svn commit: r1564565 - /hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java

[hashutosh]

Author: hashutosh
Date: Tue Feb  4 23:42:30 2014
New Revision: 1564565

URL: http://svn.apache.org/r1564565
Log:
HIVE-6356 : Dependency injection in hbase storage handler is broken (Navis via 
Ashutosh Chauhan)

Modified:
    
hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java

Modified: 
hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java
URL: 
http://svn.apache.org/viewvc/hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java?rev=1564565&r1=1564564&r2=1564565&view=diff
==============================================================================
--- 
hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java
 (original)
+++ 
hive/trunk/hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java
 Tue Feb  4 23:42:30 2014
@@ -35,7 +35,7 @@ import org.apache.hadoop.hbase.HTableDes
 import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.client.HTable;
 import org.apache.hadoop.hbase.mapred.TableOutputFormat;
-import org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil;
+import org.apache.hadoop.hbase.mapred.TableMapReduceUtil;
 import org.apache.hadoop.hbase.security.User;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hive.hbase.HBaseSerDe.ColumnMapping;
@@ -53,7 +53,6 @@ import org.apache.hadoop.hive.ql.plan.Ex
 import org.apache.hadoop.hive.ql.plan.TableDesc;
 import org.apache.hadoop.hive.serde2.Deserializer;
 import org.apache.hadoop.hive.serde2.SerDe;
-import org.apache.hadoop.hive.serde2.SerDeException;
 import org.apache.hadoop.mapred.InputFormat;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.OutputFormat;
@@ -153,9 +152,8 @@ public class HBaseStorageHandler extends
       String tableName = getHBaseTableName(tbl);
       Map<String, String> serdeParam = 
tbl.getSd().getSerdeInfo().getParameters();
       String hbaseColumnsMapping = 
serdeParam.get(HBaseSerDe.HBASE_COLUMNS_MAPPING);
-      List<ColumnMapping> columnsMapping = null;
 
-      columnsMapping = HBaseSerDe.parseColumnsMapping(hbaseColumnsMapping);
+      List<ColumnMapping> columnsMapping = 
HBaseSerDe.parseColumnsMapping(hbaseColumnsMapping);
 
       HTableDescriptor tableDesc;