Address comment.

viirya · viirya · commit 7462a55a4256 · 2017-11-24T00:00:13.000Z
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateOrdering.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateOrdering.scala
@@ -149,16 +149,14 @@ object GenerateOrdering extends CodeGenerator[Seq[SortOrder], Ordering[InternalR
           """
         }.mkString
       })
+    ctx.currentVars = oldCurrentVars
+    ctx.INPUT_ROW = oldInputRow
     // make sure INPUT_ROW is declared even if splitExpressions
     // returns an inlined block
-    val finalCode = s"""
-       |InternalRow ${ctx.INPUT_ROW} = null;
+    s"""
+       |InternalRow $inputRow = null;
        |$code
      """.stripMargin
-    // Restore original currentVars and INPUT_ROW.
-    ctx.currentVars = oldCurrentVars
-    ctx.INPUT_ROW = oldInputRow
-    finalCode
   }
 
   protected def create(ordering: Seq[SortOrder]): BaseOrdering = {
