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/f11d501b
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/f11d501b
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/f11d501b

Branch: refs/heads/encodecolumns2
Commit: f11d501b29483a3e543768f3f5e267bf2dd413b5
Parents: 90d27be
Author: Samarth <samarth.j...@salesforce.com>
Authored: Wed Dec 21 17:44:49 2016 -0800
Committer: Samarth <samarth.j...@salesforce.com>
Committed: Wed Dec 21 17:44:49 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/f11d501b/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 9d7a3d2..f1de0bd 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
@@ -2352,7 +2352,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,
@@ -2370,6 +2369,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,

Reply via email to