external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not delete row from colocation table within drop table

pull/1503/head
velioglu 2017-07-20 10:27:49 +03:00
parent c4eb6c5153
commit 7c65001e23
5 changed files with 142 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/backend/distributed/citus--7.0-12--7.0-13.sql Normal file
View File

@ -0,0 +1,46 @@
/* citus--7.0-12--7.0-13.sql */
SET search_path = 'pg_catalog';
CREATE OR REPLACE FUNCTION pg_catalog.citus_drop_trigger()
RETURNS event_trigger
LANGUAGE plpgsql
SECURITY DEFINER
SET search_path = pg_catalog
AS $cdbdt$
DECLARE
v_obj record;
sequence_names text[] := '{}';
table_colocation_id integer;
propagate_drop boolean := false;
BEGIN
-- collect set of dropped sequences to drop on workers later
SELECT array_agg(object_identity) INTO sequence_names
FROM pg_event_trigger_dropped_objects()
WHERE object_type = 'sequence';
FOR v_obj IN SELECT * FROM pg_event_trigger_dropped_objects() JOIN
pg_dist_partition ON (logicalrelid = objid)
WHERE object_type IN ('table', 'foreign table')
LOOP
-- get colocation group
SELECT colocationid INTO table_colocation_id FROM pg_dist_partition WHERE logicalrelid = v_obj.objid;
-- ensure all shards are dropped
PERFORM master_drop_all_shards(v_obj.objid, v_obj.schema_name, v_obj.object_name);
PERFORM master_drop_distributed_table_metadata(v_obj.objid, v_obj.schema_name, v_obj.object_name);
END LOOP;
IF cardinality(sequence_names) = 0 THEN
RETURN;
END IF;
PERFORM master_drop_sequences(sequence_names);
END;
$cdbdt$;
COMMENT ON FUNCTION citus_drop_trigger()
IS 'perform checks and actions at the end of DROP actions';
RESET search_path;

67
src/test/regress/expected/multi_colocation_utils.out
View File

