You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by cp...@apache.org on 2024/02/16 09:59:12 UTC
(solr) branch jira/solr-13350 updated: tentative: in SolrIndexSearcher.searchCollectorManagers defer scoreMode computation to after super.search call
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a commit to branch jira/solr-13350
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/jira/solr-13350 by this push:
new 2501f7b06f6 tentative: in SolrIndexSearcher.searchCollectorManagers defer scoreMode computation to after super.search call
2501f7b06f6 is described below
commit 2501f7b06f697f4a8b84610c6d5cfe586217fc4a
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Fri Feb 16 09:55:40 2024 +0000
tentative: in SolrIndexSearcher.searchCollectorManagers defer scoreMode computation to after super.search call
---
.../org/apache/solr/search/SolrIndexSearcher.java | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 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 6f133bff6b7..c26a72df2fe 100644
--- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
@@ -1972,7 +1972,6 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI
boolean needDocSet)
throws IOException {
Collection<CollectorManager<Collector, Object>> collectors = new ArrayList<>();
- ScoreMode scoreMode = null;
Collector[] firstCollectors = new Collector[3];
@@ -2093,15 +2092,6 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI
}
});
}
- for (Collector collector : firstCollectors) {
- if (collector != null) {
- if (scoreMode == null) {
- scoreMode = collector.scoreMode();
- } else if (scoreMode != collector.scoreMode()) {
- scoreMode = ScoreMode.COMPLETE;
- }
- }
- }
@SuppressWarnings({"unchecked", "rawtypes"})
CollectorManager<Collector, Object>[] colls = collectors.toArray(new CollectorManager[0]);
@@ -2121,6 +2111,17 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI
}
}
+ ScoreMode scoreMode = null;
+ for (Collector collector : firstCollectors) {
+ if (collector != null) {
+ if (scoreMode == null) {
+ scoreMode = collector.scoreMode();
+ } else if (scoreMode != collector.scoreMode()) {
+ scoreMode = ScoreMode.COMPLETE;
+ }
+ }
+ }
+
return new SearchResult(scoreMode, ret);
}