From a8f3f712ccf168f7b0bd7c1af0994fa961b82e48 Mon Sep 17 00:00:00 2001 From: Halil Ozan Akgul Date: Thu, 28 Oct 2021 14:16:24 +0300 Subject: [PATCH] Turns mx on in isolations tests --- .../regress/expected/isolation_ddl_vs_all.out | 34 +++++++++---------- .../expected/isolation_delete_vs_all.out | 10 +++--- .../isolation_dump_global_wait_edges.out | 18 +++++----- .../expected/isolation_hash_copy_vs_all.out | 10 +++--- .../isolation_insert_select_vs_all.out | 20 +++++------ .../expected/isolation_insert_vs_all.out | 20 +++++------ ...licate_reference_tables_to_coordinator.out | 8 ++--- .../expected/isolation_turn_mx_off_0.out | 23 +++++++++++++ .../regress/expected/isolation_turn_mx_on.out | 21 ++++++++++++ .../expected/isolation_turn_mx_on_0.out | 23 +++++++++++++ .../expected/isolation_update_vs_all.out | 20 +++++------ .../expected/isolation_upsert_vs_all.out | 10 +++--- src/test/regress/isolation_schedule | 16 +++++---- .../regress/spec/isolation_ddl_vs_all.spec | 2 +- .../regress/spec/isolation_delete_vs_all.spec | 2 +- .../spec/isolation_hash_copy_vs_all.spec | 2 +- .../spec/isolation_insert_select_vs_all.spec | 4 +-- .../regress/spec/isolation_insert_vs_all.spec | 2 +- .../regress/spec/isolation_turn_mx_on.spec | 18 ++++++++++ .../regress/spec/isolation_update_vs_all.spec | 2 +- .../regress/spec/isolation_upsert_vs_all.spec | 2 +- 21 files changed, 178 insertions(+), 89 deletions(-) create mode 100644 src/test/regress/expected/isolation_turn_mx_off_0.out create mode 100644 src/test/regress/expected/isolation_turn_mx_on.out create mode 100644 src/test/regress/expected/isolation_turn_mx_on_0.out create mode 100644 src/test/regress/spec/isolation_turn_mx_on.spec diff --git a/src/test/regress/expected/isolation_ddl_vs_all.out b/src/test/regress/expected/isolation_ddl_vs_all.out index 37aff5737..6d4aa5811 100644 --- a/src/test/regress/expected/isolation_ddl_vs_all.out +++ b/src/test/regress/expected/isolation_ddl_vs_all.out @@ -15,7 +15,7 @@ step s1-commit: COMMIT; step s2-ddl-create-index: <... completed> ERROR: duplicate key value violates unique constraint "pg_class_relname_nsp_index" step s2-commit: COMMIT; -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -41,7 +41,7 @@ step s2-ddl-create-index-concurrently: CREATE INDEX CONCURRENTLY ddl_hash_index step s1-commit: COMMIT; step s2-ddl-create-index-concurrently: <... completed> ERROR: relation "ddl_hash_index" already exists -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -68,7 +68,7 @@ step s2-ddl-add-column: ALTER TABLE ddl_hash ADD new_column_2 int DEFAULT 0; step s2-commit: COMMIT; -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -102,7 +102,7 @@ step s2-ddl-rename-column: ALTER TABLE ddl_hash RENAME data TO new_column; step s2-commit: COMMIT; -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -143,7 +143,7 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -175,7 +175,7 @@ run_command_on_workers (localhost,57638,t,"") (2 rows) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -263,7 +263,7 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -295,7 +295,7 @@ run_command_on_workers (localhost,57638,t,new_column) (2 rows) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -381,7 +381,7 @@ citus_total_relation_size step s1-commit: COMMIT; step s2-commit: COMMIT; -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -408,7 +408,7 @@ step s2-master-modify-multiple-shards: DELETE FROM ddl_hash; step s1-commit: COMMIT; step s2-master-modify-multiple-shards: <... completed> step s2-commit: COMMIT; -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -442,7 +442,7 @@ create_distributed_table (1 row) step s2-commit: COMMIT; -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,4) @@ -659,7 +659,7 @@ citus_total_relation_size step s2-ddl-create-index: CREATE INDEX ddl_hash_index ON ddl_hash(id); step s1-commit: COMMIT; step s2-commit: COMMIT; -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -686,7 +686,7 @@ step s2-ddl-create-index: CREATE INDEX ddl_hash_index ON ddl_hash(id); step s2-commit: COMMIT; -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -720,7 +720,7 @@ step s2-ddl-create-index: CREATE INDEX ddl_hash_index ON ddl_hash(id); step s2-commit: COMMIT; -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,4) @@ -749,7 +749,7 @@ citus_total_relation_size step s2-ddl-create-index-concurrently: CREATE INDEX CONCURRENTLY ddl_hash_index ON ddl_hash(id); step s1-commit: COMMIT; -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -774,7 +774,7 @@ step s1-master-modify-multiple-shards: DELETE FROM ddl_hash; step s2-ddl-create-index-concurrently: CREATE INDEX CONCURRENTLY ddl_hash_index ON ddl_hash(id); step s1-commit: COMMIT; step s2-ddl-create-index-concurrently: <... completed> -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -806,7 +806,7 @@ create_distributed_table step s2-ddl-create-index-concurrently: CREATE INDEX CONCURRENTLY ddl_hash_index ON ddl_hash(id); step s1-commit: COMMIT; step s2-ddl-create-index-concurrently: <... completed> -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,4) diff --git a/src/test/regress/expected/isolation_delete_vs_all.out b/src/test/regress/expected/isolation_delete_vs_all.out index 3ff50f909..4492451fe 100644 --- a/src/test/regress/expected/isolation_delete_vs_all.out +++ b/src/test/regress/expected/isolation_delete_vs_all.out @@ -94,7 +94,7 @@ count 4 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''delete_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''delete_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -128,7 +128,7 @@ count 4 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''delete_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''delete_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,0) @@ -159,7 +159,7 @@ count 4 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''delete_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''delete_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -404,7 +404,7 @@ count 4 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''delete_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''delete_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -438,7 +438,7 @@ count 4 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''delete_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''delete_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,0) 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 bd60e11a0..574b397ff 100644 --- a/src/test/regress/expected/isolation_dump_global_wait_edges.out +++ b/src/test/regress/expected/isolation_dump_global_wait_edges.out @@ -28,13 +28,13 @@ step detector-dump-wait-edges: waiting_transaction_num|blocking_transaction_num|blocking_transaction_waiting --------------------------------------------------------------------- - 401| 400|f + 405| 404|f (1 row) transactionnumber|waitingtransactionnumbers --------------------------------------------------------------------- - 400| - 401| 400 + 404| + 405| 404 (2 rows) step s1-abort: @@ -79,16 +79,16 @@ step detector-dump-wait-edges: waiting_transaction_num|blocking_transaction_num|blocking_transaction_waiting --------------------------------------------------------------------- - 405| 404|f - 406| 404|f - 406| 405|t + 409| 408|f + 410| 408|f + 410| 409|t (3 rows) transactionnumber|waitingtransactionnumbers --------------------------------------------------------------------- - 404| - 405|404 - 406|404,405 + 408| + 409|408 + 410|408,409 (3 rows) step s1-abort: 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 4cbaa0028..51a687dc2 100644 --- a/src/test/regress/expected/isolation_hash_copy_vs_all.out +++ b/src/test/regress/expected/isolation_hash_copy_vs_all.out @@ -222,7 +222,7 @@ count 10 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''hash_copy%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''hash_copy\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -249,7 +249,7 @@ count 10 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''hash_copy%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''hash_copy\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,0) @@ -275,7 +275,7 @@ count 10 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''hash_copy%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''hash_copy\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -778,7 +778,7 @@ count 10 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''hash_copy%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''hash_copy\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -805,7 +805,7 @@ count 10 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''hash_copy%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''hash_copy\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,0) diff --git a/src/test/regress/expected/isolation_insert_select_vs_all.out b/src/test/regress/expected/isolation_insert_select_vs_all.out index cb5ea7aea..88978bc5f 100644 --- a/src/test/regress/expected/isolation_insert_select_vs_all.out +++ b/src/test/regress/expected/isolation_insert_select_vs_all.out @@ -140,7 +140,7 @@ count 10 (1 row) -step s1-show-indexes-inserted: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_of_insert_select_hash%'''); +step s1-show-indexes-inserted: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_of_insert_select_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -172,7 +172,7 @@ count 10 (1 row) -step s1-show-indexes-inserted: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_of_insert_select_hash%'''); +step s1-show-indexes-inserted: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_of_insert_select_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,0) @@ -203,7 +203,7 @@ count 10 (1 row) -step s1-show-indexes-inserted: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_of_insert_select_hash%'''); +step s1-show-indexes-inserted: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_of_insert_select_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -535,7 +535,7 @@ count 10 (1 row) -step s1-show-indexes-selected: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''select_of_insert_select_hash%'''); +step s1-show-indexes-selected: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''select_of_insert_select_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -567,7 +567,7 @@ count 10 (1 row) -step s1-show-indexes-selected: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''select_of_insert_select_hash%'''); +step s1-show-indexes-selected: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''select_of_insert_select_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,0) @@ -598,7 +598,7 @@ count 10 (1 row) -step s1-show-indexes-selected: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''select_of_insert_select_hash%'''); +step s1-show-indexes-selected: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''select_of_insert_select_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,0) @@ -928,7 +928,7 @@ count 10 (1 row) -step s1-show-indexes-inserted: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_of_insert_select_hash%'''); +step s1-show-indexes-inserted: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_of_insert_select_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -960,7 +960,7 @@ count 10 (1 row) -step s1-show-indexes-inserted: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_of_insert_select_hash%'''); +step s1-show-indexes-inserted: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_of_insert_select_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,0) @@ -1287,7 +1287,7 @@ count 10 (1 row) -step s1-show-indexes-selected: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''select_of_insert_select_hash%'''); +step s1-show-indexes-selected: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''select_of_insert_select_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -1319,7 +1319,7 @@ count 10 (1 row) -step s1-show-indexes-selected: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''select_of_insert_select_hash%'''); +step s1-show-indexes-selected: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''select_of_insert_select_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,0) diff --git a/src/test/regress/expected/isolation_insert_vs_all.out b/src/test/regress/expected/isolation_insert_vs_all.out index 33ce3ac69..546849347 100644 --- a/src/test/regress/expected/isolation_insert_vs_all.out +++ b/src/test/regress/expected/isolation_insert_vs_all.out @@ -178,7 +178,7 @@ count 6 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -205,7 +205,7 @@ count 6 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,0) @@ -231,7 +231,7 @@ count 6 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -492,7 +492,7 @@ count 6 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -519,7 +519,7 @@ count 6 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,0) @@ -779,7 +779,7 @@ count 8 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -806,7 +806,7 @@ count 8 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,0) @@ -832,7 +832,7 @@ count 8 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -1093,7 +1093,7 @@ count 8 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -1120,7 +1120,7 @@ count 8 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,0) diff --git a/src/test/regress/expected/isolation_replicate_reference_tables_to_coordinator.out b/src/test/regress/expected/isolation_replicate_reference_tables_to_coordinator.out index df9b77179..fd24672e1 100644 --- a/src/test/regress/expected/isolation_replicate_reference_tables_to_coordinator.out +++ b/src/test/regress/expected/isolation_replicate_reference_tables_to_coordinator.out @@ -106,10 +106,10 @@ step s2-view-worker: query |query_hostname |query_hostport|distributed_query_host_name|distributed_query_host_port|state |wait_event_type|wait_event|usename |datname --------------------------------------------------------------------- -UPDATE public.ref_table_1400163 ref_table SET a = (a OPERATOR(pg_catalog.+) 1)|localhost | 57638|coordinator_host | 57636|idle in transaction|Client |ClientRead|postgres|regression -UPDATE public.ref_table_1400163 ref_table SET a = (a OPERATOR(pg_catalog.+) 1)|localhost | 57637|coordinator_host | 57636|idle in transaction|Client |ClientRead|postgres|regression -UPDATE public.ref_table_1400163 ref_table SET a = (a OPERATOR(pg_catalog.+) 1)|coordinator_host| 57636|coordinator_host | 57636|idle in transaction|Client |ClientRead|postgres|regression -UPDATE public.ref_table_1400163 ref_table SET a = (a OPERATOR(pg_catalog.+) 1)|localhost | 57636|coordinator_host | 57636|idle in transaction|Client |ClientRead|postgres|regression +UPDATE public.ref_table_1500379 ref_table SET a = (a OPERATOR(pg_catalog.+) 1)|localhost | 57638|coordinator_host | 57636|idle in transaction|Client |ClientRead|postgres|regression +UPDATE public.ref_table_1500379 ref_table SET a = (a OPERATOR(pg_catalog.+) 1)|localhost | 57637|coordinator_host | 57636|idle in transaction|Client |ClientRead|postgres|regression +UPDATE public.ref_table_1500379 ref_table SET a = (a OPERATOR(pg_catalog.+) 1)|coordinator_host| 57636|coordinator_host | 57636|idle in transaction|Client |ClientRead|postgres|regression +UPDATE public.ref_table_1500379 ref_table SET a = (a OPERATOR(pg_catalog.+) 1)|localhost | 57636|coordinator_host | 57636|idle in transaction|Client |ClientRead|postgres|regression (4 rows) step s2-end: diff --git a/src/test/regress/expected/isolation_turn_mx_off_0.out b/src/test/regress/expected/isolation_turn_mx_off_0.out new file mode 100644 index 000000000..763e806fb --- /dev/null +++ b/src/test/regress/expected/isolation_turn_mx_off_0.out @@ -0,0 +1,23 @@ +Parsed test spec with 1 sessions + +starting permutation: disable-mx-by-default reload stop-metadata-sync +step disable-mx-by-default: + ALTER SYSTEM SET citus.enable_metadata_sync_by_default TO OFF; + +step reload: + SELECT pg_reload_conf(); + +pg_reload_conf +--------------------------------------------------------------------- +t +(1 row) + +step stop-metadata-sync: + SELECT stop_metadata_sync_to_node(nodename, nodeport) FROM pg_dist_node WHERE isactive = 't' and noderole = 'primary'; + +stop_metadata_sync_to_node +--------------------------------------------------------------------- + + +(2 rows) + diff --git a/src/test/regress/expected/isolation_turn_mx_on.out b/src/test/regress/expected/isolation_turn_mx_on.out new file mode 100644 index 000000000..27a855dc4 --- /dev/null +++ b/src/test/regress/expected/isolation_turn_mx_on.out @@ -0,0 +1,21 @@ +Parsed test spec with 1 sessions + +starting permutation: enable-mx-by-default reload start-metadata-sync +step enable-mx-by-default: + ALTER SYSTEM SET citus.enable_metadata_sync_by_default TO ON; + +step reload: + SELECT pg_reload_conf(); + +pg_reload_conf +--------------------------------------------------------------------- +t +(1 row) + +step start-metadata-sync: + SELECT start_metadata_sync_to_node(nodename, nodeport) FROM pg_dist_node WHERE isactive = 't' and noderole = 'primary'; + +start_metadata_sync_to_node +--------------------------------------------------------------------- +(0 rows) + diff --git a/src/test/regress/expected/isolation_turn_mx_on_0.out b/src/test/regress/expected/isolation_turn_mx_on_0.out new file mode 100644 index 000000000..4d7889487 --- /dev/null +++ b/src/test/regress/expected/isolation_turn_mx_on_0.out @@ -0,0 +1,23 @@ +Parsed test spec with 1 sessions + +starting permutation: enable-mx-by-default reload start-metadata-sync +step enable-mx-by-default: + ALTER SYSTEM SET citus.enable_metadata_sync_by_default TO ON; + +step reload: + SELECT pg_reload_conf(); + +pg_reload_conf +--------------------------------------------------------------------- +t +(1 row) + +step start-metadata-sync: + SELECT start_metadata_sync_to_node(nodename, nodeport) FROM pg_dist_node WHERE isactive = 't' and noderole = 'primary'; + +start_metadata_sync_to_node +--------------------------------------------------------------------- + + +(2 rows) + diff --git a/src/test/regress/expected/isolation_update_vs_all.out b/src/test/regress/expected/isolation_update_vs_all.out index 699d2cd45..f35f28317 100644 --- a/src/test/regress/expected/isolation_update_vs_all.out +++ b/src/test/regress/expected/isolation_update_vs_all.out @@ -156,7 +156,7 @@ count 5 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''update_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''update_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -190,7 +190,7 @@ count 5 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''update_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''update_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,0) @@ -221,7 +221,7 @@ count 5 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''update_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''update_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -537,7 +537,7 @@ count 5 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''update_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''update_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -576,7 +576,7 @@ count 5 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''update_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''update_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,0) @@ -612,7 +612,7 @@ count 5 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''update_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''update_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -901,7 +901,7 @@ count 5 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''update_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''update_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -935,7 +935,7 @@ count 5 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''update_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''update_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,0) @@ -1246,7 +1246,7 @@ count 5 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''update_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''update_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -1285,7 +1285,7 @@ count 5 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''update_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''update_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,0) diff --git a/src/test/regress/expected/isolation_upsert_vs_all.out b/src/test/regress/expected/isolation_upsert_vs_all.out index 6ff827812..dfad2f3c1 100644 --- a/src/test/regress/expected/isolation_upsert_vs_all.out +++ b/src/test/regress/expected/isolation_upsert_vs_all.out @@ -146,7 +146,7 @@ count 5 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''upsert_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''upsert_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,4) @@ -180,7 +180,7 @@ count 5 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''upsert_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''upsert_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) @@ -211,7 +211,7 @@ count 5 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''upsert_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''upsert_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,4) @@ -534,7 +534,7 @@ count 5 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''upsert_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''upsert_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,4) @@ -568,7 +568,7 @@ count 5 (1 row) -step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''upsert_hash%'''); +step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''upsert_hash\_%'''); run_command_on_workers --------------------------------------------------------------------- (localhost,57637,t,2) diff --git a/src/test/regress/isolation_schedule b/src/test/regress/isolation_schedule index 5c486511a..a43391504 100644 --- a/src/test/regress/isolation_schedule +++ b/src/test/regress/isolation_schedule @@ -1,11 +1,12 @@ -test: isolation_turn_mx_off test: isolation_add_remove_node +test: isolation_turn_mx_off test: isolation_update_node test: isolation_update_node_lock_writes +test: isolation_ensure_dependency_activate_node +test: isolation_turn_mx_on test: isolation_add_node_vs_reference_table_operations test: isolation_create_table_vs_add_remove_node test: isolation_master_update_node -test: isolation_ensure_dependency_activate_node test: isolation_shouldhaveshards test: isolation_extension_commands @@ -33,7 +34,6 @@ test: isolation_dump_local_wait_edges test: isolation_replace_wait_function test: isolation_distributed_deadlock_detection -test: isolation_replicate_reference_tables_to_coordinator test: isolation_create_citus_local_table # creating a restore point briefly blocks all @@ -46,7 +46,6 @@ test: isolation_modify_with_subquery_vs_dml test: isolation_hash_copy_vs_all test: isolation_append_copy_vs_all test: isolation_range_copy_vs_all -test: isolation_reference_copy_vs_all test: isolation_partitioned_copy_vs_all test: isolation_select_vs_all test: isolation_insert_vs_all @@ -61,8 +60,6 @@ test: isolation_ddl_vs_all test: isolation_get_all_active_transactions test: isolation_validate_vs_insert test: isolation_insert_select_conflict -test: isolation_ref2ref_foreign_keys -test: isolation_multiuser_locking test: shared_connection_waits test: isolation_cancellation test: isolation_undistribute_table @@ -93,3 +90,10 @@ test: isolation_ref_select_for_update_vs_all_on_mx test: isolation_ref_update_delete_upsert_vs_all_on_mx test: isolation_dis2ref_foreign_keys_on_mx test: isolation_metadata_sync_deadlock + +# MXless tests +test: isolation_turn_mx_off +test: isolation_replicate_reference_tables_to_coordinator +test: isolation_reference_copy_vs_all +test: isolation_ref2ref_foreign_keys +test: isolation_multiuser_locking diff --git a/src/test/regress/spec/isolation_ddl_vs_all.spec b/src/test/regress/spec/isolation_ddl_vs_all.spec index 81a0501cf..2d672f3c1 100644 --- a/src/test/regress/spec/isolation_ddl_vs_all.spec +++ b/src/test/regress/spec/isolation_ddl_vs_all.spec @@ -33,7 +33,7 @@ step "s1-master-modify-multiple-shards" { DELETE FROM ddl_hash; } step "s1-drop" { DROP TABLE ddl_hash; } step "s1-create-non-distributed-table" { CREATE TABLE ddl_hash(id integer, data text); COPY ddl_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV; } step "s1-distribute-table" { SELECT create_distributed_table('ddl_hash', 'id'); } -step "s1-show-indexes" { SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash%'''); } +step "s1-show-indexes" { SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''ddl_hash\_%'''); } step "s1-show-columns" { SELECT run_command_on_workers('SELECT column_name FROM information_schema.columns WHERE table_name LIKE ''ddl_hash%'' AND column_name = ''new_column'' ORDER BY 1 LIMIT 1'); } step "s1-commit" { COMMIT; } diff --git a/src/test/regress/spec/isolation_delete_vs_all.spec b/src/test/regress/spec/isolation_delete_vs_all.spec index b93baf43b..2b612f0d1 100644 --- a/src/test/regress/spec/isolation_delete_vs_all.spec +++ b/src/test/regress/spec/isolation_delete_vs_all.spec @@ -37,7 +37,7 @@ step "s1-table-size" { SELECT citus_total_relation_size('delete_hash'); } step "s1-create-non-distributed-table" { CREATE TABLE delete_hash(id integer, data text); COPY delete_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV; } step "s1-distribute-table" { SELECT create_distributed_table('delete_hash', 'id'); } step "s1-select-count" { SELECT COUNT(*) FROM delete_hash; } -step "s1-show-indexes" { SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''delete_hash%'''); } +step "s1-show-indexes" { SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''delete_hash\_%'''); } step "s1-show-columns" { SELECT run_command_on_workers('SELECT column_name FROM information_schema.columns WHERE table_name LIKE ''delete_hash%'' AND column_name = ''new_column'' ORDER BY 1 LIMIT 1'); } step "s1-commit" { COMMIT; } 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 140c224b5..c0c9c7cae 100644 --- a/src/test/regress/spec/isolation_hash_copy_vs_all.spec +++ b/src/test/regress/spec/isolation_hash_copy_vs_all.spec @@ -46,7 +46,7 @@ step "s1-master-drop-all-shards" { SELECT citus_drop_all_shards('hash_copy'::reg step "s1-create-non-distributed-table" { CREATE TABLE hash_copy(id integer, data text, int_data int); 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-distribute-table" { SELECT create_distributed_table('hash_copy', 'id'); } step "s1-select-count" { SELECT COUNT(*) FROM hash_copy; } -step "s1-show-indexes" { SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''hash_copy%'''); } +step "s1-show-indexes" { SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''hash_copy\_%'''); } step "s1-show-columns" { SELECT run_command_on_workers('SELECT column_name FROM information_schema.columns WHERE table_name LIKE ''hash_copy%'' AND column_name = ''new_column'' ORDER BY 1 LIMIT 1'); } step "s1-commit" { COMMIT; } step "s1-recreate-with-replication-2" diff --git a/src/test/regress/spec/isolation_insert_select_vs_all.spec b/src/test/regress/spec/isolation_insert_select_vs_all.spec index 97e2d8a96..3a21663c2 100644 --- a/src/test/regress/spec/isolation_insert_select_vs_all.spec +++ b/src/test/regress/spec/isolation_insert_select_vs_all.spec @@ -44,7 +44,7 @@ step "s1-master-modify-multiple-shards-on-inserted" { DELETE FROM insert_of_inse step "s1-master-drop-all-shards-on-inserted" { SELECT citus_drop_all_shards('insert_of_insert_select_hash'::regclass, 'public', 'insert_of_insert_select_hash'); } step "s1-create-non-distributed-table-on-inserted" { CREATE TABLE insert_of_insert_select_hash(id integer, data text); } step "s1-distribute-table-on-inserted" { SELECT create_distributed_table('insert_of_insert_select_hash', 'id'); } -step "s1-show-indexes-inserted" { SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_of_insert_select_hash%'''); } +step "s1-show-indexes-inserted" { SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_of_insert_select_hash\_%'''); } step "s1-show-columns-inserted" { SELECT run_command_on_workers('SELECT column_name FROM information_schema.columns WHERE table_name LIKE ''insert_of_insert_select_hash%'' AND column_name = ''new_column'' ORDER BY 1 LIMIT 1'); } step "s1-update-on-selected" { UPDATE select_of_insert_select_hash SET data = 'l' WHERE id = 4; } step "s1-delete-on-selected" { DELETE FROM select_of_insert_select_hash WHERE id = 4; } @@ -60,7 +60,7 @@ step "s1-master-modify-multiple-shards-on-selected" { DELETE FROM select_of_inse step "s1-master-drop-all-shards-on-selected" { SELECT citus_drop_all_shards('select_of_insert_select_hash'::regclass, 'public', 'select_of_insert_select_hash'); } step "s1-create-non-distributed-table-on-selected" { CREATE TABLE select_of_insert_select_hash(id integer, data text); } step "s1-distribute-table-on-selected" { SELECT create_distributed_table('select_of_insert_select_hash', 'id'); } -step "s1-show-indexes-selected" { SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''select_of_insert_select_hash%'''); } +step "s1-show-indexes-selected" { SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''select_of_insert_select_hash\_%'''); } step "s1-show-columns-selected" { SELECT run_command_on_workers('SELECT column_name FROM information_schema.columns WHERE table_name LIKE ''select_of_insert_select_hash%'' AND column_name = ''new_column'' ORDER BY 1 LIMIT 1'); } step "s1-select-count" { SELECT COUNT(*) FROM select_of_insert_select_hash; } step "s1-commit" { COMMIT; } diff --git a/src/test/regress/spec/isolation_insert_vs_all.spec b/src/test/regress/spec/isolation_insert_vs_all.spec index 36448fe42..4231ac329 100644 --- a/src/test/regress/spec/isolation_insert_vs_all.spec +++ b/src/test/regress/spec/isolation_insert_vs_all.spec @@ -37,7 +37,7 @@ step "s1-master-modify-multiple-shards" { DELETE FROM insert_hash; } step "s1-create-non-distributed-table" { CREATE TABLE insert_hash(id integer, data text); COPY insert_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV; } step "s1-distribute-table" { SELECT create_distributed_table('insert_hash', 'id'); } step "s1-select-count" { SELECT COUNT(*) FROM insert_hash; } -step "s1-show-indexes" { SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_hash%'''); } +step "s1-show-indexes" { SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''insert_hash\_%'''); } step "s1-show-columns" { SELECT run_command_on_workers('SELECT column_name FROM information_schema.columns WHERE table_name LIKE ''insert_hash%'' AND column_name = ''new_column'' ORDER BY 1 LIMIT 1'); } step "s1-commit" { COMMIT; } diff --git a/src/test/regress/spec/isolation_turn_mx_on.spec b/src/test/regress/spec/isolation_turn_mx_on.spec new file mode 100644 index 000000000..ebc49705f --- /dev/null +++ b/src/test/regress/spec/isolation_turn_mx_on.spec @@ -0,0 +1,18 @@ +session "s1" + +step "enable-mx-by-default" +{ + ALTER SYSTEM SET citus.enable_metadata_sync_by_default TO ON; +} + +step "reload" +{ + SELECT pg_reload_conf(); +} + +step "start-metadata-sync" +{ + SELECT start_metadata_sync_to_node(nodename, nodeport) FROM pg_dist_node WHERE isactive = 't' and noderole = 'primary'; +} + +permutation "enable-mx-by-default" "reload" "start-metadata-sync" diff --git a/src/test/regress/spec/isolation_update_vs_all.spec b/src/test/regress/spec/isolation_update_vs_all.spec index 50ee3ffbe..16da0aa63 100644 --- a/src/test/regress/spec/isolation_update_vs_all.spec +++ b/src/test/regress/spec/isolation_update_vs_all.spec @@ -40,7 +40,7 @@ step "s1-master-modify-multiple-shards" { DELETE FROM update_hash; } step "s1-create-non-distributed-table" { CREATE TABLE update_hash(id integer, data text); COPY update_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV; } step "s1-distribute-table" { SELECT create_distributed_table('update_hash', 'id'); } step "s1-select-count" { SELECT COUNT(*) FROM update_hash; } -step "s1-show-indexes" { SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''update_hash%'''); } +step "s1-show-indexes" { SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''update_hash\_%'''); } step "s1-show-columns" { SELECT run_command_on_workers('SELECT column_name FROM information_schema.columns WHERE table_name LIKE ''update_hash%'' AND column_name = ''new_column'' ORDER BY 1 LIMIT 1'); } step "s1-commit" { COMMIT; } diff --git a/src/test/regress/spec/isolation_upsert_vs_all.spec b/src/test/regress/spec/isolation_upsert_vs_all.spec index b9f0db869..b8cc5cf23 100644 --- a/src/test/regress/spec/isolation_upsert_vs_all.spec +++ b/src/test/regress/spec/isolation_upsert_vs_all.spec @@ -39,7 +39,7 @@ step "s1-table-size" { SELECT citus_total_relation_size('upsert_hash'); } step "s1-master-modify-multiple-shards" { DELETE FROM upsert_hash; } step "s1-create-non-distributed-table" { CREATE TABLE upsert_hash(id integer PRIMARY KEY, data text); } step "s1-select-count" { SELECT COUNT(*) FROM upsert_hash; } -step "s1-show-indexes" { SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''upsert_hash%'''); } +step "s1-show-indexes" { SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''upsert_hash\_%'''); } step "s1-show-columns" { SELECT run_command_on_workers('SELECT column_name FROM information_schema.columns WHERE table_name LIKE ''upsert_hash%'' AND column_name = ''new_column'' ORDER BY 1 LIMIT 1'); } step "s1-commit" { COMMIT; }