Merge branch 'opensearch-project:main' into searchbackpressure/search…

…-task-cancellation
opensearch-project · Dec 20, 2022 · dee7efb · dee7efb
2 parents 5817770 + 306b199
commit dee7efb
Show file tree

Hide file tree

Showing 58 changed files with 944 additions and 551 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## [Unreleased]
+### Dependencies
+- Bumps `protobuf-java` from 3.21.11 to 3.21.12
+
 All notable changes to this project are documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). See the [CONTRIBUTING guide](./CONTRIBUTING.md#Changelog) for instructions on how to add changelog entries.
@@ -57,6 +61,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Update to Gradle 7.6 and JDK-19 ([#4973](https://github.com/opensearch-project/OpenSearch/pull/4973))
 - Bumps `protobuf-java` from 3.21.9 to 3.21.11 in /plugins/repository-hdfs ([#5519](https://github.com/opensearch-project/OpenSearch/pull/5519))
 - Update Apache Lucene to 9.5.0-snapshot-d5cef1c ([#5570](https://github.com/opensearch-project/OpenSearch/pull/5570))
+- Bump antlr4 from 4.9.3 to 4.11.1 ([#4546](https://github.com/opensearch-project/OpenSearch/pull/4546))
 
 ### Changed
 - [CCR] Add getHistoryOperationsFromTranslog method to fetch the history snapshot from translogs ([#3948](https://github.com/opensearch-project/OpenSearch/pull/3948))
@@ -121,4 +126,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Security
 
 [Unreleased 3.0]: https://github.com/opensearch-project/OpenSearch/compare/2.4...HEAD
-[Unreleased 2.x]: https://github.com/opensearch-project/OpenSearch/compare/2.4...2.x
+[Unreleased 2.x]: https://github.com/opensearch-project/OpenSearch/compare/2.4...2.x
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -1,5 +1,5 @@
 opensearch        = 3.0.0
-lucene            = 9.5.0-snapshot-d5cef1c
+lucene            = 9.5.0-snapshot-6700b7e
 
 bundled_jdk_vendor = adoptium
 bundled_jdk = 19.0.1+10
@@ -20,6 +20,7 @@ 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/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.5.0-snapshot-6700b7e.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.5.0-snapshot-6700b7e.jar.sha1
@@ -0,0 +1 @@
+08df331f48c00ce93cd53034e72d1c6df6089d4f
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.5.0-snapshot-d5cef1c.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.5.0-snapshot-d5cef1c.jar.sha1
diff --git a/modules/lang-painless/build.gradle b/modules/lang-painless/build.gradle
@@ -48,7 +48,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}"
@@ -155,7 +155,7 @@ configurations {
 }
 
 dependencies {
-  regenerate 'org.antlr:antlr4:4.9.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
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
diff --git a/modules/lang-painless/src/main/java/org/opensearch/painless/antlr/PainlessParser.java b/modules/lang-painless/src/main/java/org/opensearch/painless/antlr/PainlessParser.java
diff --git a/.../lang-painless/src/main/java/org/opensearch/painless/antlr/PainlessParserBaseVisitor.java b/.../lang-painless/src/main/java/org/opensearch/painless/antlr/PainlessParserBaseVisitor.java
@@ -43,6 +43,7 @@
  * @param <T> The return type of the visit operation. Use {@link Void} for
  * operations with no return type.
  */
+@SuppressWarnings("CheckReturnValue")
 class PainlessParserBaseVisitor<T> extends AbstractParseTreeVisitor<T> implements PainlessParserVisitor<T> {
     /**
      * {@inheritDoc}

diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.5.0-snapshot-6700b7e.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.5.0-snapshot-6700b7e.jar.sha1
@@ -0,0 +1 @@
+a1e6046cc43c434f7b67a067d79acb7afc16d2a5
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.5.0-snapshot-d5cef1c.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.5.0-snapshot-d5cef1c.jar.sha1
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.5.0-snapshot-6700b7e.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.5.0-snapshot-6700b7e.jar.sha1
@@ -0,0 +1 @@
+3aaa77079e6e9d3aa48f14567ff043c17928aa42
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.5.0-snapshot-d5cef1c.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.5.0-snapshot-d5cef1c.jar.sha1
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.5.0-snapshot-6700b7e.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.5.0-snapshot-6700b7e.jar.sha1
@@ -0,0 +1 @@
+20571ad73b364476fe03edefac0a4b17d93496d4
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.5.0-snapshot-d5cef1c.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.5.0-snapshot-d5cef1c.jar.sha1
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.5.0-snapshot-6700b7e.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.5.0-snapshot-6700b7e.jar.sha1
@@ -0,0 +1 @@
+51e525be810f618cca3607b050e67cef7dd10b3a
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.5.0-snapshot-d5cef1c.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.5.0-snapshot-d5cef1c.jar.sha1
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.5.0-snapshot-6700b7e.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.5.0-snapshot-6700b7e.jar.sha1
@@ -0,0 +1 @@
+2f4ea57af1e7266349281ba89a6f44f9eea95f6e
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.5.0-snapshot-d5cef1c.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.5.0-snapshot-d5cef1c.jar.sha1
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.5.0-snapshot-6700b7e.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.5.0-snapshot-6700b7e.jar.sha1
@@ -0,0 +1 @@
+5eb8d1fb7bd44ddc4a50cab3f9d9feab05a7e4c1
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.5.0-snapshot-d5cef1c.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.5.0-snapshot-d5cef1c.jar.sha1
diff --git a/...ns/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.5.0-snapshot-6700b7e.jar.sha1 b/...ns/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.5.0-snapshot-6700b7e.jar.sha1
@@ -0,0 +1 @@
+7dc7c673303ecf7c020aceb4be371e45021b559b
diff --git a/...ns/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.5.0-snapshot-d5cef1c.jar.sha1 b/...ns/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.5.0-snapshot-d5cef1c.jar.sha1
diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle
@@ -68,7 +68,7 @@ dependencies {
   api 'org.apache.avro:avro:1.11.1'
   api 'com.google.code.gson:gson:2.10'
   runtimeOnly 'com.google.guava:guava:31.1-jre'
-  api 'com.google.protobuf:protobuf-java:3.21.11'
+  api 'com.google.protobuf:protobuf-java:3.21.12'
   api "commons-logging:commons-logging:${versions.commonslogging}"
   api 'commons-cli:commons-cli:1.5.0'
   api "commons-codec:commons-codec:${versions.commonscodec}"

diff --git a/plugins/repository-hdfs/licenses/protobuf-java-3.21.11.jar.sha1 b/plugins/repository-hdfs/licenses/protobuf-java-3.21.11.jar.sha1
diff --git a/plugins/repository-hdfs/licenses/protobuf-java-3.21.12.jar.sha1 b/plugins/repository-hdfs/licenses/protobuf-java-3.21.12.jar.sha1
@@ -0,0 +1 @@
+5589e79a33cb6509f7e681d7cf4fc59d47c51c71
diff --git a/server/licenses/lucene-analysis-common-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-analysis-common-9.5.0-snapshot-6700b7e.jar.sha1
@@ -0,0 +1 @@
+006b4486680b0e31b4605580f86e920f6777bb1f
diff --git a/server/licenses/lucene-analysis-common-9.5.0-snapshot-d5cef1c.jar.sha1 b/server/licenses/lucene-analysis-common-9.5.0-snapshot-d5cef1c.jar.sha1
diff --git a/server/licenses/lucene-backward-codecs-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-backward-codecs-9.5.0-snapshot-6700b7e.jar.sha1
@@ -0,0 +1 @@
+a020dfccda5436b1753867d2c1858ce03889faa5
diff --git a/server/licenses/lucene-backward-codecs-9.5.0-snapshot-d5cef1c.jar.sha1 b/server/licenses/lucene-backward-codecs-9.5.0-snapshot-d5cef1c.jar.sha1
diff --git a/server/licenses/lucene-core-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-core-9.5.0-snapshot-6700b7e.jar.sha1
@@ -0,0 +1 @@
+ee2db9baf6cbbe8a9bb274e21f693388b31d4c27
diff --git a/server/licenses/lucene-core-9.5.0-snapshot-d5cef1c.jar.sha1 b/server/licenses/lucene-core-9.5.0-snapshot-d5cef1c.jar.sha1
diff --git a/server/licenses/lucene-grouping-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-grouping-9.5.0-snapshot-6700b7e.jar.sha1
@@ -0,0 +1 @@
+5087c01d1fde29e89767e845db97537f23a74f82
diff --git a/server/licenses/lucene-grouping-9.5.0-snapshot-d5cef1c.jar.sha1 b/server/licenses/lucene-grouping-9.5.0-snapshot-d5cef1c.jar.sha1
diff --git a/server/licenses/lucene-highlighter-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-highlighter-9.5.0-snapshot-6700b7e.jar.sha1
@@ -0,0 +1 @@
+048c8b99bb17fc2e32a278f9d0396be299a24a44
diff --git a/server/licenses/lucene-highlighter-9.5.0-snapshot-d5cef1c.jar.sha1 b/server/licenses/lucene-highlighter-9.5.0-snapshot-d5cef1c.jar.sha1
diff --git a/server/licenses/lucene-join-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-join-9.5.0-snapshot-6700b7e.jar.sha1
@@ -0,0 +1 @@
+187e3da58037aec9d0309c28776d3e806b8c3ea8
diff --git a/server/licenses/lucene-join-9.5.0-snapshot-d5cef1c.jar.sha1 b/server/licenses/lucene-join-9.5.0-snapshot-d5cef1c.jar.sha1
diff --git a/server/licenses/lucene-memory-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-memory-9.5.0-snapshot-6700b7e.jar.sha1
@@ -0,0 +1 @@
+978470b902d93ffdfb3f3e95903c74b97e61cfae
diff --git a/server/licenses/lucene-memory-9.5.0-snapshot-d5cef1c.jar.sha1 b/server/licenses/lucene-memory-9.5.0-snapshot-d5cef1c.jar.sha1
diff --git a/server/licenses/lucene-misc-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-misc-9.5.0-snapshot-6700b7e.jar.sha1
@@ -0,0 +1 @@
+d727a2d00a8bbecc14579775dde0b5d18f9b48ea
diff --git a/server/licenses/lucene-misc-9.5.0-snapshot-d5cef1c.jar.sha1 b/server/licenses/lucene-misc-9.5.0-snapshot-d5cef1c.jar.sha1
diff --git a/server/licenses/lucene-queries-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-queries-9.5.0-snapshot-6700b7e.jar.sha1
@@ -0,0 +1 @@
+70ea9bd7ae0cc33ecd4a7eaa47c0849edfc5087b
diff --git a/server/licenses/lucene-queries-9.5.0-snapshot-d5cef1c.jar.sha1 b/server/licenses/lucene-queries-9.5.0-snapshot-d5cef1c.jar.sha1
diff --git a/server/licenses/lucene-queryparser-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-queryparser-9.5.0-snapshot-6700b7e.jar.sha1
@@ -0,0 +1 @@
+e8f624f29fa6f975c6bf8e9c4a5f51b5ecec5d3e
diff --git a/server/licenses/lucene-queryparser-9.5.0-snapshot-d5cef1c.jar.sha1 b/server/licenses/lucene-queryparser-9.5.0-snapshot-d5cef1c.jar.sha1
diff --git a/server/licenses/lucene-sandbox-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-sandbox-9.5.0-snapshot-6700b7e.jar.sha1
@@ -0,0 +1 @@
+7144b2bd92d95c7e24a0253e1c0753e5d7620c97
diff --git a/server/licenses/lucene-sandbox-9.5.0-snapshot-d5cef1c.jar.sha1 b/server/licenses/lucene-sandbox-9.5.0-snapshot-d5cef1c.jar.sha1
diff --git a/server/licenses/lucene-spatial-extras-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-spatial-extras-9.5.0-snapshot-6700b7e.jar.sha1
@@ -0,0 +1 @@
+f61ce4f1890a3fb60fe66700e773001dc891f2ae
diff --git a/server/licenses/lucene-spatial-extras-9.5.0-snapshot-d5cef1c.jar.sha1 b/server/licenses/lucene-spatial-extras-9.5.0-snapshot-d5cef1c.jar.sha1
diff --git a/server/licenses/lucene-spatial3d-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-spatial3d-9.5.0-snapshot-6700b7e.jar.sha1
@@ -0,0 +1 @@
+31c18a397ecf3aee12d3809ef4b9b000ef1bde17
diff --git a/server/licenses/lucene-spatial3d-9.5.0-snapshot-d5cef1c.jar.sha1 b/server/licenses/lucene-spatial3d-9.5.0-snapshot-d5cef1c.jar.sha1
diff --git a/server/licenses/lucene-suggest-9.5.0-snapshot-6700b7e.jar.sha1 b/server/licenses/lucene-suggest-9.5.0-snapshot-6700b7e.jar.sha1
@@ -0,0 +1 @@
+3526d986a5b0e3cbfa1caae5ecf591269d5b7ed5
diff --git a/server/licenses/lucene-suggest-9.5.0-snapshot-d5cef1c.jar.sha1 b/server/licenses/lucene-suggest-9.5.0-snapshot-d5cef1c.jar.sha1