You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by no...@apache.org on 2023/01/23 13:34:32 UTC
[solr] branch branch_9x updated: Set default PRS version to zero (#1309)
This is an automated email from the ASF dual-hosted git repository.
noble pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 23ac2596db2 Set default PRS version to zero (#1309)
23ac2596db2 is described below
commit 23ac2596db20bdd4ca6b76faf080f434dd9d0717
Author: Noble Paul <no...@users.noreply.github.com>
AuthorDate: Tue Jan 24 00:32:56 2023 +1100
Set default PRS version to zero (#1309)
---
.../src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java | 4 ++--
solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
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) {