This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 9783cfeb7372c73d94b70cd1cd851ee7f5630824 Merge: a44720c779 bf4437296b Author: Caleb Rackliffe <[email protected]> AuthorDate: Thu Jul 2 15:52:22 2026 -0500 Merge branch 'cassandra-6.0' into trunk * cassandra-6.0: Make synchronization on VectorMemoryIndex inserts more granular CHANGES.txt | 1 + .../sai/disk/v1/vector/PrimaryKeyWithScore.java | 8 + .../index/sai/memory/VectorMemoryIndex.java | 59 +- .../simulator/asm/NemesisFieldSelectors.java | 50 +- .../simulator/test/OnHeapGraphSimulationTest.java | 283 ++++++++ .../test/VectorMemoryIndexSimulationTest.java | 750 +++++++++++++++++++++ .../index/sai/memory/VectorMemoryIndexTest.java | 561 ++++++++++++++- 7 files changed, 1660 insertions(+), 52 deletions(-) diff --cc CHANGES.txt index 4dfb429438,ceea15961a..3fa97b0d1c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -52,21 -46,6 +52,22 @@@ Merged from 6.0 * Differentiate between legitimate cases where the first entry is the same as the last entry and empty bounds in SSTableCursorWriter#addIndexBlock() (CASSANDRA-21255) * Introduce minimum_threshold for data resurrection startup check (CASSANDRA-21293) * Synchronously publish changes to local gossip state following metadata updates (CASSANDRA-21239) +Merged from 5.0: ++ * Make synchronization on VectorMemoryIndex inserts more granular (CASSANDRA-21160) + * Fix RequestFailureReason serializer and nits in a few others (CASSANDRA-21437) + * Remove golang dependency in gen-doc and replace with python implementation (CASSANDRA-21432) + * Use estimated compressed size for tables to check if there is enough free space for a compaction (CASSANDRA-21245) + * Fix failing select on system_views.settings for non-string keys (CASSANDRA-21348) +Merged from 4.0: + * Rename conflicting nodetool import --copy-data short option from -p to -cd (CASSANDRA-20214) + * Fix PasswordObfuscator failing to obfuscate certain passwords (CASSANDRA-21113) + * Fix negative memtable allocator ownership when an update is shadowed by an existing row deletion (CASSANDRA-21469) + * Consider first token of SSTable when calculating SSTable intersection in LeveledScanner (CASSANDRA-21369) + * Remove inFlightEcho entry on ECHO_REQ failure (CASSANDRA-21428) + * Validate snapshot names (CASSANDRA-21389) + + +6.0-alpha2 * Change default for cassandra.set_sep_thread_name to false to reduce CPU usage (CASSANDRA-21089) * Avoid permission checks for masked columns when the table doesn't have any (CASSANDRA-21299) * Reduce allocations and array copies due to buffer resizing in LocalDataResponse during row serialization (CASSANDRA-21285) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
