You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2018/09/25 14:48:22 UTC
lucene-solr:branch_7x: SOLR-11522: /autoscaling/suggestions now
include rebalance options as well even if there are no violations
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 9daeb1b01 -> a514392cc
SOLR-11522: /autoscaling/suggestions now include rebalance options as well even if there are no violations
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a514392c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a514392c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a514392c
Branch: refs/heads/branch_7x
Commit: a514392ccfa39c54d745be1dce1a1febdc92bae6
Parents: 9daeb1b
Author: Noble Paul <no...@apache.org>
Authored: Wed Sep 26 00:47:03 2018 +1000
Committer: Noble Paul <no...@apache.org>
Committed: Wed Sep 26 00:48:06 2018 +1000
----------------------------------------------------------------------
solr/solrj/src/java/org/apache/solr/common/MapWriter.java | 7 ++++++-
.../solr/client/solrj/cloud/autoscaling/TestPolicy.java | 2 +-
.../solr/client/solrj/cloud/autoscaling/TestPolicy2.java | 4 ++--
3 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a514392c/solr/solrj/src/java/org/apache/solr/common/MapWriter.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/common/MapWriter.java b/solr/solrj/src/java/org/apache/solr/common/MapWriter.java
index 4bdc00d..9b1861a 100644
--- a/solr/solrj/src/java/org/apache/solr/common/MapWriter.java
+++ b/solr/solrj/src/java/org/apache/solr/common/MapWriter.java
@@ -80,7 +80,12 @@ public interface MapWriter extends MapSerializable {
void writeMap(EntryWriter ew) throws IOException;
-
+ /**Get a child object value using json path
+ *
+ * @param path the full path to that object such as a/b/c[4]/d etc
+ * @param def the default
+ * @return the found value or default
+ */
default Object _get(String path, Object def) {
Object v = Utils.getObjectByPath(this, false, path);
return v == null ? def : v;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a514392c/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 2b11d0c..9c5be7f 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
@@ -2666,7 +2666,7 @@ public class TestPolicy extends SolrTestCaseJ4 {
List<Suggester.SuggestionInfo> suggestions = PolicyHelper.getSuggestions(cfg, cloudManagerWithData(dataproviderdata));
assertEquals(2, suggestions.size());
for (Suggester.SuggestionInfo suggestion : suggestions) {
- Utils.getObjectByPath(suggestion, true, "operation/move-replica/targetNode");
+ suggestion._get("operation/move-replica/targetNode", null);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a514392c/solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy2.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy2.java b/solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy2.java
index e902ff9..615fd4d 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy2.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy2.java
@@ -168,7 +168,7 @@ public class TestPolicy2 extends SolrTestCaseJ4 {
suggestions = PolicyHelper.getSuggestions(new AutoScalingConfig((Map<String, Object>) Utils.fromJSONString(autoScalingjson))
, createCloudManager(state, metaData));
assertEquals(1, suggestions.size());
- String repName = (String) Utils.getObjectByPath(suggestions.get(0).operation, true, "command/move-replica/replica");
+ String repName = (String) suggestions.get(0)._get("operation/command/move-replica/replica", null);
AtomicBoolean found = new AtomicBoolean(false);
session.getNode("node1").forEachReplica(replicaInfo -> {
@@ -372,7 +372,7 @@ public class TestPolicy2 extends SolrTestCaseJ4 {
assertEquals(2, suggestions.size());
for (Suggester.SuggestionInfo suggestion : suggestions) {
assertTrue(ImmutableSet.of("127.0.0.1:63219_solr", "127.0.0.1:63229_solr").contains(
- Utils.getObjectByPath(suggestion, true, "operation/command/move-replica/targetNode")));
+ suggestion._get("operation/command/move-replica/targetNode", null)));
}
}