Skip to content

[SPARK-36275][SQL] ResolveAggregateFunctions should works with nested fields #33498

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
allisonwang-db wants to merge 2 commits into from
Closed

[SPARK-36275][SQL] ResolveAggregateFunctions should works with nested fields #33498

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
9af03e9
nested fields
allisonwang-db Jul 23, 2021
fb3931c
update
allisonwang-db Jul 26, 2021
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
6 changes: 4 additions & 2 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2553,8 +2553,10 @@ class Analyzer(override val catalogManager: CatalogManager)
// a table `t` has two columns `c1` and `c2`, for query `SELECT ... FROM t
// GROUP BY c1 HAVING c2 = 0`, even though we can resolve column `c2` here, we
// should undo it later and fail with "Column c2 not found".
agg.child.resolve(u.nameParts, resolver).map(TempResolvedColumn(_, u.nameParts))
.getOrElse(u)
agg.child.resolve(u.nameParts, resolver).map({
Copy link
Member

@HyukjinKwon HyukjinKwon Aug 13, 2021

Choose a reason for hiding this comment

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

Let's use a single brace next time for map in this case: https://github.com/databricks/scala-style-guide#anonymous-methods

case a: Alias => TempResolvedColumn(a.child, u.nameParts)
case o => TempResolvedColumn(o, u.nameParts)
}).getOrElse(u)
} catch {
case _: AnalysisException => u
}
Expand Down
26 changes: 26 additions & 0 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/AnalysisSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1115,4 +1115,30 @@ class AnalysisSuite extends AnalysisTest with Matchers {
Seq("grouping_id() can only be used with GroupingSets/Cube/Rollup"),
false)
}

test("SPARK-36275: Resolve aggregate functions should work with nested fields") {
assertAnalysisSuccess(parsePlan(
"""
|SELECT c.x, SUM(c.y)
|FROM VALUES NAMED_STRUCT('x', 'A', 'y', 1), NAMED_STRUCT('x', 'A', 'y', 2) AS t(c)
|GROUP BY c.x
|HAVING c.x > 1
|""".stripMargin))

assertAnalysisSuccess(parsePlan(
"""
|SELECT c.x, SUM(c.y)
|FROM VALUES NAMED_STRUCT('x', 'A', 'y', 1), NAMED_STRUCT('x', 'A', 'y', 2) AS t(c)
|GROUP BY c.x
|ORDER BY c.x
|""".stripMargin))

assertAnalysisError(parsePlan(
"""
|SELECT c.x
|FROM VALUES NAMED_STRUCT('x', 'A', 'y', 1), NAMED_STRUCT('x', 'A', 'y', 2) AS t(c)
|GROUP BY c.x
|ORDER BY c.x + c.y
|""".stripMargin), "cannot resolve 'c.y' given input columns: [x]" :: Nil)
}
}