diff --git a/core/src/main/scala/spark/Accumulators.scala b/core/src/main/scala/spark/Accumulators.scala index 197ceedddcb47b878699b4498c9f22428524c982..5a1ca496267be11a81d0caaf6c6fde657cf76176 100644 --- a/core/src/main/scala/spark/Accumulators.scala +++ b/core/src/main/scala/spark/Accumulators.scala @@ -21,7 +21,7 @@ class Accumulable[T,R] ( * add more data to this accumulator / accumulable * @param term */ - def += (term: R) { value_ = param.addToAccum(value_, term) } + def += (term: R) { value_ = param.addAccumulator(value_, term) } /** * merge two accumulable objects together @@ -57,7 +57,7 @@ class Accumulator[T]( * @tparam T */ trait AccumulatorParam[T] extends AccumulableParam[T,T] { - def addToAccum(t1: T, t2: T) : T = { + def addAccumulator(t1: T, t2: T) : T = { addInPlace(t1, t2) } } @@ -80,7 +80,7 @@ trait AccumulableParam[T,R] extends Serializable { * @param t2 the data to be added to the accumulator * @return the new value of the accumulator */ - def addToAccum(t1: T, t2: R) : T + def addAccumulator(t1: T, t2: R) : T /** * merge two accumulated values together diff --git a/core/src/test/scala/spark/AccumulatorSuite.scala b/core/src/test/scala/spark/AccumulatorSuite.scala index 24c4591034411d36b7705b3df51792fd9973f702..d9ef8797d6473304628da9c8a9917a5d41f3f3b8 100644 --- a/core/src/test/scala/spark/AccumulatorSuite.scala +++ b/core/src/test/scala/spark/AccumulatorSuite.scala @@ -53,7 +53,7 @@ class AccumulatorSuite extends FunSuite with ShouldMatchers { t1 ++= t2 t1 } - def addToAccum(t1: mutable.Set[Any], t2: Any) : mutable.Set[Any] = { + def addAccumulator(t1: mutable.Set[Any], t2: Any) : mutable.Set[Any] = { t1 += t2 t1 }