Repository: spark Updated Branches: refs/heads/branch-1.6 cd86d8c74 -> 399739702
Fix Aggregator documentation (rename present to finish). (cherry picked from commit ecac2835458bbf73fe59413d5bf921500c5b987d) Signed-off-by: Reynold Xin <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/39973970 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/39973970 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/39973970 Branch: refs/heads/branch-1.6 Commit: 3997397024975b8affca0d609a231cde5e9959a5 Parents: cd86d8c Author: Reynold Xin <[email protected]> Authored: Wed Nov 25 13:45:41 2015 -0800 Committer: Reynold Xin <[email protected]> Committed: Wed Nov 25 13:48:15 2015 -0800 ---------------------------------------------------------------------- .../main/scala/org/apache/spark/sql/expressions/Aggregator.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/39973970/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 b0cd32b..65117d5 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 @@ -34,7 +34,7 @@ import org.apache.spark.sql.{DataFrame, Dataset, Encoder, TypedColumn} * def zero: Int = 0 * def reduce(b: Int, a: Data): Int = b + a.i * def merge(b1: Int, b2: Int): Int = b1 + b2 - * def present(r: Int): Int = r + * def finish(r: Int): Int = r * }.toColumn() * * val ds: Dataset[Data] = ... --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
