Repository: spark Updated Branches: refs/heads/master 95daff645 -> c964fc101
[SQL][MINOR] rename present to finish in Aggregator Author: Wenchen Fan <wenc...@databricks.com> Closes #9617 from cloud-fan/tmp. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c964fc10 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c964fc10 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c964fc10 Branch: refs/heads/master Commit: c964fc101585171aee76996981fe2c9fdafc614e Parents: 95daff6 Author: Wenchen Fan <wenc...@databricks.com> Authored: Wed Nov 11 10:19:09 2015 -0800 Committer: Reynold Xin <r...@databricks.com> Committed: Wed Nov 11 10:19:09 2015 -0800 ---------------------------------------------------------------------- .../sql/execution/aggregate/TypedAggregateExpression.scala | 2 +- .../scala/org/apache/spark/sql/expressions/Aggregator.scala | 2 +- .../scala/org/apache/spark/sql/DatasetAggregatorSuite.scala | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/c964fc10/sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/TypedAggregateExpression.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/TypedAggregateExpression.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/TypedAggregateExpression.scala index 0e5bc1f..b5a87c5 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/TypedAggregateExpression.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/TypedAggregateExpression.scala @@ -136,7 +136,7 @@ case class TypedAggregateExpression( override def eval(buffer: InternalRow): Any = { val b = boundB.shift(mutableAggBufferOffset).fromRow(buffer) - val result = cEncoder.toRow(aggregator.present(b)) + val result = cEncoder.toRow(aggregator.finish(b)) dataType match { case _: StructType => result case _ => result.get(0, dataType) http://git-wip-us.apache.org/repos/asf/spark/blob/c964fc10/sql/core/src/main/scala/org/apache/spark/sql/expressions/Aggregator.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/expressions/Aggregator.scala b/sql/core/src/main/scala/org/apache/spark/sql/expressions/Aggregator.scala index 3c1c457..2aa5a7d 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/expressions/Aggregator.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/expressions/Aggregator.scala @@ -65,7 +65,7 @@ abstract class Aggregator[-A, B, C] { /** * Transform the output of the reduction. */ - def present(reduction: B): C + def finish(reduction: B): C /** * Returns this `Aggregator` as a [[TypedColumn]] that can be used in [[Dataset]] or [[DataFrame]] http://git-wip-us.apache.org/repos/asf/spark/blob/c964fc10/sql/core/src/test/scala/org/apache/spark/sql/DatasetAggregatorSuite.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/test/scala/org/apache/spark/sql/DatasetAggregatorSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/DatasetAggregatorSuite.scala index 206095a..002d5c1 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/DatasetAggregatorSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/DatasetAggregatorSuite.scala @@ -36,7 +36,7 @@ class SumOf[I, N : Numeric](f: I => N) extends Aggregator[I, N, N] with Serializ override def merge(b1: N, b2: N): N = numeric.plus(b1, b2) - override def present(reduction: N): N = reduction + override def finish(reduction: N): N = reduction } object TypedAverage extends Aggregator[(String, Int), (Long, Long), Double] with Serializable { @@ -50,7 +50,7 @@ object TypedAverage extends Aggregator[(String, Int), (Long, Long), Double] with (b1._1 + b2._1, b1._2 + b2._2) } - override def present(countAndSum: (Long, Long)): Double = countAndSum._2 / countAndSum._1 + override def finish(countAndSum: (Long, Long)): Double = countAndSum._2 / countAndSum._1 } object ComplexResultAgg extends Aggregator[(String, Int), (Long, Long), (Long, Long)] @@ -66,7 +66,7 @@ object ComplexResultAgg extends Aggregator[(String, Int), (Long, Long), (Long, L (b1._1 + b2._1, b1._2 + b2._2) } - override def present(reduction: (Long, Long)): (Long, Long) = reduction + override def finish(reduction: (Long, Long)): (Long, Long) = reduction } class DatasetAggregatorSuite extends QueryTest with SharedSQLContext { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
