This is an automated email from the ASF dual-hosted git repository.
xiong pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite.git
The following commit(s) were added to refs/heads/main by this push:
new 47a2597bb2 Add testSortRemoveConstantKeyWhenOrderByIsNull on
RelOptRulesTest
47a2597bb2 is described below
commit 47a2597bb20d6d9f006f60330499323f98bf0c2f
Author: caicancai <[email protected]>
AuthorDate: Mon Jul 1 22:43:53 2024 +0800
Add testSortRemoveConstantKeyWhenOrderByIsNull on RelOptRulesTest
---
.../org/apache/calcite/test/RelOptRulesTest.java | 11 +++++++++++
.../org/apache/calcite/test/RelOptRulesTest.xml | 21 +++++++++++++++++++++
2 files changed, 32 insertions(+)
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 ab80c1b8fd..46ec204a5a 100644
--- a/core/src/test/java/org/apache/calcite/test/RelOptRulesTest.java
+++ b/core/src/test/java/org/apache/calcite/test/RelOptRulesTest.java
@@ -1387,6 +1387,17 @@ class RelOptRulesTest extends RelOptTestBase {
.check();
}
+ /** Test case for
+ * <a href="https://issues.apache.org/jira/browse/CALCITE-873";>[CALCITE-873]
+ * SortRemoveConstantKeysRule should remove NULL literal sort keys
+ * (e.g. ORDER BY NULL)</a>. */
+ @Test void testSortRemoveConstantKeyWhenOrderByIsNull() {
+ final String sql = "SELECT * FROM emp ORDER BY deptno, null, empno";
+ sql(sql)
+ .withRule(CoreRules.SORT_REMOVE_CONSTANT_KEYS)
+ .check();
+ }
+
/** Test case for
* <a
href="https://issues.apache.org/jira/browse/CALCITE-5994";>[CALCITE-5994]
* Add optimization rule to remove Sort when its input's row number
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 237305a629..3611a6a08e 100644
--- a/core/src/test/resources/org/apache/calcite/test/RelOptRulesTest.xml
+++ b/core/src/test/resources/org/apache/calcite/test/RelOptRulesTest.xml
@@ -14793,6 +14793,27 @@ LogicalProject(C=[$0])
LogicalProject(DEPTNO=[$7], SAL=[$5])
LogicalFilter(condition=[=($7, 10)])
LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+ </Resource>
+ </TestCase>
+ <TestCase name="testSortRemoveConstantKeyWhenOrderByIsNull">
+ <Resource name="sql">
+ <![CDATA[SELECT * FROM emp ORDER BY deptno, null, empno]]>
+ </Resource>
+ <Resource name="planBefore">
+ <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4],
SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+ LogicalSort(sort0=[$7], sort1=[$9], sort2=[$0], dir0=[ASC], dir1=[ASC],
dir2=[ASC])
+ LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4],
SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EXPR$9=[null:NULL])
+ LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+ </Resource>
+ <Resource name="planAfter">
+ <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4],
SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+ LogicalSort(sort0=[$7], sort1=[$0], dir0=[ASC], dir1=[ASC])
+ LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4],
SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EXPR$9=[null:NULL])
+ LogicalTableScan(table=[[CATALOG, SALES, EMP]])
]]>
</Resource>
</TestCase>
