From b9745d1c7048add980ae07ad4824ab2f43c95cbf Mon Sep 17 00:00:00 2001 From: Ahmet Gedemenli Date: Wed, 27 Oct 2021 19:03:14 +0300 Subject: [PATCH] Move upgrade test to separate file --- src/test/regress/expected/turn_mx_off_1.out | 16 ----------- .../expected/upgrade_autoconverted_after.out | 9 +++++++ .../expected/upgrade_autoconverted_before.out | 24 +++++++++++++++++ .../regress/expected/upgrade_basic_after.out | 27 +++---------------- .../regress/expected/upgrade_basic_before.out | 24 ----------------- .../sql/upgrade_autoconverted_after.sql | 3 +++ .../sql/upgrade_autoconverted_before.sql | 8 ++++++ src/test/regress/sql/upgrade_basic_after.sql | 4 --- src/test/regress/sql/upgrade_basic_before.sql | 9 ------- 9 files changed, 47 insertions(+), 77 deletions(-) delete mode 100644 src/test/regress/expected/turn_mx_off_1.out create mode 100644 src/test/regress/expected/upgrade_autoconverted_after.out create mode 100644 src/test/regress/expected/upgrade_autoconverted_before.out create mode 100644 src/test/regress/sql/upgrade_autoconverted_after.sql create mode 100644 src/test/regress/sql/upgrade_autoconverted_before.sql diff --git a/src/test/regress/expected/turn_mx_off_1.out b/src/test/regress/expected/turn_mx_off_1.out deleted file mode 100644 index 7497f24c6..000000000 --- a/src/test/regress/expected/turn_mx_off_1.out +++ /dev/null @@ -1,16 +0,0 @@ -ALTER SYSTEM SET citus.enable_metadata_sync_by_default TO OFF; -SELECT pg_reload_conf(); - pg_reload_conf ---------------------------------------------------------------------- - t -(1 row) - -SET client_min_messages TO ERROR; -SELECT stop_metadata_sync_to_node(nodename, nodeport) FROM pg_dist_node WHERE isactive = 't' and noderole = 'primary'; - stop_metadata_sync_to_node ---------------------------------------------------------------------- - - - -(3 rows) - diff --git a/src/test/regress/expected/upgrade_autoconverted_after.out b/src/test/regress/expected/upgrade_autoconverted_after.out new file mode 100644 index 000000000..cde149f3f --- /dev/null +++ b/src/test/regress/expected/upgrade_autoconverted_after.out @@ -0,0 +1,9 @@ +select logicalrelid, autoconverted from pg_dist_partition + where logicalrelid IN ('citus_local_autoconverted'::regclass, + 'citus_local_not_autoconverted'::regclass); + logicalrelid | autoconverted +-------------------------------+--------------- + citus_local_autoconverted | t + citus_local_not_autoconverted | f +(2 rows) + diff --git a/src/test/regress/expected/upgrade_autoconverted_before.out b/src/test/regress/expected/upgrade_autoconverted_before.out new file mode 100644 index 000000000..5dbfa1443 --- /dev/null +++ b/src/test/regress/expected/upgrade_autoconverted_before.out @@ -0,0 +1,24 @@ +CREATE TABLE ref_not_autoconverted(a int unique); +CREATE TABLE citus_local_autoconverted(a int unique references ref_not_autoconverted(a)); +CREATE TABLE citus_local_not_autoconverted(a int unique); +select create_reference_table('ref_not_autoconverted'); + create_reference_table +------------------------ + +(1 row) + +select citus_add_local_table_to_metadata('citus_local_not_autoconverted'); + citus_add_local_table_to_metadata +----------------------------------- + +(1 row) + +select logicalrelid, autoconverted from pg_dist_partition + where logicalrelid IN ('citus_local_autoconverted'::regclass, + 'citus_local_not_autoconverted'::regclass); + logicalrelid | autoconverted +-------------------------------+--------------- + citus_local_autoconverted | t + citus_local_not_autoconverted | f +(2 rows) + diff --git a/src/test/regress/expected/upgrade_basic_after.out b/src/test/regress/expected/upgrade_basic_after.out index 4f21d53d8..dac49d4d4 100644 --- a/src/test/regress/expected/upgrade_basic_after.out +++ b/src/test/regress/expected/upgrade_basic_after.out @@ -3,17 +3,11 @@ BEGIN; SELECT * FROM pg_indexes WHERE schemaname = 'upgrade_basic' ORDER BY tablename; schemaname | tablename | indexname | tablespace | indexdef --------------------------------------------------------------------- - upgrade_basic | citus_local_autoconverted | citus_local_autoconverted_a_key | | CREATE UNIQUE INDEX citus_local_autoconverted_a_key ON upgrade_basic.citus_local_autoconverted USING btree (a) - upgrade_basic | citus_local_autoconverted_102141 | citus_local_autoconverted_a_key_102141 | | CREATE UNIQUE INDEX citus_local_autoconverted_a_key_102141 ON upgrade_basic.citus_local_autoconverted_102141 USING btree (a) - upgrade_basic | citus_local_not_autoconverted | citus_local_not_autoconverted_a_key | | CREATE UNIQUE INDEX citus_local_not_autoconverted_a_key ON upgrade_basic.citus_local_not_autoconverted USING btree (a) - upgrade_basic | citus_local_not_autoconverted_102142 | citus_local_not_autoconverted_a_key_102142 | | CREATE UNIQUE INDEX citus_local_not_autoconverted_a_key_102142 ON upgrade_basic.citus_local_not_autoconverted_102142 USING btree (a) upgrade_basic | r | r_pkey | | CREATE UNIQUE INDEX r_pkey ON upgrade_basic.r USING btree (a) upgrade_basic | r_102104 | r_pkey_102104 | | CREATE UNIQUE INDEX r_pkey_102104 ON upgrade_basic.r_102104 USING btree (a) - upgrade_basic | ref_not_autoconverted | ref_not_autoconverted_a_key | | CREATE UNIQUE INDEX ref_not_autoconverted_a_key ON upgrade_basic.ref_not_autoconverted USING btree (a) - upgrade_basic | ref_not_autoconverted_102140 | ref_not_autoconverted_a_key_102140 | | CREATE UNIQUE INDEX ref_not_autoconverted_a_key_102140 ON upgrade_basic.ref_not_autoconverted_102140 USING btree (a) upgrade_basic | t | t_a_idx | | CREATE INDEX t_a_idx ON upgrade_basic.t USING hash (a) upgrade_basic | tp | tp_pkey | | CREATE UNIQUE INDEX tp_pkey ON upgrade_basic.tp USING btree (a) -(10 rows) +(4 rows) SELECT nextval('pg_dist_shardid_seq') = MAX(shardid)+1 FROM pg_dist_shard; ?column? @@ -76,10 +70,7 @@ SELECT logicalrelid FROM pg_dist_partition r tr t_append - ref_not_autoconverted - citus_local_autoconverted - citus_local_not_autoconverted -(9 rows) +(6 rows) SELECT tgrelid::regclass, tgfoid::regproc, tgisinternal, tgenabled, tgtype::int4::bit(8) FROM pg_dist_partition @@ -97,10 +88,7 @@ SELECT tgrelid::regclass, tgfoid::regproc, tgisinternal, tgenabled, tgtype::int4 r | citus_truncate_trigger | t | O | 00100000 tr | citus_truncate_trigger | t | O | 00100000 t_append | citus_truncate_trigger | t | O | 00100000 - ref_not_autoconverted | citus_truncate_trigger | t | O | 00100000 - citus_local_autoconverted | citus_truncate_trigger | t | O | 00100000 - citus_local_not_autoconverted | citus_truncate_trigger | t | O | 00100000 -(9 rows) +(6 rows) SELECT * FROM t ORDER BY a; a @@ -362,12 +350,3 @@ SELECT * FROM t_append ORDER BY id; (9 rows) ROLLBACK; -select logicalrelid, autoconverted from pg_dist_partition - where logicalrelid IN ('citus_local_autoconverted'::regclass, - 'citus_local_not_autoconverted'::regclass); - logicalrelid | autoconverted --------------------------------+--------------- - citus_local_autoconverted | t - citus_local_not_autoconverted | f -(2 rows) - diff --git a/src/test/regress/expected/upgrade_basic_before.out b/src/test/regress/expected/upgrade_basic_before.out index 931df24a1..11c1701eb 100644 --- a/src/test/regress/expected/upgrade_basic_before.out +++ b/src/test/regress/expected/upgrade_basic_before.out @@ -78,27 +78,3 @@ SELECT master_create_distributed_table('t_append', 'id', 'append'); \copy t_append FROM STDIN DELIMITER ',' \copy t_append FROM STDIN DELIMITER ',' -CREATE TABLE ref_not_autoconverted(a int unique); -CREATE TABLE citus_local_autoconverted(a int unique references ref_not_autoconverted(a)); -CREATE TABLE citus_local_not_autoconverted(a int unique); -select create_reference_table('ref_not_autoconverted'); - create_reference_table ------------------------- - -(1 row) - -select citus_add_local_table_to_metadata('citus_local_not_autoconverted'); - citus_add_local_table_to_metadata ------------------------------------ - -(1 row) - -select logicalrelid, autoconverted from pg_dist_partition - where logicalrelid IN ('citus_local_autoconverted'::regclass, - 'citus_local_not_autoconverted'::regclass); - logicalrelid | autoconverted --------------------------------+--------------- - citus_local_autoconverted | t - citus_local_not_autoconverted | f -(2 rows) - diff --git a/src/test/regress/sql/upgrade_autoconverted_after.sql b/src/test/regress/sql/upgrade_autoconverted_after.sql new file mode 100644 index 000000000..8c5d31cb4 --- /dev/null +++ b/src/test/regress/sql/upgrade_autoconverted_after.sql @@ -0,0 +1,3 @@ +select logicalrelid, autoconverted from pg_dist_partition + where logicalrelid IN ('citus_local_autoconverted'::regclass, + 'citus_local_not_autoconverted'::regclass); diff --git a/src/test/regress/sql/upgrade_autoconverted_before.sql b/src/test/regress/sql/upgrade_autoconverted_before.sql new file mode 100644 index 000000000..e09f87d20 --- /dev/null +++ b/src/test/regress/sql/upgrade_autoconverted_before.sql @@ -0,0 +1,8 @@ +CREATE TABLE ref_not_autoconverted(a int unique); +CREATE TABLE citus_local_autoconverted(a int unique references ref_not_autoconverted(a)); +CREATE TABLE citus_local_not_autoconverted(a int unique); +select create_reference_table('ref_not_autoconverted'); +select citus_add_local_table_to_metadata('citus_local_not_autoconverted'); +select logicalrelid, autoconverted from pg_dist_partition + where logicalrelid IN ('citus_local_autoconverted'::regclass, + 'citus_local_not_autoconverted'::regclass); diff --git a/src/test/regress/sql/upgrade_basic_after.sql b/src/test/regress/sql/upgrade_basic_after.sql index 46c102a36..a3681e08b 100644 --- a/src/test/regress/sql/upgrade_basic_after.sql +++ b/src/test/regress/sql/upgrade_basic_after.sql @@ -118,7 +118,3 @@ SELECT * FROM t_append ORDER BY id; ROLLBACK; - -select logicalrelid, autoconverted from pg_dist_partition - where logicalrelid IN ('citus_local_autoconverted'::regclass, - 'citus_local_not_autoconverted'::regclass); diff --git a/src/test/regress/sql/upgrade_basic_before.sql b/src/test/regress/sql/upgrade_basic_before.sql index 28f1bc6d9..51c97f620 100644 --- a/src/test/regress/sql/upgrade_basic_before.sql +++ b/src/test/regress/sql/upgrade_basic_before.sql @@ -64,12 +64,3 @@ SELECT master_create_distributed_table('t_append', 'id', 'append'); 6,3 7,4 \. - -CREATE TABLE ref_not_autoconverted(a int unique); -CREATE TABLE citus_local_autoconverted(a int unique references ref_not_autoconverted(a)); -CREATE TABLE citus_local_not_autoconverted(a int unique); -select create_reference_table('ref_not_autoconverted'); -select citus_add_local_table_to_metadata('citus_local_not_autoconverted'); -select logicalrelid, autoconverted from pg_dist_partition - where logicalrelid IN ('citus_local_autoconverted'::regclass, - 'citus_local_not_autoconverted'::regclass);