Github user marmbrus commented on a diff in the pull request:
https://github.com/apache/spark/pull/13147#discussion_r64972461
--- 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 --
We are safe for now though as long as we only call `next()` once right? Is
there some way to test that its doing the right thing?
---
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.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
