Skip to content

[SPARK-28250][SQL] QueryPlan#references should exclude producedAttributes #25052

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

Closed
cloud-fan wants to merge 2 commits into from
Closed

[SPARK-28250][SQL] QueryPlan#references should exclude producedAttributes #25052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34530d2
QueryPlan#references should exclude producedAttributes
cloud-fan Jul 4, 2019
e7fc7e9
update comment
cloud-fan Jul 4, 2019
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
21 changes: 10 additions & 11 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/QueryPlan.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,6 @@ abstract class QueryPlan[PlanType <: QueryPlan[PlanType]] extends TreeNode[PlanT
@transient
lazy val outputSet: AttributeSet = AttributeSet(output)

/**
* All Attributes that appear in expressions from this operator. Note that this set does not
* include attributes that are implicitly referenced by being passed through to the output tuple.
*/
@transient
lazy val references: AttributeSet =
AttributeSet.fromAttributeSets(expressions.map(_.references))

/**
* The set of all attributes that are input to this operator by its children.
*/
Expand All @@ -59,12 +51,19 @@ abstract class QueryPlan[PlanType <: QueryPlan[PlanType]] extends TreeNode[PlanT
*/
def producedAttributes: AttributeSet = AttributeSet.empty

/**
* All Attributes that appear in expressions from this operator. Note that this set does not
* include attributes that are implicitly referenced by being passed through to the output tuple.
*/
@transient
lazy val references: AttributeSet = {
AttributeSet.fromAttributeSets(expressions.map(_.references)) -- producedAttributes
}

/**
* Attributes that are referenced by expressions but not provided by this node's children.
* Subclasses should override this method if they produce attributes internally as it is used by
* assertions designed to prevent the construction of invalid plans.
*/
def missingInput: AttributeSet = references -- inputSet -- producedAttributes
final def missingInput: AttributeSet = references -- inputSet

/**
* Runs [[transformExpressionsDown]] with `rule` on all expressions present
Expand Down
3 changes: 1 addition & 2 deletions ...st/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicLogicalOperators.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,8 +586,7 @@ case class View(
output: Seq[Attribute],
child: LogicalPlan) extends LogicalPlan with MultiInstanceRelation {

@transient
override lazy val references: AttributeSet = AttributeSet.empty
override def producedAttributes: AttributeSet = outputSet

override lazy val resolved: Boolean = child.resolved

Expand Down
3 changes: 1 addition & 2 deletions ...t/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/pythonLogicalOperators.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@ trait BaseEvalPython extends UnaryNode {

override def output: Seq[Attribute] = child.output ++ resultAttrs

@transient
override lazy val references: AttributeSet = AttributeSet(udfs.flatMap(_.references))
override def producedAttributes: AttributeSet = AttributeSet(resultAttrs)
}

/**
Expand Down
2 changes: 1 addition & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/execution/GenerateExec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ case class GenerateExec(
override lazy val metrics = Map(
"numOutputRows" -> SQLMetrics.createMetric(sparkContext, "number of output rows"))

override def producedAttributes: AttributeSet = AttributeSet(output)
override def producedAttributes: AttributeSet = AttributeSet(generatorOutput)

override def outputPartitioning: Partitioning = child.outputPartitioning

Expand Down
2 changes: 0 additions & 2 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/columnar/InMemoryRelation.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,6 @@ case class InMemoryRelation(
cacheBuilder,
outputOrdering)

override def producedAttributes: AttributeSet = outputSet

@transient val partitionStatistics = new PartitionStatistics(output)

def cachedPlan: SparkPlan = cacheBuilder.cachedPlan
Expand Down
2 changes: 0 additions & 2 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/objects.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,8 +451,6 @@ case class FlatMapGroupsInRExec(

override def outputPartitioning: Partitioning = child.outputPartitioning

override def producedAttributes: AttributeSet = AttributeSet(outputObjAttr)
Copy link
Member

@viirya viirya Jul 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't outputObjAttr produced by FlatMapGroupsInRExec?

Copy link
Contributor Author

@cloud-fan cloud-fan Jul 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a no-op override, it's the same as ObjectProducerExec.producedAttributes


override def requiredChildDistribution: Seq[Distribution] =
if (groupingAttributes.isEmpty) {
AllTuples :: Nil
Expand Down
3 changes: 1 addition & 2 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/python/EvalPythonExec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ abstract class EvalPythonExec(udfs: Seq[PythonUDF], resultAttrs: Seq[Attribute],

override def output: Seq[Attribute] = child.output ++ resultAttrs

@transient
override lazy val references: AttributeSet = AttributeSet(udfs.flatMap(_.references))
override def producedAttributes: AttributeSet = AttributeSet(resultAttrs)

private def collectFunctions(udf: PythonUDF): (ChainedPythonFunctions, Seq[Expression]) = {
udf.children match {
Expand Down