Skip to content

Conversation

@djatnieks
Copy link

What is the issue

Fix CNDB-15239

What does this PR fix and why was it fixed

Since CNDB-15000, testToCQLString in PartitionRangeReadCommandCQLTest and SinglePartitionReadCommandCQLTest has been failing on main-5.0

@github-actions
Copy link

Checklist before you submit for review

  • This PR adheres to the Definition of Done
  • Make sure there is a PR in the CNDB project updating the Converged Cassandra version
  • Use NoSpamLogger for log lines that may appear frequently in the logs
  • Verify test results on Butler
  • Test coverage for new/modified code is > 80%
  • Proper code formatting
  • Proper title for each commit staring with the project-issue number, like CNDB-1234
  • Each commit has a meaningful description
  • Each commit is not very long and contains related changes
  • Renames, moves and reformatting are in distinct commits
  • All new files should contain the DataStax copyright header instead of the Apache License one

@driftx
Copy link

driftx commented Aug 29, 2025

I think the issue here is the tests are incompatible with each other. OSS 5.0 has the AF line here, which is why AbstractReadQueryToCQLStringTest passed before. DS never had it (or this test) before now, and so PartitionRangeReadCommandCQLTest and SinglePartitionReadCommandCQLTest explicitly don't expect AF to be present. PartitionRangeReadCommandCQLTest is DS-only and was probably ignorant of the 5.0 AF behavior when created, and SinglePartitionReadCommandCQLTest was modified in the commit we are trying to forward port, CNDB-13129, with this behavior.

@adelapena thoughts?

@adelapena
Copy link

It seems we have gone in different directions in CC/main and ASF. CASSANDRA-18112 added ALLOW FILTERING in all circumstances, whereas CC doesn't add it. We cannot really know if the user added AF or not.

Adding AF to every command is a tad distracting IMO, but it has the benefit of always producing runnable commands, so maybe it's a good idea to go the ASF way and always add AF? WDYT?

@adelapena
Copy link

I have left a PR for main to always add ALLOW FILTERING to toCQLString, in case we want to go that way: #1974

@driftx
Copy link

driftx commented Sep 2, 2025

Adding AF to every command is a tad distracting IMO, but it has the benefit of always producing runnable commands, so maybe it's a good idea to go the ASF way and always add AF? WDYT?

It's distracting, but aligning with the ASF way is probably the least friction for the future.

@djatnieks
Copy link
Author

Closing this in favor of #1974 for main

@djatnieks djatnieks closed this Sep 3, 2025
@djatnieks djatnieks deleted the CNDB-15239 branch September 3, 2025 12:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants