Update to Lucene 9.3.0 (#4043) (#4088)

Signed-off-by: Andriy Redko <[email protected]> (cherry picked from commit bab2e59) Signed-off-by: Andriy Redko <[email protected]>
opensearch-project · Aug 2, 2022 · 4f3e148 · 4f3e148
1 parent 57ce4a9
commit 4f3e148
Show file tree

Hide file tree

Showing 54 changed files with 47 additions and 34 deletions.
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -1,5 +1,5 @@
 opensearch        = 2.2.0
-lucene            = 9.3.0-snapshot-b7231bb
+lucene            = 9.3.0
 
 bundled_jdk_vendor = adoptium
 bundled_jdk = 17.0.3+7

diff --git a/modules/lang-expression/licenses/lucene-expressions-9.3.0-snapshot-b7231bb.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.3.0-snapshot-b7231bb.jar.sha1
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.3.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.3.0.jar.sha1
@@ -0,0 +1 @@
+5583bcd3a24d3aae40b0a3152458021844ac09aa
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.3.0-snapshot-b7231bb.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.3.0-snapshot-b7231bb.jar.sha1
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.3.0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.3.0.jar.sha1
@@ -0,0 +1 @@
+11dd9be0448fe594cf918f5260e193b3ab4e07a0
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.3.0-snapshot-b7231bb.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.3.0-snapshot-b7231bb.jar.sha1
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.3.0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.3.0.jar.sha1
@@ -0,0 +1 @@
+87c1357612f2f483174d1a63ea8c6680a1696bac
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.3.0-snapshot-b7231bb.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.3.0-snapshot-b7231bb.jar.sha1
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.3.0.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.3.0.jar.sha1
@@ -0,0 +1 @@
+5d032dbeb3f4015741336a877dd4b0e62099246c
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.3.0-snapshot-b7231bb.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.3.0-snapshot-b7231bb.jar.sha1
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.3.0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.3.0.jar.sha1
@@ -0,0 +1 @@
+fe6ac8772b545e0abd0c755cd4bd07caad58edb9
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.3.0-snapshot-b7231bb.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.3.0-snapshot-b7231bb.jar.sha1
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.3.0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.3.0.jar.sha1
@@ -0,0 +1 @@
+288726e13b598c341e81aef8b5c9ce53f51889d0
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.3.0-snapshot-b7231bb.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.3.0-snapshot-b7231bb.jar.sha1
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.3.0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.3.0.jar.sha1
@@ -0,0 +1 @@
+166d02f7f98f18c6607335030a404fcad8f57cd6
diff --git a/...ns/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.3.0-snapshot-b7231bb.jar.sha1 b/...ns/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.3.0-snapshot-b7231bb.jar.sha1
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.3.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.3.0.jar.sha1
@@ -0,0 +1 @@
+3c0e4177aa87a4be2826a360f656f3559ea3f997
diff --git a/server/licenses/lucene-analysis-common-9.3.0-snapshot-b7231bb.jar.sha1 b/server/licenses/lucene-analysis-common-9.3.0-snapshot-b7231bb.jar.sha1
diff --git a/server/licenses/lucene-analysis-common-9.3.0.jar.sha1 b/server/licenses/lucene-analysis-common-9.3.0.jar.sha1
@@ -0,0 +1 @@
+03496708a19a8a55a0dc4f61f8aa2febc6e8977c
diff --git a/server/licenses/lucene-backward-codecs-9.3.0-snapshot-b7231bb.jar.sha1 b/server/licenses/lucene-backward-codecs-9.3.0-snapshot-b7231bb.jar.sha1
diff --git a/server/licenses/lucene-backward-codecs-9.3.0.jar.sha1 b/server/licenses/lucene-backward-codecs-9.3.0.jar.sha1
@@ -0,0 +1 @@
+95ea01ee0d1e543e18e3cf58d8a6a27a587a7239
diff --git a/server/licenses/lucene-core-9.3.0-snapshot-b7231bb.jar.sha1 b/server/licenses/lucene-core-9.3.0-snapshot-b7231bb.jar.sha1
diff --git a/server/licenses/lucene-core-9.3.0.jar.sha1 b/server/licenses/lucene-core-9.3.0.jar.sha1
@@ -0,0 +1 @@
+a030180999bc3f1a65f23f53b38098ca9daeee79
diff --git a/server/licenses/lucene-grouping-9.3.0-snapshot-b7231bb.jar.sha1 b/server/licenses/lucene-grouping-9.3.0-snapshot-b7231bb.jar.sha1
diff --git a/server/licenses/lucene-grouping-9.3.0.jar.sha1 b/server/licenses/lucene-grouping-9.3.0.jar.sha1
@@ -0,0 +1 @@
+883071196e53ec93d2a53dcc8211ee30be6c00dc
diff --git a/server/licenses/lucene-highlighter-9.3.0-snapshot-b7231bb.jar.sha1 b/server/licenses/lucene-highlighter-9.3.0-snapshot-b7231bb.jar.sha1
diff --git a/server/licenses/lucene-highlighter-9.3.0.jar.sha1 b/server/licenses/lucene-highlighter-9.3.0.jar.sha1
@@ -0,0 +1 @@
+7e895c49b9991ea2ec08855c425b9eae44a08764
diff --git a/server/licenses/lucene-join-9.3.0-snapshot-b7231bb.jar.sha1 b/server/licenses/lucene-join-9.3.0-snapshot-b7231bb.jar.sha1
diff --git a/server/licenses/lucene-join-9.3.0.jar.sha1 b/server/licenses/lucene-join-9.3.0.jar.sha1
@@ -0,0 +1 @@
+04baaae4ce4a35ae919150dd17cd1e63b0da9d24
diff --git a/server/licenses/lucene-memory-9.3.0-snapshot-b7231bb.jar.sha1 b/server/licenses/lucene-memory-9.3.0-snapshot-b7231bb.jar.sha1
diff --git a/server/licenses/lucene-memory-9.3.0.jar.sha1 b/server/licenses/lucene-memory-9.3.0.jar.sha1
@@ -0,0 +1 @@
+1a2203b332edc1366b9789f5286296e109dbc8c4
diff --git a/server/licenses/lucene-misc-9.3.0-snapshot-b7231bb.jar.sha1 b/server/licenses/lucene-misc-9.3.0-snapshot-b7231bb.jar.sha1
diff --git a/server/licenses/lucene-misc-9.3.0.jar.sha1 b/server/licenses/lucene-misc-9.3.0.jar.sha1
@@ -0,0 +1 @@
+61b502c9557247b6803a346c0bab20c9dc89d125
diff --git a/server/licenses/lucene-queries-9.3.0-snapshot-b7231bb.jar.sha1 b/server/licenses/lucene-queries-9.3.0-snapshot-b7231bb.jar.sha1
diff --git a/server/licenses/lucene-queries-9.3.0.jar.sha1 b/server/licenses/lucene-queries-9.3.0.jar.sha1
@@ -0,0 +1 @@
+d8fe3bce3c05015c5fdb78279f36b9f1a75b98d8
diff --git a/server/licenses/lucene-queryparser-9.3.0-snapshot-b7231bb.jar.sha1 b/server/licenses/lucene-queryparser-9.3.0-snapshot-b7231bb.jar.sha1
diff --git a/server/licenses/lucene-queryparser-9.3.0.jar.sha1 b/server/licenses/lucene-queryparser-9.3.0.jar.sha1
@@ -0,0 +1 @@
+78f259a66d48f77a2d2b96a0a858efa08eba72dc
diff --git a/server/licenses/lucene-sandbox-9.3.0-snapshot-b7231bb.jar.sha1 b/server/licenses/lucene-sandbox-9.3.0-snapshot-b7231bb.jar.sha1
diff --git a/server/licenses/lucene-sandbox-9.3.0.jar.sha1 b/server/licenses/lucene-sandbox-9.3.0.jar.sha1
@@ -0,0 +1 @@
+5ee318cf8e9a70c2c99e03e157465316a3d4a17a
diff --git a/server/licenses/lucene-spatial-extras-9.3.0-snapshot-b7231bb.jar.sha1 b/server/licenses/lucene-spatial-extras-9.3.0-snapshot-b7231bb.jar.sha1
diff --git a/server/licenses/lucene-spatial-extras-9.3.0.jar.sha1 b/server/licenses/lucene-spatial-extras-9.3.0.jar.sha1
@@ -0,0 +1 @@
+c9b226b49ae987a4226791f023562187583eb9ad
diff --git a/server/licenses/lucene-spatial3d-9.3.0-snapshot-b7231bb.jar.sha1 b/server/licenses/lucene-spatial3d-9.3.0-snapshot-b7231bb.jar.sha1
diff --git a/server/licenses/lucene-spatial3d-9.3.0.jar.sha1 b/server/licenses/lucene-spatial3d-9.3.0.jar.sha1
@@ -0,0 +1 @@
+201aa61856ae44fa494504591aed54fd9b75af16
diff --git a/server/licenses/lucene-suggest-9.3.0-snapshot-b7231bb.jar.sha1 b/server/licenses/lucene-suggest-9.3.0-snapshot-b7231bb.jar.sha1
diff --git a/server/licenses/lucene-suggest-9.3.0.jar.sha1 b/server/licenses/lucene-suggest-9.3.0.jar.sha1
@@ -0,0 +1 @@
+fb5d7243ba67616edbda1ecf421c615dd595752d
diff --git a/server/src/main/java/org/opensearch/index/fielddata/ordinals/GlobalOrdinalMapping.java b/server/src/main/java/org/opensearch/index/fielddata/ordinals/GlobalOrdinalMapping.java
@@ -113,7 +113,7 @@ public long cost() {
     }
 
     @Override
-    public long docValueCount() {
+    public int docValueCount() {
         return values.docValueCount();
     }
 }
diff --git a/server/src/main/java/org/opensearch/index/fielddata/ordinals/MultiOrdinals.java b/server/src/main/java/org/opensearch/index/fielddata/ordinals/MultiOrdinals.java
@@ -231,8 +231,8 @@ public BytesRef lookupOrd(long ord) {
         }
 
         @Override
-        public long docValueCount() {
-            return currentEndOffset - currentOffset;
+        public int docValueCount() {
+            return Math.toIntExact(currentEndOffset - currentOffset);
         }
     }
 }
