OMID-222 Remove HBase1 support and update HBase 2 version to 2.4
diff --git a/.travis.yml b/.travis.yml
index 535f249..b19f9a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,9 +34,9 @@
- if [ "${TRAVIS_PULL_REQUEST}" = "false" ] ; then
git checkout master
&&
- mvn clean cobertura:cobertura coveralls:report -Phbase-1 ;
+ mvn clean cobertura:cobertura coveralls:report ;
else
git checkout -b tmp-build-branch
&&
- mvn clean test -Phbase-1 ;
+ mvn clean test ;
fi
\ No newline at end of file
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index de30dec..0129582 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-${hbase.artifactId.suffix}</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <artifactId>omid</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
- <artifactId>omid-benchmarks-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-benchmarks</artifactId>
<name>Benchmarks</name>
<dependencies>
@@ -31,22 +31,22 @@
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-transaction-client-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-transaction-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-commit-table-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-hbase-commit-table</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-metrics-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-metrics</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-codahale-metrics-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-codahale-metrics</artifactId>
<version>${project.version}</version>
</dependency>
<!-- End of Dependencies on Omid modules -->
diff --git a/codahale-metrics/pom.xml b/codahale-metrics/pom.xml
index 64d5c0f..226ea01 100644
--- a/codahale-metrics/pom.xml
+++ b/codahale-metrics/pom.xml
@@ -16,13 +16,13 @@
<parent>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-${hbase.artifactId.suffix}</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <artifactId>omid</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>omid-codahale-metrics-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-codahale-metrics</artifactId>
<name>Codahale Metrics</name>
<dependencies>
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-metrics-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-metrics</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/commit-table/pom.xml b/commit-table/pom.xml
index e6496b5..b65ff42 100644
--- a/commit-table/pom.xml
+++ b/commit-table/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-${hbase.artifactId.suffix}</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <artifactId>omid</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
- <artifactId>omid-commit-table-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-commit-table</artifactId>
<packaging>jar</packaging>
<name>Commit Table</name>
diff --git a/common/pom.xml b/common/pom.xml
index 25f19d3..2d58def 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-${hbase.artifactId.suffix}</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <artifactId>omid</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
- <artifactId>omid-common-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-common</artifactId>
<name>Common</name>
<packaging>jar</packaging>
@@ -33,7 +33,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<!-- end logging -->
@@ -43,7 +42,6 @@
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
- <version>${curator.version}</version>
</dependency>
<dependency>
diff --git a/examples/pom.xml b/examples/pom.xml
index c7f96d4..4cc9d65 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-${hbase.artifactId.suffix}</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <artifactId>omid</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
- <artifactId>omid-examples-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-examples</artifactId>
<name>Omid Client Examples</name>
<description>Includes some examples showing Omid features</description>
@@ -32,13 +32,13 @@
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-client-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-hbase-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-codahale-metrics-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-codahale-metrics</artifactId>
<version>${project.version}</version>
</dependency>
<!-- End of Dependencies on Omid modules -->
@@ -46,13 +46,11 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>${commons-lang3.version}</version>
</dependency>
</dependencies>
diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml
index 6c22b79..6d13972 100644
--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-${hbase.artifactId.suffix}</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <artifactId>omid</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
- <artifactId>omid-hbase-client-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-hbase-client</artifactId>
<packaging>jar</packaging>
<name>HBase Client</name>
<description>HBase specific implementation of transaction-client module</description>
@@ -33,47 +33,47 @@
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-common-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-transaction-client-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-transaction-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-commit-table-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-hbase-commit-table</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-common-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-hbase-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-tso-server-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-tso-server</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-tso-server-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-tso-server</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-commit-table-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-commit-table</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-tools-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-hbase-tools</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -100,7 +100,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<!-- end logging -->
@@ -117,7 +116,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -134,7 +132,6 @@
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-test</artifactId>
- <version>${curator.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -145,11 +142,12 @@
</dependency>
<dependency>
- <groupId>org.apache.omid</groupId>
- <artifactId>${shims.artifactId}</artifactId>
- <version>${project.version}</version>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
</dependency>
+
<!-- end testing -->
</dependencies>
diff --git a/hbase-client/src/test/java/org/apache/omid/transaction/TestCellUtils.java b/hbase-client/src/test/java/org/apache/omid/transaction/TestCellUtils.java
index f2100fa..50a4a9b 100644
--- a/hbase-client/src/test/java/org/apache/omid/transaction/TestCellUtils.java
+++ b/hbase-client/src/test/java/org/apache/omid/transaction/TestCellUtils.java
@@ -22,7 +22,6 @@
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.KeyValue.Type;
import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.omid.HBaseShims;
import org.apache.omid.tso.client.CellId;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@@ -137,7 +136,7 @@
"Should be equal");
// Modify dup shadow cell to have a greater MVCC and check that is replaced
- HBaseShims.setKeyValueSequenceId((KeyValue) dupCell1WithAnotherValue, 1);
+ ((KeyValue)dupCell1WithAnotherValue).setSequenceId(1);
cellsToShadowCells = CellUtils.mapCellsToShadowCells(badListWithDups);
assertEquals(cellsToShadowCells.size(), 1, "There should be only 1 key-value maps");
assertTrue(cellsToShadowCells.containsKey(dupCell1WithAnotherValue));
diff --git a/hbase-commit-table/pom.xml b/hbase-commit-table/pom.xml
index 9dcd686..99cc578 100644
--- a/hbase-commit-table/pom.xml
+++ b/hbase-commit-table/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-${hbase.artifactId.suffix}</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <artifactId>omid</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
- <artifactId>omid-hbase-commit-table-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-hbase-commit-table</artifactId>
<packaging>jar</packaging>
<name>HBase Commit Table</name>
@@ -32,17 +32,17 @@
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-commit-table-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-commit-table</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-common-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-common-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-hbase-common</artifactId>
<version>${project.version}</version>
</dependency>
@@ -53,7 +53,6 @@
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
- <version>${curator.version}</version>
</dependency>
<!-- end distributed comm -->
@@ -101,7 +100,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -112,7 +110,6 @@
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-test</artifactId>
- <version>${curator.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -123,11 +120,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.omid</groupId>
- <artifactId>${shims.artifactId}</artifactId>
- <version>${project.version}</version>
- </dependency>
<!-- end testing -->
<!-- TODO remove these two dependencies that are required for HBaseCommitTableTester -->
diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
index cfd72d0..2792cc6 100644
--- a/hbase-common/pom.xml
+++ b/hbase-common/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-${hbase.artifactId.suffix}</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <artifactId>omid</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
- <artifactId>omid-hbase-common-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-hbase-common</artifactId>
<name>HBase Common</name>
<packaging>jar</packaging>
@@ -48,7 +48,12 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>${commons-lang3.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.phoenix.thirdparty</groupId>
+ <artifactId>phoenix-shaded-guava</artifactId>
+ <version>${phoenix.thirdparty.version}</version>
</dependency>
<!-- end utils -->
@@ -58,7 +63,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<!-- end logging -->
@@ -77,11 +81,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.omid</groupId>
- <artifactId>${shims.artifactId}</artifactId>
- <version>${project.version}</version>
- </dependency>
<!-- end testing -->
</dependencies>
diff --git a/hbase-common/src/main/java/org/apache/omid/transaction/CellUtils.java b/hbase-common/src/main/java/org/apache/omid/transaction/CellUtils.java
index e86c28f..d553687 100644
--- a/hbase-common/src/main/java/org/apache/omid/transaction/CellUtils.java
+++ b/hbase-common/src/main/java/org/apache/omid/transaction/CellUtils.java
@@ -26,13 +26,13 @@
import java.util.TreeMap;
import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellComparatorImpl;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.omid.HBaseShims;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -323,7 +323,7 @@
// Move CellComparator to HBaseSims for 2.0 support
// Need to access through CellComparatorImpl.COMPARATOR
SortedMap<Cell, Optional<Cell>> cellToShadowCellMap
- = new TreeMap<Cell, Optional<Cell>>(HBaseShims.cellComparatorInstance());
+ = new TreeMap<Cell, Optional<Cell>>(CellComparatorImpl.COMPARATOR);
Map<CellId, Cell> cellIdToCellMap = new HashMap<CellId, Cell>();
Map<CellId, Cell> cellIdToSCCellMap = new HashMap<CellId, Cell>();
diff --git a/hbase-coprocessor/pom.xml b/hbase-coprocessor/pom.xml
index 3b72bd3..e60c6ce 100644
--- a/hbase-coprocessor/pom.xml
+++ b/hbase-coprocessor/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-${hbase.artifactId.suffix}</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <artifactId>omid</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
- <artifactId>omid-hbase-coprocessor-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-hbase-coprocessor</artifactId>
<packaging>jar</packaging>
<name>HBase Coprocessors</name>
@@ -32,24 +32,24 @@
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-commit-table-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-hbase-commit-table</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-tso-server-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-tso-server</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-client-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-hbase-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-tso-server-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-tso-server</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -98,7 +98,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -120,9 +119,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.omid</groupId>
- <artifactId>${shims.artifactId}</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-endpoint</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/hbase-shims/hbase-2/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.java b/hbase-coprocessor/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.java
similarity index 100%
rename from hbase-shims/hbase-2/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.java
rename to hbase-coprocessor/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.java
diff --git a/hbase-coprocessor/src/main/java/org/apache/omid/transaction/CompactorScanner.java b/hbase-coprocessor/src/main/java/org/apache/hadoop/hbase/regionserver/CompactorScanner.java
similarity index 98%
rename from hbase-coprocessor/src/main/java/org/apache/omid/transaction/CompactorScanner.java
rename to hbase-coprocessor/src/main/java/org/apache/hadoop/hbase/regionserver/CompactorScanner.java
index 24932ff..1c36859 100644
--- a/hbase-coprocessor/src/main/java/org/apache/omid/transaction/CompactorScanner.java
+++ b/hbase-coprocessor/src/main/java/org/apache/hadoop/hbase/regionserver/CompactorScanner.java
@@ -22,7 +22,6 @@
import org.apache.phoenix.thirdparty.com.google.common.collect.Iterators;
import org.apache.phoenix.thirdparty.com.google.common.collect.PeekingIterator;
import org.apache.commons.collections4.map.LRUMap;
-import org.apache.omid.HBaseShims;
import org.apache.omid.committable.CommitTable;
import org.apache.omid.committable.CommitTable.Client;
import org.apache.omid.committable.CommitTable.CommitTimestamp;
@@ -77,7 +76,7 @@
this.retainNonTransactionallyDeletedCells = preserveNonTransactionallyDeletedCells;
this.lowWatermark = getLowWatermarkFromCommitTable();
// Obtain the table in which the scanner is going to operate
- this.hRegion = HBaseShims.getRegionCoprocessorRegion(e.getEnvironment());
+ this.hRegion = e.getEnvironment().getRegion();
commitCache = new LRUMap<>(1000);
LOG.info("Scanner cleaning up uncommitted txs older than LW [{}] in region [{}]",
lowWatermark, hRegion.getRegionInfo());
@@ -88,6 +87,7 @@
return next(results, -1);
}
+ @Override
public boolean next(List<Cell> result, ScannerContext scannerContext) throws IOException {
int limit = scannerContext.getBatchLimit();
return next(result, limit);
diff --git a/hbase-coprocessor/src/main/java/org/apache/hadoop/hbase/regionserver/RegionConnectionFactory.java b/hbase-coprocessor/src/main/java/org/apache/hadoop/hbase/regionserver/RegionConnectionFactory.java
index 878e82a..62904dd 100644
--- a/hbase-coprocessor/src/main/java/org/apache/hadoop/hbase/regionserver/RegionConnectionFactory.java
+++ b/hbase-coprocessor/src/main/java/org/apache/hadoop/hbase/regionserver/RegionConnectionFactory.java
@@ -27,7 +27,6 @@
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
-import org.apache.omid.HBaseShims;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -50,7 +49,7 @@
// client side. In testing, we've seen NoServerForRegionException occur which
// is a DoNotRetryIOException which are not retried on the client. It's not
// clear if this is a real issue or a test-only issue.
- private static final int DEFAULT_COMMIT_TABLE_ACCESS_ON_READ_RETRIES_NUMBER = HBaseShims.getNoRetriesNumber() + 1;
+ private static final int DEFAULT_COMMIT_TABLE_ACCESS_ON_READ_RETRIES_NUMBER = 1 + 1;
private static final int DEFAULT_COMMIT_TABLE_ACCESS_ON_READ_RETRY_PAUSE = 100;
private RegionConnectionFactory() {
@@ -103,7 +102,7 @@
if((connection = connections.get(connectionType)) == null) {
synchronized (RegionConnectionFactory.class) {
if((connection = connections.get(connectionType)) == null) {
- connection = HBaseShims.newServerConnection(getTypeSpecificConfiguration(connectionType, env.getConfiguration()), env);
+ connection = env.createConnection(getTypeSpecificConfiguration(connectionType, env.getConfiguration()));
connections.put(connectionType, connection);
return connection;
}
diff --git a/hbase-coprocessor/src/main/java/org/apache/omid/transaction/CellSkipFilterBase.java b/hbase-coprocessor/src/main/java/org/apache/omid/transaction/CellSkipFilterBase.java
index 4262a23..52ebaed 100644
--- a/hbase-coprocessor/src/main/java/org/apache/omid/transaction/CellSkipFilterBase.java
+++ b/hbase-coprocessor/src/main/java/org/apache/omid/transaction/CellSkipFilterBase.java
@@ -22,7 +22,7 @@
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.KeyValueUtil;
import org.apache.hadoop.hbase.filter.Filter;
-import org.apache.omid.OmidFilterBase;
+import org.apache.hadoop.hbase.filter.FilterBase;
import java.io.IOException;
import java.util.List;
@@ -35,7 +35,7 @@
* Please see TEPHRA-169 for more details.
*/
-public class CellSkipFilterBase extends OmidFilterBase {
+public class CellSkipFilterBase extends FilterBase {
private final Filter filter;
// remember the previous keyvalue processed by filter when the return code was NEXT_COL or INCLUDE_AND_NEXT_COL
private KeyValue skipColumn = null;
diff --git a/hbase-coprocessor/src/main/java/org/apache/omid/transaction/CompactorUtil.java b/hbase-coprocessor/src/main/java/org/apache/omid/transaction/CompactorUtil.java
index 41bf13c..098a34e 100644
--- a/hbase-coprocessor/src/main/java/org/apache/omid/transaction/CompactorUtil.java
+++ b/hbase-coprocessor/src/main/java/org/apache/omid/transaction/CompactorUtil.java
@@ -21,10 +21,12 @@
import com.beust.jcommander.Parameter;
import com.beust.jcommander.ParametersDelegate;
+import org.apache.hadoop.hbase.client.Admin;
+import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
+import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.client.ConnectionFactory;
-
-import org.apache.omid.HBaseShims;
+import org.apache.hadoop.hbase.client.TableDescriptor;
import org.apache.omid.tools.hbase.HBaseLogin;
import org.apache.omid.tools.hbase.SecureHBaseConfig;
import org.apache.hadoop.conf.Configuration;
@@ -39,7 +41,13 @@
public static void setOmidCompaction(Connection conn, TableName table, byte[] columnFamily, String value)
throws IOException {
- HBaseShims.setCompaction(conn, table, columnFamily, OmidCompactor.OMID_COMPACTABLE_CF_FLAG, value);
+ try(Admin admin = conn.getAdmin()) {
+ TableDescriptor desc = admin.getDescriptor(table);
+ ColumnFamilyDescriptor cfDesc = desc.getColumnFamily(columnFamily);
+ ColumnFamilyDescriptorBuilder cfBuilder = ColumnFamilyDescriptorBuilder.newBuilder(cfDesc);
+ cfBuilder.setValue(Bytes.toBytes(OmidCompactor.OMID_COMPACTABLE_CF_FLAG),Bytes.toBytes(value));
+ admin.modifyColumnFamily(table, cfBuilder.build());
+ }
}
public static void enableOmidCompaction(Connection conn,
diff --git a/hbase-coprocessor/src/main/java/org/apache/omid/transaction/OmidCompactor.java b/hbase-coprocessor/src/main/java/org/apache/omid/transaction/OmidCompactor.java
index b5d164d..b853000 100644
--- a/hbase-coprocessor/src/main/java/org/apache/omid/transaction/OmidCompactor.java
+++ b/hbase-coprocessor/src/main/java/org/apache/omid/transaction/OmidCompactor.java
@@ -18,15 +18,14 @@
package org.apache.omid.transaction;
import org.apache.phoenix.thirdparty.com.google.common.annotations.VisibleForTesting;
-
-
+import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
import org.apache.hadoop.hbase.client.Connection;
+import org.apache.hadoop.hbase.client.TableDescriptor;
import org.apache.omid.committable.CommitTable;
import org.apache.omid.committable.hbase.HBaseCommitTable;
import org.apache.omid.committable.hbase.HBaseCommitTableConfig;
import org.apache.hadoop.hbase.CoprocessorEnvironment;
import org.apache.hadoop.hbase.DoNotRetryIOException;
-import org.apache.omid.HBaseShims;
import org.apache.hadoop.hbase.coprocessor.BaseRegionObserver;
import org.apache.hadoop.hbase.coprocessor.ObserverContext;
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
@@ -36,7 +35,7 @@
import org.apache.hadoop.hbase.regionserver.ScanType;
import org.apache.hadoop.hbase.regionserver.Store;
import org.apache.hadoop.hbase.regionserver.compactions.CompactionRequest;
-
+import org.apache.hadoop.hbase.util.Bytes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -124,8 +123,9 @@
if (enableCompactorForAllFamilies) {
omidCompactable = true;
} else {
-
- omidCompactable = HBaseShims.OmidCompactionEnabled(env, store, OMID_COMPACTABLE_CF_FLAG);
+ TableDescriptor desc = env.getEnvironment().getRegion().getTableDescriptor();
+ ColumnFamilyDescriptor famDesc = desc.getColumnFamily(Bytes.toBytes(store.getColumnFamilyName()));
+ omidCompactable =Boolean.valueOf(Bytes.toString(famDesc.getValue(Bytes.toBytes(OMID_COMPACTABLE_CF_FLAG))));
}
// only column families tagged as compactable are compacted
diff --git a/hbase-coprocessor/src/main/java/org/apache/omid/transaction/OmidSnapshotFilter.java b/hbase-coprocessor/src/main/java/org/apache/omid/transaction/OmidSnapshotFilter.java
index 7ee742d..df59d45 100644
--- a/hbase-coprocessor/src/main/java/org/apache/omid/transaction/OmidSnapshotFilter.java
+++ b/hbase-coprocessor/src/main/java/org/apache/omid/transaction/OmidSnapshotFilter.java
@@ -33,7 +33,6 @@
import org.apache.omid.committable.hbase.HBaseCommitTableConfig;
import org.apache.omid.proto.TSOProto;
import org.apache.omid.transaction.AbstractTransaction.VisibilityLevel;
-import org.apache.omid.HBaseShims;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CoprocessorEnvironment;
import org.apache.hadoop.hbase.client.Get;
@@ -132,7 +131,7 @@
SnapshotFilterImpl snapshotFilter= snapshotFilterQueue.poll();
if (snapshotFilter == null) {
RegionAccessWrapper regionAccessWrapper =
- new RegionAccessWrapper(HBaseShims.getRegionCoprocessorRegion(e.getEnvironment()));
+ new RegionAccessWrapper(e.getEnvironment().getRegion());
snapshotFilter = new SnapshotFilterImpl(regionAccessWrapper, initAndGetCommitTableClient());
}
return snapshotFilter;
diff --git a/hbase-coprocessor/src/main/java/org/apache/omid/transaction/TransactionVisibilityFilterBase.java b/hbase-coprocessor/src/main/java/org/apache/omid/transaction/TransactionVisibilityFilterBase.java
index a8fe3b2..35552b9 100644
--- a/hbase-coprocessor/src/main/java/org/apache/omid/transaction/TransactionVisibilityFilterBase.java
+++ b/hbase-coprocessor/src/main/java/org/apache/omid/transaction/TransactionVisibilityFilterBase.java
@@ -26,10 +26,10 @@
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.filter.Filter;
+import org.apache.hadoop.hbase.filter.FilterBase;
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.omid.OmidFilterBase;
import java.io.IOException;
@@ -39,7 +39,7 @@
import java.util.Map;
-public class TransactionVisibilityFilterBase extends OmidFilterBase {
+public class TransactionVisibilityFilterBase extends FilterBase {
// optional sub-filter to apply to visible cells
private final Filter userFilter;
diff --git a/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompaction.java b/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompaction.java
index a03a581..bdbf2e1 100644
--- a/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompaction.java
+++ b/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompaction.java
@@ -57,8 +57,8 @@
import org.apache.hadoop.hbase.client.Row;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.client.Table;
+import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.omid.HBaseShims;
import org.apache.omid.TestUtils;
import org.apache.omid.committable.CommitTable;
import org.apache.omid.committable.hbase.HBaseCommitTableConfig;
@@ -558,8 +558,9 @@
// directly after the flush, which we want to avoid.
private void manualFlush(String tableName) throws Throwable {
LOG.info("Manually flushing all regions and waiting 2 secs");
- HBaseShims.flushAllOnlineRegions(hbaseTestUtil.getHBaseCluster().getRegionServer(0),
- TableName.valueOf(tableName));
+ for (HRegion r : hbaseTestUtil.getHBaseCluster().getRegionServer(0).getRegions(TableName.valueOf(tableName))) {
+ r.flush(true);
+ }
TimeUnit.SECONDS.sleep(2);
}
diff --git a/hbase-shims/hbase-1/pom.xml b/hbase-shims/hbase-1/pom.xml
deleted file mode 100644
index fb5408f..0000000
--- a/hbase-shims/hbase-1/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-shims-aggregator-${hbase.artifactId.suffix}</artifactId>
- <version>1.0.3-SNAPSHOT</version>
- </parent>
-
- <artifactId>${shims1.artifactId}</artifactId>
- <name>Shims layer for HBase 1.x</name>
- <packaging>jar</packaging>
-
- <properties>
- <hbase.version>${hbase1.version}</hbase.version>
- </properties>
-
- <dependencies>
-
- <!-- Dependencies on Omid modules -->
-
- <dependency>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-common-${hbase.artifactId.suffix}</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- End of Dependencies on Omid modules -->
-
- </dependencies>
-
-</project>
diff --git a/hbase-shims/hbase-1/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerRpcController.java b/hbase-shims/hbase-1/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerRpcController.java
deleted file mode 100644
index 369f7e2..0000000
--- a/hbase-shims/hbase-1/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerRpcController.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.hbase.ipc.controller;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.ipc.DelegatingPayloadCarryingRpcController;
-import org.apache.hadoop.hbase.ipc.PayloadCarryingRpcController;
-
-import com.google.protobuf.RpcController;
-
-/**
- * {@link RpcController} that sets the appropriate priority of RPC calls destined for Phoenix index
- * tables.
- */
-class InterRegionServerRpcController extends DelegatingPayloadCarryingRpcController {
- private final int priority;
-
- public InterRegionServerRpcController(PayloadCarryingRpcController delegate, Configuration conf) {
- super(delegate);
- // Set priority higher that normal, but lower than high
- this.priority = (HConstants.HIGH_QOS + HConstants.NORMAL_QOS) / 2;
- }
-
- @Override
- public void setPriority(final TableName tn) {
- if (tn.isSystemTable()) {
- super.setPriority(tn);
- } else {
- setPriority(this.priority);
- }
- }
-
-}
\ No newline at end of file
diff --git a/hbase-shims/hbase-1/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerRpcControllerFactory.java b/hbase-shims/hbase-1/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerRpcControllerFactory.java
deleted file mode 100644
index e6868e7..0000000
--- a/hbase-shims/hbase-1/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerRpcControllerFactory.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.hbase.ipc.controller;
-
-import java.util.List;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.CellScannable;
-import org.apache.hadoop.hbase.CellScanner;
-import org.apache.hadoop.hbase.ipc.PayloadCarryingRpcController;
-import org.apache.hadoop.hbase.ipc.RpcControllerFactory;
-
-/**
- * {@link RpcControllerFactory} that should only be used when making remote RPCs to the region
- * servers. This prevents deadlocks by having RS to RS traffic handled by higher priorities
- * queues. This controller factory shouldn't be globally configured anywhere and is meant to be
- * used only internally by Omid.
- */
-public class InterRegionServerRpcControllerFactory extends RpcControllerFactory {
-
- public InterRegionServerRpcControllerFactory(Configuration conf) {
- super(conf);
- }
-
- @Override
- public PayloadCarryingRpcController newController() {
- PayloadCarryingRpcController delegate = super.newController();
- return getController(delegate);
- }
-
- @Override
- public PayloadCarryingRpcController newController(CellScanner cellScanner) {
- PayloadCarryingRpcController delegate = super.newController(cellScanner);
- return getController(delegate);
- }
-
- @Override
- public PayloadCarryingRpcController newController(List<CellScannable> cellIterables) {
- PayloadCarryingRpcController delegate = super.newController(cellIterables);
- return getController(delegate);
- }
-
- private PayloadCarryingRpcController getController(PayloadCarryingRpcController delegate) {
- // construct a chain of controllers
- return new InterRegionServerRpcController(delegate, conf);
- }
-
-}
\ No newline at end of file
diff --git a/hbase-shims/hbase-1/src/main/java/org/apache/omid/HBaseShims.java b/hbase-shims/hbase-1/src/main/java/org/apache/omid/HBaseShims.java
deleted file mode 100644
index cd24f49..0000000
--- a/hbase-shims/hbase-1/src/main/java/org/apache/omid/HBaseShims.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.omid;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.CellComparator;
-import org.apache.hadoop.hbase.HColumnDescriptor;
-import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.client.Admin;
-import org.apache.hadoop.hbase.client.Connection;
-import org.apache.hadoop.hbase.client.CoprocessorHConnection;
-import org.apache.hadoop.hbase.coprocessor.ObserverContext;
-import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
-import org.apache.hadoop.hbase.regionserver.HRegionServer;
-import org.apache.hadoop.hbase.regionserver.Region;
-import org.apache.hadoop.hbase.regionserver.Store;
-import org.apache.hadoop.hbase.util.Bytes;
-
-import java.io.IOException;
-
-public class HBaseShims {
-
- static public void setKeyValueSequenceId(KeyValue kv, int sequenceId) {
-
- kv.setSequenceId(sequenceId);
-
- }
-
- static public Region getRegionCoprocessorRegion(RegionCoprocessorEnvironment env) {
-
- return env.getRegion();
-
- }
-
- static public void flushAllOnlineRegions(HRegionServer regionServer, TableName tableName) throws IOException {
-
- for (Region r : regionServer.getOnlineRegions(tableName)) {
- r.flush(true);
- }
-
- }
-
- static public void addFamilyToHTableDescriptor(HTableDescriptor tableDesc, HColumnDescriptor columnDesc) {
-
- tableDesc.addFamily(columnDesc);
-
- }
-
- public static CellComparator cellComparatorInstance() {
- return new CellComparator();
- }
-
- public static boolean OmidCompactionEnabled(ObserverContext<RegionCoprocessorEnvironment> env,
- Store store,
- String cfFlagValue) {
- HTableDescriptor desc = env.getEnvironment().getRegion().getTableDesc();
- HColumnDescriptor famDesc
- = desc.getFamily(Bytes.toBytes(store.getColumnFamilyName()));
- return Boolean.valueOf(famDesc.getValue(cfFlagValue));
- }
-
-
- public static void setCompaction(Connection conn, TableName table, byte[] columnFamily, String key, String value)
- throws IOException {
- try(Admin admin = conn.getAdmin()) {
- HTableDescriptor desc = admin.getTableDescriptor(table);
- HColumnDescriptor cfDesc = desc.getFamily(columnFamily);
- cfDesc.setValue(key, value);
- admin.modifyColumn(table, cfDesc);
- }
- }
-
- /**
- * For HBase 1.x, an HConstants.HBASE_CLIENT_RETRIES_NUMBER value of 0
- * means no retries, while for 2.x a value of 1 means no retries.
- * @return
- */
- public static int getNoRetriesNumber() {
- return 0;
- }
-
- /**
- * Create an HBase Connection from the region server
- */
- public static Connection newServerConnection(Configuration config, RegionCoprocessorEnvironment env) throws IOException {
- return new CoprocessorHConnection(config, (HRegionServer)env.getRegionServerServices());
- }
-
-}
\ No newline at end of file
diff --git a/hbase-shims/hbase-1/src/main/java/org/apache/omid/OmidFilterBase.java b/hbase-shims/hbase-1/src/main/java/org/apache/omid/OmidFilterBase.java
deleted file mode 100644
index b96fbc1..0000000
--- a/hbase-shims/hbase-1/src/main/java/org/apache/omid/OmidFilterBase.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.omid;
-
-import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.filter.Filter;
-import org.apache.hadoop.hbase.filter.FilterBase;
-
-import java.io.IOException;
-
-public abstract class OmidFilterBase extends FilterBase {
-
- public KeyValue getNextKeyHint(KeyValue currentKV) throws IOException {
- Filter userFilter = getInnerFilter();
- if (userFilter != null) {
- return userFilter.getNextKeyHint(currentKV);
- }
- return super.getNextKeyHint(currentKV);
- }
-
- protected abstract Filter getInnerFilter();
-}
diff --git a/hbase-shims/hbase-1/src/main/java/org/apache/omid/RegionWrapper.java b/hbase-shims/hbase-1/src/main/java/org/apache/omid/RegionWrapper.java
deleted file mode 100644
index b589ec1..0000000
--- a/hbase-shims/hbase-1/src/main/java/org/apache/omid/RegionWrapper.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.omid;
-
-import org.apache.hadoop.hbase.HRegionInfo;
-import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.Result;
-import org.apache.hadoop.hbase.regionserver.Region;
-
-import java.io.IOException;
-
-/**
- * Wrapper over {@link org.apache.hadoop.hbase.regionserver.Region} interface in HBase 1.x versions
- */
-public class RegionWrapper {
-
- Region region;
-
- public RegionWrapper(Region region) {
-
- this.region = region;
-
- }
-
- public Result get(Get getOperation) throws IOException {
-
- return region.get(getOperation);
-
- }
-
- public HRegionInfo getRegionInfo() {
-
- return region.getRegionInfo();
-
- }
-
-}
\ No newline at end of file
diff --git a/hbase-shims/hbase-2/pom.xml b/hbase-shims/hbase-2/pom.xml
deleted file mode 100644
index 8770a56..0000000
--- a/hbase-shims/hbase-2/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-shims-aggregator-${hbase.artifactId.suffix}</artifactId>
- <version>1.0.3-SNAPSHOT</version>
- </parent>
-
- <artifactId>${shims2.artifactId}</artifactId>
- <name>Shims layer for HBase 2.x</name>
- <packaging>jar</packaging>
-
- <properties>
- <hbase.version>${hbase2.version}</hbase.version>
- </properties>
-
- <dependencies>
-
- <!-- Dependencies on Omid modules -->
-
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-endpoint</artifactId>
- <version>${hbase2.version}</version>
- </dependency>
-
- <!-- End of Dependencies on Omid modules -->
-
- </dependencies>
-
-</project>
diff --git a/hbase-shims/hbase-2/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerRpcController.java b/hbase-shims/hbase-2/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerRpcController.java
deleted file mode 100644
index 8b2da9f..0000000
--- a/hbase-shims/hbase-2/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerRpcController.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.hbase.ipc.controller;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.ipc.DelegatingHBaseRpcController;
-import org.apache.hadoop.hbase.ipc.HBaseRpcController;
-
-import com.google.protobuf.RpcController;
-
-/**
- * {@link RpcController} that sets the appropriate priority of RPC calls destined for Phoenix index
- * tables.
- */
-class InterRegionServerRpcController extends DelegatingHBaseRpcController {
- private final int priority;
-
- public InterRegionServerRpcController(HBaseRpcController delegate, Configuration conf) {
- super(delegate);
- // Set priority higher that normal, but lower than high
- this.priority = (HConstants.HIGH_QOS + HConstants.NORMAL_QOS) / 2;
- }
-
- @Override
- public void setPriority(final TableName tn) {
- if (tn.isSystemTable()) {
- super.setPriority(tn);
- } else {
- setPriority(this.priority);
- }
- }
-
-
-}
\ No newline at end of file
diff --git a/hbase-shims/hbase-2/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerRpcControllerFactory.java b/hbase-shims/hbase-2/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerRpcControllerFactory.java
deleted file mode 100644
index 6001b29..0000000
--- a/hbase-shims/hbase-2/src/main/java/org/apache/hadoop/hbase/ipc/controller/InterRegionServerRpcControllerFactory.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.hbase.ipc.controller;
-
-import java.util.List;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.CellScannable;
-import org.apache.hadoop.hbase.CellScanner;
-import org.apache.hadoop.hbase.ipc.HBaseRpcController;
-import org.apache.hadoop.hbase.ipc.RpcControllerFactory;
-
-/**
- * {@link RpcControllerFactory} that should only be used when making remote RPCs to the region
- * servers. This prevents deadlocks by having RS to RS traffic handled by higher priorities
- * queues. This controller factory shouldn't be globally configured anywhere and is meant to be
- * used only internally by Omid.
- */
-public class InterRegionServerRpcControllerFactory extends RpcControllerFactory {
-
- public InterRegionServerRpcControllerFactory(Configuration conf) {
- super(conf);
- }
-
- @Override
- public HBaseRpcController newController() {
- HBaseRpcController delegate = super.newController();
- return getController(delegate);
- }
-
- @Override
- public HBaseRpcController newController(CellScanner cellScanner) {
- HBaseRpcController delegate = super.newController(cellScanner);
- return getController(delegate);
- }
-
- @Override
- public HBaseRpcController newController(List<CellScannable> cellIterables) {
- HBaseRpcController delegate = super.newController(cellIterables);
- return getController(delegate);
- }
-
- private HBaseRpcController getController(HBaseRpcController delegate) {
- // construct a chain of controllers
- return new InterRegionServerRpcController(delegate, conf);
- }
-
-}
\ No newline at end of file
diff --git a/hbase-shims/hbase-2/src/main/java/org/apache/omid/HBaseShims.java b/hbase-shims/hbase-2/src/main/java/org/apache/omid/HBaseShims.java
deleted file mode 100644
index e8dc7df..0000000
--- a/hbase-shims/hbase-2/src/main/java/org/apache/omid/HBaseShims.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.omid;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.CellComparator;
-import org.apache.hadoop.hbase.CellComparatorImpl;
-import org.apache.hadoop.hbase.HColumnDescriptor;
-import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.client.Admin;
-import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
-import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
-import org.apache.hadoop.hbase.client.Connection;
-import org.apache.hadoop.hbase.client.TableDescriptor;
-import org.apache.hadoop.hbase.coprocessor.ObserverContext;
-import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
-import org.apache.hadoop.hbase.filter.Filter;
-import org.apache.hadoop.hbase.regionserver.HRegion;
-import org.apache.hadoop.hbase.regionserver.HRegionServer;
-import org.apache.hadoop.hbase.regionserver.Region;
-import org.apache.hadoop.hbase.regionserver.Store;
-import org.apache.hadoop.hbase.util.Bytes;
-
-import java.io.IOException;
-
-public class HBaseShims {
-
- static public void setKeyValueSequenceId(KeyValue kv, int sequenceId) {
-
- kv.setSequenceId(sequenceId);
-
- }
-
- static public Region getRegionCoprocessorRegion(RegionCoprocessorEnvironment env) {
-
- return env.getRegion();
-
- }
-
- static public void flushAllOnlineRegions(HRegionServer regionServer, TableName tableName)
- throws IOException {
-
- for (HRegion r : regionServer.getRegions(tableName)) {
- r.flush(true);
- }
-
- }
-
- static public void addFamilyToHTableDescriptor(HTableDescriptor tableDesc, HColumnDescriptor columnDesc) {
-
- tableDesc.addFamily(columnDesc);
-
- }
-
- public static CellComparator cellComparatorInstance() {
- return CellComparatorImpl.COMPARATOR;
- }
-
- public static boolean OmidCompactionEnabled(ObserverContext<RegionCoprocessorEnvironment> env,
- Store store,
- String cfFlagValue) {
- TableDescriptor desc = env.getEnvironment().getRegion().getTableDescriptor();
- ColumnFamilyDescriptor famDesc = desc.getColumnFamily(Bytes.toBytes(store.getColumnFamilyName()));
- return Boolean.valueOf(Bytes.toString(famDesc.getValue(Bytes.toBytes(cfFlagValue))));
- }
-
- public static void setCompaction(Connection conn, TableName table, byte[] columnFamily, String key, String value)
- throws IOException {
- try(Admin admin = conn.getAdmin()) {
- TableDescriptor desc = admin.getDescriptor(table);
- ColumnFamilyDescriptor cfDesc = desc.getColumnFamily(columnFamily);
- ColumnFamilyDescriptorBuilder cfBuilder = ColumnFamilyDescriptorBuilder.newBuilder(cfDesc);
- cfBuilder.setValue(Bytes.toBytes(key),Bytes.toBytes(value));
- admin.modifyColumnFamily(table, cfBuilder.build());
- }
- }
-
- /**
- * For HBase 1.x, an HConstants.HBASE_CLIENT_RETRIES_NUMBER value of 0
- * means no retries, while for 2.x a value of 1 means no retries.
- * @return
- */
- public static int getNoRetriesNumber() {
- return 1;
- }
-
- /**
- * Create an HBase Connection from the region server
- */
- public static Connection newServerConnection(Configuration config, RegionCoprocessorEnvironment env) throws IOException {
- return env.createConnection(config);
- }
-}
diff --git a/hbase-shims/hbase-2/src/main/java/org/apache/omid/OmidFilterBase.java b/hbase-shims/hbase-2/src/main/java/org/apache/omid/OmidFilterBase.java
deleted file mode 100644
index e5053e0..0000000
--- a/hbase-shims/hbase-2/src/main/java/org/apache/omid/OmidFilterBase.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.omid;
-import org.apache.hadoop.hbase.filter.FilterBase;
-
-public abstract class OmidFilterBase extends FilterBase {}
diff --git a/hbase-shims/pom.xml b/hbase-shims/pom.xml
deleted file mode 100644
index fade041..0000000
--- a/hbase-shims/pom.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-${hbase.artifactId.suffix}</artifactId>
- <version>1.0.3-SNAPSHOT</version>
- </parent>
-
- <artifactId>omid-shims-aggregator-${hbase.artifactId.suffix}</artifactId>
- <packaging>pom</packaging>
- <name>Shims Aggregator for HBase</name>
- <modules>
- <module>${shims.module}</module>
- </modules>
-
-
- <dependencies>
-
- <!-- storage related -->
-
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-client</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-server</artifactId>
- </dependency>
-
- <!-- end storage related -->
-
- <!-- testing -->
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-testing-util</artifactId>
- <scope>test</scope>
- </dependency>
-
-
-
- <!-- end testing related -->
-
- <!-- distributed comm -->
-
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-framework</artifactId>
- <version>${curator.version}</version>
- </dependency>
-
- <!-- end distributed comm -->
-
- <!-- utils -->
-
- <dependency>
- <groupId>org.apache.phoenix.thirdparty</groupId>
- <artifactId>phoenix-shaded-guava</artifactId>
- <version>${phoenix.thirdparty.version}</version>
- </dependency>
-
- <!-- end utils -->
-
- <!-- logging -->
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <!-- end logging -->
-
- </dependencies>
-
- <build>
- <plugins>
- <!-- Disable maven site plugin -->
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/hbase-tools/pom.xml b/hbase-tools/pom.xml
index 2034ca3..2ab810e 100644
--- a/hbase-tools/pom.xml
+++ b/hbase-tools/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-${hbase.artifactId.suffix}</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <artifactId>omid</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
- <artifactId>omid-hbase-tools-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-hbase-tools</artifactId>
<name>HBase tools</name>
<packaging>jar</packaging>
@@ -32,13 +32,13 @@
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-commit-table-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-hbase-commit-table</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-timestamp-storage-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-timestamp-storage</artifactId>
<version>${project.version}</version>
</dependency>
<!-- End of Dependencies on Omid modules -->
@@ -68,7 +68,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<!-- end logging -->
@@ -86,7 +85,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -95,11 +93,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.omid</groupId>
- <artifactId>${shims.artifactId}</artifactId>
- <version>${project.version}</version>
- </dependency>
<!-- end testing -->
</dependencies>
diff --git a/hbase-tools/src/main/java/org/apache/omid/tools/hbase/OmidTableManager.java b/hbase-tools/src/main/java/org/apache/omid/tools/hbase/OmidTableManager.java
index 104f2e8..d62a574 100644
--- a/hbase-tools/src/main/java/org/apache/omid/tools/hbase/OmidTableManager.java
+++ b/hbase-tools/src/main/java/org/apache/omid/tools/hbase/OmidTableManager.java
@@ -28,7 +28,6 @@
import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.client.ConnectionFactory;
import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.omid.HBaseShims;
import org.apache.omid.committable.hbase.HBaseCommitTableConfig;
import org.apache.omid.committable.hbase.KeyGenerator;
import org.apache.omid.committable.hbase.KeyGeneratorImplementations;
@@ -158,7 +157,7 @@
for (byte[] family : families) {
HColumnDescriptor colDescriptor = new HColumnDescriptor(family);
colDescriptor.setMaxVersions(maxVersions);
- HBaseShims.addFamilyToHTableDescriptor(tableDescriptor, colDescriptor);
+ tableDescriptor.addFamily(colDescriptor);
LOG.info("\tAdding Family {}", colDescriptor);
}
diff --git a/metrics/pom.xml b/metrics/pom.xml
index 57ad101..c8a0875 100644
--- a/metrics/pom.xml
+++ b/metrics/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-${hbase.artifactId.suffix}</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <artifactId>omid</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
- <artifactId>omid-metrics-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-metrics</artifactId>
<name>Metrics</name>
<dependencies>
@@ -32,17 +32,14 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
</dependency>
<!-- end logging -->
diff --git a/pom.xml b/pom.xml
index eb3ce50..193f451 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,10 +24,10 @@
<inceptionYear>2011</inceptionYear>
<url>http://omid.incubator.apache.org</url>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid</artifactId>
<packaging>pom</packaging>
<!-- WARNING: do not update version manually, use mvn versions:set -->
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<organization>
<name>Apache Software Foundation</name>
@@ -111,7 +111,6 @@
<module>timestamp-storage</module>
<module>commit-table</module>
<module>tso-server</module>
- <module>hbase-shims</module>
<module>hbase-common</module>
<module>hbase-commit-table</module>
<module>hbase-client</module>
@@ -147,33 +146,19 @@
<properties>
-
- <hbase1.artifactId.suffix>hbase1.x</hbase1.artifactId.suffix>
- <hbase2.artifactId.suffix>hbase2.x</hbase2.artifactId.suffix>
-
- <shims1.artifactId>omid-hbase-shims-${hbase1.artifactId.suffix}</shims1.artifactId>
- <shims2.artifactId>omid-hbase-shims-${hbase2.artifactId.suffix}</shims2.artifactId>
-
- <!-- hbase-1 profile props are here and not in profile section to work better with intelij-->
- <shims.artifactId>${shims1.artifactId}</shims.artifactId>
- <java.version>1.7</java.version>
- <hadoop.version>${hadoop1.version}</hadoop.version>
- <hbase.version>${hbase1.version}</hbase.version>
- <shims.module>hbase-1</shims.module>
- <hbase.artifactId.suffix>${hbase1.artifactId.suffix}</hbase.artifactId.suffix>
+ <java.version>1.8</java.version>
+ <commons-io.version>2.11.0</commons-io.version>
<!-- Basic properties -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- 3rd-Party Library Versioning -->
- <hbase1.version>1.3.1</hbase1.version>
- <hbase2.version>2.0.1</hbase2.version>
- <hadoop1.version>2.7.5</hadoop1.version>
- <hadoop2.version>3.0.0</hadoop2.version>
+ <hbase.version>2.4.10</hbase.version>
+ <hadoop.version>2.10.0</hadoop.version>
<phoenix.thirdparty.version>2.0.0</phoenix.thirdparty.version>
<guice.version>3.0</guice.version>
<testng.version>6.10</testng.version>
- <slf4j.version>1.7.7</slf4j.version>
+ <slf4j.version>1.7.36</slf4j.version>
<log4j.version>1.2.17</log4j.version>
<netty4.version>4.1.76.Final</netty4.version>
<!-- com.google repo will be used except on Aarch64 platform. -->
@@ -190,8 +175,8 @@
<commons.conf.version>1.10</commons.conf.version>
<hamcrest.version>1.3</hamcrest.version>
<!-- 2.12+ shades guava -->
- <curator.version>2.13.0</curator.version>
- <zookeeper.version>3.4.9</zookeeper.version>
+ <curator.version>4.2.0</curator.version>
+ <zookeeper.version>3.5.9</zookeeper.version>
<snakeyaml.version>1.26</snakeyaml.version>
<beanutils.version>1.9.4</beanutils.version>
<!-- Kept for Java 7 compatibility. Overridden in hbase-2 profile.-->
@@ -337,33 +322,6 @@
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>flatten-maven-plugin</artifactId>
- <version>1.2.5</version>
- <configuration>
- <updatePomFile>true</updatePomFile>
- </configuration>
- <executions>
- <!-- enable flattening -->
- <execution>
- <id>flatten</id>
- <phase>process-resources</phase>
- <goals>
- <goal>flatten</goal>
- </goals>
- </execution>
- <!-- ensure proper cleanup -->
- <execution>
- <id>flatten.clean</id>
- <phase>clean</phase>
- <goals>
- <goal>clean</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -612,20 +570,33 @@
<profile>
<id>hbase-1</id>
- <!-- Empty profile to prevent warning when compiling with -Phbase-1 -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <AlwaysFail/>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<profile>
<id>hbase-2</id>
- <properties>
- <shims.artifactId>${shims2.artifactId}</shims.artifactId>
- <shims.module>hbase-2</shims.module>
- <java.version>1.8</java.version>
- <hadoop.version>${hadoop2.version}</hadoop.version>
- <hbase.version>${hbase2.version}</hbase.version>
- <hbase.artifactId.suffix>${hbase2.artifactId.suffix}</hbase.artifactId.suffix>
- <commons-io.version>2.11.0</commons-io.version>
- </properties>
+ <!-- Empty profile to prevent warning when compiling with -Phbase-2 -->
</profile>
<profile>
@@ -697,11 +668,267 @@
</dependency>
<dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-endpoint</artifactId>
+ <version>${hbase.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-annotations</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-auth</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-distcp</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs-client</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <version>${hadoop.version}</version>
+ <type>test-jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-app</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-common</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-core</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-hs</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+ <version>${hadoop.version}</version>
+ <type>test-jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-shuffle</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-minicluster</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-api</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-client</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-common</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-registry</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-server-applicationhistoryservice</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-server-common</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-server-nodemanager</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-server-tests</artifactId>
+ <version>${hadoop.version}</version>
+ <type>test-jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-server-timelineservice</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-server-timelineservice</artifactId>
+ <version>${hadoop.version}</version>
+ <type>test-jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-server-web-proxy</artifactId>
+ <version>${hadoop.version}</version>
+ <type>test-jar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-client</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
+ </exclusions>
+ <version>${curator.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-framework</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
+ </exclusions>
+ <version>${curator.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-recipes</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
+ </exclusions>
+ <version>${curator.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-test</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
+ </exclusions>
+ <version>${curator.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+
+
<!-- Other test dependencies -->
<dependency>
<groupId>junit</groupId>
diff --git a/statemachine/pom.xml b/statemachine/pom.xml
index 0b7521e..5c8af8a 100644
--- a/statemachine/pom.xml
+++ b/statemachine/pom.xml
@@ -18,12 +18,12 @@
<parent>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-${hbase.artifactId.suffix}</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <artifactId>omid</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<name>State Machine</name>
- <artifactId>omid-statemachine-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-statemachine</artifactId>
<packaging>jar</packaging>
<dependencies>
@@ -33,7 +33,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<!-- end logging -->
diff --git a/timestamp-storage/pom.xml b/timestamp-storage/pom.xml
index 5bd45a6..b10ad72 100644
--- a/timestamp-storage/pom.xml
+++ b/timestamp-storage/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-${hbase.artifactId.suffix}</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <artifactId>omid</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
- <artifactId>omid-timestamp-storage-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-timestamp-storage</artifactId>
<name>Timestamp Storage</name>
<packaging>jar</packaging>
@@ -32,12 +32,12 @@
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-common-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-hbase-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-common-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-common</artifactId>
<version>${project.version}</version>
</dependency>
@@ -48,12 +48,10 @@
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
- <version>${curator.version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
- <version>${curator.version}</version>
</dependency>
<!-- end distributed comm -->
@@ -86,7 +84,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<!-- end logging -->
@@ -104,7 +101,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -121,16 +117,9 @@
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-test</artifactId>
- <version>${curator.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.omid</groupId>
- <artifactId>${shims.artifactId}</artifactId>
- <version>${project.version}</version>
-
- </dependency>
<!-- end testing -->
</dependencies>
diff --git a/transaction-client/pom.xml b/transaction-client/pom.xml
index 43989b2..03c436b 100644
--- a/transaction-client/pom.xml
+++ b/transaction-client/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-${hbase.artifactId.suffix}</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <artifactId>omid</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
- <artifactId>omid-transaction-client-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-transaction-client</artifactId>
<packaging>jar</packaging>
<name>Transaction Client</name>
@@ -32,27 +32,27 @@
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-common-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-statemachine-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-statemachine</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-commit-table-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-commit-table</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-metrics-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-metrics</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-commit-table-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-commit-table</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<classifier>tests</classifier>
@@ -65,7 +65,6 @@
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
- <version>${curator.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
@@ -95,7 +94,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<!-- end logging -->
diff --git a/tso-server/maven/assembly/bin.xml b/tso-server/maven/assembly/bin.xml
index 9a064b0..e261a35 100644
--- a/tso-server/maven/assembly/bin.xml
+++ b/tso-server/maven/assembly/bin.xml
@@ -31,9 +31,9 @@
<useAllReactorProjects>true</useAllReactorProjects>
<!-- Now, select which projects to include in this module-set. -->
<includes>
- <include>org.apache.omid:omid-hbase-commit-table-${hbase.artifactId.suffix}</include>
+ <include>org.apache.omid:omid-hbase-commit-table</include>
<include>org.apache.omid:omid-codahale-metrics</include>
- <include>org.apache.omid:omid-hbase-tools-${hbase.artifactId.suffix}</include>
+ <include>org.apache.omid:omid-hbase-tools</include>
</includes>
<binaries>
<outputDirectory>/lib</outputDirectory>
diff --git a/tso-server/pom.xml b/tso-server/pom.xml
index cd81c95..d68c03c 100644
--- a/tso-server/pom.xml
+++ b/tso-server/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-${hbase.artifactId.suffix}</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <artifactId>omid</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
- <artifactId>omid-tso-server-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-tso-server</artifactId>
<packaging>jar</packaging>
<name>TSO and TO Servers</name>
<description>Omid Transaction Status Oracle server and Timestamp Oracle</description>
@@ -33,38 +33,38 @@
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-commit-table-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-commit-table</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-common-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-hbase-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-commit-table-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-hbase-commit-table</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-timestamp-storage-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-timestamp-storage</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-metrics-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-metrics</artifactId>
<version>${project.version}</version>
</dependency>
<!-- The codahale-related dependency is added here just to include the jar in the final
tar.gz package assembled. -->
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-codahale-metrics-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-codahale-metrics</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
@@ -72,20 +72,20 @@
The hbase tools are handy to create the required Omid tables from the same script that starts the TSO server -->
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-tools-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-hbase-tools</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-commit-table-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-commit-table</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-transaction-client-${hbase.artifactId.suffix}</artifactId>
+ <artifactId>omid-transaction-client</artifactId>
<version>${project.version}</version>
</dependency>
@@ -122,12 +122,10 @@
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
- <version>${curator.version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
- <version>${curator.version}</version>
</dependency>
<!-- end distributed comm -->
@@ -176,17 +174,14 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
</dependency>
<!-- end logging -->
@@ -210,7 +205,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -221,15 +215,9 @@
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-test</artifactId>
- <version>${curator.version}</version>
<scope>test</scope>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.apache.omid</groupId>-->
- <!--<artifactId>${shims.artifactId}</artifactId>-->
- <!--<version>${project.version}</version>-->
- <!--</dependency>-->
<!-- end testing -->
</dependencies>
