elastic · dnhatn · Jun 23, 2022 · Jun 22, 2022 · Jun 23, 2022 · Jun 23, 2022
diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties
@@ -1,5 +1,5 @@
 elasticsearch     = 8.4.0
-lucene            = 9.2.0
+lucene            = 9.3.0-snapshot-f3025a56e31
 
 bundled_jdk_vendor = openjdk
 bundled_jdk = 18.0.1.1+2@65ae32619e2f40f3a9af3af1851d6e19

diff --git a/docs/Versions.asciidoc b/docs/Versions.asciidoc
@@ -1,8 +1,8 @@
 
 include::{docs-root}/shared/versions/stack/{source_branch}.asciidoc[]
 
-:lucene_version:        9.2.0
-:lucene_version_path:   9_2_0
+:lucene_version:        9.3.0
+:lucene_version_path:   9_3_0
 :jdk:                   11.0.2
 :jdk_major:             11
 :build_type:            tar

diff --git a/modules/lang-expression/licenses/lucene-codecs-9.2.0.jar.sha1 b/modules/lang-expression/licenses/lucene-codecs-9.2.0.jar.sha1
diff --git a/modules/lang-expression/licenses/lucene-codecs-9.3.0-snapshot-f3025a56e31.jar.sha1 b/modules/lang-expression/licenses/lucene-codecs-9.3.0-snapshot-f3025a56e31.jar.sha1
@@ -0,0 +1 @@
+edcd74ce93bda0e2007428dc989f0d855449e154
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.2.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.2.0.jar.sha1
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.3.0-snapshot-f3025a56e31.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.3.0-snapshot-f3025a56e31.jar.sha1
@@ -0,0 +1 @@
+6f4e079ad40b708b1b7cd6f41300e6bdb71ade94
diff --git a/modules/legacy-geo/licenses/lucene-spatial-extras-9.2.0.jar.sha1 b/modules/legacy-geo/licenses/lucene-spatial-extras-9.2.0.jar.sha1
diff --git a/modules/legacy-geo/licenses/lucene-spatial-extras-9.3.0-snapshot-f3025a56e31.jar.sha1 b/modules/legacy-geo/licenses/lucene-spatial-extras-9.3.0-snapshot-f3025a56e31.jar.sha1
@@ -0,0 +1 @@
+6dd3dedd93129e518eaccd806cd16b067f27d414
diff --git a/modules/legacy-geo/licenses/lucene-spatial3d-9.2.0.jar.sha1 b/modules/legacy-geo/licenses/lucene-spatial3d-9.2.0.jar.sha1
diff --git a/modules/legacy-geo/licenses/lucene-spatial3d-9.3.0-snapshot-f3025a56e31.jar.sha1 b/modules/legacy-geo/licenses/lucene-spatial3d-9.3.0-snapshot-f3025a56e31.jar.sha1
@@ -0,0 +1 @@
+d510d06738c5e0db79875bb07699bf3acc3b31cc
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.2.0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.2.0.jar.sha1
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.3.0-snapshot-f3025a56e31.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.3.0-snapshot-f3025a56e31.jar.sha1
@@ -0,0 +1 @@
+57e329682ef82a15901c76e5fdbc5ee233689f2d
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.2.0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.2.0.jar.sha1
diff --git a/...s/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.3.0-snapshot-f3025a56e31.jar.sha1 b/...s/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.3.0-snapshot-f3025a56e31.jar.sha1
@@ -0,0 +1 @@
+bd19c2df3970762d730e79a57398010d4dac3ea9
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.2.0.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.2.0.jar.sha1
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.3.0-snapshot-f3025a56e31.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.3.0-snapshot-f3025a56e31.jar.sha1
@@ -0,0 +1 @@
+4b59d393f25bed87d0d8df0f851e0c7d07960d23
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.2.0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.2.0.jar.sha1
diff --git a/...s/analysis-phonetic/licenses/lucene-analysis-phonetic-9.3.0-snapshot-f3025a56e31.jar.sha1 b/...s/analysis-phonetic/licenses/lucene-analysis-phonetic-9.3.0-snapshot-f3025a56e31.jar.sha1
@@ -0,0 +1 @@
+e9aaeb24bcdaf0f9da2a1f8500511ecb56306223
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.2.0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.2.0.jar.sha1
diff --git a/...ins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.3.0-snapshot-f3025a56e31.jar.sha1 b/...ins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.3.0-snapshot-f3025a56e31.jar.sha1
@@ -0,0 +1 @@
+d3bba726a5b29eae4dfba27e1e65fdd6a1f4cc2f
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.2.0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.2.0.jar.sha1
diff --git a/...ins/analysis-stempel/licenses/lucene-analysis-stempel-9.3.0-snapshot-f3025a56e31.jar.sha1 b/...ins/analysis-stempel/licenses/lucene-analysis-stempel-9.3.0-snapshot-f3025a56e31.jar.sha1
@@ -0,0 +1 @@
+5a161d98f65f6d5b0aa5bd881c37d3054db89b09
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.2.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.2.0.jar.sha1
diff --git a/...nalysis-ukrainian/licenses/lucene-analysis-morfologik-9.3.0-snapshot-f3025a56e31.jar.sha1 b/...nalysis-ukrainian/licenses/lucene-analysis-morfologik-9.3.0-snapshot-f3025a56e31.jar.sha1
@@ -0,0 +1 @@
+f148a80992ae25e893b8959efd818cbb0d3e2121
diff --git a/server/licenses/lucene-analysis-common-9.2.0.jar.sha1 b/server/licenses/lucene-analysis-common-9.2.0.jar.sha1
diff --git a/server/licenses/lucene-analysis-common-9.3.0-snapshot-f3025a56e31.jar.sha1 b/server/licenses/lucene-analysis-common-9.3.0-snapshot-f3025a56e31.jar.sha1
@@ -0,0 +1 @@
+f8fb2da223a48e2f54a5c94924850b007e5a1f57
diff --git a/server/licenses/lucene-backward-codecs-9.2.0.jar.sha1 b/server/licenses/lucene-backward-codecs-9.2.0.jar.sha1
diff --git a/server/licenses/lucene-backward-codecs-9.3.0-snapshot-f3025a56e31.jar.sha1 b/server/licenses/lucene-backward-codecs-9.3.0-snapshot-f3025a56e31.jar.sha1
@@ -0,0 +1 @@
+48b0e121903b227a8730d23ef56879ce04cdfedf
diff --git a/server/licenses/lucene-core-9.2.0.jar.sha1 b/server/licenses/lucene-core-9.2.0.jar.sha1
diff --git a/server/licenses/lucene-core-9.3.0-snapshot-f3025a56e31.jar.sha1 b/server/licenses/lucene-core-9.3.0-snapshot-f3025a56e31.jar.sha1
@@ -0,0 +1 @@
+690ea3dcc4606a4599b3e2b2e3510cff7059950c
diff --git a/server/licenses/lucene-grouping-9.2.0.jar.sha1 b/server/licenses/lucene-grouping-9.2.0.jar.sha1
diff --git a/server/licenses/lucene-grouping-9.3.0-snapshot-f3025a56e31.jar.sha1 b/server/licenses/lucene-grouping-9.3.0-snapshot-f3025a56e31.jar.sha1
@@ -0,0 +1 @@
+32cdfad19d7bbdc7f3052bf6c9d9871263cfd1c8
diff --git a/server/licenses/lucene-highlighter-9.2.0.jar.sha1 b/server/licenses/lucene-highlighter-9.2.0.jar.sha1
diff --git a/server/licenses/lucene-highlighter-9.3.0-snapshot-f3025a56e31.jar.sha1 b/server/licenses/lucene-highlighter-9.3.0-snapshot-f3025a56e31.jar.sha1
@@ -0,0 +1 @@
+366231787c733fc0c4fb373eaf507a66ba339dd6
diff --git a/server/licenses/lucene-join-9.2.0.jar.sha1 b/server/licenses/lucene-join-9.2.0.jar.sha1
diff --git a/server/licenses/lucene-join-9.3.0-snapshot-f3025a56e31.jar.sha1 b/server/licenses/lucene-join-9.3.0-snapshot-f3025a56e31.jar.sha1
@@ -0,0 +1 @@
+08837eab0f0836bba2f82827acc3eab3006b16b9
diff --git a/server/licenses/lucene-memory-9.2.0.jar.sha1 b/server/licenses/lucene-memory-9.2.0.jar.sha1
diff --git a/server/licenses/lucene-memory-9.3.0-snapshot-f3025a56e31.jar.sha1 b/server/licenses/lucene-memory-9.3.0-snapshot-f3025a56e31.jar.sha1
@@ -0,0 +1 @@
+bc550835d4a040f858f88f845dcb66573ca3c19e
diff --git a/server/licenses/lucene-misc-9.2.0.jar.sha1 b/server/licenses/lucene-misc-9.2.0.jar.sha1
diff --git a/server/licenses/lucene-misc-9.3.0-snapshot-f3025a56e31.jar.sha1 b/server/licenses/lucene-misc-9.3.0-snapshot-f3025a56e31.jar.sha1
@@ -0,0 +1 @@
+506d4ddd2ac3386df063f279113006694889ae53
diff --git a/server/licenses/lucene-queries-9.2.0.jar.sha1 b/server/licenses/lucene-queries-9.2.0.jar.sha1
diff --git a/server/licenses/lucene-queries-9.3.0-snapshot-f3025a56e31.jar.sha1 b/server/licenses/lucene-queries-9.3.0-snapshot-f3025a56e31.jar.sha1
@@ -0,0 +1 @@
+1aa664e0ac15d7d12723674d4b65d8969be9f8c2
diff --git a/server/licenses/lucene-queryparser-9.2.0.jar.sha1 b/server/licenses/lucene-queryparser-9.2.0.jar.sha1
diff --git a/server/licenses/lucene-queryparser-9.3.0-snapshot-f3025a56e31.jar.sha1 b/server/licenses/lucene-queryparser-9.3.0-snapshot-f3025a56e31.jar.sha1
@@ -0,0 +1 @@
+6350f41cb9117e4499c15bd060ec2cf7b48970d9
diff --git a/server/licenses/lucene-sandbox-9.2.0.jar.sha1 b/server/licenses/lucene-sandbox-9.2.0.jar.sha1
diff --git a/server/licenses/lucene-sandbox-9.3.0-snapshot-f3025a56e31.jar.sha1 b/server/licenses/lucene-sandbox-9.3.0-snapshot-f3025a56e31.jar.sha1
@@ -0,0 +1 @@
+b36d0d959d2decffe5f9ea68130f28470637ca5c
diff --git a/server/licenses/lucene-suggest-9.2.0.jar.sha1 b/server/licenses/lucene-suggest-9.2.0.jar.sha1
diff --git a/server/licenses/lucene-suggest-9.3.0-snapshot-f3025a56e31.jar.sha1 b/server/licenses/lucene-suggest-9.3.0-snapshot-f3025a56e31.jar.sha1
@@ -0,0 +1 @@
+b0220d2ce0e68879535246013601a09323106875
diff --git a/server/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java
@@ -114,7 +114,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_8_2_3 = new Version(8_02_03_99, org.apache.lucene.util.Version.LUCENE_9_1_0);
     public static final Version V_8_2_4 = new Version(8_02_04_99, org.apache.lucene.util.Version.LUCENE_9_1_0);
     public static final Version V_8_3_0 = new Version(8_03_00_99, org.apache.lucene.util.Version.LUCENE_9_2_0);
