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 5dcff092f7d Removed TopScoreDocsCollector.create() and replaced with
manager's newCollector()
5dcff092f7d is described below
commit 5dcff092f7d02947140a9f73f8fa3db79b6c8be7
Author: Ishan Chattopadhyaya <[email protected]>
AuthorDate: Thu Jan 16 03:19:11 2025 +0530
Removed TopScoreDocsCollector.create() and replaced with manager's
newCollector()
---
.../solr/handler/component/ExpandComponent.java | 21 ++-------------------
.../solr/index/SlowCompositeReaderWrapper.java | 7 -------
.../org/apache/solr/search/ReRankCollector.java | 14 ++------------
.../grouping/distributed/command/QueryCommand.java | 13 +++----------
4 files changed, 7 insertions(+), 48 deletions(-)
diff --git
a/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java
b/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java
index b7bbd466089..34e5e6f5087 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java
@@ -37,24 +37,7 @@ import org.apache.lucene.index.MultiDocValues;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.index.OrdinalMap;
import org.apache.lucene.index.SortedDocValues;
-import org.apache.lucene.search.BooleanClause;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.Collector;
-import org.apache.lucene.search.DocIdSetIterator;
-import org.apache.lucene.search.LeafCollector;
-import org.apache.lucene.search.MatchAllDocsQuery;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.Scorable;
-import org.apache.lucene.search.ScoreDoc;
-import org.apache.lucene.search.ScoreMode;
-import org.apache.lucene.search.Sort;
-import org.apache.lucene.search.TermInSetQuery;
-import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.search.TopDocsCollector;
-import org.apache.lucene.search.TopFieldCollector;
-import org.apache.lucene.search.TopScoreDocCollector;
-import org.apache.lucene.search.TotalHitCountCollector;
-import org.apache.lucene.search.TotalHits;
+import org.apache.lucene.search.*;
import org.apache.lucene.util.BitSetIterator;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.BytesRefBuilder;
@@ -825,7 +808,7 @@ public class ExpandComponent extends SearchComponent
implements PluginInfoInitia
if (limit == 0) {
collector = new TotalHitCountCollector();
} else if (sort == null) {
- collector = TopScoreDocCollector.create(limit, Integer.MAX_VALUE);
+ collector = new TopScoreDocCollectorManager(limit,
Integer.MAX_VALUE).newCollector();
} else {
collector = TopFieldCollector.create(sort, limit, Integer.MAX_VALUE);
}
diff --git
a/solr/core/src/java/org/apache/solr/index/SlowCompositeReaderWrapper.java
b/solr/core/src/java/org/apache/solr/index/SlowCompositeReaderWrapper.java
index abe601c4daf..05f8273050c 100644
--- a/solr/core/src/java/org/apache/solr/index/SlowCompositeReaderWrapper.java
+++ b/solr/core/src/java/org/apache/solr/index/SlowCompositeReaderWrapper.java
@@ -336,13 +336,6 @@ public final class SlowCompositeReaderWrapper extends
LeafReader {
return in.maxDoc();
}
- @Override
- @Deprecated
- public void document(int docID, StoredFieldVisitor visitor) throws
IOException {
- ensureOpen();
- in.document(docID, visitor);
- }
-
@Override
public Bits getLiveDocs() {
ensureOpen();
diff --git a/solr/core/src/java/org/apache/solr/search/ReRankCollector.java
b/solr/core/src/java/org/apache/solr/search/ReRankCollector.java
index 6a4aaf2748a..cc37a9e08e9 100644
--- a/solr/core/src/java/org/apache/solr/search/ReRankCollector.java
+++ b/solr/core/src/java/org/apache/solr/search/ReRankCollector.java
@@ -24,17 +24,7 @@ import java.util.Comparator;
import java.util.Map;
import java.util.Set;
import org.apache.lucene.index.LeafReaderContext;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.LeafCollector;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.Rescorer;
-import org.apache.lucene.search.ScoreDoc;
-import org.apache.lucene.search.ScoreMode;
-import org.apache.lucene.search.Sort;
-import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.search.TopDocsCollector;
-import org.apache.lucene.search.TopFieldCollector;
-import org.apache.lucene.search.TopScoreDocCollector;
+import org.apache.lucene.search.*;
import org.apache.lucene.util.BytesRef;
import org.apache.solr.common.SolrException;
import org.apache.solr.handler.component.QueryElevationComponent;
@@ -86,7 +76,7 @@ public class ReRankCollector extends
TopDocsCollector<ScoreDoc> {
if (sort == null) {
this.sort = null;
this.mainCollector =
- TopScoreDocCollector.create(Math.max(this.reRankDocs, length),
cmd.getMinExactCount());
+ new TopScoreDocCollectorManager(Math.max(this.reRankDocs, length),
cmd.getMinExactCount()).newCollector();
} else {
this.sort = sort = sort.rewrite(searcher);
// scores are needed for Rescorer (regardless of whether sort needs it)
diff --git
a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/QueryCommand.java
b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/QueryCommand.java
index 6eaf43834ce..42ea22bdce4 100644
---
a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/QueryCommand.java
+++
b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/QueryCommand.java
@@ -19,15 +19,8 @@ package org.apache.solr.search.grouping.distributed.command;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
-import org.apache.lucene.search.Collector;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.MultiCollector;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.Sort;
-import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.search.TopDocsCollector;
-import org.apache.lucene.search.TopFieldCollector;
-import org.apache.lucene.search.TopScoreDocCollector;
+
+import org.apache.lucene.search.*;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.search.DocSet;
import org.apache.solr.search.MaxScoreCollector;
@@ -166,7 +159,7 @@ public class QueryCommand implements
Command<QueryCommandResult> {
Collector subCollector;
if (sort == null || sort.equals(Sort.RELEVANCE)) {
subCollector =
- topDocsCollector = TopScoreDocCollector.create(docsToCollect,
Integer.MAX_VALUE);
+ topDocsCollector = new TopScoreDocCollectorManager(docsToCollect,
Integer.MAX_VALUE).newCollector();
} else {
topDocsCollector = TopFieldCollector.create(sort, docsToCollect,
Integer.MAX_VALUE);
if (needScores) {
