From 024bbae6b70dba22c18ce9b596939ee963bfcc10 Mon Sep 17 00:00:00 2001 From: Sait Talha Nisanci Date: Thu, 28 Oct 2021 00:02:09 +0300 Subject: [PATCH] test --- src/test/regress/citus_tests/common.py | 2 +- src/test/regress/citus_tests/config.py | 1 + .../expected/upgrade_basic_after_0.out | 351 ------------------ 3 files changed, 2 insertions(+), 352 deletions(-) delete mode 100644 src/test/regress/expected/upgrade_basic_after_0.out diff --git a/src/test/regress/citus_tests/common.py b/src/test/regress/citus_tests/common.py index 39d721c14..b8b9c64a6 100644 --- a/src/test/regress/citus_tests/common.py +++ b/src/test/regress/citus_tests/common.py @@ -189,7 +189,7 @@ def sync_metadata_to_workers(pg_path, worker_ports, coordinator_port): def add_coordinator_to_metadata(pg_path, coordinator_port): - command = "SELECT citus_add_node('localhost', {}, groupId := 0)".format( + command = "SELECT master_add_node('localhost', {}, groupId := 0)".format( coordinator_port ) utils.psql(pg_path, coordinator_port, command) diff --git a/src/test/regress/citus_tests/config.py b/src/test/regress/citus_tests/config.py index 41aa2bfd0..c493a1c96 100644 --- a/src/test/regress/citus_tests/config.py +++ b/src/test/regress/citus_tests/config.py @@ -181,6 +181,7 @@ class CitusUpgradeConfig(CitusBaseClusterConfig): self.user = SUPER_USER_NAME self.mixed_mode = arguments["--mixed"] self.fixed_port = 57635 + self.add_coordinator_to_metadata = True class PostgresConfig(CitusDefaultClusterConfig): diff --git a/src/test/regress/expected/upgrade_basic_after_0.out b/src/test/regress/expected/upgrade_basic_after_0.out deleted file mode 100644 index 15ef5bff5..000000000 --- a/src/test/regress/expected/upgrade_basic_after_0.out +++ /dev/null @@ -1,351 +0,0 @@ -SET search_path TO upgrade_basic, public, pg_catalog; -BEGIN; -SELECT * FROM pg_indexes WHERE schemaname = 'upgrade_basic' ORDER BY tablename; - schemaname | tablename | indexname | tablespace | indexdef ---------------------------------------------------------------------- - upgrade_basic | r | r_pkey | | CREATE UNIQUE INDEX r_pkey ON upgrade_basic.r 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) -(3 rows) - -SELECT nextval('pg_dist_shardid_seq') = MAX(shardid)+1 FROM pg_dist_shard; - ?column? ---------------------------------------------------------------------- - t -(1 row) - -SELECT nextval('pg_dist_placement_placementid_seq') = MAX(placementid)+1 FROM pg_dist_placement; - ?column? ---------------------------------------------------------------------- - t -(1 row) - -SELECT nextval('pg_dist_groupid_seq') = MAX(groupid)+1 FROM pg_dist_node; - ?column? ---------------------------------------------------------------------- - t -(1 row) - -SELECT nextval('pg_dist_node_nodeid_seq') = MAX(nodeid)+1 FROM pg_dist_node; - ?column? ---------------------------------------------------------------------- - t -(1 row) - -SELECT nextval('pg_dist_colocationid_seq') = MAX(colocationid)+1 FROM pg_dist_colocation; - ?column? ---------------------------------------------------------------------- - t -(1 row) - --- If this query gives output it means we've added a new sequence that should --- possibly be restored after upgrades. -SELECT sequence_name FROM information_schema.sequences - WHERE sequence_name LIKE 'pg_dist_%' - AND sequence_name NOT IN ( - -- these ones are restored above - 'pg_dist_shardid_seq', - 'pg_dist_placement_placementid_seq', - 'pg_dist_groupid_seq', - 'pg_dist_node_nodeid_seq', - 'pg_dist_colocationid_seq' - ); - sequence_name ---------------------------------------------------------------------- -(0 rows) - -SELECT logicalrelid FROM pg_dist_partition - JOIN pg_depend ON logicalrelid=objid - JOIN pg_catalog.pg_class ON logicalrelid=oid - WHERE - refobjid=(select oid FROM pg_extension WHERE extname = 'citus') - AND relnamespace='upgrade_basic'::regnamespace - ORDER BY logicalrelid; - logicalrelid ---------------------------------------------------------------------- - t - tp - t_ab - r - tr - t_append -(6 rows) - -SELECT tgrelid::regclass, tgfoid::regproc, tgisinternal, tgenabled, tgtype::int4::bit(8) - FROM pg_dist_partition - JOIN pg_trigger ON tgrelid=logicalrelid - JOIN pg_class ON pg_class.oid=logicalrelid - WHERE - relnamespace='upgrade_basic'::regnamespace - AND tgname LIKE 'truncate_trigger_%' - ORDER BY tgrelid::regclass; - tgrelid | tgfoid | tgisinternal | tgenabled | tgtype ---------------------------------------------------------------------- - t | citus_truncate_trigger | t | O | 00100000 - tp | citus_truncate_trigger | t | O | 00100000 - t_ab | citus_truncate_trigger | t | O | 00100000 - r | citus_truncate_trigger | t | O | 00100000 - tr | citus_truncate_trigger | t | O | 00100000 - t_append | citus_truncate_trigger | t | O | 00100000 -(6 rows) - -SELECT * FROM t ORDER BY a; - a ---------------------------------------------------------------------- - 1 - 2 - 3 - 4 - 5 -(5 rows) - -SELECT * FROM t WHERE a = 1; - a ---------------------------------------------------------------------- - 1 -(1 row) - -INSERT INTO t SELECT * FROM generate_series(10, 15); -EXPLAIN (COSTS FALSE) SELECT * from t; - QUERY PLAN ---------------------------------------------------------------------- - Custom Scan (Citus Adaptive) - Task Count: 32 - Tasks Shown: One of 32 - -> Task - Node: host=localhost port=xxxxx dbname=postgres - -> Seq Scan on t_102008 t -(6 rows) - -EXPLAIN (COSTS FALSE) SELECT * from t WHERE a = 1; - QUERY PLAN ---------------------------------------------------------------------- - Custom Scan (Citus Adaptive) - Task Count: 1 - Tasks Shown: All - -> Task - Node: host=localhost port=xxxxx dbname=postgres - -> Bitmap Heap Scan on t_102009 t - Recheck Cond: (a = 1) - -> Bitmap Index Scan on t_a_idx_102009 - Index Cond: (a = 1) -(9 rows) - -SELECT * FROM t WHERE a = 10; - a ---------------------------------------------------------------------- - 10 -(1 row) - -SELECT * FROM t WHERE a = 11; - a ---------------------------------------------------------------------- - 11 -(1 row) - -COPY t FROM PROGRAM 'echo 20 && echo 21 && echo 22 && echo 23 && echo 24' WITH CSV; -ALTER TABLE t ADD COLUMN b int DEFAULT 10; -SELECT * FROM t ORDER BY a; - a | b ---------------------------------------------------------------------- - 1 | 10 - 2 | 10 - 3 | 10 - 4 | 10 - 5 | 10 - 10 | 10 - 11 | 10 - 12 | 10 - 13 | 10 - 14 | 10 - 15 | 10 - 20 | 10 - 21 | 10 - 22 | 10 - 23 | 10 - 24 | 10 -(16 rows) - -TRUNCATE TABLE t; -SELECT * FROM T; - a | b ---------------------------------------------------------------------- -(0 rows) - -DROP TABLE t; -\d t --- verify that the table whose column is dropped before a pg_upgrade still works as expected. -SELECT * FROM t_ab ORDER BY b; - b ---------------------------------------------------------------------- - 11 - 22 - 33 -(3 rows) - -SELECT * FROM t_ab WHERE b = 11; - b ---------------------------------------------------------------------- - 11 -(1 row) - -SELECT * FROM t_ab WHERE b = 22; - b ---------------------------------------------------------------------- - 22 -(1 row) - --- Check that we can create a distributed table out of a table that was created --- before the upgrade -SELECT * FROM t2 ORDER BY a; - a | b ---------------------------------------------------------------------- - 1 | 11 - 2 | 22 - 3 | 33 -(3 rows) - -SELECT create_distributed_table('t2', 'a'); -NOTICE: Copying data from local table... -NOTICE: copying the data has completed -DETAIL: The local data in the table is no longer visible, but is still on disk. -HINT: To remove the local data, run: SELECT truncate_local_data_after_distributing_table($$upgrade_basic.t2$$) - create_distributed_table ---------------------------------------------------------------------- - -(1 row) - -SELECT * FROM t2 ORDER BY a; - a | b ---------------------------------------------------------------------- - 1 | 11 - 2 | 22 - 3 | 33 -(3 rows) - -ROLLBACK; -BEGIN; -SET LOCAL citus.multi_shard_modify_mode TO 'sequential'; -SELECT * FROM r ORDER BY a; - a ---------------------------------------------------------------------- - 1 - 2 - 3 - 4 - 5 -(5 rows) - -SELECT * FROM tr ORDER BY pk; - pk | a ---------------------------------------------------------------------- - 1 | 1 - 2 | 2 - 3 | 3 - 4 | 4 - 5 | 5 -(5 rows) - -DELETE FROM r where a = 1; -SELECT * FROM r ORDER BY a; - a ---------------------------------------------------------------------- - 2 - 3 - 4 - 5 -(4 rows) - -SELECT * FROM tr ORDER BY pk; - pk | a ---------------------------------------------------------------------- - 2 | 2 - 3 | 3 - 4 | 4 - 5 | 5 -(4 rows) - -UPDATE r SET a = 30 WHERE a = 3; -SELECT * FROM r ORDER BY a; - a ---------------------------------------------------------------------- - 2 - 4 - 5 - 30 -(4 rows) - -SELECT * FROM tr ORDER BY pk; - pk | a ---------------------------------------------------------------------- - 2 | 2 - 3 | 30 - 4 | 4 - 5 | 5 -(4 rows) - --- Check we can still create distributed tables after upgrade -CREATE TABLE t3(a int, b int); -SELECT create_distributed_table('t3', 'a'); - create_distributed_table ---------------------------------------------------------------------- - -(1 row) - -INSERT INTO t3 VALUES (1, 11); -INSERT INTO t3 VALUES (2, 22); -INSERT INTO t3 VALUES (3, 33); -SELECT * FROM t3 ORDER BY a; - a | b ---------------------------------------------------------------------- - 1 | 11 - 2 | 22 - 3 | 33 -(3 rows) - -SELECT shardminvalue, shardmaxvalue FROM pg_dist_shard - WHERE logicalrelid = 't_append'::regclass - ORDER BY shardminvalue, shardmaxvalue; - shardminvalue | shardmaxvalue ---------------------------------------------------------------------- - 1 | 3 - 5 | 7 -(2 rows) - -SELECT * FROM t_append ORDER BY id; - id | value_1 ---------------------------------------------------------------------- - 1 | 2 - 2 | 3 - 3 | 4 - 5 | 2 - 6 | 3 - 7 | 4 -(6 rows) - -\copy t_append FROM STDIN DELIMITER ',' -SELECT shardminvalue, shardmaxvalue FROM pg_dist_shard - WHERE logicalrelid = 't_append'::regclass - ORDER BY shardminvalue, shardmaxvalue; - shardminvalue | shardmaxvalue ---------------------------------------------------------------------- - 1 | 3 - 5 | 7 - 9 | 11 -(3 rows) - -SELECT * FROM t_append ORDER BY id; - id | value_1 ---------------------------------------------------------------------- - 1 | 2 - 2 | 3 - 3 | 4 - 5 | 2 - 6 | 3 - 7 | 4 - 9 | 2 - 10 | 3 - 11 | 4 -(9 rows) - -ROLLBACK;