diff --git a/CHANGELOG.md b/CHANGELOG.md index 5309dd0d66b69..3ba5e6e76cac7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Changed ### Dependencies +- Update Apache Lucene from 10.1.0 to 10.2.1 ([#17961](https://github.com/opensearch-project/OpenSearch/pull/17961)) - Bump `com.google.code.gson:gson` from 2.12.1 to 2.13.0 ([#17923](https://github.com/opensearch-project/OpenSearch/pull/17923)) - Bump `com.github.spotbugs:spotbugs-annotations` from 4.9.0 to 4.9.3 ([#17922](https://github.com/opensearch-project/OpenSearch/pull/17922)) - Bump `com.microsoft.azure:msal4j` from 1.18.0 to 1.20.0 ([#17925](https://github.com/opensearch-project/OpenSearch/pull/17925)) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3268a05115033..4c75ba5344f24 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] opensearch = "3.1.0" -lucene = "10.1.0" +lucene = "10.2.1" bundled_jdk_vendor = "adoptium" bundled_jdk = "21.0.7+6" @@ -11,7 +11,7 @@ jts = "1.15.0" jackson = "2.18.2" jackson_databind = "2.18.2" snakeyaml = "2.1" -icu4j = "75.1" +icu4j = "77.1" supercsv = "2.4.0" log4j = "2.21.0" slf4j = "1.7.36" diff --git a/libs/core/licenses/lucene-core-10.1.0.jar.sha1 b/libs/core/licenses/lucene-core-10.1.0.jar.sha1 deleted file mode 100644 index 1727275619d1f..0000000000000 --- a/libs/core/licenses/lucene-core-10.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -65d7670de89a72433ef374b332da679a484d3a1e \ No newline at end of file diff --git a/libs/core/licenses/lucene-core-10.2.1.jar.sha1 b/libs/core/licenses/lucene-core-10.2.1.jar.sha1 new file mode 100644 index 0000000000000..f360d25f42954 --- /dev/null +++ b/libs/core/licenses/lucene-core-10.2.1.jar.sha1 @@ -0,0 +1 @@ +f7bee3425ff6bff5e3ba50abfa1a0fdab2b2e46f \ 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 9700609a26435..c939a963491ac 100644 --- a/libs/core/src/main/java/org/opensearch/Version.java +++ b/libs/core/src/main/java/org/opensearch/Version.java @@ -117,7 +117,7 @@ public class Version implements Comparable, ToXContentFragment { public static final Version V_2_19_1 = new Version(2190199, org.apache.lucene.util.Version.LUCENE_9_12_1); public static final Version V_2_19_2 = new Version(2190299, org.apache.lucene.util.Version.LUCENE_9_12_1); public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_10_1_0); - public static final Version V_3_1_0 = new Version(3010099, org.apache.lucene.util.Version.LUCENE_10_1_0); + public static final Version V_3_1_0 = new Version(3010099, org.apache.lucene.util.Version.LUCENE_10_2_1); public static final Version CURRENT = V_3_1_0; public static Version fromId(int id) { diff --git a/modules/lang-expression/licenses/lucene-expressions-10.1.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-10.1.0.jar.sha1 deleted file mode 100644 index 54b10c7848627..0000000000000 --- a/modules/lang-expression/licenses/lucene-expressions-10.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5b2af7e4940909058dde5c707be7ddb266590309 \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-expressions-10.2.1.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-10.2.1.jar.sha1 new file mode 100644 index 0000000000000..e61310c824115 --- /dev/null +++ b/modules/lang-expression/licenses/lucene-expressions-10.2.1.jar.sha1 @@ -0,0 +1 @@ +7704566e72d10bd73bea5ee0a7cfcdc98b9f50cf \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/icu4j-75.1.jar.sha1 b/plugins/analysis-icu/licenses/icu4j-75.1.jar.sha1 deleted file mode 100644 index 4ee1fbe23b117..0000000000000 --- a/plugins/analysis-icu/licenses/icu4j-75.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e8f8dcc2967f5ec2cfae185172293adfa5599b78 \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/icu4j-77.1.jar.sha1 b/plugins/analysis-icu/licenses/icu4j-77.1.jar.sha1 new file mode 100644 index 0000000000000..636c32be4c8c2 --- /dev/null +++ b/plugins/analysis-icu/licenses/icu4j-77.1.jar.sha1 @@ -0,0 +1 @@ +38693cf0b1d7362a8b726af74dc06026a7c23809 \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-10.1.0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-10.1.0.jar.sha1 deleted file mode 100644 index 8de1c34f0c81f..0000000000000 --- a/plugins/analysis-icu/licenses/lucene-analysis-icu-10.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -93c315f11e5f6901595a5bd41e35224e081f4c84 \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-10.2.1.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-10.2.1.jar.sha1 new file mode 100644 index 0000000000000..b75967aa56072 --- /dev/null +++ b/plugins/analysis-icu/licenses/lucene-analysis-icu-10.2.1.jar.sha1 @@ -0,0 +1 @@ +4ffa9bc8accae6d5a4c988653d1fd12d6384bc63 \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.1.0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.1.0.jar.sha1 deleted file mode 100644 index deb1761045dc4..0000000000000 --- a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5cbe34565be95b4dfe4386e7b8dc62eb9e9020e6 \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.2.1.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.2.1.jar.sha1 new file mode 100644 index 0000000000000..bc4b7769c163d --- /dev/null +++ b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.2.1.jar.sha1 @@ -0,0 +1 @@ +3c37f5e3b1177a55ec8953ec343af5c578a02f40 \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-10.1.0.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-10.1.0.jar.sha1 deleted file mode 100644 index 875e0a2ab10b5..0000000000000 --- a/plugins/analysis-nori/licenses/lucene-analysis-nori-10.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ae634b73ddd2e5de044993bf2a5ab36aeeadbf99 \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-10.2.1.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-10.2.1.jar.sha1 new file mode 100644 index 0000000000000..8e01a01875a39 --- /dev/null +++ b/plugins/analysis-nori/licenses/lucene-analysis-nori-10.2.1.jar.sha1 @@ -0,0 +1 @@ +df44aacdf3a1ef743f42e53dca65590b95bbcbdf \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.1.0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.1.0.jar.sha1 deleted file mode 100644 index 8d2cf1a59a754..0000000000000 --- a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -62f9351b6ba692e948f0e4f718cf97e16962f441 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.2.1.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.2.1.jar.sha1 new file mode 100644 index 0000000000000..52e057a61ef14 --- /dev/null +++ b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.2.1.jar.sha1 @@ -0,0 +1 @@ +026d48b44b17dff97ae5afd9007b124410ede1d1 \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.1.0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.1.0.jar.sha1 deleted file mode 100644 index 67271157d3883..0000000000000 --- a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -277221f0ddfb8b21053cd154cb973c61631ec669 \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.2.1.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.2.1.jar.sha1 new file mode 100644 index 0000000000000..3ba2f3ca6089b --- /dev/null +++ b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.2.1.jar.sha1 @@ -0,0 +1 @@ +e9c9447fd1729bdfa4b284fdfe52202300a0be8c \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.1.0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.1.0.jar.sha1 deleted file mode 100644 index ceb636de044e1..0000000000000 --- a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -980b7136dac6b375d621237488930e8bc3a664c7 \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.2.1.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.2.1.jar.sha1 new file mode 100644 index 0000000000000..4c7cfeda31e0b --- /dev/null +++ b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.2.1.jar.sha1 @@ -0,0 +1 @@ +80a5c751308add50f6d1d33acbfafd58d27b8b55 \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.1.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.1.0.jar.sha1 deleted file mode 100644 index 127a8a25d2284..0000000000000 --- a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b641b4a674c4c89d6cee7b28018aa378b933398b \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.2.1.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.2.1.jar.sha1 new file mode 100644 index 0000000000000..5a037c071e870 --- /dev/null +++ b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.2.1.jar.sha1 @@ -0,0 +1 @@ +68df86cb2c1dddc3937824ea2cbe7803bf543ca1 \ No newline at end of file diff --git a/server/licenses/lucene-analysis-common-10.1.0.jar.sha1 b/server/licenses/lucene-analysis-common-10.1.0.jar.sha1 deleted file mode 100644 index 779b248fcf495..0000000000000 --- a/server/licenses/lucene-analysis-common-10.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ddbc824a311d49a54f5808d5a01d5c52424c48b8 \ No newline at end of file diff --git a/server/licenses/lucene-analysis-common-10.2.1.jar.sha1 b/server/licenses/lucene-analysis-common-10.2.1.jar.sha1 new file mode 100644 index 0000000000000..f5467fe100017 --- /dev/null +++ b/server/licenses/lucene-analysis-common-10.2.1.jar.sha1 @@ -0,0 +1 @@ +82578c7a8804490f1f375ccf63e080afb8c0736b \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-10.1.0.jar.sha1 b/server/licenses/lucene-backward-codecs-10.1.0.jar.sha1 deleted file mode 100644 index a212225c34cb9..0000000000000 --- a/server/licenses/lucene-backward-codecs-10.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fbbebd58f1505cc70d73dbdbb8196bfc29b9cf08 \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-10.2.1.jar.sha1 b/server/licenses/lucene-backward-codecs-10.2.1.jar.sha1 new file mode 100644 index 0000000000000..c2b0665faeee2 --- /dev/null +++ b/server/licenses/lucene-backward-codecs-10.2.1.jar.sha1 @@ -0,0 +1 @@ +32eef677c300ac9989bda1045904adf8e925b9eb \ No newline at end of file diff --git a/server/licenses/lucene-core-10.1.0.jar.sha1 b/server/licenses/lucene-core-10.1.0.jar.sha1 deleted file mode 100644 index 1727275619d1f..0000000000000 --- a/server/licenses/lucene-core-10.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -65d7670de89a72433ef374b332da679a484d3a1e \ No newline at end of file diff --git a/server/licenses/lucene-core-10.2.1.jar.sha1 b/server/licenses/lucene-core-10.2.1.jar.sha1 new file mode 100644 index 0000000000000..f360d25f42954 --- /dev/null +++ b/server/licenses/lucene-core-10.2.1.jar.sha1 @@ -0,0 +1 @@ +f7bee3425ff6bff5e3ba50abfa1a0fdab2b2e46f \ No newline at end of file diff --git a/server/licenses/lucene-grouping-10.1.0.jar.sha1 b/server/licenses/lucene-grouping-10.1.0.jar.sha1 deleted file mode 100644 index 9a0a50f0afca7..0000000000000 --- a/server/licenses/lucene-grouping-10.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2f6409cbe456d5a9840969038173f0826f7ce4ff \ No newline at end of file diff --git a/server/licenses/lucene-grouping-10.2.1.jar.sha1 b/server/licenses/lucene-grouping-10.2.1.jar.sha1 new file mode 100644 index 0000000000000..da0012d3366c0 --- /dev/null +++ b/server/licenses/lucene-grouping-10.2.1.jar.sha1 @@ -0,0 +1 @@ +5d5069134efb0c6b482c2dcfecf8a90acf1ee03a \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-10.1.0.jar.sha1 b/server/licenses/lucene-highlighter-10.1.0.jar.sha1 deleted file mode 100644 index 173b24a96da90..0000000000000 --- a/server/licenses/lucene-highlighter-10.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -db9c72d8606788e5cd3a5c97e0a8b57648c8c6d4 \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-10.2.1.jar.sha1 b/server/licenses/lucene-highlighter-10.2.1.jar.sha1 new file mode 100644 index 0000000000000..87da130de145c --- /dev/null +++ b/server/licenses/lucene-highlighter-10.2.1.jar.sha1 @@ -0,0 +1 @@ +4166f6ddb748bfab3355ef29253377c60ef5c440 \ No newline at end of file diff --git a/server/licenses/lucene-join-10.1.0.jar.sha1 b/server/licenses/lucene-join-10.1.0.jar.sha1 deleted file mode 100644 index 833dfeadd4f81..0000000000000 --- a/server/licenses/lucene-join-10.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8ae87dbc1ee0a044b72366eb750c40b269c52fd1 \ No newline at end of file diff --git a/server/licenses/lucene-join-10.2.1.jar.sha1 b/server/licenses/lucene-join-10.2.1.jar.sha1 new file mode 100644 index 0000000000000..31da038f1f7ed --- /dev/null +++ b/server/licenses/lucene-join-10.2.1.jar.sha1 @@ -0,0 +1 @@ +ef2fe517b73f4b144b9ada326ae69c8f3e996042 \ No newline at end of file diff --git a/server/licenses/lucene-memory-10.1.0.jar.sha1 b/server/licenses/lucene-memory-10.1.0.jar.sha1 deleted file mode 100644 index 836c18e425ce5..0000000000000 --- a/server/licenses/lucene-memory-10.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8f6a402ff8c40f28fe2debe3ca01c441ccbe5b2d \ No newline at end of file diff --git a/server/licenses/lucene-memory-10.2.1.jar.sha1 b/server/licenses/lucene-memory-10.2.1.jar.sha1 new file mode 100644 index 0000000000000..f05eac3cae8b8 --- /dev/null +++ b/server/licenses/lucene-memory-10.2.1.jar.sha1 @@ -0,0 +1 @@ +7e595a1dff0859818dea02729123c3e1b2520e7f \ No newline at end of file diff --git a/server/licenses/lucene-misc-10.1.0.jar.sha1 b/server/licenses/lucene-misc-10.1.0.jar.sha1 deleted file mode 100644 index abf5baa3a8602..0000000000000 --- a/server/licenses/lucene-misc-10.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ae1104521d00501e18e3c18c2b326f15589cc873 \ No newline at end of file diff --git a/server/licenses/lucene-misc-10.2.1.jar.sha1 b/server/licenses/lucene-misc-10.2.1.jar.sha1 new file mode 100644 index 0000000000000..d7760b85d295c --- /dev/null +++ b/server/licenses/lucene-misc-10.2.1.jar.sha1 @@ -0,0 +1 @@ +d4244b7b5f406e40d3f9805a5cb056e351242e86 \ No newline at end of file diff --git a/server/licenses/lucene-queries-10.1.0.jar.sha1 b/server/licenses/lucene-queries-10.1.0.jar.sha1 deleted file mode 100644 index 33697dcb6ce74..0000000000000 --- a/server/licenses/lucene-queries-10.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -48584c8a650cb4ce33a7e25864474e0da8c9eb53 \ No newline at end of file diff --git a/server/licenses/lucene-queries-10.2.1.jar.sha1 b/server/licenses/lucene-queries-10.2.1.jar.sha1 new file mode 100644 index 0000000000000..25490eabeb4c1 --- /dev/null +++ b/server/licenses/lucene-queries-10.2.1.jar.sha1 @@ -0,0 +1 @@ +ddb958b144351a7e693d8866d086aed443792ff6 \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-10.1.0.jar.sha1 b/server/licenses/lucene-queryparser-10.1.0.jar.sha1 deleted file mode 100644 index 217b6e770740b..0000000000000 --- a/server/licenses/lucene-queryparser-10.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2774ab95128b0615568a4861b9a56f24511f774a \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-10.2.1.jar.sha1 b/server/licenses/lucene-queryparser-10.2.1.jar.sha1 new file mode 100644 index 0000000000000..1e50c6ee066a2 --- /dev/null +++ b/server/licenses/lucene-queryparser-10.2.1.jar.sha1 @@ -0,0 +1 @@ +f9d7cb8ec0f9fc838326e499c4bd0cb044af75e2 \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-10.1.0.jar.sha1 b/server/licenses/lucene-sandbox-10.1.0.jar.sha1 deleted file mode 100644 index 9b44d2dc75154..0000000000000 --- a/server/licenses/lucene-sandbox-10.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1c10f36c5c2bb39ce5dd52af87834d5f0172b31d \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-10.2.1.jar.sha1 b/server/licenses/lucene-sandbox-10.2.1.jar.sha1 new file mode 100644 index 0000000000000..32ae932e17415 --- /dev/null +++ b/server/licenses/lucene-sandbox-10.2.1.jar.sha1 @@ -0,0 +1 @@ +ec539453eb49dd9e02f8ff4b14dc36a08f91436f \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-10.1.0.jar.sha1 b/server/licenses/lucene-spatial-extras-10.1.0.jar.sha1 deleted file mode 100644 index 5af6c28bf8d91..0000000000000 --- a/server/licenses/lucene-spatial-extras-10.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -601a8e6f9be21ad99fbc43d8fe222553e55ccf80 \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-10.2.1.jar.sha1 b/server/licenses/lucene-spatial-extras-10.2.1.jar.sha1 new file mode 100644 index 0000000000000..eb4c90be55ddc --- /dev/null +++ b/server/licenses/lucene-spatial-extras-10.2.1.jar.sha1 @@ -0,0 +1 @@ +d89b7dc7e2c86b5e8184b60732211f762c074979 \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-10.1.0.jar.sha1 b/server/licenses/lucene-spatial3d-10.1.0.jar.sha1 deleted file mode 100644 index 6259680f363a5..0000000000000 --- a/server/licenses/lucene-spatial3d-10.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -59819cdc2b1af71dcb215284a2f48076b6d4235a \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-10.2.1.jar.sha1 b/server/licenses/lucene-spatial3d-10.2.1.jar.sha1 new file mode 100644 index 0000000000000..443a346a67614 --- /dev/null +++ b/server/licenses/lucene-spatial3d-10.2.1.jar.sha1 @@ -0,0 +1 @@ +9935b848d1e92eb8938b0cc5ce1b3ee565b0e231 \ No newline at end of file diff --git a/server/licenses/lucene-suggest-10.1.0.jar.sha1 b/server/licenses/lucene-suggest-10.1.0.jar.sha1 deleted file mode 100644 index 5d479ef0838ee..0000000000000 --- a/server/licenses/lucene-suggest-10.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -84c212cf954bb48b022511d63b362d9a0a282ecf \ No newline at end of file diff --git a/server/licenses/lucene-suggest-10.2.1.jar.sha1 b/server/licenses/lucene-suggest-10.2.1.jar.sha1 new file mode 100644 index 0000000000000..508370a40d148 --- /dev/null +++ b/server/licenses/lucene-suggest-10.2.1.jar.sha1 @@ -0,0 +1 @@ +f798a0f8f3686a75bd3830610156d3b087299340 \ No newline at end of file diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/PointsSortedDocsProducer.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/PointsSortedDocsProducer.java index dc130eb54c0ea..b4ac7f212a74c 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/PointsSortedDocsProducer.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/PointsSortedDocsProducer.java @@ -86,7 +86,7 @@ DocIdSet processLeaf(Query query, CompositeValuesCollectorQueue queue, LeafReade upperBucket = (Long) upperValue; } - DocIdSetBuilder builder = fillDocIdSet ? new DocIdSetBuilder(context.reader().maxDoc(), values, field) : null; + DocIdSetBuilder builder = fillDocIdSet ? new DocIdSetBuilder(context.reader().maxDoc(), values) : null; Visitor visitor = new Visitor(context, queue, builder, values.getBytesPerDimension(), lowerBucket, upperBucket); try { values.intersect(visitor); diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/UnsignedLongPointsSortedDocsProducer.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/UnsignedLongPointsSortedDocsProducer.java index f391eb4f51169..fbece140836f8 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/UnsignedLongPointsSortedDocsProducer.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/UnsignedLongPointsSortedDocsProducer.java @@ -61,7 +61,7 @@ DocIdSet processLeaf(Query query, CompositeValuesCollectorQueue queue, LeafReade } upperBucket = (BigInteger) upperValue; } - DocIdSetBuilder builder = fillDocIdSet ? new DocIdSetBuilder(context.reader().maxDoc(), values, field) : null; + DocIdSetBuilder builder = fillDocIdSet ? new DocIdSetBuilder(context.reader().maxDoc(), values) : null; Visitor visitor = new Visitor( context, queue, diff --git a/server/src/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregator.java b/server/src/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregator.java index f091b28ba5184..8d8219704b284 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregator.java +++ b/server/src/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregator.java @@ -358,7 +358,7 @@ private static class PruningCollector extends Collector { postingMap.put(term, scorer); } - this.queue = new DisiPriorityQueue(postingMap.size()); + this.queue = DisiPriorityQueue.ofMaxSize(postingMap.size()); for (Scorer scorer : postingMap.values()) { queue.add(new DisiWrapper(scorer, false)); } @@ -452,15 +452,13 @@ public int advance(int target) throws IOException { } @Override - public int nextDoc() { - // don't expect this to be called based on its usage in DefaultBulkScorer - throw new UnsupportedOperationException(); + public int nextDoc() throws IOException { + return advance(slowDocId + 1); } @Override public long cost() { - // don't expect this to be called based on its usage in DefaultBulkScorer - throw new UnsupportedOperationException(); + return queue.top() == null ? 0 : queue.top().approximation.cost(); } } diff --git a/server/src/main/java/org/opensearch/search/approximate/ApproximatePointRangeQuery.java b/server/src/main/java/org/opensearch/search/approximate/ApproximatePointRangeQuery.java index ae3593537f674..6ebd0b1d18600 100644 --- a/server/src/main/java/org/opensearch/search/approximate/ApproximatePointRangeQuery.java +++ b/server/src/main/java/org/opensearch/search/approximate/ApproximatePointRangeQuery.java @@ -367,7 +367,7 @@ public ScorerSupplier scorerSupplier(LeafReaderContext context) throws IOExcepti if (sortOrder == null || sortOrder.equals(SortOrder.ASC)) { return new ScorerSupplier() { - final DocIdSetBuilder result = new DocIdSetBuilder(reader.maxDoc(), values, pointRangeQuery.getField()); + final DocIdSetBuilder result = new DocIdSetBuilder(reader.maxDoc(), values); final PointValues.IntersectVisitor visitor = getIntersectVisitor(result, docCount); long cost = -1; @@ -395,7 +395,7 @@ public long cost() { size += deletedDocs; return new ScorerSupplier() { - final DocIdSetBuilder result = new DocIdSetBuilder(reader.maxDoc(), values, pointRangeQuery.getField()); + final DocIdSetBuilder result = new DocIdSetBuilder(reader.maxDoc(), values); final PointValues.IntersectVisitor visitor = getIntersectVisitor(result, docCount); long cost = -1; diff --git a/server/src/main/java/org/opensearch/search/query/BitmapIndexQuery.java b/server/src/main/java/org/opensearch/search/query/BitmapIndexQuery.java index 2451c3d8d7d4a..d84f7eb6feabf 100644 --- a/server/src/main/java/org/opensearch/search/query/BitmapIndexQuery.java +++ b/server/src/main/java/org/opensearch/search/query/BitmapIndexQuery.java @@ -112,7 +112,7 @@ public ScorerSupplier scorerSupplier(LeafReaderContext context) throws IOExcepti return new ScorerSupplier() { long cost = -1; - final DocIdSetBuilder result = new DocIdSetBuilder(reader.maxDoc(), values, field); + final DocIdSetBuilder result = new DocIdSetBuilder(reader.maxDoc(), values); final MergePointVisitor visitor = new MergePointVisitor(result); @Override diff --git a/server/src/test/java/org/opensearch/search/query/QueryPhaseTests.java b/server/src/test/java/org/opensearch/search/query/QueryPhaseTests.java index ce15806327470..73333ea2c5706 100644 --- a/server/src/test/java/org/opensearch/search/query/QueryPhaseTests.java +++ b/server/src/test/java/org/opensearch/search/query/QueryPhaseTests.java @@ -988,7 +988,7 @@ public void testMinScore() throws Exception { context.trackTotalHitsUpTo(5); QueryPhase.executeInternal(context.withCleanQueryResult(), queryPhaseSearcher); - assertEquals(10, context.queryResult().topDocs().topDocs.totalHits.value()); + assertTrue(context.queryResult().topDocs().topDocs.totalHits.value() >= 5); reader.close(); dir.close(); diff --git a/server/src/test/java/org/opensearch/search/query/QueryProfilePhaseTests.java b/server/src/test/java/org/opensearch/search/query/QueryProfilePhaseTests.java index f246aa84e8e27..ea4db0630c7d4 100644 --- a/server/src/test/java/org/opensearch/search/query/QueryProfilePhaseTests.java +++ b/server/src/test/java/org/opensearch/search/query/QueryProfilePhaseTests.java @@ -1233,18 +1233,18 @@ public void testMinScore() throws Exception { context.trackTotalHitsUpTo(5); QueryPhase.executeInternal(context.withCleanQueryResult().withProfilers(), queryPhaseSearcher); - assertEquals(10, context.queryResult().topDocs().topDocs.totalHits.value()); + assertTrue(context.queryResult().topDocs().topDocs.totalHits.value() >= 5); assertProfileData(context, "BooleanQuery", query -> { assertThat(query.getTimeBreakdown().keySet(), not(empty())); assertThat(query.getTimeBreakdown().get("score"), greaterThan(0L)); - assertThat(query.getTimeBreakdown().get("score_count"), equalTo(10L)); + assertThat(query.getTimeBreakdown().get("score_count"), greaterThanOrEqualTo(5L)); if (executor != null) { assertThat(query.getTimeBreakdown().get("max_score"), greaterThan(0L)); assertThat(query.getTimeBreakdown().get("min_score"), greaterThan(0L)); assertThat(query.getTimeBreakdown().get("avg_score"), greaterThan(0L)); - assertThat(query.getTimeBreakdown().get("max_score_count"), equalTo(10L)); - assertThat(query.getTimeBreakdown().get("min_score_count"), equalTo(10L)); - assertThat(query.getTimeBreakdown().get("avg_score_count"), equalTo(10L)); + assertThat(query.getTimeBreakdown().get("max_score_count"), greaterThanOrEqualTo(5L)); + assertThat(query.getTimeBreakdown().get("min_score_count"), greaterThanOrEqualTo(5L)); + assertThat(query.getTimeBreakdown().get("avg_score_count"), greaterThanOrEqualTo(5L)); } assertThat(query.getTimeBreakdown().get("create_weight"), greaterThan(0L)); assertThat(query.getTimeBreakdown().get("create_weight_count"), equalTo(1L)); diff --git a/test/framework/licenses/lucene-codecs-10.1.0.jar.sha1 b/test/framework/licenses/lucene-codecs-10.1.0.jar.sha1 deleted file mode 100644 index ab61c727ad3e7..0000000000000 --- a/test/framework/licenses/lucene-codecs-10.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c8c5a67a9718b24fc2e0fe958db3404254af628e \ No newline at end of file diff --git a/test/framework/licenses/lucene-codecs-10.2.1.jar.sha1 b/test/framework/licenses/lucene-codecs-10.2.1.jar.sha1 new file mode 100644 index 0000000000000..31d4581b9a158 --- /dev/null +++ b/test/framework/licenses/lucene-codecs-10.2.1.jar.sha1 @@ -0,0 +1 @@ +7fad476daca759c657ead0e83e46a343fd09d38d \ No newline at end of file diff --git a/test/framework/licenses/lucene-test-framework-10.1.0.jar.sha1 b/test/framework/licenses/lucene-test-framework-10.1.0.jar.sha1 deleted file mode 100644 index 29df9ec4257d2..0000000000000 --- a/test/framework/licenses/lucene-test-framework-10.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1985bbbb74c358d2e2477eb467b867fc5a8d0e25 \ No newline at end of file diff --git a/test/framework/licenses/lucene-test-framework-10.2.1.jar.sha1 b/test/framework/licenses/lucene-test-framework-10.2.1.jar.sha1 new file mode 100644 index 0000000000000..2b65e36e16076 --- /dev/null +++ b/test/framework/licenses/lucene-test-framework-10.2.1.jar.sha1 @@ -0,0 +1 @@ +f01401e66a71eca1a70d19cf8269f47d191b1a37 \ No newline at end of file