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/26 14:19:42 UTC
(cassandra) branch trunk updated (c014b31ede -> a504860cc0)
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from c014b31ede Merge branch 'cassandra-6.0' into trunk
new 28999f0480 MultiStepOperations should not encode range movements using endpoints
new a504860cc0 Merge branch 'cassandra-6.0' into trunk
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 1 +
.../config/CassandraRelevantProperties.java | 1 +
.../apache/cassandra/locator/RangesByEndpoint.java | 19 ++
.../apache/cassandra/service/CassandraDaemon.java | 3 +-
.../service/accord/topology/AccordTopology.java | 2 +-
.../cassandra/tcm/AbstractLocalProcessor.java | 19 +-
src/java/org/apache/cassandra/tcm/CMSLookup.java | 6 +
.../org/apache/cassandra/tcm/ClusterMetadata.java | 4 +-
.../apache/cassandra/tcm/MultiStepOperation.java | 29 ---
.../apache/cassandra/tcm/membership/Directory.java | 4 +-
.../cassandra/tcm/membership/EndpointLookup.java | 2 +
.../{EndpointLookup.java => NodeIdLookup.java} | 6 +-
.../cassandra/tcm/membership/NodeVersion.java | 2 +-
.../cassandra/tcm/ownership/DataPlacement.java | 14 +-
.../cassandra/tcm/ownership/DataPlacements.java | 18 +-
.../org/apache/cassandra/tcm/ownership/Delta.java | 179 +++++++--------
.../ownership/{Delta.java => EndpointDelta.java} | 113 +++++++---
.../cassandra/tcm/ownership/NodeIdDelta.java | 243 +++++++++++++++++++++
.../cassandra/tcm/ownership/PlacementDeltas.java | 76 ++++---
.../tcm/ownership/PlacementTransitionPlan.java | 51 +++--
.../cassandra/tcm/ownership/ReplicaGroups.java | 84 +++++--
.../Key.java => tcm/ownership/ReplicaNode.java} | 45 ++--
.../tcm/ownership/UniformRangePlacement.java | 71 +++---
.../tcm/ownership/VersionedEndpoints.java | 14 ++
.../cassandra/tcm/sequences/BootstrapAndJoin.java | 29 +--
.../tcm/sequences/BootstrapAndReplace.java | 25 ++-
.../tcm/sequences/InProgressSequences.java | 1 +
.../org/apache/cassandra/tcm/sequences/Move.java | 39 ++--
.../cassandra/tcm/sequences/ReconfigureCMS.java | 142 +++++++++++-
.../cassandra/tcm/sequences/RemoveNodeStreams.java | 17 +-
.../tcm/sequences/ReplaceSameAddress.java | 10 +-
.../tcm/sequences/UnbootstrapAndLeave.java | 17 +-
.../tcm/sequences/UnbootstrapStreams.java | 15 +-
.../cassandra/tcm/serialization/Version.java | 4 +
.../tcm/transformations/ApplyPlacementDeltas.java | 11 +-
.../cassandra/tcm/transformations/PrepareJoin.java | 9 +-
.../tcm/transformations/PrepareLeave.java | 2 +-
.../cassandra/tcm/transformations/PrepareMove.java | 4 +-
.../tcm/transformations/PrepareReplace.java | 2 +-
.../cassandra/tcm/transformations/Startup.java | 15 +-
.../cassandra/tcm/transformations/UnsafeJoin.java | 3 +-
.../cms/AdvanceCMSReconfiguration.java | 30 +--
.../test/log/MetadataChangeSimulationTest.java | 4 +-
.../log/mso/AllowIPChangeWithBootstrapTest.java | 104 +++++++++
.../test/log/mso/AllowIPChangeWithDecomTest.java | 50 +++++
.../test/log/mso/AllowIPChangeWithMoveTest.java | 61 ++++++
.../test/log/mso/AllowIPChangeWithReplaceTest.java | 117 ++++++++++
.../test/log/mso/IPChangeWithMSOBase.java | 126 +++++++++++
.../ClusterMetadataDeltaMinorUpgradeTest.java | 66 ++++++
.../upgrade/ClusterMetadataMinorUpgradeTest.java | 150 +++++++++++++
... => ClusterMetadataReconfMinorUpgradeTest.java} | 43 ++--
.../distributed/upgrade/UpgradeTestBase.java | 9 +
.../simulator/cluster/OnClusterReplace.java | 2 +-
.../apache/cassandra/tcm/BootWithMetadataTest.java | 29 ++-
.../tcm/ClusterMetadataTransformationTest.java | 7 +-
.../listeners/MetadataSnapshotListenerTest.java | 16 +-
.../listeners/PlacementsChangeListenerTest.java | 14 +-
.../tcm/log/LogListenerNotificationTest.java | 7 +-
.../cassandra/tcm/ownership/DeltaMapTest.java | 146 +++++++------
.../cassandra/tcm/ownership/OwnershipUtils.java | 62 ++----
.../tcm/ownership/PlacementTransitionPlanTest.java | 95 ++++----
.../InProgressSequenceCancellationTest.java | 61 ++++--
.../cassandra/tcm/sequences/SequencesUtils.java | 16 +-
63 files changed, 1917 insertions(+), 649 deletions(-)
copy src/java/org/apache/cassandra/tcm/membership/{EndpointLookup.java => NodeIdLookup.java} (85%)
copy src/java/org/apache/cassandra/tcm/ownership/{Delta.java => EndpointDelta.java} (56%)
create mode 100644 src/java/org/apache/cassandra/tcm/ownership/NodeIdDelta.java
copy src/java/org/apache/cassandra/{index/accord/Key.java => tcm/ownership/ReplicaNode.java} (54%)
create mode 100644 test/distributed/org/apache/cassandra/distributed/test/log/mso/AllowIPChangeWithBootstrapTest.java
create mode 100644 test/distributed/org/apache/cassandra/distributed/test/log/mso/AllowIPChangeWithDecomTest.java
create mode 100644 test/distributed/org/apache/cassandra/distributed/test/log/mso/AllowIPChangeWithMoveTest.java
create mode 100644 test/distributed/org/apache/cassandra/distributed/test/log/mso/AllowIPChangeWithReplaceTest.java
create mode 100644 test/distributed/org/apache/cassandra/distributed/test/log/mso/IPChangeWithMSOBase.java
create mode 100644 test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataDeltaMinorUpgradeTest.java
create mode 100644 test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataMinorUpgradeTest.java
copy test/distributed/org/apache/cassandra/distributed/upgrade/{ClusterMetadataUpgradeDC2InitializeTest.java => ClusterMetadataReconfMinorUpgradeTest.java} (50%)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-6.0' into trunk
Posted by ma...@apache.org.
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 a504860cc0ff6c4a89f01ef2001818db93c70e16
Merge: c014b31ede 28999f0480
Author: Marcus Eriksson <ma...@apache.org>
AuthorDate: Wed Aug 26 16:15:17 2026 +0200
Merge branch 'cassandra-6.0' into trunk
CHANGES.txt | 1 +
.../config/CassandraRelevantProperties.java | 1 +
.../apache/cassandra/locator/RangesByEndpoint.java | 19 ++
.../apache/cassandra/service/CassandraDaemon.java | 3 +-
.../service/accord/topology/AccordTopology.java | 2 +-
.../cassandra/tcm/AbstractLocalProcessor.java | 19 +-
src/java/org/apache/cassandra/tcm/CMSLookup.java | 6 +
.../org/apache/cassandra/tcm/ClusterMetadata.java | 4 +-
.../apache/cassandra/tcm/MultiStepOperation.java | 29 ---
.../apache/cassandra/tcm/membership/Directory.java | 4 +-
.../cassandra/tcm/membership/EndpointLookup.java | 2 +
.../{EndpointLookup.java => NodeIdLookup.java} | 6 +-
.../cassandra/tcm/membership/NodeVersion.java | 2 +-
.../cassandra/tcm/ownership/DataPlacement.java | 14 +-
.../cassandra/tcm/ownership/DataPlacements.java | 18 +-
.../org/apache/cassandra/tcm/ownership/Delta.java | 179 +++++++--------
.../ownership/{Delta.java => EndpointDelta.java} | 113 +++++++---
.../cassandra/tcm/ownership/NodeIdDelta.java | 243 +++++++++++++++++++++
.../cassandra/tcm/ownership/PlacementDeltas.java | 76 ++++---
.../tcm/ownership/PlacementTransitionPlan.java | 51 +++--
.../cassandra/tcm/ownership/ReplicaGroups.java | 84 +++++--
.../cassandra/tcm/ownership/ReplicaNode.java | 63 ++++++
.../tcm/ownership/UniformRangePlacement.java | 71 +++---
.../tcm/ownership/VersionedEndpoints.java | 14 ++
.../cassandra/tcm/sequences/BootstrapAndJoin.java | 29 +--
.../tcm/sequences/BootstrapAndReplace.java | 25 ++-
.../tcm/sequences/InProgressSequences.java | 1 +
.../org/apache/cassandra/tcm/sequences/Move.java | 39 ++--
.../cassandra/tcm/sequences/ReconfigureCMS.java | 142 +++++++++++-
.../cassandra/tcm/sequences/RemoveNodeStreams.java | 17 +-
.../tcm/sequences/ReplaceSameAddress.java | 10 +-
.../tcm/sequences/UnbootstrapAndLeave.java | 17 +-
.../tcm/sequences/UnbootstrapStreams.java | 15 +-
.../cassandra/tcm/serialization/Version.java | 4 +
.../tcm/transformations/ApplyPlacementDeltas.java | 11 +-
.../cassandra/tcm/transformations/PrepareJoin.java | 9 +-
.../tcm/transformations/PrepareLeave.java | 2 +-
.../cassandra/tcm/transformations/PrepareMove.java | 4 +-
.../tcm/transformations/PrepareReplace.java | 2 +-
.../cassandra/tcm/transformations/Startup.java | 15 +-
.../cassandra/tcm/transformations/UnsafeJoin.java | 3 +-
.../cms/AdvanceCMSReconfiguration.java | 30 +--
.../test/log/MetadataChangeSimulationTest.java | 4 +-
.../log/mso/AllowIPChangeWithBootstrapTest.java | 104 +++++++++
.../test/log/mso/AllowIPChangeWithDecomTest.java | 50 +++++
.../test/log/mso/AllowIPChangeWithMoveTest.java | 61 ++++++
.../test/log/mso/AllowIPChangeWithReplaceTest.java | 117 ++++++++++
.../test/log/mso/IPChangeWithMSOBase.java | 126 +++++++++++
.../ClusterMetadataDeltaMinorUpgradeTest.java | 66 ++++++
.../upgrade/ClusterMetadataMinorUpgradeTest.java | 150 +++++++++++++
.../ClusterMetadataReconfMinorUpgradeTest.java | 57 +++++
.../distributed/upgrade/UpgradeTestBase.java | 9 +
.../simulator/cluster/OnClusterReplace.java | 2 +-
.../apache/cassandra/tcm/BootWithMetadataTest.java | 29 ++-
.../tcm/ClusterMetadataTransformationTest.java | 7 +-
.../listeners/MetadataSnapshotListenerTest.java | 16 +-
.../listeners/PlacementsChangeListenerTest.java | 14 +-
.../tcm/log/LogListenerNotificationTest.java | 7 +-
.../cassandra/tcm/ownership/DeltaMapTest.java | 146 +++++++------
.../cassandra/tcm/ownership/OwnershipUtils.java | 62 ++----
.../tcm/ownership/PlacementTransitionPlanTest.java | 95 ++++----
.../InProgressSequenceCancellationTest.java | 61 ++++--
.../cassandra/tcm/sequences/SequencesUtils.java | 16 +-
63 files changed, 1999 insertions(+), 599 deletions(-)
diff --cc CHANGES.txt
index ab0d7e8d3a,07030355ad..b0fa97d256
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,7 +1,16 @@@
-6.0-alpha3
+7.0
+ * 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:
+ * MultiStepOperations should not encode range movements using endpoints (CASSANDRA-21582)
* Avoid "During operation execution,... at ONE the ring has changed from epoch1 to epoch2 error" with counter writes (CASSANDRA-21585)
- * Reject LIKE patterns with a wildcard (%) anywhere other than the start or end (CASSANDRA-21068)
* Stabilize cursor-based compaction (CASSANDRA-21462)
* Stop using Java streams in CIDRPermissions.SubsetPermissions#canAccessFrom hot method (CASSANDRA-21588)
* Enable trickle fsync by default (CASSANDRA-21572)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org