-    public static final Version V_8_4_0 = new Version(8_04_00_99, org.apache.lucene.util.Version.LUCENE_9_2_0);
+    public static final Version V_8_4_0 = new Version(8_04_00_99, org.apache.lucene.util.Version.LUCENE_9_3_0);
     public static final Version CURRENT = V_8_4_0;
 
     private static final Map<Integer, Version> idToVersion;

diff --git a/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java b/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java
@@ -2408,6 +2408,8 @@ private IndexWriterConfig getIndexWriterConfig() {
             mergePolicy = new ShuffleForcedMergePolicy(mergePolicy);
         }
         iwc.setMergePolicy(mergePolicy);
+        // TODO: Introduce an index setting for setMaxFullFlushMergeWaitMillis
+        iwc.setMaxFullFlushMergeWaitMillis(-1);
         iwc.setSimilarity(engineConfig.getSimilarity());
         iwc.setRAMBufferSizeMB(engineConfig.getIndexingBufferSize().getMbFrac());
         iwc.setCodec(engineConfig.getCodec());

diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalMapping.java b/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalMapping.java
@@ -60,7 +60,7 @@ public long nextOrd() throws IOException {
     }
 
     @Override
-    public long docValueCount() {
+    public int docValueCount() {
         return values.docValueCount();
     }
 

diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinals.java b/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinals.java
@@ -190,8 +190,8 @@ public long nextOrd() throws IOException {
         }
 
         @Override
-        public long docValueCount() {
-            return currentEndOffset - currentOffset;
+        public int docValueCount() {
+            return Math.toIntExact(currentEndOffset - currentOffset);
         }
 
         @Override

diff --git a/server/src/main/java/org/elasticsearch/index/mapper/DocumentLeafReader.java b/server/src/main/java/org/elasticsearch/index/mapper/DocumentLeafReader.java
@@ -460,7 +460,7 @@ public long nextOrd() {
             }
 
             @Override
-            public long docValueCount() {
+            public int docValueCount() {
                 return values.size();
             }
 

diff --git a/...r/src/main/java/org/elasticsearch/index/mapper/flattened/KeyedFlattenedLeafFieldData.java b/...r/src/main/java/org/elasticsearch/index/mapper/flattened/KeyedFlattenedLeafFieldData.java
@@ -210,7 +210,7 @@ public long nextOrd() throws IOException {
         }
 
         @Override
-        public long docValueCount() {
+        public int docValueCount() {
             return delegate.docValueCount();
         }
 

diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/support/MissingValues.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/MissingValues.java
@@ -280,7 +280,7 @@ public long nextOrd() throws IOException {
             }
 
             @Override
-            public long docValueCount() {
+            public int docValueCount() {
                 return values.docValueCount();
             }
 
@@ -319,7 +319,7 @@ public BytesRef lookupOrd(long ord) throws IOException {
             }
 
             @Override
-            public long docValueCount() {
+            public int docValueCount() {
                 return values.docValueCount();
             }
 

diff --git a/server/src/test/java/org/elasticsearch/common/lucene/LuceneTests.java b/server/src/test/java/org/elasticsearch/common/lucene/LuceneTests.java
@@ -517,7 +517,9 @@ public void testWrapAllDocsLive() throws Exception {
     public void testWrapLiveDocsNotExposeAbortedDocuments() throws Exception {
         Directory dir = newDirectory();
         IndexWriterConfig config = newIndexWriterConfig().setSoftDeletesField(Lucene.SOFT_DELETES_FIELD)
-            .setMergePolicy(new SoftDeletesRetentionMergePolicy(Lucene.SOFT_DELETES_FIELD, MatchAllDocsQuery::new, newMergePolicy()));
+            .setMergePolicy(new SoftDeletesRetentionMergePolicy(Lucene.SOFT_DELETES_FIELD, MatchAllDocsQuery::new, newMergePolicy()))
+            // disable merges on refresh as we will verify the deleted documents
+            .setMaxFullFlushMergeWaitMillis(-1);
         IndexWriter writer = new IndexWriter(dir, config);
         int numDocs = between(1, 10);
         List<String> liveDocs = new ArrayList<>();

diff --git a/.../test/java/org/elasticsearch/index/mapper/flattened/KeyedFlattenedLeafFieldDataTests.java b/.../test/java/org/elasticsearch/index/mapper/flattened/KeyedFlattenedLeafFieldDataTests.java
@@ -200,7 +200,7 @@ public long nextOrd() {
         }
 
         @Override
-        public long docValueCount() {
+        public int docValueCount() {
             return documentOrds.length;
         }
 

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

diff --git a/...t/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregatorTests.java b/...t/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregatorTests.java
@@ -48,7 +48,7 @@ public long nextOrd() {
         }
 
         @Override
-        public long docValueCount() {
+        public int docValueCount() {
             return ords.length;
         }
 

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

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

diff --git a/x-pack/plugin/ml/licenses/lucene-analysis-icu-9.2.0.jar.sha1 b/x-pack/plugin/ml/licenses/lucene-analysis-icu-9.2.0.jar.sha1
diff --git a/x-pack/plugin/ml/licenses/lucene-analysis-icu-9.3.0-snapshot-f3025a56e31.jar.sha1 b/x-pack/plugin/ml/licenses/lucene-analysis-icu-9.3.0-snapshot-f3025a56e31.jar.sha1
@@ -0,0 +1 @@
+57e329682ef82a15901c76e5fdbc5ee233689f2d
diff --git a/...c/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/index/LegacySortedSetDocValues.java b/...c/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/index/LegacySortedSetDocValues.java
@@ -56,6 +56,12 @@ protected LegacySortedSetDocValues() {}
      */
     public abstract long nextOrd();
 
+    /**
+     * Retrieves the number of unique ords for the current document. This must always be greater than
+     * zero. It is illegal to call this method after advanceExact(int) returned {@code false}.
+     */
+    public abstract int docValueCount();
+
     /**
      * Sets iteration to the specified docID
      * @param docID document ID

diff --git a/...java/org/elasticsearch/xpack/lucene/bwc/codecs/index/LegacySortedSetDocValuesWrapper.java b/...java/org/elasticsearch/xpack/lucene/bwc/codecs/index/LegacySortedSetDocValuesWrapper.java
@@ -99,8 +99,8 @@ public long nextOrd() {
     }
 
     @Override
-    public long docValueCount() {
-        throw new UnsupportedOperationException();
+    public int docValueCount() {
+        return values.docValueCount();
     }
 
     @Override

diff --git a/...in/java/org/elasticsearch/xpack/lucene/bwc/codecs/lucene54/Lucene54DocValuesProducer.java b/...in/java/org/elasticsearch/xpack/lucene/bwc/codecs/lucene54/Lucene54DocValuesProducer.java
@@ -1351,6 +1351,11 @@ public BytesRef lookupOrd(long ord) {
                 return binary.get(ord);
             }
 
+            @Override
+            public int docValueCount() {
+                return Math.toIntExact(endOffset - startOffset);
+            }
+
             @Override
             public long getValueCount() {
                 return valueCount;
@@ -1415,6 +1420,11 @@ public long getValueCount() {
                 return valueCount;
             }
 
+            @Override
+            public int docValueCount() {
+                return Math.toIntExact(endOffset - startOffset);
+            }
+
             @Override
             public long lookupTerm(BytesRef key) {
                 if (binary instanceof CompressedBinaryDocValues) {