Merge pull request #557 from mspruc/main

increase calcite version & fix deprecated method

Author: juripetersen

wayang-api/wayang-api-sql/pom.xml

@@ -26,22 +26,26 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <properties>
+        <calcite.version>1.39.0</calcite.version>       
+    </properties>
+    
     <artifactId>wayang-api-sql</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.apache.calcite</groupId>
             <artifactId>calcite-core</artifactId>
-            <version>1.32.0</version>
+            <version>${calcite.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.calcite</groupId>
             <artifactId>calcite-linq4j</artifactId>
-            <version>1.32.0</version>
+            <version>${calcite.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.calcite</groupId>
             <artifactId>calcite-file</artifactId>
-            <version>1.29.0</version>
+            <version>${calcite.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.wayang</groupId>

wayang-api/wayang-api-sql/src/main/java/org/apache/wayang/api/sql/calcite/converter/functions/FilterEvaluateCondition.java

@@ -78,7 +78,7 @@ public boolean eval(final Record record, final SqlKind kind, final RexNode leftO
 
             switch (kind) {
                 case LIKE:
-                    return SqlFunctions.like(field.toString(), rexLiteral.toString().replace("'", ""));
+                    return like(field.toString(), rexLiteral.toString().replace("'", ""));
                 case GREATER_THAN:
                     return isGreaterThan(field, rexLiteral);
                 case LESS_THAN:
@@ -127,6 +127,13 @@ public boolean eval(final Record record, final SqlKind kind, final RexNode leftO
         }
     }
 
+    private boolean like(final String s1, final String s2) {
+        final SqlFunctions.LikeFunction likeFunction = new SqlFunctions.LikeFunction();
+        final boolean isMatch = likeFunction.like(s1, s2);
+
+        return isMatch;
+    }
+
     private boolean isGreaterThan(final Object o, final RexLiteral rexLiteral) {
         // return rexLiteral.getValue().compareTo(o)< 0;
         return ((Comparable) o).compareTo(rexLiteral.getValueAs(o.getClass())) > 0;