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: [email protected]
For additional commands, e-mail: [email protected]
