PHOENIX-4468 Looking up a parent index table of a child view from a different client fails (addendum)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/9355a4d2 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/9355a4d2 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/9355a4d2 Branch: refs/heads/system-catalog Commit: 9355a4d262d31d8d65e1467bcc351bb99760e11d Parents: c935f57 Author: Thomas D'Silva <tdsi...@apache.org> Authored: Wed Dec 20 15:47:19 2017 -0800 Committer: Thomas D'Silva <tdsi...@apache.org> Committed: Wed Dec 20 15:48:58 2017 -0800 ---------------------------------------------------------------------- phoenix-core/src/main/antlr3/PhoenixSQL.g | 1 - .../src/main/java/org/apache/phoenix/schema/PTableImpl.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/9355a4d2/phoenix-core/src/main/antlr3/PhoenixSQL.g ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/antlr3/PhoenixSQL.g b/phoenix-core/src/main/antlr3/PhoenixSQL.g index 5e64984..87153cd 100644 --- a/phoenix-core/src/main/antlr3/PhoenixSQL.g +++ b/phoenix-core/src/main/antlr3/PhoenixSQL.g @@ -1114,7 +1114,6 @@ from_table_name returns [TableName ret] table_identifier returns [String ret] : c=identifier { if (c.contains(QueryConstants.NAMESPACE_SEPARATOR) ) { throw new RuntimeException("Table or schema name cannot contain colon"); } - if (c.contains(QueryConstants.CHILD_VIEW_INDEX_NAME_SEPARATOR) ) { throw new RuntimeException("Table or schema name cannot contain hash"); } $ret = c; } ; http://git-wip-us.apache.org/repos/asf/phoenix/blob/9355a4d2/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java index 7df2458..9525127 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java @@ -267,7 +267,7 @@ public class PTableImpl implements PTable { public static PTableImpl makePTable(PTable table, PName tableName, long timeStamp, List<PName> physicalNames, List<PTable> indexes, String viewStatement, long updateCacheFrequency, PName tenantId) throws SQLException { return new PTableImpl( - tenantId, PNameImpl.EMPTY_NAME, tableName, table.getType(), table.getIndexState(), timeStamp, + tenantId, table.getSchemaName(), tableName, table.getType(), table.getIndexState(), timeStamp, table.getSequenceNumber(), table.getPKName(), table.getBucketNum(), getColumnsToClone(table), table.getParentSchemaName(), table.getParentTableName(), indexes, table.isImmutableRows(), physicalNames, table.getDefaultFamilyName(), viewStatement, table.isWALDisabled(), table.isMultiTenant(), table.getStoreNulls(), table.getViewType(), table.getViewIndexId(), table.getIndexType(),
