phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tdsi...@apache.org
Subject phoenix git commit: PHOENIX-4468 Looking up a parent index table of a child view from a different client fails (addendum)
Date Wed, 20 Dec 2017 23:54:15 GMT
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.2 74fe33d9c -> 84b4efbb8


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

Branch: refs/heads/4.x-HBase-1.2
Commit: 84b4efbb896881db26e65e7886ac53154945c3cb
Parents: 74fe33d
Author: Thomas D'Silva <tdsilva@apache.org>
Authored: Wed Dec 20 15:47:19 2017 -0800
Committer: Thomas D'Silva <tdsilva@apache.org>
Committed: Wed Dec 20 15:48:35 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/84b4efbb/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/84b4efbb/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(),


Mime
View raw message