Index: build.properties
===================================================================
--- build.properties (revision 1063076)
+++ build.properties (working copy)
@@ -44,4 +44,3 @@
# URLs pointing to a built tarball of a secure hadoop release
hadoop.security.url=http://mirror.facebook.net/facebook/hive-deps/hadoop/core/hadoop-0.20.3-CDH3-SNAPSHOT/hadoop-0.20.3-CDH3-SNAPSHOT.tar.gz
hadoop.security.version=0.20.3-CDH3-SNAPSHOT
-
Index: hbase-handler/ivy.xml
===================================================================
--- hbase-handler/ivy.xml (revision 1063076)
+++ hbase-handler/ivy.xml (working copy)
@@ -3,6 +3,6 @@
-
+
Index: hbase-handler/src/test/org/apache/hadoop/hive/hbase/HBaseTestSetup.java
===================================================================
--- hbase-handler/src/test/org/apache/hadoop/hive/hbase/HBaseTestSetup.java (revision 1063076)
+++ hbase-handler/src/test/org/apache/hadoop/hive/hbase/HBaseTestSetup.java (working copy)
@@ -26,7 +26,7 @@
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.MiniHBaseCluster;
-import org.apache.hadoop.hbase.MiniZooKeeperCluster;
+import org.apache.hadoop.hbase.zookeeper.MiniZooKeeperCluster;
import org.apache.hadoop.hbase.client.HConnectionManager;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hive.conf.HiveConf;
Index: hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java
===================================================================
--- hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java (revision 1063076)
+++ hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseStorageHandler.java (working copy)
@@ -32,6 +32,7 @@
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;
@@ -72,6 +73,8 @@
return admin;
} catch (MasterNotRunningException mnre) {
throw new MetaException(StringUtils.stringifyException(mnre));
+ } catch (ZooKeeperConnectionException zkce) {
+ throw new MetaException(StringUtils.stringifyException(zkce));
}
}
@@ -295,7 +298,7 @@
// this better later when we support more interesting predicates.
return null;
}
-
+
DecomposedPredicate decomposedPredicate = new DecomposedPredicate();
decomposedPredicate.pushedPredicate = analyzer.translateSearchConditions(
searchConditions);
Index: build.xml
===================================================================
--- build.xml (revision 1063076)
+++ build.xml (working copy)
@@ -658,5 +658,5 @@
-
+
Index: lib/hbase-0.20.3-test.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: lib/hbase-0.20.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: lib/zookeeper-3.2.2.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ivy/ivysettings.xml
===================================================================
--- ivy/ivysettings.xml (revision 1063076)
+++ ivy/ivysettings.xml (working copy)
@@ -55,17 +55,17 @@
-
+
-
+
-
+
@@ -74,9 +74,9 @@
-
+
-
+
Index: ivy/libraries.properties
===================================================================
--- ivy/libraries.properties (revision 1063076)
+++ ivy/libraries.properties (working copy)
@@ -35,8 +35,8 @@
commons-logging.version=1.0.4
commons-logging-api.version=1.0.4
commons-pool.version=1.5.4
-hbase.version=0.20.3
-hbase-test.version=0.20.3
+hbase.version=0.89.0-SNAPSHOT
+hbase-test.version=0.89.0-SNAPSHOT
jdo-api.version=2.3-ec
jdom.version=1.1
jline.version=0.9.94
@@ -47,4 +47,5 @@
slf4j-log4j12.version=1.6.1
thrift.version=0.5.0
thrift-fb303.version=0.5.0
-zookeeper.version=3.2.2
+zookeeper.version=3.3.1
+guava.version=r06
Index: build-common.xml
===================================================================
--- build-common.xml (revision 1063076)
+++ build-common.xml (working copy)
@@ -105,7 +105,7 @@
-
+
Index: ql/ivy.xml
===================================================================
--- ql/ivy.xml (revision 1063076)
+++ ql/ivy.xml (working copy)
@@ -1,4 +1,4 @@
-
+
@@ -6,5 +6,17 @@
+
+
+
+
+
+
+
+
Index: ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java
===================================================================
--- ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java (revision 1063076)
+++ ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java (working copy)
@@ -47,7 +47,7 @@
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.MiniZooKeeperCluster;
+import org.apache.hadoop.hbase.zookeeper.MiniZooKeeperCluster;
import org.apache.hadoop.hive.cli.CliDriver;
import org.apache.hadoop.hive.cli.CliSessionState;
import org.apache.hadoop.hive.conf.HiveConf;
@@ -338,7 +338,7 @@
}
}
db.setCurrentDatabase(DEFAULT_DATABASE_NAME);
-
+
List roleNames = db.getAllRoleNames();
for (String roleName : roleNames) {
db.dropRole(roleName);
@@ -395,9 +395,9 @@
}
public void createSources() throws Exception {
-
+
startSessionState();
-
+
// Create a bunch of tables with columns key and value
LinkedList cols = new LinkedList();
cols.add("key");
@@ -499,7 +499,7 @@
testWarehouse = conf.getVar(HiveConf.ConfVars.METASTOREWAREHOUSE);
// conf.logVars(System.out);
// System.out.flush();
-
+
SessionState.start(conf);
db = Hive.get(conf);
fs = FileSystem.get(conf);
@@ -580,7 +580,7 @@
private CliSessionState startSessionState()
throws FileNotFoundException, UnsupportedEncodingException {
-
+
HiveConf.setVar(conf, HiveConf.ConfVars.HIVE_AUTHENTICATOR_MANAGER,
"org.apache.hadoop.hive.ql.security.DummyAuthenticator");
Index: ql/build.xml
===================================================================
--- ql/build.xml (revision 1063076)
+++ ql/build.xml (working copy)
@@ -148,7 +148,7 @@
-
+