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-omid.git
The following commit(s) were added to refs/heads/master by this push:
new 91260e35 OMID-277 Omid 1.1.2 fails with Phoenix 5.2
91260e35 is described below
commit 91260e355d0e6c004420eef6cead2cda3dbc8971
Author: Istvan Toth
AuthorDate: Thu Feb 29 07:22:13 2024 +0100
OMID-277 Omid 1.1.2 fails with Phoenix 5.2
* remove overlooked unrelecated Guava references
* add maven enforcer plugin to catch future problems
---
.../org/apache/omid/transaction/HBaseCellId.java | 2 +-
.../org/apache/omid/transaction/TestCellUtils.java | 28 -
.../apache/omid/transaction/TestOmidLLRaces.java | 2 +-
.../apache/omid/transaction/TestShadowCells.java | 2 +-
.../committable/hbase/HBaseCommitTableConfig.java | 2 +-
pom.xml| 67 ++
.../timestamp/storage/HBaseTimestampStorage.java | 2 +-
.../omid/tso/client/TestUnconnectedTSOClient.java | 2 +-
8 files changed, 87 insertions(+), 20 deletions(-)
diff --git
a/hbase-client/src/main/java/org/apache/omid/transaction/HBaseCellId.java
b/hbase-client/src/main/java/org/apache/omid/transaction/HBaseCellId.java
index 7c21bc8e..736ab3dc 100644
--- a/hbase-client/src/main/java/org/apache/omid/transaction/HBaseCellId.java
+++ b/hbase-client/src/main/java/org/apache/omid/transaction/HBaseCellId.java
@@ -17,7 +17,7 @@
*/
package org.apache.omid.transaction;
-import static com.google.common.base.Charsets.UTF_8;
+import static
org.apache.phoenix.thirdparty.com.google.common.base.Charsets.UTF_8;
import org.apache.omid.tso.client.CellId;
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 50a4a9ba..d5a162fd 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
@@ -57,13 +57,13 @@ public class TestCellUtils {
public void testShadowCellQualifiers(byte[] shadowCellSuffixToTest) throws
IOException {
final byte[] validShadowCellQualifier =
-com.google.common.primitives.Bytes.concat(qualifier,
shadowCellSuffixToTest);
+
org.apache.phoenix.thirdparty.com.google.common.primitives.Bytes.concat(qualifier,
shadowCellSuffixToTest);
final byte[] sandwichValidShadowCellQualifier =
-
com.google.common.primitives.Bytes.concat(shadowCellSuffixToTest,
validShadowCellQualifier);
+
org.apache.phoenix.thirdparty.com.google.common.primitives.Bytes.concat(shadowCellSuffixToTest,
validShadowCellQualifier);
final byte[] doubleEndedValidShadowCellQualifier =
-
com.google.common.primitives.Bytes.concat(validShadowCellQualifier,
shadowCellSuffixToTest);
+
org.apache.phoenix.thirdparty.com.google.common.primitives.Bytes.concat(validShadowCellQualifier,
shadowCellSuffixToTest);
final byte[] interleavedValidShadowCellQualifier =
-
com.google.common.primitives.Bytes.concat(validShadowCellQualifier,
com.google.common.primitives.Bytes
+
org.apache.phoenix.thirdparty.com.google.common.primitives.Bytes.concat(validShadowCellQualifier,
org.apache.phoenix.thirdparty.com.google.common.primitives.Bytes
.concat(validShadowCellQualifier,
validShadowCellQualifier));
final byte[] value = Bytes.toBytes("test-value");
@@ -100,11 +100,11 @@ public class TestCellUtils {
public void testCorrectMapingOfCellsToShadowCells() throws IOException {
// Create the required data
final byte[] validShadowCellQualifier =
-com.google.common.primitives.Bytes.concat(SHADOW_CELL_PREFIX,
qualifier, SHADOW_CELL_SUFFIX);
+
org.apache.phoenix.thirdparty.com.google.common.primitives.Bytes.concat(SHADOW_CELL_PREFIX,
qualifier, SHADOW_CELL_SUFFIX);
final byte[] qualifier2 = Bytes.toBytes("test-qual2");
final byte[] validShadowCellQualifier2 =
-com.google.common.primitives.Bytes.concat(SHADOW_CELL_PREFIX,
qualifier2, SHADOW_CELL_SUFFIX);
+
org.apache.phoenix.thirdparty.com.google.common.primitives.Bytes.concat(SHADOW_CELL_PREFIX,
qualifier2, SHADOW_CELL_SUFFIX);
final byte[] qualifier3 = Bytes.toBytes("test-qual3");
@@ -176,7 +176,7 @@ public class TestCellUtils {
byte[] suffixedQualifier =
CellUtils.addShadowCellSuffixPrefix(cell.getQualifierArray(),
cell.getQualifierOffset(),
cell.getQualifierLength());
-byte[] expectedQualifier =
com.google.common.primitive