Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-15114: WAND does not work correctly on multiple segments (#2259)

Naoto MINAMI0cbb38ff4a38
diff --git a/solr/core/src/java/org/apache/solr/search/MaxScoreCollector.java b/solr/core/src/java/org/apache/solr/search/MaxScoreCollector.java
index 744e576b9af..0cd76b6994e 100644
--- a/solr/core/src/java/org/apache/solr/search/MaxScoreCollector.java
+++ b/solr/core/src/java/org/apache/solr/search/MaxScoreCollector.java
@@ -41,7 +41,12 @@ public class MaxScoreCollector extends SimpleCollector {
}
@Override
- public void setScorer(Scorable scorer) {
+ public void setScorer(Scorable scorer) throws IOException {
+ if (maxScore == Float.MIN_VALUE) {
+ scorer.setMinCompetitiveScore(0f);
+ } else {
+ scorer.setMinCompetitiveScore(Math.nextUp(maxScore));
+ }
this.scorer = scorer;
}