You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by ch...@apache.org on 2021/12/06 08:20:52 UTC
[calcite] branch master updated: [CALCITE-4783] RelFieldTrimmer incorrectly drops filter condition
This is an automated email from the ASF dual-hosted git repository.
chunwei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git
The following commit(s) were added to refs/heads/master by this push:
new 2317f4e [CALCITE-4783] RelFieldTrimmer incorrectly drops filter condition
2317f4e is described below
commit 2317f4ea7779a38d128a756baa5ad21797f2eb6c
Author: liuyanze <ya...@antgroup.com>
AuthorDate: Wed Nov 10 20:20:01 2021 +0800
[CALCITE-4783] RelFieldTrimmer incorrectly drops filter condition
---
.../apache/calcite/sql2rel/RelFieldTrimmer.java | 21 +++++++++-----
.../calcite/sql2rel/RelFieldTrimmerTest.java | 32 ++++++++++++++++++++++
2 files changed, 46 insertions(+), 7 deletions(-)
diff --git a/core/src/main/java/org/apache/calcite/sql2rel/RelFieldTrimmer.java b/core/src/main/java/org/apache/calcite/sql2rel/RelFieldTrimmer.java
index 034ff6b..fddd1f5 100644
--- a/core/src/main/java/org/apache/calcite/sql2rel/RelFieldTrimmer.java
+++ b/core/src/main/java/org/apache/calcite/sql2rel/RelFieldTrimmer.java
@@ -371,6 +371,15 @@ public class RelFieldTrimmer implements ReflectiveVisitor {
final List<RexNode> projs = Util.transform(rexProgram.getProjectList(),
rexProgram::expandLocalRef);
+ RexNode conditionExpr = null;
+ if (rexProgram.getCondition() != null) {
+ final List<RexNode> filter = Util.transform(
+ ImmutableList.of(
+ rexProgram.getCondition()), rexProgram::expandLocalRef);
+ assert filter.size() == 1;
+ conditionExpr = filter.get(0);
+ }
+
final RelDataType rowType = calc.getRowType();
final int fieldCount = rowType.getFieldCount();
final RelNode input = calc.getInput();
@@ -384,6 +393,9 @@ public class RelFieldTrimmer implements ReflectiveVisitor {
ord.e.accept(inputFinder);
}
}
+ if (conditionExpr != null) {
+ conditionExpr.accept(inputFinder);
+ }
ImmutableBitSet inputFieldsUsed = inputFinder.build();
// Create input with trimmed columns.
@@ -401,7 +413,7 @@ public class RelFieldTrimmer implements ReflectiveVisitor {
// Some parts of the system can't handle rows with zero fields, so
// pretend that one field is used.
- if (fieldsUsed.cardinality() == 0) {
+ if (fieldsUsed.cardinality() == 0 && rexProgram.getCondition() == null) {
return dummyProject(fieldCount, newInput);
}
@@ -429,12 +441,7 @@ public class RelFieldTrimmer implements ReflectiveVisitor {
final RelNode newInputRelNode = relBuilder.push(newInput).build();
RexNode newConditionExpr = null;
- if (rexProgram.getCondition() != null) {
- final List<RexNode> filter = Util.transform(
- ImmutableList.of(
- rexProgram.getCondition()), rexProgram::expandLocalRef);
- assert filter.size() == 1;
- final RexNode conditionExpr = filter.get(0);
+ if (conditionExpr != null) {
newConditionExpr = conditionExpr.accept(shuttle);
}
final RexProgram newRexProgram = RexProgram.create(newInputRelNode.getRowType(),
diff --git a/core/src/test/java/org/apache/calcite/sql2rel/RelFieldTrimmerTest.java b/core/src/test/java/org/apache/calcite/sql2rel/RelFieldTrimmerTest.java
index f5e9bef..621af1b 100644
--- a/core/src/test/java/org/apache/calcite/sql2rel/RelFieldTrimmerTest.java
+++ b/core/src/test/java/org/apache/calcite/sql2rel/RelFieldTrimmerTest.java
@@ -452,4 +452,36 @@ class RelFieldTrimmerTest {
assertTrue(calc.getHints().contains(calcHint));
}
+ /** Test case for
+ * <a href="https://issues.apache.org/jira/browse/CALCITE-4783">[CALCITE-4783]
+ * RelFieldTrimmer incorrectly drops filter condition</a>. */
+ @Test void testCalcFieldTrimmer3() {
+ final RelBuilder builder = RelBuilder.create(config().build());
+ final RelNode root =
+ builder.scan("EMP")
+ .project(
+ builder.field("ENAME"),
+ builder.field("DEPTNO"))
+ .exchange(RelDistributions.SINGLETON)
+ .filter(builder.equals(builder.field("ENAME"), builder.literal("bob")))
+ .aggregate(builder.groupKey(), builder.countStar(null))
+ .build();
+
+ final HepProgram hepProgram = new HepProgramBuilder()
+ .addRuleInstance(CoreRules.FILTER_TO_CALC).build();
+
+ final HepPlanner hepPlanner = new HepPlanner(hepProgram);
+ hepPlanner.setRoot(root);
+ final RelNode relNode = hepPlanner.findBestExp();
+ final RelFieldTrimmer fieldTrimmer = new RelFieldTrimmer(null, builder);
+ final RelNode trimmed = fieldTrimmer.trim(relNode);
+
+ final String expected = ""
+ + "LogicalAggregate(group=[{}], agg#0=[COUNT()])\n"
+ + " LogicalCalc(expr#0=[{inputs}], expr#1=['bob'], expr#2=[=($t0, $t1)], $condition=[$t2])\n"
+ + " LogicalExchange(distribution=[single])\n"
+ + " LogicalProject(ENAME=[$1])\n"
+ + " LogicalTableScan(table=[[scott, EMP]])\n";
+ assertThat(trimmed, hasTree(expected));
+ }
}