Checking if upper and lower terms are valid

Signed-off-by: Harsha Vamsi Kalluri <[email protected]>
harshavamsi · Apr 29, 2024 · 6d24db6 · 6d24db6
1 parent 40de7c2
commit 6d24db6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/server/src/main/java/org/opensearch/index/mapper/BooleanFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/BooleanFieldMapper.java
@@ -318,14 +318,17 @@ public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower
 
             }
 
+            lowerTerm = indexedValueForSearch(lowerTerm);
+            upperTerm = indexedValueForSearch(upperTerm);
+
             if (lowerTerm == upperTerm) {
                 if (!includeLower || !includeUpper) {
                     return new MatchNoDocsQuery();
                 }
-                return termQuery(lowerTerm, context);
+                return termQuery(lowerTerm.equals(Values.TRUE), context);
             }
 
-            if ((boolean) lowerTerm) {
+            if (lowerTerm.equals(Values.TRUE)) {
                 return new MatchNoDocsQuery();
             }
             if (!includeLower && !includeUpper) {

diff --git a/server/src/test/java/org/opensearch/index/mapper/BooleanFieldTypeTests.java b/server/src/test/java/org/opensearch/index/mapper/BooleanFieldTypeTests.java
@@ -123,6 +123,10 @@ public void testRangeQuery() {
         assertEquals(new TermQuery(new Term("field", "F")), ft.rangeQuery(null, false, true, true, null));
 
         assertEquals(new DocValuesFieldExistsQuery("field"), ft.rangeQuery(false, null, true, true, null));
+
+        IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> ft.rangeQuery("random", null, true, true, null));
+
+        assertEquals("Can't parse boolean value [random], expected [true] or [false]", e.getMessage());
     }
 
     public void testFetchSourceValue() throws IOException {