You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/01/09 09:10:29 UTC
lucene-solr:jira/solr-11702: SOLR-11702: Fix precommit
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-11702 030fcae48 -> d1aa999d7
SOLR-11702: Fix precommit
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d1aa999d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d1aa999d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d1aa999d
Branch: refs/heads/jira/solr-11702
Commit: d1aa999d7a75dcdc25b43383adaa5ccd75592ecb
Parents: 030fcae
Author: Cao Manh Dat <da...@apache.org>
Authored: Tue Jan 9 16:09:43 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Tue Jan 9 16:09:43 2018 +0700
----------------------------------------------------------------------
.../org/apache/solr/cloud/ZkShardTerms.java | 26 +++++++++++---------
.../solr/cloud/LIRRollingUpdatesTest.java | 14 ++++++-----
.../org/apache/solr/cloud/ZkShardTermsTest.java | 2 +-
.../solr/update/TestInPlaceUpdatesDistrib.java | 1 -
4 files changed, 24 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d1aa999d/solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java b/solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java
index d0a8b63..69ae990 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkShardTerms.java
@@ -41,21 +41,25 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Class used for interact with a ZK term node. <br/>
- * Each ZK term node relates to a shard of a collection and have this format (in json) <br/>
+ * Class used for interact with a ZK term node.
+ * Each ZK term node relates to a shard of a collection and have this format (in json)
+ * <p>
* <code>
- * {<br />
- * "replicaNodeName1" : 1,<br />
- * "replicaNodeName2" : 2,<br />
- * ..<br />
- * }<br />
+ * {
+ * "replicaNodeName1" : 1,
+ * "replicaNodeName2" : 2,
+ * ..
+ * }
* </code>
+ * <p>
* The values correspond to replicas are called terms.
* Only replicas with highest term value are considered up to date and be able to become leader and serve queries.
- * <br/>
- * Terms can only updated in two strict ways: <br/>
- * - A replica sets its term equals to leader's term <br/>
- * - The leader increase its term and some other replicas by 1 <br/>
+ * <p>
+ * Terms can only updated in two strict ways:
+ * <ul>
+ * <li>A replica sets its term equals to leader's term
+ * <li>The leader increase its term and some other replicas by 1
+ * </ul>
*/
public class ZkShardTerms implements AutoCloseable{
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d1aa999d/solr/core/src/test/org/apache/solr/cloud/LIRRollingUpdatesTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/LIRRollingUpdatesTest.java b/solr/core/src/test/org/apache/solr/cloud/LIRRollingUpdatesTest.java
index a997167..251f992 100644
--- a/solr/core/src/test/org/apache/solr/cloud/LIRRollingUpdatesTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/LIRRollingUpdatesTest.java
@@ -21,8 +21,10 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.Writer;
import java.lang.invoke.MethodHandles;
import java.net.URI;
import java.net.URL;
@@ -338,14 +340,14 @@ public class LIRRollingUpdatesTest extends SolrCloudTestCase {
if (!coreProperties.exists()) continue;
Properties properties = new Properties();
- try (InputStream is = new FileInputStream(coreProperties)) {
- properties.load(is);
+ try (Reader reader = new InputStreamReader(new FileInputStream(coreProperties), "UTF-8")) {
+ properties.load(reader);
} catch (Exception e) {
continue;
}
properties.remove("lirVersion");
- try (OutputStream out = new FileOutputStream(coreProperties)) {
- properties.store(out, "Upgraded");
+ try (Writer writer = new OutputStreamWriter(new FileOutputStream(coreProperties), "UTF-8")) {
+ properties.store(writer, "Upgraded");
} catch (Exception e) {
continue;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d1aa999d/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java b/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java
index 8d8db94..eacc6d0 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ZkShardTermsTest.java
@@ -130,7 +130,7 @@ public class ZkShardTermsTest extends SolrCloudTestCase {
}
List<String> failedReplicas = new ArrayList<>(replicas);
- Collections.shuffle(failedReplicas);
+ Collections.shuffle(failedReplicas, random());
while (failedReplicas.size() > 2) {
failedReplicas.remove(0);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d1aa999d/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
index c43892b..14f0a7c 100644
--- a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
+++ b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesDistrib.java
@@ -42,7 +42,6 @@ import org.apache.solr.client.solrj.request.schema.SchemaRequest.Field;
import org.apache.solr.client.solrj.response.UpdateResponse;
import org.apache.solr.client.solrj.response.schema.SchemaResponse.FieldResponse;
import org.apache.solr.cloud.AbstractFullDistribZkTestBase;
-import org.apache.solr.cloud.ZkController;
import org.apache.solr.cloud.ZkShardTerms;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;