Repository: hbase Updated Branches: refs/heads/branch-1.0 b0ea2fba4 -> c1b587ea9
HBASE-12929 TableMapReduceUtil.initTableMapperJob unnecessarily limits the types of outputKeyClass and outputValueClass (Will Temperley) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c1b587ea Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c1b587ea Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c1b587ea Branch: refs/heads/branch-1.0 Commit: c1b587ea9b8a1ea9a7aa588bd641f3fa0974e73d Parents: b0ea2fb Author: tedyu <yuzhih...@gmail.com> Authored: Tue Jan 27 07:58:48 2015 -0800 Committer: Enis Soztutar <e...@apache.org> Committed: Sun Feb 1 16:42:32 2015 -0800 ---------------------------------------------------------------------- .../hadoop/hbase/mapreduce/TableMapReduceUtil.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/c1b587ea/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java index a9d5b6b..149752b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java @@ -57,7 +57,6 @@ import org.apache.hadoop.hbase.util.Base64; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.zookeeper.ZKUtil; import org.apache.hadoop.io.Writable; -import org.apache.hadoop.io.WritableComparable; import org.apache.hadoop.mapreduce.InputFormat; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.util.StringUtils; @@ -354,8 +353,8 @@ public class TableMapReduceUtil { */ public static void initTableMapperJob(List<Scan> scans, Class<? extends TableMapper> mapper, - Class<? extends WritableComparable> outputKeyClass, - Class<? extends Writable> outputValueClass, Job job) throws IOException { + Class<?> outputKeyClass, + Class<?> outputValueClass, Job job) throws IOException { initTableMapperJob(scans, mapper, outputKeyClass, outputValueClass, job, true); } @@ -376,8 +375,8 @@ public class TableMapReduceUtil { */ public static void initTableMapperJob(List<Scan> scans, Class<? extends TableMapper> mapper, - Class<? extends WritableComparable> outputKeyClass, - Class<? extends Writable> outputValueClass, Job job, + Class<?> outputKeyClass, + Class<?> outputValueClass, Job job, boolean addDependencyJars) throws IOException { initTableMapperJob(scans, mapper, outputKeyClass, outputValueClass, job, addDependencyJars, true); @@ -400,8 +399,8 @@ public class TableMapReduceUtil { */ public static void initTableMapperJob(List<Scan> scans, Class<? extends TableMapper> mapper, - Class<? extends WritableComparable> outputKeyClass, - Class<? extends Writable> outputValueClass, Job job, + Class<?> outputKeyClass, + Class<?> outputValueClass, Job job, boolean addDependencyJars, boolean initCredentials) throws IOException { job.setInputFormatClass(MultiTableInputFormat.class);
