Index: hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java (revision 1401067) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java (working copy) @@ -54,8 +54,8 @@ */ public static void initTableMapJob(String table, String columns, Class mapper, - Class outputKeyClass, - Class outputValueClass, JobConf job) { + Class outputKeyClass, + Class outputValueClass, JobConf job) { initTableMapJob(table, columns, mapper, outputKeyClass, outputValueClass, job, true); } @@ -74,8 +74,8 @@ */ public static void initTableMapJob(String table, String columns, Class mapper, - Class outputKeyClass, - Class outputValueClass, JobConf job, boolean addDependencyJars) { + Class outputKeyClass, + Class outputValueClass, JobConf job, boolean addDependencyJars) { job.setInputFormat(TableInputFormat.class); job.setMapOutputValueClass(outputValueClass); Index: hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java (revision 1401067) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java (working copy) @@ -82,8 +82,8 @@ */ public static void initTableMapperJob(String table, Scan scan, Class mapper, - Class outputKeyClass, - Class outputValueClass, Job job) + Class outputKeyClass, + Class outputValueClass, Job job) throws IOException { initTableMapperJob(table, scan, mapper, outputKeyClass, outputValueClass, job, true); @@ -104,9 +104,9 @@ * @throws IOException When setting up the details fails. */ public static void initTableMapperJob(byte[] table, Scan scan, - Class mapper, - Class outputKeyClass, - Class outputValueClass, Job job) + Class mapper, + Class outputKeyClass, + Class outputValueClass, Job job) throws IOException { initTableMapperJob(Bytes.toString(table), scan, mapper, outputKeyClass, outputValueClass, job, true); @@ -129,8 +129,8 @@ */ public static void initTableMapperJob(String table, Scan scan, Class mapper, - Class outputKeyClass, - Class outputValueClass, Job job, + Class outputKeyClass, + Class outputValueClass, Job job, boolean addDependencyJars, Class inputFormatClass) throws IOException { job.setInputFormatClass(inputFormatClass); @@ -165,8 +165,8 @@ */ public static void initTableMapperJob(byte[] table, Scan scan, Class mapper, - Class outputKeyClass, - Class outputValueClass, Job job, + Class outputKeyClass, + Class outputValueClass, Job job, boolean addDependencyJars, Class inputFormatClass) throws IOException { initTableMapperJob(Bytes.toString(table), scan, mapper, outputKeyClass, @@ -190,8 +190,8 @@ */ public static void initTableMapperJob(byte[] table, Scan scan, Class mapper, - Class outputKeyClass, - Class outputValueClass, Job job, + Class outputKeyClass, + Class outputValueClass, Job job, boolean addDependencyJars) throws IOException { initTableMapperJob(Bytes.toString(table), scan, mapper, outputKeyClass, @@ -215,8 +215,8 @@ */ public static void initTableMapperJob(String table, Scan scan, Class mapper, - Class outputKeyClass, - Class outputValueClass, Job job, + Class outputKeyClass, + Class outputValueClass, Job job, boolean addDependencyJars) throws IOException { initTableMapperJob(table, scan, mapper, outputKeyClass,