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:24 UTC
(solr) branch jira/solr-13350 updated (2501f7b06f6 -> 119db0f64a6)
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a change to branch jira/solr-13350
in repository https://gitbox.apache.org/repos/asf/solr.git
from 2501f7b06f6 tentative: in SolrIndexSearcher.searchCollectorManagers defer scoreMode computation to after super.search call
new cb3c1cba7ae undo TestDistributedSearch change by uncommenting commented out code
add 03f2e17e381 NO JIRA: remove unreferenced solr/licenses/jakarta.inject-2.6.1.jar.sha1 file (#2272)
add 24603cf250a Update core param in STATUS doc (#2265)
add 0679644c382 Update caches-warming.adoc (#1238)
new 119db0f64a6 Merge remote-tracking branch 'origin/main' into jira/solr-13350
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java | 7 +++----
solr/core/src/test/org/apache/solr/TestDistributedSearch.java | 2 +-
solr/licenses/jakarta.inject-2.6.1.jar.sha1 | 1 -
.../modules/configuration-guide/pages/caches-warming.adoc | 3 +++
.../modules/configuration-guide/pages/coreadmin-api.adoc | 2 +-
5 files changed, 8 insertions(+), 7 deletions(-)
delete mode 100644 solr/licenses/jakarta.inject-2.6.1.jar.sha1
(solr) 02/02: Merge remote-tracking branch 'origin/main' into jira/solr-13350
Posted by cp...@apache.org.
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 119db0f64a6a713e10909698fe524297dfe0f006
Merge: cb3c1cba7ae 0679644c382
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Fri Feb 16 19:21:48 2024 +0000
Merge remote-tracking branch 'origin/main' into jira/solr-13350
solr/licenses/jakarta.inject-2.6.1.jar.sha1 | 1 -
.../modules/configuration-guide/pages/caches-warming.adoc | 3 +++
.../modules/configuration-guide/pages/coreadmin-api.adoc | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
(solr) 01/02: undo TestDistributedSearch change by uncommenting commented out code
Posted by cp...@apache.org.
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(