Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-17560: Remove redundant getLeaderReplicas method (#3515)

Meryem Gülbudakd260f0fb55ed
diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
index 4b4ca5d9619..b9f3842b820 100644
--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
@@ -889,15 +889,17 @@ public class HttpSolrCall {
return null;
}
Set<String> liveNodes = clusterState.getLiveNodes();
+ List<Replica> replicas = collection.getReplicasOnNode(cores.getZkController().getNodeName());
if (isPreferLeader) {
- List<Replica> leaderReplicas =
- collection.getLeaderReplicas(cores.getZkController().getNodeName());
- SolrCore core = randomlyGetSolrCore(liveNodes, leaderReplicas);
- if (core != null) return core;
+ SolrCore core = null;
+ if (replicas != null && !replicas.isEmpty()) {
+ List<Replica> leaderReplicas = replicas.stream().filter(Replica::isLeader).toList();
+ core = randomlyGetSolrCore(liveNodes, leaderReplicas);
+ if (core != null) return core;
+ }
}
- List<Replica> replicas = collection.getReplicasOnNode(cores.getZkController().getNodeName());
return randomlyGetSolrCore(liveNodes, replicas);
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java
index 318a28a289f..c6177a51c06 100644
--- a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java
@@ -467,12 +467,17 @@ public class FullSolrCloudDistribCmdsTest extends SolrCloudTestCase {
(n, c) -> DocCollection.isFullyActive(n, c, 2, 1));
{ // HACK: Check the leaderProps for the shard hosted on the node we're going to kill...
- final Replica leaderProps =
+ List<Replica> replicas =
cloudClient
.getClusterState()
.getCollection(collectionName)
- .getLeaderReplicas(leaderToPartition.getNodeName())
- .get(0);
+ .getReplicasOnNode(leaderToPartition.getNodeName());
+ assertNotNull(replicas);
+ assertFalse(replicas.isEmpty());
+ List<Replica> leaderReplicas = replicas.stream().filter(Replica::isLeader).toList();
+ assertFalse(leaderReplicas.isEmpty());
+ final Replica leaderProps = leaderReplicas.get(0);
+
// No point in this test if these aren't true...
assertNotNull(
"Sanity check: leaderProps isn't a leader?: " + leaderProps.toString(),
diff --git a/solr/core/src/test/org/apache/solr/update/processor/RoutedAliasUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/RoutedAliasUpdateProcessorTest.java
index 074598dc213..67234ac7412 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/RoutedAliasUpdateProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/RoutedAliasUpdateProcessorTest.java
@@ -205,8 +205,10 @@ public abstract class RoutedAliasUpdateProcessorTest extends SolrCloudTestCase {
String nodeName = jettySolrRunner.getNodeName();
String collectionName = core.getCollectionName();
DocCollection collectionOrNull = clusterState.getCollectionOrNull(collectionName);
- List<Replica> leaderReplicas = collectionOrNull.getLeaderReplicas(nodeName);
- if (leaderReplicas != null) {
+ if (collectionOrNull != null) {
+ List<Replica> replicas = collectionOrNull.getReplicasOnNode(nodeName);
+ assertNotNull(replicas);
+ List<Replica> leaderReplicas = replicas.stream().filter(Replica::isLeader).toList();
for (Replica leaderReplica : leaderReplicas) {
leaders.add(leaderReplica.getCoreName());
}
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java b/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java
index 4b03e96b50e..234d8cec93d 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java
@@ -34,7 +34,6 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.function.BiConsumer;
import java.util.function.BiPredicate;
import java.util.function.Supplier;
-import org.apache.solr.common.cloud.Replica.ReplicaStateProps;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -54,7 +53,6 @@ public class DocCollection extends ZkNodeProps implements Iterable<Slice> {
private final Map<String, Slice> activeSlices;
private final Slice[] activeSlicesArr;
private final Map<String, List<Replica>> nodeNameReplicas;
- private final Map<String, List<Replica>> nodeNameLeaderReplicas;
private final DocRouter router;
private final String znode;
@@ -114,7 +112,6 @@ public class DocCollection extends ZkNodeProps implements Iterable<Slice> {
this.configName = (String) props.get(CollectionStateProps.CONFIGNAME);
this.slices = slices;
this.activeSlices = new HashMap<>();
- this.nodeNameLeaderReplicas = new HashMap<>();
this.nodeNameReplicas = new HashMap<>();
this.replicationFactor = (Integer) verifyProp(props, CollectionStateProps.REPLICATION_FACTOR);
this.numReplicas = ReplicaCount.fromProps(props);
@@ -251,15 +248,6 @@ public class DocCollection extends ZkNodeProps implements Iterable<Slice> {
nodeNameReplicas.put(replica.getNodeName(), replicas);
}
replicas.add(replica);
-
- if (replica.getStr(ReplicaStateProps.LEADER) != null) {
- List<Replica> leaderReplicas = nodeNameLeaderReplicas.get(replica.getNodeName());
- if (leaderReplicas == null) {
- leaderReplicas = new ArrayList<>();
- nodeNameLeaderReplicas.put(replica.getNodeName(), leaderReplicas);
- }
- leaderReplicas.add(replica);
- }
}
/**
@@ -368,12 +356,6 @@ public class DocCollection extends ZkNodeProps implements Iterable<Slice> {
return nodeNameReplicas.get(nodeName);
}
- /** Get the list of all leaders hosted on the given node or <code>null</code> if none. */
- @Deprecated
- public List<Replica> getLeaderReplicas(String nodeName) {
- return nodeNameLeaderReplicas.get(nodeName);
- }
-
public int getZNodeVersion() {
return znodeVersion;
}