You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2026/08/04 03:55:07 UTC
(cassandra) 01/01: Merge branch 'cassandra-6.0' into trunk
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 79a8286d7213a7fa5a551e9ca67767d5c0495aa3
Merge: 10557d7ffe 793d0001ec
Author: Caleb Rackliffe <ca...@gmail.com>
AuthorDate: Mon Aug 3 22:43:18 2026 -0500
Merge branch 'cassandra-6.0' into trunk
* cassandra-6.0:
Fix ThreadLocalReadAheadBuffer#fill() to throw a CorruptBlockException if chunk metadata and file size are out of sync
CHANGES.txt | 1 +
.../io/util/ThreadLocalReadAheadBuffer.java | 11 +++--
.../io/util/StandardCompressedChunkReaderTest.java | 54 ++++++++++++++++++++++
.../io/util/ThreadLocalReadAheadBufferTest.java | 3 +-
4 files changed, 64 insertions(+), 5 deletions(-)
diff --cc CHANGES.txt
index 5b33484d30,2d6041c04b..d7a8cfcb87
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -68,25 -60,6 +68,26 @@@ Merged from 6.0
* 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)
* Synchronously publish changes to local gossip state following metadata updates (CASSANDRA-21239)
+Merged from 5.0:
++ * Fix ThreadLocalReadAheadBuffer#fill() to throw a CorruptBlockException if chunk metadata and file size are out of sync (CASSANDRA-21519)
+ * Support Python 3.12 and 3.13 in cqlsh (CASSANDRA-20997)
+ * Make synchronization on VectorMemoryIndex inserts more granular (CASSANDRA-21160)
+ * 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)
+Merged from 4.0:
+ * Bound declared value length against readable bytes in CBUtil (CASSANDRA-21521)
+ * Verify extension type before initializing reflectively-loaded classes (CASSANDRA-21525)
+ * Rename conflicting nodetool import --copy-data short option from -p to -cd (CASSANDRA-20214)
+ * Fix PasswordObfuscator failing to obfuscate certain passwords (CASSANDRA-21113)
+ * Fix negative memtable allocator ownership when an update is shadowed by an existing row deletion (CASSANDRA-21469)
+ * Consider first token of SSTable when calculating SSTable intersection in LeveledScanner (CASSANDRA-21369)
+ * Remove inFlightEcho entry on ECHO_REQ failure (CASSANDRA-21428)
+ * Validate snapshot names (CASSANDRA-21389)
+
+
+6.0-alpha2
* Change default for cassandra.set_sep_thread_name to false to reduce CPU usage (CASSANDRA-21089)
* Avoid permission checks for masked columns when the table doesn't have any (CASSANDRA-21299)
* Reduce allocations and array copies due to buffer resizing in LocalDataResponse during row serialization (CASSANDRA-21285)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org