Skip to content

Commit

Permalink
fix the scalastyle errors
Browse files Browse the repository at this point in the history
  • Loading branch information
RongGu committed Mar 17, 2014
1 parent 791189b commit 556978b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
Expand Up @@ -144,7 +144,7 @@ private[spark] class BlockManager(
* Construct a BlockManager with a memory limit set based on system properties.
*/
def this(execId: String, actorSystem: ActorSystem, master: BlockManagerMaster,
serializer: Serializer, conf: SparkConf, securityManager: SecurityManager, appId: String) = {
serializer: Serializer, conf: SparkConf, securityManager: SecurityManager, appId: String) = {
this(execId, actorSystem, master, serializer, BlockManager.getMaxMemory(conf), conf,
securityManager, appId)
}
Expand Down
Expand Up @@ -264,7 +264,8 @@ class BlockManagerMasterActor(val isLocal: Boolean, conf: SparkConf) extends Act
return
}

blockManagerInfo(blockManagerId).updateBlockInfo(blockId, storageLevel, memSize, diskSize, tachyonSize)
blockManagerInfo(blockManagerId).updateBlockInfo(
blockId, storageLevel, memSize, diskSize, tachyonSize)

var locations: mutable.HashSet[BlockManagerId] = null
if (blockLocations.containsKey(blockId)) {
Expand Down
Expand Up @@ -90,7 +90,8 @@ private[storage] object BlockManagerMessages {
}

// For pattern-matching
def unapply(h: UpdateBlockInfo): Option[(BlockManagerId, BlockId, StorageLevel, Long, Long, Long)] = {
def unapply(h: UpdateBlockInfo)
: Option[(BlockManagerId, BlockId, StorageLevel, Long, Long, Long)] = {
Some((h.blockManagerId, h.blockId, h.storageLevel, h.memSize, h.diskSize, h.tachyonSize))
}
}
Expand Down

0 comments on commit 556978b

Please sign in to comment.