Rewrite newSlowRangeQuery to MatchNoDocsQuery when upper > lower (#13425

)
apache · Jun 4, 2024 · 2ed1f2f · 2ed1f2f
1 parent e8801bf
commit 2ed1f2f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
@@ -22,6 +22,9 @@ Optimizations
 
 * GITHUB#13439: Avoid unnecessary memory allocation in PackedLongValues#Iterator. (Zhang Chao)
 
+* GITHUB##13425: Rewrite SortedNumericDocValuesRangeQuery to MatchNoDocsQuery when the upper bound is smaller than the
+  lower bound. (Ioana Tagirta)
+
 Bug Fixes
 ---------------------
 (No changes)

diff --git a/lucene/core/src/java/org/apache/lucene/document/SortedNumericDocValuesRangeQuery.java b/lucene/core/src/java/org/apache/lucene/document/SortedNumericDocValuesRangeQuery.java
@@ -26,6 +26,7 @@
 import org.apache.lucene.search.ConstantScoreWeight;
 import org.apache.lucene.search.FieldExistsQuery;
 import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.MatchNoDocsQuery;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.QueryVisitor;
 import org.apache.lucene.search.ScoreMode;
@@ -87,6 +88,9 @@ public Query rewrite(IndexSearcher indexSearcher) throws IOException {
     if (lowerValue == Long.MIN_VALUE && upperValue == Long.MAX_VALUE) {
       return new FieldExistsQuery(field);
     }
+    if (lowerValue > upperValue) {
+      return new MatchNoDocsQuery();
+    }
     return super.rewrite(indexSearcher);
   }
 

diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesQueries.java
@@ -288,6 +288,24 @@ public void testMissingField() throws IOException {
     dir.close();
   }
 
+  public void testSlowRangeQueryRewrite() throws IOException {
+    Directory dir = newDirectory();
+    RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
+    IndexReader reader = iw.getReader();
+    iw.close();
+    IndexSearcher searcher = newSearcher(reader);
+
+    QueryUtils.checkEqual(
+        NumericDocValuesField.newSlowRangeQuery("foo", 10, 1).rewrite(searcher),
+        new MatchNoDocsQuery());
+    QueryUtils.checkEqual(
+        NumericDocValuesField.newSlowRangeQuery("foo", Long.MIN_VALUE, Long.MAX_VALUE)
+            .rewrite(searcher),
+        new FieldExistsQuery("foo"));
+    reader.close();
+    dir.close();
+  }
+
   public void testSortedNumericNPE() throws IOException {
     Directory dir = newDirectory();
     RandomIndexWriter iw = new RandomIndexWriter(random(), dir);