You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by zh...@apache.org on 2025/09/12 10:12:10 UTC

(calcite) branch main updated: [CALCITE-7178] FETCH and OFFSET in EnumerableMergeUnionRule do not support BIGINT

This is an automated email from the ASF dual-hosted git repository.

zhenchen 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 91fc5980e5 [CALCITE-7178] FETCH and OFFSET in EnumerableMergeUnionRule do not support BIGINT
91fc5980e5 is described below

commit 91fc5980e58a15dc7db3329ad6c2a2a2eb93de6a
Author: Zhen Chen <cz...@163.com>
AuthorDate: Fri Sep 12 16:02:06 2025 +0800

    [CALCITE-7178] FETCH and OFFSET in EnumerableMergeUnionRule do not support BIGINT
---
 .../enumerable/EnumerableMergeUnionRule.java       |  4 +--
 .../apache/calcite/rel/rules/PruneEmptyRules.java  |  2 +-
 .../org/apache/calcite/test/RelOptRulesTest.java   | 22 +++++++++++++++
 .../org/apache/calcite/test/RelOptRulesTest.xml    | 33 ++++++++++++++++++++++
 core/src/test/resources/sql/sort.iq                |  2 +-
 5 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMergeUnionRule.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMergeUnionRule.java
index b38179dc68..bfe0555b3f 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMergeUnionRule.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMergeUnionRule.java
@@ -92,8 +92,8 @@ public EnumerableMergeUnionRule(Config config) {
         inputFetch = sort.fetch;
       } else if (sort.fetch instanceof RexLiteral && sort.offset instanceof RexLiteral) {
         inputFetch =
-            call.builder().literal(RexLiteral.intValue(sort.fetch)
-                + RexLiteral.intValue(sort.offset));
+            call.builder().literal(RexLiteral.longValue(sort.fetch)
+                + RexLiteral.longValue(sort.offset));
       }
     }
 
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/PruneEmptyRules.java b/core/src/main/java/org/apache/calcite/rel/rules/PruneEmptyRules.java
index 1afbef100e..2001c81128 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/PruneEmptyRules.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/PruneEmptyRules.java
@@ -500,7 +500,7 @@ public interface SortFetchZeroRuleConfig extends PruneEmptyRule.Config {
           Sort sort = call.rel(0);
           return sort.fetch != null
               && !(sort.fetch instanceof RexDynamicParam)
-              && RexLiteral.intValue(sort.fetch) == 0;
+              && RexLiteral.longValue(sort.fetch) == 0;
         }
 
       };
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 bfaf47dc93..f8f8db2484 100644
--- a/core/src/test/java/org/apache/calcite/test/RelOptRulesTest.java
+++ b/core/src/test/java/org/apache/calcite/test/RelOptRulesTest.java
@@ -11254,4 +11254,26 @@ private void checkLoptOptimizeJoinRule(LoptOptimizeJoinRule rule) {
         .withProgram(program)
         .check();
   }
+
+  /** Test case of
+   * <a href="https://issues.apache.org/jira/browse/CALCITE-7178">[CALCITE-7178]
+   * FETCH and OFFSET in EnumerableMergeUnionRule do not support BIGINT</a>. */
+  @Test void testEnumerableMergeUnionRule() {
+    final String sql = "SELECT deptno, job, sal\n"
+        + "FROM emp\n"
+        + "UNION ALL\n"
+        + "SELECT deptno, job, sal\n"
+        + "FROM emp order by deptno limit 3000000000 offset 2500000000";
+    sql(sql)
+        .withPreRule(CoreRules.SORT_PROJECT_TRANSPOSE)
+        .withVolcanoPlanner(false, p -> {
+          p.addRelTraitDef(RelCollationTraitDef.INSTANCE);
+          p.addRule(EnumerableRules.ENUMERABLE_MERGE_UNION_RULE);
+          p.addRule(EnumerableRules.ENUMERABLE_SORT_RULE);
+          p.addRule(EnumerableRules.ENUMERABLE_LIMIT_RULE);
+          p.addRule(EnumerableRules.ENUMERABLE_PROJECT_RULE);
+          p.addRule(EnumerableRules.ENUMERABLE_TABLE_SCAN_RULE);
+        })
+        .check();
+  }
 }
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 763ac85712..f33dd05151 100644
--- a/core/src/test/resources/org/apache/calcite/test/RelOptRulesTest.xml
+++ b/core/src/test/resources/org/apache/calcite/test/RelOptRulesTest.xml
@@ -4109,6 +4109,39 @@ EnumerableProject(R_REGIONKEY=[$0])
         EnumerableAggregate(group=[{}], m=[MAX($0)], c=[COUNT()], d=[COUNT($0)])
           EnumerableProject(R_REGIONKEY=[$0])
             EnumerableTableScan(table=[[CATALOG, SALES, CUSTOMER]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testEnumerableMergeUnionRule">
+    <Resource name="sql">
+      <![CDATA[SELECT deptno, job, sal
+FROM emp
+UNION ALL
+SELECT deptno, job, sal
+FROM emp order by deptno limit 3000000000 offset 2500000000]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], JOB=[$1], SAL=[$2])
+  LogicalSort(sort0=[$0], dir0=[ASC], offset=[2500000000:BIGINT], fetch=[3000000000:BIGINT])
+    LogicalUnion(all=[true])
+      LogicalProject(DEPTNO=[$7], JOB=[$2], SAL=[$5])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(DEPTNO=[$7], JOB=[$2], SAL=[$5])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+EnumerableProject(DEPTNO=[$0], JOB=[$1], SAL=[$2])
+  EnumerableLimit(offset=[2500000000:BIGINT], fetch=[3000000000:BIGINT])
+    EnumerableMergeUnion(all=[true])
+      EnumerableSort(sort0=[$0], dir0=[ASC])
+        EnumerableProject(DEPTNO=[$7], JOB=[$2], SAL=[$5])
+          EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+      EnumerableSort(sort0=[$0], dir0=[ASC])
+        EnumerableProject(DEPTNO=[$7], JOB=[$2], SAL=[$5])
+          EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
   </TestCase>
diff --git a/core/src/test/resources/sql/sort.iq b/core/src/test/resources/sql/sort.iq
index ea6195273c..ce34c82d09 100644
--- a/core/src/test/resources/sql/sort.iq
+++ b/core/src/test/resources/sql/sort.iq
@@ -419,7 +419,7 @@ order by arr desc;
 
 # [CALCITE-7156] OFFSET and FETCH in EnumerableLimit need to support BIGINT
 select * from "hr"."emps" limit 3000000000 offset 2500000000;
-Caused by: java.lang.ArithmeticException: Integer overflow: 3000000000 is out of range for INT
+java.lang.ArithmeticException: Integer overflow: 2500000000 is out of range for INT
 !error
 
 # End sort.iq