From 7557f7bb2d22f564e26d6cf9672d24b7ef4f347a Mon Sep 17 00:00:00 2001 From: Allen Wittenauer Date: Thu, 14 Aug 2014 17:18:14 +0000 Subject: [PATCH] MAPREDUCE-5998. CompositeInputFormat javadoc is broken (Akira AJISAKA via aw) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617995 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../org/apache/hadoop/mapred/join/CompositeInputFormat.java | 2 +- .../apache/hadoop/mapreduce/lib/join/CompositeInputFormat.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index f2a99b6ef07..d3a26dbceef 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -174,6 +174,9 @@ Trunk (Unreleased) MAPREDUCE-5950. incorrect description in distcp2 document (Akira AJISAKA via aw) + MAPREDUCE-5998. CompositeInputFormat javadoc is broken (Akira AJISAKA via + aw) + Release 2.6.0 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/join/CompositeInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/join/CompositeInputFormat.java index b177e8b8c00..40690e7541f 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/join/CompositeInputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/join/CompositeInputFormat.java @@ -36,7 +36,6 @@ import org.apache.hadoop.mapred.Reporter; /** * An InputFormat capable of performing joins over a set of data sources sorted * and partitioned the same way. - * @see #setFormat * * A user may define new join types by setting the property * mapred.join.define.<ident> to a classname. In the expression @@ -44,6 +43,7 @@ import org.apache.hadoop.mapred.Reporter; * ComposableRecordReader. * mapred.join.keycomparator can be a classname used to compare keys * in the join. + * @see #setFormat * @see JoinRecordReader * @see MultiFilterRecordReader */ diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/join/CompositeInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/join/CompositeInputFormat.java index bfb4bf14045..6189a271bc3 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/join/CompositeInputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/join/CompositeInputFormat.java @@ -39,7 +39,6 @@ import org.apache.hadoop.mapreduce.TaskAttemptContext; /** * An InputFormat capable of performing joins over a set of data sources sorted * and partitioned the same way. - * @see #setFormat * * A user may define new join types by setting the property * mapreduce.join.define.<ident> to a classname. @@ -47,6 +46,7 @@ import org.apache.hadoop.mapreduce.TaskAttemptContext; * assumed to be a ComposableRecordReader. * mapreduce.join.keycomparator can be a classname used to compare * keys in the join. + * @see #setFormat * @see JoinRecordReader * @see MultiFilterRecordReader */