From 83ad43be80ee711e9e28be2323bd67f7d6ed5f89 Mon Sep 17 00:00:00 2001 From: amaliujia Date: Tue, 5 Feb 2019 13:15:33 -0800 Subject: [PATCH] [BEAM-4522] Re-enable CalcRemoveRule --- .../beam/sdk/extensions/sql/impl/planner/BeamRuleSets.java | 4 ++-- .../org/apache/beam/sdk/extensions/sql/BeamSqlCliTest.java | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamRuleSets.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamRuleSets.java index 41c22f64d624c..51367c6fc99ff 100644 --- a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamRuleSets.java +++ b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamRuleSets.java @@ -40,6 +40,7 @@ import org.apache.calcite.rel.rules.AggregateRemoveRule; import org.apache.calcite.rel.rules.AggregateUnionAggregateRule; import org.apache.calcite.rel.rules.CalcMergeRule; +import org.apache.calcite.rel.rules.CalcRemoveRule; import org.apache.calcite.rel.rules.FilterAggregateTransposeRule; import org.apache.calcite.rel.rules.FilterCalcMergeRule; import org.apache.calcite.rel.rules.FilterJoinRule; @@ -73,8 +74,7 @@ public class BeamRuleSets { ProjectCalcMergeRule.INSTANCE, FilterToCalcRule.INSTANCE, ProjectToCalcRule.INSTANCE, - // https://issues.apache.org/jira/browse/BEAM-4522 - // CalcRemoveRule.INSTANCE, + CalcRemoveRule.INSTANCE, CalcMergeRule.INSTANCE, // push a filter into a join diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlCliTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlCliTest.java index c6968b3a9ce30..077403960bdc6 100644 --- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlCliTest.java +++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlCliTest.java @@ -232,11 +232,7 @@ public void testExplainQuery() throws Exception { + "COMMENT '' LOCATION '/home/admin/orders'"); String plan = cli.explainQuery("select * from person"); - assertThat( - plan, - equalTo( - "BeamCalcRel(expr#0..2=[{inputs}], proj#0..2=[{exprs}])\n" - + " BeamIOSourceRel(table=[[beam, person]])\n")); + assertThat(plan, equalTo("BeamIOSourceRel(table=[[beam, person]])\n")); } @Test