Repository: tez Updated Branches: refs/heads/master 2213c109e -> 08aa7ac5a
TEZ-1133. Remove some unused methods from MRHelpers. Contributed by Chen He. Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/08aa7ac5 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/08aa7ac5 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/08aa7ac5 Branch: refs/heads/master Commit: 08aa7ac5a19300538b1e9a15fe8f338e4f1cf302 Parents: 2213c10 Author: Siddharth Seth <[email protected]> Authored: Wed Jul 30 16:49:53 2014 -0700 Committer: Siddharth Seth <[email protected]> Committed: Wed Jul 30 16:49:53 2014 -0700 ---------------------------------------------------------------------- .../apache/tez/mapreduce/hadoop/MRHelpers.java | 37 +------------------- 1 file changed, 1 insertion(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/08aa7ac5/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRHelpers.java ---------------------------------------------------------------------- diff --git a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRHelpers.java b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRHelpers.java index 92dc0c5..c6b2fe4 100644 --- a/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRHelpers.java +++ b/tez-mapreduce/src/main/java/org/apache/tez/mapreduce/hadoop/MRHelpers.java @@ -935,7 +935,7 @@ public class MRHelpers { * Get default initialize JobConf-based configuration * @return Base configuration for MR-based jobs */ - public static Configuration getBaseMRConfiguration() { + static Configuration getBaseMRConfiguration() { return getBaseJobConf(null); } @@ -986,21 +986,6 @@ public class MRHelpers { vertex.addDataSource("MRInput", id, initClazz); } - /** - * Convenience method to add an MR Output to the specified vertex. The name of - * the Output is "MROutput" </p> - * - * This should only be called for one vertex in a DAG - * - * @param vertex - * @param userPayload - */ - public static void addMROutput(Vertex vertex, byte[] userPayload) { - OutputDescriptor od = new OutputDescriptor(MROutput.class.getName()) - .setUserPayload(userPayload); - vertex.addDataSink("MROutput", od, new OutputCommitterDescriptor(MROutputCommitter.class.getName())); - } - @Private public static void addMROutputLegacy(Vertex vertex, byte[] userPayload) { OutputDescriptor od = new OutputDescriptor(MROutputLegacy.class.getName()) @@ -1093,24 +1078,4 @@ public class MRHelpers { return Lists.newArrayList(iterable); } - /** - * Merge tokens from a configured binary file into provided Credentials object. - * Uses "mapreduce.job.credentials.binary" property to find location of token file. - * @param creds Credentials object to add new tokens to - * @param conf Configuration containing location of token file. - * - * TezClient reads credentials from the property - TezJobConfig.TEZ_CREDENTIALS_PATH. This method - * is not required if that property is set. - * - * @throws IOException - */ - public static void mergeMRBinaryTokens(Credentials creds, - Configuration conf) throws IOException { - String tokenFilePath = conf.get(MRJobConfig.MAPREDUCE_JOB_CREDENTIALS_BINARY); - if (tokenFilePath == null || tokenFilePath.isEmpty()) { - return; - } - TokenCache.mergeBinaryTokens(creds, conf, tokenFilePath); - } - }
