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

[se...@apache.org]

Author: sershe
Date: Tue Jan  6 23:30:07 2015
New Revision: 1649972

URL: http://svn.apache.org/r1649972
Log:
HIVE-9183 Compilation against HBase 1.0.0 fails due to missing dependency on high_scale_lib.Counter (Ted Yu, reviewed by Sergey Shelukhin)

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=1649972&r1=1649971&r2=1649972&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 Jan  6 23:30:07 2015
@@ -488,6 +488,14 @@ public class HBaseStorageHandler extends
     }
   }
 
+  private static Class counterClass = null;
+  static {
+    try {
+      counterClass = Class.forName("org.cliffc.high_scale_lib.Counter");
+    } catch (ClassNotFoundException cnfe) {
+      // this dependency is removed for HBase 1.0
+    }
+  }
   @Override
   public void configureJobConf(TableDesc tableDesc, JobConf jobConf) {
     try {
@@ -498,9 +506,13 @@ public class HBaseStorageHandler extends
        * will not be required once Hive bumps up its hbase version). At that time , we will
        * only need TableMapReduceUtil.addDependencyJars(jobConf) here.
        */
-      TableMapReduceUtil.addDependencyJars(
-          jobConf, HBaseStorageHandler.class, TableInputFormatBase.class,
-          org.cliffc.high_scale_lib.Counter.class); // this will be removed for HBase 1.0
+      if (counterClass != null) {
+        TableMapReduceUtil.addDependencyJars(
+          jobConf, HBaseStorageHandler.class, TableInputFormatBase.class, counterClass);
+      } else {
+        TableMapReduceUtil.addDependencyJars(
+          jobConf, HBaseStorageHandler.class, TableInputFormatBase.class);
+      }
       Set<String> merged = new LinkedHashSet<String>(jobConf.getStringCollection("tmpjars"));
 
       Job copy = new Job(jobConf);