Repository: phoenix Updated Branches: refs/heads/4.9-HBase-1.2 a107c0eed -> bd227a7b4
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/bd227a7b Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/bd227a7b Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/bd227a7b Branch: refs/heads/4.9-HBase-1.2 Commit: bd227a7b4d95d6aec1527b664b723d42e2ee7ecc Parents: a107c0e Author: Samarth <samarth.j...@salesforce.com> Authored: Wed Dec 21 17:47:10 2016 -0800 Committer: Samarth <samarth.j...@salesforce.com> Committed: Wed Dec 21 17:47:10 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/bd227a7b/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 721f232..a2b32a8 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 @@ -2375,7 +2375,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, @@ -2393,6 +2392,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,
