Repository: phoenix Updated Branches: refs/heads/5.x-HBase-2.0 b3edf3903 -> a54fd4aa6
PHOENIX-4457 Account for the Table interface addition of checkAndMutate Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/a54fd4aa Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/a54fd4aa Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/a54fd4aa Branch: refs/heads/5.x-HBase-2.0 Commit: a54fd4aa6c6ebe86f1ca7dd996a715b44c9a0948 Parents: b3edf39 Author: Sergey Soldatov <s...@apache.org> Authored: Wed Dec 13 09:52:57 2017 -0800 Committer: Sergey Soldatov <s...@apache.org> Committed: Wed Dec 13 09:52:57 2017 -0800 ---------------------------------------------------------------------- .../java/org/apache/phoenix/execute/DelegateHTable.java | 5 +++++ .../apache/phoenix/transaction/OmidTransactionTable.java | 6 ++++++ .../apache/phoenix/transaction/TephraTransactionTable.java | 5 +++++ .../apache/phoenix/transaction/TransactionAwareHTable.java | 9 +++++++++ 4 files changed, 25 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/a54fd4aa/phoenix-core/src/main/java/org/apache/phoenix/execute/DelegateHTable.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/execute/DelegateHTable.java b/phoenix-core/src/main/java/org/apache/phoenix/execute/DelegateHTable.java index 15d5cf6..c953c8d 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/execute/DelegateHTable.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/DelegateHTable.java @@ -271,6 +271,11 @@ public class DelegateHTable implements Table { } @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); http://git-wip-us.apache.org/repos/asf/phoenix/blob/a54fd4aa/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java ---------------------------------------------------------------------- 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 78d7e4c..0874e45 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 @@ -317,6 +317,12 @@ public class OmidTransactionTable implements PhoenixTransactionalTable { } @Override + public CheckAndMutateBuilder checkAndMutate(byte[] row, byte[] family) { + // TODO Auto-generated method stub + return null; + } + + @Override public boolean checkAndMutate(byte[] row, byte[] family, byte[] qualifier, CompareOperator op, byte[] value, RowMutations mutation) throws IOException { // TODO Auto-generated method stub http://git-wip-us.apache.org/repos/asf/phoenix/blob/a54fd4aa/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionTable.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionTable.java b/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionTable.java index f9de869..e28e98b 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionTable.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/transaction/TephraTransactionTable.java @@ -302,6 +302,11 @@ public class TephraTransactionTable implements PhoenixTransactionalTable { } @Override + public CheckAndMutateBuilder checkAndMutate(byte[] row, byte[] family) { + return transactionAwareHTable.checkAndMutate(row, family); + } + + @Override public boolean checkAndMutate(byte[] row, byte[] family, byte[] qualifier, CompareOperator op, byte[] value, RowMutations mutation) throws IOException { return transactionAwareHTable.checkAndMutate(row, family, qualifier, op, value, mutation); http://git-wip-us.apache.org/repos/asf/phoenix/blob/a54fd4aa/phoenix-core/src/main/java/org/apache/phoenix/transaction/TransactionAwareHTable.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/transaction/TransactionAwareHTable.java b/phoenix-core/src/main/java/org/apache/phoenix/transaction/TransactionAwareHTable.java index 62d3286..8499ac2 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/transaction/TransactionAwareHTable.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/transaction/TransactionAwareHTable.java @@ -605,6 +605,15 @@ public class TransactionAwareHTable extends AbstractTransactionAwareTable implem } @Override + public CheckAndMutateBuilder checkAndMutate(byte[] row, byte[] family) { + if(allowNonTransactional){ + return hTable.checkAndMutate(row, family); + }else{ + throw new UnsupportedOperationException("Operation is not supported transactionally"); + } + } + + @Override public boolean checkAndMutate(byte[] row, byte[] family, byte[] qualifier, CompareOperator op, byte[] value, RowMutations mutation) throws IOException { if(allowNonTransactional){