From 83a3c8af72237018fb9b746e3e1a2707dfcad004 Mon Sep 17 00:00:00 2001 From: Daoyuan Date: Wed, 21 May 2014 16:48:15 +0800 Subject: [PATCH] scala style fix --- .../org/apache/spark/sql/catalyst/plans/joinTypes.scala | 2 +- .../org/apache/spark/sql/execution/SparkStrategies.scala | 6 +++--- .../main/scala/org/apache/spark/sql/execution/joins.scala | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/joinTypes.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/joinTypes.scala index 593be6ca5e40c..613f4bb09daf5 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/joinTypes.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/joinTypes.scala @@ -22,4 +22,4 @@ case object Inner extends JoinType case object LeftOuter extends JoinType case object RightOuter extends JoinType case object FullOuter extends JoinType -case object LeftSemi extends JoinType \ No newline at end of file +case object LeftSemi extends JoinType 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 7a93d2b6ee661..1ed2ea709d361 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 @@ -33,13 +33,13 @@ private[sql] abstract class SparkStrategies extends QueryPlanner[SparkPlan] { // Find leftsemi joins where at least some predicates can be evaluated by matching hash keys // using the HashFilteredJoin pattern. case HashFilteredJoin(LeftSemi, leftKeys, rightKeys, condition, left, right) => - val semiJoin = - execution.LeftSemiJoinHash(leftKeys, rightKeys, BuildRight, planLater(left), planLater(right)) + val semiJoin = execution.LeftSemiJoinHash( + leftKeys, rightKeys, BuildRight, planLater(left), planLater(right)) condition.map(Filter(_, semiJoin)).getOrElse(semiJoin) :: Nil // no predicate can be evaluated by matching hash keys case logical.Join(left, right, LeftSemi, condition) => execution.LeftSemiJoinBNL( - planLater(left), planLater(right), LeftSemi, condition)(sparkContext) :: Nil + planLater(left), planLater(right), condition)(sparkContext) :: Nil case _ => Nil } } diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/joins.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/joins.scala index 302250a1a6cc0..a503875418674 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/joins.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/joins.scala @@ -235,7 +235,7 @@ case class LeftSemiJoinHash( */ @DeveloperApi case class LeftSemiJoinBNL( - streamed: SparkPlan, broadcast: SparkPlan, joinType: JoinType, condition: Option[Expression]) + streamed: SparkPlan, broadcast: SparkPlan, condition: Option[Expression]) (@transient sc: SparkContext) extends BinaryNode { // TODO: Override requiredChildDistribution.