IGNITE-28801 Calcite. Bump calcite dependency version to 1.42 by zstan · Pull Request #13274 · apache/ignite

zstan · 2026-06-24T11:57:44Z

https://issues.apache.org/jira/browse/IGNITE-28801

zstan · 2026-06-24T11:59:38Z

            BuiltInMethod.BIG_DECIMAL_NEGATE.getMethodName());
        defineUnary(UNARY_PLUS, UnaryPlus, NullPolicy.STRICT, null);
+        // checked arithmetic
+        defineBinary(CHECKED_PLUS, AddChecked, NullPolicy.STRICT, "checkedPlus");


due to categorical CHECED type without conformance flag check
https://issues.apache.org/jira/browse/CALCITE-7443

zstan · 2026-06-24T12:00:05Z

            // For checked arithmetic call the method.
-            if (CHECKED_OPERATORS.contains(op))
-                return Expressions.call(SqlFunctions.class, backupMethodName, argValueList);
+            //if (CHECKED_OPERATORS.contains(op))


also https://issues.apache.org/jira/browse/CALCITE-7443

zstan · 2026-06-24T12:00:31Z

    public static Expression makeBinary(ExpressionType binaryType, Expression left, Expression right) {
        switch (binaryType) {
-            case Add:
+            case Add, AddChecked:


check comment near, due to
https://issues.apache.org/jira/browse/CALCITE-7443

zstan · 2026-06-24T12:01:02Z

+            ConstantExpression formatExpr;
+
+            // Check for FORMAT clause if second operand is available in RexCall.
+            if (call.operandCount() == 2) {


just runtime code alignment

zstan · 2026-06-24T12:07:10Z

            "BITXOR",
            SqlKind.OTHER_FUNCTION,
-            ReturnTypes.LEAST_RESTRICTIVE,
+            ReturnTypes.BIGINT_NULLABLE,


after this
https://issues.apache.org/jira/browse/CALCITE-6731
return type resolved as Object which breaks futrher scalar compilation

Looks weird. Can we write new own SqlReturnTypeInference to derive correct data type as workaround?

plz explain ? now it can return nullable bigint and unsigned but unsigned is not supported, you mean we can loose perf with unsigned ?

zstan · 2026-06-24T12:08:04Z

-    /** {@inheritDoc} */
-    @Override public int getMaxNumericScale() {
-        return Short.MAX_VALUE;
+    @Override public int getMaxScale(SqlTypeName typeName) {


getMaxNumericScale\getMaxNumericPrecision - deprecated and moved to final notation

zstan · 2026-06-29T05:41:19Z

              files="ConcurrentLinkedHashMap\.java"/>

+    <suppress checks=".*"
+              files="RexImpTable\.java|RexToLixTranslator\.java"/>


Let`s remove checks from calcite runtime files, it`s hard to compare with base branch otherwize

Currently only limited lines have been added, but already error (unused import) was introduced. I think we should check these files too, at least for now.

This reverts commit bf6ecc6.

alex-plekhanov · 2026-07-02T07:25:10Z

 import org.apache.calcite.rex.RexCall;
 import org.apache.calcite.rex.RexLiteral;
 import org.apache.calcite.rex.RexNode;
+import org.apache.calcite.runtime.FlatLists;


Unused import.
We should not exclude this file from checkstyle to prevent such errors

disagree, we need to align all runtime but not in this PR, thus - skip this minors for now

alex-plekhanov · 2026-07-02T07:27:36Z

            final RexToLixTranslator translator,
            final RexCall call,
-            final List<Expression> argValueList) {
+            List<Expression> argValueList) {


Looks like it still final, why final was removed?

no, it`s not a final on apache calcite

alex-plekhanov · 2026-07-02T07:31:05Z

+            } else if (expressionType == NegateChecked && null != backupMethodName) {
+                e = Expressions.call(SqlFunctions.class, backupMethodName, argValueList);


Let's keep codestyle and just add these two lines

we need to have a possibility easily compare current and our runtime implementations - for such a case we need disable checkstyle for whole file

alex-plekhanov · 2026-07-02T07:58:02Z


-                    if (!allowNulls.get(p)) {
-                        collsAllowNullsBuilder.clear(c);
+                    if (!nullExclusions.get(p)) {


nullExclusions and allowNulls have inverse logic, why here not allowNulls changed to not null exclusion? Shouldn't we remove not?

no, i understand what you mean, "not" is changed in comparator implementation side, or if you about namings - let`s discuss it

alex-plekhanov · 2026-07-02T08:02:28Z

            "BITXOR",
            SqlKind.OTHER_FUNCTION,
-            ReturnTypes.LEAST_RESTRICTIVE,
+            ReturnTypes.BIGINT_NULLABLE,


Looks weird. Can we write new own SqlReturnTypeInference to derive correct data type as workaround?

alex-plekhanov · 2026-07-02T08:03:07Z

- *      mvn generate-sources -pl :ignite-calcite
- */
-
-package org.apache.ignite.internal.processors.query.calcite.sql.generated;


Why it was removed?

i can`t restore why it been removed, what purpose of this file ?

alex-plekhanov · 2026-07-02T08:06:55Z

                .and(s -> "=($0, $cor0.ID)".equals(s.condition().toString()))
                .and(hasChildThat(isInstanceOf(IgniteTableScan.class)
-                    .and(t -> "<($t0, 50)".equals(t.condition().toString()))))));
+                    .and(t -> "<(CAST($t0):INTEGER, 50)".equals(t.condition().toString()))))));


Let's change field definition from Integer.class to SqlTypeName.INTEGER instead

alex-plekhanov · 2026-07-02T08:12:23Z

-        Expression operand) {
+        Expression operand,
+        boolean safe,
+        ConstantExpression format) {


If we allow format now (have format processing code in CastImplementor) why do we ignore it here?

I not to plan aling all runtime in this PR, let`s store such questions for align part ?

alex-plekhanov · 2026-07-02T08:16:28Z

              files="ConcurrentLinkedHashMap\.java"/>

+    <suppress checks=".*"
+              files="RexImpTable\.java|RexToLixTranslator\.java"/>


Currently only limited lines have been added, but already error (unused import) was introduced. I think we should check these files too, at least for now.

zstan commented Jun 24, 2026

View reviewed changes

zstan force-pushed the ignite-28801 branch 3 times, most recently from 35bc26e to bf6ecc6 Compare June 26, 2026 14:23

zstan commented Jun 29, 2026

View reviewed changes

zstan added 8 commits June 29, 2026 08:45

IGNITE-28801 Calcite. Bump calcite dependency version to 1.42

5095dd0

improvement

15fa38b

fix javacc

11eb43e

fix tests

01667f9

chech checkstyle

2d7e595

Revert "chech checkstyle"

70469e3

This reverts commit bf6ecc6.

additional test

c608397

minor

d80198e

zstan force-pushed the ignite-28801 branch from eefc6e2 to d80198e Compare June 29, 2026 05:45

alex-plekhanov reviewed Jul 2, 2026

View reviewed changes

zstan added 2 commits July 6, 2026 21:51

fix after review

e9ecff7

remove codestyle checks

c68a2a1

		} else if (expressionType == NegateChecked && null != backupMethodName) {
		e = Expressions.call(SqlFunctions.class, backupMethodName, argValueList);

Uh oh!

Conversation

zstan commented Jun 24, 2026 • edited by tkalkirill Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

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!

zstan Jun 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

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!

zstan Jun 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

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!

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!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

zstan commented Jun 24, 2026 •

edited by tkalkirill

Loading

zstan Jun 24, 2026 •

edited

Loading

zstan Jun 29, 2026 •

edited

Loading