[CALCITE-7662] Add expression support for OFFSET by tkalkirill · Pull Request #5113 · apache/calcite

tkalkirill · 2026-07-20T17:44:51Z

Jira Link

Changes Proposed

This PR introduces support for arithmetic and scalar expressions for "OFFSET", enabling queries to execute similarly to those in other popular DBMSs (PostgreSQL, Oracle, H2, and MS SQL):

SELECT * FROM person OFFSET ? + 1 ROWS;
SELECT * FROM person OFFSET (udf(?)) ROWS;
SELECT * FROM person OFFSET (1 + NVL(?, 10000)) ROWS.

tkalkirill · 2026-07-20T19:22:28Z

@xiedeyantu Can you take a look? I'm unable to add you to the "Reviewers" section for the review.

xuzifu666 · 2026-07-21T03:15:31Z

You could refine the PR title first.

xuzifu666 · 2026-07-21T03:19:15Z

+#
+
+!use post
+!set outputformat mysql


Is there any relevant MySQL validation?

You can explain that the accuracy of the results has been verified against relevant databases.

Is there any relevant MySQL validation?

I modeled it after the neighboring files.
As far as I understand, this only affects the output style or am I mistaken?

You can explain that the accuracy of the results has been verified against relevant databases.

I checked here: https://onecompiler.com/postgresql

You might need to add all the test cases here to the link so that the reviewer can easily view them, like this: https://onecompiler.com/postgresql/44veytn3y

https://onecompiler.com/postgresql/44vv87ue8

xuzifu666 · 2026-07-21T03:21:24Z

        new HrSchemaBig(),
        "select * from (select empid, name from emps where name like 'G%' union select empid, name from emps where name like '%l') order by name limit 3")
-        .explainContains("EnumerableLimit(fetch=[3])\n"
+        .explainContains("EnumerableLimitSort(sort0=[$1], dir0=[ASC], fetch=[3])\n"


When modifying a large number of existing tests, it is best to provide a summary of the reasons to help other reviewers understand the situation more easily.

I noticed an issue at UNION DISTINCT and decided to fix it right away. I suppose that wasn't the right move, as it resulted in too many changes and is confusing. I think I'll fix it later in a separate ticket.

xuzifu666 · 2026-07-21T03:23:47Z

            + "FROM `FOO`\n"
            + "OFFSET ? ROWS\n"
            + "FETCH NEXT ? ROWS ONLY");
-    // CALCITE-7592: Arithmetic and scalar expressions are allowed within parentheses.


Why is this comment being modified? Is it related to the associated Jira ticket?

The idea is this: previously, expressions with parenthesized were available only for FETCH, but now they are supported for OFFSET as well. To avoid adding another reference to the proposal, I decided simply to remove it.

xiedeyantu · 2026-07-21T08:11:18Z

+    }
+  }
+
+  private static void unparseOffsetFetchExpression(SqlWriter writer, SqlNode node) {


Could unparseOffsetExpression and unparseOffsetFetchExpression be consolidated into a single method? Or perhaps unparseFetchUsingAnsi could be refactored? It seems like there is a lot of similar logic involved.

I didn't manage to merge everything completely, but I did refactor it a bit.

xiedeyantu · 2026-07-21T09:40:02Z

        .fails("(?s).*Encountered \"-\".*");
-    sql("select name from dept order by name offset ^-^1")
-        .fails("(?s).*Encountered \"-\".*");
+    sql("select name from dept order by name offset -1").ok();


Why did this test pass?

Because I changed the validation for OFFSET. But I fixed that and added a check for negative values for literals.

xiedeyantu · 2026-07-21T09:42:54Z

+#
+
+!use post
+!set outputformat mysql


You might need to add all the test cases here to the link so that the reviewer can easily view them, like this: https://onecompiler.com/postgresql/44veytn3y

sonarqubecloud · 2026-07-21T11:08:56Z

Quality Gate passed

Issues
10 New issues
0 Accepted issues

Measures
0 Security Hotspots
97.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

tkalkirill added 2 commits July 20, 2026 20:42

[CALCITE-7662] Wip

03794f5

[CALCITE-7662] Wip

2d6b469

xuzifu666 reviewed Jul 21, 2026

View reviewed changes

tkalkirill changed the title ~~[CALCITE-7662] Wip~~ [CALCITE-7662] Add expression support for OFFSET Jul 21, 2026

tkalkirill added 2 commits July 21, 2026 07:33

[CALCITE-7662] Wip

ab8db4f

[CALCITE-7662] Wip

affd178

tkalkirill requested a review from xuzifu666 July 21, 2026 05:34

xiedeyantu reviewed Jul 21, 2026

View reviewed changes

[CALCITE-7662] Wip

745aaf1

tkalkirill requested a review from xiedeyantu July 21, 2026 11:21

Uh oh!

Conversation

tkalkirill commented Jul 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Jira Link

Changes Proposed

Uh oh!

tkalkirill commented Jul 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

xuzifu666 commented Jul 21, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud Bot commented Jul 21, 2026

Quality Gate passed

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

tkalkirill commented Jul 20, 2026 •

edited

Loading

tkalkirill commented Jul 20, 2026 •

edited

Loading