Github user ueshin commented on a diff in the pull request:
https://github.com/apache/spark/pull/13147#discussion_r64982752
--- Diff:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/planning/QueryPlanner.scala
---
@@ -47,17 +55,27 @@ 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
+ val iter = strategies.view.flatMap(_(plan)).toIterator.flatMap {
physicalPlan =>
+ val placeholders = collectPlaceholders(physicalPlan)
+
+ (Iterator(physicalPlan) /: placeholders.toIterator) {
+ case (physicalPlans, (placeholder, logicalPlan)) =>
+ val children = this.plan(logicalPlan)
+ physicalPlans.flatMap { physicalPlan =>
+ children.map { child =>
+ physicalPlan.transformUp {
+ case `placeholder` => child
+ }
+ }
+ }
+ }
+ }
+ // TODO: We will need to prune bad plans to prevent from combinatorial
explosion.
--- End diff --
Ah, I'm sorry, you are right because the planner returns plans as Iterator
so the any other branches should not be processed.
---
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
