From f29af1e23e97135dfc7bb14674103103da7e2de9 Mon Sep 17 00:00:00 2001 From: Burak Velioglu Date: Fri, 14 Jan 2022 11:46:20 +0300 Subject: [PATCH] Check isolation test --- src/test/regress/expected/multi_colocation_utils.out | 2 ++ ...lation_replicate_reference_tables_to_coordinator.spec | 6 +++--- src/test/regress/sql/multi_colocation_utils.sql | 9 ++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/test/regress/expected/multi_colocation_utils.out b/src/test/regress/expected/multi_colocation_utils.out index dba77faa8..25ba1b26e 100644 --- a/src/test/regress/expected/multi_colocation_utils.out +++ b/src/test/regress/expected/multi_colocation_utils.out @@ -1,5 +1,7 @@ SET citus.next_shard_id TO 1300000; ALTER SEQUENCE pg_catalog.pg_dist_colocationid_seq RESTART 4; +-- Delete orphaned entries from pg_dist_colocation +DELETE FROM pg_dist_colocation where colocationid = 5 or colocationid = 6; -- =================================================================== -- create test utility function -- =================================================================== diff --git a/src/test/regress/spec/isolation_replicate_reference_tables_to_coordinator.spec b/src/test/regress/spec/isolation_replicate_reference_tables_to_coordinator.spec index dde9f93c1..fcb7eb0a1 100644 --- a/src/test/regress/spec/isolation_replicate_reference_tables_to_coordinator.spec +++ b/src/test/regress/spec/isolation_replicate_reference_tables_to_coordinator.spec @@ -123,12 +123,12 @@ step "deadlock-checker-call" // verify that locks on the placement of the reference table on the coordinator is // taken into account when looking for distributed deadlocks -// permutation "s1-begin" "s2-begin" "s1-update-dist-table" "s2-lock-ref-table-placement-on-coordinator" "s1-lock-ref-table-placement-on-coordinator" "s2-update-dist-table" "deadlock-checker-call" "s1-end" "s2-end" +permutation "s1-begin" "s2-begin" "s1-update-dist-table" "s2-lock-ref-table-placement-on-coordinator" "s1-lock-ref-table-placement-on-coordinator" "s2-update-dist-table" "deadlock-checker-call" "s1-end" "s2-end" // verify that *_dist_stat_activity() functions return the correct result when query // has a task on the coordinator. -permutation "s1-begin" "s2-begin" "s1-update-ref-table" "s2-sleep" "s2-view-dist" "s2-view-worker" "s2-end" "s1-end" +// permutation "s1-begin" "s2-begin" "s1-update-ref-table" "s2-sleep" "s2-view-dist" "s2-view-worker" "s2-end" "s1-end" // verify that get_*_active_transactions() functions return the correct result when // the query has a task on the coordinator. -permutation "s1-begin" "s2-begin" "s1-update-ref-table" "s2-active-transactions" "s1-end" "s2-end" +// permutation "s1-begin" "s2-begin" "s1-update-ref-table" "s2-active-transactions" "s1-end" "s2-end" diff --git a/src/test/regress/sql/multi_colocation_utils.sql b/src/test/regress/sql/multi_colocation_utils.sql index 33f2fb03c..07c1266b9 100644 --- a/src/test/regress/sql/multi_colocation_utils.sql +++ b/src/test/regress/sql/multi_colocation_utils.sql @@ -1,6 +1,9 @@ SET citus.next_shard_id TO 1300000; -ALTER SEQUENCE pg_catalog.pg_dist_colocationid_seq RESTART 7; +ALTER SEQUENCE pg_catalog.pg_dist_colocationid_seq RESTART 4; + +-- Delete orphaned entries from pg_dist_colocation +DELETE FROM pg_dist_colocation where colocationid = 5 or colocationid = 6; -- =================================================================== -- create test utility function @@ -547,7 +550,3 @@ DROP TABLE range_table; DROP TABLE none; DROP TABLE ref; DROP TABLE local_table; - --- Reactivate remote nodes as well -SELECT citus_activate_node('localhost', :worker_1_port); -SELECT citus_activate_node('localhost', :worker_2_port);