From 6a5a9fc85253d9b42ac399d8d230f687aec0d31e Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Wed, 22 Jun 2022 16:30:50 -0400 Subject: [PATCH 1/4] Upgrade to new Lucene snapshot --- build-tools-internal/version.properties | 2 +- docs/Versions.asciidoc | 4 ++-- modules/lang-expression/licenses/lucene-codecs-9.2.0.jar.sha1 | 1 - .../lucene-codecs-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 + .../licenses/lucene-expressions-9.2.0.jar.sha1 | 1 - .../lucene-expressions-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 + .../legacy-geo/licenses/lucene-spatial-extras-9.2.0.jar.sha1 | 1 - .../lucene-spatial-extras-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 + modules/legacy-geo/licenses/lucene-spatial3d-9.2.0.jar.sha1 | 1 - .../lucene-spatial3d-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 + .../analysis-icu/licenses/lucene-analysis-icu-9.2.0.jar.sha1 | 1 - .../lucene-analysis-icu-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 + .../licenses/lucene-analysis-kuromoji-9.2.0.jar.sha1 | 1 - ...cene-analysis-kuromoji-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 + .../licenses/lucene-analysis-nori-9.2.0.jar.sha1 | 1 - .../lucene-analysis-nori-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 + .../licenses/lucene-analysis-phonetic-9.2.0.jar.sha1 | 1 - ...cene-analysis-phonetic-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 + .../licenses/lucene-analysis-smartcn-9.2.0.jar.sha1 | 1 - ...ucene-analysis-smartcn-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 + .../licenses/lucene-analysis-stempel-9.2.0.jar.sha1 | 1 - ...ucene-analysis-stempel-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 + .../licenses/lucene-analysis-morfologik-9.2.0.jar.sha1 | 1 - ...ne-analysis-morfologik-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 + server/licenses/lucene-analysis-common-9.2.0.jar.sha1 | 1 - ...lucene-analysis-common-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 + server/licenses/lucene-backward-codecs-9.2.0.jar.sha1 | 1 - ...lucene-backward-codecs-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 + server/licenses/lucene-core-9.2.0.jar.sha1 | 1 - .../licenses/lucene-core-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 + server/licenses/lucene-grouping-9.2.0.jar.sha1 | 1 - .../lucene-grouping-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 + server/licenses/lucene-highlighter-9.2.0.jar.sha1 | 1 - .../lucene-highlighter-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 + server/licenses/lucene-join-9.2.0.jar.sha1 | 1 - .../licenses/lucene-join-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 + server/licenses/lucene-memory-9.2.0.jar.sha1 | 1 - .../lucene-memory-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 + server/licenses/lucene-misc-9.2.0.jar.sha1 | 1 - .../licenses/lucene-misc-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 + server/licenses/lucene-queries-9.2.0.jar.sha1 | 1 - .../lucene-queries-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 + server/licenses/lucene-queryparser-9.2.0.jar.sha1 | 1 - .../lucene-queryparser-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 + server/licenses/lucene-sandbox-9.2.0.jar.sha1 | 1 - .../lucene-sandbox-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 + server/licenses/lucene-suggest-9.2.0.jar.sha1 | 1 - .../lucene-suggest-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 + server/src/main/java/org/elasticsearch/Version.java | 2 +- .../index/fielddata/ordinals/GlobalOrdinalMapping.java | 2 +- .../elasticsearch/index/fielddata/ordinals/MultiOrdinals.java | 4 ++-- .../org/elasticsearch/index/mapper/DocumentLeafReader.java | 2 +- .../index/mapper/flattened/KeyedFlattenedLeafFieldData.java | 2 +- .../search/aggregations/support/MissingValues.java | 4 ++-- .../mapper/flattened/KeyedFlattenedLeafFieldDataTests.java | 2 +- .../java/org/elasticsearch/search/MultiValueModeTests.java | 2 +- .../aggregations/bucket/range/BinaryRangeAggregatorTests.java | 2 +- .../search/aggregations/support/IncludeExcludeTests.java | 2 +- .../search/aggregations/support/MissingValuesTests.java | 4 ++-- x-pack/plugin/ml/licenses/lucene-analysis-icu-9.2.0.jar.sha1 | 1 - .../lucene-analysis-icu-9.3.0-snapshot-f3025a56e31.jar.sha1 | 1 + .../bwc/codecs/index/LegacySortedSetDocValuesWrapper.java | 2 +- 62 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 modules/lang-expression/licenses/lucene-codecs-9.2.0.jar.sha1 create mode 100644 modules/lang-expression/licenses/lucene-codecs-9.3.0-snapshot-f3025a56e31.jar.sha1 delete mode 100644 modules/lang-expression/licenses/lucene-expressions-9.2.0.jar.sha1 create mode 100644 modules/lang-expression/licenses/lucene-expressions-9.3.0-snapshot-f3025a56e31.jar.sha1 delete mode 100644 modules/legacy-geo/licenses/lucene-spatial-extras-9.2.0.jar.sha1 create mode 100644 modules/legacy-geo/licenses/lucene-spatial-extras-9.3.0-snapshot-f3025a56e31.jar.sha1 delete mode 100644 modules/legacy-geo/licenses/lucene-spatial3d-9.2.0.jar.sha1 create mode 100644 modules/legacy-geo/licenses/lucene-spatial3d-9.3.0-snapshot-f3025a56e31.jar.sha1 delete mode 100644 plugins/analysis-icu/licenses/lucene-analysis-icu-9.2.0.jar.sha1 create mode 100644 plugins/analysis-icu/licenses/lucene-analysis-icu-9.3.0-snapshot-f3025a56e31.jar.sha1 delete mode 100644 plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.2.0.jar.sha1 create mode 100644 plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.3.0-snapshot-f3025a56e31.jar.sha1 delete mode 100644 plugins/analysis-nori/licenses/lucene-analysis-nori-9.2.0.jar.sha1 create mode 100644 plugins/analysis-nori/licenses/lucene-analysis-nori-9.3.0-snapshot-f3025a56e31.jar.sha1 delete mode 100644 plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.2.0.jar.sha1 create mode 100644 plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.3.0-snapshot-f3025a56e31.jar.sha1 delete mode 100644 plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.2.0.jar.sha1 create mode 100644 plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.3.0-snapshot-f3025a56e31.jar.sha1 delete mode 100644 plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.2.0.jar.sha1 create mode 100644 plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.3.0-snapshot-f3025a56e31.jar.sha1 delete mode 100644 plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.2.0.jar.sha1 create mode 100644 plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.3.0-snapshot-f3025a56e31.jar.sha1 delete mode 100644 server/licenses/lucene-analysis-common-9.2.0.jar.sha1 create mode 100644 server/licenses/lucene-analysis-common-9.3.0-snapshot-f3025a56e31.jar.sha1 delete mode 100644 server/licenses/lucene-backward-codecs-9.2.0.jar.sha1 create mode 100644 server/licenses/lucene-backward-codecs-9.3.0-snapshot-f3025a56e31.jar.sha1 delete mode 100644 server/licenses/lucene-core-9.2.0.jar.sha1 create mode 100644 server/licenses/lucene-core-9.3.0-snapshot-f3025a56e31.jar.sha1 delete mode 100644 server/licenses/lucene-grouping-9.2.0.jar.sha1 create mode 100644 server/licenses/lucene-grouping-9.3.0-snapshot-f3025a56e31.jar.sha1 delete mode 100644 server/licenses/lucene-highlighter-9.2.0.jar.sha1 create mode 100644 server/licenses/lucene-highlighter-9.3.0-snapshot-f3025a56e31.jar.sha1 delete mode 100644 server/licenses/lucene-join-9.2.0.jar.sha1 create mode 100644 server/licenses/lucene-join-9.3.0-snapshot-f3025a56e31.jar.sha1 delete mode 100644 server/licenses/lucene-memory-9.2.0.jar.sha1 create mode 100644 server/licenses/lucene-memory-9.3.0-snapshot-f3025a56e31.jar.sha1 delete mode 100644 server/licenses/lucene-misc-9.2.0.jar.sha1 create mode 100644 server/licenses/lucene-misc-9.3.0-snapshot-f3025a56e31.jar.sha1 delete mode 100644 server/licenses/lucene-queries-9.2.0.jar.sha1 create mode 100644 server/licenses/lucene-queries-9.3.0-snapshot-f3025a56e31.jar.sha1 delete mode 100644 server/licenses/lucene-queryparser-9.2.0.jar.sha1 create mode 100644 server/licenses/lucene-queryparser-9.3.0-snapshot-f3025a56e31.jar.sha1 delete mode 100644 server/licenses/lucene-sandbox-9.2.0.jar.sha1 create mode 100644 server/licenses/lucene-sandbox-9.3.0-snapshot-f3025a56e31.jar.sha1 delete mode 100644 server/licenses/lucene-suggest-9.2.0.jar.sha1 create mode 100644 server/licenses/lucene-suggest-9.3.0-snapshot-f3025a56e31.jar.sha1 delete mode 100644 x-pack/plugin/ml/licenses/lucene-analysis-icu-9.2.0.jar.sha1 create 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 812f71e8716ee..66e2a2fc4fb11 100644 --- a/build-tools-internal/version.properties +++ b/build-tools-internal/version.properties @@ -1,5 +1,5 @@ elasticsearch = 8.4.0 -lucene = 9.2.0 +lucene = 9.3.0-snapshot-f3025a56e31 bundled_jdk_vendor = openjdk bundled_jdk = 18.0.1.1+2@65ae32619e2f40f3a9af3af1851d6e19 diff --git a/docs/Versions.asciidoc b/docs/Versions.asciidoc index 6add408f3e81f..dc4f5813885f4 100644 --- a/docs/Versions.asciidoc +++ b/docs/Versions.asciidoc @@ -1,8 +1,8 @@ include::{docs-root}/shared/versions/stack/{source_branch}.asciidoc[] -:lucene_version: 9.2.0 -:lucene_version_path: 9_2_0 +:lucene_version: 9.3.0 +:lucene_version_path: 9_3_0 :jdk: 11.0.2 :jdk_major: 11 :build_type: tar diff --git a/modules/lang-expression/licenses/lucene-codecs-9.2.0.jar.sha1 b/modules/lang-expression/licenses/lucene-codecs-9.2.0.jar.sha1 deleted file mode 100644 index 45068a260bb47..0000000000000 --- a/modules/lang-expression/licenses/lucene-codecs-9.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6a1b5573015bfbfd94d7324012a3177217af7705 \ 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 new file mode 100644 index 0000000000000..87eacf955654a --- /dev/null +++ b/modules/lang-expression/licenses/lucene-codecs-9.3.0-snapshot-f3025a56e31.jar.sha1 @@ -0,0 +1 @@ +edcd74ce93bda0e2007428dc989f0d855449e154 \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-expressions-9.2.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.2.0.jar.sha1 deleted file mode 100644 index 50ceb1672cc45..0000000000000 --- a/modules/lang-expression/licenses/lucene-expressions-9.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -12e8ba1ca93695819d0251a16584880deac58ae0 \ 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 new file mode 100644 index 0000000000000..f47235f4ae419 --- /dev/null +++ b/modules/lang-expression/licenses/lucene-expressions-9.3.0-snapshot-f3025a56e31.jar.sha1 @@ -0,0 +1 @@ +6f4e079ad40b708b1b7cd6f41300e6bdb71ade94 \ No newline at end of file diff --git a/modules/legacy-geo/licenses/lucene-spatial-extras-9.2.0.jar.sha1 b/modules/legacy-geo/licenses/lucene-spatial-extras-9.2.0.jar.sha1 deleted file mode 100644 index e01ea9ef7c16f..0000000000000 --- a/modules/legacy-geo/licenses/lucene-spatial-extras-9.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -47e15ef3815554c73cff7163c70115ea1f18818f \ 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 new file mode 100644 index 0000000000000..a9faa60b6ce44 --- /dev/null +++ b/modules/legacy-geo/licenses/lucene-spatial-extras-9.3.0-snapshot-f3025a56e31.jar.sha1 @@ -0,0 +1 @@ +6dd3dedd93129e518eaccd806cd16b067f27d414 \ No newline at end of file diff --git a/modules/legacy-geo/licenses/lucene-spatial3d-9.2.0.jar.sha1 b/modules/legacy-geo/licenses/lucene-spatial3d-9.2.0.jar.sha1 deleted file mode 100644 index dd06925902b0b..0000000000000 --- a/modules/legacy-geo/licenses/lucene-spatial3d-9.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -22308d4eaab8bf8a2b16cfc9eff97bfc2fb5a508 \ 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 new file mode 100644 index 0000000000000..077aad3c7d89b --- /dev/null +++ b/modules/legacy-geo/licenses/lucene-spatial3d-9.3.0-snapshot-f3025a56e31.jar.sha1 @@ -0,0 +1 @@ +d510d06738c5e0db79875bb07699bf3acc3b31cc \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.2.0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.2.0.jar.sha1 deleted file mode 100644 index ae82ce9134db8..0000000000000 --- a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -832f62c39c8c2a77097e2d2d4438bd1642f11f29 \ 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 new file mode 100644 index 0000000000000..2c27c386d9cbd --- /dev/null +++ b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.3.0-snapshot-f3025a56e31.jar.sha1 @@ -0,0 +1 @@ +57e329682ef82a15901c76e5fdbc5ee233689f2d \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.2.0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.2.0.jar.sha1 deleted file mode 100644 index 97615d33b942e..0000000000000 --- a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f3314a95b461d30e048a932f81ff3c5808dd145f \ 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 new file mode 100644 index 0000000000000..e975ba487c886 --- /dev/null +++ b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.3.0-snapshot-f3025a56e31.jar.sha1 @@ -0,0 +1 @@ +bd19c2df3970762d730e79a57398010d4dac3ea9 \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.2.0.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.2.0.jar.sha1 deleted file mode 100644 index 38f65996f2395..0000000000000 --- a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e4fd55524bf85aa7d1ec86f8680faa7b07d95fb4 \ 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 new file mode 100644 index 0000000000000..0a771d327cd50 --- /dev/null +++ b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.3.0-snapshot-f3025a56e31.jar.sha1 @@ -0,0 +1 @@ +4b59d393f25bed87d0d8df0f851e0c7d07960d23 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.2.0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.2.0.jar.sha1 deleted file mode 100644 index 4a0a4a561bb44..0000000000000 --- a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -85c59dcdd7ac761b7f384475aa687a0ae0afaab2 \ 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 new file mode 100644 index 0000000000000..a5ed8bdfacd64 --- /dev/null +++ b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.3.0-snapshot-f3025a56e31.jar.sha1 @@ -0,0 +1 @@ +e9aaeb24bcdaf0f9da2a1f8500511ecb56306223 \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.2.0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.2.0.jar.sha1 deleted file mode 100644 index e5fb4a89d6fc3..0000000000000 --- a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8bfdb8ff2824a585be6d91d80a52a6d4d15c35e8 \ 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 new file mode 100644 index 0000000000000..3a334af07b869 --- /dev/null +++ b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.3.0-snapshot-f3025a56e31.jar.sha1 @@ -0,0 +1 @@ +d3bba726a5b29eae4dfba27e1e65fdd6a1f4cc2f \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.2.0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.2.0.jar.sha1 deleted file mode 100644 index de10c0dfc9ef6..0000000000000 --- a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a050c43f529572590d8dd5a5bc9f7b64119795b4 \ 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 new file mode 100644 index 0000000000000..0942208df23e8 --- /dev/null +++ b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.3.0-snapshot-f3025a56e31.jar.sha1 @@ -0,0 +1 @@ +5a161d98f65f6d5b0aa5bd881c37d3054db89b09 \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.2.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.2.0.jar.sha1 deleted file mode 100644 index 8e2b8f32c035a..0000000000000 --- a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d2a148922ee01da3f653e931cb572d6dfec1ba3b \ 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 new file mode 100644 index 0000000000000..514c57369cf56 --- /dev/null +++ b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.3.0-snapshot-f3025a56e31.jar.sha1 @@ -0,0 +1 @@ +f148a80992ae25e893b8959efd818cbb0d3e2121 \ No newline at end of file diff --git a/server/licenses/lucene-analysis-common-9.2.0.jar.sha1 b/server/licenses/lucene-analysis-common-9.2.0.jar.sha1 deleted file mode 100644 index 316a74de5f2d8..0000000000000 --- a/server/licenses/lucene-analysis-common-9.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -da636dedae3155ef186b5eaa543093da069ddab1 \ 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 new file mode 100644 index 0000000000000..b0351c886b1bb --- /dev/null +++ b/server/licenses/lucene-analysis-common-9.3.0-snapshot-f3025a56e31.jar.sha1 @@ -0,0 +1 @@ +f8fb2da223a48e2f54a5c94924850b007e5a1f57 \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-9.2.0.jar.sha1 b/server/licenses/lucene-backward-codecs-9.2.0.jar.sha1 deleted file mode 100644 index 991b99eadd4c3..0000000000000 --- a/server/licenses/lucene-backward-codecs-9.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -97f362ff458b03850b3e0fb45a6cc2773ddbfbfa \ 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 new file mode 100644 index 0000000000000..258eb9ea85e42 --- /dev/null +++ b/server/licenses/lucene-backward-codecs-9.3.0-snapshot-f3025a56e31.jar.sha1 @@ -0,0 +1 @@ +48b0e121903b227a8730d23ef56879ce04cdfedf \ No newline at end of file diff --git a/server/licenses/lucene-core-9.2.0.jar.sha1 b/server/licenses/lucene-core-9.2.0.jar.sha1 deleted file mode 100644 index 7f05fa3210bf3..0000000000000 --- a/server/licenses/lucene-core-9.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -da43e5472e43db68b8c74f05e63d900ecedc1631 \ 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 new file mode 100644 index 0000000000000..8bbb5978289ca --- /dev/null +++ b/server/licenses/lucene-core-9.3.0-snapshot-f3025a56e31.jar.sha1 @@ -0,0 +1 @@ +690ea3dcc4606a4599b3e2b2e3510cff7059950c \ No newline at end of file diff --git a/server/licenses/lucene-grouping-9.2.0.jar.sha1 b/server/licenses/lucene-grouping-9.2.0.jar.sha1 deleted file mode 100644 index 06e446118ebfc..0000000000000 --- a/server/licenses/lucene-grouping-9.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b1ea8b82a036cbff93a9c849cbf574c6730a7b13 \ 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 new file mode 100644 index 0000000000000..6c278a39404b4 --- /dev/null +++ b/server/licenses/lucene-grouping-9.3.0-snapshot-f3025a56e31.jar.sha1 @@ -0,0 +1 @@ +32cdfad19d7bbdc7f3052bf6c9d9871263cfd1c8 \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-9.2.0.jar.sha1 b/server/licenses/lucene-highlighter-9.2.0.jar.sha1 deleted file mode 100644 index 0729c42c4d129..0000000000000 --- a/server/licenses/lucene-highlighter-9.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c447cad35d879bd656f8a0aeb3114c08e25ca1b1 \ 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 new file mode 100644 index 0000000000000..98a54c0bda51c --- /dev/null +++ b/server/licenses/lucene-highlighter-9.3.0-snapshot-f3025a56e31.jar.sha1 @@ -0,0 +1 @@ +366231787c733fc0c4fb373eaf507a66ba339dd6 \ No newline at end of file diff --git a/server/licenses/lucene-join-9.2.0.jar.sha1 b/server/licenses/lucene-join-9.2.0.jar.sha1 deleted file mode 100644 index b401ef5c0d88c..0000000000000 --- a/server/licenses/lucene-join-9.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4652557ef1d68b0046f0bb28762ede953f6367ef \ 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 new file mode 100644 index 0000000000000..bb3368c309990 --- /dev/null +++ b/server/licenses/lucene-join-9.3.0-snapshot-f3025a56e31.jar.sha1 @@ -0,0 +1 @@ +08837eab0f0836bba2f82827acc3eab3006b16b9 \ No newline at end of file diff --git a/server/licenses/lucene-memory-9.2.0.jar.sha1 b/server/licenses/lucene-memory-9.2.0.jar.sha1 deleted file mode 100644 index dd9a95000a6cd..0000000000000 --- a/server/licenses/lucene-memory-9.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6c9aa37760c11c033f154170c15c2b1961b7a886 \ 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 new file mode 100644 index 0000000000000..9a1c59c3374e4 --- /dev/null +++ b/server/licenses/lucene-memory-9.3.0-snapshot-f3025a56e31.jar.sha1 @@ -0,0 +1 @@ +bc550835d4a040f858f88f845dcb66573ca3c19e \ No newline at end of file diff --git a/server/licenses/lucene-misc-9.2.0.jar.sha1 b/server/licenses/lucene-misc-9.2.0.jar.sha1 deleted file mode 100644 index df82a6bd926c4..0000000000000 --- a/server/licenses/lucene-misc-9.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c51ef9a5894dfb4548bbf80d1a271cfe8e86cbf6 \ 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 new file mode 100644 index 0000000000000..ddf5741290b59 --- /dev/null +++ b/server/licenses/lucene-misc-9.3.0-snapshot-f3025a56e31.jar.sha1 @@ -0,0 +1 @@ +506d4ddd2ac3386df063f279113006694889ae53 \ No newline at end of file diff --git a/server/licenses/lucene-queries-9.2.0.jar.sha1 b/server/licenses/lucene-queries-9.2.0.jar.sha1 deleted file mode 100644 index bdd9109cbd324..0000000000000 --- a/server/licenses/lucene-queries-9.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fcb32402e0cba93454675cb631d59264968b32a4 \ 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 new file mode 100644 index 0000000000000..6ad2702c4dd20 --- /dev/null +++ b/server/licenses/lucene-queries-9.3.0-snapshot-f3025a56e31.jar.sha1 @@ -0,0 +1 @@ +1aa664e0ac15d7d12723674d4b65d8969be9f8c2 \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-9.2.0.jar.sha1 b/server/licenses/lucene-queryparser-9.2.0.jar.sha1 deleted file mode 100644 index 17ff055324cc2..0000000000000 --- a/server/licenses/lucene-queryparser-9.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7bbcadf643c6bed8a15d789c71cd89a8c9dddf31 \ 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 new file mode 100644 index 0000000000000..ea7f920787721 --- /dev/null +++ b/server/licenses/lucene-queryparser-9.3.0-snapshot-f3025a56e31.jar.sha1 @@ -0,0 +1 @@ +6350f41cb9117e4499c15bd060ec2cf7b48970d9 \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-9.2.0.jar.sha1 b/server/licenses/lucene-sandbox-9.2.0.jar.sha1 deleted file mode 100644 index 026075cb7165f..0000000000000 --- a/server/licenses/lucene-sandbox-9.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -aedb9a641278845f81cb004d6bc557eb43f69a57 \ 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 new file mode 100644 index 0000000000000..9b0fa3c849406 --- /dev/null +++ b/server/licenses/lucene-sandbox-9.3.0-snapshot-f3025a56e31.jar.sha1 @@ -0,0 +1 @@ +b36d0d959d2decffe5f9ea68130f28470637ca5c \ No newline at end of file diff --git a/server/licenses/lucene-suggest-9.2.0.jar.sha1 b/server/licenses/lucene-suggest-9.2.0.jar.sha1 deleted file mode 100644 index 1d53225793a33..0000000000000 --- a/server/licenses/lucene-suggest-9.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -608e3851216dc1d8d85f9389c71241f2b395f1ea \ 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 new file mode 100644 index 0000000000000..1cf994479bc14 --- /dev/null +++ b/server/licenses/lucene-suggest-9.3.0-snapshot-f3025a56e31.jar.sha1 @@ -0,0 +1 @@ +b0220d2ce0e68879535246013601a09323106875 \ No newline at end of file diff --git a/server/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java index 7e8bd5e7cff91..bd95a03907094 100644 --- a/server/src/main/java/org/elasticsearch/Version.java +++ b/server/src/main/java/org/elasticsearch/Version.java @@ -114,7 +114,7 @@ public class Version implements Comparable, ToXContentFragment { public static final Version V_8_2_3 = new Version(8_02_03_99, org.apache.lucene.util.Version.LUCENE_9_1_0); public static final Version V_8_2_4 = new Version(8_02_04_99, org.apache.lucene.util.Version.LUCENE_9_1_0); public static final Version V_8_3_0 = new Version(8_03_00_99, org.apache.lucene.util.Version.LUCENE_9_2_0); - public static final Version V_8_4_0 = new Version(8_04_00_99, org.apache.lucene.util.Version.LUCENE_9_2_0); + public static final Version V_8_4_0 = new Version(8_04_00_99, org.apache.lucene.util.Version.LUCENE_9_3_0); public static final Version CURRENT = V_8_4_0; private static final Map idToVersion; diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalMapping.java b/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalMapping.java index 2f4032fd56538..12e487b27647c 100644 --- a/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalMapping.java +++ b/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalMapping.java @@ -60,7 +60,7 @@ public long nextOrd() throws IOException { } @Override - public long docValueCount() { + public int docValueCount() { return values.docValueCount(); } diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinals.java b/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinals.java index ea3c3df9fc501..f6ca9b310a8a6 100644 --- a/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinals.java +++ b/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinals.java @@ -190,8 +190,8 @@ public long nextOrd() throws IOException { } @Override - public long docValueCount() { - return currentEndOffset - currentOffset; + public int docValueCount() { + return Math.toIntExact(currentEndOffset - currentOffset); } @Override diff --git a/server/src/main/java/org/elasticsearch/index/mapper/DocumentLeafReader.java b/server/src/main/java/org/elasticsearch/index/mapper/DocumentLeafReader.java index ea706a694ba47..51c18ef3c659d 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/DocumentLeafReader.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/DocumentLeafReader.java @@ -460,7 +460,7 @@ public long nextOrd() { } @Override - public long docValueCount() { + public int docValueCount() { return values.size(); } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/flattened/KeyedFlattenedLeafFieldData.java b/server/src/main/java/org/elasticsearch/index/mapper/flattened/KeyedFlattenedLeafFieldData.java index f92413fe5485d..5384bc001b2a1 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/flattened/KeyedFlattenedLeafFieldData.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/flattened/KeyedFlattenedLeafFieldData.java @@ -210,7 +210,7 @@ public long nextOrd() throws IOException { } @Override - public long docValueCount() { + public int docValueCount() { return delegate.docValueCount(); } diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/support/MissingValues.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/MissingValues.java index 494ffda5ca00a..0bb6ae965cad2 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/support/MissingValues.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/support/MissingValues.java @@ -280,7 +280,7 @@ public long nextOrd() throws IOException { } @Override - public long docValueCount() { + public int docValueCount() { return values.docValueCount(); } @@ -319,7 +319,7 @@ public BytesRef lookupOrd(long ord) throws IOException { } @Override - public long docValueCount() { + public int docValueCount() { return values.docValueCount(); } diff --git a/server/src/test/java/org/elasticsearch/index/mapper/flattened/KeyedFlattenedLeafFieldDataTests.java b/server/src/test/java/org/elasticsearch/index/mapper/flattened/KeyedFlattenedLeafFieldDataTests.java index 5507725b469b1..40fea348d997e 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/flattened/KeyedFlattenedLeafFieldDataTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/flattened/KeyedFlattenedLeafFieldDataTests.java @@ -200,7 +200,7 @@ public long nextOrd() { } @Override - public long docValueCount() { + public int docValueCount() { return documentOrds.length; } diff --git a/server/src/test/java/org/elasticsearch/search/MultiValueModeTests.java b/server/src/test/java/org/elasticsearch/search/MultiValueModeTests.java index f16f1ab955488..ed6fe0296a4c7 100644 --- a/server/src/test/java/org/elasticsearch/search/MultiValueModeTests.java +++ b/server/src/test/java/org/elasticsearch/search/MultiValueModeTests.java @@ -724,7 +724,7 @@ public long nextOrd() { } @Override - public long docValueCount() { + public int docValueCount() { return array[doc].length; } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregatorTests.java index 4b89adeb8416f..99502dd3372cf 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/BinaryRangeAggregatorTests.java @@ -48,7 +48,7 @@ public long nextOrd() { } @Override - public long docValueCount() { + public int docValueCount() { return ords.length; } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/support/IncludeExcludeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/support/IncludeExcludeTests.java index 77751324b4012..56a076c8a06b3 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/support/IncludeExcludeTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/support/IncludeExcludeTests.java @@ -67,7 +67,7 @@ public long nextOrd() { } @Override - public long docValueCount() { + public int docValueCount() { return 1; } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/support/MissingValuesTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/support/MissingValuesTests.java index b305b83536fac..655b8f90ed0ef 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/support/MissingValuesTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/support/MissingValuesTests.java @@ -131,7 +131,7 @@ public long nextOrd() { } @Override - public long docValueCount() { + public int docValueCount() { return ords[doc].length; } }; @@ -232,7 +232,7 @@ public long nextOrd() throws IOException { } @Override - public long docValueCount() { + public int docValueCount() { throw new UnsupportedOperationException(); } diff --git a/x-pack/plugin/ml/licenses/lucene-analysis-icu-9.2.0.jar.sha1 b/x-pack/plugin/ml/licenses/lucene-analysis-icu-9.2.0.jar.sha1 deleted file mode 100644 index ae82ce9134db8..0000000000000 --- a/x-pack/plugin/ml/licenses/lucene-analysis-icu-9.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -832f62c39c8c2a77097e2d2d4438bd1642f11f29 \ 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 new file mode 100644 index 0000000000000..2c27c386d9cbd --- /dev/null +++ b/x-pack/plugin/ml/licenses/lucene-analysis-icu-9.3.0-snapshot-f3025a56e31.jar.sha1 @@ -0,0 +1 @@ +57e329682ef82a15901c76e5fdbc5ee233689f2d \ No newline at end of file diff --git a/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/index/LegacySortedSetDocValuesWrapper.java b/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/index/LegacySortedSetDocValuesWrapper.java index d6ac7227bb041..fca88b307a99b 100644 --- a/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/index/LegacySortedSetDocValuesWrapper.java +++ b/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/index/LegacySortedSetDocValuesWrapper.java @@ -99,7 +99,7 @@ public long nextOrd() { } @Override - public long docValueCount() { + public int docValueCount() { throw new UnsupportedOperationException(); } From 36d5fb57596a09c467d708f15f1755f7c5d24174 Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Wed, 22 Jun 2022 20:38:07 -0400 Subject: [PATCH 2/4] implement docValueCount --- .../bwc/codecs/index/LegacySortedSetDocValues.java | 6 ++++++ .../codecs/index/LegacySortedSetDocValuesWrapper.java | 2 +- .../bwc/codecs/lucene54/Lucene54DocValuesProducer.java | 10 ++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/index/LegacySortedSetDocValues.java b/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/index/LegacySortedSetDocValues.java index 3af500bcf166e..dba37a9481f78 100644 --- a/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/index/LegacySortedSetDocValues.java +++ b/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/index/LegacySortedSetDocValues.java @@ -56,6 +56,12 @@ protected LegacySortedSetDocValues() {} */ public abstract long nextOrd(); + /** + * Retrieves the number of unique ords for the current document. This must always be greater than + * zero. It is illegal to call this method after advanceExact(int) returned {@code false}. + */ + public abstract int docValueCount(); + /** * Sets iteration to the specified docID * @param docID document ID diff --git a/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/index/LegacySortedSetDocValuesWrapper.java b/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/index/LegacySortedSetDocValuesWrapper.java index fca88b307a99b..21b6818bd5613 100644 --- a/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/index/LegacySortedSetDocValuesWrapper.java +++ b/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/index/LegacySortedSetDocValuesWrapper.java @@ -100,7 +100,7 @@ public long nextOrd() { @Override public int docValueCount() { - throw new UnsupportedOperationException(); + return values.docValueCount(); } @Override diff --git a/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/lucene54/Lucene54DocValuesProducer.java b/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/lucene54/Lucene54DocValuesProducer.java index 41409a7f9d4f2..09147e821d9fb 100644 --- a/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/lucene54/Lucene54DocValuesProducer.java +++ b/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/lucene54/Lucene54DocValuesProducer.java @@ -1351,6 +1351,11 @@ public BytesRef lookupOrd(long ord) { return binary.get(ord); } + @Override + public int docValueCount() { + return Math.toIntExact(endOffset - startOffset); + } + @Override public long getValueCount() { return valueCount; @@ -1415,6 +1420,11 @@ public long getValueCount() { return valueCount; } + @Override + public int docValueCount() { + return Math.toIntExact(endOffset - startOffset); + } + @Override public long lookupTerm(BytesRef key) { if (binary instanceof CompressedBinaryDocValues) { From 2ecad106d0eec0521671161412dc33b8715cc7b6 Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Wed, 22 Jun 2022 22:12:37 -0400 Subject: [PATCH 3/4] Disable merges on refresh on specific tests --- .../java/org/elasticsearch/common/lucene/LuceneTests.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/src/test/java/org/elasticsearch/common/lucene/LuceneTests.java b/server/src/test/java/org/elasticsearch/common/lucene/LuceneTests.java index 51b042b171428..de5159dc84139 100644 --- a/server/src/test/java/org/elasticsearch/common/lucene/LuceneTests.java +++ b/server/src/test/java/org/elasticsearch/common/lucene/LuceneTests.java @@ -517,7 +517,9 @@ public void testWrapAllDocsLive() throws Exception { public void testWrapLiveDocsNotExposeAbortedDocuments() throws Exception { Directory dir = newDirectory(); IndexWriterConfig config = newIndexWriterConfig().setSoftDeletesField(Lucene.SOFT_DELETES_FIELD) - .setMergePolicy(new SoftDeletesRetentionMergePolicy(Lucene.SOFT_DELETES_FIELD, MatchAllDocsQuery::new, newMergePolicy())); + .setMergePolicy(new SoftDeletesRetentionMergePolicy(Lucene.SOFT_DELETES_FIELD, MatchAllDocsQuery::new, newMergePolicy())) + // disable merges on refresh as we will verify the deleted documents + .setMaxFullFlushMergeWaitMillis(-1); IndexWriter writer = new IndexWriter(dir, config); int numDocs = between(1, 10); List liveDocs = new ArrayList<>(); From eba522a336157d009cebaa1d1f7cb284acf8a95b Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Thu, 23 Jun 2022 10:09:43 -0400 Subject: [PATCH 4/4] Disable merges on refresh --- .../java/org/elasticsearch/index/engine/InternalEngine.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java b/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java index e3e0dec5cd8a3..7a70b5ae6b8cc 100644 --- a/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java +++ b/server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java @@ -2408,6 +2408,8 @@ private IndexWriterConfig getIndexWriterConfig() { mergePolicy = new ShuffleForcedMergePolicy(mergePolicy); } iwc.setMergePolicy(mergePolicy); + // TODO: Introduce an index setting for setMaxFullFlushMergeWaitMillis + iwc.setMaxFullFlushMergeWaitMillis(-1); iwc.setSimilarity(engineConfig.getSimilarity()); iwc.setRAMBufferSizeMB(engineConfig.getIndexingBufferSize().getMbFrac()); iwc.setCodec(engineConfig.getCodec());