diff --git a/citus-tools b/citus-tools new file mode 160000 index 000000000..3376bd684 --- /dev/null +++ b/citus-tools @@ -0,0 +1 @@ +Subproject commit 3376bd6845f0614908ed304f5033bd644c82d3bf diff --git a/src/test/regress/expected/dml_recursive.out b/src/test/regress/expected/dml_recursive.out index 3f72b00f1..de33a9175 100644 --- a/src/test/regress/expected/dml_recursive.out +++ b/src/test/regress/expected/dml_recursive.out @@ -298,7 +298,29 @@ FROM ) as baz ) as foo WHERE second_distributed_table.tenant_id = foo.tenant_id RETURNING *; -ERROR: complex joins are only supported when all distributed tables are co-located and joined on their distribution columns + tenant_id | dept | info | tenant_id +--------------------------------------------------------------------- + 14 | 3 | {"f1": 14, "f2": 196} | 14 + 23 | 5 | {"f1": 23, "f2": 529} | 23 + 24 | 6 | {"f1": 24, "f2": 576} | 24 + 3 | 0 | {"f1": 3, "f2": 9} | 3 + 33 | 8 | {"f1": 33, "f2": 1089} | 33 + 34 | 8 | {"f1": 34, "f2": 1156} | 34 + 4 | 1 | {"f1": 4, "f2": 16} | 4 + 43 | 10 | {"f1": 43, "f2": 1849} | 43 + 44 | 11 | {"f1": 44, "f2": 1936} | 44 + 53 | 13 | {"f1": 53, "f2": 2809} | 53 + 54 | 13 | {"f1": 54, "f2": 2916} | 54 + 63 | 15 | {"f1": 63, "f2": 3969} | 63 + 64 | 16 | {"f1": 64, "f2": 4096} | 64 + 73 | 18 | {"f1": 73, "f2": 5329} | 73 + 74 | 18 | {"f1": 74, "f2": 5476} | 74 + 83 | 20 | {"f1": 83, "f2": 6889} | 83 + 84 | 21 | {"f1": 84, "f2": 7056} | 84 + 93 | 23 | {"f1": 93, "f2": 8649} | 93 + 94 | 23 | {"f1": 94, "f2": 8836} | 94 +(19 rows) + -- we don't support subqueries/CTEs inside VALUES INSERT INTO second_distributed_table (tenant_id, dept) diff --git a/src/test/regress/expected/dml_recursive_0.out b/src/test/regress/expected/dml_recursive_0.out index de33a9175..3f72b00f1 100644 --- a/src/test/regress/expected/dml_recursive_0.out +++ b/src/test/regress/expected/dml_recursive_0.out @@ -298,29 +298,7 @@ FROM ) as baz ) as foo WHERE second_distributed_table.tenant_id = foo.tenant_id RETURNING *; - tenant_id | dept | info | tenant_id ---------------------------------------------------------------------- - 14 | 3 | {"f1": 14, "f2": 196} | 14 - 23 | 5 | {"f1": 23, "f2": 529} | 23 - 24 | 6 | {"f1": 24, "f2": 576} | 24 - 3 | 0 | {"f1": 3, "f2": 9} | 3 - 33 | 8 | {"f1": 33, "f2": 1089} | 33 - 34 | 8 | {"f1": 34, "f2": 1156} | 34 - 4 | 1 | {"f1": 4, "f2": 16} | 4 - 43 | 10 | {"f1": 43, "f2": 1849} | 43 - 44 | 11 | {"f1": 44, "f2": 1936} | 44 - 53 | 13 | {"f1": 53, "f2": 2809} | 53 - 54 | 13 | {"f1": 54, "f2": 2916} | 54 - 63 | 15 | {"f1": 63, "f2": 3969} | 63 - 64 | 16 | {"f1": 64, "f2": 4096} | 64 - 73 | 18 | {"f1": 73, "f2": 5329} | 73 - 74 | 18 | {"f1": 74, "f2": 5476} | 74 - 83 | 20 | {"f1": 83, "f2": 6889} | 83 - 84 | 21 | {"f1": 84, "f2": 7056} | 84 - 93 | 23 | {"f1": 93, "f2": 8649} | 93 - 94 | 23 | {"f1": 94, "f2": 8836} | 94 -(19 rows) - +ERROR: complex joins are only supported when all distributed tables are co-located and joined on their distribution columns -- we don't support subqueries/CTEs inside VALUES INSERT INTO second_distributed_table (tenant_id, dept) diff --git a/src/test/regress/sql/dml_recursive.sql b/src/test/regress/sql/dml_recursive.sql index 0bc99607d..ed1714410 100644 --- a/src/test/regress/sql/dml_recursive.sql +++ b/src/test/regress/sql/dml_recursive.sql @@ -1,6 +1,6 @@ -- Two alternative test outputs: --- dml_recursive.out for PG16 and before --- dml_recursive_0.out for PG17 +-- dml_recursive_0.out for PG16 and before +-- dml_recursive.out for PG17 -- related commit -- PostgreSQL 17 includes an enhancement that allows the optimizer to transform correlated IN subqueries into more efficient join operations. -- https://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff;h=9f1337639