You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2020/07/17 12:35:26 UTC
[lucene-solr] branch jira/solr-14613 updated: SOLR-14613: Remove
other traces of Replica.Type.
This is an automated email from the ASF dual-hosted git repository.
ab pushed a commit to branch jira/solr-14613
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/jira/solr-14613 by this push:
new 5e1fb87 SOLR-14613: Remove other traces of Replica.Type.
5e1fb87 is described below
commit 5e1fb8717c08b19fd78e9b818c3dc87a899b405a
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Fri Jul 17 14:35:00 2020 +0200
SOLR-14613: Remove other traces of Replica.Type.
---
.../cloud/api/collections/assign/AddReplicaRequest.java | 8 +++-----
.../api/collections/assign/AssignerClusterState.java | 16 +++++++++++-----
.../collections/assign/policy8x/Policy8xAssigner.java | 9 ++++-----
.../api/collections/assign/policy8x/TestPolicy8x.java | 3 ++-
4 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/assign/AddReplicaRequest.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/assign/AddReplicaRequest.java
index f6ccfa7..47fc8ba 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/assign/AddReplicaRequest.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/assign/AddReplicaRequest.java
@@ -22,18 +22,16 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
-import org.apache.solr.common.cloud.Replica;
-
/**
*
*/
public class AddReplicaRequest extends BaseAssignRequest {
- private final Replica.Type type;
+ private final ReplicaType type;
private final Map<String, Object> params = new HashMap<>();
private final String targetNode;
private final Set<String> nodeSet;
- public AddReplicaRequest(String collection, String shard, Replica.Type type, Map<String, Object> params,
+ public AddReplicaRequest(String collection, String shard, ReplicaType type, Map<String, Object> params,
String targetNode, Set<String> nodeSet) {
super(collection, shard);
this.type = type;
@@ -45,7 +43,7 @@ public class AddReplicaRequest extends BaseAssignRequest {
Objects.requireNonNull(this.type, "'type' must not be null");
}
- public Replica.Type getType() {
+ public ReplicaType getType() {
return type;
}
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/assign/AssignerClusterState.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/assign/AssignerClusterState.java
index 5deaa01..e7c0bc4 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/assign/AssignerClusterState.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/assign/AssignerClusterState.java
@@ -18,7 +18,6 @@
package org.apache.solr.cloud.api.collections.assign;
import java.util.Collection;
-import java.util.Collections;
import java.util.Map;
import java.util.Set;
@@ -30,12 +29,19 @@ public interface AssignerClusterState {
Set<String> getLiveNodes();
Collection<String> getCollections();
- default AssignerNodeState getNodeState(String nodeName) {
- return getNodeState(nodeName, Collections.emptySet(), Collections.emptySet());
- }
-
+ /**
+ * Get a node state.
+ * @param nodeName node name
+ * @param nodeKeys node metrics / properties that the plugin is interested in
+ * @param replicaKeys replica metrics / properties that the plugin is interested in
+ */
AssignerNodeState getNodeState(String nodeName, Collection<String> nodeKeys, Collection<String> replicaKeys);
+ /**
+ * Get collection state.
+ * @param collectionName collection name
+ * @param replicaKeys replica metrics / properties that the plugin is interested in.
+ */
AssignerCollectionState getCollectionState(String collectionName, Collection<String> replicaKeys);
// other cluster properties
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/assign/policy8x/Policy8xAssigner.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/assign/policy8x/Policy8xAssigner.java
index 6da30bf..a26a782 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/assign/policy8x/Policy8xAssigner.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/assign/policy8x/Policy8xAssigner.java
@@ -4,7 +4,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.Map;
import org.apache.solr.client.solrj.cloud.autoscaling.AutoScalingConfig;
import org.apache.solr.client.solrj.cloud.autoscaling.PolicyHelper;
@@ -17,7 +16,7 @@ import org.apache.solr.cloud.api.collections.assign.AssignDecision;
import org.apache.solr.cloud.api.collections.assign.AssignDecisions;
import org.apache.solr.cloud.api.collections.assign.AssignRequest;
import org.apache.solr.cloud.api.collections.assign.NoopDecision;
-import org.apache.solr.common.cloud.Replica;
+import org.apache.solr.cloud.api.collections.assign.ReplicaType;
import org.apache.solr.common.cloud.ReplicaPosition;
import org.apache.solr.common.util.TimeSource;
@@ -39,9 +38,9 @@ public class Policy8xAssigner implements Assigner {
for (AssignRequest req : requests) {
if (req instanceof AddReplicaRequest) {
AddReplicaRequest areq = (AddReplicaRequest) req;
- int nrtReplicas = areq.getType() == Replica.Type.NRT ? 1 : 0;
- int tlogReplicas = areq.getType() == Replica.Type.TLOG ? 1 : 0;
- int pullReplicas = areq.getType() == Replica.Type.PULL ? 1 : 0;
+ int nrtReplicas = areq.getType() == ReplicaType.NRT ? 1 : 0;
+ int tlogReplicas = areq.getType() == ReplicaType.TLOG ? 1 : 0;
+ int pullReplicas = areq.getType() == ReplicaType.PULL ? 1 : 0;
List<ReplicaPosition> positions = PolicyHelper.getReplicaLocations(areq.getCollection(), autoScalingConfig,
cloudManager, null, Collections.singletonList(areq.getShard()),
nrtReplicas, tlogReplicas, pullReplicas, areq.getNodeSet() != null ? new ArrayList(areq.getNodeSet()) : null);
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/assign/policy8x/TestPolicy8x.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/assign/policy8x/TestPolicy8x.java
index 3368dfb..167717b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/assign/policy8x/TestPolicy8x.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/assign/policy8x/TestPolicy8x.java
@@ -8,6 +8,7 @@ import org.apache.solr.client.solrj.cloud.SolrCloudManager;
import org.apache.solr.cloud.api.collections.assign.AddReplicaRequest;
import org.apache.solr.cloud.api.collections.assign.AssignDecisions;
import org.apache.solr.cloud.api.collections.assign.AssignRequest;
+import org.apache.solr.cloud.api.collections.assign.ReplicaType;
import org.apache.solr.cloud.autoscaling.sim.SimCloudManager;
import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.util.TimeSource;
@@ -38,7 +39,7 @@ public class TestPolicy8x extends SolrTestCaseJ4 {
public void testBasics() throws Exception {
SolrCloudManagerAssignerClusterState initialState = new SolrCloudManagerAssignerClusterState(cloudManager);
Policy8xAssigner assigner = new Policy8xAssigner();
- List<AssignRequest> requests = Collections.singletonList(new AddReplicaRequest("foo", "bar", Replica.Type.NRT, null, null, "c1", null));
+ List<AssignRequest> requests = Collections.singletonList(new AddReplicaRequest("foo", "bar", ReplicaType.NRT, null, null, null));
AssignDecisions decisions = assigner.computeAssignments(initialState, requests);
}
}