You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2012/10/27 01:08:46 UTC
svn commit: r1402710 - in
/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase:
mapred/TableMapReduceUtil.java mapreduce/TableMapReduceUtil.java
Author: stack
Date: Fri Oct 26 23:08:45 2012
New Revision: 1402710
URL: http://svn.apache.org/viewvc?rev=1402710&view=rev
Log:
HBASE-7024 TableMapReduceUtil.initTableMapperJob unnecessarily limits the types of outputKeyClass and outputValueClass
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java?rev=1402710&r1=1402709&r2=1402710&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableMapReduceUtil.java Fri Oct 26 23:08:45 2012
@@ -54,8 +54,8 @@ public class TableMapReduceUtil {
*/
public static void initTableMapJob(String table, String columns,
Class<? extends TableMap> mapper,
- Class<? extends WritableComparable> outputKeyClass,
- Class<? extends Writable> outputValueClass, JobConf job) {
+ Class<?> outputKeyClass,
+ Class<?> outputValueClass, JobConf job) {
initTableMapJob(table, columns, mapper, outputKeyClass, outputValueClass, job, true);
}
@@ -74,8 +74,8 @@ public class TableMapReduceUtil {
*/
public static void initTableMapJob(String table, String columns,
Class<? extends TableMap> mapper,
- Class<? extends WritableComparable> outputKeyClass,
- Class<? extends Writable> outputValueClass, JobConf job, boolean addDependencyJars) {
+ Class<?> outputKeyClass,
+ Class<?> outputValueClass, JobConf job, boolean addDependencyJars) {
job.setInputFormat(TableInputFormat.class);
job.setMapOutputValueClass(outputValueClass);
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java?rev=1402710&r1=1402709&r2=1402710&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java Fri Oct 26 23:08:45 2012
@@ -82,8 +82,8 @@ public class TableMapReduceUtil {
*/
public static void initTableMapperJob(String table, Scan scan,
Class<? extends TableMapper> mapper,
- Class<? extends WritableComparable> outputKeyClass,
- Class<? extends Writable> outputValueClass, Job job)
+ Class<?> outputKeyClass,
+ Class<?> outputValueClass, Job job)
throws IOException {
initTableMapperJob(table, scan, mapper, outputKeyClass, outputValueClass,
job, true);
@@ -104,9 +104,9 @@ public class TableMapReduceUtil {
* @throws IOException When setting up the details fails.
*/
public static void initTableMapperJob(byte[] table, Scan scan,
- Class<? extends TableMapper> mapper,
- Class<? extends WritableComparable> outputKeyClass,
- Class<? extends Writable> outputValueClass, Job job)
+ Class<? extends TableMapper> mapper,
+ Class<?> outputKeyClass,
+ Class<?> outputValueClass, Job job)
throws IOException {
initTableMapperJob(Bytes.toString(table), scan, mapper, outputKeyClass, outputValueClass,
job, true);
@@ -129,8 +129,8 @@ public class TableMapReduceUtil {
*/
public static void initTableMapperJob(String table, Scan scan,
Class<? extends TableMapper> mapper,
- Class<? extends WritableComparable> outputKeyClass,
- Class<? extends Writable> outputValueClass, Job job,
+ Class<?> outputKeyClass,
+ Class<?> outputValueClass, Job job,
boolean addDependencyJars, Class<? extends InputFormat> inputFormatClass)
throws IOException {
job.setInputFormatClass(inputFormatClass);
@@ -165,8 +165,8 @@ public class TableMapReduceUtil {
*/
public static void initTableMapperJob(byte[] table, Scan scan,
Class<? extends TableMapper> mapper,
- Class<? extends WritableComparable> outputKeyClass,
- Class<? extends Writable> outputValueClass, Job job,
+ Class<?> outputKeyClass,
+ Class<?> outputValueClass, Job job,
boolean addDependencyJars, Class<? extends InputFormat> inputFormatClass)
throws IOException {
initTableMapperJob(Bytes.toString(table), scan, mapper, outputKeyClass,
@@ -190,8 +190,8 @@ public class TableMapReduceUtil {
*/
public static void initTableMapperJob(byte[] table, Scan scan,
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(Bytes.toString(table), scan, mapper, outputKeyClass,
@@ -215,8 +215,8 @@ public class TableMapReduceUtil {
*/
public static void initTableMapperJob(String table, Scan scan,
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(table, scan, mapper, outputKeyClass,