PHOENIX-4605 Support running multiple transaction providers (ammendment)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/a0b0c1e1 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/a0b0c1e1 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/a0b0c1e1 Branch: refs/heads/system-catalog Commit: a0b0c1e1e0597024e7f94c6d62e238ce1f2778ef Parents: de83b8d Author: James Taylor <jtay...@salesforce.com> Authored: Thu Apr 12 18:11:19 2018 -0700 Committer: James Taylor <jtay...@salesforce.com> Committed: Thu Apr 12 18:12:58 2018 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/phoenix/schema/MetaDataClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/a0b0c1e1/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java index 3c7a837..1fb668e 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java @@ -3276,7 +3276,7 @@ public class MetaDataClient { // If changing isImmutableRows to true or it's not being changed and is already true boolean willBeImmutableRows = Boolean.TRUE.equals(metaPropertiesEvaluated.getIsImmutableRows()) || (metaPropertiesEvaluated.getIsImmutableRows() == null && table.isImmutableRows()); boolean willBeTxnl = metaProperties.getNonTxToTx(); - Long timeStamp = TransactionUtil.getTableTimestamp(connection, table.isTransactional() || willBeTxnl, metaPropertiesEvaluated.getTransactionProvider()); + Long timeStamp = TransactionUtil.getTableTimestamp(connection, table.isTransactional() || willBeTxnl, table.isTransactional() ? table.getTransactionProvider() : metaPropertiesEvaluated.getTransactionProvider()); int numPkColumnsAdded = 0; List<PColumn> columns = Lists.newArrayListWithExpectedSize(numCols); Set<String> colFamiliesForPColumnsToBeAdded = new LinkedHashSet<>();
