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

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

commit 1ef9702d77bf3557332b34f446b1537b076d4261
Merge: 3ab0d06bc7 f26870f730
Author: Benedict Elliott Smith <[email protected]>
AuthorDate: Tue Sep 15 14:31:52 2026 +0100

    Merge branch 'cassandra-6.0' into trunk

 CHANGES.txt                                        |   1 +
 .../cassandra/db/virtual/AccordDebugKeyspace.java  |   2 +-
 .../service/accord/InMemoryRangeIndex.java         |  18 ++--
 .../cassandra/service/accord/RangeIndex.java       |  16 +--
 .../service/accord/execution/AccordCache.java      |   6 +-
 .../service/accord/execution/AccordCacheEntry.java |  23 ++++-
 .../service/accord/execution/AccordExecutor.java   |   2 +-
 .../service/accord/execution/SafeTask.java         | 115 +++++++++++++++------
 .../accord/execution/SaferCommandStore.java        |  28 +++--
 .../service/accord/journal/JournalRangeIndex.java  |  18 ++--
 .../accord/serializers/LatestDepsSerializers.java  |  10 +-
 .../execution/AccordCommandStoreExecutorTest.java  |  24 ++---
 .../service/accord/AccordCommandTest.java          |  21 ++--
 .../service/accord/AccordFailedKeyTestHarness.java |   3 +-
 .../service/accord/ControllableRangeIndex.java     |  14 +--
 .../cassandra/service/accord/SafeTaskTest.java     |   6 +-
 .../accord/SimulatedAccordCommandStore.java        |  46 +++++++--
 .../SimulatedAccordCommandStoreTestBase.java       |  20 ++--
 .../service/accord/SimulatedAccordTaskTest.java    |  92 +++++++++++++++--
 .../AccordExecutorCancelledConsequenceTest.java    |   6 +-
 ...AccordExecutorContinuationCancellationTest.java |   6 +-
 .../execution/AccordExecutorIncrDeadlockTest.java  |   4 +-
 .../AccordExecutorIncrRequeueRevocationTest.java   |   6 +-
 .../execution/AccordExecutorKeyAdoptionTest.java   |  16 +--
 .../execution/AccordExecutorLoadFailureTest.java   |  12 +--
 .../AccordExecutorPresetupLoadingTest.java         |   6 +-
 .../execution/AccordExecutorRangeScanTest.java     |   8 +-
 .../execution/AccordFailedKeyAbandonTest.java      |   7 +-
 .../accord/execution/AccordFailedKeyBatchTest.java |   9 +-
 .../accord/execution/AccordFailedKeyTest.java      |  32 +++---
 30 files changed, 376 insertions(+), 201 deletions(-)

diff --cc CHANGES.txt
index 306f7ce621,9e6935fb80..160f877621
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
 -6.0-alpha3
 +7.0
 + * 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:
+  * Accord: Compute Dependencies Incrementally (CASSANDRA-21682)
   * Avoid double chunk read for BTI small partitions during a select query 
execution (CASSANDRA-21637)
   * Report the number of rows replica filtering protection cached when it 
warns (CASSANDRA-21623)
   * Fix non-printable characters in Gossiper log for TOKENS (CASSANDRA-21417)


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

Reply via email to