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 6bee931da9607e67e3314e7cf31b481ec3947f9a Merge: 50ddce8455 e1e56e5d5d Author: Sam Tunnicliffe <[email protected]> AuthorDate: Mon Jul 6 11:53:17 2026 +0100 Merge branch 'cassandra-6.0' into trunk CHANGES.txt | 1 + .../statements/schema/CreateKeyspaceStatement.java | 2 +- .../cassandra/db/AbstractMutationVerbHandler.java | 2 +- .../cassandra/db/ReadCommandVerbHandler.java | 4 +- .../cassandra/db/compaction/CompactionManager.java | 2 +- .../org/apache/cassandra/db/view/ViewUtils.java | 6 +- src/java/org/apache/cassandra/gms/Gossiper.java | 9 +- .../apache/cassandra/hints/HintsDispatcher.java | 2 +- .../cassandra/locator/CMSPlacementStrategy.java | 3 +- .../cassandra/locator/EndpointsForToken.java | 2 +- .../org/apache/cassandra/locator/MetaStrategy.java | 4 +- .../apache/cassandra/locator/ReplicaLayout.java | 14 +- .../org/apache/cassandra/locator/ReplicaPlans.java | 2 +- .../org/apache/cassandra/metrics/TCMMetrics.java | 3 +- .../apache/cassandra/net/ResponseVerbHandler.java | 3 +- .../apache/cassandra/repair/RepairCoordinator.java | 3 +- .../cassandra/service/ActiveRepairService.java | 2 +- .../apache/cassandra/service/CassandraDaemon.java | 2 +- src/java/org/apache/cassandra/service/Rebuild.java | 12 +- .../org/apache/cassandra/service/StorageProxy.java | 3 +- .../apache/cassandra/service/StorageService.java | 26 +- .../service/accord/topology/AccordTopology.java | 2 +- .../org/apache/cassandra/service/paxos/Paxos.java | 2 +- .../cassandra/service/paxos/PaxosRepair.java | 2 +- .../streaming/DataMovementVerbHandler.java | 2 +- .../cassandra/tcm/AbstractLocalProcessor.java | 4 +- .../cassandra/tcm/AtomicLongBackedProcessor.java | 12 + .../org/apache/cassandra/tcm/CMSMembership.java | 257 +++++++++++++++ .../org/apache/cassandra/tcm/CMSOperations.java | 3 +- .../org/apache/cassandra/tcm/ClusterMetadata.java | 350 +++++++++++++++++---- .../cassandra/tcm/ClusterMetadataService.java | 63 ++-- .../org/apache/cassandra/tcm/MetadataKeys.java | 4 +- .../apache/cassandra/tcm/PaxosBackedProcessor.java | 6 + src/java/org/apache/cassandra/tcm/Startup.java | 36 ++- .../cassandra/tcm/StubClusterMetadataService.java | 3 +- .../cassandra/tcm/compatibility/GossipHelper.java | 10 +- .../tcm/listeners/LegacyStateListener.java | 4 +- .../tcm/listeners/PlacementsChangeListener.java | 24 +- .../tcm/listeners/UpgradeMigrationListener.java | 20 +- .../org/apache/cassandra/tcm/log/LogState.java | 2 +- .../apache/cassandra/tcm/membership/Directory.java | 2 +- .../apache/cassandra/tcm/membership/NodeId.java | 1 + .../cassandra/tcm/membership/NodeVersion.java | 2 +- .../apache/cassandra/tcm/migration/Election.java | 5 - .../cassandra/tcm/ownership/DataPlacement.java | 5 + .../cassandra/tcm/ownership/DataPlacements.java | 29 +- .../tcm/ownership/UniformRangePlacement.java | 8 +- .../cassandra/tcm/sequences/BootstrapAndJoin.java | 4 +- .../tcm/sequences/BootstrapAndReplace.java | 8 +- .../tcm/sequences/CancelCMSReconfiguration.java | 68 ++-- .../org/apache/cassandra/tcm/sequences/Move.java | 4 +- .../cassandra/tcm/sequences/ProgressBarrier.java | 6 +- .../cassandra/tcm/sequences/RemoveNodeStreams.java | 2 +- .../tcm/sequences/ReplaceSameAddress.java | 2 +- .../tcm/sequences/UnbootstrapAndLeave.java | 2 +- .../cassandra/tcm/serialization/Version.java | 14 +- .../tcm/transformations/AccordMarkStale.java | 2 +- .../cassandra/tcm/transformations/AlterSchema.java | 2 +- .../tcm/transformations/AlterTopology.java | 4 +- .../tcm/transformations/ApplyPlacementDeltas.java | 2 +- .../cassandra/tcm/transformations/PrepareJoin.java | 6 +- .../tcm/transformations/PrepareLeave.java | 2 +- .../cassandra/tcm/transformations/PrepareMove.java | 4 +- .../tcm/transformations/PrepareReplace.java | 2 +- .../cassandra/tcm/transformations/Register.java | 2 +- .../cassandra/tcm/transformations/Startup.java | 27 +- .../cms/AdvanceCMSReconfiguration.java | 68 ++-- .../tcm/transformations/cms/FinishAddToCMS.java | 10 +- .../tcm/transformations/cms/PreInitialize.java | 40 +-- .../cms/PrepareCMSReconfiguration.java | 13 +- .../tcm/transformations/cms/RemoveFromCMS.java | 25 +- .../tcm/transformations/cms/StartAddToCMS.java | 29 +- .../org/apache/cassandra/tools/CMSOfflineTool.java | 34 +- .../tools/TransformClusterMetadataHelper.java | 27 +- .../cassandra/distributed/impl/Instance.java | 2 +- .../cassandra/distributed/shared/ClusterUtils.java | 8 +- .../hostreplacement/AssassinateCMSNodeTest.java | 5 +- .../distributed/test/log/BootWithMetadataTest.java | 16 +- .../test/log/ClusterMetadataDumpTest.java | 3 +- .../test/log/ClusterMetadataTestHelper.java | 36 ++- .../test/log/MetadataChangeSimulationTest.java | 12 +- .../test/log/OperationalEquivalenceTest.java | 3 +- .../distributed/test/log/ReconfigureCMSTest.java | 18 +- .../distributed/test/log/RegisterTest.java | 156 +++++---- .../distributed/test/log/ResumableStartupTest.java | 4 +- .../distributed/test/log/SimulatedOperation.java | 4 +- .../distributed/test/log/SnapshotTest.java | 2 +- .../distributed/test/ring/RangeVersioningTest.java | 2 +- .../test/tcm/CMSPlacementAfterReplacementTest.java | 3 +- .../ClusterMetadataUpgradeAssassinateTest.java | 2 +- ...lusterMetadataUpgradeDelayedInitializeTest.java | 8 +- .../fuzz/topology/TopologyMixupTestBase.java | 2 +- .../simulator/cluster/OnClusterReplace.java | 4 +- .../apache/cassandra/auth/GrantAndRevokeTest.java | 8 + .../org/apache/cassandra/dht/BootStrapperTest.java | 3 +- .../apache/cassandra/locator/MetaStrategyTest.java | 4 +- .../cassandra/locator/SimpleStrategyTest.java | 2 +- .../service/accord/AccordTopologyUtils.java | 2 +- .../cassandra/service/accord/EpochSyncTest.java | 6 +- .../apache/cassandra/tcm/BootWithMetadataTest.java | 8 +- .../tcm/ClusterMetadataTransformationTest.java | 43 ++- .../org/apache/cassandra/tcm/GetLogStateTest.java | 17 +- .../org/apache/cassandra/tcm/UnregisterTest.java | 2 +- .../tcm/compatibility/GossipHelperTest.java | 6 +- .../listeners/MetadataSnapshotListenerTest.java | 2 +- .../listeners/PlacementsChangeListenerTest.java | 179 +++++++++++ .../cassandra/tcm/log/DistributedLogStateTest.java | 5 +- .../cassandra/tcm/membership/MembershipUtils.java | 6 +- .../tcm/ownership/LocalRangesAllSettledTest.java | 12 +- .../cassandra/tcm/ownership/OwnershipUtils.java | 2 +- .../InProgressSequenceCancellationTest.java | 10 +- .../tcm/sequences/ProgressBarrierTest.java | 12 +- .../tcm/transformations/EventsMetadataTest.java | 14 +- .../tcm/transformations/PrepareLeaveTest.java | 15 +- .../apache/cassandra/tools/CMSOfflineToolTest.java | 23 +- .../cassandra/utils/CassandraGenerators.java | 4 +- 116 files changed, 1397 insertions(+), 652 deletions(-) diff --cc CHANGES.txt index 3727b164b8,dcd7972231..7aa91ee956 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,5 +1,10 @@@ -6.0-alpha2 +7.0 + * 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: + * Add CMS membership as a field in ClusterMetadata (CASSANDRA-20736) * Fix maven remote publishing of Accord artifacts (CASSANDRA-21261) * Move long running TCM operations to a longer timout (CASSANDRA-21453) * Offline nodetool commands should not print network options in help (CASSANDRA-20876) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
