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/10 13:54:25 UTC
lucene-solr:master: SOLR-12738: removed unused method
Repository: lucene-solr
Updated Branches:
refs/heads/master 2ffcb878b -> 8fbeedf27
SOLR-12738: removed unused method
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8fbeedf2
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8fbeedf2
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8fbeedf2
Branch: refs/heads/master
Commit: 8fbeedf27f8280f2c767d20d4558053adcf87cb7
Parents: 2ffcb87
Author: Noble Paul <no...@apache.org>
Authored: Mon Sep 10 23:54:16 2018 +1000
Committer: Noble Paul <no...@apache.org>
Committed: Mon Sep 10 23:54:16 2018 +1000
----------------------------------------------------------------------
.../solr/cloud/autoscaling/AutoScalingHandler.java | 13 ++++++-------
.../solr/client/solrj/cloud/autoscaling/Policy.java | 4 ++--
2 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8fbeedf2/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoScalingHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoScalingHandler.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoScalingHandler.java
index 17734dc..899c5cd 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoScalingHandler.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoScalingHandler.java
@@ -315,18 +315,17 @@ public class AutoScalingHandler extends RequestHandlerBase implements Permission
return currentConfig;
}
}
- List<String> params = new ArrayList<>(currentConfig.getPolicy().getParams());
- Map<String, List<Clause>> mergedPolicies = new HashMap<>(currentConfig.getPolicy().getPolicies());
- Map<String, List<Clause>> newPolicies = null;
+ Map<String, List<Clause>> currentClauses = new HashMap<>(currentConfig.getPolicy().getPolicies());
+ Map<String, List<Clause>> newClauses = null;
try {
- newPolicies = Policy.policiesFromMap((Map<String, List<Map<String, Object>>>) op.getCommandData(),
- params);
+ newClauses = Policy.clausesFromMap((Map<String, List<Map<String, Object>>>) op.getCommandData(),
+ new ArrayList<>() );
} catch (Exception e) {
op.addError(e.getMessage());
return currentConfig;
}
- mergedPolicies.putAll(newPolicies);
- Policy p = currentConfig.getPolicy().withPolicies(mergedPolicies).withParams(params);
+ currentClauses.putAll(newClauses);
+ Policy p = currentConfig.getPolicy().withPolicies(currentClauses);
currentConfig = currentConfig.withPolicy(p);
return currentConfig;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8fbeedf2/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Policy.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Policy.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Policy.java
index 210e324..2552f0a 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Policy.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Policy.java
@@ -138,7 +138,7 @@ public class Policy implements MapWriter {
}
this.policies = Collections.unmodifiableMap(
- policiesFromMap((Map<String, List<Map<String, Object>>>) jsonMap.getOrDefault(POLICIES, emptyMap()), newParams));
+ clausesFromMap((Map<String, List<Map<String, Object>>>) jsonMap.getOrDefault(POLICIES, emptyMap()), newParams));
List<Pair<String, Type>> params = newParams.stream()
.map(s -> new Pair<>(s, VariableBase.getTagType(s)))
.collect(toList());
@@ -241,7 +241,7 @@ public class Policy implements MapWriter {
return getClusterPreferences().equals(policy.getClusterPreferences());
}
- public static Map<String, List<Clause>> policiesFromMap(Map<String, List<Map<String, Object>>> map, List<String> newParams) {
+ public static Map<String, List<Clause>> clausesFromMap(Map<String, List<Map<String, Object>>> map, List<String> newParams) {
Map<String, List<Clause>> newPolicies = new HashMap<>();
map.forEach((s, l1) ->
newPolicies.put(s, l1.stream()