Apache Lucene open-source search software
Filter out MatchNoDocsQuery disjuncts in DisjunctionMaxQuery.rewrite() (#16103)
Prithvi S5b5b5c48cecc
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txtindex cf0503b3902..c2dd58432c8 100644--- a/lucene/CHANGES.txt+++ b/lucene/CHANGES.txt@@ -471,6 +471,9 @@ Optimizations* GITHUB#16147: Optimize column batch parent field with bulk fill. (Tim Brooks)+* GITHUB#16103: DisjunctionMaxQuery now filters out MatchNoDocsQuery disjuncts during rewrite,+ avoiding unnecessary scorer overhead. (Prithvi S)+* GITHUB#16109: Add count() to SortedSetDocValuesRangeQuery. (Prithvi S)* GITHUB#15991: Load dense filters into bitset in MaxScoreBulkScorer. (Prithvi S)diff --git a/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java b/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxQuery.javaindex 025a563ba01..7932e7b4f7b 100644--- a/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java+++ b/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java@@ -282,15 +282,27 @@ public final class DisjunctionMaxQuery extends Query implements Iterable<Query>List<Query> rewrittenDisjuncts = new ArrayList<>();for (Query sub : disjuncts) {Query rewrittenSub = sub.rewrite(indexSearcher);- actuallyRewritten |= rewrittenSub != sub;- rewrittenDisjuncts.add(rewrittenSub);+ if (rewrittenSub != sub || rewrittenSub instanceof MatchNoDocsQuery) {+ actuallyRewritten = true;+ }+ if (rewrittenSub instanceof MatchNoDocsQuery == false) {+ rewrittenDisjuncts.add(rewrittenSub);+ }+ }++ if (actuallyRewritten == false) {+ return super.rewrite(indexSearcher);+ }++ if (rewrittenDisjuncts.isEmpty()) {+ return new MatchNoDocsQuery("empty DisjunctionMaxQuery");}- if (actuallyRewritten) {- return new DisjunctionMaxQuery(rewrittenDisjuncts, tieBreakerMultiplier);+ if (rewrittenDisjuncts.size() == 1) {+ return rewrittenDisjuncts.get(0);}- return super.rewrite(indexSearcher);+ return new DisjunctionMaxQuery(rewrittenDisjuncts, tieBreakerMultiplier);}@Overridediff --git a/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.javaindex 19775e8d78d..ce4ef15b30c 100644--- a/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java+++ b/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java@@ -482,6 +482,46 @@ public class TestDisjunctionMaxQuery extends LuceneTestCase {assertEquals(expected, rewritten);}+ public void testRewriteAllMatchNoDocs() throws Exception {+ // All disjuncts rewrite to MatchNoDocsQuery -> should return MatchNoDocsQuery+ Query sub1 = new MatchNoDocsQuery("test1");+ Query sub2 = new MatchNoDocsQuery("test2");+ DisjunctionMaxQuery q = new DisjunctionMaxQuery(Arrays.asList(sub1, sub2), 0.0f);+ Query rewritten = s.rewrite(q);+ assertEquals(MatchNoDocsQuery.INSTANCE, rewritten);+ }++ public void testRewriteSingleSurvivor() throws Exception {+ // One disjunct rewrites to MatchNoDocsQuery, other matches -> should return the matching one+ Query sub = tq("hed", "albino");+ DisjunctionMaxQuery q =+ new DisjunctionMaxQuery(Arrays.asList(sub, new MatchNoDocsQuery("test")), 0.0f);+ Query rewritten = s.rewrite(q);+ assertEquals(sub, rewritten);+ }++ public void testRewriteFilterMatchNoDocs() throws Exception {+ // Mixed: some MatchNoDocsQuery, some real queries -> should filter out MatchNoDocsQuery+ Query sub1 = tq("hed", "albino");+ Query sub2 = tq("hed", "elephant");+ DisjunctionMaxQuery q =+ new DisjunctionMaxQuery(Arrays.asList(sub1, sub2, new MatchNoDocsQuery("test")), 0.0f);+ Query rewritten = s.rewrite(q);+ DisjunctionMaxQuery expected = new DisjunctionMaxQuery(Arrays.asList(sub1, sub2), 0.0f);+ assertEquals(expected, rewritten);+ }++ public void testRewriteFilterMatchNoDocsWithTieBreaker() throws Exception {+ // Verify tie breaker multiplier is preserved when filtering MatchNoDocsQuery+ Query sub1 = tq("hed", "albino");+ Query sub2 = tq("hed", "elephant");+ DisjunctionMaxQuery q =+ new DisjunctionMaxQuery(Arrays.asList(sub1, sub2, new MatchNoDocsQuery("test")), 0.1f);+ Query rewritten = s.rewrite(q);+ DisjunctionMaxQuery expected = new DisjunctionMaxQuery(Arrays.asList(sub1, sub2), 0.1f);+ assertEquals(expected, rewritten);+ }+public void testDisjunctOrderAndEquals() throws Exception {// the order that disjuncts are provided in should not matter for equals() comparisonsQuery sub1 = tq("hed", "albino");