@ -432,11 +432,12 @@ SELECT * FROM pg_dist_colocation
ORDER BY colocationid; ORDER BY colocationid;
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
3 | 32 | 2 | 23
4 | 2 | 2 | 23 4 | 2 | 2 | 23
5 | 2 | 1 | 23 5 | 2 | 1 | 23
6 | 2 | 2 | 25 6 | 2 | 2 | 25
7 | 4 | 2 | 23 7 | 4 | 2 | 23
(4 rows) (5 rows)
SELECT logicalrelid, colocationid FROM pg_dist_partition SELECT logicalrelid, colocationid FROM pg_dist_partition
WHERE colocationid >= 1 AND colocationid < 1000 WHERE colocationid >= 1 AND colocationid < 1000
@ -467,7 +468,8 @@ DROP TABLE table2_groupA;
SELECT * FROM pg_dist_colocation WHERE colocationid = 4; SELECT * FROM pg_dist_colocation WHERE colocationid = 4;
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
(0 rows) 4 | 2 | 2 | 23
(1 row)
-- create dropped colocation group again -- create dropped colocation group again
SET citus.shard_count = 2; SET citus.shard_count = 2;
@ -554,18 +556,24 @@ SELECT * FROM pg_dist_colocation
ORDER BY colocationid; ORDER BY colocationid;
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
3 | 32 | 2 | 23
4 | 2 | 2 | 23
5 | 2 | 1 | 23 5 | 2 | 1 | 23
6 | 2 | 2 | 25 6 | 2 | 2 | 25
7 | 4 | 2 | 23 7 | 4 | 2 | 23
8 | 2 | 2 | 23 11 | 3 | 2 | 23
12 | 3 | 2 | 23 (6 rows)
(5 rows)
SELECT logicalrelid, colocationid FROM pg_dist_partition SELECT logicalrelid, colocationid FROM pg_dist_partition
WHERE colocationid >= 1 AND colocationid < 1000 WHERE colocationid >= 1 AND colocationid < 1000
ORDER BY colocationid, logicalrelid; ORDER BY colocationid, logicalrelid;
logicalrelid | colocationid logicalrelid | colocationid
----------------------------------+-------------- ----------------------------------+--------------
table1_groupe | 4
table2_groupe | 4
table3_groupe | 4
schema_collocation.table4_groupe | 4
table4_groupe | 4
table1_groupb | 5 table1_groupb | 5
table2_groupb | 5 table2_groupb | 5
table1_groupc | 6 table1_groupc | 6
@ -573,16 +581,11 @@ SELECT logicalrelid, colocationid FROM pg_dist_partition
table1_groupd | 7 table1_groupd | 7
table2_groupd | 7 table2_groupd | 7
table3_groupd | 7 table3_groupd | 7
table1_groupe | 8 table1_group_none_1 | 8
table2_groupe | 8 table2_group_none_1 | 8
table3_groupe | 8 table1_group_none_2 | 9
schema_collocation.table4_groupe | 8 table1_group_none_3 | 10
table4_groupe | 8 table1_group_default | 11
table1_group_none_1 | 9
table2_group_none_1 | 9
table1_group_none_2 | 10
table1_group_none_3 | 11
table1_group_default | 12
(17 rows) (17 rows)
-- check failing colocate_with options -- check failing colocate_with options
@ -647,12 +650,12 @@ SELECT * FROM pg_dist_colocation
ORDER BY colocationid; ORDER BY colocationid;
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
3 | 32 | 2 | 23
4 | 2 | 2 | 23
5 | 2 | 1 | 23 5 | 2 | 1 | 23
6 | 2 | 2 | 25 6 | 2 | 2 | 25
7 | 4 | 2 | 23 7 | 4 | 2 | 23
8 | 2 | 2 | 23 11 | 3 | 2 | 23
12 | 3 | 2 | 23
13 | 1 | 2 | 0
(6 rows) (6 rows)
-- cross check with internal colocation API -- cross check with internal colocation API
@ -915,8 +918,7 @@ SELECT * FROM pg_dist_colocation
3 | 2 | 2 | 25 3 | 2 | 2 | 25
4 | 4 | 2 | 23 4 | 4 | 2 | 23
5 | 2 | 2 | 23 5 | 2 | 2 | 23
6 | 1 | 2 | 0 (4 rows)
(5 rows)
SELECT logicalrelid, colocationid FROM pg_dist_partition SELECT logicalrelid, colocationid FROM pg_dist_partition
WHERE colocationid >= 1 AND colocationid < 1000 WHERE colocationid >= 1 AND colocationid < 1000
@ -932,11 +934,9 @@ SELECT logicalrelid, colocationid FROM pg_dist_partition
table1_groupe | 5 table1_groupe | 5
table2_groupe | 5 table2_groupe | 5
table3_groupe | 5 table3_groupe | 5
table1_groupf | 6 table1_group_none | 6
table2_groupf | 6 table2_group_none | 7
table1_group_none | 7 (11 rows)
table2_group_none | 8
(13 rows)
-- move the all tables in colocation group 5 to colocation group 7 -- move the all tables in colocation group 5 to colocation group 7
SELECT mark_tables_colocated('table1_group_none', ARRAY['table1_groupE', 'table2_groupE', 'table3_groupE']); SELECT mark_tables_colocated('table1_group_none', ARRAY['table1_groupE', 'table2_groupE', 'table3_groupE']);
@ -961,8 +961,7 @@ SELECT * FROM pg_dist_colocation
2 | 2 | 1 | 23 2 | 2 | 1 | 23
3 | 2 | 2 | 25 3 | 2 | 2 | 25
4 | 4 | 2 | 23 4 | 4 | 2 | 23
6 | 1 | 2 | 0 (3 rows)
(4 rows)
SELECT logicalrelid, colocationid FROM pg_dist_partition SELECT logicalrelid, colocationid FROM pg_dist_partition
WHERE colocationid >= 1 AND colocationid < 1000 WHERE colocationid >= 1 AND colocationid < 1000
@ -975,14 +974,12 @@ SELECT logicalrelid, colocationid FROM pg_dist_partition
table2_groupc | 3 table2_groupc | 3
table1_groupd | 4 table1_groupd | 4
table2_groupd | 4 table2_groupd | 4
table1_groupf | 6 table1_groupe | 6
table2_groupf | 6 table2_groupe | 6
table1_groupe | 7 table3_groupe | 6
table2_groupe | 7 table1_group_none | 6
table3_groupe | 7 table2_group_none | 6
table1_group_none | 7 (11 rows)
table2_group_none | 7
(13 rows)
-- try to colocate different replication models -- try to colocate different replication models
CREATE TABLE table1_groupG ( id int ); CREATE TABLE table1_groupG ( id int );

