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 19:22:25 UTC
(solr) 01/02: undo TestDistributedSearch change by uncommenting commented out code
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 cb3c1cba7aeb4fb4db426bed50fc6939883d0bcf
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Fri Feb 16 19:20:40 2024 +0000
undo TestDistributedSearch change by uncommenting commented out code
---
solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java | 7 +++----
solr/core/src/test/org/apache/solr/TestDistributedSearch.java | 2 +-
2 files changed, 4 insertions(+), 5 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 c26a72df2fe..5db23a5d391 100644
--- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
@@ -2288,10 +2288,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);
- // }
+ if (cmd.getSort() != null && !(cmd.getQuery() instanceof RankQuery) && needScores) {
+ TopFieldCollector.populateScores(topDocs.scoreDocs, this, query);
+ }
// nDocsReturned = topDocs.scoreDocs.length;
// TODO: Is this correct?
// hitsRelation = topDocs.totalHits.relation;
diff --git a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java b/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
index 7b99a95fe21..fb3a1137734 100644
--- a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
+++ b/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
@@ -1786,7 +1786,7 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
CommonParams.ROWS,
"200",
CommonParams.SORT,
- "id asc");
+ "score desc, id asc");
assertIsExactHitCount(
"q", "{!cache=false}id:1", CommonParams.MIN_EXACT_COUNT, "1", CommonParams.ROWS, "1");
assertApproximatedHitCount(