SOLR-17157: Upgrade Lucene to 9.10.0

(cherry picked from commit 01f4abc) (cherry picked from commit 68762ad)
apache · Mar 19, 2024 · 7c816ad · 7c816ad
1 parent bdc4a4d
commit 7c816ad
Show file tree

Hide file tree

Showing 62 changed files with 69 additions and 62 deletions.
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
@@ -67,7 +67,8 @@ Bug Fixes
 
 Dependency Upgrades
 ---------------------
-(No changes)
+
+* SOLR-17157: Upgrade Lucene to 9.10.0 (hossman, Christine Poerschke)
 
 Other Changes
 ---------------------

diff --git a/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
@@ -536,7 +536,8 @@ private static class ReaderWrapper extends FilterLeafReader {
                   fieldInfo.getVectorDimension(),
                   fieldInfo.getVectorEncoding(),
                   fieldInfo.getVectorSimilarityFunction(),
-                  fieldInfo.isSoftDeletesField());
+                  fieldInfo.isSoftDeletesField(),
+                  fieldInfo.isParentField());
           newInfos.add(f);
         } else {
           newInfos.add(fieldInfo);

diff --git a/solr/core/src/java/org/apache/solr/search/NumericHidingLeafReader.java b/solr/core/src/java/org/apache/solr/search/NumericHidingLeafReader.java
@@ -76,7 +76,8 @@ private NumericHidingLeafReader(LeafReader in, String field) {
                 fi.getVectorDimension(),
                 fi.getVectorEncoding(),
                 fi.getVectorSimilarityFunction(),
-                fi.isSoftDeletesField()));
+                fi.isSoftDeletesField(),
+                fi.isParentField()));
       } else {
         filteredInfos.add(fi);
       }

diff --git a/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java
@@ -121,7 +121,8 @@ Query makeFilter(String fname, BytesRef[] byteRefs) {
     docValuesTermsFilterPerSegment {
       @Override
       Query makeFilter(String fname, BytesRef[] byteRefs) {
-        return disableCacheByDefault(SortedSetDocValuesField.newSlowSetQuery(fname, byteRefs));
+        return disableCacheByDefault(
+            SortedSetDocValuesField.newSlowSetQuery(fname, Arrays.asList(byteRefs)));
       }
     };
 

diff --git a/solr/core/src/java/org/apache/solr/search/join/GraphEdgeCollector.java b/solr/core/src/java/org/apache/solr/search/join/GraphEdgeCollector.java
@@ -17,6 +17,8 @@
 package org.apache.solr.search.join;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.TreeSet;
 import org.apache.lucene.document.SortedDocValuesField;
 import org.apache.lucene.index.DocValues;
@@ -169,11 +171,11 @@ public Query getResultQuery(SchemaField matchField, boolean useAutomaton) {
           AutomatonQuery autnQuery = new AutomatonQuery(new Term(matchField.getName()), autn);
           q = autnQuery;
         } else {
-          BytesRef[] termList = new BytesRef[collectorTerms.size()];
+          List<BytesRef> termList = new ArrayList<BytesRef>(collectorTerms.size());
           for (int i = 0; i < collectorTerms.size(); i++) {
             BytesRef ref = new BytesRef();
             collectorTerms.get(i, ref);
-            termList[i] = ref;
+            termList.add(ref);
           }
           q =
               (matchField.hasDocValues() && !matchField.indexed())

diff --git a/solr/core/src/java/org/apache/solr/uninverting/UninvertingReader.java b/solr/core/src/java/org/apache/solr/uninverting/UninvertingReader.java
@@ -298,7 +298,8 @@ public static LeafReader wrap(LeafReader in, Function<String, Type> mapping) {
                 fi.getVectorDimension(),
                 fi.getVectorEncoding(),
                 fi.getVectorSimilarityFunction(),
-                fi.isSoftDeletesField()));
+                fi.isSoftDeletesField(),
+                fi.isParentField()));
       } else {
         newFieldInfos.add(fi);
       }

