Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SPARK-2044] Pluggable interface for shuffles #1009

Closed
wants to merge 8 commits into from
Closed

[SPARK-2044] Pluggable interface for shuffles #1009

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
75cc044
Partial work to move hash shuffle in
mateiz Jun 6, 2014
55c7717
Changed RDD code to use ShuffleReader
mateiz Jun 6, 2014
f6f011d
Move hash shuffle reader behind ShuffleManager interface
mateiz Jun 6, 2014
4f681ba
Move write part of ShuffleMapTask to ShuffleManager
mateiz Jun 8, 2014
ac56831
Bug fix and better error message
mateiz Jun 8, 2014
1513d4e
Add ASF header
mateiz Jun 8, 2014
be33d3f
review comments
mateiz Jun 10, 2014
7a09862
review comments
mateiz Jun 12, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
review comments
  • Loading branch information
@mateiz
mateiz committed Jun 10, 2014
commit be33d3f7a333c2f069fd503e1c9fb4fb4b8f56b0
2 changes: 1 addition & 1 deletion core/src/main/scala/org/apache/spark/SparkEnv.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ object SparkEnv extends Logging {
def instantiateClass[T](propertyName: String, defaultClassName: String): T = {
val name = conf.get(propertyName, defaultClassName)
val cls = Class.forName(name, true, Utils.getContextOrSparkClassLoader)
// Look for a constructor taking a SparkConf and a boolean isDriver, than one taking just
// Look for a constructor taking a SparkConf and a boolean isDriver, then one taking just
// SparkConf, then one taking no arguments
try {
cls.getConstructor(classOf[SparkConf], java.lang.Boolean.TYPE)
Expand Down
3 changes: 1 addition & 2 deletions core/src/main/scala/org/apache/spark/shuffle/hash/BlockStoreShuffleFetcher.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,9 @@ import scala.collection.mutable.HashMap

import org.apache.spark.executor.ShuffleReadMetrics
import org.apache.spark.serializer.Serializer
import org.apache.spark.storage.{BlockId, BlockManagerId}
import org.apache.spark.storage.{BlockId, BlockManagerId, ShuffleBlockId}
import org.apache.spark.util.CompletionIterator
import org.apache.spark._
import org.apache.spark.storage.ShuffleBlockId

private[hash] object BlockStoreShuffleFetcher extends Logging {
def fetch[T](
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/scala/org/apache/spark/shuffle/hash/HashShuffleManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ import org.apache.spark._
import org.apache.spark.shuffle._

/**
* A ShuffleManager using the hash-based implementation available up to and including Spark 1.0.
* A ShuffleManager using hashing, that creates one output file per reduce partition on each
* mapper (possibly reusing these across waves of tasks).
*/
class HashShuffleManager(conf: SparkConf) extends ShuffleManager {
/* Register a shuffle with the manager and obtain a handle for it to pass to tasks. */
Expand Down