This is an automated email from the ASF dual-hosted git repository.
ishan pushed a commit to branch ishan/upgrade-to-lucene-10
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/ishan/upgrade-to-lucene-10 by
this push:
new 38a22d4d160 Replaced some more scorer() with scorerSupplier()
38a22d4d160 is described below
commit 38a22d4d160863cb70b9ffd0a5815555629c119a
Author: Ishan Chattopadhyaya <[email protected]>
AuthorDate: Thu Jan 16 02:19:05 2025 +0530
Replaced some more scorer() with scorerSupplier()
---
.../apache/solr/search/join/BlockJoinParentQParser.java | 13 +++----------
.../java/org/apache/solr/search/join/HashRangeQuery.java | 15 +++------------
.../java/org/apache/solr/update/SolrIndexSplitter.java | 16 ++++------------
3 files changed, 10 insertions(+), 34 deletions(-)
diff --git
a/solr/core/src/java/org/apache/solr/search/join/BlockJoinParentQParser.java
b/solr/core/src/java/org/apache/solr/search/join/BlockJoinParentQParser.java
index 67a38d0fc57..621da952848 100644
--- a/solr/core/src/java/org/apache/solr/search/join/BlockJoinParentQParser.java
+++ b/solr/core/src/java/org/apache/solr/search/join/BlockJoinParentQParser.java
@@ -20,14 +20,7 @@ import java.io.IOException;
import java.io.UncheckedIOException;
import java.util.Objects;
import org.apache.lucene.index.LeafReaderContext;
-import org.apache.lucene.search.ConstantScoreScorer;
-import org.apache.lucene.search.ConstantScoreWeight;
-import org.apache.lucene.search.DocIdSetIterator;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.QueryVisitor;
-import org.apache.lucene.search.Scorer;
-import org.apache.lucene.search.Weight;
+import org.apache.lucene.search.*;
import org.apache.lucene.search.join.BitSetProducer;
import org.apache.lucene.search.join.QueryBitSetProducer;
import org.apache.lucene.search.join.ScoreMode;
@@ -155,13 +148,13 @@ public class BlockJoinParentQParser extends
FiltersQParser {
throws IOException {
return new ConstantScoreWeight(BitSetProducerQuery.this, boost) {
@Override
- public Scorer scorer(LeafReaderContext context) throws IOException {
+ public ScorerSupplier scorerSupplier(LeafReaderContext context) throws
IOException {
BitSet bitSet = bitSetProducer.getBitSet(context);
if (bitSet == null) {
return null;
}
DocIdSetIterator disi = new BitSetIterator(bitSet,
bitSet.approximateCardinality());
- return new ConstantScoreScorer(this, boost, scoreMode, disi);
+ return new DefaultScorerSupplier(new ConstantScoreScorer(boost,
scoreMode, disi));
}
@Override
diff --git a/solr/core/src/java/org/apache/solr/search/join/HashRangeQuery.java
b/solr/core/src/java/org/apache/solr/search/join/HashRangeQuery.java
index d0bdc326747..73a5b2912f7 100644
--- a/solr/core/src/java/org/apache/solr/search/join/HashRangeQuery.java
+++ b/solr/core/src/java/org/apache/solr/search/join/HashRangeQuery.java
@@ -24,16 +24,7 @@ import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.SortedDocValues;
-import org.apache.lucene.search.ConstantScoreScorer;
-import org.apache.lucene.search.ConstantScoreWeight;
-import org.apache.lucene.search.DocIdSetIterator;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.QueryVisitor;
-import org.apache.lucene.search.ScoreMode;
-import org.apache.lucene.search.Scorer;
-import org.apache.lucene.search.TwoPhaseIterator;
-import org.apache.lucene.search.Weight;
+import org.apache.lucene.search.*;
import org.apache.lucene.util.BytesRef;
import org.apache.solr.common.util.Hash;
import org.apache.solr.search.SolrCache;
@@ -64,7 +55,7 @@ public class HashRangeQuery extends Query {
}
@Override
- public Scorer scorer(LeafReaderContext context) throws IOException {
+ public ScorerSupplier scorerSupplier(LeafReaderContext context) throws
IOException {
SortedDocValues docValues = context.reader().getSortedDocValues(field);
int[] cache = getCache(context);
@@ -82,7 +73,7 @@ public class HashRangeQuery extends Query {
}
};
- return new ConstantScoreScorer(this, boost, scoreMode, iterator);
+ return new DefaultScorerSupplier(new ConstantScoreScorer(boost,
scoreMode, iterator));
}
private int[] getCache(LeafReaderContext context) throws IOException {
diff --git a/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java
b/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java
index a7267fb298d..f1eb1450779 100644
--- a/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java
+++ b/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java
@@ -41,15 +41,7 @@ import org.apache.lucene.index.SlowCodecReaderWrapper;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.misc.store.HardlinkCopyDirectoryWrapper;
-import org.apache.lucene.search.ConstantScoreScorer;
-import org.apache.lucene.search.ConstantScoreWeight;
-import org.apache.lucene.search.DocIdSetIterator;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.QueryVisitor;
-import org.apache.lucene.search.ScoreMode;
-import org.apache.lucene.search.Scorer;
-import org.apache.lucene.search.Weight;
+import org.apache.lucene.search.*;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
import org.apache.lucene.store.Lock;
@@ -551,7 +543,7 @@ public class SolrIndexSplitter {
return new ConstantScoreWeight(this, boost) {
@Override
- public Scorer scorer(LeafReaderContext context) throws IOException {
+ public ScorerSupplier scorerSupplier(LeafReaderContext context) throws
IOException {
RTimerTree t = timings.sub("findDocsToDelete");
t.resume();
FixedBitSet set = findDocsToDelete(context);
@@ -576,8 +568,8 @@ public class SolrIndexSplitter {
log.error("### INVALID DELS {}", dels.cardinality());
}
}
- return new ConstantScoreScorer(
- this, score(), scoreMode, new BitSetIterator(set, set.length()));
+ return new DefaultScorerSupplier(new ConstantScoreScorer(
+ score(), scoreMode, new BitSetIterator(set, set.length())));
}
@Override
