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 fbf1137c809508e2651bff1e479564dfab09c312 Merge: c84f3d4d51 bf711a0fc1 Author: Dmitry Konstantinov <[email protected]> AuthorDate: Tue May 26 15:46:28 2026 +0100 Merge branch 'cassandra-6.0' into trunk * cassandra-6.0: BTreeRow.hasLiveData: avoid Cell iteration if there are no cell tombstones CHANGES.txt | 1 + .../org/apache/cassandra/db/rows/AbstractRow.java | 10 - .../org/apache/cassandra/db/rows/BTreeRow.java | 15 ++ .../cassandra/db/rows/BTreeRowHasLiveDataTest.java | 224 +++++++++++++++++++++ 4 files changed, 240 insertions(+), 10 deletions(-) diff --cc CHANGES.txt index 64507eef34,118a24c7ae..2ae35a9fb9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,5 +1,18 @@@ +7.0 + * Avoid using ObjectUtils.getFirstNonNull in Schema (CASSANDRA-21394) + * Allow nodetool garbagecollect to take a user defined list of SSTables (CASSANDRA-16767) + * Add a guardrail for misprepared statements (CASSANDRA-21139) 6.0-alpha2 - * BTreeRow.hasLiveData: avoid Cell iteration if there are no cell tombstones (CASSANDRA-21363) + * Ensure schema created before 2.1 without tableId in folder name can be loaded in SnapshotLoader (CASSANDRA-21246) + * 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) +Merged from 5.0: + * 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) + + +6.0-alpha2 ++ * BTreeRow#hasLiveData: Avoid Cell iteration if there are no tombstones in a row (CASSANDRA-21363) * Reduce memory allocations in row merge logic (CASSANDRA-21359) * Restore option to avoid hint transfer during decommission (CASSANDRA-21341) * Add an offline cluster metadata tool (CASSANDRA-19151) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
