Github user gatorsmile commented on a diff in the pull request:
https://github.com/apache/spark/pull/17286#discussion_r106775334
--- Diff:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/CostBasedJoinReorder.scala
---
@@ -19,31 +19,33 @@ package org.apache.spark.sql.catalyst.optimizer
import scala.collection.mutable
-import org.apache.spark.sql.catalyst.CatalystConf
import org.apache.spark.sql.catalyst.expressions.{And, Attribute,
AttributeSet, Expression, PredicateHelper}
import org.apache.spark.sql.catalyst.plans.{Inner, InnerLike}
import org.apache.spark.sql.catalyst.plans.logical.{BinaryNode, Join,
LogicalPlan, Project}
import org.apache.spark.sql.catalyst.rules.Rule
+import org.apache.spark.sql.internal.SQLConf
/**
* Cost-based join reorder.
* We may have several join reorder algorithms in the future. This class
is the entry of these
* algorithms, and chooses which one to use.
*/
-case class CostBasedJoinReorder(conf: CatalystConf) extends
Rule[LogicalPlan] with PredicateHelper {
+case class CostBasedJoinReorder(conf: SQLConf) extends Rule[LogicalPlan]
with PredicateHelper {
def apply(plan: LogicalPlan): LogicalPlan = {
if (!conf.cboEnabled || !conf.joinReorderEnabled) {
plan
} else {
- val result = plan transform {
- case p @ Project(projectList, j @ Join(_, _, _: InnerLike, _)) =>
- reorder(p, p.outputSet)
- case j @ Join(_, _, _: InnerLike, _) =>
+ val result = plan transformDown {
+ // Start reordering with a joinable item, which is an InnerLike
join with conditions.
+ case j @ Join(_, _, _: InnerLike, Some(cond)) =>
reorder(j, j.outputSet)
+ case p @ Project(projectList, Join(_, _, _: InnerLike, Some(cond)))
+ if projectList.forall(_.isInstanceOf[Attribute]) =>
+ reorder(p, p.outputSet)
}
// After reordering is finished, convert OrderedJoin back to Join
- result transform {
+ result transformDown {
--- End diff --
Is the change needed? The order must be top-down?
---
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]
