[Upgrade] Lucene-9.2-snapshot (opensearch-project#2924)

bharath-techie · Apr 21, 2022 · 3d49cce · 3d49cce
1 parent 0cbd47c
commit 3d49cce
Show file tree

Hide file tree

Showing 49 changed files with 125 additions and 63 deletions.
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -1,5 +1,5 @@
 opensearch        = 3.0.0
-lucene            = 9.1.0
+lucene            = 9.2.0-snapshot-f4f1f70
 
 bundled_jdk_vendor = adoptium
 bundled_jdk = 17.0.2+8

diff --git a/modules/lang-expression/licenses/lucene-expressions-9.1.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.1.0.jar.sha1
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.2.0-snapshot-f4f1f70.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.2.0-snapshot-f4f1f70.jar.sha1
@@ -0,0 +1 @@
+f2a8008e74589f77f1d3da305cf58c88ee01d1c1
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.1.0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.1.0.jar.sha1
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.2.0-snapshot-f4f1f70.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.2.0-snapshot-f4f1f70.jar.sha1
@@ -0,0 +1 @@
+f9569365e80897f1a9161254d5d2f44a44f95db8
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.1.0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.1.0.jar.sha1
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.2.0-snapshot-f4f1f70.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.2.0-snapshot-f4f1f70.jar.sha1
@@ -0,0 +1 @@
+35c14b39ff522dd6665e74a873035827b865075e
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.1.0.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.1.0.jar.sha1
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.2.0-snapshot-f4f1f70.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.2.0-snapshot-f4f1f70.jar.sha1
@@ -0,0 +1 @@
+a84218a1ea0d5c52d6591d417061518b8a8be4e4
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.1.0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.1.0.jar.sha1
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.2.0-snapshot-f4f1f70.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.2.0-snapshot-f4f1f70.jar.sha1
@@ -0,0 +1 @@
+057bbd20b15899844b23d2cf034a167b4fe581f0
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.1.0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.1.0.jar.sha1
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.2.0-snapshot-f4f1f70.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.2.0-snapshot-f4f1f70.jar.sha1
@@ -0,0 +1 @@
+6a9a8d49e87b6999560a131e16234e46f21e6b42
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.1.0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.1.0.jar.sha1
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.2.0-snapshot-f4f1f70.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.2.0-snapshot-f4f1f70.jar.sha1
@@ -0,0 +1 @@
+fcad3608779e0b3ab8703903b9d28cdc32767d60
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.1.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.1.0.jar.sha1
diff --git a/...ns/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.2.0-snapshot-f4f1f70.jar.sha1 b/...ns/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.2.0-snapshot-f4f1f70.jar.sha1
@@ -0,0 +1 @@
+bd28479bdf3c076bc89a0d30864188d444410267
diff --git a/...s/concurrent-search/src/test/java/org/opensearch/search/query/QueryProfilePhaseTests.java b/...s/concurrent-search/src/test/java/org/opensearch/search/query/QueryProfilePhaseTests.java
@@ -153,7 +153,9 @@ public void testPostFilterDisablesCountOptimization() throws Exception {
 
         QueryPhase.executeInternal(context.withCleanQueryResult().withProfilers(), queryPhaseSearcher);
         assertEquals(1, context.queryResult().topDocs().topDocs.totalHits.value);
-        assertProfileData(context, "MatchAllDocsQuery", query -> {
+        // IndexSearcher#rewrite optimizes by rewriting non-scoring queries to ConstantScoreQuery
+        // see: https://github.com/apache/lucene/pull/672
+        assertProfileData(context, "ConstantScoreQuery", query -> {
             assertThat(query.getTimeBreakdown().keySet(), not(empty()));
             assertThat(query.getTimeBreakdown().get("score"), equalTo(0L));
             assertThat(query.getTimeBreakdown().get("score_count"), equalTo(0L));
@@ -183,7 +185,9 @@ public void testPostFilterDisablesCountOptimization() throws Exception {
             assertThat(query.getTimeBreakdown().get("create_weight"), greaterThan(0L));
             assertThat(query.getTimeBreakdown().get("create_weight_count"), equalTo(1L));
         }, (query) -> {
-            assertThat(query.getQueryName(), equalTo("MatchAllDocsQuery"));
+            // IndexSearcher#rewrite optimizes by rewriting non-scoring queries to ConstantScoreQuery
+            // see: https://github.com/apache/lucene/pull/672
+            assertThat(query.getQueryName(), equalTo("ConstantScoreQuery"));
             assertThat(query.getTimeBreakdown().keySet(), not(empty()));
             assertThat(query.getTimeBreakdown().get("score"), equalTo(0L));
             assertThat(query.getTimeBreakdown().get("score_count"), equalTo(0L));
@@ -265,7 +269,9 @@ public void testMinScoreDisablesCountOptimization() throws Exception {
         context.setTask(new SearchShardTask(123L, "", "", "", null, Collections.emptyMap()));
         QueryPhase.executeInternal(context.withCleanQueryResult().withProfilers(), queryPhaseSearcher);
         assertEquals(1, context.queryResult().topDocs().topDocs.totalHits.value);
-        assertProfileData(context, "MatchAllDocsQuery", query -> {
+        // IndexSearcher#rewrite optimizes by rewriting non-scoring queries to ConstantScoreQuery
+        // see: https://github.com/apache/lucene/pull/672
+        assertProfileData(context, "ConstantScoreQuery", query -> {
             assertThat(query.getTimeBreakdown().keySet(), not(empty()));
             assertThat(query.getTimeBreakdown().get("score"), equalTo(0L));
             assertThat(query.getTimeBreakdown().get("score_count"), equalTo(0L));
@@ -413,7 +419,9 @@ public void testTerminateAfterEarlyTermination() throws Exception {
             assertTrue(context.queryResult().terminatedEarly());
             assertThat(context.queryResult().topDocs().topDocs.totalHits.value, equalTo(1L));
             assertThat(context.queryResult().topDocs().topDocs.scoreDocs.length, equalTo(0));
-            assertProfileData(context, "MatchAllDocsQuery", query -> {
+            // IndexSearcher#rewrite optimizes by rewriting non-scoring queries to ConstantScoreQuery
+            // see: https://github.com/apache/lucene/pull/672
+            assertProfileData(context, "ConstantScoreQuery", query -> {
                 assertThat(query.getTimeBreakdown().keySet(), not(empty()));
                 assertThat(query.getTimeBreakdown().get("score"), equalTo(0L));
                 assertThat(query.getTimeBreakdown().get("score_count"), equalTo(0L));
@@ -489,27 +497,40 @@ public void testTerminateAfterEarlyTermination() throws Exception {
             assertThat(context.queryResult().topDocs().topDocs.totalHits.value, equalTo(1L));
             assertThat(context.queryResult().topDocs().topDocs.scoreDocs.length, equalTo(0));
 
-            assertProfileData(context, "BooleanQuery", query -> {
+            // IndexSearcher#rewrite optimizes by rewriting non-scoring queries to ConstantScoreQuery
+            // see: https://github.com/apache/lucene/pull/672
+            assertProfileData(context, "ConstantScoreQuery", query -> {
                 assertThat(query.getTimeBreakdown().keySet(), not(empty()));
                 assertThat(query.getTimeBreakdown().get("score"), equalTo(0L));
                 assertThat(query.getTimeBreakdown().get("score_count"), equalTo(0L));
                 assertThat(query.getTimeBreakdown().get("create_weight"), greaterThan(0L));
                 assertThat(query.getTimeBreakdown().get("create_weight_count"), equalTo(1L));
 
-                assertThat(query.getProfiledChildren(), hasSize(2));
-                assertThat(query.getProfiledChildren().get(0).getQueryName(), equalTo("TermQuery"));
+                // rewritten as a ConstantScoreQuery wrapping the original BooleanQuery
+                // see: https://github.com/apache/lucene/pull/672
+                assertThat(query.getProfiledChildren(), hasSize(1));
+                assertThat(query.getProfiledChildren().get(0).getQueryName(), equalTo("BooleanQuery"));
                 assertThat(query.getProfiledChildren().get(0).getTime(), greaterThan(0L));
                 assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("create_weight"), greaterThan(0L));
                 assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("create_weight_count"), equalTo(1L));
                 assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("score"), equalTo(0L));
                 assertThat(query.getProfiledChildren().get(0).getTimeBreakdown().get("score_count"), equalTo(0L));
 
-                assertThat(query.getProfiledChildren().get(1).getQueryName(), equalTo("TermQuery"));
-                assertThat(query.getProfiledChildren().get(1).getTime(), greaterThan(0L));
-                assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("create_weight"), greaterThan(0L));
-                assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("create_weight_count"), equalTo(1L));
-                assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("score"), equalTo(0L));
-                assertThat(query.getProfiledChildren().get(1).getTimeBreakdown().get("score_count"), equalTo(0L));
+                List<ProfileResult> children = query.getProfiledChildren().get(0).getProfiledChildren();
+                assertThat(children, hasSize(2));
+                assertThat(children.get(0).getQueryName(), equalTo("TermQuery"));
+                assertThat(children.get(0).getTime(), greaterThan(0L));
+                assertThat(children.get(0).getTimeBreakdown().get("create_weight"), greaterThan(0L));
+                assertThat(children.get(0).getTimeBreakdown().get("create_weight_count"), equalTo(1L));
+                assertThat(children.get(0).getTimeBreakdown().get("score"), equalTo(0L));
+                assertThat(children.get(0).getTimeBreakdown().get("score_count"), equalTo(0L));
+
+                assertThat(children.get(1).getQueryName(), equalTo("TermQuery"));
+                assertThat(children.get(1).getTime(), greaterThan(0L));
+                assertThat(children.get(1).getTimeBreakdown().get("create_weight"), greaterThan(0L));
+                assertThat(children.get(1).getTimeBreakdown().get("create_weight_count"), equalTo(1L));
+                assertThat(children.get(1).getTimeBreakdown().get("score"), equalTo(0L));
+                assertThat(children.get(1).getTimeBreakdown().get("score_count"), equalTo(0L));
             }, collector -> {
                 assertThat(collector.getReason(), equalTo("search_terminate_after_count"));
                 assertThat(collector.getTime(), greaterThan(0L));
@@ -597,7 +618,9 @@ public void testIndexSortingEarlyTermination() throws Exception {
         assertThat(context.queryResult().topDocs().topDocs.scoreDocs[0], instanceOf(FieldDoc.class));
         FieldDoc fieldDoc = (FieldDoc) context.queryResult().topDocs().topDocs.scoreDocs[0];
         assertThat(fieldDoc.fields[0], equalTo(1));
-        assertProfileData(context, "MatchAllDocsQuery", query -> {
+        // IndexSearcher#rewrite optimizes by rewriting non-scoring queries to ConstantScoreQuery
+        // see: https://github.com/apache/lucene/pull/672
+        assertProfileData(context, "ConstantScoreQuery", query -> {
             assertThat(query.getTimeBreakdown().keySet(), not(empty()));
             assertThat(query.getTimeBreakdown().get("score"), equalTo(0L));
             assertThat(query.getTimeBreakdown().get("score_count"), equalTo(0L));
@@ -631,7 +654,9 @@ public void testIndexSortingEarlyTermination() throws Exception {
                 assertThat(query.getTimeBreakdown().get("create_weight"), greaterThan(0L));
                 assertThat(query.getTimeBreakdown().get("create_weight_count"), equalTo(1L));
             }, (query) -> {
-                assertThat(query.getQueryName(), equalTo("MatchAllDocsQuery"));
+                // IndexSearcher#rewrite optimizes by rewriting non-scoring queries to ConstantScoreQuery
+                // see: https://github.com/apache/lucene/pull/672
+                assertThat(query.getQueryName(), equalTo("ConstantScoreQuery"));
                 assertThat(query.getTimeBreakdown().keySet(), not(empty()));
                 assertThat(query.getTimeBreakdown().get("score"), equalTo(0L));
                 assertThat(query.getTimeBreakdown().get("score_count"), equalTo(0L));
@@ -649,7 +674,9 @@ public void testIndexSortingEarlyTermination() throws Exception {
             assertThat(context.queryResult().topDocs().topDocs.scoreDocs.length, equalTo(1));
             assertThat(context.queryResult().topDocs().topDocs.scoreDocs[0], instanceOf(FieldDoc.class));
             assertThat(fieldDoc.fields[0], anyOf(equalTo(1), equalTo(2)));
-            assertProfileData(context, "MatchAllDocsQuery", query -> {
+            // IndexSearcher#rewrite optimizes by rewriting non-scoring queries to ConstantScoreQuery
+            // see: https://github.com/apache/lucene/pull/672
+            assertProfileData(context, "ConstantScoreQuery", query -> {
                 assertThat(query.getTimeBreakdown().keySet(), not(empty()));
                 assertThat(query.getTimeBreakdown().get("score"), equalTo(0L));
                 assertThat(query.getTimeBreakdown().get("score_count"), equalTo(0L));
@@ -666,7 +693,9 @@ public void testIndexSortingEarlyTermination() throws Exception {
             assertThat(context.queryResult().topDocs().topDocs.scoreDocs.length, equalTo(1));
             assertThat(context.queryResult().topDocs().topDocs.scoreDocs[0], instanceOf(FieldDoc.class));
             assertThat(fieldDoc.fields[0], anyOf(equalTo(1), equalTo(2)));
-            assertProfileData(context, "MatchAllDocsQuery", query -> {
+            // IndexSearcher#rewrite optimizes by rewriting non-scoring queries to ConstantScoreQuery
+            // see: https://github.com/apache/lucene/pull/672
+            assertProfileData(context, "ConstantScoreQuery", query -> {
                 assertThat(query.getTimeBreakdown().keySet(), not(empty()));
                 assertThat(query.getTimeBreakdown().get("score"), equalTo(0L));
                 assertThat(query.getTimeBreakdown().get("score_count"), equalTo(0L));
@@ -721,7 +750,9 @@ public void testIndexSortScrollOptimization() throws Exception {
             assertNull(context.queryResult().terminatedEarly());
             assertThat(context.terminateAfter(), equalTo(0));
             assertThat(context.queryResult().getTotalHits().value, equalTo((long) numDocs));
-            assertProfileData(context, "MatchAllDocsQuery", query -> {
+            // IndexSearcher#rewrite optimizes by rewriting non-scoring queries to ConstantScoreQuery
+            // see: https://github.com/apache/lucene/pull/672
+            assertProfileData(context, "ConstantScoreQuery", query -> {
                 assertThat(query.getTimeBreakdown().keySet(), not(empty()));
                 assertThat(query.getTimeBreakdown().get("score"), equalTo(0L));
                 assertThat(query.getTimeBreakdown().get("score_count"), equalTo(0L));
@@ -829,7 +860,9 @@ public void testDisableTopScoreCollection() throws Exception {
         assertEquals(numDocs / 2, context.queryResult().topDocs().topDocs.totalHits.value);
         assertThat(context.queryResult().topDocs().topDocs.scoreDocs.length, equalTo(3));
         assertEquals(context.queryResult().topDocs().topDocs.totalHits.relation, TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO);
-        assertProfileData(context, "SpanNearQuery", query -> {
+        // IndexSearcher#rewrite optimizes by rewriting non-scoring queries to ConstantScoreQuery
+        // see: https://github.com/apache/lucene/pull/672
+        assertProfileData(context, "ConstantScoreQuery", query -> {
             assertThat(query.getTimeBreakdown().keySet(), not(empty()));
             assertThat(query.getTimeBreakdown().get("score"), equalTo(0L));
             assertThat(query.getTimeBreakdown().get("score_count"), equalTo(0L));

diff --git a/server/licenses/lucene-analysis-common-9.1.0.jar.sha1 b/server/licenses/lucene-analysis-common-9.1.0.jar.sha1
diff --git a/server/licenses/lucene-analysis-common-9.2.0-snapshot-f4f1f70.jar.sha1 b/server/licenses/lucene-analysis-common-9.2.0-snapshot-f4f1f70.jar.sha1
@@ -0,0 +1 @@
+1f7c4b91c8ef9f65e85c5190080b3f796076f355
diff --git a/server/licenses/lucene-backward-codecs-9.1.0.jar.sha1 b/server/licenses/lucene-backward-codecs-9.1.0.jar.sha1
diff --git a/server/licenses/lucene-backward-codecs-9.2.0-snapshot-f4f1f70.jar.sha1 b/server/licenses/lucene-backward-codecs-9.2.0-snapshot-f4f1f70.jar.sha1
@@ -0,0 +1 @@
+e3ee195405dc0cb249fe2eb3f3a6a848c4686645
diff --git a/server/licenses/lucene-core-9.1.0.jar.sha1 b/server/licenses/lucene-core-9.1.0.jar.sha1
diff --git a/server/licenses/lucene-core-9.2.0-snapshot-f4f1f70.jar.sha1 b/server/licenses/lucene-core-9.2.0-snapshot-f4f1f70.jar.sha1
@@ -0,0 +1 @@
+f1cb45d20f7f23c420c56a94e9153e96bfdd6e1f
diff --git a/server/licenses/lucene-grouping-9.1.0.jar.sha1 b/server/licenses/lucene-grouping-9.1.0.jar.sha1
diff --git a/server/licenses/lucene-grouping-9.2.0-snapshot-f4f1f70.jar.sha1 b/server/licenses/lucene-grouping-9.2.0-snapshot-f4f1f70.jar.sha1
@@ -0,0 +1 @@
+29052ac8f5255c8df2bb1d3d0da94e112c181679
diff --git a/server/licenses/lucene-highlighter-9.1.0.jar.sha1 b/server/licenses/lucene-highlighter-9.1.0.jar.sha1
diff --git a/server/licenses/lucene-highlighter-9.2.0-snapshot-f4f1f70.jar.sha1 b/server/licenses/lucene-highlighter-9.2.0-snapshot-f4f1f70.jar.sha1
@@ -0,0 +1 @@
+d710569c00d561c70d8290de4c4c15fe9735f94f
diff --git a/server/licenses/lucene-join-9.1.0.jar.sha1 b/server/licenses/lucene-join-9.1.0.jar.sha1
diff --git a/server/licenses/lucene-join-9.2.0-snapshot-f4f1f70.jar.sha1 b/server/licenses/lucene-join-9.2.0-snapshot-f4f1f70.jar.sha1
@@ -0,0 +1 @@
+0f3081b32664d8ca6318e69dd054befb5f9a334b
diff --git a/server/licenses/lucene-memory-9.1.0.jar.sha1 b/server/licenses/lucene-memory-9.1.0.jar.sha1
diff --git a/server/licenses/lucene-memory-9.2.0-snapshot-f4f1f70.jar.sha1 b/server/licenses/lucene-memory-9.2.0-snapshot-f4f1f70.jar.sha1
@@ -0,0 +1 @@
+81b63e23b87c054c140ff6a1e2e6696ca750d51c
diff --git a/server/licenses/lucene-misc-9.1.0.jar.sha1 b/server/licenses/lucene-misc-9.1.0.jar.sha1
diff --git a/server/licenses/lucene-misc-9.2.0-snapshot-f4f1f70.jar.sha1 b/server/licenses/lucene-misc-9.2.0-snapshot-f4f1f70.jar.sha1
@@ -0,0 +1 @@
+0cdea200c1890b877d26ce58b7d797f122bb8328
diff --git a/server/licenses/lucene-queries-9.1.0.jar.sha1 b/server/licenses/lucene-queries-9.1.0.jar.sha1
diff --git a/server/licenses/lucene-queries-9.2.0-snapshot-f4f1f70.jar.sha1 b/server/licenses/lucene-queries-9.2.0-snapshot-f4f1f70.jar.sha1
@@ -0,0 +1 @@
+50d8395e3afc502f267cb308399ab783edfabec0
diff --git a/server/licenses/lucene-queryparser-9.1.0.jar.sha1 b/server/licenses/lucene-queryparser-9.1.0.jar.sha1
diff --git a/server/licenses/lucene-queryparser-9.2.0-snapshot-f4f1f70.jar.sha1 b/server/licenses/lucene-queryparser-9.2.0-snapshot-f4f1f70.jar.sha1
@@ -0,0 +1 @@
+815b394c8be5cbb9673011953da38d39a843b0fa
diff --git a/server/licenses/lucene-sandbox-9.1.0.jar.sha1 b/server/licenses/lucene-sandbox-9.1.0.jar.sha1
diff --git a/server/licenses/lucene-sandbox-9.2.0-snapshot-f4f1f70.jar.sha1 b/server/licenses/lucene-sandbox-9.2.0-snapshot-f4f1f70.jar.sha1
@@ -0,0 +1 @@
+7bb7c539172dc3513d4f34e7f29d2cd3a0352361
diff --git a/server/licenses/lucene-spatial-extras-9.1.0.jar.sha1 b/server/licenses/lucene-spatial-extras-9.1.0.jar.sha1
diff --git a/server/licenses/lucene-spatial-extras-9.2.0-snapshot-f4f1f70.jar.sha1 b/server/licenses/lucene-spatial-extras-9.2.0-snapshot-f4f1f70.jar.sha1
@@ -0,0 +1 @@
+7bc2f2e37f866e3b376f083e4b7cc89a8cb45fd0
diff --git a/server/licenses/lucene-spatial3d-9.1.0.jar.sha1 b/server/licenses/lucene-spatial3d-9.1.0.jar.sha1
diff --git a/server/licenses/lucene-spatial3d-9.2.0-snapshot-f4f1f70.jar.sha1 b/server/licenses/lucene-spatial3d-9.2.0-snapshot-f4f1f70.jar.sha1
@@ -0,0 +1 @@
+a5f79bb1f8337dbe6fc50fc5abd46d4eaaf4d433
diff --git a/server/licenses/lucene-suggest-9.1.0.jar.sha1 b/server/licenses/lucene-suggest-9.1.0.jar.sha1
diff --git a/server/licenses/lucene-suggest-9.2.0-snapshot-f4f1f70.jar.sha1 b/server/licenses/lucene-suggest-9.2.0-snapshot-f4f1f70.jar.sha1
@@ -0,0 +1 @@
+9e74f66171ea215e8c4936588381c0950c290c80
diff --git a/server/src/main/java/org/opensearch/Version.java b/server/src/main/java/org/opensearch/Version.java
@@ -83,7 +83,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_1_3_2 = new Version(1030299, org.apache.lucene.util.Version.LUCENE_8_10_1);
     public static final Version V_2_0_0 = new Version(2000099, org.apache.lucene.util.Version.LUCENE_9_1_0);
     public static final Version V_2_1_0 = new Version(2010099, org.apache.lucene.util.Version.LUCENE_9_1_0);
-    public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_9_1_0);
+    public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_9_2_0);
     public static final Version CURRENT = V_3_0_0;
 
     public static Version readVersion(StreamInput in) throws IOException {

diff --git a/server/src/test/java/org/opensearch/common/lucene/uid/VersionsTests.java b/server/src/test/java/org/opensearch/common/lucene/uid/VersionsTests.java
@@ -224,7 +224,7 @@ public void testLuceneVersionOnUnknownVersions() {
         assertEquals(VersionUtils.getFirstVersion().luceneVersion.major - 1, version.luceneVersion.major);
 
         // future version, should be the same version as today
-        version = Version.fromString("2.77.1");
+        version = Version.fromString(Version.CURRENT.major + ".77.1");
         assertEquals(Version.CURRENT.luceneVersion, version.luceneVersion);
     }
 }