Repository: spark Updated Branches: refs/heads/branch-1.5 83cbf60a2 -> 33015009f
[SPARK-9960] [GRAPHX] sendMessage type fix in LabelPropagation.scala Author: zc he <[email protected]> Closes #8188 from farseer90718/farseer-patch-1. (cherry picked from commit 71a3af8a94f900a26ac7094f22ec1216cab62e15) Signed-off-by: Reynold Xin <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/33015009 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/33015009 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/33015009 Branch: refs/heads/branch-1.5 Commit: 33015009f5514fe510cdf5b486d2b84136a4522e Parents: 83cbf60 Author: zc he <[email protected]> Authored: Fri Aug 14 21:28:50 2015 -0700 Committer: Reynold Xin <[email protected]> Committed: Fri Aug 14 21:28:57 2015 -0700 ---------------------------------------------------------------------- .../main/scala/org/apache/spark/graphx/lib/LabelPropagation.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/33015009/graphx/src/main/scala/org/apache/spark/graphx/lib/LabelPropagation.scala ---------------------------------------------------------------------- diff --git a/graphx/src/main/scala/org/apache/spark/graphx/lib/LabelPropagation.scala b/graphx/src/main/scala/org/apache/spark/graphx/lib/LabelPropagation.scala index 2bcf868..a3ad6be 100644 --- a/graphx/src/main/scala/org/apache/spark/graphx/lib/LabelPropagation.scala +++ b/graphx/src/main/scala/org/apache/spark/graphx/lib/LabelPropagation.scala @@ -43,7 +43,7 @@ object LabelPropagation { */ def run[VD, ED: ClassTag](graph: Graph[VD, ED], maxSteps: Int): Graph[VertexId, ED] = { val lpaGraph = graph.mapVertices { case (vid, _) => vid } - def sendMessage(e: EdgeTriplet[VertexId, ED]): Iterator[(VertexId, Map[VertexId, VertexId])] = { + def sendMessage(e: EdgeTriplet[VertexId, ED]): Iterator[(VertexId, Map[VertexId, Long])] = { Iterator((e.srcId, Map(e.dstAttr -> 1L)), (e.dstId, Map(e.srcAttr -> 1L))) } def mergeMessage(count1: Map[VertexId, Long], count2: Map[VertexId, Long]) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