diff --git a/server/src/main/java/org/opensearch/search/aggregations/support/MissingValues.java b/server/src/main/java/org/opensearch/search/aggregations/support/MissingValues.java
@@ -311,7 +311,7 @@ public boolean advanceExact(int doc) throws IOException {
             }
 
             @Override
-            public long docValueCount() {
+            public int docValueCount() {
                 return values.docValueCount();
             }
 
@@ -346,7 +346,7 @@ public long getValueCount() {
             }
 
             @Override
-            public long docValueCount() {
+            public int docValueCount() {
                 return values.docValueCount();
             }
 

diff --git a/server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java b/server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java
@@ -260,6 +260,8 @@ protected void search(List<LeafReaderContext> leaves, Weight weight, Collector c
     private void searchLeaf(LeafReaderContext ctx, Weight weight, Collector collector) throws IOException {
         cancellable.checkCancelled();
         weight = wrapWeight(weight);
+        // See please https://github.com/apache/lucene/pull/964
+        collector.setWeight(weight);
         final LeafCollector leafCollector;
         try {
             leafCollector = collector.getLeafCollector(ctx);

diff --git a/server/src/main/java/org/opensearch/search/query/TotalHitCountCollectorManager.java b/server/src/main/java/org/opensearch/search/query/TotalHitCountCollectorManager.java
@@ -8,7 +8,10 @@
 
 package org.opensearch.search.query;
 
+import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.search.CollectorManager;
+import org.apache.lucene.search.LeafCollector;
+import org.apache.lucene.search.Scorable;
 import org.apache.lucene.search.ScoreMode;
 import org.apache.lucene.search.Sort;
 import org.apache.lucene.search.TopDocs;
@@ -33,7 +36,15 @@ public class TotalHitCountCollectorManager
 
     private static final TotalHitCountCollector EMPTY_COLLECTOR = new TotalHitCountCollector() {
         @Override
-        public void collect(int doc) {}
+        public LeafCollector getLeafCollector(LeafReaderContext context) throws IOException {
+            return new LeafCollector() {
+                @Override
+                public void setScorer(Scorable scorer) throws IOException {}
+
+                @Override
+                public void collect(int doc) throws IOException {}
+            };
+        }
 
         @Override
         public ScoreMode scoreMode() {

diff --git a/server/src/test/java/org/opensearch/search/MultiValueModeTests.java b/server/src/test/java/org/opensearch/search/MultiValueModeTests.java
@@ -765,7 +765,7 @@ public long getValueCount() {
             }
 
             @Override
-            public long docValueCount() {
+            public int docValueCount() {
                 return array[doc].length;
             }
         };

diff --git a/...test/java/org/opensearch/search/aggregations/bucket/range/BinaryRangeAggregatorTests.java b/...test/java/org/opensearch/search/aggregations/bucket/range/BinaryRangeAggregatorTests.java
@@ -84,7 +84,7 @@ public long getValueCount() {
         }
 
         @Override
-        public long docValueCount() {
+        public int docValueCount() {
             return ords.length;
         }
     }

diff --git a/server/src/test/java/org/opensearch/search/aggregations/support/IncludeExcludeTests.java b/server/src/test/java/org/opensearch/search/aggregations/support/IncludeExcludeTests.java
@@ -99,7 +99,7 @@ public long getValueCount() {
             }
 
             @Override
-            public long docValueCount() {
+            public int docValueCount() {
                 return 1;
             }
         };

diff --git a/server/src/test/java/org/opensearch/search/aggregations/support/MissingValuesTests.java b/server/src/test/java/org/opensearch/search/aggregations/support/MissingValuesTests.java
@@ -157,7 +157,7 @@ public long nextOrd() {
             }
 
             @Override
-            public long docValueCount() {
+            public int docValueCount() {
                 return ords[doc].length;
             }
         };
@@ -263,7 +263,7 @@ public BytesRef lookupOrd(long ord) throws IOException {
             }
 
             @Override
-            public long docValueCount() {
+            public int docValueCount() {
                 throw new UnsupportedOperationException();
             }