hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From da...@apache.org
Subject [09/50] [abbrv] hive git commit: HIVE-11349 Update HBase metastore hbase version to 1.1.1 (gates)
Date Tue, 22 Sep 2015 05:03:40 GMT
HIVE-11349 Update HBase metastore hbase version to 1.1.1 (gates)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/cb370216
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/cb370216
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/cb370216

Branch: refs/heads/master
Commit: cb3702164b027c646dca9ebbf01daeee0dab0d65
Parents: 61db7b8
Author: Alan Gates <gates@hortonworks.com>
Authored: Wed Jul 22 18:52:17 2015 -0700
Committer: Alan Gates <gates@hortonworks.com>
Committed: Wed Jul 22 18:52:17 2015 -0700

----------------------------------------------------------------------
 .../hadoop/hive/metastore/hbase/HBaseIntegrationTests.java    | 7 +++++--
 metastore/pom.xml                                             | 2 +-
 .../hadoop/hive/metastore/hbase/TephraHBaseConnection.java    | 4 ++--
 pom.xml                                                       | 4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/cb370216/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/HBaseIntegrationTests.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/HBaseIntegrationTests.java
b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/HBaseIntegrationTests.java
index 58b1ee9..c369058 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/hbase/HBaseIntegrationTests.java
+++ b/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 @@ public class HBaseIntegrationTests {
 
   protected static HBaseTestingUtility utility;
   protected static HBaseAdmin admin;
-  protected static Map<String, String> emptyParameters = new HashMap<String, String>();
+  protected static Map<String, String> emptyParameters = new HashMap<>();
   protected static HiveConf conf;
 
   protected HBaseStore store;
@@ -57,6 +57,9 @@ public class HBaseIntegrationTests {
         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);

http://git-wip-us.apache.org/repos/asf/hive/blob/cb370216/metastore/pom.xml
----------------------------------------------------------------------
diff --git a/metastore/pom.xml b/metastore/pom.xml
index e3942f8..ccec9f1 100644
--- a/metastore/pom.xml
+++ b/metastore/pom.xml
@@ -138,7 +138,7 @@
     </dependency>
     <dependency>
       <groupId>co.cask.tephra</groupId>
-      <artifactId>tephra-hbase-compat-0.98</artifactId>
+      <artifactId>tephra-hbase-compat-1.0</artifactId>
       <version>${tephra.version}</version>
     </dependency>
     <!-- test inter-project -->

http://git-wip-us.apache.org/repos/asf/hive/blob/cb370216/metastore/src/java/org/apache/hadoop/hive/metastore/hbase/TephraHBaseConnection.java
----------------------------------------------------------------------
diff --git a/metastore/src/java/org/apache/hadoop/hive/metastore/hbase/TephraHBaseConnection.java
b/metastore/src/java/org/apache/hadoop/hive/metastore/hbase/TephraHBaseConnection.java
index 47c3f11..f9c6e73 100644
--- a/metastore/src/java/org/apache/hadoop/hive/metastore/hbase/TephraHBaseConnection.java
+++ b/metastore/src/java/org/apache/hadoop/hive/metastore/hbase/TephraHBaseConnection.java
@@ -25,8 +25,8 @@ import co.cask.tephra.TransactionManager;
 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;

http://git-wip-us.apache.org/repos/asf/hive/blob/cb370216/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e9c054a..bb629b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
     <hadoop-23.version>2.6.0</hadoop-23.version>
     <hadoop.bin.path>${basedir}/${hive.path.to.root}/testutils/hadoop</hadoop.bin.path>
     <hbase.hadoop1.version>0.98.9-hadoop1</hbase.hadoop1.version>
-    <hbase.hadoop2.version>0.98.9-hadoop2</hbase.hadoop2.version>
+    <hbase.hadoop2.version>1.1.1</hbase.hadoop2.version>
     <!-- httpcomponents are not always in version sync -->
     <httpcomponents.client.version>4.4</httpcomponents.client.version>
     <httpcomponents.core.version>4.4</httpcomponents.core.version>
@@ -174,7 +174,7 @@
     <felix.version>2.4.0</felix.version>
     <curator.version>2.6.0</curator.version>
     <jsr305.version>3.0.0</jsr305.version>
-    <tephra.version>0.4.0</tephra.version>
+    <tephra.version>0.5.1-SNAPSHOT</tephra.version>
     <gson.version>2.2.4</gson.version>
   </properties>
 


Mime
View raw message