You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by zs...@apache.org on 2022/09/07 09:06:53 UTC
[ignite-3] branch main updated: IGNITE-16040 Bump calcite version to 1.31 New calcite version contains fix for queries with several correlated sub-queries in select list. - Fixes #1042.
This is an automated email from the ASF dual-hosted git repository.
zstan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 43ad854fe4 IGNITE-16040 Bump calcite version to 1.31 New calcite version contains fix for queries with several correlated sub-queries in select list. - Fixes #1042.
43ad854fe4 is described below
commit 43ad854fe4081fd1f9bd5f9fadbc45b1b3e1eabd
Author: zstan <st...@gmail.com>
AuthorDate: Wed Sep 7 12:04:34 2022 +0300
IGNITE-16040 Bump calcite version to 1.31
New calcite version contains fix for queries with several correlated sub-queries in select list. - Fixes #1042.
Signed-off-by: zstan <st...@gmail.com>
---
modules/runner/src/integrationTest/sql/sqlite/join/join1.test | 5 -----
.../sql/sqlite/join/{join1.test => join1.test_ignore} | 1 +
.../select1/{select1_erroneous_res.test_ignored => select1.test} | 0
.../apache/ignite/internal/sql/engine/externalize/RelJsonReader.java | 2 +-
.../org/apache/ignite/internal/sql/engine/planner/PlannerTest.java | 2 +-
parent/pom.xml | 4 ++--
6 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/modules/runner/src/integrationTest/sql/sqlite/join/join1.test b/modules/runner/src/integrationTest/sql/sqlite/join/join1.test
index 0b54eb0bc7..5fcd4d1507 100644
--- a/modules/runner/src/integrationTest/sql/sqlite/join/join1.test
+++ b/modules/runner/src/integrationTest/sql/sqlite/join/join1.test
@@ -107,11 +107,6 @@ INSERT INTO t3 VALUES(3,4,5);
statement ok
INSERT INTO t3 VALUES(4,5,6);
-query IIIII nosort
-SELECT t1.c, t2.d, t1.b, t1.a, t3.e FROM t1 natural join t2 natural join t3 WHERE t1.a=1;
-----
-3 4 2 1 5
-
query IIII nosort
SELECT * FROM t1 NATURAL LEFT JOIN t2 ORDER BY t1.a;
----
diff --git a/modules/runner/src/integrationTest/sql/sqlite/join/join1.test b/modules/runner/src/integrationTest/sql/sqlite/join/join1.test_ignore
similarity index 97%
copy from modules/runner/src/integrationTest/sql/sqlite/join/join1.test
copy to modules/runner/src/integrationTest/sql/sqlite/join/join1.test_ignore
index 0b54eb0bc7..69a4ef4ee4 100644
--- a/modules/runner/src/integrationTest/sql/sqlite/join/join1.test
+++ b/modules/runner/src/integrationTest/sql/sqlite/join/join1.test_ignore
@@ -1,3 +1,4 @@
+# Ignore https://issues.apache.org/jira/browse/IGNITE-17644
statement ok
CREATE TABLE t1(a INTEGER, b INTEGER, c INTEGER);
diff --git a/modules/runner/src/integrationTest/sql/sqlite/select1/select1_erroneous_res.test_ignored b/modules/runner/src/integrationTest/sql/sqlite/select1/select1.test
similarity index 100%
rename from modules/runner/src/integrationTest/sql/sqlite/select1/select1_erroneous_res.test_ignored
rename to modules/runner/src/integrationTest/sql/sqlite/select1/select1.test
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/externalize/RelJsonReader.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/externalize/RelJsonReader.java
index 8d4fd45491..8c4afd8d66 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/externalize/RelJsonReader.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/externalize/RelJsonReader.java
@@ -162,7 +162,7 @@ public class RelJsonReader {
List<String> tableName = getStringList("table");
return RelOptTableImpl.create(null, table.getRowType(Commons.typeFactory()), tableName,
- table, null);
+ table, c -> null);
}
/** {@inheritDoc} */
diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/PlannerTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/PlannerTest.java
index 722c401787..d57c234a8d 100644
--- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/PlannerTest.java
+++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/PlannerTest.java
@@ -728,7 +728,7 @@ public class PlannerTest extends AbstractPlannerTest {
assertEquals(
"IgniteProject(DEPTNO=[$3], DEPTNO0=[$2])\n"
+ " IgniteCorrelatedNestedLoopJoin(condition=[=(CAST(+($3, $2)):INTEGER, 2)], joinType=[inner], "
- + "correlationVariables=[[$cor2]])\n"
+ + "variablesSet=[[$cor2]], correlationVariables=[[$cor2]])\n"
+ " IgniteTableScan(table=[[PUBLIC, EMP]])\n"
+ " IgniteTableScan(table=[[PUBLIC, DEPT]], filters=[=(CAST(+($t0, $cor2.DEPTNO)):INTEGER, 2)])\n",
RelOptUtil.toString(phys),
diff --git a/parent/pom.xml b/parent/pom.xml
index aeb562150d..272a0df708 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -83,10 +83,10 @@
<hamcrest.optional.version>2.0.0</hamcrest.optional.version>
<hamcrest.path.version>1.0.1</hamcrest.path.version>
<scalecube.version>2.6.12</scalecube.version>
- <calcite.version>1.30.0</calcite.version>
+ <calcite.version>1.31.0</calcite.version>
<immutables.version>2.8.8</immutables.version>
<janino.version>3.1.6</janino.version>
- <avatica.version>1.20.0</avatica.version>
+ <avatica.version>1.22.0</avatica.version>
<jsonpath.version>2.4.0</jsonpath.version>
<classgraph.version>4.8.110</classgraph.version>
<javassist.version>3.28.0-GA</javassist.version>