PR feedback

Author: mosche

server/src/main/java/org/elasticsearch/index/mapper/RangeType.java

@@ -303,12 +303,17 @@ public Query rangeQuery(
         }
 
         private static long parseRangeTerm(DateMathParser parser, Object term, ZoneId zone, boolean roundUp, LongSupplier nowInMillis) {
-            String termString = term instanceof BytesRef ? ((BytesRef) term).utf8ToString() : term.toString();
-            // `roundUp` may only be used if the term is not a Temporal object. LocalTime#toString() and similar will output
-            // the shortest possible representation and might omit seconds, milliseconds, etc.
-            // That interferes badly with the behavior of the roundup parser leading to unexpected results.
-            boolean mayRoundUp = (term instanceof Temporal) == false;
-            return parser.parse(termString, nowInMillis, roundUp && mayRoundUp, zone).toEpochMilli();
+            String termString;
+            if (term instanceof BytesRef bytesRefTerm) {
+                termString = bytesRefTerm.utf8ToString();
+            } else {
+                termString = term.toString();
+                // `roundUp` may only be used if the term is not a Temporal object. LocalTime#toString() and similar will output
+                // the shortest possible representation and might omit seconds, milliseconds, etc.
+                // That interferes badly with the behavior of the roundup parser leading to unexpected results.
+                roundUp = roundUp && (term instanceof Temporal) == false;
+            }
+            return parser.parse(termString, nowInMillis, roundUp, zone).toEpochMilli();
         }
 
         @Override

server/src/test/java/org/elasticsearch/index/mapper/RangeFieldTypeTests.java

@@ -86,6 +86,40 @@ public void testRangeQuery() throws Exception {
         );
     }
 
+    public void testDateRangeQueryDoesNotRoundupTemporals() {
+        type = RangeType.DATE;
+        SearchExecutionContext context = createContext();
+        RangeFieldType ft = createDefaultFieldType();
+        ShapeRelation relation = randomFrom(ShapeRelation.values());
+
+        // explicitly not using nextFrom here to provide a concrete, visual example.
+        // see the behavioral difference compared to testRangeQueryIntersectsAdjacentDates
+        ZonedDateTime from = ZonedDateTime.parse("2025-05-01T14:10:00.000Z");
+        ZonedDateTime to = ZonedDateTime.parse("2025-05-01T14:11:00.000Z");
+
+        // usage of roundUp parsers is wrong if terms are Temporal objects, otherwise it would arbitrarily change the bounds
+        // depending on the string representation
+        assertEquals(
+            getExpectedRangeQuery(relation, from, to, false, true),
+            ft.rangeQuery(from, to, false, true, relation, null, null, context)
+        );
+    }
+
+    public void testRangeQueryIntersectsAdjacentDates() {
+        type = RangeType.DATE;
+        SearchExecutionContext context = createContext();
+        ShapeRelation relation = randomFrom(ShapeRelation.values());
+        RangeFieldType ft = createDefaultFieldType();
+
+        // explicitly not using nextFrom here to provide a concrete, visual example of the roundUp behavior
+        String from = "2025-05-01T14:10Z"; // transformed to 2025-05-01T14:10:59.999999999Z by roundUp parser
+        String to = "2025-05-01T14:11Z";
+
+        Query rangeQuery = ft.rangeQuery(from, to, false, false, relation, null, null, context);
+        assertThat(rangeQuery, instanceOf(IndexOrDocValuesQuery.class));
+        assertThat(((IndexOrDocValuesQuery) rangeQuery).getIndexQuery(), instanceOf(MatchNoDocsQuery.class));
+    }
+
     /**
      * test the queries are correct if from/to are adjacent and the range is exclusive of those values
      */