Skip to content

[SPARK-20891][SQL] Reduce duplicate code typedaggregators.scala #18125

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
rubenljanssen wants to merge 2 commits into from
Closed

[SPARK-20891][SQL] Reduce duplicate code typedaggregators.scala #18125

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e6899f
reduced duplicate code
rubenljanssen May 26, 2017
a33ea0d
removed constructor
rubenljanssen May 26, 2017
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
Prev Previous commit
removed constructor
  • Loading branch information
@rubenljanssen
rubenljanssen committed May 26, 2017
commit a33ea0d7601d7b14e50536e3c457847145e799ae
10 changes: 5 additions & 5 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/typedaggregators.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import org.apache.spark.sql.expressions.Aggregator
// This file defines internal implementations for aggregators.
////////////////////////////////////////////////////////////////////////////////////////////////////

abstract class TypedAggregator[IN, BUF: TypeTag, OUT: TypeTag, FRESULT, JAVA](f: IN => FRESULT)
abstract class TypedAggregator[IN, BUF: TypeTag, OUT: TypeTag, JAVA]
extends Aggregator[IN, BUF, OUT] {

def bufferEncoder: Encoder[BUF] = ExpressionEncoder[BUF]()
Expand All @@ -41,7 +41,7 @@ abstract class TypedAggregator[IN, BUF: TypeTag, OUT: TypeTag, FRESULT, JAVA](f:
}

class TypedSumDouble[IN](val f: IN => Double)
extends TypedAggregator[IN, Double, Double, Double, java.lang.Double](f) {
extends TypedAggregator[IN, Double, Double, java.lang.Double] {

override def zero: Double = 0.0
override def reduce(b: Double, a: IN): Double = b + f(a)
Expand All @@ -54,7 +54,7 @@ class TypedSumDouble[IN](val f: IN => Double)


class TypedSumLong[IN](val f: IN => Long)
extends TypedAggregator[IN, Long, Long, Long, java.lang.Long](f) {
extends TypedAggregator[IN, Long, Long, java.lang.Long] {

override def zero: Long = 0L
override def reduce(b: Long, a: IN): Long = b + f(a)
Expand All @@ -66,7 +66,7 @@ class TypedSumLong[IN](val f: IN => Long)
}

class TypedCount[IN](val f: IN => Any)
extends TypedAggregator[IN, Long, Long, Any, java.lang.Long](f) {
extends TypedAggregator[IN, Long, Long, java.lang.Long] {

override def zero: Long = 0
override def reduce(b: Long, a: IN): Long = if (f(a) == null) b else b + 1
Expand All @@ -79,7 +79,7 @@ class TypedCount[IN](val f: IN => Any)
}

class TypedAverage[IN](val f: IN => Double)
extends TypedAggregator[IN, (Double, Long), Double, Double, java.lang.Double](f) {
extends TypedAggregator[IN, (Double, Long), Double, java.lang.Double] {

override def zero: (Double, Long) = (0.0, 0L)
override def reduce(b: (Double, Long), a: IN): (Double, Long) = (f(a) + b._1, 1 + b._2)
Expand Down