Revert "[Backport 2.x] [Upgrade] Lucene 9.5.0 release (opensearch-pro…

…ject#6078) (opensearch-project#6116)" This reverts commit 090ecab.
dreamer-89 · May 16, 2023 · 9c5c48b · 9c5c48b
1 parent 6aecbb2
commit 9c5c48b
Show file tree

Hide file tree

Showing 49 changed files with 595 additions and 1,021 deletions.
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -1,5 +1,5 @@
 opensearch        = 2.8.0
-lucene            = 9.6.0
+lucene            = 9.4.2
 
 bundled_jdk_vendor = adoptium
 bundled_jdk = 17.0.7+7
@@ -19,9 +19,15 @@ asm               = 9.5
 jettison          = 1.5.4
 woodstox          = 6.4.0
 kotlin            = 1.7.10
+<<<<<<< HEAD
 antlr4            = 4.11.1
 guava             = 31.1-jre
+<<<<<<< HEAD
 protobuf          = 3.22.3
+=======
+=======
+>>>>>>> parent of 090ecabafbc ([Backport 2.x] [Upgrade] Lucene 9.5.0 release (#6078) (#6116))
+>>>>>>> 6237f6bda22 (Revert "[Backport 2.x] [Upgrade] Lucene 9.5.0 release (#6078) (#6116)")
 
 # 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,7 +50,6 @@
 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;
@@ -62,7 +61,6 @@
 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
@@ -272,13 +270,9 @@ public void testPhrasePrefix() throws IOException {
         refresh();
         logger.info("--> highlighting and searching on field0");
 
-        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"))
+        SearchSourceBuilder 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();
+        SearchResponse 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"));
 
@@ -421,7 +415,6 @@ public void testPhrasePrefix() throws IOException {
     public static XContentBuilder type1TermVectorMapping() throws IOException {
         return XContentFactory.jsonBuilder()
             .startObject()
-            .startObject("_doc")
             .startObject("properties")
             .startObject("field1")
             .field("type", "text")
@@ -432,7 +425,6 @@ 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:${versions.antlr4}"
+  api 'org.antlr:antlr4-runtime:4.9.3'
   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
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
@@ -0,0 +1 @@
+81befc16ebedb8b8aea3e4c0835dd5ca7e8523a8
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
@@ -0,0 +1 @@
+f433ede87302221b48703a890e5f5701cf1b021d
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:${versions.antlr4}"
+  api 'org.antlr:antlr4-runtime:4.9.3'
   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:${versions.antlr4}"
+  regenerate 'org.antlr:antlr4:4.5.3'
 }
 
 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
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
@@ -0,0 +1 @@
+81befc16ebedb8b8aea3e4c0835dd5ca7e8523a8
diff --git a/modules/lang-painless/src/main/java/org/opensearch/painless/antlr/PainlessLexer.java b/modules/lang-painless/src/main/java/org/opensearch/painless/antlr/PainlessLexer.java