You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2018/06/18 14:55:56 UTC
phoenix git commit: Pass TRANSACTION_PROVIDER through for index
tables when transitioning from nontx to tx
Repository: phoenix
Updated Branches:
refs/heads/omid2 0bca22d42 -> bf6a7d066
Pass TRANSACTION_PROVIDER through for index tables when transitioning from nontx to tx
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/bf6a7d06
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/bf6a7d06
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/bf6a7d06
Branch: refs/heads/omid2
Commit: bf6a7d06697d2cc01cfbb1721106f7663f2be314
Parents: 0bca22d
Author: James Taylor <ja...@apache.org>
Authored: Mon Jun 18 16:55:44 2018 +0200
Committer: James Taylor <ja...@apache.org>
Committed: Mon Jun 18 16:55:44 2018 +0200
----------------------------------------------------------------------
.../org/apache/phoenix/query/ConnectionQueryServicesImpl.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/bf6a7d06/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index c673a63..5dc3728 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -1963,6 +1963,7 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement
} else {
indexTableProps = Maps.newHashMapWithExpectedSize(1);
indexTableProps.put(PhoenixTransactionContext.READ_NON_TX_DATA, Boolean.valueOf(txValue));
+ indexTableProps.put(PhoenixDatabaseMetaData.TRANSACTION_PROVIDER, tableProps.get(PhoenixDatabaseMetaData.TRANSACTION_PROVIDER));
}
for (PTable index : table.getIndexes()) {
HTableDescriptor indexDescriptor = admin.getTableDescriptor(index.getPhysicalName().getBytes());
@@ -2114,8 +2115,10 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement
willBeTransactional = isOrWillBeTransactional = true;
tableProps.put(PhoenixTransactionContext.READ_NON_TX_DATA, propValue);
} else if (propName.equals(PhoenixDatabaseMetaData.TRANSACTION_PROVIDER) && propValue != null) {
+ willBeTransactional = isOrWillBeTransactional = true;
+ tableProps.put(PhoenixTransactionContext.READ_NON_TX_DATA, Boolean.TRUE);
txProvider = (Provider)TableProperty.TRANSACTION_PROVIDER.getValue(propValue);
- tableProps.put(PhoenixDatabaseMetaData.TRANSACTION_PROVIDER, tableProp.getValue(propValue));
+ tableProps.put(PhoenixDatabaseMetaData.TRANSACTION_PROVIDER, txProvider);
}
} else {
if (MetaDataUtil.isHColumnProperty(propName)) {