You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/06/02 10:01:25 UTC
[2/3] lucene-solr:master: SOLR-10790: Fix warnings in Assign.java and
ReplicaAssigner.java classes.
SOLR-10790: Fix warnings in Assign.java and ReplicaAssigner.java classes.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/cccf97ca
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/cccf97ca
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/cccf97ca
Branch: refs/heads/master
Commit: cccf97cae85e4714c2e7a5f042032c9fce2f47cf
Parents: 72ba34f
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri Jun 2 10:39:18 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri Jun 2 10:39:18 2017 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
solr/core/src/java/org/apache/solr/cloud/Assign.java | 2 +-
.../core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cccf97ca/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index af9ec5e..d8c9d04 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -298,6 +298,9 @@ Other Changes
* SOLR-10741: Factor out createSliceShardsStr method from HttpShardHandler.prepDistributed.
(Domenico Fabio Marino via Christine Poerschke)
+* SOLR-10790: Fix warnings in Assign.java and ReplicaAssigner.java classes.
+ (Christine Poerschke)
+
================== 6.6.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cccf97ca/solr/core/src/java/org/apache/solr/cloud/Assign.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/Assign.java b/solr/core/src/java/org/apache/solr/cloud/Assign.java
index 265e453..63e006e 100644
--- a/solr/core/src/java/org/apache/solr/cloud/Assign.java
+++ b/solr/core/src/java/org/apache/solr/cloud/Assign.java
@@ -98,7 +98,7 @@ public class Assign {
map.put(shardId, cnt);
}
- Collections.sort(shardIdNames, (o1, o2) -> {
+ Collections.sort(shardIdNames, (String o1, String o2) -> {
Integer one = map.get(o1);
Integer two = map.get(o2);
return one.compareTo(two);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cccf97ca/solr/core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java b/solr/core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java
index 506e158..669e82b 100644
--- a/solr/core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java
+++ b/solr/core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java
@@ -211,7 +211,7 @@ public class ReplicaAssigner {
int startPosition = 0;
Map<String, Map<String, Integer>> copyOfCurrentState = getDeepCopy(shardVsNodes, 2);
List<String> sortedLiveNodes = new ArrayList<>(this.participatingLiveNodes);
- Collections.sort(sortedLiveNodes, (n1, n2) -> {
+ Collections.sort(sortedLiveNodes, (String n1, String n2) -> {
int result1 = 0;
for (int i = 0; i < rulePermutation.length; i++) {
Rule rule = rules.get(rulePermutation[i]);