lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sha...@apache.org
Subject lucene-solr:jira/solr-11990: SOLR-11990: Fixing compilation issues after merging master
Date Sat, 28 Jul 2018 04:52:05 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/jira/solr-11990 dd840a2f7 -> 864b013fd


SOLR-11990: Fixing compilation issues after merging master


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/864b013f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/864b013f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/864b013f

Branch: refs/heads/jira/solr-11990
Commit: 864b013fd744edca9b6b84a8a7573fab3c5310d5
Parents: dd840a2
Author: Shalin Shekhar Mangar <shalin@apache.org>
Authored: Sat Jul 28 10:21:59 2018 +0530
Committer: Shalin Shekhar Mangar <shalin@apache.org>
Committed: Sat Jul 28 10:21:59 2018 +0530

----------------------------------------------------------------------
 .../solrj/cloud/autoscaling/Suggestion.java       |  5 -----
 .../solrj/cloud/autoscaling/TestPolicy.java       | 18 ++++++++++--------
 2 files changed, 10 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/864b013f/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Suggestion.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Suggestion.java
b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Suggestion.java
index 11858f4..af20fac 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Suggestion.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Suggestion.java
@@ -800,9 +800,4 @@ public class Suggestion {
     }
   }
 
-  static {
-    for (Suggestion.ConditionType t : Suggestion.ConditionType.values()) Suggestion.validatetypes.put(t.tagName,
t);
-  }
-
-
 }

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/864b013f/solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy.java
----------------------------------------------------------------------
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 ae2dfc1..16addd4 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
@@ -228,10 +228,10 @@ public class TestPolicy extends SolrTestCaseJ4 {
       }
 
       @Override
-      protected Map<String, Object> fetchReplicaMetrics(String solrNode, Map<String,
Object> metricsKeyVsTag) {
+      protected Map<String, Object> fetchReplicaMetrics(String solrNode, Map<String,
Pair<String, ReplicaInfo>> metricsKeyVsTagReplica) {
         //e.g: solr.core.perReplicaDataColl.shard1.replica_n4:INDEX.sizeInBytes
         Map<String, Object> result = new HashMap<>();
-        metricsKeyVsTag.forEach((k, v) -> {
+        metricsKeyVsTagReplica.forEach((k, v) -> {
           if (k.endsWith(":INDEX.sizeInBytes")) result.put(k, 100);
         });
         return result;
@@ -352,9 +352,10 @@ public class TestPolicy extends SolrTestCaseJ4 {
       }
 
       @Override
-      protected Map<String, Object> fetchReplicaMetrics(String solrNode, Map<String,
Object> metricsKeyVsTag) {
+      protected Map<String, Object> fetchReplicaMetrics(String solrNode, Map<String,
Pair<String, ReplicaInfo>> metricsKeyVsTagReplica) {
+        //e.g: solr.core.perReplicaDataColl.shard1.replica_n4:INDEX.sizeInBytes
         Map<String, Object> result = new HashMap<>();
-        metricsKeyVsTag.forEach((k, v) -> {
+        metricsKeyVsTagReplica.forEach((k, v) -> {
           if (k.endsWith(":INDEX.sizeInBytes")) result.put(k, 100);
         });
         return result;
@@ -514,9 +515,10 @@ public class TestPolicy extends SolrTestCaseJ4 {
       }
 
       @Override
-      protected Map<String, Object> fetchReplicaMetrics(String solrNode, Map<String,
Object> metricsKeyVsTag) {
+      protected Map<String, Object> fetchReplicaMetrics(String solrNode, Map<String,
Pair<String, ReplicaInfo>> metricsKeyVsTagReplica) {
+        //e.g: solr.core.perReplicaDataColl.shard1.replica_n4:INDEX.sizeInBytes
         Map<String, Object> result = new HashMap<>();
-        metricsKeyVsTag.forEach((k, v) -> {
+        metricsKeyVsTagReplica.forEach((k, v) -> {
           if (k.endsWith(":INDEX.sizeInBytes")) result.put(k, 100);
         });
         return result;
@@ -666,10 +668,10 @@ public class TestPolicy extends SolrTestCaseJ4 {
       }
 
       @Override
-      protected Map<String, Object> fetchReplicaMetrics(String solrNode, Map<String,
Object> metricsKeyVsTag) {
+      protected Map<String, Object> fetchReplicaMetrics(String solrNode, Map<String,
Pair<String, ReplicaInfo>> metricsKeyVsTagReplica) {
         //e.g: solr.core.perReplicaDataColl.shard1.replica_n4:INDEX.sizeInBytes
         Map<String, Object> result = new HashMap<>();
-        metricsKeyVsTag.forEach((k, v) -> {
+        metricsKeyVsTagReplica.forEach((k, v) -> {
           if (k.endsWith(":INDEX.sizeInBytes")) result.put(k, 100);
         });
         return result;


Mime
View raw message