Repository: phoenix Updated Branches: refs/heads/calcite b7e5ae4b1 -> c0961ebfe
Fix regression caused by PHOENIX-3341 Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/c0961ebf Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/c0961ebf Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/c0961ebf Branch: refs/heads/calcite Commit: c0961ebfec45d3d4f9203ca63c3c525636c379c5 Parents: b7e5ae4 Author: maryannxue <maryann....@gmail.com> Authored: Thu Aug 3 12:20:52 2017 -0700 Committer: maryannxue <maryann....@gmail.com> Committed: Thu Aug 3 12:20:52 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/phoenix/calcite/PhoenixPrepareImpl.java | 4 ++-- .../main/java/org/apache/phoenix/calcite/PhoenixSchema.java | 7 +------ 2 files changed, 3 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/c0961ebf/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixPrepareImpl.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixPrepareImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixPrepareImpl.java index bd7450e..7ec7552 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixPrepareImpl.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixPrepareImpl.java @@ -248,9 +248,9 @@ public class PhoenixPrepareImpl extends CalcitePrepareImpl { public Object apply(RelNode root) { for (CalciteSchema schema : rootSchema.getSubSchemaMap().values()) { if (schema.schema instanceof PhoenixSchema) { - ((PhoenixSchema) schema.schema).defineIndexesAsMaterializations(); + ((PhoenixSchema) schema.schema).defineIndexesAsMaterializations(schema.plus().getParentSchema()); for (CalciteSchema subSchema : schema.getSubSchemaMap().values()) { - ((PhoenixSchema) subSchema.schema).defineIndexesAsMaterializations(); + ((PhoenixSchema) subSchema.schema).defineIndexesAsMaterializations(subSchema.plus().getParentSchema()); } } } http://git-wip-us.apache.org/repos/asf/phoenix/blob/c0961ebf/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 bedec19..b17e0aa 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 @@ -54,12 +54,7 @@ import org.apache.phoenix.parse.FunctionParseNode.FunctionClassType; import org.apache.phoenix.parse.NamedTableNode; import org.apache.phoenix.parse.PFunction; import org.apache.phoenix.parse.PFunction.FunctionArgument; -import org.apache.phoenix.parse.ColumnParseNode; -import org.apache.phoenix.parse.ParseNode; import org.apache.phoenix.parse.ParseNodeFactory; -import org.apache.phoenix.parse.ParseNodeRewriter; -import org.apache.phoenix.parse.ParseNodeVisitor; -import org.apache.phoenix.parse.SQLParser; import org.apache.phoenix.parse.SequenceValueParseNode; import org.apache.phoenix.parse.TableName; import org.apache.phoenix.query.QueryServices; @@ -565,7 +560,7 @@ public class PhoenixSchema implements Schema { return new PhoenixSchema(name, schemaName, parentSchema, pc, typeFactory); } - public void defineIndexesAsMaterializations() { + public void defineIndexesAsMaterializations(SchemaPlus parentSchema) { SchemaPlus schema = parentSchema.getSubSchema(this.name); SchemaPlus viewSqlSchema = this.schemaName == null ? schema : parentSchema;
