This is an automated email from the ASF dual-hosted git repository.
noble 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 822d562a031 Removed dependency on TimeLimitingCollector
822d562a031 is described below
commit 822d562a0313bdb9ee9b84f89cab88bcfc0e21e2
Author: noblepaul <[email protected]>
AuthorDate: Tue Jan 14 11:24:42 2025 +0530
Removed dependency on TimeLimitingCollector
---
.../java/org/apache/solr/search/SolrIndexSearcher.java | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
index 5cd43a187f0..7956a4d5828 100644
--- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
@@ -44,18 +44,7 @@ import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
import org.apache.lucene.document.Document;
-import org.apache.lucene.index.DirectoryReader;
-import org.apache.lucene.index.ExitableDirectoryReader;
-import org.apache.lucene.index.FieldInfos;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.LeafReader;
-import org.apache.lucene.index.LeafReaderContext;
-import org.apache.lucene.index.MultiPostingsEnum;
-import org.apache.lucene.index.PostingsEnum;
-import org.apache.lucene.index.StoredFieldVisitor;
-import org.apache.lucene.index.Term;
-import org.apache.lucene.index.Terms;
-import org.apache.lucene.index.TermsEnum;
+import org.apache.lucene.index.*;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.CollectionStatistics;
@@ -77,7 +66,6 @@ import org.apache.lucene.search.SortField;
import org.apache.lucene.search.SortField.Type;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TermStatistics;
-import org.apache.lucene.search.TimeLimitingCollector;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.search.TopDocsCollector;
import org.apache.lucene.search.TopFieldCollector;
@@ -300,9 +288,7 @@ public class SolrIndexSearcher extends IndexSearcher
implements Closeable, SolrI
final long timeAllowed = cmd.getTimeAllowed();
if (timeAllowed > 0) {
- collector =
- new TimeLimitingCollector(
- collector, TimeLimitingCollector.getGlobalCounter(),
timeAllowed);
+ setTimeout(new QueryTimeoutImpl(timeAllowed));
}
if (postFilter != null) {
