Skip to content

[SQL][minor] rename present to finish in Aggregator #9617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cloud-fan wants to merge 1 commit into from
Closed

[SQL][minor] rename present to finish in Aggregator #9617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...re/src/main/scala/org/apache/spark/sql/execution/aggregate/TypedAggregateExpression.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/expressions/Aggregator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
Expand Down
6 changes: 3 additions & 3 deletions sql/core/src/test/scala/org/apache/spark/sql/DatasetAggregatorSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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)]
Expand All @@ -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 {
Expand Down