Skip to content

[SPARK-59597][SQL] Avoid quadratic CTE attribute restoration #58873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bhollis-dbx wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −5
Open

[SPARK-59597][SQL] Avoid quadratic CTE attribute restoration #58873

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .../org/apache/spark/sql/catalyst/optimizer/PushdownPredicatesAndPruneColumnsForCTEDef.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,12 @@ package org.apache.spark.sql.catalyst.optimizer

import scala.collection.mutable

import org.apache.spark.sql.catalyst.expressions.{And, Attribute, AttributeSet}
import org.apache.spark.sql.catalyst.expressions.{And, Attribute, AttributeMap, AttributeSet}
import org.apache.spark.sql.catalyst.expressions.{Expression, Literal, Or, PredicateHelper, SubqueryExpression}
import org.apache.spark.sql.catalyst.planning.PhysicalOperation
import org.apache.spark.sql.catalyst.plans.logical._
import org.apache.spark.sql.catalyst.rules.Rule
import org.apache.spark.sql.catalyst.trees.TreePattern.CTE
import org.apache.spark.util.collection.Utils

/**
* Infer predicates and column pruning for [[CTERelationDef]] from its reference points, and push
Expand All @@ -50,8 +49,7 @@ object PushdownPredicatesAndPruneColumnsForCTEDef extends Rule[LogicalPlan] with
input: Seq[Expression],
mapping: Map[Attribute, Expression]): Seq[Expression] = {
input.map(e => e.transform {
case a: Attribute =>
mapping.keys.find(_.semanticEquals(a)).map(mapping).getOrElse(a)
case a: Attribute => mapping.getOrElse(a, a)
})
}

Expand All @@ -75,7 +73,7 @@ object PushdownPredicatesAndPruneColumnsForCTEDef extends Rule[LogicalPlan] with

case PhysicalOperation(projects, predicates, ref: CTERelationRef) =>
val (cteDef, precedence, preds, attrs) = cteMap(ref.cteId)
val attrMapping = Utils.toMap(ref.output, cteDef.output)
val attrMapping = AttributeMap(ref.output.zip(cteDef.output))
val newPredicates = if (isTruePredicate(preds)) {
preds
} else {
Expand Down