diff --git a/build.gradle b/build.gradle index 420d1b5553680..642d6efce8116 100644 --- a/build.gradle +++ b/build.gradle @@ -160,8 +160,8 @@ task verifyVersions { * after the backport of the backcompat code is complete. */ -boolean bwc_tests_enabled = true -final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */ +boolean bwc_tests_enabled = false +final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/39350" /* place a PR link here when committing bwc changes */ if (bwc_tests_enabled == false) { if (bwc_tests_disabled_issue.isEmpty()) { throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false") diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 96dfa3cc05668..6d983e049677b 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -1,5 +1,5 @@ elasticsearch = 8.0.0 -lucene = 8.0.0-snapshot-83f9835 +lucene = 8.0.0-snapshot-ff9509a8df # optional dependencies spatial4j = 0.7 diff --git a/modules/lang-expression/licenses/lucene-expressions-8.0.0-snapshot-83f9835.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.0.0-snapshot-83f9835.jar.sha1 deleted file mode 100644 index fa128372b2467..0000000000000 --- a/modules/lang-expression/licenses/lucene-expressions-8.0.0-snapshot-83f9835.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c84431b751d851f484f2799f6dcb9110113b1958 \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-expressions-8.0.0-snapshot-ff9509a8df.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.0.0-snapshot-ff9509a8df.jar.sha1 new file mode 100644 index 0000000000000..31756cf6a4e28 --- /dev/null +++ b/modules/lang-expression/licenses/lucene-expressions-8.0.0-snapshot-ff9509a8df.jar.sha1 @@ -0,0 +1 @@ +6b487ff516c053fae3fa270cd51964534f46b628 \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.0.0-snapshot-83f9835.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.0.0-snapshot-83f9835.jar.sha1 deleted file mode 100644 index 927a881df73f1..0000000000000 --- a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.0.0-snapshot-83f9835.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ea440f53a9e858c2ed87927c63d57eb70e5af9ee \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.0.0-snapshot-ff9509a8df.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.0.0-snapshot-ff9509a8df.jar.sha1 new file mode 100644 index 0000000000000..23d33ebc823fb --- /dev/null +++ b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.0.0-snapshot-ff9509a8df.jar.sha1 @@ -0,0 +1 @@ +116fed6827a68b78b46a1eadfda1e27936b171a1 \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.0.0-snapshot-83f9835.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.0.0-snapshot-83f9835.jar.sha1 deleted file mode 100644 index 075bd24f3e609..0000000000000 --- a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.0.0-snapshot-83f9835.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b016fdfb8f1ac413d902cd4d244b295c9f01e610 \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.0.0-snapshot-ff9509a8df.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.0.0-snapshot-ff9509a8df.jar.sha1 new file mode 100644 index 0000000000000..f7a46a0ef7901 --- /dev/null +++ b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.0.0-snapshot-ff9509a8df.jar.sha1 @@ -0,0 +1 @@ +c39659fa1684742370dfabf37641e41394ac4799 \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.0.0-snapshot-83f9835.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.0.0-snapshot-83f9835.jar.sha1 deleted file mode 100644 index d5046efc95935..0000000000000 --- a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.0.0-snapshot-83f9835.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -395c8291751ffa7fbbb96faf578408a33a34ad1d \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.0.0-snapshot-ff9509a8df.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.0.0-snapshot-ff9509a8df.jar.sha1 new file mode 100644 index 0000000000000..91686a1b1a701 --- /dev/null +++ b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.0.0-snapshot-ff9509a8df.jar.sha1 @@ -0,0 +1 @@ +51e35640ceac2e4801b9be1263c7bea8637c7ad7 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.0.0-snapshot-83f9835.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.0.0-snapshot-83f9835.jar.sha1 deleted file mode 100644 index 19a0a9a198ce0..0000000000000 --- a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.0.0-snapshot-83f9835.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6957c71604356a1fbf0e13794595e4ea42126dd7 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.0.0-snapshot-ff9509a8df.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.0.0-snapshot-ff9509a8df.jar.sha1 new file mode 100644 index 0000000000000..3a65ca4447024 --- /dev/null +++ b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.0.0-snapshot-ff9509a8df.jar.sha1 @@ -0,0 +1 @@ +bd8f2fe37a3e2f1c4d052071ceba618e6d16f119 \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.0.0-snapshot-83f9835.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.0.0-snapshot-83f9835.jar.sha1 deleted file mode 100644 index 91597e3941158..0000000000000 --- a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.0.0-snapshot-83f9835.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -09f42235a8daca4ca8ea604314c2eb9de51b9e98 \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.0.0-snapshot-ff9509a8df.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.0.0-snapshot-ff9509a8df.jar.sha1 new file mode 100644 index 0000000000000..1f4bf1ecbad9d --- /dev/null +++ b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.0.0-snapshot-ff9509a8df.jar.sha1 @@ -0,0 +1 @@ +022de0054e9597d16f366bb83d6404d2006dcecf \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.0.0-snapshot-83f9835.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.0.0-snapshot-83f9835.jar.sha1 deleted file mode 100644 index a868f7d5a053f..0000000000000 --- a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.0.0-snapshot-83f9835.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7cf7eeb685a2060e97f50551236cfcaf39990083 \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.0.0-snapshot-ff9509a8df.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.0.0-snapshot-ff9509a8df.jar.sha1 new file mode 100644 index 0000000000000..aeec63f17efda --- /dev/null +++ b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.0.0-snapshot-ff9509a8df.jar.sha1 @@ -0,0 +1 @@ +6cff98d0fdbb6d2d65ce9051005954f5b565986c \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.0.0-snapshot-83f9835.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.0.0-snapshot-83f9835.jar.sha1 deleted file mode 100644 index 4f5f80aa96b91..0000000000000 --- a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.0.0-snapshot-83f9835.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ff163fb06ec3e47d501b290d8f69cca88a0341cc \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.0.0-snapshot-ff9509a8df.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.0.0-snapshot-ff9509a8df.jar.sha1 new file mode 100644 index 0000000000000..878a74a35c0d8 --- /dev/null +++ b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.0.0-snapshot-ff9509a8df.jar.sha1 @@ -0,0 +1 @@ +438537046ef60d75f17358bf09bb339aa84191e5 \ No newline at end of file diff --git a/server/licenses/lucene-analyzers-common-8.0.0-snapshot-83f9835.jar.sha1 b/server/licenses/lucene-analyzers-common-8.0.0-snapshot-83f9835.jar.sha1 deleted file mode 100644 index 4dc7f4b4ca6bf..0000000000000 --- a/server/licenses/lucene-analyzers-common-8.0.0-snapshot-83f9835.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f4d286ed7940fc206331424e8ce577584208eba3 \ No newline at end of file diff --git a/server/licenses/lucene-analyzers-common-8.0.0-snapshot-ff9509a8df.jar.sha1 b/server/licenses/lucene-analyzers-common-8.0.0-snapshot-ff9509a8df.jar.sha1 new file mode 100644 index 0000000000000..45f87ce4f9ee8 --- /dev/null +++ b/server/licenses/lucene-analyzers-common-8.0.0-snapshot-ff9509a8df.jar.sha1 @@ -0,0 +1 @@ +d96364f1b6a041f797e3d5f55b45284d8ab5cf95 \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-8.0.0-snapshot-83f9835.jar.sha1 b/server/licenses/lucene-backward-codecs-8.0.0-snapshot-83f9835.jar.sha1 deleted file mode 100644 index df0783e11fee6..0000000000000 --- a/server/licenses/lucene-backward-codecs-8.0.0-snapshot-83f9835.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e5416da7370f5def9a79fb1cccb091b091b808a5 \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-8.0.0-snapshot-ff9509a8df.jar.sha1 b/server/licenses/lucene-backward-codecs-8.0.0-snapshot-ff9509a8df.jar.sha1 new file mode 100644 index 0000000000000..042cacf0f50a8 --- /dev/null +++ b/server/licenses/lucene-backward-codecs-8.0.0-snapshot-ff9509a8df.jar.sha1 @@ -0,0 +1 @@ +a39f5683e6e6ce17a191dd5fcbf90fcc43d25109 \ No newline at end of file diff --git a/server/licenses/lucene-core-8.0.0-snapshot-83f9835.jar.sha1 b/server/licenses/lucene-core-8.0.0-snapshot-83f9835.jar.sha1 deleted file mode 100644 index 7a4b68f8d857d..0000000000000 --- a/server/licenses/lucene-core-8.0.0-snapshot-83f9835.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e3a95ff3cbd96e2c05b90932c20ca6374cdcdbe9 \ No newline at end of file diff --git a/server/licenses/lucene-core-8.0.0-snapshot-ff9509a8df.jar.sha1 b/server/licenses/lucene-core-8.0.0-snapshot-ff9509a8df.jar.sha1 new file mode 100644 index 0000000000000..5f789e04df4db --- /dev/null +++ b/server/licenses/lucene-core-8.0.0-snapshot-ff9509a8df.jar.sha1 @@ -0,0 +1 @@ +283cbab4d58f18fd4eed169448bd0114e5d7c971 \ No newline at end of file diff --git a/server/licenses/lucene-grouping-8.0.0-snapshot-83f9835.jar.sha1 b/server/licenses/lucene-grouping-8.0.0-snapshot-83f9835.jar.sha1 deleted file mode 100644 index e1933653b9f4d..0000000000000 --- a/server/licenses/lucene-grouping-8.0.0-snapshot-83f9835.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -045dcae6368a436cec6e56f654a9c6b3a4656d17 \ No newline at end of file diff --git a/server/licenses/lucene-grouping-8.0.0-snapshot-ff9509a8df.jar.sha1 b/server/licenses/lucene-grouping-8.0.0-snapshot-ff9509a8df.jar.sha1 new file mode 100644 index 0000000000000..f61e3187e2f44 --- /dev/null +++ b/server/licenses/lucene-grouping-8.0.0-snapshot-ff9509a8df.jar.sha1 @@ -0,0 +1 @@ +e63de6e4690f844b571edef03e4029a63bf2458b \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-8.0.0-snapshot-83f9835.jar.sha1 b/server/licenses/lucene-highlighter-8.0.0-snapshot-83f9835.jar.sha1 deleted file mode 100644 index 85aff2f06dd49..0000000000000 --- a/server/licenses/lucene-highlighter-8.0.0-snapshot-83f9835.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -63b7164d24547cea36df3d81eedb9e8b424cf3c2 \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-8.0.0-snapshot-ff9509a8df.jar.sha1 b/server/licenses/lucene-highlighter-8.0.0-snapshot-ff9509a8df.jar.sha1 new file mode 100644 index 0000000000000..766e9be71ee7b --- /dev/null +++ b/server/licenses/lucene-highlighter-8.0.0-snapshot-ff9509a8df.jar.sha1 @@ -0,0 +1 @@ +097cfc9ed8575c845c32f80745af11c04aaa6541 \ No newline at end of file diff --git a/server/licenses/lucene-join-8.0.0-snapshot-83f9835.jar.sha1 b/server/licenses/lucene-join-8.0.0-snapshot-83f9835.jar.sha1 deleted file mode 100644 index 41b3910da1319..0000000000000 --- a/server/licenses/lucene-join-8.0.0-snapshot-83f9835.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7b3358889c491237709e8aea4a39e816227f3d26 \ No newline at end of file diff --git a/server/licenses/lucene-join-8.0.0-snapshot-ff9509a8df.jar.sha1 b/server/licenses/lucene-join-8.0.0-snapshot-ff9509a8df.jar.sha1 new file mode 100644 index 0000000000000..c3fd4257d69f5 --- /dev/null +++ b/server/licenses/lucene-join-8.0.0-snapshot-ff9509a8df.jar.sha1 @@ -0,0 +1 @@ +a1b20c5408c9a1d2fec4604dc66b3d54bf91f84c \ No newline at end of file diff --git a/server/licenses/lucene-memory-8.0.0-snapshot-83f9835.jar.sha1 b/server/licenses/lucene-memory-8.0.0-snapshot-83f9835.jar.sha1 deleted file mode 100644 index 22318a34bf09e..0000000000000 --- a/server/licenses/lucene-memory-8.0.0-snapshot-83f9835.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5d9566e2b3be41c81fe42df1c57fff31fcdbc565 \ No newline at end of file diff --git a/server/licenses/lucene-memory-8.0.0-snapshot-ff9509a8df.jar.sha1 b/server/licenses/lucene-memory-8.0.0-snapshot-ff9509a8df.jar.sha1 new file mode 100644 index 0000000000000..563a2cded9d66 --- /dev/null +++ b/server/licenses/lucene-memory-8.0.0-snapshot-ff9509a8df.jar.sha1 @@ -0,0 +1 @@ +14bf9224dd2cd13d81ff90a43af713bda9c5b699 \ No newline at end of file diff --git a/server/licenses/lucene-misc-8.0.0-snapshot-83f9835.jar.sha1 b/server/licenses/lucene-misc-8.0.0-snapshot-83f9835.jar.sha1 deleted file mode 100644 index 2c4429c8c7619..0000000000000 --- a/server/licenses/lucene-misc-8.0.0-snapshot-83f9835.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -45574e22c4b1569a2aecd5b2837388c7287892b5 \ No newline at end of file diff --git a/server/licenses/lucene-misc-8.0.0-snapshot-ff9509a8df.jar.sha1 b/server/licenses/lucene-misc-8.0.0-snapshot-ff9509a8df.jar.sha1 new file mode 100644 index 0000000000000..778e2117c7e82 --- /dev/null +++ b/server/licenses/lucene-misc-8.0.0-snapshot-ff9509a8df.jar.sha1 @@ -0,0 +1 @@ +79be1830102a764d79da6c81d40f5f6bf85ad032 \ No newline at end of file diff --git a/server/licenses/lucene-queries-8.0.0-snapshot-83f9835.jar.sha1 b/server/licenses/lucene-queries-8.0.0-snapshot-83f9835.jar.sha1 deleted file mode 100644 index ae11e5858a28c..0000000000000 --- a/server/licenses/lucene-queries-8.0.0-snapshot-83f9835.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -67405660330db8c09e0994a615cf3ab95d7bc151 \ No newline at end of file diff --git a/server/licenses/lucene-queries-8.0.0-snapshot-ff9509a8df.jar.sha1 b/server/licenses/lucene-queries-8.0.0-snapshot-ff9509a8df.jar.sha1 new file mode 100644 index 0000000000000..68fb990b3b97e --- /dev/null +++ b/server/licenses/lucene-queries-8.0.0-snapshot-ff9509a8df.jar.sha1 @@ -0,0 +1 @@ +3f7281351f03ac34c8a950e667e826053b82f31e \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-8.0.0-snapshot-83f9835.jar.sha1 b/server/licenses/lucene-queryparser-8.0.0-snapshot-83f9835.jar.sha1 deleted file mode 100644 index fcb52584b667c..0000000000000 --- a/server/licenses/lucene-queryparser-8.0.0-snapshot-83f9835.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c8de64bf2c4f09766d4cd62e8dd403016665f37c \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-8.0.0-snapshot-ff9509a8df.jar.sha1 b/server/licenses/lucene-queryparser-8.0.0-snapshot-ff9509a8df.jar.sha1 new file mode 100644 index 0000000000000..a848b6729c84d --- /dev/null +++ b/server/licenses/lucene-queryparser-8.0.0-snapshot-ff9509a8df.jar.sha1 @@ -0,0 +1 @@ +039229d20cb500de435b458998aa35370c616f69 \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-8.0.0-snapshot-83f9835.jar.sha1 b/server/licenses/lucene-sandbox-8.0.0-snapshot-83f9835.jar.sha1 deleted file mode 100644 index 80750b2d41e33..0000000000000 --- a/server/licenses/lucene-sandbox-8.0.0-snapshot-83f9835.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fc080b45b881a78a23743df9a7388fd3dbbb9d66 \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-8.0.0-snapshot-ff9509a8df.jar.sha1 b/server/licenses/lucene-sandbox-8.0.0-snapshot-ff9509a8df.jar.sha1 new file mode 100644 index 0000000000000..d912c2166f2c0 --- /dev/null +++ b/server/licenses/lucene-sandbox-8.0.0-snapshot-ff9509a8df.jar.sha1 @@ -0,0 +1 @@ +00cee2f9ff5fcaa3ac3838f2d8b0c8b59c55e4a6 \ No newline at end of file diff --git a/server/licenses/lucene-spatial-8.0.0-snapshot-83f9835.jar.sha1 b/server/licenses/lucene-spatial-8.0.0-snapshot-83f9835.jar.sha1 deleted file mode 100644 index 32f5ca7196e17..0000000000000 --- a/server/licenses/lucene-spatial-8.0.0-snapshot-83f9835.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6e0e12b9882005b87ef39325e1fc8539c8caff31 \ No newline at end of file diff --git a/server/licenses/lucene-spatial-8.0.0-snapshot-ff9509a8df.jar.sha1 b/server/licenses/lucene-spatial-8.0.0-snapshot-ff9509a8df.jar.sha1 new file mode 100644 index 0000000000000..d33e2ec963973 --- /dev/null +++ b/server/licenses/lucene-spatial-8.0.0-snapshot-ff9509a8df.jar.sha1 @@ -0,0 +1 @@ +4246d1cc124eb7b2d18ccee1db96b5999ae45b95 \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-8.0.0-snapshot-83f9835.jar.sha1 b/server/licenses/lucene-spatial-extras-8.0.0-snapshot-83f9835.jar.sha1 deleted file mode 100644 index 2cf474908d1ba..0000000000000 --- a/server/licenses/lucene-spatial-extras-8.0.0-snapshot-83f9835.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7ed9c9a03e1a15840237d09ca4da7aadfce1c780 \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-8.0.0-snapshot-ff9509a8df.jar.sha1 b/server/licenses/lucene-spatial-extras-8.0.0-snapshot-ff9509a8df.jar.sha1 new file mode 100644 index 0000000000000..a722c99ab10fa --- /dev/null +++ b/server/licenses/lucene-spatial-extras-8.0.0-snapshot-ff9509a8df.jar.sha1 @@ -0,0 +1 @@ +caa0c22ce9a985f4a7a76c315ac8841d37083c2b \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-8.0.0-snapshot-83f9835.jar.sha1 b/server/licenses/lucene-spatial3d-8.0.0-snapshot-83f9835.jar.sha1 deleted file mode 100644 index c4016fb692e2f..0000000000000 --- a/server/licenses/lucene-spatial3d-8.0.0-snapshot-83f9835.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fdf0efdeb9a73a6b0f8349df21049ecbc73955d7 \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-8.0.0-snapshot-ff9509a8df.jar.sha1 b/server/licenses/lucene-spatial3d-8.0.0-snapshot-ff9509a8df.jar.sha1 new file mode 100644 index 0000000000000..e9c9fbd4ca182 --- /dev/null +++ b/server/licenses/lucene-spatial3d-8.0.0-snapshot-ff9509a8df.jar.sha1 @@ -0,0 +1 @@ +7d01e71c2e2e9fd5a2ad1f397bf75de12b860fab \ No newline at end of file diff --git a/server/licenses/lucene-suggest-8.0.0-snapshot-83f9835.jar.sha1 b/server/licenses/lucene-suggest-8.0.0-snapshot-83f9835.jar.sha1 deleted file mode 100644 index 7ea28b0ed87da..0000000000000 --- a/server/licenses/lucene-suggest-8.0.0-snapshot-83f9835.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c69399183d5f9f85f3f8130452d0bed62fd92440 \ No newline at end of file diff --git a/server/licenses/lucene-suggest-8.0.0-snapshot-ff9509a8df.jar.sha1 b/server/licenses/lucene-suggest-8.0.0-snapshot-ff9509a8df.jar.sha1 new file mode 100644 index 0000000000000..66de2babb5258 --- /dev/null +++ b/server/licenses/lucene-suggest-8.0.0-snapshot-ff9509a8df.jar.sha1 @@ -0,0 +1 @@ +fd72490e235dffbf455886d4a4339dd29f4ccd5b \ No newline at end of file diff --git a/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java b/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java index 7d13cff2ebd09..7cbbf5d48c8e3 100644 --- a/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java +++ b/server/src/main/java/org/elasticsearch/action/termvectors/TermVectorsFields.java @@ -21,6 +21,7 @@ import com.carrotsearch.hppc.ObjectLongHashMap; import com.carrotsearch.hppc.cursors.ObjectLongCursor; +import org.apache.lucene.index.BaseTermsEnum; import org.apache.lucene.index.Fields; import org.apache.lucene.index.ImpactsEnum; import org.apache.lucene.index.PostingsEnum; @@ -229,7 +230,7 @@ public TermsEnum iterator() throws IOException { // reset before asking for an iterator reset(); // convert bytes ref for the terms to actual data - return new TermsEnum() { + return new BaseTermsEnum() { int currentTerm = 0; int freq = 0; int docFreq = -1; diff --git a/server/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java b/server/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java index 388f8424a4755..168d18d45e148 100644 --- a/server/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java +++ b/server/src/main/java/org/elasticsearch/common/lucene/index/FilterableTermsEnum.java @@ -23,6 +23,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.PostingsEnum; +import org.apache.lucene.index.TermState; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.search.DocIdSetIterator; @@ -32,6 +33,7 @@ import org.apache.lucene.search.ScoreMode; import org.apache.lucene.search.Scorer; import org.apache.lucene.search.Weight; +import org.apache.lucene.util.AttributeSource; import org.apache.lucene.util.BitSet; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; @@ -126,6 +128,11 @@ public BytesRef term() throws IOException { return current; } + @Override + public AttributeSource attributes() { + throw new UnsupportedOperationException(UNSUPPORTED_MESSAGE); + } + @Override public boolean seekExact(BytesRef text) throws IOException { int docFreq = 0; @@ -195,6 +202,16 @@ public void seekExact(long ord) throws IOException { throw new UnsupportedOperationException(UNSUPPORTED_MESSAGE); } + @Override + public void seekExact(BytesRef term, TermState state) throws IOException { + throw new UnsupportedOperationException(UNSUPPORTED_MESSAGE); + } + + @Override + public TermState termState() throws IOException { + throw new UnsupportedOperationException(UNSUPPORTED_MESSAGE); + } + @Override public SeekStatus seekCeil(BytesRef text) throws IOException { throw new UnsupportedOperationException(UNSUPPORTED_MESSAGE); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReader.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReader.java index 6d3864aa3eba2..6e699d8141032 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReader.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReader.java @@ -19,6 +19,7 @@ import org.apache.lucene.index.SortedNumericDocValues; import org.apache.lucene.index.SortedSetDocValues; import org.apache.lucene.index.StoredFieldVisitor; +import org.apache.lucene.index.TermState; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.util.BytesRef; @@ -441,6 +442,14 @@ public boolean seekExact(BytesRef term) throws IOException { return accept(term) && in.seekExact(term); } + @Override + public void seekExact(BytesRef term, TermState state) throws IOException { + if (accept(term) == false) { + throw new IllegalStateException("Tried to seek using a TermState from a different reader!"); + } + in.seekExact(term, state); + } + @Override public SeekStatus seekCeil(BytesRef term) throws IOException { SeekStatus status = in.seekCeil(term); diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReaderTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReaderTests.java index 2dcfa093c008a..22ee0df16c102 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReaderTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReaderTests.java @@ -23,6 +23,7 @@ import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.FieldInfos; import org.apache.lucene.index.Fields; +import org.apache.lucene.index.FilterDirectoryReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.LeafReader; @@ -35,12 +36,12 @@ import org.apache.lucene.index.SortedNumericDocValues; import org.apache.lucene.index.SortedSetDocValues; import org.apache.lucene.index.Term; +import org.apache.lucene.index.TermState; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.index.TermsEnum.SeekStatus; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.core.internal.io.IOUtils; import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.automaton.Automata; import org.apache.lucene.util.automaton.Automaton; @@ -55,6 +56,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentType; +import org.elasticsearch.core.internal.io.IOUtils; import org.elasticsearch.index.mapper.FieldNamesFieldMapper; import org.elasticsearch.index.mapper.SourceFieldMapper; import org.elasticsearch.test.ESTestCase; @@ -768,6 +770,18 @@ public void testFieldNames() throws Exception { assertTrue(termsEnum.seekExact(new BytesRef("fieldA"))); assertFalse(termsEnum.seekExact(new BytesRef("fieldB"))); + // seekExact with TermState + // first, collect TermState from underlying reader + LeafReader unwrappedReader = FilterDirectoryReader.unwrap(ir).leaves().get(0).reader(); + Terms unwrappedTerms = unwrappedReader.terms(FieldNamesFieldMapper.NAME); + TermsEnum unwrappedTE = unwrappedTerms.iterator(); + assertTrue(unwrappedTE.seekExact(new BytesRef("fieldB"))); + TermState termState = unwrappedTE.termState(); + + // now try and seekExact with it + TermsEnum badEnum = terms.iterator(); + expectThrows(IllegalStateException.class, () -> badEnum.seekExact(new BytesRef("fieldB"), termState)); + // seekCeil termsEnum = terms.iterator(); assertEquals(SeekStatus.FOUND, termsEnum.seekCeil(new BytesRef("fieldA"))); diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.0.0-snapshot-83f9835.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.0.0-snapshot-83f9835.jar.sha1 deleted file mode 100644 index 7a4b68f8d857d..0000000000000 --- a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.0.0-snapshot-83f9835.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e3a95ff3cbd96e2c05b90932c20ca6374cdcdbe9 \ No newline at end of file diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.0.0-snapshot-ff9509a8df.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.0.0-snapshot-ff9509a8df.jar.sha1 new file mode 100644 index 0000000000000..5f789e04df4db --- /dev/null +++ b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.0.0-snapshot-ff9509a8df.jar.sha1 @@ -0,0 +1 @@ +283cbab4d58f18fd4eed169448bd0114e5d7c971 \ No newline at end of file