From fd72cca6c84a50627fdfca9a086e3883dd8682e3 Mon Sep 17 00:00:00 2001 From: Marco Slot Date: Wed, 12 Jul 2017 16:45:32 +0200 Subject: [PATCH] Use predictable placement IDs in regression test output --- .../regress/expected/multi_alter_table_add_constraints.out | 4 ++-- src/test/regress/expected/multi_insert_select.out | 5 +++-- src/test/regress/sql/multi_alter_table_add_constraints.sql | 2 +- src/test/regress/sql/multi_insert_select.sql | 1 + 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/test/regress/expected/multi_alter_table_add_constraints.out b/src/test/regress/expected/multi_alter_table_add_constraints.out index 3192f1ad9..4f14d5575 100644 --- a/src/test/regress/expected/multi_alter_table_add_constraints.out +++ b/src/test/regress/expected/multi_alter_table_add_constraints.out @@ -4,7 +4,7 @@ -- Test checks whether constraints of distributed tables can be adjusted using -- the ALTER TABLE ... ADD CONSTRAINT ... command. ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1450000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1450000; +ALTER SEQUENCE pg_catalog.pg_dist_placement_placementid_seq RESTART 1450000; -- Check "PRIMARY KEY CONSTRAINT" CREATE TABLE products ( product_no integer, @@ -443,7 +443,7 @@ BEGIN; INSERT INTO products VALUES(1,'product_1', 5); -- DDL may error out after an INSERT because it might pick the wrong connection ALTER TABLE products ADD CONSTRAINT unn_pno UNIQUE(product_no); -ERROR: cannot establish a new connection for placement 2327, since DML has been executed on a connection that is in use +ERROR: cannot establish a new connection for placement 1450407, since DML has been executed on a connection that is in use ROLLBACK; BEGIN; -- Add constraints diff --git a/src/test/regress/expected/multi_insert_select.out b/src/test/regress/expected/multi_insert_select.out index 30184b38b..6681b2544 100644 --- a/src/test/regress/expected/multi_insert_select.out +++ b/src/test/regress/expected/multi_insert_select.out @@ -2,6 +2,7 @@ -- MULTI_INSERT_SELECT -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 13300000; +ALTER SEQUENCE pg_catalog.pg_dist_placement_placementid_seq RESTART 13300000; -- create co-located tables SET citus.shard_count = 4; SET citus.shard_replication_factor = 2; @@ -1645,7 +1646,7 @@ BEGIN; ALTER TABLE reference_table ADD COLUMN z int; INSERT INTO raw_events_first (user_id) SELECT user_id FROM raw_events_second JOIN reference_table USING (user_id); -ERROR: cannot establish a new connection for placement 655, since DDL has been executed on a connection that is in use +ERROR: cannot establish a new connection for placement 13300024, since DDL has been executed on a connection that is in use ROLLBACK; -- Insert after copy is disallowed when the INSERT INTO ... SELECT chooses -- to use a connection for one shard, while the connection already modified @@ -1653,7 +1654,7 @@ ROLLBACK; BEGIN; COPY raw_events_second (user_id, value_1) FROM STDIN DELIMITER ','; INSERT INTO raw_events_first SELECT * FROM raw_events_second; -ERROR: cannot establish a new connection for placement 636, since DML has been executed on a connection that is in use +ERROR: cannot establish a new connection for placement 13300005, since DML has been executed on a connection that is in use ROLLBACK; -- Insert after copy is currently allowed for single-shard operation. -- Both insert and copy are rolled back successfully. diff --git a/src/test/regress/sql/multi_alter_table_add_constraints.sql b/src/test/regress/sql/multi_alter_table_add_constraints.sql index 4e41472f7..a30d56296 100644 --- a/src/test/regress/sql/multi_alter_table_add_constraints.sql +++ b/src/test/regress/sql/multi_alter_table_add_constraints.sql @@ -5,7 +5,7 @@ -- the ALTER TABLE ... ADD CONSTRAINT ... command. ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1450000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1450000; +ALTER SEQUENCE pg_catalog.pg_dist_placement_placementid_seq RESTART 1450000; -- Check "PRIMARY KEY CONSTRAINT" CREATE TABLE products ( diff --git a/src/test/regress/sql/multi_insert_select.sql b/src/test/regress/sql/multi_insert_select.sql index 3cf7c2cd1..c9e480a82 100644 --- a/src/test/regress/sql/multi_insert_select.sql +++ b/src/test/regress/sql/multi_insert_select.sql @@ -3,6 +3,7 @@ -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 13300000; +ALTER SEQUENCE pg_catalog.pg_dist_placement_placementid_seq RESTART 13300000; -- create co-located tables SET citus.shard_count = 4;