From bd69f90fffe6c5126cd5bcf02b23db00505d3832 Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Wed, 6 Jul 2022 16:16:03 -0400 Subject: [PATCH] Upgrade to Lucene-9.3.0-snapshot-2d05f5c623e (#88284) To include LUCENE-10620 - which passes Weight to Collector --- build-tools-internal/version.properties | 2 +- ...-codecs-9.3.0-snapshot-2d05f5c623e.jar.sha1 | 1 + ...-codecs-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 - ...essions-9.3.0-snapshot-2d05f5c623e.jar.sha1 | 1 + ...essions-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 - ...-extras-9.3.0-snapshot-2d05f5c623e.jar.sha1 | 1 + ...-extras-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 - ...atial3d-9.3.0-snapshot-2d05f5c623e.jar.sha1 | 1 + ...atial3d-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 - ...sis-icu-9.3.0-snapshot-2d05f5c623e.jar.sha1 | 1 + ...sis-icu-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 - ...uromoji-9.3.0-snapshot-2d05f5c623e.jar.sha1 | 1 + ...uromoji-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 - ...is-nori-9.3.0-snapshot-2d05f5c623e.jar.sha1 | 1 + ...is-nori-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 - ...honetic-9.3.0-snapshot-2d05f5c623e.jar.sha1 | 1 + ...honetic-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 - ...smartcn-9.3.0-snapshot-2d05f5c623e.jar.sha1 | 1 + ...smartcn-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 - ...stempel-9.3.0-snapshot-2d05f5c623e.jar.sha1 | 1 + ...stempel-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 - ...fologik-9.3.0-snapshot-2d05f5c623e.jar.sha1 | 1 + ...fologik-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 - ...-common-9.3.0-snapshot-2d05f5c623e.jar.sha1 | 1 + ...-common-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 - ...-codecs-9.3.0-snapshot-2d05f5c623e.jar.sha1 | 1 + ...-codecs-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 - ...ne-core-9.3.0-snapshot-2d05f5c623e.jar.sha1 | 1 + ...ne-core-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 - ...rouping-9.3.0-snapshot-2d05f5c623e.jar.sha1 | 1 + ...rouping-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 - ...lighter-9.3.0-snapshot-2d05f5c623e.jar.sha1 | 1 + ...lighter-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 - ...ne-join-9.3.0-snapshot-2d05f5c623e.jar.sha1 | 1 + ...ne-join-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 - ...-memory-9.3.0-snapshot-2d05f5c623e.jar.sha1 | 1 + ...-memory-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 - ...ne-misc-9.3.0-snapshot-2d05f5c623e.jar.sha1 | 1 + ...ne-misc-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 - ...queries-9.3.0-snapshot-2d05f5c623e.jar.sha1 | 1 + ...queries-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 - ...yparser-9.3.0-snapshot-2d05f5c623e.jar.sha1 | 1 + ...yparser-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 - ...sandbox-9.3.0-snapshot-2d05f5c623e.jar.sha1 | 1 + ...sandbox-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 - ...suggest-9.3.0-snapshot-2d05f5c623e.jar.sha1 | 1 + ...suggest-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 - .../elasticsearch/common/lucene/Lucene.java | 2 +- .../index/codec/CodecService.java | 10 +++++----- .../index/codec/PerFieldMapperCodec.java | 4 ++-- .../mapper/vectors/DenseVectorFieldMapper.java | 4 ++-- .../search/internal/ContextIndexSearcher.java | 4 +++- .../diskusage/IndexDiskUsageAnalyzerTests.java | 18 +++++++++--------- .../elasticsearch/index/codec/CodecTests.java | 12 ++++++------ .../engine/CompletionStatsCacheTests.java | 4 ++-- .../vectors/DenseVectorFieldMapperTests.java | 10 +++++----- ...sis-icu-9.3.0-snapshot-2d05f5c623e.jar.sha1 | 1 + ...sis-icu-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 - 58 files changed, 60 insertions(+), 58 deletions(-) create mode 100644 modules/lang-expression/licenses/lucene-codecs-9.3.0-snapshot-2d05f5c623e.jar.sha1 delete mode 100644 modules/lang-expression/licenses/lucene-codecs-9.3.0-snapshot-f3025a56e31.jar.sha1 create mode 100644 modules/lang-expression/licenses/lucene-expressions-9.3.0-snapshot-2d05f5c623e.jar.sha1 delete mode 100644 modules/lang-expression/licenses/lucene-expressions-9.3.0-snapshot-f3025a56e31.jar.sha1 create mode 100644 modules/legacy-geo/licenses/lucene-spatial-extras-9.3.0-snapshot-2d05f5c623e.jar.sha1 delete mode 100644 modules/legacy-geo/licenses/lucene-spatial-extras-9.3.0-snapshot-f3025a56e31.jar.sha1 create mode 100644 modules/legacy-geo/licenses/lucene-spatial3d-9.3.0-snapshot-2d05f5c623e.jar.sha1 delete mode 100644 modules/legacy-geo/licenses/lucene-spatial3d-9.3.0-snapshot-f3025a56e31.jar.sha1 create mode 100644 plugins/analysis-icu/licenses/lucene-analysis-icu-9.3.0-snapshot-2d05f5c623e.jar.sha1 delete mode 100644 plugins/analysis-icu/licenses/lucene-analysis-icu-9.3.0-snapshot-f3025a56e31.jar.sha1 create mode 100644 plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.3.0-snapshot-2d05f5c623e.jar.sha1 delete mode 100644 plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.3.0-snapshot-f3025a56e31.jar.sha1 create mode 100644 plugins/analysis-nori/licenses/lucene-analysis-nori-9.3.0-snapshot-2d05f5c623e.jar.sha1 delete mode 100644 plugins/analysis-nori/licenses/lucene-analysis-nori-9.3.0-snapshot-f3025a56e31.jar.sha1 create mode 100644 plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.3.0-snapshot-2d05f5c623e.jar.sha1 delete mode 100644 plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.3.0-snapshot-f3025a56e31.jar.sha1 create mode 100644 plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.3.0-snapshot-2d05f5c623e.jar.sha1 delete mode 100644 plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.3.0-snapshot-f3025a56e31.jar.sha1 create mode 100644 plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.3.0-snapshot-2d05f5c623e.jar.sha1 delete mode 100644 plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.3.0-snapshot-f3025a56e31.jar.sha1 create mode 100644 plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.3.0-snapshot-2d05f5c623e.jar.sha1 delete mode 100644 plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.3.0-snapshot-f3025a56e31.jar.sha1 create mode 100644 server/licenses/lucene-analysis-common-9.3.0-snapshot-2d05f5c623e.jar.sha1 delete mode 100644 server/licenses/lucene-analysis-common-9.3.0-snapshot-f3025a56e31.jar.sha1 create mode 100644 server/licenses/lucene-backward-codecs-9.3.0-snapshot-2d05f5c623e.jar.sha1 delete mode 100644 server/licenses/lucene-backward-codecs-9.3.0-snapshot-f3025a56e31.jar.sha1 create mode 100644 server/licenses/lucene-core-9.3.0-snapshot-2d05f5c623e.jar.sha1 delete mode 100644 server/licenses/lucene-core-9.3.0-snapshot-f3025a56e31.jar.sha1 create mode 100644 server/licenses/lucene-grouping-9.3.0-snapshot-2d05f5c623e.jar.sha1 delete mode 100644 server/licenses/lucene-grouping-9.3.0-snapshot-f3025a56e31.jar.sha1 create mode 100644 server/licenses/lucene-highlighter-9.3.0-snapshot-2d05f5c623e.jar.sha1 delete mode 100644 server/licenses/lucene-highlighter-9.3.0-snapshot-f3025a56e31.jar.sha1 create mode 100644 server/licenses/lucene-join-9.3.0-snapshot-2d05f5c623e.jar.sha1 delete mode 100644 server/licenses/lucene-join-9.3.0-snapshot-f3025a56e31.jar.sha1 create mode 100644 server/licenses/lucene-memory-9.3.0-snapshot-2d05f5c623e.jar.sha1 delete mode 100644 server/licenses/lucene-memory-9.3.0-snapshot-f3025a56e31.jar.sha1 create mode 100644 server/licenses/lucene-misc-9.3.0-snapshot-2d05f5c623e.jar.sha1 delete mode 100644 server/licenses/lucene-misc-9.3.0-snapshot-f3025a56e31.jar.sha1 create mode 100644 server/licenses/lucene-queries-9.3.0-snapshot-2d05f5c623e.jar.sha1 delete mode 100644 server/licenses/lucene-queries-9.3.0-snapshot-f3025a56e31.jar.sha1 create mode 100644 server/licenses/lucene-queryparser-9.3.0-snapshot-2d05f5c623e.jar.sha1 delete mode 100644 server/licenses/lucene-queryparser-9.3.0-snapshot-f3025a56e31.jar.sha1 create mode 100644 server/licenses/lucene-sandbox-9.3.0-snapshot-2d05f5c623e.jar.sha1 delete mode 100644 server/licenses/lucene-sandbox-9.3.0-snapshot-f3025a56e31.jar.sha1 create mode 100644 server/licenses/lucene-suggest-9.3.0-snapshot-2d05f5c623e.jar.sha1 delete mode 100644 server/licenses/lucene-suggest-9.3.0-snapshot-f3025a56e31.jar.sha1 create mode 100644 x-pack/plugin/ml/licenses/lucene-analysis-icu-9.3.0-snapshot-2d05f5c623e.jar.sha1 delete mode 100644 x-pack/plugin/ml/licenses/lucene-analysis-icu-9.3.0-snapshot-f3025a56e31.jar.sha1 diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties index bb8bff31355d..9b5b3bc66313 100644 --- a/build-tools-internal/version.properties +++ b/build-tools-internal/version.properties @@ -1,5 +1,5 @@ elasticsearch = 8.4.0 -lucene = 9.3.0-snapshot-f3025a56e31 +lucene = 9.3.0-snapshot-2d05f5c623e bundled_jdk_vendor = openjdk bundled_jdk = 18.0.1.1+2@65ae32619e2f40f3a9af3af1851d6e19 diff --git a/modules/lang-expression/licenses/lucene-codecs-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/modules/lang-expression/licenses/lucene-codecs-9.3.0-snapshot-2d05f5c623e.jar.sha1 new file mode 100644 index 000000000000..f164594b811c --- /dev/null +++ b/modules/lang-expression/licenses/lucene-codecs-9.3.0-snapshot-2d05f5c623e.jar.sha1 @@ -0,0 +1 @@ +a2b0a4e1d763c5575f289ef7b4d8f109e7ee895f \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-codecs-9.3.0-snapshot-f3025a56e31.jar.sha1 b/modules/lang-expression/licenses/lucene-codecs-9.3.0-snapshot-f3025a56e31.jar.sha1 deleted file mode 100644 index 87eacf955654..000000000000 --- a/modules/lang-expression/licenses/lucene-codecs-9.3.0-snapshot-f3025a56e31.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -edcd74ce93bda0e2007428dc989f0d855449e154 \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-expressions-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.3.0-snapshot-2d05f5c623e.jar.sha1 new file mode 100644 index 000000000000..98efd688cf3a --- /dev/null +++ b/modules/lang-expression/licenses/lucene-expressions-9.3.0-snapshot-2d05f5c623e.jar.sha1 @@ -0,0 +1 @@ +37603372705778c2c755d055ac72f835af0ebe51 \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-expressions-9.3.0-snapshot-f3025a56e31.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.3.0-snapshot-f3025a56e31.jar.sha1 deleted file mode 100644 index f47235f4ae41..000000000000 --- a/modules/lang-expression/licenses/lucene-expressions-9.3.0-snapshot-f3025a56e31.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6f4e079ad40b708b1b7cd6f41300e6bdb71ade94 \ No newline at end of file diff --git a/modules/legacy-geo/licenses/lucene-spatial-extras-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/modules/legacy-geo/licenses/lucene-spatial-extras-9.3.0-snapshot-2d05f5c623e.jar.sha1 new file mode 100644 index 000000000000..75358a122c5a --- /dev/null +++ b/modules/legacy-geo/licenses/lucene-spatial-extras-9.3.0-snapshot-2d05f5c623e.jar.sha1 @@ -0,0 +1 @@ +899069409ff5a448c641700a0371ce792a0635b1 \ No newline at end of file diff --git a/modules/legacy-geo/licenses/lucene-spatial-extras-9.3.0-snapshot-f3025a56e31.jar.sha1 b/modules/legacy-geo/licenses/lucene-spatial-extras-9.3.0-snapshot-f3025a56e31.jar.sha1 deleted file mode 100644 index a9faa60b6ce4..000000000000 --- a/modules/legacy-geo/licenses/lucene-spatial-extras-9.3.0-snapshot-f3025a56e31.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6dd3dedd93129e518eaccd806cd16b067f27d414 \ No newline at end of file diff --git a/modules/legacy-geo/licenses/lucene-spatial3d-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/modules/legacy-geo/licenses/lucene-spatial3d-9.3.0-snapshot-2d05f5c623e.jar.sha1 new file mode 100644 index 000000000000..6017afff2e6c --- /dev/null +++ b/modules/legacy-geo/licenses/lucene-spatial3d-9.3.0-snapshot-2d05f5c623e.jar.sha1 @@ -0,0 +1 @@ +3416a5a2becfd987049453c939afa2624c3db6c7 \ No newline at end of file diff --git a/modules/legacy-geo/licenses/lucene-spatial3d-9.3.0-snapshot-f3025a56e31.jar.sha1 b/modules/legacy-geo/licenses/lucene-spatial3d-9.3.0-snapshot-f3025a56e31.jar.sha1 deleted file mode 100644 index 077aad3c7d89..000000000000 --- a/modules/legacy-geo/licenses/lucene-spatial3d-9.3.0-snapshot-f3025a56e31.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d510d06738c5e0db79875bb07699bf3acc3b31cc \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.3.0-snapshot-2d05f5c623e.jar.sha1 new file mode 100644 index 000000000000..73d5dfdcae43 --- /dev/null +++ b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.3.0-snapshot-2d05f5c623e.jar.sha1 @@ -0,0 +1 @@ +87772b1d9907c63287d7bc79cf8fa3e9a46c9c77 \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.3.0-snapshot-f3025a56e31.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.3.0-snapshot-f3025a56e31.jar.sha1 deleted file mode 100644 index 2c27c386d9cb..000000000000 --- a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.3.0-snapshot-f3025a56e31.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -57e329682ef82a15901c76e5fdbc5ee233689f2d \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.3.0-snapshot-2d05f5c623e.jar.sha1 new file mode 100644 index 000000000000..7b95a9396dd9 --- /dev/null +++ b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.3.0-snapshot-2d05f5c623e.jar.sha1 @@ -0,0 +1 @@ +a58272a5eb0137dbcb030a7f2cd7925dd717c3e8 \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.3.0-snapshot-f3025a56e31.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.3.0-snapshot-f3025a56e31.jar.sha1 deleted file mode 100644 index e975ba487c88..000000000000 --- a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.3.0-snapshot-f3025a56e31.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bd19c2df3970762d730e79a57398010d4dac3ea9 \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.3.0-snapshot-2d05f5c623e.jar.sha1 new file mode 100644 index 000000000000..0e5e293c5bba --- /dev/null +++ b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.3.0-snapshot-2d05f5c623e.jar.sha1 @@ -0,0 +1 @@ +e15673b088608c7b7e2b5ab491665f9ea92941b2 \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.3.0-snapshot-f3025a56e31.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.3.0-snapshot-f3025a56e31.jar.sha1 deleted file mode 100644 index 0a771d327cd5..000000000000 --- a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.3.0-snapshot-f3025a56e31.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4b59d393f25bed87d0d8df0f851e0c7d07960d23 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.3.0-snapshot-2d05f5c623e.jar.sha1 new file mode 100644 index 000000000000..f818c60390a7 --- /dev/null +++ b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.3.0-snapshot-2d05f5c623e.jar.sha1 @@ -0,0 +1 @@ +f997bf7bdd07a5684e017294764b0a2ca398f948 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.3.0-snapshot-f3025a56e31.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.3.0-snapshot-f3025a56e31.jar.sha1 deleted file mode 100644 index a5ed8bdfacd6..000000000000 --- a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.3.0-snapshot-f3025a56e31.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e9aaeb24bcdaf0f9da2a1f8500511ecb56306223 \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.3.0-snapshot-2d05f5c623e.jar.sha1 new file mode 100644 index 000000000000..6153f690cb54 --- /dev/null +++ b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.3.0-snapshot-2d05f5c623e.jar.sha1 @@ -0,0 +1 @@ +7cdabbc7114cb7f2925407dd7e18fe6e36fbfc02 \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.3.0-snapshot-f3025a56e31.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.3.0-snapshot-f3025a56e31.jar.sha1 deleted file mode 100644 index 3a334af07b86..000000000000 --- a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.3.0-snapshot-f3025a56e31.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d3bba726a5b29eae4dfba27e1e65fdd6a1f4cc2f \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.3.0-snapshot-2d05f5c623e.jar.sha1 new file mode 100644 index 000000000000..0e796b94b617 --- /dev/null +++ b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.3.0-snapshot-2d05f5c623e.jar.sha1 @@ -0,0 +1 @@ +56cd7a7ae2f9db55fc4150f60745f900a1018e35 \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.3.0-snapshot-f3025a56e31.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.3.0-snapshot-f3025a56e31.jar.sha1 deleted file mode 100644 index 0942208df23e..000000000000 --- a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.3.0-snapshot-f3025a56e31.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5a161d98f65f6d5b0aa5bd881c37d3054db89b09 \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.3.0-snapshot-2d05f5c623e.jar.sha1 new file mode 100644 index 000000000000..751392734f74 --- /dev/null +++ b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.3.0-snapshot-2d05f5c623e.jar.sha1 @@ -0,0 +1 @@ +d8a80d858ca656735e3f3e0e3803f9130a504f58 \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.3.0-snapshot-f3025a56e31.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.3.0-snapshot-f3025a56e31.jar.sha1 deleted file mode 100644 index 514c57369cf5..000000000000 --- a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.3.0-snapshot-f3025a56e31.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f148a80992ae25e893b8959efd818cbb0d3e2121 \ No newline at end of file diff --git a/server/licenses/lucene-analysis-common-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/server/licenses/lucene-analysis-common-9.3.0-snapshot-2d05f5c623e.jar.sha1 new file mode 100644 index 000000000000..b7d65fa66ed3 --- /dev/null +++ b/server/licenses/lucene-analysis-common-9.3.0-snapshot-2d05f5c623e.jar.sha1 @@ -0,0 +1 @@ +ef6b338e156eacb5ae63daa9638899b4b0c44c15 \ No newline at end of file diff --git a/server/licenses/lucene-analysis-common-9.3.0-snapshot-f3025a56e31.jar.sha1 b/server/licenses/lucene-analysis-common-9.3.0-snapshot-f3025a56e31.jar.sha1 deleted file mode 100644 index b0351c886b1b..000000000000 --- a/server/licenses/lucene-analysis-common-9.3.0-snapshot-f3025a56e31.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f8fb2da223a48e2f54a5c94924850b007e5a1f57 \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/server/licenses/lucene-backward-codecs-9.3.0-snapshot-2d05f5c623e.jar.sha1 new file mode 100644 index 000000000000..1c06267cd06d --- /dev/null +++ b/server/licenses/lucene-backward-codecs-9.3.0-snapshot-2d05f5c623e.jar.sha1 @@ -0,0 +1 @@ +25886039976045fb8f9859e12f525eedbb64860a \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-9.3.0-snapshot-f3025a56e31.jar.sha1 b/server/licenses/lucene-backward-codecs-9.3.0-snapshot-f3025a56e31.jar.sha1 deleted file mode 100644 index 258eb9ea85e4..000000000000 --- a/server/licenses/lucene-backward-codecs-9.3.0-snapshot-f3025a56e31.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -48b0e121903b227a8730d23ef56879ce04cdfedf \ No newline at end of file diff --git a/server/licenses/lucene-core-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/server/licenses/lucene-core-9.3.0-snapshot-2d05f5c623e.jar.sha1 new file mode 100644 index 000000000000..f524e2a76baf --- /dev/null +++ b/server/licenses/lucene-core-9.3.0-snapshot-2d05f5c623e.jar.sha1 @@ -0,0 +1 @@ +98b0f69f9d285dcf822bcd90974e8aa4972187b9 \ No newline at end of file diff --git a/server/licenses/lucene-core-9.3.0-snapshot-f3025a56e31.jar.sha1 b/server/licenses/lucene-core-9.3.0-snapshot-f3025a56e31.jar.sha1 deleted file mode 100644 index 8bbb5978289c..000000000000 --- a/server/licenses/lucene-core-9.3.0-snapshot-f3025a56e31.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -690ea3dcc4606a4599b3e2b2e3510cff7059950c \ No newline at end of file diff --git a/server/licenses/lucene-grouping-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/server/licenses/lucene-grouping-9.3.0-snapshot-2d05f5c623e.jar.sha1 new file mode 100644 index 000000000000..9cdedb97f47d --- /dev/null +++ b/server/licenses/lucene-grouping-9.3.0-snapshot-2d05f5c623e.jar.sha1 @@ -0,0 +1 @@ +6f6126445ac9b86ef93c6ab26907a69931ada790 \ No newline at end of file diff --git a/server/licenses/lucene-grouping-9.3.0-snapshot-f3025a56e31.jar.sha1 b/server/licenses/lucene-grouping-9.3.0-snapshot-f3025a56e31.jar.sha1 deleted file mode 100644 index 6c278a39404b..000000000000 --- a/server/licenses/lucene-grouping-9.3.0-snapshot-f3025a56e31.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -32cdfad19d7bbdc7f3052bf6c9d9871263cfd1c8 \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/server/licenses/lucene-highlighter-9.3.0-snapshot-2d05f5c623e.jar.sha1 new file mode 100644 index 000000000000..3f84d24e5287 --- /dev/null +++ b/server/licenses/lucene-highlighter-9.3.0-snapshot-2d05f5c623e.jar.sha1 @@ -0,0 +1 @@ +dd6fafd8701b01a3f6279447f7d7c410b1230c13 \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-9.3.0-snapshot-f3025a56e31.jar.sha1 b/server/licenses/lucene-highlighter-9.3.0-snapshot-f3025a56e31.jar.sha1 deleted file mode 100644 index 98a54c0bda51..000000000000 --- a/server/licenses/lucene-highlighter-9.3.0-snapshot-f3025a56e31.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -366231787c733fc0c4fb373eaf507a66ba339dd6 \ No newline at end of file diff --git a/server/licenses/lucene-join-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/server/licenses/lucene-join-9.3.0-snapshot-2d05f5c623e.jar.sha1 new file mode 100644 index 000000000000..970cfe6d7f5b --- /dev/null +++ b/server/licenses/lucene-join-9.3.0-snapshot-2d05f5c623e.jar.sha1 @@ -0,0 +1 @@ +2bc4615335ba485b2152cd10d21ca0cb768b651e \ No newline at end of file diff --git a/server/licenses/lucene-join-9.3.0-snapshot-f3025a56e31.jar.sha1 b/server/licenses/lucene-join-9.3.0-snapshot-f3025a56e31.jar.sha1 deleted file mode 100644 index bb3368c30999..000000000000 --- a/server/licenses/lucene-join-9.3.0-snapshot-f3025a56e31.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -08837eab0f0836bba2f82827acc3eab3006b16b9 \ No newline at end of file diff --git a/server/licenses/lucene-memory-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/server/licenses/lucene-memory-9.3.0-snapshot-2d05f5c623e.jar.sha1 new file mode 100644 index 000000000000..e02a9fb3c97c --- /dev/null +++ b/server/licenses/lucene-memory-9.3.0-snapshot-2d05f5c623e.jar.sha1 @@ -0,0 +1 @@ +3972925a8a1e304e803491881e67c12cbcda4617 \ No newline at end of file diff --git a/server/licenses/lucene-memory-9.3.0-snapshot-f3025a56e31.jar.sha1 b/server/licenses/lucene-memory-9.3.0-snapshot-f3025a56e31.jar.sha1 deleted file mode 100644 index 9a1c59c3374e..000000000000 --- a/server/licenses/lucene-memory-9.3.0-snapshot-f3025a56e31.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bc550835d4a040f858f88f845dcb66573ca3c19e \ No newline at end of file diff --git a/server/licenses/lucene-misc-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/server/licenses/lucene-misc-9.3.0-snapshot-2d05f5c623e.jar.sha1 new file mode 100644 index 000000000000..212df59af004 --- /dev/null +++ b/server/licenses/lucene-misc-9.3.0-snapshot-2d05f5c623e.jar.sha1 @@ -0,0 +1 @@ +18c2adc5e45d08d65e64d31402219b67d7bc5c61 \ No newline at end of file diff --git a/server/licenses/lucene-misc-9.3.0-snapshot-f3025a56e31.jar.sha1 b/server/licenses/lucene-misc-9.3.0-snapshot-f3025a56e31.jar.sha1 deleted file mode 100644 index ddf5741290b5..000000000000 --- a/server/licenses/lucene-misc-9.3.0-snapshot-f3025a56e31.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -506d4ddd2ac3386df063f279113006694889ae53 \ No newline at end of file diff --git a/server/licenses/lucene-queries-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/server/licenses/lucene-queries-9.3.0-snapshot-2d05f5c623e.jar.sha1 new file mode 100644 index 000000000000..7b42f5400597 --- /dev/null +++ b/server/licenses/lucene-queries-9.3.0-snapshot-2d05f5c623e.jar.sha1 @@ -0,0 +1 @@ +bc9e4af7d35799ba941993be0242101f79719cc6 \ No newline at end of file diff --git a/server/licenses/lucene-queries-9.3.0-snapshot-f3025a56e31.jar.sha1 b/server/licenses/lucene-queries-9.3.0-snapshot-f3025a56e31.jar.sha1 deleted file mode 100644 index 6ad2702c4dd2..000000000000 --- a/server/licenses/lucene-queries-9.3.0-snapshot-f3025a56e31.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1aa664e0ac15d7d12723674d4b65d8969be9f8c2 \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/server/licenses/lucene-queryparser-9.3.0-snapshot-2d05f5c623e.jar.sha1 new file mode 100644 index 000000000000..9521e6945904 --- /dev/null +++ b/server/licenses/lucene-queryparser-9.3.0-snapshot-2d05f5c623e.jar.sha1 @@ -0,0 +1 @@ +f62b8f566e37fd6cf150f13d866fcc646c210e35 \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-9.3.0-snapshot-f3025a56e31.jar.sha1 b/server/licenses/lucene-queryparser-9.3.0-snapshot-f3025a56e31.jar.sha1 deleted file mode 100644 index ea7f92078772..000000000000 --- a/server/licenses/lucene-queryparser-9.3.0-snapshot-f3025a56e31.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6350f41cb9117e4499c15bd060ec2cf7b48970d9 \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/server/licenses/lucene-sandbox-9.3.0-snapshot-2d05f5c623e.jar.sha1 new file mode 100644 index 000000000000..82549c3474cd --- /dev/null +++ b/server/licenses/lucene-sandbox-9.3.0-snapshot-2d05f5c623e.jar.sha1 @@ -0,0 +1 @@ +081ff7330c13bfcf0110e7140badfc8be3df910c \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-9.3.0-snapshot-f3025a56e31.jar.sha1 b/server/licenses/lucene-sandbox-9.3.0-snapshot-f3025a56e31.jar.sha1 deleted file mode 100644 index 9b0fa3c84940..000000000000 --- a/server/licenses/lucene-sandbox-9.3.0-snapshot-f3025a56e31.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b36d0d959d2decffe5f9ea68130f28470637ca5c \ No newline at end of file diff --git a/server/licenses/lucene-suggest-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/server/licenses/lucene-suggest-9.3.0-snapshot-2d05f5c623e.jar.sha1 new file mode 100644 index 000000000000..133379a6f6ab --- /dev/null +++ b/server/licenses/lucene-suggest-9.3.0-snapshot-2d05f5c623e.jar.sha1 @@ -0,0 +1 @@ +e3240b6ab35e61a947d94978697816d102b1bd13 \ No newline at end of file diff --git a/server/licenses/lucene-suggest-9.3.0-snapshot-f3025a56e31.jar.sha1 b/server/licenses/lucene-suggest-9.3.0-snapshot-f3025a56e31.jar.sha1 deleted file mode 100644 index 1cf994479bc1..000000000000 --- a/server/licenses/lucene-suggest-9.3.0-snapshot-f3025a56e31.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b0220d2ce0e68879535246013601a09323106875 \ No newline at end of file diff --git a/server/src/main/java/org/elasticsearch/common/lucene/Lucene.java b/server/src/main/java/org/elasticsearch/common/lucene/Lucene.java index d5c2f8e7d5d6..1adf0d6afd0e 100644 --- a/server/src/main/java/org/elasticsearch/common/lucene/Lucene.java +++ b/server/src/main/java/org/elasticsearch/common/lucene/Lucene.java @@ -86,7 +86,7 @@ import java.util.List; import java.util.Map; public class Lucene { - public static final String LATEST_CODEC = "Lucene92"; + public static final String LATEST_CODEC = "Lucene93"; public static final String SOFT_DELETES_FIELD = "__soft_deletes"; diff --git a/server/src/main/java/org/elasticsearch/index/codec/CodecService.java b/server/src/main/java/org/elasticsearch/index/codec/CodecService.java index bd9dfeca6d69..f797c39a4ef2 100644 --- a/server/src/main/java/org/elasticsearch/index/codec/CodecService.java +++ b/server/src/main/java/org/elasticsearch/index/codec/CodecService.java @@ -9,7 +9,7 @@ package org.elasticsearch.index.codec; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.codecs.lucene92.Lucene92Codec; +import org.apache.lucene.codecs.lucene93.Lucene93Codec; import org.elasticsearch.core.Nullable; import org.elasticsearch.index.mapper.MapperService; @@ -34,11 +34,11 @@ public class CodecService { public CodecService(@Nullable MapperService mapperService) { final var codecs = new HashMap(); if (mapperService == null) { - codecs.put(DEFAULT_CODEC, new Lucene92Codec()); - codecs.put(BEST_COMPRESSION_CODEC, new Lucene92Codec(Lucene92Codec.Mode.BEST_COMPRESSION)); + codecs.put(DEFAULT_CODEC, new Lucene93Codec()); + codecs.put(BEST_COMPRESSION_CODEC, new Lucene93Codec(Lucene93Codec.Mode.BEST_COMPRESSION)); } else { - codecs.put(DEFAULT_CODEC, new PerFieldMapperCodec(Lucene92Codec.Mode.BEST_SPEED, mapperService)); - codecs.put(BEST_COMPRESSION_CODEC, new PerFieldMapperCodec(Lucene92Codec.Mode.BEST_COMPRESSION, mapperService)); + codecs.put(DEFAULT_CODEC, new PerFieldMapperCodec(Lucene93Codec.Mode.BEST_SPEED, mapperService)); + codecs.put(BEST_COMPRESSION_CODEC, new PerFieldMapperCodec(Lucene93Codec.Mode.BEST_COMPRESSION, mapperService)); } codecs.put(LUCENE_DEFAULT_CODEC, Codec.getDefault()); for (String codec : Codec.availableCodecs()) { diff --git a/server/src/main/java/org/elasticsearch/index/codec/PerFieldMapperCodec.java b/server/src/main/java/org/elasticsearch/index/codec/PerFieldMapperCodec.java index 517280dce73a..9c2ffa77d51b 100644 --- a/server/src/main/java/org/elasticsearch/index/codec/PerFieldMapperCodec.java +++ b/server/src/main/java/org/elasticsearch/index/codec/PerFieldMapperCodec.java @@ -13,7 +13,7 @@ import org.apache.lucene.codecs.DocValuesFormat; import org.apache.lucene.codecs.KnnVectorsFormat; import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.codecs.lucene90.Lucene90DocValuesFormat; -import org.apache.lucene.codecs.lucene92.Lucene92Codec; +import org.apache.lucene.codecs.lucene93.Lucene93Codec; import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.index.mapper.Mapper; import org.elasticsearch.index.mapper.MapperService; @@ -27,7 +27,7 @@ import org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapper; * per index in real time via the mapping API. If no specific postings format or vector format is * configured for a specific field the default postings or vector format is used. */ -public class PerFieldMapperCodec extends Lucene92Codec { +public class PerFieldMapperCodec extends Lucene93Codec { private final MapperService mapperService; private final DocValuesFormat docValuesFormat = new Lucene90DocValuesFormat(); diff --git a/server/src/main/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapper.java index 464ab696249c..c9d63251db1a 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapper.java @@ -9,7 +9,7 @@ package org.elasticsearch.index.mapper.vectors; import org.apache.lucene.codecs.KnnVectorsFormat; -import org.apache.lucene.codecs.lucene92.Lucene92HnswVectorsFormat; +import org.apache.lucene.codecs.lucene93.Lucene93HnswVectorsFormat; import org.apache.lucene.document.BinaryDocValuesField; import org.apache.lucene.document.Field; import org.apache.lucene.document.KnnVectorField; @@ -529,7 +529,7 @@ public class DenseVectorFieldMapper extends FieldMapper { return null; // use default format } else { HnswIndexOptions hnswIndexOptions = (HnswIndexOptions) indexOptions; - return new Lucene92HnswVectorsFormat(hnswIndexOptions.m, hnswIndexOptions.efConstruction); + return new Lucene93HnswVectorsFormat(hnswIndexOptions.m, hnswIndexOptions.efConstruction); } } } diff --git a/server/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java b/server/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java index 1e15db5a45a1..de193eb0efcd 100644 --- a/server/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java +++ b/server/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java @@ -162,7 +162,10 @@ public class ContextIndexSearcher extends IndexSearcher implements Releasable { } } + @Override public void search(List leaves, Weight weight, Collector collector) throws IOException { + weight = wrapWeight(weight); + collector.setWeight(weight); for (LeafReaderContext ctx : leaves) { // search each subreader searchLeaf(ctx, weight, collector); } @@ -176,7 +179,6 @@ public class ContextIndexSearcher extends IndexSearcher implements Releasable { */ private void searchLeaf(LeafReaderContext ctx, Weight weight, Collector collector) throws IOException { cancellable.checkCancelled(); - weight = wrapWeight(weight); final LeafCollector leafCollector; try { leafCollector = collector.getLeafCollector(ctx); diff --git a/server/src/test/java/org/elasticsearch/action/admin/indices/diskusage/IndexDiskUsageAnalyzerTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/diskusage/IndexDiskUsageAnalyzerTests.java index 84022bc23443..57f51457aa40 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/indices/diskusage/IndexDiskUsageAnalyzerTests.java +++ b/server/src/test/java/org/elasticsearch/action/admin/indices/diskusage/IndexDiskUsageAnalyzerTests.java @@ -12,7 +12,7 @@ import org.apache.lucene.codecs.DocValuesFormat; import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.codecs.lucene90.Lucene90DocValuesFormat; import org.apache.lucene.codecs.lucene90.Lucene90PostingsFormat; -import org.apache.lucene.codecs.lucene92.Lucene92Codec; +import org.apache.lucene.codecs.lucene93.Lucene93Codec; import org.apache.lucene.codecs.perfield.PerFieldDocValuesFormat; import org.apache.lucene.codecs.perfield.PerFieldPostingsFormat; import org.apache.lucene.document.BinaryDocValuesField; @@ -297,7 +297,7 @@ public class IndexDiskUsageAnalyzerTests extends ESTestCase { public void testCompletionField() throws Exception { IndexWriterConfig config = new IndexWriterConfig().setCommitOnClose(true) .setUseCompoundFile(false) - .setCodec(new Lucene92Codec(Lucene92Codec.Mode.BEST_SPEED) { + .setCodec(new Lucene93Codec(Lucene93Codec.Mode.BEST_SPEED) { @Override public PostingsFormat getPostingsFormatForField(String field) { if (field.startsWith("suggest_")) { @@ -384,25 +384,25 @@ public class IndexDiskUsageAnalyzerTests extends ESTestCase { enum CodecMode { BEST_SPEED { @Override - Lucene92Codec.Mode mode() { - return Lucene92Codec.Mode.BEST_SPEED; + Lucene93Codec.Mode mode() { + return Lucene93Codec.Mode.BEST_SPEED; } }, BEST_COMPRESSION { @Override - Lucene92Codec.Mode mode() { - return Lucene92Codec.Mode.BEST_COMPRESSION; + Lucene93Codec.Mode mode() { + return Lucene93Codec.Mode.BEST_COMPRESSION; } }; - abstract Lucene92Codec.Mode mode(); + abstract Lucene93Codec.Mode mode(); } static void indexRandomly(Directory directory, CodecMode codecMode, int numDocs, Consumer addFields) throws IOException { IndexWriterConfig config = new IndexWriterConfig().setCommitOnClose(true) .setUseCompoundFile(randomBoolean()) - .setCodec(new Lucene92Codec(codecMode.mode())); + .setCodec(new Lucene93Codec(codecMode.mode())); try (IndexWriter writer = new IndexWriter(directory, config)) { for (int i = 0; i < numDocs; i++) { final Document doc = new Document(); @@ -580,7 +580,7 @@ public class IndexDiskUsageAnalyzerTests extends ESTestCase { try (DirectoryReader reader = DirectoryReader.open(source)) { IndexWriterConfig config = new IndexWriterConfig().setSoftDeletesField(Lucene.SOFT_DELETES_FIELD) .setUseCompoundFile(randomBoolean()) - .setCodec(new Lucene92Codec(mode.mode()) { + .setCodec(new Lucene93Codec(mode.mode()) { @Override public PostingsFormat getPostingsFormatForField(String field) { return new Lucene90PostingsFormat(); diff --git a/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java b/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java index 1b7e80c86949..2a9f8dccf73d 100644 --- a/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java +++ b/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java @@ -10,7 +10,7 @@ package org.elasticsearch.index.codec; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.lucene90.Lucene90StoredFieldsFormat; -import org.apache.lucene.codecs.lucene92.Lucene92Codec; +import org.apache.lucene.codecs.lucene93.Lucene93Codec; import org.apache.lucene.document.Document; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexWriter; @@ -41,21 +41,21 @@ public class CodecTests extends ESTestCase { public void testResolveDefaultCodecs() throws Exception { CodecService codecService = createCodecService(); assertThat(codecService.codec("default"), instanceOf(PerFieldMapperCodec.class)); - assertThat(codecService.codec("default"), instanceOf(Lucene92Codec.class)); + assertThat(codecService.codec("default"), instanceOf(Lucene93Codec.class)); } public void testDefault() throws Exception { Codec codec = createCodecService().codec("default"); - assertStoredFieldsCompressionEquals(Lucene92Codec.Mode.BEST_SPEED, codec); + assertStoredFieldsCompressionEquals(Lucene93Codec.Mode.BEST_SPEED, codec); } public void testBestCompression() throws Exception { Codec codec = createCodecService().codec("best_compression"); - assertStoredFieldsCompressionEquals(Lucene92Codec.Mode.BEST_COMPRESSION, codec); + assertStoredFieldsCompressionEquals(Lucene93Codec.Mode.BEST_COMPRESSION, codec); } // write some docs with it, inspect .si to see this was the used compression - private void assertStoredFieldsCompressionEquals(Lucene92Codec.Mode expected, Codec actual) throws Exception { + private void assertStoredFieldsCompressionEquals(Lucene93Codec.Mode expected, Codec actual) throws Exception { Directory dir = newDirectory(); IndexWriterConfig iwc = newIndexWriterConfig(null); iwc.setCodec(actual); @@ -67,7 +67,7 @@ public class CodecTests extends ESTestCase { SegmentReader sr = (SegmentReader) ir.leaves().get(0).reader(); String v = sr.getSegmentInfo().info.getAttribute(Lucene90StoredFieldsFormat.MODE_KEY); assertNotNull(v); - assertEquals(expected, Lucene92Codec.Mode.valueOf(v)); + assertEquals(expected, Lucene93Codec.Mode.valueOf(v)); ir.close(); dir.close(); } diff --git a/server/src/test/java/org/elasticsearch/index/engine/CompletionStatsCacheTests.java b/server/src/test/java/org/elasticsearch/index/engine/CompletionStatsCacheTests.java index 1e03c7d3571a..83bc488ac064 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/CompletionStatsCacheTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/CompletionStatsCacheTests.java @@ -8,7 +8,7 @@ package org.elasticsearch.index.engine; import org.apache.lucene.codecs.PostingsFormat; -import org.apache.lucene.codecs.lucene92.Lucene92Codec; +import org.apache.lucene.codecs.lucene93.Lucene93Codec; import org.apache.lucene.document.Document; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexWriter; @@ -45,7 +45,7 @@ public class CompletionStatsCacheTests extends ESTestCase { public void testCompletionStatsCache() throws IOException, InterruptedException { final IndexWriterConfig indexWriterConfig = newIndexWriterConfig(); final PostingsFormat postingsFormat = new Completion90PostingsFormat(); - indexWriterConfig.setCodec(new Lucene92Codec() { + indexWriterConfig.setCodec(new Lucene93Codec() { @Override public PostingsFormat getPostingsFormatForField(String field) { return postingsFormat; // all fields are suggest fields diff --git a/server/src/test/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapperTests.java index 1a06836b7764..3b212ce04cc5 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapperTests.java @@ -12,7 +12,7 @@ import com.carrotsearch.randomizedtesting.generators.RandomPicks; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.KnnVectorsFormat; -import org.apache.lucene.codecs.lucene92.Lucene92HnswVectorsFormat; +import org.apache.lucene.codecs.lucene93.Lucene93HnswVectorsFormat; import org.apache.lucene.document.BinaryDocValuesField; import org.apache.lucene.document.KnnVectorField; import org.apache.lucene.index.IndexableField; @@ -40,8 +40,8 @@ import java.nio.ByteBuffer; import java.util.Arrays; import java.util.List; -import static org.apache.lucene.codecs.lucene92.Lucene92HnswVectorsFormat.DEFAULT_BEAM_WIDTH; -import static org.apache.lucene.codecs.lucene92.Lucene92HnswVectorsFormat.DEFAULT_MAX_CONN; +import static org.apache.lucene.codecs.lucene93.Lucene93HnswVectorsFormat.DEFAULT_BEAM_WIDTH; +import static org.apache.lucene.codecs.lucene93.Lucene93HnswVectorsFormat.DEFAULT_MAX_CONN; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; @@ -462,8 +462,8 @@ public class DenseVectorFieldMapperTests extends MapperTestCase { Codec codec = codecService.codec("default"); assertThat(codec, instanceOf(PerFieldMapperCodec.class)); KnnVectorsFormat knnVectorsFormat = ((PerFieldMapperCodec) codec).getKnnVectorsFormatForField("field"); - assertThat(knnVectorsFormat, instanceOf(Lucene92HnswVectorsFormat.class)); - String expectedString = "lucene92HnswVectorsFormat(name = lucene92HnswVectorsFormat, maxConn = " + assertThat(knnVectorsFormat, instanceOf(Lucene93HnswVectorsFormat.class)); + String expectedString = "Lucene93HnswVectorsFormat(name=Lucene93HnswVectorsFormat, maxConn=" + m + ", beamWidth=" + efConstruction diff --git a/x-pack/plugin/ml/licenses/lucene-analysis-icu-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/x-pack/plugin/ml/licenses/lucene-analysis-icu-9.3.0-snapshot-2d05f5c623e.jar.sha1 new file mode 100644 index 000000000000..73d5dfdcae43 --- /dev/null +++ b/x-pack/plugin/ml/licenses/lucene-analysis-icu-9.3.0-snapshot-2d05f5c623e.jar.sha1 @@ -0,0 +1 @@ +87772b1d9907c63287d7bc79cf8fa3e9a46c9c77 \ No newline at end of file diff --git a/x-pack/plugin/ml/licenses/lucene-analysis-icu-9.3.0-snapshot-f3025a56e31.jar.sha1 b/x-pack/plugin/ml/licenses/lucene-analysis-icu-9.3.0-snapshot-f3025a56e31.jar.sha1 deleted file mode 100644 index 2c27c386d9cb..000000000000 --- a/x-pack/plugin/ml/licenses/lucene-analysis-icu-9.3.0-snapshot-f3025a56e31.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -57e329682ef82a15901c76e5fdbc5ee233689f2d \ No newline at end of file