Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Allen Wittenauer 2014-08-14 17:18:14 +00:00
parent 6be98091f7
commit 7557f7bb2d
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -174,6 +174,9 @@ Trunk (Unreleased)
MAPREDUCE-5950. incorrect description in distcp2 document (Akira AJISAKA MAPREDUCE-5950. incorrect description in distcp2 document (Akira AJISAKA
via aw) via aw)
MAPREDUCE-5998. CompositeInputFormat javadoc is broken (Akira AJISAKA via
aw)
Release 2.6.0 - UNRELEASED Release 2.6.0 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/join/CompositeInputFormat.java
View File

@ -36,7 +36,6 @@ import org.apache.hadoop.mapred.Reporter;
/** /**
* An InputFormat capable of performing joins over a set of data sources sorted * An InputFormat capable of performing joins over a set of data sources sorted
* and partitioned the same way. * and partitioned the same way.
* @see #setFormat
* *
* A user may define new join types by setting the property * A user may define new join types by setting the property
* <tt>mapred.join.define.&lt;ident&gt;</tt> to a classname. In the expression * <tt>mapred.join.define.&lt;ident&gt;</tt> to a classname. In the expression
@ -44,6 +43,7 @@ import org.apache.hadoop.mapred.Reporter;
* ComposableRecordReader. * ComposableRecordReader.
* <tt>mapred.join.keycomparator</tt> can be a classname used to compare keys * <tt>mapred.join.keycomparator</tt> can be a classname used to compare keys
* in the join. * in the join.
* @see #setFormat
* @see JoinRecordReader * @see JoinRecordReader
* @see MultiFilterRecordReader * @see MultiFilterRecordReader
*/ */

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/join/CompositeInputFormat.java
View File

@ -39,7 +39,6 @@ import org.apache.hadoop.mapreduce.TaskAttemptContext;
/** /**
* An InputFormat capable of performing joins over a set of data sources sorted * An InputFormat capable of performing joins over a set of data sources sorted
* and partitioned the same way. * and partitioned the same way.
* @see #setFormat
* *
* A user may define new join types by setting the property * A user may define new join types by setting the property
* <tt>mapreduce.join.define.&lt;ident&gt;</tt> to a classname. * <tt>mapreduce.join.define.&lt;ident&gt;</tt> to a classname.
@ -47,6 +46,7 @@ import org.apache.hadoop.mapreduce.TaskAttemptContext;
* assumed to be a ComposableRecordReader. * assumed to be a ComposableRecordReader.
* <tt>mapreduce.join.keycomparator</tt> can be a classname used to compare * <tt>mapreduce.join.keycomparator</tt> can be a classname used to compare
* keys in the join. * keys in the join.
* @see #setFormat
* @see JoinRecordReader * @see JoinRecordReader
* @see MultiFilterRecordReader * @see MultiFilterRecordReader
*/ */