You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by td...@apache.org on 2015/04/08 20:32:01 UTC
phoenix git commit: Fix for AlterTableIT
Repository: phoenix
Updated Branches:
refs/heads/txn e9b509dd8 -> 0ad5c5675
Fix for AlterTableIT
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/0ad5c567
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/0ad5c567
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/0ad5c567
Branch: refs/heads/txn
Commit: 0ad5c56754cb6dffdee6591f62686d16ac20e48d
Parents: e9b509d
Author: Thomas <td...@salesforce.com>
Authored: Wed Apr 8 11:31:56 2015 -0700
Committer: Thomas <td...@salesforce.com>
Committed: Wed Apr 8 11:31:56 2015 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/phoenix/execute/MutationState.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/0ad5c567/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
index 8915534..b562cd8 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
@@ -422,11 +422,11 @@ public class MutationState implements SQLCloseable {
}
SQLException sqlE = null;
- HTableInterface hTable = connection.getQueryServices().getTable(table.getPhysicalName().getBytes());
+ HTableInterface hTable = connection.getQueryServices().getTable(htableName);
try {
// Don't add immutable indexes (those are the only ones that would participate
// during a commit), as we don't need conflict detection for these.
- if (table.isTransactional() && table.getType() != PTableType.INDEX) {
+ if (table.isTransactional() && isDataTable) {
TransactionAwareHTable txnAware = TransactionUtil.getTransactionAwareHTable(hTable);
connection.addTxParticipant(txnAware);
hTable = txnAware;