Skip to content

Commit fa38881

Browse files
committed
fix for grouping__id
1 parent f279a71 commit fa38881

File tree

1 file changed

+3
-2
lines changed
  • sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis

1 file changed

+3
-2
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class Analyzer(catalog: Catalog,
8282
// of the result of cascading resolution failures.
8383
plan.foreachUp {
8484
case operator: LogicalPlan =>
85-
operator transformAllExpressions {
85+
operator transformExpressionsUp {
8686
case a: Attribute if !a.resolved =>
8787
val from = operator.inputSet.map(_.name).mkString(", ")
8888
failAnalysis(s"cannot resolve '${a.prettyString}' given input columns $from")
@@ -125,7 +125,8 @@ class Analyzer(catalog: Catalog,
125125

126126
cleaned.foreach(checkValidAggregateExpression)
127127

128-
case o if o.children.nonEmpty && !o.references.subsetOf(o.inputSet) =>
128+
case o if o.children.nonEmpty &&
129+
!o.references.filter(_.name != "grouping__id").subsetOf(o.inputSet) =>
129130
val missingAttributes = (o.references -- o.inputSet).map(_.prettyString).mkString(",")
130131
val input = o.inputSet.map(_.prettyString).mkString(",")
131132

0 commit comments

Comments
 (0)