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/15 17:02:48 UTC
(solr) branch branch_9x updated: NO JIRA: remove duplicate '(cmd.getFlags() & GET_SCORES) != 0' calls (#2262)
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 023fef90cf9 NO JIRA: remove duplicate '(cmd.getFlags() & GET_SCORES) != 0' calls (#2262)
023fef90cf9 is described below
commit 023fef90cf9ad3984ea3cf8adfad1554e5085909
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Thu Feb 15 16:55:48 2024 +0000
NO JIRA: remove duplicate '(cmd.getFlags() & GET_SCORES) != 0' calls (#2262)
(cherry picked from commit 720bff29c231cb5ab00f8e7aac7f1041d7522303)
---
.../java/org/apache/solr/search/SolrIndexSearcher.java | 16 ++++++----------
1 file changed, 6 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 8696fbf2d95..15e8ff8949e 100644
--- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
@@ -1882,7 +1882,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI
final TopDocsCollector<?> topCollector = buildTopDocsCollector(len, cmd);
MaxScoreCollector maxScoreCollector = null;
Collector collector = topCollector;
- if ((cmd.getFlags() & GET_SCORES) != 0) {
+ if (needScores) {
maxScoreCollector = new MaxScoreCollector();
collector = MultiCollector.wrap(topCollector, maxScoreCollector);
}
@@ -1896,9 +1896,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI
} else {
hitsRelation = topDocs.totalHits.relation;
}
- if (cmd.getSort() != null
- && cmd.getQuery() instanceof RankQuery == false
- && (cmd.getFlags() & GET_SCORES) != 0) {
+ if (cmd.getSort() != null && cmd.getQuery() instanceof RankQuery == false && needScores) {
TopFieldCollector.populateScores(topDocs.scoreDocs, this, query);
}
populateNextCursorMarkFromTopDocs(qr, cmd, topDocs);
@@ -1909,7 +1907,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI
: 0.0f;
nDocsReturned = topDocs.scoreDocs.length;
ids = new int[nDocsReturned];
- scores = (cmd.getFlags() & GET_SCORES) != 0 ? new float[nDocsReturned] : null;
+ scores = needScores ? new float[nDocsReturned] : null;
for (int i = 0; i < nDocsReturned; i++) {
ScoreDoc scoreDoc = topDocs.scoreDocs[i];
ids[i] = scoreDoc.doc;
@@ -1996,7 +1994,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI
MaxScoreCollector maxScoreCollector = null;
List<Collector> collectors = new ArrayList<>(Arrays.asList(topCollector, setCollector));
- if ((cmd.getFlags() & GET_SCORES) != 0) {
+ if (needScores) {
maxScoreCollector = new MaxScoreCollector();
collectors.add(maxScoreCollector);
}
@@ -2011,9 +2009,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI
assert (totalHits == set.size()) || qr.isPartialResults();
final TopDocs topDocs = topCollector.topDocs(0, len);
- if (cmd.getSort() != null
- && !(cmd.getQuery() instanceof RankQuery)
- && (cmd.getFlags() & GET_SCORES) != 0) {
+ if (cmd.getSort() != null && !(cmd.getQuery() instanceof RankQuery) && needScores) {
TopFieldCollector.populateScores(topDocs.scoreDocs, this, query);
}
populateNextCursorMarkFromTopDocs(qr, cmd, topDocs);
@@ -2024,7 +2020,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI
nDocsReturned = topDocs.scoreDocs.length;
ids = new int[nDocsReturned];
- scores = (cmd.getFlags() & GET_SCORES) != 0 ? new float[nDocsReturned] : null;
+ scores = needScores ? new float[nDocsReturned] : null;
for (int i = 0; i < nDocsReturned; i++) {
ScoreDoc scoreDoc = topDocs.scoreDocs[i];
ids[i] = scoreDoc.doc;