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 4203dbe1732e96dd9abad2414ac2c4e3434459f6 Merge: 38a625b21a 0f0c1f530c Author: Jeremiah Jordan <[email protected]> AuthorDate: Tue Sep 8 16:33:52 2026 -0500 Merge branch 'cassandra-6.0' into trunk * cassandra-6.0: Fix concurrent SAI vector inserts failing once jvector's per-graph pool limit is exceeded CHANGES.txt | 1 + .../org/apache/cassandra/db/memtable/Memtable.java | 11 +++ .../apache/cassandra/db/memtable/Memtable_API.md | 4 + .../db/memtable/ShardedSkipListMemtable.java | 5 + .../apache/cassandra/db/memtable/TrieMemtable.java | 7 ++ .../index/sai/disk/v1/vector/OnHeapGraph.java | 31 ++++++- .../test/VectorMemoryIndexSimulationTest.java | 1 + .../memtable/MemtableConcurrentWriteLimitTest.java | 102 +++++++++++++++++++++ .../index/sai/memory/VectorMemoryIndexTest.java | 54 +++++++---- 9 files changed, 198 insertions(+), 18 deletions(-) diff --cc CHANGES.txt index 5eca072610,1cede655e0..aa356a2da1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -36,6 -25,8 +36,7 @@@ Merged from 6.0 * Make cqlsh prompt to reset to no keyspace set by USE after dropping that keyspace (CASSANDRA-21548) * Implement CMS rediscovery and recovery protocol (CASSANDRA-20476) Merged from 5.0: + * Fix concurrent SAI vector inserts failing once jvector's per-graph pool limit is exceeded (CASSANDRA-21644) - * Let the commit log allocator observe the shutdown state (CASSANDRA-21616) * Unwrap LongType properly when calculating min/max terms in V1SSTableIndex (CASSANDRA-21635) * Force repair should ignore min_repair_interval (CASSANDRA-21552) * Render SubnetGroups as JSON in system_views.settings (CASSANDRA-21579) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
