cloud-fan commented on a change in pull request #26656: [SPARK-27986][SQL]
Support ANSI SQL filter clause for aggregate expression
URL: https://github.com/apache/spark/pull/26656#discussion_r360292670
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
##########
@@ -1734,26 +1734,37 @@ class Analyzer(
s"its class is ${other.getClass.getCanonicalName}, which
is not a generator.")
}
}
- case u @ UnresolvedFunction(funcId, children, isDistinct) =>
+ case u @ UnresolvedFunction(funcId, arguments, isDistinct, filter) =>
withPosition(u) {
- v1SessionCatalog.lookupFunction(funcId, children) match {
+ v1SessionCatalog.lookupFunction(funcId, arguments) match {
// AggregateWindowFunctions are AggregateFunctions that can
only be evaluated within
// the context of a Window clause. They do not need to be
wrapped in an
// AggregateExpression.
case wf: AggregateWindowFunction =>
- if (isDistinct) {
- failAnalysis(
- s"DISTINCT specified, but ${wf.prettyName} is not an
aggregate function")
+ if (isDistinct || filter.isDefined) {
+ failAnalysis("DISTINCT or FILTER specified, " +
+ s"but ${wf.prettyName} is not an aggregate function")
} else {
wf
}
// We get an aggregate function, we need to wrap it in an
AggregateExpression.
- case agg: AggregateFunction => AggregateExpression(agg,
Complete, isDistinct)
+ case agg: AggregateFunction =>
+ // TODO: SPARK-30276 Support Filter expression allows
simultaneous use of DISTINCT
+ if (filter.isDefined) {
+ if (isDistinct) {
+ failAnalysis("DISTINCT and FILTER cannot be used in
aggregate functions " +
+ "at the same time")
+ } else if (!filter.get.deterministic) {
Review comment:
ah then it's fine.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
