From 4261e834cb9c446366569a8dd49d3ba7c1e72ffc Mon Sep 17 00:00:00 2001 From: Aaron Davidson Date: Sat, 26 Oct 2013 23:53:38 -0700 Subject: Use flag instead of name check. --- core/src/main/scala/org/apache/spark/storage/BlockManager.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'core') 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 c02c0327ac..dbe573dc64 100644 --- a/core/src/main/scala/org/apache/spark/storage/BlockManager.scala +++ b/core/src/main/scala/org/apache/spark/storage/BlockManager.scala @@ -523,8 +523,7 @@ private[spark] class BlockManager( val file = diskBlockManager.createBlockFile(blockId, filename, allowAppending = true) val writer = new DiskBlockObjectWriter(blockId, file, serializer, bufferSize, compressStream) writer.registerCloseEventHandler(() => { - if (blockId.name != filename) { - // Avoid producing mappings if we're using unique filenames for blocks. + if (shuffleBlockManager.consolidateShuffleFiles) { diskBlockManager.mapBlockToFileSegment(blockId, writer.fileSegment()) } val myInfo = new BlockInfo(StorageLevel.DISK_ONLY, false) -- cgit v1.2.3