You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by st...@apache.org on 2022/10/20 05:45:58 UTC
[phoenix] branch master updated: PHOENIX-6715 Update Omid to 1.1.0
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/master by this push:
new 4ca3d94488 PHOENIX-6715 Update Omid to 1.1.0
4ca3d94488 is described below
commit 4ca3d94488e902a47e507507db678ebbe9440142
Author: Istvan Toth <st...@apache.org>
AuthorDate: Tue May 17 15:34:20 2022 +0200
PHOENIX-6715 Update Omid to 1.1.0
---
phoenix-core/pom.xml | 18 ++--
.../phoenix/coprocessor/OmidGCProcessor.java | 2 -
pom.xml | 117 ++-------------------
3 files changed, 16 insertions(+), 121 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index f403fbdadc..f94625adf9 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -413,27 +413,23 @@
<!-- Omid dependencies -->
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-client-hbase2.x</artifactId>
+ <artifactId>omid-hbase-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-coprocessor-hbase2.x</artifactId>
+ <artifactId>omid-hbase-coprocessor</artifactId>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-shims-hbase2.x</artifactId>
+ <artifactId>omid-hbase-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-common-hbase2.x</artifactId>
+ <artifactId>omid-timestamp-storage</artifactId>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-timestamp-storage-hbase2.x</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-commit-table-hbase2.x</artifactId>
+ <artifactId>omid-hbase-commit-table</artifactId>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
@@ -451,12 +447,12 @@
<!-- Omid test dependencies -->
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-tso-server-hbase2.x</artifactId>
+ <artifactId>omid-tso-server</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-tso-server-hbase2.x</artifactId>
+ <artifactId>omid-tso-server</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/OmidGCProcessor.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/OmidGCProcessor.java
index 0fba8cc36a..379e90a1ae 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/OmidGCProcessor.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/OmidGCProcessor.java
@@ -20,9 +20,7 @@ package org.apache.phoenix.coprocessor;
import org.apache.hadoop.hbase.CoprocessorEnvironment;
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessor;
import org.apache.hadoop.hbase.coprocessor.RegionObserver;
-import org.apache.omid.committable.CommitTable;
import org.apache.omid.transaction.OmidCompactor;
-import org.apache.omid.transaction.OmidSnapshotFilter;
import java.io.IOException;
import java.util.Optional;
diff --git a/pom.xml b/pom.xml
index 76d74bfe8a..3b3f3502ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,7 @@
<collections.version>3.2.2</collections.version>
<jodatime.version>2.10.5</jodatime.version>
<joni.version>2.1.31</joni.version>
- <omid.version>1.0.2</omid.version>
+ <omid.version>1.1.0</omid.version>
<stream.version>2.9.5</stream.version>
<i18n-util.version>1.0.4</i18n-util.version>
<guice.version>4.0</guice.version>
@@ -366,16 +366,7 @@
<configuration>
<ignoredUnusedDeclaredDependencies>
<ignoredUnusedDeclaredDependency>
- org.apache.omid:omid-hbase-shims-hbase2.x
- </ignoredUnusedDeclaredDependency>
- <ignoredUnusedDeclaredDependency>
- org.apache.omid:omid-hbase-common-hbase2.x:jar
- </ignoredUnusedDeclaredDependency>
- <ignoredUnusedDeclaredDependency>
- org.apache.omid:omid-hbase-commit-table-hbase2.x
- </ignoredUnusedDeclaredDependency>
- <ignoredUnusedDeclaredDependency>
- org.apache.omid:omid-timestamp-storage-hbase2.x
+ org.apache.omid:*
</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>
org.apache.hbase:hbase-testing-util
@@ -419,9 +410,6 @@
<configuration>
<outputFile>${project.build.directory}/classes/mrapp-generated-classpath
</outputFile>
- <ignoredUnusedDeclaredDependencies>
- org.apache.omid:*hbase2.x
- </ignoredUnusedDeclaredDependencies>
</configuration>
</execution>
<execution>
@@ -1093,17 +1081,9 @@
<!-- Omid -->
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-common-hbase2.x</artifactId>
+ <artifactId>omid-hbase-common</artifactId>
<version>${omid.version}</version>
<exclusions>
- <exclusion>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-shims-hbase1.x</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-common-hbase1.x</artifactId>
- </exclusion>
<exclusion>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
@@ -1116,25 +1096,9 @@
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-client-hbase2.x</artifactId>
+ <artifactId>omid-hbase-client</artifactId>
<version>${omid.version}</version>
<exclusions>
- <exclusion>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-commit-table-hbase1.x</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-common-hbase1.x</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-client-hbase1.x</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-shims-hbase1.x</artifactId>
- </exclusion>
<exclusion>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
@@ -1143,21 +1107,9 @@
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-coprocessor-hbase2.x</artifactId>
+ <artifactId>omid-hbase-coprocessor</artifactId>
<version>${omid.version}</version>
<exclusions>
- <exclusion>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-commit-table-hbase1.x</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-client-hbase1.x</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-shims-hbase1.x</artifactId>
- </exclusion>
<exclusion>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
@@ -1174,21 +1126,9 @@
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-tso-server-hbase2.x</artifactId>
+ <artifactId>omid-tso-server</artifactId>
<version>${omid.version}</version>
<exclusions>
- <exclusion>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-common-hbase1.x</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-commit-table-hbase1.x</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-timestamp-storage-hbase1.x</artifactId>
- </exclusion>
<exclusion>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
@@ -1217,33 +1157,10 @@
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-shims-hbase2.x</artifactId>
- <version>${omid.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-tso-server-hbase2.x</artifactId>
+ <artifactId>omid-tso-server</artifactId>
<version>${omid.version}</version>
<type>test-jar</type>
<exclusions>
- <exclusion>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-common-hbase1.x</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-commit-table-hbase1.x</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-timestamp-storage-hbase1.x</artifactId>
- </exclusion>
<exclusion>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
@@ -1272,21 +1189,13 @@
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-timestamp-storage-hbase2.x</artifactId>
+ <artifactId>omid-timestamp-storage</artifactId>
<version>${omid.version}</version>
<exclusions>
<exclusion>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-shims-hbase1.x</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-common-hbase1.x</artifactId>
- </exclusion>
<exclusion>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
@@ -1303,17 +1212,9 @@
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-commit-table-hbase2.x</artifactId>
+ <artifactId>omid-hbase-commit-table</artifactId>
<version>${omid.version}</version>
<exclusions>
- <exclusion>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-common-hbase1.x</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.omid</groupId>
- <artifactId>omid-hbase-shims-hbase1.x</artifactId>
- </exclusion>
<exclusion>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>