From e6755afeebf1ba8286154af23f1f7a59b6a5d0c9 Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Sat, 29 Feb 2020 09:29:16 -0500 Subject: [PATCH] Upgrade to Lucene 8.5.0-snapshot-c4475920b08 (#52950) (#52977) To give LUCENE-9228 more CI cycles --- buildSrc/version.properties | 2 +- ...xpressions-8.5.0-snapshot-b01d7cb.jar.sha1 | 1 - ...ssions-8.5.0-snapshot-c4475920b08.jar.sha1 | 1 + ...lyzers-icu-8.5.0-snapshot-b01d7cb.jar.sha1 | 1 - ...rs-icu-8.5.0-snapshot-c4475920b08.jar.sha1 | 1 + ...s-kuromoji-8.5.0-snapshot-b01d7cb.jar.sha1 | 1 - ...romoji-8.5.0-snapshot-c4475920b08.jar.sha1 | 1 + ...yzers-nori-8.5.0-snapshot-b01d7cb.jar.sha1 | 1 - ...s-nori-8.5.0-snapshot-c4475920b08.jar.sha1 | 1 + ...s-phonetic-8.5.0-snapshot-b01d7cb.jar.sha1 | 1 - ...onetic-8.5.0-snapshot-c4475920b08.jar.sha1 | 1 + ...rs-smartcn-8.5.0-snapshot-b01d7cb.jar.sha1 | 1 - ...martcn-8.5.0-snapshot-c4475920b08.jar.sha1 | 1 + ...rs-stempel-8.5.0-snapshot-b01d7cb.jar.sha1 | 1 - ...tempel-8.5.0-snapshot-c4475920b08.jar.sha1 | 1 + ...morfologik-8.5.0-snapshot-b01d7cb.jar.sha1 | 1 - ...ologik-8.5.0-snapshot-c4475920b08.jar.sha1 | 1 + ...ers-common-8.5.0-snapshot-b01d7cb.jar.sha1 | 1 - ...common-8.5.0-snapshot-c4475920b08.jar.sha1 | 1 + ...ard-codecs-8.5.0-snapshot-b01d7cb.jar.sha1 | 1 - ...codecs-8.5.0-snapshot-c4475920b08.jar.sha1 | 1 + ...ucene-core-8.5.0-snapshot-b01d7cb.jar.sha1 | 1 - ...e-core-8.5.0-snapshot-c4475920b08.jar.sha1 | 1 + ...e-grouping-8.5.0-snapshot-b01d7cb.jar.sha1 | 1 - ...ouping-8.5.0-snapshot-c4475920b08.jar.sha1 | 1 + ...ighlighter-8.5.0-snapshot-b01d7cb.jar.sha1 | 1 - ...ighter-8.5.0-snapshot-c4475920b08.jar.sha1 | 1 + ...ucene-join-8.5.0-snapshot-b01d7cb.jar.sha1 | 1 - ...e-join-8.5.0-snapshot-c4475920b08.jar.sha1 | 1 + ...ene-memory-8.5.0-snapshot-b01d7cb.jar.sha1 | 1 - ...memory-8.5.0-snapshot-c4475920b08.jar.sha1 | 1 + ...ucene-misc-8.5.0-snapshot-b01d7cb.jar.sha1 | 1 - ...e-misc-8.5.0-snapshot-c4475920b08.jar.sha1 | 1 + ...ne-queries-8.5.0-snapshot-b01d7cb.jar.sha1 | 1 - ...ueries-8.5.0-snapshot-c4475920b08.jar.sha1 | 1 + ...ueryparser-8.5.0-snapshot-b01d7cb.jar.sha1 | 1 - ...parser-8.5.0-snapshot-c4475920b08.jar.sha1 | 1 + ...ne-sandbox-8.5.0-snapshot-b01d7cb.jar.sha1 | 1 - ...andbox-8.5.0-snapshot-c4475920b08.jar.sha1 | 1 + ...ial-extras-8.5.0-snapshot-b01d7cb.jar.sha1 | 1 - ...extras-8.5.0-snapshot-c4475920b08.jar.sha1 | 1 + ...-spatial3d-8.5.0-snapshot-b01d7cb.jar.sha1 | 1 - ...tial3d-8.5.0-snapshot-c4475920b08.jar.sha1 | 1 + ...ne-suggest-8.5.0-snapshot-b01d7cb.jar.sha1 | 1 - ...uggest-8.5.0-snapshot-c4475920b08.jar.sha1 | 1 + .../index/search/MatchQuery.java | 23 +++++++++++++------ .../index/search/MultiMatchQuery.java | 6 ++--- .../index/search/QueryStringQueryParser.java | 3 ++- .../search/SimpleQueryStringQueryParser.java | 5 ++-- .../analysis/AnalysisFactoryTestCase.java | 2 +- ...ucene-core-8.5.0-snapshot-b01d7cb.jar.sha1 | 1 - ...e-core-8.5.0-snapshot-c4475920b08.jar.sha1 | 1 + 52 files changed, 49 insertions(+), 38 deletions(-) delete mode 100644 modules/lang-expression/licenses/lucene-expressions-8.5.0-snapshot-b01d7cb.jar.sha1 create mode 100644 modules/lang-expression/licenses/lucene-expressions-8.5.0-snapshot-c4475920b08.jar.sha1 delete mode 100644 plugins/analysis-icu/licenses/lucene-analyzers-icu-8.5.0-snapshot-b01d7cb.jar.sha1 create mode 100644 plugins/analysis-icu/licenses/lucene-analyzers-icu-8.5.0-snapshot-c4475920b08.jar.sha1 delete mode 100644 plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.5.0-snapshot-b01d7cb.jar.sha1 create mode 100644 plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.5.0-snapshot-c4475920b08.jar.sha1 delete mode 100644 plugins/analysis-nori/licenses/lucene-analyzers-nori-8.5.0-snapshot-b01d7cb.jar.sha1 create mode 100644 plugins/analysis-nori/licenses/lucene-analyzers-nori-8.5.0-snapshot-c4475920b08.jar.sha1 delete mode 100644 plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.5.0-snapshot-b01d7cb.jar.sha1 create mode 100644 plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.5.0-snapshot-c4475920b08.jar.sha1 delete mode 100644 plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.5.0-snapshot-b01d7cb.jar.sha1 create mode 100644 plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.5.0-snapshot-c4475920b08.jar.sha1 delete mode 100644 plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.5.0-snapshot-b01d7cb.jar.sha1 create mode 100644 plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.5.0-snapshot-c4475920b08.jar.sha1 delete mode 100644 plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.5.0-snapshot-b01d7cb.jar.sha1 create mode 100644 plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.5.0-snapshot-c4475920b08.jar.sha1 delete mode 100644 server/licenses/lucene-analyzers-common-8.5.0-snapshot-b01d7cb.jar.sha1 create mode 100644 server/licenses/lucene-analyzers-common-8.5.0-snapshot-c4475920b08.jar.sha1 delete mode 100644 server/licenses/lucene-backward-codecs-8.5.0-snapshot-b01d7cb.jar.sha1 create mode 100644 server/licenses/lucene-backward-codecs-8.5.0-snapshot-c4475920b08.jar.sha1 delete mode 100644 server/licenses/lucene-core-8.5.0-snapshot-b01d7cb.jar.sha1 create mode 100644 server/licenses/lucene-core-8.5.0-snapshot-c4475920b08.jar.sha1 delete mode 100644 server/licenses/lucene-grouping-8.5.0-snapshot-b01d7cb.jar.sha1 create mode 100644 server/licenses/lucene-grouping-8.5.0-snapshot-c4475920b08.jar.sha1 delete mode 100644 server/licenses/lucene-highlighter-8.5.0-snapshot-b01d7cb.jar.sha1 create mode 100644 server/licenses/lucene-highlighter-8.5.0-snapshot-c4475920b08.jar.sha1 delete mode 100644 server/licenses/lucene-join-8.5.0-snapshot-b01d7cb.jar.sha1 create mode 100644 server/licenses/lucene-join-8.5.0-snapshot-c4475920b08.jar.sha1 delete mode 100644 server/licenses/lucene-memory-8.5.0-snapshot-b01d7cb.jar.sha1 create mode 100644 server/licenses/lucene-memory-8.5.0-snapshot-c4475920b08.jar.sha1 delete mode 100644 server/licenses/lucene-misc-8.5.0-snapshot-b01d7cb.jar.sha1 create mode 100644 server/licenses/lucene-misc-8.5.0-snapshot-c4475920b08.jar.sha1 delete mode 100644 server/licenses/lucene-queries-8.5.0-snapshot-b01d7cb.jar.sha1 create mode 100644 server/licenses/lucene-queries-8.5.0-snapshot-c4475920b08.jar.sha1 delete mode 100644 server/licenses/lucene-queryparser-8.5.0-snapshot-b01d7cb.jar.sha1 create mode 100644 server/licenses/lucene-queryparser-8.5.0-snapshot-c4475920b08.jar.sha1 delete mode 100644 server/licenses/lucene-sandbox-8.5.0-snapshot-b01d7cb.jar.sha1 create mode 100644 server/licenses/lucene-sandbox-8.5.0-snapshot-c4475920b08.jar.sha1 delete mode 100644 server/licenses/lucene-spatial-extras-8.5.0-snapshot-b01d7cb.jar.sha1 create mode 100644 server/licenses/lucene-spatial-extras-8.5.0-snapshot-c4475920b08.jar.sha1 delete mode 100644 server/licenses/lucene-spatial3d-8.5.0-snapshot-b01d7cb.jar.sha1 create mode 100644 server/licenses/lucene-spatial3d-8.5.0-snapshot-c4475920b08.jar.sha1 delete mode 100644 server/licenses/lucene-suggest-8.5.0-snapshot-b01d7cb.jar.sha1 create mode 100644 server/licenses/lucene-suggest-8.5.0-snapshot-c4475920b08.jar.sha1 delete mode 100644 x-pack/plugin/sql/sql-action/licenses/lucene-core-8.5.0-snapshot-b01d7cb.jar.sha1 create mode 100644 x-pack/plugin/sql/sql-action/licenses/lucene-core-8.5.0-snapshot-c4475920b08.jar.sha1 diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 3b775d175a1..9b6bcb0db3b 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -1,5 +1,5 @@ elasticsearch = 7.7.0 -lucene = 8.5.0-snapshot-b01d7cb +lucene = 8.5.0-snapshot-c4475920b08 bundled_jdk_vendor = adoptopenjdk bundled_jdk = 13.0.2+8 diff --git a/modules/lang-expression/licenses/lucene-expressions-8.5.0-snapshot-b01d7cb.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.5.0-snapshot-b01d7cb.jar.sha1 deleted file mode 100644 index e0064436f66..00000000000 --- a/modules/lang-expression/licenses/lucene-expressions-8.5.0-snapshot-b01d7cb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b3d969d1d63fe9500fe5308b1a0c60d84d7bfa92 \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-expressions-8.5.0-snapshot-c4475920b08.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.5.0-snapshot-c4475920b08.jar.sha1 new file mode 100644 index 00000000000..d892076210e --- /dev/null +++ b/modules/lang-expression/licenses/lucene-expressions-8.5.0-snapshot-c4475920b08.jar.sha1 @@ -0,0 +1 @@ +48cb44f1dc8d3368d70581ffdbeab98ac5f5167f \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.5.0-snapshot-b01d7cb.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.5.0-snapshot-b01d7cb.jar.sha1 deleted file mode 100644 index 161fd4271c8..00000000000 --- a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.5.0-snapshot-b01d7cb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d81b8f0ecdc67ba74049e65702582fcb8b605cfd \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.5.0-snapshot-c4475920b08.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.5.0-snapshot-c4475920b08.jar.sha1 new file mode 100644 index 00000000000..d90402c25e4 --- /dev/null +++ b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.5.0-snapshot-c4475920b08.jar.sha1 @@ -0,0 +1 @@ +0748be5811dfe6725847d2e87890a990c58cc3de \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.5.0-snapshot-b01d7cb.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.5.0-snapshot-b01d7cb.jar.sha1 deleted file mode 100644 index 6d5372aea0d..00000000000 --- a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.5.0-snapshot-b01d7cb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -13e9fd71cb3992b148728fe4884b7a6d0e26ee78 \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.5.0-snapshot-c4475920b08.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.5.0-snapshot-c4475920b08.jar.sha1 new file mode 100644 index 00000000000..a5003b5fb51 --- /dev/null +++ b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.5.0-snapshot-c4475920b08.jar.sha1 @@ -0,0 +1 @@ +f693cd60ad8ca9b7d3082f7b9ee6054b9c819b48 \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.5.0-snapshot-b01d7cb.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.5.0-snapshot-b01d7cb.jar.sha1 deleted file mode 100644 index 24d610869a7..00000000000 --- a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.5.0-snapshot-b01d7cb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -58638e06cd1221b1d4de01705882922936ad69c9 \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.5.0-snapshot-c4475920b08.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.5.0-snapshot-c4475920b08.jar.sha1 new file mode 100644 index 00000000000..d82cbaef39b --- /dev/null +++ b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.5.0-snapshot-c4475920b08.jar.sha1 @@ -0,0 +1 @@ +72c34e18af81ee1d18e9927fb95690fe056cbd4f \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.5.0-snapshot-b01d7cb.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.5.0-snapshot-b01d7cb.jar.sha1 deleted file mode 100644 index 6a7a5344197..00000000000 --- a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.5.0-snapshot-b01d7cb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -346c87ed2ef2c6af49a434c568635a50cce64f2e \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.5.0-snapshot-c4475920b08.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.5.0-snapshot-c4475920b08.jar.sha1 new file mode 100644 index 00000000000..2b08ae87a25 --- /dev/null +++ b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.5.0-snapshot-c4475920b08.jar.sha1 @@ -0,0 +1 @@ +655438348dcad9a98b5affa76caa3d67aa4bee51 \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.5.0-snapshot-b01d7cb.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.5.0-snapshot-b01d7cb.jar.sha1 deleted file mode 100644 index f2870ea2838..00000000000 --- a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.5.0-snapshot-b01d7cb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -82ab2570c88053439912c5de5ed81cbe4337e450 \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.5.0-snapshot-c4475920b08.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.5.0-snapshot-c4475920b08.jar.sha1 new file mode 100644 index 00000000000..9a051c8320a --- /dev/null +++ b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.5.0-snapshot-c4475920b08.jar.sha1 @@ -0,0 +1 @@ +b99147dad649fce0b0423e41f90c79e0f2fba2b7 \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.5.0-snapshot-b01d7cb.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.5.0-snapshot-b01d7cb.jar.sha1 deleted file mode 100644 index c090ef531a1..00000000000 --- a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.5.0-snapshot-b01d7cb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ef0703ff5dc1b704ea3e58596b91e4b08c326d4c \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.5.0-snapshot-c4475920b08.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.5.0-snapshot-c4475920b08.jar.sha1 new file mode 100644 index 00000000000..92d6378f04c --- /dev/null +++ b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.5.0-snapshot-c4475920b08.jar.sha1 @@ -0,0 +1 @@ +00ce3e23cf7aba8c1b3e777de92fd31ec1d4d814 \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.5.0-snapshot-b01d7cb.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.5.0-snapshot-b01d7cb.jar.sha1 deleted file mode 100644 index e65f6726aad..00000000000 --- a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.5.0-snapshot-b01d7cb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9cf8ce62436a3768e18c431cf3be43f5e2672b24 \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.5.0-snapshot-c4475920b08.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.5.0-snapshot-c4475920b08.jar.sha1 new file mode 100644 index 00000000000..427fa3cc390 --- /dev/null +++ b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.5.0-snapshot-c4475920b08.jar.sha1 @@ -0,0 +1 @@ +2b03f79d61517d8e6a8744dbd89e61ad661f6a62 \ No newline at end of file diff --git a/server/licenses/lucene-analyzers-common-8.5.0-snapshot-b01d7cb.jar.sha1 b/server/licenses/lucene-analyzers-common-8.5.0-snapshot-b01d7cb.jar.sha1 deleted file mode 100644 index 99013a49337..00000000000 --- a/server/licenses/lucene-analyzers-common-8.5.0-snapshot-b01d7cb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4d358d392a9825c1502499d0a649730208f03777 \ No newline at end of file diff --git a/server/licenses/lucene-analyzers-common-8.5.0-snapshot-c4475920b08.jar.sha1 b/server/licenses/lucene-analyzers-common-8.5.0-snapshot-c4475920b08.jar.sha1 new file mode 100644 index 00000000000..54cf1bac15e --- /dev/null +++ b/server/licenses/lucene-analyzers-common-8.5.0-snapshot-c4475920b08.jar.sha1 @@ -0,0 +1 @@ +1963afb27f340df8fc304d377971424832f4ce1a \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-8.5.0-snapshot-b01d7cb.jar.sha1 b/server/licenses/lucene-backward-codecs-8.5.0-snapshot-b01d7cb.jar.sha1 deleted file mode 100644 index dab7b857d30..00000000000 --- a/server/licenses/lucene-backward-codecs-8.5.0-snapshot-b01d7cb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -17a0b6597c5bbe6cc2fc6d46003cdf9bc937c593 \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-8.5.0-snapshot-c4475920b08.jar.sha1 b/server/licenses/lucene-backward-codecs-8.5.0-snapshot-c4475920b08.jar.sha1 new file mode 100644 index 00000000000..3297020fb5c --- /dev/null +++ b/server/licenses/lucene-backward-codecs-8.5.0-snapshot-c4475920b08.jar.sha1 @@ -0,0 +1 @@ +fdff4122e8b8a2dbbc9de24be6963e7d7e33b794 \ No newline at end of file diff --git a/server/licenses/lucene-core-8.5.0-snapshot-b01d7cb.jar.sha1 b/server/licenses/lucene-core-8.5.0-snapshot-b01d7cb.jar.sha1 deleted file mode 100644 index 06a1050ba8e..00000000000 --- a/server/licenses/lucene-core-8.5.0-snapshot-b01d7cb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9c54e267bfa2cd1ef904dc6e35b38bbedda4c4b1 \ No newline at end of file diff --git a/server/licenses/lucene-core-8.5.0-snapshot-c4475920b08.jar.sha1 b/server/licenses/lucene-core-8.5.0-snapshot-c4475920b08.jar.sha1 new file mode 100644 index 00000000000..3fd9e819ce1 --- /dev/null +++ b/server/licenses/lucene-core-8.5.0-snapshot-c4475920b08.jar.sha1 @@ -0,0 +1 @@ +ca406661129d35008411365d2b6e747dc39378af \ No newline at end of file diff --git a/server/licenses/lucene-grouping-8.5.0-snapshot-b01d7cb.jar.sha1 b/server/licenses/lucene-grouping-8.5.0-snapshot-b01d7cb.jar.sha1 deleted file mode 100644 index dd8ec235276..00000000000 --- a/server/licenses/lucene-grouping-8.5.0-snapshot-b01d7cb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a14fb545a10fcead07fbb0d801fdebce88192211 \ No newline at end of file diff --git a/server/licenses/lucene-grouping-8.5.0-snapshot-c4475920b08.jar.sha1 b/server/licenses/lucene-grouping-8.5.0-snapshot-c4475920b08.jar.sha1 new file mode 100644 index 00000000000..11adaa175d1 --- /dev/null +++ b/server/licenses/lucene-grouping-8.5.0-snapshot-c4475920b08.jar.sha1 @@ -0,0 +1 @@ +db053d5861406393254c28f6e46767879b504bb3 \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-8.5.0-snapshot-b01d7cb.jar.sha1 b/server/licenses/lucene-highlighter-8.5.0-snapshot-b01d7cb.jar.sha1 deleted file mode 100644 index 2eca5088e51..00000000000 --- a/server/licenses/lucene-highlighter-8.5.0-snapshot-b01d7cb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -25314c94f5cbcd8e360b74fb9980fc42e3641c94 \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-8.5.0-snapshot-c4475920b08.jar.sha1 b/server/licenses/lucene-highlighter-8.5.0-snapshot-c4475920b08.jar.sha1 new file mode 100644 index 00000000000..99a2bbe095e --- /dev/null +++ b/server/licenses/lucene-highlighter-8.5.0-snapshot-c4475920b08.jar.sha1 @@ -0,0 +1 @@ +f5520ee7145f5d1ef02c7dc87483255d81b5bc6c \ No newline at end of file diff --git a/server/licenses/lucene-join-8.5.0-snapshot-b01d7cb.jar.sha1 b/server/licenses/lucene-join-8.5.0-snapshot-b01d7cb.jar.sha1 deleted file mode 100644 index 14dfe4cd92e..00000000000 --- a/server/licenses/lucene-join-8.5.0-snapshot-b01d7cb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -efe41313b6733a0d2764052972c4e27a7ca7636f \ No newline at end of file diff --git a/server/licenses/lucene-join-8.5.0-snapshot-c4475920b08.jar.sha1 b/server/licenses/lucene-join-8.5.0-snapshot-c4475920b08.jar.sha1 new file mode 100644 index 00000000000..e05ece509f2 --- /dev/null +++ b/server/licenses/lucene-join-8.5.0-snapshot-c4475920b08.jar.sha1 @@ -0,0 +1 @@ +2d81c0a3473cc865e7c4858890b7fbfb869bfbf8 \ No newline at end of file diff --git a/server/licenses/lucene-memory-8.5.0-snapshot-b01d7cb.jar.sha1 b/server/licenses/lucene-memory-8.5.0-snapshot-b01d7cb.jar.sha1 deleted file mode 100644 index 249e29f05ff..00000000000 --- a/server/licenses/lucene-memory-8.5.0-snapshot-b01d7cb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f19fb11eb40f9d1bf77272de1cbd8c83e6463829 \ No newline at end of file diff --git a/server/licenses/lucene-memory-8.5.0-snapshot-c4475920b08.jar.sha1 b/server/licenses/lucene-memory-8.5.0-snapshot-c4475920b08.jar.sha1 new file mode 100644 index 00000000000..2d8258caac8 --- /dev/null +++ b/server/licenses/lucene-memory-8.5.0-snapshot-c4475920b08.jar.sha1 @@ -0,0 +1 @@ +6d009afeb485307dce111afb8bb157ebbbb0f212 \ No newline at end of file diff --git a/server/licenses/lucene-misc-8.5.0-snapshot-b01d7cb.jar.sha1 b/server/licenses/lucene-misc-8.5.0-snapshot-b01d7cb.jar.sha1 deleted file mode 100644 index 1c7eb0b5297..00000000000 --- a/server/licenses/lucene-misc-8.5.0-snapshot-b01d7cb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4295e60e1079c32dc19d1b070db3e62e04f07232 \ No newline at end of file diff --git a/server/licenses/lucene-misc-8.5.0-snapshot-c4475920b08.jar.sha1 b/server/licenses/lucene-misc-8.5.0-snapshot-c4475920b08.jar.sha1 new file mode 100644 index 00000000000..0b228e2a8fa --- /dev/null +++ b/server/licenses/lucene-misc-8.5.0-snapshot-c4475920b08.jar.sha1 @@ -0,0 +1 @@ +3a62908ec9eb6e826a56e697322c4c6b6c9a8573 \ No newline at end of file diff --git a/server/licenses/lucene-queries-8.5.0-snapshot-b01d7cb.jar.sha1 b/server/licenses/lucene-queries-8.5.0-snapshot-b01d7cb.jar.sha1 deleted file mode 100644 index ef9f506ce07..00000000000 --- a/server/licenses/lucene-queries-8.5.0-snapshot-b01d7cb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1555f90440c10250e084d36c27e0da0b760d0296 \ No newline at end of file diff --git a/server/licenses/lucene-queries-8.5.0-snapshot-c4475920b08.jar.sha1 b/server/licenses/lucene-queries-8.5.0-snapshot-c4475920b08.jar.sha1 new file mode 100644 index 00000000000..c159ab98301 --- /dev/null +++ b/server/licenses/lucene-queries-8.5.0-snapshot-c4475920b08.jar.sha1 @@ -0,0 +1 @@ +d71d54ed6e0cf482ce16cf4f419441d83f646827 \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-8.5.0-snapshot-b01d7cb.jar.sha1 b/server/licenses/lucene-queryparser-8.5.0-snapshot-b01d7cb.jar.sha1 deleted file mode 100644 index 6335bca87b4..00000000000 --- a/server/licenses/lucene-queryparser-8.5.0-snapshot-b01d7cb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4fd374ffc3ec3c82d62d0811d78b044833a8dfa1 \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-8.5.0-snapshot-c4475920b08.jar.sha1 b/server/licenses/lucene-queryparser-8.5.0-snapshot-c4475920b08.jar.sha1 new file mode 100644 index 00000000000..10be987e9c1 --- /dev/null +++ b/server/licenses/lucene-queryparser-8.5.0-snapshot-c4475920b08.jar.sha1 @@ -0,0 +1 @@ +181915a7d21b73dff16591b20cdee22648e4181f \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-8.5.0-snapshot-b01d7cb.jar.sha1 b/server/licenses/lucene-sandbox-8.5.0-snapshot-b01d7cb.jar.sha1 deleted file mode 100644 index 09138d68ae5..00000000000 --- a/server/licenses/lucene-sandbox-8.5.0-snapshot-b01d7cb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9e47dbe97818dd6caccf03e2ead6282d5e86bd3c \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-8.5.0-snapshot-c4475920b08.jar.sha1 b/server/licenses/lucene-sandbox-8.5.0-snapshot-c4475920b08.jar.sha1 new file mode 100644 index 00000000000..fb143f9c9c3 --- /dev/null +++ b/server/licenses/lucene-sandbox-8.5.0-snapshot-c4475920b08.jar.sha1 @@ -0,0 +1 @@ +d3d0bb76d9f4a5368d286a934615dbca7703b3d8 \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-8.5.0-snapshot-b01d7cb.jar.sha1 b/server/licenses/lucene-spatial-extras-8.5.0-snapshot-b01d7cb.jar.sha1 deleted file mode 100644 index bd957a07de4..00000000000 --- a/server/licenses/lucene-spatial-extras-8.5.0-snapshot-b01d7cb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bb9fa551d6d0929d5fd37c524c8c284de3f6786e \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-8.5.0-snapshot-c4475920b08.jar.sha1 b/server/licenses/lucene-spatial-extras-8.5.0-snapshot-c4475920b08.jar.sha1 new file mode 100644 index 00000000000..fd23c6f7e03 --- /dev/null +++ b/server/licenses/lucene-spatial-extras-8.5.0-snapshot-c4475920b08.jar.sha1 @@ -0,0 +1 @@ +95b9fd35e91a34c090ecf301d4dc29cabd198e6f \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-8.5.0-snapshot-b01d7cb.jar.sha1 b/server/licenses/lucene-spatial3d-8.5.0-snapshot-b01d7cb.jar.sha1 deleted file mode 100644 index 5332cf736a7..00000000000 --- a/server/licenses/lucene-spatial3d-8.5.0-snapshot-b01d7cb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -28c935b5eb84a85ac24432c8c630fa4b47f5fd54 \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-8.5.0-snapshot-c4475920b08.jar.sha1 b/server/licenses/lucene-spatial3d-8.5.0-snapshot-c4475920b08.jar.sha1 new file mode 100644 index 00000000000..d4fc63b96d4 --- /dev/null +++ b/server/licenses/lucene-spatial3d-8.5.0-snapshot-c4475920b08.jar.sha1 @@ -0,0 +1 @@ +1c8da46c3a172830372dfc23e18e9151bb14562c \ No newline at end of file diff --git a/server/licenses/lucene-suggest-8.5.0-snapshot-b01d7cb.jar.sha1 b/server/licenses/lucene-suggest-8.5.0-snapshot-b01d7cb.jar.sha1 deleted file mode 100644 index f3f9ba3265b..00000000000 --- a/server/licenses/lucene-suggest-8.5.0-snapshot-b01d7cb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -25089b0f516df58e95f345504607853e7ba0a35d \ No newline at end of file diff --git a/server/licenses/lucene-suggest-8.5.0-snapshot-c4475920b08.jar.sha1 b/server/licenses/lucene-suggest-8.5.0-snapshot-c4475920b08.jar.sha1 new file mode 100644 index 00000000000..51bc432029f --- /dev/null +++ b/server/licenses/lucene-suggest-8.5.0-snapshot-c4475920b08.jar.sha1 @@ -0,0 +1 @@ +b3ad5d3476ed85a529892962d057518555ccfcc9 \ No newline at end of file diff --git a/server/src/main/java/org/elasticsearch/index/search/MatchQuery.java b/server/src/main/java/org/elasticsearch/index/search/MatchQuery.java index e7077945caa..b8cf95c6853 100644 --- a/server/src/main/java/org/elasticsearch/index/search/MatchQuery.java +++ b/server/src/main/java/org/elasticsearch/index/search/MatchQuery.java @@ -33,6 +33,7 @@ import org.apache.lucene.queries.ExtendedCommonTermsQuery; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.BooleanQuery; +import org.apache.lucene.search.BoostAttribute; import org.apache.lucene.search.FuzzyQuery; import org.apache.lucene.search.MultiTermQuery; import org.apache.lucene.search.Query; @@ -60,6 +61,7 @@ import org.elasticsearch.index.query.support.QueryParsers; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Set; @@ -274,7 +276,7 @@ public class MatchQuery { && (fieldType instanceof TextFieldMapper.TextFieldType || fieldType instanceof KeywordFieldMapper.KeywordFieldType)) { return builder.newPrefixQuery(term); } else { - return builder.newTermQuery(term); + return builder.newTermQuery(term, BoostAttribute.DEFAULT_BOOST); } } @@ -562,7 +564,7 @@ public class MatchQuery { } @Override - protected Query newTermQuery(Term term) { + protected Query newTermQuery(Term term, float boost) { Supplier querySupplier; if (fuzziness != null) { querySupplier = () -> { @@ -613,7 +615,8 @@ public class MatchQuery { final Term term = new Term(field, termAtt.getBytesRef()); int lastOffset = offsetAtt.endOffset(); stream.end(); - return isPrefix && lastOffset == offsetAtt.endOffset() ? newPrefixQuery(term) : newTermQuery(term); + return isPrefix && lastOffset == offsetAtt.endOffset() ? + newPrefixQuery(term) : newTermQuery(term, BoostAttribute.DEFAULT_BOOST); } private void add(BooleanQuery.Builder q, String field, List current, BooleanClause.Occur operator, boolean isPrefix) { @@ -624,11 +627,14 @@ public class MatchQuery { if (isPrefix) { q.add(newPrefixQuery(current.get(0)), operator); } else { - q.add(newTermQuery(current.get(0)), operator); + q.add(newTermQuery(current.get(0), BoostAttribute.DEFAULT_BOOST), operator); } } else { // We don't apply prefix on synonyms - q.add(newSynonymQuery(current.toArray(new Term[current.size()])), operator); + final TermAndBoost[] termAndBoosts = current.stream() + .map(t -> new TermAndBoost(t, BoostAttribute.DEFAULT_BOOST)) + .toArray(TermAndBoost[]::new); + q.add(newSynonymQuery(termAndBoosts), operator); } } @@ -739,10 +745,13 @@ public class MatchQuery { Term[] terms = graph.getTerms(field, start); assert terms.length > 0; if (terms.length == 1) { - queryPos = usePrefix ? newPrefixQuery(terms[0]) : newTermQuery(terms[0]); + queryPos = usePrefix ? newPrefixQuery(terms[0]) : newTermQuery(terms[0], BoostAttribute.DEFAULT_BOOST); } else { // We don't apply prefix on synonyms - queryPos = newSynonymQuery(terms); + final TermAndBoost[] termAndBoosts = Arrays.stream(terms) + .map(t -> new TermAndBoost(t, BoostAttribute.DEFAULT_BOOST)) + .toArray(TermAndBoost[]::new); + queryPos = newSynonymQuery(termAndBoosts); } } if (queryPos != null) { diff --git a/server/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java b/server/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java index ed0f1db8ed3..0eff77ca74a 100644 --- a/server/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java +++ b/server/src/main/java/org/elasticsearch/index/search/MultiMatchQuery.java @@ -180,16 +180,16 @@ public class MultiMatchQuery extends MatchQuery { } @Override - protected Query newSynonymQuery(Term[] terms) { + protected Query newSynonymQuery(TermAndBoost[] terms) { BytesRef[] values = new BytesRef[terms.length]; for (int i = 0; i < terms.length; i++) { - values[i] = terms[i].bytes(); + values[i] = terms[i].term.bytes(); } return blendTerms(context, values, commonTermsCutoff, tieBreaker, lenient, blendedFields); } @Override - protected Query newTermQuery(Term term) { + protected Query newTermQuery(Term term, float boost) { return blendTerm(context, term.bytes(), commonTermsCutoff, tieBreaker, lenient, blendedFields); } diff --git a/server/src/main/java/org/elasticsearch/index/search/QueryStringQueryParser.java b/server/src/main/java/org/elasticsearch/index/search/QueryStringQueryParser.java index 115430a13c3..5eea6d34776 100644 --- a/server/src/main/java/org/elasticsearch/index/search/QueryStringQueryParser.java +++ b/server/src/main/java/org/elasticsearch/index/search/QueryStringQueryParser.java @@ -28,6 +28,7 @@ import org.apache.lucene.queryparser.classic.ParseException; import org.apache.lucene.queryparser.classic.Token; import org.apache.lucene.queryparser.classic.XQueryParser; import org.apache.lucene.search.BooleanClause; +import org.apache.lucene.search.BoostAttribute; import org.apache.lucene.search.BoostQuery; import org.apache.lucene.search.DisjunctionMaxQuery; import org.apache.lucene.search.FuzzyQuery; @@ -588,7 +589,7 @@ public class QueryStringQueryParser extends XQueryParser { if (isLastPos) { posQuery = currentFieldType.prefixQuery(plist.get(0), getMultiTermRewriteMethod(), context); } else { - posQuery = newTermQuery(new Term(field, plist.get(0))); + posQuery = newTermQuery(new Term(field, plist.get(0)), BoostAttribute.DEFAULT_BOOST); } } else if (isLastPos == false) { // build a synonym query for terms in the same position. diff --git a/server/src/main/java/org/elasticsearch/index/search/SimpleQueryStringQueryParser.java b/server/src/main/java/org/elasticsearch/index/search/SimpleQueryStringQueryParser.java index b8509ca2c11..f4cac7e6c6d 100644 --- a/server/src/main/java/org/elasticsearch/index/search/SimpleQueryStringQueryParser.java +++ b/server/src/main/java/org/elasticsearch/index/search/SimpleQueryStringQueryParser.java @@ -26,6 +26,7 @@ import org.apache.lucene.index.Term; import org.apache.lucene.queryparser.simple.SimpleQueryParser; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; +import org.apache.lucene.search.BoostAttribute; import org.apache.lucene.search.BoostQuery; import org.apache.lucene.search.DisjunctionMaxQuery; import org.apache.lucene.search.MatchNoDocsQuery; @@ -104,7 +105,7 @@ public class SimpleQueryStringQueryParser extends SimpleQueryParser { } @Override - protected Query newTermQuery(Term term) { + protected Query newTermQuery(Term term, float boost) { MappedFieldType ft = context.fieldMapper(term.field()); if (ft == null) { return newUnmappedFieldQuery(term.field()); @@ -259,7 +260,7 @@ public class SimpleQueryStringQueryParser extends SimpleQueryParser { if (isLastPos) { posQuery = new PrefixQuery(new Term(field, plist.get(0))); } else { - posQuery = newTermQuery(new Term(field, plist.get(0))); + posQuery = newTermQuery(new Term(field, plist.get(0)), BoostAttribute.DEFAULT_BOOST); } } else if (isLastPos == false) { // build a synonym query for terms in the same position. 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 79edf17e2a7..2734a438c7f 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 @@ -194,7 +194,7 @@ public abstract class AnalysisFactoryTestCase extends ESTestCase { .put("concatenategraph", Void.class) // LUCENE-8936 .put("spanishminimalstem", Void.class) - + .put("delimitedboost", Void.class) .immutableMap(); static final Map> KNOWN_CHARFILTERS = new MapBuilder>() diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.5.0-snapshot-b01d7cb.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.5.0-snapshot-b01d7cb.jar.sha1 deleted file mode 100644 index 06a1050ba8e..00000000000 --- a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.5.0-snapshot-b01d7cb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9c54e267bfa2cd1ef904dc6e35b38bbedda4c4b1 \ No newline at end of file diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.5.0-snapshot-c4475920b08.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.5.0-snapshot-c4475920b08.jar.sha1 new file mode 100644 index 00000000000..3fd9e819ce1 --- /dev/null +++ b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.5.0-snapshot-c4475920b08.jar.sha1 @@ -0,0 +1 @@ +ca406661129d35008411365d2b6e747dc39378af \ No newline at end of file