Skip to content

Commit 01f4abc

Browse files
committed
SOLR-17097: Upgrade Lucene to 9.10.0
1 parent 768c5af commit 01f4abc

File tree

62 files changed

+69
-62
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+69
-62
lines changed

solr/CHANGES.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,8 @@ Bug Fixes
147147

148148
Dependency Upgrades
149149
---------------------
150-
(No changes)
150+
151+
* SOLR-17097: Upgrade Lucene to 9.10.0 (hossman, Christine Poerschke)
151152

152153
Other Changes
153154
---------------------

solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,8 @@ private static class ReaderWrapper extends FilterLeafReader {
536536
fieldInfo.getVectorDimension(),
537537
fieldInfo.getVectorEncoding(),
538538
fieldInfo.getVectorSimilarityFunction(),
539-
fieldInfo.isSoftDeletesField());
539+
fieldInfo.isSoftDeletesField(),
540+
fieldInfo.isParentField());
540541
newInfos.add(f);
541542
} else {
542543
newInfos.add(fieldInfo);

solr/core/src/java/org/apache/solr/search/NumericHidingLeafReader.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ private NumericHidingLeafReader(LeafReader in, String field) {
7676
fi.getVectorDimension(),
7777
fi.getVectorEncoding(),
7878
fi.getVectorSimilarityFunction(),
79-
fi.isSoftDeletesField()));
79+
fi.isSoftDeletesField(),
80+
fi.isParentField()));
8081
} else {
8182
filteredInfos.add(fi);
8283
}

solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,8 @@ Query makeFilter(String fname, BytesRef[] byteRefs) {
121121
docValuesTermsFilterPerSegment {
122122
@Override
123123
Query makeFilter(String fname, BytesRef[] byteRefs) {
124-
return disableCacheByDefault(SortedSetDocValuesField.newSlowSetQuery(fname, byteRefs));
124+
return disableCacheByDefault(
125+
SortedSetDocValuesField.newSlowSetQuery(fname, Arrays.asList(byteRefs)));
125126
}
126127
};
127128

solr/core/src/java/org/apache/solr/search/join/GraphEdgeCollector.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
package org.apache.solr.search.join;
1818

1919
import java.io.IOException;
20+
import java.util.ArrayList;
21+
import java.util.List;
2022
import java.util.TreeSet;
2123
import org.apache.lucene.document.SortedDocValuesField;
2224
import org.apache.lucene.index.DocValues;
@@ -169,11 +171,11 @@ public Query getResultQuery(SchemaField matchField, boolean useAutomaton) {
169171
AutomatonQuery autnQuery = new AutomatonQuery(new Term(matchField.getName()), autn);
170172
q = autnQuery;
171173
} else {
172-
BytesRef[] termList = new BytesRef[collectorTerms.size()];
174+
List<BytesRef> termList = new ArrayList<BytesRef>(collectorTerms.size());
173175
for (int i = 0; i < collectorTerms.size(); i++) {
174176
BytesRef ref = new BytesRef();
175177
collectorTerms.get(i, ref);
176-
termList[i] = ref;
178+
termList.add(ref);
177179
}
178180
q =
179181
(matchField.hasDocValues() && !matchField.indexed())

solr/core/src/java/org/apache/solr/uninverting/UninvertingReader.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,8 @@ public static LeafReader wrap(LeafReader in, Function<String, Type> mapping) {
298298
fi.getVectorDimension(),
299299
fi.getVectorEncoding(),
300300
fi.getVectorSimilarityFunction(),
301-
fi.isSoftDeletesField()));
301+
fi.isSoftDeletesField(),
302+
fi.isParentField()));
302303
} else {
303304
newFieldInfos.add(fi);
304305
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
92e559808a23f61c818ef90a9ccab3669a25caa0

solr/licenses/lucene-analysis-common-9.9.2.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ed54097d13dbaae6e758c31f55a473ba6566ae8d

solr/licenses/lucene-analysis-icu-9.9.2.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)