Skip to content

Apache Lucene open-source search software

Fix TopGroupsCollector#getTopGroups() returning NaN maxScore when a group has no hits (#15873)

gaobinlong23d400cabd8e
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 743aafae3a9..c1fc63c1c0a 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -382,6 +382,8 @@ Bug Fixes
* GITHUB#12419, GITHUB#15119, GITHUB#15864: Fix circular dependency deadlock in
TestSecrets initialization (Namgyu Kim, Uwe Schindler)
+* GITHUB#15873: Fix TopGroupsCollector#getTopGroups() returning NaN maxScore when a group has no hits (Binlong Gao)
+
* GITHUB#15878: Fix existential quantification bug in caller checks
(VectorizationProvider, TestSecrets). (Uwe Schindler)
diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/TopGroups.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/TopGroups.java
index 0a1c607ab78..5568be3a849 100644
--- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/TopGroups.java
+++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/TopGroups.java
@@ -95,7 +95,7 @@ public class TopGroups<T> {
* @param b - another value
* @return ignoring any NaN return the greater of a and b
*/
- private static float nonNANmax(float a, float b) {
+ static float nonNANmax(float a, float b) {
if (Float.isNaN(a)) return b;
if (Float.isNaN(b)) return a;
return Math.max(a, b);
diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/TopGroupsCollector.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/TopGroupsCollector.java
index 6a54f7b59af..6d33765cd20 100644
--- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/TopGroupsCollector.java
+++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/TopGroupsCollector.java
@@ -17,6 +17,8 @@
package org.apache.lucene.search.grouping;
+import static org.apache.lucene.search.grouping.TopGroups.nonNANmax;
+
import java.io.IOException;
import java.util.Collection;
import java.util.Objects;
@@ -204,7 +206,7 @@ public class TopGroupsCollector<T> extends SecondPassGroupingCollector<T> {
topDocs.scoreDocs,
group.groupValue,
group.sortValues);
- maxScore = Math.max(maxScore, groupMaxScore);
+ maxScore = nonNANmax(maxScore, groupMaxScore);
}
return new TopGroups<>(