You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ps...@apache.org on 2025/09/09 12:42:44 UTC
(solr) branch main updated: Remove some dead code from distributed updater (#3610)
This is an automated email from the ASF dual-hosted git repository.
psalagnac pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 3e0f2916b18 Remove some dead code from distributed updater (#3610)
3e0f2916b18 is described below
commit 3e0f2916b18199c725b27dd60baa2239b246041a
Author: Pierre Salagnac <ps...@apache.org>
AuthorDate: Tue Sep 9 14:42:38 2025 +0200
Remove some dead code from distributed updater (#3610)
Simple code cleanup with no functional change
Co-authored-by: Ilan Ginzburg <il...@murblanc.org>
---
.../solr/cloud/DistributedClusterStateUpdater.java | 70 +++++-----------------
...istributedCollectionConfigSetCommandRunner.java | 3 +-
2 files changed, 17 insertions(+), 56 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/cloud/DistributedClusterStateUpdater.java b/solr/core/src/java/org/apache/solr/cloud/DistributedClusterStateUpdater.java
index f2c293b938c..ad838d3e562 100644
--- a/solr/core/src/java/org/apache/solr/cloud/DistributedClusterStateUpdater.java
+++ b/solr/core/src/java/org/apache/solr/cloud/DistributedClusterStateUpdater.java
@@ -20,21 +20,11 @@ package org.apache.solr.cloud;
import static java.util.Collections.singletonMap;
import static org.apache.solr.cloud.overseer.ZkStateWriter.NO_OP;
import static org.apache.solr.common.cloud.ZkStateReader.COLLECTIONS_ZKNODE;
-import static org.apache.solr.common.params.CollectionParams.CollectionAction.ADDREPLICA;
-import static org.apache.solr.common.params.CollectionParams.CollectionAction.ADDREPLICAPROP;
-import static org.apache.solr.common.params.CollectionParams.CollectionAction.BALANCESHARDUNIQUE;
-import static org.apache.solr.common.params.CollectionParams.CollectionAction.CREATE;
-import static org.apache.solr.common.params.CollectionParams.CollectionAction.CREATESHARD;
-import static org.apache.solr.common.params.CollectionParams.CollectionAction.DELETE;
-import static org.apache.solr.common.params.CollectionParams.CollectionAction.DELETEREPLICAPROP;
-import static org.apache.solr.common.params.CollectionParams.CollectionAction.DELETESHARD;
-import static org.apache.solr.common.params.CollectionParams.CollectionAction.MODIFYCOLLECTION;
import java.lang.invoke.MethodHandles;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.EnumMap;
import java.util.List;
import java.util.Optional;
import java.util.Set;
@@ -56,7 +46,6 @@ import org.apache.solr.common.cloud.PerReplicaStatesOps;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.common.cloud.ZkStateReader;
-import org.apache.solr.common.params.CollectionParams;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.util.Pair;
import org.apache.solr.common.util.Utils;
@@ -158,7 +147,7 @@ public class DistributedClusterStateUpdater {
* CollectionNodeDownChangeCalculator#executeNodeDownStateUpdate}.
*/
public enum MutatingCommand {
- BalanceShardsUnique(BALANCESHARDUNIQUE, ZkStateReader.COLLECTION_PROP) {
+ BalanceShardsUnique(ZkStateReader.COLLECTION_PROP) {
@Override
public ZkWriteCommand buildWriteCommand(
SolrCloudManager scm, ClusterState cs, ZkNodeProps message) {
@@ -171,7 +160,7 @@ public class DistributedClusterStateUpdater {
}
}
},
- ClusterCreateCollection(CREATE, CommonParams.NAME) {
+ ClusterCreateCollection(CommonParams.NAME) {
@Override
public ZkWriteCommand buildWriteCommand(
SolrCloudManager scm, ClusterState cs, ZkNodeProps message) {
@@ -183,91 +172,91 @@ public class DistributedClusterStateUpdater {
return true;
}
},
- ClusterDeleteCollection(DELETE, CommonParams.NAME) {
+ ClusterDeleteCollection(CommonParams.NAME) {
@Override
public ZkWriteCommand buildWriteCommand(
SolrCloudManager scm, ClusterState cs, ZkNodeProps message) {
return new ClusterStateMutator(scm).deleteCollection(cs, message);
}
},
- CollectionDeleteShard(DELETESHARD, ZkStateReader.COLLECTION_PROP) {
+ CollectionDeleteShard(ZkStateReader.COLLECTION_PROP) {
@Override
public ZkWriteCommand buildWriteCommand(
SolrCloudManager scm, ClusterState cs, ZkNodeProps message) {
return new CollectionMutator(scm).deleteShard(cs, message);
}
},
- CollectionModifyCollection(MODIFYCOLLECTION, ZkStateReader.COLLECTION_PROP) {
+ CollectionModifyCollection(ZkStateReader.COLLECTION_PROP) {
@Override
public ZkWriteCommand buildWriteCommand(
SolrCloudManager scm, ClusterState cs, ZkNodeProps message) {
return new CollectionMutator(scm).modifyCollection(cs, message);
}
},
- CollectionCreateShard(CREATESHARD, ZkStateReader.COLLECTION_PROP) {
+ CollectionCreateShard(ZkStateReader.COLLECTION_PROP) {
@Override
public ZkWriteCommand buildWriteCommand(
SolrCloudManager scm, ClusterState cs, ZkNodeProps message) {
return new CollectionMutator(scm).createShard(cs, message);
}
},
- ReplicaAddReplicaProperty(ADDREPLICAPROP, ZkStateReader.COLLECTION_PROP) {
+ ReplicaAddReplicaProperty(ZkStateReader.COLLECTION_PROP) {
@Override
public ZkWriteCommand buildWriteCommand(
SolrCloudManager scm, ClusterState cs, ZkNodeProps message) {
return new ReplicaMutator(scm).addReplicaProperty(cs, message);
}
},
- ReplicaDeleteReplicaProperty(DELETEREPLICAPROP, ZkStateReader.COLLECTION_PROP) {
+ ReplicaDeleteReplicaProperty(ZkStateReader.COLLECTION_PROP) {
@Override
public ZkWriteCommand buildWriteCommand(
SolrCloudManager scm, ClusterState cs, ZkNodeProps message) {
return new ReplicaMutator(scm).deleteReplicaProperty(cs, message);
}
},
- ReplicaSetState(null, ZkStateReader.COLLECTION_PROP) {
+ ReplicaSetState(ZkStateReader.COLLECTION_PROP) {
@Override
public ZkWriteCommand buildWriteCommand(
SolrCloudManager scm, ClusterState cs, ZkNodeProps message) {
return new ReplicaMutator(scm).setState(cs, message);
}
},
- SliceAddReplica(ADDREPLICA, ZkStateReader.COLLECTION_PROP) {
+ SliceAddReplica(ZkStateReader.COLLECTION_PROP) {
@Override
public ZkWriteCommand buildWriteCommand(
SolrCloudManager scm, ClusterState cs, ZkNodeProps message) {
return new SliceMutator(scm).addReplica(cs, message);
}
},
- SliceAddRoutingRule(null, ZkStateReader.COLLECTION_PROP) {
+ SliceAddRoutingRule(ZkStateReader.COLLECTION_PROP) {
@Override
public ZkWriteCommand buildWriteCommand(
SolrCloudManager scm, ClusterState cs, ZkNodeProps message) {
return new SliceMutator(scm).addRoutingRule(cs, message);
}
},
- SliceRemoveReplica(null, ZkStateReader.COLLECTION_PROP) {
+ SliceRemoveReplica(ZkStateReader.COLLECTION_PROP) {
@Override
public ZkWriteCommand buildWriteCommand(
SolrCloudManager scm, ClusterState cs, ZkNodeProps message) {
return new SliceMutator(scm).removeReplica(cs, message);
}
},
- SliceRemoveRoutingRule(null, ZkStateReader.COLLECTION_PROP) {
+ SliceRemoveRoutingRule(ZkStateReader.COLLECTION_PROP) {
@Override
public ZkWriteCommand buildWriteCommand(
SolrCloudManager scm, ClusterState cs, ZkNodeProps message) {
return new SliceMutator(scm).removeRoutingRule(cs, message);
}
},
- SliceSetShardLeader(null, ZkStateReader.COLLECTION_PROP) {
+ SliceSetShardLeader(ZkStateReader.COLLECTION_PROP) {
@Override
public ZkWriteCommand buildWriteCommand(
SolrCloudManager scm, ClusterState cs, ZkNodeProps message) {
return new SliceMutator(scm).setShardLeader(cs, message);
}
},
- SliceUpdateShardState(null, ZkStateReader.COLLECTION_PROP) {
+ SliceUpdateShardState(ZkStateReader.COLLECTION_PROP) {
@Override
public ZkWriteCommand buildWriteCommand(
SolrCloudManager scm, ClusterState cs, ZkNodeProps message) {
@@ -275,24 +264,9 @@ public class DistributedClusterStateUpdater {
}
};
- private static final EnumMap<CollectionParams.CollectionAction, MutatingCommand>
- actionsToCommands;
-
- static {
- actionsToCommands = new EnumMap<>(CollectionParams.CollectionAction.class);
- for (MutatingCommand mc : MutatingCommand.values()) {
- if (mc.collectionAction != null) {
- actionsToCommands.put(mc.collectionAction, mc);
- }
- }
- }
-
- private final CollectionParams.CollectionAction collectionAction;
private final String collectionNameParamName;
- MutatingCommand(
- CollectionParams.CollectionAction collectionAction, String collectionNameParamName) {
- this.collectionAction = collectionAction;
+ MutatingCommand(String collectionNameParamName) {
this.collectionNameParamName = collectionNameParamName;
}
@@ -304,18 +278,6 @@ public class DistributedClusterStateUpdater {
return message.getStr(collectionNameParamName);
}
- /**
- * @return the {@link MutatingCommand} corresponding to the passed {@link
- * org.apache.solr.common.params.CollectionParams.CollectionAction} or {@code null} if no
- * cluster state update command is defined for that action (given that {@link
- * org.apache.solr.common.params.CollectionParams.CollectionAction} are used for the
- * Collection API and only some are used for the cluster state updates, this is expected).
- */
- public static MutatingCommand getCommandFor(
- CollectionParams.CollectionAction collectionAction) {
- return actionsToCommands.get(collectionAction);
- }
-
/**
* Given only one command creates a collection {@link #ClusterCreateCollection}, the default
* implementation is provided here.
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/DistributedCollectionConfigSetCommandRunner.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/DistributedCollectionConfigSetCommandRunner.java
index 7789d374564..465cc4d6273 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/DistributedCollectionConfigSetCommandRunner.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/DistributedCollectionConfigSetCommandRunner.java
@@ -342,8 +342,7 @@ public class DistributedCollectionConfigSetCommandRunner {
/**
* Collection name can be found in either of two message parameters (why??). Return it from where
* it's defined. (see also parameter {@code collectionNameParamName} of {@link
- * org.apache.solr.cloud.DistributedClusterStateUpdater.MutatingCommand#MutatingCommand(CollectionParams.CollectionAction,
- * String)})
+ * org.apache.solr.cloud.DistributedClusterStateUpdater.MutatingCommand#MutatingCommand(String)})
*/
public static String getCollectionName(ZkNodeProps message) {
return message.containsKey(COLLECTION_PROP)