diff options
| author | Ankur Dave <ankurdave@gmail.com> | 2014-01-03 12:33:23 -0700 |
|---|---|---|
| committer | Ankur Dave <ankurdave@gmail.com> | 2014-01-08 21:19:14 -0800 |
| commit | 78d6b13ac88d4f0e52cf430d0bc3c1eb5369e4dc (patch) | |
| tree | f2519754e74ea41442bff2741d68663ae835c6ef | |
| parent | 91227566bc9d8aabaec3f2a37a09a17afa20989c (diff) | |
| download | spark-78d6b13ac88d4f0e52cf430d0bc3c1eb5369e4dc.tar.gz spark-78d6b13ac88d4f0e52cf430d0bc3c1eb5369e4dc.tar.bz2 spark-78d6b13ac88d4f0e52cf430d0bc3c1eb5369e4dc.zip | |
Fix mis-merge in 44fd30d3fbcf830deecbe8ea3e8ea165e74e6edd
| -rw-r--r-- | core/src/main/scala/org/apache/spark/rdd/RDD.scala | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/src/main/scala/org/apache/spark/rdd/RDD.scala b/core/src/main/scala/org/apache/spark/rdd/RDD.scala index 3f41b66279..2142ae730e 100644 --- a/core/src/main/scala/org/apache/spark/rdd/RDD.scala +++ b/core/src/main/scala/org/apache/spark/rdd/RDD.scala @@ -548,6 +548,11 @@ abstract class RDD[T: ClassTag]( * of elements in each partition. */ def zipPartitions[B: ClassTag, V: ClassTag] + (rdd2: RDD[B], preservesPartitioning: Boolean) + (f: (Iterator[T], Iterator[B]) => Iterator[V]): RDD[V] = + new ZippedPartitionsRDD2(sc, sc.clean(f), this, rdd2, preservesPartitioning) + + def zipPartitions[B: ClassTag, V: ClassTag] (rdd2: RDD[B]) (f: (Iterator[T], Iterator[B]) => Iterator[V]): RDD[V] = new ZippedPartitionsRDD2(sc, sc.clean(f), this, rdd2, false) |