This is an automated email from the ASF dual-hosted git repository. rajeshbabu pushed a commit to branch 5.1 in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.1 by this push: new 816aa9cae7 PHOENIX-7075 Backport PHOENIX-6715 “Update Omid to 1.1.0” to branch 5.1 (#1716) 816aa9cae7 is described below commit 816aa9cae7684f7f6888a683dfd398a305c1395b Author: Nihal Jain <nihaljain...@gmail.com> AuthorDate: Thu Oct 19 10:02:26 2023 +0530 PHOENIX-7075 Backport PHOENIX-6715 “Update Omid to 1.1.0” to branch 5.1 (#1716) --- phoenix-core/pom.xml | 18 ++-- .../phoenix/coprocessor/OmidGCProcessor.java | 2 - pom.xml | 106 ++------------------- 3 files changed, 15 insertions(+), 111 deletions(-) diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 327cf9057d..8cc1d18626 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -374,27 +374,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> @@ -416,12 +412,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 bb18931630..7cc069de54 100644 --- a/pom.xml +++ b/pom.xml @@ -131,7 +131,7 @@ <jodatime.version>2.10.5</jodatime.version> <joni.version>2.1.31</joni.version> <tephra.version>0.16.1</tephra.version> - <omid.version>1.0.2</omid.version> + <omid.version>1.1.0</omid.version> <stream.version>2.9.5</stream.version> <icu4j.version>72.1</icu4j.version> <guice.version>5.1.0</guice.version> @@ -454,9 +454,6 @@ <configuration> <outputFile>${project.build.directory}/classes/mrapp-generated-classpath </outputFile> - <ignoredUnusedDeclaredDependencies> - org.apache.omid:*hbase2.x - </ignoredUnusedDeclaredDependencies> </configuration> </execution> <execution> @@ -1132,17 +1129,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>commons-io</groupId> <artifactId>commons-io</artifactId> @@ -1151,25 +1140,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> @@ -1178,21 +1151,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> @@ -1205,21 +1166,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> @@ -1236,33 +1185,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> @@ -1279,21 +1205,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>commons-io</groupId> <artifactId>commons-io</artifactId> @@ -1306,17 +1224,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>commons-io</groupId> <artifactId>commons-io</artifactId>