This is an automated email from the ASF dual-hosted git repository. netudima pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 6c27ece1459c5eedd6147ace29f988a48a16f6f3 Merge: 79a8286d72 20c4f84c2b Author: Dmitry Konstantinov <[email protected]> AuthorDate: Tue Aug 4 23:29:11 2026 +0100 Merge branch 'cassandra-6.0' into trunk * cassandra-6.0: Fix memtable on-heap accounting drift in BTree.update and BTreeRow.merge CHANGES.txt | 1 + src/java/org/apache/cassandra/db/Columns.java | 2 +- .../org/apache/cassandra/db/rows/BTreeRow.java | 16 +- .../org/apache/cassandra/db/rows/ColumnData.java | 25 +- .../cassandra/db/rows/ComplexColumnData.java | 12 +- .../org/apache/cassandra/utils/btree/BTree.java | 100 ++-- .../cassandra/utils/btree/UpdateFunction.java | 2 +- .../db/partitions/PartitionRowAccountingTest.java | 504 +++++++++++++++++++++ .../db/partitions/SetCellAccountingTest.java | 171 +++++++ .../utils/btree/BTreeUpdateHeapAccountingTest.java | 276 +++++++++++ 10 files changed, 1065 insertions(+), 44 deletions(-) diff --cc CHANGES.txt index d7a8cfcb87,d9892f3eba..0cd16ff632 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -68,26 -60,6 +68,27 @@@ 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: + * Fix ThreadLocalReadAheadBuffer#fill() to throw a CorruptBlockException if chunk metadata and file size are out of sync (CASSANDRA-21519) + * Support Python 3.12 and 3.13 in cqlsh (CASSANDRA-20997) + * 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: ++ * Fix memtable on-heap accounting drift in BTree.update and BTreeRow.merge (CASSANDRA-21472) + * Bound declared value length against readable bytes in CBUtil (CASSANDRA-21521) + * Verify extension type before initializing reflectively-loaded classes (CASSANDRA-21525) + * 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]
