Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

NO JIRA: remove duplicate '(cmd.getFlags() & GET_SCORES) != 0' calls (#2262)

Christine Poerschke720bff29c231
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 c1da90a7a67..948658188c8 100644
--- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
@@ -1877,7 +1877,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);
}
@@ -1891,9 +1891,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);
@@ -1904,7 +1902,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;
@@ -1991,7 +1989,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);
}
@@ -2006,9 +2004,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);
@@ -2019,7 +2015,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;