address comment

Author: cloud-fan

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Expression.scala

@@ -118,26 +118,21 @@ abstract class Expression extends TreeNode[Expression] {
           ""
         }
 
-        val setValue = {
-          val globalValue = ctx.freshName("globalValue")
-          ctx.addMutableState(
-            ctx.javaType(dataType), globalValue, s"$globalValue = ${ctx.defaultValue(dataType)};")
-          val localValue = ve.value
-          ve.value = globalValue
-          s"$globalValue = $localValue;"
-        }
+        val javaType = ctx.javaType(dataType)
+        val newValue = ctx.freshName("value")
 
         val funcName = ctx.freshName(nodeName)
         val funcFullName = ctx.addNewFunction(funcName,
           s"""
-             |private void $funcName(InternalRow ${ctx.INPUT_ROW}) {
+             |private $javaType $funcName(InternalRow ${ctx.INPUT_ROW}) {
              |  ${ve.code.trim}
-             |  $setValue
              |  $setIsNull
+             |  return ${ve.value};
              |}
            """.stripMargin)
 
-        ve.code = s"$funcFullName(${ctx.INPUT_ROW});"
+        ve.value = newValue
+        ve.code = s"$javaType $newValue = $funcFullName(${ctx.INPUT_ROW});"
       }
 
       if (ve.code.nonEmpty) {

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/CodeGenerationSuite.scala

@@ -97,7 +97,7 @@ class CodeGenerationSuite extends SparkFunSuite with ExpressionEvalHelper {
     assert(actual(0) == cases)
   }
 
-  test("SPARK-18091: split large if expressions into blocks due to JVM code size limit") {
+  test("SPARK-22543: split large if expressions into blocks due to JVM code size limit") {
     var strExpr: Expression = Literal("abc")
     for (_ <- 1 to 150) {
       strExpr = Decode(Encode(strExpr, "utf-8"), "utf-8")
@@ -342,7 +342,7 @@ class CodeGenerationSuite extends SparkFunSuite with ExpressionEvalHelper {
     projection(row)
   }
 
-  test("SPARK-21720: split large predications into blocks due to JVM code size limit") {
+  test("SPARK-22543: split large predicates into blocks due to JVM code size limit") {
     val length = 600
 
     val input = new GenericInternalRow(length)