You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by an...@apache.org on 2016/07/06 12:26:10 UTC
phoenix git commit: PHOENIX-2902 Adjust
PhoenixDatabaseMetadata#getSchemas query if namespaces are enabled
Repository: phoenix
Updated Branches:
refs/heads/master b7564692f -> dbd9143e9
PHOENIX-2902 Adjust PhoenixDatabaseMetadata#getSchemas query if namespaces are enabled
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/dbd9143e
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/dbd9143e
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/dbd9143e
Branch: refs/heads/master
Commit: dbd9143e9cf75a9770e34bfcc5e9cb15922ea8a5
Parents: b756469
Author: Ankit Singhal <an...@gmail.com>
Authored: Wed Jul 6 17:55:53 2016 +0530
Committer: Ankit Singhal <an...@gmail.com>
Committed: Wed Jul 6 17:55:53 2016 +0530
----------------------------------------------------------------------
.../phoenix/end2end/QueryDatabaseMetaDataIT.java | 16 ++++++++++------
.../phoenix/jdbc/PhoenixDatabaseMetaData.java | 6 ++++--
2 files changed, 14 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/dbd9143e/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
index 167114a..4012d0c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
@@ -274,13 +274,11 @@ public class QueryDatabaseMetaDataIT extends BaseClientManagedTimeIT {
@Test
public void testSchemaMetadataScan() throws SQLException {
long ts = nextTimestamp();
+ ensureTableCreated(getUrl(), CUSTOM_ENTITY_DATA_FULL_NAME, null, ts);
+ ensureTableCreated(getUrl(), PTSDB_NAME, null, ts);
Properties props = new Properties();
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts));
- props.setProperty(QueryServices.IS_NAMESPACE_MAPPING_ENABLED, Boolean.toString(true));
+ props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 5));
Connection conn = DriverManager.getConnection(getUrl(), props);
- conn.createStatement().execute("CREATE SCHEMA " + CUSTOM_ENTITY_DATA_SCHEMA_NAME);
- props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts+10));
- conn = DriverManager.getConnection(getUrl(), props);
DatabaseMetaData dbmd = conn.getMetaData();
ResultSet rs;
rs = dbmd.getSchemas(null, CUSTOM_ENTITY_DATA_SCHEMA_NAME);
@@ -289,10 +287,16 @@ public class QueryDatabaseMetaDataIT extends BaseClientManagedTimeIT {
assertEquals(rs.getString(2),null);
assertFalse(rs.next());
- rs = dbmd.getSchemas();
+ rs = dbmd.getSchemas(null, null);
+ assertTrue(rs.next());
+ assertEquals(rs.getString("TABLE_SCHEM"),null);
+ assertEquals(rs.getString("TABLE_CATALOG"),null);
assertTrue(rs.next());
assertEquals(rs.getString("TABLE_SCHEM"),CUSTOM_ENTITY_DATA_SCHEMA_NAME);
assertEquals(rs.getString("TABLE_CATALOG"),null);
+ assertTrue(rs.next());
+ assertEquals(rs.getString("TABLE_SCHEM"),PhoenixDatabaseMetaData.SYSTEM_CATALOG_SCHEMA);
+ assertEquals(rs.getString("TABLE_CATALOG"),null);
assertFalse(rs.next());
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/dbd9143e/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java
index 7466b1c..c10bc9f 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java
@@ -930,8 +930,10 @@ public class PhoenixDatabaseMetaData implements DatabaseMetaData {
if (schemaPattern != null) {
buf.append(" and " + TABLE_SCHEM + " like '" + StringUtil.escapeStringConstant(schemaPattern) + "'");
}
- buf.append(" and " + TABLE_NAME + " = '" + MetaDataClient.EMPTY_TABLE + "'");
-
+ if (SchemaUtil.isNamespaceMappingEnabled(null, connection.getQueryServices().getProps())) {
+ buf.append(" and " + TABLE_NAME + " = '" + MetaDataClient.EMPTY_TABLE + "'");
+ }
+
// TODO: we should union this with SYSTEM.SEQUENCE too, but we only have support for
// UNION ALL and we really need UNION so that it dedups.
Statement stmt = connection.createStatement();