Skip to content

Conversation

@michaeljmarshall
Copy link
Member

What is the issue

Fixes: https://github.com/riptano/cndb/issues/16336

What does this PR fix and why was it fixed

In SAI, when we handle already created iterators, we need to close them on the exceptional path. This is not the most aesthetic practice, but it is the current one, so this change follows the current standard of catching throwable, calling close, and throwing the throwable.

In this case, we hit an exception when reading from disk for hasNext but there are at a couple spots there could be exceptions in there, so I wrapped the whole block.

@github-actions
Copy link

github-actions bot commented Dec 17, 2025

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

@sonarqubecloud
Copy link

Copy link
Member

@JeremiahDJordan JeremiahDJordan left a comment

Choose a reason for hiding this comment

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

thanks!

@cassci-bot
Copy link

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


1 regressions found
See build details here


Found 1 new test failures

Test Explanation Runs Upstream
o.a.c.index.sai.cql.VectorCompaction100dTest.testOneToManyCompaction[db true] NEW 🔴 0 / 19

No known test failures found

Copy link

@eolivelli eolivelli left a comment

Choose a reason for hiding this comment

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

LGTM

@michaeljmarshall michaeljmarshall merged commit a79fd6e into main Dec 18, 2025
493 of 499 checks passed
@michaeljmarshall michaeljmarshall deleted the cndb-16336 branch December 18, 2025 22:07
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