IGNITE-23435 SQL Calcite: Fix compiled expression cache key for corre…

…lated variable (#11593)
apache · Oct 15, 2024 · e948408 · e948408
1 parent 4b5b251
commit e948408
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/...a/org/apache/ignite/internal/processors/query/calcite/exec/exp/ExpressionFactoryImpl.java b/...a/org/apache/ignite/internal/processors/query/calcite/exec/exp/ExpressionFactoryImpl.java
@@ -568,6 +568,7 @@ private String digest(List<RexNode> nodes, RelDataType type, boolean biParam) {
             new RexShuttle() {
                 @Override public RexNode visitFieldAccess(RexFieldAccess fieldAccess) {
                     b.append(", fldIdx=").append(fieldAccess.getField().getIndex());
+                    b.append(", fldType=").append(fieldAccess.getField().getType().getFullTypeString());
 
                     return super.visitFieldAccess(fieldAccess);
                 }

diff --git a/...pache/ignite/internal/processors/query/calcite/integration/CorrelatesIntegrationTest.java b/...pache/ignite/internal/processors/query/calcite/integration/CorrelatesIntegrationTest.java
@@ -37,6 +37,29 @@ public void testCorrelatesAssignedBeforeAccess() {
             .check();
     }
 
+    /**
+     * Check compiled expression cache correctness for correlated variables with different data types.
+     */
+    @Test
+    public void testCorrelatesDifferentDataType() {
+        for (String type : new String[] {"INTEGER", "TINYINT"}) {
+            try {
+                sql("CREATE TABLE t1(v INTEGER)");
+                sql("CREATE TABLE t2(v " + type + ")");
+                sql("INSERT INTO t1 VALUES (1)");
+                sql("INSERT INTO t2 VALUES (1)");
+
+                assertQuery("SELECT (SELECT t1.v + t2.v FROM t1) FROM t2")
+                    .returns(2)
+                    .check();
+            }
+            finally {
+                sql("DROP TABLE t1");
+                sql("DROP TABLE t2");
+            }
+        }
+    }
+
     /**
      * Checks that correlates can't be moved under the table spool.
      */