Fixing date after merge

opendistro-for-elasticsearch · Jul 1, 2021 · 19bedb2 · 19bedb2
1 parent 69b82eb
commit 19bedb2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 35 deletions.
diff --git a/...src/main/java/com/amazon/opendistroforelasticsearch/sql/data/model/ExprDatetimeValue.java b/...src/main/java/com/amazon/opendistroforelasticsearch/sql/data/model/ExprDatetimeValue.java
@@ -15,10 +15,9 @@
 
 package com.amazon.opendistroforelasticsearch.sql.data.model;
 
-import static com.amazon.opendistroforelasticsearch.sql.data.model.ExprTimestampValue.DATE_FORMATS_ALLOWED;
-
 import com.amazon.opendistroforelasticsearch.sql.data.type.ExprCoreType;
 import com.amazon.opendistroforelasticsearch.sql.data.type.ExprType;
+import com.amazon.opendistroforelasticsearch.sql.data.utils.ExprDateFormatters;
 import com.amazon.opendistroforelasticsearch.sql.exception.SemanticCheckException;
 import com.google.common.base.Objects;
 import java.time.Instant;
@@ -28,9 +27,7 @@
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeFormatterBuilder;
 import java.time.format.DateTimeParseException;
-import java.time.temporal.ChronoField;
 import java.time.temporal.ChronoUnit;
 import lombok.RequiredArgsConstructor;
 
@@ -42,21 +39,13 @@ public class ExprDatetimeValue extends AbstractExprValue {
    * Constructor with datetime string as input.
    */
   public ExprDatetimeValue(String datetime) {
-    LocalDateTime localDateTime = null;
-
-    for (DateTimeFormatter format : DATE_FORMATS_ALLOWED) {
-      try {
-        localDateTime = LocalDateTime.parse(datetime, format);
-      } catch (DateTimeParseException ignored) {
-        // ignored
-      }
-    }
-    if (localDateTime == null) {
-      throw new SemanticCheckException(String.format(
-          "datetime:%s in unsupported format, please " + "use yyyy-MM-dd HH:mm:ss[.SSSSSS]",
-          datetime));
+    try {
+      this.datetime = LocalDateTime.parse(datetime,
+          ExprDateFormatters.TOLERANT_PARSER_DATE_TIME_FORMATTER);
+    } catch (DateTimeParseException e) {
+      throw new SemanticCheckException(String.format("datetime:%s in unsupported format, please "
+          + "use yyyy-MM-dd HH:mm:ss[.SSSSSS]", datetime));
     }
-    this.datetime = localDateTime;
   }
 
   @Override

diff --git a/...src/test/java/com/amazon/opendistroforelasticsearch/sql/data/model/DateTimeValueTest.java b/...src/test/java/com/amazon/opendistroforelasticsearch/sql/data/model/DateTimeValueTest.java
@@ -120,17 +120,6 @@ public void timestampInUnsupportedFormat() {
         exception.getMessage());
   }
 
-  @Test
-  public void datetimeInUnsupportedFormat() {
-    SemanticCheckException exception =
-        assertThrows(SemanticCheckException.class,
-            () -> new ExprDatetimeValue("2020-07-07T01:01:01Z"));
-    assertEquals(
-        "datetime:2020-07-07T01:01:01Z in unsupported format, "
-            + "please use yyyy-MM-dd HH:mm:ss[.SSSSSS]",
-        exception.getMessage());
-  }
-
   @Test
   public void stringDateTimeValue() {
     ExprValue stringValue = new ExprStringValue("2020-08-17 19:44:00");
@@ -142,9 +131,9 @@ public void stringDateTimeValue() {
 
     SemanticCheckException exception =
         assertThrows(SemanticCheckException.class,
-            () -> new ExprStringValue("2020-07-07T01:01:01Z").datetimeValue());
+            () -> new ExprStringValue("2020-07-07T01:01:01Z12345678").datetimeValue());
     assertEquals(
-        "datetime:2020-07-07T01:01:01Z in unsupported format, "
+        "datetime:2020-07-07T01:01:01Z12345678 in unsupported format, "
             + "please use yyyy-MM-dd HH:mm:ss[.SSSSSS]",
         exception.getMessage());
   }
@@ -250,9 +239,9 @@ public void timestampOverMaxMicroPrecision() {
   public void datetimeOverMaxMicroPrecision() {
     SemanticCheckException exception =
         assertThrows(SemanticCheckException.class,
-            () -> new ExprDatetimeValue("2020-07-07 01:01:01.1234567"));
+            () -> new ExprDatetimeValue("2020-07-07 01:01:01.1234567890"));
     assertEquals(
-        "datetime:2020-07-07 01:01:01.1234567 in unsupported format, "
+        "datetime:2020-07-07 01:01:01.1234567890 in unsupported format, "
                 + "please use yyyy-MM-dd HH:mm:ss[.SSSSSS]",
         exception.getMessage());
   }
@@ -261,9 +250,9 @@ public void datetimeOverMaxMicroPrecision() {
   public void timeOverMaxMicroPrecision() {
     SemanticCheckException exception =
         assertThrows(SemanticCheckException.class,
-            () -> new ExprTimeValue("01:01:01.1234567"));
+            () -> new ExprTimeValue("01:01:01.1234567891"));
     assertEquals(
-        "time:01:01:01.1234567 in unsupported format, please use HH:mm:ss[.SSSSSS]",
+        "time:01:01:01.1234567891 in unsupported format, please use HH:mm:ss[.SSSSSS]",
         exception.getMessage());
   }
 }