phoenix git commit: PHOENIX-4634 Looking up a parent index table of a tenant child view fails in BaseColumnResolver createTableRef()
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.3 31dad52c0 -> f81cce37e PHOENIX-4634 Looking up a parent index table of a tenant child view fails in BaseColumnResolver createTableRef() Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/f81cce37 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/f81cce37 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/f81cce37 Branch: refs/heads/4.x-HBase-1.3 Commit: f81cce37eb431be16f83dd356941d85a23cd02de Parents: 31dad52 Author: Thomas D'SilvaAuthored: Tue Mar 6 11:14:47 2018 -0800 Committer: Thomas D'Silva Committed: Tue Mar 13 10:39:10 2018 -0700 -- .../apache/phoenix/end2end/PhoenixDriverIT.java | 2 +- .../index/ChildViewsUseParentViewIndexIT.java | 10 +- .../apache/phoenix/schema/MetaDataClient.java | 159 --- .../org/apache/phoenix/util/PhoenixRuntime.java | 24 +-- 4 files changed, 115 insertions(+), 80 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/f81cce37/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixDriverIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixDriverIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixDriverIT.java index 407e9cf..c93d2aa 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixDriverIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixDriverIT.java @@ -159,7 +159,7 @@ public class PhoenixDriverIT extends BaseUniqueNamesOwnClusterIT { stmt.executeQuery(sql); PTable indexTable = stmt.getQueryPlan().getTableRef().getTable(); String tableName = indexTable.getName().getString(); -String expectedTableName = baseTableIndexName + QueryConstants.CHILD_VIEW_INDEX_NAME_SEPARATOR + viewName; +String expectedTableName = viewName + QueryConstants.CHILD_VIEW_INDEX_NAME_SEPARATOR + baseTableIndexName; assertEquals("Parent Index table is not used ", expectedTableName, tableName); // verify that we can look up the index using PhoenixRuntime from a different client http://git-wip-us.apache.org/repos/asf/phoenix/blob/f81cce37/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java index 1e60bf1..6c8f9e8 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java @@ -37,11 +37,11 @@ public class ChildViewsUseParentViewIndexIT extends ParallelStatsDisabledIT { @Test public void testIndexOnParentViewWithTenantSpecificConnection() throws Exception { -final String baseTableName = generateUniqueName(); -final String globalViewName = generateUniqueName(); -final String globalViewIdxName = generateUniqueName(); -final String tenantViewName1 = generateUniqueName(); -final String tenantViewName2 = generateUniqueName(); +final String baseTableName = "BT_" + generateUniqueName(); +final String globalViewName = "GV_" + generateUniqueName(); +final String globalViewIdxName = "GVI_" + generateUniqueName(); +final String tenantViewName1 = "TV1_" + generateUniqueName(); +final String tenantViewName2 = "TV2_" + generateUniqueName(); // Set up props with TenantId Properties props = new Properties(); http://git-wip-us.apache.org/repos/asf/phoenix/blob/f81cce37/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java index e7f7795..d252879 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java @@ -596,66 +596,111 @@ public class MetaDataClient { int tryCount = 0; MetaDataMutationResult result; -do { -final byte[] schemaBytes = PVarchar.INSTANCE.toBytes(schemaName); -final byte[] tableBytes = PVarchar.INSTANCE.toBytes(tableName); -ConnectionQueryServices queryServices =
phoenix git commit: PHOENIX-4634 Looking up a parent index table of a tenant child view fails in BaseColumnResolver createTableRef()
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.1 80df1c3c9 -> 20f4cf99f PHOENIX-4634 Looking up a parent index table of a tenant child view fails in BaseColumnResolver createTableRef() Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/20f4cf99 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/20f4cf99 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/20f4cf99 Branch: refs/heads/4.x-HBase-1.1 Commit: 20f4cf99fb6154c251b68e8c02016dec8417d622 Parents: 80df1c3 Author: Thomas D'SilvaAuthored: Tue Mar 6 11:14:47 2018 -0800 Committer: Thomas D'Silva Committed: Tue Mar 13 10:38:54 2018 -0700 -- .../apache/phoenix/end2end/PhoenixDriverIT.java | 2 +- .../index/ChildViewsUseParentViewIndexIT.java | 10 +- .../apache/phoenix/schema/MetaDataClient.java | 159 --- .../org/apache/phoenix/util/PhoenixRuntime.java | 24 +-- 4 files changed, 115 insertions(+), 80 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/20f4cf99/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixDriverIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixDriverIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixDriverIT.java index 407e9cf..c93d2aa 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixDriverIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixDriverIT.java @@ -159,7 +159,7 @@ public class PhoenixDriverIT extends BaseUniqueNamesOwnClusterIT { stmt.executeQuery(sql); PTable indexTable = stmt.getQueryPlan().getTableRef().getTable(); String tableName = indexTable.getName().getString(); -String expectedTableName = baseTableIndexName + QueryConstants.CHILD_VIEW_INDEX_NAME_SEPARATOR + viewName; +String expectedTableName = viewName + QueryConstants.CHILD_VIEW_INDEX_NAME_SEPARATOR + baseTableIndexName; assertEquals("Parent Index table is not used ", expectedTableName, tableName); // verify that we can look up the index using PhoenixRuntime from a different client http://git-wip-us.apache.org/repos/asf/phoenix/blob/20f4cf99/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java index 1e60bf1..6c8f9e8 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java @@ -37,11 +37,11 @@ public class ChildViewsUseParentViewIndexIT extends ParallelStatsDisabledIT { @Test public void testIndexOnParentViewWithTenantSpecificConnection() throws Exception { -final String baseTableName = generateUniqueName(); -final String globalViewName = generateUniqueName(); -final String globalViewIdxName = generateUniqueName(); -final String tenantViewName1 = generateUniqueName(); -final String tenantViewName2 = generateUniqueName(); +final String baseTableName = "BT_" + generateUniqueName(); +final String globalViewName = "GV_" + generateUniqueName(); +final String globalViewIdxName = "GVI_" + generateUniqueName(); +final String tenantViewName1 = "TV1_" + generateUniqueName(); +final String tenantViewName2 = "TV2_" + generateUniqueName(); // Set up props with TenantId Properties props = new Properties(); http://git-wip-us.apache.org/repos/asf/phoenix/blob/20f4cf99/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java index 24eaef8..5f305a5 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java @@ -590,66 +590,111 @@ public class MetaDataClient { int tryCount = 0; MetaDataMutationResult result; -do { -final byte[] schemaBytes = PVarchar.INSTANCE.toBytes(schemaName); -final byte[] tableBytes = PVarchar.INSTANCE.toBytes(tableName); -ConnectionQueryServices queryServices =
phoenix git commit: PHOENIX-4634 Looking up a parent index table of a tenant child view fails in BaseColumnResolver createTableRef()
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 6d0cbbb6f -> 1e83415f1 PHOENIX-4634 Looking up a parent index table of a tenant child view fails in BaseColumnResolver createTableRef() Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/1e83415f Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/1e83415f Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/1e83415f Branch: refs/heads/4.x-HBase-0.98 Commit: 1e83415f1cfb8dc1e96b53861b8e3097e4c8b4f7 Parents: 6d0cbbb Author: Thomas D'SilvaAuthored: Tue Mar 6 11:14:47 2018 -0800 Committer: Thomas D'Silva Committed: Tue Mar 13 10:38:45 2018 -0700 -- .../apache/phoenix/end2end/PhoenixDriverIT.java | 2 +- .../index/ChildViewsUseParentViewIndexIT.java | 10 +- .../apache/phoenix/schema/MetaDataClient.java | 159 --- .../org/apache/phoenix/util/PhoenixRuntime.java | 24 +-- 4 files changed, 115 insertions(+), 80 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/1e83415f/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixDriverIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixDriverIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixDriverIT.java index 407e9cf..c93d2aa 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixDriverIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixDriverIT.java @@ -159,7 +159,7 @@ public class PhoenixDriverIT extends BaseUniqueNamesOwnClusterIT { stmt.executeQuery(sql); PTable indexTable = stmt.getQueryPlan().getTableRef().getTable(); String tableName = indexTable.getName().getString(); -String expectedTableName = baseTableIndexName + QueryConstants.CHILD_VIEW_INDEX_NAME_SEPARATOR + viewName; +String expectedTableName = viewName + QueryConstants.CHILD_VIEW_INDEX_NAME_SEPARATOR + baseTableIndexName; assertEquals("Parent Index table is not used ", expectedTableName, tableName); // verify that we can look up the index using PhoenixRuntime from a different client http://git-wip-us.apache.org/repos/asf/phoenix/blob/1e83415f/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java index 1e60bf1..6c8f9e8 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java @@ -37,11 +37,11 @@ public class ChildViewsUseParentViewIndexIT extends ParallelStatsDisabledIT { @Test public void testIndexOnParentViewWithTenantSpecificConnection() throws Exception { -final String baseTableName = generateUniqueName(); -final String globalViewName = generateUniqueName(); -final String globalViewIdxName = generateUniqueName(); -final String tenantViewName1 = generateUniqueName(); -final String tenantViewName2 = generateUniqueName(); +final String baseTableName = "BT_" + generateUniqueName(); +final String globalViewName = "GV_" + generateUniqueName(); +final String globalViewIdxName = "GVI_" + generateUniqueName(); +final String tenantViewName1 = "TV1_" + generateUniqueName(); +final String tenantViewName2 = "TV2_" + generateUniqueName(); // Set up props with TenantId Properties props = new Properties(); http://git-wip-us.apache.org/repos/asf/phoenix/blob/1e83415f/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java index 3b38ede..6687db6 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java @@ -591,66 +591,111 @@ public class MetaDataClient { int tryCount = 0; MetaDataMutationResult result; -do { -final byte[] schemaBytes = PVarchar.INSTANCE.toBytes(schemaName); -final byte[] tableBytes = PVarchar.INSTANCE.toBytes(tableName); -ConnectionQueryServices queryServices =
phoenix git commit: PHOENIX-4634 Looking up a parent index table of a tenant child view fails in BaseColumnResolver createTableRef()
Repository: phoenix Updated Branches: refs/heads/master 7091820ea -> 4e677818e PHOENIX-4634 Looking up a parent index table of a tenant child view fails in BaseColumnResolver createTableRef() Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/4e677818 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/4e677818 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/4e677818 Branch: refs/heads/master Commit: 4e677818e2a2453e3e078506e3e096301df4564f Parents: 7091820 Author: Thomas D'SilvaAuthored: Tue Mar 6 11:14:47 2018 -0800 Committer: Thomas D'Silva Committed: Tue Mar 13 11:04:00 2018 -0700 -- .../apache/phoenix/end2end/PhoenixDriverIT.java | 2 +- .../index/ChildViewsUseParentViewIndexIT.java | 10 +- .../apache/phoenix/schema/MetaDataClient.java | 159 --- .../org/apache/phoenix/util/PhoenixRuntime.java | 24 +-- 4 files changed, 115 insertions(+), 80 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/4e677818/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixDriverIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixDriverIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixDriverIT.java index 407e9cf..c93d2aa 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixDriverIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixDriverIT.java @@ -159,7 +159,7 @@ public class PhoenixDriverIT extends BaseUniqueNamesOwnClusterIT { stmt.executeQuery(sql); PTable indexTable = stmt.getQueryPlan().getTableRef().getTable(); String tableName = indexTable.getName().getString(); -String expectedTableName = baseTableIndexName + QueryConstants.CHILD_VIEW_INDEX_NAME_SEPARATOR + viewName; +String expectedTableName = viewName + QueryConstants.CHILD_VIEW_INDEX_NAME_SEPARATOR + baseTableIndexName; assertEquals("Parent Index table is not used ", expectedTableName, tableName); // verify that we can look up the index using PhoenixRuntime from a different client http://git-wip-us.apache.org/repos/asf/phoenix/blob/4e677818/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java index 1e60bf1..6c8f9e8 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ChildViewsUseParentViewIndexIT.java @@ -37,11 +37,11 @@ public class ChildViewsUseParentViewIndexIT extends ParallelStatsDisabledIT { @Test public void testIndexOnParentViewWithTenantSpecificConnection() throws Exception { -final String baseTableName = generateUniqueName(); -final String globalViewName = generateUniqueName(); -final String globalViewIdxName = generateUniqueName(); -final String tenantViewName1 = generateUniqueName(); -final String tenantViewName2 = generateUniqueName(); +final String baseTableName = "BT_" + generateUniqueName(); +final String globalViewName = "GV_" + generateUniqueName(); +final String globalViewIdxName = "GVI_" + generateUniqueName(); +final String tenantViewName1 = "TV1_" + generateUniqueName(); +final String tenantViewName2 = "TV2_" + generateUniqueName(); // Set up props with TenantId Properties props = new Properties(); http://git-wip-us.apache.org/repos/asf/phoenix/blob/4e677818/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java index e7f7795..d252879 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java @@ -596,66 +596,111 @@ public class MetaDataClient { int tryCount = 0; MetaDataMutationResult result; -do { -final byte[] schemaBytes = PVarchar.INSTANCE.toBytes(schemaName); -final byte[] tableBytes = PVarchar.INSTANCE.toBytes(tableName); -ConnectionQueryServices queryServices =