Skip to content

CNDB-17983: Redact expressions and orderers in SAI query plan (#2448)#2496

Merged
driftx merged 1 commit into
main-5.0from
CNDB-18326
Jul 1, 2026
Merged

CNDB-17983: Redact expressions and orderers in SAI query plan (#2448)#2496
driftx merged 1 commit into
main-5.0from
CNDB-18326

Conversation

@driftx

@driftx driftx commented Jun 29, 2026

Copy link
Copy Markdown

Adds the missing redaction of plan expressions and orderers.

Also, refactor toCQLString methods to use a Redaction.[NONE|REDACT] enum.

@github-actions

Copy link
Copy Markdown

Checklist before you submit for review

  • This PR adheres to the Definition of Done
  • Make sure there is a PR and ticket 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 IBM copyright header instead of the Apache License one (no DataStax copyright any longer)

@driftx

driftx commented Jun 29, 2026

Copy link
Copy Markdown
Author

Adjusted imports, other minor 5.0 adaptations. Relocated changes to now removed virtual tables, added toString methods where needed.

Adds the missing redaction of plan expressions and orderers.

Also, refactor toCQLString methods to use a Redaction.[NONE|REDACT] enum.
@plpesvc-ds

Copy link
Copy Markdown

❌ Build ds-cassandra-pr-gate/PR-2496 rejected by Butler


15 regressions found
See build details here


Found 15 new test failures

Test Explanation Runs Upstream
replica_side_filtering_test.TestAllowFiltering.test_consistent_skinny_table (offheap-bti-scm-hcd_1) REGRESSION 🔵🔴 0 / 30
o.a.c.db.AbstractReadQueryToCQLStringTest.testLiterals (compression) REGRESSION 🔵🔴 0 / 30
o.a.c.db.AbstractReadQueryToCQLStringTest.testQuotedNames (compression) REGRESSION 🔵🔴 0 / 30
o.a.c.db.AbstractReadQueryToCQLStringTest.testSkinnyTable (compression) REGRESSION 🔵🔴 0 / 30
o.a.c.db.AbstractReadQueryToCQLStringTest.testSkinnyTableWithMulticolumnKey (compression) REGRESSION 🔵🔴 0 / 30
o.a.c.db.AbstractReadQueryToCQLStringTest.testVirtualTable (compression) REGRESSION 🔵🔴 0 / 30
o.a.c.db.AbstractReadQueryToCQLStringTest.testWideTable (compression) REGRESSION 🔵🔴 0 / 30
o.a.c.db.AbstractReadQueryToCQLStringTest.testWideTableWithMulticolumnKey (compression) REGRESSION 🔵🔴 0 / 30
o.a.c.db.PartitionRangeReadCommandCQLTest.testToCQLString (compression) REGRESSION 🔵🔴 0 / 30
o.a.c.db.compaction.CompactionsCQLTest.testCompactionInvalidRTs (compression) REGRESSION 🔴🔴 0 / 30
o.a.c.index.sai.cql.VectorCompaction100dTest.testZeroOrOneToManyCompaction[version=ec enableNVQ=false] () NEW 🔴🔴 0 / 30
o.a.c.index.sai.cql.VectorKeyRestrictedOnPartitionTest.partitionRestrictedWidePartitionPqCompressedTest[ca false] () NEW 🔴 0 / 30
o.a.c.index.sai.cql.VectorSiftSmallTest.testMultiSegmentBuild[ed false] () NEW 🔴 0 / 30
o.a.c.index.sai.disk.RowAwareSkinnyPrimaryKeyMapTest.testExactRowIdOrInvertedCeiling[version=ed] (compression) REGRESSION 🔴🔵 0 / 30
o.a.c.index.sai.disk.v2.sortedterms.SortedTermsTest.testFileValidation (compression) REGRESSION 🔴🔵 0 / 30

Found 3 known test failures

=======
*
* @param builder a consumer to receive a builder for the options to append
>>>>>>> 4714c43331 (CNDB-13129: Add index hints)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yay - I've been waiting for a change to this class that would clean this up!

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hah, surprised me when I got there.

@driftx driftx merged commit 3171408 into main-5.0 Jul 1, 2026
3 of 5 checks passed
@driftx driftx deleted the CNDB-18326 branch July 1, 2026 12:18
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.

4 participants