This is an automated email from the ASF dual-hosted git repository.
stoty 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 105876a501 PHOENIX-7188 Remove Omid TTable.getTableDescriptor() calls
105876a501 is described below
commit 105876a5015555e0d3fe74938e0bcb3579f5ba1f
Author: Istvan Toth <[email protected]>
AuthorDate: Thu Feb 8 08:30:10 2024 +0100
PHOENIX-7188 Remove Omid TTable.getTableDescriptor() calls
---
.../org/apache/phoenix/transaction/OmidTransactionTable.java | 7 ++-----
.../phoenix/compat/hbase/CompatOmidTransactionTable.java | 12 ++++++++++++
.../phoenix/compat/hbase/CompatOmidTransactionTable.java | 12 ++++++++++++
.../phoenix/compat/hbase/CompatOmidTransactionTable.java | 12 ++++++++++++
.../phoenix/compat/hbase/CompatOmidTransactionTable.java | 12 ++++++++++++
.../phoenix/compat/hbase/CompatOmidTransactionTable.java | 12 ++++++++++++
.../phoenix/compat/hbase/CompatOmidTransactionTable.java | 12 ++++++++++++
.../phoenix/compat/hbase/CompatOmidTransactionTable.java | 12 ++++++++++++
8 files changed, 86 insertions(+), 5 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
b/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
index cdd8349987..335489f16c 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
@@ -65,6 +65,7 @@ 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,6 +80,7 @@ public class OmidTransactionTable extends
CompatOmidTransactionTable implements
}
public OmidTransactionTable(PhoenixTransactionContext ctx, Table hTable,
boolean isConflictFree, boolean addShadowCells) throws SQLException {
+ super(hTable);
assert(ctx instanceof OmidTransactionContext);
OmidTransactionContext omidTransactionContext =
(OmidTransactionContext) ctx;
@@ -121,11 +123,6 @@ public class OmidTransactionTable extends
CompatOmidTransactionTable implements
return tTable.getConfiguration();
}
- @Override
- public HTableDescriptor getTableDescriptor() throws IOException {
- return tTable.getTableDescriptor();
- }
-
@Override
public boolean exists(Get get) throws IOException {
return tTable.exists(tx, get);
diff --git
a/phoenix-hbase-compat-2.1.6/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
b/phoenix-hbase-compat-2.1.6/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
index 573196e59b..d5c893abc2 100644
---
a/phoenix-hbase-compat-2.1.6/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
+++
b/phoenix-hbase-compat-2.1.6/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
@@ -19,11 +19,23 @@ package org.apache.phoenix.compat.hbase;
import java.io.IOException;
+import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.client.RowMutations;
import org.apache.hadoop.hbase.client.Table;
public abstract class CompatOmidTransactionTable implements Table {
+ protected Table hTable;
+
+ public CompatOmidTransactionTable(Table hTable) {
+ this.hTable = hTable;
+ }
+
+ @Override
+ public HTableDescriptor getTableDescriptor() throws IOException {
+ return hTable.getTableDescriptor();
+ }
+
@Override
public void mutateRow(RowMutations rm) throws IOException {
throw new UnsupportedOperationException();
diff --git
a/phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
b/phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
index 573196e59b..d5c893abc2 100644
---
a/phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
+++
b/phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
@@ -19,11 +19,23 @@ package org.apache.phoenix.compat.hbase;
import java.io.IOException;
+import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.client.RowMutations;
import org.apache.hadoop.hbase.client.Table;
public abstract class CompatOmidTransactionTable implements Table {
+ protected Table hTable;
+
+ public CompatOmidTransactionTable(Table hTable) {
+ this.hTable = hTable;
+ }
+
+ @Override
+ public HTableDescriptor getTableDescriptor() throws IOException {
+ return hTable.getTableDescriptor();
+ }
+
@Override
public void mutateRow(RowMutations rm) throws IOException {
throw new UnsupportedOperationException();
diff --git
a/phoenix-hbase-compat-2.3.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
b/phoenix-hbase-compat-2.3.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
index 8baa2f34ea..9e241f8ce8 100644
---
a/phoenix-hbase-compat-2.3.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
+++
b/phoenix-hbase-compat-2.3.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
@@ -19,12 +19,24 @@ package org.apache.phoenix.compat.hbase;
import java.io.IOException;
+import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.client.RegionLocator;
import org.apache.hadoop.hbase.client.RowMutations;
import org.apache.hadoop.hbase.client.Table;
public abstract class CompatOmidTransactionTable implements Table {
+ protected Table hTable;
+
+ 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.4.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
b/phoenix-hbase-compat-2.4.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
index ae7992fb34..6531a49875 100644
---
a/phoenix-hbase-compat-2.4.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
+++
b/phoenix-hbase-compat-2.4.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
@@ -19,6 +19,7 @@ package org.apache.phoenix.compat.hbase;
import java.io.IOException;
+import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.client.RegionLocator;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.RowMutations;
@@ -26,6 +27,17 @@ import org.apache.hadoop.hbase.client.Table;
public abstract class CompatOmidTransactionTable implements Table {
+ protected Table hTable;
+
+ 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.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 ae7992fb34..6531a49875 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
@@ -19,6 +19,7 @@ package org.apache.phoenix.compat.hbase;
import java.io.IOException;
+import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.client.RegionLocator;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.RowMutations;
@@ -26,6 +27,17 @@ import org.apache.hadoop.hbase.client.Table;
public abstract class CompatOmidTransactionTable implements Table {
+ protected Table hTable;
+
+ 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.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 ae7992fb34..6531a49875 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
@@ -19,6 +19,7 @@ package org.apache.phoenix.compat.hbase;
import java.io.IOException;
+import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.client.RegionLocator;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.RowMutations;
@@ -26,6 +27,17 @@ import org.apache.hadoop.hbase.client.Table;
public abstract class CompatOmidTransactionTable implements Table {
+ protected Table hTable;
+
+ 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/CompatOmidTransactionTable.java
b/phoenix-hbase-compat-2.5.4/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
index ae7992fb34..6531a49875 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
@@ -19,6 +19,7 @@ package org.apache.phoenix.compat.hbase;
import java.io.IOException;
+import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.client.RegionLocator;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.RowMutations;
@@ -26,6 +27,17 @@ import org.apache.hadoop.hbase.client.Table;
public abstract class CompatOmidTransactionTable implements Table {
+ protected Table hTable;
+
+ 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();
