Apache Lucene open-source search software
Fix IOOB in MaxScoreBulkScorer (#16199)
Alan Woodwardd1f2aced7ff0
diff --git a/lucene/core/src/java/org/apache/lucene/search/MaxScoreBulkScorer.java b/lucene/core/src/java/org/apache/lucene/search/MaxScoreBulkScorer.javaindex 1e1a12ab4a0..d01452167f5 100644--- a/lucene/core/src/java/org/apache/lucene/search/MaxScoreBulkScorer.java+++ b/lucene/core/src/java/org/apache/lucene/search/MaxScoreBulkScorer.java@@ -182,6 +182,10 @@ final class MaxScoreBulkScorer extends BulkScorer {top = essentialQueue.updateTop();}+ if (top.doc >= max) {+ return;+ }+// Only score an inner window, after that we'll check if the min competitive score has increased// enough for a more favorable partitioning to be used.int innerWindowMin = top.doc;diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMaxScoreBulkScorer.java b/lucene/core/src/test/org/apache/lucene/search/TestMaxScoreBulkScorer.javaindex e4696267de2..4eac0fef50f 100644--- a/lucene/core/src/test/org/apache/lucene/search/TestMaxScoreBulkScorer.java+++ b/lucene/core/src/test/org/apache/lucene/search/TestMaxScoreBulkScorer.java@@ -986,4 +986,95 @@ public class TestMaxScoreBulkScorer extends LuceneTestCase {scorer.updateMaxWindowScores(4, 100);assertFalse(scorer.partitionScorers()); // no possible match in this window}++ /**+ * Test that fillScoreBufferViaBitSet doesn't produce a negative innerWindowSize when the filter+ * iterator gets advanced past the outer window max, causing essentials to advance past max on the+ * next inner window iteration.+ */+ public void testFilteredDisjunctionWithFilterGapCausingNegativeWindowSize() throws Exception {+ try (Directory dir = newDirectory()) {+ // Need 2 * INNER_WINDOW_SIZE docs so there's room for a second inner window.+ // Filter only matches first INNER_WINDOW_SIZE docs, creating a gap.+ int numDocs = 2 * MaxScoreBulkScorer.INNER_WINDOW_SIZE;+ try (IndexWriter w =+ new IndexWriter(dir, newIndexWriterConfig().setMergePolicy(newLogMergePolicy()))) {+ for (int i = 0; i < numDocs; i++) {+ Document doc = new Document();+ if (i < MaxScoreBulkScorer.INNER_WINDOW_SIZE) {+ // Dense filter: matches only in the first window+ doc.add(new StringField("filter", "F", Field.Store.NO));+ }+ if (i == 0) {+ doc.add(new StringField("foo", "A", Field.Store.NO));+ doc.add(new StringField("foo", "B", Field.Store.NO));+ }+ // Place a scoring match beyond the filter range but within outerWindowMax+ if (i == MaxScoreBulkScorer.INNER_WINDOW_SIZE + 4) {+ doc.add(new StringField("foo", "A", Field.Store.NO));+ }+ w.addDocument(doc);+ }+ w.forceMerge(1);+ }++ try (IndexReader reader = DirectoryReader.open(dir)) {+ IndexSearcher searcher = newSearcher(reader);++ Query clause1 =+ new BoostQuery(new ConstantScoreQuery(new TermQuery(new Term("foo", "A"))), 2);+ Query clause2 = new ConstantScoreQuery(new TermQuery(new Term("foo", "B")));+ Query filter = new TermQuery(new Term("filter", "F"));+ LeafReaderContext context = searcher.getIndexReader().leaves().get(0);++ // Verify filter is dense enough for bitset path+ Scorer filterCheck =+ searcher+ .createWeight(searcher.rewrite(filter), ScoreMode.TOP_SCORES, 1f)+ .scorer(context);+ assertTrue(+ "filter should be dense enough for bitset path",+ filterCheck.iterator().cost()+ >= context.reader().maxDoc()+ / DenseConjunctionBulkScorer.DENSITY_THRESHOLD_INVERSE);++ Scorer scorer1 =+ searcher+ .createWeight(searcher.rewrite(clause1), ScoreMode.TOP_SCORES, 1f)+ .scorer(context);+ Scorer scorer2 =+ searcher+ .createWeight(searcher.rewrite(clause2), ScoreMode.TOP_SCORES, 1f)+ .scorer(context);+ Scorer filterScorer =+ searcher+ .createWeight(searcher.rewrite(filter), ScoreMode.TOP_SCORES, 1f)+ .scorer(context);++ BulkScorer bulkScorer =+ new MaxScoreBulkScorer(+ context.reader().maxDoc(), Arrays.asList(scorer1, scorer2), filterScorer);++ // Score with a max that allows a second inner window.+ // After the first window, filter.doc = NO_MORE_DOCS (no filter matches >= 4096).+ // Essential queue top is at INNER_WINDOW_SIZE + 4 (< max), triggering the bug+ // in scoreInnerWindowWithFilter where the while loop advances essentials past max.+ bulkScorer.score(+ new LeafCollector() {++ @Override+ public void setScorer(Scorable scorer) throws IOException {}++ @Override+ public void collect(int doc) throws IOException {+ // Doc 0 is the only doc matching both filter and scoring clauses+ assertEquals(0, doc);+ }+ },+ null,+ 0,+ numDocs);+ }+ }+ }}