Use stricter date and time formatters

Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>

Author: yuancu

core/src/main/java/org/opensearch/sql/calcite/utils/datetime/DateTimeParser.java

@@ -5,6 +5,10 @@
 
 package org.opensearch.sql.calcite.utils.datetime;
 
+import static org.opensearch.sql.utils.DateTimeFormatters.DATE_TIME_FORMATTER_VARIABLE_NANOS;
+import static org.opensearch.sql.utils.DateTimeFormatters.STRICT_DATE_FORMATTER;
+import static org.opensearch.sql.utils.DateTimeFormatters.STRICT_TIME_FORMATTER;
+
 import com.google.common.collect.ImmutableList;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -13,7 +17,6 @@
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 import org.opensearch.sql.exception.SemanticCheckException;
-import org.opensearch.sql.utils.DateTimeFormatters;
 
 public interface DateTimeParser {
   /**
@@ -91,7 +94,7 @@ static LocalDateTime parseDateOrTimestamp(String input) {
 
   static LocalDateTime parseTimestamp(String input) {
     List<DateTimeFormatter> dateTimeFormatters =
-        ImmutableList.of(DateTimeFormatters.DATE_TIME_FORMATTER_VARIABLE_NANOS_OPTIONAL);
+        ImmutableList.of(DATE_TIME_FORMATTER_VARIABLE_NANOS);
 
     for (DateTimeFormatter fmt : dateTimeFormatters) {
       try {
@@ -106,7 +109,7 @@ static LocalDateTime parseTimestamp(String input) {
   }
 
   static LocalTime parseTime(String input) {
-    List<DateTimeFormatter> timeFormatters = ImmutableList.of(DateTimeFormatter.ISO_TIME);
+    List<DateTimeFormatter> timeFormatters = ImmutableList.of(STRICT_TIME_FORMATTER);
     for (DateTimeFormatter fmt : timeFormatters) {
       try {
         return LocalTime.parse(input, fmt);
@@ -118,7 +121,7 @@ static LocalTime parseTime(String input) {
   }
 
   static LocalDate parseDate(String input) {
-    List<DateTimeFormatter> dateFormatters = ImmutableList.of(DateTimeFormatter.ISO_DATE);
+    List<DateTimeFormatter> dateFormatters = ImmutableList.of(STRICT_DATE_FORMATTER);
     for (DateTimeFormatter fmt : dateFormatters) {
       try {
         return LocalDate.parse(input, fmt);

core/src/main/java/org/opensearch/sql/utils/DateTimeFormatters.java

@@ -129,6 +129,20 @@ public class DateTimeFormatters {
           .toFormatter(Locale.ROOT)
           .withResolverStyle(ResolverStyle.STRICT);
 
+  public static final DateTimeFormatter STRICT_DATE_FORMATTER =
+      new DateTimeFormatterBuilder()
+          .appendPattern("[uuuu-MM-dd]")
+          .toFormatter(Locale.ROOT)
+          .withResolverStyle(ResolverStyle.STRICT);
+
+  public static final DateTimeFormatter STRICT_TIME_FORMATTER =
+      new DateTimeFormatterBuilder()
+          .appendPattern("[HH:mm:ss][HH:mm]")
+          .appendFraction(
+              ChronoField.NANO_OF_SECOND, MIN_FRACTION_SECONDS, MAX_FRACTION_SECONDS, true)
+          .toFormatter(Locale.ROOT)
+          .withResolverStyle(ResolverStyle.STRICT);
+
   // MDD
   public static final DateTimeFormatter DATE_FORMATTER_SINGLE_DIGIT_MONTH =
       new DateTimeFormatterBuilder()

integ-test/src/test/java/org/opensearch/sql/sql/DateTimeFunctionIT.java

@@ -1471,8 +1471,9 @@ public void testBracketFails() {
     assertThrows(ResponseException.class, () -> executeQuery("select {t '2020-09-16'}"));
     assertThrows(ResponseException.class, () -> executeQuery("select {date '17:30:00'}"));
     assertThrows(ResponseException.class, () -> executeQuery("select {d '17:30:00'}"));
-    assertThrows(ResponseException.class, () -> executeQuery("select {timestamp '2020-09-16'}"));
-    assertThrows(ResponseException.class, () -> executeQuery("select {ts '2020-09-16'}"));
+    // The following test case is removed because they will be parsed to proper timestamps
+    // assertThrows(ResponseException.class, () -> executeQuery("select {timestamp '2020-09-16'}"));
+    // assertThrows(ResponseException.class, () -> executeQuery("select {ts '2020-09-16'}"));
     assertThrows(ResponseException.class, () -> executeQuery("select {timestamp '17:30:00'}"));
     assertThrows(ResponseException.class, () -> executeQuery("select {ts '17:30:00'}"));
   }