Repository: incubator-gearpump Updated Branches: refs/heads/master 833f4d732 -> 1b6a234cc
[GEARPUMP-166] Rename sumByValue to sumByKey [GEARPUMP-166](https://issues.apache.org/jira/browse/GEARPUMP-166) Streaming org.apache.gearpump.streaming.dsl.Stream have a function named sumByValue . It rename to sumByKey maybe better . Author: darionyaphet <[email protected]> Closes #51 from darionyaphet/GEARPUMP-166. Project: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/commit/1b6a234c Tree: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/tree/1b6a234c Diff: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/diff/1b6a234c Branch: refs/heads/master Commit: 1b6a234ccface3004fb28767dc419bf6d54950cc Parents: 833f4d7 Author: darionyaphet <[email protected]> Authored: Tue Jun 28 06:23:06 2016 +0800 Committer: manuzhang <[email protected]> Committed: Tue Jun 28 06:23:06 2016 +0800 ---------------------------------------------------------------------- .../src/main/scala/akka/stream/gearpump/scaladsl/Api.scala | 6 +++--- .../main/scala/org/apache/gearpump/streaming/dsl/Stream.scala | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/1b6a234c/experiments/akkastream/src/main/scala/akka/stream/gearpump/scaladsl/Api.scala ---------------------------------------------------------------------- diff --git a/experiments/akkastream/src/main/scala/akka/stream/gearpump/scaladsl/Api.scala b/experiments/akkastream/src/main/scala/akka/stream/gearpump/scaladsl/Api.scala index 9e35389..9cc46c9 100644 --- a/experiments/akkastream/src/main/scala/akka/stream/gearpump/scaladsl/Api.scala +++ b/experiments/akkastream/src/main/scala/akka/stream/gearpump/scaladsl/Api.scala @@ -243,7 +243,7 @@ object Implicits { * , otherwise, it will do the sum no matter what current key is. */ def sumOnValue(implicit numeric: Numeric[V]): Source[(K, V), Mat] = { - val stage = Reduce.apply(sumByValue[K, V](numeric)) + val stage = Reduce.apply(sumByKey[K, V](numeric)) source.via(stage) } } @@ -270,13 +270,13 @@ object Implicits { * */ def sumOnValue(implicit numeric: Numeric[V]): Flow[(K, V), (K, V), Mat] = { - val stage = Reduce.apply(sumByValue[K, V](numeric)) + val stage = Reduce.apply(sumByKey[K, V](numeric)) flow.via(stage) } } private def getTupleKey[K, V](tuple: Tuple2[K, V]): K = tuple._1 - private def sumByValue[K, V](numeric: Numeric[V]): (Tuple2[K, V], Tuple2[K, V]) => Tuple2[K, V] = + private def sumByKey[K, V](numeric: Numeric[V]): (Tuple2[K, V], Tuple2[K, V]) => Tuple2[K, V] = (tuple1, tuple2) => Tuple2(tuple1._1, numeric.plus(tuple1._2, tuple2._2)) } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/1b6a234c/streaming/src/main/scala/org/apache/gearpump/streaming/dsl/Stream.scala ---------------------------------------------------------------------- diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/dsl/Stream.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/dsl/Stream.scala index 5ca92dd..786d496 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/dsl/Stream.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/dsl/Stream.scala @@ -172,7 +172,7 @@ class KVStream[K, V](stream: Stream[Tuple2[K, V]]) { * @return the sum stream */ def sum(implicit numeric: Numeric[V]): Stream[(K, V)] = { - stream.reduce(Stream.sumByValue[K, V](numeric), "sum") + stream.reduce(Stream.sumByKey[K, V](numeric), "sum") } } @@ -184,7 +184,7 @@ object Stream { def getTupleKey[K, V](tuple: Tuple2[K, V]): K = tuple._1 - def sumByValue[K, V](numeric: Numeric[V]): (Tuple2[K, V], Tuple2[K, V]) => Tuple2[K, V] + def sumByKey[K, V](numeric: Numeric[V]): (Tuple2[K, V], Tuple2[K, V]) => Tuple2[K, V] = (tuple1, tuple2) => Tuple2(tuple1._1, numeric.plus(tuple1._2, tuple2._2)) implicit def streamToKVStream[K, V](stream: Stream[Tuple2[K, V]]): KVStream[K, V] = {
