cloud-fan commented on code in PR #48820:
URL: https://github.com/apache/spark/pull/48820#discussion_r1839964432
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/ColumnResolutionHelper.scala:
##########
@@ -221,35 +221,39 @@ trait ColumnResolutionHelper extends Logging with
DataTypeErrorsBase {
val outerPlan = AnalysisContext.get.outerPlan
if (outerPlan.isEmpty) return e
- e.transformWithPruning(_.containsAnyPattern(UNRESOLVED_ATTRIBUTE,
TEMP_RESOLVED_COLUMN)) {
+ def resolve(nameParts: Seq[String]): Option[Expression] = try {
+ outerPlan.get match {
+ // Subqueries in UnresolvedHaving can host grouping expressions and
aggregate functions.
+ // We should resolve columns with `agg.output` and the rule
`ResolveAggregateFunctions` will
+ // push them down to Aggregate later. This is similar to what we do in
`resolveColumns`.
+ case u @ UnresolvedHaving(_, agg: Aggregate) =>
+ agg.resolveChildren(nameParts, conf.resolver)
+ .orElse(u.resolveChildren(nameParts, conf.resolver))
+ .map(wrapOuterReference)
+ case other =>
+ other.resolveChildren(nameParts,
conf.resolver).map(wrapOuterReference)
+ }
+ } catch {
+ case ae: AnalysisException =>
+ logDebug(ae.getMessage)
+ None
+ }
+
+ e.transformWithPruning(
+ _.containsAnyPattern(UNRESOLVED_ATTRIBUTE, TEMP_RESOLVED_COLUMN,
LAZY_OUTER_REFERENCE)) {
case u: UnresolvedAttribute =>
- resolveOuterReference(u.nameParts, outerPlan.get).getOrElse(u)
+ resolve(u.nameParts).getOrElse(u)
+ case u: LazyOuterReference =>
Review Comment:
This is the new change. Other changes are just reverting back the previous
changes.
--
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]
