Skip to content

Commit

Permalink
Merge branch 'master' of github.com:apache/spark into yarn-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewor14 committed May 9, 2014
2 parents 381fe32 + 59577df commit c10e8c7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions core/src/main/scala/org/apache/spark/rdd/RDD.scala
Original file line number Diff line number Diff line change
Expand Up @@ -330,9 +330,9 @@ abstract class RDD[T: ClassTag](
if (shuffle) {
// include a shuffle step so that our upstream tasks are still distributed
new CoalescedRDD(
new ShuffledRDD[Int, T, (Int, T)](map(x => (Utils.random.nextInt(), x)),
new ShuffledRDD[T, Null, (T, Null)](map(x => (x, null)),
new HashPartitioner(numPartitions)),
numPartitions).values
numPartitions).keys
} else {
new CoalescedRDD(this, numPartitions)
}
Expand Down

0 comments on commit c10e8c7

Please sign in to comment.