30
src/test/regress/expected/multi_remove_node_reference_table.out
View File

@ -141,7 +141,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'remove_node_reference_table'::regclass); WHERE logicalrelid = 'remove_node_reference_table'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1380000 | 1 | 2 | 0 1370005 | 1 | 2 | 0
(1 row) (1 row)
@ -196,7 +196,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'remove_node_reference_table'::regclass); WHERE logicalrelid = 'remove_node_reference_table'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1380000 | 1 | 1 | 0 1370005 | 1 | 1 | 0
(1 row) (1 row)
\c - - - :worker_1_port \c - - - :worker_1_port
@ -277,7 +277,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'remove_node_reference_table'::regclass); WHERE logicalrelid = 'remove_node_reference_table'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1380000 | 1 | 2 | 0 1370005 | 1 | 2 | 0
(1 row) (1 row)
@ -335,7 +335,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'remove_node_reference_table'::regclass); WHERE logicalrelid = 'remove_node_reference_table'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1380000 | 1 | 2 | 0 1370005 | 1 | 2 | 0
(1 row) (1 row)
\c - - - :worker_1_port \c - - - :worker_1_port
@ -385,7 +385,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'remove_node_reference_table'::regclass); WHERE logicalrelid = 'remove_node_reference_table'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1380000 | 1 | 2 | 0 1370005 | 1 | 2 | 0
(1 row) (1 row)
@ -442,7 +442,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'remove_node_reference_table'::regclass); WHERE logicalrelid = 'remove_node_reference_table'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1380000 | 1 | 1 | 0 1370005 | 1 | 1 | 0
(1 row) (1 row)
@ -500,7 +500,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'remove_node_reference_table'::regclass); WHERE logicalrelid = 'remove_node_reference_table'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1380000 | 1 | 2 | 0 1370005 | 1 | 2 | 0
(1 row) (1 row)
\c - - - :worker_1_port \c - - - :worker_1_port
@ -558,7 +558,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'remove_node_reference_table'::regclass); WHERE logicalrelid = 'remove_node_reference_table'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1380000 | 1 | 1 | 0 1370005 | 1 | 1 | 0
(1 row) (1 row)
--verify the data is inserted --verify the data is inserted
@ -629,7 +629,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'remove_node_reference_table'::regclass); WHERE logicalrelid = 'remove_node_reference_table'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1380000 | 1 | 2 | 0 1370005 | 1 | 2 | 0
(1 row) (1 row)
\c - - - :worker_1_port \c - - - :worker_1_port
@ -688,7 +688,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'remove_node_reference_table'::regclass); WHERE logicalrelid = 'remove_node_reference_table'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1380000 | 1 | 1 | 0 1370005 | 1 | 1 | 0
(1 row) (1 row)
@ -754,7 +754,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'remove_node_reference_table'::regclass); WHERE logicalrelid = 'remove_node_reference_table'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1380000 | 1 | 2 | 0 1370005 | 1 | 2 | 0
(1 row) (1 row)
BEGIN; BEGIN;
@ -841,7 +841,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'remove_node_reference_table_schema.table1'::regclass); WHERE logicalrelid = 'remove_node_reference_table_schema.table1'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1380001 | 1 | 2 | 0 1370004 | 1 | 2 | 0
(1 row) (1 row)
@ -898,7 +898,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'remove_node_reference_table_schema.table1'::regclass); WHERE logicalrelid = 'remove_node_reference_table_schema.table1'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1380001 | 1 | 1 | 0 1370004 | 1 | 1 | 0
(1 row) (1 row)
\c - - - :worker_1_port \c - - - :worker_1_port
@ -960,7 +960,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'remove_node_reference_table'::regclass); WHERE logicalrelid = 'remove_node_reference_table'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1380001 | 1 | 2 | 0 1370004 | 1 | 2 | 0
(1 row) (1 row)
\c - - - :worker_1_port \c - - - :worker_1_port
@ -1017,7 +1017,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'remove_node_reference_table'::regclass); WHERE logicalrelid = 'remove_node_reference_table'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1380001 | 1 | 2 | 0 1370004 | 1 | 2 | 0
(1 row) (1 row)
\c - - - :worker_1_port \c - - - :worker_1_port

