Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

Set default PRS version to zero (#1309)

Noble Pauld76edbd7bc9e
diff --git a/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java b/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java
index 80604de2b85..a0750f44e9d 100644
--- a/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java
@@ -258,7 +258,7 @@ public class ZkStateReaderTest extends SolrTestCaseJ4 {
ClusterState.CollectionRef ref = reader.getClusterState().getCollectionRef("c1");
assertFalse(ref.isLazilyLoaded());
assertEquals(0, ref.get().getZNodeVersion());
- assertEquals(-1, ref.get().getChildNodesVersion());
+ assertEquals(0, ref.get().getChildNodesVersion());
DocCollection collection = ref.get();
PerReplicaStates prs =
@@ -316,7 +316,7 @@ public class ZkStateReaderTest extends SolrTestCaseJ4 {
ref = reader.getClusterState().getCollectionRef("c1");
assertFalse(ref.isLazilyLoaded());
assertEquals(0, ref.get().getZNodeVersion());
- assertEquals(-1, ref.get().getChildNodesVersion()); // child node version is reset
+ assertEquals(0, ref.get().getChildNodesVersion()); // child node version is reset
// re-add PRS
collection = ref.get();
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java b/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java
index 6d4f6394d45..5abeab48e5d 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java
@@ -281,7 +281,7 @@ public class DocCollection extends ZkNodeProps implements Iterable<Slice> {
}
public int getChildNodesVersion() {
- return perReplicaStates == null ? -1 : perReplicaStates.cversion;
+ return perReplicaStates == null ? 0 : perReplicaStates.cversion;
}
public boolean isModified(int dataVersion, int childVersion) {