Repository: hadoop Updated Branches: refs/heads/trunk 99271b762 -> 41ae7768e
MAPREDUCE-6406. Update FileOutputCommitter.FILEOUTPUTCOMMITTER_ALGORITHM_VERSION_DEFAULT to match mapred-default.xml. Contributed by Ray Chiang. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/41ae7768 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/41ae7768 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/41ae7768 Branch: refs/heads/trunk Commit: 41ae7768ebb8637c09c7f9733bcfe9dc43dbce69 Parents: 99271b7 Author: Devaraj K <[email protected]> Authored: Tue Jun 23 10:23:44 2015 +0530 Committer: Devaraj K <[email protected]> Committed: Tue Jun 23 10:23:44 2015 +0530 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../apache/hadoop/mapreduce/lib/output/FileOutputCommitter.java | 2 +- .../src/main/resources/mapred-default.xml | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/41ae7768/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index da1a2f3..0cefde0 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -200,6 +200,9 @@ Trunk (Unreleased) MAPREDUCE-6396. TestPipeApplication fails by NullPointerException. (Brahma Reddy Battula via aajisaka) + MAPREDUCE-6406. Update FileOutputCommitter.FILEOUTPUTCOMMITTER_ALGORITHM_VERSION_DEFAULT + to match mapred-default.xml. (Ray Chiang via devaraj) + BREAKDOWN OF MAPREDUCE-2841 (NATIVE TASK) SUBTASKS MAPREDUCE-5985. native-task: Fix build on macosx. Contributed by http://git-wip-us.apache.org/repos/asf/hadoop/blob/41ae7768/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/output/FileOutputCommitter.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/output/FileOutputCommitter.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/output/FileOutputCommitter.java index 6e5d0a1..1e5d71a 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/output/FileOutputCommitter.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/output/FileOutputCommitter.java @@ -63,7 +63,7 @@ public class FileOutputCommitter extends OutputCommitter { "mapreduce.fileoutputcommitter.marksuccessfuljobs"; public static final String FILEOUTPUTCOMMITTER_ALGORITHM_VERSION = "mapreduce.fileoutputcommitter.algorithm.version"; - public static final int FILEOUTPUTCOMMITTER_ALGORITHM_VERSION_DEFAULT = 1; + public static final int FILEOUTPUTCOMMITTER_ALGORITHM_VERSION_DEFAULT = 2; private Path outputPath = null; private Path workPath = null; private final int algorithmVersion; http://git-wip-us.apache.org/repos/asf/hadoop/blob/41ae7768/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml index 3789429..ba63c02 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml @@ -1326,7 +1326,7 @@ <value>2</value> <description>The file output committer algorithm version valid algorithm version number: 1 or 2 - default to 1, which is the original algorithm + default to 2, which is the original algorithm In algorithm version 1,
