Skip to content

[SPARK-5623][GraphX] Replace an obsolete mapReduceTriplets with a new aggregateMessages in GraphSuite #4402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
maropu wants to merge 2 commits into from
Closed

[SPARK-5623][GraphX] Replace an obsolete mapReduceTriplets with a new aggregateMessages in GraphSuite #4402

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5810ff2
Replace an obsolete API
maropu Apr 17, 2015
182b39b
Fix a code-style error
maropu Apr 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions graphx/src/test/scala/org/apache/spark/graphx/GraphSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,8 @@ class GraphSuite extends FunSuite with LocalSparkContext {
val vertices: RDD[(VertexId, Int)] = sc.parallelize(Array((1L, 1), (2L, 2)))
val edges: RDD[Edge[Int]] = sc.parallelize(Array(Edge(1L, 2L, 0)))
val graph = Graph(vertices, edges).reverse
val result = graph.mapReduceTriplets[Int](et => Iterator((et.dstId, et.srcAttr)), _ + _)
assert(result.collect().toSet === Set((1L, 2)))
val result = graph.aggregateMessages[Int](ctx => ctx.sendToDst(ctx.srcAttr), _ + _)
assert(result.collect.toSet === Set((1L, 2)))
}
}

Expand Down Expand Up @@ -346,12 +346,13 @@ class GraphSuite extends FunSuite with LocalSparkContext {
val n = 5
val reverseStar = starGraph(sc, n).reverse.cache()
// outerJoinVertices changing type
val reverseStarDegrees = reverseStar.outerJoinVertices(reverseStar.outDegrees) {
(vid, a, bOpt) => bOpt.getOrElse(0)
}
val neighborDegreeSums = reverseStarDegrees.mapReduceTriplets(
et => Iterator((et.srcId, et.dstAttr), (et.dstId, et.srcAttr)),
(a: Int, b: Int) => a + b).collect().toSet
val reverseStarDegrees =
reverseStar.outerJoinVertices(reverseStar.outDegrees) {
(vid, a, bOpt) => bOpt.getOrElse(0) }
val neighborDegreeSums = reverseStarDegrees.aggregateMessages[Int]( ctx => {
ctx.sendToSrc(ctx.dstAttr)
ctx.sendToDst(ctx.srcAttr)
}, (a: Int, b: Int) => a + b).collect.toSet
assert(neighborDegreeSums === Set((0: VertexId, n)) ++ (1 to n).map(x => (x: VertexId, 0)))
// outerJoinVertices preserving type
val messages = reverseStar.vertices.mapValues { (vid, attr) => vid.toString }
Expand Down Expand Up @@ -422,9 +423,9 @@ class GraphSuite extends FunSuite with LocalSparkContext {
val edges = sc.parallelize((1 to n).map(x => (x: VertexId, 0: VertexId)),
numEdgePartitions)
val graph = Graph.fromEdgeTuples(edges, 1)
val neighborAttrSums = graph.mapReduceTriplets[Int](
et => Iterator((et.dstId, et.srcAttr)), _ + _)
assert(neighborAttrSums.collect().toSet === Set((0: VertexId, n)))
val neighborAttrSums = graph.aggregateMessages[Int](
ctx => ctx.sendToDst(ctx.srcAttr), _ + _)
assert(neighborAttrSums.collect.toSet === Set((0: VertexId, n)))
} finally {
sc.stop()
}
Expand Down