From 85940a7d71c1e729c0d2102d64b8335eb6aa11e5 Mon Sep 17 00:00:00 2001 From: Imran Rashid Date: Mon, 16 Jul 2012 18:17:13 -0700 Subject: rename addToAccum to addAccumulator --- core/src/main/scala/spark/Accumulators.scala | 6 +++--- core/src/test/scala/spark/AccumulatorSuite.scala | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'core') diff --git a/core/src/main/scala/spark/Accumulators.scala b/core/src/main/scala/spark/Accumulators.scala index 7febf1c8af..30f30e35b6 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 24c4591034..d9ef8797d6 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 } -- cgit v1.2.3