gengliangwang commented on a change in pull request #35534:
URL: https://github.com/apache/spark/pull/35534#discussion_r809833315
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/aggregate/CountIf.scala
##########
@@ -36,30 +34,11 @@ import org.apache.spark.sql.types.{AbstractDataType,
BooleanType, DataType, Long
""",
group = "agg_funcs",
since = "3.0.0")
-case class CountIf(predicate: Expression) extends UnevaluableAggregate with
ImplicitCastInputTypes
- with UnaryLike[Expression] {
-
- override def prettyName: String = "count_if"
-
- override def child: Expression = predicate
-
- override def nullable: Boolean = false
-
- override def dataType: DataType = LongType
-
+case class CountIf(child: Expression) extends RuntimeReplaceableAggregate
+ with ImplicitCastInputTypes with UnaryLike[Expression] {
+ override lazy val replacement: Expression = Count(new NullIf(child,
Literal.FalseLiteral))
+ override def nodeName: String = "count_if"
Review comment:
ditto
##########
File path:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/Expression.scala
##########
@@ -388,29 +395,13 @@ trait RuntimeReplaceable extends UnaryExpression with
Unevaluable {
* with other databases. For example, we use this to support every, any/some
aggregates by rewriting
* them with Min and Max respectively.
*/
-trait UnevaluableAggregate extends DeclarativeAggregate {
-
- override def nullable: Boolean = true
-
- override lazy val aggBufferAttributes =
- throw QueryExecutionErrors.evaluateUnevaluableAggregateUnsupportedError(
- "aggBufferAttributes", this)
-
- override lazy val initialValues: Seq[Expression] =
- throw QueryExecutionErrors.evaluateUnevaluableAggregateUnsupportedError(
- "initialValues", this)
-
- override lazy val updateExpressions: Seq[Expression] =
- throw QueryExecutionErrors.evaluateUnevaluableAggregateUnsupportedError(
- "updateExpressions", this)
-
- override lazy val mergeExpressions: Seq[Expression] =
- throw QueryExecutionErrors.evaluateUnevaluableAggregateUnsupportedError(
- "mergeExpressions", this)
-
- override lazy val evaluateExpression: Expression =
- throw QueryExecutionErrors.evaluateUnevaluableAggregateUnsupportedError(
- "evaluateExpression", this)
+abstract class RuntimeReplaceableAggregate extends AggregateFunction with
RuntimeReplaceable {
+ def aggBufferSchema: StructType = throw new IllegalStateException(
+ "RuntimeReplaceableAggregate.aggBufferSchema should not be called")
+ def aggBufferAttributes: Seq[AttributeReference] = throw new
IllegalStateException(
Review comment:
Nit: add blank lines between methods as per
https://github.com/databricks/scala-style-guide#blanklines
--
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]
