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 c588b674bf0ab0bcd170cd847ae6caf45a2b09b5
Merge: 0a6774d35d 9198058986
Author: Dmitry Konstantinov <[email protected]>
AuthorDate: Thu May 28 15:18:20 2026 +0100

    Merge branch 'cassandra-6.0' into trunk
    
    * cassandra-6.0:
      Avoid type lookup in SerializationHeader#getType if schema and SSTable 
are aligned

 CHANGES.txt                                        |   1 +
 .../apache/cassandra/db/SerializationHeader.java   |  14 +-
 .../cassandra/db/SerializationHeaderTest.java      | 170 ++++++++++++++++++++-
 3 files changed, 180 insertions(+), 5 deletions(-)

diff --cc CHANGES.txt
index 73fb39a96e,2b666949d5..3758b4d97a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,7 +1,11 @@@
 -6.0-alpha2
 +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)
 +Merged from 6.0:
+  * Avoid type lookup in SerializationHeader#getType if schema and SSTable are 
aligned (CASSANDRA-21402)
   * Replace LongAdder in metric-like logic with ThreadLocalCounter 
(CASSANDRA-21400)
 - * BTreeRow.hasLiveData: avoid Cell iteration if there are no cell tombstones 
(CASSANDRA-21363)
 + * 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]

Reply via email to