Remove unnecessary map() on return Iterator

massie · massie · commit f45848936d7d · 2015-06-11T09:59:47.000-07:00
diff --git a/core/src/main/scala/org/apache/spark/shuffle/hash/HashShuffleReader.scala b/core/src/main/scala/org/apache/spark/shuffle/hash/HashShuffleReader.scala
@@ -80,9 +80,7 @@ private[spark] class HashShuffleReader[K, C](
       }
     } else {
       require(!dep.mapSideCombine, "Map-side combine without Aggregator specified!")
-
-      // Convert the Product2s to pairs since this is what downstream RDDs currently expect
-      interruptibleIter.asInstanceOf[Iterator[Product2[K, C]]].map(pair => (pair._1, pair._2))
+      interruptibleIter.asInstanceOf[Iterator[Product2[K, C]]]
     }
 
     // Sort the output if there is a sort ordering defined.

Original file line number	Diff line number	Diff line change
`@@ -80,9 +80,7 @@ private[spark] class HashShuffleReader[K, C](`
`80`	`80`	`}`
`81`	`81`	`} else {`
`82`	`82`	`require(!dep.mapSideCombine, "Map-side combine without Aggregator specified!")`
`83`		`-`
`84`		`- // Convert the Product2s to pairs since this is what downstream RDDs currently expect`
`85`		`- interruptibleIter.asInstanceOf[Iterator[Product2[K, C]]].map(pair => (pair._1, pair._2))`
	`83`	`+ interruptibleIter.asInstanceOf[Iterator[Product2[K, C]]]`
`86`	`84`	`}`
`87`	`85`
`88`	`86`	`// Sort the output if there is a sort ordering defined.`