anchovYu commented on code in PR #39040:
URL: https://github.com/apache/spark/pull/39040#discussion_r1052738997
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveLateralColumnAlias.scala:
##########
@@ -244,7 +303,67 @@ object ResolveLateralColumnAliasReference extends
Rule[LogicalPlan] {
child = Project(innerProjectList.toSeq, child)
)
}
+
+ case agg @ Aggregate(groupingExpressions, aggregateExpressions, _) if
agg.resolved
+ &&
aggregateExpressions.exists(_.containsPattern(LATERAL_COLUMN_ALIAS_REFERENCE))
=>
+
+ val newAggExprs = collection.mutable.Set.empty[NamedExpression]
+ val expressionMap =
collection.mutable.LinkedHashMap.empty[Expression, NamedExpression]
+ val projectExprs = aggregateExpressions.map { exp =>
+ exp.transformDown {
+ case aggExpr: AggregateExpression =>
+ // Doesn't support referencing a lateral alias in aggregate
function
+ if (aggExpr.containsPattern(LATERAL_COLUMN_ALIAS_REFERENCE)) {
+ aggExpr.collectFirst {
+ case lcaRef: LateralColumnAliasReference =>
+ throw
QueryCompilationErrors.lateralColumnAliasInAggFuncUnsupportedError(
+ lcaRef.nameParts, aggExpr)
+ }
+ }
+ val ne = expressionMap.getOrElseUpdate(aggExpr.canonicalized,
assignAlias(aggExpr))
+ newAggExprs += ne
+ ne.toAttribute
+ case e if groupingExpressions.exists(_.semanticEquals(e)) =>
+ val ne = expressionMap.getOrElseUpdate(e.canonicalized,
assignAlias(e))
+ newAggExprs += ne
+ ne.toAttribute
+ }.asInstanceOf[NamedExpression]
+ }
+ if (newAggExprs.isEmpty) {
+ agg
+ } else {
+ // perform an early check on current Aggregate before any lift-up
/ push-down to throw
+ // the same exception such as non-aggregate expressions not in
group by, which becomes
+ // missing input after transformation
+ earlyCheckAggregate(agg)
Review Comment:
Yes, actually simplified from `checkAnalysis`. If this solution works and
all tests pass, I can move this method to Aggregate or AnalysisHelper object.
--
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]
