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 7ac557c369664a8c54300195cfd2d19420ee1728 Merge: 338449c0d0 3d40c8825c Author: Benedict Elliott Smith <[email protected]> AuthorDate: Thu Jun 18 10:58:49 2026 +0100 Merge branch 'cassandra-6.0' into trunk modules/accord | 2 +- .../org/apache/cassandra/config/AccordConfig.java | 3 + src/java/org/apache/cassandra/db/LivenessInfo.java | 6 +- .../cassandra/db/compaction/CompactionTask.java | 3 +- .../org/apache/cassandra/db/rows/BTreeRow.java | 15 +- .../cassandra/db/view/ViewUpdateGenerator.java | 4 +- .../db/virtual/AbstractLazyVirtualTable.java | 2 +- .../cassandra/db/virtual/AccordDebugKeyspace.java | 2 +- .../db/virtual/RemoteToLocalVirtualTable.java | 12 +- .../service/accord/AccordCommandStore.java | 56 ++---- .../cassandra/service/accord/AccordKeyspace.java | 8 +- .../service/accord/AccordSafeCommandStore.java | 1 - .../cassandra/service/accord/AccordService.java | 24 ++- .../service/accord/journal/JournalRangeIndex.java | 2 +- .../AccordCommandStoreTryExecuteListeningTest.java | 202 -------------------- .../distributed/test/accord/AccordLoadTest.java | 2 - .../AccordJournalConsistentExpungeTest.java | 112 +++++++++++ .../accord/AccordJournalCompactionTest.java | 1 + .../accord/journal/AccordJournalBurnTest.java | 21 +- .../cassandra/db/partitions/SimplePartition.java | 10 +- .../cassandra/db/rows/BTreeRowHasLiveDataTest.java | 2 +- .../org/apache/cassandra/db/rows/RowsTest.java | 18 +- .../db/rows/UnfilteredRowIteratorsMergeTest.java | 2 +- .../cassandra/db/rows/UnfilteredRowsGenerator.java | 4 +- .../db/transform/DuplicateRowCheckerTest.java | 2 +- .../db/transform/RTTransformationsTest.java | 2 +- .../service/accord/AccordExpungeTest.java | 211 +++++++++++++++++++++ .../cassandra/service/accord/AccordTestUtils.java | 10 +- .../cassandra/service/accord/EpochSyncTest.java | 2 +- .../accord/SimulatedAccordCommandStore.java | 9 +- .../serializers/CommandsForKeySerializerTest.java | 3 +- .../serializers/LatestDepsSerializerTest.java | 3 +- .../apache/cassandra/utils/AccordGenerators.java | 7 +- 33 files changed, 452 insertions(+), 311 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
