From 87e72156ce54aa25b7dc61b45d6ccbf45a2fe07c Mon Sep 17 00:00:00 2001 From: Adrien Grand Date: Tue, 10 Dec 2019 18:04:58 +0100 Subject: [PATCH] Upgrade to lucene 8.4.0-snapshot-662c455. (#50016) (#50039) Lucene 8.4 is about to be released so we should check it doesn't cause problems with Elasticsearch. --- buildSrc/version.properties | 2 +- .../reference/mapping/params/normalizer.asciidoc | 6 +++--- docs/reference/search/explain.asciidoc | 8 ++++---- docs/reference/search/request-body.asciidoc | 4 ++-- .../search/request/highlighting.asciidoc | 8 ++++---- .../reference/search/request/inner-hits.asciidoc | 8 ++++---- docs/reference/search/search.asciidoc | 4 ++-- docs/reference/search/uri-request.asciidoc | 4 ++-- ...e-expressions-8.4.0-snapshot-662c455.jar.sha1 | 1 + ...pressions-8.4.0-snapshot-e648d601efb.jar.sha1 | 1 - ...analyzers-icu-8.4.0-snapshot-662c455.jar.sha1 | 1 + ...yzers-icu-8.4.0-snapshot-e648d601efb.jar.sha1 | 1 - ...zers-kuromoji-8.4.0-snapshot-662c455.jar.sha1 | 1 + ...-kuromoji-8.4.0-snapshot-e648d601efb.jar.sha1 | 1 - ...nalyzers-nori-8.4.0-snapshot-662c455.jar.sha1 | 1 + ...zers-nori-8.4.0-snapshot-e648d601efb.jar.sha1 | 1 - ...zers-phonetic-8.4.0-snapshot-662c455.jar.sha1 | 1 + ...-phonetic-8.4.0-snapshot-e648d601efb.jar.sha1 | 1 - ...yzers-smartcn-8.4.0-snapshot-662c455.jar.sha1 | 1 + ...s-smartcn-8.4.0-snapshot-e648d601efb.jar.sha1 | 1 - ...yzers-stempel-8.4.0-snapshot-662c455.jar.sha1 | 1 + ...s-stempel-8.4.0-snapshot-e648d601efb.jar.sha1 | 1 - ...rs-morfologik-8.4.0-snapshot-662c455.jar.sha1 | 1 + ...orfologik-8.4.0-snapshot-e648d601efb.jar.sha1 | 1 - ...lyzers-common-8.4.0-snapshot-662c455.jar.sha1 | 1 + ...rs-common-8.4.0-snapshot-e648d601efb.jar.sha1 | 1 - ...ckward-codecs-8.4.0-snapshot-662c455.jar.sha1 | 1 + ...rd-codecs-8.4.0-snapshot-e648d601efb.jar.sha1 | 1 - .../lucene-core-8.4.0-snapshot-662c455.jar.sha1 | 1 + ...cene-core-8.4.0-snapshot-e648d601efb.jar.sha1 | 1 - ...cene-grouping-8.4.0-snapshot-662c455.jar.sha1 | 1 + ...-grouping-8.4.0-snapshot-e648d601efb.jar.sha1 | 1 - ...e-highlighter-8.4.0-snapshot-662c455.jar.sha1 | 1 + ...ghlighter-8.4.0-snapshot-e648d601efb.jar.sha1 | 1 - .../lucene-join-8.4.0-snapshot-662c455.jar.sha1 | 1 + ...cene-join-8.4.0-snapshot-e648d601efb.jar.sha1 | 1 - ...lucene-memory-8.4.0-snapshot-662c455.jar.sha1 | 1 + ...ne-memory-8.4.0-snapshot-e648d601efb.jar.sha1 | 1 - .../lucene-misc-8.4.0-snapshot-662c455.jar.sha1 | 1 + ...cene-misc-8.4.0-snapshot-e648d601efb.jar.sha1 | 1 - ...ucene-queries-8.4.0-snapshot-662c455.jar.sha1 | 1 + ...e-queries-8.4.0-snapshot-e648d601efb.jar.sha1 | 1 - ...e-queryparser-8.4.0-snapshot-662c455.jar.sha1 | 1 + ...eryparser-8.4.0-snapshot-e648d601efb.jar.sha1 | 1 - ...ucene-sandbox-8.4.0-snapshot-662c455.jar.sha1 | 1 + ...e-sandbox-8.4.0-snapshot-e648d601efb.jar.sha1 | 1 - ...ucene-spatial-8.4.0-snapshot-662c455.jar.sha1 | 1 + ...e-spatial-8.4.0-snapshot-e648d601efb.jar.sha1 | 1 - ...patial-extras-8.4.0-snapshot-662c455.jar.sha1 | 1 + ...al-extras-8.4.0-snapshot-e648d601efb.jar.sha1 | 1 - ...ene-spatial3d-8.4.0-snapshot-662c455.jar.sha1 | 1 + ...spatial3d-8.4.0-snapshot-e648d601efb.jar.sha1 | 1 - ...ucene-suggest-8.4.0-snapshot-662c455.jar.sha1 | 1 + ...e-suggest-8.4.0-snapshot-e648d601efb.jar.sha1 | 1 - .../uhighlight/CustomUnifiedHighlighter.java | 3 +-- .../org/elasticsearch/common/lucene/Lucene.java | 2 +- .../elasticsearch/index/codec/CodecService.java | 6 +++--- .../codec/PerFieldMappingPostingFormatCodec.java | 4 ++-- .../index/mapper/CompletionFieldMapper.java | 4 ++-- .../elasticsearch/indices/IndicesQueryCache.java | 6 +++--- .../elasticsearch/index/codec/CodecTests.java | 16 ++++++++-------- .../lucene-core-8.4.0-snapshot-662c455.jar.sha1 | 1 + ...cene-core-8.4.0-snapshot-e648d601efb.jar.sha1 | 1 - 63 files changed, 66 insertions(+), 67 deletions(-) create mode 100644 modules/lang-expression/licenses/lucene-expressions-8.4.0-snapshot-662c455.jar.sha1 delete mode 100644 modules/lang-expression/licenses/lucene-expressions-8.4.0-snapshot-e648d601efb.jar.sha1 create mode 100644 plugins/analysis-icu/licenses/lucene-analyzers-icu-8.4.0-snapshot-662c455.jar.sha1 delete mode 100644 plugins/analysis-icu/licenses/lucene-analyzers-icu-8.4.0-snapshot-e648d601efb.jar.sha1 create mode 100644 plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.4.0-snapshot-662c455.jar.sha1 delete mode 100644 plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.4.0-snapshot-e648d601efb.jar.sha1 create mode 100644 plugins/analysis-nori/licenses/lucene-analyzers-nori-8.4.0-snapshot-662c455.jar.sha1 delete mode 100644 plugins/analysis-nori/licenses/lucene-analyzers-nori-8.4.0-snapshot-e648d601efb.jar.sha1 create mode 100644 plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.4.0-snapshot-662c455.jar.sha1 delete mode 100644 plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.4.0-snapshot-e648d601efb.jar.sha1 create mode 100644 plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.4.0-snapshot-662c455.jar.sha1 delete mode 100644 plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.4.0-snapshot-e648d601efb.jar.sha1 create mode 100644 plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.4.0-snapshot-662c455.jar.sha1 delete mode 100644 plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.4.0-snapshot-e648d601efb.jar.sha1 create mode 100644 plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.4.0-snapshot-662c455.jar.sha1 delete mode 100644 plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.4.0-snapshot-e648d601efb.jar.sha1 create mode 100644 server/licenses/lucene-analyzers-common-8.4.0-snapshot-662c455.jar.sha1 delete mode 100644 server/licenses/lucene-analyzers-common-8.4.0-snapshot-e648d601efb.jar.sha1 create mode 100644 server/licenses/lucene-backward-codecs-8.4.0-snapshot-662c455.jar.sha1 delete mode 100644 server/licenses/lucene-backward-codecs-8.4.0-snapshot-e648d601efb.jar.sha1 create mode 100644 server/licenses/lucene-core-8.4.0-snapshot-662c455.jar.sha1 delete mode 100644 server/licenses/lucene-core-8.4.0-snapshot-e648d601efb.jar.sha1 create mode 100644 server/licenses/lucene-grouping-8.4.0-snapshot-662c455.jar.sha1 delete mode 100644 server/licenses/lucene-grouping-8.4.0-snapshot-e648d601efb.jar.sha1 create mode 100644 server/licenses/lucene-highlighter-8.4.0-snapshot-662c455.jar.sha1 delete mode 100644 server/licenses/lucene-highlighter-8.4.0-snapshot-e648d601efb.jar.sha1 create mode 100644 server/licenses/lucene-join-8.4.0-snapshot-662c455.jar.sha1 delete mode 100644 server/licenses/lucene-join-8.4.0-snapshot-e648d601efb.jar.sha1 create mode 100644 server/licenses/lucene-memory-8.4.0-snapshot-662c455.jar.sha1 delete mode 100644 server/licenses/lucene-memory-8.4.0-snapshot-e648d601efb.jar.sha1 create mode 100644 server/licenses/lucene-misc-8.4.0-snapshot-662c455.jar.sha1 delete mode 100644 server/licenses/lucene-misc-8.4.0-snapshot-e648d601efb.jar.sha1 create mode 100644 server/licenses/lucene-queries-8.4.0-snapshot-662c455.jar.sha1 delete mode 100644 server/licenses/lucene-queries-8.4.0-snapshot-e648d601efb.jar.sha1 create mode 100644 server/licenses/lucene-queryparser-8.4.0-snapshot-662c455.jar.sha1 delete mode 100644 server/licenses/lucene-queryparser-8.4.0-snapshot-e648d601efb.jar.sha1 create mode 100644 server/licenses/lucene-sandbox-8.4.0-snapshot-662c455.jar.sha1 delete mode 100644 server/licenses/lucene-sandbox-8.4.0-snapshot-e648d601efb.jar.sha1 create mode 100644 server/licenses/lucene-spatial-8.4.0-snapshot-662c455.jar.sha1 delete mode 100644 server/licenses/lucene-spatial-8.4.0-snapshot-e648d601efb.jar.sha1 create mode 100644 server/licenses/lucene-spatial-extras-8.4.0-snapshot-662c455.jar.sha1 delete mode 100644 server/licenses/lucene-spatial-extras-8.4.0-snapshot-e648d601efb.jar.sha1 create mode 100644 server/licenses/lucene-spatial3d-8.4.0-snapshot-662c455.jar.sha1 delete mode 100644 server/licenses/lucene-spatial3d-8.4.0-snapshot-e648d601efb.jar.sha1 create mode 100644 server/licenses/lucene-suggest-8.4.0-snapshot-662c455.jar.sha1 delete mode 100644 server/licenses/lucene-suggest-8.4.0-snapshot-e648d601efb.jar.sha1 create mode 100644 x-pack/plugin/sql/sql-action/licenses/lucene-core-8.4.0-snapshot-662c455.jar.sha1 delete mode 100644 x-pack/plugin/sql/sql-action/licenses/lucene-core-8.4.0-snapshot-e648d601efb.jar.sha1 diff --git a/buildSrc/version.properties b/buildSrc/version.properties index aba90f29bb3..904399a3d7d 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -1,5 +1,5 @@ elasticsearch = 7.6.0 -lucene = 8.4.0-snapshot-e648d601efb +lucene = 8.4.0-snapshot-662c455 bundled_jdk_vendor = adoptopenjdk bundled_jdk = 13.0.1+9 diff --git a/docs/reference/mapping/params/normalizer.asciidoc b/docs/reference/mapping/params/normalizer.asciidoc index b85c45fd807..bb950d19e18 100644 --- a/docs/reference/mapping/params/normalizer.asciidoc +++ b/docs/reference/mapping/params/normalizer.asciidoc @@ -90,13 +90,13 @@ both index and query time. "value": 2, "relation": "eq" }, - "max_score": 0.47000363, + "max_score": 0.4700036, "hits": [ { "_index": "index", "_type": "_doc", "_id": "1", - "_score": 0.47000363, + "_score": 0.4700036, "_source": { "foo": "BÀR" } @@ -105,7 +105,7 @@ both index and query time. "_index": "index", "_type": "_doc", "_id": "2", - "_score": 0.47000363, + "_score": 0.4700036, "_source": { "foo": "bar" } diff --git a/docs/reference/search/explain.asciidoc b/docs/reference/search/explain.asciidoc index 1b5d280559c..38df7639d52 100644 --- a/docs/reference/search/explain.asciidoc +++ b/docs/reference/search/explain.asciidoc @@ -107,12 +107,12 @@ The API returns the following response: "_id":"0", "matched":true, "explanation":{ - "value":1.6943597, + "value":1.6943598, "description":"weight(message:elasticsearch in 0) [PerFieldSimilarity], result of:", "details":[ { - "value":1.6943597, - "description":"score(freq=1.0), product of:", + "value":1.6943598, + "description":"score(freq=1.0), computed as boost * idf * tf from:", "details":[ { "value":2.2, @@ -136,7 +136,7 @@ The API returns the following response: ] }, { - "value":0.5555555, + "value":0.5555556, "description":"tf, computed as freq / (freq + k1 * (1 - b + b * dl / avgdl)) from:", "details":[ { diff --git a/docs/reference/search/request-body.asciidoc b/docs/reference/search/request-body.asciidoc index db4c80805e4..a94c8c1304e 100644 --- a/docs/reference/search/request-body.asciidoc +++ b/docs/reference/search/request-body.asciidoc @@ -118,13 +118,13 @@ The API returns the following response: "value": 1, "relation": "eq" }, - "max_score": 1.3862944, + "max_score": 1.3862942, "hits" : [ { "_index" : "twitter", "_type" : "_doc", "_id" : "0", - "_score": 1.3862944, + "_score": 1.3862942, "_source" : { "user" : "kimchy", "message": "trying out Elasticsearch", diff --git a/docs/reference/search/request/highlighting.asciidoc b/docs/reference/search/request/highlighting.asciidoc index 73d9a1d93d7..6b2a976d44a 100644 --- a/docs/reference/search/request/highlighting.asciidoc +++ b/docs/reference/search/request/highlighting.asciidoc @@ -840,13 +840,13 @@ Response: "value": 1, "relation": "eq" }, - "max_score": 1.601195, + "max_score": 1.6011951, "hits": [ { "_index": "twitter", "_type": "_doc", "_id": "1", - "_score": 1.601195, + "_score": 1.6011951, "_source": { "user": "test", "message": "some message with the number 1", @@ -898,13 +898,13 @@ Response: "value": 1, "relation": "eq" }, - "max_score": 1.601195, + "max_score": 1.6011951, "hits": [ { "_index": "twitter", "_type": "_doc", "_id": "1", - "_score": 1.601195, + "_score": 1.6011951, "_source": { "user": "test", "message": "some message with the number 1", diff --git a/docs/reference/search/request/inner-hits.asciidoc b/docs/reference/search/request/inner-hits.asciidoc index 51c2c158903..2d0b0d63e25 100644 --- a/docs/reference/search/request/inner-hits.asciidoc +++ b/docs/reference/search/request/inner-hits.asciidoc @@ -384,13 +384,13 @@ Which would look like: "value": 1, "relation": "eq" }, - "max_score": 0.6931472, + "max_score": 0.6931471, "hits": [ { "_index": "test", "_type": "_doc", "_id": "1", - "_score": 0.6931472, + "_score": 0.6931471, "_source": ..., "inner_hits": { "comments.votes": { <1> @@ -399,7 +399,7 @@ Which would look like: "value": 1, "relation": "eq" }, - "max_score": 0.6931472, + "max_score": 0.6931471, "hits": [ { "_index": "test", @@ -413,7 +413,7 @@ Which would look like: "offset": 0 } }, - "_score": 0.6931472, + "_score": 0.6931471, "_source": { "value": 1, "voter": "kimchy" diff --git a/docs/reference/search/search.asciidoc b/docs/reference/search/search.asciidoc index 378ce1a2813..be58e1478e9 100644 --- a/docs/reference/search/search.asciidoc +++ b/docs/reference/search/search.asciidoc @@ -362,13 +362,13 @@ The API returns the following response: "value" : 1, "relation" : "eq" }, - "max_score" : 1.3862944, + "max_score" : 1.3862942, "hits" : [ { "_index" : "twitter", "_type" : "_doc", "_id" : "0", - "_score" : 1.3862944, + "_score" : 1.3862942, "_source" : { "date" : "2009-11-15T14:12:12", "likes" : 0, diff --git a/docs/reference/search/uri-request.asciidoc b/docs/reference/search/uri-request.asciidoc index 1c523fae2a9..9fec759c03d 100644 --- a/docs/reference/search/uri-request.asciidoc +++ b/docs/reference/search/uri-request.asciidoc @@ -134,13 +134,13 @@ The API returns the following response: "value": 1, "relation": "eq" }, - "max_score": 1.3862944, + "max_score": 1.3862942, "hits" : [ { "_index" : "twitter", "_type" : "_doc", "_id" : "0", - "_score": 1.3862944, + "_score": 1.3862942, "_source" : { "user" : "kimchy", "date" : "2009-11-15T14:12:12", diff --git a/modules/lang-expression/licenses/lucene-expressions-8.4.0-snapshot-662c455.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.4.0-snapshot-662c455.jar.sha1 new file mode 100644 index 00000000000..1c4c5ce2b62 --- /dev/null +++ b/modules/lang-expression/licenses/lucene-expressions-8.4.0-snapshot-662c455.jar.sha1 @@ -0,0 +1 @@ +4041db9db7c394584571b45812734732912ef8e2 \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-expressions-8.4.0-snapshot-e648d601efb.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.4.0-snapshot-e648d601efb.jar.sha1 deleted file mode 100644 index 7a75661f63f..00000000000 --- a/modules/lang-expression/licenses/lucene-expressions-8.4.0-snapshot-e648d601efb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -43b9178f582373f4fcee61837404c0cc8636043e \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.4.0-snapshot-662c455.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.4.0-snapshot-662c455.jar.sha1 new file mode 100644 index 00000000000..0fc96bc500e --- /dev/null +++ b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.4.0-snapshot-662c455.jar.sha1 @@ -0,0 +1 @@ +d5bddd6b7660439e29bbce26ded283931c756d75 \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.4.0-snapshot-e648d601efb.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.4.0-snapshot-e648d601efb.jar.sha1 deleted file mode 100644 index 2765cfafb05..00000000000 --- a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.4.0-snapshot-e648d601efb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8ee342fa6e6306e56b583251639a661250fada46 \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.4.0-snapshot-662c455.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.4.0-snapshot-662c455.jar.sha1 new file mode 100644 index 00000000000..388bc9748b7 --- /dev/null +++ b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.4.0-snapshot-662c455.jar.sha1 @@ -0,0 +1 @@ +4303858c346c51bbbc68c32eb25f7f372b09331c \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.4.0-snapshot-e648d601efb.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.4.0-snapshot-e648d601efb.jar.sha1 deleted file mode 100644 index f653bf5c3b5..00000000000 --- a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.4.0-snapshot-e648d601efb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7e31f2a38d1434eb50781efc65b0e028f08d7821 \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.4.0-snapshot-662c455.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.4.0-snapshot-662c455.jar.sha1 new file mode 100644 index 00000000000..07ff7fd907a --- /dev/null +++ b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.4.0-snapshot-662c455.jar.sha1 @@ -0,0 +1 @@ +b1a9182ed1b92a121c1587fe9710aa7a41f3f77a \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.4.0-snapshot-e648d601efb.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.4.0-snapshot-e648d601efb.jar.sha1 deleted file mode 100644 index 2c3ee0313a9..00000000000 --- a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.4.0-snapshot-e648d601efb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9079d81a8ea2c7190ef09ca06a987d1cab2fdf17 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.4.0-snapshot-662c455.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.4.0-snapshot-662c455.jar.sha1 new file mode 100644 index 00000000000..95e603ec188 --- /dev/null +++ b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.4.0-snapshot-662c455.jar.sha1 @@ -0,0 +1 @@ +4df747b25286baecf5e790bf76bc40038c059691 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.4.0-snapshot-e648d601efb.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.4.0-snapshot-e648d601efb.jar.sha1 deleted file mode 100644 index 5de2626b6ad..00000000000 --- a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.4.0-snapshot-e648d601efb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f253f59d4e8bb6e55eb307b011ddb81ba0ebab92 \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.4.0-snapshot-662c455.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.4.0-snapshot-662c455.jar.sha1 new file mode 100644 index 00000000000..4eaf91f3083 --- /dev/null +++ b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.4.0-snapshot-662c455.jar.sha1 @@ -0,0 +1 @@ +88d3f8f9134b95884f3b80280b09aa2513b71297 \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.4.0-snapshot-e648d601efb.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.4.0-snapshot-e648d601efb.jar.sha1 deleted file mode 100644 index fcb579806bf..00000000000 --- a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.4.0-snapshot-e648d601efb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -36547378493e6e84f63dc744df8d414cb2add1a4 \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.4.0-snapshot-662c455.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.4.0-snapshot-662c455.jar.sha1 new file mode 100644 index 00000000000..e28b8d87cd5 --- /dev/null +++ b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.4.0-snapshot-662c455.jar.sha1 @@ -0,0 +1 @@ +9ddccf575ee03a1329c8d1eb2e4ee7a6e3f3f56f \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.4.0-snapshot-e648d601efb.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.4.0-snapshot-e648d601efb.jar.sha1 deleted file mode 100644 index d26f99ab24e..00000000000 --- a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.4.0-snapshot-e648d601efb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8b15a376efa7d4289b697144f34a819a9f8772f1 \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.4.0-snapshot-662c455.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.4.0-snapshot-662c455.jar.sha1 new file mode 100644 index 00000000000..1b8ec8c5831 --- /dev/null +++ b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.4.0-snapshot-662c455.jar.sha1 @@ -0,0 +1 @@ +e115e562a42c12a3292fb138607855c1fdfb0772 \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.4.0-snapshot-e648d601efb.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.4.0-snapshot-e648d601efb.jar.sha1 deleted file mode 100644 index 43a7650c70d..00000000000 --- a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.4.0-snapshot-e648d601efb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d1bc4170e6981ca9af71d7a4ce46a3feb2f7b613 \ No newline at end of file diff --git a/server/licenses/lucene-analyzers-common-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-analyzers-common-8.4.0-snapshot-662c455.jar.sha1 new file mode 100644 index 00000000000..d6f8049f7b1 --- /dev/null +++ b/server/licenses/lucene-analyzers-common-8.4.0-snapshot-662c455.jar.sha1 @@ -0,0 +1 @@ +061fb94ab616492721f8868dcaec3fbc989733be \ No newline at end of file diff --git a/server/licenses/lucene-analyzers-common-8.4.0-snapshot-e648d601efb.jar.sha1 b/server/licenses/lucene-analyzers-common-8.4.0-snapshot-e648d601efb.jar.sha1 deleted file mode 100644 index c2ec1128c17..00000000000 --- a/server/licenses/lucene-analyzers-common-8.4.0-snapshot-e648d601efb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1cb225781b19e758d216987e363b77fa4b041174 \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-backward-codecs-8.4.0-snapshot-662c455.jar.sha1 new file mode 100644 index 00000000000..243c4420bea --- /dev/null +++ b/server/licenses/lucene-backward-codecs-8.4.0-snapshot-662c455.jar.sha1 @@ -0,0 +1 @@ +503f3d516889a99e1c0e2dbdba7bf9cc9900c54c \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-8.4.0-snapshot-e648d601efb.jar.sha1 b/server/licenses/lucene-backward-codecs-8.4.0-snapshot-e648d601efb.jar.sha1 deleted file mode 100644 index b6486fb3eeb..00000000000 --- a/server/licenses/lucene-backward-codecs-8.4.0-snapshot-e648d601efb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cbbf849e24ef0cc61312579acf6d6c5b72c99cf5 \ No newline at end of file diff --git a/server/licenses/lucene-core-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-core-8.4.0-snapshot-662c455.jar.sha1 new file mode 100644 index 00000000000..d1657fccc5e --- /dev/null +++ b/server/licenses/lucene-core-8.4.0-snapshot-662c455.jar.sha1 @@ -0,0 +1 @@ +8ca36adea0a904ec725d57f509a62652a53ecff8 \ No newline at end of file diff --git a/server/licenses/lucene-core-8.4.0-snapshot-e648d601efb.jar.sha1 b/server/licenses/lucene-core-8.4.0-snapshot-e648d601efb.jar.sha1 deleted file mode 100644 index 4b736046f3a..00000000000 --- a/server/licenses/lucene-core-8.4.0-snapshot-e648d601efb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -aa74590851b6fcf536976f75448be52f6ca18a4a \ No newline at end of file diff --git a/server/licenses/lucene-grouping-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-grouping-8.4.0-snapshot-662c455.jar.sha1 new file mode 100644 index 00000000000..f1f0684d9b3 --- /dev/null +++ b/server/licenses/lucene-grouping-8.4.0-snapshot-662c455.jar.sha1 @@ -0,0 +1 @@ +f176fdcf8fc574f4cb1c549aaa4da0301afd34ba \ No newline at end of file diff --git a/server/licenses/lucene-grouping-8.4.0-snapshot-e648d601efb.jar.sha1 b/server/licenses/lucene-grouping-8.4.0-snapshot-e648d601efb.jar.sha1 deleted file mode 100644 index 97a3c7b927b..00000000000 --- a/server/licenses/lucene-grouping-8.4.0-snapshot-e648d601efb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1bd113010c183168d79fbc10a6b590fdacc3fa35 \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-highlighter-8.4.0-snapshot-662c455.jar.sha1 new file mode 100644 index 00000000000..a9ad6fb95cb --- /dev/null +++ b/server/licenses/lucene-highlighter-8.4.0-snapshot-662c455.jar.sha1 @@ -0,0 +1 @@ +db5ea7b647309e5d29fa92bcbb6b11286d11436d \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-8.4.0-snapshot-e648d601efb.jar.sha1 b/server/licenses/lucene-highlighter-8.4.0-snapshot-e648d601efb.jar.sha1 deleted file mode 100644 index f2dd654d8d6..00000000000 --- a/server/licenses/lucene-highlighter-8.4.0-snapshot-e648d601efb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4e44a435e14d12113ca9193182a302677fda155e \ No newline at end of file diff --git a/server/licenses/lucene-join-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-join-8.4.0-snapshot-662c455.jar.sha1 new file mode 100644 index 00000000000..6ef1d079f63 --- /dev/null +++ b/server/licenses/lucene-join-8.4.0-snapshot-662c455.jar.sha1 @@ -0,0 +1 @@ +36329bc2ea6a5640d4128206221456656de7bbe2 \ No newline at end of file diff --git a/server/licenses/lucene-join-8.4.0-snapshot-e648d601efb.jar.sha1 b/server/licenses/lucene-join-8.4.0-snapshot-e648d601efb.jar.sha1 deleted file mode 100644 index 9e8d72cc13f..00000000000 --- a/server/licenses/lucene-join-8.4.0-snapshot-e648d601efb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -eb8eacd015ef81ef2055ada357a92c9751308ef1 \ No newline at end of file diff --git a/server/licenses/lucene-memory-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-memory-8.4.0-snapshot-662c455.jar.sha1 new file mode 100644 index 00000000000..eeb42485102 --- /dev/null +++ b/server/licenses/lucene-memory-8.4.0-snapshot-662c455.jar.sha1 @@ -0,0 +1 @@ +083f492781b3d2c1d470bd1439c875ebf74a14eb \ No newline at end of file diff --git a/server/licenses/lucene-memory-8.4.0-snapshot-e648d601efb.jar.sha1 b/server/licenses/lucene-memory-8.4.0-snapshot-e648d601efb.jar.sha1 deleted file mode 100644 index e6048ffd912..00000000000 --- a/server/licenses/lucene-memory-8.4.0-snapshot-e648d601efb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4dc565203bb1eab0222c52215891e207e7032209 \ No newline at end of file diff --git a/server/licenses/lucene-misc-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-misc-8.4.0-snapshot-662c455.jar.sha1 new file mode 100644 index 00000000000..6f5d479c76d --- /dev/null +++ b/server/licenses/lucene-misc-8.4.0-snapshot-662c455.jar.sha1 @@ -0,0 +1 @@ +9cd5ea7bc08d93053ca993bd6fc1c9cd0a1b91fd \ No newline at end of file diff --git a/server/licenses/lucene-misc-8.4.0-snapshot-e648d601efb.jar.sha1 b/server/licenses/lucene-misc-8.4.0-snapshot-e648d601efb.jar.sha1 deleted file mode 100644 index 480dcc63290..00000000000 --- a/server/licenses/lucene-misc-8.4.0-snapshot-e648d601efb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ef596e6d2a7ac9c7dfc6196dad75dc719c81ce85 \ No newline at end of file diff --git a/server/licenses/lucene-queries-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-queries-8.4.0-snapshot-662c455.jar.sha1 new file mode 100644 index 00000000000..30733a5a577 --- /dev/null +++ b/server/licenses/lucene-queries-8.4.0-snapshot-662c455.jar.sha1 @@ -0,0 +1 @@ +89e39f65d1c42b5849ccf3a8e6cc9b3b277c08a6 \ No newline at end of file diff --git a/server/licenses/lucene-queries-8.4.0-snapshot-e648d601efb.jar.sha1 b/server/licenses/lucene-queries-8.4.0-snapshot-e648d601efb.jar.sha1 deleted file mode 100644 index 2524672e062..00000000000 --- a/server/licenses/lucene-queries-8.4.0-snapshot-e648d601efb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b0c963e68dd71444f09336258c8f63425514426a \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-queryparser-8.4.0-snapshot-662c455.jar.sha1 new file mode 100644 index 00000000000..98b065176a4 --- /dev/null +++ b/server/licenses/lucene-queryparser-8.4.0-snapshot-662c455.jar.sha1 @@ -0,0 +1 @@ +651f6a0075ee30b814c8b56020d95155424c0e67 \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-8.4.0-snapshot-e648d601efb.jar.sha1 b/server/licenses/lucene-queryparser-8.4.0-snapshot-e648d601efb.jar.sha1 deleted file mode 100644 index 4ab7a7fe6f6..00000000000 --- a/server/licenses/lucene-queryparser-8.4.0-snapshot-e648d601efb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bfab3e9b0467662a8ff969da215dc4a999b73076 \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-sandbox-8.4.0-snapshot-662c455.jar.sha1 new file mode 100644 index 00000000000..484ce6b5c00 --- /dev/null +++ b/server/licenses/lucene-sandbox-8.4.0-snapshot-662c455.jar.sha1 @@ -0,0 +1 @@ +935968488cc2bbcd3ced9c254f690e7c90447d9e \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-8.4.0-snapshot-e648d601efb.jar.sha1 b/server/licenses/lucene-sandbox-8.4.0-snapshot-e648d601efb.jar.sha1 deleted file mode 100644 index 9361e9252f2..00000000000 --- a/server/licenses/lucene-sandbox-8.4.0-snapshot-e648d601efb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -dadfc90e4cd032f8a4db5cc1e0bdddecea635edb \ No newline at end of file diff --git a/server/licenses/lucene-spatial-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-spatial-8.4.0-snapshot-662c455.jar.sha1 new file mode 100644 index 00000000000..1bb42417cb1 --- /dev/null +++ b/server/licenses/lucene-spatial-8.4.0-snapshot-662c455.jar.sha1 @@ -0,0 +1 @@ +0bbdd0002d8d87e54b5caff6c77a1627bf449d38 \ No newline at end of file diff --git a/server/licenses/lucene-spatial-8.4.0-snapshot-e648d601efb.jar.sha1 b/server/licenses/lucene-spatial-8.4.0-snapshot-e648d601efb.jar.sha1 deleted file mode 100644 index ce5a13ec8d6..00000000000 --- a/server/licenses/lucene-spatial-8.4.0-snapshot-e648d601efb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e72dd79d30781e4d05bc8397ae61d0b51d7ad522 \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-spatial-extras-8.4.0-snapshot-662c455.jar.sha1 new file mode 100644 index 00000000000..2bdbd889b44 --- /dev/null +++ b/server/licenses/lucene-spatial-extras-8.4.0-snapshot-662c455.jar.sha1 @@ -0,0 +1 @@ +255b547571dcec118ff1a0560bb16e259f96b76a \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-8.4.0-snapshot-e648d601efb.jar.sha1 b/server/licenses/lucene-spatial-extras-8.4.0-snapshot-e648d601efb.jar.sha1 deleted file mode 100644 index 4530b17e84e..00000000000 --- a/server/licenses/lucene-spatial-extras-8.4.0-snapshot-e648d601efb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e6b6dbd0526287f25d98d7fe354d5e290c875b8a \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-spatial3d-8.4.0-snapshot-662c455.jar.sha1 new file mode 100644 index 00000000000..e7036243119 --- /dev/null +++ b/server/licenses/lucene-spatial3d-8.4.0-snapshot-662c455.jar.sha1 @@ -0,0 +1 @@ +739af6d9876f6aa7f2a3d46fa3f236a5d6ee3653 \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-8.4.0-snapshot-e648d601efb.jar.sha1 b/server/licenses/lucene-spatial3d-8.4.0-snapshot-e648d601efb.jar.sha1 deleted file mode 100644 index a96977cf134..00000000000 --- a/server/licenses/lucene-spatial3d-8.4.0-snapshot-e648d601efb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6351edfc6dde2aefd8f6d8ef33ae5a6e08f88321 \ No newline at end of file diff --git a/server/licenses/lucene-suggest-8.4.0-snapshot-662c455.jar.sha1 b/server/licenses/lucene-suggest-8.4.0-snapshot-662c455.jar.sha1 new file mode 100644 index 00000000000..72c92c101b0 --- /dev/null +++ b/server/licenses/lucene-suggest-8.4.0-snapshot-662c455.jar.sha1 @@ -0,0 +1 @@ +20fa11a541a7ca3a50caa443a9abf0276b1194ea \ No newline at end of file diff --git a/server/licenses/lucene-suggest-8.4.0-snapshot-e648d601efb.jar.sha1 b/server/licenses/lucene-suggest-8.4.0-snapshot-e648d601efb.jar.sha1 deleted file mode 100644 index 090cf9ee734..00000000000 --- a/server/licenses/lucene-suggest-8.4.0-snapshot-e648d601efb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -921dd4ab493b9d70a0b1bf7b0fe8a6790b7e8036 \ 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 2d35de522b5..db79122fa3d 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 @@ -31,7 +31,6 @@ import org.apache.lucene.search.spans.SpanOrQuery; import org.apache.lucene.search.spans.SpanQuery; import org.apache.lucene.search.spans.SpanTermQuery; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.automaton.CharacterRunAutomaton; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.lucene.search.MultiPhrasePrefixQuery; @@ -136,7 +135,7 @@ public class CustomUnifiedHighlighter extends UnifiedHighlighter { BytesRef[] terms = filterExtractedTerms(fieldMatcher, allTerms); Set highlightFlags = getFlags(field); PhraseHelper phraseHelper = getPhraseHelper(field, query, highlightFlags); - CharacterRunAutomaton[] automata = getAutomata(field, query, highlightFlags); + LabelledCharArrayMatcher[] automata = getAutomata(field, query, highlightFlags); UHComponents components = new UHComponents(field, fieldMatcher, query, terms, phraseHelper, automata, false , highlightFlags); OffsetSource offsetSource = getOptimizedOffsetSource(components); BreakIterator breakIterator = new SplittingBreakIterator(getBreakIterator(field), diff --git a/server/src/main/java/org/elasticsearch/common/lucene/Lucene.java b/server/src/main/java/org/elasticsearch/common/lucene/Lucene.java index c3ad300e79e..eb126d8cc2d 100644 --- a/server/src/main/java/org/elasticsearch/common/lucene/Lucene.java +++ b/server/src/main/java/org/elasticsearch/common/lucene/Lucene.java @@ -107,7 +107,7 @@ import java.util.Map; public class Lucene { public static final String LATEST_DOC_VALUES_FORMAT = "Lucene70"; public static final String LATEST_POSTINGS_FORMAT = "Lucene50"; - public static final String LATEST_CODEC = "Lucene80"; + public static final String LATEST_CODEC = "Lucene84"; static { Deprecated annotation = PostingsFormat.forName(LATEST_POSTINGS_FORMAT).getClass().getAnnotation(Deprecated.class); diff --git a/server/src/main/java/org/elasticsearch/index/codec/CodecService.java b/server/src/main/java/org/elasticsearch/index/codec/CodecService.java index efc19587658..0909465da4f 100644 --- a/server/src/main/java/org/elasticsearch/index/codec/CodecService.java +++ b/server/src/main/java/org/elasticsearch/index/codec/CodecService.java @@ -22,7 +22,7 @@ package org.elasticsearch.index.codec; import org.apache.logging.log4j.Logger; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.lucene50.Lucene50StoredFieldsFormat.Mode; -import org.apache.lucene.codecs.lucene80.Lucene80Codec; +import org.apache.lucene.codecs.lucene84.Lucene84Codec; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.collect.MapBuilder; import org.elasticsearch.index.mapper.MapperService; @@ -47,8 +47,8 @@ public class CodecService { public CodecService(@Nullable MapperService mapperService, Logger logger) { final MapBuilder codecs = MapBuilder.newMapBuilder(); if (mapperService == null) { - codecs.put(DEFAULT_CODEC, new Lucene80Codec()); - codecs.put(BEST_COMPRESSION_CODEC, new Lucene80Codec(Mode.BEST_COMPRESSION)); + codecs.put(DEFAULT_CODEC, new Lucene84Codec()); + codecs.put(BEST_COMPRESSION_CODEC, new Lucene84Codec(Mode.BEST_COMPRESSION)); } else { codecs.put(DEFAULT_CODEC, new PerFieldMappingPostingFormatCodec(Mode.BEST_SPEED, mapperService, logger)); diff --git a/server/src/main/java/org/elasticsearch/index/codec/PerFieldMappingPostingFormatCodec.java b/server/src/main/java/org/elasticsearch/index/codec/PerFieldMappingPostingFormatCodec.java index 4a154abd8ea..ccaa873af27 100644 --- a/server/src/main/java/org/elasticsearch/index/codec/PerFieldMappingPostingFormatCodec.java +++ b/server/src/main/java/org/elasticsearch/index/codec/PerFieldMappingPostingFormatCodec.java @@ -23,7 +23,7 @@ import org.apache.logging.log4j.Logger; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.codecs.lucene50.Lucene50StoredFieldsFormat; -import org.apache.lucene.codecs.lucene80.Lucene80Codec; +import org.apache.lucene.codecs.lucene84.Lucene84Codec; import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.index.mapper.CompletionFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; @@ -37,7 +37,7 @@ import org.elasticsearch.index.mapper.MapperService; * per index in real time via the mapping API. If no specific postings format is * configured for a specific field the default postings format is used. */ -public class PerFieldMappingPostingFormatCodec extends Lucene80Codec { +public class PerFieldMappingPostingFormatCodec extends Lucene84Codec { private final Logger logger; private final MapperService mapperService; diff --git a/server/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java index df293f3afbf..ec6ca0400a2 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/CompletionFieldMapper.java @@ -24,7 +24,7 @@ import org.apache.lucene.index.IndexableField; import org.apache.lucene.index.Term; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; -import org.apache.lucene.search.suggest.document.Completion50PostingsFormat; +import org.apache.lucene.search.suggest.document.Completion84PostingsFormat; import org.apache.lucene.search.suggest.document.CompletionAnalyzer; import org.apache.lucene.search.suggest.document.CompletionQuery; import org.apache.lucene.search.suggest.document.FuzzyCompletionQuery; @@ -265,7 +265,7 @@ public class CompletionFieldMapper extends FieldMapper implements ArrayValueMapp */ public static synchronized PostingsFormat postingsFormat() { if (postingsFormat == null) { - postingsFormat = new Completion50PostingsFormat(); + postingsFormat = new Completion84PostingsFormat(); } return postingsFormat; } diff --git a/server/src/main/java/org/elasticsearch/indices/IndicesQueryCache.java b/server/src/main/java/org/elasticsearch/indices/IndicesQueryCache.java index dc054f8b51d..9183b1a8265 100644 --- a/server/src/main/java/org/elasticsearch/indices/IndicesQueryCache.java +++ b/server/src/main/java/org/elasticsearch/indices/IndicesQueryCache.java @@ -80,7 +80,7 @@ public class IndicesQueryCache implements QueryCache, Closeable { logger.debug("using [node] query cache with size [{}] max filter count [{}]", size, count); if (INDICES_QUERIES_CACHE_ALL_SEGMENTS_SETTING.get(settings)) { - cache = new ElasticsearchLRUQueryCache(count, size.getBytes(), context -> true); + cache = new ElasticsearchLRUQueryCache(count, size.getBytes(), context -> true, 1f); } else { cache = new ElasticsearchLRUQueryCache(count, size.getBytes()); } @@ -250,8 +250,8 @@ public class IndicesQueryCache implements QueryCache, Closeable { private class ElasticsearchLRUQueryCache extends LRUQueryCache { - ElasticsearchLRUQueryCache(int maxSize, long maxRamBytesUsed, Predicate leavesToCache) { - super(maxSize, maxRamBytesUsed, leavesToCache); + ElasticsearchLRUQueryCache(int maxSize, long maxRamBytesUsed, Predicate leavesToCache, float skipFactor) { + super(maxSize, maxRamBytesUsed, leavesToCache, skipFactor); } ElasticsearchLRUQueryCache(int maxSize, long maxRamBytesUsed) { diff --git a/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java b/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java index fa775a84c72..dc5b8031a6c 100644 --- a/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java +++ b/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java @@ -19,11 +19,16 @@ package org.elasticsearch.index.codec; +import static org.hamcrest.Matchers.instanceOf; + +import java.io.IOException; +import java.util.Collections; + import org.apache.logging.log4j.LogManager; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.lucene50.Lucene50StoredFieldsFormat; import org.apache.lucene.codecs.lucene50.Lucene50StoredFieldsFormat.Mode; -import org.apache.lucene.codecs.lucene80.Lucene80Codec; +import org.apache.lucene.codecs.lucene84.Lucene84Codec; import org.apache.lucene.document.Document; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexWriter; @@ -42,19 +47,14 @@ import org.elasticsearch.plugins.MapperPlugin; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.IndexSettingsModule; -import java.io.IOException; -import java.util.Collections; - -import static org.hamcrest.Matchers.instanceOf; - @SuppressCodecs("*") // we test against default codec so never get a random one here! public class CodecTests extends ESTestCase { public void testResolveDefaultCodecs() throws Exception { CodecService codecService = createCodecService(); assertThat(codecService.codec("default"), instanceOf(PerFieldMappingPostingFormatCodec.class)); - assertThat(codecService.codec("default"), instanceOf(Lucene80Codec.class)); - assertThat(codecService.codec("Lucene80"), instanceOf(Lucene80Codec.class)); + assertThat(codecService.codec("default"), instanceOf(Lucene84Codec.class)); + assertThat(codecService.codec("Lucene84"), instanceOf(Lucene84Codec.class)); } public void testDefault() throws Exception { diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.4.0-snapshot-662c455.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.4.0-snapshot-662c455.jar.sha1 new file mode 100644 index 00000000000..d1657fccc5e --- /dev/null +++ b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.4.0-snapshot-662c455.jar.sha1 @@ -0,0 +1 @@ +8ca36adea0a904ec725d57f509a62652a53ecff8 \ No newline at end of file diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.4.0-snapshot-e648d601efb.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.4.0-snapshot-e648d601efb.jar.sha1 deleted file mode 100644 index 4b736046f3a..00000000000 --- a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.4.0-snapshot-e648d601efb.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -aa74590851b6fcf536976f75448be52f6ca18a4a \ No newline at end of file