36
src/test/regress/expected/multi_replicate_reference_table.out
View File

@ -117,7 +117,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'replicate_reference_table_valid'::regclass); WHERE logicalrelid = 'replicate_reference_table_valid'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1370001 | 1 | 1 | 0 1370000 | 1 | 1 | 0
(1 row) (1 row)
SELECT 1 FROM master_add_node('localhost', :worker_2_port); SELECT 1 FROM master_add_node('localhost', :worker_2_port);
@ -147,7 +147,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'replicate_reference_table_valid'::regclass); WHERE logicalrelid = 'replicate_reference_table_valid'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1370001 | 1 | 2 | 0 1370000 | 1 | 2 | 0
(1 row) (1 row)
-- test add same node twice -- test add same node twice
@ -171,7 +171,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'replicate_reference_table_valid'::regclass); WHERE logicalrelid = 'replicate_reference_table_valid'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1370001 | 1 | 2 | 0 1370000 | 1 | 2 | 0
(1 row) (1 row)
SELECT 1 FROM master_add_node('localhost', :worker_2_port); SELECT 1 FROM master_add_node('localhost', :worker_2_port);
@ -200,7 +200,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'replicate_reference_table_valid'::regclass); WHERE logicalrelid = 'replicate_reference_table_valid'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1370001 | 1 | 2 | 0 1370000 | 1 | 2 | 0
(1 row) (1 row)
DROP TABLE replicate_reference_table_valid; DROP TABLE replicate_reference_table_valid;
@ -237,7 +237,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'replicate_reference_table_rollback'::regclass); WHERE logicalrelid = 'replicate_reference_table_rollback'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1370002 | 1 | 1 | 0 1370001 | 1 | 1 | 0
(1 row) (1 row)
BEGIN; BEGIN;
@ -268,7 +268,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'replicate_reference_table_rollback'::regclass); WHERE logicalrelid = 'replicate_reference_table_rollback'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1370002 | 1 | 1 | 0 1370001 | 1 | 1 | 0
(1 row) (1 row)
DROP TABLE replicate_reference_table_rollback; DROP TABLE replicate_reference_table_rollback;
@ -299,7 +299,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'replicate_reference_table_commit'::regclass); WHERE logicalrelid = 'replicate_reference_table_commit'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1370003 | 1 | 1 | 0 1370001 | 1 | 1 | 0
(1 row) (1 row)
BEGIN; BEGIN;
@ -331,7 +331,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'replicate_reference_table_commit'::regclass); WHERE logicalrelid = 'replicate_reference_table_commit'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1370003 | 1 | 2 | 0 1370001 | 1 | 2 | 0
(1 row) (1 row)
DROP TABLE replicate_reference_table_commit; DROP TABLE replicate_reference_table_commit;
@ -381,7 +381,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'replicate_reference_table_reference_one'::regclass); WHERE logicalrelid = 'replicate_reference_table_reference_one'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1370004 | 1 | 1 | 0 1370002 | 1 | 1 | 0
(1 row) (1 row)
SELECT SELECT
@ -393,8 +393,8 @@ WHERE
ORDER BY logicalrelid; ORDER BY logicalrelid;
logicalrelid | partmethod | colocationid | repmodel logicalrelid | partmethod | colocationid | repmodel
-----------------------------------------+------------+--------------+---------- -----------------------------------------+------------+--------------+----------
replicate_reference_table_reference_one | n | 1370004 | t replicate_reference_table_reference_one | n | 1370002 | t
replicate_reference_table_hash | h | 1370005 | c replicate_reference_table_hash | h | 1360004 | c
(2 rows) (2 rows)
BEGIN; BEGIN;
@ -443,7 +443,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'replicate_reference_table_reference_one'::regclass); WHERE logicalrelid = 'replicate_reference_table_reference_one'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1370004 | 1 | 2 | 0 1370002 | 1 | 2 | 0
(1 row) (1 row)
SELECT SELECT
@ -456,9 +456,9 @@ ORDER BY
logicalrelid; logicalrelid;
logicalrelid | partmethod | colocationid | repmodel logicalrelid | partmethod | colocationid | repmodel
-----------------------------------------+------------+--------------+---------- -----------------------------------------+------------+--------------+----------
replicate_reference_table_reference_one | n | 1370004 | t replicate_reference_table_reference_one | n | 1370002 | t
replicate_reference_table_hash | n | 1370004 | t replicate_reference_table_hash | n | 1370002 | t
replicate_reference_table_reference_two | n | 1370004 | t replicate_reference_table_reference_two | n | 1370002 | t
(3 rows) (3 rows)
DROP TABLE replicate_reference_table_reference_one; DROP TABLE replicate_reference_table_reference_one;
@ -544,7 +544,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'replicate_reference_table_drop'::regclass); WHERE logicalrelid = 'replicate_reference_table_drop'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1370009 | 1 | 1 | 0 1370003 | 1 | 1 | 0
(1 row) (1 row)
BEGIN; BEGIN;
@ -607,7 +607,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'replicate_reference_table_schema.table1'::regclass); WHERE logicalrelid = 'replicate_reference_table_schema.table1'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1370010 | 1 | 1 | 0 1370004 | 1 | 1 | 0
(1 row) (1 row)
SELECT 1 FROM master_add_node('localhost', :worker_2_port); SELECT 1 FROM master_add_node('localhost', :worker_2_port);
@ -637,7 +637,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'replicate_reference_table_schema.table1'::regclass); WHERE logicalrelid = 'replicate_reference_table_schema.table1'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1370010 | 1 | 2 | 0 1370004 | 1 | 2 | 0
(1 row) (1 row)
DROP TABLE replicate_reference_table_schema.table1; DROP TABLE replicate_reference_table_schema.table1;

