From ec8061b7f36b87c883af111438ac9ff0304050d7 Mon Sep 17 00:00:00 2001 From: Daoyuan Wang Date: Tue, 14 Apr 2015 22:20:23 -0700 Subject: [PATCH] minor change --- .../main/scala/org/apache/spark/sql/execution/Exchange.scala | 1 - .../org/apache/spark/sql/execution/joins/SortMergeJoin.scala | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/Exchange.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/Exchange.scala index a56f6a100a515..85587befb8758 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/Exchange.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/Exchange.scala @@ -188,7 +188,6 @@ private[sql] case class EnsureRequirements(sqlContext: SQLContext) extends Rule[ case (required, child) => required.nonEmpty && required != child } - // True iff outputPartitionings of children are compatible with each other. // It is possible that every child satisfies its required data distribution // but two children have incompatible outputPartitionings. For example, diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/SortMergeJoin.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/SortMergeJoin.scala index e2393ba3bb8f6..b5123668ba11e 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/SortMergeJoin.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/SortMergeJoin.scala @@ -47,8 +47,7 @@ case class SortMergeJoin( ClusteredDistribution(leftKeys) :: ClusteredDistribution(rightKeys) :: Nil // this is to manually construct an ordering that can be used to compare keys from both sides - private val keyOrdering: RowOrdering = - RowOrdering.forSchema(leftKeys.map(_.dataType)) + private val keyOrdering: RowOrdering = RowOrdering.forSchema(leftKeys.map(_.dataType)) override def outputOrdering: Seq[SortOrder] = requiredOrders(leftKeys)