Revert "add date and time support"

core/src/main/java/com/amazon/opendistroforelasticsearch/sql/analysis/ExpressionAnalyzer.java

@@ -78,8 +78,7 @@ public Expression visitEqualTo(EqualTo node, AnalysisContext context) {
 
   @Override
   public Expression visitLiteral(Literal node, AnalysisContext context) {
-    return DSL
-        .literal(ExprValueUtils.fromObjectValue(node.getValue(), node.getType().getCoreType()));
+    return DSL.literal(ExprValueUtils.fromObjectValue(node.getValue()));
   }
 
   @Override

core/src/main/java/com/amazon/opendistroforelasticsearch/sql/ast/dsl/AstDSL.java

@@ -123,18 +123,6 @@ public static Literal intLiteral(Integer value) {
     return literal(value, DataType.INTEGER);
   }
 
-  public static Literal dateLiteral(String value) {
-    return literal(value, DataType.DATE);
-  }
-
-  public static Literal timeLiteral(String value) {
-    return literal(value, DataType.TIME);
-  }
-
-  public static Literal timestampLiteral(String value) {
-    return literal(value, DataType.TIMESTAMP);
-  }
-
   public static Literal doubleLiteral(Double value) {
     return literal(value, DataType.DOUBLE);
   }

core/src/main/java/com/amazon/opendistroforelasticsearch/sql/ast/expression/DataType.java

@@ -15,28 +15,12 @@
 
 package com.amazon.opendistroforelasticsearch.sql.ast.expression;
 
-import com.amazon.opendistroforelasticsearch.sql.data.type.ExprCoreType;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-/**
- * The DataType defintion in AST.
- * Question, could we use {@link ExprCoreType} directly in AST?
- */
-@RequiredArgsConstructor
 public enum DataType {
-  TYPE_ERROR(ExprCoreType.UNKNOWN),
-  NULL(ExprCoreType.UNKNOWN),
-
-  INTEGER(ExprCoreType.INTEGER),
-  DOUBLE(ExprCoreType.DOUBLE),
-  STRING(ExprCoreType.STRING),
-  BOOLEAN(ExprCoreType.BOOLEAN),
-
-  DATE(ExprCoreType.DATE),
-  TIME(ExprCoreType.TIME),
-  TIMESTAMP(ExprCoreType.TIMESTAMP);
+  TYPE_ERROR,
+  NULL,
 
-  @Getter
-  private final ExprCoreType coreType;
+  INTEGER,
+  DOUBLE,
+  STRING,
+  BOOLEAN
 }

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

@@ -23,7 +23,6 @@
 import com.amazon.opendistroforelasticsearch.sql.data.type.ExprCoreType;
 import com.amazon.opendistroforelasticsearch.sql.exception.ExpressionEvaluationException;
 import com.google.common.annotations.VisibleForTesting;
-import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -118,22 +117,6 @@ public static ExprValue fromObjectValue(Object o) {
     }
   }
 
-  /**
-   * Construct ExprValue from Object with ExprCoreType.
-   */
-  public static ExprValue fromObjectValue(Object o, ExprCoreType type) {
-    switch (type) {
-      case TIMESTAMP:
-        return new ExprTimestampValue((String)o);
-      case DATE:
-        return new ExprDateValue((String)o);
-      case TIME:
-        return new ExprTimeValue((String)o);
-      default:
-        return fromObjectValue(o);
-    }
-  }
-
   public static Integer getIntegerValue(ExprValue exprValue) {
     return getNumberValue(exprValue).intValue();
   }
@@ -166,19 +149,6 @@ public static Boolean getBooleanValue(ExprValue exprValue) {
     return convert(exprValue, BOOLEAN);
   }
 
-  /**
-   * Get {@link ZonedDateTime} from ExprValue of Date type.
-   */
-  public static ZonedDateTime getDateValue(ExprValue exprValue) {
-    if (ExprCoreType.DATE == exprValue.type()) {
-      return ((ExprDateValue) exprValue).getDate();
-    } else {
-      throw new ExpressionEvaluationException(
-          String.format("invalid to convert expression with type:%s to type:%s", exprValue.type(),
-              ExprCoreType.DATE));
-    }
-  }
-
   /**
    * Get Number Value from {@link ExprValue}.
    */

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

@@ -81,11 +81,6 @@ public FunctionExpression multiply(Expression... expressions) {
         repository.compile(BuiltinFunctionName.MULTIPLY.getName(), Arrays.asList(expressions));
   }
 
-  public FunctionExpression dayofmonth(Expression... expressions) {
-    return (FunctionExpression)
-        repository.compile(BuiltinFunctionName.DAYOFMONTH.getName(), Arrays.asList(expressions));
-  }
-
   public FunctionExpression divide(Expression... expressions) {
     return (FunctionExpression)
         repository.compile(BuiltinFunctionName.DIVIDE.getName(), Arrays.asList(expressions));

core/src/main/java/com/amazon/opendistroforelasticsearch/sql/expression/config/ExpressionConfig.java

@@ -17,7 +17,6 @@
 
 import com.amazon.opendistroforelasticsearch.sql.expression.DSL;
 import com.amazon.opendistroforelasticsearch.sql.expression.aggregation.AggregatorFunction;
-import com.amazon.opendistroforelasticsearch.sql.expression.datetime.DateTimeFunction;
 import com.amazon.opendistroforelasticsearch.sql.expression.function.BuiltinFunctionRepository;
 import com.amazon.opendistroforelasticsearch.sql.expression.operator.arthmetic.ArithmeticFunction;
 import com.amazon.opendistroforelasticsearch.sql.expression.operator.arthmetic.UnaryFunction;
@@ -44,7 +43,6 @@ public BuiltinFunctionRepository functionRepository() {
     UnaryFunction.register(builtinFunctionRepository);
     UnaryPredicateOperator.register(builtinFunctionRepository);
     AggregatorFunction.register(builtinFunctionRepository);
-    DateTimeFunction.register(builtinFunctionRepository);
     return builtinFunctionRepository;
   }