address review comment

kiszk · kiszk · commit 94dfde25a395 · 2017-11-13T15:45:09.000Z
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Cast.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Cast.scala
@@ -1015,9 +1015,7 @@ case class Cast(child: Expression, dataType: DataType, timeZoneId: Option[String
     }
     val rowClass = classOf[GenericInternalRow].getName
     val result = ctx.freshName("result")
-    ctx.addMutableState(s"$rowClass", result, "")
     val tmpRow = ctx.freshName("tmpRow")
-    ctx.addMutableState("InternalRow", tmpRow, "")
 
     val fieldsEvalCode = fieldsCasts.zipWithIndex.map { case (cast, i) =>
       val fromFieldPrim = ctx.freshName("ffp")
@@ -1042,12 +1040,17 @@ case class Cast(child: Expression, dataType: DataType, timeZoneId: Option[String
         }
        """
     }
-    val fieldsEvalCodes = ctx.splitExpressions(ctx.INPUT_ROW, fieldsEvalCode)
+    val fieldsEvalCodes = if (ctx.INPUT_ROW != null && ctx.currentVars == null) {
+      ctx.splitExpressions(fieldsEvalCode, "castStruct",
+        ("InternalRow", ctx.INPUT_ROW) :: (rowClass, result) :: ("InternalRow", tmpRow) :: Nil)
+    } else {
+      fieldsEvalCode.mkString("\n")
+    }
 
     (c, evPrim, evNull) =>
       s"""
-        $result = new $rowClass(${fieldsCasts.length});
-        $tmpRow = $c;
+        $rowClass $result = new $rowClass(${fieldsCasts.length});
+        InternalRow $tmpRow = $c;
         $fieldsEvalCodes
         $evPrim = $result;
       """
