Skip to content

Commit

Permalink
Add more test for target indirection in UPDATE
Browse files Browse the repository at this point in the history 
Queries of the form:

```
UPDATE ... SET (a, b) = (SELECT '1', '2')
UPDATE ... SET (b, a) = (SELECT '2', '1')
```

Should do the same thing, but currently the order of the attributes in
`SET (...)` as rewriten for pushdown is only based on the physical ordering
of the attributes in the relation. This leads to several subtle problems
including situation where a DROPped then reADDed attributes will change its
placement in the attribute list.

There are maybe more tests to add in other situation where a SET
(MULTIEXPR) is possible, though UPDATE form is pretty unique as
alternatives are not supported by citus: `(INSERT .. ON CONFLICT SET (a,b).....`
  • Loading branch information
@c2main
c2main committed Aug 23, 2024
1 parent 9e1852e commit 755d626
Show file tree
Hide file tree
Showing 2 changed files with 292 additions and 0 deletions.
191 changes: 191 additions & 0 deletions src/test/regress/expected/multi_modifications.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -890,6 +890,16 @@ SELECT * FROM summary_table ORDER BY id;
(2 rows)

-- try different syntax
UPDATE summary_table SET (average_value, min_value) =
(SELECT avg(value), min(value) FROM raw_table WHERE id = 2)
WHERE id = 2;
SELECT * FROM summary_table ORDER BY id;
id | min_value | average_value | count | uniques
---------------------------------------------------------------------
1 | | 200.0000000000000000 | |
2 | 400 | 450.0000000000000000 | |
(2 rows)

UPDATE summary_table SET (min_value, average_value) =
(SELECT min(value), avg(value) FROM raw_table WHERE id = 2)
WHERE id = 2;
Expand Down Expand Up @@ -1297,6 +1307,187 @@ CREATE TABLE multi_modifications.local (a int default 1, b int);
INSERT INTO multi_modifications.local VALUES (default, (SELECT min(id) FROM summary_table));
ERROR: subqueries are not supported within INSERT queries
HINT: Try rewriting your queries with 'INSERT INTO ... SELECT' syntax.
-- test advanced UPDATE SET () with indirection and physical reordering.
CREATE TABLE updateset (
id bigint primary key
, col_0 integer
, col_1 integer
, col_2 integer
, col_3 integer
);
select create_reference_table('updateset');
create_reference_table
---------------------------------------------------------------------

(1 row)

insert into updateset values (1, 0, 0, 0, 0);
-- default physical ordering
update updateset
SET (col_0, col_1, col_2, col_3)
= (SELECT 100, 111, 222, 333)
returning *;
id | col_0 | col_1 | col_2 | col_3
---------------------------------------------------------------------
1 | 100 | 111 | 222 | 333
(1 row)

select * from updateset;
id | col_0 | col_1 | col_2 | col_3
---------------------------------------------------------------------
1 | 100 | 111 | 222 | 333
(1 row)

-- check indirection
update updateset
SET (col_0, col_1, col_3, col_2)
= (SELECT 10, 11, 33, 22)
returning *;
id | col_0 | col_1 | col_2 | col_3
---------------------------------------------------------------------
1 | 10 | 11 | 22 | 33
(1 row)

select * from updateset;
id | col_0 | col_1 | col_2 | col_3
---------------------------------------------------------------------
1 | 10 | 11 | 22 | 33
(1 row)

update updateset
SET (col_0, col_3, col_1, col_2)
= (SELECT 100, 333, 111, 222)
returning *;
id | col_0 | col_1 | col_2 | col_3
---------------------------------------------------------------------
1 | 100 | 111 | 222 | 333
(1 row)

select * from updateset;
id | col_0 | col_1 | col_2 | col_3
---------------------------------------------------------------------
1 | 100 | 111 | 222 | 333
(1 row)

update updateset
SET (col_3, col_1)
= (SELECT 3, 1)
returning *;
id | col_0 | col_1 | col_2 | col_3
---------------------------------------------------------------------
1 | 100 | 1 | 222 | 3
(1 row)

select * from updateset;
id | col_0 | col_1 | col_2 | col_3
---------------------------------------------------------------------
1 | 100 | 1 | 222 | 3
(1 row)

-- check more complex queries with indirection
insert into updateset values (2, 0, 0, 0, 0);
update updateset
SET (col_0, col_1, col_3, col_2)
= (SELECT 10, 11, 33, 22)
where id = 2
returning *;
id | col_0 | col_1 | col_2 | col_3
---------------------------------------------------------------------
2 | 10 | 11 | 22 | 33
(1 row)

select * from updateset where id = 2;
id | col_0 | col_1 | col_2 | col_3
---------------------------------------------------------------------
2 | 10 | 11 | 22 | 33
(1 row)

update updateset
SET (col_0, col_3, col_1, col_2)
= (SELECT 100, 333, 111, 222)
where id = 2
returning *;
id | col_0 | col_1 | col_2 | col_3
---------------------------------------------------------------------
2 | 100 | 111 | 222 | 333
(1 row)

select * from updateset where id = 2;
id | col_0 | col_1 | col_2 | col_3
---------------------------------------------------------------------
2 | 100 | 111 | 222 | 333
(1 row)

update updateset
SET (col_3, col_1)
= (SELECT 3, 1)
where id = 2
returning *;
id | col_0 | col_1 | col_2 | col_3
---------------------------------------------------------------------
2 | 100 | 1 | 222 | 3
(1 row)

