Fix tests by binding attributes.

apache · Jul 7, 2015 · f27be09 · f27be09
1 parent 0a79d39
commit f27be09
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/basicOperators.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/basicOperators.scala
@@ -270,9 +270,10 @@ case class UnsafeExternalSort(
     assert(codegenEnabled, "UnsafeExternalSort requires code generation to be enabled")
     def doSort(iterator: Iterator[InternalRow]): Iterator[InternalRow] = {
       val ordering = newOrdering(sortOrder, child.output)
-      val prefixComparator = SortPrefixUtils.getPrefixComparator(sortOrder.head)
+      val boundSortExpression = BindReferences.bindReference(sortOrder.head, child.output)
+      val prefixComparator = SortPrefixUtils.getPrefixComparator(boundSortExpression)
       val prefixComputer = {
-        val prefixComputer = SortPrefixUtils.getPrefixComputer(sortOrder.head)
+        val prefixComputer = SortPrefixUtils.getPrefixComputer(boundSortExpression)
         new UnsafeExternalRowSorter.PrefixComputer {
           override def computePrefix(row: InternalRow): Long = prefixComputer(row)
         }

diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/UnsafeExternalSortSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/UnsafeExternalSortSuite.scala
@@ -26,7 +26,6 @@ import org.apache.spark.sql.catalyst.dsl.expressions._
 import org.apache.spark.sql.test.TestSQLContext
 import org.apache.spark.sql.types._
 
-
 class UnsafeExternalSortSuite extends SparkPlanTest with BeforeAndAfterAll {
 
   override def beforeAll(): Unit = {