Do not perform a map-side sort unless we're also doing map-side aggre…

…gation
nemccarthy · May 27, 2015 · 8522b6a · 8522b6a
1 parent 08e40f3
commit 8522b6a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/core/src/main/scala/org/apache/spark/shuffle/sort/SortShuffleWriter.scala b/core/src/main/scala/org/apache/spark/shuffle/sort/SortShuffleWriter.scala
@@ -55,7 +55,7 @@ private[spark] class SortShuffleWriter[K, V, C](
       new ExternalSorter[K, V, C](
         dep.aggregator, Some(dep.partitioner), dep.keyOrdering, dep.serializer)
     } else if (SortShuffleWriter.shouldBypassMergeSort(
-        SparkEnv.get.conf, dep.partitioner.numPartitions, aggregator = None, dep.keyOrdering)) {
+        SparkEnv.get.conf, dep.partitioner.numPartitions, aggregator = None, keyOrdering = None)) {
       // If there are fewer than spark.shuffle.sort.bypassMergeThreshold partitions and we don't
       // need local aggregation and sorting, write numPartitions files directly and just concatenate
       // them at the end. This avoids doing serialization and deserialization twice to merge