CNDB-15774: Fix the CQL query validation to allow SAI indexes with OR operators when regular indexes present #2094
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Checklist before you submit for review
|
szymon-miezal
changed the title
…when regular indexes present Previously, when a table had both a SAI index (supporting OR operators) and a regular index (not supporting OR operators), queries with OR operators would fail even if the query targeted the SAI-indexed column. This patch modifies the validation to pass if at least one index supports the given filter.
szymon-miezal
force-pushed
the
CNDB-15774
branch
from
ecf1099 to
0a06ffa
Compare
szymon-miezal
changed the title
szymon-miezal
changed the title
adelapena
approved these changes
Nov 3, 2025
adelapena
left a comment
adelapena
left a comment
There was a problem hiding this comment.
LGTM. A couple of nits that I failed to detect on the DSP ticket are the comment about both SAI and secondary indexes and the PR and commit title itself. The fix is not in the query planner but in CQL validation, so a better commit description would be Fix CQL query validation to allow SAI indexes with OR operators when regular indexes are present. These two nits can be addressed on merge.
| @Test | ||
| public void shouldPickIndexWithDisjunctionSupportToServeTheQuery() | ||
| { | ||
| // given schema with both SAI and secondary indexes |
There was a problem hiding this comment.
Nit: both SAI and legacy/table-based is a secondary index, so I'd change this to something:
Suggested change
| // given schema with both SAI and secondary indexes | |
| // given schema with both SAI and legacy secondary indexes |
or:
Suggested change
| // given schema with both SAI and secondary indexes | |
| // given schema with both SAI and table-based secondary indexes |
or:
Suggested change
| // given schema with both SAI and secondary indexes | |
| // given schema with both SAI and cf-based secondary indexes |
Author
|
That's right, in the DSP ticket the query planner was modified as well given I have ported a related change from CC, for this PR it's not the case anymore, good catch thank you! |
szymon-miezal
changed the title
|
❌ Build ds-cassandra-pr-gate/PR-2094 rejected by Butler1 regressions found Found 1 new test failures
No known test failures found |
michaelsembwever
pushed a commit
that referenced
this pull request
Nov 5, 2025
…exes with OR operators when regular indexes present (#2094) Previously, when a table had both a SAI index (supporting OR operators) and a regular index (not supporting OR operators), queries with OR operators would fail even if the query targeted the SAI-indexed column. This patch modifies the validation to pass if at least one index supports the given filter. CNDB PR: riptano/cndb#15865
michaelsembwever
pushed a commit
that referenced
this pull request
Nov 17, 2025
…exes with OR operators when regular indexes present (#2094) Previously, when a table had both a SAI index (supporting OR operators) and a regular index (not supporting OR operators), queries with OR operators would fail even if the query targeted the SAI-indexed column. This patch modifies the validation to pass if at least one index supports the given filter. CNDB PR: riptano/cndb#15865
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is the issue
Previously, when a table had both a SAI index (supporting OR operators) and a regular index (not supporting OR operators), queries with OR operators would fail even if the query targeted the SAI-indexed column.
What does this PR fix and why was it fixed
This patch modifies the validation to pass if at least one index supports the given filter.
CNDB PR: https://github.com/riptano/cndb/pull/15865