From 43d38a6ebb6d46b09e327e493f5a218ac1d1093a Mon Sep 17 00:00:00 2001 From: Zongheng Yang Date: Wed, 9 Jul 2014 23:39:16 -0700 Subject: [PATCH] Revert optimization for BroadcastNestedLoopJoin (this fixes tests). --- .../org/apache/spark/sql/execution/SparkStrategies.scala | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkStrategies.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkStrategies.scala index cf689a80a6e67..0b78432ab2017 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkStrategies.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkStrategies.scala @@ -152,11 +152,8 @@ private[sql] abstract class SparkStrategies extends QueryPlanner[SparkPlan] { object BroadcastNestedLoopJoin extends Strategy { def apply(plan: LogicalPlan): Seq[SparkPlan] = plan match { case logical.Join(left, right, joinType, condition) => - val (streamed, broadcast) = - if (right.statistics.sizeInBytes <= left.statistics.sizeInBytes) (left, right) - else (right, left) execution.BroadcastNestedLoopJoin( - planLater(streamed), planLater(broadcast), joinType, condition)(sqlContext) :: Nil + planLater(left), planLater(right), joinType, condition)(sqlContext) :: Nil case _ => Nil } }