Repository: phoenix Updated Branches: refs/heads/omid2 862929248 -> 7b5a49a5d
PHOENIX-4937 Pass whether or not a table is conflict free to TTable constructor Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/caa6939d Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/caa6939d Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/caa6939d Branch: refs/heads/omid2 Commit: caa6939dd0f7228979e3c277a89a1061063e175a Parents: 8629292 Author: James Taylor <[email protected]> Authored: Sat Sep 29 12:02:18 2018 -0700 Committer: James Taylor <[email protected]> Committed: Sat Sep 29 12:02:18 2018 -0700 ---------------------------------------------------------------------- .../org/apache/phoenix/transaction/OmidTransactionTable.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/caa6939d/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 70625d2..bb6764c 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 @@ -68,13 +68,13 @@ public class OmidTransactionTable implements Table { this(ctx, hTable, false); } - public OmidTransactionTable(PhoenixTransactionContext ctx, Table hTable, boolean isImmutable) throws SQLException { + public OmidTransactionTable(PhoenixTransactionContext ctx, Table hTable, boolean isConflictFree) throws SQLException { assert(ctx instanceof OmidTransactionContext); OmidTransactionContext omidTransactionContext = (OmidTransactionContext) ctx; try { - tTable = new TTable(hTable, true); + tTable = new TTable(hTable, true, isConflictFree); } catch (IOException e) { throw new SQLExceptionInfo.Builder( SQLExceptionCode.TRANSACTION_FAILED)
