diff --git a/src/test/regress/spec/isolation_blocking_shard_split.spec b/src/test/regress/spec/isolation_blocking_shard_split.spec index bb2f93368..94b65f5bc 100644 --- a/src/test/regress/spec/isolation_blocking_shard_split.spec +++ b/src/test/regress/spec/isolation_blocking_shard_split.spec @@ -4,6 +4,13 @@ setup SET citus.shard_replication_factor to 1; SELECT setval('pg_dist_shardid_seq', 1500000); + -- Cleanup any orphan shards that might be left over from a previous run. + CREATE OR REPLACE FUNCTION run_try_drop_marked_shards() + RETURNS VOID + AS 'citus' + LANGUAGE C STRICT VOLATILE; + SELECT run_try_drop_marked_shards(); + CREATE TABLE to_split_table (id int, value int); SELECT create_distributed_table('to_split_table', 'id'); } diff --git a/src/test/regress/spec/isolation_blocking_shard_split_with_fkey_to_reference.spec b/src/test/regress/spec/isolation_blocking_shard_split_with_fkey_to_reference.spec index 49b56c4a5..211adb4b7 100644 --- a/src/test/regress/spec/isolation_blocking_shard_split_with_fkey_to_reference.spec +++ b/src/test/regress/spec/isolation_blocking_shard_split_with_fkey_to_reference.spec @@ -4,6 +4,13 @@ setup SET citus.shard_count to 2; SET citus.shard_replication_factor to 1; + -- Cleanup any orphan shards that might be left over from a previous run. + CREATE OR REPLACE FUNCTION run_try_drop_marked_shards() + RETURNS VOID + AS 'citus' + LANGUAGE C STRICT VOLATILE; + SELECT run_try_drop_marked_shards(); + CREATE TABLE reference_table (id int PRIMARY KEY, value int); SELECT create_reference_table('reference_table'); diff --git a/src/test/regress/spec/isolation_non_blocking_shard_split.spec b/src/test/regress/spec/isolation_non_blocking_shard_split.spec index deb1b61a8..92c81bb2b 100644 --- a/src/test/regress/spec/isolation_non_blocking_shard_split.spec +++ b/src/test/regress/spec/isolation_non_blocking_shard_split.spec @@ -10,6 +10,13 @@ setup SET citus.shard_replication_factor to 1; SELECT setval('pg_dist_shardid_seq', 1500000); + -- Cleanup any orphan shards that might be left over from a previous run. + CREATE OR REPLACE FUNCTION run_try_drop_marked_shards() + RETURNS VOID + AS 'citus' + LANGUAGE C STRICT VOLATILE; + SELECT run_try_drop_marked_shards(); + CREATE TABLE to_split_table (id int PRIMARY KEY, value int); SELECT create_distributed_table('to_split_table', 'id'); } diff --git a/src/test/regress/spec/isolation_non_blocking_shard_split_fkey.spec b/src/test/regress/spec/isolation_non_blocking_shard_split_fkey.spec index 2aee89f53..090a61b30 100644 --- a/src/test/regress/spec/isolation_non_blocking_shard_split_fkey.spec +++ b/src/test/regress/spec/isolation_non_blocking_shard_split_fkey.spec @@ -10,6 +10,13 @@ setup SET citus.shard_count to 2; SET citus.shard_replication_factor to 1; + -- Cleanup any orphan shards that might be left over from a previous run. + CREATE OR REPLACE FUNCTION run_try_drop_marked_shards() + RETURNS VOID + AS 'citus' + LANGUAGE C STRICT VOLATILE; + SELECT run_try_drop_marked_shards(); + CREATE TABLE reference_table (id int PRIMARY KEY, value int); SELECT create_reference_table('reference_table'); diff --git a/src/test/regress/spec/isolation_non_blocking_shard_split_with_index_as_replicaIdentity.spec b/src/test/regress/spec/isolation_non_blocking_shard_split_with_index_as_replicaIdentity.spec index be4371e26..66b1847d0 100644 --- a/src/test/regress/spec/isolation_non_blocking_shard_split_with_index_as_replicaIdentity.spec +++ b/src/test/regress/spec/isolation_non_blocking_shard_split_with_index_as_replicaIdentity.spec @@ -9,6 +9,13 @@ setup SET citus.shard_replication_factor to 1; SELECT setval('pg_dist_shardid_seq', 1500000); + -- Cleanup any orphan shards that might be left over from a previous run. + CREATE OR REPLACE FUNCTION run_try_drop_marked_shards() + RETURNS VOID + AS 'citus' + LANGUAGE C STRICT VOLATILE; + SELECT run_try_drop_marked_shards(); + CREATE TABLE to_split_table (id int NOT NULL, value int); CREATE UNIQUE INDEX split_table_index ON to_split_table(id); ALTER TABLE to_split_table REPLICA IDENTITY USING INDEX split_table_index;