This is an automated email from the ASF dual-hosted git repository.

michaelsembwever pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 966d96bc73979f9f5375367747e8ab87c7b037d5
Merge: f320d3ac3c a941f34538
Author: mck <[email protected]>
AuthorDate: Fri Nov 6 00:40:48 2026 +0100

    Merge branch 'cassandra-6.0' into trunk
    
    * cassandra-6.0:
      Serialise local metadata proposals so concurrent DDL keeps its retry 
budget

 CHANGES.txt                                        |   1 +
 .../schema/DistributedMetadataLogKeyspace.java     |   1 +
 .../cassandra/tcm/AbstractLocalProcessor.java      | 158 +++++---
 .../test/tcm/ConcurrentSchemaCommitTest.java       | 110 ++++++
 .../tcm/AbstractLocalProcessorClockTest.java       |  83 +++++
 .../tcm/AbstractLocalProcessorConcurrencyTest.java | 331 +++++++++++++++++
 .../tcm/AbstractLocalProcessorCycleTest.java       | 360 ++++++++++++++++++
 .../tcm/AbstractLocalProcessorLockTest.java        | 405 +++++++++++++++++++++
 8 files changed, 1405 insertions(+), 44 deletions(-)

diff --cc CHANGES.txt
index e799236ff7,9492206786..a6bd149952
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,5 +1,21 @@@
 -6.0-alpha3
 +7.0
 + * Improve algorithmic complexity for finding intersecting SSTables for LCS 
compaction candidates (CASSANDRA-21605)
 + * Clarify off-heap OOM error message in JVMStabilityInspector 
(CASSANDRA-19831)
 + * FQLTool Replay support for full set of login options (CASSANDRA-17559)
 + * Extract reusable HttpService from cloud metadata connector 
(CASSANDRA-21195)
 + * Redact hash and _hash suffixed parameters in system_views.settings 
(CASSANDRA-21686)
 + * Allow CQLSSTableWriter to specify SSTable id generator to use 
(CASSANDRA-21012)
 + * Reject LIKE patterns with a wildcard (%) anywhere other than the start or 
end (CASSANDRA-21068)
 + * Support pluggable default role initialization (CASSANDRA-21546)
 + * Add prepared statement cache stats to nodetool info (CASSANDRA-14366)
 + * Don't increment client metrics on messaging service connection unpause 
(CASSANDRA-21491)
 + * Add nodetool getreplicas (CASSANDRA-17665)
 + * Implementation of CEP-49: Hardware-accelerated compression 
(CASSANDRA-20975)
 + * 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:
+  * Prevent concurrent schema changes from failing prematurely due to metadata 
commit contention (CASSANDRA-21537)
   * Throw CorruptBlockException from DirectReadAheadBuffer on a short read so 
the chunk buffer is reset (CASSANDRA-21829)
   * Cursor compaction fails with AssertionError when a static collection 
exceeds a collection guardrail threshold (CASSANDRA-21827)
   * Support wildcard * in excluded_indexes index hints (CASSANDRA-21715)


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

Reply via email to