aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatei Zaharia <matei@eecs.berkeley.edu>2012-09-28 23:40:56 -0700
committerMatei Zaharia <matei@eecs.berkeley.edu>2012-09-28 23:40:56 -0700
commit56dcad593641ef8de211fcb4303574a9f4509f89 (patch)
tree2558a1176bafa3067d205885f4b02c8841c8b83e
parent1d44644f4f13e4c7416492a95a935f74b87f7578 (diff)
downloadspark-56dcad593641ef8de211fcb4303574a9f4509f89.tar.gz
spark-56dcad593641ef8de211fcb4303574a9f4509f89.tar.bz2
spark-56dcad593641ef8de211fcb4303574a9f4509f89.zip
Don't create a Cache in SparkEnv because we don't use it
-rw-r--r--core/src/main/scala/spark/SparkEnv.scala6
1 files changed, 1 insertions, 5 deletions
diff --git a/core/src/main/scala/spark/SparkEnv.scala b/core/src/main/scala/spark/SparkEnv.scala
index 280c00b486..f2a52ab356 100644
--- a/core/src/main/scala/spark/SparkEnv.scala
+++ b/core/src/main/scala/spark/SparkEnv.scala
@@ -19,7 +19,6 @@ import spark.util.AkkaUtils
*/
class SparkEnv (
val actorSystem: ActorSystem,
- val cache: Cache,
val serializer: Serializer,
val closureSerializer: Serializer,
val cacheTracker: CacheTracker,
@@ -33,7 +32,7 @@ class SparkEnv (
/** No-parameter constructor for unit tests. */
def this() = {
- this(null, null, new JavaSerializer, new JavaSerializer, null, null, null, null, null, null, null)
+ this(null, new JavaSerializer, new JavaSerializer, null, null, null, null, null, null, null)
}
def stop() {
@@ -100,8 +99,6 @@ object SparkEnv {
val closureSerializer = instantiateClass[Serializer](
"spark.closure.serializer", "spark.JavaSerializer")
- val cache = instantiateClass[Cache]("spark.cache.class", "spark.BoundedMemoryCache")
-
val cacheTracker = new CacheTracker(actorSystem, isMaster, blockManager)
blockManager.cacheTracker = cacheTracker
@@ -116,7 +113,6 @@ object SparkEnv {
new SparkEnv(
actorSystem,
- cache,
serializer,
closureSerializer,
cacheTracker,