From 6f71800d7f663ee3456a9e528099968eba55b25b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vill=C5=91=20Sz=C5=B1cs?= Date: Mon, 9 Dec 2024 15:11:23 +0100 Subject: [PATCH 1/3] PHOENIX-7481 HBase 3 compatibility changes: Cleanup deprecated APIs, HTable and HTableDescriptor Co-authored-by: Istvan Toth --- .../phoenix/execute/DelegateHTable.java | 105 ---------------- .../transaction/OmidTransactionTable.java | 29 +++-- .../coprocessor/MetaDataRegionObserver.java | 3 +- .../end2end/AlterTableWithViewsIT.java | 5 +- .../phoenix/end2end/ViewTTLNotEnabledIT.java | 1 - .../phoenix/end2end/index/BaseIndexIT.java | 3 +- .../index/BaseIndexWithRegionMovesIT.java | 3 +- .../index/ImmutableIndexExtendedIT.java | 4 +- .../compat/hbase/CompatDelegateHTable.java | 111 +++++++++++++++++ .../hbase/CompatOmidTransactionTable.java | 7 -- .../compat/hbase/CompatDelegateHTable.java | 110 +++++++++++++++++ .../hbase/CompatOmidTransactionTable.java | 7 -- .../compat/hbase/CompatDelegateHTable.java | 111 +++++++++++++++++ .../hbase/CompatOmidTransactionTable.java | 6 - .../compat/hbase/CompatDelegateHTable.java | 113 ++++++++++++++++++ .../hbase/CompatOmidTransactionTable.java | 7 -- 16 files changed, 467 insertions(+), 158 deletions(-) diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/execute/DelegateHTable.java b/phoenix-core-client/src/main/java/org/apache/phoenix/execute/DelegateHTable.java index d099bd1680a..21b9ebeba13 100644 --- a/phoenix-core-client/src/main/java/org/apache/phoenix/execute/DelegateHTable.java +++ b/phoenix-core-client/src/main/java/org/apache/phoenix/execute/DelegateHTable.java @@ -24,7 +24,6 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.CompareOperator; -import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Append; import org.apache.hadoop.hbase.client.CheckAndMutate; @@ -44,7 +43,6 @@ import org.apache.hadoop.hbase.client.TableDescriptor; import org.apache.hadoop.hbase.client.coprocessor.Batch.Call; import org.apache.hadoop.hbase.client.coprocessor.Batch.Callback; -import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; import org.apache.hadoop.hbase.ipc.CoprocessorRpcChannel; import org.apache.phoenix.compat.hbase.CompatDelegateHTable; @@ -69,21 +67,11 @@ public Configuration getConfiguration() { return delegate.getConfiguration(); } - @Override - public HTableDescriptor getTableDescriptor() throws IOException { - return delegate.getTableDescriptor(); - } - @Override public boolean exists(Get get) throws IOException { return delegate.exists(get); } - @Override - public boolean[] existsAll(List gets) throws IOException { - return delegate.existsAll(gets); - } - @Override public void batch(List actions, Object[] results) throws IOException, InterruptedException { @@ -131,18 +119,6 @@ public void put(List puts) throws IOException { delegate.put(puts); } - @Override - public boolean checkAndPut(byte[] row, byte[] family, byte[] qualifier, byte[] value, Put put) - throws IOException { - return delegate.checkAndPut(row, family, qualifier, value, put); - } - - @Override - public boolean checkAndPut(byte[] row, byte[] family, byte[] qualifier, CompareOp compareOp, - byte[] value, Put put) throws IOException { - return delegate.checkAndPut(row, family, qualifier, compareOp, value, put); - } - @Override public void delete(Delete delete) throws IOException { delegate.delete(delete); @@ -153,18 +129,6 @@ public void delete(List deletes) throws IOException { delegate.delete(deletes); } - @Override - public boolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier, byte[] value, - Delete delete) throws IOException { - return delegate.checkAndDelete(row, family, qualifier, value, delete); - } - - @Override - public boolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier, CompareOp compareOp, - byte[] value, Delete delete) throws IOException { - return delegate.checkAndDelete(row, family, qualifier, compareOp, value, delete); - } - @Override public Result append(Append append) throws IOException { return delegate.append(append); @@ -230,80 +194,11 @@ public CheckAndMutateResult checkAndMutate(CheckAndMutate checkAndMutate) throws return delegate.checkAndMutate(checkAndMutate); } - @Override - public boolean checkAndMutate(byte[] row, byte[] family, byte[] qualifier, CompareOp compareOp, - byte[] value, RowMutations mutation) throws IOException { - return delegate.checkAndMutate(row, family, qualifier, compareOp, value, mutation); - } - - @Override - public void setOperationTimeout(int operationTimeout) { - delegate.setOperationTimeout(operationTimeout); - } - - @Override - public int getOperationTimeout() { - return delegate.getOperationTimeout(); - } - - @Override - public int getRpcTimeout() { - return delegate.getRpcTimeout(); - } - - @Override - public void setRpcTimeout(int rpcTimeout) { - delegate.setRpcTimeout(rpcTimeout); - } - @Override public TableDescriptor getDescriptor() throws IOException { return delegate.getDescriptor(); } - @Override - public boolean checkAndPut(byte[] row, byte[] family, byte[] qualifier, CompareOperator op, - byte[] value, Put put) throws IOException { - return delegate.checkAndPut(row, family, qualifier, op, value, put); - } - - @Override - public boolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier, CompareOperator op, - byte[] value, Delete delete) throws IOException { - return delegate.checkAndDelete(row, family, qualifier, op, value, delete); - } - - @Override - public CheckAndMutateBuilder checkAndMutate(byte[] row, byte[] family) { - return delegate.checkAndMutate(row, family); - } - - @Override - public boolean checkAndMutate(byte[] row, byte[] family, byte[] qualifier, CompareOperator op, - byte[] value, RowMutations mutation) throws IOException { - return delegate.checkAndMutate(row, family, qualifier, op, value, mutation); - } - - @Override - public int getReadRpcTimeout() { - return delegate.getReadRpcTimeout(); - } - - @Override - public void setReadRpcTimeout(int readRpcTimeout) { - delegate.setReadRpcTimeout(readRpcTimeout); - } - - @Override - public int getWriteRpcTimeout() { - return delegate.getWriteRpcTimeout(); - } - - @Override - public void setWriteRpcTimeout(int writeRpcTimeout) { - delegate.setWriteRpcTimeout(writeRpcTimeout); - } - @Override public boolean[] exists(List gets) throws IOException { return delegate.exists(gets); diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java b/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java index 483a52b7257..0e93b76334d 100644 --- a/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java +++ b/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java @@ -26,7 +26,6 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.CompareOperator; -import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Append; import org.apache.hadoop.hbase.client.Delete; @@ -165,7 +164,7 @@ public TableName getName() { return TableName.valueOf(name); } - @Override + //No @Override for HBase 3 compatibility public boolean[] existsAll(List gets) throws IOException { throw new UnsupportedOperationException(); } @@ -186,13 +185,13 @@ public void batchCallback(List actions, throw new UnsupportedOperationException(); } - @Override + //No @Override for HBase 3 compatibility public boolean checkAndPut(byte[] row, byte[] family, byte[] qualifier, byte[] value, Put put) throws IOException { throw new UnsupportedOperationException(); } - @Override + //No @Override for HBase 3 compatibility public boolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier, byte[] value, Delete delete) throws IOException { throw new UnsupportedOperationException(); @@ -256,42 +255,42 @@ public void batchCoprocessorService( throw new UnsupportedOperationException(); } - @Override + //No @Override for HBase 3 compatibility public int getOperationTimeout() { throw new UnsupportedOperationException(); } - @Override + //No @Override for HBase 3 compatibility public int getRpcTimeout() { throw new UnsupportedOperationException(); } - @Override + //No @Override for HBase 3 compatibility public void setOperationTimeout(int arg0) { throw new UnsupportedOperationException(); } - @Override + //No @Override for HBase 3 compatibility public void setRpcTimeout(int arg0) { throw new UnsupportedOperationException(); } - @Override + //No @Override for HBase 3 compatibility public int getWriteRpcTimeout() { throw new UnsupportedOperationException(); } - @Override + //No @Override for HBase 3 compatibility public void setWriteRpcTimeout(int writeRpcTimeout) { throw new UnsupportedOperationException(); } - @Override + //No @Override for HBase 3 compatibility public int getReadRpcTimeout() { throw new UnsupportedOperationException(); } - @Override + //No @Override for HBase 3 compatibility public void setReadRpcTimeout(int readRpcTimeout) { throw new UnsupportedOperationException(); } @@ -306,19 +305,19 @@ public boolean[] exists(List gets) throws IOException { throw new UnsupportedOperationException(); } - @Override + //No @Override for HBase 3 compatibility public boolean checkAndPut(byte[] row, byte[] family, byte[] qualifier, CompareOperator op, byte[] value, Put put) throws IOException { throw new UnsupportedOperationException(); } - @Override + //No @Override for HBase 3 compatibility public boolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier, CompareOperator op, byte[] value, Delete delete) throws IOException { throw new UnsupportedOperationException(); } - @Override + //No @Override for HBase 3 compatibility public boolean checkAndMutate(byte[] row, byte[] family, byte[] qualifier, CompareOperator op, byte[] value, RowMutations mutation) throws IOException { throw new UnsupportedOperationException(); diff --git a/phoenix-core-server/src/main/java/org/apache/phoenix/coprocessor/MetaDataRegionObserver.java b/phoenix-core-server/src/main/java/org/apache/phoenix/coprocessor/MetaDataRegionObserver.java index 0562dfea816..d477b14dc2b 100644 --- a/phoenix-core-server/src/main/java/org/apache/phoenix/coprocessor/MetaDataRegionObserver.java +++ b/phoenix-core-server/src/main/java/org/apache/phoenix/coprocessor/MetaDataRegionObserver.java @@ -40,6 +40,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; +import org.apache.hadoop.hbase.CompareOperator; import org.apache.hadoop.hbase.CoprocessorEnvironment; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionLocation; @@ -307,7 +308,7 @@ public void run() { Scan scan = new Scan(); SingleColumnValueFilter filter = new SingleColumnValueFilter(PhoenixDatabaseMetaData.TABLE_FAMILY_BYTES, PhoenixDatabaseMetaData.INDEX_DISABLE_TIMESTAMP_BYTES, - CompareFilter.CompareOp.NOT_EQUAL, PLong.INSTANCE.toBytes(0L)); + CompareOperator.NOT_EQUAL, PLong.INSTANCE.toBytes(0L)); filter.setFilterIfMissing(true); scan.setFilter(filter); scan.addColumn(PhoenixDatabaseMetaData.TABLE_FAMILY_BYTES, diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java index f02f358cd4d..36344a21d01 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableWithViewsIT.java @@ -40,7 +40,6 @@ import java.util.Properties; import org.apache.commons.lang3.ArrayUtils; -import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; @@ -1013,7 +1012,7 @@ public void testMakeBaseTableTransactional() throws Exception { PName tenantId = isMultiTenant ? PNameFactory.newName(TENANT1) : null; PhoenixConnection phoenixConn = conn.unwrap(PhoenixConnection.class); - Table htable = phoenixConn.getQueryServices().getTable(Bytes.toBytes(baseTableName)); + Table table = phoenixConn.getQueryServices().getTable(Bytes.toBytes(baseTableName)); assertFalse(phoenixConn.getTable(new PTableKey(null, baseTableName)).isTransactional()); assertFalse(viewConn.unwrap(PhoenixConnection.class).getTable(new PTableKey(tenantId, viewOfTable)).isTransactional()); } @@ -1196,7 +1195,7 @@ public void testDroppingIndexedColDropsViewIndex() throws Exception { // scan the physical table and verify there is a single row for the second local index Scan scan = new Scan(); - HTable table = (HTable) conn.unwrap(PhoenixConnection.class).getQueryServices().getTable(viewIndexPhysicalTable); + Table table = conn.unwrap(PhoenixConnection.class).getQueryServices().getTable(viewIndexPhysicalTable); ResultScanner results = table.getScanner(scan); Result result = results.next(); assertNotNull(result); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewTTLNotEnabledIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewTTLNotEnabledIT.java index c4e5e677aba..d768752b75b 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewTTLNotEnabledIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewTTLNotEnabledIT.java @@ -18,7 +18,6 @@ package org.apache.phoenix.end2end; -import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; import org.apache.phoenix.compile.QueryPlan; diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexIT.java index 429dfbc159f..6f1fe87f443 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexIT.java @@ -48,7 +48,6 @@ import org.apache.hadoop.hbase.CellScanner; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; @@ -914,7 +913,7 @@ public void testUpsertAfterIndexDrop() throws Exception { conn.commit(); // the index table is one row - HTable table = (HTable) conn.unwrap(PhoenixConnection.class).getQueryServices().getTable(fullTableName.getBytes()); + Table table = conn.unwrap(PhoenixConnection.class).getQueryServices().getTable(fullTableName.getBytes()); ResultScanner resultScanner = table.getScanner(new Scan()); for (Result result : resultScanner) { System.out.println(result); diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexWithRegionMovesIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexWithRegionMovesIT.java index 6f4c2705912..eaa2b932776 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexWithRegionMovesIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/BaseIndexWithRegionMovesIT.java @@ -22,7 +22,6 @@ import org.apache.hadoop.hbase.CellScanner; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; @@ -1028,7 +1027,7 @@ public void testUpsertAfterIndexDrop() throws Exception { conn.commit(); // the index table is one row - HTable table = (HTable) conn.unwrap(PhoenixConnection.class).getQueryServices() + Table table = conn.unwrap(PhoenixConnection.class).getQueryServices() .getTable(fullTableName.getBytes()); ResultScanner resultScanner = table.getScanner(new Scan()); for (Result result : resultScanner) { diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexExtendedIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexExtendedIT.java index 55675b1a06a..3547987bd68 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexExtendedIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexExtendedIT.java @@ -20,11 +20,11 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Lists; import org.apache.phoenix.thirdparty.com.google.common.collect.Maps; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Mutation; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; +import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.coprocessor.ObserverContext; import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; import org.apache.hadoop.hbase.coprocessor.SimpleRegionObserver; @@ -225,7 +225,7 @@ public static int getRowCountForEmptyColValue(Connection conn, String tableName, byte[] emptyCQ = EncodedColumnsUtil.getEmptyKeyValueInfo(table).getFirst(); ConnectionQueryServices queryServices = conn.unwrap(PhoenixConnection.class).getQueryServices(); - HTable htable = (HTable) queryServices.getTable(table.getPhysicalName().getBytes()); + Table htable = queryServices.getTable(table.getPhysicalName().getBytes()); Scan scan = new Scan(); scan.addColumn(emptyCF, emptyCQ); ResultScanner resultScanner = htable.getScanner(scan); diff --git a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java b/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java index 47cf21d4cba..35b441a4f3b 100644 --- a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java +++ b/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java @@ -17,10 +17,17 @@ package org.apache.phoenix.compat.hbase; import java.io.IOException; +import java.util.List; +import org.apache.hadoop.hbase.CompareOperator; +import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.client.Delete; +import org.apache.hadoop.hbase.client.Get; +import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.RowMutations; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; public abstract class CompatDelegateHTable implements Table { @@ -34,4 +41,108 @@ public CompatDelegateHTable(Table delegate) { public Result mutateRow(RowMutations rm) throws IOException { return delegate.mutateRow(rm); } + + @Override + public HTableDescriptor getTableDescriptor() throws IOException { + return delegate.getTableDescriptor(); + } + + @Override + public boolean checkAndPut(byte[] row, byte[] family, byte[] qualifier, CompareOp compareOp, + byte[] value, Put put) throws IOException { + return delegate.checkAndPut(row, family, qualifier, compareOp, value, put); + } + + @Override + public boolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier, CompareOp compareOp, + byte[] value, Delete delete) throws IOException { + return delegate.checkAndDelete(row, family, qualifier, compareOp, value, delete); + } + + @Override + public boolean checkAndMutate(byte[] row, byte[] family, byte[] qualifier, CompareOp compareOp, + byte[] value, RowMutations mutation) throws IOException { + return delegate.checkAndMutate(row, family, qualifier, compareOp, value, mutation); + } + + + @Override + public boolean checkAndPut(byte[] row, byte[] family, byte[] qualifier, byte[] value, Put put) + throws IOException { + return delegate.checkAndPut(row, family, qualifier, value, put); + } + + @Override + public boolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier, byte[] value, + Delete delete) throws IOException { + return delegate.checkAndDelete(row, family, qualifier, value, delete); + } + + @Override + public boolean checkAndPut(byte[] row, byte[] family, byte[] qualifier, CompareOperator op, + byte[] value, Put put) throws IOException { + return delegate.checkAndPut(row, family, qualifier, op, value, put); + } + + @Override + public boolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier, CompareOperator op, + byte[] value, Delete delete) throws IOException { + return delegate.checkAndDelete(row, family, qualifier, op, value, delete); + } + + @Override + public boolean checkAndMutate(byte[] row, byte[] family, byte[] qualifier, CompareOperator op, + byte[] value, RowMutations mutation) throws IOException { + return delegate.checkAndMutate(row, family, qualifier, op, value, mutation); + } + + @Override + public CheckAndMutateBuilder checkAndMutate(byte[] row, byte[] family) { + return delegate.checkAndMutate(row, family); + } + + @Override + public void setOperationTimeout(int operationTimeout) { + delegate.setOperationTimeout(operationTimeout); + } + + @Override + public int getOperationTimeout() { + return delegate.getOperationTimeout(); + } + + @Override + public int getRpcTimeout() { + return delegate.getRpcTimeout(); + } + + @Override + public void setRpcTimeout(int rpcTimeout) { + delegate.setRpcTimeout(rpcTimeout); + } + + @Override + public int getReadRpcTimeout() { + return delegate.getReadRpcTimeout(); + } + + @Override + public void setReadRpcTimeout(int readRpcTimeout) { + delegate.setReadRpcTimeout(readRpcTimeout); + } + + @Override + public int getWriteRpcTimeout() { + return delegate.getWriteRpcTimeout(); + } + + @Override + public void setWriteRpcTimeout(int writeRpcTimeout) { + delegate.setWriteRpcTimeout(writeRpcTimeout); + } + + @Override + public boolean[] existsAll(List gets) throws IOException { + return delegate.existsAll(gets); + } } diff --git a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java b/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java index c4c98c68925..5ed8c89a63f 100644 --- a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java +++ b/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java @@ -18,13 +18,11 @@ import java.io.IOException; -import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.RowMutations; import org.apache.hadoop.hbase.client.Table; -import org.apache.hadoop.hbase.client.Table.CheckAndMutateBuilder; import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; public abstract class CompatOmidTransactionTable implements Table { @@ -35,11 +33,6 @@ public CompatOmidTransactionTable(Table hTable) { this.hTable = hTable; } - @Override - public HTableDescriptor getTableDescriptor() throws IOException { - return hTable.getTableDescriptor(); - } - @Override public Result mutateRow(RowMutations rm) throws IOException { throw new UnsupportedOperationException(); diff --git a/phoenix-hbase-compat-2.5.0/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java b/phoenix-hbase-compat-2.5.0/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java index 8e6dca1b79e..64ab2c68d25 100644 --- a/phoenix-hbase-compat-2.5.0/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java +++ b/phoenix-hbase-compat-2.5.0/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java @@ -17,11 +17,18 @@ package org.apache.phoenix.compat.hbase; import java.io.IOException; +import java.util.List; +import org.apache.hadoop.hbase.CompareOperator; +import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.client.Delete; +import org.apache.hadoop.hbase.client.Get; +import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.RegionLocator; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.RowMutations; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; public abstract class CompatDelegateHTable implements Table { @@ -40,4 +47,107 @@ public RegionLocator getRegionLocator() throws IOException { public Result mutateRow(RowMutations rm) throws IOException { return delegate.mutateRow(rm); } + + @Override + public HTableDescriptor getTableDescriptor() throws IOException { + return delegate.getTableDescriptor(); + } + + @Override + public boolean checkAndPut(byte[] row, byte[] family, byte[] qualifier, CompareOp compareOp, + byte[] value, Put put) throws IOException { + return delegate.checkAndPut(row, family, qualifier, compareOp, value, put); + } + + @Override + public boolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier, CompareOp compareOp, + byte[] value, Delete delete) throws IOException { + return delegate.checkAndDelete(row, family, qualifier, compareOp, value, delete); + } + + @Override + public boolean checkAndMutate(byte[] row, byte[] family, byte[] qualifier, CompareOp compareOp, + byte[] value, RowMutations mutation) throws IOException { + return delegate.checkAndMutate(row, family, qualifier, compareOp, value, mutation); + } + + @Override + public boolean checkAndPut(byte[] row, byte[] family, byte[] qualifier, byte[] value, Put put) + throws IOException { + return delegate.checkAndPut(row, family, qualifier, value, put); + } + + @Override + public boolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier, byte[] value, + Delete delete) throws IOException { + return delegate.checkAndDelete(row, family, qualifier, value, delete); + } + + @Override + public boolean checkAndPut(byte[] row, byte[] family, byte[] qualifier, CompareOperator op, + byte[] value, Put put) throws IOException { + return delegate.checkAndPut(row, family, qualifier, op, value, put); + } + + @Override + public boolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier, CompareOperator op, + byte[] value, Delete delete) throws IOException { + return delegate.checkAndDelete(row, family, qualifier, op, value, delete); + } + + @Override + public boolean checkAndMutate(byte[] row, byte[] family, byte[] qualifier, CompareOperator op, + byte[] value, RowMutations mutation) throws IOException { + return delegate.checkAndMutate(row, family, qualifier, op, value, mutation); + } + + @Override + public CheckAndMutateBuilder checkAndMutate(byte[] row, byte[] family) { + return delegate.checkAndMutate(row, family); + } + + @Override + public void setOperationTimeout(int operationTimeout) { + delegate.setOperationTimeout(operationTimeout); + } + + @Override + public int getOperationTimeout() { + return delegate.getOperationTimeout(); + } + + @Override + public int getRpcTimeout() { + return delegate.getRpcTimeout(); + } + + @Override + public void setRpcTimeout(int rpcTimeout) { + delegate.setRpcTimeout(rpcTimeout); + } + + @Override + public int getReadRpcTimeout() { + return delegate.getReadRpcTimeout(); + } + + @Override + public void setReadRpcTimeout(int readRpcTimeout) { + delegate.setReadRpcTimeout(readRpcTimeout); + } + + @Override + public int getWriteRpcTimeout() { + return delegate.getWriteRpcTimeout(); + } + + @Override + public void setWriteRpcTimeout(int writeRpcTimeout) { + delegate.setWriteRpcTimeout(writeRpcTimeout); + } + + @Override + public boolean[] existsAll(List gets) throws IOException { + return delegate.existsAll(gets); + } } diff --git a/phoenix-hbase-compat-2.5.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java b/phoenix-hbase-compat-2.5.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java index cfbfe407756..da135501cae 100644 --- a/phoenix-hbase-compat-2.5.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java +++ b/phoenix-hbase-compat-2.5.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java @@ -18,14 +18,12 @@ import java.io.IOException; -import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.RegionLocator; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.RowMutations; import org.apache.hadoop.hbase.client.Table; -import org.apache.hadoop.hbase.client.Table.CheckAndMutateBuilder; import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; public abstract class CompatOmidTransactionTable implements Table { @@ -36,11 +34,6 @@ public CompatOmidTransactionTable(Table hTable) { this.hTable = hTable; } - @Override - public HTableDescriptor getTableDescriptor() throws IOException { - return hTable.getTableDescriptor(); - } - @Override public RegionLocator getRegionLocator() throws IOException { throw new UnsupportedOperationException(); diff --git a/phoenix-hbase-compat-2.5.4/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java b/phoenix-hbase-compat-2.5.4/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java index 8e6dca1b79e..616b35dadb9 100644 --- a/phoenix-hbase-compat-2.5.4/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java +++ b/phoenix-hbase-compat-2.5.4/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java @@ -17,11 +17,18 @@ package org.apache.phoenix.compat.hbase; import java.io.IOException; +import java.util.List; +import org.apache.hadoop.hbase.CompareOperator; +import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.client.Delete; +import org.apache.hadoop.hbase.client.Get; +import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.RegionLocator; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.RowMutations; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; public abstract class CompatDelegateHTable implements Table { @@ -40,4 +47,108 @@ public RegionLocator getRegionLocator() throws IOException { public Result mutateRow(RowMutations rm) throws IOException { return delegate.mutateRow(rm); } + + @Override + public HTableDescriptor getTableDescriptor() throws IOException { + return delegate.getTableDescriptor(); + } + + @Override + public boolean checkAndPut(byte[] row, byte[] family, byte[] qualifier, CompareOp compareOp, + byte[] value, Put put) throws IOException { + return delegate.checkAndPut(row, family, qualifier, compareOp, value, put); + } + + @Override + public boolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier, CompareOp compareOp, + byte[] value, Delete delete) throws IOException { + return delegate.checkAndDelete(row, family, qualifier, compareOp, value, delete); + } + + @Override + public boolean checkAndMutate(byte[] row, byte[] family, byte[] qualifier, CompareOp compareOp, + byte[] value, RowMutations mutation) throws IOException { + return delegate.checkAndMutate(row, family, qualifier, compareOp, value, mutation); + } + + @Override + public boolean checkAndPut(byte[] row, byte[] family, byte[] qualifier, byte[] value, Put put) + throws IOException { + return delegate.checkAndPut(row, family, qualifier, value, put); + } + + @Override + public boolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier, byte[] value, + Delete delete) throws IOException { + return delegate.checkAndDelete(row, family, qualifier, value, delete); + } + + @Override + public boolean checkAndPut(byte[] row, byte[] family, byte[] qualifier, CompareOperator op, + byte[] value, Put put) throws IOException { + return delegate.checkAndPut(row, family, qualifier, op, value, put); + } + + @Override + public boolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier, CompareOperator op, + byte[] value, Delete delete) throws IOException { + return delegate.checkAndDelete(row, family, qualifier, op, value, delete); + } + + + @Override + public boolean checkAndMutate(byte[] row, byte[] family, byte[] qualifier, CompareOperator op, + byte[] value, RowMutations mutation) throws IOException { + return delegate.checkAndMutate(row, family, qualifier, op, value, mutation); + } + + @Override + public CheckAndMutateBuilder checkAndMutate(byte[] row, byte[] family) { + return delegate.checkAndMutate(row, family); + } + + @Override + public void setOperationTimeout(int operationTimeout) { + delegate.setOperationTimeout(operationTimeout); + } + + @Override + public int getOperationTimeout() { + return delegate.getOperationTimeout(); + } + + @Override + public int getRpcTimeout() { + return delegate.getRpcTimeout(); + } + + @Override + public void setRpcTimeout(int rpcTimeout) { + delegate.setRpcTimeout(rpcTimeout); + } + + @Override + public int getReadRpcTimeout() { + return delegate.getReadRpcTimeout(); + } + + @Override + public void setReadRpcTimeout(int readRpcTimeout) { + delegate.setReadRpcTimeout(readRpcTimeout); + } + + @Override + public int getWriteRpcTimeout() { + return delegate.getWriteRpcTimeout(); + } + + @Override + public void setWriteRpcTimeout(int writeRpcTimeout) { + delegate.setWriteRpcTimeout(writeRpcTimeout); + } + + @Override + public boolean[] existsAll(List gets) throws IOException { + return delegate.existsAll(gets); + } } diff --git a/phoenix-hbase-compat-2.5.4/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java b/phoenix-hbase-compat-2.5.4/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java index cfbfe407756..9597f75b09d 100644 --- a/phoenix-hbase-compat-2.5.4/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java +++ b/phoenix-hbase-compat-2.5.4/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java @@ -25,7 +25,6 @@ import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.RowMutations; import org.apache.hadoop.hbase.client.Table; -import org.apache.hadoop.hbase.client.Table.CheckAndMutateBuilder; import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; public abstract class CompatOmidTransactionTable implements Table { @@ -36,11 +35,6 @@ public CompatOmidTransactionTable(Table hTable) { this.hTable = hTable; } - @Override - public HTableDescriptor getTableDescriptor() throws IOException { - return hTable.getTableDescriptor(); - } - @Override public RegionLocator getRegionLocator() throws IOException { throw new UnsupportedOperationException(); diff --git a/phoenix-hbase-compat-2.6.0/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java b/phoenix-hbase-compat-2.6.0/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java index 8e6dca1b79e..b2170ad5277 100644 --- a/phoenix-hbase-compat-2.6.0/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java +++ b/phoenix-hbase-compat-2.6.0/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java @@ -17,11 +17,18 @@ package org.apache.phoenix.compat.hbase; import java.io.IOException; +import java.util.List; +import org.apache.hadoop.hbase.CompareOperator; +import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.client.Delete; +import org.apache.hadoop.hbase.client.Get; +import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.RegionLocator; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.RowMutations; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; public abstract class CompatDelegateHTable implements Table { @@ -40,4 +47,110 @@ public RegionLocator getRegionLocator() throws IOException { public Result mutateRow(RowMutations rm) throws IOException { return delegate.mutateRow(rm); } + + @Override + public HTableDescriptor getTableDescriptor() throws IOException { + return delegate.getTableDescriptor(); + } + + + @Override + public boolean checkAndPut(byte[] row, byte[] family, byte[] qualifier, CompareOp compareOp, + byte[] value, Put put) throws IOException { + return delegate.checkAndPut(row, family, qualifier, compareOp, value, put); + } + + @Override + public boolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier, CompareOp compareOp, + byte[] value, Delete delete) throws IOException { + return delegate.checkAndDelete(row, family, qualifier, compareOp, value, delete); + } + + @Override + public boolean checkAndMutate(byte[] row, byte[] family, byte[] qualifier, CompareOp compareOp, + byte[] value, RowMutations mutation) throws IOException { + return delegate.checkAndMutate(row, family, qualifier, compareOp, value, mutation); + } + + + @Override + public boolean checkAndPut(byte[] row, byte[] family, byte[] qualifier, byte[] value, Put put) + throws IOException { + return delegate.checkAndPut(row, family, qualifier, value, put); + } + + @Override + public boolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier, byte[] value, + Delete delete) throws IOException { + return delegate.checkAndDelete(row, family, qualifier, value, delete); + } + + @Override + public boolean checkAndPut(byte[] row, byte[] family, byte[] qualifier, CompareOperator op, + byte[] value, Put put) throws IOException { + return delegate.checkAndPut(row, family, qualifier, op, value, put); + } + + @Override + public boolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier, CompareOperator op, + byte[] value, Delete delete) throws IOException { + return delegate.checkAndDelete(row, family, qualifier, op, value, delete); + } + + + @Override + public boolean checkAndMutate(byte[] row, byte[] family, byte[] qualifier, CompareOperator op, + byte[] value, RowMutations mutation) throws IOException { + return delegate.checkAndMutate(row, family, qualifier, op, value, mutation); + } + + @Override + public CheckAndMutateBuilder checkAndMutate(byte[] row, byte[] family) { + return delegate.checkAndMutate(row, family); + } + + @Override + public void setOperationTimeout(int operationTimeout) { + delegate.setOperationTimeout(operationTimeout); + } + + @Override + public int getOperationTimeout() { + return delegate.getOperationTimeout(); + } + + @Override + public int getRpcTimeout() { + return delegate.getRpcTimeout(); + } + + @Override + public void setRpcTimeout(int rpcTimeout) { + delegate.setRpcTimeout(rpcTimeout); + } + + @Override + public int getReadRpcTimeout() { + return delegate.getReadRpcTimeout(); + } + + @Override + public void setReadRpcTimeout(int readRpcTimeout) { + delegate.setReadRpcTimeout(readRpcTimeout); + } + + @Override + public int getWriteRpcTimeout() { + return delegate.getWriteRpcTimeout(); + } + + @Override + public void setWriteRpcTimeout(int writeRpcTimeout) { + delegate.setWriteRpcTimeout(writeRpcTimeout); + } + + @Override + public boolean[] existsAll(List gets) throws IOException { + return delegate.existsAll(gets); + } } diff --git a/phoenix-hbase-compat-2.6.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java b/phoenix-hbase-compat-2.6.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java index 81e4a1873f4..56d087f65ff 100644 --- a/phoenix-hbase-compat-2.6.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java +++ b/phoenix-hbase-compat-2.6.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java @@ -18,14 +18,12 @@ import java.io.IOException; -import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.RegionLocator; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.RowMutations; import org.apache.hadoop.hbase.client.Table; -import org.apache.hadoop.hbase.client.Table.CheckAndMutateBuilder; import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; public abstract class CompatOmidTransactionTable implements Table { @@ -36,11 +34,6 @@ public CompatOmidTransactionTable(Table hTable) { this.hTable = hTable; } - @Override - public HTableDescriptor getTableDescriptor() throws IOException { - return hTable.getTableDescriptor(); - } - @Override public RegionLocator getRegionLocator() throws IOException { throw new UnsupportedOperationException(); From 588d38dc9614f79c3122a5c153b3868308c1ba03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vill=C5=91=20Sz=C5=B1cs?= Date: Fri, 10 Jan 2025 14:15:34 +0100 Subject: [PATCH 2/3] Remove protected field hTable --- .../apache/phoenix/transaction/OmidTransactionTable.java | 2 -- .../phoenix/compat/hbase/CompatOmidTransactionTable.java | 6 ------ .../phoenix/compat/hbase/CompatOmidTransactionTable.java | 6 ------ .../phoenix/compat/hbase/CompatOmidTransactionTable.java | 6 ------ .../phoenix/compat/hbase/CompatOmidTransactionTable.java | 6 ------ 5 files changed, 26 deletions(-) diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java b/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java index 0e93b76334d..e1f534927ba 100644 --- a/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java +++ b/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java @@ -64,7 +64,6 @@ public class OmidTransactionTable extends CompatOmidTransactionTable implements private final boolean addShadowCells; public OmidTransactionTable() throws SQLException { - super(null); this.tTable = null; this.tx = null; this.addShadowCells = false; @@ -79,7 +78,6 @@ public OmidTransactionTable(PhoenixTransactionContext ctx, Table hTable, boolean } public OmidTransactionTable(PhoenixTransactionContext ctx, Table hTable, boolean isConflictFree, boolean addShadowCells) throws SQLException { - super(hTable); assert(ctx instanceof OmidTransactionContext); OmidTransactionContext omidTransactionContext = (OmidTransactionContext) ctx; diff --git a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java b/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java index 5ed8c89a63f..1008d9a9099 100644 --- a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java +++ b/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java @@ -27,12 +27,6 @@ public abstract class CompatOmidTransactionTable implements Table { - protected Table hTable; - - public CompatOmidTransactionTable(Table hTable) { - this.hTable = hTable; - } - @Override public Result mutateRow(RowMutations rm) throws IOException { throw new UnsupportedOperationException(); diff --git a/phoenix-hbase-compat-2.5.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java b/phoenix-hbase-compat-2.5.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java index da135501cae..9cd0edec24c 100644 --- a/phoenix-hbase-compat-2.5.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java +++ b/phoenix-hbase-compat-2.5.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java @@ -28,12 +28,6 @@ public abstract class CompatOmidTransactionTable implements Table { - protected Table hTable; - - public CompatOmidTransactionTable(Table hTable) { - this.hTable = hTable; - } - @Override public RegionLocator getRegionLocator() throws IOException { throw new UnsupportedOperationException(); diff --git a/phoenix-hbase-compat-2.5.4/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java b/phoenix-hbase-compat-2.5.4/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java index 9597f75b09d..6dbcb5f4365 100644 --- a/phoenix-hbase-compat-2.5.4/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java +++ b/phoenix-hbase-compat-2.5.4/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java @@ -29,12 +29,6 @@ public abstract class CompatOmidTransactionTable implements Table { - protected Table hTable; - - public CompatOmidTransactionTable(Table hTable) { - this.hTable = hTable; - } - @Override public RegionLocator getRegionLocator() throws IOException { throw new UnsupportedOperationException(); diff --git a/phoenix-hbase-compat-2.6.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java b/phoenix-hbase-compat-2.6.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java index 56d087f65ff..651759a891c 100644 --- a/phoenix-hbase-compat-2.6.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java +++ b/phoenix-hbase-compat-2.6.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java @@ -28,12 +28,6 @@ public abstract class CompatOmidTransactionTable implements Table { - protected Table hTable; - - public CompatOmidTransactionTable(Table hTable) { - this.hTable = hTable; - } - @Override public RegionLocator getRegionLocator() throws IOException { throw new UnsupportedOperationException(); From 5ca33b8d0f90b9e88b10cfd2720f3dbdfe421770 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vill=C5=91=20Sz=C5=B1cs?= Date: Tue, 14 Jan 2025 10:25:16 +0100 Subject: [PATCH 3/3] Remove unused imports --- .../main/java/org/apache/phoenix/execute/DelegateHTable.java | 2 -- .../org/apache/phoenix/coprocessor/MetaDataRegionObserver.java | 1 - .../apache/phoenix/compat/hbase/CompatOmidTransactionTable.java | 1 - 3 files changed, 4 deletions(-) diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/execute/DelegateHTable.java b/phoenix-core-client/src/main/java/org/apache/phoenix/execute/DelegateHTable.java index 21b9ebeba13..0150364dd14 100644 --- a/phoenix-core-client/src/main/java/org/apache/phoenix/execute/DelegateHTable.java +++ b/phoenix-core-client/src/main/java/org/apache/phoenix/execute/DelegateHTable.java @@ -23,7 +23,6 @@ import java.util.concurrent.TimeUnit; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.CompareOperator; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Append; import org.apache.hadoop.hbase.client.CheckAndMutate; @@ -37,7 +36,6 @@ import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Row; -import org.apache.hadoop.hbase.client.RowMutations; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.client.TableDescriptor; diff --git a/phoenix-core-server/src/main/java/org/apache/phoenix/coprocessor/MetaDataRegionObserver.java b/phoenix-core-server/src/main/java/org/apache/phoenix/coprocessor/MetaDataRegionObserver.java index d477b14dc2b..c504490cade 100644 --- a/phoenix-core-server/src/main/java/org/apache/phoenix/coprocessor/MetaDataRegionObserver.java +++ b/phoenix-core-server/src/main/java/org/apache/phoenix/coprocessor/MetaDataRegionObserver.java @@ -54,7 +54,6 @@ import org.apache.hadoop.hbase.coprocessor.RegionCoprocessor; import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; import org.apache.hadoop.hbase.coprocessor.RegionObserver; -import org.apache.hadoop.hbase.filter.CompareFilter; import org.apache.hadoop.hbase.filter.SingleColumnValueFilter; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.hbase.ipc.HBaseRpcController; diff --git a/phoenix-hbase-compat-2.5.4/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java b/phoenix-hbase-compat-2.5.4/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java index 6dbcb5f4365..9cd0edec24c 100644 --- a/phoenix-hbase-compat-2.5.4/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java +++ b/phoenix-hbase-compat-2.5.4/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java @@ -18,7 +18,6 @@ import java.io.IOException; -import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.RegionLocator;