Repository: phoenix Updated Branches: refs/heads/calcite 0b35e7684 -> 553dc9727
Make corresponding changes for CALCITE-1510 and CALCITE-1628 Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/553dc972 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/553dc972 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/553dc972 Branch: refs/heads/calcite Commit: 553dc972757872c5fd6a2cf72147791b9eb8482f Parents: 0b35e76 Author: maryannxue <maryann....@gmail.com> Authored: Thu Feb 9 13:11:00 2017 -0800 Committer: maryannxue <maryann....@gmail.com> Committed: Thu Feb 9 13:11:00 2017 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/phoenix/calcite/PhoenixPrograms.java | 6 ++++-- .../java/org/apache/phoenix/calcite/PhoenixSqlConformance.java | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/553dc972/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixPrograms.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixPrograms.java b/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixPrograms.java index 58aa3c4..f9bda39 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixPrograms.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixPrograms.java @@ -80,7 +80,8 @@ public class PhoenixPrograms { JoinCommuteRule.INSTANCE, JoinPushExpressionsRule.INSTANCE, ProjectRemoveRule.INSTANCE, - SemiJoinRule.INSTANCE, + SemiJoinRule.PROJECT, + SemiJoinRule.JOIN, SortJoinTransposeRule.INSTANCE, SortUnionTransposeRule.INSTANCE, UnionToDistinctRule.INSTANCE, @@ -335,7 +336,8 @@ public class PhoenixPrograms { true, metadataProvider); final Program misc2 = Programs.hep( ImmutableList.of( - SemiJoinRule.INSTANCE), + SemiJoinRule.PROJECT, + SemiJoinRule.JOIN), true, metadataProvider); return Programs.sequence( misc1, http://git-wip-us.apache.org/repos/asf/phoenix/blob/553dc972/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixSqlConformance.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixSqlConformance.java b/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixSqlConformance.java index 2cbcd45..0f228cd 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixSqlConformance.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixSqlConformance.java @@ -60,4 +60,9 @@ public class PhoenixSqlConformance implements SqlConformance { public boolean isApplyAllowed() { return false; } + + @Override + public boolean isInsertSubsetColumnsAllowed() { + return true; + } }
