MAPREDUCE-7149. Javadocs for FileInputFormat and OutputFormat to mention DT collection. Contributed by Steve Loughran.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/735a36af Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/735a36af Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/735a36af Branch: refs/heads/HDFS-12943 Commit: 735a36afd528862d7690bee2d71b2f60dd282d21 Parents: 96d28b4 Author: Steve Loughran <ste...@apache.org> Authored: Thu Oct 11 20:01:42 2018 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Thu Oct 11 20:01:42 2018 +0100 ---------------------------------------------------------------------- .../java/org/apache/hadoop/mapred/FileInputFormat.java | 8 ++++++-- .../main/java/org/apache/hadoop/mapred/OutputFormat.java | 3 +++ .../java/org/apache/hadoop/mapreduce/OutputFormat.java | 3 +++ .../hadoop/mapreduce/lib/input/FileInputFormat.java | 10 +++++++--- 4 files changed, 19 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/735a36af/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/FileInputFormat.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/FileInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/FileInputFormat.java index fe43991..afdc0ca 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/FileInputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/FileInputFormat.java @@ -198,11 +198,15 @@ public abstract class FileInputFormat<K, V> implements InputFormat<K, V> { } } - /** List input directories. + /** + * List input directories. * Subclasses may override to, e.g., select only files matching a regular * expression. * - * @param job the job to list input paths for + * If security is enabled, this method collects + * delegation tokens from the input paths and adds them to the job's + * credentials. + * @param job the job to list input paths for and attach tokens to. * @return array of FileStatus objects * @throws IOException if zero items. */ http://git-wip-us.apache.org/repos/asf/hadoop/blob/735a36af/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/OutputFormat.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/OutputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/OutputFormat.java index 6ea6a71..adfda0b 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/OutputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/OutputFormat.java @@ -71,6 +71,9 @@ public interface OutputFormat<K, V> { * throwing an exception when it already exists, so that output is not * overwritten.</p> * + * Implementations which write to filesystems which support delegation + * tokens usually collect the tokens for the destination path(s) + * and attach them to the job configuration. * @param ignored * @param job job configuration. * @throws IOException when output should not be attempted http://git-wip-us.apache.org/repos/asf/hadoop/blob/735a36af/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/OutputFormat.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/OutputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/OutputFormat.java index 6f9e525..901d5ee 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/OutputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/OutputFormat.java @@ -66,6 +66,9 @@ public abstract class OutputFormat<K, V> { * throwing an exception when it already exists, so that output is not * overwritten.</p> * + * Implementations which write to filesystems which support delegation + * tokens usually collect the tokens for the destination path(s) + * and attach them to the job context's JobConf. * @param context information about the job * @throws IOException when output should not be attempted */ http://git-wip-us.apache.org/repos/asf/hadoop/blob/735a36af/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/input/FileInputFormat.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/input/FileInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/input/FileInputFormat.java index e2d8e6f..e2658ca 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/input/FileInputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/input/FileInputFormat.java @@ -233,11 +233,15 @@ public abstract class FileInputFormat<K, V> extends InputFormat<K, V> { (PathFilter) ReflectionUtils.newInstance(filterClass, conf) : null; } - /** List input directories. + /** + * List input directories. * Subclasses may override to, e.g., select only files matching a regular * expression. - * - * @param job the job to list input paths for + * + * If security is enabled, this method collects + * delegation tokens from the input paths and adds them to the job's + * credentials. + * @param job the job to list input paths for and attach tokens to. * @return array of FileStatus objects * @throws IOException if zero items. */ --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
