From c9913b135ce655a7251d6265184aeb0315f0bdec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20Ozan=20Akg=C3=BCl?= Date: Fri, 11 Mar 2022 13:30:11 +0300 Subject: [PATCH] Turn metadata sync on in isolation_ref2ref_foreign_keys test (#5791) --- .../isolation_ref2ref_foreign_keys.out | 165 ++++++++++++++++++ src/test/regress/isolation_schedule | 4 +- .../spec/isolation_ref2ref_foreign_keys.spec | 4 + 3 files changed, 170 insertions(+), 3 deletions(-) diff --git a/src/test/regress/expected/isolation_ref2ref_foreign_keys.out b/src/test/regress/expected/isolation_ref2ref_foreign_keys.out index 6c63be9c1..c45405fdb 100644 --- a/src/test/regress/expected/isolation_ref2ref_foreign_keys.out +++ b/src/test/regress/expected/isolation_ref2ref_foreign_keys.out @@ -38,6 +38,11 @@ mode|count --------------------------------------------------------------------- (0 rows) +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s2-begin s2-delete-table-1 s1-view-locks s2-rollback s1-view-locks step s2-begin: @@ -71,6 +76,11 @@ mode|count --------------------------------------------------------------------- (0 rows) +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s2-begin s2-update-table-2 s1-view-locks s2-rollback s1-view-locks step s2-begin: @@ -104,6 +114,11 @@ mode|count --------------------------------------------------------------------- (0 rows) +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s2-begin s2-delete-table-2 s1-view-locks s2-rollback s1-view-locks step s2-begin: @@ -137,6 +152,11 @@ mode|count --------------------------------------------------------------------- (0 rows) +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s2-begin s2-update-table-3 s1-begin s1-view-locks s1-rollback s2-rollback s1-view-locks step s2-begin: @@ -176,6 +196,11 @@ mode|count --------------------------------------------------------------------- (0 rows) +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s2-begin s2-delete-table-3 s1-begin s1-view-locks s1-rollback s2-rollback s1-view-locks step s2-begin: @@ -215,6 +240,11 @@ mode|count --------------------------------------------------------------------- (0 rows) +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s2-begin s2-insert-table-1 s1-view-locks s2-rollback s1-view-locks step s2-begin: @@ -248,6 +278,11 @@ mode|count --------------------------------------------------------------------- (0 rows) +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s2-begin s2-insert-table-2 s1-view-locks s2-rollback s1-view-locks step s2-begin: @@ -281,6 +316,11 @@ mode|count --------------------------------------------------------------------- (0 rows) +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s2-begin s2-insert-table-3 s1-view-locks s2-rollback s1-view-locks step s2-begin: @@ -314,6 +354,11 @@ mode|count --------------------------------------------------------------------- (0 rows) +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s1-begin s2-begin s2-update-table-1 s1-delete-table-2 s2-commit s1-commit s1-select-table-2 step s1-begin: @@ -344,6 +389,11 @@ id|value 5| 5 (2 rows) +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s1-begin s2-begin s2-update-table-1 s1-insert-table-2 s2-commit s1-commit s1-select-table-2 step s1-begin: @@ -376,6 +426,11 @@ id|value 7| 2 (4 rows) +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s1-begin s2-begin s2-update-table-1 s1-update-table-2 s2-commit s1-commit s1-select-table-2 step s1-begin: @@ -407,6 +462,11 @@ id|value 5| 5 (3 rows) +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s1-begin s2-begin s2-delete-table-1 s1-delete-table-2 s2-commit s1-commit s1-select-table-2 step s1-begin: @@ -437,6 +497,11 @@ id|value 5| 5 (2 rows) +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s1-begin s2-begin s2-delete-table-1 s1-insert-table-2 s2-commit s1-commit s1-select-table-2 step s1-begin: @@ -468,6 +533,11 @@ id|value 5| 5 (2 rows) +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s1-begin s2-begin s2-delete-table-1 s1-update-table-2 s2-commit s1-commit s1-select-table-2 step s1-begin: @@ -498,6 +568,11 @@ id|value 5| 5 (2 rows) +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s1-begin s2-begin s2-delete-table-1 s1-delete-table-3 s2-commit s1-commit s1-select-table-3 step s1-begin: @@ -532,6 +607,11 @@ id|value 5| 5 (2 rows) +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s1-begin s2-begin s2-delete-table-1 s1-insert-table-3 s2-commit s1-commit s1-select-table-3 step s1-begin: @@ -563,6 +643,11 @@ id|value 5| 5 (2 rows) +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s1-begin s2-begin s2-delete-table-1 s1-update-table-3 s2-commit s1-commit s1-select-table-3 step s1-begin: @@ -597,6 +682,11 @@ id|value 5| 5 (2 rows) +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s1-begin s2-begin s2-insert-table-1 s1-update-table-3 s2-commit s1-commit s1-select-table-3 step s1-begin: @@ -633,6 +723,11 @@ id|value 5| 5 (3 rows) +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s1-begin s2-begin s1-update-table-3 s2-insert-table-1 s1-commit s2-commit s1-select-table-3 step s1-begin: @@ -669,6 +764,11 @@ id|value 5| 5 (3 rows) +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s1-begin s2-begin s2-insert-table-1 s1-update-table-2 s2-commit s1-commit s1-select-table-3 step s1-begin: @@ -700,6 +800,11 @@ id|value 5| 5 (3 rows) +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s1-begin s2-begin s1-update-table-2 s2-insert-table-1 s1-commit s2-commit s1-select-table-3 step s1-begin: @@ -731,6 +836,11 @@ id|value 5| 5 (3 rows) +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s1-begin s2-begin s2-insert-table-2 s1-update-table-3 s2-commit s1-commit s1-select-table-3 step s1-begin: @@ -767,6 +877,11 @@ id|value 5| 5 (3 rows) +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s1-begin s2-begin s1-update-table-3 s2-insert-table-2 s1-commit s2-commit s1-select-table-3 step s1-begin: @@ -803,6 +918,11 @@ id|value 5| 5 (3 rows) +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s1-begin s2-begin s2-insert-table-1 s1-select-table-1 s2-commit s1-commit step s1-begin: @@ -830,6 +950,11 @@ step s2-commit: step s1-commit: COMMIT; +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s1-begin s2-begin s2-insert-table-1 s1-select-table-2 s2-commit s1-commit step s1-begin: @@ -857,6 +982,11 @@ step s2-commit: step s1-commit: COMMIT; +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s1-begin s2-begin s2-insert-table-1 s1-select-table-3 s2-commit s1-commit step s1-begin: @@ -884,6 +1014,11 @@ step s2-commit: step s1-commit: COMMIT; +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s1-begin s2-begin s2-delete-table-2 s1-select-table-1 s2-commit s1-commit step s1-begin: @@ -911,6 +1046,11 @@ step s2-commit: step s1-commit: COMMIT; +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s1-begin s2-begin s2-delete-table-2 s1-select-table-2 s2-commit s1-commit step s1-begin: @@ -938,6 +1078,11 @@ step s2-commit: step s1-commit: COMMIT; +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s1-begin s2-begin s2-delete-table-2 s1-select-table-3 s2-commit s1-commit step s1-begin: @@ -965,6 +1110,11 @@ step s2-commit: step s1-commit: COMMIT; +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s1-begin s2-begin s2-update-table-3 s1-select-table-1 s2-commit s1-commit step s1-begin: @@ -992,6 +1142,11 @@ step s2-commit: step s1-commit: COMMIT; +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s1-begin s2-begin s2-update-table-3 s1-select-table-2 s2-commit s1-commit step s1-begin: @@ -1019,6 +1174,11 @@ step s2-commit: step s1-commit: COMMIT; +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + starting permutation: s1-begin s2-begin s2-update-table-3 s1-select-table-3 s2-commit s1-commit step s1-begin: @@ -1046,3 +1206,8 @@ step s2-commit: step s1-commit: COMMIT; +restore_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + diff --git a/src/test/regress/isolation_schedule b/src/test/regress/isolation_schedule index 8df57a237..618fa9460 100644 --- a/src/test/regress/isolation_schedule +++ b/src/test/regress/isolation_schedule @@ -61,6 +61,7 @@ test: isolation_ddl_vs_all test: isolation_get_all_active_transactions test: isolation_validate_vs_insert test: isolation_insert_select_conflict +test: isolation_ref2ref_foreign_keys test: shared_connection_waits test: isolation_cancellation test: isolation_max_client_connections @@ -96,7 +97,4 @@ test: isolation_replicated_dist_on_mx test: isolation_replicate_reference_tables_to_coordinator test: isolation_multiuser_locking -# MXless tests test: isolation_check_mx -test: isolation_turn_mx_off -test: isolation_ref2ref_foreign_keys diff --git a/src/test/regress/spec/isolation_ref2ref_foreign_keys.spec b/src/test/regress/spec/isolation_ref2ref_foreign_keys.spec index 6137df058..d92ee5357 100644 --- a/src/test/regress/spec/isolation_ref2ref_foreign_keys.spec +++ b/src/test/regress/spec/isolation_ref2ref_foreign_keys.spec @@ -1,5 +1,8 @@ setup { + SELECT citus_internal.replace_isolation_tester_func(); + SELECT citus_internal.refresh_isolation_tester_prepared_statement(); + CREATE TABLE ref_table_1(id int PRIMARY KEY, value int); SELECT create_reference_table('ref_table_1'); @@ -17,6 +20,7 @@ setup teardown { DROP TABLE ref_table_1, ref_table_2, ref_table_3; + SELECT citus_internal.restore_isolation_tester_func(); } session "s1"