diff --git a/buildSrc/version.properties b/buildSrc/version.properties index c75cea2a32b..e797a04ab18 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -1,5 +1,5 @@ elasticsearch = 7.4.0 -lucene = 8.1.0 +lucene = 8.2.0-snapshot-860e0be5378 bundled_jdk = 12.0.1+12@69cfe15208a647278a19ef0990eea691 diff --git a/docs/Versions.asciidoc b/docs/Versions.asciidoc index c97bb7a6138..c4fd4ff6a7a 100644 --- a/docs/Versions.asciidoc +++ b/docs/Versions.asciidoc @@ -5,8 +5,8 @@ bare_version never includes -alpha or -beta :bare_version: 7.4.0 :major-version: 7.x :prev-major-version: 6.x -:lucene_version: 8.1.0 -:lucene_version_path: 8_1_0 +:lucene_version: 8.2.0 +:lucene_version_path: 8_2_0 :branch: 7.x :jdk: 1.8.0_131 :jdk_major: 8 diff --git a/modules/lang-expression/licenses/lucene-expressions-8.1.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.1.0.jar.sha1 deleted file mode 100644 index 2554e8ce526..00000000000 --- a/modules/lang-expression/licenses/lucene-expressions-8.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0c98e3b9d25f27ab05ac643cfb28756daa516bc7 \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-expressions-8.2.0-snapshot-860e0be5378.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.2.0-snapshot-860e0be5378.jar.sha1 new file mode 100644 index 00000000000..0489db9e965 --- /dev/null +++ b/modules/lang-expression/licenses/lucene-expressions-8.2.0-snapshot-860e0be5378.jar.sha1 @@ -0,0 +1 @@ +779a843cfa50fc09eb0cbadebe1ae2de35fb80b4 \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.1.0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.1.0.jar.sha1 deleted file mode 100644 index e4657681667..00000000000 --- a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d61364290eb1c28696e62b7df3a7d041d3be2fa5 \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.2.0-snapshot-860e0be5378.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.2.0-snapshot-860e0be5378.jar.sha1 new file mode 100644 index 00000000000..fdfcfb3d187 --- /dev/null +++ b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.2.0-snapshot-860e0be5378.jar.sha1 @@ -0,0 +1 @@ +9ec124ed1efe19b6a6ebdc9ce299d2a3726cf040 \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.1.0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.1.0.jar.sha1 deleted file mode 100644 index fff37598a08..00000000000 --- a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7f78b18890a0a0e74a8249806a6cfcabd2fae304 \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.2.0-snapshot-860e0be5378.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.2.0-snapshot-860e0be5378.jar.sha1 new file mode 100644 index 00000000000..632365824e7 --- /dev/null +++ b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.2.0-snapshot-860e0be5378.jar.sha1 @@ -0,0 +1 @@ +86c02792e73efdc762e2e65ea7e78912ca01ab65 \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.1.0.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.1.0.jar.sha1 deleted file mode 100644 index 47b0c633fdc..00000000000 --- a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bfc6b5d67a792aa23ee134fe93307696aad94223 \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.2.0-snapshot-860e0be5378.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.2.0-snapshot-860e0be5378.jar.sha1 new file mode 100644 index 00000000000..9891fee684b --- /dev/null +++ b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.2.0-snapshot-860e0be5378.jar.sha1 @@ -0,0 +1 @@ +7fd7096cbee02f0c888df1bf391e0fe2d12422e6 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.1.0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.1.0.jar.sha1 deleted file mode 100644 index d24096b883f..00000000000 --- a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6fac1ff799b86f872b67e7fad55120d338daa86f \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.2.0-snapshot-860e0be5378.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.2.0-snapshot-860e0be5378.jar.sha1 new file mode 100644 index 00000000000..933870a30ee --- /dev/null +++ b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.2.0-snapshot-860e0be5378.jar.sha1 @@ -0,0 +1 @@ +9d22bef4e7aa7b651eda01ad99e608018da9527d \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.1.0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.1.0.jar.sha1 deleted file mode 100644 index 9ed51a53f62..00000000000 --- a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -72941af5e1bfb012aec04dd518a2deb43402702c \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.2.0-snapshot-860e0be5378.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.2.0-snapshot-860e0be5378.jar.sha1 new file mode 100644 index 00000000000..1302bc92a02 --- /dev/null +++ b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.2.0-snapshot-860e0be5378.jar.sha1 @@ -0,0 +1 @@ +1600d60203bf6b53244668352f4026653497abd1 \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.1.0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.1.0.jar.sha1 deleted file mode 100644 index 190a7031928..00000000000 --- a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0ac885595cfdc0267d7d9cb843c22dabf7215ff0 \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.2.0-snapshot-860e0be5378.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.2.0-snapshot-860e0be5378.jar.sha1 new file mode 100644 index 00000000000..99ecca008f2 --- /dev/null +++ b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.2.0-snapshot-860e0be5378.jar.sha1 @@ -0,0 +1 @@ +2902e1e58cf5d8bbb2ed98d85b1dcddff3b46cbe \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.1.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.1.0.jar.sha1 deleted file mode 100644 index 7f2d4c5e864..00000000000 --- a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e260cff7f48e350e1ec037dec1c260ce05ddb53e \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.2.0-snapshot-860e0be5378.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.2.0-snapshot-860e0be5378.jar.sha1 new file mode 100644 index 00000000000..2ad051fc297 --- /dev/null +++ b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.2.0-snapshot-860e0be5378.jar.sha1 @@ -0,0 +1 @@ +d85bddbdc8a890bd90b572b7fe8e8f944af7fc70 \ No newline at end of file diff --git a/server/licenses/lucene-analyzers-common-8.1.0.jar.sha1 b/server/licenses/lucene-analyzers-common-8.1.0.jar.sha1 deleted file mode 100644 index 6eb7722fec7..00000000000 --- a/server/licenses/lucene-analyzers-common-8.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -262f20cb2786cdf7015a4ba1a64ce90ff2d746f5 \ No newline at end of file diff --git a/server/licenses/lucene-analyzers-common-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-analyzers-common-8.2.0-snapshot-860e0be5378.jar.sha1 new file mode 100644 index 00000000000..10251422007 --- /dev/null +++ b/server/licenses/lucene-analyzers-common-8.2.0-snapshot-860e0be5378.jar.sha1 @@ -0,0 +1 @@ +ceed9fd2c88f62b9f039e28eef57f5d95e71c578 \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-8.1.0.jar.sha1 b/server/licenses/lucene-backward-codecs-8.1.0.jar.sha1 deleted file mode 100644 index c232e0fbdfd..00000000000 --- a/server/licenses/lucene-backward-codecs-8.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c5610306f8eff182b399b9aed7a60b82668a8395 \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-backward-codecs-8.2.0-snapshot-860e0be5378.jar.sha1 new file mode 100644 index 00000000000..d638c9f017a --- /dev/null +++ b/server/licenses/lucene-backward-codecs-8.2.0-snapshot-860e0be5378.jar.sha1 @@ -0,0 +1 @@ +24feeb6db1bc38b1a7aa31eaa052b5af323f206c \ No newline at end of file diff --git a/server/licenses/lucene-core-8.1.0.jar.sha1 b/server/licenses/lucene-core-8.1.0.jar.sha1 deleted file mode 100644 index 4a6aa7b0986..00000000000 --- a/server/licenses/lucene-core-8.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -46d614acdeb42f4661e91347100217bc72aae11e \ No newline at end of file diff --git a/server/licenses/lucene-core-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-core-8.2.0-snapshot-860e0be5378.jar.sha1 new file mode 100644 index 00000000000..2c872c6c74d --- /dev/null +++ b/server/licenses/lucene-core-8.2.0-snapshot-860e0be5378.jar.sha1 @@ -0,0 +1 @@ +d5f5b26c967dce353db5b69f52a22ab1c39e3ce6 \ No newline at end of file diff --git a/server/licenses/lucene-grouping-8.1.0.jar.sha1 b/server/licenses/lucene-grouping-8.1.0.jar.sha1 deleted file mode 100644 index f3c49cb193a..00000000000 --- a/server/licenses/lucene-grouping-8.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -443f63d9038eea0601b493fa37fc599d74b035eb \ No newline at end of file diff --git a/server/licenses/lucene-grouping-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-grouping-8.2.0-snapshot-860e0be5378.jar.sha1 new file mode 100644 index 00000000000..0db201810e6 --- /dev/null +++ b/server/licenses/lucene-grouping-8.2.0-snapshot-860e0be5378.jar.sha1 @@ -0,0 +1 @@ +45d506e861bcfe5dcffeab89e08f046934b540cb \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-8.1.0.jar.sha1 b/server/licenses/lucene-highlighter-8.1.0.jar.sha1 deleted file mode 100644 index 6b174859e18..00000000000 --- a/server/licenses/lucene-highlighter-8.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e3e52591f8d44a4e1006ced4dd4a67f7a572990a \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-highlighter-8.2.0-snapshot-860e0be5378.jar.sha1 new file mode 100644 index 00000000000..b3d533aa842 --- /dev/null +++ b/server/licenses/lucene-highlighter-8.2.0-snapshot-860e0be5378.jar.sha1 @@ -0,0 +1 @@ +0a6c96eff6c944ec576873e1d1936fd6b265afd4 \ No newline at end of file diff --git a/server/licenses/lucene-join-8.1.0.jar.sha1 b/server/licenses/lucene-join-8.1.0.jar.sha1 deleted file mode 100644 index 75232f1fc0a..00000000000 --- a/server/licenses/lucene-join-8.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2e885b1e3e55f94ccc2744f85738563a577a4e21 \ No newline at end of file diff --git a/server/licenses/lucene-join-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-join-8.2.0-snapshot-860e0be5378.jar.sha1 new file mode 100644 index 00000000000..3cd1d2e8de2 --- /dev/null +++ b/server/licenses/lucene-join-8.2.0-snapshot-860e0be5378.jar.sha1 @@ -0,0 +1 @@ +9b9fba1279c24d2daac0a8c54228c0bbc4375d60 \ No newline at end of file diff --git a/server/licenses/lucene-memory-8.1.0.jar.sha1 b/server/licenses/lucene-memory-8.1.0.jar.sha1 deleted file mode 100644 index 4b2c65af32d..00000000000 --- a/server/licenses/lucene-memory-8.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e58d0092da1c4744627d57d022f4e07d8b80d11b \ No newline at end of file diff --git a/server/licenses/lucene-memory-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-memory-8.2.0-snapshot-860e0be5378.jar.sha1 new file mode 100644 index 00000000000..48f63afb6b1 --- /dev/null +++ b/server/licenses/lucene-memory-8.2.0-snapshot-860e0be5378.jar.sha1 @@ -0,0 +1 @@ +d723326c2d973928a07868ec97282dea2f3ae511 \ No newline at end of file diff --git a/server/licenses/lucene-misc-8.1.0.jar.sha1 b/server/licenses/lucene-misc-8.1.0.jar.sha1 deleted file mode 100644 index 37afcfadb7e..00000000000 --- a/server/licenses/lucene-misc-8.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -07833aee2c5feb6fa1a16a21d27c8f15c01d0b4c \ No newline at end of file diff --git a/server/licenses/lucene-misc-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-misc-8.2.0-snapshot-860e0be5378.jar.sha1 new file mode 100644 index 00000000000..0e70cd39fe3 --- /dev/null +++ b/server/licenses/lucene-misc-8.2.0-snapshot-860e0be5378.jar.sha1 @@ -0,0 +1 @@ +5c5422ee3afeebbe6114ef989888e15a7fd7af0e \ No newline at end of file diff --git a/server/licenses/lucene-queries-8.1.0.jar.sha1 b/server/licenses/lucene-queries-8.1.0.jar.sha1 deleted file mode 100644 index 7f09849b676..00000000000 --- a/server/licenses/lucene-queries-8.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -63096d40298b8b8245a602d344b57bfa14b929fd \ No newline at end of file diff --git a/server/licenses/lucene-queries-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-queries-8.2.0-snapshot-860e0be5378.jar.sha1 new file mode 100644 index 00000000000..23c3817b968 --- /dev/null +++ b/server/licenses/lucene-queries-8.2.0-snapshot-860e0be5378.jar.sha1 @@ -0,0 +1 @@ +5006b9e0ef1bc9c9857742c898ab79eb276891c5 \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-8.1.0.jar.sha1 b/server/licenses/lucene-queryparser-8.1.0.jar.sha1 deleted file mode 100644 index ada3ec974e0..00000000000 --- a/server/licenses/lucene-queryparser-8.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9bb4fb3c7035a877e4a87ed86870894509d26d65 \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-queryparser-8.2.0-snapshot-860e0be5378.jar.sha1 new file mode 100644 index 00000000000..d50afd9c08e --- /dev/null +++ b/server/licenses/lucene-queryparser-8.2.0-snapshot-860e0be5378.jar.sha1 @@ -0,0 +1 @@ +a2e1ef30071d5f5da5b2c515455c70919e131d43 \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-8.1.0.jar.sha1 b/server/licenses/lucene-sandbox-8.1.0.jar.sha1 deleted file mode 100644 index 422195c73c6..00000000000 --- a/server/licenses/lucene-sandbox-8.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1033737c97703516134ba4c99d41724729854df4 \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-sandbox-8.2.0-snapshot-860e0be5378.jar.sha1 new file mode 100644 index 00000000000..b225f75d509 --- /dev/null +++ b/server/licenses/lucene-sandbox-8.2.0-snapshot-860e0be5378.jar.sha1 @@ -0,0 +1 @@ +921849a9546d7582b530415ceb718896bde3f017 \ No newline at end of file diff --git a/server/licenses/lucene-spatial-8.1.0.jar.sha1 b/server/licenses/lucene-spatial-8.1.0.jar.sha1 deleted file mode 100644 index e0d8f362a1e..00000000000 --- a/server/licenses/lucene-spatial-8.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -968d2fb35b0c2e68ac07c1ec187ab38a74b6602a \ No newline at end of file diff --git a/server/licenses/lucene-spatial-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-spatial-8.2.0-snapshot-860e0be5378.jar.sha1 new file mode 100644 index 00000000000..cf160c5cb91 --- /dev/null +++ b/server/licenses/lucene-spatial-8.2.0-snapshot-860e0be5378.jar.sha1 @@ -0,0 +1 @@ +81aecdc5655a43de5de16d27e7c9f79dd22e338a \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-8.1.0.jar.sha1 b/server/licenses/lucene-spatial-extras-8.1.0.jar.sha1 deleted file mode 100644 index 0a45cfe117a..00000000000 --- a/server/licenses/lucene-spatial-extras-8.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -551b7fa327645d3fd59ae1321320153b2f858766 \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-spatial-extras-8.2.0-snapshot-860e0be5378.jar.sha1 new file mode 100644 index 00000000000..0a6eaad890e --- /dev/null +++ b/server/licenses/lucene-spatial-extras-8.2.0-snapshot-860e0be5378.jar.sha1 @@ -0,0 +1 @@ +268880a91f20eed94c5e48e53d50b7b9a32680d0 \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-8.1.0.jar.sha1 b/server/licenses/lucene-spatial3d-8.1.0.jar.sha1 deleted file mode 100644 index 9cdde5a308e..00000000000 --- a/server/licenses/lucene-spatial3d-8.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -45e63df708be458e95d9da3e6054189c50c30dff \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-spatial3d-8.2.0-snapshot-860e0be5378.jar.sha1 new file mode 100644 index 00000000000..1a336741a65 --- /dev/null +++ b/server/licenses/lucene-spatial3d-8.2.0-snapshot-860e0be5378.jar.sha1 @@ -0,0 +1 @@ +72169e3d35627df0c6f713288a7a32d02fb13117 \ No newline at end of file diff --git a/server/licenses/lucene-suggest-8.1.0.jar.sha1 b/server/licenses/lucene-suggest-8.1.0.jar.sha1 deleted file mode 100644 index c4ac6e68080..00000000000 --- a/server/licenses/lucene-suggest-8.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d5cd0e619b473e132f03e3577d1b422f050f99c0 \ No newline at end of file diff --git a/server/licenses/lucene-suggest-8.2.0-snapshot-860e0be5378.jar.sha1 b/server/licenses/lucene-suggest-8.2.0-snapshot-860e0be5378.jar.sha1 new file mode 100644 index 00000000000..95d612b2866 --- /dev/null +++ b/server/licenses/lucene-suggest-8.2.0-snapshot-860e0be5378.jar.sha1 @@ -0,0 +1 @@ +3b33ee4801404570028e8431ccb327e37a20ddfa \ No newline at end of file diff --git a/server/src/main/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighter.java b/server/src/main/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighter.java index 4dd36896bf3..2d35de522b5 100644 --- a/server/src/main/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighter.java +++ b/server/src/main/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighter.java @@ -137,10 +137,10 @@ public class CustomUnifiedHighlighter extends UnifiedHighlighter { Set highlightFlags = getFlags(field); PhraseHelper phraseHelper = getPhraseHelper(field, query, highlightFlags); CharacterRunAutomaton[] automata = getAutomata(field, query, highlightFlags); - OffsetSource offsetSource = getOptimizedOffsetSource(field, terms, phraseHelper, automata); + UHComponents components = new UHComponents(field, fieldMatcher, query, terms, phraseHelper, automata, false , highlightFlags); + OffsetSource offsetSource = getOptimizedOffsetSource(components); BreakIterator breakIterator = new SplittingBreakIterator(getBreakIterator(field), UnifiedHighlighter.MULTIVAL_SEP_CHAR); - UHComponents components = new UHComponents(field, fieldMatcher, query, terms, phraseHelper, automata, highlightFlags); FieldOffsetStrategy strategy = getOffsetStrategy(offsetSource, components); return new CustomFieldHighlighter(field, strategy, breakIteratorLocale, breakIterator, getScorer(field), maxPassages, (noMatchSize > 0 ? 1 : 0), getFormatter(field), noMatchSize, fieldValue); diff --git a/server/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java index efc9ef77e5f..a2babe91137 100644 --- a/server/src/main/java/org/elasticsearch/Version.java +++ b/server/src/main/java/org/elasticsearch/Version.java @@ -104,7 +104,7 @@ public class Version implements Comparable, ToXContentFragment { public static final Version V_7_2_0 = new Version(7020099, org.apache.lucene.util.Version.LUCENE_8_0_0); public static final Version V_7_2_1 = new Version(7020199, org.apache.lucene.util.Version.LUCENE_8_0_0); public static final Version V_7_3_0 = new Version(7030099, org.apache.lucene.util.Version.LUCENE_8_1_0); - public static final Version V_7_4_0 = new Version(7040099, org.apache.lucene.util.Version.LUCENE_8_1_0); + public static final Version V_7_4_0 = new Version(7040099, org.apache.lucene.util.Version.LUCENE_8_2_0); public static final Version CURRENT = V_7_4_0; private static final ImmutableOpenIntMap idToVersion; diff --git a/server/src/main/java/org/elasticsearch/common/geo/ShapeRelation.java b/server/src/main/java/org/elasticsearch/common/geo/ShapeRelation.java index e2e177c8f0f..23ba2f3ef69 100644 --- a/server/src/main/java/org/elasticsearch/common/geo/ShapeRelation.java +++ b/server/src/main/java/org/elasticsearch/common/geo/ShapeRelation.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.geo; -import org.apache.lucene.document.LatLonShape.QueryRelation; +import org.apache.lucene.document.ShapeField.QueryRelation; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; diff --git a/server/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java b/server/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java index 411045abaf7..1a7840407a1 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java @@ -34,7 +34,7 @@ import org.apache.lucene.search.MultiTermQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermInSetQuery; import org.apache.lucene.search.TermQuery; -import org.apache.lucene.search.intervals.IntervalsSource; +import org.apache.lucene.queries.intervals.IntervalsSource; import org.apache.lucene.search.spans.SpanMultiTermQueryWrapper; import org.apache.lucene.search.spans.SpanQuery; import org.apache.lucene.util.BytesRef; diff --git a/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java index 6c252451da7..b53d618fd23 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/TextFieldMapper.java @@ -44,8 +44,8 @@ import org.apache.lucene.search.PrefixQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.SynonymQuery; import org.apache.lucene.search.TermQuery; -import org.apache.lucene.search.intervals.Intervals; -import org.apache.lucene.search.intervals.IntervalsSource; +import org.apache.lucene.queries.intervals.Intervals; +import org.apache.lucene.queries.intervals.IntervalsSource; import org.apache.lucene.search.spans.FieldMaskingSpanQuery; import org.apache.lucene.search.spans.SpanMultiTermQueryWrapper; import org.apache.lucene.search.spans.SpanNearQuery; @@ -425,7 +425,7 @@ public class TextFieldMapper extends FieldMapper { public IntervalsSource intervals(BytesRef term) { if (term.length > maxChars) { - return Intervals.prefix(term.utf8ToString()); + return Intervals.prefix(term); } if (term.length >= minChars) { return Intervals.fixField(name(), Intervals.term(term)); @@ -435,7 +435,7 @@ public class TextFieldMapper extends FieldMapper { sb.append("?"); } String wildcardTerm = sb.toString(); - return Intervals.or(Intervals.fixField(name(), Intervals.wildcard(wildcardTerm)), Intervals.term(term)); + return Intervals.or(Intervals.fixField(name(), Intervals.wildcard(new BytesRef(wildcardTerm))), Intervals.term(term)); } @Override @@ -679,7 +679,7 @@ public class TextFieldMapper extends FieldMapper { if (prefixFieldType != null) { return prefixFieldType.intervals(normalizedTerm); } - return Intervals.prefix(normalizedTerm.utf8ToString()); // TODO make Intervals.prefix() take a BytesRef + return Intervals.prefix(normalizedTerm); } IntervalBuilder builder = new IntervalBuilder(name(), analyzer == null ? searchAnalyzer() : analyzer); return builder.analyzeText(text, maxGaps, ordered); diff --git a/server/src/main/java/org/elasticsearch/index/query/IntervalBuilder.java b/server/src/main/java/org/elasticsearch/index/query/IntervalBuilder.java index 5e104768484..a1970759460 100644 --- a/server/src/main/java/org/elasticsearch/index/query/IntervalBuilder.java +++ b/server/src/main/java/org/elasticsearch/index/query/IntervalBuilder.java @@ -29,9 +29,9 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.MatchesIterator; import org.apache.lucene.search.QueryVisitor; -import org.apache.lucene.search.intervals.IntervalIterator; -import org.apache.lucene.search.intervals.Intervals; -import org.apache.lucene.search.intervals.IntervalsSource; +import org.apache.lucene.queries.intervals.IntervalIterator; +import org.apache.lucene.queries.intervals.Intervals; +import org.apache.lucene.queries.intervals.IntervalsSource; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.graph.GraphTokenStreamFiniteStrings; diff --git a/server/src/main/java/org/elasticsearch/index/query/IntervalFilterScript.java b/server/src/main/java/org/elasticsearch/index/query/IntervalFilterScript.java index 306560b3d5f..1f86179dca7 100644 --- a/server/src/main/java/org/elasticsearch/index/query/IntervalFilterScript.java +++ b/server/src/main/java/org/elasticsearch/index/query/IntervalFilterScript.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.query; -import org.apache.lucene.search.intervals.IntervalIterator; +import org.apache.lucene.queries.intervals.IntervalIterator; import org.elasticsearch.script.ScriptContext; /** diff --git a/server/src/main/java/org/elasticsearch/index/query/IntervalQueryBuilder.java b/server/src/main/java/org/elasticsearch/index/query/IntervalQueryBuilder.java index b9ea7d96e46..4813adfc4d3 100644 --- a/server/src/main/java/org/elasticsearch/index/query/IntervalQueryBuilder.java +++ b/server/src/main/java/org/elasticsearch/index/query/IntervalQueryBuilder.java @@ -21,7 +21,7 @@ package org.elasticsearch.index.query; import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.Query; -import org.apache.lucene.search.intervals.IntervalQuery; +import org.apache.lucene.queries.intervals.IntervalQuery; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/elasticsearch/index/query/IntervalsSourceProvider.java b/server/src/main/java/org/elasticsearch/index/query/IntervalsSourceProvider.java index d4d28057c12..b81206c7f87 100644 --- a/server/src/main/java/org/elasticsearch/index/query/IntervalsSourceProvider.java +++ b/server/src/main/java/org/elasticsearch/index/query/IntervalsSourceProvider.java @@ -20,10 +20,10 @@ package org.elasticsearch.index.query; import org.apache.lucene.index.IndexOptions; -import org.apache.lucene.search.intervals.FilteredIntervalsSource; -import org.apache.lucene.search.intervals.IntervalIterator; -import org.apache.lucene.search.intervals.Intervals; -import org.apache.lucene.search.intervals.IntervalsSource; +import org.apache.lucene.queries.intervals.FilteredIntervalsSource; +import org.apache.lucene.queries.intervals.IntervalIterator; +import org.apache.lucene.queries.intervals.Intervals; +import org.apache.lucene.queries.intervals.IntervalsSource; import org.apache.lucene.util.BytesRef; import org.elasticsearch.Version; import org.elasticsearch.common.ParseField; @@ -585,12 +585,12 @@ public abstract class IntervalsSourceProvider implements NamedWriteable, ToXCont } BytesRef normalizedTerm = analyzer.normalize(useField, pattern); // TODO Intervals.wildcard() should take BytesRef - source = Intervals.fixField(useField, Intervals.wildcard(normalizedTerm.utf8ToString())); + source = Intervals.fixField(useField, Intervals.wildcard(normalizedTerm)); } else { checkPositions(fieldType); BytesRef normalizedTerm = analyzer.normalize(fieldType.name(), pattern); - source = Intervals.wildcard(normalizedTerm.utf8ToString()); + source = Intervals.wildcard(normalizedTerm); } return source; } diff --git a/server/src/test/java/org/elasticsearch/index/query/IntervalBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/IntervalBuilderTests.java index 69464edb513..8c14fead824 100644 --- a/server/src/test/java/org/elasticsearch/index/query/IntervalBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/IntervalBuilderTests.java @@ -23,8 +23,8 @@ import org.apache.lucene.analysis.CachingTokenFilter; import org.apache.lucene.analysis.CannedTokenStream; import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.standard.StandardAnalyzer; -import org.apache.lucene.search.intervals.Intervals; -import org.apache.lucene.search.intervals.IntervalsSource; +import org.apache.lucene.queries.intervals.Intervals; +import org.apache.lucene.queries.intervals.IntervalsSource; import org.elasticsearch.test.ESTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/query/IntervalQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/IntervalQueryBuilderTests.java index c480b52c6dc..01a11450392 100644 --- a/server/src/test/java/org/elasticsearch/index/query/IntervalQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/IntervalQueryBuilderTests.java @@ -22,8 +22,9 @@ package org.elasticsearch.index.query; import org.apache.lucene.search.BoostQuery; import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.Query; -import org.apache.lucene.search.intervals.IntervalQuery; -import org.apache.lucene.search.intervals.Intervals; +import org.apache.lucene.queries.intervals.IntervalQuery; +import org.apache.lucene.queries.intervals.Intervals; +import org.apache.lucene.util.BytesRef; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.Strings; import org.elasticsearch.common.compress.CompressedXContent; @@ -395,7 +396,7 @@ public class IntervalQueryBuilderTests extends AbstractQueryTestCase missing = new TreeSet(org.apache.lucene.analysis.util.TokenizerFactory.availableTokenizers()); + Set missing = new TreeSet(); + missing.addAll(org.apache.lucene.analysis.util.TokenizerFactory.availableTokenizers() + .stream().map(key -> key.toLowerCase(Locale.ROOT)).collect(Collectors.toSet())); missing.removeAll(getTokenizers().keySet()); assertTrue("new tokenizers found, please update KNOWN_TOKENIZERS: " + missing.toString(), missing.isEmpty()); } public void testCharFilters() { - Set missing = new TreeSet(org.apache.lucene.analysis.util.CharFilterFactory.availableCharFilters()); + Set missing = new TreeSet(); + missing.addAll(org.apache.lucene.analysis.util.CharFilterFactory.availableCharFilters() + .stream().map(key -> key.toLowerCase(Locale.ROOT)).collect(Collectors.toSet())); missing.removeAll(getCharFilters().keySet()); assertTrue("new charfilters found, please update KNOWN_CHARFILTERS: " + missing.toString(), missing.isEmpty()); } public void testTokenFilters() { - Set missing = new TreeSet(org.apache.lucene.analysis.util.TokenFilterFactory.availableTokenFilters()); + Set missing = new TreeSet(); + missing.addAll(org.apache.lucene.analysis.util.TokenFilterFactory.availableTokenFilters() + .stream().map(key -> key.toLowerCase(Locale.ROOT)).collect(Collectors.toSet())); missing.removeAll(getTokenFilters().keySet()); assertTrue("new tokenfilters found, please update KNOWN_TOKENFILTERS: " + missing.toString(), missing.isEmpty()); } diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.1.0.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.1.0.jar.sha1 deleted file mode 100644 index 4a6aa7b0986..00000000000 --- a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -46d614acdeb42f4661e91347100217bc72aae11e \ No newline at end of file diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.2.0-snapshot-860e0be5378.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.2.0-snapshot-860e0be5378.jar.sha1 new file mode 100644 index 00000000000..2c872c6c74d --- /dev/null +++ b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.2.0-snapshot-860e0be5378.jar.sha1 @@ -0,0 +1 @@ +d5f5b26c967dce353db5b69f52a22ab1c39e3ce6 \ No newline at end of file