Repository: calcite Updated Branches: refs/heads/master 4ac82a30b -> 50c4b0619
[CALCITE-1129] Extend JoinUnionTransposeRule to match Union instead of LogicalUnion (Vasia Kalavri) Close apache/calcite#206 Project: http://git-wip-us.apache.org/repos/asf/calcite/repo Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/50c4b061 Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/50c4b061 Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/50c4b061 Branch: refs/heads/master Commit: 50c4b0619af94ae82bc461d9598d24b3b5e0ec21 Parents: 4ac82a3 Author: vasia <[email protected]> Authored: Mon Mar 7 21:19:03 2016 +0100 Committer: Jesus Camacho Rodriguez <[email protected]> Committed: Tue Mar 8 11:04:25 2016 +0100 ---------------------------------------------------------------------- .../org/apache/calcite/rel/rules/JoinUnionTransposeRule.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/calcite/blob/50c4b061/core/src/main/java/org/apache/calcite/rel/rules/JoinUnionTransposeRule.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rel/rules/JoinUnionTransposeRule.java b/core/src/main/java/org/apache/calcite/rel/rules/JoinUnionTransposeRule.java index 4e522c8..0a3bee9 100644 --- a/core/src/main/java/org/apache/calcite/rel/rules/JoinUnionTransposeRule.java +++ b/core/src/main/java/org/apache/calcite/rel/rules/JoinUnionTransposeRule.java @@ -23,15 +23,14 @@ import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.core.Join; import org.apache.calcite.rel.core.SetOp; import org.apache.calcite.rel.core.Union; -import org.apache.calcite.rel.logical.LogicalUnion; import java.util.ArrayList; import java.util.List; /** * Planner rule that pushes a - * {@link org.apache.calcite.rel.logical.LogicalJoin} - * past a non-distinct {@link org.apache.calcite.rel.logical.LogicalUnion}. + * {@link org.apache.calcite.rel.core.Join} + * past a non-distinct {@link org.apache.calcite.rel.core.Union}. */ public class JoinUnionTransposeRule extends RelOptRule { public static final JoinUnionTransposeRule LEFT_UNION = @@ -58,7 +57,7 @@ public class JoinUnionTransposeRule extends RelOptRule { final Union unionRel; RelNode otherInput; boolean unionOnLeft; - if (call.rel(1) instanceof LogicalUnion) { + if (call.rel(1) instanceof Union) { unionRel = call.rel(1); otherInput = call.rel(2); unionOnLeft = true;
