From b90523628f4c37a686e346a5c1e2bcde5bcac13a Mon Sep 17 00:00:00 2001 From: Hanefi Onaldi Date: Wed, 6 Jul 2022 11:04:31 +0300 Subject: [PATCH] Replace iso tester func only once (#5964) Use Citus helper UDFs by default in iso tests PostgreSQL isolation test infrastructure uses some UDFs to detect whether concurrent sessions block each other. Citus implements alternatives to that UDF so that we are able to detect and report distributed transactions that get blocked on the worker nodes as well. We needed to explicitly replace PG helper functions with Citus implementations in each isolation file. Now we replace them by default. (cherry picked from commit 2b7cf0c09771a49a47f4438dfe71b07898723e04) --- src/test/regress/base_isolation_schedule | 1 + ...enterprise_isolation_logicalrep_2_schedule | 2 + .../isolation_acquire_distributed_locks.out | 38 +- ...ocking_move_multi_shard_commands_on_mx.out | 20 - ...cking_move_single_shard_commands_on_mx.out | 25 - .../expected/isolation_concurrent_dml.out | 25 - .../expected/isolation_copy_vs_all_on_mx.out | 15 - .../regress/expected/isolation_ddl_vs_all.out | 165 ----- .../expected/isolation_delete_vs_all.out | 100 --- .../isolation_dis2ref_foreign_keys_on_mx.out | 35 - ...op_alter_index_select_for_update_on_mx.out | 20 - .../expected/isolation_drop_vs_all.out | 90 --- .../isolation_dump_global_wait_edges.out | 10 - .../expected/isolation_hash_copy_vs_all.out | 250 +------ .../isolation_insert_select_conflict.out | 316 ++++---- .../isolation_insert_select_vs_all_on_mx.out | 70 -- .../isolation_insert_vs_all_on_mx.out | 55 -- ...replication_multi_shard_commands_on_mx.out | 40 - ...eplication_single_shard_commands_on_mx.out | 50 -- .../isolation_metadata_sync_deadlock.out | 5 - .../isolation_modify_with_subquery_vs_dml.out | 62 +- .../isolation_ref2ref_foreign_keys.out | 165 ----- .../isolation_ref2ref_foreign_keys_on_mx.out | 45 -- ...ion_ref_select_for_update_vs_all_on_mx.out | 40 - ..._ref_update_delete_upsert_vs_all_on_mx.out | 20 - .../isolation_reference_copy_vs_all.out | 180 ----- .../expected/isolation_reference_on_mx.out | 50 -- .../isolation_replace_wait_function.out | 5 - .../isolation_replicated_dist_on_mx.out | 691 +++++++----------- .../expected/isolation_select_for_update.out | 65 -- .../expected/isolation_select_vs_all.out | 490 ------------- .../isolation_select_vs_all_on_mx.out | 35 - src/test/regress/expected/isolation_setup.out | 19 + .../isolation_shard_rebalancer_progress.out | 5 - .../expected/isolation_truncate_vs_all.out | 120 --- .../isolation_truncate_vs_all_on_mx.out | 40 - .../expected/isolation_undistribute_table.out | 50 -- ...tion_update_delete_upsert_vs_all_on_mx.out | 20 - .../expected/isolation_update_node.out | 14 +- .../expected/isolation_update_vs_all.out | 235 ------ .../expected/isolation_upsert_vs_all.out | 125 ---- src/test/regress/isolation_schedule | 1 + .../isolation_acquire_distributed_locks.spec | 2 - ...on_blocking_move_multi_shard_commands.spec | 5 - ...cking_move_multi_shard_commands_on_mx.spec | 5 - ...n_blocking_move_single_shard_commands.spec | 5 - ...king_move_single_shard_commands_on_mx.spec | 5 - .../spec/isolation_citus_dist_activity.spec | 6 + .../spec/isolation_concurrent_dml.spec | 3 - .../spec/isolation_copy_vs_all_on_mx.spec | 1 - .../regress/spec/isolation_ddl_vs_all.spec | 5 - .../regress/spec/isolation_delete_vs_all.spec | 5 - .../isolation_dis2ref_foreign_keys_on_mx.spec | 1 - ...lation_distributed_deadlock_detection.spec | 4 - ...p_alter_index_select_for_update_on_mx.spec | 1 - .../regress/spec/isolation_drop_vs_all.spec | 5 - .../isolation_dump_global_wait_edges.spec | 3 - ...ation_get_distributed_wait_queries_mx.spec | 1 - .../regress/spec/isolation_global_pid.spec | 1 - .../spec/isolation_hash_copy_vs_all.spec | 3 - .../isolation_insert_select_conflict.spec | 3 - .../isolation_insert_select_vs_all_on_mx.spec | 1 - .../spec/isolation_insert_vs_all_on_mx.spec | 1 - ...eplication_multi_shard_commands_on_mx.spec | 2 - ...plication_single_shard_commands_on_mx.spec | 2 - .../spec/isolation_master_update_node.spec | 6 + .../isolation_metadata_sync_deadlock.spec | 1 - ...isolation_modify_with_subquery_vs_dml.spec | 3 - .../isolation_multi_shard_modify_vs_all.spec | 4 - .../spec/isolation_multiuser_locking.spec | 5 - .../spec/isolation_mx_common.include.spec | 3 - .../isolation_rebalancer_deferred_drop.spec | 5 - .../spec/isolation_ref2ref_foreign_keys.spec | 4 - .../isolation_ref2ref_foreign_keys_on_mx.spec | 1 - ...on_ref_select_for_update_vs_all_on_mx.spec | 1 - ...ref_update_delete_upsert_vs_all_on_mx.spec | 1 - .../spec/isolation_reference_copy_vs_all.spec | 3 - .../spec/isolation_reference_on_mx.spec | 1 - .../spec/isolation_replace_wait_function.spec | 3 - ...icate_reference_tables_to_coordinator.spec | 4 - .../spec/isolation_replicated_dist_on_mx.spec | 1 - .../spec/isolation_select_for_update.spec | 5 - .../regress/spec/isolation_select_vs_all.spec | 4 - .../spec/isolation_select_vs_all_on_mx.spec | 1 - src/test/regress/spec/isolation_setup.spec | 15 + .../isolation_shard_rebalancer_progress.spec | 3 - .../spec/isolation_truncate_vs_all.spec | 5 - .../spec/isolation_truncate_vs_all_on_mx.spec | 1 - .../spec/isolation_undistribute_table.spec | 4 - ...ion_update_delete_upsert_vs_all_on_mx.spec | 1 - .../regress/spec/isolation_update_node.spec | 6 + .../regress/spec/isolation_update_vs_all.spec | 5 - .../regress/spec/isolation_upsert_vs_all.spec | 5 - 93 files changed, 524 insertions(+), 3456 deletions(-) create mode 100644 src/test/regress/expected/isolation_setup.out create mode 100644 src/test/regress/spec/isolation_setup.spec diff --git a/src/test/regress/base_isolation_schedule b/src/test/regress/base_isolation_schedule index 7e86b998c..1fc2f7de5 100644 --- a/src/test/regress/base_isolation_schedule +++ b/src/test/regress/base_isolation_schedule @@ -1,4 +1,5 @@ # ---------- # isolation setup steps # ---------- +test: isolation_setup test: isolation_cluster_management diff --git a/src/test/regress/enterprise_isolation_logicalrep_2_schedule b/src/test/regress/enterprise_isolation_logicalrep_2_schedule index 1863d4dc5..a350ea2f1 100644 --- a/src/test/regress/enterprise_isolation_logicalrep_2_schedule +++ b/src/test/regress/enterprise_isolation_logicalrep_2_schedule @@ -1,3 +1,5 @@ +test: isolation_setup + # tests that change node metadata should precede # isolation_cluster_management such that tests # that come later can be parallelized diff --git a/src/test/regress/expected/isolation_acquire_distributed_locks.out b/src/test/regress/expected/isolation_acquire_distributed_locks.out index ed51f1da6..86abfc64e 100644 --- a/src/test/regress/expected/isolation_acquire_distributed_locks.out +++ b/src/test/regress/expected/isolation_acquire_distributed_locks.out @@ -51,7 +51,7 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -117,7 +117,7 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -174,7 +174,7 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -271,7 +271,7 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -336,7 +336,7 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -398,7 +398,7 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -455,7 +455,7 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -512,7 +512,7 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -569,7 +569,7 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -626,7 +626,7 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -683,7 +683,7 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -740,7 +740,7 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -797,7 +797,7 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -854,7 +854,7 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -911,7 +911,7 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -968,7 +968,7 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -1024,7 +1024,7 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -1081,7 +1081,7 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func +citus_remove_node --------------------------------------------------------------------- (1 row) @@ -1184,7 +1184,7 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func +citus_remove_node --------------------------------------------------------------------- (1 row) diff --git a/src/test/regress/expected/isolation_blocking_move_multi_shard_commands_on_mx.out b/src/test/regress/expected/isolation_blocking_move_multi_shard_commands_on_mx.out index 83da032b8..ff93f37b2 100644 --- a/src/test/regress/expected/isolation_blocking_move_multi_shard_commands_on_mx.out +++ b/src/test/regress/expected/isolation_blocking_move_multi_shard_commands_on_mx.out @@ -73,11 +73,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-insert s1-begin s2-start-session-level-connection s2-begin-on-worker s2-update s1-move-placement s2-commit-worker s1-commit s1-select s1-get-shard-distribution s2-stop-connection step s1-insert: @@ -155,11 +150,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-insert s1-begin s2-start-session-level-connection s2-begin-on-worker s2-delete s1-move-placement s2-commit-worker s1-commit s1-select s1-get-shard-distribution s2-stop-connection step s1-insert: @@ -235,11 +225,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-insert s1-begin s2-start-session-level-connection s2-begin-on-worker s2-select s1-move-placement s2-commit-worker s1-commit s1-get-shard-distribution s2-stop-connection step s1-insert: @@ -307,8 +292,3 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_blocking_move_single_shard_commands_on_mx.out b/src/test/regress/expected/isolation_blocking_move_single_shard_commands_on_mx.out index ad6c17c7f..0162815b8 100644 --- a/src/test/regress/expected/isolation_blocking_move_single_shard_commands_on_mx.out +++ b/src/test/regress/expected/isolation_blocking_move_single_shard_commands_on_mx.out @@ -72,11 +72,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-insert s1-begin s2-start-session-level-connection s2-begin-on-worker s2-update s1-move-placement s2-commit-worker s1-commit s1-select s1-get-shard-distribution s2-stop-connection step s1-insert: @@ -153,11 +148,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-insert s1-begin s2-start-session-level-connection s2-begin-on-worker s2-delete s1-move-placement s2-commit-worker s1-commit s1-select s1-get-shard-distribution s2-stop-connection step s1-insert: @@ -233,11 +223,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-insert s1-begin s2-start-session-level-connection s2-begin-on-worker s2-select s1-move-placement s2-commit-worker s1-commit s1-get-shard-distribution s2-stop-connection step s1-insert: @@ -305,11 +290,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-insert s1-begin s2-start-session-level-connection s2-begin-on-worker s2-select-for-update s1-move-placement s2-commit-worker s1-commit s1-get-shard-distribution s2-stop-connection step s1-insert: @@ -377,8 +357,3 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_concurrent_dml.out b/src/test/regress/expected/isolation_concurrent_dml.out index eca23913e..f6b18d709 100644 --- a/src/test/regress/expected/isolation_concurrent_dml.out +++ b/src/test/regress/expected/isolation_concurrent_dml.out @@ -19,11 +19,6 @@ step s1-commit: COMMIT; step s2-update: <... completed> -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-insert s2-update create_distributed_table @@ -37,11 +32,6 @@ step s1-insert: step s2-update: UPDATE test_concurrent_dml SET data = 'blarg' WHERE test_id = 1; -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s1-multi-insert s2-update s1-commit create_distributed_table @@ -62,11 +52,6 @@ step s1-commit: COMMIT; step s2-update: <... completed> -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s1-multi-insert s2-multi-insert-overlap s1-commit create_distributed_table @@ -86,11 +71,6 @@ step s2-multi-insert-overlap: step s1-commit: COMMIT; -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s2-begin s1-multi-insert s2-multi-insert s1-commit s2-commit create_distributed_table @@ -116,8 +96,3 @@ step s1-commit: step s2-commit: COMMIT; -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_copy_vs_all_on_mx.out b/src/test/regress/expected/isolation_copy_vs_all_on_mx.out index ef2fb5661..8f60ccae9 100644 --- a/src/test/regress/expected/isolation_copy_vs_all_on_mx.out +++ b/src/test/regress/expected/isolation_copy_vs_all_on_mx.out @@ -89,11 +89,6 @@ count 11 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-copy s2-begin s2-coordinator-drop s1-commit-worker s2-commit s1-stop-connection s3-select-count step s1-start-session-level-connection: @@ -150,11 +145,6 @@ step s3-select-count: SELECT COUNT(*) FROM copy_table; ERROR: relation "copy_table" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-copy s2-start-session-level-connection s2-begin-on-worker s2-select-for-update s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-select-count step s1-start-session-level-connection: @@ -245,8 +235,3 @@ count 8 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_ddl_vs_all.out b/src/test/regress/expected/isolation_ddl_vs_all.out index 6d4aa5811..7e040fccc 100644 --- a/src/test/regress/expected/isolation_ddl_vs_all.out +++ b/src/test/regress/expected/isolation_ddl_vs_all.out @@ -22,11 +22,6 @@ run_command_on_workers (localhost,57638,t,2) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-ddl-create-index s2-ddl-create-index-concurrently s1-commit s1-show-indexes create_distributed_table @@ -48,11 +43,6 @@ run_command_on_workers (localhost,57638,t,2) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-ddl-create-index s2-ddl-add-column s1-commit s2-commit s1-show-indexes s1-show-columns create_distributed_table @@ -82,11 +72,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-ddl-create-index s2-ddl-rename-column s1-commit s2-commit s1-show-indexes s1-show-columns create_distributed_table @@ -116,11 +101,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-ddl-add-column s2-ddl-create-index s1-commit s2-commit s1-show-columns s1-show-indexes create_distributed_table @@ -150,11 +130,6 @@ run_command_on_workers (localhost,57638,t,2) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-ddl-add-column s2-ddl-create-index-concurrently s1-commit s1-show-columns s1-show-indexes create_distributed_table @@ -182,11 +157,6 @@ run_command_on_workers (localhost,57638,t,2) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-ddl-add-column s2-ddl-add-column s1-commit s2-commit s1-show-columns create_distributed_table @@ -209,11 +179,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-ddl-add-column s2-ddl-rename-column s1-commit s2-commit s1-show-columns create_distributed_table @@ -236,11 +201,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-ddl-rename-column s2-ddl-create-index s1-commit s2-commit s1-show-columns s1-show-indexes create_distributed_table @@ -270,11 +230,6 @@ run_command_on_workers (localhost,57638,t,2) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-ddl-rename-column s2-ddl-create-index-concurrently s1-commit s1-show-columns s1-show-indexes create_distributed_table @@ -302,11 +257,6 @@ run_command_on_workers (localhost,57638,t,2) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-ddl-rename-column s2-ddl-add-column s1-commit s2-commit s1-show-columns create_distributed_table @@ -329,11 +279,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-ddl-rename-column s2-ddl-rename-column s1-commit s2-commit s1-show-columns create_distributed_table @@ -357,11 +302,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-ddl-create-index s2-table-size s1-commit s2-commit s1-show-indexes create_distributed_table @@ -388,11 +328,6 @@ run_command_on_workers (localhost,57638,t,2) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-ddl-create-index s2-master-modify-multiple-shards s1-commit s2-commit s1-show-indexes create_distributed_table @@ -415,11 +350,6 @@ run_command_on_workers (localhost,57638,t,2) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-drop s1-create-non-distributed-table s1-initialize s1-begin s2-begin s1-ddl-create-index s2-distribute-table s1-commit s2-commit s1-show-indexes create_distributed_table @@ -449,11 +379,6 @@ run_command_on_workers (localhost,57638,t,4) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-ddl-add-column s2-table-size s1-commit s2-commit s1-show-columns create_distributed_table @@ -481,11 +406,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-ddl-add-column s2-master-modify-multiple-shards s1-commit s2-commit s1-show-columns create_distributed_table @@ -508,11 +428,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-drop s1-create-non-distributed-table s1-initialize s1-begin s2-begin s1-ddl-add-column s2-distribute-table s1-commit s2-commit s1-show-columns create_distributed_table @@ -542,11 +457,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-ddl-rename-column s2-table-size s1-commit s2-commit s1-show-columns create_distributed_table @@ -574,11 +484,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-ddl-rename-column s2-master-modify-multiple-shards s1-commit s2-commit s1-show-columns create_distributed_table @@ -601,11 +506,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-drop s1-create-non-distributed-table s1-initialize s1-begin s2-begin s1-ddl-rename-column s2-distribute-table s1-commit s2-commit s1-show-columns create_distributed_table @@ -635,11 +535,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-table-size s2-ddl-create-index s1-commit s2-commit s1-show-indexes create_distributed_table @@ -666,11 +561,6 @@ run_command_on_workers (localhost,57638,t,2) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-master-modify-multiple-shards s2-ddl-create-index s1-commit s2-commit s1-show-indexes create_distributed_table @@ -693,11 +583,6 @@ run_command_on_workers (localhost,57638,t,2) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-drop s1-create-non-distributed-table s1-initialize s1-begin s2-begin s1-distribute-table s2-ddl-create-index s1-commit s2-commit s1-show-indexes create_distributed_table @@ -727,11 +612,6 @@ run_command_on_workers (localhost,57638,t,4) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-table-size s2-ddl-create-index-concurrently s1-commit s1-show-indexes create_distributed_table @@ -756,11 +636,6 @@ run_command_on_workers (localhost,57638,t,2) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-master-modify-multiple-shards s2-ddl-create-index-concurrently s1-commit s1-show-indexes create_distributed_table @@ -781,11 +656,6 @@ run_command_on_workers (localhost,57638,t,2) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-drop s1-create-non-distributed-table s1-initialize s1-begin s1-distribute-table s2-ddl-create-index-concurrently s1-commit s1-show-indexes create_distributed_table @@ -813,11 +683,6 @@ run_command_on_workers (localhost,57638,t,4) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-table-size s2-ddl-add-column s1-commit s2-commit s1-show-columns create_distributed_table @@ -844,11 +709,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-master-modify-multiple-shards s2-ddl-add-column s1-commit s2-commit s1-show-columns create_distributed_table @@ -871,11 +731,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-drop s1-create-non-distributed-table s1-initialize s1-begin s2-begin s1-distribute-table s2-ddl-add-column s1-commit s2-commit s1-show-columns create_distributed_table @@ -905,11 +760,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-table-size s2-ddl-rename-column s1-commit s2-commit s1-show-columns create_distributed_table @@ -936,11 +786,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-master-modify-multiple-shards s2-ddl-rename-column s1-commit s2-commit s1-show-columns create_distributed_table @@ -963,11 +808,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-drop s1-create-non-distributed-table s1-initialize s1-begin s2-begin s1-distribute-table s2-ddl-rename-column s1-commit s2-commit s1-show-columns create_distributed_table @@ -997,8 +837,3 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_delete_vs_all.out b/src/test/regress/expected/isolation_delete_vs_all.out index 4492451fe..aba31313a 100644 --- a/src/test/regress/expected/isolation_delete_vs_all.out +++ b/src/test/regress/expected/isolation_delete_vs_all.out @@ -20,11 +20,6 @@ count 4 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-delete s2-truncate s1-commit s2-commit s1-select-count create_distributed_table @@ -46,11 +41,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-delete s2-drop s1-commit s2-commit s1-select-count create_distributed_table @@ -68,11 +58,6 @@ step s2-drop: <... completed> step s2-commit: COMMIT; step s1-select-count: SELECT COUNT(*) FROM delete_hash; ERROR: relation "delete_hash" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-delete s2-ddl-create-index s1-commit s2-commit s1-select-count s1-show-indexes create_distributed_table @@ -101,11 +86,6 @@ run_command_on_workers (localhost,57638,t,2) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-create-index s1-begin s2-begin s1-delete s2-ddl-drop-index s1-commit s2-commit s1-select-count s1-show-indexes create_distributed_table @@ -135,11 +115,6 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-delete s2-ddl-create-index-concurrently s1-commit s1-select-count s1-show-indexes create_distributed_table @@ -166,11 +141,6 @@ run_command_on_workers (localhost,57638,t,2) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-delete s2-ddl-add-column s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -199,11 +169,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-add-column s1-begin s2-begin s1-delete s2-ddl-drop-column s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -233,11 +198,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-delete s2-ddl-rename-column s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -266,11 +226,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-delete s2-table-size s1-commit s2-commit s1-select-count create_distributed_table @@ -296,11 +251,6 @@ count 4 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-drop s1-create-non-distributed-table s1-initialize s1-begin s2-begin s1-delete s2-distribute-table s1-commit s2-commit s1-select-count create_distributed_table @@ -329,11 +279,6 @@ count 8 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-truncate s2-delete s1-commit s2-commit s1-select-count create_distributed_table @@ -355,11 +300,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-drop s2-delete s1-commit s2-commit s1-select-count create_distributed_table @@ -378,11 +318,6 @@ ERROR: relation "delete_hash" does not exist step s2-commit: COMMIT; step s1-select-count: SELECT COUNT(*) FROM delete_hash; ERROR: relation "delete_hash" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-ddl-create-index s2-delete s1-commit s2-commit s1-select-count s1-show-indexes create_distributed_table @@ -411,11 +346,6 @@ run_command_on_workers (localhost,57638,t,2) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-create-index s1-begin s2-begin s1-ddl-drop-index s2-delete s1-commit s2-commit s1-select-count s1-show-indexes create_distributed_table @@ -445,11 +375,6 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-ddl-add-column s2-delete s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -478,11 +403,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-add-column s1-begin s2-begin s1-ddl-drop-column s2-delete s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -512,11 +432,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-ddl-rename-column s2-delete s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -545,11 +460,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-table-size s2-delete s1-commit s2-commit s1-select-count create_distributed_table @@ -575,11 +485,6 @@ count 4 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-drop s1-create-non-distributed-table s1-initialize s1-begin s2-begin s1-distribute-table s2-delete s1-commit s2-commit s1-select-count create_distributed_table @@ -608,8 +513,3 @@ count 8 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_dis2ref_foreign_keys_on_mx.out b/src/test/regress/expected/isolation_dis2ref_foreign_keys_on_mx.out index e3704e66c..ede303225 100644 --- a/src/test/regress/expected/isolation_dis2ref_foreign_keys_on_mx.out +++ b/src/test/regress/expected/isolation_dis2ref_foreign_keys_on_mx.out @@ -99,11 +99,6 @@ id|value 2| 2 (3 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-delete s2-start-session-level-connection s2-begin-on-worker s2-select s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-display step s1-start-session-level-connection: @@ -200,11 +195,6 @@ id|value 2| 2 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-delete s2-start-session-level-connection s2-begin-on-worker s2-insert-select s1-rollback-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-display step s1-start-session-level-connection: @@ -306,11 +296,6 @@ id|value 2| 2 (4 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-update s2-start-session-level-connection s2-begin-on-worker s2-update s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-display step s1-start-session-level-connection: @@ -410,11 +395,6 @@ id|value 2| 2 (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-update s2-start-session-level-connection s2-begin-on-worker s2-copy s1-rollback-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-display step s1-start-session-level-connection: @@ -515,11 +495,6 @@ id|value 2| 2 (3 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-update s2-start-session-level-connection s2-begin-on-worker s2-truncate s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-display step s1-start-session-level-connection: @@ -617,11 +592,6 @@ id|value --------------------------------------------------------------------- (0 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-delete s2-start-session-level-connection s2-begin-on-worker s2-select-for-udpate s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-display step s1-start-session-level-connection: @@ -719,8 +689,3 @@ id|value 2| 2 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_drop_alter_index_select_for_update_on_mx.out b/src/test/regress/expected/isolation_drop_alter_index_select_for_update_on_mx.out index 38e185202..0b9042c1c 100644 --- a/src/test/regress/expected/isolation_drop_alter_index_select_for_update_on_mx.out +++ b/src/test/regress/expected/isolation_drop_alter_index_select_for_update_on_mx.out @@ -85,11 +85,6 @@ count 6 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s1-index s2-start-session-level-connection s2-begin-on-worker s2-select-for-update s1-commit s2-commit-worker s2-stop-connection step s1-begin: @@ -141,11 +136,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-select-for-update s2-start-session-level-connection s2-begin-on-worker s2-select-for-update s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: @@ -229,11 +219,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-select-for-update s2-flaky-coordinator-create-index-concurrently s1-commit-worker s1-stop-connection step s1-start-session-level-connection: @@ -279,8 +264,3 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_drop_vs_all.out b/src/test/regress/expected/isolation_drop_vs_all.out index e4cfe791a..a6ec239fe 100644 --- a/src/test/regress/expected/isolation_drop_vs_all.out +++ b/src/test/regress/expected/isolation_drop_vs_all.out @@ -18,11 +18,6 @@ ERROR: table "drop_hash" does not exist step s2-commit: COMMIT; step s1-select-count: SELECT COUNT(*) FROM drop_hash; ERROR: relation "drop_hash" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s2-initialize s1-begin s2-begin s1-drop-schema s2-drop-schema s1-commit s2-commit s1-select-count create_distributed_table @@ -42,11 +37,6 @@ ERROR: schema "drop_tests" does not exist step s2-commit: COMMIT; step s1-select-count: SELECT COUNT(*) FROM drop_hash; ERROR: relation "drop_hash" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s2-initialize s1-begin s2-begin s1-drop-schema s2-drop-schema-2 s1-commit s2-commit s1-select-count create_distributed_table @@ -64,11 +54,6 @@ step s1-commit: COMMIT; step s2-commit: COMMIT; step s1-select-count: SELECT COUNT(*) FROM drop_hash; ERROR: relation "drop_hash" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s2-initialize s1-begin s2-begin s1-drop s2-ddl-create-index s1-commit s2-commit s1-select-count s1-show-indexes create_distributed_table @@ -95,11 +80,6 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s2-initialize s1-ddl-create-index s1-begin s2-begin s1-drop s2-ddl-drop-index s1-commit s2-commit s1-select-count s1-show-indexes create_distributed_table @@ -127,11 +107,6 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s2-initialize s1-begin s1-drop s2-ddl-create-index-concurrently s1-commit s1-select-count s1-show-indexes create_distributed_table @@ -156,11 +131,6 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s2-initialize s1-begin s2-begin s1-drop s2-ddl-add-column s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -187,11 +157,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s2-initialize s1-ddl-add-column s1-begin s2-begin s1-drop s2-ddl-drop-column s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -219,11 +184,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s2-initialize s1-begin s2-begin s1-drop s2-ddl-rename-column s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -250,11 +210,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s2-initialize s1-begin s2-begin s1-drop s2-table-size s1-commit s2-commit s1-select-count create_distributed_table @@ -274,11 +229,6 @@ ERROR: could not compute table size: relation does not exist step s2-commit: COMMIT; step s1-select-count: SELECT COUNT(*) FROM drop_hash; ERROR: relation "drop_hash" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-drop s1-create-non-distributed-table s1-initialize s2-initialize s1-begin s2-begin s1-drop s2-distribute-table s1-commit s2-commit s1-select-count create_distributed_table @@ -300,11 +250,6 @@ ERROR: could not create distributed table: relation does not exist step s2-commit: COMMIT; step s1-select-count: SELECT COUNT(*) FROM drop_hash; ERROR: relation "drop_hash" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s2-initialize s1-begin s2-begin s1-ddl-create-index s2-drop s1-commit s2-commit s1-select-count s1-show-indexes create_distributed_table @@ -330,11 +275,6 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s2-initialize s1-ddl-create-index s1-begin s2-begin s1-ddl-drop-index s2-drop s1-commit s2-commit s1-select-count s1-show-indexes create_distributed_table @@ -361,11 +301,6 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s2-initialize s1-begin s2-begin s1-ddl-add-column s2-drop s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -391,11 +326,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s2-initialize s1-ddl-add-column s1-begin s2-begin s1-ddl-drop-column s2-drop s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -422,11 +352,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s2-initialize s1-begin s2-begin s1-ddl-rename-column s2-drop s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -452,11 +377,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s2-initialize s1-begin s2-begin s1-table-size s2-drop s1-commit s2-commit s1-select-count create_distributed_table @@ -479,11 +399,6 @@ step s1-commit: COMMIT; step s2-commit: COMMIT; step s1-select-count: SELECT COUNT(*) FROM drop_hash; ERROR: relation "drop_hash" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-drop s1-create-non-distributed-table s1-initialize s2-initialize s1-begin s2-begin s1-distribute-table s2-drop s1-commit s2-commit s1-select-count create_distributed_table @@ -509,8 +424,3 @@ step s2-drop: <... completed> step s2-commit: COMMIT; step s1-select-count: SELECT COUNT(*) FROM drop_hash; ERROR: relation "drop_hash" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_dump_global_wait_edges.out b/src/test/regress/expected/isolation_dump_global_wait_edges.out index 046025599..0086e488a 100644 --- a/src/test/regress/expected/isolation_dump_global_wait_edges.out +++ b/src/test/regress/expected/isolation_dump_global_wait_edges.out @@ -56,11 +56,6 @@ step s2-update: <... completed> step s2-abort: ABORT; -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s2-begin s3-begin s1-update s2-update s3-update detector-dump-wait-edges s1-abort s2-abort s3-abort step s1-begin: @@ -137,8 +132,3 @@ step s3-update: <... completed> step s3-abort: ABORT; -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_hash_copy_vs_all.out b/src/test/regress/expected/isolation_hash_copy_vs_all.out index bbf9e9c6b..4c734925c 100644 --- a/src/test/regress/expected/isolation_hash_copy_vs_all.out +++ b/src/test/regress/expected/isolation_hash_copy_vs_all.out @@ -17,11 +17,6 @@ count 15 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-router-select s1-commit s1-select-count create_distributed_table @@ -45,11 +40,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-real-time-select s1-commit s1-select-count create_distributed_table @@ -77,11 +67,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-adaptive-select s1-commit s1-select-count create_distributed_table @@ -93,8 +78,8 @@ step s1-initialize: COPY hash_copy FROM PROGRAM 'echo 0, a, 0 && echo 1, b, 1 && step s1-begin: BEGIN; step s1-copy: COPY hash_copy FROM PROGRAM 'echo 5, f, 5 && echo 6, g, 6 && echo 7, h, 7 && echo 8, i, 8 && echo 9, j, 9' WITH CSV; step s2-adaptive-select: - SET citus.enable_repartition_joins TO ON; - SELECT * FROM hash_copy AS t1 JOIN hash_copy AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4; + SET citus.enable_repartition_joins TO ON; + SELECT * FROM hash_copy AS t1 JOIN hash_copy AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4; id|data|int_data|id|data|int_data --------------------------------------------------------------------- @@ -112,11 +97,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-insert s1-commit s1-select-count create_distributed_table @@ -135,11 +115,6 @@ count 11 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-insert-select s1-commit s1-select-count create_distributed_table @@ -158,11 +133,6 @@ count 15 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-update s1-commit s1-select-count create_distributed_table @@ -181,11 +151,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-delete s1-commit s1-select-count create_distributed_table @@ -204,11 +169,6 @@ count 9 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-truncate s1-commit s1-select-count create_distributed_table @@ -228,11 +188,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-drop s1-commit s1-select-count create_distributed_table @@ -248,11 +203,6 @@ step s1-commit: COMMIT; step s2-drop: <... completed> step s1-select-count: SELECT COUNT(*) FROM hash_copy; ERROR: relation "hash_copy" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-ddl-create-index s1-commit s1-select-count s1-show-indexes create_distributed_table @@ -279,11 +229,6 @@ run_command_on_workers (localhost,57638,t,2) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-create-index s1-begin s1-copy s2-ddl-drop-index s1-commit s1-select-count s1-show-indexes create_distributed_table @@ -311,11 +256,6 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-flaky-ddl-create-index-concurrently s1-commit s1-select-count s1-show-indexes create_distributed_table @@ -341,11 +281,6 @@ run_command_on_workers (localhost,57638,t,2) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-ddl-add-column s1-commit s1-select-count s1-show-columns create_distributed_table @@ -372,11 +307,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-add-column s1-begin s1-copy-additional-column s2-ddl-drop-column s1-commit s1-select-count s1-show-columns create_distributed_table @@ -404,11 +334,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-ddl-rename-column s1-commit s1-select-count s1-show-columns create_distributed_table @@ -435,11 +360,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-table-size s1-commit s1-select-count create_distributed_table @@ -463,11 +383,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-master-modify-multiple-shards s1-commit s1-select-count create_distributed_table @@ -486,11 +401,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-master-drop-all-shards s1-commit s1-select-count create_distributed_table @@ -515,11 +425,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-drop s1-create-non-distributed-table s1-initialize s1-begin s1-copy s2-distribute-table s1-commit s1-select-count create_distributed_table @@ -546,11 +451,6 @@ count 15 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-recreate-with-replication-2 s1-initialize s1-begin s1-copy s2-update s1-commit s1-select-count create_distributed_table @@ -559,10 +459,10 @@ create_distributed_table (1 row) step s1-recreate-with-replication-2: - DROP TABLE hash_copy; - SET citus.shard_replication_factor TO 2; - CREATE TABLE hash_copy(id integer, data text, int_data int); - SELECT create_distributed_table('hash_copy', 'id'); + DROP TABLE hash_copy; + SET citus.shard_replication_factor TO 2; + CREATE TABLE hash_copy(id integer, data text, int_data int); + SELECT create_distributed_table('hash_copy', 'id'); create_distributed_table --------------------------------------------------------------------- @@ -581,11 +481,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-recreate-with-replication-2 s1-initialize s1-begin s1-copy s2-delete s1-commit s1-select-count create_distributed_table @@ -594,10 +489,10 @@ create_distributed_table (1 row) step s1-recreate-with-replication-2: - DROP TABLE hash_copy; - SET citus.shard_replication_factor TO 2; - CREATE TABLE hash_copy(id integer, data text, int_data int); - SELECT create_distributed_table('hash_copy', 'id'); + DROP TABLE hash_copy; + SET citus.shard_replication_factor TO 2; + CREATE TABLE hash_copy(id integer, data text, int_data int); + SELECT create_distributed_table('hash_copy', 'id'); create_distributed_table --------------------------------------------------------------------- @@ -616,11 +511,6 @@ count 9 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-recreate-with-replication-2 s1-initialize s1-begin s1-copy s2-insert-select s1-commit s1-select-count create_distributed_table @@ -629,10 +519,10 @@ create_distributed_table (1 row) step s1-recreate-with-replication-2: - DROP TABLE hash_copy; - SET citus.shard_replication_factor TO 2; - CREATE TABLE hash_copy(id integer, data text, int_data int); - SELECT create_distributed_table('hash_copy', 'id'); + DROP TABLE hash_copy; + SET citus.shard_replication_factor TO 2; + CREATE TABLE hash_copy(id integer, data text, int_data int); + SELECT create_distributed_table('hash_copy', 'id'); create_distributed_table --------------------------------------------------------------------- @@ -651,11 +541,6 @@ count 20 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-recreate-with-replication-2 s1-initialize s1-begin s1-copy s2-master-modify-multiple-shards s1-commit s1-select-count create_distributed_table @@ -664,10 +549,10 @@ create_distributed_table (1 row) step s1-recreate-with-replication-2: - DROP TABLE hash_copy; - SET citus.shard_replication_factor TO 2; - CREATE TABLE hash_copy(id integer, data text, int_data int); - SELECT create_distributed_table('hash_copy', 'id'); + DROP TABLE hash_copy; + SET citus.shard_replication_factor TO 2; + CREATE TABLE hash_copy(id integer, data text, int_data int); + SELECT create_distributed_table('hash_copy', 'id'); create_distributed_table --------------------------------------------------------------------- @@ -686,11 +571,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-router-select s2-copy s1-commit s1-select-count create_distributed_table @@ -714,11 +594,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-real-time-select s2-copy s1-commit s1-select-count create_distributed_table @@ -746,11 +621,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-adaptive-select s2-copy s1-commit s1-select-count create_distributed_table @@ -761,8 +631,8 @@ create_distributed_table step s1-initialize: COPY hash_copy FROM PROGRAM 'echo 0, a, 0 && echo 1, b, 1 && echo 2, c, 2 && echo 3, d, 3 && echo 4, e, 4' WITH CSV; step s1-begin: BEGIN; step s1-adaptive-select: - SET citus.enable_repartition_joins TO ON; - SELECT * FROM hash_copy AS t1 JOIN hash_copy AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4; + SET citus.enable_repartition_joins TO ON; + SELECT * FROM hash_copy AS t1 JOIN hash_copy AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4; id|data|int_data|id|data|int_data --------------------------------------------------------------------- @@ -781,11 +651,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-insert s2-copy s1-commit s1-select-count create_distributed_table @@ -804,11 +669,6 @@ count 11 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-insert-select s2-copy s1-commit s1-select-count create_distributed_table @@ -827,11 +687,6 @@ count 15 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-update s2-copy s1-commit s1-select-count create_distributed_table @@ -850,11 +705,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-delete s2-copy s1-commit s1-select-count create_distributed_table @@ -873,11 +723,6 @@ count 9 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-truncate s2-copy s1-commit s1-select-count create_distributed_table @@ -897,11 +742,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-drop s2-copy s1-commit s1-select-count create_distributed_table @@ -918,11 +758,6 @@ step s2-copy: <... completed> ERROR: relation "hash_copy" does not exist step s1-select-count: SELECT COUNT(*) FROM hash_copy; ERROR: relation "hash_copy" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-ddl-create-index s2-copy s1-commit s1-select-count s1-show-indexes create_distributed_table @@ -949,11 +784,6 @@ run_command_on_workers (localhost,57638,t,2) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-create-index s1-begin s1-ddl-drop-index s2-copy s1-commit s1-select-count s1-show-indexes create_distributed_table @@ -981,11 +811,6 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-ddl-add-column s2-copy s1-commit s1-select-count s1-show-columns create_distributed_table @@ -1013,11 +838,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-add-column s1-begin s1-ddl-drop-column s2-copy s1-commit s1-select-count s1-show-columns create_distributed_table @@ -1045,11 +865,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-ddl-rename-column s2-copy s1-commit s1-select-count s1-show-columns create_distributed_table @@ -1076,11 +891,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-table-size s2-copy s1-commit s1-select-count create_distributed_table @@ -1104,11 +914,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-master-modify-multiple-shards s2-copy s1-commit s1-select-count create_distributed_table @@ -1127,11 +932,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-master-drop-all-shards s2-copy s1-commit s1-select-count create_distributed_table @@ -1157,11 +957,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-drop s1-create-non-distributed-table s1-initialize s1-begin s1-distribute-table s2-copy s1-commit s1-select-count create_distributed_table @@ -1188,8 +983,3 @@ count 15 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_insert_select_conflict.out b/src/test/regress/expected/isolation_insert_select_conflict.out index 2a375574a..9c5411727 100644 --- a/src/test/regress/expected/isolation_insert_select_conflict.out +++ b/src/test/regress/expected/isolation_insert_select_conflict.out @@ -7,21 +7,21 @@ create_distributed_table (1 row) step s1-begin: - SET citus.shard_replication_factor to 1; - BEGIN; + SET citus.shard_replication_factor to 1; + BEGIN; step s1-insert-into-select-conflict-update: - INSERT INTO target_table - SELECT - col_1, col_2 - FROM ( - SELECT - col_1, col_2, col_3 - FROM - source_table - LIMIT 5 - ) as foo - ON CONFLICT(col_1) DO UPDATE SET col_2 = EXCLUDED.col_2 RETURNING *; + INSERT INTO target_table + SELECT + col_1, col_2 + FROM ( + SELECT + col_1, col_2, col_3 + FROM + source_table + LIMIT 5 + ) as foo + ON CONFLICT(col_1) DO UPDATE SET col_2 = EXCLUDED.col_2 RETURNING *; col_1|col_2 --------------------------------------------------------------------- @@ -33,22 +33,17 @@ col_1|col_2 (5 rows) step s2-begin: - BEGIN; + BEGIN; step s2-update: - UPDATE target_table SET col_2 = 5; + UPDATE target_table SET col_2 = 5; step s1-commit: - COMMIT; + COMMIT; step s2-update: <... completed> step s2-commit: - COMMIT; - -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) + COMMIT; starting permutation: s1-begin s1-insert-into-select-conflict-do-nothing s2-begin s2-delete s1-commit s2-commit @@ -58,39 +53,34 @@ create_distributed_table (1 row) step s1-begin: - SET citus.shard_replication_factor to 1; - BEGIN; + SET citus.shard_replication_factor to 1; + BEGIN; step s1-insert-into-select-conflict-do-nothing: - INSERT INTO target_table - SELECT - col_1, col_2 - FROM ( - SELECT - col_1, col_2, col_3 - FROM - source_table - LIMIT 5 - ) as foo - ON CONFLICT DO NOTHING; + INSERT INTO target_table + SELECT + col_1, col_2 + FROM ( + SELECT + col_1, col_2, col_3 + FROM + source_table + LIMIT 5 + ) as foo + ON CONFLICT DO NOTHING; step s2-begin: - BEGIN; + BEGIN; step s2-delete: - DELETE FROM target_table; + DELETE FROM target_table; step s1-commit: - COMMIT; + COMMIT; step s2-delete: <... completed> step s2-commit: - COMMIT; - -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) + COMMIT; starting permutation: s1-begin s1-insert-into-select-conflict-do-nothing s2-begin s2-insert-into-select-conflict-update s1-commit s2-commit @@ -100,40 +90,40 @@ create_distributed_table (1 row) step s1-begin: - SET citus.shard_replication_factor to 1; - BEGIN; + SET citus.shard_replication_factor to 1; + BEGIN; step s1-insert-into-select-conflict-do-nothing: - INSERT INTO target_table - SELECT - col_1, col_2 - FROM ( - SELECT - col_1, col_2, col_3 - FROM - source_table - LIMIT 5 - ) as foo - ON CONFLICT DO NOTHING; + INSERT INTO target_table + SELECT + col_1, col_2 + FROM ( + SELECT + col_1, col_2, col_3 + FROM + source_table + LIMIT 5 + ) as foo + ON CONFLICT DO NOTHING; step s2-begin: - BEGIN; + BEGIN; step s2-insert-into-select-conflict-update: - INSERT INTO target_table - SELECT - col_1, col_2 - FROM ( - SELECT - col_1, col_2, col_3 - FROM - source_table - LIMIT 5 - ) as foo - ON CONFLICT(col_1) DO UPDATE SET col_2 = EXCLUDED.col_2 RETURNING *; + INSERT INTO target_table + SELECT + col_1, col_2 + FROM ( + SELECT + col_1, col_2, col_3 + FROM + source_table + LIMIT 5 + ) as foo + ON CONFLICT(col_1) DO UPDATE SET col_2 = EXCLUDED.col_2 RETURNING *; step s1-commit: - COMMIT; + COMMIT; step s2-insert-into-select-conflict-update: <... completed> col_1|col_2 @@ -146,12 +136,7 @@ col_1|col_2 (5 rows) step s2-commit: - COMMIT; - -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) + COMMIT; starting permutation: s1-begin s1-insert-into-select-conflict-update s2-begin s2-insert-into-select-conflict-update s1-commit s2-commit @@ -161,21 +146,21 @@ create_distributed_table (1 row) step s1-begin: - SET citus.shard_replication_factor to 1; - BEGIN; + SET citus.shard_replication_factor to 1; + BEGIN; step s1-insert-into-select-conflict-update: - INSERT INTO target_table - SELECT - col_1, col_2 - FROM ( - SELECT - col_1, col_2, col_3 - FROM - source_table - LIMIT 5 - ) as foo - ON CONFLICT(col_1) DO UPDATE SET col_2 = EXCLUDED.col_2 RETURNING *; + INSERT INTO target_table + SELECT + col_1, col_2 + FROM ( + SELECT + col_1, col_2, col_3 + FROM + source_table + LIMIT 5 + ) as foo + ON CONFLICT(col_1) DO UPDATE SET col_2 = EXCLUDED.col_2 RETURNING *; col_1|col_2 --------------------------------------------------------------------- @@ -187,23 +172,23 @@ col_1|col_2 (5 rows) step s2-begin: - BEGIN; + BEGIN; step s2-insert-into-select-conflict-update: - INSERT INTO target_table - SELECT - col_1, col_2 - FROM ( - SELECT - col_1, col_2, col_3 - FROM - source_table - LIMIT 5 - ) as foo - ON CONFLICT(col_1) DO UPDATE SET col_2 = EXCLUDED.col_2 RETURNING *; + INSERT INTO target_table + SELECT + col_1, col_2 + FROM ( + SELECT + col_1, col_2, col_3 + FROM + source_table + LIMIT 5 + ) as foo + ON CONFLICT(col_1) DO UPDATE SET col_2 = EXCLUDED.col_2 RETURNING *; step s1-commit: - COMMIT; + COMMIT; step s2-insert-into-select-conflict-update: <... completed> col_1|col_2 @@ -216,12 +201,7 @@ col_1|col_2 (5 rows) step s2-commit: - COMMIT; - -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) + COMMIT; starting permutation: s1-begin s1-insert-into-select-conflict-update s2-begin s2-insert-into-select-conflict-do-nothing s1-commit s2-commit @@ -231,21 +211,21 @@ create_distributed_table (1 row) step s1-begin: - SET citus.shard_replication_factor to 1; - BEGIN; + SET citus.shard_replication_factor to 1; + BEGIN; step s1-insert-into-select-conflict-update: - INSERT INTO target_table - SELECT - col_1, col_2 - FROM ( - SELECT - col_1, col_2, col_3 - FROM - source_table - LIMIT 5 - ) as foo - ON CONFLICT(col_1) DO UPDATE SET col_2 = EXCLUDED.col_2 RETURNING *; + INSERT INTO target_table + SELECT + col_1, col_2 + FROM ( + SELECT + col_1, col_2, col_3 + FROM + source_table + LIMIT 5 + ) as foo + ON CONFLICT(col_1) DO UPDATE SET col_2 = EXCLUDED.col_2 RETURNING *; col_1|col_2 --------------------------------------------------------------------- @@ -257,32 +237,27 @@ col_1|col_2 (5 rows) step s2-begin: - BEGIN; + BEGIN; step s2-insert-into-select-conflict-do-nothing: - INSERT INTO target_table - SELECT - col_1, col_2 - FROM ( - SELECT - col_1, col_2, col_3 - FROM - source_table - LIMIT 5 - ) as foo - ON CONFLICT DO NOTHING; + INSERT INTO target_table + SELECT + col_1, col_2 + FROM ( + SELECT + col_1, col_2, col_3 + FROM + source_table + LIMIT 5 + ) as foo + ON CONFLICT DO NOTHING; step s1-commit: - COMMIT; + COMMIT; step s2-insert-into-select-conflict-do-nothing: <... completed> step s2-commit: - COMMIT; - -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) + COMMIT; starting permutation: s1-begin-replication-factor-2 s1-insert-into-select-conflict-update-replication-factor-2 s2-begin-replication-factor-2 s2-insert-into-select-conflict-update-replication-factor-2 s1-commit s2-commit @@ -292,21 +267,21 @@ create_distributed_table (1 row) step s1-begin-replication-factor-2: - SET citus.shard_replication_factor to 2; - BEGIN; + SET citus.shard_replication_factor to 2; + BEGIN; step s1-insert-into-select-conflict-update-replication-factor-2: - INSERT INTO target_table_2 - SELECT - col_1, col_2 - FROM ( - SELECT - col_1, col_2, col_3 - FROM - source_table - LIMIT 5 - ) as foo - ON CONFLICT(col_1) DO UPDATE SET col_2 = EXCLUDED.col_2 RETURNING *; + INSERT INTO target_table_2 + SELECT + col_1, col_2 + FROM ( + SELECT + col_1, col_2, col_3 + FROM + source_table + LIMIT 5 + ) as foo + ON CONFLICT(col_1) DO UPDATE SET col_2 = EXCLUDED.col_2 RETURNING *; col_1|col_2|col_3 --------------------------------------------------------------------- @@ -318,24 +293,24 @@ col_1|col_2|col_3 (5 rows) step s2-begin-replication-factor-2: - SET citus.shard_replication_factor to 2; - BEGIN; + SET citus.shard_replication_factor to 2; + BEGIN; step s2-insert-into-select-conflict-update-replication-factor-2: - INSERT INTO target_table_2 - SELECT - col_1, col_2 - FROM ( - SELECT - col_1, col_2, col_3 - FROM - source_table - LIMIT 5 - ) as foo - ON CONFLICT(col_1) DO UPDATE SET col_2 = EXCLUDED.col_2 RETURNING *; + INSERT INTO target_table_2 + SELECT + col_1, col_2 + FROM ( + SELECT + col_1, col_2, col_3 + FROM + source_table + LIMIT 5 + ) as foo + ON CONFLICT(col_1) DO UPDATE SET col_2 = EXCLUDED.col_2 RETURNING *; step s1-commit: - COMMIT; + COMMIT; step s2-insert-into-select-conflict-update-replication-factor-2: <... completed> col_1|col_2|col_3 @@ -348,10 +323,5 @@ col_1|col_2|col_3 (5 rows) step s2-commit: - COMMIT; - -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) + COMMIT; diff --git a/src/test/regress/expected/isolation_insert_select_vs_all_on_mx.out b/src/test/regress/expected/isolation_insert_select_vs_all_on_mx.out index 91a487c8a..82e202aee 100644 --- a/src/test/regress/expected/isolation_insert_select_vs_all_on_mx.out +++ b/src/test/regress/expected/isolation_insert_select_vs_all_on_mx.out @@ -89,11 +89,6 @@ count 15 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert-select-via-coordinator s2-start-session-level-connection s2-begin-on-worker s2-colocated-insert-select s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-select-count step s1-start-session-level-connection: @@ -184,11 +179,6 @@ count 15 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-colocated-insert-select s2-start-session-level-connection s2-begin-on-worker s2-insert-select-via-coordinator s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-select-count step s1-start-session-level-connection: @@ -279,11 +269,6 @@ count 15 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert-select-via-coordinator s2-start-session-level-connection s2-begin-on-worker s2-insert-select-via-coordinator s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-select-count step s1-start-session-level-connection: @@ -374,11 +359,6 @@ count 15 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert-select-via-coordinator s2-start-session-level-connection s2-begin-on-worker s2-insert s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-select-count step s1-start-session-level-connection: @@ -469,11 +449,6 @@ count 12 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert-select-via-coordinator s2-start-session-level-connection s2-begin-on-worker s2-select s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-select-count step s1-start-session-level-connection: @@ -564,11 +539,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-colocated-insert-select s2-start-session-level-connection s2-begin-on-worker s2-update s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-select-count step s1-start-session-level-connection: @@ -659,11 +629,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert-select-via-coordinator s2-start-session-level-connection s2-begin-on-worker s2-update s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-select-count step s1-start-session-level-connection: @@ -754,11 +719,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-colocated-insert-select s2-start-session-level-connection s2-begin-on-worker s2-copy s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-select-count step s1-start-session-level-connection: @@ -849,11 +809,6 @@ count 13 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert-select-via-coordinator s2-start-session-level-connection s2-begin-on-worker s2-copy s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-select-count step s1-start-session-level-connection: @@ -944,11 +899,6 @@ count 13 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-colocated-insert-select s2-begin s2-coordinator-drop s1-commit-worker s2-commit s1-stop-connection s2-stop-connection s3-select-count step s1-start-session-level-connection: @@ -1013,11 +963,6 @@ step s3-select-count: SELECT COUNT(*) FROM dist_table; ERROR: relation "dist_table" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert-select-via-coordinator s2-begin s2-coordinator-drop s1-commit-worker s2-commit s1-stop-connection s2-stop-connection s3-select-count step s1-start-session-level-connection: @@ -1082,11 +1027,6 @@ step s3-select-count: SELECT COUNT(*) FROM dist_table; ERROR: relation "dist_table" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-colocated-insert-select s2-start-session-level-connection s2-begin-on-worker s2-select-for-update s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-select-count step s1-start-session-level-connection: @@ -1177,11 +1117,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert-select-via-coordinator s2-start-session-level-connection s2-begin-on-worker s2-select-for-update s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-select-count step s1-start-session-level-connection: @@ -1272,8 +1207,3 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_insert_vs_all_on_mx.out b/src/test/regress/expected/isolation_insert_vs_all_on_mx.out index 8f4bb9cbb..cba634e63 100644 --- a/src/test/regress/expected/isolation_insert_vs_all_on_mx.out +++ b/src/test/regress/expected/isolation_insert_vs_all_on_mx.out @@ -89,11 +89,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert-multi-row s2-start-session-level-connection s2-begin-on-worker s2-insert s1-commit-worker s2-commit-worker s3-select-count s1-stop-connection s2-stop-connection step s1-start-session-level-connection: @@ -184,11 +179,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert s2-start-session-level-connection s2-begin-on-worker s2-insert-multi-row s1-commit-worker s2-commit-worker s3-select-count s1-stop-connection s2-stop-connection step s1-start-session-level-connection: @@ -279,11 +269,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert-multi-row s2-start-session-level-connection s2-begin-on-worker s2-insert-multi-row s1-commit-worker s2-commit-worker s3-select-count s1-stop-connection s2-stop-connection step s1-start-session-level-connection: @@ -374,11 +359,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert s2-start-session-level-connection s2-begin-on-worker s2-select s1-commit-worker s2-commit-worker s3-select-count s1-stop-connection s2-stop-connection step s1-start-session-level-connection: @@ -469,11 +449,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert s2-start-session-level-connection s2-begin-on-worker s2-insert-select s1-commit-worker s2-commit-worker s3-select-count s1-stop-connection s2-stop-connection step s1-start-session-level-connection: @@ -564,11 +539,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert s2-start-session-level-connection s2-begin-on-worker s2-update s1-commit-worker s2-commit-worker s3-select-count s1-stop-connection s2-stop-connection step s1-start-session-level-connection: @@ -659,11 +629,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert-multi-row s2-start-session-level-connection s2-begin-on-worker s2-update-multi-row s1-commit-worker s2-commit-worker s3-select-count s1-stop-connection s2-stop-connection step s1-start-session-level-connection: @@ -754,11 +719,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert s2-start-session-level-connection s2-begin-on-worker s2-copy s1-commit-worker s2-commit-worker s3-select-count s1-stop-connection s2-stop-connection step s1-start-session-level-connection: @@ -849,11 +809,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert s2-start-session-level-connection s2-begin-on-worker s2-truncate s1-commit-worker s2-commit-worker s3-select-count s1-stop-connection s2-stop-connection step s1-start-session-level-connection: @@ -945,11 +900,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert s2-start-session-level-connection s2-begin-on-worker s2-select-for-update s1-commit-worker s2-commit-worker s3-select-count s1-stop-connection s2-stop-connection step s1-start-session-level-connection: @@ -1040,8 +990,3 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_logical_replication_multi_shard_commands_on_mx.out b/src/test/regress/expected/isolation_logical_replication_multi_shard_commands_on_mx.out index a5eb30520..1189b0c40 100644 --- a/src/test/regress/expected/isolation_logical_replication_multi_shard_commands_on_mx.out +++ b/src/test/regress/expected/isolation_logical_replication_multi_shard_commands_on_mx.out @@ -89,11 +89,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-insert s3-acquire-advisory-lock s1-begin s1-move-placement s2-start-session-level-connection s2-begin-on-worker s2-update s2-commit-worker s3-release-advisory-lock s1-commit s1-select s1-get-shard-distribution s2-stop-connection step s1-insert: @@ -187,11 +182,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-insert s3-acquire-advisory-lock s1-begin s1-move-placement s2-start-session-level-connection s2-begin-on-worker s2-delete s2-commit-worker s3-release-advisory-lock s1-commit s1-select s1-get-shard-distribution s2-stop-connection step s1-insert: @@ -283,11 +273,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-insert s3-acquire-advisory-lock s1-begin s1-move-placement s2-start-session-level-connection s2-begin-on-worker s2-select s2-commit-worker s3-release-advisory-lock s1-commit s1-get-shard-distribution s2-stop-connection step s1-insert: @@ -372,11 +357,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s2-start-session-level-connection s2-begin-on-worker s2-insert s1-move-placement s2-commit-worker s1-commit s1-select s1-get-shard-distribution s2-stop-connection step s1-begin: @@ -451,11 +431,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-insert s1-begin s2-start-session-level-connection s2-begin-on-worker s2-update s1-move-placement s2-commit-worker s1-commit s1-select s1-get-shard-distribution s2-stop-connection step s1-insert: @@ -533,11 +508,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-insert s1-begin s2-start-session-level-connection s2-begin-on-worker s2-delete s1-move-placement s2-commit-worker s1-commit s1-select s1-get-shard-distribution s2-stop-connection step s1-insert: @@ -613,11 +583,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-insert s1-begin s2-start-session-level-connection s2-begin-on-worker s2-select s1-move-placement s2-commit-worker s1-commit s1-get-shard-distribution s2-stop-connection step s1-insert: @@ -685,8 +650,3 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_logical_replication_single_shard_commands_on_mx.out b/src/test/regress/expected/isolation_logical_replication_single_shard_commands_on_mx.out index 43ee52eeb..9e55d42ca 100644 --- a/src/test/regress/expected/isolation_logical_replication_single_shard_commands_on_mx.out +++ b/src/test/regress/expected/isolation_logical_replication_single_shard_commands_on_mx.out @@ -88,11 +88,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-insert s3-acquire-advisory-lock s1-begin s1-move-placement s2-start-session-level-connection s2-begin-on-worker s2-update s2-commit-worker s3-release-advisory-lock s1-commit s1-select s1-get-shard-distribution s2-stop-connection step s1-insert: @@ -185,11 +180,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-insert s3-acquire-advisory-lock s1-begin s1-move-placement s2-start-session-level-connection s2-begin-on-worker s2-delete s2-commit-worker s3-release-advisory-lock s1-commit s1-select s1-get-shard-distribution s2-stop-connection step s1-insert: @@ -281,11 +271,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-insert s3-acquire-advisory-lock s1-begin s1-move-placement s2-start-session-level-connection s2-begin-on-worker s2-select s2-commit-worker s3-release-advisory-lock s1-commit s1-get-shard-distribution s2-stop-connection step s1-insert: @@ -370,11 +355,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-insert s3-acquire-advisory-lock s1-begin s1-move-placement s2-start-session-level-connection s2-begin-on-worker s2-select-for-update s2-commit-worker s3-release-advisory-lock s1-commit s1-get-shard-distribution s2-stop-connection step s1-insert: @@ -459,11 +439,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s2-start-session-level-connection s2-begin-on-worker s2-insert s1-move-placement s2-commit-worker s1-commit s1-select s1-get-shard-distribution s2-stop-connection step s1-begin: @@ -537,11 +512,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-insert s1-begin s2-start-session-level-connection s2-begin-on-worker s2-update s1-move-placement s2-commit-worker s1-commit s1-select s1-get-shard-distribution s2-stop-connection step s1-insert: @@ -618,11 +588,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-insert s1-begin s2-start-session-level-connection s2-begin-on-worker s2-delete s1-move-placement s2-commit-worker s1-commit s1-select s1-get-shard-distribution s2-stop-connection step s1-insert: @@ -698,11 +663,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-insert s1-begin s2-start-session-level-connection s2-begin-on-worker s2-select s1-move-placement s2-commit-worker s1-commit s1-get-shard-distribution s2-stop-connection step s1-insert: @@ -770,11 +730,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-insert s1-begin s2-start-session-level-connection s2-begin-on-worker s2-select-for-update s1-move-placement s2-commit-worker s1-commit s1-get-shard-distribution s2-stop-connection step s1-insert: @@ -843,8 +798,3 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_metadata_sync_deadlock.out b/src/test/regress/expected/isolation_metadata_sync_deadlock.out index 2ee9a986a..42951eee5 100644 --- a/src/test/regress/expected/isolation_metadata_sync_deadlock.out +++ b/src/test/regress/expected/isolation_metadata_sync_deadlock.out @@ -117,8 +117,3 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_modify_with_subquery_vs_dml.out b/src/test/regress/expected/isolation_modify_with_subquery_vs_dml.out index 5e6f9fdba..15328aab6 100644 --- a/src/test/regress/expected/isolation_modify_with_subquery_vs_dml.out +++ b/src/test/regress/expected/isolation_modify_with_subquery_vs_dml.out @@ -5,7 +5,7 @@ step s1-begin: BEGIN; step s2-begin: - BEGIN; + BEGIN; step s2-modify_with_subquery_v1: UPDATE users_test_table SET value_2 = 5 FROM events_test_table WHERE users_test_table.user_id = events_test_table.user_id; @@ -14,76 +14,61 @@ step s1-insert_to_events_test_table: INSERT INTO events_test_table VALUES(4,6,8,10); step s2-commit: - COMMIT; + COMMIT; step s1-insert_to_events_test_table: <... completed> step s1-commit: COMMIT; -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s2-begin s2-modify_with_subquery_v1 s1-update_events_test_table s2-commit s1-commit step s1-begin: BEGIN; step s2-begin: - BEGIN; + BEGIN; step s2-modify_with_subquery_v1: UPDATE users_test_table SET value_2 = 5 FROM events_test_table WHERE users_test_table.user_id = events_test_table.user_id; step s1-update_events_test_table: - UPDATE users_test_table SET value_1 = 3; + UPDATE users_test_table SET value_1 = 3; step s2-commit: - COMMIT; + COMMIT; step s1-update_events_test_table: <... completed> step s1-commit: COMMIT; -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s2-begin s2-modify_with_subquery_v1 s1-delete_events_test_table s2-commit s1-commit step s1-begin: BEGIN; step s2-begin: - BEGIN; + BEGIN; step s2-modify_with_subquery_v1: UPDATE users_test_table SET value_2 = 5 FROM events_test_table WHERE users_test_table.user_id = events_test_table.user_id; step s1-delete_events_test_table: - DELETE FROM events_test_table WHERE user_id = 1 or user_id = 3; + DELETE FROM events_test_table WHERE user_id = 1 or user_id = 3; step s2-commit: - COMMIT; + COMMIT; step s1-delete_events_test_table: <... completed> step s1-commit: COMMIT; -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s2-begin s1-insert_to_events_test_table s2-modify_with_subquery_v1 s1-commit s2-commit step s1-begin: BEGIN; step s2-begin: - BEGIN; + BEGIN; step s1-insert_to_events_test_table: INSERT INTO events_test_table VALUES(4,6,8,10); @@ -96,12 +81,7 @@ step s1-commit: step s2-modify_with_subquery_v1: <... completed> step s2-commit: - COMMIT; - -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) + COMMIT; starting permutation: s1-begin s2-begin s1-update_events_test_table s2-modify_with_subquery_v1 s1-commit s2-commit @@ -109,10 +89,10 @@ step s1-begin: BEGIN; step s2-begin: - BEGIN; + BEGIN; step s1-update_events_test_table: - UPDATE users_test_table SET value_1 = 3; + UPDATE users_test_table SET value_1 = 3; step s2-modify_with_subquery_v1: UPDATE users_test_table SET value_2 = 5 FROM events_test_table WHERE users_test_table.user_id = events_test_table.user_id; @@ -122,12 +102,7 @@ step s1-commit: step s2-modify_with_subquery_v1: <... completed> step s2-commit: - COMMIT; - -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) + COMMIT; starting permutation: s1-begin s2-begin s1-delete_events_test_table s2-modify_with_subquery_v1 s1-commit s2-commit @@ -135,10 +110,10 @@ step s1-begin: BEGIN; step s2-begin: - BEGIN; + BEGIN; step s1-delete_events_test_table: - DELETE FROM events_test_table WHERE user_id = 1 or user_id = 3; + DELETE FROM events_test_table WHERE user_id = 1 or user_id = 3; step s2-modify_with_subquery_v1: UPDATE users_test_table SET value_2 = 5 FROM events_test_table WHERE users_test_table.user_id = events_test_table.user_id; @@ -148,10 +123,5 @@ step s1-commit: step s2-modify_with_subquery_v1: <... completed> step s2-commit: - COMMIT; - -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) + COMMIT; diff --git a/src/test/regress/expected/isolation_ref2ref_foreign_keys.out b/src/test/regress/expected/isolation_ref2ref_foreign_keys.out index c45405fdb..6c63be9c1 100644 --- a/src/test/regress/expected/isolation_ref2ref_foreign_keys.out +++ b/src/test/regress/expected/isolation_ref2ref_foreign_keys.out @@ -38,11 +38,6 @@ 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: @@ -76,11 +71,6 @@ 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: @@ -114,11 +104,6 @@ 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: @@ -152,11 +137,6 @@ 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: @@ -196,11 +176,6 @@ 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: @@ -240,11 +215,6 @@ 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: @@ -278,11 +248,6 @@ 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: @@ -316,11 +281,6 @@ 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: @@ -354,11 +314,6 @@ 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: @@ -389,11 +344,6 @@ 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: @@ -426,11 +376,6 @@ 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: @@ -462,11 +407,6 @@ 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: @@ -497,11 +437,6 @@ 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: @@ -533,11 +468,6 @@ 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: @@ -568,11 +498,6 @@ 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: @@ -607,11 +532,6 @@ 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: @@ -643,11 +563,6 @@ 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: @@ -682,11 +597,6 @@ 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: @@ -723,11 +633,6 @@ 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: @@ -764,11 +669,6 @@ 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: @@ -800,11 +700,6 @@ 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: @@ -836,11 +731,6 @@ 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: @@ -877,11 +767,6 @@ 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: @@ -918,11 +803,6 @@ 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: @@ -950,11 +830,6 @@ 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: @@ -982,11 +857,6 @@ 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: @@ -1014,11 +884,6 @@ 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: @@ -1046,11 +911,6 @@ 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: @@ -1078,11 +938,6 @@ 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: @@ -1110,11 +965,6 @@ 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: @@ -1142,11 +992,6 @@ 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: @@ -1174,11 +1019,6 @@ 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: @@ -1206,8 +1046,3 @@ step s2-commit: step s1-commit: COMMIT; -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_ref2ref_foreign_keys_on_mx.out b/src/test/regress/expected/isolation_ref2ref_foreign_keys_on_mx.out index 91482f247..21f2f11c4 100644 --- a/src/test/regress/expected/isolation_ref2ref_foreign_keys_on_mx.out +++ b/src/test/regress/expected/isolation_ref2ref_foreign_keys_on_mx.out @@ -87,11 +87,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s2-start-session-level-connection s2-begin-on-worker s2-delete-table-1 s1-start-session-level-connection s1-view-locks s2-rollback-worker s1-view-locks s1-stop-connection s2-stop-connection step s2-start-session-level-connection: @@ -180,11 +175,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s2-start-session-level-connection s2-begin-on-worker s2-update-table-2 s1-start-session-level-connection s1-view-locks s2-rollback-worker s1-view-locks s1-stop-connection s2-stop-connection step s2-start-session-level-connection: @@ -273,11 +263,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s2-start-session-level-connection s2-begin-on-worker s2-delete-table-2 s1-start-session-level-connection s1-view-locks s2-rollback-worker s1-view-locks s1-stop-connection s2-stop-connection step s2-start-session-level-connection: @@ -366,11 +351,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s2-start-session-level-connection s2-begin-on-worker s2-update-table-3 s1-start-session-level-connection s1-view-locks s2-rollback-worker s1-view-locks s1-stop-connection s2-stop-connection step s2-start-session-level-connection: @@ -459,11 +439,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s2-start-session-level-connection s2-begin-on-worker s2-delete-table-3 s1-start-session-level-connection s1-view-locks s2-rollback-worker s1-view-locks s1-stop-connection s2-stop-connection step s2-start-session-level-connection: @@ -552,11 +527,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s2-start-session-level-connection s2-begin-on-worker s2-insert-table-1 s1-start-session-level-connection s1-view-locks s2-rollback-worker s1-view-locks s1-stop-connection s2-stop-connection step s2-start-session-level-connection: @@ -645,11 +615,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s2-start-session-level-connection s2-begin-on-worker s2-insert-table-2 s1-start-session-level-connection s1-view-locks s2-rollback-worker s1-view-locks s1-stop-connection s2-stop-connection step s2-start-session-level-connection: @@ -738,11 +703,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s2-start-session-level-connection s2-begin-on-worker s2-insert-table-3 s1-start-session-level-connection s1-view-locks s2-rollback-worker s1-view-locks s1-stop-connection s2-stop-connection step s2-start-session-level-connection: @@ -831,8 +791,3 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_ref_select_for_update_vs_all_on_mx.out b/src/test/regress/expected/isolation_ref_select_for_update_vs_all_on_mx.out index 5e4c8d8d8..e5aa05580 100644 --- a/src/test/regress/expected/isolation_ref_select_for_update_vs_all_on_mx.out +++ b/src/test/regress/expected/isolation_ref_select_for_update_vs_all_on_mx.out @@ -87,11 +87,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-select-for-update s2-start-session-level-connection s2-begin-on-worker s2-insert s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-select-count create_reference_table @@ -188,11 +183,6 @@ count 2 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-select-for-update s2-start-session-level-connection s2-begin-on-worker s2-select s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection create_reference_table @@ -280,11 +270,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-select-for-update s2-start-session-level-connection s2-begin-on-worker s2-insert-select-ref-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection create_reference_table @@ -373,11 +358,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-select-for-update s2-start-session-level-connection s2-begin-on-worker s2-copy s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-select-count create_reference_table @@ -474,11 +454,6 @@ count 2 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-select-for-update s2-start-session-level-connection s2-begin-on-worker s2-alter s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection create_reference_table @@ -562,11 +537,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-select-for-update s2-start-session-level-connection s2-begin-on-worker s2-truncate s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection create_reference_table @@ -655,11 +625,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-select-for-update s2-coordinator-create-index-concurrently s1-commit-worker s1-stop-connection create_reference_table @@ -710,8 +675,3 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_ref_update_delete_upsert_vs_all_on_mx.out b/src/test/regress/expected/isolation_ref_update_delete_upsert_vs_all_on_mx.out index 88f4d68cd..f42a41669 100644 --- a/src/test/regress/expected/isolation_ref_update_delete_upsert_vs_all_on_mx.out +++ b/src/test/regress/expected/isolation_ref_update_delete_upsert_vs_all_on_mx.out @@ -97,11 +97,6 @@ count 2 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-delete s2-start-session-level-connection s2-begin-on-worker s2-insert-select-ref-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-select-count create_reference_table @@ -198,11 +193,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-add-primary-key s1-start-session-level-connection s1-begin-on-worker s1-upsert s2-start-session-level-connection s2-begin-on-worker s2-drop s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-select-count create_reference_table @@ -293,11 +283,6 @@ step s3-select-count: SELECT COUNT(*) FROM ref_table; ERROR: relation "ref_table" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-delete s2-start-session-level-connection s2-begin-on-worker s2-truncate s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-select-count create_reference_table @@ -394,8 +379,3 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_reference_copy_vs_all.out b/src/test/regress/expected/isolation_reference_copy_vs_all.out index b7703be8e..1329ac93b 100644 --- a/src/test/regress/expected/isolation_reference_copy_vs_all.out +++ b/src/test/regress/expected/isolation_reference_copy_vs_all.out @@ -17,11 +17,6 @@ count 15 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-router-select s1-commit s1-select-count create_reference_table @@ -45,11 +40,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-real-time-select s1-commit s1-select-count create_reference_table @@ -77,11 +67,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-adaptive-select s1-commit s1-select-count create_reference_table @@ -111,11 +96,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-insert s1-commit s1-select-count create_reference_table @@ -134,11 +114,6 @@ count 11 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-insert-select s1-commit s1-select-count create_reference_table @@ -158,11 +133,6 @@ count 20 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-update s1-commit s1-select-count create_reference_table @@ -182,11 +152,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-delete s1-commit s1-select-count create_reference_table @@ -206,11 +171,6 @@ count 9 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-truncate s1-commit s1-select-count create_reference_table @@ -230,11 +190,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-drop s1-commit s1-select-count create_reference_table @@ -250,11 +205,6 @@ step s1-commit: COMMIT; step s2-drop: <... completed> step s1-select-count: SELECT COUNT(*) FROM reference_copy; ERROR: relation "reference_copy" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-ddl-create-index s1-commit s1-select-count s1-show-indexes create_reference_table @@ -281,11 +231,6 @@ run_command_on_workers (localhost,57638,t,2) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-create-index s1-begin s1-copy s2-ddl-drop-index s1-commit s1-select-count s1-show-indexes create_reference_table @@ -313,11 +258,6 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-flaky-ddl-create-index-concurrently s1-commit s1-select-count s1-show-indexes create_reference_table @@ -343,11 +283,6 @@ run_command_on_workers (localhost,57638,t,2) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-ddl-add-column s1-commit s1-select-count s1-show-columns create_reference_table @@ -374,11 +309,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-add-column s1-begin s1-copy-additional-column s2-ddl-drop-column s1-commit s1-select-count s1-show-columns create_reference_table @@ -406,11 +336,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-ddl-rename-column s1-commit s1-select-count s1-show-columns create_reference_table @@ -437,11 +362,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-table-size s1-commit s1-select-count create_reference_table @@ -465,11 +385,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-copy s2-master-modify-multiple-shards s1-commit s1-select-count create_reference_table @@ -489,11 +404,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-drop s1-create-non-distributed-table s1-initialize s1-begin s1-copy s2-distribute-table s1-commit s1-select-count create_reference_table @@ -520,11 +430,6 @@ count 15 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-router-select s2-copy s1-commit s1-select-count create_reference_table @@ -548,11 +453,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-real-time-select s2-copy s1-commit s1-select-count create_reference_table @@ -580,11 +480,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-adaptive-select s2-copy s1-commit s1-select-count create_reference_table @@ -614,11 +509,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-insert s2-copy s1-commit s1-select-count create_reference_table @@ -637,11 +527,6 @@ count 11 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-insert-select s2-copy s1-commit s1-select-count create_reference_table @@ -661,11 +546,6 @@ count 15 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-update s2-copy s1-commit s1-select-count create_reference_table @@ -685,11 +565,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-delete s2-copy s1-commit s1-select-count create_reference_table @@ -709,11 +584,6 @@ count 9 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-truncate s2-copy s1-commit s1-select-count create_reference_table @@ -733,11 +603,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-drop s2-copy s1-commit s1-select-count create_reference_table @@ -754,11 +619,6 @@ step s2-copy: <... completed> ERROR: relation "reference_copy" does not exist step s1-select-count: SELECT COUNT(*) FROM reference_copy; ERROR: relation "reference_copy" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-ddl-create-index s2-copy s1-commit s1-select-count s1-show-indexes create_reference_table @@ -785,11 +645,6 @@ run_command_on_workers (localhost,57638,t,2) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-create-index s1-begin s1-ddl-drop-index s2-copy s1-commit s1-select-count s1-show-indexes create_reference_table @@ -817,11 +672,6 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-ddl-add-column s2-copy s1-commit s1-select-count s1-show-columns create_reference_table @@ -849,11 +699,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-add-column s1-begin s1-ddl-drop-column s2-copy s1-commit s1-select-count s1-show-columns create_reference_table @@ -881,11 +726,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-ddl-rename-column s2-copy s1-commit s1-select-count s1-show-columns create_reference_table @@ -912,11 +752,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-table-size s2-copy s1-commit s1-select-count create_reference_table @@ -940,11 +775,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-master-modify-multiple-shards s2-copy s1-commit s1-select-count create_reference_table @@ -964,11 +794,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-drop s1-create-non-distributed-table s1-initialize s1-begin s1-distribute-table s2-copy s1-commit s1-select-count create_reference_table @@ -995,8 +820,3 @@ count 15 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_reference_on_mx.out b/src/test/regress/expected/isolation_reference_on_mx.out index 4d7f1a51c..cbb130420 100644 --- a/src/test/regress/expected/isolation_reference_on_mx.out +++ b/src/test/regress/expected/isolation_reference_on_mx.out @@ -82,11 +82,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-delete-from-ref-table s2-start-session-level-connection s2-begin-on-worker s2-update-ref-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: @@ -170,11 +165,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert-into-ref-table s2-start-session-level-connection s2-begin-on-worker s2-update-ref-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: @@ -258,11 +248,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert-into-ref-table s2-start-session-level-connection s2-begin-on-worker s2-insert-into-ref-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: @@ -345,11 +330,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-copy-to-ref-table s2-start-session-level-connection s2-begin-on-worker s2-update-ref-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: @@ -433,11 +413,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-copy-to-ref-table s2-start-session-level-connection s2-begin-on-worker s2-insert-into-ref-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: @@ -520,11 +495,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-copy-to-ref-table s2-start-session-level-connection s2-begin-on-worker s2-copy-to-ref-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: @@ -607,11 +577,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-select-for-update s2-start-session-level-connection s2-begin-on-worker s2-update-ref-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: @@ -695,11 +660,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s2-start-session-level-connection s2-begin-on-worker s2-insert-into-ref-table s1-begin s1-alter-table s2-commit-worker s1-commit s2-stop-connection step s2-start-session-level-connection: @@ -752,11 +712,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s2-start-session-level-connection s2-begin-on-worker s2-select-from-ref-table s1-begin s1-alter-table s2-commit-worker s1-commit s2-stop-connection step s2-start-session-level-connection: @@ -809,8 +764,3 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_replace_wait_function.out b/src/test/regress/expected/isolation_replace_wait_function.out index b36aca587..950200d8b 100644 --- a/src/test/regress/expected/isolation_replace_wait_function.out +++ b/src/test/regress/expected/isolation_replace_wait_function.out @@ -22,8 +22,3 @@ ERROR: duplicate key value violates unique constraint "test_locking_a_key_14000 step s2-commit: COMMIT; -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_replicated_dist_on_mx.out b/src/test/regress/expected/isolation_replicated_dist_on_mx.out index 646783bae..e53bf0ca9 100644 --- a/src/test/regress/expected/isolation_replicated_dist_on_mx.out +++ b/src/test/regress/expected/isolation_replicated_dist_on_mx.out @@ -2,7 +2,7 @@ Parsed test spec with 2 sessions starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-update-1-rep-table s2-start-session-level-connection s2-begin-on-worker s2-update-1-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -10,7 +10,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -18,7 +18,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-update-1-rep-table: - SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12 WHERE user_id = 1'); + SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12 WHERE user_id = 1'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -26,7 +26,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -34,7 +34,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -42,7 +42,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-update-1-rep-table: - SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12 WHERE user_id = 1'); + SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12 WHERE user_id = 1'); step s1-commit-worker: SELECT run_commands_on_session_level_connection_to_node('COMMIT'); @@ -67,7 +67,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -75,22 +75,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-update-1-rep-table s2-start-session-level-connection s2-begin-on-worker s2-update-all-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -98,7 +93,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -106,7 +101,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-update-1-rep-table: - SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12 WHERE user_id = 1'); + SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12 WHERE user_id = 1'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -114,7 +109,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -122,7 +117,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -130,7 +125,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-update-all-rep-table: - SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12'); + SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12'); step s1-commit-worker: SELECT run_commands_on_session_level_connection_to_node('COMMIT'); @@ -155,7 +150,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -163,22 +158,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-update-all-rep-table s2-start-session-level-connection s2-begin-on-worker s2-update-all-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -186,7 +176,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -194,7 +184,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-update-all-rep-table: - SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12'); + SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -202,7 +192,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -210,7 +200,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -218,7 +208,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-update-all-rep-table: - SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12'); + SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12'); step s1-commit-worker: SELECT run_commands_on_session_level_connection_to_node('COMMIT'); @@ -243,7 +233,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -251,22 +241,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-update-all-rep-table s2-start-session-level-connection s2-begin-on-worker s2-update-1-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -274,7 +259,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -282,7 +267,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-update-all-rep-table: - SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12'); + SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -290,7 +275,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -298,7 +283,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -306,7 +291,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-update-1-rep-table: - SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12 WHERE user_id = 1'); + SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12 WHERE user_id = 1'); step s1-commit-worker: SELECT run_commands_on_session_level_connection_to_node('COMMIT'); @@ -331,7 +316,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -339,22 +324,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-delete-1-from-rep-table s2-start-session-level-connection s2-begin-on-worker s2-update-1-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -362,7 +342,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -370,7 +350,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-delete-1-from-rep-table: - SELECT run_commands_on_session_level_connection_to_node('DELETE FROM replicated_table WHERE user_id = 1'); + SELECT run_commands_on_session_level_connection_to_node('DELETE FROM replicated_table WHERE user_id = 1'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -378,7 +358,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -386,7 +366,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -394,7 +374,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-update-1-rep-table: - SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12 WHERE user_id = 1'); + SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12 WHERE user_id = 1'); step s1-commit-worker: SELECT run_commands_on_session_level_connection_to_node('COMMIT'); @@ -419,7 +399,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -427,22 +407,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-delete-all-from-rep-table s2-start-session-level-connection s2-begin-on-worker s2-update-1-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -450,7 +425,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -458,7 +433,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-delete-all-from-rep-table: - SELECT run_commands_on_session_level_connection_to_node('DELETE FROM replicated_table'); + SELECT run_commands_on_session_level_connection_to_node('DELETE FROM replicated_table'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -466,7 +441,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -474,7 +449,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -482,7 +457,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-update-1-rep-table: - SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12 WHERE user_id = 1'); + SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12 WHERE user_id = 1'); step s1-commit-worker: SELECT run_commands_on_session_level_connection_to_node('COMMIT'); @@ -507,7 +482,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -515,22 +490,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-delete-1-from-rep-table s2-start-session-level-connection s2-begin-on-worker s2-update-all-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -538,7 +508,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -546,7 +516,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-delete-1-from-rep-table: - SELECT run_commands_on_session_level_connection_to_node('DELETE FROM replicated_table WHERE user_id = 1'); + SELECT run_commands_on_session_level_connection_to_node('DELETE FROM replicated_table WHERE user_id = 1'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -554,7 +524,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -562,7 +532,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -570,7 +540,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-update-all-rep-table: - SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12'); + SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12'); step s1-commit-worker: SELECT run_commands_on_session_level_connection_to_node('COMMIT'); @@ -595,7 +565,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -603,22 +573,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-delete-all-from-rep-table s2-start-session-level-connection s2-begin-on-worker s2-update-1-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -626,7 +591,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -634,7 +599,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-delete-all-from-rep-table: - SELECT run_commands_on_session_level_connection_to_node('DELETE FROM replicated_table'); + SELECT run_commands_on_session_level_connection_to_node('DELETE FROM replicated_table'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -642,7 +607,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -650,7 +615,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -658,7 +623,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-update-1-rep-table: - SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12 WHERE user_id = 1'); + SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12 WHERE user_id = 1'); step s1-commit-worker: SELECT run_commands_on_session_level_connection_to_node('COMMIT'); @@ -683,7 +648,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -691,22 +656,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert-into-1-rep-table s2-start-session-level-connection s2-begin-on-worker s2-update-1-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -714,7 +674,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -722,7 +682,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-insert-into-1-rep-table: - SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(1,81)'); + SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(1,81)'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -730,7 +690,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -738,7 +698,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -746,7 +706,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-update-1-rep-table: - SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12 WHERE user_id = 1'); + SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12 WHERE user_id = 1'); step s1-commit-worker: SELECT run_commands_on_session_level_connection_to_node('COMMIT'); @@ -771,7 +731,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -779,22 +739,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert-into-1-rep-table s2-start-session-level-connection s2-begin-on-worker s2-update-all-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -802,7 +757,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -810,7 +765,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-insert-into-1-rep-table: - SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(1,81)'); + SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(1,81)'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -818,7 +773,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -826,7 +781,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -834,7 +789,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-update-all-rep-table: - SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12'); + SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12'); step s1-commit-worker: SELECT run_commands_on_session_level_connection_to_node('COMMIT'); @@ -859,7 +814,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -867,22 +822,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert-into-all-rep-table s2-start-session-level-connection s2-begin-on-worker s2-update-1-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -890,7 +840,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -898,7 +848,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-insert-into-all-rep-table: - SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(8,81),(9,91),(10,91),(11,91),(12,91), (13,91), (14,91), (15,91), (16,91), (17,91), (18,91), (19,91), (20,91)'); + SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(8,81),(9,91),(10,91),(11,91),(12,91), (13,91), (14,91), (15,91), (16,91), (17,91), (18,91), (19,91), (20,91)'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -906,7 +856,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -914,7 +864,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -922,7 +872,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-update-1-rep-table: - SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12 WHERE user_id = 1'); + SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12 WHERE user_id = 1'); step s1-commit-worker: SELECT run_commands_on_session_level_connection_to_node('COMMIT'); @@ -947,7 +897,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -955,22 +905,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert-into-all-rep-table s2-start-session-level-connection s2-begin-on-worker s2-update-all-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -978,7 +923,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -986,7 +931,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-insert-into-all-rep-table: - SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(8,81),(9,91),(10,91),(11,91),(12,91), (13,91), (14,91), (15,91), (16,91), (17,91), (18,91), (19,91), (20,91)'); + SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(8,81),(9,91),(10,91),(11,91),(12,91), (13,91), (14,91), (15,91), (16,91), (17,91), (18,91), (19,91), (20,91)'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -994,7 +939,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -1002,7 +947,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1010,7 +955,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-update-all-rep-table: - SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12'); + SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12'); step s1-commit-worker: SELECT run_commands_on_session_level_connection_to_node('COMMIT'); @@ -1035,7 +980,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -1043,22 +988,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-update-1-rep-table s2-start-session-level-connection s2-begin-on-worker s2-insert-into-1-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -1066,7 +1006,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1074,7 +1014,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-update-1-rep-table: - SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12 WHERE user_id = 1'); + SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12 WHERE user_id = 1'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1082,7 +1022,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -1090,7 +1030,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1098,7 +1038,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-insert-into-1-rep-table: - SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(1,81)'); + SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(1,81)'); step s1-commit-worker: SELECT run_commands_on_session_level_connection_to_node('COMMIT'); @@ -1123,7 +1063,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -1131,22 +1071,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-update-1-rep-table s2-start-session-level-connection s2-begin-on-worker s2-insert-into-all-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -1154,7 +1089,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1162,7 +1097,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-update-1-rep-table: - SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12 WHERE user_id = 1'); + SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12 WHERE user_id = 1'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1170,7 +1105,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -1178,7 +1113,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1186,7 +1121,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-insert-into-all-rep-table: - SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(8,81),(9,91),(10,91),(11,91),(12,91), (13,91), (14,91), (15,91), (16,91), (17,91), (18,91), (19,91), (20,91)'); + SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(8,81),(9,91),(10,91),(11,91),(12,91), (13,91), (14,91), (15,91), (16,91), (17,91), (18,91), (19,91), (20,91)'); step s1-commit-worker: SELECT run_commands_on_session_level_connection_to_node('COMMIT'); @@ -1211,7 +1146,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -1219,22 +1154,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-update-all-rep-table s2-start-session-level-connection s2-begin-on-worker s2-insert-into-1-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -1242,7 +1172,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1250,7 +1180,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-update-all-rep-table: - SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12'); + SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1258,7 +1188,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -1266,7 +1196,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1274,7 +1204,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-insert-into-1-rep-table: - SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(1,81)'); + SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(1,81)'); step s1-commit-worker: SELECT run_commands_on_session_level_connection_to_node('COMMIT'); @@ -1299,7 +1229,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -1307,22 +1237,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-update-all-rep-table s2-start-session-level-connection s2-begin-on-worker s2-insert-into-all-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -1330,7 +1255,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1338,7 +1263,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-update-all-rep-table: - SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12'); + SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1346,7 +1271,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -1354,7 +1279,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1362,7 +1287,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-insert-into-all-rep-table: - SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(8,81),(9,91),(10,91),(11,91),(12,91), (13,91), (14,91), (15,91), (16,91), (17,91), (18,91), (19,91), (20,91)'); + SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(8,81),(9,91),(10,91),(11,91),(12,91), (13,91), (14,91), (15,91), (16,91), (17,91), (18,91), (19,91), (20,91)'); step s1-commit-worker: SELECT run_commands_on_session_level_connection_to_node('COMMIT'); @@ -1387,7 +1312,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -1395,22 +1320,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert-into-1-rep-table s2-start-session-level-connection s2-begin-on-worker s2-insert-into-1-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -1418,7 +1338,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1426,7 +1346,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-insert-into-1-rep-table: - SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(1,81)'); + SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(1,81)'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1434,7 +1354,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -1442,7 +1362,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1450,7 +1370,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-insert-into-1-rep-table: - SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(1,81)'); + SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(1,81)'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1474,7 +1394,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -1482,22 +1402,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert-into-1-rep-table s2-start-session-level-connection s2-begin-on-worker s2-insert-into-all-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -1505,7 +1420,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1513,7 +1428,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-insert-into-1-rep-table: - SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(1,81)'); + SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(1,81)'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1521,7 +1436,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -1529,7 +1444,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1537,7 +1452,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-insert-into-all-rep-table: - SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(8,81),(9,91),(10,91),(11,91),(12,91), (13,91), (14,91), (15,91), (16,91), (17,91), (18,91), (19,91), (20,91)'); + SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(8,81),(9,91),(10,91),(11,91),(12,91), (13,91), (14,91), (15,91), (16,91), (17,91), (18,91), (19,91), (20,91)'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1561,7 +1476,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -1569,22 +1484,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert-into-all-rep-table s2-start-session-level-connection s2-begin-on-worker s2-insert-into-1-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -1592,7 +1502,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1600,7 +1510,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-insert-into-all-rep-table: - SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(8,81),(9,91),(10,91),(11,91),(12,91), (13,91), (14,91), (15,91), (16,91), (17,91), (18,91), (19,91), (20,91)'); + SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(8,81),(9,91),(10,91),(11,91),(12,91), (13,91), (14,91), (15,91), (16,91), (17,91), (18,91), (19,91), (20,91)'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1608,7 +1518,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -1616,7 +1526,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1624,7 +1534,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-insert-into-1-rep-table: - SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(1,81)'); + SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(1,81)'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1648,7 +1558,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -1656,22 +1566,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert-into-all-rep-table s2-start-session-level-connection s2-begin-on-worker s2-insert-into-all-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -1679,7 +1584,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1687,7 +1592,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-insert-into-all-rep-table: - SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(8,81),(9,91),(10,91),(11,91),(12,91), (13,91), (14,91), (15,91), (16,91), (17,91), (18,91), (19,91), (20,91)'); + SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(8,81),(9,91),(10,91),(11,91),(12,91), (13,91), (14,91), (15,91), (16,91), (17,91), (18,91), (19,91), (20,91)'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1695,7 +1600,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -1703,7 +1608,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1711,7 +1616,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-insert-into-all-rep-table: - SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(8,81),(9,91),(10,91),(11,91),(12,91), (13,91), (14,91), (15,91), (16,91), (17,91), (18,91), (19,91), (20,91)'); + SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(8,81),(9,91),(10,91),(11,91),(12,91), (13,91), (14,91), (15,91), (16,91), (17,91), (18,91), (19,91), (20,91)'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1735,7 +1640,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -1743,22 +1648,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-copy-1-to-rep-table s2-start-session-level-connection s2-begin-on-worker s2-update-1-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -1766,7 +1666,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1774,7 +1674,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-copy-1-to-rep-table: - SELECT run_commands_on_session_level_connection_to_node('COPY replicated_table FROM PROGRAM ''echo 1, 101 && echo 1, 111 && echo 1,1111'' WITH CSV'); + SELECT run_commands_on_session_level_connection_to_node('COPY replicated_table FROM PROGRAM ''echo 1, 101 && echo 1, 111 && echo 1,1111'' WITH CSV'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1782,7 +1682,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -1790,7 +1690,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1798,7 +1698,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-update-1-rep-table: - SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12 WHERE user_id = 1'); + SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12 WHERE user_id = 1'); step s1-commit-worker: SELECT run_commands_on_session_level_connection_to_node('COMMIT'); @@ -1823,7 +1723,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -1831,22 +1731,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-copy-1-to-rep-table s2-start-session-level-connection s2-begin-on-worker s2-update-all-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -1854,7 +1749,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1862,7 +1757,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-copy-1-to-rep-table: - SELECT run_commands_on_session_level_connection_to_node('COPY replicated_table FROM PROGRAM ''echo 1, 101 && echo 1, 111 && echo 1,1111'' WITH CSV'); + SELECT run_commands_on_session_level_connection_to_node('COPY replicated_table FROM PROGRAM ''echo 1, 101 && echo 1, 111 && echo 1,1111'' WITH CSV'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1870,7 +1765,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -1878,7 +1773,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1886,7 +1781,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-update-all-rep-table: - SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12'); + SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12'); step s1-commit-worker: SELECT run_commands_on_session_level_connection_to_node('COMMIT'); @@ -1911,7 +1806,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -1919,22 +1814,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-copy-all-to-rep-table s2-start-session-level-connection s2-begin-on-worker s2-update-1-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -1942,7 +1832,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1950,7 +1840,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-copy-all-to-rep-table: - SELECT run_commands_on_session_level_connection_to_node('COPY replicated_table FROM PROGRAM ''echo 10, 101 && echo 11, 111 && echo 11, 111 && echo 12, 111 && echo 13, 111 && echo 14, 111 && echo 15, 111 && echo 16, 111 && echo 17, 111 && echo 18, 111 && echo 19, 111 && echo 20, 111 && echo 21, 111 && echo 22, 111 && echo 23, 111'' WITH CSV'); + SELECT run_commands_on_session_level_connection_to_node('COPY replicated_table FROM PROGRAM ''echo 10, 101 && echo 11, 111 && echo 11, 111 && echo 12, 111 && echo 13, 111 && echo 14, 111 && echo 15, 111 && echo 16, 111 && echo 17, 111 && echo 18, 111 && echo 19, 111 && echo 20, 111 && echo 21, 111 && echo 22, 111 && echo 23, 111'' WITH CSV'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1958,7 +1848,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -1966,7 +1856,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -1974,7 +1864,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-update-1-rep-table: - SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12 WHERE user_id = 1'); + SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12 WHERE user_id = 1'); step s1-commit-worker: SELECT run_commands_on_session_level_connection_to_node('COMMIT'); @@ -1999,7 +1889,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -2007,22 +1897,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-copy-all-to-rep-table s2-start-session-level-connection s2-begin-on-worker s2-update-all-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -2030,7 +1915,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2038,7 +1923,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-copy-all-to-rep-table: - SELECT run_commands_on_session_level_connection_to_node('COPY replicated_table FROM PROGRAM ''echo 10, 101 && echo 11, 111 && echo 11, 111 && echo 12, 111 && echo 13, 111 && echo 14, 111 && echo 15, 111 && echo 16, 111 && echo 17, 111 && echo 18, 111 && echo 19, 111 && echo 20, 111 && echo 21, 111 && echo 22, 111 && echo 23, 111'' WITH CSV'); + SELECT run_commands_on_session_level_connection_to_node('COPY replicated_table FROM PROGRAM ''echo 10, 101 && echo 11, 111 && echo 11, 111 && echo 12, 111 && echo 13, 111 && echo 14, 111 && echo 15, 111 && echo 16, 111 && echo 17, 111 && echo 18, 111 && echo 19, 111 && echo 20, 111 && echo 21, 111 && echo 22, 111 && echo 23, 111'' WITH CSV'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2046,7 +1931,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -2054,7 +1939,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2062,7 +1947,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-update-all-rep-table: - SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12'); + SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12'); step s1-commit-worker: SELECT run_commands_on_session_level_connection_to_node('COMMIT'); @@ -2087,7 +1972,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -2095,22 +1980,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-copy-all-to-rep-table s2-start-session-level-connection s2-begin-on-worker s2-insert-into-all-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -2118,7 +1998,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2126,7 +2006,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-copy-all-to-rep-table: - SELECT run_commands_on_session_level_connection_to_node('COPY replicated_table FROM PROGRAM ''echo 10, 101 && echo 11, 111 && echo 11, 111 && echo 12, 111 && echo 13, 111 && echo 14, 111 && echo 15, 111 && echo 16, 111 && echo 17, 111 && echo 18, 111 && echo 19, 111 && echo 20, 111 && echo 21, 111 && echo 22, 111 && echo 23, 111'' WITH CSV'); + SELECT run_commands_on_session_level_connection_to_node('COPY replicated_table FROM PROGRAM ''echo 10, 101 && echo 11, 111 && echo 11, 111 && echo 12, 111 && echo 13, 111 && echo 14, 111 && echo 15, 111 && echo 16, 111 && echo 17, 111 && echo 18, 111 && echo 19, 111 && echo 20, 111 && echo 21, 111 && echo 22, 111 && echo 23, 111'' WITH CSV'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2134,7 +2014,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -2142,7 +2022,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2150,7 +2030,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-insert-into-all-rep-table: - SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(8,81),(9,91),(10,91),(11,91),(12,91), (13,91), (14,91), (15,91), (16,91), (17,91), (18,91), (19,91), (20,91)'); + SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(8,81),(9,91),(10,91),(11,91),(12,91), (13,91), (14,91), (15,91), (16,91), (17,91), (18,91), (19,91), (20,91)'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2174,7 +2054,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -2182,22 +2062,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-copy-1-to-rep-table s2-start-session-level-connection s2-begin-on-worker s2-insert-into-1-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -2205,7 +2080,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2213,7 +2088,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-copy-1-to-rep-table: - SELECT run_commands_on_session_level_connection_to_node('COPY replicated_table FROM PROGRAM ''echo 1, 101 && echo 1, 111 && echo 1,1111'' WITH CSV'); + SELECT run_commands_on_session_level_connection_to_node('COPY replicated_table FROM PROGRAM ''echo 1, 101 && echo 1, 111 && echo 1,1111'' WITH CSV'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2221,7 +2096,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -2229,7 +2104,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2237,7 +2112,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-insert-into-1-rep-table: - SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(1,81)'); + SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(1,81)'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2261,7 +2136,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -2269,22 +2144,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-copy-all-to-rep-table s2-start-session-level-connection s2-begin-on-worker s2-copy-all-to-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -2292,7 +2162,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2300,7 +2170,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-copy-all-to-rep-table: - SELECT run_commands_on_session_level_connection_to_node('COPY replicated_table FROM PROGRAM ''echo 10, 101 && echo 11, 111 && echo 11, 111 && echo 12, 111 && echo 13, 111 && echo 14, 111 && echo 15, 111 && echo 16, 111 && echo 17, 111 && echo 18, 111 && echo 19, 111 && echo 20, 111 && echo 21, 111 && echo 22, 111 && echo 23, 111'' WITH CSV'); + SELECT run_commands_on_session_level_connection_to_node('COPY replicated_table FROM PROGRAM ''echo 10, 101 && echo 11, 111 && echo 11, 111 && echo 12, 111 && echo 13, 111 && echo 14, 111 && echo 15, 111 && echo 16, 111 && echo 17, 111 && echo 18, 111 && echo 19, 111 && echo 20, 111 && echo 21, 111 && echo 22, 111 && echo 23, 111'' WITH CSV'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2308,7 +2178,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -2316,7 +2186,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2324,7 +2194,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-copy-all-to-rep-table: - SELECT run_commands_on_session_level_connection_to_node('COPY replicated_table FROM PROGRAM ''echo 10, 101 && echo 11, 111 && echo 11, 111 && echo 12, 111 && echo 13, 111 && echo 14, 111 && echo 15, 111 && echo 16, 111 && echo 17, 111 && echo 18, 111 && echo 19, 111 && echo 20, 111 && echo 21, 111 && echo 22, 111 && echo 23, 111'' WITH CSV'); + SELECT run_commands_on_session_level_connection_to_node('COPY replicated_table FROM PROGRAM ''echo 10, 101 && echo 11, 111 && echo 11, 111 && echo 12, 111 && echo 13, 111 && echo 14, 111 && echo 15, 111 && echo 16, 111 && echo 17, 111 && echo 18, 111 && echo 19, 111 && echo 20, 111 && echo 21, 111 && echo 22, 111 && echo 23, 111'' WITH CSV'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2348,7 +2218,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -2356,22 +2226,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-copy-all-to-rep-table s2-start-session-level-connection s2-begin-on-worker s2-select-from-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -2379,7 +2244,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2387,7 +2252,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-copy-all-to-rep-table: - SELECT run_commands_on_session_level_connection_to_node('COPY replicated_table FROM PROGRAM ''echo 10, 101 && echo 11, 111 && echo 11, 111 && echo 12, 111 && echo 13, 111 && echo 14, 111 && echo 15, 111 && echo 16, 111 && echo 17, 111 && echo 18, 111 && echo 19, 111 && echo 20, 111 && echo 21, 111 && echo 22, 111 && echo 23, 111'' WITH CSV'); + SELECT run_commands_on_session_level_connection_to_node('COPY replicated_table FROM PROGRAM ''echo 10, 101 && echo 11, 111 && echo 11, 111 && echo 12, 111 && echo 13, 111 && echo 14, 111 && echo 15, 111 && echo 16, 111 && echo 17, 111 && echo 18, 111 && echo 19, 111 && echo 20, 111 && echo 21, 111 && echo 22, 111 && echo 23, 111'' WITH CSV'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2395,7 +2260,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -2403,7 +2268,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2411,7 +2276,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-select-from-rep-table: - SELECT run_commands_on_session_level_connection_to_node('SELECT count(*) FROM replicated_table'); + SELECT run_commands_on_session_level_connection_to_node('SELECT count(*) FROM replicated_table'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2435,7 +2300,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -2443,22 +2308,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s2-start-session-level-connection s2-begin-on-worker s2-insert-into-1-rep-table s1-begin s1-alter-table s2-commit-worker s1-commit s2-stop-connection step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -2466,7 +2326,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2474,7 +2334,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-insert-into-1-rep-table: - SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(1,81)'); + SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(1,81)'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2482,10 +2342,10 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-begin: - BEGIN; + BEGIN; step s1-alter-table: - ALTER TABLE replicated_table ADD COLUMN x INT; + ALTER TABLE replicated_table ADD COLUMN x INT; step s2-commit-worker: SELECT run_commands_on_session_level_connection_to_node('COMMIT'); @@ -2497,25 +2357,20 @@ run_commands_on_session_level_connection_to_node step s1-alter-table: <... completed> step s1-commit: - COMMIT; + COMMIT; step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s2-start-session-level-connection s2-begin-on-worker s2-select-from-rep-table s1-begin s1-alter-table s2-commit-worker s1-commit s2-stop-connection step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -2523,7 +2378,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2531,7 +2386,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-select-from-rep-table: - SELECT run_commands_on_session_level_connection_to_node('SELECT count(*) FROM replicated_table'); + SELECT run_commands_on_session_level_connection_to_node('SELECT count(*) FROM replicated_table'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2539,10 +2394,10 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-begin: - BEGIN; + BEGIN; step s1-alter-table: - ALTER TABLE replicated_table ADD COLUMN x INT; + ALTER TABLE replicated_table ADD COLUMN x INT; step s2-commit-worker: SELECT run_commands_on_session_level_connection_to_node('COMMIT'); @@ -2554,25 +2409,20 @@ run_commands_on_session_level_connection_to_node step s1-alter-table: <... completed> step s1-commit: - COMMIT; + COMMIT; step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert-into-select s2-start-session-level-connection s2-begin-on-worker s2-insert-into-all-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -2580,7 +2430,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2588,7 +2438,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-insert-into-select: - SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table SELECT * FROM replicated_table_2'); + SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table SELECT * FROM replicated_table_2'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2596,7 +2446,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -2604,7 +2454,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2612,7 +2462,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-insert-into-all-rep-table: - SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(8,81),(9,91),(10,91),(11,91),(12,91), (13,91), (14,91), (15,91), (16,91), (17,91), (18,91), (19,91), (20,91)'); + SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(8,81),(9,91),(10,91),(11,91),(12,91), (13,91), (14,91), (15,91), (16,91), (17,91), (18,91), (19,91), (20,91)'); step s1-commit-worker: SELECT run_commands_on_session_level_connection_to_node('COMMIT'); @@ -2637,7 +2487,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -2645,22 +2495,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert-into-select s2-start-session-level-connection s2-begin-on-worker s2-insert-into-1-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -2668,7 +2513,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2676,7 +2521,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-insert-into-select: - SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table SELECT * FROM replicated_table_2'); + SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table SELECT * FROM replicated_table_2'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2684,7 +2529,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -2692,7 +2537,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2700,7 +2545,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-insert-into-1-rep-table: - SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(1,81)'); + SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table VALUES(1,81)'); step s1-commit-worker: SELECT run_commands_on_session_level_connection_to_node('COMMIT'); @@ -2725,7 +2570,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -2733,22 +2578,17 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert-into-select-from-single-rep s2-start-session-level-connection s2-begin-on-worker s2-update-all-single-rep-table s2-update-all-rep-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57637); + SELECT start_session_level_connection_to_node('localhost', 57637); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -2756,7 +2596,7 @@ start_session_level_connection_to_node (1 row) step s1-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2764,7 +2604,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-insert-into-select-from-single-rep: - SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table SELECT * FROM single_replicated_table LIMIT 10'); + SELECT run_commands_on_session_level_connection_to_node('INSERT INTO replicated_table SELECT * FROM single_replicated_table LIMIT 10'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2772,7 +2612,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-start-session-level-connection: - SELECT start_session_level_connection_to_node('localhost', 57638); + SELECT start_session_level_connection_to_node('localhost', 57638); start_session_level_connection_to_node --------------------------------------------------------------------- @@ -2780,7 +2620,7 @@ start_session_level_connection_to_node (1 row) step s2-begin-on-worker: - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); + SELECT run_commands_on_session_level_connection_to_node('BEGIN'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2788,7 +2628,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-update-all-single-rep-table: - SELECT run_commands_on_session_level_connection_to_node('UPDATE single_replicated_table SET value_1 = 12'); + SELECT run_commands_on_session_level_connection_to_node('UPDATE single_replicated_table SET value_1 = 12'); run_commands_on_session_level_connection_to_node --------------------------------------------------------------------- @@ -2796,7 +2636,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s2-update-all-rep-table: - SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12'); + SELECT run_commands_on_session_level_connection_to_node('UPDATE replicated_table SET value_1 = 12'); step s1-commit-worker: SELECT run_commands_on_session_level_connection_to_node('COMMIT'); @@ -2821,7 +2661,7 @@ run_commands_on_session_level_connection_to_node (1 row) step s1-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- @@ -2829,15 +2669,10 @@ stop_session_level_connection_to_node (1 row) step s2-stop-connection: - SELECT stop_session_level_connection_to_node(); + SELECT stop_session_level_connection_to_node(); stop_session_level_connection_to_node --------------------------------------------------------------------- (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_select_for_update.out b/src/test/regress/expected/isolation_select_for_update.out index a59f7fe03..9965497f2 100644 --- a/src/test/regress/expected/isolation_select_for_update.out +++ b/src/test/regress/expected/isolation_select_for_update.out @@ -29,11 +29,6 @@ step s2-update-t1: <... completed> step s2-commit: COMMIT; -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s1-select-from-t1-t2-for-share s2-begin s2-delete-t1 s1-commit s2-commit step s1-begin: @@ -64,11 +59,6 @@ step s2-delete-t1: <... completed> step s2-commit: COMMIT; -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s1-select-from-t1-rt-for-update s2-begin s2-update-t1 s1-commit s2-commit step s1-begin: @@ -99,11 +89,6 @@ step s2-update-t1: <... completed> step s2-commit: COMMIT; -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s1-select-from-t1-rt-with-lc-for-update s2-begin s2-update-rt s1-commit s2-commit step s1-begin: @@ -135,11 +120,6 @@ step s2-update-rt: <... completed> step s2-commit: COMMIT; -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s1-select-from-t1-rt-with-lc-for-update s2-begin s2-update-t1 s1-commit s2-commit step s1-begin: @@ -170,11 +150,6 @@ step s1-commit: step s2-commit: COMMIT; -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s1-select-from-t1-t2-for-share s2-begin s2-select-from-t1-t2-for-share s1-commit s2-commit step s1-begin: @@ -213,11 +188,6 @@ step s1-commit: step s2-commit: COMMIT; -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s1-select-from-t1-rt-for-update s2-begin s2-select-from-t1-t2-for-update s1-commit s2-commit step s1-begin: @@ -257,11 +227,6 @@ id|val_1|id|val_1 step s2-commit: COMMIT; -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s1-select-from-t1-within-cte s2-begin s2-select-from-t1-t2-for-update s1-commit s2-commit step s1-begin: @@ -298,11 +263,6 @@ id|val_1|id|val_1 step s2-commit: COMMIT; -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s1-select-from-t1-within-cte s2-begin s2-update-t1 s1-commit s2-commit step s1-begin: @@ -330,11 +290,6 @@ step s2-update-t1: <... completed> step s2-commit: COMMIT; -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s1-select-from-t1-with-subquery s2-begin s2-update-t1 s1-commit s2-commit step s1-begin: @@ -365,11 +320,6 @@ step s2-update-t1: <... completed> step s2-commit: COMMIT; -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s1-select-from-rt-with-subquery s2-begin s2-update-rt s1-commit s2-commit step s1-begin: @@ -396,11 +346,6 @@ step s2-update-rt: <... completed> step s2-commit: COMMIT; -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s1-select-from-t1-with-view s2-begin s2-update-t1 s1-commit s2-commit step s1-begin: @@ -427,11 +372,6 @@ step s2-update-t1: <... completed> step s2-commit: COMMIT; -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s1-update-rt-with-cte-select-from-rt s2-begin s2-update-rt s1-commit s2-commit step s1-begin: @@ -454,8 +394,3 @@ step s2-update-rt: <... completed> step s2-commit: COMMIT; -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_select_vs_all.out b/src/test/regress/expected/isolation_select_vs_all.out index 06f8dc332..ba7c00d1e 100644 --- a/src/test/regress/expected/isolation_select_vs_all.out +++ b/src/test/regress/expected/isolation_select_vs_all.out @@ -27,11 +27,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-router-select s2-real-time-select s1-commit s1-select-count master_create_empty_shard @@ -64,11 +59,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-router-select s2-adaptive-select s1-commit s1-select-count master_create_empty_shard @@ -104,11 +94,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-real-time-select s2-router-select s1-commit s1-select-count master_create_empty_shard @@ -141,11 +126,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-real-time-select s2-real-time-select s1-commit s1-select-count master_create_empty_shard @@ -182,11 +162,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-real-time-select s2-adaptive-select s1-commit s1-select-count master_create_empty_shard @@ -226,11 +201,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-adaptive-select s2-router-select s1-commit s1-select-count master_create_empty_shard @@ -266,11 +236,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-adaptive-select s2-real-time-select s1-commit s1-select-count master_create_empty_shard @@ -310,11 +275,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-adaptive-select s2-adaptive-select s1-commit s1-select-count master_create_empty_shard @@ -357,11 +317,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-router-select s2-insert s1-commit s1-select-count master_create_empty_shard @@ -385,11 +340,6 @@ count 6 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-router-select s2-insert-select s1-commit s1-select-count master_create_empty_shard @@ -413,11 +363,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-router-select s2-update s1-commit s1-select-count master_create_empty_shard @@ -441,11 +386,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-router-select s2-delete s1-commit s1-select-count master_create_empty_shard @@ -469,11 +409,6 @@ count 4 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-router-select s2-truncate s1-commit s1-select-count master_create_empty_shard @@ -498,11 +433,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-router-select s2-drop s1-commit s1-select-count master_create_empty_shard @@ -523,11 +453,6 @@ step s1-commit: COMMIT; step s2-drop: <... completed> step s1-select-count: SELECT COUNT(*) FROM select_append; ERROR: relation "select_append" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-router-select s2-ddl-create-index s1-commit s1-select-count s1-show-indexes master_create_empty_shard @@ -558,11 +483,6 @@ run_command_on_workers (localhost,57638,t,1) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-create-index s1-begin s1-router-select s2-ddl-drop-index s1-commit s1-select-count s1-show-indexes master_create_empty_shard @@ -595,11 +515,6 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-disable-binary-protocol s1-router-select s2-ddl-create-index-concurrently s1-commit s1-select-count s1-show-indexes master_create_empty_shard @@ -634,11 +549,6 @@ run_command_on_workers (localhost,57638,t,1) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-router-select s2-ddl-add-column s1-commit s1-select-count s1-show-columns master_create_empty_shard @@ -670,11 +580,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-add-column s1-begin s1-router-select s2-ddl-drop-column s1-commit s1-select-count s1-show-columns master_create_empty_shard @@ -707,11 +612,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-router-select s2-ddl-rename-column s1-commit s1-select-count s1-show-columns master_create_empty_shard @@ -743,11 +643,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-router-select s2-table-size s1-commit s1-select-count master_create_empty_shard @@ -776,11 +671,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-router-select s2-master-modify-multiple-shards s1-commit s1-select-count master_create_empty_shard @@ -804,11 +694,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-master-drop-all-shards s1-commit s1-select-count master_create_empty_shard @@ -831,11 +716,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-drop s1-create-non-distributed-table s1-begin s1-router-select s2-distribute-table s1-commit s1-select-count master_create_empty_shard @@ -864,11 +744,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-insert s2-router-select s1-commit s1-select-count master_create_empty_shard @@ -892,11 +767,6 @@ count 6 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-insert-select s2-router-select s1-commit s1-select-count master_create_empty_shard @@ -920,11 +790,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-update s2-router-select s1-commit s1-select-count master_create_empty_shard @@ -948,11 +813,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-delete s2-router-select s1-commit s1-select-count master_create_empty_shard @@ -976,11 +836,6 @@ count 4 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-truncate s2-router-select s1-commit s1-select-count master_create_empty_shard @@ -1004,11 +859,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-drop s2-router-select s1-commit s1-select-count master_create_empty_shard @@ -1025,11 +875,6 @@ step s2-router-select: <... completed> ERROR: relation "select_append" does not exist step s1-select-count: SELECT COUNT(*) FROM select_append; ERROR: relation "select_append" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-ddl-create-index s2-router-select s1-commit s1-select-count s1-show-indexes master_create_empty_shard @@ -1060,11 +905,6 @@ run_command_on_workers (localhost,57638,t,1) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-create-index s1-begin s1-ddl-drop-index s2-router-select s1-commit s1-select-count s1-show-indexes master_create_empty_shard @@ -1097,11 +937,6 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-ddl-add-column s2-router-select s1-commit s1-select-count s1-show-columns master_create_empty_shard @@ -1133,11 +968,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-add-column s1-begin s1-ddl-drop-column s2-router-select s1-commit s1-select-count s1-show-columns master_create_empty_shard @@ -1170,11 +1000,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-ddl-rename-column s2-router-select s1-commit s1-select-count s1-show-columns master_create_empty_shard @@ -1206,11 +1031,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-table-size s2-router-select s1-commit s1-select-count master_create_empty_shard @@ -1239,11 +1059,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-master-modify-multiple-shards s2-router-select s1-commit s1-select-count master_create_empty_shard @@ -1267,11 +1082,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-master-drop-all-shards s1-commit s1-select-count master_create_empty_shard @@ -1294,11 +1104,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-drop s1-create-non-distributed-table s1-begin s1-distribute-table s2-router-select s1-commit s1-select-count master_create_empty_shard @@ -1327,11 +1132,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-real-time-select s2-insert s1-commit s1-select-count master_create_empty_shard @@ -1359,11 +1159,6 @@ count 6 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-real-time-select s2-insert-select s1-commit s1-select-count master_create_empty_shard @@ -1391,11 +1186,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-real-time-select s2-update s1-commit s1-select-count master_create_empty_shard @@ -1423,11 +1213,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-real-time-select s2-delete s1-commit s1-select-count master_create_empty_shard @@ -1455,11 +1240,6 @@ count 4 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-real-time-select s2-truncate s1-commit s1-select-count master_create_empty_shard @@ -1488,11 +1268,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-real-time-select s2-drop s1-commit s1-select-count master_create_empty_shard @@ -1517,11 +1292,6 @@ step s1-commit: COMMIT; step s2-drop: <... completed> step s1-select-count: SELECT COUNT(*) FROM select_append; ERROR: relation "select_append" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-real-time-select s2-ddl-create-index s1-commit s1-select-count s1-show-indexes master_create_empty_shard @@ -1556,11 +1326,6 @@ run_command_on_workers (localhost,57638,t,1) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-create-index s1-begin s1-real-time-select s2-ddl-drop-index s1-commit s1-select-count s1-show-indexes master_create_empty_shard @@ -1597,11 +1362,6 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-real-time-select s2-ddl-create-index-concurrently s1-commit s1-select-count s1-show-indexes master_create_empty_shard @@ -1636,11 +1396,6 @@ run_command_on_workers (localhost,57638,t,1) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-real-time-select s2-ddl-add-column s1-commit s1-select-count s1-show-columns master_create_empty_shard @@ -1676,11 +1431,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-add-column s1-begin s1-real-time-select s2-ddl-drop-column s1-commit s1-select-count s1-show-columns master_create_empty_shard @@ -1717,11 +1467,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-real-time-select s2-ddl-rename-column s1-commit s1-select-count s1-show-columns master_create_empty_shard @@ -1757,11 +1502,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-real-time-select s2-table-size s1-commit s1-select-count master_create_empty_shard @@ -1794,11 +1534,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-real-time-select s2-master-modify-multiple-shards s1-commit s1-select-count master_create_empty_shard @@ -1826,11 +1561,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-drop s1-create-non-distributed-table s1-begin s1-real-time-select s2-distribute-table s1-commit s1-select-count master_create_empty_shard @@ -1859,11 +1589,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-insert s2-real-time-select s1-commit s1-select-count master_create_empty_shard @@ -1891,11 +1616,6 @@ count 6 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-insert-select s2-real-time-select s1-commit s1-select-count master_create_empty_shard @@ -1923,11 +1643,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-update s2-real-time-select s1-commit s1-select-count master_create_empty_shard @@ -1955,11 +1670,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-delete s2-real-time-select s1-commit s1-select-count master_create_empty_shard @@ -1987,11 +1697,6 @@ count 4 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-truncate s2-real-time-select s1-commit s1-select-count master_create_empty_shard @@ -2015,11 +1720,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-drop s2-real-time-select s1-commit s1-select-count master_create_empty_shard @@ -2036,11 +1736,6 @@ step s2-real-time-select: <... completed> ERROR: relation "select_append" does not exist step s1-select-count: SELECT COUNT(*) FROM select_append; ERROR: relation "select_append" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-ddl-create-index s2-real-time-select s1-commit s1-select-count s1-show-indexes master_create_empty_shard @@ -2075,11 +1770,6 @@ run_command_on_workers (localhost,57638,t,1) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-create-index s1-begin s1-ddl-drop-index s2-real-time-select s1-commit s1-select-count s1-show-indexes master_create_empty_shard @@ -2116,11 +1806,6 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-ddl-add-column s2-real-time-select s1-commit s1-select-count s1-show-columns master_create_empty_shard @@ -2156,11 +1841,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-add-column s1-begin s1-ddl-drop-column s2-real-time-select s1-commit s1-select-count s1-show-columns master_create_empty_shard @@ -2197,11 +1877,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-ddl-rename-column s2-real-time-select s1-commit s1-select-count s1-show-columns master_create_empty_shard @@ -2237,11 +1912,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-table-size s2-real-time-select s1-commit s1-select-count master_create_empty_shard @@ -2274,11 +1944,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-master-modify-multiple-shards s2-real-time-select s1-commit s1-select-count master_create_empty_shard @@ -2306,11 +1971,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-drop s1-create-non-distributed-table s1-begin s1-distribute-table s2-real-time-select s1-commit s1-select-count master_create_empty_shard @@ -2339,11 +1999,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-adaptive-select s2-insert s1-commit s1-select-count master_create_empty_shard @@ -2374,11 +2029,6 @@ count 6 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-adaptive-select s2-insert-select s1-commit s1-select-count master_create_empty_shard @@ -2409,11 +2059,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-adaptive-select s2-update s1-commit s1-select-count master_create_empty_shard @@ -2444,11 +2089,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-adaptive-select s2-delete s1-commit s1-select-count master_create_empty_shard @@ -2479,11 +2119,6 @@ count 4 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-adaptive-select s2-truncate s1-commit s1-select-count master_create_empty_shard @@ -2515,11 +2150,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-adaptive-select s2-drop s1-commit s1-select-count master_create_empty_shard @@ -2547,11 +2177,6 @@ step s1-commit: COMMIT; step s2-drop: <... completed> step s1-select-count: SELECT COUNT(*) FROM select_append; ERROR: relation "select_append" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-adaptive-select s2-ddl-create-index s1-commit s1-select-count s1-show-indexes master_create_empty_shard @@ -2589,11 +2214,6 @@ run_command_on_workers (localhost,57638,t,1) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-create-index s1-begin s1-adaptive-select s2-ddl-drop-index s1-commit s1-select-count s1-show-indexes master_create_empty_shard @@ -2633,11 +2253,6 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-adaptive-select s2-ddl-create-index-concurrently s1-commit s1-select-count s1-show-indexes master_create_empty_shard @@ -2675,11 +2290,6 @@ run_command_on_workers (localhost,57638,t,1) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-adaptive-select s2-ddl-add-column s1-commit s1-select-count s1-show-columns master_create_empty_shard @@ -2718,11 +2328,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-add-column s1-begin s1-adaptive-select s2-ddl-drop-column s1-commit s1-select-count s1-show-columns master_create_empty_shard @@ -2762,11 +2367,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-adaptive-select s2-ddl-rename-column s1-commit s1-select-count s1-show-columns master_create_empty_shard @@ -2805,11 +2405,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-adaptive-select s2-table-size s1-commit s1-select-count master_create_empty_shard @@ -2845,11 +2440,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-adaptive-select s2-master-modify-multiple-shards s1-commit s1-select-count master_create_empty_shard @@ -2880,11 +2470,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-drop s1-create-non-distributed-table s1-begin s1-adaptive-select s2-distribute-table s1-commit s1-select-count master_create_empty_shard @@ -2916,11 +2501,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-insert s2-adaptive-select s1-commit s1-select-count master_create_empty_shard @@ -2951,11 +2531,6 @@ count 6 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-insert-select s2-adaptive-select s1-commit s1-select-count master_create_empty_shard @@ -2986,11 +2561,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-update s2-adaptive-select s1-commit s1-select-count master_create_empty_shard @@ -3021,11 +2591,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-delete s2-adaptive-select s1-commit s1-select-count master_create_empty_shard @@ -3056,11 +2621,6 @@ count 4 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-truncate s2-adaptive-select s1-commit s1-select-count master_create_empty_shard @@ -3087,11 +2647,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-drop s2-adaptive-select s1-commit s1-select-count master_create_empty_shard @@ -3111,11 +2666,6 @@ step s2-adaptive-select: <... completed> ERROR: relation "select_append" does not exist step s1-select-count: SELECT COUNT(*) FROM select_append; ERROR: relation "select_append" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-ddl-create-index s2-adaptive-select s1-commit s1-select-count s1-show-indexes master_create_empty_shard @@ -3153,11 +2703,6 @@ run_command_on_workers (localhost,57638,t,1) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-create-index s1-begin s1-ddl-drop-index s2-adaptive-select s1-commit s1-select-count s1-show-indexes master_create_empty_shard @@ -3197,11 +2742,6 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-ddl-add-column s2-adaptive-select s1-commit s1-select-count s1-show-columns master_create_empty_shard @@ -3240,11 +2780,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-add-column s1-begin s1-ddl-drop-column s2-adaptive-select s1-commit s1-select-count s1-show-columns master_create_empty_shard @@ -3284,11 +2819,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-ddl-rename-column s2-adaptive-select s1-commit s1-select-count s1-show-columns master_create_empty_shard @@ -3327,11 +2857,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-table-size s2-adaptive-select s1-commit s1-select-count master_create_empty_shard @@ -3367,11 +2892,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-master-modify-multiple-shards s2-adaptive-select s1-commit s1-select-count master_create_empty_shard @@ -3402,11 +2922,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-drop s1-create-non-distributed-table s1-begin s1-distribute-table s2-adaptive-select s1-commit s1-select-count master_create_empty_shard @@ -3438,8 +2953,3 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_select_vs_all_on_mx.out b/src/test/regress/expected/isolation_select_vs_all_on_mx.out index 90c296404..519401246 100644 --- a/src/test/regress/expected/isolation_select_vs_all_on_mx.out +++ b/src/test/regress/expected/isolation_select_vs_all_on_mx.out @@ -81,11 +81,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-select s2-start-session-level-connection s2-begin-on-worker s2-insert-select s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-select-count step s1-start-session-level-connection: @@ -176,11 +171,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-select s2-start-session-level-connection s2-begin-on-worker s2-delete s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-select-count step s1-start-session-level-connection: @@ -271,11 +261,6 @@ count 4 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-select s2-start-session-level-connection s2-begin-on-worker s2-copy s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-select-count step s1-start-session-level-connection: @@ -366,11 +351,6 @@ count 7 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-select s2-begin s2-index s1-commit-worker s2-commit s1-stop-connection step s1-start-session-level-connection: @@ -422,11 +402,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-select s2-start-session-level-connection s2-begin-on-worker s2-select-for-update s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection step s1-start-session-level-connection: @@ -509,11 +484,6 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-disable-binary-protocol-on-worker s1-select s2-flaky-coordinator-create-index-concurrently s1-commit-worker s1-stop-connection step s1-start-session-level-connection: @@ -568,8 +538,3 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_setup.out b/src/test/regress/expected/isolation_setup.out new file mode 100644 index 000000000..c551354cb --- /dev/null +++ b/src/test/regress/expected/isolation_setup.out @@ -0,0 +1,19 @@ +Parsed test spec with 1 sessions + +starting permutation: setup +step setup: + -- Replace pg_isolation_test_session_is_blocked so that all isolation tests are run with Citus implementation. + -- + -- Vanilla PG only checks for local blocks, whereas citus implementation also checks worker jobs in distributed + -- transactions. + -- + -- We have some tests that do not produce deterministic outputs when we use the Citus UDFs. They restore this + -- function in the setup phase and replace it again on the teardown phase so that the remainder of the tests can + -- keep using the Citus alternatives. Those tests should never be run concurrently with other isolation tests. + SELECT citus_internal.replace_isolation_tester_func(); + +replace_isolation_tester_func +--------------------------------------------------------------------- + +(1 row) + diff --git a/src/test/regress/expected/isolation_shard_rebalancer_progress.out b/src/test/regress/expected/isolation_shard_rebalancer_progress.out index 992e95057..b03b7b99d 100644 --- a/src/test/regress/expected/isolation_shard_rebalancer_progress.out +++ b/src/test/regress/expected/isolation_shard_rebalancer_progress.out @@ -144,8 +144,3 @@ table_name|shardid|shard_size|sourcename|sourceport|source_shard_size|targetname --------------------------------------------------------------------- (0 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_truncate_vs_all.out b/src/test/regress/expected/isolation_truncate_vs_all.out index 7514be591..d323c3f54 100644 --- a/src/test/regress/expected/isolation_truncate_vs_all.out +++ b/src/test/regress/expected/isolation_truncate_vs_all.out @@ -20,11 +20,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-truncate s2-truncate s1-commit s2-commit s1-select-count master_create_empty_shard @@ -46,11 +41,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-truncate s2-drop s1-commit s2-commit s1-select-count master_create_empty_shard @@ -68,11 +58,6 @@ step s2-drop: <... completed> step s2-commit: COMMIT; step s1-select-count: SELECT COUNT(*) FROM truncate_append; ERROR: relation "truncate_append" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-truncate s2-ddl-create-index s1-commit s2-commit s1-select-count s1-show-indexes master_create_empty_shard @@ -101,11 +86,6 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-create-index s1-begin s2-begin s1-truncate s2-ddl-drop-index s1-commit s2-commit s1-select-count s1-show-indexes master_create_empty_shard @@ -135,11 +115,6 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-truncate s2-ddl-create-index-concurrently s1-commit s1-select-count s1-show-indexes master_create_empty_shard @@ -166,11 +141,6 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-truncate s2-ddl-add-column s1-commit s2-commit s1-select-count s1-show-columns master_create_empty_shard @@ -199,11 +169,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-add-column s1-begin s2-begin s1-truncate s2-ddl-drop-column s1-commit s2-commit s1-select-count s1-show-columns master_create_empty_shard @@ -233,11 +198,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-truncate s2-ddl-rename-column s1-commit s2-commit s1-select-count s1-show-columns master_create_empty_shard @@ -266,11 +226,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-truncate s2-table-size s1-commit s2-commit s1-select-count master_create_empty_shard @@ -297,11 +252,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-truncate s2-master-modify-multiple-shards s1-commit s2-commit s1-select-count master_create_empty_shard @@ -323,11 +273,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-truncate s2-master-drop-all-shards s1-commit s2-commit s1-select-count master_create_empty_shard @@ -354,11 +299,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-drop s1-create-non-distributed-table s1-begin s2-begin s1-truncate s2-distribute-table s1-commit s2-commit s1-select-count master_create_empty_shard @@ -386,11 +326,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-truncate s2-truncate s1-commit s2-commit s1-select-count master_create_empty_shard @@ -412,11 +347,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-drop s2-truncate s1-commit s2-commit s1-select-count master_create_empty_shard @@ -435,11 +365,6 @@ ERROR: relation "truncate_append" does not exist step s2-commit: COMMIT; step s1-select-count: SELECT COUNT(*) FROM truncate_append; ERROR: relation "truncate_append" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-ddl-create-index s2-truncate s1-commit s2-commit s1-select-count s1-show-indexes master_create_empty_shard @@ -468,11 +393,6 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-create-index s1-begin s2-begin s1-ddl-drop-index s2-truncate s1-commit s2-commit s1-select-count s1-show-indexes master_create_empty_shard @@ -502,11 +422,6 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-ddl-add-column s2-truncate s1-commit s2-commit s1-select-count s1-show-columns master_create_empty_shard @@ -535,11 +450,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-add-column s1-begin s2-begin s1-ddl-drop-column s2-truncate s1-commit s2-commit s1-select-count s1-show-columns master_create_empty_shard @@ -569,11 +479,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-ddl-rename-column s2-truncate s1-commit s2-commit s1-select-count s1-show-columns master_create_empty_shard @@ -602,11 +507,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-table-size s2-truncate s1-commit s2-commit s1-select-count master_create_empty_shard @@ -632,11 +532,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-master-modify-multiple-shards s2-truncate s1-commit s2-commit s1-select-count master_create_empty_shard @@ -658,11 +553,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-master-drop-all-shards s2-truncate s1-commit s2-commit s1-select-count master_create_empty_shard @@ -689,11 +579,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-drop s1-create-non-distributed-table s1-begin s2-begin s1-distribute-table s2-truncate s1-commit s2-commit s1-select-count master_create_empty_shard @@ -721,8 +606,3 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_truncate_vs_all_on_mx.out b/src/test/regress/expected/isolation_truncate_vs_all_on_mx.out index 5a4b244f0..e3baf9e89 100644 --- a/src/test/regress/expected/isolation_truncate_vs_all_on_mx.out +++ b/src/test/regress/expected/isolation_truncate_vs_all_on_mx.out @@ -90,11 +90,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-select s2-start-session-level-connection s2-begin-on-worker s2-truncate s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-select-count step s1-start-session-level-connection: @@ -186,11 +181,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert-select s2-start-session-level-connection s2-begin-on-worker s2-truncate s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-select-count step s1-start-session-level-connection: @@ -282,11 +272,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-delete s2-start-session-level-connection s2-begin-on-worker s2-truncate s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-select-count step s1-start-session-level-connection: @@ -378,11 +363,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-copy s2-start-session-level-connection s2-begin-on-worker s2-truncate s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-select-count step s1-start-session-level-connection: @@ -474,11 +454,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s1-alter s2-start-session-level-connection s2-begin-on-worker s2-truncate s1-commit s2-commit-worker s2-stop-connection s3-select-count step s1-begin: @@ -539,11 +514,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-select-for-update s2-start-session-level-connection s2-begin-on-worker s2-truncate s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-select-count step s1-start-session-level-connection: @@ -635,11 +605,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-truncate s3-select-count-from-ref-table s1-commit-worker s1-stop-connection step s1-start-session-level-connection: @@ -691,8 +656,3 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_undistribute_table.out b/src/test/regress/expected/isolation_undistribute_table.out index 4048f0f52..b972001f3 100644 --- a/src/test/regress/expected/isolation_undistribute_table.out +++ b/src/test/regress/expected/isolation_undistribute_table.out @@ -20,11 +20,6 @@ step s1-commit: step s2-undistribute: <... completed> ERROR: cannot complete operation because no such table exists -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s1-undistribute s2-select s1-commit step s1-begin: @@ -52,11 +47,6 @@ a|b 5|6 (3 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s1-undistribute s2-insert s1-commit s2-select step s1-begin: @@ -89,11 +79,6 @@ a| b 9|10 (5 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s1-undistribute s2-insert-select s1-commit s2-select step s1-begin: @@ -127,11 +112,6 @@ a|b 5|6 (6 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s1-undistribute s2-delete s1-commit s2-select step s1-begin: @@ -161,11 +141,6 @@ a|b 5|6 (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s1-undistribute s2-copy s1-commit s2-select step s1-begin: @@ -198,11 +173,6 @@ step s2-select: 13|14 (5 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s1-undistribute s2-drop s1-commit s2-select step s1-begin: @@ -227,11 +197,6 @@ step s2-select: SELECT * FROM dist_table ORDER BY 1, 2; ERROR: relation "dist_table" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s1-undistribute s2-truncate s1-commit s2-select step s1-begin: @@ -264,11 +229,6 @@ a|b 5|6 (3 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s1-undistribute s2-select-for-update s1-commit step s1-begin: @@ -294,11 +254,6 @@ a|b 5|6 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-begin s1-undistribute s2-create-index-concurrently s1-commit step s1-begin: @@ -319,8 +274,3 @@ step s1-commit: COMMIT; step s2-create-index-concurrently: <... completed> -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_update_delete_upsert_vs_all_on_mx.out b/src/test/regress/expected/isolation_update_delete_upsert_vs_all_on_mx.out index ae3223ca7..c3badcec4 100644 --- a/src/test/regress/expected/isolation_update_delete_upsert_vs_all_on_mx.out +++ b/src/test/regress/expected/isolation_update_delete_upsert_vs_all_on_mx.out @@ -94,11 +94,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-delete s2-start-session-level-connection s2-begin-on-worker s2-copy s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-select-count create_distributed_table @@ -194,11 +189,6 @@ count 3 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-update s2-start-session-level-connection s2-begin-on-worker s2-alter-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-select-count create_distributed_table @@ -290,11 +280,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-update s2-start-session-level-connection s2-begin-on-worker s2-select-for-update s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection create_distributed_table @@ -382,8 +367,3 @@ stop_session_level_connection_to_node (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_update_node.out b/src/test/regress/expected/isolation_update_node.out index ff2b76f00..86615648c 100644 --- a/src/test/regress/expected/isolation_update_node.out +++ b/src/test/regress/expected/isolation_update_node.out @@ -8,7 +8,7 @@ nodeid|nodename |nodeport (2 rows) step s1-begin: - BEGIN; + BEGIN; step s1-update-node-1: SELECT 1 FROM master_update_node( @@ -28,7 +28,7 @@ step s2-update-node-2: 58638); step s1-commit: - COMMIT; + COMMIT; step s2-update-node-2: <... completed> ?column? @@ -98,7 +98,7 @@ nodeid|nodename |nodeport (2 rows) step s1-begin: - BEGIN; + BEGIN; step s1-update-node-1: SELECT 1 FROM master_update_node( @@ -112,7 +112,7 @@ step s1-update-node-1: (1 row) step s2-begin: - BEGIN; + BEGIN; step s2-update-node-1: SELECT 1 FROM master_update_node( @@ -121,7 +121,7 @@ step s2-update-node-1: 58637); step s1-commit: - COMMIT; + COMMIT; step s2-update-node-1: <... completed> ?column? @@ -130,7 +130,7 @@ step s2-update-node-1: <... completed> (1 row) step s2-abort: - ABORT; + ABORT; step s1-show-nodes: SELECT nodeid, nodename, nodeport, isactive @@ -192,7 +192,7 @@ create_distributed_table (1 row) step s1-begin: - BEGIN; + BEGIN; step s1-update-node-nonexistent: SELECT 1 FROM master_update_node( diff --git a/src/test/regress/expected/isolation_update_vs_all.out b/src/test/regress/expected/isolation_update_vs_all.out index f35f28317..54cf4ce02 100644 --- a/src/test/regress/expected/isolation_update_vs_all.out +++ b/src/test/regress/expected/isolation_update_vs_all.out @@ -20,11 +20,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-update-cte s2-update-cte s1-commit s2-commit s1-select-count create_distributed_table @@ -56,11 +51,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-update s2-delete s1-commit s2-commit s1-select-count create_distributed_table @@ -82,11 +72,6 @@ count 4 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-update s2-truncate s1-commit s2-commit s1-select-count create_distributed_table @@ -108,11 +93,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-update s2-drop s1-commit s2-commit s1-select-count create_distributed_table @@ -130,11 +110,6 @@ step s2-drop: <... completed> step s2-commit: COMMIT; step s1-select-count: SELECT COUNT(*) FROM update_hash; ERROR: relation "update_hash" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-update s2-ddl-create-index s1-commit s2-commit s1-select-count s1-show-indexes create_distributed_table @@ -163,11 +138,6 @@ run_command_on_workers (localhost,57638,t,2) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-create-index s1-begin s2-begin s1-update s2-ddl-drop-index s1-commit s2-commit s1-select-count s1-show-indexes create_distributed_table @@ -197,11 +167,6 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-update s2-ddl-create-index-concurrently s1-commit s1-select-count s1-show-indexes create_distributed_table @@ -228,11 +193,6 @@ run_command_on_workers (localhost,57638,t,2) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-update s2-ddl-add-column s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -261,11 +221,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-add-column s1-begin s2-begin s1-update s2-ddl-drop-column s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -295,11 +250,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-update s2-ddl-rename-column s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -328,11 +278,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-update s2-table-size s1-commit s2-commit s1-select-count create_distributed_table @@ -358,11 +303,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-update s2-master-modify-multiple-shards s1-commit s2-commit s1-select-count create_distributed_table @@ -384,11 +324,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-drop s1-create-non-distributed-table s1-initialize s1-begin s2-begin s1-update s2-distribute-table s1-commit s2-commit s1-select-count create_distributed_table @@ -417,11 +352,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-update-cte s2-delete s1-commit s2-commit s1-select-count create_distributed_table @@ -448,11 +378,6 @@ count 4 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-update-cte s2-truncate s1-commit s2-commit s1-select-count create_distributed_table @@ -479,11 +404,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-update-cte s2-drop s1-commit s2-commit s1-select-count create_distributed_table @@ -506,11 +426,6 @@ step s2-drop: <... completed> step s2-commit: COMMIT; step s1-select-count: SELECT COUNT(*) FROM update_hash; ERROR: relation "update_hash" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-update-cte s2-ddl-create-index s1-commit s2-commit s1-select-count s1-show-indexes create_distributed_table @@ -544,11 +459,6 @@ run_command_on_workers (localhost,57638,t,2) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-create-index s1-begin s2-begin s1-update-cte s2-ddl-drop-index s1-commit s2-commit s1-select-count s1-show-indexes create_distributed_table @@ -583,11 +493,6 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-update-cte s2-ddl-create-index-concurrently s1-commit s1-select-count s1-show-indexes create_distributed_table @@ -619,11 +524,6 @@ run_command_on_workers (localhost,57638,t,2) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-update-cte s2-ddl-add-column s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -657,11 +557,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-add-column s1-begin s2-begin s1-update-cte s2-ddl-drop-column s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -696,11 +591,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-update-cte s2-ddl-rename-column s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -734,11 +624,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-update-cte s2-table-size s1-commit s2-commit s1-select-count create_distributed_table @@ -769,11 +654,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-update-cte s2-master-modify-multiple-shards s1-commit s2-commit s1-select-count create_distributed_table @@ -800,11 +680,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-delete s2-update s1-commit s2-commit s1-select-count create_distributed_table @@ -826,11 +701,6 @@ count 4 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-truncate s2-update s1-commit s2-commit s1-select-count create_distributed_table @@ -852,11 +722,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-drop s2-update s1-commit s2-commit s1-select-count create_distributed_table @@ -875,11 +740,6 @@ ERROR: relation "update_hash" does not exist step s2-commit: COMMIT; step s1-select-count: SELECT COUNT(*) FROM update_hash; ERROR: relation "update_hash" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-ddl-create-index s2-update s1-commit s2-commit s1-select-count s1-show-indexes create_distributed_table @@ -908,11 +768,6 @@ run_command_on_workers (localhost,57638,t,2) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-create-index s1-begin s2-begin s1-ddl-drop-index s2-update s1-commit s2-commit s1-select-count s1-show-indexes create_distributed_table @@ -942,11 +797,6 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-ddl-add-column s2-update s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -975,11 +825,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-add-column s1-begin s2-begin s1-ddl-drop-column s2-update s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -1009,11 +854,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-ddl-rename-column s2-update s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -1043,11 +883,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-table-size s2-update s1-commit s2-commit s1-select-count create_distributed_table @@ -1073,11 +908,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-master-modify-multiple-shards s2-update s1-commit s2-commit s1-select-count create_distributed_table @@ -1099,11 +929,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-drop s1-create-non-distributed-table s1-initialize s1-begin s2-begin s1-distribute-table s2-update s1-commit s2-commit s1-select-count create_distributed_table @@ -1132,11 +957,6 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-delete s2-update-cte s1-commit s2-commit s1-select-count create_distributed_table @@ -1162,11 +982,6 @@ count 4 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-truncate s2-update-cte s1-commit s2-commit s1-select-count create_distributed_table @@ -1192,11 +1007,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-drop s2-update-cte s1-commit s2-commit s1-select-count create_distributed_table @@ -1215,11 +1025,6 @@ ERROR: relation "update_hash" does not exist step s2-commit: COMMIT; step s1-select-count: SELECT COUNT(*) FROM update_hash; ERROR: relation "update_hash" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-ddl-create-index s2-update-cte s1-commit s2-commit s1-select-count s1-show-indexes create_distributed_table @@ -1253,11 +1058,6 @@ run_command_on_workers (localhost,57638,t,2) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-create-index s1-begin s2-begin s1-ddl-drop-index s2-update-cte s1-commit s2-commit s1-select-count s1-show-indexes create_distributed_table @@ -1292,11 +1092,6 @@ run_command_on_workers (localhost,57638,t,0) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-ddl-add-column s2-update-cte s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -1330,11 +1125,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-add-column s1-begin s2-begin s1-ddl-drop-column s2-update-cte s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -1369,11 +1159,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-ddl-rename-column s2-update-cte s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -1403,11 +1188,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-table-size s2-update-cte s1-commit s2-commit s1-select-count create_distributed_table @@ -1438,11 +1218,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-master-modify-multiple-shards s2-update-cte s1-commit s2-commit s1-select-count create_distributed_table @@ -1468,11 +1243,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-drop s1-create-non-distributed-table s1-initialize s1-begin s2-begin s1-distribute-table s2-update-cte s1-commit s2-commit s1-select-count create_distributed_table @@ -1507,8 +1277,3 @@ count 10 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/expected/isolation_upsert_vs_all.out b/src/test/regress/expected/isolation_upsert_vs_all.out index dfad2f3c1..017df63de 100644 --- a/src/test/regress/expected/isolation_upsert_vs_all.out +++ b/src/test/regress/expected/isolation_upsert_vs_all.out @@ -20,11 +20,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-upsert s2-update s1-commit s2-commit s1-select-count create_distributed_table @@ -46,11 +41,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-upsert s2-delete s1-commit s2-commit s1-select-count create_distributed_table @@ -72,11 +62,6 @@ count 4 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-upsert s2-truncate s1-commit s2-commit s1-select-count create_distributed_table @@ -98,11 +83,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-upsert s2-drop s1-commit s2-commit s1-select-count create_distributed_table @@ -120,11 +100,6 @@ step s2-drop: <... completed> step s2-commit: COMMIT; step s1-select-count: SELECT COUNT(*) FROM upsert_hash; ERROR: relation "upsert_hash" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-upsert s2-ddl-create-index s1-commit s2-commit s1-select-count s1-show-indexes create_distributed_table @@ -153,11 +128,6 @@ run_command_on_workers (localhost,57638,t,4) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-create-index s1-begin s2-begin s1-upsert s2-ddl-drop-index s1-commit s2-commit s1-select-count s1-show-indexes create_distributed_table @@ -187,11 +157,6 @@ run_command_on_workers (localhost,57638,t,2) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s1-upsert s2-ddl-create-index-concurrently s1-commit s1-select-count s1-show-indexes create_distributed_table @@ -218,11 +183,6 @@ run_command_on_workers (localhost,57638,t,4) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-upsert s2-ddl-add-column s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -251,11 +211,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-add-column s1-begin s2-begin s1-upsert s2-ddl-drop-column s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -285,11 +240,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-upsert s2-ddl-rename-column s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -318,11 +268,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-upsert s2-table-size s1-commit s2-commit s1-select-count create_distributed_table @@ -348,11 +293,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-upsert s2-master-modify-multiple-shards s1-commit s2-commit s1-select-count create_distributed_table @@ -374,11 +314,6 @@ count 0 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-drop s1-create-non-distributed-table s1-initialize s1-begin s2-begin s1-upsert s2-distribute-table s1-commit s2-commit s1-select-count create_distributed_table @@ -407,11 +342,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-update s2-upsert s1-commit s2-commit s1-select-count create_distributed_table @@ -433,11 +363,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-delete s2-upsert s1-commit s2-commit s1-select-count create_distributed_table @@ -459,11 +384,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-truncate s2-upsert s1-commit s2-commit s1-select-count create_distributed_table @@ -485,11 +405,6 @@ count 1 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-drop s2-upsert s1-commit s2-commit s1-select-count create_distributed_table @@ -508,11 +423,6 @@ ERROR: relation "upsert_hash" does not exist step s2-commit: COMMIT; step s1-select-count: SELECT COUNT(*) FROM upsert_hash; ERROR: relation "upsert_hash" does not exist -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-ddl-create-index s2-upsert s1-commit s2-commit s1-select-count s1-show-indexes create_distributed_table @@ -541,11 +451,6 @@ run_command_on_workers (localhost,57638,t,4) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-create-index s1-begin s2-begin s1-ddl-drop-index s2-upsert s1-commit s2-commit s1-select-count s1-show-indexes create_distributed_table @@ -575,11 +480,6 @@ run_command_on_workers (localhost,57638,t,2) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-ddl-add-column s2-upsert s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -608,11 +508,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-ddl-add-column s1-begin s2-begin s1-ddl-drop-column s2-upsert s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -642,11 +537,6 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-ddl-rename-column s2-upsert s1-commit s2-commit s1-select-count s1-show-columns create_distributed_table @@ -676,11 +566,6 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-table-size s2-upsert s1-commit s2-commit s1-select-count create_distributed_table @@ -706,11 +591,6 @@ count 5 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - starting permutation: s1-initialize s1-begin s2-begin s1-master-modify-multiple-shards s2-upsert s1-commit s2-commit s1-select-count create_distributed_table @@ -732,8 +612,3 @@ count 1 (1 row) -restore_isolation_tester_func ---------------------------------------------------------------------- - -(1 row) - diff --git a/src/test/regress/isolation_schedule b/src/test/regress/isolation_schedule index c96cd3220..485598fc2 100644 --- a/src/test/regress/isolation_schedule +++ b/src/test/regress/isolation_schedule @@ -1,3 +1,4 @@ +test: isolation_setup test: isolation_add_remove_node test: isolation_update_node test: isolation_update_node_lock_writes diff --git a/src/test/regress/spec/isolation_acquire_distributed_locks.spec b/src/test/regress/spec/isolation_acquire_distributed_locks.spec index eb6d51e68..ba2d0af7f 100644 --- a/src/test/regress/spec/isolation_acquire_distributed_locks.spec +++ b/src/test/regress/spec/isolation_acquire_distributed_locks.spec @@ -51,8 +51,6 @@ teardown DROP TABLE partitioned_table; SELECT citus_remove_node('localhost', 57636); - - SELECT citus_internal.restore_isolation_tester_func(); } // coordinator session diff --git a/src/test/regress/spec/isolation_blocking_move_multi_shard_commands.spec b/src/test/regress/spec/isolation_blocking_move_multi_shard_commands.spec index 45f5fed84..610920cc4 100644 --- a/src/test/regress/spec/isolation_blocking_move_multi_shard_commands.spec +++ b/src/test/regress/spec/isolation_blocking_move_multi_shard_commands.spec @@ -3,9 +3,6 @@ setup { - SELECT citus_internal.replace_isolation_tester_func(); - SELECT citus_internal.refresh_isolation_tester_prepared_statement(); - SET citus.shard_count TO 8; SET citus.shard_replication_factor TO 1; @@ -18,8 +15,6 @@ setup teardown { - SELECT citus_internal.restore_isolation_tester_func(); - DROP TABLE selected_shard; DROP TABLE logical_replicate_placement; } diff --git a/src/test/regress/spec/isolation_blocking_move_multi_shard_commands_on_mx.spec b/src/test/regress/spec/isolation_blocking_move_multi_shard_commands_on_mx.spec index df73e0bfc..2592d6b1b 100644 --- a/src/test/regress/spec/isolation_blocking_move_multi_shard_commands_on_mx.spec +++ b/src/test/regress/spec/isolation_blocking_move_multi_shard_commands_on_mx.spec @@ -20,9 +20,6 @@ setup AS 'citus', $$stop_session_level_connection_to_node$$; RESET citus.enable_metadata_sync; - SELECT citus_internal.replace_isolation_tester_func(); - SELECT citus_internal.refresh_isolation_tester_prepared_statement(); - -- start_metadata_sync_to_node can not be run inside a transaction block -- following is a workaround to overcome that -- port numbers are hard coded at the moment @@ -48,8 +45,6 @@ teardown { DROP TABLE selected_shard; DROP TABLE logical_replicate_placement; - - SELECT citus_internal.restore_isolation_tester_func(); } diff --git a/src/test/regress/spec/isolation_blocking_move_single_shard_commands.spec b/src/test/regress/spec/isolation_blocking_move_single_shard_commands.spec index f125904c0..c834a2916 100644 --- a/src/test/regress/spec/isolation_blocking_move_single_shard_commands.spec +++ b/src/test/regress/spec/isolation_blocking_move_single_shard_commands.spec @@ -2,9 +2,6 @@ // so setting the corresponding shard here is useful setup { - SELECT citus_internal.replace_isolation_tester_func(); - SELECT citus_internal.refresh_isolation_tester_prepared_statement(); - SET citus.shard_count TO 8; SET citus.shard_replication_factor TO 1; @@ -16,8 +13,6 @@ setup teardown { - SELECT citus_internal.restore_isolation_tester_func(); - DROP TABLE selected_shard; DROP TABLE logical_replicate_placement; } diff --git a/src/test/regress/spec/isolation_blocking_move_single_shard_commands_on_mx.spec b/src/test/regress/spec/isolation_blocking_move_single_shard_commands_on_mx.spec index 74024a7c8..5b102917d 100644 --- a/src/test/regress/spec/isolation_blocking_move_single_shard_commands_on_mx.spec +++ b/src/test/regress/spec/isolation_blocking_move_single_shard_commands_on_mx.spec @@ -19,9 +19,6 @@ setup AS 'citus', $$stop_session_level_connection_to_node$$; RESET citus.enable_ddl_propagation; - SELECT citus_internal.replace_isolation_tester_func(); - SELECT citus_internal.refresh_isolation_tester_prepared_statement(); - -- start_metadata_sync_to_node can not be run inside a transaction block -- following is a workaround to overcome that -- port numbers are hard coded at the moment @@ -46,8 +43,6 @@ teardown { DROP TABLE selected_shard; DROP TABLE logical_replicate_placement; - - SELECT citus_internal.restore_isolation_tester_func(); } diff --git a/src/test/regress/spec/isolation_citus_dist_activity.spec b/src/test/regress/spec/isolation_citus_dist_activity.spec index b2e977dda..eb0ee2a5d 100644 --- a/src/test/regress/spec/isolation_citus_dist_activity.spec +++ b/src/test/regress/spec/isolation_citus_dist_activity.spec @@ -1,5 +1,8 @@ setup { + -- revert back to pg_isolation_test_session_is_blocked until the tests are fixed + SELECT citus_internal.restore_isolation_tester_func(); + CREATE OR REPLACE FUNCTION test_assign_global_pid() RETURNS void LANGUAGE C STRICT @@ -14,6 +17,9 @@ setup teardown { + -- replace pg_isolation_test_session_is_blocked so that next tests are run with Citus implementation + SELECT citus_internal.replace_isolation_tester_func(); + DROP TABLE test_table; } diff --git a/src/test/regress/spec/isolation_concurrent_dml.spec b/src/test/regress/spec/isolation_concurrent_dml.spec index 35f2fd7a4..937880671 100644 --- a/src/test/regress/spec/isolation_concurrent_dml.spec +++ b/src/test/regress/spec/isolation_concurrent_dml.spec @@ -1,7 +1,5 @@ setup { - SELECT citus_internal.replace_isolation_tester_func(); - SELECT citus_internal.refresh_isolation_tester_prepared_statement(); CREATE TABLE test_concurrent_dml (test_id integer NOT NULL, data text); SET citus.shard_replication_factor TO 2; SELECT create_distributed_table('test_concurrent_dml', 'test_id', 'hash', shard_count:=4); @@ -10,7 +8,6 @@ setup teardown { DROP TABLE IF EXISTS test_concurrent_dml CASCADE; - SELECT citus_internal.restore_isolation_tester_func(); } session "s1" diff --git a/src/test/regress/spec/isolation_copy_vs_all_on_mx.spec b/src/test/regress/spec/isolation_copy_vs_all_on_mx.spec index 92fb26e73..47abce739 100644 --- a/src/test/regress/spec/isolation_copy_vs_all_on_mx.spec +++ b/src/test/regress/spec/isolation_copy_vs_all_on_mx.spec @@ -12,7 +12,6 @@ setup teardown { DROP TABLE IF EXISTS copy_table CASCADE; - SELECT citus_internal.restore_isolation_tester_func(); } session "s1" diff --git a/src/test/regress/spec/isolation_ddl_vs_all.spec b/src/test/regress/spec/isolation_ddl_vs_all.spec index 2d672f3c1..46a1a9872 100644 --- a/src/test/regress/spec/isolation_ddl_vs_all.spec +++ b/src/test/regress/spec/isolation_ddl_vs_all.spec @@ -5,9 +5,6 @@ // create range distributed table to test behavior of DDL in concurrent operations setup { - SELECT citus_internal.replace_isolation_tester_func(); - SELECT citus_internal.refresh_isolation_tester_prepared_statement(); - SET citus.shard_replication_factor TO 1; CREATE TABLE ddl_hash(id integer, data text); SELECT create_distributed_table('ddl_hash', 'id'); @@ -17,8 +14,6 @@ setup teardown { DROP TABLE IF EXISTS ddl_hash CASCADE; - - SELECT citus_internal.restore_isolation_tester_func(); } // session 1 diff --git a/src/test/regress/spec/isolation_delete_vs_all.spec b/src/test/regress/spec/isolation_delete_vs_all.spec index 2b612f0d1..b1ecb3a19 100644 --- a/src/test/regress/spec/isolation_delete_vs_all.spec +++ b/src/test/regress/spec/isolation_delete_vs_all.spec @@ -5,9 +5,6 @@ // create range distributed table to test behavior of DELETE in concurrent operations setup { - SELECT citus_internal.replace_isolation_tester_func(); - SELECT citus_internal.refresh_isolation_tester_prepared_statement(); - SET citus.shard_replication_factor TO 1; CREATE TABLE delete_hash(id integer, data text); SELECT create_distributed_table('delete_hash', 'id'); @@ -17,8 +14,6 @@ setup teardown { DROP TABLE IF EXISTS delete_hash CASCADE; - - SELECT citus_internal.restore_isolation_tester_func(); } // session 1 diff --git a/src/test/regress/spec/isolation_dis2ref_foreign_keys_on_mx.spec b/src/test/regress/spec/isolation_dis2ref_foreign_keys_on_mx.spec index eb312fae3..3bfc5e6bd 100644 --- a/src/test/regress/spec/isolation_dis2ref_foreign_keys_on_mx.spec +++ b/src/test/regress/spec/isolation_dis2ref_foreign_keys_on_mx.spec @@ -15,7 +15,6 @@ setup teardown { DROP TABLE ref_table, dist_table; - SELECT citus_internal.restore_isolation_tester_func(); } session "s1" diff --git a/src/test/regress/spec/isolation_distributed_deadlock_detection.spec b/src/test/regress/spec/isolation_distributed_deadlock_detection.spec index 9676530bc..27e18ea1c 100644 --- a/src/test/regress/spec/isolation_distributed_deadlock_detection.spec +++ b/src/test/regress/spec/isolation_distributed_deadlock_detection.spec @@ -1,8 +1,5 @@ setup { - SELECT citus_internal.replace_isolation_tester_func(); - SELECT citus_internal.refresh_isolation_tester_prepared_statement(); - CREATE TABLE deadlock_detection_reference (user_id int UNIQUE, some_val int); SELECT create_reference_table('deadlock_detection_reference'); @@ -26,7 +23,6 @@ teardown DROP TABLE local_deadlock_table; DROP TABLE deadlock_detection_test_rep_2; DROP TABLE deadlock_detection_reference; - SELECT citus_internal.restore_isolation_tester_func(); SET citus.shard_replication_factor = 1; } diff --git a/src/test/regress/spec/isolation_drop_alter_index_select_for_update_on_mx.spec b/src/test/regress/spec/isolation_drop_alter_index_select_for_update_on_mx.spec index 032bf0d02..ba83a18b1 100644 --- a/src/test/regress/spec/isolation_drop_alter_index_select_for_update_on_mx.spec +++ b/src/test/regress/spec/isolation_drop_alter_index_select_for_update_on_mx.spec @@ -12,7 +12,6 @@ setup teardown { DROP TABLE IF EXISTS dist_table CASCADE; - SELECT citus_internal.restore_isolation_tester_func(); } session "s1" diff --git a/src/test/regress/spec/isolation_drop_vs_all.spec b/src/test/regress/spec/isolation_drop_vs_all.spec index c970567e0..dd625fa79 100644 --- a/src/test/regress/spec/isolation_drop_vs_all.spec +++ b/src/test/regress/spec/isolation_drop_vs_all.spec @@ -5,9 +5,6 @@ // create distributed table to test behavior of DROP in concurrent operations setup { - SELECT citus_internal.replace_isolation_tester_func(); - SELECT citus_internal.refresh_isolation_tester_prepared_statement(); - SET citus.shard_replication_factor TO 1; CREATE SCHEMA drop_tests; CREATE TABLE drop_tests.drop_hash(id integer, data text); @@ -23,8 +20,6 @@ teardown { DROP TABLE IF EXISTS drop_tests.drop_hash, drop_tests_2.drop_hash_2 CASCADE; DROP SCHEMA IF EXISTS drop_tests, drop_tests_2 CASCADE; - - SELECT citus_internal.restore_isolation_tester_func(); } // session 1 diff --git a/src/test/regress/spec/isolation_dump_global_wait_edges.spec b/src/test/regress/spec/isolation_dump_global_wait_edges.spec index d9328eddf..f6f41a6ce 100644 --- a/src/test/regress/spec/isolation_dump_global_wait_edges.spec +++ b/src/test/regress/spec/isolation_dump_global_wait_edges.spec @@ -1,7 +1,5 @@ setup { - SELECT citus_internal.replace_isolation_tester_func(); - SELECT citus_internal.refresh_isolation_tester_prepared_statement(); CREATE TABLE distributed_table (x int primary key, y int); SELECT create_distributed_table('distributed_table', 'x'); INSERT INTO distributed_table VALUES (1,0); @@ -19,7 +17,6 @@ setup teardown { DROP TABLE distributed_table; - SELECT citus_internal.restore_isolation_tester_func(); } session "s1" diff --git a/src/test/regress/spec/isolation_get_distributed_wait_queries_mx.spec b/src/test/regress/spec/isolation_get_distributed_wait_queries_mx.spec index dfe1587be..03512f343 100644 --- a/src/test/regress/spec/isolation_get_distributed_wait_queries_mx.spec +++ b/src/test/regress/spec/isolation_get_distributed_wait_queries_mx.spec @@ -17,7 +17,6 @@ teardown { DROP TABLE ref_table; DROP TABLE tt1; - SELECT citus_internal.restore_isolation_tester_func(); SELECT citus_remove_node('localhost', 57636); } diff --git a/src/test/regress/spec/isolation_global_pid.spec b/src/test/regress/spec/isolation_global_pid.spec index 690d1768a..f1a24cfd9 100644 --- a/src/test/regress/spec/isolation_global_pid.spec +++ b/src/test/regress/spec/isolation_global_pid.spec @@ -11,7 +11,6 @@ setup teardown { DROP TABLE dist_table; - SELECT citus_internal.restore_isolation_tester_func(); SELECT citus_remove_node('localhost', 57636); } diff --git a/src/test/regress/spec/isolation_hash_copy_vs_all.spec b/src/test/regress/spec/isolation_hash_copy_vs_all.spec index 58ec28f5c..ac3e015f5 100644 --- a/src/test/regress/spec/isolation_hash_copy_vs_all.spec +++ b/src/test/regress/spec/isolation_hash_copy_vs_all.spec @@ -5,8 +5,6 @@ // create append distributed table to test behavior of COPY in concurrent operations setup { - SELECT citus_internal.replace_isolation_tester_func(); - SELECT citus_internal.refresh_isolation_tester_prepared_statement(); SET citus.shard_replication_factor TO 1; CREATE TABLE hash_copy(id integer, data text, int_data int); SELECT create_distributed_table('hash_copy', 'id'); @@ -16,7 +14,6 @@ setup teardown { DROP TABLE IF EXISTS hash_copy CASCADE; - SELECT citus_internal.restore_isolation_tester_func(); } // session 1 diff --git a/src/test/regress/spec/isolation_insert_select_conflict.spec b/src/test/regress/spec/isolation_insert_select_conflict.spec index a25f01712..cf548ff2d 100644 --- a/src/test/regress/spec/isolation_insert_select_conflict.spec +++ b/src/test/regress/spec/isolation_insert_select_conflict.spec @@ -1,7 +1,5 @@ setup { - SELECT citus_internal.replace_isolation_tester_func(); - SELECT citus_internal.refresh_isolation_tester_prepared_statement(); CREATE TABLE target_table(col_1 int primary key, col_2 int); SELECT create_distributed_table('target_table','col_1'); INSERT INTO target_table VALUES(1,2),(2,3),(3,4),(4,5),(5,6); @@ -18,7 +16,6 @@ setup teardown { DROP TABLE target_table, target_table_2, source_table; - SELECT citus_internal.restore_isolation_tester_func(); } session "s1" diff --git a/src/test/regress/spec/isolation_insert_select_vs_all_on_mx.spec b/src/test/regress/spec/isolation_insert_select_vs_all_on_mx.spec index 82d8d8638..6481bd999 100644 --- a/src/test/regress/spec/isolation_insert_select_vs_all_on_mx.spec +++ b/src/test/regress/spec/isolation_insert_select_vs_all_on_mx.spec @@ -12,7 +12,6 @@ setup teardown { DROP TABLE IF EXISTS dist_table CASCADE; - SELECT citus_internal.restore_isolation_tester_func(); } session "s1" diff --git a/src/test/regress/spec/isolation_insert_vs_all_on_mx.spec b/src/test/regress/spec/isolation_insert_vs_all_on_mx.spec index 7367fecb6..0a61899e4 100644 --- a/src/test/regress/spec/isolation_insert_vs_all_on_mx.spec +++ b/src/test/regress/spec/isolation_insert_vs_all_on_mx.spec @@ -12,7 +12,6 @@ setup teardown { DROP TABLE IF EXISTS insert_table CASCADE; - SELECT citus_internal.restore_isolation_tester_func(); } diff --git a/src/test/regress/spec/isolation_logical_replication_multi_shard_commands_on_mx.spec b/src/test/regress/spec/isolation_logical_replication_multi_shard_commands_on_mx.spec index 512eb3af7..24432a78b 100644 --- a/src/test/regress/spec/isolation_logical_replication_multi_shard_commands_on_mx.spec +++ b/src/test/regress/spec/isolation_logical_replication_multi_shard_commands_on_mx.spec @@ -17,8 +17,6 @@ teardown { DROP TABLE selected_shard; DROP TABLE logical_replicate_placement; - - SELECT citus_internal.restore_isolation_tester_func(); } diff --git a/src/test/regress/spec/isolation_logical_replication_single_shard_commands_on_mx.spec b/src/test/regress/spec/isolation_logical_replication_single_shard_commands_on_mx.spec index 5f2a9cc93..7f24dab91 100644 --- a/src/test/regress/spec/isolation_logical_replication_single_shard_commands_on_mx.spec +++ b/src/test/regress/spec/isolation_logical_replication_single_shard_commands_on_mx.spec @@ -15,8 +15,6 @@ teardown { DROP TABLE selected_shard; DROP TABLE logical_replicate_placement; - - SELECT citus_internal.restore_isolation_tester_func(); } diff --git a/src/test/regress/spec/isolation_master_update_node.spec b/src/test/regress/spec/isolation_master_update_node.spec index 5234db32b..a6358d760 100644 --- a/src/test/regress/spec/isolation_master_update_node.spec +++ b/src/test/regress/spec/isolation_master_update_node.spec @@ -1,5 +1,8 @@ setup { + -- revert back to pg_isolation_test_session_is_blocked until the tests are fixed + SELECT citus_internal.restore_isolation_tester_func(); + SELECT 1 FROM master_add_node('localhost', 57637); SELECT 1 FROM master_add_node('localhost', 57638); @@ -9,6 +12,9 @@ setup teardown { + -- replace pg_isolation_test_session_is_blocked so that next tests are run with Citus implementation + SELECT citus_internal.replace_isolation_tester_func(); + DROP TABLE t1; -- remove the nodes again diff --git a/src/test/regress/spec/isolation_metadata_sync_deadlock.spec b/src/test/regress/spec/isolation_metadata_sync_deadlock.spec index 64b376395..67c20a2b2 100644 --- a/src/test/regress/spec/isolation_metadata_sync_deadlock.spec +++ b/src/test/regress/spec/isolation_metadata_sync_deadlock.spec @@ -26,7 +26,6 @@ teardown DROP TABLE deadlock_detection_test; DROP TABLE t2; SET citus.shard_replication_factor = 1; - SELECT citus_internal.restore_isolation_tester_func(); } session "s1" diff --git a/src/test/regress/spec/isolation_modify_with_subquery_vs_dml.spec b/src/test/regress/spec/isolation_modify_with_subquery_vs_dml.spec index 89835dd30..ae5a08e0a 100644 --- a/src/test/regress/spec/isolation_modify_with_subquery_vs_dml.spec +++ b/src/test/regress/spec/isolation_modify_with_subquery_vs_dml.spec @@ -1,7 +1,5 @@ setup { - SELECT citus_internal.replace_isolation_tester_func(); - SELECT citus_internal.refresh_isolation_tester_prepared_statement(); SET citus.shard_replication_factor to 2; CREATE TABLE users_test_table(user_id int, value_1 int, value_2 int, value_3 int); SELECT create_distributed_table('users_test_table', 'user_id'); @@ -31,7 +29,6 @@ teardown DROP TABLE users_test_table; DROP TABLE events_test_table; SET citus.shard_replication_factor to 1; - SELECT citus_internal.restore_isolation_tester_func(); } session "s1" diff --git a/src/test/regress/spec/isolation_multi_shard_modify_vs_all.spec b/src/test/regress/spec/isolation_multi_shard_modify_vs_all.spec index 61ecd1a28..60216f27f 100644 --- a/src/test/regress/spec/isolation_multi_shard_modify_vs_all.spec +++ b/src/test/regress/spec/isolation_multi_shard_modify_vs_all.spec @@ -1,8 +1,5 @@ setup { - SELECT citus_internal.replace_isolation_tester_func(); - SELECT citus_internal.refresh_isolation_tester_prepared_statement(); - SET citus.shard_replication_factor to 1; SET citus.shard_count to 32; SET citus.multi_shard_modify_mode to 'parallel'; @@ -34,7 +31,6 @@ teardown { DROP TABLE users_test_table; DROP TABLE events_test_table; - SELECT citus_internal.restore_isolation_tester_func(); SET citus.shard_count to 4; } diff --git a/src/test/regress/spec/isolation_multiuser_locking.spec b/src/test/regress/spec/isolation_multiuser_locking.spec index 177b0f778..5891ca622 100644 --- a/src/test/regress/spec/isolation_multiuser_locking.spec +++ b/src/test/regress/spec/isolation_multiuser_locking.spec @@ -1,9 +1,6 @@ setup { SET citus.max_cached_conns_per_worker to 0; - SELECT citus_internal.replace_isolation_tester_func(); - SELECT citus_internal.refresh_isolation_tester_prepared_statement(); - SET citus.shard_replication_factor TO 1; CREATE USER test_user_1; @@ -17,8 +14,6 @@ setup teardown { - SELECT citus_internal.restore_isolation_tester_func(); - BEGIN; DROP TABLE IF EXISTS test_table; DROP USER test_user_1, test_user_2; diff --git a/src/test/regress/spec/isolation_mx_common.include.spec b/src/test/regress/spec/isolation_mx_common.include.spec index ed70908ac..fec4b2b98 100644 --- a/src/test/regress/spec/isolation_mx_common.include.spec +++ b/src/test/regress/spec/isolation_mx_common.include.spec @@ -29,9 +29,6 @@ setup AS 'citus', $$stop_session_level_connection_to_node$$; RESET citus.enable_metadata_sync; - SELECT citus_internal.replace_isolation_tester_func(); - SELECT citus_internal.refresh_isolation_tester_prepared_statement(); - -- start_metadata_sync_to_node can not be run inside a transaction block -- following is a workaround to overcome that -- port numbers are hard coded at the moment diff --git a/src/test/regress/spec/isolation_rebalancer_deferred_drop.spec b/src/test/regress/spec/isolation_rebalancer_deferred_drop.spec index f2e566936..7de6d69cc 100644 --- a/src/test/regress/spec/isolation_rebalancer_deferred_drop.spec +++ b/src/test/regress/spec/isolation_rebalancer_deferred_drop.spec @@ -23,9 +23,6 @@ setup LANGUAGE C STRICT VOLATILE AS 'citus', $$stop_session_level_connection_to_node$$; - SELECT citus_internal.replace_isolation_tester_func(); - SELECT citus_internal.refresh_isolation_tester_prepared_statement(); - CREATE OR REPLACE PROCEDURE isolation_cleanup_orphaned_shards() LANGUAGE C AS 'citus', $$isolation_cleanup_orphaned_shards$$; @@ -44,8 +41,6 @@ COMMENT ON PROCEDURE isolation_cleanup_orphaned_shards() teardown { - SELECT citus_internal.restore_isolation_tester_func(); - DROP TABLE selected_shard; DROP TABLE t1; } diff --git a/src/test/regress/spec/isolation_ref2ref_foreign_keys.spec b/src/test/regress/spec/isolation_ref2ref_foreign_keys.spec index d92ee5357..6137df058 100644 --- a/src/test/regress/spec/isolation_ref2ref_foreign_keys.spec +++ b/src/test/regress/spec/isolation_ref2ref_foreign_keys.spec @@ -1,8 +1,5 @@ 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'); @@ -20,7 +17,6 @@ setup teardown { DROP TABLE ref_table_1, ref_table_2, ref_table_3; - SELECT citus_internal.restore_isolation_tester_func(); } session "s1" diff --git a/src/test/regress/spec/isolation_ref2ref_foreign_keys_on_mx.spec b/src/test/regress/spec/isolation_ref2ref_foreign_keys_on_mx.spec index 2f7a0b74c..2d0fc9df0 100644 --- a/src/test/regress/spec/isolation_ref2ref_foreign_keys_on_mx.spec +++ b/src/test/regress/spec/isolation_ref2ref_foreign_keys_on_mx.spec @@ -19,7 +19,6 @@ setup teardown { DROP TABLE ref_table_1, ref_table_2, ref_table_3; - SELECT citus_internal.restore_isolation_tester_func(); } session "s1" diff --git a/src/test/regress/spec/isolation_ref_select_for_update_vs_all_on_mx.spec b/src/test/regress/spec/isolation_ref_select_for_update_vs_all_on_mx.spec index 8f7e89945..0adf1864a 100644 --- a/src/test/regress/spec/isolation_ref_select_for_update_vs_all_on_mx.spec +++ b/src/test/regress/spec/isolation_ref_select_for_update_vs_all_on_mx.spec @@ -11,7 +11,6 @@ setup teardown { DROP TABLE IF EXISTS ref_table CASCADE; - SELECT citus_internal.restore_isolation_tester_func(); } session "s1" diff --git a/src/test/regress/spec/isolation_ref_update_delete_upsert_vs_all_on_mx.spec b/src/test/regress/spec/isolation_ref_update_delete_upsert_vs_all_on_mx.spec index 6fc02d78e..d36e5c586 100644 --- a/src/test/regress/spec/isolation_ref_update_delete_upsert_vs_all_on_mx.spec +++ b/src/test/regress/spec/isolation_ref_update_delete_upsert_vs_all_on_mx.spec @@ -11,7 +11,6 @@ setup teardown { DROP TABLE IF EXISTS ref_table CASCADE; - SELECT citus_internal.restore_isolation_tester_func(); } session "s1" diff --git a/src/test/regress/spec/isolation_reference_copy_vs_all.spec b/src/test/regress/spec/isolation_reference_copy_vs_all.spec index e08223db2..07dfdb5f2 100644 --- a/src/test/regress/spec/isolation_reference_copy_vs_all.spec +++ b/src/test/regress/spec/isolation_reference_copy_vs_all.spec @@ -5,8 +5,6 @@ // create append distributed table to test behavior of COPY in concurrent operations setup { - SELECT citus_internal.replace_isolation_tester_func(); - SELECT citus_internal.refresh_isolation_tester_prepared_statement(); SET citus.shard_replication_factor TO 1; CREATE TABLE reference_copy(id integer, data text, int_data int); SELECT create_reference_table('reference_copy'); @@ -16,7 +14,6 @@ setup teardown { DROP TABLE IF EXISTS reference_copy CASCADE; - SELECT citus_internal.restore_isolation_tester_func(); } // session 1 diff --git a/src/test/regress/spec/isolation_reference_on_mx.spec b/src/test/regress/spec/isolation_reference_on_mx.spec index 787928b4f..45e4bf905 100644 --- a/src/test/regress/spec/isolation_reference_on_mx.spec +++ b/src/test/regress/spec/isolation_reference_on_mx.spec @@ -12,7 +12,6 @@ setup teardown { DROP TABLE ref_table; - SELECT citus_internal.restore_isolation_tester_func(); } session "s1" diff --git a/src/test/regress/spec/isolation_replace_wait_function.spec b/src/test/regress/spec/isolation_replace_wait_function.spec index 5790ef57f..bf7f8a03d 100644 --- a/src/test/regress/spec/isolation_replace_wait_function.spec +++ b/src/test/regress/spec/isolation_replace_wait_function.spec @@ -5,8 +5,6 @@ setup { - SELECT citus_internal.replace_isolation_tester_func(); - SELECT citus_internal.refresh_isolation_tester_prepared_statement(); select setval('pg_dist_shardid_seq', GREATEST(1400000, nextval('pg_dist_shardid_seq'))); CREATE TABLE test_locking (a int unique); @@ -16,7 +14,6 @@ setup teardown { DROP TABLE test_locking; - SELECT citus_internal.restore_isolation_tester_func(); } session "s1" 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 11f260bfd..69f10a339 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 @@ -1,8 +1,5 @@ setup { - SELECT citus_internal.replace_isolation_tester_func(); - SELECT citus_internal.refresh_isolation_tester_prepared_statement(); - CREATE TABLE ref_table(a int primary key); SELECT create_reference_table('ref_table'); INSERT INTO ref_table VALUES (1), (3), (5), (7); @@ -13,7 +10,6 @@ setup teardown { - SELECT citus_internal.restore_isolation_tester_func(); DROP TABLE ref_table, dist_table; SELECT master_remove_node('localhost', 57636); } diff --git a/src/test/regress/spec/isolation_replicated_dist_on_mx.spec b/src/test/regress/spec/isolation_replicated_dist_on_mx.spec index b1e59d512..f3dd18816 100644 --- a/src/test/regress/spec/isolation_replicated_dist_on_mx.spec +++ b/src/test/regress/spec/isolation_replicated_dist_on_mx.spec @@ -25,7 +25,6 @@ setup teardown { DROP TABLE replicated_table, replicated_table_2, single_replicated_table; - SELECT citus_internal.restore_isolation_tester_func(); } session "s1" diff --git a/src/test/regress/spec/isolation_select_for_update.spec b/src/test/regress/spec/isolation_select_for_update.spec index 4dcd2f42c..d92884aed 100644 --- a/src/test/regress/spec/isolation_select_for_update.spec +++ b/src/test/regress/spec/isolation_select_for_update.spec @@ -1,9 +1,6 @@ setup { - SELECT citus_internal.replace_isolation_tester_func(); - SELECT citus_internal.refresh_isolation_tester_prepared_statement(); - SET citus.shard_replication_factor to 1; CREATE TABLE test_table_1_rf1(id int, val_1 int); @@ -28,8 +25,6 @@ teardown DROP TABLE test_table_1_rf1 CASCADE; DROP TABLE test_table_2_rf1; DROP TABLE ref_table; - - SELECT citus_internal.restore_isolation_tester_func(); } session "s1" diff --git a/src/test/regress/spec/isolation_select_vs_all.spec b/src/test/regress/spec/isolation_select_vs_all.spec index 2aebcc7bb..741dd1809 100644 --- a/src/test/regress/spec/isolation_select_vs_all.spec +++ b/src/test/regress/spec/isolation_select_vs_all.spec @@ -5,9 +5,6 @@ // create range distributed table to test behavior of SELECT in concurrent operations setup { - SELECT citus_internal.replace_isolation_tester_func(); - SELECT citus_internal.refresh_isolation_tester_prepared_statement(); - SET citus.shard_replication_factor TO 1; SET citus.next_shard_id TO 6780300; CREATE TABLE select_append(id integer, data text, int_data int); @@ -19,7 +16,6 @@ setup teardown { DROP TABLE IF EXISTS select_append CASCADE; - SELECT citus_internal.restore_isolation_tester_func(); } // session 1 diff --git a/src/test/regress/spec/isolation_select_vs_all_on_mx.spec b/src/test/regress/spec/isolation_select_vs_all_on_mx.spec index 66201af7f..0bac9b42f 100644 --- a/src/test/regress/spec/isolation_select_vs_all_on_mx.spec +++ b/src/test/regress/spec/isolation_select_vs_all_on_mx.spec @@ -12,7 +12,6 @@ setup teardown { DROP TABLE IF EXISTS select_table CASCADE; - SELECT citus_internal.restore_isolation_tester_func(); } session "s1" diff --git a/src/test/regress/spec/isolation_setup.spec b/src/test/regress/spec/isolation_setup.spec new file mode 100644 index 000000000..0a69a2c9d --- /dev/null +++ b/src/test/regress/spec/isolation_setup.spec @@ -0,0 +1,15 @@ +session "s1" +step "setup" +{ + -- Replace pg_isolation_test_session_is_blocked so that all isolation tests are run with Citus implementation. + -- + -- Vanilla PG only checks for local blocks, whereas citus implementation also checks worker jobs in distributed + -- transactions. + -- + -- We have some tests that do not produce deterministic outputs when we use the Citus UDFs. They restore this + -- function in the setup phase and replace it again on the teardown phase so that the remainder of the tests can + -- keep using the Citus alternatives. Those tests should never be run concurrently with other isolation tests. + SELECT citus_internal.replace_isolation_tester_func(); +} + +permutation "setup" diff --git a/src/test/regress/spec/isolation_shard_rebalancer_progress.spec b/src/test/regress/spec/isolation_shard_rebalancer_progress.spec index d2248292d..9e7bcca25 100644 --- a/src/test/regress/spec/isolation_shard_rebalancer_progress.spec +++ b/src/test/regress/spec/isolation_shard_rebalancer_progress.spec @@ -1,7 +1,5 @@ setup { - SELECT citus_internal.replace_isolation_tester_func(); - SELECT citus_internal.refresh_isolation_tester_prepared_statement(); select setval('pg_dist_shardid_seq', GREATEST(1500000, nextval('pg_dist_shardid_seq'))); SET citus.shard_count TO 4; SET citus.shard_replication_factor TO 1; @@ -23,7 +21,6 @@ teardown { DROP TABLE colocated2; DROP TABLE colocated1; - SELECT citus_internal.restore_isolation_tester_func(); } session "s1" diff --git a/src/test/regress/spec/isolation_truncate_vs_all.spec b/src/test/regress/spec/isolation_truncate_vs_all.spec index dd8cb7c2c..e9fe6ba35 100644 --- a/src/test/regress/spec/isolation_truncate_vs_all.spec +++ b/src/test/regress/spec/isolation_truncate_vs_all.spec @@ -5,9 +5,6 @@ // create range distributed table to test behavior of TRUNCATE in concurrent operations setup { - SELECT citus_internal.replace_isolation_tester_func(); - SELECT citus_internal.refresh_isolation_tester_prepared_statement(); - SET citus.shard_replication_factor TO 1; SET citus.next_shard_id TO 5990340; CREATE TABLE truncate_append(id integer, data text); @@ -19,8 +16,6 @@ setup teardown { DROP TABLE IF EXISTS truncate_append CASCADE; - - SELECT citus_internal.restore_isolation_tester_func(); } // session 1 diff --git a/src/test/regress/spec/isolation_truncate_vs_all_on_mx.spec b/src/test/regress/spec/isolation_truncate_vs_all_on_mx.spec index ac87c4b05..779170b00 100644 --- a/src/test/regress/spec/isolation_truncate_vs_all_on_mx.spec +++ b/src/test/regress/spec/isolation_truncate_vs_all_on_mx.spec @@ -24,7 +24,6 @@ teardown DROP TABLE IF EXISTS referencing_table_2; DROP TABLE IF EXISTS referencing_table_1; DROP TABLE IF EXISTS truncate_table CASCADE; - SELECT citus_internal.restore_isolation_tester_func(); } session "s1" diff --git a/src/test/regress/spec/isolation_undistribute_table.spec b/src/test/regress/spec/isolation_undistribute_table.spec index c3ae23ed5..cd08364a2 100644 --- a/src/test/regress/spec/isolation_undistribute_table.spec +++ b/src/test/regress/spec/isolation_undistribute_table.spec @@ -1,8 +1,5 @@ setup { - SELECT citus_internal.replace_isolation_tester_func(); - SELECT citus_internal.refresh_isolation_tester_prepared_statement(); - CREATE TABLE dist_table(a INT, b INT); SELECT create_distributed_table('dist_table', 'a'); INSERT INTO dist_table VALUES (1, 2), (3, 4), (5, 6); @@ -11,7 +8,6 @@ setup teardown { DROP TABLE IF EXISTS dist_table; - SELECT citus_internal.restore_isolation_tester_func(); } session "s1" diff --git a/src/test/regress/spec/isolation_update_delete_upsert_vs_all_on_mx.spec b/src/test/regress/spec/isolation_update_delete_upsert_vs_all_on_mx.spec index b91b50390..4d8aa5330 100644 --- a/src/test/regress/spec/isolation_update_delete_upsert_vs_all_on_mx.spec +++ b/src/test/regress/spec/isolation_update_delete_upsert_vs_all_on_mx.spec @@ -11,7 +11,6 @@ setup teardown { DROP TABLE IF EXISTS dist_table CASCADE; - SELECT citus_internal.restore_isolation_tester_func(); } session "s1" diff --git a/src/test/regress/spec/isolation_update_node.spec b/src/test/regress/spec/isolation_update_node.spec index 5ae6fcaa6..d6be6bfdc 100644 --- a/src/test/regress/spec/isolation_update_node.spec +++ b/src/test/regress/spec/isolation_update_node.spec @@ -1,5 +1,8 @@ setup { + -- revert back to pg_isolation_test_session_is_blocked until the tests are fixed + SELECT citus_internal.restore_isolation_tester_func(); + SELECT 1 FROM master_add_node('localhost', 57637); SELECT 1 FROM master_add_node('localhost', 57638); @@ -8,6 +11,9 @@ setup teardown { + -- replace pg_isolation_test_session_is_blocked so that next tests are run with Citus implementation + SELECT citus_internal.replace_isolation_tester_func(); + DROP TABLE IF EXISTS test; SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node; SELECT nodeid, nodename, nodeport from pg_dist_node ORDER BY 1 DESC; diff --git a/src/test/regress/spec/isolation_update_vs_all.spec b/src/test/regress/spec/isolation_update_vs_all.spec index 16da0aa63..1d249e0d4 100644 --- a/src/test/regress/spec/isolation_update_vs_all.spec +++ b/src/test/regress/spec/isolation_update_vs_all.spec @@ -5,9 +5,6 @@ // create range distributed table to test behavior of UPDATE in concurrent operations setup { - SELECT citus_internal.replace_isolation_tester_func(); - SELECT citus_internal.refresh_isolation_tester_prepared_statement(); - SET citus.shard_replication_factor TO 1; CREATE TABLE update_hash(id integer, data text); SELECT create_distributed_table('update_hash', 'id'); @@ -17,8 +14,6 @@ setup teardown { DROP TABLE IF EXISTS update_hash CASCADE; - - SELECT citus_internal.restore_isolation_tester_func(); } // session 1 diff --git a/src/test/regress/spec/isolation_upsert_vs_all.spec b/src/test/regress/spec/isolation_upsert_vs_all.spec index b8cc5cf23..a6c5fc339 100644 --- a/src/test/regress/spec/isolation_upsert_vs_all.spec +++ b/src/test/regress/spec/isolation_upsert_vs_all.spec @@ -5,9 +5,6 @@ // create range distributed table to test behavior of UPSERT in concurrent operations setup { - SELECT citus_internal.replace_isolation_tester_func(); - SELECT citus_internal.refresh_isolation_tester_prepared_statement(); - SET citus.shard_replication_factor TO 1; CREATE TABLE upsert_hash(id integer PRIMARY KEY, data text); SELECT create_distributed_table('upsert_hash', 'id'); @@ -17,8 +14,6 @@ setup teardown { DROP TABLE IF EXISTS upsert_hash CASCADE; - - SELECT citus_internal.restore_isolation_tester_func(); } // session 1