diff options
author | Reynold Xin <rxin@databricks.com> | 2015-10-07 15:38:46 -0700 |
---|---|---|
committer | Josh Rosen <joshrosen@databricks.com> | 2015-10-07 15:38:46 -0700 |
commit | 6dbfd7ecf41297213f4ce8024d00c40808c5ac8f (patch) | |
tree | 555d81bf2a10626a182b021b377a7f45da2a3880 /sql/catalyst/src | |
parent | da936fbb74b852d5c98286ce92522dc3efd6ad6c (diff) | |
download | spark-6dbfd7ecf41297213f4ce8024d00c40808c5ac8f.tar.gz spark-6dbfd7ecf41297213f4ce8024d00c40808c5ac8f.tar.bz2 spark-6dbfd7ecf41297213f4ce8024d00c40808c5ac8f.zip |
[SPARK-10982] [SQL] Rename ExpressionAggregate -> DeclarativeAggregate.
DeclarativeAggregate matches more closely with ImperativeAggregate we already have.
Author: Reynold Xin <rxin@databricks.com>
Closes #9013 from rxin/SPARK-10982.
Diffstat (limited to 'sql/catalyst/src')
2 files changed, 10 insertions, 10 deletions
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/aggregate/functions.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/aggregate/functions.scala index 4ad2607a85..8aad0b7dee 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/aggregate/functions.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/aggregate/functions.scala @@ -26,7 +26,7 @@ import org.apache.spark.sql.catalyst.dsl.expressions._ import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.types._ -case class Average(child: Expression) extends ExpressionAggregate { +case class Average(child: Expression) extends DeclarativeAggregate { override def children: Seq[Expression] = child :: Nil @@ -88,7 +88,7 @@ case class Average(child: Expression) extends ExpressionAggregate { } } -case class Count(child: Expression) extends ExpressionAggregate { +case class Count(child: Expression) extends DeclarativeAggregate { override def children: Seq[Expression] = child :: Nil override def nullable: Boolean = false @@ -118,7 +118,7 @@ case class Count(child: Expression) extends ExpressionAggregate { override val evaluateExpression = Cast(currentCount, LongType) } -case class First(child: Expression) extends ExpressionAggregate { +case class First(child: Expression) extends DeclarativeAggregate { override def children: Seq[Expression] = child :: Nil @@ -152,7 +152,7 @@ case class First(child: Expression) extends ExpressionAggregate { override val evaluateExpression = first } -case class Last(child: Expression) extends ExpressionAggregate { +case class Last(child: Expression) extends DeclarativeAggregate { override def children: Seq[Expression] = child :: Nil @@ -186,7 +186,7 @@ case class Last(child: Expression) extends ExpressionAggregate { override val evaluateExpression = last } -case class Max(child: Expression) extends ExpressionAggregate { +case class Max(child: Expression) extends DeclarativeAggregate { override def children: Seq[Expression] = child :: Nil @@ -220,7 +220,7 @@ case class Max(child: Expression) extends ExpressionAggregate { override val evaluateExpression = max } -case class Min(child: Expression) extends ExpressionAggregate { +case class Min(child: Expression) extends DeclarativeAggregate { override def children: Seq[Expression] = child :: Nil @@ -277,7 +277,7 @@ case class StddevSamp(child: Expression) extends StddevAgg(child) { // Compute standard deviation based on online algorithm specified here: // http://en.wikipedia.org/wiki/Algorithms_for_calculating_variance -abstract class StddevAgg(child: Expression) extends ExpressionAggregate { +abstract class StddevAgg(child: Expression) extends DeclarativeAggregate { override def children: Seq[Expression] = child :: Nil @@ -397,7 +397,7 @@ abstract class StddevAgg(child: Expression) extends ExpressionAggregate { } } -case class Sum(child: Expression) extends ExpressionAggregate { +case class Sum(child: Expression) extends DeclarativeAggregate { override def children: Seq[Expression] = child :: Nil diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/aggregate/interfaces.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/aggregate/interfaces.scala index 74e15ec90b..9ba3a9c980 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/aggregate/interfaces.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/aggregate/interfaces.scala @@ -97,7 +97,7 @@ private[sql] case class AggregateExpression2( * * - [[ImperativeAggregate]] is for aggregation functions that are specified in terms of * initialize(), update(), and merge() functions that operate on Row-based aggregation buffers. - * - [[ExpressionAggregate]] is for aggregation functions that are specified using + * - [[DeclarativeAggregate]] is for aggregation functions that are specified using * Catalyst expressions. * * In both interfaces, aggregates must define the schema ([[aggBufferSchema]]) and attributes @@ -244,7 +244,7 @@ abstract class ImperativeAggregate extends AggregateFunction2 { * can then use these attributes when defining `updateExpressions`, `mergeExpressions`, and * `evaluateExpressions`. */ -abstract class ExpressionAggregate +abstract class DeclarativeAggregate extends AggregateFunction2 with Serializable with Unevaluable { |