From d15bedc3bf7730f6f2587ed8618a97097c4768fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Cea=20Fontenla?= Date: Mon, 27 Jan 2025 17:32:14 +0100 Subject: [PATCH] ESQL: Fix DateExtract with nanos tests --- .../qa/testFixtures/src/main/resources/date_nanos.csv-spec | 3 ++- .../esql/expression/function/scalar/date/DateExtract.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/date_nanos.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/date_nanos.csv-spec index ec68e7eecc658..a41c9b8cd0b16 100644 --- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/date_nanos.csv-spec +++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/date_nanos.csv-spec @@ -506,7 +506,8 @@ required_capability: date_nanos_date_extract FROM date_nanos | EVAL nn = MV_MAX(nanos) | EVAL year = DATE_EXTRACT("year", nn), ns = DATE_EXTRACT("nano_of_second", nn) -| KEEP nn, year, ns; +| KEEP nn, year, ns +| SORT nn DESC; nn:date_nanos | year:long | ns:long 2023-10-23T13:55:01.543123456Z | 2023 | 543123456 diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateExtract.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateExtract.java index 20ff398803854..7d8648a672ff8 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateExtract.java +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateExtract.java @@ -114,8 +114,8 @@ public String getWriteableName() { @Override public ExpressionEvaluator.Factory toEvaluator(ToEvaluator toEvaluator) { boolean isNanos = switch (field().dataType()) { - case DataType.DATETIME -> false; - case DataType.DATE_NANOS -> true; + case DATETIME -> false; + case DATE_NANOS -> true; default -> throw new UnsupportedOperationException( "Unsupported field type [" + field().dataType().name()