elastic · iverase · Sep 10, 2020 · Sep 10, 2020
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -1,5 +1,5 @@
 elasticsearch     = 8.0.0
-lucene            = 8.7.0-snapshot-61ea26a
+lucene            = 8.7.0-snapshot-b313618cc1d
 
 bundled_jdk_vendor = adoptopenjdk
 bundled_jdk = 14.0.1+7

diff --git a/modules/lang-expression/licenses/lucene-expressions-8.7.0-snapshot-61ea26a.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.7.0-snapshot-61ea26a.jar.sha1
diff --git a/modules/lang-expression/licenses/lucene-expressions-8.7.0-snapshot-b313618cc1d.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.7.0-snapshot-b313618cc1d.jar.sha1
@@ -0,0 +1 @@
+353857a5b9892aaea57643f7fdd4f207cf151394
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.7.0-snapshot-61ea26a.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.7.0-snapshot-61ea26a.jar.sha1
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.7.0-snapshot-b313618cc1d.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.7.0-snapshot-b313618cc1d.jar.sha1
@@ -0,0 +1 @@
+95a74c0f9491b9045e0293ab25037b146e67ec81
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.7.0-snapshot-61ea26a.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.7.0-snapshot-61ea26a.jar.sha1
diff --git a/.../analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.7.0-snapshot-b313618cc1d.jar.sha1 b/.../analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.7.0-snapshot-b313618cc1d.jar.sha1
@@ -0,0 +1 @@
+a1623f3e4a3969e79d94ab343c35636c21f67a44
diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.7.0-snapshot-61ea26a.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.7.0-snapshot-61ea26a.jar.sha1
diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.7.0-snapshot-b313618cc1d.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.7.0-snapshot-b313618cc1d.jar.sha1
@@ -0,0 +1 @@
+b684bd38412b620985390a219790e0757048d9f2
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.7.0-snapshot-61ea26a.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.7.0-snapshot-61ea26a.jar.sha1
diff --git a/.../analysis-phonetic/licenses/lucene-analyzers-phonetic-8.7.0-snapshot-b313618cc1d.jar.sha1 b/.../analysis-phonetic/licenses/lucene-analyzers-phonetic-8.7.0-snapshot-b313618cc1d.jar.sha1
@@ -0,0 +1 @@
+70440f867a91da65434f9cbe4e8f5502df6f2ad2
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.7.0-snapshot-61ea26a.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.7.0-snapshot-61ea26a.jar.sha1
diff --git a/...ns/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.7.0-snapshot-b313618cc1d.jar.sha1 b/...ns/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.7.0-snapshot-b313618cc1d.jar.sha1
@@ -0,0 +1 @@
+35bd837080af6345a65850a2985d3f5a65c70faf
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.7.0-snapshot-61ea26a.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.7.0-snapshot-61ea26a.jar.sha1
diff --git a/...ns/analysis-stempel/licenses/lucene-analyzers-stempel-8.7.0-snapshot-b313618cc1d.jar.sha1 b/...ns/analysis-stempel/licenses/lucene-analyzers-stempel-8.7.0-snapshot-b313618cc1d.jar.sha1
@@ -0,0 +1 @@
+9f17e75fc36e6f049b0712b84bcb93ad303e4672
diff --git a/...s/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.7.0-snapshot-61ea26a.jar.sha1 b/...s/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.7.0-snapshot-61ea26a.jar.sha1
diff --git a/...alysis-ukrainian/licenses/lucene-analyzers-morfologik-8.7.0-snapshot-b313618cc1d.jar.sha1 b/...alysis-ukrainian/licenses/lucene-analyzers-morfologik-8.7.0-snapshot-b313618cc1d.jar.sha1
@@ -0,0 +1 @@
+a39f532fb2f6d2774d6889a45a86041933cc0c6a
diff --git a/server/licenses/lucene-analyzers-common-8.7.0-snapshot-61ea26a.jar.sha1 b/server/licenses/lucene-analyzers-common-8.7.0-snapshot-61ea26a.jar.sha1
diff --git a/server/licenses/lucene-analyzers-common-8.7.0-snapshot-b313618cc1d.jar.sha1 b/server/licenses/lucene-analyzers-common-8.7.0-snapshot-b313618cc1d.jar.sha1
@@ -0,0 +1 @@
+740a84ce4f73782c3f504c636938f78538e46c54
diff --git a/server/licenses/lucene-backward-codecs-8.7.0-snapshot-61ea26a.jar.sha1 b/server/licenses/lucene-backward-codecs-8.7.0-snapshot-61ea26a.jar.sha1
diff --git a/server/licenses/lucene-backward-codecs-8.7.0-snapshot-b313618cc1d.jar.sha1 b/server/licenses/lucene-backward-codecs-8.7.0-snapshot-b313618cc1d.jar.sha1
@@ -0,0 +1 @@
+a94936bc5a02ecd04a3a0fcdc1bdcf305e657c39
diff --git a/server/licenses/lucene-core-8.7.0-snapshot-61ea26a.jar.sha1 b/server/licenses/lucene-core-8.7.0-snapshot-61ea26a.jar.sha1
diff --git a/server/licenses/lucene-core-8.7.0-snapshot-b313618cc1d.jar.sha1 b/server/licenses/lucene-core-8.7.0-snapshot-b313618cc1d.jar.sha1
@@ -0,0 +1 @@
+be458e2aa6cdb6c24df05c560323edfbad1a4ac9
diff --git a/server/licenses/lucene-grouping-8.7.0-snapshot-61ea26a.jar.sha1 b/server/licenses/lucene-grouping-8.7.0-snapshot-61ea26a.jar.sha1
diff --git a/server/licenses/lucene-grouping-8.7.0-snapshot-b313618cc1d.jar.sha1 b/server/licenses/lucene-grouping-8.7.0-snapshot-b313618cc1d.jar.sha1
@@ -0,0 +1 @@
+796a26a1d95d8ac0205f91915f070e4f84c07ed0
diff --git a/server/licenses/lucene-highlighter-8.7.0-snapshot-61ea26a.jar.sha1 b/server/licenses/lucene-highlighter-8.7.0-snapshot-61ea26a.jar.sha1
diff --git a/server/licenses/lucene-highlighter-8.7.0-snapshot-b313618cc1d.jar.sha1 b/server/licenses/lucene-highlighter-8.7.0-snapshot-b313618cc1d.jar.sha1
@@ -0,0 +1 @@
+2ef6327dd4ccf1e39627375dfc1f4d18fb740921
diff --git a/server/licenses/lucene-join-8.7.0-snapshot-61ea26a.jar.sha1 b/server/licenses/lucene-join-8.7.0-snapshot-61ea26a.jar.sha1
diff --git a/server/licenses/lucene-join-8.7.0-snapshot-b313618cc1d.jar.sha1 b/server/licenses/lucene-join-8.7.0-snapshot-b313618cc1d.jar.sha1
@@ -0,0 +1 @@
+4f31d020b0963592833c91b23de4526975f20cad
diff --git a/server/licenses/lucene-memory-8.7.0-snapshot-61ea26a.jar.sha1 b/server/licenses/lucene-memory-8.7.0-snapshot-61ea26a.jar.sha1
diff --git a/server/licenses/lucene-memory-8.7.0-snapshot-b313618cc1d.jar.sha1 b/server/licenses/lucene-memory-8.7.0-snapshot-b313618cc1d.jar.sha1
@@ -0,0 +1 @@
+74dccfd7b08e3fdef90874e86e3df0d1094e66ae
diff --git a/server/licenses/lucene-misc-8.7.0-snapshot-61ea26a.jar.sha1 b/server/licenses/lucene-misc-8.7.0-snapshot-61ea26a.jar.sha1
diff --git a/server/licenses/lucene-misc-8.7.0-snapshot-b313618cc1d.jar.sha1 b/server/licenses/lucene-misc-8.7.0-snapshot-b313618cc1d.jar.sha1
@@ -0,0 +1 @@
+a20f9310006f38a0ac731ff2fe6f5604ccac40e3
diff --git a/server/licenses/lucene-queries-8.7.0-snapshot-61ea26a.jar.sha1 b/server/licenses/lucene-queries-8.7.0-snapshot-61ea26a.jar.sha1
diff --git a/server/licenses/lucene-queries-8.7.0-snapshot-b313618cc1d.jar.sha1 b/server/licenses/lucene-queries-8.7.0-snapshot-b313618cc1d.jar.sha1
@@ -0,0 +1 @@
+adbe04951f52abb5bc6525852485cbe4cccb905c
diff --git a/server/licenses/lucene-queryparser-8.7.0-snapshot-61ea26a.jar.sha1 b/server/licenses/lucene-queryparser-8.7.0-snapshot-61ea26a.jar.sha1
diff --git a/server/licenses/lucene-queryparser-8.7.0-snapshot-b313618cc1d.jar.sha1 b/server/licenses/lucene-queryparser-8.7.0-snapshot-b313618cc1d.jar.sha1
@@ -0,0 +1 @@
+83301271ce15daedbffb17619b1d40846ea64e4d
diff --git a/server/licenses/lucene-sandbox-8.7.0-snapshot-61ea26a.jar.sha1 b/server/licenses/lucene-sandbox-8.7.0-snapshot-61ea26a.jar.sha1
diff --git a/server/licenses/lucene-sandbox-8.7.0-snapshot-b313618cc1d.jar.sha1 b/server/licenses/lucene-sandbox-8.7.0-snapshot-b313618cc1d.jar.sha1
@@ -0,0 +1 @@
+ac08ec6d2f2c370c43a40e1992de3fce7d6df56d
diff --git a/server/licenses/lucene-spatial-extras-8.7.0-snapshot-61ea26a.jar.sha1 b/server/licenses/lucene-spatial-extras-8.7.0-snapshot-61ea26a.jar.sha1
diff --git a/server/licenses/lucene-spatial-extras-8.7.0-snapshot-b313618cc1d.jar.sha1 b/server/licenses/lucene-spatial-extras-8.7.0-snapshot-b313618cc1d.jar.sha1
@@ -0,0 +1 @@
+2e362721ac930d1eaed547c00c33baa12e646347
diff --git a/server/licenses/lucene-spatial3d-8.7.0-snapshot-61ea26a.jar.sha1 b/server/licenses/lucene-spatial3d-8.7.0-snapshot-61ea26a.jar.sha1
diff --git a/server/licenses/lucene-spatial3d-8.7.0-snapshot-b313618cc1d.jar.sha1 b/server/licenses/lucene-spatial3d-8.7.0-snapshot-b313618cc1d.jar.sha1
@@ -0,0 +1 @@
+8f89adfad9fb1d6e7712cc875e9cd2e6bbb43d25
diff --git a/server/licenses/lucene-suggest-8.7.0-snapshot-61ea26a.jar.sha1 b/server/licenses/lucene-suggest-8.7.0-snapshot-61ea26a.jar.sha1
diff --git a/server/licenses/lucene-suggest-8.7.0-snapshot-b313618cc1d.jar.sha1 b/server/licenses/lucene-suggest-8.7.0-snapshot-b313618cc1d.jar.sha1
@@ -0,0 +1 @@
+6d77ce7816c0b8e07c72609ca2a6ffaa94280bdf
diff --git a/server/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java b/server/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java
@@ -74,6 +74,7 @@
 import org.apache.lucene.store.IndexOutput;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.FixedBitSet;
