Github user hvanhovell commented on a diff in the pull request: https://github.com/apache/spark/pull/13147#discussion_r65107682 --- Diff: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/planning/QueryPlanner.scala --- @@ -47,17 +55,34 @@ abstract class QueryPlanner[PhysicalPlan <: TreeNode[PhysicalPlan]] { /** A list of execution strategies that can be used by the planner */ def strategies: Seq[GenericStrategy[PhysicalPlan]] - /** - * Returns a placeholder for a physical plan that executes `plan`. This placeholder will be - * filled in automatically by the QueryPlanner using the other execution strategies that are - * available. - */ - protected def planLater(plan: LogicalPlan): PhysicalPlan = this.plan(plan).next() - def plan(plan: LogicalPlan): Iterator[PhysicalPlan] = { // Obviously a lot to do here still... - val iter = strategies.view.flatMap(_(plan)).toIterator - assert(iter.hasNext, s"No plan for $plan") - iter + val iter = strategies.iterator.flatMap(_(plan)).flatMap { physicalPlan => + val placeholders = collectPlaceholders(physicalPlan) + + // Plan logical plan marked as [[planLater]] and replace placeholders + placeholders.iterator.foldLeft(Iterator(physicalPlan)) { + case (physicalPlans, (placeholder, logicalPlan)) => + // Plan the logical plan for the placeholder + val children = this.plan(logicalPlan) + physicalPlans.flatMap { physicalPlan => + // Replace the placeholder by the child plans + children.map { child => + physicalPlan.transformUp { + case p if p == placeholder => child + } + } + } + } + } + val pruned = prunePlans(iter) + assert(pruned.hasNext, s"No plan for $plan") + pruned } + + /** Collects placeholders marked as [[planLater]] by strategy and its [[LogicalPlan]]s */ + protected def collectPlaceholders(plan: PhysicalPlan): Seq[(PhysicalPlan, LogicalPlan)] + + /** Prunes bad plans to prevent from combinatorial explosion. */ --- End diff -- NIT: remove `...from...`
--- 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 infrastruct...@apache.org or file a JIRA ticket with INFRA. --- --------------------------------------------------------------------- To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org