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 f989d96b4b6d8a4c156a360059851f8de6d62a14
Merge: 1515da5635 27cc24bc79
Author: Caleb Rackliffe <[email protected]>
AuthorDate: Sat Jul 18 23:14:53 2026 -0500

    Merge branch 'cassandra-6.0' into trunk
    
    * cassandra-6.0:
      SAI Component Checksum Validation Should be Segment-Aware

 CHANGES.txt                                        |   1 +
 .../index/sai/disk/io/IndexInputReader.java        |  64 ++++++---
 .../index/sai/disk/v1/V1OnDiskFormat.java          |  99 +++++++++++++-
 .../index/sai/cql/StorageAttachedIndexDDLTest.java |  23 ++++
 .../index/sai/disk/v1/SegmentFlushTest.java        | 149 +++++++++++++++++++++
 5 files changed, 314 insertions(+), 22 deletions(-)

diff --cc CHANGES.txt
index 04e62e29b0,f6687fcea4..14b5748afa
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -86,6 -63,14 +86,7 @@@ Merged from 4.0
   * Fix a removed TTLed row re-appearance in a materialized view after a 
cursor compaction (CASSANDRA-21152)
   * Rework ZSTD dictionary compression logic to create a trainer per training 
(CASSANDRA-21209)
  Merged from 5.0:
+  * SAI Component Checksum Validation Should be Segment-Aware (CASSANDRA-21516)
 - * Support Python 3.12 and 3.13 in cqlsh (CASSANDRA-20997)
 - * Make synchronization on VectorMemoryIndex inserts more granular 
(CASSANDRA-21160)
 - * putShortVolatile is not volatile in InMemoryTrie (CASSANDRA-21353)
 - * 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)
   * Ensure SAI sends range tombstones to the coordinator for queries on static 
columns (CASSANDRA-21332)
  Merged from 4.1:
   * Add Paxos v2 option and informatin in cassandra.yaml (CASSANDRA-21316)


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

Reply via email to