You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by he...@apache.org on 2012/01/31 23:35:45 UTC

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

Author: heyongqiang
Date: Tue Jan 31 22:35:45 2012
New Revision: 1238837

URL: http://svn.apache.org/viewvc?rev=1238837&view=rev
Log:
HIVE-2765 hbase handler uses ZooKeeperConnectionException which is not compatible with HBase versions other than 0.89 (Pei Yue via He Yongqiang)

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=1238837&r1=1238836&r2=1238837&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 31 22:35:45 2012
@@ -32,7 +32,6 @@ import org.apache.hadoop.hbase.HBaseConf
 import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.MasterNotRunningException;
-import org.apache.hadoop.hbase.ZooKeeperConnectionException;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.client.HTable;
 import org.apache.hadoop.hbase.util.Bytes;
@@ -64,7 +63,7 @@ public class HBaseStorageHandler extends
   implements HiveMetaHook, HiveStoragePredicateHandler {
 
   final static public String DEFAULT_PREFIX = "default.";
-  
+
   private HBaseConfiguration hbaseConf;
   private HBaseAdmin admin;
 
@@ -74,10 +73,8 @@ public class HBaseStorageHandler extends
         admin = new HBaseAdmin(hbaseConf);
       }
       return admin;
-    } catch (MasterNotRunningException mnre) {
-      throw new MetaException(StringUtils.stringifyException(mnre));
-    } catch (ZooKeeperConnectionException zkce) {
-      throw new MetaException(StringUtils.stringifyException(zkce));
+    } catch (IOException ioe) {
+      throw new MetaException(StringUtils.stringifyException(ioe));
     }
   }