Support date and time functions: date_add, date_sub, day, dayname, dayofweek, dayofyear, from_days, hour, microsecond, minute, month, monthname, quarter, second, subdate, time_to_sec, to_days

core/src/main/java/com/amazon/opendistroforelasticsearch/sql/data/model/ExprDatetimeValue.java

@@ -27,12 +27,13 @@
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
+import java.time.temporal.ChronoUnit;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
 public class ExprDatetimeValue extends AbstractExprValue {
   private static final DateTimeFormatter formatter = DateTimeFormatter
-      .ofPattern("yyyy-MM-dd HH:mm:ss");
+      .ofPattern("yyyy-MM-dd HH:mm:ss[.SSSSSS]");
   private final LocalDateTime datetime;
 
   /**
@@ -43,7 +44,7 @@ public ExprDatetimeValue(String datetime) {
       this.datetime = LocalDateTime.parse(datetime, formatter);
     } catch (DateTimeParseException e) {
       throw new SemanticCheckException(String.format("datetime:%s in unsupported format, please "
-          + "use yyyy-MM-dd HH:mm:ss", datetime));
+          + "use yyyy-MM-dd HH:mm:ss[.SSSSSS]", datetime));
     }
   }
 
@@ -80,7 +81,8 @@ public boolean equal(ExprValue other) {
   @Override
   public String value() {
     return String.format("%s %s", DateTimeFormatter.ISO_DATE.format(datetime),
-        DateTimeFormatter.ISO_TIME.format(datetime));
+        DateTimeFormatter.ISO_TIME.format((datetime.getNano() == 0)
+            ? datetime.truncatedTo(ChronoUnit.SECONDS) : datetime));
   }
 
   @Override

core/src/main/java/com/amazon/opendistroforelasticsearch/sql/data/model/ExprStringValue.java

@@ -17,6 +17,11 @@
 
 import com.amazon.opendistroforelasticsearch.sql.data.type.ExprCoreType;
 import com.amazon.opendistroforelasticsearch.sql.data.type.ExprType;
+import com.amazon.opendistroforelasticsearch.sql.exception.SemanticCheckException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeParseException;
 import java.util.Objects;
 import lombok.EqualsAndHashCode;
 import lombok.RequiredArgsConstructor;
@@ -43,6 +48,40 @@ public String stringValue() {
     return value;
   }
 
+  @Override
+  public LocalDateTime datetimeValue() {
+    try {
+      return new ExprDatetimeValue(value).datetimeValue();
+    } catch (SemanticCheckException e) {
+      try {
+        return new ExprDatetimeValue(
+            LocalDateTime.of(new ExprDateValue(value).dateValue(), LocalTime.of(0, 0, 0)))
+            .datetimeValue();
+      } catch (SemanticCheckException exception) {
+        throw new SemanticCheckException(String.format("datetime:%s in unsupported format, please "
+            + "use yyyy-MM-dd HH:mm:ss[.SSSSSS]", value));
+      }
+    }
+  }
+
+  @Override
+  public LocalDate dateValue() {
+    try {
+      return new ExprDatetimeValue(value).dateValue();
+    } catch (SemanticCheckException e) {
+      return new ExprDateValue(value).dateValue();
+    }
+  }
+
+  @Override
+  public LocalTime timeValue() {
+    try {
+      return new ExprDatetimeValue(value).timeValue();
+    } catch (SemanticCheckException e) {
+      return new ExprTimeValue(value).timeValue();
+    }
+  }
+
   @Override
   public String toString() {
     return String.format("\"%s\"", value);

core/src/main/java/com/amazon/opendistroforelasticsearch/sql/data/model/ExprTimestampValue.java

@@ -44,6 +44,8 @@ public class ExprTimestampValue extends AbstractExprValue {
    * todo. only support timestamp in format yyyy-MM-dd HH:mm:ss.
    */
   private static final DateTimeFormatter FORMATTER = DateTimeFormatter
+      .ofPattern("yyyy-MM-dd HH:mm:ss[.SSSSSS]");
+  private static final DateTimeFormatter FORMATTER_WITNOUT_NANO = DateTimeFormatter
       .ofPattern("yyyy-MM-dd HH:mm:ss");
   private final Instant timestamp;
 
@@ -55,14 +57,16 @@ public ExprTimestampValue(String timestamp) {
       this.timestamp = LocalDateTime.parse(timestamp, FORMATTER).atZone(ZONE).toInstant();
     } catch (DateTimeParseException e) {
       throw new SemanticCheckException(String.format("timestamp:%s in unsupported format, please "
-          + "use yyyy-MM-dd HH:mm:ss", timestamp));
+          + "use yyyy-MM-dd HH:mm:ss[.SSSSSS]", timestamp));
     }
 
   }
 
   @Override
   public String value() {
-    return FORMATTER.withZone(ZONE).format(timestamp.truncatedTo(ChronoUnit.SECONDS));
+    return timestamp.getNano() == 0 ? FORMATTER_WITNOUT_NANO.withZone(ZONE)
+        .format(timestamp.truncatedTo(ChronoUnit.SECONDS))
+        : FORMATTER.withZone(ZONE).format(timestamp);
   }
 
   @Override

