Return-Path: 
 <commits-return-22435-apmail-hbase-commits-archive=hbase.apache.org@hbase.apache.org>
X-Original-To: apmail-hbase-commits-archive@www.apache.org
Delivered-To: apmail-hbase-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id AAE1217B78
	for <apmail-hbase-commits-archive@www.apache.org>;
 Tue, 27 Jan 2015 15:58:52 +0000 (UTC)
Received: (qmail 122 invoked by uid 500); 27 Jan 2015 15:58:53 -0000
Delivered-To: apmail-hbase-commits-archive@hbase.apache.org
Received: (qmail 99976 invoked by uid 500); 27 Jan 2015 15:58:53 -0000
Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hbase.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hbase.apache.org>
List-Post: <mailto:commits@hbase.apache.org>
List-Id: <commits.hbase.apache.org>
Reply-To: dev@hbase.apache.org
Delivered-To: mailing list commits@hbase.apache.org
Received: (qmail 99967 invoked by uid 99); 27 Jan 2015 15:58:52 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Jan 2015 15:58:52 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id D2CFFE03F8; Tue, 27 Jan 2015 15:58:52 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: tedyu@apache.org
To: commits@hbase.apache.org
Message-Id: <bc03ab0d34934966881cdc27a47daec0@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: hbase git commit: HBASE-12929 TableMapReduceUtil.initTableMapperJob
 unnecessarily limits the types of outputKeyClass and outputValueClass (Will
 Temperley)
Date: Tue, 27 Jan 2015 15:58:52 +0000 (UTC)

Repository: hbase
Updated Branches:
  refs/heads/branch-1 e7bb32c24 -> f1bd04111


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/f1bd0411
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f1bd0411
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f1bd0411

Branch: refs/heads/branch-1
Commit: f1bd041113a29ac94960a3f74a8a7f386726fa95
Parents: e7bb32c
Author: tedyu <yuzhihong@gmail.com>
Authored: Tue Jan 27 07:58:48 2015 -0800
Committer: tedyu <yuzhihong@gmail.com>
Committed: Tue Jan 27 07:58:48 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/f1bd0411/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);