Merge pull request apache#9 from mapr/mapr-22204

MAPR-22204:  Sqoop 1.4.6 failed to import data to HBase 1.1.1

Author: ssvinarchuk

build.xml

@@ -201,7 +201,7 @@
   </if>
 
   <!-- Set dependency versions that are working with all Hadoop versions-->
-  <property name="hbase95.version" value="0.95.2-hadoop${hbasecompatprofile}-SNAPSHOT" />
+  <property name="hbase95.version" value="0.95.2-hadoop${hbasecompatprofile}" />
 
   <!-- Load system-wide and project-wide default properties set by
        the user, to avoid needing to override with -D. -->

ivy/ivysettings.xml

@@ -40,6 +40,9 @@ under the License.
   <property name="snapshot.apache.org"
       value="https://repository.apache.org/content/repositories/snapshots/"
       override="false"/>
+  <property name="release.apache.org"
+      value="https://repository.apache.org/content/repositories/releases/"
+      override="false"/>  
   <property name="staging.cloudera.com"
       value="https://repository.cloudera.com/content/repositories/staging/"
       override="false"/>
@@ -65,6 +68,8 @@ under the License.
         pattern="${maven2.pattern.ext}" m2compatible="true"/>
     <ibiblio name="cloudera-releases" root="${releases.cloudera.com}"
         pattern="${maven2.pattern.ext}" m2compatible="true"/>
+    <ibiblio name="apache-release" root="${release.apache.org}"
+        pattern="${maven2.pattern.ext}" m2compatible="true" />
     <ibiblio name="apache-snapshot" root="${snapshot.apache.org}"
         m2compatible="true" checkmodified="true" changingPattern=".*SNAPSHOT"/>
     <ibiblio name="cloudera-staging" root="${staging.cloudera.com}"
@@ -79,6 +84,7 @@ under the License.
         changingPattern=".*SNAPSHOT">
       <resolver ref="fs"/>
       <resolver ref="mapr-releases"/>
+      <resolver ref="apache-release"/>
       <resolver ref="apache-snapshot"/>
       <resolver ref="datanucleus"/>
       <resolver ref="cloudera-releases"/>

src/java/org/apache/sqoop/mapreduce/HBaseImportJob.java

@@ -219,7 +219,7 @@ protected void jobSetup(Job job) throws IOException, ImportException {
         // Create the table.
         LOG.info("Creating missing HBase table " + tableName);
         tableDesc =  new HTableDescriptor(tableName);
-        tableDesc.addFamily(colDesc);
+        HTableDescriptorProxy.addFamily(tableDesc, colDesc);
         admin.createTable(tableDesc);
       } else {
         LOG.warn("Could not find HBase table " + tableName);

src/java/org/apache/sqoop/mapreduce/HTableDescriptorProxy.java

@@ -0,0 +1,45 @@
+package org.apache.sqoop.mapreduce;
+
+import java.lang.reflect.Method;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hbase.HColumnDescriptor;
+import org.apache.hadoop.hbase.HTableDescriptor;
+
+public class HTableDescriptorProxy {
+
+  private static final Log LOG = LogFactory.getLog(HTableDescriptorProxy.class);
+
+  private static boolean addFamily_InitError_ = false;
+  private static Method addFamily_Method_ = null;
+  private static RuntimeException addFamily_InitException_ = null;
+
+
+  static {
+    try {
+      addFamily_Method_ = HTableDescriptor.class.getMethod("addFamily", HColumnDescriptor.class);
+    } catch (Exception e) {
+      addFamily_InitException_ = new RuntimeException("cannot find org.apache.hadoop.hbase.HTableDescriptor.addFamily(HColumnDescriptor) ", e);
+      addFamily_InitError_ = true;
+    }
+  }
+
+  public static void addFamily(HTableDescriptor object, HColumnDescriptor param) {
+    if (addFamily_InitError_) {
+      throw addFamily_InitException_;
+    }
+
+    try {
+      if (addFamily_Method_ != null) {
+        LOG.debug("Call HTableDescriptor::addFamily()");
+        addFamily_Method_.invoke(object, param);
+        return;
+      }
+      throw new RuntimeException("No HTableDescriptor::addFamily() function found.");
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+}