Rename SortShuffleSorter to SortShuffleFileWriter

This is a better name, since one of the implementations never sorts.
jeanlyn · May 26, 2015 · 25b964f · 25b964f
1 parent 0d9848c
commit 25b964f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/core/src/main/scala/org/apache/spark/shuffle/sort/BypassMergeSortShuffleWriter.scala b/core/src/main/scala/org/apache/spark/shuffle/sort/BypassMergeSortShuffleWriter.scala
@@ -42,7 +42,7 @@ private[spark] class BypassMergeSortShuffleWriter[K, V](
     partitioner: Partitioner,
     writeMetrics: ShuffleWriteMetrics,
     serializer: Serializer)
-  extends Logging with SortShuffleSorter[K, V] {
+  extends Logging with SortShuffleFileWriter[K, V] {
 
   private[this] val numPartitions = partitioner.numPartitions
 

diff --git a/...park/shuffle/sort/SortShuffleSorter.scala → .../shuffle/sort/SortShuffleFileWriter.scala b/...park/shuffle/sort/SortShuffleSorter.scala → .../shuffle/sort/SortShuffleFileWriter.scala
@@ -22,7 +22,10 @@ import java.io.{IOException, File}
 import org.apache.spark.TaskContext
 import org.apache.spark.storage.BlockId
 
-private[spark] trait SortShuffleSorter[K, V] {
+/**
+ * Interface for objects that [[SortShuffleWriter]] uses to write its output files.
+ */
+private[spark] trait SortShuffleFileWriter[K, V] {
 
   @throws[IOException]
   def insertAll(records: Iterator[_ <: Product2[K, V]]): Unit

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
@@ -36,7 +36,7 @@ private[spark] class SortShuffleWriter[K, V, C](
 
   private val blockManager = SparkEnv.get.blockManager
 
-  private var sorter: SortShuffleSorter[K, V] = null
+  private var sorter: SortShuffleFileWriter[K, V] = null
 
   // Are we in the process of stopping? Because map tasks can call stop() with success = true
   // and then call stop() with success = false if they get an exception, we want to make sure

diff --git a/core/src/main/scala/org/apache/spark/util/collection/ExternalSorter.scala b/core/src/main/scala/org/apache/spark/util/collection/ExternalSorter.scala
@@ -29,7 +29,7 @@ import com.google.common.io.ByteStreams
 import org.apache.spark._
 import org.apache.spark.serializer._
 import org.apache.spark.executor.ShuffleWriteMetrics
-import org.apache.spark.shuffle.sort.{SortShuffleWriter, SortShuffleSorter}
+import org.apache.spark.shuffle.sort.{SortShuffleFileWriter, SortShuffleWriter}
 import org.apache.spark.storage.{BlockId, BlockObjectWriter}
 
 /**
@@ -94,7 +94,7 @@ private[spark] class ExternalSorter[K, V, C](
     serializer: Option[Serializer] = None)
   extends Logging
   with Spillable[WritablePartitionedPairCollection[K, C]]
-  with SortShuffleSorter[K, V] {
+  with SortShuffleFileWriter[K, V] {
 
   private val conf = SparkEnv.get.conf