From 0b378f60951069fe332a7a257d88e992ee73c9e9 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 25 Feb 2026 22:44:37 -0800 Subject: [PATCH 1/6] Bump Apache Lucene to 10.4.0 Signed-off-by: Ankit Jain --- gradle/libs.versions.toml | 2 +- ...cene-core-10.4.0-snapshot-a8c1455.jar.sha1 | 1 + .../src/main/java/org/opensearch/Version.java | 2 +- ...pressions-10.4.0-snapshot-a8c1455.jar.sha1 | 1 + ...lysis-icu-10.4.0-snapshot-a8c1455.jar.sha1 | 1 + ...-kuromoji-10.4.0-snapshot-a8c1455.jar.sha1 | 1 + ...ysis-nori-10.4.0-snapshot-a8c1455.jar.sha1 | 1 + ...-phonetic-10.4.0-snapshot-a8c1455.jar.sha1 | 1 + ...s-smartcn-10.4.0-snapshot-a8c1455.jar.sha1 | 1 + ...s-stempel-10.4.0-snapshot-a8c1455.jar.sha1 | 1 + ...orfologik-10.4.0-snapshot-a8c1455.jar.sha1 | 1 + ...is-common-10.4.0-snapshot-a8c1455.jar.sha1 | 1 + ...rd-codecs-10.4.0-snapshot-a8c1455.jar.sha1 | 1 + ...cene-core-10.4.0-snapshot-a8c1455.jar.sha1 | 1 + ...-grouping-10.4.0-snapshot-a8c1455.jar.sha1 | 1 + ...ghlighter-10.4.0-snapshot-a8c1455.jar.sha1 | 1 + ...cene-join-10.4.0-snapshot-a8c1455.jar.sha1 | 1 + ...ne-memory-10.4.0-snapshot-a8c1455.jar.sha1 | 1 + ...cene-misc-10.4.0-snapshot-a8c1455.jar.sha1 | 1 + ...e-queries-10.4.0-snapshot-a8c1455.jar.sha1 | 1 + ...eryparser-10.4.0-snapshot-a8c1455.jar.sha1 | 1 + ...e-sandbox-10.4.0-snapshot-a8c1455.jar.sha1 | 1 + ...al-extras-10.4.0-snapshot-a8c1455.jar.sha1 | 1 + ...spatial3d-10.4.0-snapshot-a8c1455.jar.sha1 | 1 + ...e-suggest-10.4.0-snapshot-a8c1455.jar.sha1 | 1 + .../org/opensearch/common/lucene/Lucene.java | 2 +- .../opensearch/index/codec/CodecService.java | 18 +++--- .../index/codec/CriteriaBasedCodec.java | 13 +++++ .../PerFieldMappingPostingFormatCodec.java | 4 +- .../composite/CompositeCodecFactory.java | 14 ++--- .../composite101/package-info.java | 2 +- .../composite103/Composite103Codec.java | 10 +--- .../composite103/package-info.java | 12 ++++ .../composite104/Composite104Codec.java | 58 +++++++++++++++++++ .../package-info.java | 4 +- .../index/mapper/CompletionFieldMapper.java | 4 +- .../services/org.apache.lucene.codecs.Codec | 3 +- .../index/CriteriaBasedMergePolicyTests.java | 4 +- .../opensearch/index/codec/CodecTests.java | 40 ++++++------- .../LuceneDocValuesConsumerFactoryTests.java | 8 +-- .../LuceneDocValuesProducerFactoryTests.java | 4 +- .../AbstractStarTreeDVFormatTests.java | 6 +- .../builder/BaseStarTreeBuilderTests.java | 4 +- .../startree/builder/BuilderTestsUtils.java | 6 +- .../builder/StarTreeBuildMetricTests.java | 6 +- .../builder/StarTreesBuilderTests.java | 4 +- .../meta/StarTreeMetadataTests.java | 4 +- .../engine/CompletionStatsCacheTests.java | 8 +-- .../DateHistogramAggregatorTests.java | 6 +- .../startree/DateRangeQueryTests.java | 6 +- .../startree/KeywordTermsAggregatorTests.java | 6 +- .../startree/MetricAggregatorTests.java | 6 +- .../startree/MultiTermsAggregatorTests.java | 6 +- .../startree/NumericTermsAggregatorTests.java | 6 +- .../startree/RangeAggregatorTests.java | 6 +- .../startree/StarTreeFilterTests.java | 6 +- .../StarTreeNestedAggregatorTests.java | 6 +- ...ne-codecs-10.4.0-snapshot-a8c1455.jar.sha1 | 1 + ...framework-10.4.0-snapshot-a8c1455.jar.sha1 | 1 + 59 files changed, 212 insertions(+), 109 deletions(-) create mode 100644 libs/core/licenses/lucene-core-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 modules/lang-expression/licenses/lucene-expressions-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 plugins/analysis-icu/licenses/lucene-analysis-icu-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 plugins/analysis-nori/licenses/lucene-analysis-nori-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 server/licenses/lucene-analysis-common-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 server/licenses/lucene-backward-codecs-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 server/licenses/lucene-core-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 server/licenses/lucene-grouping-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 server/licenses/lucene-highlighter-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 server/licenses/lucene-join-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 server/licenses/lucene-memory-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 server/licenses/lucene-misc-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 server/licenses/lucene-queries-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 server/licenses/lucene-queryparser-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 server/licenses/lucene-sandbox-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 server/licenses/lucene-spatial-extras-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 server/licenses/lucene-spatial3d-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 server/licenses/lucene-suggest-10.4.0-snapshot-a8c1455.jar.sha1 rename server/src/main/java/org/opensearch/index/codec/composite/{ => backward_codecs}/composite103/Composite103Codec.java (77%) create mode 100644 server/src/main/java/org/opensearch/index/codec/composite/backward_codecs/composite103/package-info.java create mode 100644 server/src/main/java/org/opensearch/index/codec/composite/composite104/Composite104Codec.java rename server/src/main/java/org/opensearch/index/codec/composite/{composite103 => composite104}/package-info.java (73%) create mode 100644 test/framework/licenses/lucene-codecs-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 test/framework/licenses/lucene-test-framework-10.4.0-snapshot-a8c1455.jar.sha1 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3a5b696e4305c..7b2bc3c65c844 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] opensearch = "3.6.0" -lucene = "10.3.2" +lucene = "10.4.0" bundled_jdk_vendor = "adoptium" bundled_jdk = "25.0.2+10" diff --git a/libs/core/licenses/lucene-core-10.4.0-snapshot-a8c1455.jar.sha1 b/libs/core/licenses/lucene-core-10.4.0-snapshot-a8c1455.jar.sha1 new file mode 100644 index 0000000000000..f036d2163e0fa --- /dev/null +++ b/libs/core/licenses/lucene-core-10.4.0-snapshot-a8c1455.jar.sha1 @@ -0,0 +1 @@ +96781fdefe4a7e2ac3482ccb41801b2cd1607501 \ 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 437570f5c71c8..2512a3d9752a3 100644 --- a/libs/core/src/main/java/org/opensearch/Version.java +++ b/libs/core/src/main/java/org/opensearch/Version.java @@ -135,7 +135,7 @@ public class Version implements Comparable, ToXContentFragment { public static final Version V_3_3_2 = new Version(3030299, org.apache.lucene.util.Version.LUCENE_10_3_1); public static final Version V_3_4_0 = new Version(3040099, org.apache.lucene.util.Version.LUCENE_10_3_2); public static final Version V_3_5_0 = new Version(3050099, org.apache.lucene.util.Version.LUCENE_10_3_2); - public static final Version V_3_6_0 = new Version(3060099, org.apache.lucene.util.Version.LUCENE_10_3_2); + public static final Version V_3_6_0 = new Version(3060099, org.apache.lucene.util.Version.LUCENE_10_4_0); public static final Version CURRENT = V_3_6_0; protected static final Map idToVersion; diff --git a/modules/lang-expression/licenses/lucene-expressions-10.4.0-snapshot-a8c1455.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-10.4.0-snapshot-a8c1455.jar.sha1 new file mode 100644 index 0000000000000..a778f3734eaea --- /dev/null +++ b/modules/lang-expression/licenses/lucene-expressions-10.4.0-snapshot-a8c1455.jar.sha1 @@ -0,0 +1 @@ +886e976447a505c02e636ba67b4d381b257a3f44 \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-10.4.0-snapshot-a8c1455.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-10.4.0-snapshot-a8c1455.jar.sha1 new file mode 100644 index 0000000000000..5d055d9231497 --- /dev/null +++ b/plugins/analysis-icu/licenses/lucene-analysis-icu-10.4.0-snapshot-a8c1455.jar.sha1 @@ -0,0 +1 @@ +2ad93f9924ecc4491b26dc540bef1fabe2afd2ea \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.4.0-snapshot-a8c1455.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.4.0-snapshot-a8c1455.jar.sha1 new file mode 100644 index 0000000000000..d534a31707557 --- /dev/null +++ b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.4.0-snapshot-a8c1455.jar.sha1 @@ -0,0 +1 @@ +6efc194346481fb1ca2a174182ad2429294021bb \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-10.4.0-snapshot-a8c1455.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-10.4.0-snapshot-a8c1455.jar.sha1 new file mode 100644 index 0000000000000..73745fbe6bd70 --- /dev/null +++ b/plugins/analysis-nori/licenses/lucene-analysis-nori-10.4.0-snapshot-a8c1455.jar.sha1 @@ -0,0 +1 @@ +11a5ecc992d8725bfb760925f07fe13a40ce4b06 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.4.0-snapshot-a8c1455.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.4.0-snapshot-a8c1455.jar.sha1 new file mode 100644 index 0000000000000..9b08ef6f575e1 --- /dev/null +++ b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.4.0-snapshot-a8c1455.jar.sha1 @@ -0,0 +1 @@ +7821a0b53f5c3e25418659163968f60327484da1 \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.4.0-snapshot-a8c1455.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.4.0-snapshot-a8c1455.jar.sha1 new file mode 100644 index 0000000000000..f2b538a1608b4 --- /dev/null +++ b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.4.0-snapshot-a8c1455.jar.sha1 @@ -0,0 +1 @@ +6bff6a2e336dee93a4dff882138296d80ab62fd6 \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.4.0-snapshot-a8c1455.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.4.0-snapshot-a8c1455.jar.sha1 new file mode 100644 index 0000000000000..6281cd2270a03 --- /dev/null +++ b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.4.0-snapshot-a8c1455.jar.sha1 @@ -0,0 +1 @@ +5d76ae18c4e5119845cd278ed276929505c88bfe \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.4.0-snapshot-a8c1455.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.4.0-snapshot-a8c1455.jar.sha1 new file mode 100644 index 0000000000000..60cb1191410a9 --- /dev/null +++ b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.4.0-snapshot-a8c1455.jar.sha1 @@ -0,0 +1 @@ +9513d1dcd7dd057a9026fa3c0764d778540d3b8d \ No newline at end of file diff --git a/server/licenses/lucene-analysis-common-10.4.0-snapshot-a8c1455.jar.sha1 b/server/licenses/lucene-analysis-common-10.4.0-snapshot-a8c1455.jar.sha1 new file mode 100644 index 0000000000000..26ab2d0886948 --- /dev/null +++ b/server/licenses/lucene-analysis-common-10.4.0-snapshot-a8c1455.jar.sha1 @@ -0,0 +1 @@ +7142df4d1076f734aabd863fc56516b58dcae605 \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-10.4.0-snapshot-a8c1455.jar.sha1 b/server/licenses/lucene-backward-codecs-10.4.0-snapshot-a8c1455.jar.sha1 new file mode 100644 index 0000000000000..3be0fd622f10d --- /dev/null +++ b/server/licenses/lucene-backward-codecs-10.4.0-snapshot-a8c1455.jar.sha1 @@ -0,0 +1 @@ +3d9f4cf13f20e1b384021a808d8f57a73427287e \ No newline at end of file diff --git a/server/licenses/lucene-core-10.4.0-snapshot-a8c1455.jar.sha1 b/server/licenses/lucene-core-10.4.0-snapshot-a8c1455.jar.sha1 new file mode 100644 index 0000000000000..f036d2163e0fa --- /dev/null +++ b/server/licenses/lucene-core-10.4.0-snapshot-a8c1455.jar.sha1 @@ -0,0 +1 @@ +96781fdefe4a7e2ac3482ccb41801b2cd1607501 \ No newline at end of file diff --git a/server/licenses/lucene-grouping-10.4.0-snapshot-a8c1455.jar.sha1 b/server/licenses/lucene-grouping-10.4.0-snapshot-a8c1455.jar.sha1 new file mode 100644 index 0000000000000..38b8beb22ee86 --- /dev/null +++ b/server/licenses/lucene-grouping-10.4.0-snapshot-a8c1455.jar.sha1 @@ -0,0 +1 @@ +beba73c7a31f7f72d21a1485b200d864706638b3 \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-10.4.0-snapshot-a8c1455.jar.sha1 b/server/licenses/lucene-highlighter-10.4.0-snapshot-a8c1455.jar.sha1 new file mode 100644 index 0000000000000..514916efe95fc --- /dev/null +++ b/server/licenses/lucene-highlighter-10.4.0-snapshot-a8c1455.jar.sha1 @@ -0,0 +1 @@ +077fca639cabd72a1c8521e6e3e8aacc36d0b7eb \ No newline at end of file diff --git a/server/licenses/lucene-join-10.4.0-snapshot-a8c1455.jar.sha1 b/server/licenses/lucene-join-10.4.0-snapshot-a8c1455.jar.sha1 new file mode 100644 index 0000000000000..fa2c3f28b08f9 --- /dev/null +++ b/server/licenses/lucene-join-10.4.0-snapshot-a8c1455.jar.sha1 @@ -0,0 +1 @@ +79ab48828901f08ca79b74fd0d1de855a7ed8cda \ No newline at end of file diff --git a/server/licenses/lucene-memory-10.4.0-snapshot-a8c1455.jar.sha1 b/server/licenses/lucene-memory-10.4.0-snapshot-a8c1455.jar.sha1 new file mode 100644 index 0000000000000..88d6d7c6112cd --- /dev/null +++ b/server/licenses/lucene-memory-10.4.0-snapshot-a8c1455.jar.sha1 @@ -0,0 +1 @@ +de41ae03a22b20fa52140f178ae62cad7724cf4e \ No newline at end of file diff --git a/server/licenses/lucene-misc-10.4.0-snapshot-a8c1455.jar.sha1 b/server/licenses/lucene-misc-10.4.0-snapshot-a8c1455.jar.sha1 new file mode 100644 index 0000000000000..657c12d7cc7ca --- /dev/null +++ b/server/licenses/lucene-misc-10.4.0-snapshot-a8c1455.jar.sha1 @@ -0,0 +1 @@ +7ae8474b4a17d92394126f9c6cc8e76e479df388 \ No newline at end of file diff --git a/server/licenses/lucene-queries-10.4.0-snapshot-a8c1455.jar.sha1 b/server/licenses/lucene-queries-10.4.0-snapshot-a8c1455.jar.sha1 new file mode 100644 index 0000000000000..36d81c37379ef --- /dev/null +++ b/server/licenses/lucene-queries-10.4.0-snapshot-a8c1455.jar.sha1 @@ -0,0 +1 @@ +24e09399d8c70f5a6a0d72546cec522696bf4bac \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-10.4.0-snapshot-a8c1455.jar.sha1 b/server/licenses/lucene-queryparser-10.4.0-snapshot-a8c1455.jar.sha1 new file mode 100644 index 0000000000000..0e38a1e1de26f --- /dev/null +++ b/server/licenses/lucene-queryparser-10.4.0-snapshot-a8c1455.jar.sha1 @@ -0,0 +1 @@ +86cf4d847c39a0081d23535be84bf36dbb6a262a \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-10.4.0-snapshot-a8c1455.jar.sha1 b/server/licenses/lucene-sandbox-10.4.0-snapshot-a8c1455.jar.sha1 new file mode 100644 index 0000000000000..6395cabb47562 --- /dev/null +++ b/server/licenses/lucene-sandbox-10.4.0-snapshot-a8c1455.jar.sha1 @@ -0,0 +1 @@ +c1078394a5db5510b3b8d508440d53be642fc1eb \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-10.4.0-snapshot-a8c1455.jar.sha1 b/server/licenses/lucene-spatial-extras-10.4.0-snapshot-a8c1455.jar.sha1 new file mode 100644 index 0000000000000..75b101054b014 --- /dev/null +++ b/server/licenses/lucene-spatial-extras-10.4.0-snapshot-a8c1455.jar.sha1 @@ -0,0 +1 @@ +8b7925295d45c23b9fc087e9762afc74da578ae5 \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-10.4.0-snapshot-a8c1455.jar.sha1 b/server/licenses/lucene-spatial3d-10.4.0-snapshot-a8c1455.jar.sha1 new file mode 100644 index 0000000000000..9023668aeb09c --- /dev/null +++ b/server/licenses/lucene-spatial3d-10.4.0-snapshot-a8c1455.jar.sha1 @@ -0,0 +1 @@ +055860e2000dfc62982ccb1e2ba4ea8bf75acd8e \ No newline at end of file diff --git a/server/licenses/lucene-suggest-10.4.0-snapshot-a8c1455.jar.sha1 b/server/licenses/lucene-suggest-10.4.0-snapshot-a8c1455.jar.sha1 new file mode 100644 index 0000000000000..572f527387b32 --- /dev/null +++ b/server/licenses/lucene-suggest-10.4.0-snapshot-a8c1455.jar.sha1 @@ -0,0 +1 @@ +197e5f4d7f5dab0442c1865fce9dd941d7620022 \ No newline at end of file diff --git a/server/src/main/java/org/opensearch/common/lucene/Lucene.java b/server/src/main/java/org/opensearch/common/lucene/Lucene.java index 2b0caf5516d83..241b810ceef46 100644 --- a/server/src/main/java/org/opensearch/common/lucene/Lucene.java +++ b/server/src/main/java/org/opensearch/common/lucene/Lucene.java @@ -113,7 +113,7 @@ * @opensearch.internal */ public class Lucene { - public static final String LATEST_CODEC = "Lucene103"; + public static final String LATEST_CODEC = "Lucene104"; public static final String SOFT_DELETES_FIELD = "__soft_deletes"; public static final String PARENT_FIELD = "__nested_parent"; diff --git a/server/src/main/java/org/opensearch/index/codec/CodecService.java b/server/src/main/java/org/opensearch/index/codec/CodecService.java index 8f9f447af7926..a069a411590b0 100644 --- a/server/src/main/java/org/opensearch/index/codec/CodecService.java +++ b/server/src/main/java/org/opensearch/index/codec/CodecService.java @@ -34,7 +34,7 @@ import org.apache.logging.log4j.Logger; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.codecs.lucene103.Lucene103Codec; +import org.apache.lucene.codecs.lucene104.Lucene104Codec; import org.opensearch.common.Nullable; import org.opensearch.common.annotation.PublicApi; import org.opensearch.common.collect.MapBuilder; @@ -87,23 +87,23 @@ public CodecService( final MapBuilder codecs = MapBuilder.newMapBuilder(); assert null != indexSettings; if (mapperService == null) { - codecs.put(DEFAULT_CODEC, new Lucene103Codec()); - codecs.put(LZ4, new Lucene103Codec()); - codecs.put(BEST_COMPRESSION_CODEC, new Lucene103Codec(Lucene103Codec.Mode.BEST_COMPRESSION)); - codecs.put(ZLIB, new Lucene103Codec(Lucene103Codec.Mode.BEST_COMPRESSION)); + codecs.put(DEFAULT_CODEC, new Lucene104Codec()); + codecs.put(LZ4, new Lucene104Codec()); + codecs.put(BEST_COMPRESSION_CODEC, new Lucene104Codec(Lucene104Codec.Mode.BEST_COMPRESSION)); + codecs.put(ZLIB, new Lucene104Codec(Lucene104Codec.Mode.BEST_COMPRESSION)); } else { // CompositeCodec still delegates to PerFieldMappingPostingFormatCodec // We can still support all the compression codecs when composite index is present if (mapperService.isCompositeIndexPresent()) { codecs.putAll(compositeCodecFactory.getCompositeIndexCodecs(mapperService, logger)); } else { - codecs.put(DEFAULT_CODEC, new PerFieldMappingPostingFormatCodec(Lucene103Codec.Mode.BEST_SPEED, mapperService, logger)); - codecs.put(LZ4, new PerFieldMappingPostingFormatCodec(Lucene103Codec.Mode.BEST_SPEED, mapperService, logger)); + codecs.put(DEFAULT_CODEC, new PerFieldMappingPostingFormatCodec(Lucene104Codec.Mode.BEST_SPEED, mapperService, logger)); + codecs.put(LZ4, new PerFieldMappingPostingFormatCodec(Lucene104Codec.Mode.BEST_SPEED, mapperService, logger)); codecs.put( BEST_COMPRESSION_CODEC, - new PerFieldMappingPostingFormatCodec(Lucene103Codec.Mode.BEST_COMPRESSION, mapperService, logger) + new PerFieldMappingPostingFormatCodec(Lucene104Codec.Mode.BEST_COMPRESSION, mapperService, logger) ); - codecs.put(ZLIB, new PerFieldMappingPostingFormatCodec(Lucene103Codec.Mode.BEST_COMPRESSION, mapperService, logger)); + codecs.put(ZLIB, new PerFieldMappingPostingFormatCodec(Lucene104Codec.Mode.BEST_COMPRESSION, mapperService, logger)); } } codecs.put(LUCENE_DEFAULT_CODEC, Codec.getDefault()); diff --git a/server/src/main/java/org/opensearch/index/codec/CriteriaBasedCodec.java b/server/src/main/java/org/opensearch/index/codec/CriteriaBasedCodec.java index b58b5fee7049d..349b6edffb24c 100644 --- a/server/src/main/java/org/opensearch/index/codec/CriteriaBasedCodec.java +++ b/server/src/main/java/org/opensearch/index/codec/CriteriaBasedCodec.java @@ -12,6 +12,13 @@ import org.apache.lucene.codecs.FilterCodec; import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.codecs.perfield.PerFieldPostingsFormat; +import org.apache.lucene.codecs.SegmentInfoFormat; +import org.apache.lucene.codecs.lucene104.Lucene104Codec; +import org.apache.lucene.index.SegmentInfo; +import org.apache.lucene.store.Directory; +import org.apache.lucene.store.IOContext; + +import java.io.IOException; /** * Filter codec used to attach bucket attributes to segments of child writer. @@ -22,6 +29,12 @@ public class CriteriaBasedCodec extends FilterCodec { private final String bucket; public static final String BUCKET_NAME = "bucket"; public static final String ATTRIBUTE_BINDING_TARGET_FIELD = "_id"; + private static final String PLACEHOLDER_BUCKET_FOR_PARENT_WRITER = "-2"; + + public CriteriaBasedCodec() { + super("CriteriaBasedCodec", new Lucene104Codec()); + bucket = null; + } public CriteriaBasedCodec(Codec delegate, String bucket) { super(delegate.getName(), delegate); diff --git a/server/src/main/java/org/opensearch/index/codec/PerFieldMappingPostingFormatCodec.java b/server/src/main/java/org/opensearch/index/codec/PerFieldMappingPostingFormatCodec.java index b2f288f03d5f6..ee2d2398af277 100644 --- a/server/src/main/java/org/opensearch/index/codec/PerFieldMappingPostingFormatCodec.java +++ b/server/src/main/java/org/opensearch/index/codec/PerFieldMappingPostingFormatCodec.java @@ -36,7 +36,7 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.DocValuesFormat; import org.apache.lucene.codecs.PostingsFormat; -import org.apache.lucene.codecs.lucene103.Lucene103Codec; +import org.apache.lucene.codecs.lucene104.Lucene104Codec; import org.apache.lucene.codecs.lucene90.Lucene90DocValuesFormat; import org.opensearch.common.lucene.Lucene; import org.opensearch.index.codec.fuzzy.FuzzyFilterPostingsFormat; @@ -59,7 +59,7 @@ * * @opensearch.internal */ -public class PerFieldMappingPostingFormatCodec extends Lucene103Codec { +public class PerFieldMappingPostingFormatCodec extends Lucene104Codec { private final Logger logger; private final MapperService mapperService; private final DocValuesFormat dvFormat = new Lucene90DocValuesFormat(); diff --git a/server/src/main/java/org/opensearch/index/codec/composite/CompositeCodecFactory.java b/server/src/main/java/org/opensearch/index/codec/composite/CompositeCodecFactory.java index 3273a10189ad8..5c5e88edbb6eb 100644 --- a/server/src/main/java/org/opensearch/index/codec/composite/CompositeCodecFactory.java +++ b/server/src/main/java/org/opensearch/index/codec/composite/CompositeCodecFactory.java @@ -10,9 +10,9 @@ import org.apache.logging.log4j.Logger; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.codecs.lucene103.Lucene103Codec; +import org.apache.lucene.codecs.lucene104.Lucene104Codec; import org.opensearch.common.annotation.ExperimentalApi; -import org.opensearch.index.codec.composite.composite103.Composite103Codec; +import org.opensearch.index.codec.composite.composite104.Composite104Codec; import org.opensearch.index.mapper.MapperService; import java.util.HashMap; @@ -32,16 +32,16 @@ public class CompositeCodecFactory { // we can use this to track the latest composite codec - public static final String COMPOSITE_CODEC = Composite103Codec.COMPOSITE_INDEX_CODEC_NAME; + public static final String COMPOSITE_CODEC = Composite104Codec.COMPOSITE_INDEX_CODEC_NAME; public CompositeCodecFactory() {} public Map getCompositeIndexCodecs(MapperService mapperService, Logger logger) { Map codecs = new HashMap<>(); - codecs.put(DEFAULT_CODEC, new Composite103Codec(Lucene103Codec.Mode.BEST_SPEED, mapperService, logger)); - codecs.put(LZ4, new Composite103Codec(Lucene103Codec.Mode.BEST_SPEED, mapperService, logger)); - codecs.put(BEST_COMPRESSION_CODEC, new Composite103Codec(Lucene103Codec.Mode.BEST_COMPRESSION, mapperService, logger)); - codecs.put(ZLIB, new Composite103Codec(Lucene103Codec.Mode.BEST_COMPRESSION, mapperService, logger)); + codecs.put(DEFAULT_CODEC, new Composite104Codec(Lucene104Codec.Mode.BEST_SPEED, mapperService, logger)); + codecs.put(LZ4, new Composite104Codec(Lucene104Codec.Mode.BEST_SPEED, mapperService, logger)); + codecs.put(BEST_COMPRESSION_CODEC, new Composite104Codec(Lucene104Codec.Mode.BEST_COMPRESSION, mapperService, logger)); + codecs.put(ZLIB, new Composite104Codec(Lucene104Codec.Mode.BEST_COMPRESSION, mapperService, logger)); return codecs; } } diff --git a/server/src/main/java/org/opensearch/index/codec/composite/backward_codecs/composite101/package-info.java b/server/src/main/java/org/opensearch/index/codec/composite/backward_codecs/composite101/package-info.java index c35f209cf89e0..0205fabe5d73b 100644 --- a/server/src/main/java/org/opensearch/index/codec/composite/backward_codecs/composite101/package-info.java +++ b/server/src/main/java/org/opensearch/index/codec/composite/backward_codecs/composite101/package-info.java @@ -7,6 +7,6 @@ */ /** - * Responsible for handling all composite index codecs and operations associated with Composite100 codec + * Responsible for handling all composite index codecs and operations associated with Composite101 codec */ package org.opensearch.index.codec.composite.backward_codecs.composite101; diff --git a/server/src/main/java/org/opensearch/index/codec/composite/composite103/Composite103Codec.java b/server/src/main/java/org/opensearch/index/codec/composite/backward_codecs/composite103/Composite103Codec.java similarity index 77% rename from server/src/main/java/org/opensearch/index/codec/composite/composite103/Composite103Codec.java rename to server/src/main/java/org/opensearch/index/codec/composite/backward_codecs/composite103/Composite103Codec.java index 043478cc6b34b..2c7ad01a4096c 100644 --- a/server/src/main/java/org/opensearch/index/codec/composite/composite103/Composite103Codec.java +++ b/server/src/main/java/org/opensearch/index/codec/composite/backward_codecs/composite103/Composite103Codec.java @@ -6,15 +6,13 @@ * compatible open source license. */ -package org.opensearch.index.codec.composite.composite103; +package org.opensearch.index.codec.composite.backward_codecs.composite103; -import org.apache.logging.log4j.Logger; +import org.apache.lucene.backward_codecs.lucene103.Lucene103Codec; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.DocValuesFormat; import org.apache.lucene.codecs.FilterCodec; -import org.apache.lucene.codecs.lucene103.Lucene103Codec; import org.opensearch.common.annotation.ExperimentalApi; -import org.opensearch.index.codec.PerFieldMappingPostingFormatCodec; import org.opensearch.index.codec.composite.composite912.Composite912DocValuesFormat; import org.opensearch.index.mapper.MapperService; @@ -34,10 +32,6 @@ public Composite103Codec() { this(COMPOSITE_INDEX_CODEC_NAME, new Lucene103Codec(), null); } - public Composite103Codec(Lucene103Codec.Mode compressionMode, MapperService mapperService, Logger logger) { - this(COMPOSITE_INDEX_CODEC_NAME, new PerFieldMappingPostingFormatCodec(compressionMode, mapperService, logger), mapperService); - } - /** * Sole constructor. When subclassing this codec, create a no-arg ctor and pass the delegate codec and a unique name to * this ctor. diff --git a/server/src/main/java/org/opensearch/index/codec/composite/backward_codecs/composite103/package-info.java b/server/src/main/java/org/opensearch/index/codec/composite/backward_codecs/composite103/package-info.java new file mode 100644 index 0000000000000..d819de7fd6346 --- /dev/null +++ b/server/src/main/java/org/opensearch/index/codec/composite/backward_codecs/composite103/package-info.java @@ -0,0 +1,12 @@ +/* + * SPDX-License-Identifier: Apache-2.0 + * + * The OpenSearch Contributors require contributions made to + * this file be licensed under the Apache-2.0 license or a + * compatible open source license. + */ + +/** + * Responsible for handling all composite index codecs and operations associated with Composite103 codec + */ +package org.opensearch.index.codec.composite.backward_codecs.composite103; diff --git a/server/src/main/java/org/opensearch/index/codec/composite/composite104/Composite104Codec.java b/server/src/main/java/org/opensearch/index/codec/composite/composite104/Composite104Codec.java new file mode 100644 index 0000000000000..a759996bff3c6 --- /dev/null +++ b/server/src/main/java/org/opensearch/index/codec/composite/composite104/Composite104Codec.java @@ -0,0 +1,58 @@ +/* + * SPDX-License-Identifier: Apache-2.0 + * + * The OpenSearch Contributors require contributions made to + * this file be licensed under the Apache-2.0 license or a + * compatible open source license. + */ + +package org.opensearch.index.codec.composite.composite104; + +import org.apache.logging.log4j.Logger; +import org.apache.lucene.codecs.Codec; +import org.apache.lucene.codecs.DocValuesFormat; +import org.apache.lucene.codecs.FilterCodec; +import org.apache.lucene.codecs.lucene104.Lucene104Codec; +import org.opensearch.common.annotation.ExperimentalApi; +import org.opensearch.index.codec.PerFieldMappingPostingFormatCodec; +import org.opensearch.index.codec.composite.composite912.Composite912DocValuesFormat; +import org.opensearch.index.mapper.MapperService; + +/** + * Extends the Codec to support new file formats for composite indices eg: star tree index + * based on the mappings. + * + * @opensearch.experimental + */ +@ExperimentalApi +public class Composite104Codec extends FilterCodec { + public static final String COMPOSITE_INDEX_CODEC_NAME = "Composite104Codec"; + private final MapperService mapperService; + + // needed for SPI - this is used in reader path + public Composite104Codec() { + this(COMPOSITE_INDEX_CODEC_NAME, new Lucene104Codec(), null); + } + + public Composite104Codec(Lucene104Codec.Mode compressionMode, MapperService mapperService, Logger logger) { + this(COMPOSITE_INDEX_CODEC_NAME, new PerFieldMappingPostingFormatCodec(compressionMode, mapperService, logger), mapperService); + } + + /** + * Sole constructor. When subclassing this codec, create a no-arg ctor and pass the delegate codec and a unique name to + * this ctor. + * + * @param name name of the codec + * @param delegate codec delegate + * @param mapperService mapper service instance + */ + protected Composite104Codec(String name, Codec delegate, MapperService mapperService) { + super(name, delegate); + this.mapperService = mapperService; + } + + @Override + public DocValuesFormat docValuesFormat() { + return new Composite912DocValuesFormat(mapperService); + } +} diff --git a/server/src/main/java/org/opensearch/index/codec/composite/composite103/package-info.java b/server/src/main/java/org/opensearch/index/codec/composite/composite104/package-info.java similarity index 73% rename from server/src/main/java/org/opensearch/index/codec/composite/composite103/package-info.java rename to server/src/main/java/org/opensearch/index/codec/composite/composite104/package-info.java index 424609b521fd1..970c7fe85e9b0 100644 --- a/server/src/main/java/org/opensearch/index/codec/composite/composite103/package-info.java +++ b/server/src/main/java/org/opensearch/index/codec/composite/composite104/package-info.java @@ -7,6 +7,6 @@ */ /** - * Responsible for handling all composite index codecs and operations associated with Composite100 codec + * Responsible for handling all composite index codecs and operations associated with Composite104 codec */ -package org.opensearch.index.codec.composite.composite103; +package org.opensearch.index.codec.composite.composite104; diff --git a/server/src/main/java/org/opensearch/index/mapper/CompletionFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/CompletionFieldMapper.java index a78d181e362b2..246aa2e803954 100644 --- a/server/src/main/java/org/opensearch/index/mapper/CompletionFieldMapper.java +++ b/server/src/main/java/org/opensearch/index/mapper/CompletionFieldMapper.java @@ -35,7 +35,7 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.Term; -import org.apache.lucene.search.suggest.document.Completion101PostingsFormat; +import org.apache.lucene.search.suggest.document.Completion104PostingsFormat; import org.apache.lucene.search.suggest.document.CompletionAnalyzer; import org.apache.lucene.search.suggest.document.CompletionQuery; import org.apache.lucene.search.suggest.document.FuzzyCompletionQuery; @@ -330,7 +330,7 @@ public ContextMappings getContextMappings() { */ public static synchronized PostingsFormat postingsFormat() { if (postingsFormat == null) { - postingsFormat = new Completion101PostingsFormat(); + postingsFormat = new Completion104PostingsFormat(); } return postingsFormat; } diff --git a/server/src/main/resources/META-INF/services/org.apache.lucene.codecs.Codec b/server/src/main/resources/META-INF/services/org.apache.lucene.codecs.Codec index 90f4d20ad07a5..7524cc1e7bd05 100644 --- a/server/src/main/resources/META-INF/services/org.apache.lucene.codecs.Codec +++ b/server/src/main/resources/META-INF/services/org.apache.lucene.codecs.Codec @@ -1,3 +1,4 @@ org.opensearch.index.codec.composite.composite912.Composite912Codec -org.opensearch.index.codec.composite.composite103.Composite103Codec +org.opensearch.index.codec.composite.composite104.Composite104Codec +org.opensearch.index.codec.composite.backward_codecs.composite103.Composite103Codec org.opensearch.index.codec.composite.backward_codecs.composite101.Composite101Codec diff --git a/server/src/test/java/org/opensearch/index/CriteriaBasedMergePolicyTests.java b/server/src/test/java/org/opensearch/index/CriteriaBasedMergePolicyTests.java index d45c042fcea8c..e5ab28f87db7b 100644 --- a/server/src/test/java/org/opensearch/index/CriteriaBasedMergePolicyTests.java +++ b/server/src/test/java/org/opensearch/index/CriteriaBasedMergePolicyTests.java @@ -8,7 +8,7 @@ package org.opensearch.index; -import org.apache.lucene.codecs.lucene103.Lucene103Codec; +import org.apache.lucene.codecs.lucene104.Lucene104Codec; import org.apache.lucene.index.MergePolicy; import org.apache.lucene.index.MergeTrigger; import org.apache.lucene.index.SegmentCommitInfo; @@ -160,7 +160,7 @@ private SegmentCommitInfo createSegmentCommitInfo(String segmentName, String buc 5, false, false, - new Lucene103Codec(), + new Lucene104Codec(), new HashMap<>(), UUID.randomUUID().toString().substring(0, 16).getBytes(StandardCharsets.UTF_8), new HashMap<>(), diff --git a/server/src/test/java/org/opensearch/index/codec/CodecTests.java b/server/src/test/java/org/opensearch/index/codec/CodecTests.java index bcc507d22f4d9..304155d074abc 100644 --- a/server/src/test/java/org/opensearch/index/codec/CodecTests.java +++ b/server/src/test/java/org/opensearch/index/codec/CodecTests.java @@ -34,7 +34,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.codecs.lucene103.Lucene103Codec; +import org.apache.lucene.codecs.lucene104.Lucene104Codec; import org.apache.lucene.codecs.lucene90.Lucene90StoredFieldsFormat; import org.apache.lucene.document.Document; import org.apache.lucene.index.DirectoryReader; @@ -48,7 +48,7 @@ import org.opensearch.env.Environment; import org.opensearch.index.IndexSettings; import org.opensearch.index.analysis.IndexAnalyzers; -import org.opensearch.index.codec.composite.composite103.Composite103Codec; +import org.opensearch.index.codec.composite.composite104.Composite104Codec; import org.opensearch.index.engine.EngineConfig; import org.opensearch.index.mapper.MapperService; import org.opensearch.index.similarity.SimilarityService; @@ -72,58 +72,58 @@ public class CodecTests extends OpenSearchTestCase { public void testResolveDefaultCodecs() throws Exception { CodecService codecService = createCodecService(false); assertThat(codecService.codec("default"), instanceOf(PerFieldMappingPostingFormatCodec.class)); - assertThat(codecService.codec("default"), instanceOf(Lucene103Codec.class)); + assertThat(codecService.codec("default"), instanceOf(Lucene104Codec.class)); } public void testDefault() throws Exception { Codec codec = createCodecService(false).codec("default"); - assertStoredFieldsCompressionEquals(Lucene103Codec.Mode.BEST_SPEED, codec); + assertStoredFieldsCompressionEquals(Lucene104Codec.Mode.BEST_SPEED, codec); } public void testDefaultWithCompositeIndex() throws Exception { Codec codec = createCodecService(false, true).codec("default"); - assertStoredFieldsCompressionEquals(Lucene103Codec.Mode.BEST_SPEED, codec); - assert codec instanceof Composite103Codec; + assertStoredFieldsCompressionEquals(Lucene104Codec.Mode.BEST_SPEED, codec); + assert codec instanceof Composite104Codec; } public void testBestCompression() throws Exception { Codec codec = createCodecService(false).codec("best_compression"); - assertStoredFieldsCompressionEquals(Lucene103Codec.Mode.BEST_COMPRESSION, codec); + assertStoredFieldsCompressionEquals(Lucene104Codec.Mode.BEST_COMPRESSION, codec); } public void testBestCompressionWithCompositeIndex() throws Exception { Codec codec = createCodecService(false, true).codec("best_compression"); - assertStoredFieldsCompressionEquals(Lucene103Codec.Mode.BEST_COMPRESSION, codec); - assert codec instanceof Composite103Codec; + assertStoredFieldsCompressionEquals(Lucene104Codec.Mode.BEST_COMPRESSION, codec); + assert codec instanceof Composite104Codec; } public void testLZ4() throws Exception { Codec codec = createCodecService(false).codec("lz4"); - assertStoredFieldsCompressionEquals(Lucene103Codec.Mode.BEST_SPEED, codec); + assertStoredFieldsCompressionEquals(Lucene104Codec.Mode.BEST_SPEED, codec); assert codec instanceof PerFieldMappingPostingFormatCodec; } public void testLZ4WithCompositeIndex() throws Exception { Codec codec = createCodecService(false, true).codec("lz4"); - assertStoredFieldsCompressionEquals(Lucene103Codec.Mode.BEST_SPEED, codec); - assert codec instanceof Composite103Codec; + assertStoredFieldsCompressionEquals(Lucene104Codec.Mode.BEST_SPEED, codec); + assert codec instanceof Composite104Codec; } public void testZlib() throws Exception { Codec codec = createCodecService(false).codec("zlib"); - assertStoredFieldsCompressionEquals(Lucene103Codec.Mode.BEST_COMPRESSION, codec); + assertStoredFieldsCompressionEquals(Lucene104Codec.Mode.BEST_COMPRESSION, codec); assert codec instanceof PerFieldMappingPostingFormatCodec; } public void testZlibWithCompositeIndex() throws Exception { Codec codec = createCodecService(false, true).codec("zlib"); - assertStoredFieldsCompressionEquals(Lucene103Codec.Mode.BEST_COMPRESSION, codec); - assert codec instanceof Composite103Codec; + assertStoredFieldsCompressionEquals(Lucene104Codec.Mode.BEST_COMPRESSION, codec); + assert codec instanceof Composite104Codec; } public void testResolveDefaultCodecsWithCompositeIndex() throws Exception { CodecService codecService = createCodecService(false, true); - assertThat(codecService.codec("default"), instanceOf(Composite103Codec.class)); + assertThat(codecService.codec("default"), instanceOf(Composite104Codec.class)); } public void testBestCompressionWithCompressionLevel() { @@ -158,12 +158,12 @@ public void testLuceneCodecsWithCompressionLevel() { public void testDefaultMapperServiceNull() throws Exception { Codec codec = createCodecService(true).codec("default"); - assertStoredFieldsCompressionEquals(Lucene103Codec.Mode.BEST_SPEED, codec); + assertStoredFieldsCompressionEquals(Lucene104Codec.Mode.BEST_SPEED, codec); } public void testBestCompressionMapperServiceNull() throws Exception { Codec codec = createCodecService(true).codec("best_compression"); - assertStoredFieldsCompressionEquals(Lucene103Codec.Mode.BEST_COMPRESSION, codec); + assertStoredFieldsCompressionEquals(Lucene104Codec.Mode.BEST_COMPRESSION, codec); } public void testExceptionCodecNull() { @@ -175,11 +175,11 @@ public void testExceptionIndexSettingsNull() { } // write some docs with it, inspect .si to see this was the used compression - private void assertStoredFieldsCompressionEquals(Lucene103Codec.Mode expected, Codec actual) throws Exception { + private void assertStoredFieldsCompressionEquals(Lucene104Codec.Mode expected, Codec actual) throws Exception { SegmentReader sr = getSegmentReader(actual); String v = sr.getSegmentInfo().info.getAttribute(Lucene90StoredFieldsFormat.MODE_KEY); assertNotNull(v); - assertEquals(expected, Lucene103Codec.Mode.valueOf(v)); + assertEquals(expected, Lucene104Codec.Mode.valueOf(v)); } private CodecService createCodecService(boolean isMapperServiceNull) throws IOException { diff --git a/server/src/test/java/org/opensearch/index/codec/composite/LuceneDocValuesConsumerFactoryTests.java b/server/src/test/java/org/opensearch/index/codec/composite/LuceneDocValuesConsumerFactoryTests.java index fdb2df2be0dbc..81631ad46d7ff 100644 --- a/server/src/test/java/org/opensearch/index/codec/composite/LuceneDocValuesConsumerFactoryTests.java +++ b/server/src/test/java/org/opensearch/index/codec/composite/LuceneDocValuesConsumerFactoryTests.java @@ -9,7 +9,7 @@ package org.opensearch.index.codec.composite; import org.apache.lucene.codecs.DocValuesConsumer; -import org.apache.lucene.codecs.lucene103.Lucene103Codec; +import org.apache.lucene.codecs.lucene104.Lucene104Codec; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.FieldInfos; import org.apache.lucene.index.SegmentInfo; @@ -17,7 +17,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.util.InfoStream; import org.apache.lucene.util.Version; -import org.opensearch.index.codec.composite.composite103.Composite103Codec; +import org.opensearch.index.codec.composite.composite104.Composite104Codec; import org.opensearch.test.OpenSearchTestCase; import org.junit.After; import org.junit.Before; @@ -49,7 +49,7 @@ public void testGetDocValuesConsumerForCompositeCodec() throws IOException { randomInt(), false, false, - new Lucene103Codec(), + new Lucene104Codec(), new HashMap<>(), UUID.randomUUID().toString().substring(0, 16).getBytes(StandardCharsets.UTF_8), new HashMap<>(), @@ -73,7 +73,7 @@ public void testGetDocValuesConsumerForCompositeCodec() throws IOException { ); assertEquals("org.apache.lucene.codecs.lucene90.Lucene90DocValuesConsumer", consumer.getClass().getName()); - assertEquals(CompositeCodecFactory.COMPOSITE_CODEC, Composite103Codec.COMPOSITE_INDEX_CODEC_NAME); + assertEquals(CompositeCodecFactory.COMPOSITE_CODEC, Composite104Codec.COMPOSITE_INDEX_CODEC_NAME); consumer.close(); } diff --git a/server/src/test/java/org/opensearch/index/codec/composite/LuceneDocValuesProducerFactoryTests.java b/server/src/test/java/org/opensearch/index/codec/composite/LuceneDocValuesProducerFactoryTests.java index ec65e532cfbeb..9c3a95b9ee608 100644 --- a/server/src/test/java/org/opensearch/index/codec/composite/LuceneDocValuesProducerFactoryTests.java +++ b/server/src/test/java/org/opensearch/index/codec/composite/LuceneDocValuesProducerFactoryTests.java @@ -10,7 +10,7 @@ import org.apache.lucene.codecs.DocValuesConsumer; import org.apache.lucene.codecs.DocValuesProducer; -import org.apache.lucene.codecs.lucene103.Lucene103Codec; +import org.apache.lucene.codecs.lucene104.Lucene104Codec; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.FieldInfos; import org.apache.lucene.index.SegmentInfo; @@ -53,7 +53,7 @@ public void testGetDocValuesProducerForCompositeCodec99() throws IOException { randomInt(), false, false, - new Lucene103Codec(), + new Lucene104Codec(), new HashMap<>(), UUID.randomUUID().toString().substring(0, 16).getBytes(StandardCharsets.UTF_8), new HashMap<>(), diff --git a/server/src/test/java/org/opensearch/index/codec/composite912/datacube/startree/AbstractStarTreeDVFormatTests.java b/server/src/test/java/org/opensearch/index/codec/composite912/datacube/startree/AbstractStarTreeDVFormatTests.java index c281ad469be16..16d5307e99732 100644 --- a/server/src/test/java/org/opensearch/index/codec/composite912/datacube/startree/AbstractStarTreeDVFormatTests.java +++ b/server/src/test/java/org/opensearch/index/codec/composite912/datacube/startree/AbstractStarTreeDVFormatTests.java @@ -13,7 +13,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.codecs.lucene103.Lucene103Codec; +import org.apache.lucene.codecs.lucene104.Lucene104Codec; import org.apache.lucene.tests.index.BaseDocValuesFormatTestCase; import org.apache.lucene.tests.util.LuceneTestCase; import org.opensearch.Version; @@ -28,7 +28,7 @@ import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.index.IndexSettings; import org.opensearch.index.MapperTestUtils; -import org.opensearch.index.codec.composite.composite103.Composite103Codec; +import org.opensearch.index.codec.composite.composite104.Composite104Codec; import org.opensearch.index.compositeindex.datacube.startree.StarTreeFieldConfiguration; import org.opensearch.index.compositeindex.datacube.startree.StarTreeIndexSettings; import org.opensearch.index.mapper.MapperService; @@ -75,7 +75,7 @@ protected Codec getCodec() { } catch (IOException e) { throw new RuntimeException(e); } - Codec codec = new Composite103Codec(Lucene103Codec.Mode.BEST_SPEED, mapperService, testLogger); + Codec codec = new Composite104Codec(Lucene104Codec.Mode.BEST_SPEED, mapperService, testLogger); return codec; } diff --git a/server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/builder/BaseStarTreeBuilderTests.java b/server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/builder/BaseStarTreeBuilderTests.java index 1ab9af16f4bdd..e23e6c59b66fe 100644 --- a/server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/builder/BaseStarTreeBuilderTests.java +++ b/server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/builder/BaseStarTreeBuilderTests.java @@ -10,7 +10,7 @@ import org.apache.lucene.codecs.DocValuesConsumer; import org.apache.lucene.codecs.DocValuesProducer; -import org.apache.lucene.codecs.lucene103.Lucene103Codec; +import org.apache.lucene.codecs.lucene104.Lucene104Codec; import org.apache.lucene.index.DocValuesSkipIndexType; import org.apache.lucene.index.DocValuesType; import org.apache.lucene.index.FieldInfo; @@ -115,7 +115,7 @@ public static void setup() throws IOException { 5, false, false, - new Lucene103Codec(), + new Lucene104Codec(), new HashMap<>(), UUID.randomUUID().toString().substring(0, 16).getBytes(StandardCharsets.UTF_8), new HashMap<>(), diff --git a/server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/builder/BuilderTestsUtils.java b/server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/builder/BuilderTestsUtils.java index 6d9e8f9f8e2de..391625dd3393b 100644 --- a/server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/builder/BuilderTestsUtils.java +++ b/server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/builder/BuilderTestsUtils.java @@ -9,7 +9,7 @@ package org.opensearch.index.compositeindex.datacube.startree.builder; import org.apache.lucene.codecs.DocValuesProducer; -import org.apache.lucene.codecs.lucene103.Lucene103Codec; +import org.apache.lucene.codecs.lucene104.Lucene104Codec; import org.apache.lucene.index.DocValuesSkipIndexType; import org.apache.lucene.index.DocValuesType; import org.apache.lucene.index.FieldInfo; @@ -526,7 +526,7 @@ public static SegmentReadState getReadState( numDocs, false, false, - new Lucene103Codec(), + new Lucene104Codec(), new HashMap<>(), writeState.segmentInfo.getId(), new HashMap<>(), @@ -580,7 +580,7 @@ public static SegmentWriteState getWriteState(int numDocs, byte[] id, FieldInfo[ numDocs, false, false, - new Lucene103Codec(), + new Lucene104Codec(), new HashMap<>(), id, new HashMap<>(), diff --git a/server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/builder/StarTreeBuildMetricTests.java b/server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/builder/StarTreeBuildMetricTests.java index f877b2bc084cc..34a7737cfa5f6 100644 --- a/server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/builder/StarTreeBuildMetricTests.java +++ b/server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/builder/StarTreeBuildMetricTests.java @@ -10,7 +10,7 @@ import org.apache.lucene.codecs.DocValuesConsumer; import org.apache.lucene.codecs.DocValuesProducer; -import org.apache.lucene.codecs.lucene103.Lucene103Codec; +import org.apache.lucene.codecs.lucene104.Lucene104Codec; import org.apache.lucene.index.DocValuesSkipIndexType; import org.apache.lucene.index.DocValuesType; import org.apache.lucene.index.FieldInfo; @@ -641,7 +641,7 @@ public void test_build_multipleStarTrees() throws IOException { 7, false, false, - new Lucene103Codec(), + new Lucene104Codec(), new HashMap<>(), UUID.randomUUID().toString().substring(0, 16).getBytes(StandardCharsets.UTF_8), new HashMap<>(), @@ -925,7 +925,7 @@ public void test_build_starTreeDataset() throws IOException { 7, false, false, - new Lucene103Codec(), + new Lucene104Codec(), new HashMap<>(), UUID.randomUUID().toString().substring(0, 16).getBytes(StandardCharsets.UTF_8), new HashMap<>(), diff --git a/server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/builder/StarTreesBuilderTests.java b/server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/builder/StarTreesBuilderTests.java index c2ec63fdbbfa8..901c1e55e177b 100644 --- a/server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/builder/StarTreesBuilderTests.java +++ b/server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/builder/StarTreesBuilderTests.java @@ -10,7 +10,7 @@ import org.apache.lucene.codecs.DocValuesConsumer; import org.apache.lucene.codecs.DocValuesProducer; -import org.apache.lucene.codecs.lucene103.Lucene103Codec; +import org.apache.lucene.codecs.lucene104.Lucene104Codec; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.FieldInfos; import org.apache.lucene.index.SegmentInfo; @@ -65,7 +65,7 @@ public void setUp() throws Exception { 5, false, false, - new Lucene103Codec(), + new Lucene104Codec(), new HashMap<>(), UUID.randomUUID().toString().substring(0, 16).getBytes(StandardCharsets.UTF_8), new HashMap<>(), diff --git a/server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/fileformats/meta/StarTreeMetadataTests.java b/server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/fileformats/meta/StarTreeMetadataTests.java index c8d07542238e2..bb90ebc38435d 100644 --- a/server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/fileformats/meta/StarTreeMetadataTests.java +++ b/server/src/test/java/org/opensearch/index/compositeindex/datacube/startree/fileformats/meta/StarTreeMetadataTests.java @@ -8,7 +8,7 @@ package org.opensearch.index.compositeindex.datacube.startree.fileformats.meta; -import org.apache.lucene.codecs.lucene103.Lucene103Codec; +import org.apache.lucene.codecs.lucene104.Lucene104Codec; import org.apache.lucene.index.DocValuesSkipIndexType; import org.apache.lucene.index.DocValuesType; import org.apache.lucene.index.FieldInfo; @@ -81,7 +81,7 @@ public void setup() throws IOException { 6, false, false, - new Lucene103Codec(), + new Lucene104Codec(), new HashMap<>(), UUID.randomUUID().toString().substring(0, 16).getBytes(StandardCharsets.UTF_8), new HashMap<>(), diff --git a/server/src/test/java/org/opensearch/index/engine/CompletionStatsCacheTests.java b/server/src/test/java/org/opensearch/index/engine/CompletionStatsCacheTests.java index 26c5d538fec28..130486fb10129 100644 --- a/server/src/test/java/org/opensearch/index/engine/CompletionStatsCacheTests.java +++ b/server/src/test/java/org/opensearch/index/engine/CompletionStatsCacheTests.java @@ -32,14 +32,14 @@ package org.opensearch.index.engine; import org.apache.lucene.codecs.PostingsFormat; -import org.apache.lucene.codecs.lucene103.Lucene103Codec; +import org.apache.lucene.codecs.lucene104.Lucene104Codec; import org.apache.lucene.document.Document; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.search.Query; import org.apache.lucene.search.QueryCachingPolicy; -import org.apache.lucene.search.suggest.document.Completion101PostingsFormat; +import org.apache.lucene.search.suggest.document.Completion104PostingsFormat; import org.apache.lucene.search.suggest.document.SuggestField; import org.apache.lucene.store.Directory; import org.opensearch.OpenSearchException; @@ -69,8 +69,8 @@ public void testExceptionsAreNotCached() { public void testCompletionStatsCache() throws IOException, InterruptedException { final IndexWriterConfig indexWriterConfig = newIndexWriterConfig(); - final PostingsFormat postingsFormat = new Completion101PostingsFormat(); - indexWriterConfig.setCodec(new Lucene103Codec() { + final PostingsFormat postingsFormat = new Completion104PostingsFormat(); + indexWriterConfig.setCodec(new Lucene104Codec() { @Override public PostingsFormat getPostingsFormatForField(String field) { return postingsFormat; // all fields are suggest fields diff --git a/server/src/test/java/org/opensearch/search/aggregations/startree/DateHistogramAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/startree/DateHistogramAggregatorTests.java index 396d9a5f27b50..8665241e4c7c4 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/startree/DateHistogramAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/startree/DateHistogramAggregatorTests.java @@ -13,7 +13,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.codecs.lucene103.Lucene103Codec; +import org.apache.lucene.codecs.lucene104.Lucene104Codec; import org.apache.lucene.document.Document; import org.apache.lucene.document.LongPoint; import org.apache.lucene.document.SortedNumericDocValuesField; @@ -31,7 +31,7 @@ import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.index.codec.composite.CompositeIndexFieldInfo; import org.opensearch.index.codec.composite.CompositeIndexReader; -import org.opensearch.index.codec.composite.composite103.Composite103Codec; +import org.opensearch.index.codec.composite.composite104.Composite104Codec; import org.opensearch.index.codec.composite912.datacube.startree.StarTreeDocValuesFormatTests; import org.opensearch.index.compositeindex.datacube.DateDimension; import org.opensearch.index.compositeindex.datacube.Dimension; @@ -82,7 +82,7 @@ protected Codec getCodec() { } catch (IOException e) { throw new RuntimeException(e); } - return new Composite103Codec(Lucene103Codec.Mode.BEST_SPEED, mapperService, testLogger); + return new Composite104Codec(Lucene104Codec.Mode.BEST_SPEED, mapperService, testLogger); } public void testStarTreeDateHistogram() throws IOException { diff --git a/server/src/test/java/org/opensearch/search/aggregations/startree/DateRangeQueryTests.java b/server/src/test/java/org/opensearch/search/aggregations/startree/DateRangeQueryTests.java index e115e4e9eed7f..3f967b25d4fea 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/startree/DateRangeQueryTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/startree/DateRangeQueryTests.java @@ -13,7 +13,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.codecs.lucene103.Lucene103Codec; +import org.apache.lucene.codecs.lucene104.Lucene104Codec; import org.apache.lucene.document.Document; import org.apache.lucene.document.LongPoint; import org.apache.lucene.document.SortedNumericDocValuesField; @@ -32,7 +32,7 @@ import org.opensearch.common.lucene.Lucene; import org.opensearch.index.codec.composite.CompositeIndexFieldInfo; import org.opensearch.index.codec.composite.CompositeIndexReader; -import org.opensearch.index.codec.composite.composite103.Composite103Codec; +import org.opensearch.index.codec.composite.composite104.Composite104Codec; import org.opensearch.index.codec.composite912.datacube.startree.StarTreeDocValuesFormatTests; import org.opensearch.index.compositeindex.datacube.DateDimension; import org.opensearch.index.compositeindex.datacube.Dimension; @@ -87,7 +87,7 @@ protected Codec getCodec() { } catch (IOException e) { throw new RuntimeException(e); } - return new Composite103Codec(Lucene103Codec.Mode.BEST_SPEED, mapperService, testLogger); + return new Composite104Codec(Lucene104Codec.Mode.BEST_SPEED, mapperService, testLogger); } public void testStarTreeValidDateRangeQuery() throws IOException { diff --git a/server/src/test/java/org/opensearch/search/aggregations/startree/KeywordTermsAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/startree/KeywordTermsAggregatorTests.java index ce567eff034d9..c0469434eb6f7 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/startree/KeywordTermsAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/startree/KeywordTermsAggregatorTests.java @@ -13,7 +13,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.codecs.lucene103.Lucene103Codec; +import org.apache.lucene.codecs.lucene104.Lucene104Codec; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.SortedNumericDocValuesField; @@ -33,7 +33,7 @@ import org.opensearch.common.lucene.Lucene; import org.opensearch.index.codec.composite.CompositeIndexFieldInfo; import org.opensearch.index.codec.composite.CompositeIndexReader; -import org.opensearch.index.codec.composite.composite103.Composite103Codec; +import org.opensearch.index.codec.composite.composite104.Composite104Codec; import org.opensearch.index.codec.composite912.datacube.startree.StarTreeDocValuesFormatTests; import org.opensearch.index.compositeindex.datacube.Dimension; import org.opensearch.index.compositeindex.datacube.NumericDimension; @@ -85,7 +85,7 @@ protected Codec getCodec() { } catch (IOException e) { throw new RuntimeException(e); } - return new Composite103Codec(Lucene103Codec.Mode.BEST_SPEED, mapperService, testLogger); + return new Composite104Codec(Lucene104Codec.Mode.BEST_SPEED, mapperService, testLogger); } public void testStarTreeKeywordTerms() throws IOException { diff --git a/server/src/test/java/org/opensearch/search/aggregations/startree/MetricAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/startree/MetricAggregatorTests.java index 0dc575d4ea928..056cb181c23a3 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/startree/MetricAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/startree/MetricAggregatorTests.java @@ -13,7 +13,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.codecs.lucene103.Lucene103Codec; +import org.apache.lucene.codecs.lucene104.Lucene104Codec; import org.apache.lucene.document.Document; import org.apache.lucene.document.DoubleField; import org.apache.lucene.document.Field; @@ -43,7 +43,7 @@ import org.opensearch.core.indices.breaker.NoneCircuitBreakerService; import org.opensearch.index.codec.composite.CompositeIndexFieldInfo; import org.opensearch.index.codec.composite.CompositeIndexReader; -import org.opensearch.index.codec.composite.composite103.Composite103Codec; +import org.opensearch.index.codec.composite.composite104.Composite104Codec; import org.opensearch.index.codec.composite912.datacube.startree.StarTreeDocValuesFormatTests; import org.opensearch.index.compositeindex.datacube.Dimension; import org.opensearch.index.compositeindex.datacube.Metric; @@ -124,7 +124,7 @@ protected Codec getCodec( } catch (IOException e) { throw new RuntimeException(e); } - return new Composite103Codec(Lucene103Codec.Mode.BEST_SPEED, mapperService, testLogger); + return new Composite104Codec(Lucene104Codec.Mode.BEST_SPEED, mapperService, testLogger); } public void testStarTreeDocValues() throws IOException { diff --git a/server/src/test/java/org/opensearch/search/aggregations/startree/MultiTermsAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/startree/MultiTermsAggregatorTests.java index 769630974ce48..a587d30c04950 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/startree/MultiTermsAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/startree/MultiTermsAggregatorTests.java @@ -11,7 +11,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.codecs.lucene103.Lucene103Codec; +import org.apache.lucene.codecs.lucene104.Lucene104Codec; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.SortedNumericDocValuesField; @@ -32,7 +32,7 @@ import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.index.codec.composite.CompositeIndexFieldInfo; import org.opensearch.index.codec.composite.CompositeIndexReader; -import org.opensearch.index.codec.composite.composite103.Composite103Codec; +import org.opensearch.index.codec.composite.composite104.Composite104Codec; import org.opensearch.index.codec.composite912.datacube.startree.StarTreeDocValuesFormatTests; import org.opensearch.index.compositeindex.datacube.Dimension; import org.opensearch.index.compositeindex.datacube.NumericDimension; @@ -86,7 +86,7 @@ protected Codec getCodec() { } catch (IOException e) { throw new RuntimeException(e); } - return new Composite103Codec(Lucene103Codec.Mode.BEST_SPEED, mapperService, testLogger); + return new Composite104Codec(Lucene104Codec.Mode.BEST_SPEED, mapperService, testLogger); } public void testMultiTermsWithStarTree() throws IOException { diff --git a/server/src/test/java/org/opensearch/search/aggregations/startree/NumericTermsAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/startree/NumericTermsAggregatorTests.java index 28919b9539b13..b8c8c34b338d7 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/startree/NumericTermsAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/startree/NumericTermsAggregatorTests.java @@ -13,7 +13,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.codecs.lucene103.Lucene103Codec; +import org.apache.lucene.codecs.lucene104.Lucene104Codec; import org.apache.lucene.document.Document; import org.apache.lucene.document.SortedNumericDocValuesField; import org.apache.lucene.index.DirectoryReader; @@ -31,7 +31,7 @@ import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.index.codec.composite.CompositeIndexFieldInfo; import org.opensearch.index.codec.composite.CompositeIndexReader; -import org.opensearch.index.codec.composite.composite103.Composite103Codec; +import org.opensearch.index.codec.composite.composite104.Composite104Codec; import org.opensearch.index.codec.composite912.datacube.startree.StarTreeDocValuesFormatTests; import org.opensearch.index.compositeindex.datacube.Dimension; import org.opensearch.index.compositeindex.datacube.NumericDimension; @@ -81,7 +81,7 @@ protected Codec getCodec() { } catch (IOException e) { throw new RuntimeException(e); } - return new Composite103Codec(Lucene103Codec.Mode.BEST_SPEED, mapperService, testLogger); + return new Composite104Codec(Lucene104Codec.Mode.BEST_SPEED, mapperService, testLogger); } public void testStarTreeNumericTerms() throws IOException { diff --git a/server/src/test/java/org/opensearch/search/aggregations/startree/RangeAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/startree/RangeAggregatorTests.java index 30b5a852040b0..e3ef7d62fcde7 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/startree/RangeAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/startree/RangeAggregatorTests.java @@ -13,7 +13,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.codecs.lucene103.Lucene103Codec; +import org.apache.lucene.codecs.lucene104.Lucene104Codec; import org.apache.lucene.document.Document; import org.apache.lucene.document.SortedNumericDocValuesField; import org.apache.lucene.index.DirectoryReader; @@ -29,7 +29,7 @@ import org.opensearch.common.lucene.Lucene; import org.opensearch.index.codec.composite.CompositeIndexFieldInfo; import org.opensearch.index.codec.composite.CompositeIndexReader; -import org.opensearch.index.codec.composite.composite103.Composite103Codec; +import org.opensearch.index.codec.composite.composite104.Composite104Codec; import org.opensearch.index.codec.composite912.datacube.startree.StarTreeDocValuesFormatTests; import org.opensearch.index.compositeindex.datacube.Dimension; import org.opensearch.index.compositeindex.datacube.NumericDimension; @@ -75,7 +75,7 @@ protected Codec getCodec() { } catch (IOException e) { throw new RuntimeException(e); } - return new Composite103Codec(Lucene103Codec.Mode.BEST_SPEED, mapperService, testLogger); + return new Composite104Codec(Lucene104Codec.Mode.BEST_SPEED, mapperService, testLogger); } public void testRangeAggregation() throws IOException { diff --git a/server/src/test/java/org/opensearch/search/aggregations/startree/StarTreeFilterTests.java b/server/src/test/java/org/opensearch/search/aggregations/startree/StarTreeFilterTests.java index 1d8fc3a460a24..b32cd6ebea6ac 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/startree/StarTreeFilterTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/startree/StarTreeFilterTests.java @@ -11,7 +11,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.codecs.lucene103.Lucene103Codec; +import org.apache.lucene.codecs.lucene104.Lucene104Codec; import org.apache.lucene.document.Document; import org.apache.lucene.document.SortedNumericDocValuesField; import org.apache.lucene.index.DirectoryReader; @@ -28,7 +28,7 @@ import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.index.codec.composite.CompositeIndexFieldInfo; import org.opensearch.index.codec.composite.CompositeIndexReader; -import org.opensearch.index.codec.composite.composite103.Composite103Codec; +import org.opensearch.index.codec.composite.composite104.Composite104Codec; import org.opensearch.index.codec.composite912.datacube.startree.StarTreeDocValuesFormatTests; import org.opensearch.index.compositeindex.datacube.MetricStat; import org.opensearch.index.compositeindex.datacube.startree.index.StarTreeValues; @@ -85,7 +85,7 @@ protected Codec getCodec(int maxLeafDoc, boolean skipStarNodeCreationForSDVDimen } catch (IOException e) { throw new RuntimeException(e); } - return new Composite103Codec(Lucene103Codec.Mode.BEST_SPEED, mapperService, testLogger); + return new Composite104Codec(Lucene104Codec.Mode.BEST_SPEED, mapperService, testLogger); } public void testStarTreeFilterWithNoDocsInSVDField() throws IOException { diff --git a/server/src/test/java/org/opensearch/search/aggregations/startree/StarTreeNestedAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/startree/StarTreeNestedAggregatorTests.java index f94ac2424ecbe..c72dabc76238e 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/startree/StarTreeNestedAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/startree/StarTreeNestedAggregatorTests.java @@ -13,7 +13,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.codecs.lucene103.Lucene103Codec; +import org.apache.lucene.codecs.lucene104.Lucene104Codec; import org.apache.lucene.document.Document; import org.apache.lucene.document.LongPoint; import org.apache.lucene.document.SortedNumericDocValuesField; @@ -32,7 +32,7 @@ import org.opensearch.common.lucene.Lucene; import org.opensearch.index.codec.composite.CompositeIndexFieldInfo; import org.opensearch.index.codec.composite.CompositeIndexReader; -import org.opensearch.index.codec.composite.composite103.Composite103Codec; +import org.opensearch.index.codec.composite.composite104.Composite104Codec; import org.opensearch.index.codec.composite912.datacube.startree.StarTreeDocValuesFormatTests; import org.opensearch.index.compositeindex.datacube.DateDimension; import org.opensearch.index.compositeindex.datacube.Dimension; @@ -98,7 +98,7 @@ protected Codec getCodec() { } catch (IOException e) { throw new RuntimeException(e); } - return new Composite103Codec(Lucene103Codec.Mode.BEST_SPEED, mapperService, testLogger); + return new Composite104Codec(Lucene104Codec.Mode.BEST_SPEED, mapperService, testLogger); } public void testStarTreeNestedAggregations() throws IOException { diff --git a/test/framework/licenses/lucene-codecs-10.4.0-snapshot-a8c1455.jar.sha1 b/test/framework/licenses/lucene-codecs-10.4.0-snapshot-a8c1455.jar.sha1 new file mode 100644 index 0000000000000..940afb04c4ad2 --- /dev/null +++ b/test/framework/licenses/lucene-codecs-10.4.0-snapshot-a8c1455.jar.sha1 @@ -0,0 +1 @@ +9bbe3928fb20ece18edd8a6f025f55b48d060c91 \ No newline at end of file diff --git a/test/framework/licenses/lucene-test-framework-10.4.0-snapshot-a8c1455.jar.sha1 b/test/framework/licenses/lucene-test-framework-10.4.0-snapshot-a8c1455.jar.sha1 new file mode 100644 index 0000000000000..4c1c3fbf2db88 --- /dev/null +++ b/test/framework/licenses/lucene-test-framework-10.4.0-snapshot-a8c1455.jar.sha1 @@ -0,0 +1 @@ +1e46f7eaf8bfd6eb41d6fbeb29e03165ad629e8c \ No newline at end of file From b1232526a39ae3f2c3448cdd712124acedb212c0 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 25 Feb 2026 23:05:34 -0800 Subject: [PATCH 2/6] Updating sha1 Signed-off-by: Ankit Jain --- CHANGELOG.md | 1 + libs/core/licenses/lucene-core-10.3.2.jar.sha1 | 1 - libs/core/licenses/lucene-core-10.4.0-snapshot-a8c1455.jar.sha1 | 1 - libs/core/licenses/lucene-core-10.4.0.jar.sha1 | 1 + libs/netty4/licenses/lucene-core-10.3.2.jar.sha1 | 1 - libs/netty4/licenses/lucene-core-10.4.0.jar.sha1 | 1 + .../lang-expression/licenses/lucene-expressions-10.3.2.jar.sha1 | 1 - .../licenses/lucene-expressions-10.4.0-snapshot-a8c1455.jar.sha1 | 1 - .../lang-expression/licenses/lucene-expressions-10.4.0.jar.sha1 | 1 + .../analysis-icu/licenses/lucene-analysis-icu-10.3.2.jar.sha1 | 1 - .../lucene-analysis-icu-10.4.0-snapshot-a8c1455.jar.sha1 | 1 - .../analysis-icu/licenses/lucene-analysis-icu-10.4.0.jar.sha1 | 1 + .../licenses/lucene-analysis-kuromoji-10.3.2.jar.sha1 | 1 - .../lucene-analysis-kuromoji-10.4.0-snapshot-a8c1455.jar.sha1 | 1 - .../licenses/lucene-analysis-kuromoji-10.4.0.jar.sha1 | 1 + .../analysis-nori/licenses/lucene-analysis-nori-10.3.2.jar.sha1 | 1 - .../lucene-analysis-nori-10.4.0-snapshot-a8c1455.jar.sha1 | 1 - .../analysis-nori/licenses/lucene-analysis-nori-10.4.0.jar.sha1 | 1 + .../licenses/lucene-analysis-phonetic-10.3.2.jar.sha1 | 1 - .../lucene-analysis-phonetic-10.4.0-snapshot-a8c1455.jar.sha1 | 1 - .../licenses/lucene-analysis-phonetic-10.4.0.jar.sha1 | 1 + .../licenses/lucene-analysis-smartcn-10.3.2.jar.sha1 | 1 - .../lucene-analysis-smartcn-10.4.0-snapshot-a8c1455.jar.sha1 | 1 - .../licenses/lucene-analysis-smartcn-10.4.0.jar.sha1 | 1 + .../licenses/lucene-analysis-stempel-10.3.2.jar.sha1 | 1 - .../lucene-analysis-stempel-10.4.0-snapshot-a8c1455.jar.sha1 | 1 - .../licenses/lucene-analysis-stempel-10.4.0.jar.sha1 | 1 + .../licenses/lucene-analysis-morfologik-10.3.2.jar.sha1 | 1 - .../lucene-analysis-morfologik-10.4.0-snapshot-a8c1455.jar.sha1 | 1 - .../licenses/lucene-analysis-morfologik-10.4.0.jar.sha1 | 1 + server/licenses/lucene-analysis-common-10.3.2.jar.sha1 | 1 - .../lucene-analysis-common-10.4.0-snapshot-a8c1455.jar.sha1 | 1 - server/licenses/lucene-analysis-common-10.4.0.jar.sha1 | 1 + server/licenses/lucene-backward-codecs-10.3.2.jar.sha1 | 1 - .../lucene-backward-codecs-10.4.0-snapshot-a8c1455.jar.sha1 | 1 - server/licenses/lucene-backward-codecs-10.4.0.jar.sha1 | 1 + server/licenses/lucene-core-10.3.2.jar.sha1 | 1 - server/licenses/lucene-core-10.4.0-snapshot-a8c1455.jar.sha1 | 1 - server/licenses/lucene-core-10.4.0.jar.sha1 | 1 + server/licenses/lucene-grouping-10.3.2.jar.sha1 | 1 - server/licenses/lucene-grouping-10.4.0-snapshot-a8c1455.jar.sha1 | 1 - server/licenses/lucene-grouping-10.4.0.jar.sha1 | 1 + server/licenses/lucene-highlighter-10.3.2.jar.sha1 | 1 - .../licenses/lucene-highlighter-10.4.0-snapshot-a8c1455.jar.sha1 | 1 - server/licenses/lucene-highlighter-10.4.0.jar.sha1 | 1 + server/licenses/lucene-join-10.3.2.jar.sha1 | 1 - server/licenses/lucene-join-10.4.0-snapshot-a8c1455.jar.sha1 | 1 - server/licenses/lucene-join-10.4.0.jar.sha1 | 1 + server/licenses/lucene-memory-10.3.2.jar.sha1 | 1 - server/licenses/lucene-memory-10.4.0-snapshot-a8c1455.jar.sha1 | 1 - server/licenses/lucene-memory-10.4.0.jar.sha1 | 1 + server/licenses/lucene-misc-10.3.2.jar.sha1 | 1 - server/licenses/lucene-misc-10.4.0-snapshot-a8c1455.jar.sha1 | 1 - server/licenses/lucene-misc-10.4.0.jar.sha1 | 1 + server/licenses/lucene-queries-10.3.2.jar.sha1 | 1 - server/licenses/lucene-queries-10.4.0-snapshot-a8c1455.jar.sha1 | 1 - server/licenses/lucene-queries-10.4.0.jar.sha1 | 1 + server/licenses/lucene-queryparser-10.3.2.jar.sha1 | 1 - .../licenses/lucene-queryparser-10.4.0-snapshot-a8c1455.jar.sha1 | 1 - server/licenses/lucene-queryparser-10.4.0.jar.sha1 | 1 + server/licenses/lucene-sandbox-10.3.2.jar.sha1 | 1 - server/licenses/lucene-sandbox-10.4.0-snapshot-a8c1455.jar.sha1 | 1 - server/licenses/lucene-sandbox-10.4.0.jar.sha1 | 1 + server/licenses/lucene-spatial-extras-10.3.2.jar.sha1 | 1 - .../lucene-spatial-extras-10.4.0-snapshot-a8c1455.jar.sha1 | 1 - server/licenses/lucene-spatial-extras-10.4.0.jar.sha1 | 1 + server/licenses/lucene-spatial3d-10.3.2.jar.sha1 | 1 - .../licenses/lucene-spatial3d-10.4.0-snapshot-a8c1455.jar.sha1 | 1 - server/licenses/lucene-spatial3d-10.4.0.jar.sha1 | 1 + server/licenses/lucene-suggest-10.3.2.jar.sha1 | 1 - server/licenses/lucene-suggest-10.4.0-snapshot-a8c1455.jar.sha1 | 1 - server/licenses/lucene-suggest-10.4.0.jar.sha1 | 1 + test/framework/licenses/lucene-codecs-10.3.2.jar.sha1 | 1 - .../licenses/lucene-codecs-10.4.0-snapshot-a8c1455.jar.sha1 | 1 - test/framework/licenses/lucene-codecs-10.4.0.jar.sha1 | 1 + test/framework/licenses/lucene-test-framework-10.3.2.jar.sha1 | 1 - .../lucene-test-framework-10.4.0-snapshot-a8c1455.jar.sha1 | 1 - test/framework/licenses/lucene-test-framework-10.4.0.jar.sha1 | 1 + 78 files changed, 27 insertions(+), 51 deletions(-) delete mode 100644 libs/core/licenses/lucene-core-10.3.2.jar.sha1 delete mode 100644 libs/core/licenses/lucene-core-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 libs/core/licenses/lucene-core-10.4.0.jar.sha1 delete mode 100644 libs/netty4/licenses/lucene-core-10.3.2.jar.sha1 create mode 100644 libs/netty4/licenses/lucene-core-10.4.0.jar.sha1 delete mode 100644 modules/lang-expression/licenses/lucene-expressions-10.3.2.jar.sha1 delete mode 100644 modules/lang-expression/licenses/lucene-expressions-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 modules/lang-expression/licenses/lucene-expressions-10.4.0.jar.sha1 delete mode 100644 plugins/analysis-icu/licenses/lucene-analysis-icu-10.3.2.jar.sha1 delete mode 100644 plugins/analysis-icu/licenses/lucene-analysis-icu-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 plugins/analysis-icu/licenses/lucene-analysis-icu-10.4.0.jar.sha1 delete mode 100644 plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.3.2.jar.sha1 delete mode 100644 plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.4.0.jar.sha1 delete mode 100644 plugins/analysis-nori/licenses/lucene-analysis-nori-10.3.2.jar.sha1 delete mode 100644 plugins/analysis-nori/licenses/lucene-analysis-nori-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 plugins/analysis-nori/licenses/lucene-analysis-nori-10.4.0.jar.sha1 delete mode 100644 plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.3.2.jar.sha1 delete mode 100644 plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.4.0.jar.sha1 delete mode 100644 plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.3.2.jar.sha1 delete mode 100644 plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.4.0.jar.sha1 delete mode 100644 plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.3.2.jar.sha1 delete mode 100644 plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.4.0.jar.sha1 delete mode 100644 plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.3.2.jar.sha1 delete mode 100644 plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.4.0.jar.sha1 delete mode 100644 server/licenses/lucene-analysis-common-10.3.2.jar.sha1 delete mode 100644 server/licenses/lucene-analysis-common-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 server/licenses/lucene-analysis-common-10.4.0.jar.sha1 delete mode 100644 server/licenses/lucene-backward-codecs-10.3.2.jar.sha1 delete mode 100644 server/licenses/lucene-backward-codecs-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 server/licenses/lucene-backward-codecs-10.4.0.jar.sha1 delete mode 100644 server/licenses/lucene-core-10.3.2.jar.sha1 delete mode 100644 server/licenses/lucene-core-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 server/licenses/lucene-core-10.4.0.jar.sha1 delete mode 100644 server/licenses/lucene-grouping-10.3.2.jar.sha1 delete mode 100644 server/licenses/lucene-grouping-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 server/licenses/lucene-grouping-10.4.0.jar.sha1 delete mode 100644 server/licenses/lucene-highlighter-10.3.2.jar.sha1 delete mode 100644 server/licenses/lucene-highlighter-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 server/licenses/lucene-highlighter-10.4.0.jar.sha1 delete mode 100644 server/licenses/lucene-join-10.3.2.jar.sha1 delete mode 100644 server/licenses/lucene-join-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 server/licenses/lucene-join-10.4.0.jar.sha1 delete mode 100644 server/licenses/lucene-memory-10.3.2.jar.sha1 delete mode 100644 server/licenses/lucene-memory-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 server/licenses/lucene-memory-10.4.0.jar.sha1 delete mode 100644 server/licenses/lucene-misc-10.3.2.jar.sha1 delete mode 100644 server/licenses/lucene-misc-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 server/licenses/lucene-misc-10.4.0.jar.sha1 delete mode 100644 server/licenses/lucene-queries-10.3.2.jar.sha1 delete mode 100644 server/licenses/lucene-queries-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 server/licenses/lucene-queries-10.4.0.jar.sha1 delete mode 100644 server/licenses/lucene-queryparser-10.3.2.jar.sha1 delete mode 100644 server/licenses/lucene-queryparser-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 server/licenses/lucene-queryparser-10.4.0.jar.sha1 delete mode 100644 server/licenses/lucene-sandbox-10.3.2.jar.sha1 delete mode 100644 server/licenses/lucene-sandbox-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 server/licenses/lucene-sandbox-10.4.0.jar.sha1 delete mode 100644 server/licenses/lucene-spatial-extras-10.3.2.jar.sha1 delete mode 100644 server/licenses/lucene-spatial-extras-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 server/licenses/lucene-spatial-extras-10.4.0.jar.sha1 delete mode 100644 server/licenses/lucene-spatial3d-10.3.2.jar.sha1 delete mode 100644 server/licenses/lucene-spatial3d-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 server/licenses/lucene-spatial3d-10.4.0.jar.sha1 delete mode 100644 server/licenses/lucene-suggest-10.3.2.jar.sha1 delete mode 100644 server/licenses/lucene-suggest-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 server/licenses/lucene-suggest-10.4.0.jar.sha1 delete mode 100644 test/framework/licenses/lucene-codecs-10.3.2.jar.sha1 delete mode 100644 test/framework/licenses/lucene-codecs-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 test/framework/licenses/lucene-codecs-10.4.0.jar.sha1 delete mode 100644 test/framework/licenses/lucene-test-framework-10.3.2.jar.sha1 delete mode 100644 test/framework/licenses/lucene-test-framework-10.4.0-snapshot-a8c1455.jar.sha1 create mode 100644 test/framework/licenses/lucene-test-framework-10.4.0.jar.sha1 diff --git a/CHANGELOG.md b/CHANGELOG.md index b3aa88360e2e8..763494c67beb3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -66,6 +66,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `org.apache.commons:commons-text` from 1.14.0 to 1.15.0 ([#20576](https://github.com/opensearch-project/OpenSearch/pull/20576)) - Bump `aws-actions/configure-aws-credentials` from 5 to 6 ([#20577](https://github.com/opensearch-project/OpenSearch/pull/20577)) - Bump `netty` from 4.2.9.Final to 4.2.10.Final ([#20586](https://github.com/opensearch-project/OpenSearch/pull/20586)) +- Bump Apache Lucene from 10.3.2 to 10.4.0 ([#20735](https://github.com/opensearch-project/OpenSearch/pull/20735)) - Bump `reactor-netty` from 1.3.2 to 1.3.3 ([#20589](https://github.com/opensearch-project/OpenSearch/pull/20589)) - Bump `reactor` from 3.8.2 to 3.8.3 ([#20589](https://github.com/opensearch-project/OpenSearch/pull/20589)) - Bump `org.jruby.jcodings:jcodings` from 1.0.63 to 1.0.64 ([#20713](https://github.com/opensearch-project/OpenSearch/pull/20713)) diff --git a/libs/core/licenses/lucene-core-10.3.2.jar.sha1 b/libs/core/licenses/lucene-core-10.3.2.jar.sha1 deleted file mode 100644 index b33ac6735cee1..0000000000000 --- a/libs/core/licenses/lucene-core-10.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e46afe546d01bb56a87860ad60889945f29e7e51 \ No newline at end of file diff --git a/libs/core/licenses/lucene-core-10.4.0-snapshot-a8c1455.jar.sha1 b/libs/core/licenses/lucene-core-10.4.0-snapshot-a8c1455.jar.sha1 deleted file mode 100644 index f036d2163e0fa..0000000000000 --- a/libs/core/licenses/lucene-core-10.4.0-snapshot-a8c1455.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -96781fdefe4a7e2ac3482ccb41801b2cd1607501 \ No newline at end of file diff --git a/libs/core/licenses/lucene-core-10.4.0.jar.sha1 b/libs/core/licenses/lucene-core-10.4.0.jar.sha1 new file mode 100644 index 0000000000000..89d6695f37459 --- /dev/null +++ b/libs/core/licenses/lucene-core-10.4.0.jar.sha1 @@ -0,0 +1 @@ +7493bc763cd5e91f2a8f7722c2f90d8ce15c6319 \ No newline at end of file diff --git a/libs/netty4/licenses/lucene-core-10.3.2.jar.sha1 b/libs/netty4/licenses/lucene-core-10.3.2.jar.sha1 deleted file mode 100644 index b33ac6735cee1..0000000000000 --- a/libs/netty4/licenses/lucene-core-10.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e46afe546d01bb56a87860ad60889945f29e7e51 \ No newline at end of file diff --git a/libs/netty4/licenses/lucene-core-10.4.0.jar.sha1 b/libs/netty4/licenses/lucene-core-10.4.0.jar.sha1 new file mode 100644 index 0000000000000..89d6695f37459 --- /dev/null +++ b/libs/netty4/licenses/lucene-core-10.4.0.jar.sha1 @@ -0,0 +1 @@ +7493bc763cd5e91f2a8f7722c2f90d8ce15c6319 \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-expressions-10.3.2.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-10.3.2.jar.sha1 deleted file mode 100644 index 8fdd49c25f84e..0000000000000 --- a/modules/lang-expression/licenses/lucene-expressions-10.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4036c0a87511fb78c2debe7597338b338fb6227b \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-expressions-10.4.0-snapshot-a8c1455.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-10.4.0-snapshot-a8c1455.jar.sha1 deleted file mode 100644 index a778f3734eaea..0000000000000 --- a/modules/lang-expression/licenses/lucene-expressions-10.4.0-snapshot-a8c1455.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -886e976447a505c02e636ba67b4d381b257a3f44 \ 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 new file mode 100644 index 0000000000000..4206f09667e5f --- /dev/null +++ b/modules/lang-expression/licenses/lucene-expressions-10.4.0.jar.sha1 @@ -0,0 +1 @@ +e50bb1b8f468887a315c456b75f8375ddba5559e \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-10.3.2.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-10.3.2.jar.sha1 deleted file mode 100644 index 7e7f9c0401924..0000000000000 --- a/plugins/analysis-icu/licenses/lucene-analysis-icu-10.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8cea7b0638329ac312444ffe714122e68960432a \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-10.4.0-snapshot-a8c1455.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-10.4.0-snapshot-a8c1455.jar.sha1 deleted file mode 100644 index 5d055d9231497..0000000000000 --- a/plugins/analysis-icu/licenses/lucene-analysis-icu-10.4.0-snapshot-a8c1455.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2ad93f9924ecc4491b26dc540bef1fabe2afd2ea \ 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 new file mode 100644 index 0000000000000..8f7a2f739cd27 --- /dev/null +++ b/plugins/analysis-icu/licenses/lucene-analysis-icu-10.4.0.jar.sha1 @@ -0,0 +1 @@ +50257f0d7d3fc805d596d6b842f0eeb099c72640 \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.3.2.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.3.2.jar.sha1 deleted file mode 100644 index 5143627f2a495..0000000000000 --- a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8e47f3252593c63e1ef21afa880cf1adcf873478 \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.4.0-snapshot-a8c1455.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.4.0-snapshot-a8c1455.jar.sha1 deleted file mode 100644 index d534a31707557..0000000000000 --- a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.4.0-snapshot-a8c1455.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6efc194346481fb1ca2a174182ad2429294021bb \ 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 new file mode 100644 index 0000000000000..8d0bf21c63e21 --- /dev/null +++ b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-10.4.0.jar.sha1 @@ -0,0 +1 @@ +71033f490b07f1f1784724ade66efaa181a69b92 \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-10.3.2.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-10.3.2.jar.sha1 deleted file mode 100644 index 14683338d1e79..0000000000000 --- a/plugins/analysis-nori/licenses/lucene-analysis-nori-10.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7ae0466b6b8cf319840cea4e350e867c75821d6b \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-10.4.0-snapshot-a8c1455.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-10.4.0-snapshot-a8c1455.jar.sha1 deleted file mode 100644 index 73745fbe6bd70..0000000000000 --- a/plugins/analysis-nori/licenses/lucene-analysis-nori-10.4.0-snapshot-a8c1455.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -11a5ecc992d8725bfb760925f07fe13a40ce4b06 \ 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 new file mode 100644 index 0000000000000..70bc273c4d9e0 --- /dev/null +++ b/plugins/analysis-nori/licenses/lucene-analysis-nori-10.4.0.jar.sha1 @@ -0,0 +1 @@ +3781153d96b93e8f50c975bb5b60c7634687074a \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.3.2.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.3.2.jar.sha1 deleted file mode 100644 index c6b09ae7ac99e..0000000000000 --- a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3f924f27ac1719f0790b2fa0693473f8d263fc60 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.4.0-snapshot-a8c1455.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.4.0-snapshot-a8c1455.jar.sha1 deleted file mode 100644 index 9b08ef6f575e1..0000000000000 --- a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.4.0-snapshot-a8c1455.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7821a0b53f5c3e25418659163968f60327484da1 \ 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 new file mode 100644 index 0000000000000..9f19d7f83eba5 --- /dev/null +++ b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-10.4.0.jar.sha1 @@ -0,0 +1 @@ +8bec2c8cba1dd2f16d6899cfa1a7de48c0454c09 \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.3.2.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.3.2.jar.sha1 deleted file mode 100644 index 93a90d2c297a5..0000000000000 --- a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f759c2a7ce2571667ae2a3070b90f7e783504ffb \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.4.0-snapshot-a8c1455.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.4.0-snapshot-a8c1455.jar.sha1 deleted file mode 100644 index f2b538a1608b4..0000000000000 --- a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.4.0-snapshot-a8c1455.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6bff6a2e336dee93a4dff882138296d80ab62fd6 \ 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 new file mode 100644 index 0000000000000..d18455ff73b79 --- /dev/null +++ b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-10.4.0.jar.sha1 @@ -0,0 +1 @@ +e05ae4af9a81735b4bf3c88449a2468331f5455e \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.3.2.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.3.2.jar.sha1 deleted file mode 100644 index e171de66440c3..0000000000000 --- a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ffd0a61235677583c4d916eff48ab83aba2fb5d5 \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.4.0-snapshot-a8c1455.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.4.0-snapshot-a8c1455.jar.sha1 deleted file mode 100644 index 6281cd2270a03..0000000000000 --- a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.4.0-snapshot-a8c1455.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5d76ae18c4e5119845cd278ed276929505c88bfe \ 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 new file mode 100644 index 0000000000000..6aa41cde5ce17 --- /dev/null +++ b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-10.4.0.jar.sha1 @@ -0,0 +1 @@ +718244708f4ef6d6ba4133c7e71b11ced8ebaa7d \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.3.2.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.3.2.jar.sha1 deleted file mode 100644 index d121315eaf3d4..0000000000000 --- a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b2f9f841d645fae8cd924cdd5d944462e3570c04 \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.4.0-snapshot-a8c1455.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.4.0-snapshot-a8c1455.jar.sha1 deleted file mode 100644 index 60cb1191410a9..0000000000000 --- a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.4.0-snapshot-a8c1455.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9513d1dcd7dd057a9026fa3c0764d778540d3b8d \ 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 new file mode 100644 index 0000000000000..10984e7989aa7 --- /dev/null +++ b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-10.4.0.jar.sha1 @@ -0,0 +1 @@ +21d90ece2dbe5df22e98dc54d848c16e1ddc838a \ No newline at end of file diff --git a/server/licenses/lucene-analysis-common-10.3.2.jar.sha1 b/server/licenses/lucene-analysis-common-10.3.2.jar.sha1 deleted file mode 100644 index 1482946dcb25c..0000000000000 --- a/server/licenses/lucene-analysis-common-10.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6aceb9bc2fa78798e14e5318ed1c4251f99fcfac \ No newline at end of file diff --git a/server/licenses/lucene-analysis-common-10.4.0-snapshot-a8c1455.jar.sha1 b/server/licenses/lucene-analysis-common-10.4.0-snapshot-a8c1455.jar.sha1 deleted file mode 100644 index 26ab2d0886948..0000000000000 --- a/server/licenses/lucene-analysis-common-10.4.0-snapshot-a8c1455.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7142df4d1076f734aabd863fc56516b58dcae605 \ 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 new file mode 100644 index 0000000000000..edc73cad56dd6 --- /dev/null +++ b/server/licenses/lucene-analysis-common-10.4.0.jar.sha1 @@ -0,0 +1 @@ +61c4a7b27753662619e84261b42f404fda85886f \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-10.3.2.jar.sha1 b/server/licenses/lucene-backward-codecs-10.3.2.jar.sha1 deleted file mode 100644 index f008235612687..0000000000000 --- a/server/licenses/lucene-backward-codecs-10.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -81097b8cf1dd5017601a7520fef2bc59c29d8afd \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-10.4.0-snapshot-a8c1455.jar.sha1 b/server/licenses/lucene-backward-codecs-10.4.0-snapshot-a8c1455.jar.sha1 deleted file mode 100644 index 3be0fd622f10d..0000000000000 --- a/server/licenses/lucene-backward-codecs-10.4.0-snapshot-a8c1455.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3d9f4cf13f20e1b384021a808d8f57a73427287e \ 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 new file mode 100644 index 0000000000000..beac03c7ea7f5 --- /dev/null +++ b/server/licenses/lucene-backward-codecs-10.4.0.jar.sha1 @@ -0,0 +1 @@ +9cb01ee8ba10cd935133a82bd72d16faf4f8dffe \ No newline at end of file diff --git a/server/licenses/lucene-core-10.3.2.jar.sha1 b/server/licenses/lucene-core-10.3.2.jar.sha1 deleted file mode 100644 index b33ac6735cee1..0000000000000 --- a/server/licenses/lucene-core-10.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e46afe546d01bb56a87860ad60889945f29e7e51 \ No newline at end of file diff --git a/server/licenses/lucene-core-10.4.0-snapshot-a8c1455.jar.sha1 b/server/licenses/lucene-core-10.4.0-snapshot-a8c1455.jar.sha1 deleted file mode 100644 index f036d2163e0fa..0000000000000 --- a/server/licenses/lucene-core-10.4.0-snapshot-a8c1455.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -96781fdefe4a7e2ac3482ccb41801b2cd1607501 \ 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 new file mode 100644 index 0000000000000..89d6695f37459 --- /dev/null +++ b/server/licenses/lucene-core-10.4.0.jar.sha1 @@ -0,0 +1 @@ +7493bc763cd5e91f2a8f7722c2f90d8ce15c6319 \ No newline at end of file diff --git a/server/licenses/lucene-grouping-10.3.2.jar.sha1 b/server/licenses/lucene-grouping-10.3.2.jar.sha1 deleted file mode 100644 index a5e739a302eff..0000000000000 --- a/server/licenses/lucene-grouping-10.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ca37f5c6442cf6b10138d9e5257546dd23063c6b \ No newline at end of file diff --git a/server/licenses/lucene-grouping-10.4.0-snapshot-a8c1455.jar.sha1 b/server/licenses/lucene-grouping-10.4.0-snapshot-a8c1455.jar.sha1 deleted file mode 100644 index 38b8beb22ee86..0000000000000 --- a/server/licenses/lucene-grouping-10.4.0-snapshot-a8c1455.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -beba73c7a31f7f72d21a1485b200d864706638b3 \ 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 new file mode 100644 index 0000000000000..307cb2f07efa2 --- /dev/null +++ b/server/licenses/lucene-grouping-10.4.0.jar.sha1 @@ -0,0 +1 @@ +8d143b267e6575a08d5483a8b103384536fdd4c9 \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-10.3.2.jar.sha1 b/server/licenses/lucene-highlighter-10.3.2.jar.sha1 deleted file mode 100644 index 9c8bd15a43e84..0000000000000 --- a/server/licenses/lucene-highlighter-10.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3ca1c35035e2c6096e8fab3f5044199f2144a6fe \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-10.4.0-snapshot-a8c1455.jar.sha1 b/server/licenses/lucene-highlighter-10.4.0-snapshot-a8c1455.jar.sha1 deleted file mode 100644 index 514916efe95fc..0000000000000 --- a/server/licenses/lucene-highlighter-10.4.0-snapshot-a8c1455.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -077fca639cabd72a1c8521e6e3e8aacc36d0b7eb \ 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 new file mode 100644 index 0000000000000..4f3d2135d7a91 --- /dev/null +++ b/server/licenses/lucene-highlighter-10.4.0.jar.sha1 @@ -0,0 +1 @@ +a3cd37e7588506447382a9175da271fb37c55e67 \ No newline at end of file diff --git a/server/licenses/lucene-join-10.3.2.jar.sha1 b/server/licenses/lucene-join-10.3.2.jar.sha1 deleted file mode 100644 index 56c54c3004bd6..0000000000000 --- a/server/licenses/lucene-join-10.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bfb873644a3e56c97a8732d7ce94bce4a36f6049 \ No newline at end of file diff --git a/server/licenses/lucene-join-10.4.0-snapshot-a8c1455.jar.sha1 b/server/licenses/lucene-join-10.4.0-snapshot-a8c1455.jar.sha1 deleted file mode 100644 index fa2c3f28b08f9..0000000000000 --- a/server/licenses/lucene-join-10.4.0-snapshot-a8c1455.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -79ab48828901f08ca79b74fd0d1de855a7ed8cda \ 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 new file mode 100644 index 0000000000000..87e6d8db260b2 --- /dev/null +++ b/server/licenses/lucene-join-10.4.0.jar.sha1 @@ -0,0 +1 @@ +56e08fe428fe88e51dd4c89ca62c6a72bf2f8f57 \ No newline at end of file diff --git a/server/licenses/lucene-memory-10.3.2.jar.sha1 b/server/licenses/lucene-memory-10.3.2.jar.sha1 deleted file mode 100644 index fd87d1e605ac2..0000000000000 --- a/server/licenses/lucene-memory-10.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8e39a8dc8346fa495f019a0e7b0024b488370e86 \ No newline at end of file diff --git a/server/licenses/lucene-memory-10.4.0-snapshot-a8c1455.jar.sha1 b/server/licenses/lucene-memory-10.4.0-snapshot-a8c1455.jar.sha1 deleted file mode 100644 index 88d6d7c6112cd..0000000000000 --- a/server/licenses/lucene-memory-10.4.0-snapshot-a8c1455.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -de41ae03a22b20fa52140f178ae62cad7724cf4e \ 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 new file mode 100644 index 0000000000000..d6f6d189292b6 --- /dev/null +++ b/server/licenses/lucene-memory-10.4.0.jar.sha1 @@ -0,0 +1 @@ +6c6f1080466c5dff5b1d0eeeb3ead745591eb9d1 \ No newline at end of file diff --git a/server/licenses/lucene-misc-10.3.2.jar.sha1 b/server/licenses/lucene-misc-10.3.2.jar.sha1 deleted file mode 100644 index 1e42747872f9e..0000000000000 --- a/server/licenses/lucene-misc-10.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -529d6009bad3ad6ac6bc3e0bf73a37c2ffb18efe \ No newline at end of file diff --git a/server/licenses/lucene-misc-10.4.0-snapshot-a8c1455.jar.sha1 b/server/licenses/lucene-misc-10.4.0-snapshot-a8c1455.jar.sha1 deleted file mode 100644 index 657c12d7cc7ca..0000000000000 --- a/server/licenses/lucene-misc-10.4.0-snapshot-a8c1455.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7ae8474b4a17d92394126f9c6cc8e76e479df388 \ 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 new file mode 100644 index 0000000000000..6783f2b1d38c8 --- /dev/null +++ b/server/licenses/lucene-misc-10.4.0.jar.sha1 @@ -0,0 +1 @@ +e86d65b1a8b5bf8dc66f4e002fe75ddc886da62c \ No newline at end of file diff --git a/server/licenses/lucene-queries-10.3.2.jar.sha1 b/server/licenses/lucene-queries-10.3.2.jar.sha1 deleted file mode 100644 index 4fbf6dfdfcf13..0000000000000 --- a/server/licenses/lucene-queries-10.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e2519bed51773348277c52fe9d4bd434b6b68f88 \ No newline at end of file diff --git a/server/licenses/lucene-queries-10.4.0-snapshot-a8c1455.jar.sha1 b/server/licenses/lucene-queries-10.4.0-snapshot-a8c1455.jar.sha1 deleted file mode 100644 index 36d81c37379ef..0000000000000 --- a/server/licenses/lucene-queries-10.4.0-snapshot-a8c1455.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -24e09399d8c70f5a6a0d72546cec522696bf4bac \ 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 new file mode 100644 index 0000000000000..8619fd3bce7c3 --- /dev/null +++ b/server/licenses/lucene-queries-10.4.0.jar.sha1 @@ -0,0 +1 @@ +43b2654a448504dc4ac382f6d9b6896e2e8b67b7 \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-10.3.2.jar.sha1 b/server/licenses/lucene-queryparser-10.3.2.jar.sha1 deleted file mode 100644 index 77fe5ed5a2f1e..0000000000000 --- a/server/licenses/lucene-queryparser-10.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cc9a5decdc61ff00ec1d27e3276ed4da058e5f34 \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-10.4.0-snapshot-a8c1455.jar.sha1 b/server/licenses/lucene-queryparser-10.4.0-snapshot-a8c1455.jar.sha1 deleted file mode 100644 index 0e38a1e1de26f..0000000000000 --- a/server/licenses/lucene-queryparser-10.4.0-snapshot-a8c1455.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -86cf4d847c39a0081d23535be84bf36dbb6a262a \ 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 new file mode 100644 index 0000000000000..d2dc853dd6bfd --- /dev/null +++ b/server/licenses/lucene-queryparser-10.4.0.jar.sha1 @@ -0,0 +1 @@ +6e3e758b60b1e2549a85139d9498b54565c38eeb \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-10.3.2.jar.sha1 b/server/licenses/lucene-sandbox-10.3.2.jar.sha1 deleted file mode 100644 index 29a55ec762177..0000000000000 --- a/server/licenses/lucene-sandbox-10.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a38472709daa3c4bb4e657cb1afa6ceeec9548fe \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-10.4.0-snapshot-a8c1455.jar.sha1 b/server/licenses/lucene-sandbox-10.4.0-snapshot-a8c1455.jar.sha1 deleted file mode 100644 index 6395cabb47562..0000000000000 --- a/server/licenses/lucene-sandbox-10.4.0-snapshot-a8c1455.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c1078394a5db5510b3b8d508440d53be642fc1eb \ 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 new file mode 100644 index 0000000000000..1dfab5a550136 --- /dev/null +++ b/server/licenses/lucene-sandbox-10.4.0.jar.sha1 @@ -0,0 +1 @@ +15976efaae9213b1a61e3509da6f366e243b90c7 \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-10.3.2.jar.sha1 b/server/licenses/lucene-spatial-extras-10.3.2.jar.sha1 deleted file mode 100644 index d74bc54fb0c55..0000000000000 --- a/server/licenses/lucene-spatial-extras-10.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cd709afdec93de17d6bbadec3a6cbc383d2ebfd6 \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-10.4.0-snapshot-a8c1455.jar.sha1 b/server/licenses/lucene-spatial-extras-10.4.0-snapshot-a8c1455.jar.sha1 deleted file mode 100644 index 75b101054b014..0000000000000 --- a/server/licenses/lucene-spatial-extras-10.4.0-snapshot-a8c1455.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8b7925295d45c23b9fc087e9762afc74da578ae5 \ 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 new file mode 100644 index 0000000000000..2bde1e35e7a6b --- /dev/null +++ b/server/licenses/lucene-spatial-extras-10.4.0.jar.sha1 @@ -0,0 +1 @@ +1f56784003e51d7b2df7c27a99d7b127e67e97bf \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-10.3.2.jar.sha1 b/server/licenses/lucene-spatial3d-10.3.2.jar.sha1 deleted file mode 100644 index f1252e45081f3..0000000000000 --- a/server/licenses/lucene-spatial3d-10.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e9f3aed3f620754bf1f9a2abb945f9a30e718ef4 \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-10.4.0-snapshot-a8c1455.jar.sha1 b/server/licenses/lucene-spatial3d-10.4.0-snapshot-a8c1455.jar.sha1 deleted file mode 100644 index 9023668aeb09c..0000000000000 --- a/server/licenses/lucene-spatial3d-10.4.0-snapshot-a8c1455.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -055860e2000dfc62982ccb1e2ba4ea8bf75acd8e \ 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 new file mode 100644 index 0000000000000..188a9793bc655 --- /dev/null +++ b/server/licenses/lucene-spatial3d-10.4.0.jar.sha1 @@ -0,0 +1 @@ +fa337dd41be0f0ee99bc4fd463d517adf25e06a3 \ No newline at end of file diff --git a/server/licenses/lucene-suggest-10.3.2.jar.sha1 b/server/licenses/lucene-suggest-10.3.2.jar.sha1 deleted file mode 100644 index 7506fd3811063..0000000000000 --- a/server/licenses/lucene-suggest-10.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9bf9edd5d16481b08320bda4ab234e76164444bb \ No newline at end of file diff --git a/server/licenses/lucene-suggest-10.4.0-snapshot-a8c1455.jar.sha1 b/server/licenses/lucene-suggest-10.4.0-snapshot-a8c1455.jar.sha1 deleted file mode 100644 index 572f527387b32..0000000000000 --- a/server/licenses/lucene-suggest-10.4.0-snapshot-a8c1455.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -197e5f4d7f5dab0442c1865fce9dd941d7620022 \ 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 new file mode 100644 index 0000000000000..dcfdfac03d13b --- /dev/null +++ b/server/licenses/lucene-suggest-10.4.0.jar.sha1 @@ -0,0 +1 @@ +d86d535c415cf9c79016aaefa9957dab98766a68 \ No newline at end of file diff --git a/test/framework/licenses/lucene-codecs-10.3.2.jar.sha1 b/test/framework/licenses/lucene-codecs-10.3.2.jar.sha1 deleted file mode 100644 index eadbb5b9a90b2..0000000000000 --- a/test/framework/licenses/lucene-codecs-10.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8ff2e77764b37227948ce6abe248b4ae47fd5e30 \ No newline at end of file diff --git a/test/framework/licenses/lucene-codecs-10.4.0-snapshot-a8c1455.jar.sha1 b/test/framework/licenses/lucene-codecs-10.4.0-snapshot-a8c1455.jar.sha1 deleted file mode 100644 index 940afb04c4ad2..0000000000000 --- a/test/framework/licenses/lucene-codecs-10.4.0-snapshot-a8c1455.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9bbe3928fb20ece18edd8a6f025f55b48d060c91 \ No newline at end of file diff --git a/test/framework/licenses/lucene-codecs-10.4.0.jar.sha1 b/test/framework/licenses/lucene-codecs-10.4.0.jar.sha1 new file mode 100644 index 0000000000000..8b573c09b0a4c --- /dev/null +++ b/test/framework/licenses/lucene-codecs-10.4.0.jar.sha1 @@ -0,0 +1 @@ +426ad64f5810e04a533f335aaeca4bbca3c746e1 \ No newline at end of file diff --git a/test/framework/licenses/lucene-test-framework-10.3.2.jar.sha1 b/test/framework/licenses/lucene-test-framework-10.3.2.jar.sha1 deleted file mode 100644 index 2a367c87711ad..0000000000000 --- a/test/framework/licenses/lucene-test-framework-10.3.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9a8e1152e5c1e709480333c25e0cc7616828962a \ No newline at end of file diff --git a/test/framework/licenses/lucene-test-framework-10.4.0-snapshot-a8c1455.jar.sha1 b/test/framework/licenses/lucene-test-framework-10.4.0-snapshot-a8c1455.jar.sha1 deleted file mode 100644 index 4c1c3fbf2db88..0000000000000 --- a/test/framework/licenses/lucene-test-framework-10.4.0-snapshot-a8c1455.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1e46f7eaf8bfd6eb41d6fbeb29e03165ad629e8c \ 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 new file mode 100644 index 0000000000000..8ba10fe22ab60 --- /dev/null +++ b/test/framework/licenses/lucene-test-framework-10.4.0.jar.sha1 @@ -0,0 +1 @@ +2120a695bcd5c88882289bc77ed2b65d36469521 \ No newline at end of file From 4b7978e39c62f8b1885fe8f241cd0727dc36b077 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Wed, 25 Feb 2026 23:23:34 -0800 Subject: [PATCH 3/6] Fixing compile errors Signed-off-by: Ankit Jain --- .../index/codec/CriteriaBasedCodec.java | 13 ------------- .../java/org/opensearch/index/engine/Engine.java | 2 +- .../engine/NRTReplicationReaderManager.java | 3 ++- .../org/opensearch/index/engine/NoOpEngine.java | 16 ++++++++++++++++ ...onPruningSortedSetOrdinalsIndexFieldData.java | 12 ------------ 5 files changed, 19 insertions(+), 27 deletions(-) diff --git a/server/src/main/java/org/opensearch/index/codec/CriteriaBasedCodec.java b/server/src/main/java/org/opensearch/index/codec/CriteriaBasedCodec.java index 349b6edffb24c..b58b5fee7049d 100644 --- a/server/src/main/java/org/opensearch/index/codec/CriteriaBasedCodec.java +++ b/server/src/main/java/org/opensearch/index/codec/CriteriaBasedCodec.java @@ -12,13 +12,6 @@ import org.apache.lucene.codecs.FilterCodec; import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.codecs.perfield.PerFieldPostingsFormat; -import org.apache.lucene.codecs.SegmentInfoFormat; -import org.apache.lucene.codecs.lucene104.Lucene104Codec; -import org.apache.lucene.index.SegmentInfo; -import org.apache.lucene.store.Directory; -import org.apache.lucene.store.IOContext; - -import java.io.IOException; /** * Filter codec used to attach bucket attributes to segments of child writer. @@ -29,12 +22,6 @@ public class CriteriaBasedCodec extends FilterCodec { private final String bucket; public static final String BUCKET_NAME = "bucket"; public static final String ATTRIBUTE_BINDING_TARGET_FIELD = "_id"; - private static final String PLACEHOLDER_BUCKET_FOR_PARENT_WRITER = "-2"; - - public CriteriaBasedCodec() { - super("CriteriaBasedCodec", new Lucene104Codec()); - bucket = null; - } public CriteriaBasedCodec(Codec delegate, String bucket) { super(delegate.getName(), delegate); diff --git a/server/src/main/java/org/opensearch/index/engine/Engine.java b/server/src/main/java/org/opensearch/index/engine/Engine.java index 3ec1788a70309..003967ac2b872 100644 --- a/server/src/main/java/org/opensearch/index/engine/Engine.java +++ b/server/src/main/java/org/opensearch/index/engine/Engine.java @@ -309,7 +309,7 @@ public void verifyEngineBeforeIndexClosing() throws IllegalStateException { * Get max sequence number from segments that are referenced by given SegmentInfos */ public long getMaxSeqNoFromSegmentInfos(SegmentInfos segmentInfos) throws IOException { - try (DirectoryReader innerReader = StandardDirectoryReader.open(store.directory(), segmentInfos, null, null)) { + try (DirectoryReader innerReader = StandardDirectoryReader.open(store.directory(), segmentInfos, null, null, null)) { final IndexSearcher searcher = new IndexSearcher(innerReader); return getMaxSeqNoFromSearcher(searcher); } diff --git a/server/src/main/java/org/opensearch/index/engine/NRTReplicationReaderManager.java b/server/src/main/java/org/opensearch/index/engine/NRTReplicationReaderManager.java index 8ae98f528042a..0385cef5a6065 100644 --- a/server/src/main/java/org/opensearch/index/engine/NRTReplicationReaderManager.java +++ b/server/src/main/java/org/opensearch/index/engine/NRTReplicationReaderManager.java @@ -83,7 +83,8 @@ protected OpenSearchDirectoryReader refreshIfNeeded(OpenSearchDirectoryReader re referenceToRefresh.directory(), currentInfos, subs, - engineConfig.getLeafSorter() + engineConfig.getLeafSorter(), + null ); final DirectoryReader softDeletesDirectoryReaderWrapper = new SoftDeletesDirectoryReaderWrapper( innerReader, diff --git a/server/src/main/java/org/opensearch/index/engine/NoOpEngine.java b/server/src/main/java/org/opensearch/index/engine/NoOpEngine.java index 7795815f9dc32..2bce8778695ea 100644 --- a/server/src/main/java/org/opensearch/index/engine/NoOpEngine.java +++ b/server/src/main/java/org/opensearch/index/engine/NoOpEngine.java @@ -57,6 +57,7 @@ import java.io.UncheckedIOException; import java.util.List; import java.util.Map; +import java.util.concurrent.ExecutorService; import java.util.function.Function; import static org.opensearch.index.translog.Translog.EMPTY_TRANSLOG_SNAPSHOT; @@ -101,16 +102,31 @@ protected DirectoryReader doOpenIfChanged() { return null; } + @Override + protected DirectoryReader doOpenIfChanged(ExecutorService executorService) { + return null; + } + @Override protected DirectoryReader doOpenIfChanged(IndexCommit commit) { return null; } + @Override + protected DirectoryReader doOpenIfChanged(IndexCommit commit, ExecutorService executorService) { + return null; + } + @Override protected DirectoryReader doOpenIfChanged(IndexWriter writer, boolean applyAllDeletes) { return null; } + @Override + protected DirectoryReader doOpenIfChanged(IndexWriter writer, boolean applyAllDeletes, ExecutorService executorService) { + return null; + } + @Override public long getVersion() { return 0; diff --git a/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java b/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java index fb96085dbb737..153f4c7217aea 100644 --- a/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java +++ b/server/src/main/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldData.java @@ -18,7 +18,6 @@ import org.apache.lucene.search.SortedSetSelector; import org.apache.lucene.search.SortedSetSortField; import org.apache.lucene.store.DataInput; -import org.apache.lucene.util.BytesRef; import org.opensearch.common.Nullable; import org.opensearch.core.indices.breaker.CircuitBreakerService; import org.opensearch.index.fielddata.IndexFieldData; @@ -31,7 +30,6 @@ import org.opensearch.search.aggregations.support.ValuesSourceType; import java.io.IOException; -import java.util.Comparator; import java.util.function.Function; /** @@ -161,16 +159,6 @@ public int hashCode() { return delegate.hashCode(); } - @Override - public void setBytesComparator(Comparator b) { - delegate.setBytesComparator(b); - } - - @Override - public Comparator getBytesComparator() { - return delegate.getBytesComparator(); - } - @Override public FieldComparator getComparator(int numHits, Pruning pruning) { return delegate.getComparator(numHits, pruning); From a739e0ea9a7bcffb79f02b0b374cb58cf3a0d46a Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 26 Feb 2026 10:09:38 -0800 Subject: [PATCH 4/6] Fixing test failures Signed-off-by: Ankit Jain --- .../index/codec/PerFieldMappingPostingFormatCodecTests.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/src/test/java/org/opensearch/index/codec/PerFieldMappingPostingFormatCodecTests.java b/server/src/test/java/org/opensearch/index/codec/PerFieldMappingPostingFormatCodecTests.java index aa7094b8411ee..debb6c7e1bef9 100644 --- a/server/src/test/java/org/opensearch/index/codec/PerFieldMappingPostingFormatCodecTests.java +++ b/server/src/test/java/org/opensearch/index/codec/PerFieldMappingPostingFormatCodecTests.java @@ -10,7 +10,7 @@ import org.apache.logging.log4j.Logger; import org.apache.lucene.codecs.PostingsFormat; -import org.apache.lucene.codecs.lucene103.Lucene103Codec; +import org.apache.lucene.codecs.lucene104.Lucene104Codec; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; import org.opensearch.index.IndexSettings; @@ -60,7 +60,7 @@ public void testFuzzySetDisabled() { assertFalse("Fuzzy set should be disabled", isEnabled); PerFieldMappingPostingFormatCodec codec = new PerFieldMappingPostingFormatCodec( - Lucene103Codec.Mode.BEST_SPEED, + Lucene104Codec.Mode.BEST_SPEED, mapperService, logger ); @@ -87,7 +87,7 @@ public void testFuzzyFilterPostingsFormatIsUsedForDocId() { when(mapperService.fieldType(IdFieldMapper.NAME)).thenReturn(mockFieldType); PerFieldMappingPostingFormatCodec codec = new PerFieldMappingPostingFormatCodec( - Lucene103Codec.Mode.BEST_SPEED, + Lucene104Codec.Mode.BEST_SPEED, mapperService, logger ); From 47ae6282b91bb13501b463d2457057408f0c9b58 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 26 Feb 2026 10:50:03 -0800 Subject: [PATCH 5/6] Fixing test failures Signed-off-by: Ankit Jain --- .../plain/NonPruningSortedSetOrdinalsIndexFieldDataTests.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/server/src/test/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldDataTests.java b/server/src/test/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldDataTests.java index d5d3299871c86..6bc3d2e94125a 100644 --- a/server/src/test/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldDataTests.java +++ b/server/src/test/java/org/opensearch/index/fielddata/plain/NonPruningSortedSetOrdinalsIndexFieldDataTests.java @@ -25,7 +25,6 @@ import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.io.IOException; -import java.util.Comparator; import java.util.Objects; public class NonPruningSortedSetOrdinalsIndexFieldDataTests extends OpenSearchSingleNodeTestCase { @@ -63,7 +62,6 @@ public void testNonPruningSortedSetOrdinalsIndexFieldDataSerialization() throws } public void testNonPruningSortedSetOrdinalsIndexFieldDataComparator() throws IOException { - assertTrue(field.getBytesComparator().equals(Comparator.naturalOrder())); assertTrue(field.getComparator(0, Pruning.NONE) instanceof FieldComparator); assertTrue(field.getIndexSorter() instanceof IndexSorter); } From c72c3e98ac5836926e654fa6f99cae536cff6ecc Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Thu, 26 Feb 2026 13:31:07 -0800 Subject: [PATCH 6/6] Fixing audit failures Signed-off-by: Ankit Jain --- server/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/build.gradle b/server/build.gradle index 32ae6a14813e5..07010938f8975 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -365,6 +365,8 @@ tasks.named("thirdPartyAudit").configure { 'org.apache.lucene.facet.DrillSideways', 'org.apache.lucene.facet.DrillSideways$Result', 'org.apache.lucene.facet.FacetResult', + 'org.apache.lucene.facet.FacetsCollector', + 'org.apache.lucene.facet.FacetsCollector$MatchingDocs', 'org.apache.lucene.facet.FacetsConfig', 'org.apache.lucene.facet.FacetsConfig$DimConfig', 'org.apache.lucene.facet.LabelAndValue',