Apache Lucene open-source search software
Misc cleanups to TopScoreDocCollector (#13935)
Armin Braund92d04517382
diff --git a/lucene/core/src/java/org/apache/lucene/search/HitQueue.java b/lucene/core/src/java/org/apache/lucene/search/HitQueue.javaindex dc2a7e5bff5..edb7d518e7a 100644--- a/lucene/core/src/java/org/apache/lucene/search/HitQueue.java+++ b/lucene/core/src/java/org/apache/lucene/search/HitQueue.java@@ -62,24 +62,22 @@ public final class HitQueue extends PriorityQueue<ScoreDoc> {public HitQueue(int size, boolean prePopulate) {super(size,- () -> {- if (prePopulate) {- // Always set the doc Id to MAX_VALUE so that it won't be favored by- // lessThan. This generally should not happen since if score is not NEG_INF,- // TopScoreDocCollector will always add the object to the queue.- return new ScoreDoc(Integer.MAX_VALUE, Float.NEGATIVE_INFINITY);- } else {- return null;- }- });+ prePopulate+ ? () -> {+ // Always set the doc Id to MAX_VALUE so that it won't be favored by+ // lessThan. This generally should not happen since if score is not NEG_INF,+ // TopScoreDocCollector will always add the object to the queue.+ return new ScoreDoc(Integer.MAX_VALUE, Float.NEGATIVE_INFINITY);+ }+ : () -> null);}@Overrideprotected final boolean lessThan(ScoreDoc hitA, ScoreDoc hitB) {- if (hitA.score == hitB.score) {+ int cmp = Float.compare(hitA.score, hitB.score);+ if (cmp == 0) {return hitA.doc > hitB.doc;- } else {- return hitA.score < hitB.score;}+ return cmp < 0;}}diff --git a/lucene/core/src/java/org/apache/lucene/search/TopDocsCollector.java b/lucene/core/src/java/org/apache/lucene/search/TopDocsCollector.javaindex 62ec4e1a3d4..3cb4024fe49 100644--- a/lucene/core/src/java/org/apache/lucene/search/TopDocsCollector.java+++ b/lucene/core/src/java/org/apache/lucene/search/TopDocsCollector.java@@ -87,7 +87,7 @@ public abstract class TopDocsCollector<T extends ScoreDoc> implements Collector// In case pq was populated with sentinel values, there might be less// results than pq.size(). Therefore return all results until either// pq.size() or totalHits.- return totalHits < pq.size() ? totalHits : pq.size();+ return Math.min(totalHits, pq.size());}/** Returns the top docs that were collected by this collector. */