diff options
Diffstat (limited to 'core/src/main/scala/spark/storage/BlockManager.scala')
| -rw-r--r-- | core/src/main/scala/spark/storage/BlockManager.scala | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/src/main/scala/spark/storage/BlockManager.scala b/core/src/main/scala/spark/storage/BlockManager.scala index 3a51f6bd96..15748b70d5 100644 --- a/core/src/main/scala/spark/storage/BlockManager.scala +++ b/core/src/main/scala/spark/storage/BlockManager.scala @@ -614,10 +614,9 @@ class BlockManager(val master: BlockManagerMaster, val serializer: Serializer, m } def dataDeserialize(bytes: ByteBuffer): Iterator[Any] = { - /*serializer.newInstance().deserializeMany(bytes)*/ - val ser = serializer.newInstance() bytes.rewind() - return ser.deserializeStream(new ByteBufferInputStream(bytes)).toIterator + val ser = serializer.newInstance() + return ser.deserializeStream(new ByteBufferInputStream(bytes)).asIterator } def stop() { @@ -632,7 +631,7 @@ class BlockManager(val master: BlockManagerMaster, val serializer: Serializer, m object BlockManager { def getNumParallelFetchesFromSystemProperties(): Int = { - System.getProperty("spark.blockManager.parallelFetches", "8").toInt + System.getProperty("spark.blockManager.parallelFetches", "4").toInt } def getMaxMemoryFromSystemProperties(): Long = { |