Index: storage-drivers/hbase/ivy.xml =================================================================== --- storage-drivers/hbase/ivy.xml (revision 1291958) +++ storage-drivers/hbase/ivy.xml (working copy) @@ -46,6 +46,11 @@ - + + + + + + Index: storage-drivers/hbase/ivy/ivysettings.xml =================================================================== --- storage-drivers/hbase/ivy/ivysettings.xml (revision 1291958) +++ storage-drivers/hbase/ivy/ivysettings.xml (working copy) @@ -32,6 +32,9 @@ + + + @@ -43,10 +46,11 @@ pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]" /> + - + Index: storage-drivers/hbase/ivy/libraries.properties =================================================================== --- storage-drivers/hbase/ivy/libraries.properties (revision 1291958) +++ storage-drivers/hbase/ivy/libraries.properties (working copy) @@ -16,6 +16,8 @@ junit.version=3.8.1 ivy.version=2.2.0 rats-lib.version=0.5.1 -hbase.version=0.90.5 -zookeeper.version=3.4.0 -thrift.version=0.7.0 +hbase.version=0.92.0-SNAPSHOT +zookeeper.version=3.4.3 +guava.version=11.0 +jetty.version=6.1.26 +high-scale-lib.version=1.1.1 Index: storage-drivers/hbase/src/test/org/apache/hcatalog/hbase/ManyMiniCluster.java =================================================================== --- storage-drivers/hbase/src/test/org/apache/hcatalog/hbase/ManyMiniCluster.java (revision 1291958) +++ storage-drivers/hbase/src/test/org/apache/hcatalog/hbase/ManyMiniCluster.java (working copy) @@ -235,7 +235,7 @@ zookeeperDir = new File(workDir,"zk").getAbsolutePath(); zookeeperPort = findFreePort(); zookeeperCluster = new MiniZooKeeperCluster(); - zookeeperCluster.setClientPort(zookeeperPort); + zookeeperCluster.setDefaultClientPort(zookeeperPort); zookeeperCluster.startup(new File(zookeeperDir)); } catch(Exception e) { throw new IllegalStateException("Failed to Setup Zookeeper Cluster",e); @@ -262,7 +262,7 @@ hbaseConf.setInt("hbase.regionserver.info.port", -1); hbaseCluster = new MiniHBaseCluster(hbaseConf, numRegionServers); - hbaseConf.set("hbase.master", hbaseCluster.getHMasterAddress().toString()); + hbaseConf.set("hbase.master", hbaseCluster.getMaster().getServerName().getHostAndPort()); //opening the META table ensures that cluster is running new HTable(hbaseConf, HConstants.META_TABLE_NAME); } catch (Exception e) { Index: storage-drivers/hbase/src/java/org/apache/hcatalog/hbase/HBaseInputStorageDriver.java =================================================================== --- storage-drivers/hbase/src/java/org/apache/hcatalog/hbase/HBaseInputStorageDriver.java (revision 1291958) +++ storage-drivers/hbase/src/java/org/apache/hcatalog/hbase/HBaseInputStorageDriver.java (working copy) @@ -99,7 +99,11 @@ String serSnapshot = (String) inpJobInfo.getProperties().get( HBaseConstants.PROPERTY_TABLE_SNAPSHOT_KEY); if(serSnapshot == null){ - HBaseConfiguration.addHbaseResources(context.getConfiguration()); + // merge default hbase configuration only for values that are not set + Configuration conf = HBaseConfiguration.addHbaseResources(new Configuration(false)); + for (Map.Entry config : conf) { + context.getConfiguration().setIfUnset(config.getKey(), config.getValue()); + } snapshot = HBaseHCatStorageHandler.createSnapshot(jobConf, hbaseTableName); inpJobInfo.getProperties().setProperty( Index: storage-drivers/hbase/src/java/org/apache/hcatalog/hbase/ImportSequenceFile.java =================================================================== --- storage-drivers/hbase/src/java/org/apache/hcatalog/hbase/ImportSequenceFile.java (revision 1291958) +++ storage-drivers/hbase/src/java/org/apache/hcatalog/hbase/ImportSequenceFile.java (working copy) @@ -125,11 +125,15 @@ try { baseOutputCommitter.commitJob(jobContext); Configuration conf = jobContext.getConfiguration(); + try { //import hfiles new LoadIncrementalHFiles(conf) .doBulkLoad(HFileOutputFormat.getOutputPath(jobContext), new HTable(conf, conf.get(HBaseConstants.PROPERTY_OUTPUT_TABLE_NAME_KEY))); + } catch (Exception e) { + throw new IOException("BulkLoad failed.", e); + } } finally { cleanupScratch(jobContext); } Index: storage-drivers/hbase/build.xml =================================================================== --- storage-drivers/hbase/build.xml (revision 1291958) +++ storage-drivers/hbase/build.xml (working copy) @@ -111,21 +111,21 @@ - - + + + + + + + + + + - - - - - - -