Github user cloud-fan commented on a diff in the pull request:
https://github.com/apache/spark/pull/5189#discussion_r27188497
--- Diff:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
---
@@ -340,19 +340,16 @@ class Analyzer(catalog: Catalog,
def apply(plan: LogicalPlan): LogicalPlan = plan transformUp {
case s @ Sort(ordering, global, p @ Project(projectList, child))
if !s.resolved && p.resolved =>
- val unresolved = ordering.flatMap(_.collect { case
UnresolvedAttribute(name) => name })
- val resolved = unresolved.flatMap(child.resolve(_, resolver))
- val requiredAttributes =
- AttributeSet(resolved.flatMap(_.collect { case a: Attribute => a
}))
+ val (resolvedOrdering, missing) = resolveAndFindMissing(ordering,
p, child)
- val missingInProject = requiredAttributes -- p.output
- if (missingInProject.nonEmpty) {
+ // If this rule was not a no-op, return the transformed plan,
otherwise return the original.
+ if (missing.nonEmpty) {
// Add missing attributes and then project them away after the
sort.
- Project(projectList.map(_.toAttribute),
- Sort(ordering, global,
- Project(projectList ++ missingInProject, child)))
+ Project(p.output,
+ Sort(resolvedOrdering, global,
+ Project(projectList ++ missing, child)))
} else {
- logDebug(s"Failed to find $missingInProject in
${p.output.mkString(", ")}")
+ logDebug(s"Failed to find $missing in ${p.output.mkString(",
")}")
s // Nothing we can do here. Return original plan.
--- End diff --
Even there is no missing in project, we still need to build new `Sort` with
resolved `SortOrder`.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
