diff options
| author | Ankur Dave <ankurdave@gmail.com> | 2014-09-03 23:49:47 -0700 |
|---|---|---|
| committer | Ankur Dave <ankurdave@gmail.com> | 2014-09-03 23:49:47 -0700 |
| commit | 00362dac976cd05b06638deb11d990d612429e0b (patch) | |
| tree | c9f9e1b0c9499b6687002a412d3f0823daa96ce4 /graphx/src/main | |
| parent | 1bed0a3869a526241381d2a74ba064e5b3721336 (diff) | |
| download | spark-00362dac976cd05b06638deb11d990d612429e0b.tar.gz spark-00362dac976cd05b06638deb11d990d612429e0b.tar.bz2 spark-00362dac976cd05b06638deb11d990d612429e0b.zip | |
[HOTFIX] [SPARK-3400] Revert 9b225ac "fix GraphX EdgeRDD zipPartitions"
9b225ac3072de522b40b46aba6df1f1c231f13ef has been causing GraphX tests
to fail nondeterministically, which is blocking development for others.
Author: Ankur Dave <ankurdave@gmail.com>
Closes #2271 from ankurdave/SPARK-3400 and squashes the following commits:
10c2a97 [Ankur Dave] [HOTFIX] [SPARK-3400] Revert 9b225ac "fix GraphX EdgeRDD zipPartitions"
Diffstat (limited to 'graphx/src/main')
| -rw-r--r-- | graphx/src/main/scala/org/apache/spark/graphx/EdgeRDD.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphx/src/main/scala/org/apache/spark/graphx/EdgeRDD.scala b/graphx/src/main/scala/org/apache/spark/graphx/EdgeRDD.scala index 35fbd47e6c..5bcb96b136 100644 --- a/graphx/src/main/scala/org/apache/spark/graphx/EdgeRDD.scala +++ b/graphx/src/main/scala/org/apache/spark/graphx/EdgeRDD.scala @@ -19,7 +19,7 @@ package org.apache.spark.graphx import scala.reflect.{classTag, ClassTag} -import org.apache.spark._ +import org.apache.spark.{OneToOneDependency, Partition, Partitioner, TaskContext} import org.apache.spark.rdd.RDD import org.apache.spark.storage.StorageLevel @@ -55,7 +55,7 @@ class EdgeRDD[@specialized ED: ClassTag, VD: ClassTag]( * partitioner that allows co-partitioning with `partitionsRDD`. */ override val partitioner = - partitionsRDD.partitioner.orElse(Some(new HashPartitioner(partitionsRDD.partitions.size))) + partitionsRDD.partitioner.orElse(Some(Partitioner.defaultPartitioner(partitionsRDD))) override def compute(part: Partition, context: TaskContext): Iterator[Edge[ED]] = { val p = firstParent[(PartitionID, EdgePartition[ED, VD])].iterator(part, context) |