From e247f76bfa1a58e5b39dda686c43e884a49bfadc Mon Sep 17 00:00:00 2001
From: Jarek Jarcec Cecho <jarcec@apache.org>
Date: Sat, 9 Aug 2014 10:41:04 -0700
Subject: [PATCH] SQOOP-1423: hcatalog export with --map-column-java fails

(Muhammad Ehsan ul Haque via Jarek Jarcec Cecho)
---
 .../sqoop/mapreduce/hcat/SqoopHCatUtilities.java       | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/java/org/apache/sqoop/mapreduce/hcat/SqoopHCatUtilities.java b/src/java/org/apache/sqoop/mapreduce/hcat/SqoopHCatUtilities.java
index 05b454d3..b69b83ee 100644
--- a/src/java/org/apache/sqoop/mapreduce/hcat/SqoopHCatUtilities.java
+++ b/src/java/org/apache/sqoop/mapreduce/hcat/SqoopHCatUtilities.java
@@ -798,10 +798,16 @@ public static void configureExportInputFormat(SqoopOptions opts, Job job,
     job.setInputFormatClass(getInputFormatClass());
     Map<String, List<Integer>> dbColInfo = hCatUtils.getDbColumnInfo();
     MapWritable columnTypesJava = new MapWritable();
+    Properties mapColumnJava = opts.getMapColumnJava();
     for (Map.Entry<String, List<Integer>> e : dbColInfo.entrySet()) {
       Text columnName = new Text(e.getKey());
-      Text columnText = new Text(connMgr.toJavaType(dbTable, e.getKey(),
-        e.getValue().get(0)));
+      Text columnText = null;
+      if (mapColumnJava.containsKey(e.getKey())) {
+        columnText = new Text(mapColumnJava.getProperty(e.getKey()));
+      } else {
+        columnText = new Text(connMgr.toJavaType(dbTable, e.getKey(),
+          e.getValue().get(0)));
+      }
       columnTypesJava.put(columnName, columnText);
     }
     MapWritable columnTypesSql = new MapWritable();