62
src/test/regress/expected/multi_upgrade_reference_table.out
View File

@ -180,7 +180,7 @@ WHERE
logicalrelid = 'upgrade_reference_table_append'::regclass; logicalrelid = 'upgrade_reference_table_append'::regclass;
partmethod | partkeyisnull | colocationid | repmodel partmethod | partkeyisnull | colocationid | repmodel
------------+---------------+--------------+---------- ------------+---------------+--------------+----------
n | t | 1360005 | t n | t | 10005 | t
(1 row) (1 row)
SELECT SELECT
@ -202,7 +202,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'upgrade_reference_table_append'::regclass); WHERE logicalrelid = 'upgrade_reference_table_append'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1360005 | 1 | 2 | 0 10005 | 1 | 2 | 0
(1 row) (1 row)
SELECT SELECT
@ -240,7 +240,7 @@ WHERE
logicalrelid = 'upgrade_reference_table_one_worker'::regclass; logicalrelid = 'upgrade_reference_table_one_worker'::regclass;
partmethod | partkeyisnull | colocationid | repmodel partmethod | partkeyisnull | colocationid | repmodel
------------+---------------+--------------+---------- ------------+---------------+--------------+----------
h | f | 1360006 | c h | f | 1360000 | c
(1 row) (1 row)
SELECT SELECT
@ -262,7 +262,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'upgrade_reference_table_one_worker'::regclass); WHERE logicalrelid = 'upgrade_reference_table_one_worker'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1360006 | 1 | 1 | 23 1360000 | 1 | 1 | 23
(1 row) (1 row)
SELECT SELECT
@ -293,7 +293,7 @@ WHERE
logicalrelid = 'upgrade_reference_table_one_worker'::regclass; logicalrelid = 'upgrade_reference_table_one_worker'::regclass;
partmethod | partkeyisnull | colocationid | repmodel partmethod | partkeyisnull | colocationid | repmodel
------------+---------------+--------------+---------- ------------+---------------+--------------+----------
n | t | 1360007 | t n | t | 10005 | t
(1 row) (1 row)
SELECT SELECT
@ -315,7 +315,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'upgrade_reference_table_one_worker'::regclass); WHERE logicalrelid = 'upgrade_reference_table_one_worker'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1360007 | 1 | 2 | 0 10005 | 1 | 2 | 0
(1 row) (1 row)
SELECT SELECT
@ -354,7 +354,7 @@ WHERE
logicalrelid = 'upgrade_reference_table_one_unhealthy'::regclass; logicalrelid = 'upgrade_reference_table_one_unhealthy'::regclass;
partmethod | partkeyisnull | colocationid | repmodel partmethod | partkeyisnull | colocationid | repmodel
------------+---------------+--------------+---------- ------------+---------------+--------------+----------
h | f | 1360008 | c h | f | 1360001 | c
(1 row) (1 row)
SELECT SELECT
@ -376,7 +376,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'upgrade_reference_table_one_unhealthy'::regclass); WHERE logicalrelid = 'upgrade_reference_table_one_unhealthy'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1360008 | 1 | 2 | 23 1360001 | 1 | 2 | 23
(1 row) (1 row)
SELECT SELECT
@ -409,7 +409,7 @@ WHERE
logicalrelid = 'upgrade_reference_table_one_unhealthy'::regclass; logicalrelid = 'upgrade_reference_table_one_unhealthy'::regclass;
partmethod | partkeyisnull | colocationid | repmodel partmethod | partkeyisnull | colocationid | repmodel
------------+---------------+--------------+---------- ------------+---------------+--------------+----------
n | t | 1360009 | t n | t | 10005 | t
(1 row) (1 row)
SELECT SELECT
@ -431,7 +431,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'upgrade_reference_table_one_unhealthy'::regclass); WHERE logicalrelid = 'upgrade_reference_table_one_unhealthy'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1360009 | 1 | 2 | 0 10005 | 1 | 2 | 0
(1 row) (1 row)
SELECT SELECT
@ -468,7 +468,7 @@ WHERE
logicalrelid = 'upgrade_reference_table_both_healthy'::regclass; logicalrelid = 'upgrade_reference_table_both_healthy'::regclass;
partmethod | partkeyisnull | colocationid | repmodel partmethod | partkeyisnull | colocationid | repmodel
------------+---------------+--------------+---------- ------------+---------------+--------------+----------
h | f | 1360010 | c h | f | 1360002 | c
(1 row) (1 row)
SELECT SELECT
@ -490,7 +490,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'upgrade_reference_table_both_healthy'::regclass); WHERE logicalrelid = 'upgrade_reference_table_both_healthy'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1360010 | 1 | 2 | 23 1360002 | 1 | 2 | 23
(1 row) (1 row)
SELECT SELECT
@ -523,7 +523,7 @@ WHERE
logicalrelid = 'upgrade_reference_table_both_healthy'::regclass; logicalrelid = 'upgrade_reference_table_both_healthy'::regclass;
partmethod | partkeyisnull | colocationid | repmodel partmethod | partkeyisnull | colocationid | repmodel
------------+---------------+--------------+---------- ------------+---------------+--------------+----------
n | t | 1360011 | t n | t | 10005 | t
(1 row) (1 row)
SELECT SELECT
@ -545,7 +545,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'upgrade_reference_table_both_healthy'::regclass); WHERE logicalrelid = 'upgrade_reference_table_both_healthy'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1360011 | 1 | 2 | 0 10005 | 1 | 2 | 0
(1 row) (1 row)
SELECT SELECT
@ -584,7 +584,7 @@ WHERE
logicalrelid = 'upgrade_reference_table_transaction_rollback'::regclass; logicalrelid = 'upgrade_reference_table_transaction_rollback'::regclass;
partmethod | partkeyisnull | colocationid | repmodel partmethod | partkeyisnull | colocationid | repmodel
------------+---------------+--------------+---------- ------------+---------------+--------------+----------
h | f | 1360012 | c h | f | 1360003 | c
(1 row) (1 row)
SELECT SELECT
@ -606,7 +606,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'upgrade_reference_table_transaction_rollback'::regclass); WHERE logicalrelid = 'upgrade_reference_table_transaction_rollback'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1360012 | 1 | 1 | 23 1360003 | 1 | 1 | 23
(1 row) (1 row)
SELECT SELECT
@ -639,7 +639,7 @@ WHERE
logicalrelid = 'upgrade_reference_table_transaction_rollback'::regclass; logicalrelid = 'upgrade_reference_table_transaction_rollback'::regclass;
partmethod | partkeyisnull | colocationid | repmodel partmethod | partkeyisnull | colocationid | repmodel
------------+---------------+--------------+---------- ------------+---------------+--------------+----------
h | f | 1360012 | c h | f | 1360003 | c
(1 row) (1 row)
SELECT SELECT
@ -661,7 +661,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'upgrade_reference_table_transaction_rollback'::regclass); WHERE logicalrelid = 'upgrade_reference_table_transaction_rollback'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1360012 | 1 | 1 | 23 1360003 | 1 | 1 | 23
(1 row) (1 row)
SELECT SELECT
@ -697,7 +697,7 @@ WHERE
logicalrelid = 'upgrade_reference_table_transaction_commit'::regclass; logicalrelid = 'upgrade_reference_table_transaction_commit'::regclass;
partmethod | partkeyisnull | colocationid | repmodel partmethod | partkeyisnull | colocationid | repmodel
------------+---------------+--------------+---------- ------------+---------------+--------------+----------
h | f | 1360014 | c h | f | 1360003 | c
(1 row) (1 row)
SELECT SELECT
@ -719,7 +719,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'upgrade_reference_table_transaction_commit'::regclass); WHERE logicalrelid = 'upgrade_reference_table_transaction_commit'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1360014 | 1 | 1 | 23 1360003 | 1 | 1 | 23
(1 row) (1 row)
SELECT SELECT
@ -752,7 +752,7 @@ WHERE
logicalrelid = 'upgrade_reference_table_transaction_commit'::regclass; logicalrelid = 'upgrade_reference_table_transaction_commit'::regclass;
partmethod | partkeyisnull | colocationid | repmodel partmethod | partkeyisnull | colocationid | repmodel
------------+---------------+--------------+---------- ------------+---------------+--------------+----------
n | t | 1360015 | t n | t | 10005 | t
(1 row) (1 row)
SELECT SELECT
@ -774,7 +774,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'upgrade_reference_table_transaction_commit'::regclass); WHERE logicalrelid = 'upgrade_reference_table_transaction_commit'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1360015 | 1 | 2 | 0 10005 | 1 | 2 | 0
(1 row) (1 row)
SELECT SELECT
@ -823,7 +823,7 @@ WHERE
logicalrelid = 'upgrade_reference_table_mx'::regclass; logicalrelid = 'upgrade_reference_table_mx'::regclass;
partmethod | partkeyisnull | colocationid | repmodel partmethod | partkeyisnull | colocationid | repmodel
------------+---------------+--------------+---------- ------------+---------------+--------------+----------
h | f | 1360016 | s h | f | 1360004 | s
(1 row) (1 row)
SELECT SELECT
@ -845,7 +845,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'upgrade_reference_table_mx'::regclass); WHERE logicalrelid = 'upgrade_reference_table_mx'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1360016 | 1 | 1 | 23 1360004 | 1 | 1 | 23
(1 row) (1 row)
SELECT SELECT
@ -875,7 +875,7 @@ WHERE
logicalrelid = 'upgrade_reference_table_mx'::regclass; logicalrelid = 'upgrade_reference_table_mx'::regclass;
partmethod | partkeyisnull | colocationid | repmodel partmethod | partkeyisnull | colocationid | repmodel
------------+---------------+--------------+---------- ------------+---------------+--------------+----------
h | f | 1360016 | s h | f | 1360004 | s
(1 row) (1 row)
SELECT SELECT
@ -897,7 +897,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'upgrade_reference_table_mx'::regclass); WHERE logicalrelid = 'upgrade_reference_table_mx'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1360016 | 1 | 1 | 23 1360004 | 1 | 1 | 23
(1 row) (1 row)
SELECT SELECT
@ -944,7 +944,7 @@ WHERE
logicalrelid = 'upgrade_reference_table_mx'::regclass; logicalrelid = 'upgrade_reference_table_mx'::regclass;
partmethod | partkeyisnull | colocationid | repmodel partmethod | partkeyisnull | colocationid | repmodel
------------+---------------+--------------+---------- ------------+---------------+--------------+----------
h | f | 1360017 | c h | f | 1360005 | c
(1 row) (1 row)
SELECT SELECT
@ -966,7 +966,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'upgrade_reference_table_mx'::regclass); WHERE logicalrelid = 'upgrade_reference_table_mx'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1360017 | 1 | 2 | 23 1360005 | 1 | 2 | 23
(1 row) (1 row)
SELECT SELECT
@ -1001,7 +1001,7 @@ WHERE
logicalrelid = 'upgrade_reference_table_mx'::regclass; logicalrelid = 'upgrade_reference_table_mx'::regclass;
partmethod | partkeyisnull | colocationid | repmodel partmethod | partkeyisnull | colocationid | repmodel
------------+---------------+--------------+---------- ------------+---------------+--------------+----------
n | t | 1360018 | t n | t | 10005 | t
(1 row) (1 row)
SELECT SELECT
@ -1023,7 +1023,7 @@ WHERE colocationid IN
WHERE logicalrelid = 'upgrade_reference_table_mx'::regclass); WHERE logicalrelid = 'upgrade_reference_table_mx'::regclass);
colocationid | shardcount | replicationfactor | distributioncolumntype colocationid | shardcount | replicationfactor | distributioncolumntype
--------------+------------+-------------------+------------------------ --------------+------------+-------------------+------------------------
1360018 | 1 | 2 | 0 10005 | 1 | 2 | 0
(1 row) (1 row)
SELECT SELECT
@ -1051,7 +1051,7 @@ WHERE
logicalrelid = 'upgrade_reference_table_mx'::regclass; logicalrelid = 'upgrade_reference_table_mx'::regclass;
partmethod | partkeyisnull | colocationid | repmodel partmethod | partkeyisnull | colocationid | repmodel
------------+---------------+--------------+---------- ------------+---------------+--------------+----------
n | t | 1360018 | t n | t | 10005 | t
(1 row) (1 row)
SELECT SELECT