Update Apache Lucene to 9.8.0-snapshot-79b9664

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
opensearch-project · Jul 13, 2023 · 3bf1fec · 3bf1fec
1 parent 6a19660
commit 3bf1fec
Show file tree

Hide file tree

Showing 49 changed files with 27 additions and 26 deletions.
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -1,5 +1,5 @@
 opensearch        = 3.0.0
-lucene            = 9.7.0
+lucene            = 9.8.0-snapshot-79b9664
 
 bundled_jdk_vendor = adoptium
 bundled_jdk = 20.0.1+9

diff --git a/libs/core/licenses/lucene-core-9.7.0.jar.sha1 b/libs/core/licenses/lucene-core-9.7.0.jar.sha1
diff --git a/libs/core/licenses/lucene-core-9.8.0-snapshot-79b9664.jar.sha1 b/libs/core/licenses/lucene-core-9.8.0-snapshot-79b9664.jar.sha1
@@ -0,0 +1 @@
+df1d6ee8870702d40f46d57063cd2eab97171371
diff --git a/libs/core/src/main/java/org/opensearch/Version.java b/libs/core/src/main/java/org/opensearch/Version.java
@@ -55,7 +55,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
      * The logic for ID is: XXYYZZAA, where XX is major version, YY is minor version, ZZ is revision, and AA is alpha/beta/rc indicator AA
      * values below 25 are for alpha builder (since 5.0), and above 25 and below 50 are beta builds, and below 99 are RC builds, with 99
      * indicating a release the (internal) format of the id is there so we can easily do after/before checks on the id
-     *
+     *>>
      * IMPORTANT: Unreleased vs. Released Versions
      *
      * All listed versions MUST be released versions, except the last major, the last minor and the last revison. ONLY those are required
@@ -91,7 +91,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_2_8_1 = new Version(2080199, org.apache.lucene.util.Version.LUCENE_9_6_0);
     public static final Version V_2_9_0 = new Version(2090099, org.apache.lucene.util.Version.LUCENE_9_7_0);
     public static final Version V_2_10_0 = new Version(2100099, org.apache.lucene.util.Version.LUCENE_9_7_0);
