update according to review comments

fang-xing-esql · Mar 19, 2024 · 76909d8 · 76909d8
1 parent 61b5257
commit 76909d8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/analysis/Analyzer.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/analysis/Analyzer.java
@@ -79,7 +79,6 @@
 import static java.util.Collections.singletonList;
 import static org.elasticsearch.common.logging.LoggerMessageFormat.format;
 import static org.elasticsearch.xpack.esql.stats.FeatureMetric.LIMIT;
-import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.DEFAULT_DATE_TIME_FORMATTER;
 import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.convertDatetimeStringToLong;
 import static org.elasticsearch.xpack.ql.analyzer.AnalyzerRules.resolveFunction;
 import static org.elasticsearch.xpack.ql.type.DataTypes.DATETIME;

diff --git a/...rc/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateFormat.java b/...rc/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateFormat.java
@@ -96,12 +96,7 @@ static BytesRef process(long val, BytesRef formatter, @Fixed Locale locale) {
     public ExpressionEvaluator.Factory toEvaluator(Function<Expression, ExpressionEvaluator.Factory> toEvaluator) {
         var fieldEvaluator = toEvaluator.apply(field);
         if (format == null) {
-            return dvrCtx -> new DateFormatConstantEvaluator(
-                source(),
-                fieldEvaluator.get(dvrCtx),
-                DEFAULT_DATE_TIME_FORMATTER,
-                dvrCtx
-            );
+            return dvrCtx -> new DateFormatConstantEvaluator(source(), fieldEvaluator.get(dvrCtx), DEFAULT_DATE_TIME_FORMATTER, dvrCtx);
         }
         if (format.dataType() != DataTypes.KEYWORD) {
             throw new IllegalArgumentException("unsupported data type for format [" + format.dataType() + "]");
@@ -121,9 +116,7 @@ public ExpressionEvaluator.Factory toEvaluator(Function<Expression, ExpressionEv
     }
 
     private static DateFormatter toFormatter(Object format, Locale locale) {
-        DateFormatter result = format == null
-            ? DEFAULT_DATE_TIME_FORMATTER
-            : DateFormatter.forPattern(((BytesRef) format).utf8ToString());
+        DateFormatter result = format == null ? DEFAULT_DATE_TIME_FORMATTER : DateFormatter.forPattern(((BytesRef) format).utf8ToString());
         return result.withLocale(locale);
     }
 

diff --git a/...java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDatetimeTests.java b/...java/org/elasticsearch/xpack/esql/expression/function/scalar/convert/ToDatetimeTests.java
@@ -24,7 +24,7 @@
 import java.util.function.Supplier;
 
 import static java.util.Collections.emptyList;
-import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.ESQL_DEFAULT_DATE_TIME_FORMATTER;
+import static org.elasticsearch.xpack.esql.type.EsqlDataTypeConverter.DEFAULT_DATE_TIME_FORMATTER;
 
 public class ToDatetimeTests extends AbstractFunctionTestCase {
     public ToDatetimeTests(@Name("TestCase") Supplier<TestCaseSupplier.TestCase> testCaseSupplier) {
@@ -118,7 +118,7 @@ public static Iterable<Object[]> parameters() {
                 )
             ),
             DataTypes.DATETIME,
-            bytesRef -> ESQL_DEFAULT_DATE_TIME_FORMATTER.parseMillis(((BytesRef) bytesRef).utf8ToString()),
+            bytesRef -> DEFAULT_DATE_TIME_FORMATTER.parseMillis(((BytesRef) bytesRef).utf8ToString()),
             emptyList()
         );
         TestCaseSupplier.unary(