@@ -27,8 +27,6 @@ import org.apache.spark.storage.StorageLevel
2727import org .apache .spark .graphx .impl .RoutingTablePartition
2828import org .apache .spark .graphx .impl .ShippableVertexPartition
2929import org .apache .spark .graphx .impl .VertexAttributeBlock
30- import org .apache .spark .graphx .impl .RoutingTableMessageRDDFunctions ._
31- import org .apache .spark .graphx .impl .VertexRDDFunctions ._
3230
3331/**
3432 * Extends `RDD[(VertexId, VD)]` by ensuring that there is only one entry for each vertex and by
@@ -233,7 +231,7 @@ class VertexRDD[@specialized VD: ClassTag](
233231 case _ =>
234232 this .withPartitionsRDD[VD3 ](
235233 partitionsRDD.zipPartitions(
236- other.copartitionWithVertices (this .partitioner.get), preservesPartitioning = true ) {
234+ other.partitionBy (this .partitioner.get), preservesPartitioning = true ) {
237235 (partIter, msgs) => partIter.map(_.leftJoin(msgs)(f))
238236 }
239237 )
@@ -277,7 +275,7 @@ class VertexRDD[@specialized VD: ClassTag](
277275 case _ =>
278276 this .withPartitionsRDD(
279277 partitionsRDD.zipPartitions(
280- other.copartitionWithVertices (this .partitioner.get), preservesPartitioning = true ) {
278+ other.partitionBy (this .partitioner.get), preservesPartitioning = true ) {
281279 (partIter, msgs) => partIter.map(_.innerJoin(msgs)(f))
282280 }
283281 )
@@ -297,7 +295,7 @@ class VertexRDD[@specialized VD: ClassTag](
297295 */
298296 def aggregateUsingIndex [VD2 : ClassTag ](
299297 messages : RDD [(VertexId , VD2 )], reduceFunc : (VD2 , VD2 ) => VD2 ): VertexRDD [VD2 ] = {
300- val shuffled = messages.copartitionWithVertices (this .partitioner.get)
298+ val shuffled = messages.partitionBy (this .partitioner.get)
301299 val parts = partitionsRDD.zipPartitions(shuffled, true ) { (thisIter, msgIter) =>
302300 thisIter.map(_.aggregateUsingIndex(msgIter, reduceFunc))
303301 }
@@ -371,7 +369,7 @@ object VertexRDD {
371369 def apply [VD : ClassTag ](vertices : RDD [(VertexId , VD )]): VertexRDD [VD ] = {
372370 val vPartitioned : RDD [(VertexId , VD )] = vertices.partitioner match {
373371 case Some (p) => vertices
374- case None => vertices.copartitionWithVertices (new HashPartitioner (vertices.partitions.size))
372+ case None => vertices.partitionBy (new HashPartitioner (vertices.partitions.size))
375373 }
376374 val vertexPartitions = vPartitioned.mapPartitions(
377375 iter => Iterator (ShippableVertexPartition (iter)),
@@ -412,7 +410,7 @@ object VertexRDD {
412410 ): VertexRDD [VD ] = {
413411 val vPartitioned : RDD [(VertexId , VD )] = vertices.partitioner match {
414412 case Some (p) => vertices
415- case None => vertices.copartitionWithVertices (new HashPartitioner (vertices.partitions.size))
413+ case None => vertices.partitionBy (new HashPartitioner (vertices.partitions.size))
416414 }
417415 val routingTables = createRoutingTables(edges, vPartitioned.partitioner.get)
418416 val vertexPartitions = vPartitioned.zipPartitions(routingTables, preservesPartitioning = true ) {
@@ -454,7 +452,7 @@ object VertexRDD {
454452 .setName(" VertexRDD.createRoutingTables - vid2pid (aggregation)" )
455453
456454 val numEdgePartitions = edges.partitions.size
457- vid2pid.copartitionWithVertices (vertexPartitioner).mapPartitions(
455+ vid2pid.partitionBy (vertexPartitioner).mapPartitions(
458456 iter => Iterator (RoutingTablePartition .fromMsgs(numEdgePartitions, iter)),
459457 preservesPartitioning = true )
460458 }
0 commit comments