[ESQL] date nanos binary comparisons (elastic#111908)

resolves elastic#109992 Nothing fancy here. Nanosecond dates are still longs, and we can just compare them as longs. Please note that, as mentioned in the linked issue, this only supports comparing date nanos to other date nanos, and not comparing to millisecond dates. With the cast functions added in elastic#111850, users can explicitly cast to millisecond dates (or longs) to compare nanos to other things.
davidkyle · Sep 5, 2024 · 66a4d12 · 66a4d12
1 parent 596e78c
commit 66a4d12
Show file tree

Hide file tree

Showing 12 changed files with 96 additions and 12 deletions.
diff --git a/...in/java/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/Equals.java b/...in/java/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/Equals.java
@@ -35,6 +35,7 @@ public class Equals extends EsqlBinaryComparison implements Negatable<EsqlBinary
         Map.entry(DataType.LONG, EqualsLongsEvaluator.Factory::new),
         Map.entry(DataType.UNSIGNED_LONG, EqualsLongsEvaluator.Factory::new),
         Map.entry(DataType.DATETIME, EqualsLongsEvaluator.Factory::new),
+        Map.entry(DataType.DATE_NANOS, EqualsLongsEvaluator.Factory::new),
         Map.entry(DataType.GEO_POINT, EqualsGeometriesEvaluator.Factory::new),
         Map.entry(DataType.CARTESIAN_POINT, EqualsGeometriesEvaluator.Factory::new),
         Map.entry(DataType.GEO_SHAPE, EqualsGeometriesEvaluator.Factory::new),

diff --git a/...va/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/GreaterThan.java b/...va/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/GreaterThan.java
@@ -34,6 +34,7 @@ public class GreaterThan extends EsqlBinaryComparison implements Negatable<EsqlB
         Map.entry(DataType.LONG, GreaterThanLongsEvaluator.Factory::new),
         Map.entry(DataType.UNSIGNED_LONG, GreaterThanLongsEvaluator.Factory::new),
         Map.entry(DataType.DATETIME, GreaterThanLongsEvaluator.Factory::new),
+        Map.entry(DataType.DATE_NANOS, GreaterThanLongsEvaluator.Factory::new),
         Map.entry(DataType.KEYWORD, GreaterThanKeywordsEvaluator.Factory::new),
         Map.entry(DataType.TEXT, GreaterThanKeywordsEvaluator.Factory::new),
         Map.entry(DataType.VERSION, GreaterThanKeywordsEvaluator.Factory::new),

diff --git a/...elasticsearch/xpack/esql/expression/predicate/operator/comparison/GreaterThanOrEqual.java b/...elasticsearch/xpack/esql/expression/predicate/operator/comparison/GreaterThanOrEqual.java
@@ -34,6 +34,7 @@ public class GreaterThanOrEqual extends EsqlBinaryComparison implements Negatabl
         Map.entry(DataType.LONG, GreaterThanOrEqualLongsEvaluator.Factory::new),
         Map.entry(DataType.UNSIGNED_LONG, GreaterThanOrEqualLongsEvaluator.Factory::new),
         Map.entry(DataType.DATETIME, GreaterThanOrEqualLongsEvaluator.Factory::new),
+        Map.entry(DataType.DATE_NANOS, GreaterThanOrEqualLongsEvaluator.Factory::new),
         Map.entry(DataType.KEYWORD, GreaterThanOrEqualKeywordsEvaluator.Factory::new),
         Map.entry(DataType.TEXT, GreaterThanOrEqualKeywordsEvaluator.Factory::new),
         Map.entry(DataType.VERSION, GreaterThanOrEqualKeywordsEvaluator.Factory::new),

diff --git a/.../java/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/LessThan.java b/.../java/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/LessThan.java
@@ -34,6 +34,7 @@ public class LessThan extends EsqlBinaryComparison implements Negatable<EsqlBina
         Map.entry(DataType.LONG, LessThanLongsEvaluator.Factory::new),
         Map.entry(DataType.UNSIGNED_LONG, LessThanLongsEvaluator.Factory::new),
         Map.entry(DataType.DATETIME, LessThanLongsEvaluator.Factory::new),
+        Map.entry(DataType.DATE_NANOS, LessThanLongsEvaluator.Factory::new),
         Map.entry(DataType.KEYWORD, LessThanKeywordsEvaluator.Factory::new),
         Map.entry(DataType.TEXT, LessThanKeywordsEvaluator.Factory::new),
         Map.entry(DataType.VERSION, LessThanKeywordsEvaluator.Factory::new),

diff --git a/...rg/elasticsearch/xpack/esql/expression/predicate/operator/comparison/LessThanOrEqual.java b/...rg/elasticsearch/xpack/esql/expression/predicate/operator/comparison/LessThanOrEqual.java
@@ -34,6 +34,7 @@ public class LessThanOrEqual extends EsqlBinaryComparison implements Negatable<E
         Map.entry(DataType.LONG, LessThanOrEqualLongsEvaluator.Factory::new),
         Map.entry(DataType.UNSIGNED_LONG, LessThanOrEqualLongsEvaluator.Factory::new),
         Map.entry(DataType.DATETIME, LessThanOrEqualLongsEvaluator.Factory::new),
+        Map.entry(DataType.DATE_NANOS, LessThanOrEqualLongsEvaluator.Factory::new),
         Map.entry(DataType.KEYWORD, LessThanOrEqualKeywordsEvaluator.Factory::new),
         Map.entry(DataType.TEXT, LessThanOrEqualKeywordsEvaluator.Factory::new),
         Map.entry(DataType.VERSION, LessThanOrEqualKeywordsEvaluator.Factory::new),

diff --git a/...java/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/NotEquals.java b/...java/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/NotEquals.java
@@ -35,6 +35,7 @@ public class NotEquals extends EsqlBinaryComparison implements Negatable<EsqlBin
         Map.entry(DataType.LONG, NotEqualsLongsEvaluator.Factory::new),
         Map.entry(DataType.UNSIGNED_LONG, NotEqualsLongsEvaluator.Factory::new),
         Map.entry(DataType.DATETIME, NotEqualsLongsEvaluator.Factory::new),
+        Map.entry(DataType.DATE_NANOS, NotEqualsLongsEvaluator.Factory::new),
         Map.entry(DataType.GEO_POINT, NotEqualsGeometriesEvaluator.Factory::new),
         Map.entry(DataType.CARTESIAN_POINT, NotEqualsGeometriesEvaluator.Factory::new),
         Map.entry(DataType.GEO_SHAPE, NotEqualsGeometriesEvaluator.Factory::new),

diff --git a/...va/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/EqualsTests.java b/...va/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/EqualsTests.java
@@ -116,7 +116,6 @@ public static Iterable<Object[]> parameters() {
             )
         );
         // Datetime
