aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorImran Rashid <imran@quantifind.com>2012-07-16 18:17:13 -0700
committerImran Rashid <imran@quantifind.com>2012-07-16 18:17:13 -0700
commit85940a7d71c1e729c0d2102d64b8335eb6aa11e5 (patch)
tree5bfa7a944f930a545c0803bebf5150048a2af0aa /core
parent86024ca74da87907b360963d5a603ef0fcc0a286 (diff)
downloadspark-85940a7d71c1e729c0d2102d64b8335eb6aa11e5.tar.gz
spark-85940a7d71c1e729c0d2102d64b8335eb6aa11e5.tar.bz2
spark-85940a7d71c1e729c0d2102d64b8335eb6aa11e5.zip
rename addToAccum to addAccumulator
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/spark/Accumulators.scala6
-rw-r--r--core/src/test/scala/spark/AccumulatorSuite.scala2
2 files changed, 4 insertions, 4 deletions
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
}