Skip to content

[SPARK-6184][SQL] Relocate logDebug to correct location in ResolveSortReferences #4905

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
viirya wants to merge 1 commit into from
Closed

[SPARK-6184][SQL] Relocate logDebug to correct location in ResolveSortReferences #4905

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
9 changes: 6 additions & 3 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 @@ -325,12 +325,13 @@ class Analyzer(catalog: Catalog,

val missingInProject = requiredAttributes -- p.output
if (missingInProject.nonEmpty) {
logDebug(s"Failed to find $missingInProject in ${p.output.mkString(", ")}")
logDebug(s"Adding $missingInProject to $p")
// Add missing attributes and then project them away after the sort.
Project(projectList.map(_.toAttribute),
Project(p.output,
Sort(ordering, global,
Project(projectList ++ missingInProject, child)))
} else {
logDebug(s"Failed to find $missingInProject in ${p.output.mkString(", ")}")
s // Nothing we can do here. Return original plan.
}
case s @ Sort(ordering, global, a @ Aggregate(grouping, aggs, child))
Expand All @@ -345,8 +346,10 @@ class Analyzer(catalog: Catalog,
logDebug(s"Grouping expressions: $groupingRelation")
val resolved = unresolved.flatMap(groupingRelation.resolve(_, resolver))
val missingInAggs = resolved.filterNot(a.outputSet.contains)
logDebug(s"Resolved: $resolved Missing in aggs: $missingInAggs")
logDebug(s"Resolved: $resolved")
if (missingInAggs.nonEmpty) {
logDebug(s"Missing in aggs: $missingInAggs")
logDebug(s"Adding $missingInAggs to $a")
// Add missing grouping exprs and then project them away after the sort.
Project(a.output,
Sort(ordering, global, Aggregate(grouping, aggs ++ missingInAggs, child)))
Expand Down