Repository: phoenix Updated Branches: refs/heads/calcite 29da79fa6 -> e17523320
PHOENIX-3635 Many tests failing for not resolving table name properly in Phoenix-Calcite Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/e1752332 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/e1752332 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/e1752332 Branch: refs/heads/calcite Commit: e1752332089739c5609091a324d126c1548e56b0 Parents: 29da79f Author: maryannxue <maryann....@gmail.com> Authored: Fri Jan 27 14:21:28 2017 -0800 Committer: maryannxue <maryann....@gmail.com> Committed: Fri Jan 27 14:21:28 2017 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/phoenix/calcite/PhoenixSchema.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/e1752332/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixSchema.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixSchema.java b/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixSchema.java index d895b74..73ad98a 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixSchema.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixSchema.java @@ -404,7 +404,12 @@ public class PhoenixSchema implements Schema { if (schema != null) { return schema; } - + + //TODO We should call FromCompiler.getResolverForSchema() here after + // all schemas are required to be explicitly created. + if (getTable(name) != null || !getFunctions(name).isEmpty()) { + return null; + } schema = new PhoenixSchema(name, name, parentSchema.getSubSchema(this.name), pc); subSchemas.put(name, schema); return schema;
