commit 5ef0e2f7b09ad25d7ecfce2e2cf28264c9e9c134 Author: Alan Gates Date: Wed Jul 22 17:46:00 2015 -0700 HIVE-11349 Upgrade to HBase 1.1.1. This borks Tephra, but we're not testing with it at the moment anyway. diff --git itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/HBaseIntegrationTests.java itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/HBaseIntegrationTests.java index 58b1ee9..c369058 100644 --- itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/HBaseIntegrationTests.java +++ itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/HBaseIntegrationTests.java @@ -18,7 +18,7 @@ */ package org.apache.hadoop.hive.metastore.hbase; -import co.cask.tephra.hbase98.coprocessor.TransactionProcessor; +import co.cask.tephra.hbase10.coprocessor.TransactionProcessor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.HBaseTestingUtility; @@ -46,7 +46,7 @@ protected static HBaseTestingUtility utility; protected static HBaseAdmin admin; - protected static Map emptyParameters = new HashMap(); + protected static Map emptyParameters = new HashMap<>(); protected static HiveConf conf; protected HBaseStore store; @@ -57,6 +57,9 @@ protected static void startMiniCluster() throws Exception { System.getProperty(HiveConf.ConfVars.METASTORE_HBASE_CONNECTION_CLASS.varname); boolean testingTephra = connectionClassName != null && connectionClassName.equals(TephraHBaseConnection.class.getName()); + if (testingTephra) { + LOG.info("Testing with Tephra"); + } utility = new HBaseTestingUtility(); utility.startMiniCluster(); conf = new HiveConf(utility.getConfiguration(), HBaseIntegrationTests.class); diff --git metastore/pom.xml metastore/pom.xml index e3942f8..ccec9f1 100644 --- metastore/pom.xml +++ metastore/pom.xml @@ -138,7 +138,7 @@ co.cask.tephra - tephra-hbase-compat-0.98 + tephra-hbase-compat-1.0 ${tephra.version} diff --git metastore/src/java/org/apache/hadoop/hive/metastore/hbase/TephraHBaseConnection.java metastore/src/java/org/apache/hadoop/hive/metastore/hbase/TephraHBaseConnection.java index 47c3f11..f9c6e73 100644 --- metastore/src/java/org/apache/hadoop/hive/metastore/hbase/TephraHBaseConnection.java +++ metastore/src/java/org/apache/hadoop/hive/metastore/hbase/TephraHBaseConnection.java @@ -25,8 +25,8 @@ import co.cask.tephra.TransactionSystemClient; import co.cask.tephra.distributed.ThreadLocalClientProvider; import co.cask.tephra.distributed.TransactionServiceClient; -import co.cask.tephra.hbase98.TransactionAwareHTable; -import co.cask.tephra.hbase98.coprocessor.TransactionProcessor; +import co.cask.tephra.hbase10.TransactionAwareHTable; +import co.cask.tephra.hbase10.coprocessor.TransactionProcessor; import co.cask.tephra.inmemory.InMemoryTxSystemClient; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git pom.xml pom.xml index e9c054a..bb629b2 100644 --- pom.xml +++ pom.xml @@ -125,7 +125,7 @@ 2.6.0 ${basedir}/${hive.path.to.root}/testutils/hadoop 0.98.9-hadoop1 - 0.98.9-hadoop2 + 1.1.1 4.4 4.4 @@ -174,7 +174,7 @@ 2.4.0 2.6.0 3.0.0 - 0.4.0 + 0.5.1-SNAPSHOT 2.2.4