diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-06-15 23:47:11 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-06-15 23:47:11 -0700 |
| commit | f58da6164eaf13dd986a39a40535975096b71b44 (patch) | |
| tree | 78ccc05ff8b49bd8ec903d0481ecfebaa28ed574 /bagel | |
| parent | b5cf47cda382601e3f1400884415c9a6bd508a13 (diff) | |
| parent | 4449eb97834ed6191dc0937d255c475191895980 (diff) | |
| download | spark-f58da6164eaf13dd986a39a40535975096b71b44.tar.gz spark-f58da6164eaf13dd986a39a40535975096b71b44.tar.bz2 spark-f58da6164eaf13dd986a39a40535975096b71b44.zip | |
Merge branch 'master' into dev
Diffstat (limited to 'bagel')
| -rw-r--r-- | bagel/src/main/scala/spark/bagel/Bagel.scala | 3 | ||||
| -rw-r--r-- | bagel/src/main/scala/spark/bagel/examples/WikipediaPageRankStandalone.scala | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/bagel/src/main/scala/spark/bagel/Bagel.scala b/bagel/src/main/scala/spark/bagel/Bagel.scala index 2f57c9c0fd..996ca2a877 100644 --- a/bagel/src/main/scala/spark/bagel/Bagel.scala +++ b/bagel/src/main/scala/spark/bagel/Bagel.scala @@ -30,8 +30,7 @@ object Bagel extends Logging { val aggregated = agg(verts, aggregator) val combinedMsgs = msgs.combineByKey( - combiner.createCombiner, combiner.mergeMsg, combiner.mergeCombiners, - splits, partitioner) + combiner.createCombiner _, combiner.mergeMsg _, combiner.mergeCombiners _, partitioner) val grouped = combinedMsgs.groupWith(verts) val (processed, numMsgs, numActiveVerts) = comp[K, V, M, C](sc, grouped, compute(_, _, aggregated, superstep)) diff --git a/bagel/src/main/scala/spark/bagel/examples/WikipediaPageRankStandalone.scala b/bagel/src/main/scala/spark/bagel/examples/WikipediaPageRankStandalone.scala index 4c18cb9134..ed8ace3a57 100644 --- a/bagel/src/main/scala/spark/bagel/examples/WikipediaPageRankStandalone.scala +++ b/bagel/src/main/scala/spark/bagel/examples/WikipediaPageRankStandalone.scala @@ -106,7 +106,6 @@ object WikipediaPageRankStandalone { ranks = (contribs.combineByKey((x: Double) => x, (x: Double, y: Double) => x + y, (x: Double, y: Double) => x + y, - numSplits, partitioner) .mapValues(sum => a/n + (1-a)*sum)) } |