cloud-fan commented on code in PR #44532:
URL: https://github.com/apache/spark/pull/44532#discussion_r1439142630
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/ColumnResolutionHelper.scala:
##########
@@ -520,9 +524,33 @@ trait ColumnResolutionHelper extends Logging with
DataTypeErrorsBase {
"planId" -> planId.toString,
"q" -> q.toString))
}
- })
- val isMetadataAccess = u.getTagValue(LogicalPlan.IS_METADATA_COL).isDefined
+ val matched = found.flatMap { case (child, nodes) =>
+ val resolved = nodes
+ .flatMap(resolveUnresolvedAttributeByPlan(u, _, isMetadataAccess))
+ if (isMetadataAccess) {
+ // NOTE: A metadata column might appear in `output` instead of
`metadataOutput`.
+ val metadataOutputSet = child.outputSet ++
AttributeSet(child.metadataOutput)
+ resolved.filter(metadataOutputSet.contains)
+ } else {
+ resolved.filter(child.outputSet.contains)
+ }
+ }
+ if (matched.length > 1) {
+ throw new AnalysisException(
+ errorClass = "AMBIGUOUS_COLUMN_REFERENCE",
+ messageParameters = Map("name" -> toSQLId(u.nameParts)),
+ origin = u.origin
+ )
+ }
+ matched.headOption
+ }
+ }
+
+ private def resolveUnresolvedAttributeByPlan(
+ u: UnresolvedAttribute,
Review Comment:
nit: 4 spaces indentation
--
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]
