diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-09-30 22:52:16 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-09-30 22:52:16 -0700 |
| commit | 2314132d57878152a84325f86ea320bdbc7cca31 (patch) | |
| tree | e85b29055cd145ffdefa9f67bc815dff96303a5f /core/src/main | |
| parent | 3128c57f9031541d1b77e763b614751b536847b0 (diff) | |
| download | spark-2314132d57878152a84325f86ea320bdbc7cca31.tar.gz spark-2314132d57878152a84325f86ea320bdbc7cca31.tar.bz2 spark-2314132d57878152a84325f86ea320bdbc7cca31.zip | |
Added a (failing) test for LRU with MEMORY_AND_DISK.
Diffstat (limited to 'core/src/main')
| -rw-r--r-- | core/src/main/scala/spark/storage/BlockManager.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/main/scala/spark/storage/BlockManager.scala b/core/src/main/scala/spark/storage/BlockManager.scala index 5384274d65..a66f812662 100644 --- a/core/src/main/scala/spark/storage/BlockManager.scala +++ b/core/src/main/scala/spark/storage/BlockManager.scala @@ -65,8 +65,8 @@ class BlockManager(val master: BlockManagerMaster, val serializer: Serializer, m private val locker = new BlockLocker(NUM_LOCKS) private val blockInfo = new ConcurrentHashMap[String, BlockInfo]() - private val memoryStore: BlockStore = new MemoryStore(this, maxMemory) - private val diskStore: BlockStore = new DiskStore(this, + private[storage] val memoryStore: BlockStore = new MemoryStore(this, maxMemory) + private[storage] val diskStore: BlockStore = new DiskStore(this, System.getProperty("spark.local.dir", System.getProperty("java.io.tmpdir"))) val connectionManager = new ConnectionManager(0) |