From b1224fca8c74d7008e94ad505a52d5c6731cdebe Mon Sep 17 00:00:00 2001 From: Ignacio Vera Date: Mon, 21 Oct 2019 08:21:09 +0200 Subject: [PATCH] upgrade to Lucene-8.3.0-snapshot-25968e3b75e (#48227) --- buildSrc/version.properties | 2 +- docs/Versions.asciidoc | 4 ++-- .../licenses/lucene-expressions-8.2.0.jar.sha1 | 1 - .../lucene-expressions-8.3.0-snapshot-25968e3b75e.jar.sha1 | 1 + .../licenses/lucene-analyzers-icu-8.2.0.jar.sha1 | 1 - ...ucene-analyzers-icu-8.3.0-snapshot-25968e3b75e.jar.sha1 | 1 + .../licenses/lucene-analyzers-kuromoji-8.2.0.jar.sha1 | 1 - ...-analyzers-kuromoji-8.3.0-snapshot-25968e3b75e.jar.sha1 | 1 + .../licenses/lucene-analyzers-nori-8.2.0.jar.sha1 | 1 - ...cene-analyzers-nori-8.3.0-snapshot-25968e3b75e.jar.sha1 | 1 + .../licenses/lucene-analyzers-phonetic-8.2.0.jar.sha1 | 1 - ...-analyzers-phonetic-8.3.0-snapshot-25968e3b75e.jar.sha1 | 1 + .../licenses/lucene-analyzers-smartcn-8.2.0.jar.sha1 | 1 - ...e-analyzers-smartcn-8.3.0-snapshot-25968e3b75e.jar.sha1 | 1 + .../licenses/lucene-analyzers-stempel-8.2.0.jar.sha1 | 1 - ...e-analyzers-stempel-8.3.0-snapshot-25968e3b75e.jar.sha1 | 1 + .../licenses/lucene-analyzers-morfologik-8.2.0.jar.sha1 | 1 - ...nalyzers-morfologik-8.3.0-snapshot-25968e3b75e.jar.sha1 | 1 + server/licenses/lucene-analyzers-common-8.2.0.jar.sha1 | 1 - ...ne-analyzers-common-8.3.0-snapshot-25968e3b75e.jar.sha1 | 1 + server/licenses/lucene-backward-codecs-8.2.0.jar.sha1 | 1 - ...ene-backward-codecs-8.3.0-snapshot-25968e3b75e.jar.sha1 | 1 + server/licenses/lucene-core-8.2.0.jar.sha1 | 1 - .../lucene-core-8.3.0-snapshot-25968e3b75e.jar.sha1 | 1 + server/licenses/lucene-grouping-8.2.0.jar.sha1 | 1 - .../lucene-grouping-8.3.0-snapshot-25968e3b75e.jar.sha1 | 1 + server/licenses/lucene-highlighter-8.2.0.jar.sha1 | 1 - .../lucene-highlighter-8.3.0-snapshot-25968e3b75e.jar.sha1 | 1 + server/licenses/lucene-join-8.2.0.jar.sha1 | 1 - .../lucene-join-8.3.0-snapshot-25968e3b75e.jar.sha1 | 1 + server/licenses/lucene-memory-8.2.0.jar.sha1 | 1 - .../lucene-memory-8.3.0-snapshot-25968e3b75e.jar.sha1 | 1 + server/licenses/lucene-misc-8.2.0.jar.sha1 | 1 - .../lucene-misc-8.3.0-snapshot-25968e3b75e.jar.sha1 | 1 + server/licenses/lucene-queries-8.2.0.jar.sha1 | 1 - .../lucene-queries-8.3.0-snapshot-25968e3b75e.jar.sha1 | 1 + server/licenses/lucene-queryparser-8.2.0.jar.sha1 | 1 - .../lucene-queryparser-8.3.0-snapshot-25968e3b75e.jar.sha1 | 1 + server/licenses/lucene-sandbox-8.2.0.jar.sha1 | 1 - .../lucene-sandbox-8.3.0-snapshot-25968e3b75e.jar.sha1 | 1 + server/licenses/lucene-spatial-8.2.0.jar.sha1 | 1 - .../lucene-spatial-8.3.0-snapshot-25968e3b75e.jar.sha1 | 1 + server/licenses/lucene-spatial-extras-8.2.0.jar.sha1 | 1 - ...cene-spatial-extras-8.3.0-snapshot-25968e3b75e.jar.sha1 | 1 + server/licenses/lucene-spatial3d-8.2.0.jar.sha1 | 1 - .../lucene-spatial3d-8.3.0-snapshot-25968e3b75e.jar.sha1 | 1 + server/licenses/lucene-suggest-8.2.0.jar.sha1 | 1 - .../lucene-suggest-8.3.0-snapshot-25968e3b75e.jar.sha1 | 1 + server/src/main/java/org/elasticsearch/Version.java | 2 +- .../main/java/org/elasticsearch/search/dfs/DfsPhase.java | 5 ++--- .../search/internal/ContextIndexSearcher.java | 7 +++---- .../elasticsearch/index/mapper/TextFieldMapperTests.java | 1 + .../indices/analysis/AnalysisFactoryTestCase.java | 2 ++ .../sql/sql-action/licenses/lucene-core-8.2.0.jar.sha1 | 1 - .../lucene-core-8.3.0-snapshot-25968e3b75e.jar.sha1 | 1 + 55 files changed, 36 insertions(+), 35 deletions(-) delete mode 100644 modules/lang-expression/licenses/lucene-expressions-8.2.0.jar.sha1 create mode 100644 modules/lang-expression/licenses/lucene-expressions-8.3.0-snapshot-25968e3b75e.jar.sha1 delete mode 100644 plugins/analysis-icu/licenses/lucene-analyzers-icu-8.2.0.jar.sha1 create mode 100644 plugins/analysis-icu/licenses/lucene-analyzers-icu-8.3.0-snapshot-25968e3b75e.jar.sha1 delete mode 100644 plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.2.0.jar.sha1 create mode 100644 plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.3.0-snapshot-25968e3b75e.jar.sha1 delete mode 100644 plugins/analysis-nori/licenses/lucene-analyzers-nori-8.2.0.jar.sha1 create mode 100644 plugins/analysis-nori/licenses/lucene-analyzers-nori-8.3.0-snapshot-25968e3b75e.jar.sha1 delete mode 100644 plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.2.0.jar.sha1 create mode 100644 plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.3.0-snapshot-25968e3b75e.jar.sha1 delete mode 100644 plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.2.0.jar.sha1 create mode 100644 plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.3.0-snapshot-25968e3b75e.jar.sha1 delete mode 100644 plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.2.0.jar.sha1 create mode 100644 plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.3.0-snapshot-25968e3b75e.jar.sha1 delete mode 100644 plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.2.0.jar.sha1 create mode 100644 plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.3.0-snapshot-25968e3b75e.jar.sha1 delete mode 100644 server/licenses/lucene-analyzers-common-8.2.0.jar.sha1 create mode 100644 server/licenses/lucene-analyzers-common-8.3.0-snapshot-25968e3b75e.jar.sha1 delete mode 100644 server/licenses/lucene-backward-codecs-8.2.0.jar.sha1 create mode 100644 server/licenses/lucene-backward-codecs-8.3.0-snapshot-25968e3b75e.jar.sha1 delete mode 100644 server/licenses/lucene-core-8.2.0.jar.sha1 create mode 100644 server/licenses/lucene-core-8.3.0-snapshot-25968e3b75e.jar.sha1 delete mode 100644 server/licenses/lucene-grouping-8.2.0.jar.sha1 create mode 100644 server/licenses/lucene-grouping-8.3.0-snapshot-25968e3b75e.jar.sha1 delete mode 100644 server/licenses/lucene-highlighter-8.2.0.jar.sha1 create mode 100644 server/licenses/lucene-highlighter-8.3.0-snapshot-25968e3b75e.jar.sha1 delete mode 100644 server/licenses/lucene-join-8.2.0.jar.sha1 create mode 100644 server/licenses/lucene-join-8.3.0-snapshot-25968e3b75e.jar.sha1 delete mode 100644 server/licenses/lucene-memory-8.2.0.jar.sha1 create mode 100644 server/licenses/lucene-memory-8.3.0-snapshot-25968e3b75e.jar.sha1 delete mode 100644 server/licenses/lucene-misc-8.2.0.jar.sha1 create mode 100644 server/licenses/lucene-misc-8.3.0-snapshot-25968e3b75e.jar.sha1 delete mode 100644 server/licenses/lucene-queries-8.2.0.jar.sha1 create mode 100644 server/licenses/lucene-queries-8.3.0-snapshot-25968e3b75e.jar.sha1 delete mode 100644 server/licenses/lucene-queryparser-8.2.0.jar.sha1 create mode 100644 server/licenses/lucene-queryparser-8.3.0-snapshot-25968e3b75e.jar.sha1 delete mode 100644 server/licenses/lucene-sandbox-8.2.0.jar.sha1 create mode 100644 server/licenses/lucene-sandbox-8.3.0-snapshot-25968e3b75e.jar.sha1 delete mode 100644 server/licenses/lucene-spatial-8.2.0.jar.sha1 create mode 100644 server/licenses/lucene-spatial-8.3.0-snapshot-25968e3b75e.jar.sha1 delete mode 100644 server/licenses/lucene-spatial-extras-8.2.0.jar.sha1 create mode 100644 server/licenses/lucene-spatial-extras-8.3.0-snapshot-25968e3b75e.jar.sha1 delete mode 100644 server/licenses/lucene-spatial3d-8.2.0.jar.sha1 create mode 100644 server/licenses/lucene-spatial3d-8.3.0-snapshot-25968e3b75e.jar.sha1 delete mode 100644 server/licenses/lucene-suggest-8.2.0.jar.sha1 create mode 100644 server/licenses/lucene-suggest-8.3.0-snapshot-25968e3b75e.jar.sha1 delete mode 100644 x-pack/plugin/sql/sql-action/licenses/lucene-core-8.2.0.jar.sha1 create mode 100644 x-pack/plugin/sql/sql-action/licenses/lucene-core-8.3.0-snapshot-25968e3b75e.jar.sha1 diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 652b72f78d4..5c74d4f1b3f 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -1,5 +1,5 @@ elasticsearch = 7.6.0 -lucene = 8.2.0 +lucene = 8.3.0-snapshot-25968e3b75e bundled_jdk_vendor = adoptopenjdk bundled_jdk = 13+33 diff --git a/docs/Versions.asciidoc b/docs/Versions.asciidoc index 6a1c7eda521..16f7ff654bc 100644 --- a/docs/Versions.asciidoc +++ b/docs/Versions.asciidoc @@ -1,8 +1,8 @@ include::{asciidoc-dir}/../../shared/versions/stack/{source_branch}.asciidoc[] -:lucene_version: 8.2.0 -:lucene_version_path: 8_2_0 +:lucene_version: 8.3.0 +:lucene_version_path: 8_3_0 :jdk: 1.8.0_131 :jdk_major: 8 :build_flavor: default diff --git a/modules/lang-expression/licenses/lucene-expressions-8.2.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.2.0.jar.sha1 deleted file mode 100644 index 6e4047678cf..00000000000 --- a/modules/lang-expression/licenses/lucene-expressions-8.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -afec1e7228eca31b5f469bdcbbc84d04b0748eae \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-expressions-8.3.0-snapshot-25968e3b75e.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.3.0-snapshot-25968e3b75e.jar.sha1 new file mode 100644 index 00000000000..ae94a3f34bd --- /dev/null +++ b/modules/lang-expression/licenses/lucene-expressions-8.3.0-snapshot-25968e3b75e.jar.sha1 @@ -0,0 +1 @@ +738a12e76b5c60f2a714fc3e6611c8ae6dc63159 \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.2.0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.2.0.jar.sha1 deleted file mode 100644 index d733c7da589..00000000000 --- a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -246a593068e012d0deac604cde68734b3e843aa3 \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.3.0-snapshot-25968e3b75e.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.3.0-snapshot-25968e3b75e.jar.sha1 new file mode 100644 index 00000000000..1e1113301af --- /dev/null +++ b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.3.0-snapshot-25968e3b75e.jar.sha1 @@ -0,0 +1 @@ +6313d19a4f40d54ad12e20a66666049f88bac0ff \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.2.0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.2.0.jar.sha1 deleted file mode 100644 index 8be94f834f8..00000000000 --- a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -169e079501f3e0b143c4ea3c953a3cc9aff8758a \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.3.0-snapshot-25968e3b75e.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.3.0-snapshot-25968e3b75e.jar.sha1 new file mode 100644 index 00000000000..8236b15fde1 --- /dev/null +++ b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.3.0-snapshot-25968e3b75e.jar.sha1 @@ -0,0 +1 @@ +a28b8590a4f9ae219241a34382a39fe2f205f2e2 \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.2.0.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.2.0.jar.sha1 deleted file mode 100644 index f6e4c6e0b92..00000000000 --- a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4f0feca14e6ac73b708a9ccd437478260a46bead \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.3.0-snapshot-25968e3b75e.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.3.0-snapshot-25968e3b75e.jar.sha1 new file mode 100644 index 00000000000..4864ae98d09 --- /dev/null +++ b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.3.0-snapshot-25968e3b75e.jar.sha1 @@ -0,0 +1 @@ +c088334a34e477b122d8fa8623fb3b8f6a0a46e4 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.2.0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.2.0.jar.sha1 deleted file mode 100644 index 0699472550d..00000000000 --- a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a87df79bb727bbe355dbcf367e4489fc1010343f \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.3.0-snapshot-25968e3b75e.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.3.0-snapshot-25968e3b75e.jar.sha1 new file mode 100644 index 00000000000..3554da79760 --- /dev/null +++ b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.3.0-snapshot-25968e3b75e.jar.sha1 @@ -0,0 +1 @@ +c36d794f4f1758e6e7fab457c3a6d41b45690484 \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.2.0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.2.0.jar.sha1 deleted file mode 100644 index eb0fc640980..00000000000 --- a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cb93b65fb1ddd218142ebc50857c56a61b3b578b \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.3.0-snapshot-25968e3b75e.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.3.0-snapshot-25968e3b75e.jar.sha1 new file mode 100644 index 00000000000..9264c024639 --- /dev/null +++ b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.3.0-snapshot-25968e3b75e.jar.sha1 @@ -0,0 +1 @@ +8707a4fae440930f198a05083435466b605aa42f \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.2.0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.2.0.jar.sha1 deleted file mode 100644 index 13fcb479542..00000000000 --- a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6db9b08863134ef1c080f30376693a55de3a372b \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.3.0-snapshot-25968e3b75e.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.3.0-snapshot-25968e3b75e.jar.sha1 new file mode 100644 index 00000000000..66ee8dd6f63 --- /dev/null +++ b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.3.0-snapshot-25968e3b75e.jar.sha1 @@ -0,0 +1 @@ +49f9c34735dfc9bfc182ca56a7271350d1944040 \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.2.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.2.0.jar.sha1 deleted file mode 100644 index 4afbba111c5..00000000000 --- a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b89c9f985cdcf3f563d6e66057b2fd6e22e75f77 \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.3.0-snapshot-25968e3b75e.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.3.0-snapshot-25968e3b75e.jar.sha1 new file mode 100644 index 00000000000..dc8902e6d15 --- /dev/null +++ b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.3.0-snapshot-25968e3b75e.jar.sha1 @@ -0,0 +1 @@ +f1e4bb9faba619705f0b5753db65ce51f2156712 \ No newline at end of file diff --git a/server/licenses/lucene-analyzers-common-8.2.0.jar.sha1 b/server/licenses/lucene-analyzers-common-8.2.0.jar.sha1 deleted file mode 100644 index e99f6769fb0..00000000000 --- a/server/licenses/lucene-analyzers-common-8.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8e8abc90572ed74b110c75b546c675153aecc570 \ No newline at end of file diff --git a/server/licenses/lucene-analyzers-common-8.3.0-snapshot-25968e3b75e.jar.sha1 b/server/licenses/lucene-analyzers-common-8.3.0-snapshot-25968e3b75e.jar.sha1 new file mode 100644 index 00000000000..c69a768b513 --- /dev/null +++ b/server/licenses/lucene-analyzers-common-8.3.0-snapshot-25968e3b75e.jar.sha1 @@ -0,0 +1 @@ +9ceeaa74e15fd21435331bd5be3176f61972cdc2 \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-8.2.0.jar.sha1 b/server/licenses/lucene-backward-codecs-8.2.0.jar.sha1 deleted file mode 100644 index 279c896a670..00000000000 --- a/server/licenses/lucene-backward-codecs-8.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -91397b1e0dab4a66e9e58a82ab1690f0383aaced \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-8.3.0-snapshot-25968e3b75e.jar.sha1 b/server/licenses/lucene-backward-codecs-8.3.0-snapshot-25968e3b75e.jar.sha1 new file mode 100644 index 00000000000..738b3cdf975 --- /dev/null +++ b/server/licenses/lucene-backward-codecs-8.3.0-snapshot-25968e3b75e.jar.sha1 @@ -0,0 +1 @@ +43eaefd258e3cc9b1261679f18421d264d8f40a1 \ No newline at end of file diff --git a/server/licenses/lucene-core-8.2.0.jar.sha1 b/server/licenses/lucene-core-8.2.0.jar.sha1 deleted file mode 100644 index 538ece10823..00000000000 --- a/server/licenses/lucene-core-8.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f6da40436d3633de272810fae1e339c237adfcf6 \ No newline at end of file diff --git a/server/licenses/lucene-core-8.3.0-snapshot-25968e3b75e.jar.sha1 b/server/licenses/lucene-core-8.3.0-snapshot-25968e3b75e.jar.sha1 new file mode 100644 index 00000000000..ec00b55a480 --- /dev/null +++ b/server/licenses/lucene-core-8.3.0-snapshot-25968e3b75e.jar.sha1 @@ -0,0 +1 @@ +d84d93bf46fb105864fa5d54c08fd63ca2650d56 \ No newline at end of file diff --git a/server/licenses/lucene-grouping-8.2.0.jar.sha1 b/server/licenses/lucene-grouping-8.2.0.jar.sha1 deleted file mode 100644 index 7054df97d2b..00000000000 --- a/server/licenses/lucene-grouping-8.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a457b6ae0b02a02c9fc7061a19289601554c320a \ No newline at end of file diff --git a/server/licenses/lucene-grouping-8.3.0-snapshot-25968e3b75e.jar.sha1 b/server/licenses/lucene-grouping-8.3.0-snapshot-25968e3b75e.jar.sha1 new file mode 100644 index 00000000000..7981a4a98fd --- /dev/null +++ b/server/licenses/lucene-grouping-8.3.0-snapshot-25968e3b75e.jar.sha1 @@ -0,0 +1 @@ +aa4a4b7b27591003e290a2eb02b61cfc52147b4c \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-8.2.0.jar.sha1 b/server/licenses/lucene-highlighter-8.2.0.jar.sha1 deleted file mode 100644 index ac3b578156c..00000000000 --- a/server/licenses/lucene-highlighter-8.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -21bdc9d7e134c9e8bb2bab7a5c32f5ff08b345ec \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-8.3.0-snapshot-25968e3b75e.jar.sha1 b/server/licenses/lucene-highlighter-8.3.0-snapshot-25968e3b75e.jar.sha1 new file mode 100644 index 00000000000..731960a90ab --- /dev/null +++ b/server/licenses/lucene-highlighter-8.3.0-snapshot-25968e3b75e.jar.sha1 @@ -0,0 +1 @@ +7a4f796d2f8617d805f9f84623e7497085dda0d4 \ No newline at end of file diff --git a/server/licenses/lucene-join-8.2.0.jar.sha1 b/server/licenses/lucene-join-8.2.0.jar.sha1 deleted file mode 100644 index cfd2ded2e91..00000000000 --- a/server/licenses/lucene-join-8.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6e1f359cb49868ec2482cb1af7f32b19ac70fcf3 \ No newline at end of file diff --git a/server/licenses/lucene-join-8.3.0-snapshot-25968e3b75e.jar.sha1 b/server/licenses/lucene-join-8.3.0-snapshot-25968e3b75e.jar.sha1 new file mode 100644 index 00000000000..ba001c04bb4 --- /dev/null +++ b/server/licenses/lucene-join-8.3.0-snapshot-25968e3b75e.jar.sha1 @@ -0,0 +1 @@ +ffd05f24dd7749b08809dfc2ad3a93c0845c5f84 \ No newline at end of file diff --git a/server/licenses/lucene-memory-8.2.0.jar.sha1 b/server/licenses/lucene-memory-8.2.0.jar.sha1 deleted file mode 100644 index 5feab9e898c..00000000000 --- a/server/licenses/lucene-memory-8.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -719c1c86f525d58a717eb6338552cd3aaa19d56c \ No newline at end of file diff --git a/server/licenses/lucene-memory-8.3.0-snapshot-25968e3b75e.jar.sha1 b/server/licenses/lucene-memory-8.3.0-snapshot-25968e3b75e.jar.sha1 new file mode 100644 index 00000000000..0f9204010e3 --- /dev/null +++ b/server/licenses/lucene-memory-8.3.0-snapshot-25968e3b75e.jar.sha1 @@ -0,0 +1 @@ +fb576d36ebf966c48fb58765c6bd7b6e5320cbd6 \ No newline at end of file diff --git a/server/licenses/lucene-misc-8.2.0.jar.sha1 b/server/licenses/lucene-misc-8.2.0.jar.sha1 deleted file mode 100644 index 88c672cbed4..00000000000 --- a/server/licenses/lucene-misc-8.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -539c353c1861df0ace480978429f48a4bccd29c4 \ No newline at end of file diff --git a/server/licenses/lucene-misc-8.3.0-snapshot-25968e3b75e.jar.sha1 b/server/licenses/lucene-misc-8.3.0-snapshot-25968e3b75e.jar.sha1 new file mode 100644 index 00000000000..5a3b6719e4a --- /dev/null +++ b/server/licenses/lucene-misc-8.3.0-snapshot-25968e3b75e.jar.sha1 @@ -0,0 +1 @@ +b052ad9ac2ad9d81d1b80e48ec47985644d36f3f \ No newline at end of file diff --git a/server/licenses/lucene-queries-8.2.0.jar.sha1 b/server/licenses/lucene-queries-8.2.0.jar.sha1 deleted file mode 100644 index 2e3e0ddd3e9..00000000000 --- a/server/licenses/lucene-queries-8.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5da383678cb0a35a07ccb03487ba00cf184d1d71 \ No newline at end of file diff --git a/server/licenses/lucene-queries-8.3.0-snapshot-25968e3b75e.jar.sha1 b/server/licenses/lucene-queries-8.3.0-snapshot-25968e3b75e.jar.sha1 new file mode 100644 index 00000000000..1ae72bdc1fc --- /dev/null +++ b/server/licenses/lucene-queries-8.3.0-snapshot-25968e3b75e.jar.sha1 @@ -0,0 +1 @@ +8edf59c2cd920a1cd926573620b8b0f82fe03f2a \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-8.2.0.jar.sha1 b/server/licenses/lucene-queryparser-8.2.0.jar.sha1 deleted file mode 100644 index 35fd1c4fa59..00000000000 --- a/server/licenses/lucene-queryparser-8.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8925df7b104e78e308e236ff0740a064dd93cadd \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-8.3.0-snapshot-25968e3b75e.jar.sha1 b/server/licenses/lucene-queryparser-8.3.0-snapshot-25968e3b75e.jar.sha1 new file mode 100644 index 00000000000..911dd7ed37b --- /dev/null +++ b/server/licenses/lucene-queryparser-8.3.0-snapshot-25968e3b75e.jar.sha1 @@ -0,0 +1 @@ +d070d33ddf37bf45a0656dec980a69ac930c8218 \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-8.2.0.jar.sha1 b/server/licenses/lucene-sandbox-8.2.0.jar.sha1 deleted file mode 100644 index 73bc68f4796..00000000000 --- a/server/licenses/lucene-sandbox-8.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f50931f1db40cdcc31e5044439d4e5522a23f6c1 \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-8.3.0-snapshot-25968e3b75e.jar.sha1 b/server/licenses/lucene-sandbox-8.3.0-snapshot-25968e3b75e.jar.sha1 new file mode 100644 index 00000000000..06bcd6e821d --- /dev/null +++ b/server/licenses/lucene-sandbox-8.3.0-snapshot-25968e3b75e.jar.sha1 @@ -0,0 +1 @@ +5ea387ae19df210c5b6e75eb38bf589dc39e54f4 \ No newline at end of file diff --git a/server/licenses/lucene-spatial-8.2.0.jar.sha1 b/server/licenses/lucene-spatial-8.2.0.jar.sha1 deleted file mode 100644 index f475db434c2..00000000000 --- a/server/licenses/lucene-spatial-8.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8a9edbc075ae5fd6ee2265f0bb6d5847e78c8a96 \ No newline at end of file diff --git a/server/licenses/lucene-spatial-8.3.0-snapshot-25968e3b75e.jar.sha1 b/server/licenses/lucene-spatial-8.3.0-snapshot-25968e3b75e.jar.sha1 new file mode 100644 index 00000000000..b764a6f6488 --- /dev/null +++ b/server/licenses/lucene-spatial-8.3.0-snapshot-25968e3b75e.jar.sha1 @@ -0,0 +1 @@ +395ddd7e7774ad9027269222d746d30651ab8cf3 \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-8.2.0.jar.sha1 b/server/licenses/lucene-spatial-extras-8.2.0.jar.sha1 deleted file mode 100644 index 994a4328c50..00000000000 --- a/server/licenses/lucene-spatial-extras-8.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1335a4a876a82dbbb79df8172133df66de06689f \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-8.3.0-snapshot-25968e3b75e.jar.sha1 b/server/licenses/lucene-spatial-extras-8.3.0-snapshot-25968e3b75e.jar.sha1 new file mode 100644 index 00000000000..0c2d20e8224 --- /dev/null +++ b/server/licenses/lucene-spatial-extras-8.3.0-snapshot-25968e3b75e.jar.sha1 @@ -0,0 +1 @@ +85da517bdc0b200b040c0293eea0ff6f36082e31 \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-8.2.0.jar.sha1 b/server/licenses/lucene-spatial3d-8.2.0.jar.sha1 deleted file mode 100644 index e659f46f858..00000000000 --- a/server/licenses/lucene-spatial3d-8.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0bc0ee3f2d70cf66dc79a781b9edd6311f1f6a49 \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-8.3.0-snapshot-25968e3b75e.jar.sha1 b/server/licenses/lucene-spatial3d-8.3.0-snapshot-25968e3b75e.jar.sha1 new file mode 100644 index 00000000000..bdbba1f81f9 --- /dev/null +++ b/server/licenses/lucene-spatial3d-8.3.0-snapshot-25968e3b75e.jar.sha1 @@ -0,0 +1 @@ +ccf4b384c0051d9bd1df73a0a5f62c7064039db6 \ No newline at end of file diff --git a/server/licenses/lucene-suggest-8.2.0.jar.sha1 b/server/licenses/lucene-suggest-8.2.0.jar.sha1 deleted file mode 100644 index 9dd04618a7d..00000000000 --- a/server/licenses/lucene-suggest-8.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -334d627bda935dfb34e8e1c78d8f5a28b4be325a \ No newline at end of file diff --git a/server/licenses/lucene-suggest-8.3.0-snapshot-25968e3b75e.jar.sha1 b/server/licenses/lucene-suggest-8.3.0-snapshot-25968e3b75e.jar.sha1 new file mode 100644 index 00000000000..6e26830f99f --- /dev/null +++ b/server/licenses/lucene-suggest-8.3.0-snapshot-25968e3b75e.jar.sha1 @@ -0,0 +1 @@ +9bf83a2a79cf6c392961c06b3afaa3d3871274da \ 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 d4860af9c17..b276289c1b2 100644 --- a/server/src/main/java/org/elasticsearch/Version.java +++ b/server/src/main/java/org/elasticsearch/Version.java @@ -121,7 +121,7 @@ public class Version implements Comparable, ToXContentFragment { public static final Version V_7_4_0 = new Version(7040099, org.apache.lucene.util.Version.LUCENE_8_2_0); public static final Version V_7_4_1 = new Version(7040199, org.apache.lucene.util.Version.LUCENE_8_2_0); public static final Version V_7_5_0 = new Version(7050099, org.apache.lucene.util.Version.LUCENE_8_2_0); - public static final Version V_7_6_0 = new Version(7060099, org.apache.lucene.util.Version.LUCENE_8_2_0); + public static final Version V_7_6_0 = new Version(7060099, org.apache.lucene.util.Version.LUCENE_8_3_0); public static final Version CURRENT = V_7_6_0; private static final ImmutableOpenIntMap idToVersion; diff --git a/server/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java b/server/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java index 35df8e322ad..d5ad0e8aa65 100644 --- a/server/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java +++ b/server/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java @@ -21,7 +21,6 @@ package org.elasticsearch.search.dfs; import com.carrotsearch.hppc.ObjectObjectHashMap; import org.apache.lucene.index.Term; -import org.apache.lucene.index.TermStates; import org.apache.lucene.search.CollectionStatistics; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; @@ -54,11 +53,11 @@ public class DfsPhase implements SearchPhase { Map stats = new HashMap<>(); IndexSearcher searcher = new IndexSearcher(context.searcher().getIndexReader()) { @Override - public TermStatistics termStatistics(Term term, TermStates states) throws IOException { + public TermStatistics termStatistics(Term term, int docFreq, long totalTermFreq) throws IOException { if (context.isCancelled()) { throw new TaskCancelledException("cancelled"); } - TermStatistics ts = super.termStatistics(term, states); + TermStatistics ts = super.termStatistics(term, docFreq, totalTermFreq); if (ts != null) { stats.put(term, ts); } 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 81343ef730a..e2b8e8ab7af 100644 --- a/server/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java +++ b/server/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java @@ -23,7 +23,6 @@ import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.Term; -import org.apache.lucene.index.TermStates; import org.apache.lucene.search.BulkScorer; import org.apache.lucene.search.CollectionStatistics; import org.apache.lucene.search.CollectionTerminatedException; @@ -244,15 +243,15 @@ public class ContextIndexSearcher extends IndexSearcher { } @Override - public TermStatistics termStatistics(Term term, TermStates context) throws IOException { + public TermStatistics termStatistics(Term term, int docFreq, long totalTermFreq) throws IOException { if (aggregatedDfs == null) { // we are either executing the dfs phase or the search_type doesn't include the dfs phase. - return super.termStatistics(term, context); + return super.termStatistics(term, docFreq, totalTermFreq); } TermStatistics termStatistics = aggregatedDfs.termStatistics().get(term); if (termStatistics == null) { // we don't have stats for this - this might be a must_not clauses etc. that doesn't allow extract terms on the query - return super.termStatistics(term, context); + return super.termStatistics(term, docFreq, totalTermFreq); } return termStatistics; } diff --git a/server/src/test/java/org/elasticsearch/index/mapper/TextFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/TextFieldMapperTests.java index 57895e45d63..6fc8d42647f 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/TextFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/TextFieldMapperTests.java @@ -784,6 +784,7 @@ public class TextFieldMapperTests extends ESSingleNodeTestCase { } } + @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/47777") public void testFastPhraseMapping() throws IOException { QueryShardContext queryShardContext = indexService.newQueryShardContext( diff --git a/test/framework/src/main/java/org/elasticsearch/indices/analysis/AnalysisFactoryTestCase.java b/test/framework/src/main/java/org/elasticsearch/indices/analysis/AnalysisFactoryTestCase.java index 368e99f3d58..79edf17e2a7 100644 --- a/test/framework/src/main/java/org/elasticsearch/indices/analysis/AnalysisFactoryTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/indices/analysis/AnalysisFactoryTestCase.java @@ -192,6 +192,8 @@ public abstract class AnalysisFactoryTestCase extends ESTestCase { .put("protectedterm", Void.class) // LUCENE-8332 .put("concatenategraph", Void.class) + // LUCENE-8936 + .put("spanishminimalstem", Void.class) .immutableMap(); diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.2.0.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.2.0.jar.sha1 deleted file mode 100644 index 538ece10823..00000000000 --- a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f6da40436d3633de272810fae1e339c237adfcf6 \ No newline at end of file diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.3.0-snapshot-25968e3b75e.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.3.0-snapshot-25968e3b75e.jar.sha1 new file mode 100644 index 00000000000..ec00b55a480 --- /dev/null +++ b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.3.0-snapshot-25968e3b75e.jar.sha1 @@ -0,0 +1 @@ +d84d93bf46fb105864fa5d54c08fd63ca2650d56 \ No newline at end of file