-        // TODO: I'm surprised this passes. Shouldn't there be a cast from DateTime to Long?
         suppliers.addAll(
             TestCaseSupplier.forBinaryNotCasting(
                 "EqualsLongsEvaluator",
@@ -131,6 +130,20 @@ public static Iterable<Object[]> parameters() {
             )
         );
 
+        suppliers.addAll(
+            TestCaseSupplier.forBinaryNotCasting(
+                "EqualsLongsEvaluator",
+                "lhs",
+                "rhs",
+                Object::equals,
+                DataType.BOOLEAN,
+                TestCaseSupplier.dateNanosCases(),
+                TestCaseSupplier.dateNanosCases(),
+                List.of(),
+                false
+            )
+        );
+
         suppliers.addAll(
             TestCaseSupplier.stringCases(
                 Object::equals,
@@ -204,7 +217,7 @@ public static Iterable<Object[]> parameters() {
     }
 
     private static String typeErrorString =
-        "boolean, cartesian_point, cartesian_shape, datetime, double, geo_point, geo_shape, integer, ip, keyword, long, text, "
+        "boolean, cartesian_point, cartesian_shape, datetime, date_nanos, double, geo_point, geo_shape, integer, ip, keyword, long, text, "
             + "unsigned_long or version";
 
     @Override

diff --git a/...icsearch/xpack/esql/expression/predicate/operator/comparison/GreaterThanOrEqualTests.java b/...icsearch/xpack/esql/expression/predicate/operator/comparison/GreaterThanOrEqualTests.java
@@ -106,7 +106,6 @@ public static Iterable<Object[]> parameters() {
             )
         );
         // Datetime
-        // TODO: I'm surprised this passes. Shouldn't there be a cast from DateTime to Long?
         suppliers.addAll(
             TestCaseSupplier.forBinaryNotCasting(
                 "GreaterThanOrEqualLongsEvaluator",
@@ -121,6 +120,20 @@ public static Iterable<Object[]> parameters() {
             )
         );
 
+        suppliers.addAll(
+            TestCaseSupplier.forBinaryNotCasting(
+                "GreaterThanOrEqualLongsEvaluator",
+                "lhs",
+                "rhs",
+                (l, r) -> ((Number) l).longValue() >= ((Number) r).longValue(),
+                DataType.BOOLEAN,
+                TestCaseSupplier.dateNanosCases(),
+                TestCaseSupplier.dateNanosCases(),
+                List.of(),
+                false
+            )
+        );
+
         suppliers.addAll(
             TestCaseSupplier.stringCases(
                 (l, r) -> ((BytesRef) l).compareTo((BytesRef) r) >= 0,
@@ -137,7 +150,7 @@ public static Iterable<Object[]> parameters() {
                     o,
                     v,
                     t,
-                    (l, p) -> "datetime, double, integer, ip, keyword, long, text, unsigned_long or version"
+                    (l, p) -> "date_nanos, datetime, double, integer, ip, keyword, long, text, unsigned_long or version"
                 )
             )
         );

diff --git a/...g/elasticsearch/xpack/esql/expression/predicate/operator/comparison/GreaterThanTests.java b/...g/elasticsearch/xpack/esql/expression/predicate/operator/comparison/GreaterThanTests.java
@@ -106,7 +106,6 @@ public static Iterable<Object[]> parameters() {
             )
         );
         // Datetime
-        // TODO: I'm surprised this passes. Shouldn't there be a cast from DateTime to Long?
         suppliers.addAll(
             TestCaseSupplier.forBinaryNotCasting(
                 "GreaterThanLongsEvaluator",
@@ -121,6 +120,20 @@ public static Iterable<Object[]> parameters() {
             )
         );
 
+        suppliers.addAll(
+            TestCaseSupplier.forBinaryNotCasting(
+                "GreaterThanLongsEvaluator",
+                "lhs",
+                "rhs",
+                (l, r) -> ((Number) l).longValue() > ((Number) r).longValue(),
+                DataType.BOOLEAN,
+                TestCaseSupplier.dateNanosCases(),
+                TestCaseSupplier.dateNanosCases(),
+                List.of(),
+                false
+            )
+        );
+
         suppliers.addAll(
             TestCaseSupplier.stringCases(
                 (l, r) -> ((BytesRef) l).compareTo((BytesRef) r) > 0,
@@ -137,7 +150,7 @@ public static Iterable<Object[]> parameters() {
                     o,
                     v,
                     t,
-                    (l, p) -> "datetime, double, integer, ip, keyword, long, text, unsigned_long or version"
+                    (l, p) -> "date_nanos, datetime, double, integer, ip, keyword, long, text, unsigned_long or version"
                 )
             )
         );

diff --git a/...asticsearch/xpack/esql/expression/predicate/operator/comparison/LessThanOrEqualTests.java b/...asticsearch/xpack/esql/expression/predicate/operator/comparison/LessThanOrEqualTests.java
@@ -106,7 +106,6 @@ public static Iterable<Object[]> parameters() {
             )
         );
         // Datetime
-        // TODO: I'm surprised this passes. Shouldn't there be a cast from DateTime to Long?
         suppliers.addAll(
             TestCaseSupplier.forBinaryNotCasting(
                 "LessThanOrEqualLongsEvaluator",
@@ -121,6 +120,20 @@ public static Iterable<Object[]> parameters() {
             )
         );
 
+        suppliers.addAll(
+            TestCaseSupplier.forBinaryNotCasting(
+                "LessThanOrEqualLongsEvaluator",
+                "lhs",
+                "rhs",
+                (l, r) -> ((Number) l).longValue() <= ((Number) r).longValue(),
+                DataType.BOOLEAN,
+                TestCaseSupplier.dateNanosCases(),
+                TestCaseSupplier.dateNanosCases(),
+                List.of(),
+                false
+            )
+        );
+
         suppliers.addAll(
             TestCaseSupplier.stringCases(
                 (l, r) -> ((BytesRef) l).compareTo((BytesRef) r) <= 0,
@@ -137,7 +150,7 @@ public static Iterable<Object[]> parameters() {
                     o,
                     v,
                     t,
-                    (l, p) -> "datetime, double, integer, ip, keyword, long, text, unsigned_long or version"
+                    (l, p) -> "date_nanos, datetime, double, integer, ip, keyword, long, text, unsigned_long or version"
                 )
             )
         );

diff --git a/.../org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/LessThanTests.java b/.../org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/LessThanTests.java
@@ -106,7 +106,20 @@ public static Iterable<Object[]> parameters() {
             )
         );
         // Datetime
-        // TODO: I'm surprised this passes. Shouldn't there be a cast from DateTime to Long?
+        suppliers.addAll(
+            TestCaseSupplier.forBinaryNotCasting(
+                "LessThanLongsEvaluator",
+                "lhs",
+                "rhs",
+                (l, r) -> ((Number) l).longValue() < ((Number) r).longValue(),
+                DataType.BOOLEAN,
+                TestCaseSupplier.dateCases(),
+                TestCaseSupplier.dateCases(),
+                List.of(),
+                false
+            )
+        );
+
         suppliers.addAll(
             TestCaseSupplier.forBinaryNotCasting(
                 "LessThanLongsEvaluator",
@@ -137,7 +150,7 @@ public static Iterable<Object[]> parameters() {
                     o,
                     v,
                     t,
-                    (l, p) -> "datetime, double, integer, ip, keyword, long, text, unsigned_long or version"
+                    (l, p) -> "date_nanos, datetime, double, integer, ip, keyword, long, text, unsigned_long or version"
                 )
             )
         );

diff --git a/...org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/NotEqualsTests.java b/...org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/NotEqualsTests.java
@@ -115,7 +115,6 @@ public static Iterable<Object[]> parameters() {
             )
         );
         // Datetime
-        // TODO: I'm surprised this passes. Shouldn't there be a cast from DateTime to Long?
         suppliers.addAll(
             TestCaseSupplier.forBinaryNotCasting(
                 "NotEqualsLongsEvaluator",
@@ -129,6 +128,20 @@ public static Iterable<Object[]> parameters() {
                 false
             )
         );
+        // Datetime
+        suppliers.addAll(
+            TestCaseSupplier.forBinaryNotCasting(
+                "NotEqualsLongsEvaluator",
+                "lhs",
+                "rhs",
+                (l, r) -> false == l.equals(r),
+                DataType.BOOLEAN,
+                TestCaseSupplier.dateNanosCases(),
+                TestCaseSupplier.dateNanosCases(),
+                List.of(),
+                false
+            )
+        );
         suppliers.addAll(
             TestCaseSupplier.stringCases(
                 (l, r) -> false == l.equals(r),
@@ -198,7 +211,7 @@ public static Iterable<Object[]> parameters() {
     }
 
     private static String typeErrorString =
-        "boolean, cartesian_point, cartesian_shape, datetime, double, geo_point, geo_shape, integer, ip, keyword, long, text, "
+        "boolean, cartesian_point, cartesian_shape, datetime, date_nanos, double, geo_point, geo_shape, integer, ip, keyword, long, text, "
             + "unsigned_long or version";
 
     @Override