Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.2 6d9140ed6 -> b7e358242
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/b7e35824 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/b7e35824 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/b7e35824 Branch: refs/heads/4.x-HBase-1.2 Commit: b7e35824249e2677e4bf7062f7434e10355f0baa Parents: 6d9140e Author: James Taylor <[email protected]> Authored: Thu Apr 12 18:11:19 2018 -0700 Committer: James Taylor <[email protected]> Committed: Thu Apr 12 18:14:25 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/b7e35824/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<>();
