diff --git a/src/test/regress/expected/isolation_add_node_vs_reference_table_operations.out b/src/test/regress/expected/isolation_add_node_vs_reference_table_operations.out index 1f936c11e..56d464af6 100644 --- a/src/test/regress/expected/isolation_add_node_vs_reference_table_operations.out +++ b/src/test/regress/expected/isolation_add_node_vs_reference_table_operations.out @@ -1,7 +1,7 @@ Parsed test spec with 2 sessions starting permutation: s2-load-metadata-cache s1-begin s1-add-second-worker s2-copy-to-reference-table s1-commit s2-print-content -create_reference_table +create_distributed_table step s2-load-metadata-cache: @@ -24,9 +24,9 @@ step s1-commit: step s2-copy-to-reference-table: <... completed> step s2-print-content: - SELECT - nodeport, success, result - FROM + SELECT + nodeport, success, result + FROM run_command_on_placements('test_reference_table', 'select count(*) from %s') ORDER BY nodeport; @@ -41,7 +41,7 @@ master_remove_node starting permutation: s2-load-metadata-cache s2-begin s2-copy-to-reference-table s1-add-second-worker s2-commit s2-print-content -create_reference_table +create_distributed_table step s2-load-metadata-cache: @@ -64,9 +64,9 @@ step s1-add-second-worker: <... completed> 1 step s2-print-content: - SELECT - nodeport, success, result - FROM + SELECT + nodeport, success, result + FROM run_command_on_placements('test_reference_table', 'select count(*) from %s') ORDER BY nodeport; @@ -81,7 +81,7 @@ master_remove_node starting permutation: s2-load-metadata-cache s1-begin s1-add-second-worker s2-insert-to-reference-table s1-commit s2-print-content -create_reference_table +create_distributed_table step s2-load-metadata-cache: @@ -104,9 +104,9 @@ step s1-commit: step s2-insert-to-reference-table: <... completed> step s2-print-content: - SELECT - nodeport, success, result - FROM + SELECT + nodeport, success, result + FROM run_command_on_placements('test_reference_table', 'select count(*) from %s') ORDER BY nodeport; @@ -121,7 +121,7 @@ master_remove_node starting permutation: s2-load-metadata-cache s2-begin s2-insert-to-reference-table s1-add-second-worker s2-commit s2-print-content -create_reference_table +create_distributed_table step s2-load-metadata-cache: @@ -144,9 +144,9 @@ step s1-add-second-worker: <... completed> 1 step s2-print-content: - SELECT - nodeport, success, result - FROM + SELECT + nodeport, success, result + FROM run_command_on_placements('test_reference_table', 'select count(*) from %s') ORDER BY nodeport; @@ -161,7 +161,7 @@ master_remove_node starting permutation: s2-load-metadata-cache s1-begin s1-add-second-worker s2-ddl-on-reference-table s1-commit s2-print-index-count -create_reference_table +create_distributed_table step s2-load-metadata-cache: @@ -184,9 +184,9 @@ step s1-commit: step s2-ddl-on-reference-table: <... completed> step s2-print-index-count: - SELECT - nodeport, success, result - FROM + SELECT + nodeport, success, result + FROM run_command_on_placements('test_reference_table', 'select count(*) from pg_indexes WHERE tablename = ''%s''') ORDER BY nodeport; @@ -201,7 +201,7 @@ master_remove_node starting permutation: s2-load-metadata-cache s2-begin s2-ddl-on-reference-table s1-add-second-worker s2-commit s2-print-index-count -create_reference_table +create_distributed_table step s2-load-metadata-cache: @@ -224,9 +224,9 @@ step s1-add-second-worker: <... completed> 1 step s2-print-index-count: - SELECT - nodeport, success, result - FROM + SELECT + nodeport, success, result + FROM run_command_on_placements('test_reference_table', 'select count(*) from pg_indexes WHERE tablename = ''%s''') ORDER BY nodeport; @@ -240,10 +240,96 @@ master_remove_node -starting permutation: s1-begin s1-add-second-worker s2-copy-to-reference-table s1-commit s2-print-content +starting permutation: s2-load-metadata-cache s1-begin s1-add-second-worker s2-create-reference-table-2 s1-commit s2-print-content-2 +create_distributed_table + + +step s2-load-metadata-cache: + COPY test_reference_table FROM PROGRAM 'echo 1 && echo 2 && echo 3 && echo 4 && echo 5'; + +step s1-begin: + BEGIN; + +step s1-add-second-worker: + SELECT 1 FROM master_add_node('localhost', 57638); + +?column? + +1 +step s2-create-reference-table-2: + SELECT create_reference_table('test_reference_table_2'); + +step s1-commit: + COMMIT; + +step s2-create-reference-table-2: <... completed> create_reference_table +step s2-print-content-2: + SELECT + nodeport, success, result + FROM + run_command_on_placements('test_reference_table_2', 'select count(*) from %s') + ORDER BY + nodeport; + +nodeport success result + +57637 t 1 +57638 t 1 +master_remove_node + + + + +starting permutation: s2-load-metadata-cache s2-begin s2-create-reference-table-2 s1-add-second-worker s2-commit s2-print-content-2 +create_distributed_table + + +step s2-load-metadata-cache: + COPY test_reference_table FROM PROGRAM 'echo 1 && echo 2 && echo 3 && echo 4 && echo 5'; + +step s2-begin: + BEGIN; + +step s2-create-reference-table-2: + SELECT create_reference_table('test_reference_table_2'); + +create_reference_table + + +step s1-add-second-worker: + SELECT 1 FROM master_add_node('localhost', 57638); + +step s2-commit: + COMMIT; + +step s1-add-second-worker: <... completed> +?column? + +1 +step s2-print-content-2: + SELECT + nodeport, success, result + FROM + run_command_on_placements('test_reference_table_2', 'select count(*) from %s') + ORDER BY + nodeport; + +nodeport success result + +57637 t 1 +57638 t 1 +master_remove_node + + + + +starting permutation: s1-begin s1-add-second-worker s2-copy-to-reference-table s1-commit s2-print-content +create_distributed_table + + step s1-begin: BEGIN; @@ -261,9 +347,9 @@ step s1-commit: step s2-copy-to-reference-table: <... completed> step s2-print-content: - SELECT - nodeport, success, result - FROM + SELECT + nodeport, success, result + FROM run_command_on_placements('test_reference_table', 'select count(*) from %s') ORDER BY nodeport; @@ -278,7 +364,7 @@ master_remove_node starting permutation: s2-begin s2-copy-to-reference-table s1-add-second-worker s2-commit s2-print-content -create_reference_table +create_distributed_table step s2-begin: @@ -298,9 +384,9 @@ step s1-add-second-worker: <... completed> 1 step s2-print-content: - SELECT - nodeport, success, result - FROM + SELECT + nodeport, success, result + FROM run_command_on_placements('test_reference_table', 'select count(*) from %s') ORDER BY nodeport; @@ -315,7 +401,7 @@ master_remove_node starting permutation: s1-begin s1-add-second-worker s2-insert-to-reference-table s1-commit s2-print-content -create_reference_table +create_distributed_table step s1-begin: @@ -335,9 +421,9 @@ step s1-commit: step s2-insert-to-reference-table: <... completed> step s2-print-content: - SELECT - nodeport, success, result - FROM + SELECT + nodeport, success, result + FROM run_command_on_placements('test_reference_table', 'select count(*) from %s') ORDER BY nodeport; @@ -352,7 +438,7 @@ master_remove_node starting permutation: s2-begin s2-insert-to-reference-table s1-add-second-worker s2-commit s2-print-content -create_reference_table +create_distributed_table step s2-begin: @@ -372,9 +458,9 @@ step s1-add-second-worker: <... completed> 1 step s2-print-content: - SELECT - nodeport, success, result - FROM + SELECT + nodeport, success, result + FROM run_command_on_placements('test_reference_table', 'select count(*) from %s') ORDER BY nodeport; @@ -389,7 +475,7 @@ master_remove_node starting permutation: s1-begin s1-add-second-worker s2-ddl-on-reference-table s1-commit s2-print-index-count -create_reference_table +create_distributed_table step s1-begin: @@ -409,9 +495,9 @@ step s1-commit: step s2-ddl-on-reference-table: <... completed> step s2-print-index-count: - SELECT - nodeport, success, result - FROM + SELECT + nodeport, success, result + FROM run_command_on_placements('test_reference_table', 'select count(*) from pg_indexes WHERE tablename = ''%s''') ORDER BY nodeport; @@ -426,7 +512,7 @@ master_remove_node starting permutation: s2-begin s2-ddl-on-reference-table s1-add-second-worker s2-commit s2-print-index-count -create_reference_table +create_distributed_table step s2-begin: @@ -446,9 +532,9 @@ step s1-add-second-worker: <... completed> 1 step s2-print-index-count: - SELECT - nodeport, success, result - FROM + SELECT + nodeport, success, result + FROM run_command_on_placements('test_reference_table', 'select count(*) from pg_indexes WHERE tablename = ''%s''') ORDER BY nodeport; @@ -461,3 +547,83 @@ master_remove_node + +starting permutation: s1-begin s1-add-second-worker s2-create-reference-table-2 s1-commit s2-print-content-2 +create_distributed_table + + +step s1-begin: + BEGIN; + +step s1-add-second-worker: + SELECT 1 FROM master_add_node('localhost', 57638); + +?column? + +1 +step s2-create-reference-table-2: + SELECT create_reference_table('test_reference_table_2'); + +step s1-commit: + COMMIT; + +step s2-create-reference-table-2: <... completed> +create_reference_table + + +step s2-print-content-2: + SELECT + nodeport, success, result + FROM + run_command_on_placements('test_reference_table_2', 'select count(*) from %s') + ORDER BY + nodeport; + +nodeport success result + +57637 t 1 +57638 t 1 +master_remove_node + + + + +starting permutation: s2-begin s2-create-reference-table-2 s1-add-second-worker s2-commit s2-print-content-2 +create_distributed_table + + +step s2-begin: + BEGIN; + +step s2-create-reference-table-2: + SELECT create_reference_table('test_reference_table_2'); + +create_reference_table + + +step s1-add-second-worker: + SELECT 1 FROM master_add_node('localhost', 57638); + +step s2-commit: + COMMIT; + +step s1-add-second-worker: <... completed> +?column? + +1 +step s2-print-content-2: + SELECT + nodeport, success, result + FROM + run_command_on_placements('test_reference_table_2', 'select count(*) from %s') + ORDER BY + nodeport; + +nodeport success result + +57637 t 1 +57638 t 1 +master_remove_node + + + diff --git a/src/test/regress/expected/isolation_add_node_vs_reference_table_operations_0.out b/src/test/regress/expected/isolation_add_node_vs_reference_table_operations_0.out deleted file mode 100644 index 9d01ce635..000000000 --- a/src/test/regress/expected/isolation_add_node_vs_reference_table_operations_0.out +++ /dev/null @@ -1,463 +0,0 @@ -Parsed test spec with 2 sessions - -starting permutation: s2-load-metadata-cache s1-begin s1-add-second-worker s2-copy-to-reference-table s1-commit s2-print-content -create_reference_table - - -step s2-load-metadata-cache: - COPY test_reference_table FROM PROGRAM 'echo "1\n2\n3\n4\n5"'; - -step s1-begin: - BEGIN; - -step s1-add-second-worker: - SELECT nodename, nodeport, isactive FROM master_add_node('localhost', 57638); - -nodename nodeport isactive - -localhost 57638 t -step s2-copy-to-reference-table: - COPY test_reference_table FROM PROGRAM 'echo "1\n2\n3\n4\n5"'; - -step s1-commit: - COMMIT; - -step s2-copy-to-reference-table: <... completed> -step s2-print-content: - SELECT - nodeport, success, result - FROM - run_command_on_placements('test_reference_table', 'select count(*) from %s') - ORDER BY - nodeport; - -nodeport success result - -57637 t 10 -57638 t 10 -master_remove_node - - - - -starting permutation: s2-load-metadata-cache s2-begin s2-copy-to-reference-table s1-add-second-worker s2-commit s2-print-content -create_reference_table - - -step s2-load-metadata-cache: - COPY test_reference_table FROM PROGRAM 'echo "1\n2\n3\n4\n5"'; - -step s2-begin: - BEGIN; - -step s2-copy-to-reference-table: - COPY test_reference_table FROM PROGRAM 'echo "1\n2\n3\n4\n5"'; - -step s1-add-second-worker: - SELECT nodename, nodeport, isactive FROM master_add_node('localhost', 57638); - -step s2-commit: - COMMIT; - -step s1-add-second-worker: <... completed> -nodename nodeport isactive - -localhost 57638 t -step s2-print-content: - SELECT - nodeport, success, result - FROM - run_command_on_placements('test_reference_table', 'select count(*) from %s') - ORDER BY - nodeport; - -nodeport success result - -57637 t 10 -57638 t 10 -master_remove_node - - - - -starting permutation: s2-load-metadata-cache s1-begin s1-add-second-worker s2-insert-to-reference-table s1-commit s2-print-content -create_reference_table - - -step s2-load-metadata-cache: - COPY test_reference_table FROM PROGRAM 'echo "1\n2\n3\n4\n5"'; - -step s1-begin: - BEGIN; - -step s1-add-second-worker: - SELECT nodename, nodeport, isactive FROM master_add_node('localhost', 57638); - -nodename nodeport isactive - -localhost 57638 t -step s2-insert-to-reference-table: - INSERT INTO test_reference_table VALUES (6); - -step s1-commit: - COMMIT; - -step s2-insert-to-reference-table: <... completed> -step s2-print-content: - SELECT - nodeport, success, result - FROM - run_command_on_placements('test_reference_table', 'select count(*) from %s') - ORDER BY - nodeport; - -nodeport success result - -57637 t 6 -57638 t 6 -master_remove_node - - - - -starting permutation: s2-load-metadata-cache s2-begin s2-insert-to-reference-table s1-add-second-worker s2-commit s2-print-content -create_reference_table - - -step s2-load-metadata-cache: - COPY test_reference_table FROM PROGRAM 'echo "1\n2\n3\n4\n5"'; - -step s2-begin: - BEGIN; - -step s2-insert-to-reference-table: - INSERT INTO test_reference_table VALUES (6); - -step s1-add-second-worker: - SELECT nodename, nodeport, isactive FROM master_add_node('localhost', 57638); - -step s2-commit: - COMMIT; - -step s1-add-second-worker: <... completed> -nodename nodeport isactive - -localhost 57638 t -step s2-print-content: - SELECT - nodeport, success, result - FROM - run_command_on_placements('test_reference_table', 'select count(*) from %s') - ORDER BY - nodeport; - -nodeport success result - -57637 t 6 -57638 t 6 -master_remove_node - - - - -starting permutation: s2-load-metadata-cache s1-begin s1-add-second-worker s2-ddl-on-reference-table s1-commit s2-print-index-count -create_reference_table - - -step s2-load-metadata-cache: - COPY test_reference_table FROM PROGRAM 'echo "1\n2\n3\n4\n5"'; - -step s1-begin: - BEGIN; - -step s1-add-second-worker: - SELECT nodename, nodeport, isactive FROM master_add_node('localhost', 57638); - -nodename nodeport isactive - -localhost 57638 t -step s2-ddl-on-reference-table: - CREATE INDEX reference_index ON test_reference_table(test_id); - -step s1-commit: - COMMIT; - -step s2-ddl-on-reference-table: <... completed> -step s2-print-index-count: - SELECT - nodeport, success, result - FROM - run_command_on_placements('test_reference_table', 'select count(*) from pg_indexes WHERE tablename = ''%s''') - ORDER BY - nodeport; - -nodeport success result - -57637 t 1 -57638 t 1 -master_remove_node - - - - -starting permutation: s2-load-metadata-cache s2-begin s2-ddl-on-reference-table s1-add-second-worker s2-commit s2-print-index-count -create_reference_table - - -step s2-load-metadata-cache: - COPY test_reference_table FROM PROGRAM 'echo "1\n2\n3\n4\n5"'; - -step s2-begin: - BEGIN; - -step s2-ddl-on-reference-table: - CREATE INDEX reference_index ON test_reference_table(test_id); - -step s1-add-second-worker: - SELECT nodename, nodeport, isactive FROM master_add_node('localhost', 57638); - -step s2-commit: - COMMIT; - -step s1-add-second-worker: <... completed> -nodename nodeport isactive - -localhost 57638 t -step s2-print-index-count: - SELECT - nodeport, success, result - FROM - run_command_on_placements('test_reference_table', 'select count(*) from pg_indexes WHERE tablename = ''%s''') - ORDER BY - nodeport; - -nodeport success result - -57637 t 1 -57638 t 1 -master_remove_node - - - - -starting permutation: s1-begin s1-add-second-worker s2-copy-to-reference-table s1-commit s2-print-content -create_reference_table - - -step s1-begin: - BEGIN; - -step s1-add-second-worker: - SELECT nodename, nodeport, isactive FROM master_add_node('localhost', 57638); - -nodename nodeport isactive - -localhost 57638 t -step s2-copy-to-reference-table: - COPY test_reference_table FROM PROGRAM 'echo "1\n2\n3\n4\n5"'; - -step s1-commit: - COMMIT; - -step s2-copy-to-reference-table: <... completed> -step s2-print-content: - SELECT - nodeport, success, result - FROM - run_command_on_placements('test_reference_table', 'select count(*) from %s') - ORDER BY - nodeport; - -nodeport success result - -57637 t 5 -57638 t 5 -master_remove_node - - - - -starting permutation: s2-begin s2-copy-to-reference-table s1-add-second-worker s2-commit s2-print-content -create_reference_table - - -step s2-begin: - BEGIN; - -step s2-copy-to-reference-table: - COPY test_reference_table FROM PROGRAM 'echo "1\n2\n3\n4\n5"'; - -step s1-add-second-worker: - SELECT nodename, nodeport, isactive FROM master_add_node('localhost', 57638); - -step s2-commit: - COMMIT; - -step s1-add-second-worker: <... completed> -nodename nodeport isactive - -localhost 57638 t -step s2-print-content: - SELECT - nodeport, success, result - FROM - run_command_on_placements('test_reference_table', 'select count(*) from %s') - ORDER BY - nodeport; - -nodeport success result - -57637 t 5 -57638 t 5 -master_remove_node - - - - -starting permutation: s1-begin s1-add-second-worker s2-insert-to-reference-table s1-commit s2-print-content -create_reference_table - - -step s1-begin: - BEGIN; - -step s1-add-second-worker: - SELECT nodename, nodeport, isactive FROM master_add_node('localhost', 57638); - -nodename nodeport isactive - -localhost 57638 t -step s2-insert-to-reference-table: - INSERT INTO test_reference_table VALUES (6); - -step s1-commit: - COMMIT; - -step s2-insert-to-reference-table: <... completed> -step s2-print-content: - SELECT - nodeport, success, result - FROM - run_command_on_placements('test_reference_table', 'select count(*) from %s') - ORDER BY - nodeport; - -nodeport success result - -57637 t 1 -57638 t 1 -master_remove_node - - - - -starting permutation: s2-begin s2-insert-to-reference-table s1-add-second-worker s2-commit s2-print-content -create_reference_table - - -step s2-begin: - BEGIN; - -step s2-insert-to-reference-table: - INSERT INTO test_reference_table VALUES (6); - -step s1-add-second-worker: - SELECT nodename, nodeport, isactive FROM master_add_node('localhost', 57638); - -step s2-commit: - COMMIT; - -step s1-add-second-worker: <... completed> -nodename nodeport isactive - -localhost 57638 t -step s2-print-content: - SELECT - nodeport, success, result - FROM - run_command_on_placements('test_reference_table', 'select count(*) from %s') - ORDER BY - nodeport; - -nodeport success result - -57637 t 1 -57638 t 1 -master_remove_node - - - - -starting permutation: s1-begin s1-add-second-worker s2-ddl-on-reference-table s1-commit s2-print-index-count -create_reference_table - - -step s1-begin: - BEGIN; - -step s1-add-second-worker: - SELECT nodename, nodeport, isactive FROM master_add_node('localhost', 57638); - -nodename nodeport isactive - -localhost 57638 t -step s2-ddl-on-reference-table: - CREATE INDEX reference_index ON test_reference_table(test_id); - -step s1-commit: - COMMIT; - -step s2-ddl-on-reference-table: <... completed> -step s2-print-index-count: - SELECT - nodeport, success, result - FROM - run_command_on_placements('test_reference_table', 'select count(*) from pg_indexes WHERE tablename = ''%s''') - ORDER BY - nodeport; - -nodeport success result - -57637 t 1 -57638 t 1 -master_remove_node - - - - -starting permutation: s2-begin s2-ddl-on-reference-table s1-add-second-worker s2-commit s2-print-index-count -create_reference_table - - -step s2-begin: - BEGIN; - -step s2-ddl-on-reference-table: - CREATE INDEX reference_index ON test_reference_table(test_id); - -step s1-add-second-worker: - SELECT nodename, nodeport, isactive FROM master_add_node('localhost', 57638); - -step s2-commit: - COMMIT; - -step s1-add-second-worker: <... completed> -nodename nodeport isactive - -localhost 57638 t -step s2-print-index-count: - SELECT - nodeport, success, result - FROM - run_command_on_placements('test_reference_table', 'select count(*) from pg_indexes WHERE tablename = ''%s''') - ORDER BY - nodeport; - -nodeport success result - -57637 t 1 -57638 t 1 -master_remove_node - - - diff --git a/src/test/regress/expected/isolation_citus_dist_activity.out b/src/test/regress/expected/isolation_citus_dist_activity.out index 5f8d727ee..0b4a983fb 100644 --- a/src/test/regress/expected/isolation_citus_dist_activity.out +++ b/src/test/regress/expected/isolation_citus_dist_activity.out @@ -41,16 +41,16 @@ step s3-view-worker: query query_hostname query_hostport master_query_host_namemaster_query_host_portstate wait_event_typewait_event usename datname -SELECT worker_apply_shard_ddl_command (102145, 'public', ' +SELECT worker_apply_shard_ddl_command (102217, 'public', ' ALTER TABLE test_table ADD COLUMN x INT; ')localhost 57638 coordinator_host57636 idle in transactionClient ClientRead postgres regression -SELECT worker_apply_shard_ddl_command (102144, 'public', ' +SELECT worker_apply_shard_ddl_command (102216, 'public', ' ALTER TABLE test_table ADD COLUMN x INT; ')localhost 57637 coordinator_host57636 idle in transactionClient ClientRead postgres regression -SELECT worker_apply_shard_ddl_command (102143, 'public', ' +SELECT worker_apply_shard_ddl_command (102215, 'public', ' ALTER TABLE test_table ADD COLUMN x INT; ')localhost 57638 coordinator_host57636 idle in transactionClient ClientRead postgres regression -SELECT worker_apply_shard_ddl_command (102142, 'public', ' +SELECT worker_apply_shard_ddl_command (102214, 'public', ' ALTER TABLE test_table ADD COLUMN x INT; ')localhost 57637 coordinator_host57636 idle in transactionClient ClientRead postgres regression step s2-rollback: @@ -104,7 +104,7 @@ step s3-view-worker: query query_hostname query_hostport master_query_host_namemaster_query_host_portstate wait_event_typewait_event usename datname -INSERT INTO public.test_table_102148 (column1, column2) VALUES (100, 100)localhost 57637 coordinator_host57636 idle in transactionClient ClientRead postgres regression +INSERT INTO public.test_table_102220 (column1, column2) VALUES (100, 100)localhost 57637 coordinator_host57636 idle in transactionClient ClientRead postgres regression step s2-rollback: ROLLBACK; @@ -159,10 +159,10 @@ step s3-view-worker: query query_hostname query_hostport master_query_host_namemaster_query_host_portstate wait_event_typewait_event usename datname -COPY (SELECT count(*) AS count FROM test_table_102153 test_table WHERE true) TO STDOUTlocalhost 57638 coordinator_host57636 idle in transactionClient ClientRead postgres regression -COPY (SELECT count(*) AS count FROM test_table_102152 test_table WHERE true) TO STDOUTlocalhost 57637 coordinator_host57636 idle in transactionClient ClientRead postgres regression -COPY (SELECT count(*) AS count FROM test_table_102151 test_table WHERE true) TO STDOUTlocalhost 57638 coordinator_host57636 idle in transactionClient ClientRead postgres regression -COPY (SELECT count(*) AS count FROM test_table_102150 test_table WHERE true) TO STDOUTlocalhost 57637 coordinator_host57636 idle in transactionClient ClientRead postgres regression +SELECT count(*) AS count FROM test_table_102225 test_table WHERE truelocalhost 57638 coordinator_host57636 idle in transactionClient ClientRead postgres regression +SELECT count(*) AS count FROM test_table_102224 test_table WHERE truelocalhost 57637 coordinator_host57636 idle in transactionClient ClientRead postgres regression +SELECT count(*) AS count FROM test_table_102223 test_table WHERE truelocalhost 57638 coordinator_host57636 idle in transactionClient ClientRead postgres regression +SELECT count(*) AS count FROM test_table_102222 test_table WHERE truelocalhost 57637 coordinator_host57636 idle in transactionClient ClientRead postgres regression step s2-rollback: ROLLBACK; @@ -217,7 +217,7 @@ step s3-view-worker: query query_hostname query_hostport master_query_host_namemaster_query_host_portstate wait_event_typewait_event usename datname -SELECT count(*) AS count FROM public.test_table_102155 test_table WHERE (column1 OPERATOR(pg_catalog.=) 55)localhost 57638 0 idle Client ClientRead postgres regression +SELECT count(*) AS count FROM public.test_table_102227 test_table WHERE (column1 OPERATOR(pg_catalog.=) 55)localhost 57638 coordinator_host57636 idle in transactionClient ClientRead postgres regression step s2-rollback: ROLLBACK; diff --git a/src/test/regress/expected/isolation_citus_dist_activity_9.out b/src/test/regress/expected/isolation_citus_dist_activity_9.out index 8f30ca0dd..2d7e1710b 100644 --- a/src/test/regress/expected/isolation_citus_dist_activity_9.out +++ b/src/test/regress/expected/isolation_citus_dist_activity_9.out @@ -41,16 +41,16 @@ step s3-view-worker: query query_hostname query_hostport master_query_host_namemaster_query_host_portstate wait_event_typewait_event usename datname -SELECT worker_apply_shard_ddl_command (102145, 'public', ' +SELECT worker_apply_shard_ddl_command (102217, 'public', ' ALTER TABLE test_table ADD COLUMN x INT; ')localhost 57638 coordinator_host57636 idle in transactionClient ClientRead postgres regression -SELECT worker_apply_shard_ddl_command (102144, 'public', ' +SELECT worker_apply_shard_ddl_command (102216, 'public', ' ALTER TABLE test_table ADD COLUMN x INT; ')localhost 57637 coordinator_host57636 idle in transactionClient ClientRead postgres regression -SELECT worker_apply_shard_ddl_command (102143, 'public', ' +SELECT worker_apply_shard_ddl_command (102215, 'public', ' ALTER TABLE test_table ADD COLUMN x INT; ')localhost 57638 coordinator_host57636 idle in transactionClient ClientRead postgres regression -SELECT worker_apply_shard_ddl_command (102142, 'public', ' +SELECT worker_apply_shard_ddl_command (102214, 'public', ' ALTER TABLE test_table ADD COLUMN x INT; ')localhost 57637 coordinator_host57636 idle in transactionClient ClientRead postgres regression step s2-rollback: @@ -104,7 +104,7 @@ step s3-view-worker: query query_hostname query_hostport master_query_host_namemaster_query_host_portstate wait_event_typewait_event usename datname -INSERT INTO public.test_table_102148 (column1, column2) VALUES (100, 100)localhost 57637 coordinator_host57636 idle in transactionClient ClientRead postgres regression +INSERT INTO public.test_table_102220 (column1, column2) VALUES (100, 100)localhost 57637 coordinator_host57636 idle in transactionClient ClientRead postgres regression step s2-rollback: ROLLBACK; @@ -159,10 +159,10 @@ step s3-view-worker: query query_hostname query_hostport master_query_host_namemaster_query_host_portstate wait_event_typewait_event usename datname -SELECT count(*) AS count FROM test_table_102153 test_table WHERE truelocalhost 57638 coordinator_host57636 idle in transactionClient ClientRead postgres regression -SELECT count(*) AS count FROM test_table_102152 test_table WHERE truelocalhost 57637 coordinator_host57636 idle in transactionClient ClientRead postgres regression -SELECT count(*) AS count FROM test_table_102151 test_table WHERE truelocalhost 57638 coordinator_host57636 idle in transactionClient ClientRead postgres regression -SELECT count(*) AS count FROM test_table_102150 test_table WHERE truelocalhost 57637 coordinator_host57636 idle in transactionClient ClientRead postgres regression +COPY (SELECT count(*) AS count FROM test_table_102225 test_table WHERE true) TO STDOUTlocalhost 57638 coordinator_host57636 idle in transactionClient ClientRead postgres regression +COPY (SELECT count(*) AS count FROM test_table_102224 test_table WHERE true) TO STDOUTlocalhost 57637 coordinator_host57636 idle in transactionClient ClientRead postgres regression +COPY (SELECT count(*) AS count FROM test_table_102223 test_table WHERE true) TO STDOUTlocalhost 57638 coordinator_host57636 idle in transactionClient ClientRead postgres regression +COPY (SELECT count(*) AS count FROM test_table_102222 test_table WHERE true) TO STDOUTlocalhost 57637 coordinator_host57636 idle in transactionClient ClientRead postgres regression step s2-rollback: ROLLBACK; @@ -217,7 +217,7 @@ step s3-view-worker: query query_hostname query_hostport master_query_host_namemaster_query_host_portstate wait_event_typewait_event usename datname -SELECT count(*) AS count FROM public.test_table_102155 test_table WHERE (column1 OPERATOR(pg_catalog.=) 55)localhost 57638 coordinator_host57636 idle in transactionClient ClientRead postgres regression +SELECT count(*) AS count FROM public.test_table_102227 test_table WHERE (column1 OPERATOR(pg_catalog.=) 55)localhost 57638 0 idle Client ClientRead postgres regression step s2-rollback: ROLLBACK; 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 0a21b6b7b..edd3644e7 100644 --- a/src/test/regress/expected/isolation_dump_global_wait_edges.out +++ b/src/test/regress/expected/isolation_dump_global_wait_edges.out @@ -29,11 +29,11 @@ step detector-dump-wait-edges: waiting_transaction_numblocking_transaction_numblocking_transaction_waiting -246 245 f +264 263 f transactionnumberwaitingtransactionnumbers -245 -246 245 +263 +264 263 step s1-abort: ABORT; @@ -77,14 +77,14 @@ step detector-dump-wait-edges: waiting_transaction_numblocking_transaction_numblocking_transaction_waiting -250 249 f -251 249 f -251 250 t +268 267 f +269 267 f +269 268 t transactionnumberwaitingtransactionnumbers -249 -250 249 -251 249,250 +267 +268 267 +269 267,268 step s1-abort: ABORT; diff --git a/src/test/regress/expected/isolation_dump_global_wait_edges_0.out b/src/test/regress/expected/isolation_dump_global_wait_edges_0.out index e49912948..256931969 100644 --- a/src/test/regress/expected/isolation_dump_global_wait_edges_0.out +++ b/src/test/regress/expected/isolation_dump_global_wait_edges_0.out @@ -29,11 +29,11 @@ step detector-dump-wait-edges: waiting_transaction_numblocking_transaction_numblocking_transaction_waiting -247 246 f +265 264 f transactionnumberwaitingtransactionnumbers -246 -247 246 +264 +265 264 step s1-abort: ABORT; @@ -77,14 +77,14 @@ step detector-dump-wait-edges: waiting_transaction_numblocking_transaction_numblocking_transaction_waiting -251 250 f -252 250 f -252 251 t +269 268 f +270 268 f +270 269 t transactionnumberwaitingtransactionnumbers -250 -251 250 -252 250,251 +268 +269 268 +270 268,269 step s1-abort: ABORT; diff --git a/src/test/regress/expected/isolation_replace_wait_function.out b/src/test/regress/expected/isolation_replace_wait_function.out index 155eaad07..4c9441586 100644 --- a/src/test/regress/expected/isolation_replace_wait_function.out +++ b/src/test/regress/expected/isolation_replace_wait_function.out @@ -16,7 +16,7 @@ step s1-commit: COMMIT; step s2-insert: <... completed> -error in steps s1-commit s2-insert: ERROR: duplicate key value violates unique constraint "test_locking_a_key_102417" +error in steps s1-commit s2-insert: ERROR: duplicate key value violates unique constraint "test_locking_a_key_102489" step s2-commit: COMMIT; diff --git a/src/test/regress/specs/isolation_add_node_vs_reference_table_operations.spec b/src/test/regress/specs/isolation_add_node_vs_reference_table_operations.spec index 09ff6b760..9b01ce65f 100644 --- a/src/test/regress/specs/isolation_add_node_vs_reference_table_operations.spec +++ b/src/test/regress/specs/isolation_add_node_vs_reference_table_operations.spec @@ -2,16 +2,23 @@ # add single one of the nodes for the purpose of the test setup { + SET citus.shard_replication_factor to 1; SELECT 1 FROM master_add_node('localhost', 57637); CREATE TABLE test_reference_table (test_id integer); + CREATE TABLE test_reference_table_2 (test_id integer); + INSERT INTO test_reference_table_2 VALUES (8); SELECT create_reference_table('test_reference_table'); + CREATE TABLE test_table (x int, y int); + SELECT create_distributed_table('test_table','x'); } -# ensure that both nodes exists for the remaining of the isolation tests +# ensure neither node's added for the remaining of the isolation tests teardown { DROP TABLE test_reference_table; + DROP TABLE test_reference_table_2; + DROP TABLE test_table; SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node; } @@ -46,7 +53,7 @@ step "s2-load-metadata-cache" COPY test_reference_table FROM PROGRAM 'echo 1 && echo 2 && echo 3 && echo 4 && echo 5'; } -step "s2-copy-to-reference-table" +step "s2-copy-to-reference-table" { COPY test_reference_table FROM PROGRAM 'echo 1 && echo 2 && echo 3 && echo 4 && echo 5'; } @@ -61,6 +68,11 @@ step "s2-ddl-on-reference-table" CREATE INDEX reference_index ON test_reference_table(test_id); } +step "s2-create-reference-table-2" +{ + SELECT create_reference_table('test_reference_table_2'); +} + step "s2-begin" { BEGIN; @@ -73,27 +85,37 @@ step "s2-commit" step "s2-print-content" { - SELECT - nodeport, success, result - FROM + SELECT + nodeport, success, result + FROM run_command_on_placements('test_reference_table', 'select count(*) from %s') ORDER BY nodeport; } +step "s2-print-content-2" +{ + SELECT + nodeport, success, result + FROM + run_command_on_placements('test_reference_table_2', 'select count(*) from %s') + ORDER BY + nodeport; +} + step "s2-print-index-count" { - SELECT - nodeport, success, result - FROM + SELECT + nodeport, success, result + FROM run_command_on_placements('test_reference_table', 'select count(*) from pg_indexes WHERE tablename = ''%s''') ORDER BY nodeport; } # verify that copy/insert gets the invalidation and re-builts its metadata cache -# note that we need to run "s1-load-metadata-cache" and "s2-load-metadata-cache" -# to ensure that metadata is cached otherwise the test would be useless since +# note that we need to run "s1-load-metadata-cache" and "s2-load-metadata-cache" +# to ensure that metadata is cached otherwise the test would be useless since # the cache would be empty and the metadata data is gathered from the tables directly permutation "s2-load-metadata-cache" "s1-begin" "s1-add-second-worker" "s2-copy-to-reference-table" "s1-commit" "s2-print-content" permutation "s2-load-metadata-cache" "s2-begin" "s2-copy-to-reference-table" "s1-add-second-worker" "s2-commit" "s2-print-content" @@ -101,6 +123,8 @@ permutation "s2-load-metadata-cache" "s1-begin" "s1-add-second-worker" "s2-inser permutation "s2-load-metadata-cache" "s2-begin" "s2-insert-to-reference-table" "s1-add-second-worker" "s2-commit" "s2-print-content" permutation "s2-load-metadata-cache" "s1-begin" "s1-add-second-worker" "s2-ddl-on-reference-table" "s1-commit" "s2-print-index-count" permutation "s2-load-metadata-cache" "s2-begin" "s2-ddl-on-reference-table" "s1-add-second-worker" "s2-commit" "s2-print-index-count" +permutation "s2-load-metadata-cache" "s1-begin" "s1-add-second-worker" "s2-create-reference-table-2" "s1-commit" "s2-print-content-2" +permutation "s2-load-metadata-cache" "s2-begin" "s2-create-reference-table-2" "s1-add-second-worker" "s2-commit" "s2-print-content-2" # same tests without loading the cache @@ -110,3 +134,6 @@ permutation "s1-begin" "s1-add-second-worker" "s2-insert-to-reference-table" "s1 permutation "s2-begin" "s2-insert-to-reference-table" "s1-add-second-worker" "s2-commit" "s2-print-content" permutation "s1-begin" "s1-add-second-worker" "s2-ddl-on-reference-table" "s1-commit" "s2-print-index-count" permutation "s2-begin" "s2-ddl-on-reference-table" "s1-add-second-worker" "s2-commit" "s2-print-index-count" +permutation "s1-begin" "s1-add-second-worker" "s2-create-reference-table-2" "s1-commit" "s2-print-content-2" +permutation "s2-begin" "s2-create-reference-table-2" "s1-add-second-worker" "s2-commit" "s2-print-content-2" +