Skip to content

Commit bf044de

Browse files
committed
Revert "[SPARK-6397][SQL] Check the missingInput simply"
This reverts commit e566fe5.
1 parent e566fe5 commit bf044de

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,9 @@ class CheckAnalysis {
8585

8686
cleaned.foreach(checkValidAggregateExpression)
8787

88-
case o if o.children.nonEmpty && o.missingInput.nonEmpty =>
89-
val missingAttributes = o.missingInput.map(_.prettyString).mkString(",")
88+
case o if o.children.nonEmpty &&
89+
!o.references.filter(_.name != "grouping__id").subsetOf(o.inputSet) =>
90+
val missingAttributes = (o.references -- o.inputSet).map(_.prettyString).mkString(",")
9091
val input = o.inputSet.map(_.prettyString).mkString(",")
9192

9293
failAnalysis(s"resolved attributes $missingAttributes missing from $input")

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicOperators.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,6 @@ case class Expand(
191191
val sizeInBytes = child.statistics.sizeInBytes * projections.length
192192
Statistics(sizeInBytes = sizeInBytes)
193193
}
194-
195-
override def missingInput = super.missingInput.filter(_.name != VirtualColumn.groupingIdName)
196194
}
197195

198196
trait GroupingAnalytics extends UnaryNode {

0 commit comments

Comments
 (0)