You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2014/07/23 03:14:51 UTC
git commit: Graphx example
Repository: spark
Updated Branches:
refs/heads/master 79fe7634f -> 5f7b99168
Graphx example
fix examples
Author: CrazyJvm <cr...@gmail.com>
Closes #1523 from CrazyJvm/graphx-example and squashes the following commits:
663457a [CrazyJvm] outDegrees does not take parameters
7cfff1d [CrazyJvm] fix example for joinVertices
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/5f7b9916
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/5f7b9916
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/5f7b9916
Branch: refs/heads/master
Commit: 5f7b99168004f06191dcf121fe985e90bf7dcf74
Parents: 79fe763
Author: CrazyJvm <cr...@gmail.com>
Authored: Tue Jul 22 18:14:44 2014 -0700
Committer: Ankur Dave <an...@gmail.com>
Committed: Tue Jul 22 18:14:44 2014 -0700
----------------------------------------------------------------------
graphx/src/main/scala/org/apache/spark/graphx/Graph.scala | 2 +-
graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/5f7b9916/graphx/src/main/scala/org/apache/spark/graphx/Graph.scala
----------------------------------------------------------------------
diff --git a/graphx/src/main/scala/org/apache/spark/graphx/Graph.scala b/graphx/src/main/scala/org/apache/spark/graphx/Graph.scala
index 3507f35..fa4b891 100644
--- a/graphx/src/main/scala/org/apache/spark/graphx/Graph.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/Graph.scala
@@ -344,7 +344,7 @@ abstract class Graph[VD: ClassTag, ED: ClassTag] protected () extends Serializab
*
* {{{
* val rawGraph: Graph[_, _] = Graph.textFile("webgraph")
- * val outDeg: RDD[(VertexId, Int)] = rawGraph.outDegrees()
+ * val outDeg: RDD[(VertexId, Int)] = rawGraph.outDegrees
* val graph = rawGraph.outerJoinVertices(outDeg) {
* (vid, data, optDeg) => optDeg.getOrElse(0)
* }
http://git-wip-us.apache.org/repos/asf/spark/blob/5f7b9916/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
----------------------------------------------------------------------
diff --git a/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala b/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
index edd5b79..02afaa9 100644
--- a/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
@@ -198,10 +198,10 @@ class GraphOps[VD: ClassTag, ED: ClassTag](graph: Graph[VD, ED]) extends Seriali
*
* {{{
* val rawGraph: Graph[Int, Int] = GraphLoader.edgeListFile(sc, "webgraph")
- * .mapVertices(v => 0)
- * val outDeg: RDD[(Int, Int)] = rawGraph.outDegrees
- * val graph = rawGraph.leftJoinVertices[Int,Int](outDeg,
- * (v, deg) => deg )
+ * .mapVertices((_, _) => 0)
+ * val outDeg = rawGraph.outDegrees
+ * val graph = rawGraph.joinVertices[Int](outDeg)
+ * ((_, _, outDeg) => outDeg)
* }}}
*
*/