Revert unneccesary changes. Minor comments update.

Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>
opensearch-project · Jan 13, 2023 · 3fd3dc7 · 3fd3dc7
1 parent 508f1f2
commit 3fd3dc7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 38 deletions.
diff --git a/core/src/main/java/org/opensearch/sql/data/type/ExprCoreType.java b/core/src/main/java/org/opensearch/sql/data/type/ExprCoreType.java
@@ -53,7 +53,6 @@ public enum ExprCoreType implements ExprType {
 
   /**
    * Date.
-   * Todo. compatible relationship.
    */
   DATE(STRING),
   TIME(STRING),

diff --git a/core/src/main/java/org/opensearch/sql/expression/DSL.java b/core/src/main/java/org/opensearch/sql/expression/DSL.java
@@ -536,52 +536,28 @@ public static FunctionExpression not(Expression... expressions) {
     return compile(FunctionProperties.None, BuiltinFunctionName.NOT, expressions);
   }
 
-  public static FunctionExpression equal(FunctionProperties fp, Expression... expressions) {
-    return compile(fp, BuiltinFunctionName.EQUAL, expressions);
-  }
-
   public static FunctionExpression equal(Expression... expressions) {
-    return equal(FunctionProperties.None, expressions);
-  }
-
-  public static FunctionExpression notequal(FunctionProperties fp, Expression... expressions) {
-    return compile(fp, BuiltinFunctionName.NOTEQUAL, expressions);
+    return compile(FunctionProperties.None, BuiltinFunctionName.EQUAL, expressions);
   }
 
   public static FunctionExpression notequal(Expression... expressions) {
-    return notequal(FunctionProperties.None, expressions);
-  }
-
-  public static FunctionExpression less(FunctionProperties fp, Expression... expressions) {
-    return compile(fp, BuiltinFunctionName.LESS, expressions);
+    return compile(FunctionProperties.None, BuiltinFunctionName.NOTEQUAL, expressions);
   }
 
   public static FunctionExpression less(Expression... expressions) {
-    return less(FunctionProperties.None, expressions);
-  }
-
-  public static FunctionExpression lte(FunctionProperties fp, Expression... expressions) {
-    return compile(fp, BuiltinFunctionName.LTE, expressions);
+    return compile(FunctionProperties.None, BuiltinFunctionName.LESS, expressions);
   }
 
   public static FunctionExpression lte(Expression... expressions) {
-    return lte(FunctionProperties.None, expressions);
-  }
-
-  public static FunctionExpression greater(FunctionProperties fp, Expression... expressions) {
-    return compile(fp, BuiltinFunctionName.GREATER, expressions);
+    return compile(FunctionProperties.None, BuiltinFunctionName.LTE, expressions);
   }
 
   public static FunctionExpression greater(Expression... expressions) {
-    return greater(FunctionProperties.None, expressions);
-  }
-
-  public static FunctionExpression gte(FunctionProperties fp, Expression... expressions) {
-    return compile(fp, BuiltinFunctionName.GTE, expressions);
+    return compile(FunctionProperties.None, BuiltinFunctionName.GREATER, expressions);
   }
 
   public static FunctionExpression gte(Expression... expressions) {
-    return gte(FunctionProperties.None, expressions);
+    return compile(FunctionProperties.None, BuiltinFunctionName.GTE, expressions);
   }
 
   public static FunctionExpression like(Expression... expressions) {

diff --git a/core/src/main/java/org/opensearch/sql/expression/operator/convert/TypeCastOperator.java b/core/src/main/java/org/opensearch/sql/expression/operator/convert/TypeCastOperator.java
@@ -178,6 +178,7 @@ private static DefaultFunctionResolver castToTime() {
     );
   }
 
+  // `DATE`/`TIME`/`DATETIME` -> `DATETIME`/TIMESTAMP` cast tested in BinaryPredicateOperatorTest
   private static DefaultFunctionResolver castToTimestamp() {
     return FunctionDSL.define(BuiltinFunctionName.CAST_TO_TIMESTAMP.getName(),
         impl(nullMissingHandling(

diff --git a/...st/java/org/opensearch/sql/expression/operator/predicate/BinaryPredicateOperatorTest.java b/...st/java/org/opensearch/sql/expression/operator/predicate/BinaryPredicateOperatorTest.java
@@ -412,7 +412,7 @@ public void test_null_xor_missing() {
   @ParameterizedTest(name = "equal({0}, {1})")
   @MethodSource("testEqualArguments")
   public void test_equal(ExprValue v1, ExprValue v2) {
-    FunctionExpression equal = DSL.equal(functionProperties, DSL.literal(v1), DSL.literal(v2));
+    FunctionExpression equal = DSL.equal(DSL.literal(v1), DSL.literal(v2));
     assertEquals(BOOLEAN, equal.type());
     if (v1.type() == v2.type()) {
       assertEquals(v1.value().equals(v2.value()),
@@ -485,8 +485,7 @@ public void test_null_equal_missing() {
   @ParameterizedTest(name = "equal({0}, {1})")
   @MethodSource({"testEqualArguments", "testNotEqualArguments"})
   public void test_notequal(ExprValue v1, ExprValue v2) {
-    FunctionExpression notequal = DSL.notequal(functionProperties,
-        DSL.literal(v1), DSL.literal(v2));
+    FunctionExpression notequal = DSL.notequal(DSL.literal(v1), DSL.literal(v2));
     assertEquals(BOOLEAN, notequal.type());
     if (v1.type() == v2.type()) {
       assertEquals(!v1.value().equals(v2.value()),
@@ -545,7 +544,7 @@ public void test_null_notequal_missing() {
   @ParameterizedTest(name = "less({0}, {1})")
   @MethodSource("testCompareValueArguments")
   public void test_less(ExprValue v1, ExprValue v2) {
-    FunctionExpression less = DSL.less(functionProperties, DSL.literal(v1), DSL.literal(v2));
+    FunctionExpression less = DSL.less(DSL.literal(v1), DSL.literal(v2));
     assertEquals(BOOLEAN, less.type());
     assertEquals(compare(functionProperties, v1, v2) < 0,
         ExprValueUtils.getBooleanValue(less.valueOf(valueEnv())));
@@ -602,7 +601,7 @@ public void test_null_less_missing() {
   @ParameterizedTest(name = "lte({0}, {1})")
   @MethodSource("testCompareValueArguments")
   public void test_lte(ExprValue v1, ExprValue v2) {
-    FunctionExpression lte = DSL.lte(functionProperties, DSL.literal(v1), DSL.literal(v2));
+    FunctionExpression lte = DSL.lte(DSL.literal(v1), DSL.literal(v2));
     assertEquals(BOOLEAN, lte.type());
     assertEquals(compare(functionProperties, v1, v2) <= 0,
         ExprValueUtils.getBooleanValue(lte.valueOf(valueEnv())));
@@ -659,7 +658,7 @@ public void test_null_lte_missing() {
   @ParameterizedTest(name = "greater({0}, {1})")
   @MethodSource("testCompareValueArguments")
   public void test_greater(ExprValue v1, ExprValue v2) {
-    FunctionExpression greater = DSL.greater(functionProperties, DSL.literal(v1), DSL.literal(v2));
+    FunctionExpression greater = DSL.greater(DSL.literal(v1), DSL.literal(v2));
     assertEquals(BOOLEAN, greater.type());
     assertEquals(compare(functionProperties, v1, v2) > 0,
         ExprValueUtils.getBooleanValue(greater.valueOf(valueEnv())));
@@ -716,7 +715,7 @@ public void test_null_greater_missing() {
   @ParameterizedTest(name = "gte({0}, {1})")
   @MethodSource("testCompareValueArguments")
   public void test_gte(ExprValue v1, ExprValue v2) {
-    FunctionExpression gte = DSL.gte(functionProperties, DSL.literal(v1), DSL.literal(v2));
+    FunctionExpression gte = DSL.gte(DSL.literal(v1), DSL.literal(v2));
     assertEquals(BOOLEAN, gte.type());
     assertEquals(compare(functionProperties, v1, v2) >= 0,
         ExprValueUtils.getBooleanValue(gte.valueOf(valueEnv())));
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,7 +53,6 @@ public enum ExprCoreType implements ExprType { @@
       /**
        * Date.
-       * Todo. compatible relationship.
        */
       DATE(STRING),
       TIME(STRING),
@@ Expand Down @@