diff --git a/buildSrc/version.properties b/buildSrc/version.properties index a02a8cd1514..4b63f53bb2b 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -1,5 +1,5 @@ elasticsearch = 7.10.0 -lucene = 8.7.0-snapshot-9cd3af50f80 +lucene = 8.7.0-snapshot-830bd186a8d bundled_jdk_vendor = adoptopenjdk bundled_jdk = 15+36 diff --git a/modules/lang-expression/licenses/lucene-expressions-8.7.0-snapshot-830bd186a8d.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.7.0-snapshot-830bd186a8d.jar.sha1 new file mode 100644 index 00000000000..1a213bf5d7c --- /dev/null +++ b/modules/lang-expression/licenses/lucene-expressions-8.7.0-snapshot-830bd186a8d.jar.sha1 @@ -0,0 +1 @@ +e91724fb3ca6b4a88bca6c06f33cf3ece2570d2a \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-expressions-8.7.0-snapshot-9cd3af50f80.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.7.0-snapshot-9cd3af50f80.jar.sha1 deleted file mode 100644 index 54217b3b62f..00000000000 --- a/modules/lang-expression/licenses/lucene-expressions-8.7.0-snapshot-9cd3af50f80.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -46311836aeec9daa80e4fb4625f3a942d0e9326c \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.7.0-snapshot-830bd186a8d.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.7.0-snapshot-830bd186a8d.jar.sha1 new file mode 100644 index 00000000000..679f2042b51 --- /dev/null +++ b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.7.0-snapshot-830bd186a8d.jar.sha1 @@ -0,0 +1 @@ +570181517723658fb81e417d3e1034d21602f3af \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.7.0-snapshot-9cd3af50f80.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.7.0-snapshot-9cd3af50f80.jar.sha1 deleted file mode 100644 index 9a3d9263681..00000000000 --- a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.7.0-snapshot-9cd3af50f80.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -db78b0fe0e6c9ecbddde90351c6bf6dd36b7e274 \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.7.0-snapshot-830bd186a8d.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.7.0-snapshot-830bd186a8d.jar.sha1 new file mode 100644 index 00000000000..c94ca559320 --- /dev/null +++ b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.7.0-snapshot-830bd186a8d.jar.sha1 @@ -0,0 +1 @@ +d5c9c026382e5eacbbc917b08b51e140c30c2186 \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.7.0-snapshot-9cd3af50f80.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.7.0-snapshot-9cd3af50f80.jar.sha1 deleted file mode 100644 index 598537f3a40..00000000000 --- a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.7.0-snapshot-9cd3af50f80.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f02da079d8a318e0fb2d046a42e7e90c6d419624 \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.7.0-snapshot-830bd186a8d.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.7.0-snapshot-830bd186a8d.jar.sha1 new file mode 100644 index 00000000000..a205f80c297 --- /dev/null +++ b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.7.0-snapshot-830bd186a8d.jar.sha1 @@ -0,0 +1 @@ +7fad372e469d55db8eca00188e65b837a6b4ec2b \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.7.0-snapshot-9cd3af50f80.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.7.0-snapshot-9cd3af50f80.jar.sha1 deleted file mode 100644 index 292e611d8ae..00000000000 --- a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.7.0-snapshot-9cd3af50f80.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -02a4aa023646071a59edc27dd46bca766dd9602c \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.7.0-snapshot-830bd186a8d.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.7.0-snapshot-830bd186a8d.jar.sha1 new file mode 100644 index 00000000000..e51937cfafe --- /dev/null +++ b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.7.0-snapshot-830bd186a8d.jar.sha1 @@ -0,0 +1 @@ +899683551059ac5ab4fb88d4a96d0ec75743bfdd \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.7.0-snapshot-9cd3af50f80.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.7.0-snapshot-9cd3af50f80.jar.sha1 deleted file mode 100644 index cfb51104ff4..00000000000 --- a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.7.0-snapshot-9cd3af50f80.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fa83f2fd07becc6de2cea6f85ea6bb23b04f5b77 \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.7.0-snapshot-830bd186a8d.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.7.0-snapshot-830bd186a8d.jar.sha1 new file mode 100644 index 00000000000..2d4dad3856b --- /dev/null +++ b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.7.0-snapshot-830bd186a8d.jar.sha1 @@ -0,0 +1 @@ +8d6cd0bd8b28de9d09560b1597791cc533258df5 \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.7.0-snapshot-9cd3af50f80.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.7.0-snapshot-9cd3af50f80.jar.sha1 deleted file mode 100644 index 2967196e798..00000000000 --- a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.7.0-snapshot-9cd3af50f80.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -370cbcf95db94209c79c72840c91053997928982 \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.7.0-snapshot-830bd186a8d.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.7.0-snapshot-830bd186a8d.jar.sha1 new file mode 100644 index 00000000000..8aefa0a9901 --- /dev/null +++ b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.7.0-snapshot-830bd186a8d.jar.sha1 @@ -0,0 +1 @@ +87d11fe1b430f124d79f514a5e74eda43bd941a8 \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.7.0-snapshot-9cd3af50f80.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.7.0-snapshot-9cd3af50f80.jar.sha1 deleted file mode 100644 index d477c84ad18..00000000000 --- a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.7.0-snapshot-9cd3af50f80.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -307ea97f7f403cc2f60a5b0e992dd78fa36d39af \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.7.0-snapshot-830bd186a8d.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.7.0-snapshot-830bd186a8d.jar.sha1 new file mode 100644 index 00000000000..a67a8d71e1a --- /dev/null +++ b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.7.0-snapshot-830bd186a8d.jar.sha1 @@ -0,0 +1 @@ +42eea3dc402968fda468fd0c4cd785192d8103c9 \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.7.0-snapshot-9cd3af50f80.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.7.0-snapshot-9cd3af50f80.jar.sha1 deleted file mode 100644 index 4c621568812..00000000000 --- a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.7.0-snapshot-9cd3af50f80.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b4ebfc1a42e774b075803bcb4320424a340122c2 \ No newline at end of file diff --git a/server/licenses/lucene-analyzers-common-8.7.0-snapshot-830bd186a8d.jar.sha1 b/server/licenses/lucene-analyzers-common-8.7.0-snapshot-830bd186a8d.jar.sha1 new file mode 100644 index 00000000000..755d677d56b --- /dev/null +++ b/server/licenses/lucene-analyzers-common-8.7.0-snapshot-830bd186a8d.jar.sha1 @@ -0,0 +1 @@ +f7911b977b8f38b9f24bd5b0af77f14d3f5b51a2 \ No newline at end of file diff --git a/server/licenses/lucene-analyzers-common-8.7.0-snapshot-9cd3af50f80.jar.sha1 b/server/licenses/lucene-analyzers-common-8.7.0-snapshot-9cd3af50f80.jar.sha1 deleted file mode 100644 index 2fd4dfd5fd6..00000000000 --- a/server/licenses/lucene-analyzers-common-8.7.0-snapshot-9cd3af50f80.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4f39f38a58ba8f1192c147aec896fdb3372d01e8 \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-8.7.0-snapshot-830bd186a8d.jar.sha1 b/server/licenses/lucene-backward-codecs-8.7.0-snapshot-830bd186a8d.jar.sha1 new file mode 100644 index 00000000000..247f7088fc1 --- /dev/null +++ b/server/licenses/lucene-backward-codecs-8.7.0-snapshot-830bd186a8d.jar.sha1 @@ -0,0 +1 @@ +d0269710e4c54ae429b7004fbe2d72d7e7b6e6c3 \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-8.7.0-snapshot-9cd3af50f80.jar.sha1 b/server/licenses/lucene-backward-codecs-8.7.0-snapshot-9cd3af50f80.jar.sha1 deleted file mode 100644 index f05f595bc67..00000000000 --- a/server/licenses/lucene-backward-codecs-8.7.0-snapshot-9cd3af50f80.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -03af3f9cffd07c56a91126fb23972efeb7637b43 \ No newline at end of file diff --git a/server/licenses/lucene-core-8.7.0-snapshot-830bd186a8d.jar.sha1 b/server/licenses/lucene-core-8.7.0-snapshot-830bd186a8d.jar.sha1 new file mode 100644 index 00000000000..17fd0ce7d28 --- /dev/null +++ b/server/licenses/lucene-core-8.7.0-snapshot-830bd186a8d.jar.sha1 @@ -0,0 +1 @@ +a634da70c00c91a3f71568fd888711312b0deaf7 \ No newline at end of file diff --git a/server/licenses/lucene-core-8.7.0-snapshot-9cd3af50f80.jar.sha1 b/server/licenses/lucene-core-8.7.0-snapshot-9cd3af50f80.jar.sha1 deleted file mode 100644 index 45379e5b997..00000000000 --- a/server/licenses/lucene-core-8.7.0-snapshot-9cd3af50f80.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -25d62b2f5a4f796ae0e525a982b31d2c51341be3 \ No newline at end of file diff --git a/server/licenses/lucene-grouping-8.7.0-snapshot-830bd186a8d.jar.sha1 b/server/licenses/lucene-grouping-8.7.0-snapshot-830bd186a8d.jar.sha1 new file mode 100644 index 00000000000..a6ae3ee0b9c --- /dev/null +++ b/server/licenses/lucene-grouping-8.7.0-snapshot-830bd186a8d.jar.sha1 @@ -0,0 +1 @@ +19666d433d1f00db94120224b1e44127a3322201 \ No newline at end of file diff --git a/server/licenses/lucene-grouping-8.7.0-snapshot-9cd3af50f80.jar.sha1 b/server/licenses/lucene-grouping-8.7.0-snapshot-9cd3af50f80.jar.sha1 deleted file mode 100644 index 5dc759c54ea..00000000000 --- a/server/licenses/lucene-grouping-8.7.0-snapshot-9cd3af50f80.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2f1a9fca2e3bd918cf017060a85a0bb1c808409d \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-8.7.0-snapshot-830bd186a8d.jar.sha1 b/server/licenses/lucene-highlighter-8.7.0-snapshot-830bd186a8d.jar.sha1 new file mode 100644 index 00000000000..845a32060f8 --- /dev/null +++ b/server/licenses/lucene-highlighter-8.7.0-snapshot-830bd186a8d.jar.sha1 @@ -0,0 +1 @@ +b3ec82ee53c13a22991c0d418ba7814a698f0841 \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-8.7.0-snapshot-9cd3af50f80.jar.sha1 b/server/licenses/lucene-highlighter-8.7.0-snapshot-9cd3af50f80.jar.sha1 deleted file mode 100644 index 2782d7939c6..00000000000 --- a/server/licenses/lucene-highlighter-8.7.0-snapshot-9cd3af50f80.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8ee51f51d8fc5b58e2c9edb055760b22dbae2346 \ No newline at end of file diff --git a/server/licenses/lucene-join-8.7.0-snapshot-830bd186a8d.jar.sha1 b/server/licenses/lucene-join-8.7.0-snapshot-830bd186a8d.jar.sha1 new file mode 100644 index 00000000000..b39f697f7d6 --- /dev/null +++ b/server/licenses/lucene-join-8.7.0-snapshot-830bd186a8d.jar.sha1 @@ -0,0 +1 @@ +7ca56a6cebb50899092124900f33d945ce7233c4 \ No newline at end of file diff --git a/server/licenses/lucene-join-8.7.0-snapshot-9cd3af50f80.jar.sha1 b/server/licenses/lucene-join-8.7.0-snapshot-9cd3af50f80.jar.sha1 deleted file mode 100644 index d14771668a6..00000000000 --- a/server/licenses/lucene-join-8.7.0-snapshot-9cd3af50f80.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6face13500e975b3710f086709d5badaec03f49a \ No newline at end of file diff --git a/server/licenses/lucene-memory-8.7.0-snapshot-830bd186a8d.jar.sha1 b/server/licenses/lucene-memory-8.7.0-snapshot-830bd186a8d.jar.sha1 new file mode 100644 index 00000000000..9dd42592b2c --- /dev/null +++ b/server/licenses/lucene-memory-8.7.0-snapshot-830bd186a8d.jar.sha1 @@ -0,0 +1 @@ +16911245a11527612f0180bd10b9be82ecbe9b55 \ No newline at end of file diff --git a/server/licenses/lucene-memory-8.7.0-snapshot-9cd3af50f80.jar.sha1 b/server/licenses/lucene-memory-8.7.0-snapshot-9cd3af50f80.jar.sha1 deleted file mode 100644 index ededa7808f5..00000000000 --- a/server/licenses/lucene-memory-8.7.0-snapshot-9cd3af50f80.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d2e078d2590829e3f4c593a8e37d99eae48ddd6c \ No newline at end of file diff --git a/server/licenses/lucene-misc-8.7.0-snapshot-830bd186a8d.jar.sha1 b/server/licenses/lucene-misc-8.7.0-snapshot-830bd186a8d.jar.sha1 new file mode 100644 index 00000000000..2a67a71f2dc --- /dev/null +++ b/server/licenses/lucene-misc-8.7.0-snapshot-830bd186a8d.jar.sha1 @@ -0,0 +1 @@ +f6adb514a50abad2b067bfe9ef3829b6962f3a1c \ No newline at end of file diff --git a/server/licenses/lucene-misc-8.7.0-snapshot-9cd3af50f80.jar.sha1 b/server/licenses/lucene-misc-8.7.0-snapshot-9cd3af50f80.jar.sha1 deleted file mode 100644 index 27d0b247b5a..00000000000 --- a/server/licenses/lucene-misc-8.7.0-snapshot-9cd3af50f80.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -62fdddbbafe4cecda591fc03c6e093aec8d28981 \ No newline at end of file diff --git a/server/licenses/lucene-queries-8.7.0-snapshot-830bd186a8d.jar.sha1 b/server/licenses/lucene-queries-8.7.0-snapshot-830bd186a8d.jar.sha1 new file mode 100644 index 00000000000..22703fedc30 --- /dev/null +++ b/server/licenses/lucene-queries-8.7.0-snapshot-830bd186a8d.jar.sha1 @@ -0,0 +1 @@ +a0e9bb6cdc6cc2eecdbb8be401662db36935da8a \ No newline at end of file diff --git a/server/licenses/lucene-queries-8.7.0-snapshot-9cd3af50f80.jar.sha1 b/server/licenses/lucene-queries-8.7.0-snapshot-9cd3af50f80.jar.sha1 deleted file mode 100644 index f66d7f51e3e..00000000000 --- a/server/licenses/lucene-queries-8.7.0-snapshot-9cd3af50f80.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -fc2347e8559394345932415a2a124bf81d6f22c0 \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-8.7.0-snapshot-830bd186a8d.jar.sha1 b/server/licenses/lucene-queryparser-8.7.0-snapshot-830bd186a8d.jar.sha1 new file mode 100644 index 00000000000..1bb6c386dce --- /dev/null +++ b/server/licenses/lucene-queryparser-8.7.0-snapshot-830bd186a8d.jar.sha1 @@ -0,0 +1 @@ +0d35c16d9e969ea9ee5a3594a12d56b81bbcbad7 \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-8.7.0-snapshot-9cd3af50f80.jar.sha1 b/server/licenses/lucene-queryparser-8.7.0-snapshot-9cd3af50f80.jar.sha1 deleted file mode 100644 index d7a8fb5c2d0..00000000000 --- a/server/licenses/lucene-queryparser-8.7.0-snapshot-9cd3af50f80.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c7f8321de0198ca879636fbc4dde0eac0d8ab855 \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-8.7.0-snapshot-830bd186a8d.jar.sha1 b/server/licenses/lucene-sandbox-8.7.0-snapshot-830bd186a8d.jar.sha1 new file mode 100644 index 00000000000..f05088ee7c4 --- /dev/null +++ b/server/licenses/lucene-sandbox-8.7.0-snapshot-830bd186a8d.jar.sha1 @@ -0,0 +1 @@ +8614efee0fde1d0ae22ea74d5c13323cd1f54572 \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-8.7.0-snapshot-9cd3af50f80.jar.sha1 b/server/licenses/lucene-sandbox-8.7.0-snapshot-9cd3af50f80.jar.sha1 deleted file mode 100644 index 1d25f334faa..00000000000 --- a/server/licenses/lucene-sandbox-8.7.0-snapshot-9cd3af50f80.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2ef99b2592c61cfd52c7e4982014ecbe26929540 \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-8.7.0-snapshot-830bd186a8d.jar.sha1 b/server/licenses/lucene-spatial-extras-8.7.0-snapshot-830bd186a8d.jar.sha1 new file mode 100644 index 00000000000..57e5c23cb9b --- /dev/null +++ b/server/licenses/lucene-spatial-extras-8.7.0-snapshot-830bd186a8d.jar.sha1 @@ -0,0 +1 @@ +5106571200056a68f0b6e555c9b2a0fe4429ee09 \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-8.7.0-snapshot-9cd3af50f80.jar.sha1 b/server/licenses/lucene-spatial-extras-8.7.0-snapshot-9cd3af50f80.jar.sha1 deleted file mode 100644 index 16f6b34bb1e..00000000000 --- a/server/licenses/lucene-spatial-extras-8.7.0-snapshot-9cd3af50f80.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -95bd7fa58d6a40251a028bd7af51087721a3185f \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-8.7.0-snapshot-830bd186a8d.jar.sha1 b/server/licenses/lucene-spatial3d-8.7.0-snapshot-830bd186a8d.jar.sha1 new file mode 100644 index 00000000000..262b8c5d6d4 --- /dev/null +++ b/server/licenses/lucene-spatial3d-8.7.0-snapshot-830bd186a8d.jar.sha1 @@ -0,0 +1 @@ +495ec1cecc01f87850305d1f2dbf1e859c961726 \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-8.7.0-snapshot-9cd3af50f80.jar.sha1 b/server/licenses/lucene-spatial3d-8.7.0-snapshot-9cd3af50f80.jar.sha1 deleted file mode 100644 index 46104fde9ff..00000000000 --- a/server/licenses/lucene-spatial3d-8.7.0-snapshot-9cd3af50f80.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4067b745014da2cdbcf18715caf08661d9c65c85 \ No newline at end of file diff --git a/server/licenses/lucene-suggest-8.7.0-snapshot-830bd186a8d.jar.sha1 b/server/licenses/lucene-suggest-8.7.0-snapshot-830bd186a8d.jar.sha1 new file mode 100644 index 00000000000..25f1b357093 --- /dev/null +++ b/server/licenses/lucene-suggest-8.7.0-snapshot-830bd186a8d.jar.sha1 @@ -0,0 +1 @@ +4b0f5152b0bdf834a47fb5aecd3b0cdf98e21f32 \ No newline at end of file diff --git a/server/licenses/lucene-suggest-8.7.0-snapshot-9cd3af50f80.jar.sha1 b/server/licenses/lucene-suggest-8.7.0-snapshot-9cd3af50f80.jar.sha1 deleted file mode 100644 index ec40e8aad92..00000000000 --- a/server/licenses/lucene-suggest-8.7.0-snapshot-9cd3af50f80.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6cd4bc79cd1d5816fc0c076f2a2063cbd6b79a77 \ No newline at end of file diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/DoubleValuesComparatorSource.java b/server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/DoubleValuesComparatorSource.java index ab537ebf09f..09e4f6e060b 100644 --- a/server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/DoubleValuesComparatorSource.java +++ b/server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/DoubleValuesComparatorSource.java @@ -23,8 +23,10 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.FieldComparator; +import org.apache.lucene.search.LeafFieldComparator; import org.apache.lucene.search.Scorable; import org.apache.lucene.search.SortField; +import org.apache.lucene.search.comparators.DoubleComparator; import org.apache.lucene.util.BitSet; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.util.BigArrays; @@ -83,14 +85,20 @@ public class DoubleValuesComparatorSource extends IndexFieldData.XFieldComparato final double dMissingValue = (Double) missingObject(missingValue, reversed); // NOTE: it's important to pass null as a missing value in the constructor so that // the comparator doesn't check docsWithField since we replace missing values in select() - return new FieldComparator.DoubleComparator(numHits, null, null) { + return new DoubleComparator(numHits, null, null, reversed, sortPos) { @Override - protected NumericDocValues getNumericDocValues(LeafReaderContext context, String field) throws IOException { - return DoubleValuesComparatorSource.this.getNumericDocValues(context, dMissingValue).getRawDoubleValues(); - } - @Override - public void setScorer(Scorable scorer) { - DoubleValuesComparatorSource.this.setScorer(scorer); + public LeafFieldComparator getLeafComparator(LeafReaderContext context) throws IOException { + return new DoubleLeafComparator(context) { + @Override + protected NumericDocValues getNumericDocValues(LeafReaderContext context, String field) throws IOException { + return DoubleValuesComparatorSource.this.getNumericDocValues(context, dMissingValue).getRawDoubleValues(); + } + + @Override + public void setScorer(Scorable scorer) { + DoubleValuesComparatorSource.this.setScorer(scorer); + } + }; } }; } diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/FloatValuesComparatorSource.java b/server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/FloatValuesComparatorSource.java index 1f646dcba05..265002be7aa 100644 --- a/server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/FloatValuesComparatorSource.java +++ b/server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/FloatValuesComparatorSource.java @@ -22,8 +22,10 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.FieldComparator; +import org.apache.lucene.search.LeafFieldComparator; import org.apache.lucene.search.Scorable; import org.apache.lucene.search.SortField; +import org.apache.lucene.search.comparators.FloatComparator; import org.apache.lucene.util.BitSet; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.util.BigArrays; @@ -76,10 +78,15 @@ public class FloatValuesComparatorSource extends IndexFieldData.XFieldComparator final float fMissingValue = (Float) missingObject(missingValue, reversed); // NOTE: it's important to pass null as a missing value in the constructor so that // the comparator doesn't check docsWithField since we replace missing values in select() - return new FieldComparator.FloatComparator(numHits, null, null) { + return new FloatComparator(numHits, null, null, reversed, sortPos) { @Override - protected NumericDocValues getNumericDocValues(LeafReaderContext context, String field) throws IOException { - return FloatValuesComparatorSource.this.getNumericDocValues(context, fMissingValue).getRawFloatValues(); + public LeafFieldComparator getLeafComparator(LeafReaderContext context) throws IOException { + return new FloatLeafComparator(context) { + @Override + protected NumericDocValues getNumericDocValues(LeafReaderContext context, String field) throws IOException { + return FloatValuesComparatorSource.this.getNumericDocValues(context, fMissingValue).getRawFloatValues(); + } + }; } }; } diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/LongValuesComparatorSource.java b/server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/LongValuesComparatorSource.java index 33e1ab33736..9b843c6db56 100644 --- a/server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/LongValuesComparatorSource.java +++ b/server/src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/LongValuesComparatorSource.java @@ -23,7 +23,9 @@ import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.index.SortedNumericDocValues; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.FieldComparator; +import org.apache.lucene.search.LeafFieldComparator; import org.apache.lucene.search.SortField; +import org.apache.lucene.search.comparators.LongComparator; import org.apache.lucene.util.BitSet; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.util.BigArrays; @@ -95,10 +97,15 @@ public class LongValuesComparatorSource extends IndexFieldData.XFieldComparatorS final long lMissingValue = (Long) missingObject(missingValue, reversed); // NOTE: it's important to pass null as a missing value in the constructor so that // the comparator doesn't check docsWithField since we replace missing values in select() - return new FieldComparator.LongComparator(numHits, null, null) { + return new LongComparator(numHits, null, null, reversed, sortPos) { @Override - protected NumericDocValues getNumericDocValues(LeafReaderContext context, String field) throws IOException { - return LongValuesComparatorSource.this.getNumericDocValues(context, lMissingValue); + public LeafFieldComparator getLeafComparator(LeafReaderContext context) throws IOException { + return new LongLeafComparator(context) { + @Override + protected NumericDocValues getNumericDocValues(LeafReaderContext context, String field) throws IOException { + return LongValuesComparatorSource.this.getNumericDocValues(context, lMissingValue); + } + }; } }; } diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java index ecb39acfb40..52defae72c4 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java @@ -32,6 +32,7 @@ import org.apache.lucene.search.DocIdSet; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.FieldComparator; import org.apache.lucene.search.FieldDoc; +import org.apache.lucene.search.LeafFieldComparator; import org.apache.lucene.search.Query; import org.apache.lucene.search.ScoreMode; import org.apache.lucene.search.Scorer; @@ -40,6 +41,7 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.search.SortedNumericSelector; import org.apache.lucene.search.SortedNumericSortField; import org.apache.lucene.search.Weight; +import org.apache.lucene.search.comparators.LongComparator; import org.apache.lucene.util.RoaringDocIdSet; import org.elasticsearch.common.lease.Releasables; import org.elasticsearch.index.IndexSortConfig; @@ -289,40 +291,47 @@ final class CompositeAggregator extends BucketsAggregator { @Override public FieldComparator getComparator(int numHits, int sortPos) { - return new FieldComparator.LongComparator(1, delegate.getField(), (Long) missingValue) { + return new LongComparator(1, delegate.getField(), (Long) missingValue, delegate.getReverse(), sortPos) { @Override - protected NumericDocValues getNumericDocValues(LeafReaderContext context, String field) throws IOException { - NumericDocValues dvs = SortedNumericSelector.wrap(DocValues.getSortedNumeric(context.reader(), field), - delegate.getSelector(), delegate.getNumericType()); - return new NumericDocValues() { + public LeafFieldComparator getLeafComparator(LeafReaderContext context) throws IOException { + return new LongLeafComparator(context) { @Override - public long longValue() throws IOException { - return round.applyAsLong(dvs.longValue()); - } + protected NumericDocValues getNumericDocValues(LeafReaderContext context, String field) + throws IOException { + NumericDocValues dvs = SortedNumericSelector.wrap( + DocValues.getSortedNumeric(context.reader(), field), + delegate.getSelector(), delegate.getNumericType()); + return new NumericDocValues() { + @Override + public long longValue() throws IOException { + return round.applyAsLong(dvs.longValue()); + } - @Override - public boolean advanceExact(int target) throws IOException { - return dvs.advanceExact(target); - } + @Override + public boolean advanceExact(int target) throws IOException { + return dvs.advanceExact(target); + } - @Override - public int docID() { - return dvs.docID(); - } + @Override + public int docID() { + return dvs.docID(); + } - @Override - public int nextDoc() throws IOException { - return dvs.nextDoc(); - } + @Override + public int nextDoc() throws IOException { + return dvs.nextDoc(); + } - @Override - public int advance(int target) throws IOException { - return dvs.advance(target); - } + @Override + public int advance(int target) throws IOException { + return dvs.advance(target); + } - @Override - public long cost() { - return dvs.cost(); + @Override + public long cost() { + return dvs.cost(); + } + }; } }; } diff --git a/server/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java b/server/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java index cad13b83397..3e3b9dc7f2c 100644 --- a/server/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java @@ -24,7 +24,9 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.FieldComparator; +import org.apache.lucene.search.LeafFieldComparator; import org.apache.lucene.search.SortField; +import org.apache.lucene.search.comparators.DoubleComparator; import org.apache.lucene.util.BitSet; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.Version; @@ -699,10 +701,15 @@ public class GeoDistanceSortBuilder extends SortBuilder @Override public FieldComparator newComparator(String fieldname, int numHits, int sortPos, boolean reversed) { - return new FieldComparator.DoubleComparator(numHits, null, null) { + return new DoubleComparator(numHits, null, null, reversed, sortPos) { @Override - protected NumericDocValues getNumericDocValues(LeafReaderContext context, String field) throws IOException { - return getNumericDoubleValues(context).getRawDoubleValues(); + public LeafFieldComparator getLeafComparator(LeafReaderContext context) throws IOException { + return new DoubleLeafComparator(context) { + @Override + protected NumericDocValues getNumericDocValues(LeafReaderContext context, String field) throws IOException { + return getNumericDoubleValues(context).getRawDoubleValues(); + } + }; } }; } diff --git a/server/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java b/server/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java index 4524adba4a5..cc1d90e7d04 100644 --- a/server/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java +++ b/server/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java @@ -670,11 +670,11 @@ public class QueryPhaseTests extends IndexShardTestCase { context.sort(new SortAndFormats(new Sort(new SortField("other", SortField.Type.INT)), new DocValueFormat[]{DocValueFormat.RAW})); topDocsContext = TopDocsCollectorContext.createTopDocsCollectorContext(context, false); - assertEquals(topDocsContext.create(null).scoreMode(), org.apache.lucene.search.ScoreMode.COMPLETE_NO_SCORES); + assertEquals(topDocsContext.create(null).scoreMode(), org.apache.lucene.search.ScoreMode.TOP_DOCS); QueryPhase.executeInternal(context); assertEquals(5, context.queryResult().topDocs().topDocs.totalHits.value); assertThat(context.queryResult().topDocs().topDocs.scoreDocs.length, equalTo(3)); - assertEquals(context.queryResult().topDocs().topDocs.totalHits.relation, TotalHits.Relation.EQUAL_TO); + assertEquals(context.queryResult().topDocs().topDocs.totalHits.relation, TotalHits.Relation.GREATER_THAN_OR_EQUAL_TO); reader.close(); dir.close(); diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.7.0-snapshot-830bd186a8d.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.7.0-snapshot-830bd186a8d.jar.sha1 new file mode 100644 index 00000000000..17fd0ce7d28 --- /dev/null +++ b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.7.0-snapshot-830bd186a8d.jar.sha1 @@ -0,0 +1 @@ +a634da70c00c91a3f71568fd888711312b0deaf7 \ No newline at end of file diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.7.0-snapshot-9cd3af50f80.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.7.0-snapshot-9cd3af50f80.jar.sha1 deleted file mode 100644 index 45379e5b997..00000000000 --- a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.7.0-snapshot-9cd3af50f80.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -25d62b2f5a4f796ae0e525a982b31d2c51341be3 \ No newline at end of file