Instead of checking whether block name = file name, can we use diskBlockManager.consolidateShuffleFiles?