spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayousterh...@apache.org
Subject git commit: [SPARK-4102] Remove unused ShuffleReader.stop() method.
Date Thu, 30 Oct 2014 06:52:52 GMT
Repository: spark
Updated Branches:
  refs/heads/master cd739bd75 -> 6db315746


[SPARK-4102] Remove unused ShuffleReader.stop() method.

This method is not implemented by the only subclass
(HashShuffleReader), nor is it ever called. While the
use of Scala's fancy "???" was pretty exciting, the method's
existence can only lead to confusion and it therefore should
be deleted.

mateiz was there a reason for adding this that I'm
missing?

Author: Kay Ousterhout <kayousterhout@gmail.com>

Closes #2966 from kayousterhout/SPARK-4102 and squashes the following commits:

532c564 [Kay Ousterhout] Added back commented-out method, as per Matei's request
904655e [Kay Ousterhout] [SPARK-4102] Remove unused ShuffleReader.stop() method.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/6db31574
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/6db31574
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/6db31574

Branch: refs/heads/master
Commit: 6db3157464e36f7a572ada5f1e7f88730aa23dbd
Parents: cd739bd
Author: Kay Ousterhout <kayousterhout@gmail.com>
Authored: Wed Oct 29 23:52:46 2014 -0700
Committer: Kay Ousterhout <kayousterhout@gmail.com>
Committed: Wed Oct 29 23:52:46 2014 -0700

----------------------------------------------------------------------
 .../main/scala/org/apache/spark/shuffle/ShuffleReader.scala  | 8 ++++++--
 .../org/apache/spark/shuffle/hash/HashShuffleReader.scala    | 3 ---
 2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/6db31574/core/src/main/scala/org/apache/spark/shuffle/ShuffleReader.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/shuffle/ShuffleReader.scala b/core/src/main/scala/org/apache/spark/shuffle/ShuffleReader.scala
index b30e366..292e483 100644
--- a/core/src/main/scala/org/apache/spark/shuffle/ShuffleReader.scala
+++ b/core/src/main/scala/org/apache/spark/shuffle/ShuffleReader.scala
@@ -24,6 +24,10 @@ private[spark] trait ShuffleReader[K, C] {
   /** Read the combined key-values for this reduce task */
   def read(): Iterator[Product2[K, C]]
 
-  /** Close this reader */
-  def stop(): Unit
+  /**
+   * Close this reader.
+   * TODO: Add this back when we make the ShuffleReader a developer API that others can implement
+   * (at which point this will likely be necessary).
+   */
+  // def stop(): Unit
 }

http://git-wip-us.apache.org/repos/asf/spark/blob/6db31574/core/src/main/scala/org/apache/spark/shuffle/hash/HashShuffleReader.scala
----------------------------------------------------------------------
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
index 88a5f1e..5baf45d 100644
--- a/core/src/main/scala/org/apache/spark/shuffle/hash/HashShuffleReader.scala
+++ b/core/src/main/scala/org/apache/spark/shuffle/hash/HashShuffleReader.scala
@@ -66,7 +66,4 @@ private[spark] class HashShuffleReader[K, C](
         aggregatedIter
     }
   }
-
-  /** Close this reader */
-  override def stop(): Unit = ???
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message