[FLINK-16181][table-planner-blink] Fix IfCallGen throw NPE when opera…

…nd's resultTerm is null This closes apache#11161
jonchase · Jul 14, 2020 · d677f02 · d677f02
1 parent 07e43c9
commit d677f02
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/...planner-blink/src/main/scala/org/apache/flink/table/planner/codegen/calls/IfCallGen.scala b/...planner-blink/src/main/scala/org/apache/flink/table/planner/codegen/calls/IfCallGen.scala
@@ -18,7 +18,7 @@
 
 package org.apache.flink.table.planner.codegen.calls
 
-import org.apache.flink.table.planner.codegen.CodeGenUtils.primitiveTypeTermForType
+import org.apache.flink.table.planner.codegen.CodeGenUtils.{primitiveDefaultValue, primitiveTypeTermForType}
 import org.apache.flink.table.planner.codegen.{CodeGenUtils, CodeGeneratorContext, GeneratedExpression}
 import org.apache.flink.table.types.logical.LogicalType
 
@@ -44,20 +44,26 @@ class IfCallGen() extends CallGenerator {
     }
 
     val resultTypeTerm = primitiveTypeTermForType(returnType)
+    val resultDefault = primitiveDefaultValue(returnType)
     val Seq(resultTerm, nullTerm) = ctx.addReusableLocalVariables(
       (resultTypeTerm, "result"),
       ("boolean", "isNull"))
 
     val resultCode =
       s"""
          |${operands.head.code}
+         |$resultTerm = $resultDefault;
          |if (${operands.head.resultTerm}) {
          |  ${operands(1).code}
-         |  $resultTerm = $castedResultTerm1;
+         |  if (!${operands(1).nullTerm}) {
+         |    $resultTerm = $castedResultTerm1;
+         |  }
          |  $nullTerm = ${operands(1).nullTerm};
          |} else {
          |  ${operands(2).code}
-         |  $resultTerm = $castedResultTerm2;
+         |  if (!${operands(2).nullTerm}) {
+         |    $resultTerm = $castedResultTerm2;
+         |  }
          |  $nullTerm = ${operands(2).nullTerm};
          |}
        """.stripMargin

diff --git a/...blink/src/test/scala/org/apache/flink/table/planner/expressions/ScalarOperatorsTest.scala b/...blink/src/test/scala/org/apache/flink/table/planner/expressions/ScalarOperatorsTest.scala
@@ -124,5 +124,6 @@ class ScalarOperatorsTest extends ScalarOperatorsTestBase {
     testSqlApi("CASE 1 WHEN 1 THEN true WHEN 2 THEN false ELSE NULL END", "true")
 
     testSqlApi("CASE WHEN f2 = 1 THEN CAST('' as INT) ELSE 0 END", "null")
+    testSqlApi("IF(true, CAST('non-numeric' AS BIGINT), 0)", "null")
   }
 }