-    public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_9_7_0);
+    public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_9_8_0);
     public static final Version CURRENT = V_3_0_0;
 
     public static Version fromId(int id) {

diff --git a/modules/lang-expression/licenses/lucene-expressions-9.7.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.7.0.jar.sha1
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.8.0-snapshot-79b9664.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.8.0-snapshot-79b9664.jar.sha1
@@ -0,0 +1 @@
+300d4b63b0293d1611e715e53cc9b9ceee32a5fc
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.7.0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.7.0.jar.sha1
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.8.0-snapshot-79b9664.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.8.0-snapshot-79b9664.jar.sha1
@@ -0,0 +1 @@
+8886032dcd3a80762c9778906ceaf88758a257db
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.7.0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.7.0.jar.sha1
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.8.0-snapshot-79b9664.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.8.0-snapshot-79b9664.jar.sha1
@@ -0,0 +1 @@
+85d3430a452de5dfab400b91cbe91c6a9ae7c02a
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.7.0.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.7.0.jar.sha1
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.8.0-snapshot-79b9664.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.8.0-snapshot-79b9664.jar.sha1
@@ -0,0 +1 @@
+0934239364971e9967b12a36c097e4d8b7f3b226
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.7.0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.7.0.jar.sha1
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.8.0-snapshot-79b9664.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.8.0-snapshot-79b9664.jar.sha1
@@ -0,0 +1 @@
+5498fbf583a7a6a7f280f3e68402cd3a785b045f
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.7.0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.7.0.jar.sha1
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.8.0-snapshot-79b9664.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.8.0-snapshot-79b9664.jar.sha1
@@ -0,0 +1 @@
+4b48bff1ecabe8f983869b67d602739a5782979f
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.7.0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.7.0.jar.sha1
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.8.0-snapshot-79b9664.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.8.0-snapshot-79b9664.jar.sha1
@@ -0,0 +1 @@
+e14cc954d508aa590ac79794b7a43c60a3f2bccb
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.7.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.7.0.jar.sha1
diff --git a/...ns/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.8.0-snapshot-79b9664.jar.sha1 b/...ns/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.8.0-snapshot-79b9664.jar.sha1
@@ -0,0 +1 @@
+940e6825e1b3c1e8e14a2531719cf53785e77dc4
diff --git a/server/licenses/lucene-analysis-common-9.7.0.jar.sha1 b/server/licenses/lucene-analysis-common-9.7.0.jar.sha1
diff --git a/server/licenses/lucene-analysis-common-9.8.0-snapshot-79b9664.jar.sha1 b/server/licenses/lucene-analysis-common-9.8.0-snapshot-79b9664.jar.sha1
@@ -0,0 +1 @@
+359edffb4edf0d75b285c7a1fbb3c6888bdbd1b6
diff --git a/server/licenses/lucene-backward-codecs-9.7.0.jar.sha1 b/server/licenses/lucene-backward-codecs-9.7.0.jar.sha1
diff --git a/server/licenses/lucene-backward-codecs-9.8.0-snapshot-79b9664.jar.sha1 b/server/licenses/lucene-backward-codecs-9.8.0-snapshot-79b9664.jar.sha1
@@ -0,0 +1 @@
+96fea6478191d05f76a47f320cfbe9e604124a49
diff --git a/server/licenses/lucene-core-9.7.0.jar.sha1 b/server/licenses/lucene-core-9.7.0.jar.sha1
diff --git a/server/licenses/lucene-core-9.8.0-snapshot-79b9664.jar.sha1 b/server/licenses/lucene-core-9.8.0-snapshot-79b9664.jar.sha1
@@ -0,0 +1 @@
+df1d6ee8870702d40f46d57063cd2eab97171371
diff --git a/server/licenses/lucene-grouping-9.7.0.jar.sha1 b/server/licenses/lucene-grouping-9.7.0.jar.sha1
diff --git a/server/licenses/lucene-grouping-9.8.0-snapshot-79b9664.jar.sha1 b/server/licenses/lucene-grouping-9.8.0-snapshot-79b9664.jar.sha1
@@ -0,0 +1 @@
+42517d06f398a2487a51a39ad3c4d443eb9dd438
diff --git a/server/licenses/lucene-highlighter-9.7.0.jar.sha1 b/server/licenses/lucene-highlighter-9.7.0.jar.sha1
diff --git a/server/licenses/lucene-highlighter-9.8.0-snapshot-79b9664.jar.sha1 b/server/licenses/lucene-highlighter-9.8.0-snapshot-79b9664.jar.sha1
@@ -0,0 +1 @@
+f9679203fbad0d351f384b0794cf862087fb55ff
diff --git a/server/licenses/lucene-join-9.7.0.jar.sha1 b/server/licenses/lucene-join-9.7.0.jar.sha1
diff --git a/server/licenses/lucene-join-9.8.0-snapshot-79b9664.jar.sha1 b/server/licenses/lucene-join-9.8.0-snapshot-79b9664.jar.sha1
@@ -0,0 +1 @@
+0a5623c84e564527ebec58efbb001455448c234f
diff --git a/server/licenses/lucene-memory-9.7.0.jar.sha1 b/server/licenses/lucene-memory-9.7.0.jar.sha1
diff --git a/server/licenses/lucene-memory-9.8.0-snapshot-79b9664.jar.sha1 b/server/licenses/lucene-memory-9.8.0-snapshot-79b9664.jar.sha1
@@ -0,0 +1 @@
+26300fb04edc496cb33a519eb7d2f567f013b18c
diff --git a/server/licenses/lucene-misc-9.7.0.jar.sha1 b/server/licenses/lucene-misc-9.7.0.jar.sha1
diff --git a/server/licenses/lucene-misc-9.8.0-snapshot-79b9664.jar.sha1 b/server/licenses/lucene-misc-9.8.0-snapshot-79b9664.jar.sha1
@@ -0,0 +1 @@
+aaf52829e6ebcd85c14ca713b77f2f32f0f1910e
diff --git a/server/licenses/lucene-queries-9.7.0.jar.sha1 b/server/licenses/lucene-queries-9.7.0.jar.sha1
diff --git a/server/licenses/lucene-queries-9.8.0-snapshot-79b9664.jar.sha1 b/server/licenses/lucene-queries-9.8.0-snapshot-79b9664.jar.sha1
@@ -0,0 +1 @@
+97407919432745b9788cee1aa7229003ff40b03a
diff --git a/server/licenses/lucene-queryparser-9.7.0.jar.sha1 b/server/licenses/lucene-queryparser-9.7.0.jar.sha1
diff --git a/server/licenses/lucene-queryparser-9.8.0-snapshot-79b9664.jar.sha1 b/server/licenses/lucene-queryparser-9.8.0-snapshot-79b9664.jar.sha1
@@ -0,0 +1 @@
+19665412d3077c0b2b8eefd5da9ed1c15d457680
diff --git a/server/licenses/lucene-sandbox-9.7.0.jar.sha1 b/server/licenses/lucene-sandbox-9.7.0.jar.sha1
diff --git a/server/licenses/lucene-sandbox-9.8.0-snapshot-79b9664.jar.sha1 b/server/licenses/lucene-sandbox-9.8.0-snapshot-79b9664.jar.sha1
@@ -0,0 +1 @@
+4ecaabcd0cf038e0093069461c9a0709e660895a
diff --git a/server/licenses/lucene-spatial-extras-9.7.0.jar.sha1 b/server/licenses/lucene-spatial-extras-9.7.0.jar.sha1
diff --git a/server/licenses/lucene-spatial-extras-9.8.0-snapshot-79b9664.jar.sha1 b/server/licenses/lucene-spatial-extras-9.8.0-snapshot-79b9664.jar.sha1
@@ -0,0 +1 @@
+202a98f1f04917bb2d74dbc6ed4452c58191d18c
diff --git a/server/licenses/lucene-spatial3d-9.7.0.jar.sha1 b/server/licenses/lucene-spatial3d-9.7.0.jar.sha1
diff --git a/server/licenses/lucene-spatial3d-9.8.0-snapshot-79b9664.jar.sha1 b/server/licenses/lucene-spatial3d-9.8.0-snapshot-79b9664.jar.sha1
@@ -0,0 +1 @@
+ad741b6014bc7159195ace3abc1cf282e170df70
diff --git a/server/licenses/lucene-suggest-9.7.0.jar.sha1 b/server/licenses/lucene-suggest-9.7.0.jar.sha1
diff --git a/server/licenses/lucene-suggest-9.8.0-snapshot-79b9664.jar.sha1 b/server/licenses/lucene-suggest-9.8.0-snapshot-79b9664.jar.sha1
@@ -0,0 +1 @@
+26037170854e2591c5e16abd3b62147a7d279c9e
diff --git a/server/src/main/java/org/opensearch/search/suggest/completion/CompletionSuggester.java b/server/src/main/java/org/opensearch/search/suggest/completion/CompletionSuggester.java
@@ -116,6 +116,7 @@ private static void suggest(IndexSearcher searcher, CompletionQuery query, TopSu
                 }
             }
         }
+        collector.finish();
     }
 
     @Override
-Original file line number
+Diff line change
@@ Expand Up @@
                     }
                 }
             }
+            collector.finish();
         }
         @Override
@@ Expand Down @@