+import org.apache.lucene.util.bkd.BKDConfig;
 import org.apache.lucene.util.bkd.BKDReader;
 import org.apache.lucene.util.bkd.BKDWriter;
 import org.elasticsearch.action.search.SearchShardTask;
@@ -771,9 +772,9 @@ public void testIndexHasDuplicateData() throws IOException {
         int maxPointsInLeafNode = 40;
         float duplicateRatio = 0.7f;
         long duplicateValue = randomLongBetween(-10000000L, 10000000L);
-
+        BKDConfig config = new BKDConfig(1, 1, 8, maxPointsInLeafNode);
         try (Directory dir = newDirectory()) {
-            BKDWriter w = new BKDWriter(docsCount, dir, "tmp", 1, 1, 8, maxPointsInLeafNode, 1, docsCount);
+            BKDWriter w = new BKDWriter(docsCount, dir, "tmp", config, 1, docsCount);
             byte[] longBytes = new byte[8];
             for (int docId = 0; docId < docsCount; docId++) {
                 long value = randomFloat() < duplicateRatio ? duplicateValue : randomLongBetween(-10000000L, 10000000L);
@@ -799,9 +800,9 @@ public void testIndexHasNoDuplicateData() throws IOException {
         int maxPointsInLeafNode = 40;
         float duplicateRatio = 0.3f;
         long duplicateValue = randomLongBetween(-10000000L, 10000000L);
-
+        BKDConfig config = new BKDConfig(1, 1, 8, maxPointsInLeafNode);
         try (Directory dir = newDirectory()) {
-            BKDWriter w = new BKDWriter(docsCount, dir, "tmp", 1, 1, 8, maxPointsInLeafNode, 1, docsCount);
+            BKDWriter w = new BKDWriter(docsCount, dir, "tmp", config, 1, docsCount);
             byte[] longBytes = new byte[8];
             for (int docId = 0; docId < docsCount; docId++) {
                 long value = randomFloat() < duplicateRatio ? duplicateValue : randomLongBetween(-10000000L, 10000000L);

diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.7.0-snapshot-61ea26a.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.7.0-snapshot-61ea26a.jar.sha1
diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.7.0-snapshot-b313618cc1d.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.7.0-snapshot-b313618cc1d.jar.sha1
@@ -0,0 +1 @@
+be458e2aa6cdb6c24df05c560323edfbad1a4ac9