This is an automated email from the ASF dual-hosted git repository.
hyuan 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 70f1453 [CALCITE-3296] Decorrelator shouldn't give empty value when
fetch and offset values are null in Sort rel (Juhwan Kim)
70f1453 is described below
commit 70f1453086d67bd6d431d63b93a27baf0cdba06d
Author: Juhwan Kim <[email protected]>
AuthorDate: Mon Aug 26 11:41:53 2019 -0700
[CALCITE-3296] Decorrelator shouldn't give empty value when fetch and
offset values are null in Sort rel (Juhwan Kim)
Instead of passing in zeros, pass negative values to sortLimit builder when
values are null.
Close #1416
---
.../apache/calcite/sql2rel/RelDecorrelator.java | 4 +--
.../org/apache/calcite/test/RelOptRulesTest.java | 15 +++++++++
.../org/apache/calcite/test/RelOptRulesTest.xml | 38 ++++++++++++++++++++++
3 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/core/src/main/java/org/apache/calcite/sql2rel/RelDecorrelator.java
b/core/src/main/java/org/apache/calcite/sql2rel/RelDecorrelator.java
index 01ed669..944a61d 100644
--- a/core/src/main/java/org/apache/calcite/sql2rel/RelDecorrelator.java
+++ b/core/src/main/java/org/apache/calcite/sql2rel/RelDecorrelator.java
@@ -420,8 +420,8 @@ public class RelDecorrelator implements ReflectiveVisitor {
RelCollation oldCollation = rel.getCollation();
RelCollation newCollation = RexUtil.apply(mapping, oldCollation);
- final int offset = rel.offset == null ? 0 :
RexLiteral.intValue(rel.offset);
- final int fetch = rel.fetch == null ? 0 : RexLiteral.intValue(rel.fetch);
+ final int offset = rel.offset == null ? -1 :
RexLiteral.intValue(rel.offset);
+ final int fetch = rel.fetch == null ? -1 : RexLiteral.intValue(rel.fetch);
final RelNode newSort = relBuilder
.push(newInput)
diff --git a/core/src/test/java/org/apache/calcite/test/RelOptRulesTest.java
b/core/src/test/java/org/apache/calcite/test/RelOptRulesTest.java
index a003f7f..dff2723 100644
--- a/core/src/test/java/org/apache/calcite/test/RelOptRulesTest.java
+++ b/core/src/test/java/org/apache/calcite/test/RelOptRulesTest.java
@@ -6285,6 +6285,21 @@ public class RelOptRulesTest extends RelOptTestBase {
// Do not copy the offset
checkPlanning(tester, preProgram, new HepPlanner(program), sql);
}
+
+ /** Test case for
+ * <a
href="https://issues.apache.org/jira/browse/CALCITE-3296";>[CALCITE-3296]
+ * Decorrelator gives empty result
+ * after decorrelating sort rel with null offset and fetch </a>
+ */
+ @Test public void testDecorrelationWithSort() {
+ final String sql = "SELECT e1.empno\n"
+ + "FROM emp e1, dept d1 where e1.deptno = d1.deptno\n"
+ + "and e1.deptno < 10 and d1.deptno < 15\n"
+ + "and e1.sal > (select avg(sal) from emp e2 where e1.empno =
e2.empno)\n"
+ + "order by e1.empno";
+
+
sql(sql).with(HepProgram.builder().build()).withDecorrelation(true).checkUnchanged();
+ }
}
// End RelOptRulesTest.java
diff --git
a/core/src/test/resources/org/apache/calcite/test/RelOptRulesTest.xml
b/core/src/test/resources/org/apache/calcite/test/RelOptRulesTest.xml
index c987c22..5323ed8 100644
--- a/core/src/test/resources/org/apache/calcite/test/RelOptRulesTest.xml
+++ b/core/src/test/resources/org/apache/calcite/test/RelOptRulesTest.xml
@@ -11606,4 +11606,42 @@ LogicalJoin(condition=[=($2, $12)], joinType=[anti])
]]>
</Resource>
</TestCase>
+ <TestCase name="testDecorrelationWithSort">
+ <Resource name="sql">
+ <![CDATA[SELECT e1.empno
+ FROM emp e1, dept d1 where e1.deptno = d1.deptno and e1.deptno <
10 and d1.deptno < 15 and e1.sal > (select avg(sal) from emp e2 where e1.empno
= e2.empno) order by e1.empno]]>
+ </Resource>
+ <Resource name="planBefore">
+ <![CDATA[
+LogicalSort(sort0=[$0], dir0=[ASC])
+ LogicalProject(EMPNO=[$0])
+ LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4],
SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10],
EMPNO0=[CAST($11):INTEGER], EXPR$0=[CAST($12):INTEGER])
+ LogicalJoin(condition=[AND(=($0, $11), >($5, $12))], joinType=[inner])
+ LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+ LogicalFilter(condition=[<($7, 10)])
+ LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+ LogicalFilter(condition=[<($0, 15)])
+ LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+ LogicalAggregate(group=[{0}], EXPR$0=[AVG($1)])
+ LogicalProject(EMPNO=[$0], SAL=[$5])
+ LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+ </Resource>
+ <Resource name="planAfter">
+ <![CDATA[
+LogicalSort(sort0=[$0], dir0=[ASC])
+ LogicalProject(EMPNO=[$0])
+ LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4],
SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10],
EMPNO0=[CAST($11):INTEGER], EXPR$0=[CAST($12):INTEGER])
+ LogicalJoin(condition=[AND(=($0, $11), >($5, $12))], joinType=[inner])
+ LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+ LogicalFilter(condition=[<($7, 10)])
+ LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+ LogicalFilter(condition=[<($0, 15)])
+ LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+ LogicalAggregate(group=[{0}], EXPR$0=[AVG($1)])
+ LogicalProject(EMPNO=[$0], SAL=[$5])
+ LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+ </Resource>
+ </TestCase>
</Root>
