From 23387435817a6742be35470c9732d7bacf96f57b Mon Sep 17 00:00:00 2001 From: Harsha Vamsi Kalluri Date: Thu, 25 Jun 2026 17:44:48 +0000 Subject: [PATCH 1/3] Upgrading lucene version to 10.5.0 Signed-off-by: Harsha Vamsi Kalluri --- gradle/libs.versions.toml | 2 +- libs/core/licenses/lucene-core-10.4.0.jar.sha1 | 1 - libs/core/licenses/lucene-core-10.5.0.jar.sha1 | 1 + .../core/src/main/java/org/opensearch/Version.java | 2 +- libs/netty4/licenses/lucene-core-10.4.0.jar.sha1 | 1 - libs/netty4/licenses/lucene-core-10.5.0.jar.sha1 | 1 + .../licenses/lucene-expressions-10.4.0.jar.sha1 | 1 - .../licenses/lucene-expressions-10.5.0.jar.sha1 | 1 + .../licenses/lucene-analysis-icu-10.4.0.jar.sha1 | 1 - .../licenses/lucene-analysis-icu-10.5.0.jar.sha1 | 1 + .../lucene-analysis-kuromoji-10.4.0.jar.sha1 | 1 - .../lucene-analysis-kuromoji-10.5.0.jar.sha1 | 1 + .../licenses/lucene-analysis-nori-10.4.0.jar.sha1 | 1 - .../licenses/lucene-analysis-nori-10.5.0.jar.sha1 | 1 + .../lucene-analysis-phonetic-10.4.0.jar.sha1 | 1 - .../lucene-analysis-phonetic-10.5.0.jar.sha1 | 1 + .../lucene-analysis-smartcn-10.4.0.jar.sha1 | 1 - .../lucene-analysis-smartcn-10.5.0.jar.sha1 | 1 + .../lucene-analysis-stempel-10.4.0.jar.sha1 | 1 - .../lucene-analysis-stempel-10.5.0.jar.sha1 | 1 + .../lucene-analysis-morfologik-10.4.0.jar.sha1 | 1 - .../lucene-analysis-morfologik-10.5.0.jar.sha1 | 1 + .../lucene-analysis-common-10.4.0.jar.sha1 | 1 - .../lucene-analysis-common-10.5.0.jar.sha1 | 1 + .../lucene-backward-codecs-10.4.0.jar.sha1 | 1 - .../lucene-backward-codecs-10.5.0.jar.sha1 | 1 + server/licenses/lucene-core-10.4.0.jar.sha1 | 1 - server/licenses/lucene-core-10.5.0.jar.sha1 | 1 + server/licenses/lucene-grouping-10.4.0.jar.sha1 | 1 - server/licenses/lucene-grouping-10.5.0.jar.sha1 | 1 + server/licenses/lucene-highlighter-10.4.0.jar.sha1 | 1 - server/licenses/lucene-highlighter-10.5.0.jar.sha1 | 1 + server/licenses/lucene-join-10.4.0.jar.sha1 | 1 - server/licenses/lucene-join-10.5.0.jar.sha1 | 1 + server/licenses/lucene-memory-10.4.0.jar.sha1 | 1 - server/licenses/lucene-memory-10.5.0.jar.sha1 | 1 + server/licenses/lucene-misc-10.4.0.jar.sha1 | 1 - server/licenses/lucene-misc-10.5.0.jar.sha1 | 1 + server/licenses/lucene-queries-10.4.0.jar.sha1 | 1 - server/licenses/lucene-queries-10.5.0.jar.sha1 | 1 + server/licenses/lucene-queryparser-10.4.0.jar.sha1 | 1 - server/licenses/lucene-queryparser-10.5.0.jar.sha1 | 1 + server/licenses/lucene-sandbox-10.4.0.jar.sha1 | 1 - server/licenses/lucene-sandbox-10.5.0.jar.sha1 | 1 + .../licenses/lucene-spatial-extras-10.4.0.jar.sha1 | 1 - .../licenses/lucene-spatial-extras-10.5.0.jar.sha1 | 1 + server/licenses/lucene-spatial3d-10.4.0.jar.sha1 | 1 - server/licenses/lucene-spatial3d-10.5.0.jar.sha1 | 1 + server/licenses/lucene-suggest-10.4.0.jar.sha1 | 1 - server/licenses/lucene-suggest-10.5.0.jar.sha1 | 1 + .../lucene90/Lucene90DocValuesConsumerWrapper.java | 8 ++++++-- .../lucene90/Lucene90DocValuesProducerWrapper.java | 14 ++++++++++++-- .../index/SortedSetDocValuesWriterWrapper.java | 7 ++++++- .../composite/LuceneDocValuesConsumerFactory.java | 5 ++++- .../composite/LuceneDocValuesProducerFactory.java | 5 ++++- .../composite912/Composite912DocValuesFormat.java | 6 ++++++ .../index/query/MoreLikeThisQueryBuilder.java | 2 +- .../org/opensearch/lucene/util/CombinedBitSet.java | 13 +++++++++++++ .../licenses/lucene-codecs-10.4.0.jar.sha1 | 1 - .../licenses/lucene-codecs-10.5.0.jar.sha1 | 1 + .../licenses/lucene-test-framework-10.4.0.jar.sha1 | 1 - .../licenses/lucene-test-framework-10.5.0.jar.sha1 | 1 + 62 files changed, 80 insertions(+), 36 deletions(-) delete mode 100644 libs/core/licenses/lucene-core-10.4.0.jar.sha1 create mode 100644 libs/core/licenses/lucene-core-10.5.0.jar.sha1 delete mode 100644 libs/netty4/licenses/lucene-core-10.4.0.jar.sha1 create mode 100644 libs/netty4/licenses/lucene-core-10.5.0.jar.sha1 delete mode 100644 modules/lang-expression/licenses/lucene-expressions-10.4.0.jar.sha1 create mode 100644 modules/lang-expression/licenses/lucene-expressions-10.5.0.jar.sha1 delete mode 100644 plugins/analysis-icu/licenses/lucene-analysis-icu-10.4.0.jar.sha1 create mode 100644 plugins/analysis-icu/licenses/lucene-analysis-icu-10.5.0.jar.sha1 delete mode 100644 plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.4.0.jar.sha1 create mode 100644 plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.5.0.jar.sha1 delete mode 100644 plugins/analysis-nori/licenses/lucene-analysis-nori-10.4.0.jar.sha1 create mode 100644 plugins/analysis-nori/licenses/lucene-analysis-nori-10.5.0.jar.sha1 delete mode 100644 plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.4.0.jar.sha1 create mode 100644 plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.5.0.jar.sha1 delete mode 100644 plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.4.0.jar.sha1 create mode 100644 plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.5.0.jar.sha1 delete mode 100644 plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.4.0.jar.sha1 create mode 100644 plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.5.0.jar.sha1 delete mode 100644 plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.4.0.jar.sha1 create mode 100644 plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.5.0.jar.sha1 delete mode 100644 server/licenses/lucene-analysis-common-10.4.0.jar.sha1 create mode 100644 server/licenses/lucene-analysis-common-10.5.0.jar.sha1 delete mode 100644 server/licenses/lucene-backward-codecs-10.4.0.jar.sha1 create mode 100644 server/licenses/lucene-backward-codecs-10.5.0.jar.sha1 delete mode 100644 server/licenses/lucene-core-10.4.0.jar.sha1 create mode 100644 server/licenses/lucene-core-10.5.0.jar.sha1 delete mode 100644 server/licenses/lucene-grouping-10.4.0.jar.sha1 create mode 100644 server/licenses/lucene-grouping-10.5.0.jar.sha1 delete mode 100644 server/licenses/lucene-highlighter-10.4.0.jar.sha1 create mode 100644 server/licenses/lucene-highlighter-10.5.0.jar.sha1 delete mode 100644 server/licenses/lucene-join-10.4.0.jar.sha1 create mode 100644 server/licenses/lucene-join-10.5.0.jar.sha1 delete mode 100644 server/licenses/lucene-memory-10.4.0.jar.sha1 create mode 100644 server/licenses/lucene-memory-10.5.0.jar.sha1 delete mode 100644 server/licenses/lucene-misc-10.4.0.jar.sha1 create mode 100644 server/licenses/lucene-misc-10.5.0.jar.sha1 delete mode 100644 server/licenses/lucene-queries-10.4.0.jar.sha1 create mode 100644 server/licenses/lucene-queries-10.5.0.jar.sha1 delete mode 100644 server/licenses/lucene-queryparser-10.4.0.jar.sha1 create mode 100644 server/licenses/lucene-queryparser-10.5.0.jar.sha1 delete mode 100644 server/licenses/lucene-sandbox-10.4.0.jar.sha1 create mode 100644 server/licenses/lucene-sandbox-10.5.0.jar.sha1 delete mode 100644 server/licenses/lucene-spatial-extras-10.4.0.jar.sha1 create mode 100644 server/licenses/lucene-spatial-extras-10.5.0.jar.sha1 delete mode 100644 server/licenses/lucene-spatial3d-10.4.0.jar.sha1 create mode 100644 server/licenses/lucene-spatial3d-10.5.0.jar.sha1 delete mode 100644 server/licenses/lucene-suggest-10.4.0.jar.sha1 create mode 100644 server/licenses/lucene-suggest-10.5.0.jar.sha1 delete mode 100644 test/framework/licenses/lucene-codecs-10.4.0.jar.sha1 create mode 100644 test/framework/licenses/lucene-codecs-10.5.0.jar.sha1 delete mode 100644 test/framework/licenses/lucene-test-framework-10.4.0.jar.sha1 create mode 100644 test/framework/licenses/lucene-test-framework-10.5.0.jar.sha1 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2b524e1385629..4c0a8e873ce3f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] opensearch = "3.8.0" -lucene = "10.4.0" +lucene = "10.5.0" bundled_jdk_vendor = "adoptium" bundled_jdk = "25.0.3+9" diff --git a/libs/core/licenses/lucene-core-10.4.0.jar.sha1 b/libs/core/licenses/lucene-core-10.4.0.jar.sha1 deleted file mode 100644 index 89d6695f37459..0000000000000 --- a/libs/core/licenses/lucene-core-10.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7493bc763cd5e91f2a8f7722c2f90d8ce15c6319 \ No newline at end of file diff --git a/libs/core/licenses/lucene-core-10.5.0.jar.sha1 b/libs/core/licenses/lucene-core-10.5.0.jar.sha1 new file mode 100644 index 0000000000000..c283fe8a56b45 --- /dev/null +++ b/libs/core/licenses/lucene-core-10.5.0.jar.sha1 @@ -0,0 +1 @@ +383deeee9b44ef15daaf7541d57ea5183d52a7b5 \ 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 475cc15c1cb4b..6efa888434817 100644 --- a/libs/core/src/main/java/org/opensearch/Version.java +++ b/libs/core/src/main/java/org/opensearch/Version.java @@ -173,7 +173,7 @@ private static String legacyFriendlyIdToString(int versionId) { public static final Version V_3_6_1 = new Version(3060199, org.apache.lucene.util.Version.LUCENE_10_4_0); public static final Version V_3_7_0 = new Version(3070099, org.apache.lucene.util.Version.LUCENE_10_4_0); public static final Version V_3_7_1 = new Version(3070199, org.apache.lucene.util.Version.LUCENE_10_4_0); - public static final Version V_3_8_0 = new Version(3080099, org.apache.lucene.util.Version.LUCENE_10_4_0); + public static final Version V_3_8_0 = new Version(3080099, org.apache.lucene.util.Version.LUCENE_10_5_0); public static final Version CURRENT = V_3_8_0; protected static final Map idToVersion; diff --git a/libs/netty4/licenses/lucene-core-10.4.0.jar.sha1 b/libs/netty4/licenses/lucene-core-10.4.0.jar.sha1 deleted file mode 100644 index 89d6695f37459..0000000000000 --- a/libs/netty4/licenses/lucene-core-10.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7493bc763cd5e91f2a8f7722c2f90d8ce15c6319 \ No newline at end of file diff --git a/libs/netty4/licenses/lucene-core-10.5.0.jar.sha1 b/libs/netty4/licenses/lucene-core-10.5.0.jar.sha1 new file mode 100644 index 0000000000000..c283fe8a56b45 --- /dev/null +++ b/libs/netty4/licenses/lucene-core-10.5.0.jar.sha1 @@ -0,0 +1 @@ +383deeee9b44ef15daaf7541d57ea5183d52a7b5 \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-expressions-10.4.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-10.4.0.jar.sha1 deleted file mode 100644 index 4206f09667e5f..0000000000000 --- a/modules/lang-expression/licenses/lucene-expressions-10.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e50bb1b8f468887a315c456b75f8375ddba5559e \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-expressions-10.5.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-10.5.0.jar.sha1 new file mode 100644 index 0000000000000..0b104cd0ce388 --- /dev/null +++ b/modules/lang-expression/licenses/lucene-expressions-10.5.0.jar.sha1 @@ -0,0 +1 @@ +a1820135f8c0f51a6635905d754705472592a008 \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-10.4.0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-10.4.0.jar.sha1 deleted file mode 100644 index 8f7a2f739cd27..0000000000000 --- a/plugins/analysis-icu/licenses/lucene-analysis-icu-10.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -50257f0d7d3fc805d596d6b842f0eeb099c72640 \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-10.5.0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-10.5.0.jar.sha1 new file mode 100644 index 0000000000000..b490479390839 --- /dev/null +++ b/plugins/analysis-icu/licenses/lucene-analysis-icu-10.5.0.jar.sha1 @@ -0,0 +1 @@ +cb67d073b767ed1d1d24a9b03117ef9bbac5c1aa \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.4.0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.4.0.jar.sha1 deleted file mode 100644 index 8d0bf21c63e21..0000000000000 --- a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -71033f490b07f1f1784724ade66efaa181a69b92 \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.5.0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.5.0.jar.sha1 new file mode 100644 index 0000000000000..ec21a19de5bfa --- /dev/null +++ b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.5.0.jar.sha1 @@ -0,0 +1 @@ +c205946d6a177bf516f590e89e4cda36a537c33f \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-10.4.0.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-10.4.0.jar.sha1 deleted file mode 100644 index 70bc273c4d9e0..0000000000000 --- a/plugins/analysis-nori/licenses/lucene-analysis-nori-10.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3781153d96b93e8f50c975bb5b60c7634687074a \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-10.5.0.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-10.5.0.jar.sha1 new file mode 100644 index 0000000000000..7bd3c8c9a0b7c --- /dev/null +++ b/plugins/analysis-nori/licenses/lucene-analysis-nori-10.5.0.jar.sha1 @@ -0,0 +1 @@ +2a2db150e967984e18d293619142b2cd27f09f63 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.4.0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.4.0.jar.sha1 deleted file mode 100644 index 9f19d7f83eba5..0000000000000 --- a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8bec2c8cba1dd2f16d6899cfa1a7de48c0454c09 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.5.0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.5.0.jar.sha1 new file mode 100644 index 0000000000000..1655db0c3da6c --- /dev/null +++ b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.5.0.jar.sha1 @@ -0,0 +1 @@ +2dfd6a62be5ed3822b01c96a0da805fa55e962ef \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.4.0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.4.0.jar.sha1 deleted file mode 100644 index d18455ff73b79..0000000000000 --- a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e05ae4af9a81735b4bf3c88449a2468331f5455e \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.5.0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.5.0.jar.sha1 new file mode 100644 index 0000000000000..520e448917a44 --- /dev/null +++ b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.5.0.jar.sha1 @@ -0,0 +1 @@ +c6ef06ff204f4e370584a37674cd676b708d5ceb \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.4.0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.4.0.jar.sha1 deleted file mode 100644 index 6aa41cde5ce17..0000000000000 --- a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -718244708f4ef6d6ba4133c7e71b11ced8ebaa7d \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.5.0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.5.0.jar.sha1 new file mode 100644 index 0000000000000..69ad1366e131f --- /dev/null +++ b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.5.0.jar.sha1 @@ -0,0 +1 @@ +4bbed0d5695daefcbf6c380d72c1b54b99ddf397 \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.4.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.4.0.jar.sha1 deleted file mode 100644 index 10984e7989aa7..0000000000000 --- a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -21d90ece2dbe5df22e98dc54d848c16e1ddc838a \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.5.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.5.0.jar.sha1 new file mode 100644 index 0000000000000..9b81c5ae6ec75 --- /dev/null +++ b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.5.0.jar.sha1 @@ -0,0 +1 @@ +1ea877703aeefcd8109934c6894387ee6fde7163 \ No newline at end of file diff --git a/server/licenses/lucene-analysis-common-10.4.0.jar.sha1 b/server/licenses/lucene-analysis-common-10.4.0.jar.sha1 deleted file mode 100644 index edc73cad56dd6..0000000000000 --- a/server/licenses/lucene-analysis-common-10.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -61c4a7b27753662619e84261b42f404fda85886f \ No newline at end of file diff --git a/server/licenses/lucene-analysis-common-10.5.0.jar.sha1 b/server/licenses/lucene-analysis-common-10.5.0.jar.sha1 new file mode 100644 index 0000000000000..70332e4419fcf --- /dev/null +++ b/server/licenses/lucene-analysis-common-10.5.0.jar.sha1 @@ -0,0 +1 @@ +2b314f57f18f3d9ad855f611f6f391519ac78a8d \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-10.4.0.jar.sha1 b/server/licenses/lucene-backward-codecs-10.4.0.jar.sha1 deleted file mode 100644 index beac03c7ea7f5..0000000000000 --- a/server/licenses/lucene-backward-codecs-10.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9cb01ee8ba10cd935133a82bd72d16faf4f8dffe \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-10.5.0.jar.sha1 b/server/licenses/lucene-backward-codecs-10.5.0.jar.sha1 new file mode 100644 index 0000000000000..a35ed264d2f0b --- /dev/null +++ b/server/licenses/lucene-backward-codecs-10.5.0.jar.sha1 @@ -0,0 +1 @@ +0967b73127de6f17bbd83c015d258872359e8f97 \ No newline at end of file diff --git a/server/licenses/lucene-core-10.4.0.jar.sha1 b/server/licenses/lucene-core-10.4.0.jar.sha1 deleted file mode 100644 index 89d6695f37459..0000000000000 --- a/server/licenses/lucene-core-10.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7493bc763cd5e91f2a8f7722c2f90d8ce15c6319 \ No newline at end of file diff --git a/server/licenses/lucene-core-10.5.0.jar.sha1 b/server/licenses/lucene-core-10.5.0.jar.sha1 new file mode 100644 index 0000000000000..c283fe8a56b45 --- /dev/null +++ b/server/licenses/lucene-core-10.5.0.jar.sha1 @@ -0,0 +1 @@ +383deeee9b44ef15daaf7541d57ea5183d52a7b5 \ No newline at end of file diff --git a/server/licenses/lucene-grouping-10.4.0.jar.sha1 b/server/licenses/lucene-grouping-10.4.0.jar.sha1 deleted file mode 100644 index 307cb2f07efa2..0000000000000 --- a/server/licenses/lucene-grouping-10.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8d143b267e6575a08d5483a8b103384536fdd4c9 \ No newline at end of file diff --git a/server/licenses/lucene-grouping-10.5.0.jar.sha1 b/server/licenses/lucene-grouping-10.5.0.jar.sha1 new file mode 100644 index 0000000000000..fe687855e33a6 --- /dev/null +++ b/server/licenses/lucene-grouping-10.5.0.jar.sha1 @@ -0,0 +1 @@ +ed85d8acb132c4aa175c92778132f8e54a00ce0e \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-10.4.0.jar.sha1 b/server/licenses/lucene-highlighter-10.4.0.jar.sha1 deleted file mode 100644 index 4f3d2135d7a91..0000000000000 --- a/server/licenses/lucene-highlighter-10.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a3cd37e7588506447382a9175da271fb37c55e67 \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-10.5.0.jar.sha1 b/server/licenses/lucene-highlighter-10.5.0.jar.sha1 new file mode 100644 index 0000000000000..fb76f497aadcb --- /dev/null +++ b/server/licenses/lucene-highlighter-10.5.0.jar.sha1 @@ -0,0 +1 @@ +fccffbe10fa6fd84bc884df844eb850ffcc8d51b \ No newline at end of file diff --git a/server/licenses/lucene-join-10.4.0.jar.sha1 b/server/licenses/lucene-join-10.4.0.jar.sha1 deleted file mode 100644 index 87e6d8db260b2..0000000000000 --- a/server/licenses/lucene-join-10.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -56e08fe428fe88e51dd4c89ca62c6a72bf2f8f57 \ No newline at end of file diff --git a/server/licenses/lucene-join-10.5.0.jar.sha1 b/server/licenses/lucene-join-10.5.0.jar.sha1 new file mode 100644 index 0000000000000..b1053a47da7b2 --- /dev/null +++ b/server/licenses/lucene-join-10.5.0.jar.sha1 @@ -0,0 +1 @@ +b34a23804c461495fb98ef597d72cfc134466b3b \ No newline at end of file diff --git a/server/licenses/lucene-memory-10.4.0.jar.sha1 b/server/licenses/lucene-memory-10.4.0.jar.sha1 deleted file mode 100644 index d6f6d189292b6..0000000000000 --- a/server/licenses/lucene-memory-10.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6c6f1080466c5dff5b1d0eeeb3ead745591eb9d1 \ No newline at end of file diff --git a/server/licenses/lucene-memory-10.5.0.jar.sha1 b/server/licenses/lucene-memory-10.5.0.jar.sha1 new file mode 100644 index 0000000000000..4e2d636232a3b --- /dev/null +++ b/server/licenses/lucene-memory-10.5.0.jar.sha1 @@ -0,0 +1 @@ +a18c7a57e054836d2dc7ece7dfe28a9cad61f660 \ No newline at end of file diff --git a/server/licenses/lucene-misc-10.4.0.jar.sha1 b/server/licenses/lucene-misc-10.4.0.jar.sha1 deleted file mode 100644 index 6783f2b1d38c8..0000000000000 --- a/server/licenses/lucene-misc-10.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e86d65b1a8b5bf8dc66f4e002fe75ddc886da62c \ No newline at end of file diff --git a/server/licenses/lucene-misc-10.5.0.jar.sha1 b/server/licenses/lucene-misc-10.5.0.jar.sha1 new file mode 100644 index 0000000000000..5e81bcd59d7c6 --- /dev/null +++ b/server/licenses/lucene-misc-10.5.0.jar.sha1 @@ -0,0 +1 @@ +113d957ae3c80c8c52052f4d38badc9ae5c1b60d \ No newline at end of file diff --git a/server/licenses/lucene-queries-10.4.0.jar.sha1 b/server/licenses/lucene-queries-10.4.0.jar.sha1 deleted file mode 100644 index 8619fd3bce7c3..0000000000000 --- a/server/licenses/lucene-queries-10.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -43b2654a448504dc4ac382f6d9b6896e2e8b67b7 \ No newline at end of file diff --git a/server/licenses/lucene-queries-10.5.0.jar.sha1 b/server/licenses/lucene-queries-10.5.0.jar.sha1 new file mode 100644 index 0000000000000..af7896ff0f36e --- /dev/null +++ b/server/licenses/lucene-queries-10.5.0.jar.sha1 @@ -0,0 +1 @@ +c96555ec32a411d860527ea13add388d72a614b2 \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-10.4.0.jar.sha1 b/server/licenses/lucene-queryparser-10.4.0.jar.sha1 deleted file mode 100644 index d2dc853dd6bfd..0000000000000 --- a/server/licenses/lucene-queryparser-10.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6e3e758b60b1e2549a85139d9498b54565c38eeb \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-10.5.0.jar.sha1 b/server/licenses/lucene-queryparser-10.5.0.jar.sha1 new file mode 100644 index 0000000000000..888ca9ad534a8 --- /dev/null +++ b/server/licenses/lucene-queryparser-10.5.0.jar.sha1 @@ -0,0 +1 @@ +dea0c58101825f086127abf5adce13ced0bd0fc2 \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-10.4.0.jar.sha1 b/server/licenses/lucene-sandbox-10.4.0.jar.sha1 deleted file mode 100644 index 1dfab5a550136..0000000000000 --- a/server/licenses/lucene-sandbox-10.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -15976efaae9213b1a61e3509da6f366e243b90c7 \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-10.5.0.jar.sha1 b/server/licenses/lucene-sandbox-10.5.0.jar.sha1 new file mode 100644 index 0000000000000..7dd1ebd09d49a --- /dev/null +++ b/server/licenses/lucene-sandbox-10.5.0.jar.sha1 @@ -0,0 +1 @@ +928527693dc814ba0125659b07316e260713e38f \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-10.4.0.jar.sha1 b/server/licenses/lucene-spatial-extras-10.4.0.jar.sha1 deleted file mode 100644 index 2bde1e35e7a6b..0000000000000 --- a/server/licenses/lucene-spatial-extras-10.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1f56784003e51d7b2df7c27a99d7b127e67e97bf \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-10.5.0.jar.sha1 b/server/licenses/lucene-spatial-extras-10.5.0.jar.sha1 new file mode 100644 index 0000000000000..0ac47da0b21b2 --- /dev/null +++ b/server/licenses/lucene-spatial-extras-10.5.0.jar.sha1 @@ -0,0 +1 @@ +900c6d78202cfd96a8e513f2271c972c4af98388 \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-10.4.0.jar.sha1 b/server/licenses/lucene-spatial3d-10.4.0.jar.sha1 deleted file mode 100644 index 188a9793bc655..0000000000000 --- a/server/licenses/lucene-spatial3d-10.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fa337dd41be0f0ee99bc4fd463d517adf25e06a3 \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-10.5.0.jar.sha1 b/server/licenses/lucene-spatial3d-10.5.0.jar.sha1 new file mode 100644 index 0000000000000..a922121cfb346 --- /dev/null +++ b/server/licenses/lucene-spatial3d-10.5.0.jar.sha1 @@ -0,0 +1 @@ +e2a6601ca2d16796a068589128787114d15935c3 \ No newline at end of file diff --git a/server/licenses/lucene-suggest-10.4.0.jar.sha1 b/server/licenses/lucene-suggest-10.4.0.jar.sha1 deleted file mode 100644 index dcfdfac03d13b..0000000000000 --- a/server/licenses/lucene-suggest-10.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d86d535c415cf9c79016aaefa9957dab98766a68 \ No newline at end of file diff --git a/server/licenses/lucene-suggest-10.5.0.jar.sha1 b/server/licenses/lucene-suggest-10.5.0.jar.sha1 new file mode 100644 index 0000000000000..97dccca431dd0 --- /dev/null +++ b/server/licenses/lucene-suggest-10.5.0.jar.sha1 @@ -0,0 +1 @@ +62ee5896308143da8ee6b8c0f6a1a2f724c1ffb4 \ No newline at end of file diff --git a/server/src/main/java/org/apache/lucene/codecs/lucene90/Lucene90DocValuesConsumerWrapper.java b/server/src/main/java/org/apache/lucene/codecs/lucene90/Lucene90DocValuesConsumerWrapper.java index 580f7a1cc576b..76ecf9a337b22 100644 --- a/server/src/main/java/org/apache/lucene/codecs/lucene90/Lucene90DocValuesConsumerWrapper.java +++ b/server/src/main/java/org/apache/lucene/codecs/lucene90/Lucene90DocValuesConsumerWrapper.java @@ -31,7 +31,9 @@ public Lucene90DocValuesConsumerWrapper( String dataCodec, String dataExtension, String metaCodec, - String metaExtension + String metaExtension, + String skipIndexCodec, + String skipIndexExtension ) throws IOException { lucene90DocValuesConsumer = new Lucene90DocValuesConsumer( state, @@ -39,7 +41,9 @@ public Lucene90DocValuesConsumerWrapper( dataCodec, dataExtension, metaCodec, - metaExtension + metaExtension, + skipIndexCodec, + skipIndexExtension ); } diff --git a/server/src/main/java/org/apache/lucene/codecs/lucene90/Lucene90DocValuesProducerWrapper.java b/server/src/main/java/org/apache/lucene/codecs/lucene90/Lucene90DocValuesProducerWrapper.java index a213852c59094..3a6588b18500c 100644 --- a/server/src/main/java/org/apache/lucene/codecs/lucene90/Lucene90DocValuesProducerWrapper.java +++ b/server/src/main/java/org/apache/lucene/codecs/lucene90/Lucene90DocValuesProducerWrapper.java @@ -30,9 +30,19 @@ public Lucene90DocValuesProducerWrapper( String dataCodec, String dataExtension, String metaCodec, - String metaExtension + String metaExtension, + String skipIndexCodec, + String skipIndexExtension ) throws IOException { - lucene90DocValuesProducer = new Lucene90DocValuesProducer(state, dataCodec, dataExtension, metaCodec, metaExtension); + lucene90DocValuesProducer = new Lucene90DocValuesProducer( + state, + dataCodec, + dataExtension, + metaCodec, + metaExtension, + skipIndexCodec, + skipIndexExtension + ); } public DocValuesProducer getLucene90DocValuesProducer() { diff --git a/server/src/main/java/org/apache/lucene/index/SortedSetDocValuesWriterWrapper.java b/server/src/main/java/org/apache/lucene/index/SortedSetDocValuesWriterWrapper.java index 95aa242535e48..6b02e2456a63a 100644 --- a/server/src/main/java/org/apache/lucene/index/SortedSetDocValuesWriterWrapper.java +++ b/server/src/main/java/org/apache/lucene/index/SortedSetDocValuesWriterWrapper.java @@ -33,7 +33,12 @@ public class SortedSetDocValuesWriterWrapper implements DocValuesWriterWrapper= 0 && start < length() : "start=" + start + " numBits=" + length(); + assert upperBound >= start && upperBound <= length() : "upperBound=" + upperBound + " numBits=" + length(); + + for (int i = start; i < upperBound; i++) { + if (get(i) == false) { + return i; + } + } + return DocIdSetIterator.NO_MORE_DOCS; + } } diff --git a/test/framework/licenses/lucene-codecs-10.4.0.jar.sha1 b/test/framework/licenses/lucene-codecs-10.4.0.jar.sha1 deleted file mode 100644 index 8b573c09b0a4c..0000000000000 --- a/test/framework/licenses/lucene-codecs-10.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -426ad64f5810e04a533f335aaeca4bbca3c746e1 \ No newline at end of file diff --git a/test/framework/licenses/lucene-codecs-10.5.0.jar.sha1 b/test/framework/licenses/lucene-codecs-10.5.0.jar.sha1 new file mode 100644 index 0000000000000..2409ee3ff1a8f --- /dev/null +++ b/test/framework/licenses/lucene-codecs-10.5.0.jar.sha1 @@ -0,0 +1 @@ +d128c42988203efb7c3a2c7fb8beb788cb578dae \ No newline at end of file diff --git a/test/framework/licenses/lucene-test-framework-10.4.0.jar.sha1 b/test/framework/licenses/lucene-test-framework-10.4.0.jar.sha1 deleted file mode 100644 index 8ba10fe22ab60..0000000000000 --- a/test/framework/licenses/lucene-test-framework-10.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2120a695bcd5c88882289bc77ed2b65d36469521 \ No newline at end of file diff --git a/test/framework/licenses/lucene-test-framework-10.5.0.jar.sha1 b/test/framework/licenses/lucene-test-framework-10.5.0.jar.sha1 new file mode 100644 index 0000000000000..891942e6fa1ec --- /dev/null +++ b/test/framework/licenses/lucene-test-framework-10.5.0.jar.sha1 @@ -0,0 +1 @@ +fbca09b1ae940d26b6c3a90befecda40d5f1c3c2 \ No newline at end of file From 6a9fd91e4fe44090e3bc36158fd34c220f7a8a2c Mon Sep 17 00:00:00 2001 From: Harsha Vamsi Kalluri Date: Thu, 25 Jun 2026 17:48:19 +0000 Subject: [PATCH 2/3] Fix last test Signed-off-by: Harsha Vamsi Kalluri --- .../datacube/startree/builder/StarTreeBuilderTestCase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/builder/StarTreeBuilderTestCase.java b/server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/builder/StarTreeBuilderTestCase.java index 5c96cf8333485..91c5149018f37 100644 --- a/server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/builder/StarTreeBuilderTestCase.java +++ b/server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/builder/StarTreeBuilderTestCase.java @@ -166,7 +166,7 @@ public void setup() throws IOException { } writeState = getWriteState(5, UUID.randomUUID().toString().substring(0, 16).getBytes(StandardCharsets.UTF_8)); - mergeState = new MergeState(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, false); + mergeState = new MergeState(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, false, null); dataFileName = IndexFileNames.segmentFileName( writeState.segmentInfo.name, From 4c7121f1982176bda329c43d0d0d77424a337069 Mon Sep 17 00:00:00 2001 From: Harsha Vamsi Kalluri Date: Mon, 29 Jun 2026 18:01:35 +0000 Subject: [PATCH 3/3] improve coverage Signed-off-by: Harsha Vamsi Kalluri --- .../java/org/opensearch/lucene/util/CombinedBitSetTests.java | 1 + 1 file changed, 1 insertion(+) diff --git a/server/src/test/java/org/opensearch/lucene/util/CombinedBitSetTests.java b/server/src/test/java/org/opensearch/lucene/util/CombinedBitSetTests.java index 7b5b9cec41b09..9219adf6162a9 100644 --- a/server/src/test/java/org/opensearch/lucene/util/CombinedBitSetTests.java +++ b/server/src/test/java/org/opensearch/lucene/util/CombinedBitSetTests.java @@ -79,6 +79,7 @@ private void testCase(int numBits, float percent1, float percent2) { for (int i = 0; i < numBits; ++i) { assertEquals(expected.nextSetBit(i), actual.nextSetBit(i)); assertEquals(Integer.toString(i), expected.prevSetBit(i), actual.prevSetBit(i)); + assertEquals(Integer.toString(i), expected.nextClearBit(i, numBits), actual.nextClearBit(i, numBits)); } }