Repository: phoenix Updated Branches: refs/heads/4.8-HBase-0.98 f63aa5e57 -> 1c1a564e8
PHOENIX-3652 Users who do not have global access to hbase cluster can't connect to phoenix(addendum) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/1c1a564e Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/1c1a564e Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/1c1a564e Branch: refs/heads/4.8-HBase-0.98 Commit: 1c1a564e88ec6205cfee0955c67818f094145a55 Parents: f63aa5e Author: Ankit Singhal <ankitsingha...@gmail.com> Authored: Mon Feb 6 22:10:33 2017 +0530 Committer: Ankit Singhal <ankitsingha...@gmail.com> Committed: Mon Feb 6 22:10:33 2017 +0530 ---------------------------------------------------------------------- .../org/apache/phoenix/query/ConnectionQueryServicesImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/1c1a564e/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 0acbcde..0d2cefa 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 @@ -20,7 +20,6 @@ package org.apache.phoenix.query; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.apache.hadoop.hbase.HColumnDescriptor.TTL; import static org.apache.phoenix.coprocessor.MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP; -import static org.apache.phoenix.coprocessor.MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_8_1; import static org.apache.phoenix.coprocessor.MetaDataProtocol.PHOENIX_MAJOR_VERSION; import static org.apache.phoenix.coprocessor.MetaDataProtocol.PHOENIX_MINOR_VERSION; import static org.apache.phoenix.coprocessor.MetaDataProtocol.PHOENIX_PATCH_NUMBER; @@ -2731,7 +2730,7 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement try (HBaseAdmin admin = getAdmin()) { ensureNamespaceCreated(QueryConstants.SYSTEM_SCHEMA_NAME); List<TableName> tableNames = Arrays - .asList(admin.listTableNames(QueryConstants.SYSTEM_SCHEMA_NAME + "\\..*")); + .asList(admin.listTableNamesByNamespace(QueryConstants.SYSTEM_SCHEMA_NAME)); if (tableNames.size() == 0) { return; } if (tableNames.size() > 4) { throw new IllegalArgumentException( "Expected 4 system table only but found " + tableNames.size() + ":" + tableNames); }