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 0998495417be86988159b032557308287c702dc0
Merge: a656b7b556 71e8b7c213
Author: Dmitry Konstantinov <[email protected]>
AuthorDate: Thu May 21 22:37:31 2026 +0100

    Merge branch 'cassandra-6.0' into trunk
    
    * cassandra-6.0:
      Reduce memory allocations in row merge logic

 CHANGES.txt                                        |  1 +
 src/java/org/apache/cassandra/db/rows/Row.java     | 49 ++++++++++++++++++----
 .../org/apache/cassandra/utils/MergeIterator.java  | 21 +++++-----
 3 files changed, 54 insertions(+), 17 deletions(-)

diff --cc CHANGES.txt
index 11b32e5ff4,ac9d7fa4b7..64507eef34
--- 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
 + * 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
+  * 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)
   * Accord: Tail Latency Improvements (CASSANDRA-21361)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to