Revert the MEMORY_AND_DISK_SER changes.

rxin · rxin · commit 92c62a5361e4 · 2014-08-18T19:32:59.000-07:00
diff --git a/core/src/main/scala/org/apache/spark/broadcast/TorrentBroadcast.scala b/core/src/main/scala/org/apache/spark/broadcast/TorrentBroadcast.scala
@@ -89,13 +89,13 @@ private[spark] class TorrentBroadcast[T: ClassTag](
     val metaId = BroadcastBlockId(id, "meta")
     val metaInfo = TorrentInfo(null, totalBlocks, totalBytes)
     SparkEnv.get.blockManager.putSingle(
-      metaId, metaInfo, StorageLevel.MEMORY_AND_DISK_SER, tellMaster = true)
+      metaId, metaInfo, StorageLevel.MEMORY_AND_DISK, tellMaster = true)
 
     // Store individual pieces
     for (i <- 0 until totalBlocks) {
       val pieceId = BroadcastBlockId(id, "piece" + i)
       SparkEnv.get.blockManager.putSingle(
-        pieceId, tInfo.arrayOfBlocks(i), StorageLevel.MEMORY_AND_DISK_SER, tellMaster = true)
+        pieceId, tInfo.arrayOfBlocks(i), StorageLevel.MEMORY_AND_DISK, tellMaster = true)
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -89,13 +89,13 @@ private[spark] class TorrentBroadcast[T: ClassTag](`
`89`	`89`	`val metaId = BroadcastBlockId(id, "meta")`
`90`	`90`	`val metaInfo = TorrentInfo(null, totalBlocks, totalBytes)`
`91`	`91`	`SparkEnv.get.blockManager.putSingle(`
`92`		`- metaId, metaInfo, StorageLevel.MEMORY_AND_DISK_SER, tellMaster = true)`
	`92`	`+ metaId, metaInfo, StorageLevel.MEMORY_AND_DISK, tellMaster = true)`
`93`	`93`
`94`	`94`	`// Store individual pieces`
`95`	`95`	`for (i <- 0 until totalBlocks) {`
`96`	`96`	`val pieceId = BroadcastBlockId(id, "piece" + i)`
`97`	`97`	`SparkEnv.get.blockManager.putSingle(`
`98`		`- pieceId, tInfo.arrayOfBlocks(i), StorageLevel.MEMORY_AND_DISK_SER, tellMaster = true)`
	`98`	`+ pieceId, tInfo.arrayOfBlocks(i), StorageLevel.MEMORY_AND_DISK, tellMaster = true)`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`