Repository: phoenix Updated Branches: refs/heads/master 31f3a4635 -> 108b78dee
PHOENIX-3535 Addendum to fix test failures Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/108b78de Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/108b78de Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/108b78de Branch: refs/heads/master Commit: 108b78deed29b42b9a37470abb8e832108182361 Parents: 31f3a46 Author: Samarth <samarth.j...@salesforce.com> Authored: Wed Dec 21 17:44:20 2016 -0800 Committer: Samarth <samarth.j...@salesforce.com> Committed: Wed Dec 21 17:44:20 2016 -0800 ---------------------------------------------------------------------- .../java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/108b78de/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 2227c70..f66b358 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 @@ -2355,7 +2355,6 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement hConnectionEstablished = true; boolean isDoNotUpgradePropSet = UpgradeUtil.isNoUpgradeSet(props); try (HBaseAdmin admin = getAdmin()) { - createSysMutexTable(admin); boolean mappedSystemCatalogExists = admin .tableExists(SchemaUtil.getPhysicalTableName(SYSTEM_CATALOG_NAME_BYTES, true)); if (SchemaUtil.isNamespaceMappingEnabled(PTableType.SYSTEM, @@ -2373,6 +2372,7 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement + " is found but client does not have " + IS_NAMESPACE_MAPPING_ENABLED + " enabled") .build().buildException(); } + createSysMutexTable(admin); } Properties scnProps = PropertiesUtil.deepCopy(props); scnProps.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,