core/src/main/java/com/amazon/opendistroforelasticsearch/sql/expression/DSL.java

@@ -244,25 +244,97 @@ public FunctionExpression subtract(Expression... expressions) {
   public FunctionExpression multiply(Expression... expressions) {
     return function(BuiltinFunctionName.MULTIPLY, expressions);
   }
+
+  public FunctionExpression adddate(Expression... expressions) {
+    return function(BuiltinFunctionName.ADDDATE, expressions);
+  }
+
+  public FunctionExpression date(Expression... expressions) {
+    return function(BuiltinFunctionName.DATE, expressions);
+  }
+
+  public FunctionExpression date_add(Expression... expressions) {
+    return function(BuiltinFunctionName.DATE_ADD, expressions);
+  }
+
+  public FunctionExpression date_sub(Expression... expressions) {
+    return function(BuiltinFunctionName.DATE_SUB, expressions);
+  }
+
+  public FunctionExpression day(Expression... expressions) {
+    return function(BuiltinFunctionName.DAY, expressions);
+  }
+
+  public FunctionExpression dayname(Expression... expressions) {
+    return function(BuiltinFunctionName.DAYNAME, expressions);
+  }
 
   public FunctionExpression dayofmonth(Expression... expressions) {
     return function(BuiltinFunctionName.DAYOFMONTH, expressions);
   }
 
-  public FunctionExpression date(Expression... expressions) {
-    return function(BuiltinFunctionName.DATE, expressions);
+  public FunctionExpression dayofweek(Expression... expressions) {
+    return function(BuiltinFunctionName.DAYOFWEEK, expressions);
+  }
+
+  public FunctionExpression dayofyear(Expression... expressions) {
+    return function(BuiltinFunctionName.DAYOFYEAR, expressions);
+  }
+
+  public FunctionExpression from_days(Expression... expressions) {
+    return function(BuiltinFunctionName.FROM_DAYS, expressions);
+  }
+
+  public FunctionExpression hour(Expression... expressions) {
+    return function(BuiltinFunctionName.HOUR, expressions);
+  }
+
+  public FunctionExpression microsecond(Expression... expressions) {
+    return function(BuiltinFunctionName.MICROSECOND, expressions);
+  }
+
+  public FunctionExpression minute(Expression... expressions) {
+    return function(BuiltinFunctionName.MINUTE, expressions);
+  }
+
+  public FunctionExpression month(Expression... expressions) {
+    return function(BuiltinFunctionName.MONTH, expressions);
+  }
+
+  public FunctionExpression monthname(Expression... expressions) {
+    return function(BuiltinFunctionName.MONTHNAME, expressions);
+  }
+
+  public FunctionExpression quarter(Expression... expressions) {
+    return function(BuiltinFunctionName.QUARTER, expressions);
+  }
+
+  public FunctionExpression second(Expression... expressions) {
+    return function(BuiltinFunctionName.SECOND, expressions);
+  }
+
+  public FunctionExpression subdate(Expression... expressions) {
+    return function(BuiltinFunctionName.SUBDATE, expressions);
   }
 
   public FunctionExpression time(Expression... expressions) {
     return function(BuiltinFunctionName.TIME, expressions);
   }
 
+  public FunctionExpression time_to_sec(Expression... expressions) {
+    return function(BuiltinFunctionName.TIME_TO_SEC, expressions);
+  }
+
   public FunctionExpression timestamp(Expression... expressions) {
     return function(BuiltinFunctionName.TIMESTAMP, expressions);
   }
 
-  public FunctionExpression adddate(Expression... expressions) {
-    return function(BuiltinFunctionName.ADDDATE, expressions);
+  public FunctionExpression to_days(Expression... expressions) {
+    return function(BuiltinFunctionName.TO_DAYS, expressions);
+  }
+
+  public FunctionExpression year(Expression... expressions) {
+    return function(BuiltinFunctionName.YEAR, expressions);
   }
 
   public FunctionExpression divide(Expression... expressions) {