cloud-fan commented on code in PR #45846:
URL: https://github.com/apache/spark/pull/45846#discussion_r1549622671
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/ColumnResolutionHelper.scala:
##########
@@ -542,23 +544,24 @@ trait ColumnResolutionHelper extends Logging with
DataTypeErrorsBase {
u: UnresolvedAttribute,
id: Long,
isMetadataAccess: Boolean,
- q: Seq[LogicalPlan]): (Option[NamedExpression], Boolean) = {
- q.iterator.map(resolveDataFrameColumnRecursively(u, id, isMetadataAccess,
_))
- .foldLeft((Option.empty[NamedExpression], false)) {
- case ((r1, m1), (r2, m2)) =>
- if (r1.nonEmpty && r2.nonEmpty) {
- throw QueryCompilationErrors.ambiguousColumnReferences(u)
- }
- (if (r1.nonEmpty) r1 else r2, m1 | m2)
+ q: Seq[LogicalPlan],
+ d: Int): Option[(NamedExpression, Int)] = {
+ q.flatMap(resolveDataFrameColumnRecursively(u, id, isMetadataAccess, _, d))
+ .sortBy(_._2) // make sure 0-depth result is on the left side (avoid
depths like: 1, 2, 0)
+ .foldLeft(Option.empty[(NamedExpression, Int)]) {
+ case (None, (r2, d2)) => Some((r2, d2))
+ case (Some((r1, 0)), (r2, d2)) if d2 != 0 => Some((r1, 0))
+ case _ => throw QueryCompilationErrors.ambiguousColumnReferences(u)
}
}
private def resolveDataFrameColumnRecursively(
u: UnresolvedAttribute,
id: Long,
isMetadataAccess: Boolean,
- p: LogicalPlan): (Option[NamedExpression], Boolean) = {
- val (resolved, matched) = if
(p.getTagValue(LogicalPlan.PLAN_ID_TAG).contains(id)) {
+ p: LogicalPlan,
+ d: Int): Option[(NamedExpression, Int)] = {
Review Comment:
ditto
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
