Repository: crunch Updated Branches: refs/heads/master 188360048 -> 85f24c5c8
CRUNCH-577 Use getLongBytes() to correctly parse dfs block size. Signed-off-by: Josh Wills <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/crunch/repo Commit: http://git-wip-us.apache.org/repos/asf/crunch/commit/85f24c5c Tree: http://git-wip-us.apache.org/repos/asf/crunch/tree/85f24c5c Diff: http://git-wip-us.apache.org/repos/asf/crunch/diff/85f24c5c Branch: refs/heads/master Commit: 85f24c5c8c95964516b691477d949a948149e7a2 Parents: 1883600 Author: Tomáš Äechal <[email protected]> Authored: Tue Nov 10 12:11:13 2015 +0100 Committer: Josh Wills <[email protected]> Committed: Tue Nov 10 15:56:25 2015 -0800 ---------------------------------------------------------------------- .../apache/crunch/impl/mr/run/CrunchCombineFileInputFormat.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/crunch/blob/85f24c5c/crunch-core/src/main/java/org/apache/crunch/impl/mr/run/CrunchCombineFileInputFormat.java ---------------------------------------------------------------------- diff --git a/crunch-core/src/main/java/org/apache/crunch/impl/mr/run/CrunchCombineFileInputFormat.java b/crunch-core/src/main/java/org/apache/crunch/impl/mr/run/CrunchCombineFileInputFormat.java index 2413ccf..715a48d 100644 --- a/crunch-core/src/main/java/org/apache/crunch/impl/mr/run/CrunchCombineFileInputFormat.java +++ b/crunch-core/src/main/java/org/apache/crunch/impl/mr/run/CrunchCombineFileInputFormat.java @@ -35,7 +35,7 @@ public class CrunchCombineFileInputFormat<K, V> extends CombineFileInputFormat<K if (conf.get(RuntimeParameters.COMBINE_FILE_BLOCK_SIZE) != null) { setMaxSplitSize(conf.getLong(RuntimeParameters.COMBINE_FILE_BLOCK_SIZE, 0)); } else { - setMaxSplitSize(jobContext.getConfiguration().getLong("dfs.block.size", 134217728L)); + setMaxSplitSize(jobContext.getConfiguration().getLongBytes("dfs.blocksize", 134217728L)); } } }
