tephra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From poo...@apache.org
Subject incubator-tephra git commit: TEPHRA-289 Update HBase 2.0 dependency to the released version
Date Mon, 07 May 2018 05:24:37 GMT
Repository: incubator-tephra
Updated Branches:
  refs/heads/master 40817bfa1 -> 58578e029


TEPHRA-289 Update HBase 2.0 dependency to the released version

This closes #76

Signed-off-by: poorna <poorna@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-tephra/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tephra/commit/58578e02
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tephra/tree/58578e02
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tephra/diff/58578e02

Branch: refs/heads/master
Commit: 58578e029016cddcaaa02cb435d754ce6a95f5e7
Parents: 40817bf
Author: poorna <poorna@apache.org>
Authored: Sun May 6 21:53:44 2018 -0700
Committer: poorna <poorna@apache.org>
Committed: Sun May 6 22:24:20 2018 -0700

----------------------------------------------------------------------
 pom.xml                                         |  2 +-
 tephra-examples/hbase-2.0/pom.xml               | 26 ++++++--------------
 tephra-hbase-compat-2.0/pom.xml                 |  1 -
 .../hbase/coprocessor/TransactionProcessor.java |  5 +---
 .../coprocessor/TransactionProcessorTest.java   |  2 +-
 5 files changed, 10 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/58578e02/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 98834a1..0665484 100644
--- a/pom.xml
+++ b/pom.xml
@@ -218,7 +218,7 @@
     <hbase12.version>1.2.0</hbase12.version>
     <hbase13.version>1.3.1</hbase13.version>
     <hbase14.version>1.4.0</hbase14.version>
-    <hbase2.version>2.0.0-beta-1</hbase2.version> 
+    <hbase20.version>2.0.0</hbase20.version>
     <junit.version>4.11</junit.version>
     <slf4j.version>1.7.5</slf4j.version>
     <thrift.version>0.9.0</thrift.version>

http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/58578e02/tephra-examples/hbase-2.0/pom.xml
----------------------------------------------------------------------
diff --git a/tephra-examples/hbase-2.0/pom.xml b/tephra-examples/hbase-2.0/pom.xml
index e3fc693..361f420 100644
--- a/tephra-examples/hbase-2.0/pom.xml
+++ b/tephra-examples/hbase-2.0/pom.xml
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-common</artifactId>
-      <version>${hbase2.version}</version>
+      <version>${hbase20.version}</version>
       <scope>provided</scope>
       <exclusions>
         <exclusion>
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-client</artifactId>
-      <version>${hbase2.version}</version>
+      <version>${hbase20.version}</version>
       <scope>provided</scope>
       <exclusions>
         <exclusion>
@@ -82,13 +82,13 @@
     <dependency>
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-protocol</artifactId>
-      <version>${hbase2.version}</version>
+      <version>${hbase20.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-server</artifactId>
-      <version>${hbase2.version}</version>
+      <version>${hbase20.version}</version>
       <scope>provided</scope>
       <exclusions>
         <exclusion>
@@ -102,7 +102,7 @@
     <dependency>
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-server</artifactId>
-      <version>${hbase2.version}</version>
+      <version>${hbase20.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
       <exclusions>
@@ -135,7 +135,7 @@
     <dependency>
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-testing-util</artifactId>
-      <version>${hbase2.version}</version>
+      <version>${hbase20.version}</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -150,20 +150,8 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-testing-util</artifactId>
-      <version>${hbase2.version}</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>asm</groupId>
-          <artifactId>asm</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-http</artifactId>
-      <version>${hbase2.version}</version>
+      <version>${hbase20.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/58578e02/tephra-hbase-compat-2.0/pom.xml
----------------------------------------------------------------------
diff --git a/tephra-hbase-compat-2.0/pom.xml b/tephra-hbase-compat-2.0/pom.xml
index 1d4ffa0..c85ac43 100644
--- a/tephra-hbase-compat-2.0/pom.xml
+++ b/tephra-hbase-compat-2.0/pom.xml
@@ -30,7 +30,6 @@
 
   <properties>
     <hadoop.version>2.7.4</hadoop.version>
-    <hbase20.version>2.0.0-beta-1</hbase20.version> 
   </properties>
 
   <dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/58578e02/tephra-hbase-compat-2.0/src/main/java/org/apache/tephra/hbase/coprocessor/TransactionProcessor.java
----------------------------------------------------------------------
diff --git a/tephra-hbase-compat-2.0/src/main/java/org/apache/tephra/hbase/coprocessor/TransactionProcessor.java
b/tephra-hbase-compat-2.0/src/main/java/org/apache/tephra/hbase/coprocessor/TransactionProcessor.java
index 4b7a516..b589baf 100644
--- a/tephra-hbase-compat-2.0/src/main/java/org/apache/tephra/hbase/coprocessor/TransactionProcessor.java
+++ b/tephra-hbase-compat-2.0/src/main/java/org/apache/tephra/hbase/coprocessor/TransactionProcessor.java
@@ -20,7 +20,6 @@ package org.apache.tephra.hbase.coprocessor;
 
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
@@ -44,7 +43,6 @@ import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
 import org.apache.hadoop.hbase.coprocessor.RegionObserver;
 import org.apache.hadoop.hbase.filter.Filter;
 import org.apache.hadoop.hbase.filter.FilterBase;
-import org.apache.hadoop.hbase.regionserver.HStore;
 import org.apache.hadoop.hbase.regionserver.InternalScanner;
 import org.apache.hadoop.hbase.regionserver.Region;
 import org.apache.hadoop.hbase.regionserver.ScanOptions;
@@ -73,7 +71,6 @@ import java.util.NavigableSet;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
-
 import javax.annotation.Nullable;
 
 /**
@@ -364,7 +361,7 @@ public class TransactionProcessor implements RegionObserver, RegionCoprocessor
{
     // in the region
     // then the region must be empty
     long numStoreFiles = numStoreFilesForRegion(e);
-    long memstoreSize = region.getMemStoreSize();
+    long memstoreSize = region.getMemStoreDataSize();
     LOG.debug(String.format("Region %s: memstore size = %s, num store files = %s",
       region.getRegionInfo().getRegionNameAsString(), memstoreSize, numStoreFiles));
     if (memstoreSize == 0 && numStoreFiles == 0) {

http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/58578e02/tephra-hbase-compat-2.0/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionProcessorTest.java
----------------------------------------------------------------------
diff --git a/tephra-hbase-compat-2.0/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionProcessorTest.java
b/tephra-hbase-compat-2.0/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionProcessorTest.java
index 08efdd4..4888c70 100644
--- a/tephra-hbase-compat-2.0/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionProcessorTest.java
+++ b/tephra-hbase-compat-2.0/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionProcessorTest.java
@@ -595,7 +595,7 @@ public class TransactionProcessorTest {
     Path tablePath = FSUtils.getTableDir(FSUtils.getRootDir(conf), htd.getTableName());
     FileSystem fs = FileSystem.get(conf);
     assertTrue(fs.mkdirs(tablePath));
-    WALFactory walFactory = new WALFactory(conf, null, tableName + ".hlog");
+    WALFactory walFactory = new WALFactory(conf, tableName + ".hlog");
     HRegionInfo info = new HRegionInfo(htd.getTableName(), null, null, false);
     WAL hLog = walFactory.getWAL(info);
     HRegionInfo regionInfo = new HRegionInfo(TableName.valueOf(tableName));


Mime
View raw message