(solr) 02/02: use factored out SolrIndexSearcher.populateScoresIfNeeded method on new code path too

[cpoerschke]

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

commit 4a46b6d85c66ca2b34a5c8a365ac3087221c0a11
Author: Christine Poerschke <cpoersc...@apache.org>
AuthorDate: Mon Feb 19 16:13:42 2024 +0000

    use factored out SolrIndexSearcher.populateScoresIfNeeded method on new 
code path too
---
 .../org/apache/solr/search/SolrIndexSearcher.java     | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 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 a7c9712c348..81ae9b08b8c 100644
--- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
@@ -1943,16 +1943,9 @@ public class SolrIndexSearcher extends IndexSearcher 
implements Closeable, SolrI
         }
 
         populateNextCursorMarkFromTopDocs(qr, cmd, topDocs);
-        if (cmd.getSort() != null && !(cmd.getQuery() instanceof RankQuery) && 
needScores) {
-          TopFieldCollector.populateScores(topDocs.scoreDocs, this, query);
-        }
+        hitsRelation =
+            populateScoresIfNeeded(cmd, needScores, topDocs, query, 
searchResult.scoreMode);
         nDocsReturned = topDocs.scoreDocs.length;
-        ScoreMode scoreModeUsed = searchResult.scoreMode;
-        if (scoreModeUsed == ScoreMode.COMPLETE || scoreModeUsed == 
ScoreMode.COMPLETE_NO_SCORES) {
-          hitsRelation = TotalHits.Relation.EQUAL_TO;
-        } else {
-          hitsRelation = topDocs.totalHits.relation;
-        }
       }
 
       ids = new int[nDocsReturned];
@@ -2292,9 +2285,11 @@ public class SolrIndexSearcher extends IndexSearcher 
implements Closeable, SolrI
         }
 
         populateNextCursorMarkFromTopDocs(qr, cmd, topDocs);
-        if (cmd.getSort() != null && !(cmd.getQuery() instanceof RankQuery) && 
needScores) {
-          TopFieldCollector.populateScores(topDocs.scoreDocs, this, query);
-        }
+        populateScoresIfNeeded(cmd, needScores, topDocs, query, 
ScoreMode.COMPLETE);
+        // TODO: Is this correct?
+        // hitsRelation = populateScoresIfNeeded(cmd, needScores, topDocs, 
query,
+        // searchResult.scoreMode);
+
         // nDocsReturned = topDocs.scoreDocs.length;
         // TODO: Is this correct?
         // hitsRelation = topDocs.totalHits.relation;