Repository: spark Updated Branches: refs/heads/branch-1.0 b4ea3d972 -> e43e31ded
remove unnecessary brace and semicolon in 'putBlockInfo.synchronize' block delete semicolon Author: Chen Chao <crazy...@gmail.com> Closes #411 from CrazyJvm/patch-5 and squashes the following commits: 72333a3 [Chen Chao] remove unnecessary brace de5d9a7 [Chen Chao] style fix (cherry picked from commit 016a87764a7eb1092b6489e5f411d9e67c56e027) Signed-off-by: Reynold Xin <r...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/e43e31de Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/e43e31de Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/e43e31de Branch: refs/heads/branch-1.0 Commit: e43e31ded43af87d85d869127db0193c0f18b506 Parents: b4ea3d9 Author: Chen Chao <crazy...@gmail.com> Authored: Wed Apr 16 17:30:01 2014 -0700 Committer: Reynold Xin <r...@apache.org> Committed: Wed Apr 16 17:30:11 2014 -0700 ---------------------------------------------------------------------- .../scala/org/apache/spark/storage/BlockManager.scala | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/e43e31de/core/src/main/scala/org/apache/spark/storage/BlockManager.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/storage/BlockManager.scala b/core/src/main/scala/org/apache/spark/storage/BlockManager.scala index f140170..f15fa4d 100644 --- a/core/src/main/scala/org/apache/spark/storage/BlockManager.scala +++ b/core/src/main/scala/org/apache/spark/storage/BlockManager.scala @@ -658,10 +658,9 @@ private[spark] class BlockManager( memoryStore.putValues(blockId, iterator, level, true) case ArrayBufferValues(array) => memoryStore.putValues(blockId, array, level, true) - case ByteBufferValues(bytes) => { + case ByteBufferValues(bytes) => bytes.rewind() memoryStore.putBytes(blockId, bytes, level) - } } size = res.size res.data match { @@ -677,10 +676,9 @@ private[spark] class BlockManager( tachyonStore.putValues(blockId, iterator, level, false) case ArrayBufferValues(array) => tachyonStore.putValues(blockId, array, level, false) - case ByteBufferValues(bytes) => { - bytes.rewind(); + case ByteBufferValues(bytes) => + bytes.rewind() tachyonStore.putBytes(blockId, bytes, level) - } } size = res.size res.data match { @@ -697,10 +695,9 @@ private[spark] class BlockManager( diskStore.putValues(blockId, iterator, level, askForBytes) case ArrayBufferValues(array) => diskStore.putValues(blockId, array, level, askForBytes) - case ByteBufferValues(bytes) => { + case ByteBufferValues(bytes) => bytes.rewind() diskStore.putBytes(blockId, bytes, level) - } } size = res.size res.data match {
