Merge branch 'release-0.293-clp-connector' into xwei/ensure-ts-nanoseconds-part2

Author: anlowee

presto-clp/src/main/java/com/facebook/presto/plugin/clp/optimization/ClpFilterToKqlConverter.java

@@ -57,6 +57,8 @@
 import static com.facebook.presto.common.type.IntegerType.INTEGER;
 import static com.facebook.presto.common.type.RealType.REAL;
 import static com.facebook.presto.common.type.SmallintType.SMALLINT;
+import static com.facebook.presto.common.type.TimestampType.TIMESTAMP;
+import static com.facebook.presto.common.type.TimestampType.TIMESTAMP_MICROSECONDS;
 import static com.facebook.presto.common.type.TinyintType.TINYINT;
 import static com.facebook.presto.plugin.clp.ClpErrorCode.CLP_PUSHDOWN_UNSUPPORTED_EXPRESSION;
 import static com.facebook.presto.spi.relation.SpecialFormExpression.Form.AND;
@@ -486,7 +488,7 @@ private Optional<ClpExpression> tryInterpretSubstringEquality(
             RowExpression possibleSubstring,
             RowExpression possibleLiteral)
     {
-        if (!operator.equals(EQUAL)) {
+        if (!operator.equals(EQUAL) && !operator.equals(NOT_EQUAL)) {
             return Optional.empty();
         }
 
@@ -501,7 +503,7 @@ private Optional<ClpExpression> tryInterpretSubstringEquality(
         }
 
         String targetString = getLiteralString((ConstantExpression) possibleLiteral);
-        return interpretSubstringEquality(maybeSubstringCall.get(), targetString);
+        return interpretSubstringEquality(maybeSubstringCall.get(), targetString, operator.equals(EQUAL));
     }
 
     /**
@@ -552,10 +554,15 @@ private Optional<SubstrInfo> parseSubstringCall(CallExpression callExpression)
      *
      * @param info parsed SUBSTR call info
      * @param targetString the literal string being compared to
+     * @param isEqual whether the operator is EQUAL or not
      * @return an Optional containing either a ClpExpression with the equivalent KQL query
      */
-    private Optional<ClpExpression> interpretSubstringEquality(SubstrInfo info, String targetString)
+    private Optional<ClpExpression> interpretSubstringEquality(SubstrInfo info, String targetString, boolean isEqual)
     {
+        StringBuilder result = new StringBuilder();
+        if (!isEqual) {
+            result.append("NOT ");
+        }
         if (info.lengthExpression != null) {
             Optional<Integer> maybeStart = parseIntValue(info.startExpression);
             Optional<Integer> maybeLen = parseLengthLiteral(info.lengthExpression, targetString);
@@ -564,7 +571,6 @@ private Optional<ClpExpression> interpretSubstringEquality(SubstrInfo info, Stri
                 int start = maybeStart.get();
                 int len = maybeLen.get();
                 if (start > 0 && len == targetString.length()) {
-                    StringBuilder result = new StringBuilder();
                     result.append(info.variableName).append(": \"");
                     for (int i = 1; i < start; i++) {
                         result.append("?");
@@ -579,7 +585,6 @@ private Optional<ClpExpression> interpretSubstringEquality(SubstrInfo info, Stri
             if (maybeStart.isPresent()) {
                 int start = maybeStart.get();
                 if (start > 0) {
-                    StringBuilder result = new StringBuilder();
                     result.append(info.variableName).append(": \"");
                     for (int i = 1; i < start; i++) {
                         result.append("?");
@@ -588,7 +593,8 @@ private Optional<ClpExpression> interpretSubstringEquality(SubstrInfo info, Stri
                     return Optional.of(new ClpExpression(result.toString()));
                 }
                 if (start == -targetString.length()) {
-                    return Optional.of(new ClpExpression(format("%s: \"*%s\"", info.variableName, targetString)));
+                    result.append(format("%s: \"*%s\"", info.variableName, targetString));
+                    return Optional.of(new ClpExpression(result.toString()));
                 }
             }
         }
@@ -914,6 +920,8 @@ public static boolean isClpCompatibleNumericType(Type type)
                 || type.equals(TINYINT)
                 || type.equals(DOUBLE)
                 || type.equals(REAL)
+                || type.equals(TIMESTAMP)
+                || type.equals(TIMESTAMP_MICROSECONDS)
                 || type instanceof DecimalType;
     }