fix: using deprecated calcite cast method

Signed-off-by: mbwhite <whitemat@uk.ibm.com>
substrait-io · Mar 15, 2024 · 9063134 · 9063134
1 parent f54ed40
commit 9063134
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 6 deletions.
diff --git a/core/src/main/java/io/substrait/expression/ExpressionCreator.java b/core/src/main/java/io/substrait/expression/ExpressionCreator.java
@@ -407,10 +407,6 @@ public static Expression.WindowFunctionInvocation windowFunction(
         .build();
   }
 
-  public static Expression cast(Type type, Expression expression) {
-    return cast(type, expression, Expression.FailureBehavior.UNSPECIFIED);
-  }
-
   public static Expression cast(
       Type type, Expression expression, Expression.FailureBehavior failureBehavior) {
     return Expression.Cast.builder()

diff --git a/isthmus/src/main/java/io/substrait/isthmus/expression/AggregateFunctionConverter.java b/isthmus/src/main/java/io/substrait/isthmus/expression/AggregateFunctionConverter.java
@@ -9,6 +9,7 @@
 import io.substrait.isthmus.AggregateFunctions;
 import io.substrait.isthmus.SubstraitRelVisitor;
 import io.substrait.isthmus.TypeConverter;
+import io.substrait.isthmus.expression.FunctionConverter.GenericCall;
 import io.substrait.type.Type;
 import java.util.Collections;
 import java.util.List;

diff --git a/isthmus/src/main/java/io/substrait/isthmus/expression/ExpressionRexConverter.java b/isthmus/src/main/java/io/substrait/isthmus/expression/ExpressionRexConverter.java
@@ -4,6 +4,7 @@
 import io.substrait.expression.AbstractExpressionVisitor;
 import io.substrait.expression.EnumArg;
 import io.substrait.expression.Expression;
+import io.substrait.expression.Expression.FailureBehavior;
 import io.substrait.expression.Expression.SingleOrList;
 import io.substrait.expression.Expression.Switch;
 import io.substrait.expression.FieldReference;
@@ -478,8 +479,10 @@ private String convert(FunctionArg a) {
 
   @Override
   public RexNode visit(Expression.Cast expr) throws RuntimeException {
+
+    var safeCast = expr.failureBehavior() == FailureBehavior.RETURN_NULL;
     return rexBuilder.makeAbstractCast(
-        typeConverter.toCalcite(typeFactory, expr.getType()), expr.input().accept(this));
+        typeConverter.toCalcite(typeFactory, expr.getType()), expr.input().accept(this), safeCast);
   }
 
   @Override

diff --git a/isthmus/src/main/java/io/substrait/isthmus/expression/FunctionConverter.java b/isthmus/src/main/java/io/substrait/isthmus/expression/FunctionConverter.java
@@ -484,6 +484,7 @@ private static List<Expression> coerceArguments(List<Expression> arguments, Type
   }
 
   private static Expression coerceArgument(Expression argument, Type type) {
+    System.out.println("From   " + argument);
     var typeMatches = isMatch(type, argument.getType());
     if (!typeMatches) {
       return ExpressionCreator.cast(type, argument, Expression.FailureBehavior.THROW_EXCEPTION);

diff --git a/isthmus/src/main/java/io/substrait/isthmus/expression/ScalarFunctionConverter.java b/isthmus/src/main/java/io/substrait/isthmus/expression/ScalarFunctionConverter.java
@@ -6,6 +6,7 @@
 import io.substrait.extension.SimpleExtension;
 import io.substrait.isthmus.CallConverter;
 import io.substrait.isthmus.TypeConverter;
+import io.substrait.isthmus.expression.FunctionConverter.GenericCall;
 import io.substrait.type.Type;
 import java.util.List;
 import java.util.Optional;

diff --git a/isthmus/src/main/java/io/substrait/isthmus/expression/WindowRelFunctionConverter.java b/isthmus/src/main/java/io/substrait/isthmus/expression/WindowRelFunctionConverter.java
@@ -9,6 +9,7 @@
 import io.substrait.expression.WindowBound;
 import io.substrait.extension.SimpleExtension;
 import io.substrait.isthmus.AggregateFunctions;
+import io.substrait.isthmus.expression.FunctionConverter.GenericCall;
 import io.substrait.relation.ConsistentPartitionWindow;
 import io.substrait.type.Type;
 import java.util.List;

diff --git a/isthmus/src/test/java/io/substrait/isthmus/ExpressionConvertabilityTest.java b/isthmus/src/test/java/io/substrait/isthmus/ExpressionConvertabilityTest.java
@@ -117,7 +117,7 @@ public void castFailureCondition() {
                         b.fieldReference(input, 0),
                         Expression.FailureBehavior.THROW_EXCEPTION),
                     ExpressionCreator.cast(
-                        R.I64, b.fieldReference(input, 0), Expression.FailureBehavior.RETURN_NULL)),
+                        R.I32, b.fieldReference(input, 0), Expression.FailureBehavior.RETURN_NULL)),
             b.remap(1, 2),
             b.namedScan(List.of("test"), List.of("col1"), List.of(R.STRING)));