diff --git a/solr/licenses/lucene-analysis-common-9.10.0.jar.sha1 b/solr/licenses/lucene-analysis-common-9.10.0.jar.sha1
@@ -0,0 +1 @@
+92e559808a23f61c818ef90a9ccab3669a25caa0
diff --git a/solr/licenses/lucene-analysis-common-9.9.2.jar.sha1 b/solr/licenses/lucene-analysis-common-9.9.2.jar.sha1
diff --git a/solr/licenses/lucene-analysis-icu-9.10.0.jar.sha1 b/solr/licenses/lucene-analysis-icu-9.10.0.jar.sha1
@@ -0,0 +1 @@
+ed54097d13dbaae6e758c31f55a473ba6566ae8d
diff --git a/solr/licenses/lucene-analysis-icu-9.9.2.jar.sha1 b/solr/licenses/lucene-analysis-icu-9.9.2.jar.sha1
diff --git a/solr/licenses/lucene-analysis-kuromoji-9.10.0.jar.sha1 b/solr/licenses/lucene-analysis-kuromoji-9.10.0.jar.sha1
@@ -0,0 +1 @@
+a158d8a7d386c782a10ec15827ff3f0aa6fd8291
diff --git a/solr/licenses/lucene-analysis-kuromoji-9.9.2.jar.sha1 b/solr/licenses/lucene-analysis-kuromoji-9.9.2.jar.sha1
diff --git a/solr/licenses/lucene-analysis-morfologik-9.10.0.jar.sha1 b/solr/licenses/lucene-analysis-morfologik-9.10.0.jar.sha1
@@ -0,0 +1 @@
+7acc74d35684269ffa74909395044e0e02581285
diff --git a/solr/licenses/lucene-analysis-morfologik-9.9.2.jar.sha1 b/solr/licenses/lucene-analysis-morfologik-9.9.2.jar.sha1
diff --git a/solr/licenses/lucene-analysis-nori-9.10.0.jar.sha1 b/solr/licenses/lucene-analysis-nori-9.10.0.jar.sha1
@@ -0,0 +1 @@
+79eb4c5e1c92b613341d05173dfcdce182fa5f80
diff --git a/solr/licenses/lucene-analysis-nori-9.9.2.jar.sha1 b/solr/licenses/lucene-analysis-nori-9.9.2.jar.sha1
diff --git a/solr/licenses/lucene-analysis-opennlp-9.10.0.jar.sha1 b/solr/licenses/lucene-analysis-opennlp-9.10.0.jar.sha1
@@ -0,0 +1 @@
+adbb75a175ef3d02058795000c1123216538d569
diff --git a/solr/licenses/lucene-analysis-opennlp-9.9.2.jar.sha1 b/solr/licenses/lucene-analysis-opennlp-9.9.2.jar.sha1
diff --git a/solr/licenses/lucene-analysis-phonetic-9.10.0.jar.sha1 b/solr/licenses/lucene-analysis-phonetic-9.10.0.jar.sha1
@@ -0,0 +1 @@
+b6ba8f0ecee48b94911c08ee12c20f059ec38ec5
diff --git a/solr/licenses/lucene-analysis-phonetic-9.9.2.jar.sha1 b/solr/licenses/lucene-analysis-phonetic-9.9.2.jar.sha1
diff --git a/solr/licenses/lucene-analysis-smartcn-9.10.0.jar.sha1 b/solr/licenses/lucene-analysis-smartcn-9.10.0.jar.sha1
@@ -0,0 +1 @@
+ccf4512816ba9cd5c2cca9182db78a2e48e7e16f
diff --git a/solr/licenses/lucene-analysis-smartcn-9.9.2.jar.sha1 b/solr/licenses/lucene-analysis-smartcn-9.9.2.jar.sha1
diff --git a/solr/licenses/lucene-analysis-stempel-9.10.0.jar.sha1 b/solr/licenses/lucene-analysis-stempel-9.10.0.jar.sha1
@@ -0,0 +1 @@
+b596817e70f00bc54d66e82c118f47ca91b9e401
diff --git a/solr/licenses/lucene-analysis-stempel-9.9.2.jar.sha1 b/solr/licenses/lucene-analysis-stempel-9.9.2.jar.sha1
diff --git a/solr/licenses/lucene-backward-codecs-9.10.0.jar.sha1 b/solr/licenses/lucene-backward-codecs-9.10.0.jar.sha1
@@ -0,0 +1 @@
+6570ebf974d07025ad4cd9ffaa9927546b534704
diff --git a/solr/licenses/lucene-backward-codecs-9.9.2.jar.sha1 b/solr/licenses/lucene-backward-codecs-9.9.2.jar.sha1
diff --git a/solr/licenses/lucene-classification-9.10.0.jar.sha1 b/solr/licenses/lucene-classification-9.10.0.jar.sha1
@@ -0,0 +1 @@
+cb5bd20fbd26d73f9bda17e6c09666fddaf14918
diff --git a/solr/licenses/lucene-classification-9.9.2.jar.sha1 b/solr/licenses/lucene-classification-9.9.2.jar.sha1
diff --git a/solr/licenses/lucene-codecs-9.10.0.jar.sha1 b/solr/licenses/lucene-codecs-9.10.0.jar.sha1
@@ -0,0 +1 @@
+caab918d047da970783376fc9fe65b3b428d92a2
diff --git a/solr/licenses/lucene-codecs-9.9.2.jar.sha1 b/solr/licenses/lucene-codecs-9.9.2.jar.sha1
diff --git a/solr/licenses/lucene-core-9.10.0.jar.sha1 b/solr/licenses/lucene-core-9.10.0.jar.sha1
@@ -0,0 +1 @@
+64e5624754d59386be5d9159c68f81ff96298704
diff --git a/solr/licenses/lucene-core-9.9.2.jar.sha1 b/solr/licenses/lucene-core-9.9.2.jar.sha1
diff --git a/solr/licenses/lucene-expressions-9.10.0.jar.sha1 b/solr/licenses/lucene-expressions-9.10.0.jar.sha1
@@ -0,0 +1 @@
+e2daf2e568fe120e84567505f7c85643bb0b9dd2
diff --git a/solr/licenses/lucene-expressions-9.9.2.jar.sha1 b/solr/licenses/lucene-expressions-9.9.2.jar.sha1
diff --git a/solr/licenses/lucene-grouping-9.10.0.jar.sha1 b/solr/licenses/lucene-grouping-9.10.0.jar.sha1
@@ -0,0 +1 @@
+b82838299e4fa423fc574c1c07405410823f74ce
diff --git a/solr/licenses/lucene-grouping-9.9.2.jar.sha1 b/solr/licenses/lucene-grouping-9.9.2.jar.sha1
diff --git a/solr/licenses/lucene-highlighter-9.10.0.jar.sha1 b/solr/licenses/lucene-highlighter-9.10.0.jar.sha1
@@ -0,0 +1 @@
+2f21ade4b4896f1ece2b3a823e1640c762c9d0cf
diff --git a/solr/licenses/lucene-highlighter-9.9.2.jar.sha1 b/solr/licenses/lucene-highlighter-9.9.2.jar.sha1
diff --git a/solr/licenses/lucene-join-9.10.0.jar.sha1 b/solr/licenses/lucene-join-9.10.0.jar.sha1
@@ -0,0 +1 @@
+541b722bb842817e2ec899cd4d0de2a136953f53
diff --git a/solr/licenses/lucene-join-9.9.2.jar.sha1 b/solr/licenses/lucene-join-9.9.2.jar.sha1
diff --git a/solr/licenses/lucene-memory-9.10.0.jar.sha1 b/solr/licenses/lucene-memory-9.10.0.jar.sha1
@@ -0,0 +1 @@
+06620029b6c7d84480fb7ad1ba0d72963111b765
diff --git a/solr/licenses/lucene-memory-9.9.2.jar.sha1 b/solr/licenses/lucene-memory-9.9.2.jar.sha1
diff --git a/solr/licenses/lucene-misc-9.10.0.jar.sha1 b/solr/licenses/lucene-misc-9.10.0.jar.sha1
@@ -0,0 +1 @@
+3621206c534d253a0205f8a0293c146ff34d8b03
diff --git a/solr/licenses/lucene-misc-9.9.2.jar.sha1 b/solr/licenses/lucene-misc-9.9.2.jar.sha1
diff --git a/solr/licenses/lucene-queries-9.10.0.jar.sha1 b/solr/licenses/lucene-queries-9.10.0.jar.sha1
@@ -0,0 +1 @@
+bbe2360c60a43bf41fbf05d5f0b4f471547217ba
diff --git a/solr/licenses/lucene-queries-9.9.2.jar.sha1 b/solr/licenses/lucene-queries-9.9.2.jar.sha1
diff --git a/solr/licenses/lucene-queryparser-9.10.0.jar.sha1 b/solr/licenses/lucene-queryparser-9.10.0.jar.sha1
@@ -0,0 +1 @@
+c50f82d244ea5adac2d2d9295de85ddccc2d45cb
diff --git a/solr/licenses/lucene-queryparser-9.9.2.jar.sha1 b/solr/licenses/lucene-queryparser-9.9.2.jar.sha1
diff --git a/solr/licenses/lucene-sandbox-9.10.0.jar.sha1 b/solr/licenses/lucene-sandbox-9.10.0.jar.sha1
@@ -0,0 +1 @@
+80bc56b23b34cddab97557e5ada7cd0558dbf5e5
diff --git a/solr/licenses/lucene-sandbox-9.9.2.jar.sha1 b/solr/licenses/lucene-sandbox-9.9.2.jar.sha1
diff --git a/solr/licenses/lucene-spatial-extras-9.10.0.jar.sha1 b/solr/licenses/lucene-spatial-extras-9.10.0.jar.sha1
@@ -0,0 +1 @@
+055e6aa874b6ec9ddafc2e115055de1445c2df49
diff --git a/solr/licenses/lucene-spatial-extras-9.9.2.jar.sha1 b/solr/licenses/lucene-spatial-extras-9.9.2.jar.sha1
diff --git a/solr/licenses/lucene-spatial3d-9.10.0.jar.sha1 b/solr/licenses/lucene-spatial3d-9.10.0.jar.sha1
@@ -0,0 +1 @@
+06945a8b2a703062ce4b286ecceae7182b4f5f44
diff --git a/solr/licenses/lucene-spatial3d-9.9.2.jar.sha1 b/solr/licenses/lucene-spatial3d-9.9.2.jar.sha1
diff --git a/solr/licenses/lucene-suggest-9.10.0.jar.sha1 b/solr/licenses/lucene-suggest-9.10.0.jar.sha1
@@ -0,0 +1 @@
+d2068ad997165a414927e8c0072d0b88741af069
diff --git a/solr/licenses/lucene-suggest-9.9.2.jar.sha1 b/solr/licenses/lucene-suggest-9.9.2.jar.sha1
diff --git a/solr/licenses/lucene-test-framework-9.10.0.jar.sha1 b/solr/licenses/lucene-test-framework-9.10.0.jar.sha1
@@ -0,0 +1 @@
+3da58b8d40798a45e4073fdc2148095c8a5ed483
diff --git a/solr/licenses/lucene-test-framework-9.9.2.jar.sha1 b/solr/licenses/lucene-test-framework-9.9.2.jar.sha1
diff --git a/solr/server/solr/configsets/_default/conf/solrconfig.xml b/solr/server/solr/configsets/_default/conf/solrconfig.xml
@@ -35,7 +35,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
   -->
