You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/11/13 23:29:23 UTC
[lucene-solr] branch reference_impl_dev updated: @1184 Test to
Nightly, get correct version when tracked is reset.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/reference_impl_dev by this push:
new 4fecfc7 @1184 Test to Nightly, get correct version when tracked is reset.
4fecfc7 is described below
commit 4fecfc7478fcfe4dc65f6a1444a89fed7832ba6f
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Fri Nov 13 17:27:47 2020 -0600
@1184 Test to Nightly, get correct version when tracked is reset.
---
.../org/apache/lucene/collation/TestICUCollationDocValuesField.java | 1 +
solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationDocValuesField.java b/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationDocValuesField.java
index 24862c4..494db2f 100644
--- a/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationDocValuesField.java
+++ b/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationDocValuesField.java
@@ -40,6 +40,7 @@ import com.ibm.icu.util.ULocale;
/**
* trivial test of ICUCollationDocValuesField
*/
+@LuceneTestCase.Nightly
public class TestICUCollationDocValuesField extends LuceneTestCase {
public void testBasic() throws Exception {
diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
index a81cffa..7c2ea2f 100644
--- a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
+++ b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
@@ -166,7 +166,10 @@ public class ZkStateWriter {
}
Integer ver = trackVersions.get(docColl.getName());
if (ver == null) {
- ver = 0;
+ ver = docColl.getZNodeVersion();
+ if (ver == null) {
+ ver = 0;
+ }
} else {
ver = ver + 1;
}