select * from updateset where id = 2;
id | col_0 | col_1 | col_2 | col_3
---------------------------------------------------------------------
2 | 100 | 1 | 222 | 3
(1 row)

-- the single row update is expected behavior
insert into updateset values (3, 0, 1, 2, 3);
insert into updateset values (4, 0, 0, 0, 0);
with qq as (
update updateset
SET (col_1, col_3)
= (SELECT 11, 33)
where id = 4
returning *
)
update updateset
set (col_2, col_1, col_3)
= (select col_2, col_1, col_3 from qq)
where id in (3, 4)
returning *;
id | col_0 | col_1 | col_2 | col_3
---------------------------------------------------------------------
3 | 0 | 11 | 0 | 33
(1 row)

select * from updateset where id in (3, 4);
id | col_0 | col_1 | col_2 | col_3
---------------------------------------------------------------------
3 | 0 | 11 | 0 | 33
4 | 0 | 11 | 0 | 33
(2 rows)

-- add more advanced queries ?
-- we want to ensure the reordering the targetlist
-- from indirection is not run when it should not
truncate updateset;
-- change physical ordering
alter table updateset drop col_2;
alter table updateset add col_2 integer;
insert into updateset values (1, 0, 0, 0, 0);
insert into updateset values (2, 0, 0, 0, 0);
update updateset
SET (col_0, col_1, col_2, col_3)
= (SELECT 10, 11, 22, 33)
returning *;
id | col_0 | col_1 | col_3 | col_2
---------------------------------------------------------------------
1 | 10 | 11 | 33 | 22
2 | 10 | 11 | 33 | 22
(2 rows)

select * from updateset;
id | col_0 | col_1 | col_3 | col_2
---------------------------------------------------------------------
1 | 10 | 11 | 33 | 22
2 | 10 | 11 | 33 | 22
(2 rows)

DROP TABLE updateset;
DROP TABLE insufficient_shards;
DROP TABLE raw_table;
DROP TABLE summary_table;
Expand Down
101 changes: 101 additions & 0 deletions src/test/regress/sql/multi_modifications.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,12 @@ WHERE id = 1;
SELECT * FROM summary_table ORDER BY id;

-- try different syntax
UPDATE summary_table SET (average_value, min_value) =
(SELECT avg(value), min(value) FROM raw_table WHERE id = 2)
WHERE id = 2;

SELECT * FROM summary_table ORDER BY id;

UPDATE summary_table SET (min_value, average_value) =
(SELECT min(value), avg(value) FROM raw_table WHERE id = 2)
WHERE id = 2;
Expand Down Expand Up @@ -875,6 +881,101 @@ DELETE FROM summary_table WHERE id < (
CREATE TABLE multi_modifications.local (a int default 1, b int);
INSERT INTO multi_modifications.local VALUES (default, (SELECT min(id) FROM summary_table));

-- test advanced UPDATE SET () with indirection and physical reordering.
CREATE TABLE updateset (
id bigint primary key
, col_0 integer
, col_1 integer
, col_2 integer
, col_3 integer
);
select create_reference_table('updateset');

insert into updateset values (1, 0, 0, 0, 0);

-- default physical ordering
update updateset
SET (col_0, col_1, col_2, col_3)
= (SELECT 100, 111, 222, 333)
returning *;
select * from updateset;

-- check indirection
update updateset
SET (col_0, col_1, col_3, col_2)
= (SELECT 10, 11, 33, 22)
returning *;
select * from updateset;

update updateset
SET (col_0, col_3, col_1, col_2)
= (SELECT 100, 333, 111, 222)
returning *;
select * from updateset;

update updateset
SET (col_3, col_1)
= (SELECT 3, 1)
returning *;
select * from updateset;

-- check more complex queries with indirection
insert into updateset values (2, 0, 0, 0, 0);
update updateset
SET (col_0, col_1, col_3, col_2)
= (SELECT 10, 11, 33, 22)
where id = 2
returning *;
select * from updateset where id = 2;

update updateset
SET (col_0, col_3, col_1, col_2)
= (SELECT 100, 333, 111, 222)
where id = 2
returning *;
select * from updateset where id = 2;

update updateset
SET (col_3, col_1)
= (SELECT 3, 1)
where id = 2
returning *;
select * from updateset where id = 2;

-- the single row update is expected behavior
insert into updateset values (3, 0, 1, 2, 3);
insert into updateset values (4, 0, 0, 0, 0);
with qq as (
update updateset
SET (col_1, col_3)
= (SELECT 11, 33)
where id = 4
returning *
)
update updateset
set (col_2, col_1, col_3)
= (select col_2, col_1, col_3 from qq)
where id in (3, 4)
returning *;
select * from updateset where id in (3, 4);

-- add more advanced queries ?
-- we want to ensure the reordering the targetlist
-- from indirection is not run when it should not
truncate updateset;

-- change physical ordering
alter table updateset drop col_2;
alter table updateset add col_2 integer;
insert into updateset values (1, 0, 0, 0, 0);
insert into updateset values (2, 0, 0, 0, 0);
update updateset
SET (col_0, col_1, col_2, col_3)
= (SELECT 10, 11, 22, 33)
returning *;
select * from updateset;

DROP TABLE updateset;
DROP TABLE insufficient_shards;
DROP TABLE raw_table;
DROP TABLE summary_table;
Expand Down

0 comments on commit 755d626

Please sign in to comment.