From 71e8021b650a31fbb21c99de0a6b897bec5c9857 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Fri, 11 Oct 2013 03:59:43 +0000
Subject: [PATCH] HBASE-9744 Set io.serializations correctly in
 HFileOutputFormat.configureIncrementalLoad

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1531188 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java   | 1 +
 .../main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java
index f52ef341a49..1875ee434b9 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java
@@ -335,6 +335,7 @@ public class HFileOutputFormat extends FileOutputFormat<ImmutableBytesWritable,
     }
 
     conf.setStrings("io.serializations", conf.get("io.serializations"),
+        MutationSerialization.class.getName(), ResultSerialization.class.getName(),
         KeyValueSerialization.class.getName());
 
     // Use table's region boundaries for TOP split points.
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java
index 0e4a49432c3..de918297ef9 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/ImportTsv.java
@@ -303,9 +303,6 @@ public class ImportTsv extends Configured implements Tool {
     Class mapperClass = mapperClassName != null ?
         Class.forName(mapperClassName) : DEFAULT_MAPPER;
 
-    conf.setStrings("io.serializations", conf.get("io.serializations"),
-        MutationSerialization.class.getName(), ResultSerialization.class.getName());
-
     String tableName = args[0];
     Path inputDir = new Path(args[1]);
     String jobName = conf.get(JOB_NAME_CONF_KEY,NAME + "_" + tableName);