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:32:07 UTC
[1/2] lucene-solr:branch_6x: SOLR-10790: Fix warnings in Assign.java
and ReplicaAssigner.java classes.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 5ea49934c -> b947dbeae
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/6fe9f2ec
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/6fe9f2ec
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/6fe9f2ec
Branch: refs/heads/branch_6x
Commit: 6fe9f2ec865dd44b8c450a8c10961a3dccad1b42
Parents: 5ea4993
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 11:02:52 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/6fe9f2ec/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index c899009..1f2903a 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -96,6 +96,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/6fe9f2ec/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 ba03ccd..8537069 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/6fe9f2ec/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 3eab8b4..afded83 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
@@ -209,7 +209,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]);
[2/2] lucene-solr:branch_6x: LUCENE-7858: checkJavadocLinks.py to
mention common root causes of broken links
Posted by cp...@apache.org.
LUCENE-7858: checkJavadocLinks.py to mention common root causes of broken links
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b947dbea
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b947dbea
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b947dbea
Branch: refs/heads/branch_6x
Commit: b947dbeae2dd853fe0f3605788c8719785449db1
Parents: 6fe9f2e
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri Jun 2 10:40:53 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri Jun 2 11:03:06 2017 +0100
----------------------------------------------------------------------
dev-tools/scripts/checkJavadocLinks.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b947dbea/dev-tools/scripts/checkJavadocLinks.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/checkJavadocLinks.py b/dev-tools/scripts/checkJavadocLinks.py
index e5ff2f3..2e3cdea 100644
--- a/dev-tools/scripts/checkJavadocLinks.py
+++ b/dev-tools/scripts/checkJavadocLinks.py
@@ -266,7 +266,10 @@ def checkAll(dirName):
if __name__ == '__main__':
if checkAll(sys.argv[1]):
print()
- print('Broken javadocs links were found!')
+ print('Broken javadocs links were found! Common root causes:')
+ # please feel free to add to this list
+ print('* A typo of some sort for manually created links.')
+ print('* Public methods referencing non-public classes in their signature.')
sys.exit(1)
sys.exit(0)