Bladeren bron

Upgrade to lucene snapshot 774e9aefbc (#36637)

Includes LUCENE-8607: improvement to MatchAllDocsQuery
Alan Woodward 6 jaren geleden
bovenliggende
commit
c7ac9ef826
50 gewijzigde bestanden met toevoegingen van 29 en 29 verwijderingen
  1. 1 1
      buildSrc/version.properties
  2. 1 0
      modules/lang-expression/licenses/lucene-expressions-8.0.0-snapshot-774e9aefbc.jar.sha1
  3. 0 1
      modules/lang-expression/licenses/lucene-expressions-8.0.0-snapshot-7e4555a2fd.jar.sha1
  4. 1 0
      plugins/analysis-icu/licenses/lucene-analyzers-icu-8.0.0-snapshot-774e9aefbc.jar.sha1
  5. 0 1
      plugins/analysis-icu/licenses/lucene-analyzers-icu-8.0.0-snapshot-7e4555a2fd.jar.sha1
  6. 1 0
      plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.0.0-snapshot-774e9aefbc.jar.sha1
  7. 0 1
      plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.0.0-snapshot-7e4555a2fd.jar.sha1
  8. 1 0
      plugins/analysis-nori/licenses/lucene-analyzers-nori-8.0.0-snapshot-774e9aefbc.jar.sha1
  9. 0 1
      plugins/analysis-nori/licenses/lucene-analyzers-nori-8.0.0-snapshot-7e4555a2fd.jar.sha1
  10. 1 0
      plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.0.0-snapshot-774e9aefbc.jar.sha1
  11. 0 1
      plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.0.0-snapshot-7e4555a2fd.jar.sha1
  12. 1 0
      plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.0.0-snapshot-774e9aefbc.jar.sha1
  13. 0 1
      plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.0.0-snapshot-7e4555a2fd.jar.sha1
  14. 1 0
      plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.0.0-snapshot-774e9aefbc.jar.sha1
  15. 0 1
      plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.0.0-snapshot-7e4555a2fd.jar.sha1
  16. 1 0
      plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.0.0-snapshot-774e9aefbc.jar.sha1
  17. 0 1
      plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.0.0-snapshot-7e4555a2fd.jar.sha1
  18. 1 0
      server/licenses/lucene-analyzers-common-8.0.0-snapshot-774e9aefbc.jar.sha1
  19. 0 1
      server/licenses/lucene-analyzers-common-8.0.0-snapshot-7e4555a2fd.jar.sha1
  20. 1 0
      server/licenses/lucene-backward-codecs-8.0.0-snapshot-774e9aefbc.jar.sha1
  21. 0 1
      server/licenses/lucene-backward-codecs-8.0.0-snapshot-7e4555a2fd.jar.sha1
  22. 1 0
      server/licenses/lucene-core-8.0.0-snapshot-774e9aefbc.jar.sha1
  23. 0 1
      server/licenses/lucene-core-8.0.0-snapshot-7e4555a2fd.jar.sha1
  24. 1 0
      server/licenses/lucene-grouping-8.0.0-snapshot-774e9aefbc.jar.sha1
  25. 0 1
      server/licenses/lucene-grouping-8.0.0-snapshot-7e4555a2fd.jar.sha1
  26. 1 0
      server/licenses/lucene-highlighter-8.0.0-snapshot-774e9aefbc.jar.sha1
  27. 0 1
      server/licenses/lucene-highlighter-8.0.0-snapshot-7e4555a2fd.jar.sha1
  28. 1 0
      server/licenses/lucene-join-8.0.0-snapshot-774e9aefbc.jar.sha1
  29. 0 1
      server/licenses/lucene-join-8.0.0-snapshot-7e4555a2fd.jar.sha1
  30. 1 0
      server/licenses/lucene-memory-8.0.0-snapshot-774e9aefbc.jar.sha1
  31. 0 1
      server/licenses/lucene-memory-8.0.0-snapshot-7e4555a2fd.jar.sha1
  32. 1 0
      server/licenses/lucene-misc-8.0.0-snapshot-774e9aefbc.jar.sha1
  33. 0 1
      server/licenses/lucene-misc-8.0.0-snapshot-7e4555a2fd.jar.sha1
  34. 1 0
      server/licenses/lucene-queries-8.0.0-snapshot-774e9aefbc.jar.sha1
  35. 0 1
      server/licenses/lucene-queries-8.0.0-snapshot-7e4555a2fd.jar.sha1
  36. 1 0
      server/licenses/lucene-queryparser-8.0.0-snapshot-774e9aefbc.jar.sha1
  37. 0 1
      server/licenses/lucene-queryparser-8.0.0-snapshot-7e4555a2fd.jar.sha1
  38. 1 0
      server/licenses/lucene-sandbox-8.0.0-snapshot-774e9aefbc.jar.sha1
  39. 0 1
      server/licenses/lucene-sandbox-8.0.0-snapshot-7e4555a2fd.jar.sha1
  40. 1 0
      server/licenses/lucene-spatial-8.0.0-snapshot-774e9aefbc.jar.sha1
  41. 0 1
      server/licenses/lucene-spatial-8.0.0-snapshot-7e4555a2fd.jar.sha1
  42. 1 0
      server/licenses/lucene-spatial-extras-8.0.0-snapshot-774e9aefbc.jar.sha1
  43. 0 1
      server/licenses/lucene-spatial-extras-8.0.0-snapshot-7e4555a2fd.jar.sha1
  44. 1 0
      server/licenses/lucene-spatial3d-8.0.0-snapshot-774e9aefbc.jar.sha1
  45. 0 1
      server/licenses/lucene-spatial3d-8.0.0-snapshot-7e4555a2fd.jar.sha1
  46. 1 0
      server/licenses/lucene-suggest-8.0.0-snapshot-774e9aefbc.jar.sha1
  47. 0 1
      server/licenses/lucene-suggest-8.0.0-snapshot-7e4555a2fd.jar.sha1
  48. 4 4
      server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
  49. 1 0
      x-pack/plugin/sql/sql-action/licenses/lucene-core-8.0.0-snapshot-774e9aefbc.jar.sha1
  50. 0 1
      x-pack/plugin/sql/sql-action/licenses/lucene-core-8.0.0-snapshot-7e4555a2fd.jar.sha1

+ 1 - 1
buildSrc/version.properties

@@ -1,5 +1,5 @@
 elasticsearch     = 7.0.0
-lucene            = 8.0.0-snapshot-7e4555a2fd
+lucene            = 8.0.0-snapshot-774e9aefbc
 
 # optional dependencies
 spatial4j         = 0.7

+ 1 - 0
modules/lang-expression/licenses/lucene-expressions-8.0.0-snapshot-774e9aefbc.jar.sha1

@@ -0,0 +1 @@
+69279f27885c43662ca7216a6939dacbdf9b4795

+ 0 - 1
modules/lang-expression/licenses/lucene-expressions-8.0.0-snapshot-7e4555a2fd.jar.sha1

@@ -1 +0,0 @@
-70b328502ac1cc2d27c899a642ffb2f4f1d2b9f3

+ 1 - 0
plugins/analysis-icu/licenses/lucene-analyzers-icu-8.0.0-snapshot-774e9aefbc.jar.sha1

@@ -0,0 +1 @@
+143e925924dcc9cb8ad1b584727c2c3b6c9e5633

+ 0 - 1
plugins/analysis-icu/licenses/lucene-analyzers-icu-8.0.0-snapshot-7e4555a2fd.jar.sha1

@@ -1 +0,0 @@
-643eede8327f69cf0332cecd13100536daa5f04a

+ 1 - 0
plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.0.0-snapshot-774e9aefbc.jar.sha1

@@ -0,0 +1 @@
+53281a354724cf52babb0460e51d5b6ec99ecad4

+ 0 - 1
plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.0.0-snapshot-7e4555a2fd.jar.sha1

@@ -1 +0,0 @@
-191f07773cd9e8fa76914d7ba1a79292fd465230

+ 1 - 0
plugins/analysis-nori/licenses/lucene-analyzers-nori-8.0.0-snapshot-774e9aefbc.jar.sha1

@@ -0,0 +1 @@
+d12356cdbcf4ed17586fef5e6fd1a6ea068821b5

+ 0 - 1
plugins/analysis-nori/licenses/lucene-analyzers-nori-8.0.0-snapshot-7e4555a2fd.jar.sha1

@@ -1 +0,0 @@
-f981e4522f24af287a47e582080e6f4eae3bfbd9

+ 1 - 0
plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.0.0-snapshot-774e9aefbc.jar.sha1

@@ -0,0 +1 @@
+b0f3b0409db20717a5229bc639f703eca97ebd4c

+ 0 - 1
plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.0.0-snapshot-7e4555a2fd.jar.sha1

@@ -1 +0,0 @@
-4e79b61404330b938aee53c19a7c1628b23c06e8

+ 1 - 0
plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.0.0-snapshot-774e9aefbc.jar.sha1

@@ -0,0 +1 @@
+79f18e781a83062919eb60e06a96184ffda4a0c3

+ 0 - 1
plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.0.0-snapshot-7e4555a2fd.jar.sha1

@@ -1 +0,0 @@
-dbd77958185f15d27510ae554b4f91366f477e41

+ 1 - 0
plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.0.0-snapshot-774e9aefbc.jar.sha1

@@ -0,0 +1 @@
+3c78ca17dd641a3efe1bea980e5290159867b85d

+ 0 - 1
plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.0.0-snapshot-7e4555a2fd.jar.sha1

@@ -1 +0,0 @@
-0b7bcb14961ad1ff22157dff78497b409fd76050

+ 1 - 0
plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.0.0-snapshot-774e9aefbc.jar.sha1

@@ -0,0 +1 @@
+019b424ea61617788f460218fbdd9c2107a7ff5a

+ 0 - 1
plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.0.0-snapshot-7e4555a2fd.jar.sha1

@@ -1 +0,0 @@
-4e2d601547ffe3e8ccc814a25ce35e3ba7e369b3

+ 1 - 0
server/licenses/lucene-analyzers-common-8.0.0-snapshot-774e9aefbc.jar.sha1

@@ -0,0 +1 @@
+729c6a031e3849874028020301e1f45a05d5a0bb

+ 0 - 1
server/licenses/lucene-analyzers-common-8.0.0-snapshot-7e4555a2fd.jar.sha1

@@ -1 +0,0 @@
-37be26a0881a2ae009a7057d6f384b75136d98f7

+ 1 - 0
server/licenses/lucene-backward-codecs-8.0.0-snapshot-774e9aefbc.jar.sha1

@@ -0,0 +1 @@
+5f831dea7c0bafd6306653144388a8ecd1186158

+ 0 - 1
server/licenses/lucene-backward-codecs-8.0.0-snapshot-7e4555a2fd.jar.sha1

@@ -1 +0,0 @@
-a5b18174ee3936b29218a0320b2a8b94e7150871

+ 1 - 0
server/licenses/lucene-core-8.0.0-snapshot-774e9aefbc.jar.sha1

@@ -0,0 +1 @@
+49b3ac44b6749a7ebf0c2e41a81e7910133d2fcc

+ 0 - 1
server/licenses/lucene-core-8.0.0-snapshot-7e4555a2fd.jar.sha1

@@ -1 +0,0 @@
-47253358ac340c35845c2a1007849db4234740da

+ 1 - 0
server/licenses/lucene-grouping-8.0.0-snapshot-774e9aefbc.jar.sha1

@@ -0,0 +1 @@
+0396dff0af03463e784b86fd1a24008e2f07daa2

+ 0 - 1
server/licenses/lucene-grouping-8.0.0-snapshot-7e4555a2fd.jar.sha1

@@ -1 +0,0 @@
-98799c869205e22d903a797dcb495c31954699e0

+ 1 - 0
server/licenses/lucene-highlighter-8.0.0-snapshot-774e9aefbc.jar.sha1

@@ -0,0 +1 @@
+d552b941fef2a64ab4c9b2509906950257f92262

+ 0 - 1
server/licenses/lucene-highlighter-8.0.0-snapshot-7e4555a2fd.jar.sha1

@@ -1 +0,0 @@
-7bb476d98f9e9caf7ba62ac1b0feb791979c36c9

+ 1 - 0
server/licenses/lucene-join-8.0.0-snapshot-774e9aefbc.jar.sha1

@@ -0,0 +1 @@
+192e9374124c14c7cd594a6f87aed61806e6e402

+ 0 - 1
server/licenses/lucene-join-8.0.0-snapshot-7e4555a2fd.jar.sha1

@@ -1 +0,0 @@
-a7a3562acc7f0c20ad9d24bc21f140d920de973b

+ 1 - 0
server/licenses/lucene-memory-8.0.0-snapshot-774e9aefbc.jar.sha1

@@ -0,0 +1 @@
+b9345c0321a3f4c7aa69ecfaf15cdee74180e409

+ 0 - 1
server/licenses/lucene-memory-8.0.0-snapshot-7e4555a2fd.jar.sha1

@@ -1 +0,0 @@
-0b76d08438b959417d2372512ce6f43347085f51

+ 1 - 0
server/licenses/lucene-misc-8.0.0-snapshot-774e9aefbc.jar.sha1

@@ -0,0 +1 @@
+ace540746369ded8b2f354d35002f5ccf6a58aab

+ 0 - 1
server/licenses/lucene-misc-8.0.0-snapshot-7e4555a2fd.jar.sha1

@@ -1 +0,0 @@
-0ed089a34dbd66f8b153d292d6dd2a04f99ce8af

+ 1 - 0
server/licenses/lucene-queries-8.0.0-snapshot-774e9aefbc.jar.sha1

@@ -0,0 +1 @@
+baaf3082d703c0e89ea5f131de878b586d302e34

+ 0 - 1
server/licenses/lucene-queries-8.0.0-snapshot-7e4555a2fd.jar.sha1

@@ -1 +0,0 @@
-59b63afbf361b9856d544d03e3117e4cd6ef1b18

+ 1 - 0
server/licenses/lucene-queryparser-8.0.0-snapshot-774e9aefbc.jar.sha1

@@ -0,0 +1 @@
+799b3ffee1401fba8874b0a8ce1ab203c98d9708

+ 0 - 1
server/licenses/lucene-queryparser-8.0.0-snapshot-7e4555a2fd.jar.sha1

@@ -1 +0,0 @@
-63266335c7e8839d944bbc152aa110f921878cda

+ 1 - 0
server/licenses/lucene-sandbox-8.0.0-snapshot-774e9aefbc.jar.sha1

@@ -0,0 +1 @@
+a6293e2d890e4b1be455524466474a3eaac8be9a

+ 0 - 1
server/licenses/lucene-sandbox-8.0.0-snapshot-7e4555a2fd.jar.sha1

@@ -1 +0,0 @@
-4d37ca0d28dce66953bbcc4001ba08dc1af4d3b2

+ 1 - 0
server/licenses/lucene-spatial-8.0.0-snapshot-774e9aefbc.jar.sha1

@@ -0,0 +1 @@
+77490eb78316afdec9d0889868997777caf820c0

+ 0 - 1
server/licenses/lucene-spatial-8.0.0-snapshot-7e4555a2fd.jar.sha1

@@ -1 +0,0 @@
-47dfd50d6911b0a127d261068b0bfe496232e0c1

+ 1 - 0
server/licenses/lucene-spatial-extras-8.0.0-snapshot-774e9aefbc.jar.sha1

@@ -0,0 +1 @@
+4bb18049052ef738702ff5c0b294a5986971ed59

+ 0 - 1
server/licenses/lucene-spatial-extras-8.0.0-snapshot-7e4555a2fd.jar.sha1

@@ -1 +0,0 @@
-43f6876126ebb024e76a23d2247897d4a98c9c0f

+ 1 - 0
server/licenses/lucene-spatial3d-8.0.0-snapshot-774e9aefbc.jar.sha1

@@ -0,0 +1 @@
+936aa91d3b48bd559ee9d25303934f06aa95c1f7

+ 0 - 1
server/licenses/lucene-spatial3d-8.0.0-snapshot-7e4555a2fd.jar.sha1

@@ -1 +0,0 @@
-b6fa3f8d933fc7c2b91acd17edf3e849a34f89d7

+ 1 - 0
server/licenses/lucene-suggest-8.0.0-snapshot-774e9aefbc.jar.sha1

@@ -0,0 +1 @@
+268747a9cbdebb492268aca4558968f9d46d37a9

+ 0 - 1
server/licenses/lucene-suggest-8.0.0-snapshot-7e4555a2fd.jar.sha1

@@ -1 +0,0 @@
-0733cf78f94066053d3148448a565e71064515ed

+ 4 - 4
server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java

@@ -3609,8 +3609,8 @@ public class InternalEngineTests extends EngineTestCase {
         }
         engine.refresh("test");
         try (Engine.Searcher searcher = engine.acquireSearcher("test")) {
-            TopDocs topDocs = searcher.searcher().search(new MatchAllDocsQuery(), 10);
-            assertEquals(numDocs, topDocs.totalHits.value);
+            int count = searcher.searcher().count(new MatchAllDocsQuery());
+            assertEquals(numDocs, count);
         }
         if (primary) {
             // primaries rely on lucene dedup and may index the same document twice
@@ -3716,8 +3716,8 @@ public class InternalEngineTests extends EngineTestCase {
 
         engine.refresh("test");
         try (Engine.Searcher searcher = engine.acquireSearcher("test")) {
-            TopDocs topDocs = searcher.searcher().search(new MatchAllDocsQuery(), 10);
-            assertEquals(docs.size(), topDocs.totalHits.value);
+            int count = searcher.searcher().count(new MatchAllDocsQuery());
+            assertEquals(docs.size(), count);
         }
         assertEquals(0, engine.getNumVersionLookups());
         assertEquals(0, engine.getNumIndexVersionsLookups());

+ 1 - 0
x-pack/plugin/sql/sql-action/licenses/lucene-core-8.0.0-snapshot-774e9aefbc.jar.sha1

@@ -0,0 +1 @@
+49b3ac44b6749a7ebf0c2e41a81e7910133d2fcc

+ 0 - 1
x-pack/plugin/sql/sql-action/licenses/lucene-core-8.0.0-snapshot-7e4555a2fd.jar.sha1

@@ -1 +0,0 @@
-47253358ac340c35845c2a1007849db4234740da