Github user squito commented on a diff in the pull request:
https://github.com/apache/spark/pull/2851#discussion_r26393526
--- Diff: core/src/main/scala/org/apache/spark/storage/StorageUtils.scala
---
@@ -101,25 +122,30 @@ class StorageStatus(val blockManagerId:
BlockManagerId, val maxMem: Long) {
private[spark] def updateBlock(blockId: BlockId, blockStatus:
BlockStatus): Unit = {
addBlock(blockId, blockStatus)
}
+
+ private def getIdAndBlockMap(blockId: BlockId) = blockId match {
+ case RDDBlockId(rddId, _) => (rddId.toLong, _rddBlocks)
+ case BroadcastBlockId(broadcastId, _) => (broadcastId,
_broadcastBlocks)
+ }
/** Remove the given block from this storage status. */
private[spark] def removeBlock(blockId: BlockId): Option[BlockStatus] = {
updateStorageInfo(blockId, BlockStatus.empty)
blockId match {
- case RDDBlockId(rddId, _) =>
- // Actually remove the block, if it exists
- if (_rddBlocks.contains(rddId)) {
- val removed = _rddBlocks(rddId).remove(blockId)
- // If the given RDD has no more blocks left, remove the RDD
- if (_rddBlocks(rddId).isEmpty) {
- _rddBlocks.remove(rddId)
+ case rddOrBroadcastBlockId @ (_: BroadcastBlockId | _: RDDBlockId) =>
+ val (id, blockMap) = getIdAndBlockMap(rddOrBroadcastBlockId)
+ var removed: Option[BlockStatus] = None
+ if (blockMap.contains(id)) {
+ removed = blockMap(id).remove(blockId)
--- End diff --
you don't need the `var` here, you can keep the `val` like before:
```
if (blockMap.contains(id)) {
val removed = blockMap(id).remove(blockId)
...
```
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
