Apache Solr open-source search software
Make sure to test normal scorers with asserting wrappers. (#1834)
Julie Tibshiranifceab765c1c2
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txtindex d8bdf7fefe5..62306fe7de4 100644--- a/lucene/CHANGES.txt+++ b/lucene/CHANGES.txt@@ -215,7 +215,9 @@ Improvements* LUCENE-9446: In BooleanQuery rewrite, always remove MatchAllDocsQuery filter clauseswhen possible. (Julie Tibshirani)-* LUCENE-9501: Improve how Asserting* test classes handle singleton doc values.+* LUCENE-9501: Improve coverage for Asserting* test classes: make sure to handle singleton doc+ values, and sometimes exercise Weight#scorer instead of Weight#bulkScorer for top-level+ queries. (Julie Tibshirani)* LUCENE-9511: Include StoredFieldsWriter in DWPT accounting to ensure that it'sheap consumption is taken into account when IndexWriter stalls or should flushdiff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java b/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.javaindex dfc32dad99f..18a307c600c 100644--- a/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java+++ b/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java@@ -115,6 +115,12 @@ public class TestDrillSideways extends FacetTestCase {};}+ private IndexSearcher getNewSearcher(IndexReader reader) {+ // Do not wrap with an asserting searcher, since DrillSidewaysQuery doesn't+ // implement all the required components like Weight#scorer.+ return newSearcher(reader, true, false);+ }+public void testBasic() throws Exception {Directory dir = newDirectory();Directory taxoDir = newDirectory();@@ -154,7 +160,7 @@ public class TestDrillSideways extends FacetTestCase {writer.addDocument(config.build(taxoWriter, doc));// NRT open- IndexSearcher searcher = newSearcher(writer.getReader());+ IndexSearcher searcher = getNewSearcher(writer.getReader());//System.out.println("searcher=" + searcher);@@ -339,7 +345,7 @@ public class TestDrillSideways extends FacetTestCase {writer.addDocument(config.build(taxoWriter, doc));// NRT open- IndexSearcher searcher = newSearcher(writer.getReader());+ IndexSearcher searcher = getNewSearcher(writer.getReader());//System.out.println("searcher=" + searcher);@@ -402,7 +408,7 @@ public class TestDrillSideways extends FacetTestCase {writer.addDocument(config.build(taxoWriter, doc));// NRT open- IndexSearcher searcher = newSearcher(writer.getReader());+ IndexSearcher searcher = getNewSearcher(writer.getReader());//System.out.println("searcher=" + searcher);@@ -629,7 +635,7 @@ public class TestDrillSideways extends FacetTestCase {IndexReader r = w.getReader();final SortedSetDocValuesReaderState sortedSetDVState;- IndexSearcher s = newSearcher(r);+ IndexSearcher s = getNewSearcher(r);if (doUseDV) {sortedSetDVState = new DefaultSortedSetDocValuesReaderState(s.getIndexReader());@@ -1139,7 +1145,7 @@ public class TestDrillSideways extends FacetTestCase {Directory taxoDir = newDirectory();RandomIndexWriter writer = new RandomIndexWriter(random(), dir);DirectoryTaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir, IndexWriterConfig.OpenMode.CREATE);- IndexSearcher searcher = newSearcher(writer.getReader());+ IndexSearcher searcher = getNewSearcher(writer.getReader());TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);// Count "Author"@@ -1178,7 +1184,7 @@ public class TestDrillSideways extends FacetTestCase {writer.addDocument(config.build(taxoWriter, doc));// NRT open- IndexSearcher searcher = newSearcher(writer.getReader());+ IndexSearcher searcher = getNewSearcher(writer.getReader());// NRT openTaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoWriter);diff --git a/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java b/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.javaindex 7a4367a7fe7..f1d847cfb72 100644--- a/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java+++ b/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java@@ -254,7 +254,7 @@ public class TestRangeFacetCounts extends FacetTestCase {final TaxonomyReader tr = new DirectoryTaxonomyReader(tw);- IndexSearcher s = newSearcher(r, false);+ IndexSearcher s = newSearcher(r, false, false);if (VERBOSE) {System.out.println("TEST: searcher=" + s);@@ -813,7 +813,8 @@ public class TestRangeFacetCounts extends FacetTestCase {FacetsCollector fc = new FacetsCollector();IndexReader r = writer.getReader();- IndexSearcher s = newSearcher(r);++ IndexSearcher s = newSearcher(r, false, false);s.search(new MatchAllDocsQuery(), fc);final DoubleRange[] ranges = new DoubleRange[] {diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingWeight.java b/lucene/test-framework/src/java/org/apache/lucene/search/AssertingWeight.javaindex 55fda238ce7..88b9499e537 100644--- a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingWeight.java+++ b/lucene/test-framework/src/java/org/apache/lucene/search/AssertingWeight.java@@ -20,6 +20,8 @@ import java.io.IOException;import java.util.Random;import org.apache.lucene.index.LeafReaderContext;+import static org.apache.lucene.util.LuceneTestCase.usually;+class AssertingWeight extends FilterWeight {final Random random;@@ -85,11 +87,18 @@ class AssertingWeight extends FilterWeight {@Overridepublic BulkScorer bulkScorer(LeafReaderContext context) throws IOException {- BulkScorer inScorer = in.bulkScorer(context);+ BulkScorer inScorer;+ // We explicitly test both the delegate's bulk scorer, and also the normal scorer.+ // This ensures that normal scorers are sometimes tested with an asserting wrapper.+ if (usually(random)) {+ inScorer = in.bulkScorer(context);+ } else {+ inScorer = super.bulkScorer(context);+ }+if (inScorer == null) {return null;}-return AssertingBulkScorer.wrap(new Random(random.nextLong()), inScorer, context.reader().maxDoc(), scoreMode);}}