From 3bf1fec4a7664e6c2f5deeb6b30b5a5491122f3e Mon Sep 17 00:00:00 2001 From: Andriy Redko Date: Wed, 12 Jul 2023 17:04:18 -0400 Subject: [PATCH] Update Apache Lucene to 9.8.0-snapshot-79b9664 Signed-off-by: Andriy Redko --- buildSrc/version.properties | 2 +- libs/core/licenses/lucene-core-9.7.0.jar.sha1 | 1 - .../core/licenses/lucene-core-9.8.0-snapshot-79b9664.jar.sha1 | 1 + libs/core/src/main/java/org/opensearch/Version.java | 4 ++-- .../licenses/lucene-expressions-9.7.0.jar.sha1 | 1 - .../lucene-expressions-9.8.0-snapshot-79b9664.jar.sha1 | 1 + .../analysis-icu/licenses/lucene-analysis-icu-9.7.0.jar.sha1 | 1 - .../lucene-analysis-icu-9.8.0-snapshot-79b9664.jar.sha1 | 1 + .../licenses/lucene-analysis-kuromoji-9.7.0.jar.sha1 | 1 - .../lucene-analysis-kuromoji-9.8.0-snapshot-79b9664.jar.sha1 | 1 + .../licenses/lucene-analysis-nori-9.7.0.jar.sha1 | 1 - .../lucene-analysis-nori-9.8.0-snapshot-79b9664.jar.sha1 | 1 + .../licenses/lucene-analysis-phonetic-9.7.0.jar.sha1 | 1 - .../lucene-analysis-phonetic-9.8.0-snapshot-79b9664.jar.sha1 | 1 + .../licenses/lucene-analysis-smartcn-9.7.0.jar.sha1 | 1 - .../lucene-analysis-smartcn-9.8.0-snapshot-79b9664.jar.sha1 | 1 + .../licenses/lucene-analysis-stempel-9.7.0.jar.sha1 | 1 - .../lucene-analysis-stempel-9.8.0-snapshot-79b9664.jar.sha1 | 1 + .../licenses/lucene-analysis-morfologik-9.7.0.jar.sha1 | 1 - ...lucene-analysis-morfologik-9.8.0-snapshot-79b9664.jar.sha1 | 1 + server/licenses/lucene-analysis-common-9.7.0.jar.sha1 | 1 - .../lucene-analysis-common-9.8.0-snapshot-79b9664.jar.sha1 | 1 + server/licenses/lucene-backward-codecs-9.7.0.jar.sha1 | 1 - .../lucene-backward-codecs-9.8.0-snapshot-79b9664.jar.sha1 | 1 + server/licenses/lucene-core-9.7.0.jar.sha1 | 1 - server/licenses/lucene-core-9.8.0-snapshot-79b9664.jar.sha1 | 1 + server/licenses/lucene-grouping-9.7.0.jar.sha1 | 1 - .../licenses/lucene-grouping-9.8.0-snapshot-79b9664.jar.sha1 | 1 + server/licenses/lucene-highlighter-9.7.0.jar.sha1 | 1 - .../lucene-highlighter-9.8.0-snapshot-79b9664.jar.sha1 | 1 + server/licenses/lucene-join-9.7.0.jar.sha1 | 1 - server/licenses/lucene-join-9.8.0-snapshot-79b9664.jar.sha1 | 1 + server/licenses/lucene-memory-9.7.0.jar.sha1 | 1 - server/licenses/lucene-memory-9.8.0-snapshot-79b9664.jar.sha1 | 1 + server/licenses/lucene-misc-9.7.0.jar.sha1 | 1 - server/licenses/lucene-misc-9.8.0-snapshot-79b9664.jar.sha1 | 1 + server/licenses/lucene-queries-9.7.0.jar.sha1 | 1 - .../licenses/lucene-queries-9.8.0-snapshot-79b9664.jar.sha1 | 1 + server/licenses/lucene-queryparser-9.7.0.jar.sha1 | 1 - .../lucene-queryparser-9.8.0-snapshot-79b9664.jar.sha1 | 1 + server/licenses/lucene-sandbox-9.7.0.jar.sha1 | 1 - .../licenses/lucene-sandbox-9.8.0-snapshot-79b9664.jar.sha1 | 1 + server/licenses/lucene-spatial-extras-9.7.0.jar.sha1 | 1 - .../lucene-spatial-extras-9.8.0-snapshot-79b9664.jar.sha1 | 1 + server/licenses/lucene-spatial3d-9.7.0.jar.sha1 | 1 - .../licenses/lucene-spatial3d-9.8.0-snapshot-79b9664.jar.sha1 | 1 + server/licenses/lucene-suggest-9.7.0.jar.sha1 | 1 - .../licenses/lucene-suggest-9.8.0-snapshot-79b9664.jar.sha1 | 1 + .../search/suggest/completion/CompletionSuggester.java | 1 + 49 files changed, 27 insertions(+), 26 deletions(-) delete mode 100644 libs/core/licenses/lucene-core-9.7.0.jar.sha1 create mode 100644 libs/core/licenses/lucene-core-9.8.0-snapshot-79b9664.jar.sha1 delete mode 100644 modules/lang-expression/licenses/lucene-expressions-9.7.0.jar.sha1 create mode 100644 modules/lang-expression/licenses/lucene-expressions-9.8.0-snapshot-79b9664.jar.sha1 delete mode 100644 plugins/analysis-icu/licenses/lucene-analysis-icu-9.7.0.jar.sha1 create mode 100644 plugins/analysis-icu/licenses/lucene-analysis-icu-9.8.0-snapshot-79b9664.jar.sha1 delete mode 100644 plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.7.0.jar.sha1 create mode 100644 plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.8.0-snapshot-79b9664.jar.sha1 delete mode 100644 plugins/analysis-nori/licenses/lucene-analysis-nori-9.7.0.jar.sha1 create mode 100644 plugins/analysis-nori/licenses/lucene-analysis-nori-9.8.0-snapshot-79b9664.jar.sha1 delete mode 100644 plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.7.0.jar.sha1 create mode 100644 plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.8.0-snapshot-79b9664.jar.sha1 delete mode 100644 plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.7.0.jar.sha1 create mode 100644 plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.8.0-snapshot-79b9664.jar.sha1 delete mode 100644 plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.7.0.jar.sha1 create mode 100644 plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.8.0-snapshot-79b9664.jar.sha1 delete mode 100644 plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.7.0.jar.sha1 create mode 100644 plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.8.0-snapshot-79b9664.jar.sha1 delete mode 100644 server/licenses/lucene-analysis-common-9.7.0.jar.sha1 create mode 100644 server/licenses/lucene-analysis-common-9.8.0-snapshot-79b9664.jar.sha1 delete mode 100644 server/licenses/lucene-backward-codecs-9.7.0.jar.sha1 create mode 100644 server/licenses/lucene-backward-codecs-9.8.0-snapshot-79b9664.jar.sha1 delete mode 100644 server/licenses/lucene-core-9.7.0.jar.sha1 create mode 100644 server/licenses/lucene-core-9.8.0-snapshot-79b9664.jar.sha1 delete mode 100644 server/licenses/lucene-grouping-9.7.0.jar.sha1 create mode 100644 server/licenses/lucene-grouping-9.8.0-snapshot-79b9664.jar.sha1 delete mode 100644 server/licenses/lucene-highlighter-9.7.0.jar.sha1 create mode 100644 server/licenses/lucene-highlighter-9.8.0-snapshot-79b9664.jar.sha1 delete mode 100644 server/licenses/lucene-join-9.7.0.jar.sha1 create mode 100644 server/licenses/lucene-join-9.8.0-snapshot-79b9664.jar.sha1 delete mode 100644 server/licenses/lucene-memory-9.7.0.jar.sha1 create mode 100644 server/licenses/lucene-memory-9.8.0-snapshot-79b9664.jar.sha1 delete mode 100644 server/licenses/lucene-misc-9.7.0.jar.sha1 create mode 100644 server/licenses/lucene-misc-9.8.0-snapshot-79b9664.jar.sha1 delete mode 100644 server/licenses/lucene-queries-9.7.0.jar.sha1 create mode 100644 server/licenses/lucene-queries-9.8.0-snapshot-79b9664.jar.sha1 delete mode 100644 server/licenses/lucene-queryparser-9.7.0.jar.sha1 create mode 100644 server/licenses/lucene-queryparser-9.8.0-snapshot-79b9664.jar.sha1 delete mode 100644 server/licenses/lucene-sandbox-9.7.0.jar.sha1 create mode 100644 server/licenses/lucene-sandbox-9.8.0-snapshot-79b9664.jar.sha1 delete mode 100644 server/licenses/lucene-spatial-extras-9.7.0.jar.sha1 create mode 100644 server/licenses/lucene-spatial-extras-9.8.0-snapshot-79b9664.jar.sha1 delete mode 100644 server/licenses/lucene-spatial3d-9.7.0.jar.sha1 create mode 100644 server/licenses/lucene-spatial3d-9.8.0-snapshot-79b9664.jar.sha1 delete mode 100644 server/licenses/lucene-suggest-9.7.0.jar.sha1 create mode 100644 server/licenses/lucene-suggest-9.8.0-snapshot-79b9664.jar.sha1 diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 246f6e3444224..0559c793cf2ce 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -1,5 +1,5 @@ opensearch = 3.0.0 -lucene = 9.7.0 +lucene = 9.8.0-snapshot-79b9664 bundled_jdk_vendor = adoptium bundled_jdk = 20.0.1+9 diff --git a/libs/core/licenses/lucene-core-9.7.0.jar.sha1 b/libs/core/licenses/lucene-core-9.7.0.jar.sha1 deleted file mode 100644 index 2b0f77275c0ab..0000000000000 --- a/libs/core/licenses/lucene-core-9.7.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ad391210ffd806931334be9670a35af00c56f959 \ No newline at end of file diff --git a/libs/core/licenses/lucene-core-9.8.0-snapshot-79b9664.jar.sha1 b/libs/core/licenses/lucene-core-9.8.0-snapshot-79b9664.jar.sha1 new file mode 100644 index 0000000000000..0a3d6728c5827 --- /dev/null +++ b/libs/core/licenses/lucene-core-9.8.0-snapshot-79b9664.jar.sha1 @@ -0,0 +1 @@ +df1d6ee8870702d40f46d57063cd2eab97171371 \ No newline at end of file diff --git a/libs/core/src/main/java/org/opensearch/Version.java b/libs/core/src/main/java/org/opensearch/Version.java index f85da63bdbb1f..9329f221922ea 100644 --- a/libs/core/src/main/java/org/opensearch/Version.java +++ b/libs/core/src/main/java/org/opensearch/Version.java @@ -55,7 +55,7 @@ public class Version implements Comparable, ToXContentFragment { * The logic for ID is: XXYYZZAA, where XX is major version, YY is minor version, ZZ is revision, and AA is alpha/beta/rc indicator AA * values below 25 are for alpha builder (since 5.0), and above 25 and below 50 are beta builds, and below 99 are RC builds, with 99 * indicating a release the (internal) format of the id is there so we can easily do after/before checks on the id - * + *>> * IMPORTANT: Unreleased vs. Released Versions * * All listed versions MUST be released versions, except the last major, the last minor and the last revison. ONLY those are required @@ -91,7 +91,7 @@ public class Version implements Comparable, ToXContentFragment { public static final Version V_2_8_1 = new Version(2080199, org.apache.lucene.util.Version.LUCENE_9_6_0); public static final Version V_2_9_0 = new Version(2090099, org.apache.lucene.util.Version.LUCENE_9_7_0); public static final Version V_2_10_0 = new Version(2100099, org.apache.lucene.util.Version.LUCENE_9_7_0); - public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_9_7_0); + public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_9_8_0); public static final Version CURRENT = V_3_0_0; public static Version fromId(int id) { diff --git a/modules/lang-expression/licenses/lucene-expressions-9.7.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.7.0.jar.sha1 deleted file mode 100644 index ecf696b4b3b83..0000000000000 --- a/modules/lang-expression/licenses/lucene-expressions-9.7.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -297e1cfade4ef71466cc9d4f361d81807c8dc4c8 \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-expressions-9.8.0-snapshot-79b9664.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.8.0-snapshot-79b9664.jar.sha1 new file mode 100644 index 0000000000000..8b0f8809150f6 --- /dev/null +++ b/modules/lang-expression/licenses/lucene-expressions-9.8.0-snapshot-79b9664.jar.sha1 @@ -0,0 +1 @@ +300d4b63b0293d1611e715e53cc9b9ceee32a5fc \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.7.0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.7.0.jar.sha1 deleted file mode 100644 index 0ed030926ab93..0000000000000 --- a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.7.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -94293b169fb8572f440a5a4a523320ecf9778ffe \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.8.0-snapshot-79b9664.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.8.0-snapshot-79b9664.jar.sha1 new file mode 100644 index 0000000000000..9f35452f5e031 --- /dev/null +++ b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.8.0-snapshot-79b9664.jar.sha1 @@ -0,0 +1 @@ +8886032dcd3a80762c9778906ceaf88758a257db \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.7.0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.7.0.jar.sha1 deleted file mode 100644 index ddd67276606a5..0000000000000 --- a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.7.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2df800a38b64867b8dcd61fc2cd986114e4a80cb \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.8.0-snapshot-79b9664.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.8.0-snapshot-79b9664.jar.sha1 new file mode 100644 index 0000000000000..a87a3a5fc6891 --- /dev/null +++ b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.8.0-snapshot-79b9664.jar.sha1 @@ -0,0 +1 @@ +85d3430a452de5dfab400b91cbe91c6a9ae7c02a \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.7.0.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.7.0.jar.sha1 deleted file mode 100644 index 0cd68af98e724..0000000000000 --- a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.7.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a01e8153f34d72e8c8c0180c1dea5b10f677dd3a \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.8.0-snapshot-79b9664.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.8.0-snapshot-79b9664.jar.sha1 new file mode 100644 index 0000000000000..bc176a695e893 --- /dev/null +++ b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.8.0-snapshot-79b9664.jar.sha1 @@ -0,0 +1 @@ +0934239364971e9967b12a36c097e4d8b7f3b226 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.7.0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.7.0.jar.sha1 deleted file mode 100644 index c7b4d2dc6da75..0000000000000 --- a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.7.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b7d47d54683b0b1e09b271c32d1b7d3eb1990f49 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.8.0-snapshot-79b9664.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.8.0-snapshot-79b9664.jar.sha1 new file mode 100644 index 0000000000000..4aaf34663f378 --- /dev/null +++ b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.8.0-snapshot-79b9664.jar.sha1 @@ -0,0 +1 @@ +5498fbf583a7a6a7f280f3e68402cd3a785b045f \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.7.0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.7.0.jar.sha1 deleted file mode 100644 index 8df7245044171..0000000000000 --- a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.7.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5e68b9816e6cff8ee15f5b350cf2ffa54f9828b7 \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.8.0-snapshot-79b9664.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.8.0-snapshot-79b9664.jar.sha1 new file mode 100644 index 0000000000000..a7936ee5c9d0a --- /dev/null +++ b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.8.0-snapshot-79b9664.jar.sha1 @@ -0,0 +1 @@ +4b48bff1ecabe8f983869b67d602739a5782979f \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.7.0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.7.0.jar.sha1 deleted file mode 100644 index 974e4202f5ffb..0000000000000 --- a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.7.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d23b1f05b471e05d0d6068b3ece7c8c65672eae7 \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.8.0-snapshot-79b9664.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.8.0-snapshot-79b9664.jar.sha1 new file mode 100644 index 0000000000000..62615c9febebe --- /dev/null +++ b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.8.0-snapshot-79b9664.jar.sha1 @@ -0,0 +1 @@ +e14cc954d508aa590ac79794b7a43c60a3f2bccb \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.7.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.7.0.jar.sha1 deleted file mode 100644 index dce408a7d40ef..0000000000000 --- a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.7.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -dfb4313f3c68d337310522840d7144c1605d084a \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.8.0-snapshot-79b9664.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.8.0-snapshot-79b9664.jar.sha1 new file mode 100644 index 0000000000000..72abe12e68955 --- /dev/null +++ b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.8.0-snapshot-79b9664.jar.sha1 @@ -0,0 +1 @@ +940e6825e1b3c1e8e14a2531719cf53785e77dc4 \ No newline at end of file diff --git a/server/licenses/lucene-analysis-common-9.7.0.jar.sha1 b/server/licenses/lucene-analysis-common-9.7.0.jar.sha1 deleted file mode 100644 index 45d8f459573b1..0000000000000 --- a/server/licenses/lucene-analysis-common-9.7.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -27ba6caaa4587a982cd451f7217b5a982bcfc44a \ No newline at end of file diff --git a/server/licenses/lucene-analysis-common-9.8.0-snapshot-79b9664.jar.sha1 b/server/licenses/lucene-analysis-common-9.8.0-snapshot-79b9664.jar.sha1 new file mode 100644 index 0000000000000..4641ca588f0b8 --- /dev/null +++ b/server/licenses/lucene-analysis-common-9.8.0-snapshot-79b9664.jar.sha1 @@ -0,0 +1 @@ +359edffb4edf0d75b285c7a1fbb3c6888bdbd1b6 \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-9.7.0.jar.sha1 b/server/licenses/lucene-backward-codecs-9.7.0.jar.sha1 deleted file mode 100644 index 3981ea4fa226e..0000000000000 --- a/server/licenses/lucene-backward-codecs-9.7.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6389463bfbfcf902c8d31d12e9513a6818ac9d5e \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-9.8.0-snapshot-79b9664.jar.sha1 b/server/licenses/lucene-backward-codecs-9.8.0-snapshot-79b9664.jar.sha1 new file mode 100644 index 0000000000000..3e40d153db056 --- /dev/null +++ b/server/licenses/lucene-backward-codecs-9.8.0-snapshot-79b9664.jar.sha1 @@ -0,0 +1 @@ +96fea6478191d05f76a47f320cfbe9e604124a49 \ No newline at end of file diff --git a/server/licenses/lucene-core-9.7.0.jar.sha1 b/server/licenses/lucene-core-9.7.0.jar.sha1 deleted file mode 100644 index 2b0f77275c0ab..0000000000000 --- a/server/licenses/lucene-core-9.7.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ad391210ffd806931334be9670a35af00c56f959 \ No newline at end of file diff --git a/server/licenses/lucene-core-9.8.0-snapshot-79b9664.jar.sha1 b/server/licenses/lucene-core-9.8.0-snapshot-79b9664.jar.sha1 new file mode 100644 index 0000000000000..0a3d6728c5827 --- /dev/null +++ b/server/licenses/lucene-core-9.8.0-snapshot-79b9664.jar.sha1 @@ -0,0 +1 @@ +df1d6ee8870702d40f46d57063cd2eab97171371 \ No newline at end of file diff --git a/server/licenses/lucene-grouping-9.7.0.jar.sha1 b/server/licenses/lucene-grouping-9.7.0.jar.sha1 deleted file mode 100644 index 90acbf6dcee8d..0000000000000 --- a/server/licenses/lucene-grouping-9.7.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8e6f0c229f4861be641047c33b05067176e4279c \ No newline at end of file diff --git a/server/licenses/lucene-grouping-9.8.0-snapshot-79b9664.jar.sha1 b/server/licenses/lucene-grouping-9.8.0-snapshot-79b9664.jar.sha1 new file mode 100644 index 0000000000000..828dc297e6557 --- /dev/null +++ b/server/licenses/lucene-grouping-9.8.0-snapshot-79b9664.jar.sha1 @@ -0,0 +1 @@ +42517d06f398a2487a51a39ad3c4d443eb9dd438 \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-9.7.0.jar.sha1 b/server/licenses/lucene-highlighter-9.7.0.jar.sha1 deleted file mode 100644 index bfcca0bc6cb5b..0000000000000 --- a/server/licenses/lucene-highlighter-9.7.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -facb7c7ee0f75ed457a2d98f10d6430e25a53691 \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-9.8.0-snapshot-79b9664.jar.sha1 b/server/licenses/lucene-highlighter-9.8.0-snapshot-79b9664.jar.sha1 new file mode 100644 index 0000000000000..b9d0d59cdeff2 --- /dev/null +++ b/server/licenses/lucene-highlighter-9.8.0-snapshot-79b9664.jar.sha1 @@ -0,0 +1 @@ +f9679203fbad0d351f384b0794cf862087fb55ff \ No newline at end of file diff --git a/server/licenses/lucene-join-9.7.0.jar.sha1 b/server/licenses/lucene-join-9.7.0.jar.sha1 deleted file mode 100644 index 0dab3a7ddc41a..0000000000000 --- a/server/licenses/lucene-join-9.7.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d041bdc0947a14223cf68357407ee18b21027587 \ No newline at end of file diff --git a/server/licenses/lucene-join-9.8.0-snapshot-79b9664.jar.sha1 b/server/licenses/lucene-join-9.8.0-snapshot-79b9664.jar.sha1 new file mode 100644 index 0000000000000..0c5a8846842c6 --- /dev/null +++ b/server/licenses/lucene-join-9.8.0-snapshot-79b9664.jar.sha1 @@ -0,0 +1 @@ +0a5623c84e564527ebec58efbb001455448c234f \ No newline at end of file diff --git a/server/licenses/lucene-memory-9.7.0.jar.sha1 b/server/licenses/lucene-memory-9.7.0.jar.sha1 deleted file mode 100644 index 357a9c4b2ea26..0000000000000 --- a/server/licenses/lucene-memory-9.7.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0fade51ee353e15ddbbc45262aafe6f99ed020f1 \ No newline at end of file diff --git a/server/licenses/lucene-memory-9.8.0-snapshot-79b9664.jar.sha1 b/server/licenses/lucene-memory-9.8.0-snapshot-79b9664.jar.sha1 new file mode 100644 index 0000000000000..96599dd53e69b --- /dev/null +++ b/server/licenses/lucene-memory-9.8.0-snapshot-79b9664.jar.sha1 @@ -0,0 +1 @@ +26300fb04edc496cb33a519eb7d2f567f013b18c \ No newline at end of file diff --git a/server/licenses/lucene-misc-9.7.0.jar.sha1 b/server/licenses/lucene-misc-9.7.0.jar.sha1 deleted file mode 100644 index da5e1921626b2..0000000000000 --- a/server/licenses/lucene-misc-9.7.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7fcf451e2376526c3a027958812866cc5b0ff13f \ No newline at end of file diff --git a/server/licenses/lucene-misc-9.8.0-snapshot-79b9664.jar.sha1 b/server/licenses/lucene-misc-9.8.0-snapshot-79b9664.jar.sha1 new file mode 100644 index 0000000000000..114c2bfa136b4 --- /dev/null +++ b/server/licenses/lucene-misc-9.8.0-snapshot-79b9664.jar.sha1 @@ -0,0 +1 @@ +aaf52829e6ebcd85c14ca713b77f2f32f0f1910e \ No newline at end of file diff --git a/server/licenses/lucene-queries-9.7.0.jar.sha1 b/server/licenses/lucene-queries-9.7.0.jar.sha1 deleted file mode 100644 index fa82e95a7e19f..0000000000000 --- a/server/licenses/lucene-queries-9.7.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -126989d4622419aa06fcbf3a342e859cab8c8799 \ No newline at end of file diff --git a/server/licenses/lucene-queries-9.8.0-snapshot-79b9664.jar.sha1 b/server/licenses/lucene-queries-9.8.0-snapshot-79b9664.jar.sha1 new file mode 100644 index 0000000000000..3f769750ece23 --- /dev/null +++ b/server/licenses/lucene-queries-9.8.0-snapshot-79b9664.jar.sha1 @@ -0,0 +1 @@ +97407919432745b9788cee1aa7229003ff40b03a \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-9.7.0.jar.sha1 b/server/licenses/lucene-queryparser-9.7.0.jar.sha1 deleted file mode 100644 index 438db0aea66e1..0000000000000 --- a/server/licenses/lucene-queryparser-9.7.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6e77bde908ff698354e4a2149e6dd4658b56d7b0 \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-9.8.0-snapshot-79b9664.jar.sha1 b/server/licenses/lucene-queryparser-9.8.0-snapshot-79b9664.jar.sha1 new file mode 100644 index 0000000000000..2a3a9a02a8c0f --- /dev/null +++ b/server/licenses/lucene-queryparser-9.8.0-snapshot-79b9664.jar.sha1 @@ -0,0 +1 @@ +19665412d3077c0b2b8eefd5da9ed1c15d457680 \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-9.7.0.jar.sha1 b/server/licenses/lucene-sandbox-9.7.0.jar.sha1 deleted file mode 100644 index 38b0b1cccbc29..0000000000000 --- a/server/licenses/lucene-sandbox-9.7.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9f3e8e1947f2f1c5784132444af51a060ff0b4bf \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-9.8.0-snapshot-79b9664.jar.sha1 b/server/licenses/lucene-sandbox-9.8.0-snapshot-79b9664.jar.sha1 new file mode 100644 index 0000000000000..d54242ae30669 --- /dev/null +++ b/server/licenses/lucene-sandbox-9.8.0-snapshot-79b9664.jar.sha1 @@ -0,0 +1 @@ +4ecaabcd0cf038e0093069461c9a0709e660895a \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-9.7.0.jar.sha1 b/server/licenses/lucene-spatial-extras-9.7.0.jar.sha1 deleted file mode 100644 index 48679df469fd1..0000000000000 --- a/server/licenses/lucene-spatial-extras-9.7.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -01b0bc7a407d8c35a70a1adf7966bb3e7caae928 \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-9.8.0-snapshot-79b9664.jar.sha1 b/server/licenses/lucene-spatial-extras-9.8.0-snapshot-79b9664.jar.sha1 new file mode 100644 index 0000000000000..2e88ef2c2b26a --- /dev/null +++ b/server/licenses/lucene-spatial-extras-9.8.0-snapshot-79b9664.jar.sha1 @@ -0,0 +1 @@ +202a98f1f04917bb2d74dbc6ed4452c58191d18c \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-9.7.0.jar.sha1 b/server/licenses/lucene-spatial3d-9.7.0.jar.sha1 deleted file mode 100644 index 55d4d217fa6b9..0000000000000 --- a/server/licenses/lucene-spatial3d-9.7.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7c6b1b6e0a70c9cd177371e648648c2f896742a2 \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-9.8.0-snapshot-79b9664.jar.sha1 b/server/licenses/lucene-spatial3d-9.8.0-snapshot-79b9664.jar.sha1 new file mode 100644 index 0000000000000..930d6ac4e0d74 --- /dev/null +++ b/server/licenses/lucene-spatial3d-9.8.0-snapshot-79b9664.jar.sha1 @@ -0,0 +1 @@ +ad741b6014bc7159195ace3abc1cf282e170df70 \ No newline at end of file diff --git a/server/licenses/lucene-suggest-9.7.0.jar.sha1 b/server/licenses/lucene-suggest-9.7.0.jar.sha1 deleted file mode 100644 index d4d7e6cd6bed9..0000000000000 --- a/server/licenses/lucene-suggest-9.7.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5c37fd9a5d71dc87fe1cd4c18ff295ec8cfac170 \ No newline at end of file diff --git a/server/licenses/lucene-suggest-9.8.0-snapshot-79b9664.jar.sha1 b/server/licenses/lucene-suggest-9.8.0-snapshot-79b9664.jar.sha1 new file mode 100644 index 0000000000000..cd9225aaa138b --- /dev/null +++ b/server/licenses/lucene-suggest-9.8.0-snapshot-79b9664.jar.sha1 @@ -0,0 +1 @@ +26037170854e2591c5e16abd3b62147a7d279c9e \ No newline at end of file diff --git a/server/src/main/java/org/opensearch/search/suggest/completion/CompletionSuggester.java b/server/src/main/java/org/opensearch/search/suggest/completion/CompletionSuggester.java index c7498635d2553..175503cb94e3d 100644 --- a/server/src/main/java/org/opensearch/search/suggest/completion/CompletionSuggester.java +++ b/server/src/main/java/org/opensearch/search/suggest/completion/CompletionSuggester.java @@ -116,6 +116,7 @@ private static void suggest(IndexSearcher searcher, CompletionQuery query, TopSu } } } + collector.finish(); } @Override