Early termination with PointValues

Signed-off-by: Prudhvi Godithi <[email protected]>
opensearch-project · Dec 8, 2024 · 5378859 · 5378859
1 parent 3eecea4
commit 5378859
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 17 deletions.
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/server/src/main/java/org/opensearch/common/time/DateUtils.java b/server/src/main/java/org/opensearch/common/time/DateUtils.java
@@ -272,6 +272,16 @@ public static Instant clampToNanosRange(Instant instant) {
         return instant;
     }
 
+    public static Instant clampToMillisRange(Instant instant) {
+        if (instant.isBefore(Instant.ofEpochMilli(Long.MIN_VALUE))) {
+            return Instant.ofEpochMilli(Long.MIN_VALUE);
+        }
+        if (instant.isAfter(Instant.ofEpochMilli(Long.MAX_VALUE))) {
+            return Instant.ofEpochMilli(Long.MAX_VALUE);
+        }
+        return instant;
+    }
+
     /**
      * convert a long value to a java time instant
      * the long value resembles the nanoseconds since the epoch

diff --git a/server/src/main/java/org/opensearch/index/mapper/DateFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/DateFieldMapper.java
@@ -123,7 +123,7 @@ public enum Resolution {
         MILLISECONDS(CONTENT_TYPE, NumericType.DATE) {
             @Override
             public long convert(Instant instant) {
-                return instant.toEpochMilli();
+                return clampToValidRange(instant).toEpochMilli();
             }
 
             @Override
@@ -133,7 +133,7 @@ public Instant toInstant(long value) {
 
             @Override
             public Instant clampToValidRange(Instant instant) {
-                return instant;
+                return DateUtils.clampToMillisRange(instant);
             }
 
             @Override
@@ -612,6 +612,7 @@ public Relation isFieldWithinQuery(
             if (isSearchable() == false && hasDocValues()) {
                 return Relation.INTERSECTS;
             }
+
             if (dateParser == null) {
                 dateParser = this.dateMathParser;
             }