diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/AddReplicaSuggester.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/AddReplicaSuggester.java index c79ec95a84f..c813e17df40 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/AddReplicaSuggester.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/AddReplicaSuggester.java @@ -49,7 +49,6 @@ class AddReplicaSuggester extends Suggester { if (!row.isLive) continue; if (!isAllowed(row.node, Hint.TARGET_NODE)) continue; Row tmpRow = row.addReplica(coll, shard, type); - tmpRow.violations.clear(); List errs = testChangedMatrix(strict, getModifiedMatrix(getMatrix(), tmpRow, i)); if (!containsNewErrors(errs)) { diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/MoveReplicaSuggester.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/MoveReplicaSuggester.java index a06825338a2..3454ee62ac6 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/MoveReplicaSuggester.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/MoveReplicaSuggester.java @@ -51,7 +51,6 @@ public class MoveReplicaSuggester extends Suggester { //no such replica available continue; } - tmpRow.violations.clear(); final int i = getMatrix().indexOf(fromRow); for (int j = getMatrix().size() - 1; j > i; j--) { @@ -59,7 +58,6 @@ public class MoveReplicaSuggester extends Suggester { if(!targetRow.isLive) continue; if (!isAllowed(targetRow.node, Hint.TARGET_NODE)) continue; targetRow = targetRow.addReplica(coll, shard, replicaInfo.type); - targetRow.violations.clear(); List errs = testChangedMatrix(strict, getModifiedMatrix(getModifiedMatrix(getMatrix(), tmpRow, i), targetRow, j)); if (!containsNewErrors(errs) && isLessSerious(errs, leastSeriousViolation)) { leastSeriousViolation = errs; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Row.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Row.java index c00249e364c..fe1121d3565 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Row.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Row.java @@ -38,7 +38,6 @@ public class Row implements MapWriter { public final String node; final Cell[] cells; public Map>> collectionVsShardVsReplicas; - List violations = new ArrayList<>(); boolean anyValueMissing = false; boolean isLive = true; @@ -58,7 +57,7 @@ public class Row implements MapWriter { } public Row(String node, Cell[] cells, boolean anyValueMissing, Map>> collectionVsShardVsReplicas, List violations, boolean isLive) { + Map>> collectionVsShardVsReplicas, boolean isLive) { this.node = node; this.isLive = isLive; this.cells = new Cell[cells.length]; @@ -68,7 +67,6 @@ public class Row implements MapWriter { } this.anyValueMissing = anyValueMissing; this.collectionVsShardVsReplicas = collectionVsShardVsReplicas; - this.violations = violations; } @Override @@ -80,7 +78,7 @@ public class Row implements MapWriter { } Row copy() { - return new Row(node, cells, anyValueMissing, Utils.getDeepCopy(collectionVsShardVsReplicas, 3), new ArrayList<>(violations), isLive); + return new Row(node, cells, anyValueMissing, Utils.getDeepCopy(collectionVsShardVsReplicas, 3), isLive); } Object getVal(String name) { diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy.java b/solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy.java index 1e6ae7fb8a4..049cf0421ce 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy.java @@ -588,7 +588,7 @@ public class TestPolicy extends SolrTestCaseJ4 { } public void testRow() { - Row row = new Row("nodex", new Cell[]{new Cell(0, "node", "nodex")}, false, new HashMap<>(), new ArrayList<>(), true); + Row row = new Row("nodex", new Cell[]{new Cell(0, "node", "nodex")}, false, new HashMap<>(), true); Row r1 = row.addReplica("c1", "s1", null); Row r2 = r1.addReplica("c1", "s1",null); assertEquals(1, r1.collectionVsShardVsReplicas.get("c1").get("s1").size());