diff --git a/src/test/regress/spec/isolation_add_node_vs_reference_table_operations.spec b/src/test/regress/spec/isolation_add_node_vs_reference_table_operations.spec index 72517669a..fd4eac77f 100644 --- a/src/test/regress/spec/isolation_add_node_vs_reference_table_operations.spec +++ b/src/test/regress/spec/isolation_add_node_vs_reference_table_operations.spec @@ -44,11 +44,6 @@ step "s1-add-second-worker" SELECT 1 FROM master_add_node('localhost', 57638); } -step "s1-remove-second-worker" -{ - SELECT master_remove_node('localhost', 57638); -} - step "s1-drop-reference-table" { DROP TABLE test_reference_table; diff --git a/src/test/regress/spec/isolation_add_remove_node.spec b/src/test/regress/spec/isolation_add_remove_node.spec index 40a008749..e8bbe62ed 100644 --- a/src/test/regress/spec/isolation_add_remove_node.spec +++ b/src/test/regress/spec/isolation_add_remove_node.spec @@ -45,11 +45,6 @@ step "s1-remove-node-1" SELECT * FROM master_remove_node('localhost', 57637); } -step "s1-remove-node-2" -{ - SELECT * FROM master_remove_node('localhost', 57638); -} - step "s1-abort" { ABORT; @@ -67,11 +62,6 @@ step "s1-show-nodes" session "s2" -step "s2-begin" -{ - BEGIN; -} - step "s2-add-node-1" { SELECT 1 FROM master_add_node('localhost', 57637); @@ -102,11 +92,6 @@ step "s2-remove-node-2" SELECT * FROM master_remove_node('localhost', 57638); } -step "s2-commit" -{ - COMMIT; -} - // session 1 adds a node, session 2 removes it, should be ok permutation "s1-begin" "s1-add-node-1" "s2-remove-node-1" "s1-commit" "s1-show-nodes" // add a different node from 2 sessions, should be ok diff --git a/src/test/regress/spec/isolation_append_copy_vs_all.spec b/src/test/regress/spec/isolation_append_copy_vs_all.spec index 0c2bc1b12..e6c1a03fc 100644 --- a/src/test/regress/spec/isolation_append_copy_vs_all.spec +++ b/src/test/regress/spec/isolation_append_copy_vs_all.spec @@ -40,7 +40,6 @@ step "s1-ddl-drop-index" { DROP INDEX append_copy_index; } step "s1-ddl-add-column" { ALTER TABLE append_copy ADD new_column int DEFAULT 0; } step "s1-ddl-drop-column" { ALTER TABLE append_copy DROP new_column; } step "s1-ddl-rename-column" { ALTER TABLE append_copy RENAME data TO new_column; } -step "s1-ddl-unique-constraint" { ALTER TABLE append_copy ADD CONSTRAINT append_copy_unique UNIQUE(id); } step "s1-table-size" { SELECT citus_total_relation_size('append_copy'); } step "s1-master-apply-delete-command" { SELECT master_apply_delete_command('DELETE FROM append_copy WHERE id <= 4;'); } step "s1-master-drop-all-shards" { SELECT master_drop_all_shards('append_copy'::regclass, 'public', 'append_copy'); } @@ -54,7 +53,6 @@ step "s1-commit" { COMMIT; } // session 2 session "s2" step "s2-copy" { COPY append_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-copy-additional-column" { COPY append_copy FROM PROGRAM 'echo 5, f, 5, 5 && echo 6, g, 6, 6 && echo 7, h, 7, 7 && echo 8, i, 8, 8 && echo 9, j, 9, 9' WITH CSV; } step "s2-router-select" { SELECT * FROM append_copy WHERE id = 1; } step "s2-real-time-select" { SELECT * FROM append_copy ORDER BY 1, 2; } step "s2-adaptive-select" 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 53292f48a..92fb26e73 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 @@ -79,11 +79,6 @@ step "s2-select-for-update" SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM copy_table WHERE id=5 FOR UPDATE'); } -step "s2-coordinator-create-index-concurrently" -{ - CREATE INDEX CONCURRENTLY copy_table_index ON copy_table(id); -} - step "s2-commit-worker" { SELECT run_commands_on_session_level_connection_to_node('COMMIT'); diff --git a/src/test/regress/spec/isolation_create_table_vs_add_remove_node.spec b/src/test/regress/spec/isolation_create_table_vs_add_remove_node.spec index bb03b843b..2f91ae1a7 100644 --- a/src/test/regress/spec/isolation_create_table_vs_add_remove_node.spec +++ b/src/test/regress/spec/isolation_create_table_vs_add_remove_node.spec @@ -38,16 +38,6 @@ step "s1-commit" COMMIT; } -step "s1-query-table" -{ - SELECT * FROM dist_table; -} - -step "s1-show-nodes" -{ - SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport; -} - step "s1-show-placements" { SELECT diff --git a/src/test/regress/spec/isolation_ddl_vs_all.spec b/src/test/regress/spec/isolation_ddl_vs_all.spec index 84603ba2c..81a0501cf 100644 --- a/src/test/regress/spec/isolation_ddl_vs_all.spec +++ b/src/test/regress/spec/isolation_ddl_vs_all.spec @@ -26,16 +26,13 @@ session "s1" step "s1-initialize" { COPY ddl_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV; } step "s1-begin" { BEGIN; } step "s1-ddl-create-index" { CREATE INDEX ddl_hash_index ON ddl_hash(id); } -step "s1-ddl-drop-index" { DROP INDEX ddl_hash_index; } step "s1-ddl-add-column" { ALTER TABLE ddl_hash ADD new_column_1 int DEFAULT 0; } -step "s1-ddl-drop-column" { ALTER TABLE ddl_hash DROP new_column_2; } step "s1-ddl-rename-column" { ALTER TABLE ddl_hash RENAME data TO new_column; } step "s1-table-size" { SELECT citus_total_relation_size('ddl_hash'); } 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-select-count" { SELECT COUNT(*) FROM 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; } @@ -44,16 +41,12 @@ step "s1-commit" { COMMIT; } session "s2" step "s2-begin" { BEGIN; } step "s2-ddl-create-index" { CREATE INDEX ddl_hash_index ON ddl_hash(id); } -step "s2-ddl-drop-index" { DROP INDEX ddl_hash_index; } step "s2-ddl-create-index-concurrently" { CREATE INDEX CONCURRENTLY ddl_hash_index ON ddl_hash(id); } step "s2-ddl-add-column" { ALTER TABLE ddl_hash ADD new_column_2 int DEFAULT 0; } -step "s2-ddl-drop-column" { ALTER TABLE ddl_hash DROP new_column_1; } step "s2-ddl-rename-column" { ALTER TABLE ddl_hash RENAME data TO new_column; } step "s2-table-size" { SELECT citus_total_relation_size('ddl_hash'); } step "s2-master-modify-multiple-shards" { DELETE FROM ddl_hash; } -step "s2-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 "s2-distribute-table" { SELECT create_distributed_table('ddl_hash', 'id'); } -step "s2-select" { SELECT * FROM ddl_hash ORDER BY 1, 2; } step "s2-commit" { COMMIT; } // permutations - DDL vs DDL diff --git a/src/test/regress/spec/isolation_delete_vs_all.spec b/src/test/regress/spec/isolation_delete_vs_all.spec index 422384c24..b93baf43b 100644 --- a/src/test/regress/spec/isolation_delete_vs_all.spec +++ b/src/test/regress/spec/isolation_delete_vs_all.spec @@ -54,9 +54,7 @@ step "s2-ddl-add-column" { ALTER TABLE delete_hash ADD new_column int DEFAULT 0; step "s2-ddl-drop-column" { ALTER TABLE delete_hash DROP new_column; } step "s2-ddl-rename-column" { ALTER TABLE delete_hash RENAME data TO new_column; } step "s2-table-size" { SELECT citus_total_relation_size('delete_hash'); } -step "s2-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 "s2-distribute-table" { SELECT create_distributed_table('delete_hash', 'id'); } -step "s2-select" { SELECT * FROM delete_hash ORDER BY 1, 2; } step "s2-commit" { COMMIT; } // permutations - DELETE vs DELETE 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 7bacf4fb5..eb312fae3 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 @@ -102,11 +102,6 @@ step "s2-select-for-udpate" SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM dist_table WHERE id=1 FOR UPDATE'); } -step "s2-coordinator-create-index-concurrently" -{ - CREATE INDEX CONCURRENTLY dist_table_index ON dist_table(id); -} - step "s2-commit-worker" { SELECT run_commands_on_session_level_connection_to_node('COMMIT'); diff --git a/src/test/regress/spec/isolation_distributed_deadlock_detection.spec b/src/test/regress/spec/isolation_distributed_deadlock_detection.spec index f738bc45d..9676530bc 100644 --- a/src/test/regress/spec/isolation_distributed_deadlock_detection.spec +++ b/src/test/regress/spec/isolation_distributed_deadlock_detection.spec @@ -47,11 +47,6 @@ step "s1-update-2" UPDATE deadlock_detection_test SET some_val = 1 WHERE user_id = 2; } -step "s1-update-3" -{ - UPDATE deadlock_detection_test SET some_val = 1 WHERE user_id = 3; -} - step "s1-update-4" { UPDATE deadlock_detection_test SET some_val = 1 WHERE user_id = 4; @@ -234,11 +229,6 @@ step "s4-update-2" UPDATE deadlock_detection_test SET some_val = 4 WHERE user_id = 2; } -step "s4-update-3" -{ - UPDATE deadlock_detection_test SET some_val = 4 WHERE user_id = 3; -} - step "s4-update-4" { UPDATE deadlock_detection_test SET some_val = 4 WHERE user_id = 4; @@ -254,11 +244,6 @@ step "s4-update-6" UPDATE deadlock_detection_test SET some_val = 4 WHERE user_id = 6; } -step "s4-update-7" -{ - UPDATE deadlock_detection_test SET some_val = 4 WHERE user_id = 7; -} - step "s4-random-adv-lock" { SELECT pg_advisory_xact_lock(8765); @@ -281,21 +266,6 @@ step "s5-update-1" UPDATE deadlock_detection_test SET some_val = 5 WHERE user_id = 1; } -step "s5-update-2" -{ - UPDATE deadlock_detection_test SET some_val = 5 WHERE user_id = 2; -} - -step "s5-update-3" -{ - UPDATE deadlock_detection_test SET some_val = 5 WHERE user_id = 3; -} - -step "s5-update-4" -{ - UPDATE deadlock_detection_test SET some_val = 5 WHERE user_id = 4; -} - step "s5-update-5" { UPDATE deadlock_detection_test SET some_val = 5 WHERE user_id = 5; @@ -306,11 +276,6 @@ step "s5-update-6" UPDATE deadlock_detection_test SET some_val = 5 WHERE user_id = 6; } -step "s5-update-7" -{ - UPDATE deadlock_detection_test SET some_val = 5 WHERE user_id = 7; -} - step "s5-random-adv-lock" { SELECT pg_advisory_xact_lock(8765); @@ -328,26 +293,6 @@ step "s6-begin" BEGIN; } -step "s6-update-1" -{ - UPDATE deadlock_detection_test SET some_val = 6 WHERE user_id = 1; -} - -step "s6-update-2" -{ - UPDATE deadlock_detection_test SET some_val = 6 WHERE user_id = 2; -} - -step "s6-update-3" -{ - UPDATE deadlock_detection_test SET some_val = 6 WHERE user_id = 3; -} - -step "s6-update-4" -{ - UPDATE deadlock_detection_test SET some_val = 6 WHERE user_id = 4; -} - step "s6-update-5" { UPDATE deadlock_detection_test SET some_val = 6 WHERE user_id = 5; @@ -358,11 +303,6 @@ step "s6-update-6" UPDATE deadlock_detection_test SET some_val = 6 WHERE user_id = 6; } -step "s6-update-7" -{ - UPDATE deadlock_detection_test SET some_val = 6 WHERE user_id = 7; -} - step "s6-commit" { COMMIT; diff --git a/src/test/regress/spec/isolation_distributed_transaction_id.spec b/src/test/regress/spec/isolation_distributed_transaction_id.spec index 53d6dd828..7bf4c02c0 100644 --- a/src/test/regress/spec/isolation_distributed_transaction_id.spec +++ b/src/test/regress/spec/isolation_distributed_transaction_id.spec @@ -86,17 +86,6 @@ step "s2-commit" COMMIT; } -// print only the necessary parts to prevent concurrent runs to print different values -step "s2-get-first-worker-active-transactions" -{ - SELECT * FROM run_command_on_workers('SELECT row(initiator_node_identifier, transaction_number) - FROM - get_all_active_transactions(); - ') - WHERE nodeport = 57637; -; -} - step "s2-get-all-transactions" { SELECT initiator_node_identifier, transaction_number, transaction_stamp FROM get_current_transaction_id() ORDER BY 1,2,3; diff --git a/src/test/regress/spec/isolation_dml_vs_repair.spec b/src/test/regress/spec/isolation_dml_vs_repair.spec index 78a2a764c..46a93ed8d 100644 --- a/src/test/regress/spec/isolation_dml_vs_repair.spec +++ b/src/test/regress/spec/isolation_dml_vs_repair.spec @@ -68,11 +68,6 @@ step "s2-invalidate-57637" UPDATE pg_dist_shard_placement SET shardstate = '3' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_dml_vs_repair'::regclass) AND nodeport = 57637; } -step "s2-revalidate-57637" -{ - UPDATE pg_dist_shard_placement SET shardstate = '1' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_dml_vs_repair'::regclass) AND nodeport = 57637; -} - step "s2-invalidate-57638" { UPDATE pg_dist_shard_placement SET shardstate = '3' WHERE shardid = (SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_dml_vs_repair'::regclass) AND nodeport = 57638; diff --git a/src/test/regress/spec/isolation_drop_vs_all.spec b/src/test/regress/spec/isolation_drop_vs_all.spec index c23471a90..3aef01eee 100644 --- a/src/test/regress/spec/isolation_drop_vs_all.spec +++ b/src/test/regress/spec/isolation_drop_vs_all.spec @@ -50,9 +50,7 @@ step "s2-ddl-add-column" { ALTER TABLE drop_hash ADD new_column int DEFAULT 0; } step "s2-ddl-drop-column" { ALTER TABLE drop_hash DROP new_column; } step "s2-ddl-rename-column" { ALTER TABLE drop_hash RENAME data TO new_column; } step "s2-table-size" { SELECT citus_total_relation_size('drop_hash'); } -step "s2-create-non-distributed-table" { CREATE TABLE drop_hash(id integer, data text); COPY drop_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV; } step "s2-distribute-table" { SELECT create_distributed_table('drop_hash', 'id'); } -step "s2-select" { SELECT * FROM drop_hash ORDER BY 1, 2; } step "s2-commit" { COMMIT; } // permutations - DROP vs DROP diff --git a/src/test/regress/spec/isolation_ensure_dependency_activate_node.spec b/src/test/regress/spec/isolation_ensure_dependency_activate_node.spec index f36b1cbb5..539c71c5c 100644 --- a/src/test/regress/spec/isolation_ensure_dependency_activate_node.spec +++ b/src/test/regress/spec/isolation_ensure_dependency_activate_node.spec @@ -149,11 +149,6 @@ step "s2-print-distributed-objects" session "s3" -step "s3-public-schema" -{ - SET search_path TO public; -} - step "s3-use-schema" { SET search_path TO myschema; @@ -172,11 +167,6 @@ step "s3-wait-for-metadata-sync" SELECT public.wait_until_metadata_sync(5000); } -step "s3-listen-channel" -{ - LISTEN metadata_sync; -} - step "s3-create-schema2" { CREATE SCHEMA myschema2; 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 d49aa1f90..b43708ab1 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 @@ -100,11 +100,6 @@ step "s1-commit" session "s2" -step "s2-begin" -{ - COMMIT; -} - step "s2-start-session-level-connection" { SELECT start_session_level_connection_to_node('localhost', 57638); @@ -125,16 +120,6 @@ step "s2-update-ref-table" SELECT run_commands_on_session_level_connection_to_node('UPDATE ref_table SET value_1 = 12 WHERE user_id = 1'); } -step "s2-select-from-ref-table" -{ - SELECT run_commands_on_session_level_connection_to_node('SELECT count(*) FROM ref_table'); -} - -step "s2-delete-from-ref-table" -{ - SELECT run_commands_on_session_level_connection_to_node('DELETE FROM ref_table WHERE user_id = 2'); -} - step "s2-insert-into-ref-table" { SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table VALUES(8,81),(9,91)'); 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 f2d25b92a..419485c70 100644 --- a/src/test/regress/spec/isolation_hash_copy_vs_all.spec +++ b/src/test/regress/spec/isolation_hash_copy_vs_all.spec @@ -40,7 +40,6 @@ step "s1-ddl-drop-index" { DROP INDEX hash_copy_index; } step "s1-ddl-add-column" { ALTER TABLE hash_copy ADD new_column int DEFAULT 0; } step "s1-ddl-drop-column" { ALTER TABLE hash_copy DROP new_column; } step "s1-ddl-rename-column" { ALTER TABLE hash_copy RENAME data TO new_column; } -step "s1-ddl-unique-constraint" { ALTER TABLE hash_copy ADD CONSTRAINT hash_copy_unique UNIQUE(id); } step "s1-table-size" { SELECT citus_total_relation_size('hash_copy'); } step "s1-master-modify-multiple-shards" { DELETE FROM hash_copy; } step "s1-master-drop-all-shards" { SELECT master_drop_all_shards('hash_copy'::regclass, 'public', 'hash_copy'); } @@ -61,7 +60,6 @@ step "s1-recreate-with-replication-2" // session 2 session "s2" step "s2-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-copy-additional-column" { COPY hash_copy FROM PROGRAM 'echo 5, f, 5, 5 && echo 6, g, 6, 6 && echo 7, h, 7, 7 && echo 8, i, 8, 8 && echo 9, j, 9, 9' WITH CSV; } step "s2-router-select" { SELECT * FROM hash_copy WHERE id = 1; } step "s2-real-time-select" { SELECT * FROM hash_copy ORDER BY 1, 2; } step "s2-adaptive-select" 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 b9cef7db1..ca28f461c 100644 --- a/src/test/regress/spec/isolation_insert_select_vs_all.spec +++ b/src/test/regress/spec/isolation_insert_select_vs_all.spec @@ -81,7 +81,6 @@ step "s2-ddl-rename-column-on-inserted" { ALTER TABLE insert_of_insert_select_ha step "s2-table-size-on-inserted" { SELECT citus_total_relation_size('insert_of_insert_select_hash'); } step "s2-master-modify-multiple-shards-on-inserted" { DELETE FROM insert_of_insert_select_hash; } step "s2-master-drop-all-shards-on-inserted" { SELECT master_drop_all_shards('insert_of_insert_select_hash'::regclass, 'public', 'insert_of_insert_select_hash'); } -step "s2-create-non-distributed-table-on-inserted" { CREATE TABLE insert_of_insert_select_hash(id integer, data text); } step "s2-distribute-table-on-inserted" { SELECT create_distributed_table('insert_of_insert_select_hash', 'id'); } step "s2-update-on-selected" { UPDATE select_of_insert_select_hash SET data = 'l' WHERE id = 4; } step "s2-delete-on-selected" { DELETE FROM select_of_insert_select_hash WHERE id = 4; } @@ -96,7 +95,6 @@ step "s2-ddl-rename-column-on-selected" { ALTER TABLE select_of_insert_select_ha step "s2-table-size-on-selected" { SELECT citus_total_relation_size('select_of_insert_select_hash'); } step "s2-master-modify-multiple-shards-on-selected" { DELETE FROM select_of_insert_select_hash; } step "s2-master-drop-all-shards-on-selected" { SELECT master_drop_all_shards('select_of_insert_select_hash'::regclass, 'public', 'select_of_insert_select_hash'); } -step "s2-create-non-distributed-table-on-selected" { CREATE TABLE select_of_insert_select_hash(id integer, data text); } step "s2-distribute-table-on-selected" { SELECT create_distributed_table('select_of_insert_select_hash', 'id'); } // permutations - INSERT/SELECT vs INSERT/SELECT 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 4073ef027..82d8d8638 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 @@ -109,11 +109,6 @@ step "s2-select-for-update" SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM dist_table WHERE id = 5 FOR UPDATE'); } -step "s2-coordinator-create-index-concurrently" -{ - CREATE INDEX CONCURRENTLY dist_table_index ON dist_table(id); -} - step "s2-commit-worker" { SELECT run_commands_on_session_level_connection_to_node('COMMIT'); 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 88f2e0603..8f98289ad 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 @@ -110,11 +110,6 @@ step "s2-select-for-update" SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM insert_table WHERE id = 6 FOR UPDATE'); } -step "s2-coordinator-create-index-concurrently" -{ - CREATE INDEX CONCURRENTLY insert_table_index ON insert_table(id); -} - step "s2-commit-worker" { SELECT run_commands_on_session_level_connection_to_node('COMMIT'); diff --git a/src/test/regress/spec/isolation_master_update_node.spec b/src/test/regress/spec/isolation_master_update_node.spec index a7fdf3652..5234db32b 100644 --- a/src/test/regress/spec/isolation_master_update_node.spec +++ b/src/test/regress/spec/isolation_master_update_node.spec @@ -18,7 +18,6 @@ teardown session "s1" step "s1-begin" { BEGIN; } step "s1-insert" { INSERT INTO t1 SELECT generate_series(1, 100); } -step "s1-verify-terminated" { -- verify the connection has been terminated } step "s1-abort" { ABORT; } session "s2" 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 d3e193bd3..903be0c1b 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 @@ -71,11 +71,6 @@ 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 "s2-modify_with_subquery_v2" -{ - UPDATE users_test_table SET value_1 = 3 WHERE user_id IN (SELECT user_id FROM events_test_table); -} - step "s2-commit" { COMMIT; 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 6424863a1..61ecd1a28 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 @@ -67,11 +67,6 @@ step "s1-update_value_1_of_1_or_3_to_5" UPDATE users_test_table SET value_1 = 5 WHERE user_id = 1 or user_id = 3; } -step "s1-update_value_1_of_1_or_3_to_7" -{ - UPDATE users_test_table SET value_1 = 7 WHERE user_id = 1 or user_id = 3; -} - step "s1-update_value_1_of_2_or_4_to_5" { UPDATE users_test_table SET value_1 = 5 WHERE user_id = 2 or user_id = 4; diff --git a/src/test/regress/spec/isolation_multiuser_locking.spec b/src/test/regress/spec/isolation_multiuser_locking.spec index af225ce61..3c5193e96 100644 --- a/src/test/regress/spec/isolation_multiuser_locking.spec +++ b/src/test/regress/spec/isolation_multiuser_locking.spec @@ -33,11 +33,6 @@ step "s1-grant" GRANT ALL ON test_table TO test_user_2; } -step "s1-setrole" -{ - SET ROLE test_user_1; -} - step "s1-begin" { BEGIN; @@ -76,11 +71,6 @@ step "s1-commit" session "s2" -step "s2-setrole" -{ - SET ROLE test_user_2; -} - step "s2-begin" { BEGIN; diff --git a/src/test/regress/spec/isolation_partitioned_copy_vs_all.spec b/src/test/regress/spec/isolation_partitioned_copy_vs_all.spec index bebddd15f..f893e5282 100644 --- a/src/test/regress/spec/isolation_partitioned_copy_vs_all.spec +++ b/src/test/regress/spec/isolation_partitioned_copy_vs_all.spec @@ -38,26 +38,21 @@ step "s1-update" { UPDATE partitioned_copy SET data = 'l' WHERE id = 0; } step "s1-delete" { DELETE FROM partitioned_copy WHERE id = 1; } step "s1-truncate" { TRUNCATE partitioned_copy; } step "s1-drop" { DROP TABLE partitioned_copy; } -step "s1-ddl-create-index" { CREATE INDEX partitioned_copy_index ON partitioned_copy(id); } -step "s1-ddl-drop-index" { DROP INDEX partitioned_copy_index; } step "s1-ddl-add-column" { ALTER TABLE partitioned_copy ADD new_column int DEFAULT 0; } step "s1-ddl-drop-column" { ALTER TABLE partitioned_copy DROP new_column; } step "s1-ddl-rename-column" { ALTER TABLE partitioned_copy RENAME data TO new_column; } -step "s1-ddl-unique-constraint" { ALTER TABLE partitioned_copy ADD CONSTRAINT partitioned_copy_unique UNIQUE(id); } step "s1-table-size" { SELECT citus_total_relation_size('partitioned_copy'); } step "s1-master-modify-multiple-shards" { DELETE FROM partitioned_copy; } step "s1-master-drop-all-shards" { SELECT master_drop_all_shards('partitioned_copy'::regclass, 'public', 'partitioned_copy'); } step "s1-create-non-distributed-table" { CREATE TABLE partitioned_copy(id integer, data text, int_data int); COPY partitioned_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('partitioned_copy', 'id'); } step "s1-select-count" { SELECT COUNT(*) FROM partitioned_copy; } -step "s1-show-indexes" { SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''partitioned_copy%'''); } step "s1-show-columns" { SELECT run_command_on_workers('SELECT column_name FROM information_schema.columns WHERE table_name LIKE ''partitioned_copy%'' AND column_name = ''new_column'' ORDER BY 1 LIMIT 1'); } step "s1-commit" { COMMIT; } // session 2 session "s2" step "s2-copy" { COPY partitioned_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-copy-additional-column" { COPY partitioned_copy FROM PROGRAM 'echo 5, f, 5, 5 && echo 6, g, 6, 6 && echo 7, h, 7, 7 && echo 8, i, 8, 8 && echo 9, j, 9, 9' WITH CSV; } step "s2-router-select" { SELECT * FROM partitioned_copy WHERE id = 1; } step "s2-real-time-select" { SELECT * FROM partitioned_copy ORDER BY 1, 2; } step "s2-adaptive-select" @@ -71,9 +66,6 @@ step "s2-update" { UPDATE partitioned_copy SET data = 'l' WHERE id = 0; } step "s2-delete" { DELETE FROM partitioned_copy WHERE id = 1; } step "s2-truncate" { TRUNCATE partitioned_copy; } step "s2-drop" { DROP TABLE partitioned_copy; } -step "s2-ddl-create-index" { CREATE INDEX partitioned_copy_index ON partitioned_copy(id); } -step "s2-ddl-drop-index" { DROP INDEX partitioned_copy_index; } -step "s2-ddl-create-index-concurrently" { CREATE INDEX CONCURRENTLY partitioned_copy_index ON partitioned_copy(id); } step "s2-ddl-add-column" { ALTER TABLE partitioned_copy ADD new_column int DEFAULT 0; } step "s2-ddl-drop-column" { ALTER TABLE partitioned_copy DROP new_column; } step "s2-ddl-rename-column" { ALTER TABLE partitioned_copy RENAME data TO new_column; } diff --git a/src/test/regress/spec/isolation_range_copy_vs_all.spec b/src/test/regress/spec/isolation_range_copy_vs_all.spec index facc432f3..eb0451eeb 100644 --- a/src/test/regress/spec/isolation_range_copy_vs_all.spec +++ b/src/test/regress/spec/isolation_range_copy_vs_all.spec @@ -40,7 +40,6 @@ step "s1-ddl-drop-index" { DROP INDEX range_copy_index; } step "s1-ddl-add-column" { ALTER TABLE range_copy ADD new_column int DEFAULT 0; } step "s1-ddl-drop-column" { ALTER TABLE range_copy DROP new_column; } step "s1-ddl-rename-column" { ALTER TABLE range_copy RENAME data TO new_column; } -step "s1-ddl-unique-constraint" { ALTER TABLE range_copy ADD CONSTRAINT range_copy_unique UNIQUE(id); } step "s1-table-size" { SELECT citus_total_relation_size('range_copy'); } step "s1-master-modify-multiple-shards" { DELETE FROM range_copy; } step "s1-master-apply-delete-command" { SELECT master_apply_delete_command('DELETE FROM range_copy WHERE id <= 4;'); } @@ -56,7 +55,6 @@ step "s1-commit" { COMMIT; } // session 2 session "s2" step "s2-copy" { COPY range_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-copy-additional-column" { COPY range_copy FROM PROGRAM 'echo 5, f, 5, 5 && echo 6, g, 6, 6 && echo 7, h, 7, 7 && echo 8, i, 8, 8 && echo 9, j, 9, 9' WITH CSV; } step "s2-router-select" { SELECT * FROM range_copy WHERE id = 1; } step "s2-real-time-select" { SELECT * FROM range_copy ORDER BY 1, 2; } step "s2-adaptive-select" 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 c59963188..2f7a0b74c 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 @@ -29,11 +29,6 @@ step "s1-start-session-level-connection" SELECT start_session_level_connection_to_node('localhost', 57637); } -step "s1-begin-on-worker" -{ - SELECT run_commands_on_session_level_connection_to_node('BEGIN'); -} - step "s1-view-locks" { SELECT * FROM master_run_on_worker( @@ -46,11 +41,6 @@ step "s1-view-locks" false); } -step "s1-rollback-worker" -{ - SELECT run_commands_on_session_level_connection_to_node('ROLLBACK'); -} - step "s1-stop-connection" { SELECT stop_session_level_connection_to_node(); 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 952bf079c..8f7de5f6e 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 @@ -33,11 +33,6 @@ step "s1-begin-on-worker" SELECT run_commands_on_session_level_connection_to_node('BEGIN'); } -step "s1-update" -{ - SELECT run_commands_on_session_level_connection_to_node('UPDATE ref_table SET value=12 WHERE id=1 OR id=2'); -} - step "s1-delete" { SELECT run_commands_on_session_level_connection_to_node('DELETE FROM ref_table WHERE id=1 OR id=2'); @@ -93,11 +88,6 @@ step "s2-truncate" SELECT run_commands_on_session_level_connection_to_node('TRUNCATE ref_table'); } -step "s2-coordinator-create-index-concurrently" -{ - CREATE INDEX CONCURRENTLY ref_table_index ON ref_table(id); -} - step "s2-commit-worker" { SELECT run_commands_on_session_level_connection_to_node('COMMIT'); 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 aa9028831..1ee681b81 100644 --- a/src/test/regress/spec/isolation_reference_copy_vs_all.spec +++ b/src/test/regress/spec/isolation_reference_copy_vs_all.spec @@ -39,10 +39,8 @@ step "s1-ddl-drop-index" { DROP INDEX reference_copy_index; } step "s1-ddl-add-column" { ALTER TABLE reference_copy ADD new_column int DEFAULT 0; } step "s1-ddl-drop-column" { ALTER TABLE reference_copy DROP new_column; } step "s1-ddl-rename-column" { ALTER TABLE reference_copy RENAME data TO new_column; } -step "s1-ddl-unique-constraint" { ALTER TABLE reference_copy ADD CONSTRAINT reference_copy_unique UNIQUE(id); } step "s1-table-size" { SELECT citus_total_relation_size('reference_copy'); } step "s1-master-modify-multiple-shards" { DELETE FROM reference_copy; } -step "s1-master-apply-delete-command" { SELECT master_apply_delete_command('DELETE FROM reference_copy WHERE id <= 4;'); } step "s1-create-non-distributed-table" { CREATE TABLE reference_copy(id integer, data text, int_data int); COPY reference_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_reference_table('reference_copy'); } step "s1-select-count" { SELECT COUNT(*) FROM reference_copy; } @@ -53,7 +51,6 @@ step "s1-commit" { COMMIT; } // session 2 session "s2" step "s2-copy" { COPY reference_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-copy-additional-column" { COPY reference_copy FROM PROGRAM 'echo 5, f, 5, 5 && echo 6, g, 6, 6 && echo 7, h, 7, 7 && echo 8, i, 8, 8 && echo 9, j, 9, 9' WITH CSV; } step "s2-router-select" { SELECT * FROM reference_copy WHERE id = 1; } step "s2-real-time-select" { SELECT * FROM reference_copy ORDER BY 1, 2; } step "s2-adaptive-select" @@ -74,9 +71,6 @@ step "s2-ddl-drop-column" { ALTER TABLE reference_copy DROP new_column; } step "s2-ddl-rename-column" { ALTER TABLE reference_copy RENAME data TO new_column; } step "s2-table-size" { SELECT citus_total_relation_size('reference_copy'); } step "s2-master-modify-multiple-shards" { DELETE FROM reference_copy; } -step "s2-master-apply-delete-command" { SELECT master_apply_delete_command('DELETE FROM reference_copy WHERE id <= 4;'); } -step "s2-master-drop-all-shards" { SELECT master_drop_all_shards('reference_copy'::regclass, 'public', 'reference_copy'); } -step "s2-create-non-distributed-table" { CREATE TABLE reference_copy(id integer, data text, int_data int); COPY reference_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 "s2-distribute-table" { SELECT create_reference_table('reference_copy'); } // permutations - COPY vs COPY diff --git a/src/test/regress/spec/isolation_reference_on_mx.spec b/src/test/regress/spec/isolation_reference_on_mx.spec index 6b63e4162..787928b4f 100644 --- a/src/test/regress/spec/isolation_reference_on_mx.spec +++ b/src/test/regress/spec/isolation_reference_on_mx.spec @@ -101,11 +101,6 @@ step "s2-select-from-ref-table" SELECT run_commands_on_session_level_connection_to_node('SELECT count(*) FROM ref_table'); } -step "s2-delete-from-ref-table" -{ - SELECT run_commands_on_session_level_connection_to_node('DELETE FROM ref_table WHERE user_id = 2'); -} - step "s2-insert-into-ref-table" { SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table VALUES(8,81),(9,91)'); 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 c567d579f..5ce2d0cce 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 @@ -74,11 +74,6 @@ step "s2-select" SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM select_table'); } -step "s2-insert" -{ - SELECT run_commands_on_session_level_connection_to_node('INSERT INTO select_table VALUES(6, 60)'); -} - step "s2-insert-select" { SELECT run_commands_on_session_level_connection_to_node('INSERT INTO select_table SELECT * FROM select_table'); diff --git a/src/test/regress/spec/isolation_truncate_vs_all.spec b/src/test/regress/spec/isolation_truncate_vs_all.spec index 901f8e6f8..b35fa3965 100644 --- a/src/test/regress/spec/isolation_truncate_vs_all.spec +++ b/src/test/regress/spec/isolation_truncate_vs_all.spec @@ -58,9 +58,7 @@ step "s2-table-size" { SELECT citus_total_relation_size('truncate_append'); } step "s2-master-modify-multiple-shards" { DELETE FROM truncate_append; } step "s2-master-apply-delete-command" { SELECT master_apply_delete_command('DELETE FROM truncate_append WHERE id <= 4;'); } step "s2-master-drop-all-shards" { SELECT master_drop_all_shards('truncate_append'::regclass, 'public', 'truncate_append'); } -step "s2-create-non-distributed-table" { CREATE TABLE truncate_append(id integer, data text); } step "s2-distribute-table" { SELECT create_distributed_table('truncate_append', 'id', 'append'); } -step "s2-select" { SELECT * FROM truncate_append ORDER BY 1, 2; } step "s2-commit" { COMMIT; } // permutations - TRUNCATE vs TRUNCATE 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 5c473d2ed..b91b50390 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 @@ -83,11 +83,6 @@ step "s2-select-for-update" SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM dist_table WHERE id=5 FOR UPDATE'); } -step "s2-coordinator-create-index-concurrently" -{ - CREATE INDEX CONCURRENTLY dist_table_index ON dist_table(id); -} - step "s2-commit-worker" { SELECT run_commands_on_session_level_connection_to_node('COMMIT'); diff --git a/src/test/regress/spec/isolation_update_node.spec b/src/test/regress/spec/isolation_update_node.spec index b48d5415c..feb21ffaf 100644 --- a/src/test/regress/spec/isolation_update_node.spec +++ b/src/test/regress/spec/isolation_update_node.spec @@ -27,14 +27,6 @@ step "s1-update-node-1" 58637); } -step "s1-update-node-2" -{ - SELECT 1 FROM master_update_node( - (select nodeid from pg_dist_node where nodeport = 57638), - 'localhost', - 58638); -} - step "s1-commit" { COMMIT; @@ -89,11 +81,6 @@ step "s2-abort" ABORT; } -step "s2-commit" -{ - COMMIT; -} - // session 1 updates node 1, session 2 updates node 2, should be ok permutation "s1-begin" "s1-update-node-1" "s2-update-node-2" "s1-commit" "s1-show-nodes" diff --git a/src/test/regress/spec/isolation_update_node_lock_writes.spec b/src/test/regress/spec/isolation_update_node_lock_writes.spec index 25d99b3e6..6915b6a46 100644 --- a/src/test/regress/spec/isolation_update_node_lock_writes.spec +++ b/src/test/regress/spec/isolation_update_node_lock_writes.spec @@ -36,11 +36,6 @@ step "s1-commit" COMMIT; } -step "s1-abort" -{ - ABORT; -} - session "s2" step "s2-begin" diff --git a/src/test/regress/spec/isolation_upsert_vs_all.spec b/src/test/regress/spec/isolation_upsert_vs_all.spec index a168ab79a..b9f0db869 100644 --- a/src/test/regress/spec/isolation_upsert_vs_all.spec +++ b/src/test/regress/spec/isolation_upsert_vs_all.spec @@ -38,7 +38,6 @@ step "s1-ddl-rename-column" { ALTER TABLE upsert_hash RENAME data TO new_column; 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-distribute-table" { SELECT create_distributed_table('upsert_hash', 'id'); } 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-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'); } diff --git a/src/test/regress/spec/isolation_validate_vs_insert.spec b/src/test/regress/spec/isolation_validate_vs_insert.spec index 05e9f81f5..e50ddb5eb 100644 --- a/src/test/regress/spec/isolation_validate_vs_insert.spec +++ b/src/test/regress/spec/isolation_validate_vs_insert.spec @@ -28,7 +28,6 @@ step "s1-commit" { COMMIT; } session "s2" step "s2-begin" { BEGIN; } step "s2-insert" { INSERT INTO constrained_table VALUES(10, 10); } -step "s2-insert-invalid" { INSERT INTO constrained_table VALUES(100, 100); } step "s2-select" { SELECT sum(int_data) FROM constrained_table; } step "s2-commit" { COMMIT; }