Address more comments

apache · Nov 5, 2016 · 33b5fd8 · 33b5fd8
1 parent 1ae9935
commit 33b5fd8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/...lyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeGenerator.scala b/...lyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeGenerator.scala
@@ -537,6 +537,7 @@ class CodegenContext {
       val funcCode: String =
         s"""
           public int $compareFunc(InternalRow a, InternalRow b) {
+            InternalRow i = null;
             $comparisons
             return 0;
           }

diff --git a/...t/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateOrdering.scala b/...t/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateOrdering.scala
@@ -127,10 +127,7 @@ object GenerateOrdering extends CodeGenerator[Seq[SortOrder], Ordering[InternalR
     val numberOfComparisonsThreshold = 40
 
     if (ordering.size <= numberOfComparisonsThreshold) {
-      s"""
-         |  InternalRow ${ctx.INPUT_ROW} = null;  // Holds current row being evaluated.
-         |  ${comparisons(ordering)}
-      """.stripMargin
+      comparisons(ordering)
     } else {
       val groupedOrderingItr = ordering.grouped(numberOfComparisonsThreshold)
       val funcNamePrefix = ctx.freshName("compare")
@@ -180,6 +177,7 @@ object GenerateOrdering extends CodeGenerator[Seq[SortOrder], Ordering[InternalR
         ${ctx.declareAddedFunctions()}
 
         public int compare(InternalRow a, InternalRow b) {
+          InternalRow ${ctx.INPUT_ROW} = null;  // Holds current row being evaluated.
           $comparisons
           return 0;
         }