Github user davies commented on a diff in the pull request:
https://github.com/apache/spark/pull/10678#discussion_r49556790
--- Diff:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
---
@@ -521,38 +522,81 @@ class Analyzer(
*/
object ResolveSortReferences extends Rule[LogicalPlan] {
def apply(plan: LogicalPlan): LogicalPlan = plan resolveOperators {
- case s @ Sort(ordering, global, p @ Project(projectList, child))
- if !s.resolved && p.resolved =>
- val (newOrdering, missing) = resolveAndFindMissing(ordering, p,
child)
+ case s @ Sort(_, _, child) if !s.resolved && child.resolved =>
+ val (newOrdering, missingAttrs, missingPlans) =
+ collectResolvedMissingAttrs(s.order, child,
Seq.empty[LogicalPlan])
- // 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(p.output,
- Sort(newOrdering, global,
- Project(projectList ++ missing, child)))
- } else {
- logDebug(s"Failed to find $missing in ${p.output.mkString(",
")}")
+ if (missingAttrs.isEmpty) {
+ logDebug(s"Failed to find $missingAttrs in
${child.output.mkString(", ")}")
s // Nothing we can do here. Return original plan.
}
+ else {
+ val missingPlanSet = missingPlans.toSet
--- End diff --
I think we don't need this missingPlans, could be done like this:
```
var stop = false
val newChild = child transform {
case Projection(list, child) if missingAttr.nonEmpty && !stop =>
val newList = list ++ missingAttr
missingAttr = missingAttr.filterNot(child.outputSet.contains)
Projection(newList, child)
case j: Join =>
stop = true
j
}
```
---
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 [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
