diff options
author | Andy Konwinski <andyk@berkeley.edu> | 2012-09-12 19:28:55 -0700 |
---|---|---|
committer | Andy Konwinski <andyk@berkeley.edu> | 2012-09-12 19:28:55 -0700 |
commit | 1bcd09e09313fb7306a6c11e7e21d8ee73eb8edf (patch) | |
tree | 8813df080f1c04e276c0134c97f24c55d4d43cb7 | |
parent | 35adccd0088e5f0baa0eb97f8ca21e0d1c1ff71f (diff) | |
parent | 4b8b0d5c08f82ce2ce28c6495a9875a549cf8b3a (diff) | |
download | spark-1bcd09e09313fb7306a6c11e7e21d8ee73eb8edf.tar.gz spark-1bcd09e09313fb7306a6c11e7e21d8ee73eb8edf.tar.bz2 spark-1bcd09e09313fb7306a6c11e7e21d8ee73eb8edf.zip |
Merge remote-tracking branch 'public-spark/dev' into doc
-rw-r--r-- | core/src/main/scala/spark/scheduler/ShuffleMapTask.scala | 2 | ||||
-rw-r--r-- | docs/index.md | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/src/main/scala/spark/scheduler/ShuffleMapTask.scala b/core/src/main/scala/spark/scheduler/ShuffleMapTask.scala index 99984fb557..3bcc588015 100644 --- a/core/src/main/scala/spark/scheduler/ShuffleMapTask.scala +++ b/core/src/main/scala/spark/scheduler/ShuffleMapTask.scala @@ -188,7 +188,7 @@ class ShuffleMapTask( // Get a scala iterator from java map val iter: Iterator[(Any, Any)] = bucketIterators(i) // TODO: This should probably be DISK_ONLY - blockManager.put(blockId, iter, StorageLevel.MEMORY_ONLY, false) + blockManager.put(blockId, iter, StorageLevel.DISK_ONLY, false) } return SparkEnv.get.blockManager.blockManagerId diff --git a/docs/index.md b/docs/index.md index ac22363d3f..48ab151e41 100644 --- a/docs/index.md +++ b/docs/index.md @@ -62,6 +62,7 @@ of `project/SparkBuild.scala`, then rebuilding Spark (`sbt/sbt clean compile`). # Other Resources * [Spark Homepage](http://www.spark-project.org) +* [AMPCamp](http://ampcamp.berkeley.edu/): All AMPCamp presentation videos are available online. Going through the videos and exercises is a great way to sharpen your Spark skills. * [Paper describing the programming model](http://www.cs.berkeley.edu/~matei/papers/2012/nsdi_spark.pdf) * [Code Examples](http://spark-project.org/examples.html) (more also available in the [examples subfolder](https://github.com/mesos/spark/tree/master/examples/src/main/scala/spark/examples) of the Spark codebase) * [Mailing List](http://groups.google.com/group/spark-users) |