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 074a3f5605ef8cb3fa9c433980d4d59768b103d3 Merge: ce53702764 63ed734aa8 Author: Caleb Rackliffe <[email protected]> AuthorDate: Fri Sep 25 13:57:04 2026 -0500 Merge branch 'cassandra-6.0' into trunk * cassandra-6.0: Fix compressed scan read-ahead buffer Block leak and chunk-cache pollution by scans CHANGES.txt | 1 + .../org/apache/cassandra/cache/ChunkCache.java | 3 +- .../index/sai/StorageAttachedIndexBuilder.java | 3 +- .../cassandra/index/sasi/SASIIndexBuilder.java | 3 +- .../cassandra/io/sstable/format/SSTableReader.java | 12 +- .../io/sstable/format/SortedTableScrubber.java | 5 +- .../io/sstable/format/SortedTableVerifier.java | 5 +- .../io/sstable/format/bti/PartitionIterator.java | 2 +- .../cassandra/io/util/CompressedChunkReader.java | 108 +++++----- ...AheadBuffer.java => DirectReadAheadBuffer.java} | 10 +- .../org/apache/cassandra/io/util/FileHandle.java | 21 +- ...alReadAheadBuffer.java => ReadAheadBuffer.java} | 124 +++++------- .../cassandra/io/util/SimpleChunkReader.java | 2 +- .../io/sstable/format/ForwardingSSTableReader.java | 24 +++ .../cassandra/cache/ChunkCacheScanBypassTest.java | 223 +++++++++++++++++++++ .../DirectCompressedSequentialWriterTest.java | 2 +- .../io/util/DirectCompressedChunkReaderTest.java | 53 ++--- ...ferTest.java => DirectReadAheadBufferTest.java} | 18 +- ...eadBufferTest.java => ReadAheadBufferTest.java} | 111 ++++++++-- .../io/util/StandardCompressedChunkReaderTest.java | 130 ++++++++++-- 20 files changed, 639 insertions(+), 221 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
