Apache Lucene open-source search software
Improve DenseConjunctionBulkScorer's sparse fallback. (#14354)
Adrien Grand51d2a5b3fa2d
diff --git a/lucene/core/src/java/org/apache/lucene/search/DenseConjunctionBulkScorer.java b/lucene/core/src/java/org/apache/lucene/search/DenseConjunctionBulkScorer.javaindex 46599bbaba3..c1f6abd473a 100644--- a/lucene/core/src/java/org/apache/lucene/search/DenseConjunctionBulkScorer.java+++ b/lucene/core/src/java/org/apache/lucene/search/DenseConjunctionBulkScorer.java@@ -223,18 +223,18 @@ final class DenseConjunctionBulkScorer extends BulkScorer {otherDoc = other.advance(doc);}if (doc != otherDoc) {- int clearUpTo = Math.min(WINDOW_SIZE, otherDoc - windowBase);- windowMatches.clear(windowMatch, clearUpTo);- windowMatch = advance(windowMatches, clearUpTo);+ windowMatch = advance(windowMatches, otherDoc - windowBase);continue advanceHead;}}+ collector.collect(doc);windowMatch = advance(windowMatches, windowMatch + 1);}+ } else {+ docIdStreamView.windowBase = windowBase;+ collector.collect(docIdStreamView);}- docIdStreamView.windowBase = windowBase;- collector.collect(docIdStreamView);windowMatches.clear();}