-  <luceneMatchVersion>9.9</luceneMatchVersion>
+  <luceneMatchVersion>9.10</luceneMatchVersion>
 
   <!-- <lib/> directives can be used to instruct Solr to load any Jars
        identified and use them to resolve any "plugins" specified in

diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
@@ -35,7 +35,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
   -->
-  <luceneMatchVersion>9.9</luceneMatchVersion>
+  <luceneMatchVersion>9.10</luceneMatchVersion>
 
   <!-- <lib/> directives can be used to instruct Solr to load any Jars
        identified and use them to resolve any "plugins" specified in

diff --git a/versions.lock b/versions.lock
@@ -215,32 +215,32 @@ org.apache.logging.log4j:log4j-jul:2.21.0 (1 constraints: 3705363b)
 org.apache.logging.log4j:log4j-layout-template-json:2.21.0 (1 constraints: 3705363b)
 org.apache.logging.log4j:log4j-slf4j2-impl:2.21.0 (1 constraints: 3705363b)
 org.apache.logging.log4j:log4j-web:2.21.0 (1 constraints: 3705363b)
-org.apache.lucene:lucene-analysis-common:9.9.2 (10 constraints: 1a9fe48d)
-org.apache.lucene:lucene-analysis-icu:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-analysis-kuromoji:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-analysis-morfologik:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-analysis-nori:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-analysis-opennlp:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-analysis-phonetic:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-analysis-smartcn:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-analysis-stempel:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-backward-codecs:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-classification:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-codecs:9.9.2 (3 constraints: b4258047)
-org.apache.lucene:lucene-core:9.9.2 (26 constraints: b19036b6)
-org.apache.lucene:lucene-expressions:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-grouping:9.9.2 (2 constraints: f21560e5)
-org.apache.lucene:lucene-highlighter:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-join:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-memory:9.9.2 (1 constraints: a00fbc83)
-org.apache.lucene:lucene-misc:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-queries:9.9.2 (6 constraints: de51e688)
-org.apache.lucene:lucene-queryparser:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-sandbox:9.9.2 (1 constraints: d40f3587)
-org.apache.lucene:lucene-spatial-extras:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-spatial3d:9.9.2 (1 constraints: c310c4b9)
-org.apache.lucene:lucene-suggest:9.9.2 (1 constraints: 16053536)
-org.apache.lucene:lucene-test-framework:9.9.2 (1 constraints: 16053536)
+org.apache.lucene:lucene-analysis-common:9.10.0 (10 constraints: 96a0f715)
+org.apache.lucene:lucene-analysis-icu:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-analysis-kuromoji:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-analysis-morfologik:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-analysis-nori:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-analysis-opennlp:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-analysis-phonetic:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-analysis-smartcn:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-analysis-stempel:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-backward-codecs:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-classification:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-codecs:9.10.0 (3 constraints: 2626bd9c)
+org.apache.lucene:lucene-core:9.10.0 (26 constraints: 8d94ec8e)
+org.apache.lucene:lucene-expressions:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-grouping:9.10.0 (2 constraints: 3e16d907)
+org.apache.lucene:lucene-highlighter:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-join:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-memory:9.10.0 (1 constraints: c60f6a93)
+org.apache.lucene:lucene-misc:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-queries:9.10.0 (6 constraints: c25289f5)
+org.apache.lucene:lucene-queryparser:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-sandbox:9.10.0 (1 constraints: fa0f1797)
+org.apache.lucene:lucene-spatial-extras:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-spatial3d:9.10.0 (1 constraints: e91095ca)
+org.apache.lucene:lucene-suggest:9.10.0 (1 constraints: 3c05593b)
+org.apache.lucene:lucene-test-framework:9.10.0 (1 constraints: 3c05593b)
 org.apache.opennlp:opennlp-tools:1.9.4 (2 constraints: fc1dce6d)
 org.apache.pdfbox:fontbox:2.0.26 (1 constraints: 180b72d8)
 org.apache.pdfbox:jbig2-imageio:3.0.4 (1 constraints: 5e0cef01)

diff --git a/versions.props b/versions.props
@@ -50,7 +50,7 @@ org.apache.httpcomponents:httpcore=4.4.16
 org.apache.httpcomponents:httpmime=4.5.14
 org.apache.kerby:*=1.0.1
 org.apache.logging.log4j:*=2.21.0
-org.apache.lucene:*=9.9.2
+org.apache.lucene:*=9.10.0
 org.apache.tika:*=1.28.5
 org.apache.tomcat:annotations-api=6.0.53
 org.apache.zookeeper:*=3.9.1