[Backport 2.x] [Upgrade] Lucene 9.5.0 release (opensearch-project#6078)…

… (opensearch-project#6116) * [Upgrade] Lucene 9.5.0 release (opensearch-project#6078) Upgrades to official release of Lucene 9.5. Signed-off-by: Nicholas Walter Knize <[email protected]> Co-authord-by: Suraj Singh <[email protected]> * Bump antlr4 from 4.9.3 to 4.11.1 Signed-off-by: Andriy Redko <[email protected]> --------- Signed-off-by: Nicholas Walter Knize <[email protected]> Signed-off-by: Andriy Redko <[email protected]> Co-authored-by: Andriy Redko <[email protected]>
mch2 · Jan 31, 2023 · 090ecab · 090ecab
1 parent b2ddd9b
commit 090ecab
Show file tree

Hide file tree

Showing 73 changed files with 1,048 additions and 591 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - OpenJDK Update (January 2023 Patch releases) ([#6075](https://github.com/opensearch-project/OpenSearch/pull/6075))
 - Bumps `Mockito` from 4.7.0 to 5.1.0, `ByteBuddy` from 1.12.18 to 1.12.22 ([#6088](https://github.com/opensearch-project/OpenSearch/pull/6088))
 - Bumps `joda` from 2.10.13 to 2.12.2 ([#6095](https://github.com/opensearch-project/OpenSearch/pull/6095))
+- Upgrade to Lucene 9.5.0 ([#6078](https://github.com/opensearch-project/OpenSearch/pull/6078))
+- Bump antlr4 from 4.9.3 to 4.11.1 ([#6116](https://github.com/opensearch-project/OpenSearch/pull/6116))
 
 ### Changed
 - Use ReplicationFailedException instead of OpensearchException in ReplicationTarget ([#4725](https://github.com/opensearch-project/OpenSearch/pull/4725))

diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -1,5 +1,5 @@
 opensearch        = 2.6.0
-lucene            = 9.4.2
+lucene            = 9.5.0
 
 bundled_jdk_vendor = adoptium
 bundled_jdk = 17.0.6+10
@@ -12,13 +12,14 @@ jackson_databind  = 2.14.1
 snakeyaml         = 1.32
 icu4j             = 70.1
 supercsv          = 2.4.0
-# Update to 2.17.2+ is breaking OpenSearchJsonLayout (see https://issues.apache.org/jira/browse/LOG4J2-3562) 
+# Update to 2.17.2+ is breaking OpenSearchJsonLayout (see https://issues.apache.org/jira/browse/LOG4J2-3562)
 log4j             = 2.17.1
 slf4j             = 1.7.36
 asm               = 9.4
 jettison          = 1.5.1
 woodstox          = 6.4.0
 kotlin            = 1.7.10
+antlr4            = 4.11.1
 
 # when updating the JNA version, also update the version in buildSrc/build.gradle
 jna               = 5.5.0

diff --git a/...is-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java b/...is-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java
@@ -50,6 +50,7 @@
 import static org.opensearch.client.Requests.searchRequest;
 import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder;
 import static org.opensearch.index.query.QueryBuilders.boolQuery;
+import static org.opensearch.index.query.QueryBuilders.matchAllQuery;
 import static org.opensearch.index.query.QueryBuilders.matchPhrasePrefixQuery;
 import static org.opensearch.index.query.QueryBuilders.matchPhraseQuery;
 import static org.opensearch.index.query.QueryBuilders.matchQuery;
@@ -61,6 +62,7 @@
 import static org.hamcrest.Matchers.anyOf;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.startsWith;
+import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount;
 
 public class HighlighterWithAnalyzersTests extends OpenSearchIntegTestCase {
     @Override
@@ -270,9 +272,13 @@ public void testPhrasePrefix() throws IOException {
         refresh();
         logger.info("--> highlighting and searching on field0");
 
-        SearchSourceBuilder source = searchSource().query(matchPhrasePrefixQuery("field0", "bro"))
-            .highlighter(highlight().field("field0").order("score").preTags("<x>").postTags("</x>"));
+        SearchSourceBuilder source = searchSource().query(matchAllQuery());
         SearchResponse searchResponse = client().search(searchRequest("first_test_index").source(source)).actionGet();
+        assertHitCount(searchResponse, 2);
+
+        source = searchSource().query(matchPhrasePrefixQuery("field0", "bro"))
+            .highlighter(highlight().field("field0").order("score").preTags("<x>").postTags("</x>"));
+        searchResponse = client().search(searchRequest("first_test_index").source(source)).actionGet();
 
         assertHighlight(searchResponse, 0, "field0", 0, 1, equalTo("The quick <x>brown</x> fox jumps over the lazy dog"));
 
@@ -415,6 +421,7 @@ public void testPhrasePrefix() throws IOException {
     public static XContentBuilder type1TermVectorMapping() throws IOException {
         return XContentFactory.jsonBuilder()
             .startObject()
+            .startObject("_doc")
             .startObject("properties")
             .startObject("field1")
             .field("type", "text")
@@ -425,6 +432,7 @@ public static XContentBuilder type1TermVectorMapping() throws IOException {
             .field("term_vector", "with_positions_offsets")
             .endObject()
             .endObject()
+            .endObject()
             .endObject();
     }
 }
diff --git a/modules/lang-expression/build.gradle b/modules/lang-expression/build.gradle
@@ -37,7 +37,7 @@ opensearchplugin {
 
 dependencies {
   api "org.apache.lucene:lucene-expressions:${versions.lucene}"
-  api 'org.antlr:antlr4-runtime:4.9.3'
+  api "org.antlr:antlr4-runtime:${versions.antlr4}"
   api "org.ow2.asm:asm:${versions.asm}"
   api "org.ow2.asm:asm-commons:${versions.asm}"
   api "org.ow2.asm:asm-tree:${versions.asm}"

diff --git a/modules/lang-expression/licenses/antlr4-runtime-4.11.1.jar.sha1 b/modules/lang-expression/licenses/antlr4-runtime-4.11.1.jar.sha1
@@ -0,0 +1 @@
+069214c1de1960040729702eb58deac8827135e7
diff --git a/modules/lang-expression/licenses/antlr4-runtime-4.9.3.jar.sha1 b/modules/lang-expression/licenses/antlr4-runtime-4.9.3.jar.sha1
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.4.2.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.4.2.jar.sha1
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.5.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.5.0.jar.sha1
@@ -0,0 +1 @@
+62f3d3630ecc14069d5c24b9693df5a2787f8202
diff --git a/modules/lang-painless/build.gradle b/modules/lang-painless/build.gradle
@@ -53,7 +53,7 @@ testClusters.all {
 }
 
 dependencies {
-  api 'org.antlr:antlr4-runtime:4.9.3'
+  api "org.antlr:antlr4-runtime:${versions.antlr4}"
   api "org.ow2.asm:asm-util:${versions.asm}"
   api "org.ow2.asm:asm-tree:${versions.asm}"
   api "org.ow2.asm:asm-commons:${versions.asm}"
@@ -160,7 +160,7 @@ configurations {
 }
 
 dependencies {
-  regenerate 'org.antlr:antlr4:4.5.3'
+  regenerate "org.antlr:antlr4:${versions.antlr4}"
 }
 
 String grammarPath = 'src/main/antlr'

diff --git a/modules/lang-painless/licenses/antlr4-runtime-4.11.1.jar.sha1 b/modules/lang-painless/licenses/antlr4-runtime-4.11.1.jar.sha1
@@ -0,0 +1 @@
+069214c1de1960040729702eb58deac8827135e7
diff --git a/modules/lang-painless/licenses/antlr4-runtime-4.9.3.jar.sha1 b/modules/lang-painless/licenses/antlr4-runtime-4.9.3.jar.sha1