Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Partially revert HIVE-2748 to maintain compatibility with HBase 0.90.x
  • Loading branch information
lfrancke committed May 22, 2012
1 parent 7c198f9 commit 1167634
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
Expand Up @@ -68,7 +68,7 @@ void preTest(HiveConf conf) throws Exception {
setUpFixtures(conf);
}
conf.set("hbase.rootdir", hbaseRoot);
conf.set("hbase.master", hbaseCluster.getMaster().getServerName().getHostAndPort());
conf.set("hbase.master", hbaseCluster.getHMasterAddress().toString());
conf.set("hbase.zookeeper.property.clientPort", Integer.toString(zooKeeperPort));
String auxJars = conf.getAuxJars();
auxJars = ((auxJars == null) ? "" : (auxJars + ",")) + "file://"
Expand All @@ -94,7 +94,7 @@ private void setUpFixtures(HiveConf conf) throws Exception {
hbaseConf.setInt("hbase.regionserver.port", findFreePort());
hbaseConf.setInt("hbase.regionserver.info.port", -1);
hbaseCluster = new MiniHBaseCluster(hbaseConf, NUM_REGIONSERVERS);
conf.set("hbase.master", hbaseCluster.getMaster().getServerName().getHostAndPort());
conf.set("hbase.master", hbaseCluster.getHMasterAddress().toString());
// opening the META table ensures that cluster is running
new HTable(hbaseConf, HConstants.META_TABLE_NAME);
createHBaseTable(hbaseConf);
Expand Down
3 changes: 2 additions & 1 deletion ivy/libraries.properties
Expand Up @@ -41,7 +41,8 @@ commons-logging-api.version=1.0.4
commons-pool.version=1.5.4
derby.version=10.4.2.0
guava.version=r09
hbase.version=0.92.0
hbase.version=0.90.4
hbase-test.version=0.90.4
jackson.version=1.8.8
javaewah.version=0.3.2
jdo-api.version=2.3-ec
Expand Down

0 comments on commit 1167634

Please sign in to comment.