Github user rxin commented on a diff in the pull request:
https://github.com/apache/spark/pull/418#discussion_r11936766
--- Diff:
sql/core/src/main/scala/org/apache/spark/sql/execution/SparkStrategies.scala ---
@@ -28,51 +28,14 @@ import org.apache.spark.sql.parquet._
abstract class SparkStrategies extends QueryPlanner[SparkPlan] {
self: SQLContext#SparkPlanner =>
- object HashJoin extends Strategy {
+ object HashJoin extends Strategy with PredicateHelper {
def apply(plan: LogicalPlan): Seq[SparkPlan] = plan match {
- case FilteredOperation(predicates, logical.Join(left, right, Inner,
condition)) =>
- logger.debug(s"Considering join: ${predicates ++ condition}")
- // Find equi-join predicates that can be evaluated before the
join, and thus can be used
- // as join keys. Note we can only mix in the conditions with other
predicates because the
- // match above ensures that this is and Inner join.
- val (joinPredicates, otherPredicates) = (predicates ++
condition).partition {
- case Equals(l, r) if (canEvaluate(l, left) && canEvaluate(r,
right)) ||
- (canEvaluate(l, right) && canEvaluate(r,
left)) => true
- case _ => false
- }
-
- val joinKeys = joinPredicates.map {
- case Equals(l,r) if canEvaluate(l, left) && canEvaluate(r,
right) => (l, r)
- case Equals(l,r) if canEvaluate(l, right) && canEvaluate(r,
left) => (r, l)
- }
-
- // Do not consider this strategy if there are no join keys.
- if (joinKeys.nonEmpty) {
- val leftKeys = joinKeys.map(_._1)
- val rightKeys = joinKeys.map(_._2)
-
- val joinOp = execution.HashJoin(
- leftKeys, rightKeys, BuildRight, planLater(left),
planLater(right))
-
- // Make sure other conditions are met if present.
- if (otherPredicates.nonEmpty) {
-
execution.Filter(combineConjunctivePredicates(otherPredicates), joinOp) :: Nil
- } else {
- joinOp :: Nil
- }
- } else {
- logger.debug(s"Avoiding spark join with no join keys.")
- Nil
- }
+ case HashFilteredJoin(Inner, leftKeys, rightKeys, condition, left,
right) =>
--- End diff --
maybe add some comment explaining what's happening here...
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
