Skip to content

[CALCITE-7441] AggregateFilterToFilteredAggregateRule fails when WHERE condition is nullable #4836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zabetak wants to merge 1 commit into
base: main
Choose a base branch
from
+29 −0
Open

[CALCITE-7441] AggregateFilterToFilteredAggregateRule fails when WHERE condition is nullable #4836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions core/src/main/java/org/apache/calcite/rel/rules/AggregateFilterToFilteredAggregateRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.apache.calcite.rel.core.AggregateCall;
import org.apache.calcite.rel.core.Filter;
import org.apache.calcite.rex.RexNode;
import org.apache.calcite.sql.fun.SqlStdOperatorTable;
import org.apache.calcite.tools.RelBuilder;

import org.immutables.value.Value;
Expand Down Expand Up @@ -76,6 +77,9 @@ private AggregateFilterToFilteredAggregateRule(Config config) {
return;
}
RexNode condition = filter.getCondition();
if (condition.getType().isNullable()) {
condition = builder.call(SqlStdOperatorTable.IS_TRUE, condition);
}
// If the aggregate call has its own filter, combine it with the filter condition.
if (aggCall.hasFilter()) {
condition = builder.and(condition, builder.field(aggCall.filterArg));
Expand Down
6 changes: 6 additions & 0 deletions core/src/test/java/org/apache/calcite/test/AggregateFilterToFilteredAggregateRuleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ private static RelOptFixture sql(String sql) {
.withRule(AGGREGATE_FILTER_TO_FILTERED_AGGREGATE).check();
}

@Test void testSingleColumnAggregateWithFilterOnNullableColumn() {
String sql = "select sum(sal) from emp where mgr = 10";
sql(sql).withPreRule(AGGREGATE_PROJECT_MERGE)
.withRule(AGGREGATE_FILTER_TO_FILTERED_AGGREGATE).check();
}

@Test void testSingleStarAggregate() {
String sql = "select count(*) from emp where deptno = 10";
sql(sql).withPreRule(AGGREGATE_PROJECT_MERGE)
Expand Down
19 changes: 19 additions & 0 deletions ...src/test/resources/org/apache/calcite/test/AggregateFilterToFilteredAggregateRuleTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,25 @@ LogicalAggregate(group=[{}], EXPR$0=[SUM($5)])
LogicalAggregate(group=[{}], EXPR$0=[SUM($0) FILTER $1])
LogicalProject(SAL=[$5], $f9=[=($7, 10)])
LogicalTableScan(table=[[CATALOG, SALES, EMP]])
]]>
</Resource>
</TestCase>
<TestCase name="testSingleColumnAggregateWithFilterOnNullableColumn">
<Resource name="sql">
<![CDATA[select sum(sal) from emp where mgr = 10]]>
</Resource>
<Resource name="planBefore">
<![CDATA[
LogicalAggregate(group=[{}], EXPR$0=[SUM($5)])
LogicalFilter(condition=[=($3, 10)])
LogicalTableScan(table=[[CATALOG, SALES, EMP]])
]]>
</Resource>
<Resource name="planAfter">
<![CDATA[
LogicalAggregate(group=[{}], EXPR$0=[SUM($0) FILTER $1])
LogicalProject(SAL=[$5], $f9=[IS TRUE(=($3, 10))])
LogicalTableScan(table=[[CATALOG, SALES, EMP]])
]]>
</Resource>
</TestCase>
Expand Down
Loading