upgrade to Lucene-8.3.0-snapshot-47aece66b48 (#47770)

buildSrc/version.properties

@@ -1,5 +1,5 @@
 elasticsearch     = 8.0.0
-lucene            = 8.2.0
+lucene            = 8.3.0-snapshot-47aece66b48
 
 bundled_jdk_vendor = adoptopenjdk
 bundled_jdk = 13+33

docs/Versions.asciidoc

@@ -1,8 +1,8 @@
 
 include::{asciidoc-dir}/../../shared/versions/stack/{source_branch}.asciidoc[]
 
-:lucene_version:        8.2.0
-:lucene_version_path:   8_2_0
+:lucene_version:        8.3.0
+:lucene_version_path:   8_3_0
 :jdk:                   11.0.2
 :jdk_major:             11
 :build_flavor:          default

modules/lang-expression/licenses/lucene-expressions-8.2.0.jar.sha1

@@ -1 +0,0 @@
-afec1e7228eca31b5f469bdcbbc84d04b0748eae

modules/lang-expression/licenses/lucene-expressions-8.3.0-snapshot-47aece66b48.jar.sha1

@@ -0,0 +1 @@
+e2260f824416f7d12b20bf886eebae03be8944a1

plugins/analysis-icu/licenses/lucene-analyzers-icu-8.2.0.jar.sha1

@@ -1 +0,0 @@
-246a593068e012d0deac604cde68734b3e843aa3

plugins/analysis-icu/licenses/lucene-analyzers-icu-8.3.0-snapshot-47aece66b48.jar.sha1

@@ -0,0 +1 @@
+c7a7f7d40a7494b8bd52be1209911ddd9143c5b8

plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.2.0.jar.sha1

@@ -1 +0,0 @@
-169e079501f3e0b143c4ea3c953a3cc9aff8758a

plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.3.0-snapshot-47aece66b48.jar.sha1

@@ -0,0 +1 @@
+cef642e6a327bad903f5981eeae0060b89021563

plugins/analysis-nori/licenses/lucene-analyzers-nori-8.2.0.jar.sha1

@@ -1 +0,0 @@
-4f0feca14e6ac73b708a9ccd437478260a46bead

plugins/analysis-nori/licenses/lucene-analyzers-nori-8.3.0-snapshot-47aece66b48.jar.sha1

@@ -0,0 +1 @@
+88ea5a9a936bf82c2736c6c5d7e51063e64e6cf3

plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.2.0.jar.sha1

@@ -1 +0,0 @@
-a87df79bb727bbe355dbcf367e4489fc1010343f

plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.3.0-snapshot-47aece66b48.jar.sha1

@@ -0,0 +1 @@
+7108a0cb8b49507a7f0a5f39812df9089e57042d

plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.2.0.jar.sha1

@@ -1 +0,0 @@
-cb93b65fb1ddd218142ebc50857c56a61b3b578b

plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.3.0-snapshot-47aece66b48.jar.sha1

@@ -0,0 +1 @@
+37d7b6d5325fca7aaafb0b695e02a8be688c3f7a

plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.2.0.jar.sha1

@@ -1 +0,0 @@
-6db9b08863134ef1c080f30376693a55de3a372b

plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.3.0-snapshot-47aece66b48.jar.sha1

@@ -0,0 +1 @@
+c2d9ace594785c1ab1c2df13a9f5ebcb42689307

plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.2.0.jar.sha1

@@ -1 +0,0 @@
-b89c9f985cdcf3f563d6e66057b2fd6e22e75f77

plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.3.0-snapshot-47aece66b48.jar.sha1

@@ -0,0 +1 @@
+ad1ca606d91504d451681bfd68b9cb853f47e2df

server/licenses/lucene-analyzers-common-8.2.0.jar.sha1

@@ -1 +0,0 @@
-8e8abc90572ed74b110c75b546c675153aecc570

server/licenses/lucene-analyzers-common-8.3.0-snapshot-47aece66b48.jar.sha1

@@ -0,0 +1 @@
+5108223bbcac863608afa1e41e509e3ec460aa3f

server/licenses/lucene-backward-codecs-8.2.0.jar.sha1

@@ -1 +0,0 @@
-91397b1e0dab4a66e9e58a82ab1690f0383aaced

server/licenses/lucene-backward-codecs-8.3.0-snapshot-47aece66b48.jar.sha1

@@ -0,0 +1 @@
+e21c89e2b29844bb917ad1491a81ccccd0626731

server/licenses/lucene-core-8.2.0.jar.sha1

@@ -1 +0,0 @@
-f6da40436d3633de272810fae1e339c237adfcf6

server/licenses/lucene-core-8.3.0-snapshot-47aece66b48.jar.sha1

@@ -0,0 +1 @@
+056ec85e87643be0229f08adefe37158cc9eedb9

server/licenses/lucene-grouping-8.2.0.jar.sha1

@@ -1 +0,0 @@
-a457b6ae0b02a02c9fc7061a19289601554c320a

server/licenses/lucene-grouping-8.3.0-snapshot-47aece66b48.jar.sha1

@@ -0,0 +1 @@
+22101e555b07ab21967c7bbc99bea332d884e771

server/licenses/lucene-highlighter-8.2.0.jar.sha1

@@ -1 +0,0 @@
-21bdc9d7e134c9e8bb2bab7a5c32f5ff08b345ec

server/licenses/lucene-highlighter-8.3.0-snapshot-47aece66b48.jar.sha1

@@ -0,0 +1 @@
+e5601ed8177edbbfd30ed9fc5bd26b1a05c7d9cc

server/licenses/lucene-join-8.2.0.jar.sha1

@@ -1 +0,0 @@
-6e1f359cb49868ec2482cb1af7f32b19ac70fcf3

server/licenses/lucene-join-8.3.0-snapshot-47aece66b48.jar.sha1

@@ -0,0 +1 @@
+fae3ee405820dfb06d084799a19fd21961b2f469

server/licenses/lucene-memory-8.2.0.jar.sha1

@@ -1 +0,0 @@
-719c1c86f525d58a717eb6338552cd3aaa19d56c

server/licenses/lucene-memory-8.3.0-snapshot-47aece66b48.jar.sha1

@@ -0,0 +1 @@
+7c16bd6b897fccef3eadd121c338b4d068cb767f

server/licenses/lucene-misc-8.2.0.jar.sha1

@@ -1 +0,0 @@
-539c353c1861df0ace480978429f48a4bccd29c4

server/licenses/lucene-misc-8.3.0-snapshot-47aece66b48.jar.sha1

@@ -0,0 +1 @@
+6a7e82ccfb773fdc9e3e95b731a133cbfd94a595

server/licenses/lucene-queries-8.2.0.jar.sha1

@@ -1 +0,0 @@
-5da383678cb0a35a07ccb03487ba00cf184d1d71

server/licenses/lucene-queries-8.3.0-snapshot-47aece66b48.jar.sha1

@@ -0,0 +1 @@
+2048e411a78fab4515b3b9a778eb947da7985f3c

server/licenses/lucene-queryparser-8.2.0.jar.sha1

@@ -1 +0,0 @@
-8925df7b104e78e308e236ff0740a064dd93cadd

server/licenses/lucene-queryparser-8.3.0-snapshot-47aece66b48.jar.sha1

@@ -0,0 +1 @@
+b5767557a3108d5c655003eb244f74630fe6ac4d

server/licenses/lucene-sandbox-8.2.0.jar.sha1

@@ -1 +0,0 @@
-f50931f1db40cdcc31e5044439d4e5522a23f6c1

server/licenses/lucene-sandbox-8.3.0-snapshot-47aece66b48.jar.sha1

@@ -0,0 +1 @@
+e44616942f414ae2235981ec93fa66eea9b3303e

server/licenses/lucene-spatial-8.2.0.jar.sha1

@@ -1 +0,0 @@
-8a9edbc075ae5fd6ee2265f0bb6d5847e78c8a96

server/licenses/lucene-spatial-8.3.0-snapshot-47aece66b48.jar.sha1

@@ -0,0 +1 @@
+78d211bd87d94aed9e1589425d5302f31c3eb6bd

server/licenses/lucene-spatial-extras-8.2.0.jar.sha1

@@ -1 +0,0 @@
-1335a4a876a82dbbb79df8172133df66de06689f

server/licenses/lucene-spatial-extras-8.3.0-snapshot-47aece66b48.jar.sha1

@@ -0,0 +1 @@
+f4973cb04cf610b28dd0e29c41200f5cbca4b546

server/licenses/lucene-spatial3d-8.2.0.jar.sha1

@@ -1 +0,0 @@
-0bc0ee3f2d70cf66dc79a781b9edd6311f1f6a49

server/licenses/lucene-spatial3d-8.3.0-snapshot-47aece66b48.jar.sha1

@@ -0,0 +1 @@
+7b3b034e4c7b8719411ce8a937dc2572b442bab1

server/licenses/lucene-suggest-8.2.0.jar.sha1

@@ -1 +0,0 @@
-334d627bda935dfb34e8e1c78d8f5a28b4be325a

server/licenses/lucene-suggest-8.3.0-snapshot-47aece66b48.jar.sha1

@@ -0,0 +1 @@
+51ed07430792c03888a7b721f2977d0e08e31e81

server/src/main/java/org/elasticsearch/Version.java

@@ -69,7 +69,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_7_4_0 = new Version(7040099, org.apache.lucene.util.Version.LUCENE_8_2_0);
     public static final Version V_7_4_1 = new Version(7040199, org.apache.lucene.util.Version.LUCENE_8_2_0);
     public static final Version V_7_5_0 = new Version(7050099, org.apache.lucene.util.Version.LUCENE_8_2_0);
-    public static final Version V_8_0_0 = new Version(8000099, org.apache.lucene.util.Version.LUCENE_8_2_0);
+    public static final Version V_8_0_0 = new Version(8000099, org.apache.lucene.util.Version.LUCENE_8_3_0);
     public static final Version CURRENT = V_8_0_0;
 
     private static final ImmutableOpenIntMap<Version> idToVersion;

server/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java

@@ -21,7 +21,6 @@ package org.elasticsearch.search.dfs;
 
 import com.carrotsearch.hppc.ObjectObjectHashMap;
 import org.apache.lucene.index.Term;
-import org.apache.lucene.index.TermStates;
 import org.apache.lucene.search.CollectionStatistics;
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
@@ -54,11 +53,11 @@ public class DfsPhase implements SearchPhase {
             Map<Term, TermStatistics> stats = new HashMap<>();
             IndexSearcher searcher = new IndexSearcher(context.searcher().getIndexReader()) {
                 @Override
-                public TermStatistics termStatistics(Term term, TermStates states) throws IOException {
+                public TermStatistics termStatistics(Term term, int docFreq, long totalTermFreq) throws IOException {
                     if (context.isCancelled()) {
                         throw new TaskCancelledException("cancelled");
                     }
-                    TermStatistics ts = super.termStatistics(term, states);
+                    TermStatistics ts = super.termStatistics(term, docFreq, totalTermFreq);
                     if (ts != null) {
                         stats.put(term, ts);
                     }

server/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java

@@ -23,7 +23,6 @@ import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.Term;
-import org.apache.lucene.index.TermStates;
 import org.apache.lucene.search.BulkScorer;
 import org.apache.lucene.search.CollectionStatistics;
 import org.apache.lucene.search.CollectionTerminatedException;
@@ -244,15 +243,15 @@ public class ContextIndexSearcher extends IndexSearcher {
     }
 
     @Override
-    public TermStatistics termStatistics(Term term, TermStates context) throws IOException {
+    public TermStatistics termStatistics(Term term, int docFreq, long totalTermFreq) throws IOException {
         if (aggregatedDfs == null) {
             // we are either executing the dfs phase or the search_type doesn't include the dfs phase.
-            return super.termStatistics(term, context);
+            return super.termStatistics(term, docFreq, totalTermFreq);
         }
         TermStatistics termStatistics = aggregatedDfs.termStatistics().get(term);
         if (termStatistics == null) {
             // we don't have stats for this - this might be a must_not clauses etc. that doesn't allow extract terms on the query
-            return super.termStatistics(term, context);
+            return super.termStatistics(term, docFreq, totalTermFreq);
         }
         return termStatistics;
     }

server/src/test/java/org/elasticsearch/index/mapper/TextFieldMapperTests.java

@@ -771,6 +771,7 @@ public class TextFieldMapperTests extends ESSingleNodeTestCase {
         }
     }
 
+    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/47777")
     public void testFastPhraseMapping() throws IOException {
 
         QueryShardContext queryShardContext = indexService.newQueryShardContext(

test/framework/src/main/java/org/elasticsearch/indices/analysis/AnalysisFactoryTestCase.java

@@ -191,7 +191,9 @@ public abstract class AnalysisFactoryTestCase extends ESTestCase {
         // particular token filters based on the attributes of the current token.
         entry("protectedterm", Void.class),
         // LUCENE-8332
-        entry("concatenategraph", Void.class));
+        entry("concatenategraph", Void.class),
+        // LUCENE-8936
+        entry("spanishminimalstem", Void.class));
 
     static final Map<String, Class<?>> KNOWN_CHARFILTERS = Map.of(
             "htmlstrip", MovedToAnalysisCommon.class,

x-pack/plugin/sql/sql-action/licenses/lucene-core-8.2.0.jar.sha1

@@ -1 +0,0 @@
-f6da40436d3633de272810fae1e339c237adfcf6

x-pack/plugin/sql/sql-action/licenses/lucene-core-8.3.0-snapshot-47aece66b48.jar.sha1

@@ -0,0 +1 @@
+056ec85e87643be0229f08adefe37158cc9eedb9