Change error message style in isolation tests to align with PG

src/test/regress/expected/isolation_add_node_vs_reference_table_operations.out

@@ -186,7 +186,7 @@ step s1-add-second-worker:
 step s2-ddl-on-reference-table:
  CREATE INDEX reference_index ON test_reference_table(test_id);
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-ddl-on-reference-table: <... completed>
@@ -225,7 +225,7 @@ step s2-ddl-on-reference-table:
 step s1-add-second-worker:
  SELECT 1 FROM master_add_node('localhost', 57638);
  <waiting ...>
-step s2-commit:
+step s2-commit: 
  COMMIT;
 
 step s1-add-second-worker: <... completed>
@@ -270,7 +270,7 @@ step s1-add-second-worker:
 step s2-create-reference-table-2:
  SELECT create_reference_table('test_reference_table_2');
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-create-reference-table-2: <... completed>
@@ -316,7 +316,7 @@ create_reference_table
 step s1-add-second-worker:
  SELECT 1 FROM master_add_node('localhost', 57638);
  <waiting ...>
-step s2-commit:
+step s2-commit: 
  COMMIT;
 
 step s1-add-second-worker: <... completed>
@@ -510,7 +510,7 @@ step s1-add-second-worker:
 step s2-ddl-on-reference-table:
  CREATE INDEX reference_index ON test_reference_table(test_id);
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-ddl-on-reference-table: <... completed>
@@ -546,7 +546,7 @@ step s2-ddl-on-reference-table:
 step s1-add-second-worker:
  SELECT 1 FROM master_add_node('localhost', 57638);
  <waiting ...>
-step s2-commit:
+step s2-commit: 
  COMMIT;
 
 step s1-add-second-worker: <... completed>
@@ -588,7 +588,7 @@ step s1-add-second-worker:
 step s2-create-reference-table-2:
  SELECT create_reference_table('test_reference_table_2');
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-create-reference-table-2: <... completed>
@@ -631,7 +631,7 @@ create_reference_table
 step s1-add-second-worker:
  SELECT 1 FROM master_add_node('localhost', 57638);
  <waiting ...>
-step s2-commit:
+step s2-commit: 
  COMMIT;
 
 step s1-add-second-worker: <... completed>
@@ -673,7 +673,7 @@ step s1-add-second-worker:
 step s2-copy-to-reference-table:
  COPY test_reference_table FROM PROGRAM 'echo 1 && echo 2 && echo 3 && echo 4 && echo 5';
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-copy-to-reference-table: <... completed>
@@ -710,7 +710,7 @@ step s2-copy-to-reference-table:
 step s1-add-second-worker:
  SELECT 1 FROM master_add_node('localhost', 57638);
  <waiting ...>
-step s2-commit:
+step s2-commit: 
  COMMIT;
 
 step s1-add-second-worker: <... completed>
@@ -753,7 +753,7 @@ step s1-add-second-worker:
 step s2-insert-to-reference-table:
  INSERT INTO test_reference_table VALUES (6);
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-insert-to-reference-table: <... completed>
@@ -790,7 +790,7 @@ step s2-insert-to-reference-table:
 step s1-add-second-worker:
  SELECT 1 FROM master_add_node('localhost', 57638);
  <waiting ...>
-step s2-commit:
+step s2-commit: 
  COMMIT;
 
 step s1-add-second-worker: <... completed>
@@ -833,7 +833,7 @@ step s1-add-second-worker:
 step s2-ddl-on-reference-table:
  CREATE INDEX reference_index ON test_reference_table(test_id);
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-ddl-on-reference-table: <... completed>
@@ -870,7 +870,7 @@ step s2-ddl-on-reference-table:
 step s1-add-second-worker:
  SELECT 1 FROM master_add_node('localhost', 57638);
  <waiting ...>
-step s2-commit:
+step s2-commit: 
  COMMIT;
 
 step s1-add-second-worker: <... completed>
@@ -913,7 +913,7 @@ step s1-add-second-worker:
 step s2-create-reference-table-2:
  SELECT create_reference_table('test_reference_table_2');
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-create-reference-table-2: <... completed>
@@ -956,7 +956,7 @@ create_reference_table
 step s1-add-second-worker:
  SELECT 1 FROM master_add_node('localhost', 57638);
  <waiting ...>
-step s2-commit:
+step s2-commit: 
  COMMIT;
 
 step s1-add-second-worker: <... completed>
@@ -1007,7 +1007,7 @@ step s2-replicate-reference-tables:
  SELECT replicate_reference_tables();
  RESET client_min_messages;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-replicate-reference-tables: <... completed>

src/test/regress/expected/isolation_add_remove_node.out

@@ -5,26 +5,26 @@ starting permutation: s1-begin s1-add-node-1 s2-remove-node-1 s1-commit s1-show-
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-remove-node-1:
-	SELECT * FROM master_remove_node('localhost', 57637);
+ SELECT * FROM master_remove_node('localhost', 57637);
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-remove-node-1: <... completed>
 master_remove_node
 
 
 step s1-show-nodes:
-	SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
+ SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
 
 nodename       nodeport       isactive
 
@@ -36,26 +36,26 @@ starting permutation: s1-begin s1-add-node-1 s2-add-node-2 s1-commit s1-show-nod
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-add-node-2:
-	SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM master_add_node('localhost', 57638);
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-add-node-2: <... completed>
 ?column?
 
 1
 step s1-show-nodes:
-	SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
+ SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
 
 nodename       nodeport       isactive
 
@@ -71,26 +71,26 @@ starting permutation: s1-begin s1-add-node-1 s2-add-node-1 s1-commit s1-show-nod
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-add-node-1: <... completed>
 ?column?
 
 1
 step s1-show-nodes:
-	SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
+ SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
 
 nodename       nodeport       isactive
 
@@ -104,26 +104,26 @@ starting permutation: s1-begin s1-add-node-1 s2-add-node-2 s1-abort s1-show-node
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-add-node-2:
-	SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM master_add_node('localhost', 57638);
  <waiting ...>
-step s1-abort:
+step s1-abort: 
-	ABORT;
+ ABORT;
 
 step s2-add-node-2: <... completed>
 ?column?
 
 1
 step s1-show-nodes:
-	SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
+ SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
 
 nodename       nodeport       isactive
 
@@ -137,26 +137,26 @@ starting permutation: s1-begin s1-add-node-1 s2-add-node-1 s1-abort s1-show-node
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
  <waiting ...>
-step s1-abort:
+step s1-abort: 
-	ABORT;
+ ABORT;
 
 step s2-add-node-1: <... completed>
 ?column?
 
 1
 step s1-show-nodes:
-	SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
+ SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
 
 nodename       nodeport       isactive
 
@@ -170,38 +170,38 @@ starting permutation: s1-add-node-1 s1-add-node-2 s1-begin s1-remove-node-1 s2-r
 
 1
 step s1-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
 
 ?column?
 
 1
 step s1-add-node-2:
-	SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM master_add_node('localhost', 57638);
 
 ?column?
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-remove-node-1:
-	SELECT * FROM master_remove_node('localhost', 57637);
+ SELECT * FROM master_remove_node('localhost', 57637);
 
 master_remove_node
 
 
 step s2-remove-node-2:
-	SELECT * FROM master_remove_node('localhost', 57638);
+ SELECT * FROM master_remove_node('localhost', 57638);
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-remove-node-2: <... completed>
 master_remove_node
 
 
 step s1-show-nodes:
-	SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
+ SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
 
 nodename       nodeport       isactive
 
@@ -213,30 +213,30 @@ starting permutation: s1-add-node-1 s1-begin s1-remove-node-1 s2-remove-node-1 s
 
 1
 step s1-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
 
 ?column?
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-remove-node-1:
-	SELECT * FROM master_remove_node('localhost', 57637);
+ SELECT * FROM master_remove_node('localhost', 57637);
 
 master_remove_node
 
 
 step s2-remove-node-1:
-	SELECT * FROM master_remove_node('localhost', 57637);
+ SELECT * FROM master_remove_node('localhost', 57637);
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-remove-node-1: <... completed>
-error in steps s1-commit s2-remove-node-1: ERROR:  node at "localhost:xxxxx" does not exist
+ERROR:  node at "localhost:xxxxx" does not exist
 step s1-show-nodes:
-	SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
+ SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
 
 nodename       nodeport       isactive
 
@@ -248,32 +248,32 @@ starting permutation: s1-add-node-1 s1-begin s1-activate-node-1 s2-activate-node
 
 1
 step s1-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
 
 ?column?
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-activate-node-1:
-	SELECT 1 FROM master_activate_node('localhost', 57637);
+ SELECT 1 FROM master_activate_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-activate-node-1:
-	SELECT 1 FROM master_activate_node('localhost', 57637);
+ SELECT 1 FROM master_activate_node('localhost', 57637);
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-activate-node-1: <... completed>
 ?column?
 
 1
 step s1-show-nodes:
-	SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
+ SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
 
 nodename       nodeport       isactive
 
@@ -287,32 +287,32 @@ starting permutation: s1-add-node-1 s1-begin s1-disable-node-1 s2-disable-node-1
 
 1
 step s1-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
 
 ?column?
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-disable-node-1:
-	SELECT 1 FROM master_disable_node('localhost', 57637);
+ SELECT 1 FROM master_disable_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-disable-node-1:
-	SELECT 1 FROM master_disable_node('localhost', 57637);
+ SELECT 1 FROM master_disable_node('localhost', 57637);
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-disable-node-1: <... completed>
 ?column?
 
 1
 step s1-show-nodes:
-	SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
+ SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
 
 nodename       nodeport       isactive
 
@@ -326,32 +326,32 @@ starting permutation: s1-add-inactive-1 s1-begin s1-activate-node-1 s2-activate-
 
 1
 step s1-add-inactive-1:
-	SELECT 1 FROM master_add_inactive_node('localhost', 57637);
+ SELECT 1 FROM master_add_inactive_node('localhost', 57637);
 
 ?column?
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-activate-node-1:
-	SELECT 1 FROM master_activate_node('localhost', 57637);
+ SELECT 1 FROM master_activate_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-activate-node-1:
-	SELECT 1 FROM master_activate_node('localhost', 57637);
+ SELECT 1 FROM master_activate_node('localhost', 57637);
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-activate-node-1: <... completed>
 ?column?
 
 1
 step s1-show-nodes:
-	SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
+ SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
 
 nodename       nodeport       isactive
 
@@ -365,32 +365,32 @@ starting permutation: s1-add-inactive-1 s1-begin s1-disable-node-1 s2-disable-no
 
 1
 step s1-add-inactive-1:
-	SELECT 1 FROM master_add_inactive_node('localhost', 57637);
+ SELECT 1 FROM master_add_inactive_node('localhost', 57637);
 
 ?column?
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-disable-node-1:
-	SELECT 1 FROM master_disable_node('localhost', 57637);
+ SELECT 1 FROM master_disable_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-disable-node-1:
-	SELECT 1 FROM master_disable_node('localhost', 57637);
+ SELECT 1 FROM master_disable_node('localhost', 57637);
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-disable-node-1: <... completed>
 ?column?
 
 1
 step s1-show-nodes:
-	SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
+ SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
 
 nodename       nodeport       isactive
 
@@ -404,32 +404,32 @@ starting permutation: s1-add-node-1 s1-begin s1-disable-node-1 s2-activate-node-
 
 1
 step s1-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
 
 ?column?
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-disable-node-1:
-	SELECT 1 FROM master_disable_node('localhost', 57637);
+ SELECT 1 FROM master_disable_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-activate-node-1:
-	SELECT 1 FROM master_activate_node('localhost', 57637);
+ SELECT 1 FROM master_activate_node('localhost', 57637);
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-activate-node-1: <... completed>
 ?column?
 
 1
 step s1-show-nodes:
-	SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
+ SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
 
 nodename       nodeport       isactive
 
@@ -443,32 +443,32 @@ starting permutation: s1-add-node-1 s1-begin s1-activate-node-1 s2-disable-node-
 
 1
 step s1-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
 
 ?column?
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-activate-node-1:
-	SELECT 1 FROM master_activate_node('localhost', 57637);
+ SELECT 1 FROM master_activate_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-disable-node-1:
-	SELECT 1 FROM master_disable_node('localhost', 57637);
+ SELECT 1 FROM master_disable_node('localhost', 57637);
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-disable-node-1: <... completed>
 ?column?
 
 1
 step s1-show-nodes:
-	SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
+ SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
 
 nodename       nodeport       isactive
 
@@ -482,32 +482,32 @@ starting permutation: s1-add-inactive-1 s1-begin s1-disable-node-1 s2-activate-n
 
 1
 step s1-add-inactive-1:
-	SELECT 1 FROM master_add_inactive_node('localhost', 57637);
+ SELECT 1 FROM master_add_inactive_node('localhost', 57637);
 
 ?column?
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-disable-node-1:
-	SELECT 1 FROM master_disable_node('localhost', 57637);
+ SELECT 1 FROM master_disable_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-activate-node-1:
-	SELECT 1 FROM master_activate_node('localhost', 57637);
+ SELECT 1 FROM master_activate_node('localhost', 57637);
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-activate-node-1: <... completed>
 ?column?
 
 1
 step s1-show-nodes:
-	SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
+ SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
 
 nodename       nodeport       isactive
 
@@ -521,32 +521,32 @@ starting permutation: s1-add-inactive-1 s1-begin s1-activate-node-1 s2-disable-n
 
 1
 step s1-add-inactive-1:
-	SELECT 1 FROM master_add_inactive_node('localhost', 57637);
+ SELECT 1 FROM master_add_inactive_node('localhost', 57637);
 
 ?column?
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-activate-node-1:
-	SELECT 1 FROM master_activate_node('localhost', 57637);
+ SELECT 1 FROM master_activate_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-disable-node-1:
-	SELECT 1 FROM master_disable_node('localhost', 57637);
+ SELECT 1 FROM master_disable_node('localhost', 57637);
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-disable-node-1: <... completed>
 ?column?
 
 1
 step s1-show-nodes:
-	SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
+ SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
 
 nodename       nodeport       isactive
 
@@ -560,32 +560,32 @@ starting permutation: s1-add-inactive-1 s1-begin s1-activate-node-1 s2-disable-n
 
 1
 step s1-add-inactive-1:
-	SELECT 1 FROM master_add_inactive_node('localhost', 57637);
+ SELECT 1 FROM master_add_inactive_node('localhost', 57637);
 
 ?column?
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-activate-node-1:
-	SELECT 1 FROM master_activate_node('localhost', 57637);
+ SELECT 1 FROM master_activate_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-disable-node-1:
-	SELECT 1 FROM master_disable_node('localhost', 57637);
+ SELECT 1 FROM master_disable_node('localhost', 57637);
  <waiting ...>
-step s1-abort:
+step s1-abort: 
-	ABORT;
+ ABORT;
 
 step s2-disable-node-1: <... completed>
 ?column?
 
 1
 step s1-show-nodes:
-	SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
+ SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
 
 nodename       nodeport       isactive
 
@@ -599,32 +599,32 @@ starting permutation: s1-add-node-1 s1-begin s1-disable-node-1 s2-disable-node-1
 
 1
 step s1-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
 
 ?column?
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-disable-node-1:
-	SELECT 1 FROM master_disable_node('localhost', 57637);
+ SELECT 1 FROM master_disable_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-disable-node-1:
-	SELECT 1 FROM master_disable_node('localhost', 57637);
+ SELECT 1 FROM master_disable_node('localhost', 57637);
  <waiting ...>
-step s1-abort:
+step s1-abort: 
-	ABORT;
+ ABORT;
 
 step s2-disable-node-1: <... completed>
 ?column?
 
 1
 step s1-show-nodes:
-	SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
+ SELECT nodename, nodeport, isactive FROM pg_dist_node ORDER BY nodename, nodeport;
 
 nodename       nodeport       isactive
 

src/test/regress/expected/isolation_append_copy_vs_all.out

@@ -60,8 +60,8 @@ step s1-initialize: COPY append_copy FROM PROGRAM 'echo 0, a, 0 && echo 1, b, 1
 step s1-begin: BEGIN;
 step s1-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-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM append_copy AS t1 JOIN append_copy AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM append_copy AS t1 JOIN append_copy AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -399,8 +399,8 @@ create_distributed_table
 step s1-initialize: COPY append_copy FROM PROGRAM 'echo 0, a, 0 && echo 1, b, 1 && echo 2, c, 2 && echo 3, d, 3 && echo 4, e, 4' WITH CSV;
 step s1-begin: BEGIN;
 step s1-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM append_copy AS t1 JOIN append_copy AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM append_copy AS t1 JOIN append_copy AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -497,7 +497,7 @@ step s1-drop: DROP TABLE append_copy;
 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; <waiting ...>
 step s1-commit: COMMIT;
 step s2-copy: <... completed>
-error in steps s1-commit s2-copy: ERROR:  relation "append_copy" does not exist
+ERROR:  relation "append_copy" does not exist
 step s1-select-count: SELECT COUNT(*) FROM append_copy;
 ERROR:  relation "append_copy" does not exist
 
@@ -552,7 +552,7 @@ step s1-ddl-add-column: ALTER TABLE append_copy ADD new_column int DEFAULT 0;
 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; <waiting ...>
 step s1-commit: COMMIT;
 step s2-copy: <... completed>
-error in steps s1-commit s2-copy: ERROR:  missing data for column "new_column"
+ERROR:  missing data for column "new_column"
 step s1-select-count: SELECT COUNT(*) FROM append_copy;
 count
 

src/test/regress/expected/isolation_citus_update_table_statistics.out

@@ -87,4 +87,4 @@ step s2-commit:
     COMMIT;
 
 step s1-drop-table: <... completed>
-error in steps s2-commit s1-drop-table: ERROR:  tuple concurrently deleted
+ERROR:  tuple concurrently deleted

src/test/regress/expected/isolation_concurrent_dml.out

@@ -13,7 +13,7 @@ step s1-insert:
 step s2-update:
     UPDATE test_concurrent_dml SET data = 'blarg' WHERE test_id = 1;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-update: <... completed>
@@ -42,7 +42,7 @@ step s1-multi-insert:
 step s2-update:
     UPDATE test_concurrent_dml SET data = 'blarg' WHERE test_id = 1;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-update: <... completed>

src/test/regress/expected/isolation_copy_placement_vs_copy_placement.out

@@ -2,50 +2,50 @@ Parsed test spec with 2 sessions
 
 starting permutation: s1-load-cache s2-load-cache s2-set-placement-inactive s2-begin s2-repair-placement s1-repair-placement s2-commit
 step s1-load-cache:
-	COPY test_hash_table FROM PROGRAM 'echo 1,1 && echo 2,2 && echo 3,3 && echo 4,4 && echo 5,5' WITH CSV;
+ COPY test_hash_table FROM PROGRAM 'echo 1,1 && echo 2,2 && echo 3,3 && echo 4,4 && echo 5,5' WITH CSV;
 
 step s2-load-cache:
-	COPY test_hash_table FROM PROGRAM 'echo 1,1 && echo 2,2 && echo 3,3 && echo 4,4 && echo 5,5' WITH CSV;
+ COPY test_hash_table FROM PROGRAM 'echo 1,1 && echo 2,2 && echo 3,3 && echo 4,4 && echo 5,5' WITH CSV;
 
 step s2-set-placement-inactive:
-	UPDATE pg_dist_shard_placement SET shardstate = 3 WHERE shardid IN (SELECT * FROM selected_shard_for_test_table) AND nodeport = 57638;
+ UPDATE pg_dist_shard_placement SET shardstate = 3 WHERE shardid IN (SELECT * FROM selected_shard_for_test_table) AND nodeport = 57638;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-repair-placement:
-	SELECT master_copy_shard_placement((SELECT * FROM selected_shard_for_test_table), 'localhost', 57637, 'localhost', 57638);
+ SELECT master_copy_shard_placement((SELECT * FROM selected_shard_for_test_table), 'localhost', 57637, 'localhost', 57638);
 
 master_copy_shard_placement
 
 
 step s1-repair-placement:
-	SELECT master_copy_shard_placement((SELECT * FROM selected_shard_for_test_table), 'localhost', 57637, 'localhost', 57638);
+ SELECT master_copy_shard_placement((SELECT * FROM selected_shard_for_test_table), 'localhost', 57637, 'localhost', 57638);
  <waiting ...>
-step s2-commit:
+step s2-commit: 
-	COMMIT;
+ COMMIT;
 
 step s1-repair-placement: <... completed>
-error in steps s2-commit s1-repair-placement: ERROR:  target placement must be in inactive state
+ERROR:  target placement must be in inactive state
 
 starting permutation: s2-set-placement-inactive s2-begin s2-repair-placement s1-repair-placement s2-commit
 step s2-set-placement-inactive:
-	UPDATE pg_dist_shard_placement SET shardstate = 3 WHERE shardid IN (SELECT * FROM selected_shard_for_test_table) AND nodeport = 57638;
+ UPDATE pg_dist_shard_placement SET shardstate = 3 WHERE shardid IN (SELECT * FROM selected_shard_for_test_table) AND nodeport = 57638;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-repair-placement:
-	SELECT master_copy_shard_placement((SELECT * FROM selected_shard_for_test_table), 'localhost', 57637, 'localhost', 57638);
+ SELECT master_copy_shard_placement((SELECT * FROM selected_shard_for_test_table), 'localhost', 57637, 'localhost', 57638);
 
 master_copy_shard_placement
 
 
 step s1-repair-placement:
-	SELECT master_copy_shard_placement((SELECT * FROM selected_shard_for_test_table), 'localhost', 57637, 'localhost', 57638);
+ SELECT master_copy_shard_placement((SELECT * FROM selected_shard_for_test_table), 'localhost', 57637, 'localhost', 57638);
  <waiting ...>
-step s2-commit:
+step s2-commit: 
-	COMMIT;
+ COMMIT;
 
 step s1-repair-placement: <... completed>
-error in steps s2-commit s1-repair-placement: ERROR:  target placement must be in inactive state
+ERROR:  target placement must be in inactive state

src/test/regress/expected/isolation_copy_vs_all_on_mx.out

@@ -14,7 +14,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-copy:
-	SELECT run_commands_on_session_level_connection_to_node('COPY copy_table FROM PROGRAM ''echo 5, 50 && echo 6, 60 && echo 7, 70''WITH CSV');
+ SELECT run_commands_on_session_level_connection_to_node('COPY copy_table FROM PROGRAM ''echo 5, 50 && echo 6, 60 && echo 7, 70''WITH CSV');
 
 run_commands_on_session_level_connection_to_node
 
@@ -32,13 +32,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-copy:
-	SELECT run_commands_on_session_level_connection_to_node('COPY copy_table FROM PROGRAM ''echo 5, 50 && echo 8, 80 && echo 9, 90''WITH CSV');
+ SELECT run_commands_on_session_level_connection_to_node('COPY copy_table FROM PROGRAM ''echo 5, 50 && echo 8, 80 && echo 9, 90''WITH CSV');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -50,7 +50,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -62,7 +62,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM copy_table;
+ SELECT COUNT(*) FROM copy_table;
 
 count
 
@@ -85,35 +85,35 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-copy:
-	SELECT run_commands_on_session_level_connection_to_node('COPY copy_table FROM PROGRAM ''echo 5, 50 && echo 6, 60 && echo 7, 70''WITH CSV');
+ SELECT run_commands_on_session_level_connection_to_node('COPY copy_table FROM PROGRAM ''echo 5, 50 && echo 6, 60 && echo 7, 70''WITH CSV');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-coordinator-drop:
-	DROP TABLE copy_table;
+ DROP TABLE copy_table;
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-coordinator-drop: <... completed>
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM copy_table;
+ SELECT COUNT(*) FROM copy_table;
 
 ERROR:  relation "copy_table" does not exist
 restore_isolation_tester_func
@@ -134,7 +134,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-copy:
-	SELECT run_commands_on_session_level_connection_to_node('COPY copy_table FROM PROGRAM ''echo 5, 50 && echo 6, 60 && echo 7, 70''WITH CSV');
+ SELECT run_commands_on_session_level_connection_to_node('COPY copy_table FROM PROGRAM ''echo 5, 50 && echo 6, 60 && echo 7, 70''WITH CSV');
 
 run_commands_on_session_level_connection_to_node
 
@@ -152,13 +152,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-select-for-update:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM copy_table WHERE id=5 FOR UPDATE');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM copy_table WHERE id=5 FOR UPDATE');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -170,7 +170,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -182,7 +182,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM copy_table;
+ SELECT COUNT(*) FROM copy_table;
 
 count
 

src/test/regress/expected/isolation_create_citus_local_table.out

@@ -10,7 +10,7 @@ citus_add_local_table_to_metadata
 step s2-create-citus-local-table-1: SELECT citus_add_local_table_to_metadata('citus_local_table_1'); <waiting ...>
 step s1-commit: COMMIT;
 step s2-create-citus-local-table-1: <... completed>
-error in steps s1-commit s2-create-citus-local-table-1: ERROR:  relation "citus_local_table_1_xxxxxxx" is a shard relation
+ERROR:  relation "citus_local_table_1_xxxxxxx" is a shard relation
 step s2-commit: COMMIT;
 master_remove_node
 
@@ -26,7 +26,7 @@ citus_add_local_table_to_metadata
 step s2-create-citus-local-table-3: SELECT citus_add_local_table_to_metadata('another_schema.citus_local_table_3'); <waiting ...>
 step s1-commit: COMMIT;
 step s2-create-citus-local-table-3: <... completed>
-error in steps s1-commit s2-create-citus-local-table-3: ERROR:  relation "citus_local_table_3_xxxxxxx" is a shard relation
+ERROR:  relation "citus_local_table_3_xxxxxxx" is a shard relation
 step s2-commit: COMMIT;
 master_remove_node
 
@@ -126,7 +126,7 @@ citus_add_local_table_to_metadata
 step s2-remove-coordinator: SELECT master_remove_node('localhost', 57636); <waiting ...>
 step s1-commit: COMMIT;
 step s2-remove-coordinator: <... completed>
-error in steps s1-commit s2-remove-coordinator: ERROR:  cannot remove the primary node of a node group which has shard placements
+ERROR:  cannot remove the primary node of a node group which has shard placements
 step s2-commit: COMMIT;
 master_remove_node
 
@@ -139,7 +139,7 @@ step s1-drop-table: DROP TABLE citus_local_table_1;
 step s2-create-citus-local-table-1: SELECT citus_add_local_table_to_metadata('citus_local_table_1'); <waiting ...>
 step s1-commit: COMMIT;
 step s2-create-citus-local-table-1: <... completed>
-error in steps s1-commit s2-create-citus-local-table-1: ERROR:  cannot add local table to metadata, relation does not exist
+ERROR:  cannot add local table to metadata, relation does not exist
 step s2-commit: COMMIT;
 master_remove_node
 
@@ -187,7 +187,7 @@ master_remove_node
 step s2-create-citus-local-table-1: SELECT citus_add_local_table_to_metadata('citus_local_table_1'); <waiting ...>
 step s1-commit: COMMIT;
 step s2-create-citus-local-table-1: <... completed>
-error in steps s1-commit s2-create-citus-local-table-1: ERROR:  could not find the coordinator node in metadata as it is not added as a worker
+ERROR:  could not find the coordinator node in metadata as it is not added as a worker
 step s2-commit: COMMIT;
 master_remove_node
 

src/test/regress/expected/isolation_create_distributed_table.out

@@ -5,24 +5,24 @@ step s1-begin:
     BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-create_distributed_table:
-	SELECT create_distributed_table('table_to_distribute', 'id');
+ SELECT create_distributed_table('table_to_distribute', 'id');
 
 create_distributed_table
 
 
 step s2-create_distributed_table:
-	SELECT create_distributed_table('table_to_distribute', 'id');
+ SELECT create_distributed_table('table_to_distribute', 'id');
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-create_distributed_table: <... completed>
-error in steps s1-commit s2-create_distributed_table: ERROR:  table "table_to_distribute" is already distributed
+ERROR:  table "table_to_distribute" is already distributed
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 
 starting permutation: s1-begin s2-begin s1-create_distributed_table s2-copy_to_local_table s1-commit s2-commit
@@ -30,23 +30,23 @@ step s1-begin:
     BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-create_distributed_table:
-	SELECT create_distributed_table('table_to_distribute', 'id');
+ SELECT create_distributed_table('table_to_distribute', 'id');
 
 create_distributed_table
 
 
 step s2-copy_to_local_table:
-	COPY table_to_distribute FROM PROGRAM 'echo 0 && echo 1 && echo 2 && echo 3 && echo 4 && echo 5 && echo 6 && echo 7 && echo 8';
+ COPY table_to_distribute FROM PROGRAM 'echo 0 && echo 1 && echo 2 && echo 3 && echo 4 && echo 5 && echo 6 && echo 7 && echo 8';
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-copy_to_local_table: <... completed>
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 
 starting permutation: s1-begin s2-begin s2-copy_to_local_table s1-create_distributed_table s2-commit s1-commit
@@ -54,16 +54,16 @@ step s1-begin:
     BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-copy_to_local_table:
-	COPY table_to_distribute FROM PROGRAM 'echo 0 && echo 1 && echo 2 && echo 3 && echo 4 && echo 5 && echo 6 && echo 7 && echo 8';
+ COPY table_to_distribute FROM PROGRAM 'echo 0 && echo 1 && echo 2 && echo 3 && echo 4 && echo 5 && echo 6 && echo 7 && echo 8';
 
 step s1-create_distributed_table:
-	SELECT create_distributed_table('table_to_distribute', 'id');
+ SELECT create_distributed_table('table_to_distribute', 'id');
  <waiting ...>
-step s2-commit:
+step s2-commit: 
-	COMMIT;
+ COMMIT;
 
 step s1-create_distributed_table: <... completed>
 create_distributed_table
@@ -75,28 +75,28 @@ step s1-commit:
 
 starting permutation: s1-copy_to_local_table s1-begin s2-begin s1-create_distributed_table s2-create_distributed_table s1-commit s2-commit
 step s1-copy_to_local_table:
-	COPY table_to_distribute FROM PROGRAM 'echo 0 && echo 1 && echo 2 && echo 3 && echo 4 && echo 5 && echo 6 && echo 7 && echo 8';
+ COPY table_to_distribute FROM PROGRAM 'echo 0 && echo 1 && echo 2 && echo 3 && echo 4 && echo 5 && echo 6 && echo 7 && echo 8';
 
 step s1-begin:
     BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-create_distributed_table:
-	SELECT create_distributed_table('table_to_distribute', 'id');
+ SELECT create_distributed_table('table_to_distribute', 'id');
 
 create_distributed_table
 
 
 step s2-create_distributed_table:
-	SELECT create_distributed_table('table_to_distribute', 'id');
+ SELECT create_distributed_table('table_to_distribute', 'id');
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-create_distributed_table: <... completed>
-error in steps s1-commit s2-create_distributed_table: ERROR:  table "table_to_distribute" is already distributed
+ERROR:  table "table_to_distribute" is already distributed
 step s2-commit:
-	COMMIT;
+ COMMIT;
 

src/test/regress/expected/isolation_create_table_vs_add_remove_node.out

@@ -19,7 +19,7 @@ step s2-create-table-1:
  CREATE TABLE dist_table (x int, y int);
  SELECT create_distributed_table('dist_table', 'x');
  <waiting ...>
-step s1-commit:
+step s1-commit: 
  COMMIT;
 
 step s2-create-table-1: <... completed>
@@ -71,7 +71,7 @@ step s2-create-table-1:
  CREATE TABLE dist_table (x int, y int);
  SELECT create_distributed_table('dist_table', 'x');
  <waiting ...>
-step s1-abort:
+step s1-abort: 
  ABORT;
 
 step s2-create-table-1: <... completed>
@@ -122,7 +122,7 @@ create_distributed_table
 step s1-add-node-2:
  SELECT 1 FROM master_add_node('localhost', 57638);
  <waiting ...>
-step s2-commit:
+step s2-commit: 
  COMMIT;
 
 step s1-add-node-2: <... completed>
@@ -180,7 +180,7 @@ step s2-create-table-1:
  CREATE TABLE dist_table (x int, y int);
  SELECT create_distributed_table('dist_table', 'x');
  <waiting ...>
-step s1-commit:
+step s1-commit: 
  COMMIT;
 
 step s2-create-table-1: <... completed>
@@ -237,7 +237,7 @@ step s2-create-table-1:
  CREATE TABLE dist_table (x int, y int);
  SELECT create_distributed_table('dist_table', 'x');
  <waiting ...>
-step s1-abort:
+step s1-abort: 
  ABORT;
 
 step s2-create-table-1: <... completed>
@@ -295,11 +295,11 @@ create_distributed_table
 step s1-remove-node-2:
  SELECT * FROM master_remove_node('localhost', 57638);
  <waiting ...>
-step s2-commit:
+step s2-commit: 
  COMMIT;
 
 step s1-remove-node-2: <... completed>
-error in steps s2-commit s1-remove-node-2: ERROR:  cannot remove the primary node of a node group which has shard placements
+ERROR:  cannot remove the primary node of a node group which has shard placements
 step s1-show-placements:
  SELECT
   nodename, nodeport
@@ -351,11 +351,11 @@ step s2-create-table-2:
  CREATE TABLE dist_table (x int, y int);
  SELECT create_distributed_table('dist_table', 'x');
  <waiting ...>
-step s1-commit:
+step s1-commit: 
  COMMIT;
 
 step s2-create-table-2: <... completed>
-error in steps s1-commit s2-create-table-2: ERROR:  replication_factor (2) exceeds number of worker nodes (1)
+ERROR:  replication_factor (2) exceeds number of worker nodes (1)
 step s2-select:
  SELECT * FROM dist_table;
 
@@ -389,11 +389,11 @@ create_distributed_table
 step s1-remove-node-2:
  SELECT * FROM master_remove_node('localhost', 57638);
  <waiting ...>
-step s2-commit:
+step s2-commit: 
  COMMIT;
 
 step s1-remove-node-2: <... completed>
-error in steps s2-commit s1-remove-node-2: ERROR:  cannot remove the primary node of a node group which has shard placements
+ERROR:  cannot remove the primary node of a node group which has shard placements
 step s2-select:
  SELECT * FROM dist_table;
 
@@ -429,7 +429,7 @@ step s2-create-append-table:
  SELECT create_distributed_table('dist_table', 'x', 'append');
  SELECT 1 FROM master_create_empty_shard('dist_table');
  <waiting ...>
-step s1-commit:
+step s1-commit: 
  COMMIT;
 
 step s2-create-append-table: <... completed>
@@ -476,11 +476,11 @@ create_distributed_table
 step s1-remove-node-2:
  SELECT * FROM master_remove_node('localhost', 57638);
  <waiting ...>
-step s2-commit:
+step s2-commit: 
  COMMIT;
 
 step s1-remove-node-2: <... completed>
-error in steps s2-commit s1-remove-node-2: ERROR:  cannot remove the primary node of a node group which has shard placements
+ERROR:  cannot remove the primary node of a node group which has shard placements
 step s2-select:
  SELECT * FROM dist_table;
 

src/test/regress/expected/isolation_data_migration.out

@@ -2,23 +2,23 @@ Parsed test spec with 2 sessions
 
 starting permutation: s2-begin s2-copy s1-create_distributed_table s2-commit s2-select
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-copy:
-	COPY migration_table FROM PROGRAM 'echo 1,hello' WITH CSV;
+ COPY migration_table FROM PROGRAM 'echo 1,hello' WITH CSV;
 
 step s1-create_distributed_table:
-	SELECT create_distributed_table('migration_table', 'test_id');
+ SELECT create_distributed_table('migration_table', 'test_id');
  <waiting ...>
-step s2-commit:
+step s2-commit: 
-	COMMIT;
+ COMMIT;
 
 step s1-create_distributed_table: <... completed>
 create_distributed_table
 
 
 step s2-select:
-	SELECT * FROM migration_table ORDER BY test_id;
+ SELECT * FROM migration_table ORDER BY test_id;
 
 test_id        data
 
@@ -26,23 +26,23 @@ test_id        data
 
 starting permutation: s1-begin s1-create_distributed_table s2-copy s1-commit s2-select
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-create_distributed_table:
-	SELECT create_distributed_table('migration_table', 'test_id');
+ SELECT create_distributed_table('migration_table', 'test_id');
 
 create_distributed_table
 
 
 step s2-copy:
-	COPY migration_table FROM PROGRAM 'echo 1,hello' WITH CSV;
+ COPY migration_table FROM PROGRAM 'echo 1,hello' WITH CSV;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-copy: <... completed>
 step s2-select:
-	SELECT * FROM migration_table ORDER BY test_id;
+ SELECT * FROM migration_table ORDER BY test_id;
 
 test_id        data
 
@@ -50,23 +50,23 @@ test_id        data
 
 starting permutation: s2-begin s2-insert s1-create_distributed_table s2-commit s2-select
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-insert:
-	INSERT INTO migration_table VALUES (1, 'hello');
+ INSERT INTO migration_table VALUES (1, 'hello');
 
 step s1-create_distributed_table:
-	SELECT create_distributed_table('migration_table', 'test_id');
+ SELECT create_distributed_table('migration_table', 'test_id');
  <waiting ...>
-step s2-commit:
+step s2-commit: 
-	COMMIT;
+ COMMIT;
 
 step s1-create_distributed_table: <... completed>
 create_distributed_table
 
 
 step s2-select:
-	SELECT * FROM migration_table ORDER BY test_id;
+ SELECT * FROM migration_table ORDER BY test_id;
 
 test_id        data
 
@@ -74,23 +74,23 @@ test_id        data
 
 starting permutation: s1-begin s1-create_distributed_table s2-insert s1-commit s2-select
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-create_distributed_table:
-	SELECT create_distributed_table('migration_table', 'test_id');
+ SELECT create_distributed_table('migration_table', 'test_id');
 
 create_distributed_table
 
 
 step s2-insert:
-	INSERT INTO migration_table VALUES (1, 'hello');
+ INSERT INTO migration_table VALUES (1, 'hello');
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-insert: <... completed>
 step s2-select:
-	SELECT * FROM migration_table ORDER BY test_id;
+ SELECT * FROM migration_table ORDER BY test_id;
 
 test_id        data
 
@@ -98,26 +98,26 @@ test_id        data
 
 starting permutation: s1-begin-serializable s2-copy s1-create_distributed_table s1-commit s2-select
 step s1-begin-serializable:
-	BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
+ BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
-	SELECT 1;
+ SELECT 1;
 
 ?column?
 
 1
 step s2-copy:
-	COPY migration_table FROM PROGRAM 'echo 1,hello' WITH CSV;
+ COPY migration_table FROM PROGRAM 'echo 1,hello' WITH CSV;
 
 step s1-create_distributed_table:
-	SELECT create_distributed_table('migration_table', 'test_id');
+ SELECT create_distributed_table('migration_table', 'test_id');
 
 create_distributed_table
 
 
 step s1-commit:
-	COMMIT;
+ COMMIT;
 
 step s2-select:
-	SELECT * FROM migration_table ORDER BY test_id;
+ SELECT * FROM migration_table ORDER BY test_id;
 
 test_id        data
 
@@ -125,26 +125,26 @@ test_id        data
 
 starting permutation: s1-begin-serializable s2-insert s1-create_distributed_table s1-commit s2-select
 step s1-begin-serializable:
-	BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
+ BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
-	SELECT 1;
+ SELECT 1;
 
 ?column?
 
 1
 step s2-insert:
-	INSERT INTO migration_table VALUES (1, 'hello');
+ INSERT INTO migration_table VALUES (1, 'hello');
 
 step s1-create_distributed_table:
-	SELECT create_distributed_table('migration_table', 'test_id');
+ SELECT create_distributed_table('migration_table', 'test_id');
 
 create_distributed_table
 
 
 step s1-commit:
-	COMMIT;
+ COMMIT;
 
 step s2-select:
-	SELECT * FROM migration_table ORDER BY test_id;
+ SELECT * FROM migration_table ORDER BY test_id;
 
 test_id        data
 

src/test/regress/expected/isolation_ddl_vs_all.out

@@ -11,7 +11,7 @@ step s1-ddl-create-index: CREATE INDEX ddl_hash_index ON ddl_hash(id);
 step s2-ddl-create-index: CREATE INDEX ddl_hash_index ON ddl_hash(id); <waiting ...>
 step s1-commit: COMMIT;
 step s2-ddl-create-index: <... completed>
-error in steps s1-commit s2-ddl-create-index: ERROR:  duplicate key value violates unique constraint "pg_class_relname_nsp_index"
+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%''');
 run_command_on_workers
@@ -32,7 +32,7 @@ step s1-ddl-create-index: CREATE INDEX ddl_hash_index ON ddl_hash(id);
 step s2-ddl-create-index-concurrently: CREATE INDEX CONCURRENTLY ddl_hash_index ON ddl_hash(id); <waiting ...>
 step s1-commit: COMMIT;
 step s2-ddl-create-index-concurrently: <... completed>
-error in steps s1-commit s2-ddl-create-index-concurrently: ERROR:  relation "ddl_hash_index" already exists
+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%''');
 run_command_on_workers
 
@@ -268,7 +268,7 @@ step s1-ddl-rename-column: ALTER TABLE ddl_hash RENAME data TO new_column;
 step s2-ddl-rename-column: ALTER TABLE ddl_hash RENAME data TO new_column; <waiting ...>
 step s1-commit: COMMIT;
 step s2-ddl-rename-column: <... completed>
-error in steps s1-commit s2-ddl-rename-column: ERROR:  column "data" does not exist
+ERROR:  column "data" does not exist
 step s2-commit: COMMIT;
 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');
 run_command_on_workers

src/test/regress/expected/isolation_delete_vs_all.out

@@ -286,7 +286,7 @@ step s1-drop: DROP TABLE delete_hash;
 step s2-delete: DELETE FROM delete_hash WHERE id = 4; <waiting ...>
 step s1-commit: COMMIT;
 step s2-delete: <... completed>
-error in steps s1-commit s2-delete: ERROR:  relation "delete_hash" does not exist
+ERROR:  relation "delete_hash" does not exist
 step s2-commit: COMMIT;
 step s1-select-count: SELECT COUNT(*) FROM delete_hash;
 ERROR:  relation "delete_hash" does not exist

src/test/regress/expected/isolation_dis2ref_foreign_keys_on_mx.out

@@ -2,31 +2,31 @@ Parsed test spec with 3 sessions
 
 starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-delete s2-start-session-level-connection s2-begin-on-worker s2-insert s1-rollback-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-display
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-delete:
-	SELECT run_commands_on_session_level_connection_to_node('DELETE FROM ref_table WHERE id=1');
+ SELECT run_commands_on_session_level_connection_to_node('DELETE FROM ref_table WHERE id=1');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57638);
+ SELECT start_session_level_connection_to_node('localhost', 57638);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
@@ -34,8 +34,8 @@ run_commands_on_session_level_connection_to_node
 step s2-insert:
         SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table VALUES (1, 1)');
  <waiting ...>
-step s1-rollback-worker:
+step s1-rollback-worker: 
-	SELECT run_commands_on_session_level_connection_to_node('ROLLBACK');
+ SELECT run_commands_on_session_level_connection_to_node('ROLLBACK');
 
 run_commands_on_session_level_connection_to_node
 
@@ -45,26 +45,26 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s3-display:
-	SELECT * FROM ref_table ORDER BY id, value;
+ SELECT * FROM ref_table ORDER BY id, value;
-	SELECT * FROM dist_table ORDER BY id, value;
+ SELECT * FROM dist_table ORDER BY id, value;
 
 id             value
 
@@ -81,31 +81,31 @@ restore_isolation_tester_func
 
 starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-delete s2-start-session-level-connection s2-begin-on-worker s2-select s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-display
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-delete:
-	SELECT run_commands_on_session_level_connection_to_node('DELETE FROM ref_table WHERE id=1');
+ SELECT run_commands_on_session_level_connection_to_node('DELETE FROM ref_table WHERE id=1');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57638);
+ SELECT start_session_level_connection_to_node('localhost', 57638);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
@@ -117,32 +117,32 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s3-display:
-	SELECT * FROM ref_table ORDER BY id, value;
+ SELECT * FROM ref_table ORDER BY id, value;
-	SELECT * FROM dist_table ORDER BY id, value;
+ SELECT * FROM dist_table ORDER BY id, value;
 
 id             value
 
@@ -156,31 +156,31 @@ restore_isolation_tester_func
 
 starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-delete s2-start-session-level-connection s2-begin-on-worker s2-insert-select s1-rollback-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-display
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-delete:
-	SELECT run_commands_on_session_level_connection_to_node('DELETE FROM ref_table WHERE id=1');
+ SELECT run_commands_on_session_level_connection_to_node('DELETE FROM ref_table WHERE id=1');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57638);
+ SELECT start_session_level_connection_to_node('localhost', 57638);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
@@ -188,8 +188,8 @@ run_commands_on_session_level_connection_to_node
 step s2-insert-select:
         SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT * FROM dist_table');
  <waiting ...>
-step s1-rollback-worker:
+step s1-rollback-worker: 
-	SELECT run_commands_on_session_level_connection_to_node('ROLLBACK');
+ SELECT run_commands_on_session_level_connection_to_node('ROLLBACK');
 
 run_commands_on_session_level_connection_to_node
 
@@ -199,26 +199,26 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s3-display:
-	SELECT * FROM ref_table ORDER BY id, value;
+ SELECT * FROM ref_table ORDER BY id, value;
-	SELECT * FROM dist_table ORDER BY id, value;
+ SELECT * FROM dist_table ORDER BY id, value;
 
 id             value
 
@@ -236,31 +236,31 @@ restore_isolation_tester_func
 
 starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-update s2-start-session-level-connection s2-begin-on-worker s2-update s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-display
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-update:
-	SELECT run_commands_on_session_level_connection_to_node('UPDATE ref_table SET id=id+2 WHERE id=1');
+ SELECT run_commands_on_session_level_connection_to_node('UPDATE ref_table SET id=id+2 WHERE id=1');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57638);
+ SELECT start_session_level_connection_to_node('localhost', 57638);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
@@ -268,8 +268,8 @@ run_commands_on_session_level_connection_to_node
 step s2-update:
         SELECT run_commands_on_session_level_connection_to_node('UPDATE dist_table SET value=2 WHERE id=1');
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -279,26 +279,26 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s3-display:
-	SELECT * FROM ref_table ORDER BY id, value;
+ SELECT * FROM ref_table ORDER BY id, value;
-	SELECT * FROM dist_table ORDER BY id, value;
+ SELECT * FROM dist_table ORDER BY id, value;
 
 id             value
 
@@ -314,31 +314,31 @@ restore_isolation_tester_func
 
 starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-update s2-start-session-level-connection s2-begin-on-worker s2-copy s1-rollback-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-display
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-update:
-	SELECT run_commands_on_session_level_connection_to_node('UPDATE ref_table SET id=id+2 WHERE id=1');
+ SELECT run_commands_on_session_level_connection_to_node('UPDATE ref_table SET id=id+2 WHERE id=1');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57638);
+ SELECT start_session_level_connection_to_node('localhost', 57638);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
@@ -346,8 +346,8 @@ run_commands_on_session_level_connection_to_node
 step s2-copy:
         SELECT run_commands_on_session_level_connection_to_node('COPY dist_table FROM PROGRAM ''echo 1, 1''WITH CSV');
  <waiting ...>
-step s1-rollback-worker:
+step s1-rollback-worker: 
-	SELECT run_commands_on_session_level_connection_to_node('ROLLBACK');
+ SELECT run_commands_on_session_level_connection_to_node('ROLLBACK');
 
 run_commands_on_session_level_connection_to_node
 
@@ -357,26 +357,26 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s3-display:
-	SELECT * FROM ref_table ORDER BY id, value;
+ SELECT * FROM ref_table ORDER BY id, value;
-	SELECT * FROM dist_table ORDER BY id, value;
+ SELECT * FROM dist_table ORDER BY id, value;
 
 id             value
 
@@ -393,31 +393,31 @@ restore_isolation_tester_func
 
 starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-update s2-start-session-level-connection s2-begin-on-worker s2-truncate s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-display
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-update:
-	SELECT run_commands_on_session_level_connection_to_node('UPDATE ref_table SET id=id+2 WHERE id=1');
+ SELECT run_commands_on_session_level_connection_to_node('UPDATE ref_table SET id=id+2 WHERE id=1');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57638);
+ SELECT start_session_level_connection_to_node('localhost', 57638);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
@@ -425,8 +425,8 @@ run_commands_on_session_level_connection_to_node
 step s2-truncate:
         SELECT run_commands_on_session_level_connection_to_node('TRUNCATE dist_table');
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -436,26 +436,26 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s3-display:
-	SELECT * FROM ref_table ORDER BY id, value;
+ SELECT * FROM ref_table ORDER BY id, value;
-	SELECT * FROM dist_table ORDER BY id, value;
+ SELECT * FROM dist_table ORDER BY id, value;
 
 id             value
 
@@ -469,31 +469,31 @@ restore_isolation_tester_func
 
 starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-delete s2-start-session-level-connection s2-begin-on-worker s2-select-for-udpate s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection s3-display
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-delete:
-	SELECT run_commands_on_session_level_connection_to_node('DELETE FROM ref_table WHERE id=1');
+ SELECT run_commands_on_session_level_connection_to_node('DELETE FROM ref_table WHERE id=1');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57638);
+ SELECT start_session_level_connection_to_node('localhost', 57638);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
@@ -501,8 +501,8 @@ run_commands_on_session_level_connection_to_node
 step s2-select-for-udpate:
         SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM dist_table WHERE id=1 FOR UPDATE');
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -512,26 +512,26 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s3-display:
-	SELECT * FROM ref_table ORDER BY id, value;
+ SELECT * FROM ref_table ORDER BY id, value;
-	SELECT * FROM dist_table ORDER BY id, value;
+ SELECT * FROM dist_table ORDER BY id, value;
 
 id             value
 

src/test/regress/expected/isolation_distributed_deadlock_detection.out

@@ -16,7 +16,7 @@ step s2-update-2:
 step s2-update-1:
   UPDATE deadlock_detection_test SET some_val = 2 WHERE user_id = 1;
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
@@ -25,15 +25,15 @@ f
 step s1-update-2:
   UPDATE deadlock_detection_test SET some_val = 1 WHERE user_id = 2;
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
 
 t
 step s2-update-1: <... completed>
+ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step s1-update-2: <... completed>
-error in steps deadlock-checker-call s2-update-1 s1-update-2: ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step s1-commit:
   COMMIT;
 
@@ -57,7 +57,7 @@ step s2-update-2-rep-2:
 step s2-update-1-rep-2:
   UPDATE deadlock_detection_test_rep_2 SET some_val = 1 WHERE user_id = 1;
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
@@ -66,15 +66,15 @@ f
 step s1-update-2-rep-2:
   UPDATE deadlock_detection_test_rep_2 SET some_val = 1 WHERE user_id = 2;
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
 
 t
 step s2-update-1-rep-2: <... completed>
+ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step s1-update-2-rep-2: <... completed>
-error in steps deadlock-checker-call s2-update-1-rep-2 s1-update-2-rep-2: ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step s1-commit:
   COMMIT;
 
@@ -90,10 +90,10 @@ step s2-begin:
   BEGIN;
 
 step s1-set-2pc:
-	set citus.multi_shard_commit_protocol TO '2pc';
+ set citus.multi_shard_commit_protocol TO '2pc';
 
 step s2-set-2pc:
-	set citus.multi_shard_commit_protocol TO '2pc';
+ set citus.multi_shard_commit_protocol TO '2pc';
 
 step s1-update-1:
   UPDATE deadlock_detection_test SET some_val = 1 WHERE user_id = 1;
@@ -104,7 +104,7 @@ step s2-update-2:
 step s2-update-1:
   UPDATE deadlock_detection_test SET some_val = 2 WHERE user_id = 1;
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
@@ -113,15 +113,15 @@ f
 step s1-update-2:
   UPDATE deadlock_detection_test SET some_val = 1 WHERE user_id = 2;
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
 
 t
 step s2-update-1: <... completed>
+ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step s1-update-2: <... completed>
-error in steps deadlock-checker-call s2-update-1 s1-update-2: ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step s1-commit:
   COMMIT;
 
@@ -145,16 +145,16 @@ step s2-update-2:
 step s1-update-2:
   UPDATE deadlock_detection_test SET some_val = 1 WHERE user_id = 2;
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
 
 f
 step s2-upsert-select-all:
-	INSERT INTO deadlock_detection_test SELECT * FROM deadlock_detection_test ON CONFLICT(user_id) DO UPDATE SET some_val = deadlock_detection_test.some_val + 5 RETURNING *;
+ INSERT INTO deadlock_detection_test SELECT * FROM deadlock_detection_test ON CONFLICT(user_id) DO UPDATE SET some_val = deadlock_detection_test.some_val + 5 RETURNING *;
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
@@ -162,7 +162,7 @@ check_distributed_deadlocks
 t
 step s1-update-2: <... completed>
 step s2-upsert-select-all: <... completed>
-error in steps deadlock-checker-call s1-update-2 s2-upsert-select-all: ERROR:  canceling the transaction since it was involved in a distributed deadlock
+ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step s1-commit:
   COMMIT;
 
@@ -186,16 +186,16 @@ step s2-update-2:
 step s1-update-2:
   UPDATE deadlock_detection_test SET some_val = 1 WHERE user_id = 2;
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
 
 f
 step s2-ddl:
-	ALTER TABLE deadlock_detection_test ADD COLUMN test_col INT;
+ ALTER TABLE deadlock_detection_test ADD COLUMN test_col INT;
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
@@ -203,7 +203,7 @@ check_distributed_deadlocks
 t
 step s1-update-2: <... completed>
 step s2-ddl: <... completed>
-error in steps deadlock-checker-call s1-update-2 s2-ddl: ERROR:  canceling the transaction since it was involved in a distributed deadlock
+ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step s1-commit:
   COMMIT;
 
@@ -227,18 +227,18 @@ step s2-insert-local-10:
 step s2-insert-dist-10:
   INSERT INTO deadlock_detection_test VALUES (10, 10);
  <waiting ...>
-step s1-insert-local-10:
+step s1-insert-local-10: 
   INSERT INTO local_deadlock_table VALUES (10, 10);
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
 
 t
 step s2-insert-dist-10: <... completed>
+ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step s1-insert-local-10: <... completed>
-error in steps deadlock-checker-call s2-insert-dist-10 s1-insert-local-10: ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step s1-commit:
   COMMIT;
 
@@ -262,18 +262,18 @@ step s1-insert-ref-11:
 step s1-insert-ref-10:
   INSERT INTO deadlock_detection_reference VALUES (10, 10);
  <waiting ...>
-step s2-insert-ref-11:
+step s2-insert-ref-11: 
   INSERT INTO deadlock_detection_reference VALUES (11, 11);
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
 
 t
 step s1-insert-ref-10: <... completed>
+ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step s2-insert-ref-11: <... completed>
-error in steps deadlock-checker-call s1-insert-ref-10 s2-insert-ref-11: ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step s1-commit:
   COMMIT;
 
@@ -303,10 +303,10 @@ f
 step s2-update-1:
   UPDATE deadlock_detection_test SET some_val = 2 WHERE user_id = 1;
  <waiting ...>
-step s1-insert-ref-10:
+step s1-insert-ref-10: 
   INSERT INTO deadlock_detection_reference VALUES (10, 10);
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
@@ -314,7 +314,7 @@ check_distributed_deadlocks
 t
 step s2-update-1: <... completed>
 step s1-insert-ref-10: <... completed>
-error in steps deadlock-checker-call s2-update-1 s1-insert-ref-10: ERROR:  canceling the transaction since it was involved in a distributed deadlock
+ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step s1-commit:
   COMMIT;
 
@@ -350,13 +350,13 @@ f
 step s1-update-2:
   UPDATE deadlock_detection_test SET some_val = 1 WHERE user_id = 2;
  <waiting ...>
-step s2-update-3:
+step s2-update-3: 
   UPDATE deadlock_detection_test SET some_val = 2 WHERE user_id = 3;
  <waiting ...>
-step s3-update-1:
+step s3-update-1: 
   UPDATE deadlock_detection_test SET some_val = 3 WHERE user_id = 1;
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
@@ -364,7 +364,7 @@ check_distributed_deadlocks
 t
 step s2-update-3: <... completed>
 step s3-update-1: <... completed>
-error in steps deadlock-checker-call s2-update-3 s3-update-1: ERROR:  canceling the transaction since it was involved in a distributed deadlock
+ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step s3-commit:
   COMMIT;
 
@@ -392,7 +392,7 @@ step s2-update-1:
 step s1-update-1:
   UPDATE deadlock_detection_test SET some_val = 1 WHERE user_id = 1;
  <waiting ...>
-step s2-update-2:
+step s2-update-2: 
   UPDATE deadlock_detection_test SET some_val = 2 WHERE user_id = 2;
 
 step s3-update-3:
@@ -401,7 +401,7 @@ step s3-update-3:
 step s3-update-2:
   UPDATE deadlock_detection_test SET some_val = 3 WHERE user_id = 2;
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
@@ -410,15 +410,15 @@ f
 step s2-update-3:
   UPDATE deadlock_detection_test SET some_val = 2 WHERE user_id = 3;
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
 
 t
 step s3-update-2: <... completed>
+ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step s2-update-3: <... completed>
-error in steps deadlock-checker-call s3-update-2 s2-update-3: ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step s3-commit:
   COMMIT;
 
@@ -455,7 +455,7 @@ step s3-update-3:
 step s3-update-2:
   UPDATE deadlock_detection_test SET some_val = 3 WHERE user_id = 2;
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
@@ -467,15 +467,15 @@ step s4-update-4:
 step s2-update-3:
   UPDATE deadlock_detection_test SET some_val = 2 WHERE user_id = 3;
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
 
 t
 step s3-update-2: <... completed>
+ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step s2-update-3: <... completed>
-error in steps deadlock-checker-call s3-update-2 s2-update-3: ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step s3-commit:
   COMMIT;
 
@@ -508,7 +508,7 @@ step s4-update-1:
 step s1-update-1:
   UPDATE deadlock_detection_test SET some_val = 1 WHERE user_id = 1;
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
@@ -523,10 +523,10 @@ step s3-update-3:
 step s2-update-3:
   UPDATE deadlock_detection_test SET some_val = 2 WHERE user_id = 3;
  <waiting ...>
-step s3-update-2:
+step s3-update-2: 
   UPDATE deadlock_detection_test SET some_val = 3 WHERE user_id = 2;
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
@@ -534,7 +534,7 @@ check_distributed_deadlocks
 t
 step s2-update-3: <... completed>
 step s3-update-2: <... completed>
-error in steps deadlock-checker-call s2-update-3 s3-update-2: ERROR:  canceling the transaction since it was involved in a distributed deadlock
+ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step s3-commit:
   COMMIT;
 
@@ -577,21 +577,21 @@ step s3-update-3:
 step s3-update-2:
   UPDATE deadlock_detection_test SET some_val = 3 WHERE user_id = 2;
  <waiting ...>
-step s4-update-1:
+step s4-update-1: 
   UPDATE deadlock_detection_test SET some_val = 4 WHERE user_id = 1;
  <waiting ...>
-step s1-update-4:
+step s1-update-4: 
   UPDATE deadlock_detection_test SET some_val = 1 WHERE user_id = 4;
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
 
 t
 step s4-update-1: <... completed>
+ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step s1-update-4: <... completed>
-error in steps deadlock-checker-call s4-update-1 s1-update-4: ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step s1-commit:
   COMMIT;
 
@@ -601,15 +601,15 @@ step s4-commit:
 step s2-update-3:
   UPDATE deadlock_detection_test SET some_val = 2 WHERE user_id = 3;
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
 
 t
 step s3-update-2: <... completed>
+ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step s2-update-3: <... completed>
-error in steps deadlock-checker-call s3-update-2 s2-update-3: ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step s2-commit:
   COMMIT;
 
@@ -654,7 +654,7 @@ step s4-update-4:
 step s3-update-4:
   UPDATE deadlock_detection_test SET some_val = 3 WHERE user_id = 4;
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
@@ -666,13 +666,13 @@ step s6-update-6:
 step s4-update-6:
   UPDATE deadlock_detection_test SET some_val = 4 WHERE user_id = 6;
  <waiting ...>
-step s1-update-5:
+step s1-update-5: 
   UPDATE deadlock_detection_test SET some_val = 1 WHERE user_id = 5;
  <waiting ...>
-step s5-update-1:
+step s5-update-1: 
   UPDATE deadlock_detection_test SET some_val = 5 WHERE user_id = 1;
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
@@ -680,7 +680,7 @@ check_distributed_deadlocks
 t
 step s1-update-5: <... completed>
 step s5-update-1: <... completed>
-error in steps deadlock-checker-call s1-update-5 s5-update-1: ERROR:  canceling the transaction since it was involved in a distributed deadlock
+ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step s1-commit:
   COMMIT;
 
@@ -730,16 +730,16 @@ step s5-update-5:
 step s5-update-6:
   UPDATE deadlock_detection_test SET some_val = 5 WHERE user_id = 6;
  <waiting ...>
-step s4-update-4:
+step s4-update-4: 
   UPDATE deadlock_detection_test SET some_val = 4 WHERE user_id = 4;
 
 step s1-update-4:
   UPDATE deadlock_detection_test SET some_val = 1 WHERE user_id = 4;
  <waiting ...>
-step s4-update-5:
+step s4-update-5: 
   UPDATE deadlock_detection_test SET some_val = 4 WHERE user_id = 5;
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
@@ -754,10 +754,10 @@ step s3-update-2:
 step s2-update-2:
   UPDATE deadlock_detection_test SET some_val = 2 WHERE user_id = 2;
  <waiting ...>
-step s3-update-3:
+step s3-update-3: 
   UPDATE deadlock_detection_test SET some_val = 3 WHERE user_id = 3;
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
@@ -765,7 +765,7 @@ check_distributed_deadlocks
 t
 step s2-update-2: <... completed>
 step s3-update-3: <... completed>
-error in steps deadlock-checker-call s2-update-2 s3-update-3: ERROR:  canceling the transaction since it was involved in a distributed deadlock
+ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step s6-commit:
   COMMIT;
 
@@ -816,19 +816,19 @@ step s3-update-2:
 step s2-update-2:
   UPDATE deadlock_detection_test SET some_val = 2 WHERE user_id = 2;
  <waiting ...>
-step s4-update-4:
+step s4-update-4: 
   UPDATE deadlock_detection_test SET some_val = 4 WHERE user_id = 4;
 
 step s3-update-4:
   UPDATE deadlock_detection_test SET some_val = 3 WHERE user_id = 4;
  <waiting ...>
-step s4-update-5:
+step s4-update-5: 
   UPDATE deadlock_detection_test SET some_val = 4 WHERE user_id = 5;
  <waiting ...>
-step s1-update-4:
+step s1-update-4: 
   UPDATE deadlock_detection_test SET some_val = 1 WHERE user_id = 4;
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
@@ -840,10 +840,10 @@ step s6-update-6:
 step s5-update-6:
   UPDATE deadlock_detection_test SET some_val = 5 WHERE user_id = 6;
  <waiting ...>
-step s6-update-5:
+step s6-update-5: 
   UPDATE deadlock_detection_test SET some_val = 6 WHERE user_id = 5;
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
@@ -851,7 +851,7 @@ check_distributed_deadlocks
 t
 step s5-update-6: <... completed>
 step s6-update-5: <... completed>
-error in steps deadlock-checker-call s5-update-6 s6-update-5: ERROR:  canceling the transaction since it was involved in a distributed deadlock
+ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step s5-commit:
   COMMIT;
 
@@ -903,7 +903,7 @@ step s2-update-4:
 step s2-update-3:
   UPDATE deadlock_detection_test SET some_val = 2 WHERE user_id = 3;
  <waiting ...>
-step s4-update-2:
+step s4-update-2: 
   UPDATE deadlock_detection_test SET some_val = 4 WHERE user_id = 2;
 
 step s5-random-adv-lock:
@@ -915,20 +915,20 @@ pg_advisory_xact_lock
 step s4-random-adv-lock:
   SELECT pg_advisory_xact_lock(8765);
  <waiting ...>
-step s3-update-1:
+step s3-update-1: 
   UPDATE deadlock_detection_test SET some_val = 3 WHERE user_id = 1;
  <waiting ...>
-step s1-update-2-4:
+step s1-update-2-4: 
   UPDATE deadlock_detection_test SET some_val = 1 WHERE user_id = 2 OR user_id = 4;
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
 
 t
 step s2-update-3: <... completed>
-error in steps deadlock-checker-call s2-update-3: ERROR:  canceling the transaction since it was involved in a distributed deadlock
+ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step deadlock-checker-call:
   SELECT check_distributed_deadlocks();
 

src/test/regress/expected/isolation_distributed_transaction_id.out

@@ -11,7 +11,7 @@ assign_distributed_transaction_id
 
 
 step s1-get-all-transactions:
-	SELECT initiator_node_identifier, transaction_number, transaction_stamp FROM get_current_transaction_id() ORDER BY 1,2,3;
+ SELECT initiator_node_identifier, transaction_number, transaction_stamp FROM get_current_transaction_id() ORDER BY 1,2,3;
 
 initiator_node_identifiertransaction_numbertransaction_stamp
 
@@ -26,7 +26,7 @@ assign_distributed_transaction_id
 
 
 step s2-get-all-transactions:
-	SELECT initiator_node_identifier, transaction_number, transaction_stamp FROM get_current_transaction_id() ORDER BY 1,2,3;
+ SELECT initiator_node_identifier, transaction_number, transaction_stamp FROM get_current_transaction_id() ORDER BY 1,2,3;
 
 initiator_node_identifiertransaction_numbertransaction_stamp
 
@@ -41,7 +41,7 @@ assign_distributed_transaction_id
 
 
 step s3-get-all-transactions:
-	SELECT initiator_node_identifier, transaction_number, transaction_stamp FROM get_current_transaction_id() ORDER BY 1,2,3;
+ SELECT initiator_node_identifier, transaction_number, transaction_stamp FROM get_current_transaction_id() ORDER BY 1,2,3;
 
 initiator_node_identifiertransaction_numbertransaction_stamp
 
@@ -58,10 +58,10 @@ step s3-commit:
 
 starting permutation: s1-create-table s1-begin s1-insert s1-verify-current-xact-is-on-worker s1-commit
 step s1-create-table:
-	-- some tests also use distributed table
+ -- some tests also use distributed table
-	CREATE TABLE distributed_transaction_id_table(some_value int, other_value int);
+ CREATE TABLE distributed_transaction_id_table(some_value int, other_value int);
-	SET citus.shard_count TO 4;
+ SET citus.shard_count TO 4;
-	SELECT create_distributed_table('distributed_transaction_id_table', 'some_value');
+ SELECT create_distributed_table('distributed_transaction_id_table', 'some_value');
 
 create_distributed_table
 
@@ -70,16 +70,16 @@ step s1-begin:
     BEGIN;
 
 step s1-insert:
-	INSERT INTO distributed_transaction_id_table VALUES (1, 1);
+ INSERT INTO distributed_transaction_id_table VALUES (1, 1);
 
 step s1-verify-current-xact-is-on-worker:
-	SELECT
+ SELECT
-	    remote.nodeport,
+     remote.nodeport,
-	    remote.result = row(xact.initiator_node_identifier, xact.transaction_number)::text AS xact_exists
+     remote.result = row(xact.initiator_node_identifier, xact.transaction_number)::text AS xact_exists
-	FROM
+ FROM
-	    get_current_transaction_id() as xact,
+     get_current_transaction_id() as xact,
-	    run_command_on_workers($$
+     run_command_on_workers($$
-	        SELECT row(initiator_node_identifier, transaction_number)
+         SELECT row(initiator_node_identifier, transaction_number)
             FROM get_all_active_transactions();
         $$) as remote
     ORDER BY remote.nodeport ASC;

src/test/regress/expected/isolation_dml_vs_repair.out

@@ -16,7 +16,7 @@ step s1-insertone:
 step s2-repair:
     SELECT master_copy_shard_placement((SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_dml_vs_repair'::regclass), 'localhost', 57638, 'localhost', 57637);
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-repair: <... completed>
@@ -43,7 +43,7 @@ step s1-insertall:
 step s2-repair:
     SELECT master_copy_shard_placement((SELECT shardid FROM pg_dist_shard WHERE logicalrelid = 'test_dml_vs_repair'::regclass), 'localhost', 57638, 'localhost', 57637);
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-repair: <... completed>
@@ -70,7 +70,7 @@ master_copy_shard_placement
 step s1-insertone:
     INSERT INTO test_dml_vs_repair VALUES(1, 1);
  <waiting ...>
-step s2-commit:
+step s2-commit: 
     COMMIT;
 
 step s1-insertone: <... completed>
@@ -118,7 +118,7 @@ master_copy_shard_placement
 step s1-prepared-insertone:
     EXECUTE insertone;
  <waiting ...>
-step s2-commit:
+step s2-commit: 
     COMMIT;
 
 step s1-prepared-insertone: <... completed>
@@ -171,7 +171,7 @@ master_copy_shard_placement
 step s1-prepared-insertall:
     EXECUTE insertall;
  <waiting ...>
-step s2-commit:
+step s2-commit: 
     COMMIT;
 
 step s1-prepared-insertall: <... completed>

src/test/regress/expected/isolation_drop_alter_index_select_for_update_on_mx.out

@@ -32,10 +32,10 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-alter:
-	ALTER TABLE dist_table DROP value;
+ ALTER TABLE dist_table DROP value;
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -48,7 +48,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -60,7 +60,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM dist_table;
+ SELECT COUNT(*) FROM dist_table;
 
 count
 
@@ -71,10 +71,10 @@ restore_isolation_tester_func
 
 starting permutation: s1-begin s1-index s2-start-session-level-connection s2-begin-on-worker s2-select-for-update s1-commit s2-commit-worker s2-stop-connection
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-index:
-	CREATE INDEX dist_table_index ON dist_table (id);
+ CREATE INDEX dist_table_index ON dist_table (id);
 
 step s2-start-session-level-connection:
         SELECT start_session_level_connection_to_node('localhost', 57638);
@@ -89,13 +89,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-select-for-update:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM dist_table WHERE id = 5 FOR UPDATE');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM dist_table WHERE id = 5 FOR UPDATE');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit:
-	COMMIT;
+ COMMIT;
 
 step s2-commit-worker:
         SELECT run_commands_on_session_level_connection_to_node('COMMIT');
@@ -127,7 +127,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-select-for-update:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM dist_table WHERE id = 5 FOR UPDATE');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM dist_table WHERE id = 5 FOR UPDATE');
 
 run_commands_on_session_level_connection_to_node
 
@@ -145,10 +145,10 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-select-for-update:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM dist_table WHERE id = 5 FOR UPDATE');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM dist_table WHERE id = 5 FOR UPDATE');
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -164,7 +164,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -193,22 +193,22 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-select-for-update:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM dist_table WHERE id = 5 FOR UPDATE');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM dist_table WHERE id = 5 FOR UPDATE');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-coordinator-create-index-concurrently:
-	CREATE INDEX CONCURRENTLY dist_table_index_conc ON dist_table(id);
+ CREATE INDEX CONCURRENTLY dist_table_index_conc ON dist_table(id);
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 

src/test/regress/expected/isolation_drop_shards.out

@@ -5,19 +5,19 @@ starting permutation: s1-begin s1-drop-all-shards s2-truncate s1-commit
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-drop-all-shards:
-	SELECT citus_drop_all_shards('append_table', 'public', 'append_table');
+ SELECT citus_drop_all_shards('append_table', 'public', 'append_table');
 
 citus_drop_all_shards
 
 16
 step s2-truncate:
-	TRUNCATE append_table;
+ TRUNCATE append_table;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-truncate: <... completed>
 
@@ -26,19 +26,19 @@ starting permutation: s1-begin s1-drop-all-shards s2-apply-delete-command s1-com
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-drop-all-shards:
-	SELECT citus_drop_all_shards('append_table', 'public', 'append_table');
+ SELECT citus_drop_all_shards('append_table', 'public', 'append_table');
 
 citus_drop_all_shards
 
 16
 step s2-apply-delete-command:
-	SELECT master_apply_delete_command('DELETE FROM append_table');
+ SELECT master_apply_delete_command('DELETE FROM append_table');
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-apply-delete-command: <... completed>
 master_apply_delete_command
@@ -50,19 +50,19 @@ starting permutation: s1-begin s1-drop-all-shards s2-drop-all-shards s1-commit
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-drop-all-shards:
-	SELECT citus_drop_all_shards('append_table', 'public', 'append_table');
+ SELECT citus_drop_all_shards('append_table', 'public', 'append_table');
 
 citus_drop_all_shards
 
 16
 step s2-drop-all-shards:
-	SELECT citus_drop_all_shards('append_table', 'public', 'append_table');
+ SELECT citus_drop_all_shards('append_table', 'public', 'append_table');
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-drop-all-shards: <... completed>
 citus_drop_all_shards
@@ -74,19 +74,19 @@ starting permutation: s1-begin s1-drop-all-shards s2-select s1-commit
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-drop-all-shards:
-	SELECT citus_drop_all_shards('append_table', 'public', 'append_table');
+ SELECT citus_drop_all_shards('append_table', 'public', 'append_table');
 
 citus_drop_all_shards
 
 16
 step s2-select:
-	SELECT * FROM append_table;
+ SELECT * FROM append_table;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-select: <... completed>
 test_id        data
@@ -97,19 +97,19 @@ starting permutation: s1-begin s1-apply-delete-command s2-truncate s1-commit
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-apply-delete-command:
-	SELECT master_apply_delete_command('DELETE FROM append_table');
+ SELECT master_apply_delete_command('DELETE FROM append_table');
 
 master_apply_delete_command
 
 16
 step s2-truncate:
-	TRUNCATE append_table;
+ TRUNCATE append_table;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-truncate: <... completed>
 
@@ -118,19 +118,19 @@ starting permutation: s1-begin s1-apply-delete-command s2-apply-delete-command s
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-apply-delete-command:
-	SELECT master_apply_delete_command('DELETE FROM append_table');
+ SELECT master_apply_delete_command('DELETE FROM append_table');
 
 master_apply_delete_command
 
 16
 step s2-apply-delete-command:
-	SELECT master_apply_delete_command('DELETE FROM append_table');
+ SELECT master_apply_delete_command('DELETE FROM append_table');
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-apply-delete-command: <... completed>
 master_apply_delete_command
@@ -142,19 +142,19 @@ starting permutation: s1-begin s1-apply-delete-command s2-drop-all-shards s1-com
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-apply-delete-command:
-	SELECT master_apply_delete_command('DELETE FROM append_table');
+ SELECT master_apply_delete_command('DELETE FROM append_table');
 
 master_apply_delete_command
 
 16
 step s2-drop-all-shards:
-	SELECT citus_drop_all_shards('append_table', 'public', 'append_table');
+ SELECT citus_drop_all_shards('append_table', 'public', 'append_table');
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-drop-all-shards: <... completed>
 citus_drop_all_shards
@@ -166,16 +166,16 @@ starting permutation: s1-begin s1-truncate s2-truncate s1-commit
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-truncate:
-	TRUNCATE append_table;
+ TRUNCATE append_table;
 
 step s2-truncate:
-	TRUNCATE append_table;
+ TRUNCATE append_table;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-truncate: <... completed>
 
@@ -184,16 +184,16 @@ starting permutation: s1-begin s1-truncate s2-apply-delete-command s1-commit
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-truncate:
-	TRUNCATE append_table;
+ TRUNCATE append_table;
 
 step s2-apply-delete-command:
-	SELECT master_apply_delete_command('DELETE FROM append_table');
+ SELECT master_apply_delete_command('DELETE FROM append_table');
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-apply-delete-command: <... completed>
 master_apply_delete_command
@@ -205,16 +205,16 @@ starting permutation: s1-begin s1-truncate s2-drop-all-shards s1-commit
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-truncate:
-	TRUNCATE append_table;
+ TRUNCATE append_table;
 
 step s2-drop-all-shards:
-	SELECT citus_drop_all_shards('append_table', 'public', 'append_table');
+ SELECT citus_drop_all_shards('append_table', 'public', 'append_table');
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-drop-all-shards: <... completed>
 citus_drop_all_shards
@@ -226,16 +226,16 @@ starting permutation: s1-begin s1-truncate s2-select s1-commit
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-truncate:
-	TRUNCATE append_table;
+ TRUNCATE append_table;
 
 step s2-select:
-	SELECT * FROM append_table;
+ SELECT * FROM append_table;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-select: <... completed>
 test_id        data

src/test/regress/expected/isolation_drop_vs_all.out

@@ -11,7 +11,7 @@ step s1-drop: DROP TABLE drop_hash;
 step s2-drop: DROP TABLE drop_hash; <waiting ...>
 step s1-commit: COMMIT;
 step s2-drop: <... completed>
-error in steps s1-commit s2-drop: ERROR:  table "drop_hash" does not exist
+ERROR:  table "drop_hash" does not exist
 step s2-commit: COMMIT;
 step s1-select-count: SELECT COUNT(*) FROM drop_hash;
 ERROR:  relation "drop_hash" does not exist
@@ -30,7 +30,7 @@ step s1-drop: DROP TABLE drop_hash;
 step s2-ddl-create-index: CREATE INDEX drop_hash_index ON drop_hash(id); <waiting ...>
 step s1-commit: COMMIT;
 step s2-ddl-create-index: <... completed>
-error in steps s1-commit s2-ddl-create-index: ERROR:  relation "drop_hash" does not exist
+ERROR:  relation "drop_hash" does not exist
 step s2-commit: COMMIT;
 step s1-select-count: SELECT COUNT(*) FROM drop_hash;
 ERROR:  relation "drop_hash" does not exist
@@ -55,7 +55,7 @@ step s1-drop: DROP TABLE drop_hash;
 step s2-ddl-drop-index: DROP INDEX drop_hash_index; <waiting ...>
 step s1-commit: COMMIT;
 step s2-ddl-drop-index: <... completed>
-error in steps s1-commit s2-ddl-drop-index: ERROR:  index "drop_hash_index" does not exist
+ERROR:  index "drop_hash_index" does not exist
 step s2-commit: COMMIT;
 step s1-select-count: SELECT COUNT(*) FROM drop_hash;
 ERROR:  relation "drop_hash" does not exist
@@ -78,7 +78,7 @@ step s1-drop: DROP TABLE drop_hash;
 step s2-ddl-create-index-concurrently: CREATE INDEX CONCURRENTLY drop_hash_index ON drop_hash(id); <waiting ...>
 step s1-commit: COMMIT;
 step s2-ddl-create-index-concurrently: <... completed>
-error in steps s1-commit s2-ddl-create-index-concurrently: ERROR:  relation "drop_hash" does not exist
+ERROR:  relation "drop_hash" does not exist
 step s1-select-count: SELECT COUNT(*) FROM drop_hash;
 ERROR:  relation "drop_hash" does not exist
 step s1-show-indexes: SELECT run_command_on_workers('SELECT COUNT(*) FROM pg_indexes WHERE tablename LIKE ''drop_hash%''');
@@ -101,7 +101,7 @@ step s1-drop: DROP TABLE drop_hash;
 step s2-ddl-add-column: ALTER TABLE drop_hash ADD new_column int DEFAULT 0; <waiting ...>
 step s1-commit: COMMIT;
 step s2-ddl-add-column: <... completed>
-error in steps s1-commit s2-ddl-add-column: ERROR:  relation "drop_hash" does not exist
+ERROR:  relation "drop_hash" does not exist
 step s2-commit: COMMIT;
 step s1-select-count: SELECT COUNT(*) FROM drop_hash;
 ERROR:  relation "drop_hash" does not exist
@@ -126,7 +126,7 @@ step s1-drop: DROP TABLE drop_hash;
 step s2-ddl-drop-column: ALTER TABLE drop_hash DROP new_column; <waiting ...>
 step s1-commit: COMMIT;
 step s2-ddl-drop-column: <... completed>
-error in steps s1-commit s2-ddl-drop-column: ERROR:  relation "drop_hash" does not exist
+ERROR:  relation "drop_hash" does not exist
 step s2-commit: COMMIT;
 step s1-select-count: SELECT COUNT(*) FROM drop_hash;
 ERROR:  relation "drop_hash" does not exist
@@ -150,7 +150,7 @@ step s1-drop: DROP TABLE drop_hash;
 step s2-ddl-rename-column: ALTER TABLE drop_hash RENAME data TO new_column; <waiting ...>
 step s1-commit: COMMIT;
 step s2-ddl-rename-column: <... completed>
-error in steps s1-commit s2-ddl-rename-column: ERROR:  relation "drop_hash" does not exist
+ERROR:  relation "drop_hash" does not exist
 step s2-commit: COMMIT;
 step s1-select-count: SELECT COUNT(*) FROM drop_hash;
 ERROR:  relation "drop_hash" does not exist
@@ -174,7 +174,7 @@ step s1-drop: DROP TABLE drop_hash;
 step s2-table-size: SELECT citus_total_relation_size('drop_hash'); <waiting ...>
 step s1-commit: COMMIT;
 step s2-table-size: <... completed>
-error in steps s1-commit s2-table-size: ERROR:  could not compute table size: relation does not exist
+ERROR:  could not compute table size: relation does not exist
 step s2-commit: COMMIT;
 step s1-select-count: SELECT COUNT(*) FROM drop_hash;
 ERROR:  relation "drop_hash" does not exist
@@ -195,7 +195,7 @@ step s1-drop: DROP TABLE drop_hash;
 step s2-distribute-table: SELECT create_distributed_table('drop_hash', 'id'); <waiting ...>
 step s1-commit: COMMIT;
 step s2-distribute-table: <... completed>
-error in steps s1-commit s2-distribute-table: ERROR:  could not create distributed table: relation does not exist
+ERROR:  could not create distributed table: relation does not exist
 step s2-commit: COMMIT;
 step s1-select-count: SELECT COUNT(*) FROM drop_hash;
 ERROR:  relation "drop_hash" does not exist

src/test/regress/expected/isolation_dump_local_wait_edges.out

@@ -21,7 +21,7 @@ step dist11-update:
 step dist13-update:
     UPDATE local_table SET y = 3 WHERE x = 1;
  <waiting ...>
-step detector-dump-wait-edges:
+step detector-dump-wait-edges: 
     SELECT
         waiting_node_id,
         waiting_transaction_num,
@@ -63,7 +63,7 @@ step local-update:
 step dist13-update:
     UPDATE local_table SET y = 3 WHERE x = 1;
  <waiting ...>
-step detector-dump-wait-edges:
+step detector-dump-wait-edges: 
     SELECT
         waiting_node_id,
         waiting_transaction_num,
@@ -112,10 +112,10 @@ step dist11-update:
 step local-update:
     UPDATE local_table SET y = 2 WHERE x = 1;
  <waiting ...>
-step dist13-update:
+step dist13-update: 
     UPDATE local_table SET y = 3 WHERE x = 1;
  <waiting ...>
-step detector-dump-wait-edges:
+step detector-dump-wait-edges: 
     SELECT
         waiting_node_id,
         waiting_transaction_num,

src/test/regress/expected/isolation_extension_commands.out

@@ -2,27 +2,27 @@ Parsed test spec with 2 sessions
 
 starting permutation: s1-begin s1-add-node-1 s2-create-extension-version-11 s1-commit s1-print
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-create-extension-version-11:
-	CREATE extension seg VERSION "1.1";
+ CREATE extension seg VERSION "1.1";
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-create-extension-version-11: <... completed>
 step s1-print:
-	select count(*) from citus.pg_dist_object ;
+ select count(*) from citus.pg_dist_object ;
-	select extname, extversion, nspname from pg_extension, pg_namespace where pg_namespace.oid=pg_extension.extnamespace and extname='seg';
+ select extname, extversion, nspname from pg_extension, pg_namespace where pg_namespace.oid=pg_extension.extnamespace and extname='seg';
-	SELECT run_command_on_workers($$select extname from pg_extension where extname='seg'$$);
+ SELECT run_command_on_workers($$select extname from pg_extension where extname='seg'$$);
-	SELECT run_command_on_workers($$select extversion from pg_extension where extname='seg'$$);
+ SELECT run_command_on_workers($$select extversion from pg_extension where extname='seg'$$);
-	SELECT run_command_on_workers($$select nspname from pg_extension, pg_namespace where extname='seg' and pg_extension.extnamespace=pg_namespace.oid$$);
+ SELECT run_command_on_workers($$select nspname from pg_extension, pg_namespace where extname='seg' and pg_extension.extnamespace=pg_namespace.oid$$);
 
 count
 
@@ -49,27 +49,27 @@ master_remove_node
 
 starting permutation: s1-begin s1-add-node-1 s2-alter-extension-update-to-version-12 s1-commit s1-print
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-alter-extension-update-to-version-12:
-	ALTER extension seg update to "1.2";
+ ALTER extension seg update to "1.2";
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-alter-extension-update-to-version-12: <... completed>
 step s1-print:
-	select count(*) from citus.pg_dist_object ;
+ select count(*) from citus.pg_dist_object ;
-	select extname, extversion, nspname from pg_extension, pg_namespace where pg_namespace.oid=pg_extension.extnamespace and extname='seg';
+ select extname, extversion, nspname from pg_extension, pg_namespace where pg_namespace.oid=pg_extension.extnamespace and extname='seg';
-	SELECT run_command_on_workers($$select extname from pg_extension where extname='seg'$$);
+ SELECT run_command_on_workers($$select extname from pg_extension where extname='seg'$$);
-	SELECT run_command_on_workers($$select extversion from pg_extension where extname='seg'$$);
+ SELECT run_command_on_workers($$select extversion from pg_extension where extname='seg'$$);
-	SELECT run_command_on_workers($$select nspname from pg_extension, pg_namespace where extname='seg' and pg_extension.extnamespace=pg_namespace.oid$$);
+ SELECT run_command_on_workers($$select nspname from pg_extension, pg_namespace where extname='seg' and pg_extension.extnamespace=pg_namespace.oid$$);
 
 count
 
@@ -96,33 +96,33 @@ master_remove_node
 
 starting permutation: s1-add-node-1 s1-begin s1-remove-node-1 s2-drop-extension s1-commit s1-print
 step s1-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
 
 ?column?
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-remove-node-1:
-	SELECT 1 FROM master_remove_node('localhost', 57637);
+ SELECT 1 FROM master_remove_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-drop-extension:
-	drop extension seg;
+ drop extension seg;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-drop-extension: <... completed>
 step s1-print:
-	select count(*) from citus.pg_dist_object ;
+ select count(*) from citus.pg_dist_object ;
-	select extname, extversion, nspname from pg_extension, pg_namespace where pg_namespace.oid=pg_extension.extnamespace and extname='seg';
+ select extname, extversion, nspname from pg_extension, pg_namespace where pg_namespace.oid=pg_extension.extnamespace and extname='seg';
-	SELECT run_command_on_workers($$select extname from pg_extension where extname='seg'$$);
+ SELECT run_command_on_workers($$select extname from pg_extension where extname='seg'$$);
-	SELECT run_command_on_workers($$select extversion from pg_extension where extname='seg'$$);
+ SELECT run_command_on_workers($$select extversion from pg_extension where extname='seg'$$);
-	SELECT run_command_on_workers($$select nspname from pg_extension, pg_namespace where extname='seg' and pg_extension.extnamespace=pg_namespace.oid$$);
+ SELECT run_command_on_workers($$select nspname from pg_extension, pg_namespace where extname='seg' and pg_extension.extnamespace=pg_namespace.oid$$);
 
 count
 
@@ -144,27 +144,27 @@ master_remove_node
 
 starting permutation: s1-begin s1-add-node-1 s2-create-extension-with-schema1 s1-commit s1-print
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-create-extension-with-schema1:
-	CREATE extension seg with schema schema1;
+ CREATE extension seg with schema schema1;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-create-extension-with-schema1: <... completed>
 step s1-print:
-	select count(*) from citus.pg_dist_object ;
+ select count(*) from citus.pg_dist_object ;
-	select extname, extversion, nspname from pg_extension, pg_namespace where pg_namespace.oid=pg_extension.extnamespace and extname='seg';
+ select extname, extversion, nspname from pg_extension, pg_namespace where pg_namespace.oid=pg_extension.extnamespace and extname='seg';
-	SELECT run_command_on_workers($$select extname from pg_extension where extname='seg'$$);
+ SELECT run_command_on_workers($$select extname from pg_extension where extname='seg'$$);
-	SELECT run_command_on_workers($$select extversion from pg_extension where extname='seg'$$);
+ SELECT run_command_on_workers($$select extversion from pg_extension where extname='seg'$$);
-	SELECT run_command_on_workers($$select nspname from pg_extension, pg_namespace where extname='seg' and pg_extension.extnamespace=pg_namespace.oid$$);
+ SELECT run_command_on_workers($$select nspname from pg_extension, pg_namespace where extname='seg' and pg_extension.extnamespace=pg_namespace.oid$$);
 
 count
 
@@ -191,27 +191,27 @@ master_remove_node
 
 starting permutation: s1-begin s1-add-node-1 s2-drop-extension s1-commit s1-print
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-drop-extension:
-	drop extension seg;
+ drop extension seg;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-drop-extension: <... completed>
 step s1-print:
-	select count(*) from citus.pg_dist_object ;
+ select count(*) from citus.pg_dist_object ;
-	select extname, extversion, nspname from pg_extension, pg_namespace where pg_namespace.oid=pg_extension.extnamespace and extname='seg';
+ select extname, extversion, nspname from pg_extension, pg_namespace where pg_namespace.oid=pg_extension.extnamespace and extname='seg';
-	SELECT run_command_on_workers($$select extname from pg_extension where extname='seg'$$);
+ SELECT run_command_on_workers($$select extname from pg_extension where extname='seg'$$);
-	SELECT run_command_on_workers($$select extversion from pg_extension where extname='seg'$$);
+ SELECT run_command_on_workers($$select extversion from pg_extension where extname='seg'$$);
-	SELECT run_command_on_workers($$select nspname from pg_extension, pg_namespace where extname='seg' and pg_extension.extnamespace=pg_namespace.oid$$);
+ SELECT run_command_on_workers($$select nspname from pg_extension, pg_namespace where extname='seg' and pg_extension.extnamespace=pg_namespace.oid$$);
 
 count
 
@@ -237,36 +237,36 @@ master_remove_node
 
 starting permutation: s1-add-node-1 s1-create-extension-with-schema2 s1-begin s1-remove-node-1 s2-alter-extension-set-schema3 s1-commit s1-print
 step s1-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
 
 ?column?
 
 1
 step s1-create-extension-with-schema2:
-	CREATE extension seg with schema schema2;
+ CREATE extension seg with schema schema2;
 
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-remove-node-1:
-	SELECT 1 FROM master_remove_node('localhost', 57637);
+ SELECT 1 FROM master_remove_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-alter-extension-set-schema3:
-	alter extension seg set schema schema3;
+ alter extension seg set schema schema3;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-alter-extension-set-schema3: <... completed>
 step s1-print:
-	select count(*) from citus.pg_dist_object ;
+ select count(*) from citus.pg_dist_object ;
-	select extname, extversion, nspname from pg_extension, pg_namespace where pg_namespace.oid=pg_extension.extnamespace and extname='seg';
+ select extname, extversion, nspname from pg_extension, pg_namespace where pg_namespace.oid=pg_extension.extnamespace and extname='seg';
-	SELECT run_command_on_workers($$select extname from pg_extension where extname='seg'$$);
+ SELECT run_command_on_workers($$select extname from pg_extension where extname='seg'$$);
-	SELECT run_command_on_workers($$select extversion from pg_extension where extname='seg'$$);
+ SELECT run_command_on_workers($$select extversion from pg_extension where extname='seg'$$);
-	SELECT run_command_on_workers($$select nspname from pg_extension, pg_namespace where extname='seg' and pg_extension.extnamespace=pg_namespace.oid$$);
+ SELECT run_command_on_workers($$select nspname from pg_extension, pg_namespace where extname='seg' and pg_extension.extnamespace=pg_namespace.oid$$);
 
 count
 
@@ -289,36 +289,36 @@ master_remove_node
 
 starting permutation: s1-add-node-1 s2-drop-extension s1-begin s1-remove-node-1 s2-create-extension-with-schema1 s1-commit s1-print
 step s1-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-drop-extension:
-	drop extension seg;
+ drop extension seg;
 
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-remove-node-1:
-	SELECT 1 FROM master_remove_node('localhost', 57637);
+ SELECT 1 FROM master_remove_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-create-extension-with-schema1:
-	CREATE extension seg with schema schema1;
+ CREATE extension seg with schema schema1;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-create-extension-with-schema1: <... completed>
 step s1-print:
-	select count(*) from citus.pg_dist_object ;
+ select count(*) from citus.pg_dist_object ;
-	select extname, extversion, nspname from pg_extension, pg_namespace where pg_namespace.oid=pg_extension.extnamespace and extname='seg';
+ select extname, extversion, nspname from pg_extension, pg_namespace where pg_namespace.oid=pg_extension.extnamespace and extname='seg';
-	SELECT run_command_on_workers($$select extname from pg_extension where extname='seg'$$);
+ SELECT run_command_on_workers($$select extname from pg_extension where extname='seg'$$);
-	SELECT run_command_on_workers($$select extversion from pg_extension where extname='seg'$$);
+ SELECT run_command_on_workers($$select extversion from pg_extension where extname='seg'$$);
-	SELECT run_command_on_workers($$select nspname from pg_extension, pg_namespace where extname='seg' and pg_extension.extnamespace=pg_namespace.oid$$);
+ SELECT run_command_on_workers($$select nspname from pg_extension, pg_namespace where extname='seg' and pg_extension.extnamespace=pg_namespace.oid$$);
 
 count
 
@@ -341,41 +341,41 @@ master_remove_node
 
 starting permutation: s2-add-node-1 s2-drop-extension s2-remove-node-1 s2-begin s2-create-extension-version-11 s1-add-node-1 s2-commit s1-print
 step s2-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-drop-extension:
-	drop extension seg;
+ drop extension seg;
 
 step s2-remove-node-1:
-	SELECT 1 FROM master_remove_node('localhost', 57637);
+ SELECT 1 FROM master_remove_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-create-extension-version-11:
-	CREATE extension seg VERSION "1.1";
+ CREATE extension seg VERSION "1.1";
 
 step s1-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 step s1-print:
-	select count(*) from citus.pg_dist_object ;
+ select count(*) from citus.pg_dist_object ;
-	select extname, extversion, nspname from pg_extension, pg_namespace where pg_namespace.oid=pg_extension.extnamespace and extname='seg';
+ select extname, extversion, nspname from pg_extension, pg_namespace where pg_namespace.oid=pg_extension.extnamespace and extname='seg';
-	SELECT run_command_on_workers($$select extname from pg_extension where extname='seg'$$);
+ SELECT run_command_on_workers($$select extname from pg_extension where extname='seg'$$);
-	SELECT run_command_on_workers($$select extversion from pg_extension where extname='seg'$$);
+ SELECT run_command_on_workers($$select extversion from pg_extension where extname='seg'$$);
-	SELECT run_command_on_workers($$select nspname from pg_extension, pg_namespace where extname='seg' and pg_extension.extnamespace=pg_namespace.oid$$);
+ SELECT run_command_on_workers($$select nspname from pg_extension, pg_namespace where extname='seg' and pg_extension.extnamespace=pg_namespace.oid$$);
 
 count
 
@@ -402,45 +402,45 @@ master_remove_node
 
 starting permutation: s2-drop-extension s2-add-node-1 s2-create-extension-version-11 s2-remove-node-1 s2-begin s2-alter-extension-update-to-version-12 s1-add-node-1 s2-commit s1-print
 step s2-drop-extension:
-	drop extension seg;
+ drop extension seg;
 
 step s2-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-create-extension-version-11:
-	CREATE extension seg VERSION "1.1";
+ CREATE extension seg VERSION "1.1";
 
 step s2-remove-node-1:
-	SELECT 1 FROM master_remove_node('localhost', 57637);
+ SELECT 1 FROM master_remove_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-alter-extension-update-to-version-12:
-	ALTER extension seg update to "1.2";
+ ALTER extension seg update to "1.2";
 
 step s1-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
  <waiting ...>
-step s2-commit:
+step s2-commit: 
-	COMMIT;
+ COMMIT;
 
 step s1-add-node-1: <... completed>
 ?column?
 
 1
 step s1-print:
-	select count(*) from citus.pg_dist_object ;
+ select count(*) from citus.pg_dist_object ;
-	select extname, extversion, nspname from pg_extension, pg_namespace where pg_namespace.oid=pg_extension.extnamespace and extname='seg';
+ select extname, extversion, nspname from pg_extension, pg_namespace where pg_namespace.oid=pg_extension.extnamespace and extname='seg';
-	SELECT run_command_on_workers($$select extname from pg_extension where extname='seg'$$);
+ SELECT run_command_on_workers($$select extname from pg_extension where extname='seg'$$);
-	SELECT run_command_on_workers($$select extversion from pg_extension where extname='seg'$$);
+ SELECT run_command_on_workers($$select extversion from pg_extension where extname='seg'$$);
-	SELECT run_command_on_workers($$select nspname from pg_extension, pg_namespace where extname='seg' and pg_extension.extnamespace=pg_namespace.oid$$);
+ SELECT run_command_on_workers($$select nspname from pg_extension, pg_namespace where extname='seg' and pg_extension.extnamespace=pg_namespace.oid$$);
 
 count
 
@@ -467,33 +467,33 @@ master_remove_node
 
 starting permutation: s2-add-node-1 s2-begin s2-drop-extension s1-remove-node-1 s2-commit s1-print
 step s2-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-drop-extension:
-	drop extension seg;
+ drop extension seg;
 
 step s1-remove-node-1:
-	SELECT 1 FROM master_remove_node('localhost', 57637);
+ SELECT 1 FROM master_remove_node('localhost', 57637);
  <waiting ...>
-step s2-commit:
+step s2-commit: 
-	COMMIT;
+ COMMIT;
 
 step s1-remove-node-1: <... completed>
 ?column?
 
 1
 step s1-print:
-	select count(*) from citus.pg_dist_object ;
+ select count(*) from citus.pg_dist_object ;
-	select extname, extversion, nspname from pg_extension, pg_namespace where pg_namespace.oid=pg_extension.extnamespace and extname='seg';
+ select extname, extversion, nspname from pg_extension, pg_namespace where pg_namespace.oid=pg_extension.extnamespace and extname='seg';
-	SELECT run_command_on_workers($$select extname from pg_extension where extname='seg'$$);
+ SELECT run_command_on_workers($$select extname from pg_extension where extname='seg'$$);
-	SELECT run_command_on_workers($$select extversion from pg_extension where extname='seg'$$);
+ SELECT run_command_on_workers($$select extversion from pg_extension where extname='seg'$$);
-	SELECT run_command_on_workers($$select nspname from pg_extension, pg_namespace where extname='seg' and pg_extension.extnamespace=pg_namespace.oid$$);
+ SELECT run_command_on_workers($$select nspname from pg_extension, pg_namespace where extname='seg' and pg_extension.extnamespace=pg_namespace.oid$$);
 
 count
 
@@ -515,26 +515,26 @@ master_remove_node
 
 starting permutation: s2-begin s2-create-extension-with-schema1 s1-add-node-1 s2-commit s1-print
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-create-extension-with-schema1:
-	CREATE extension seg with schema schema1;
+ CREATE extension seg with schema schema1;
 
 step s1-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 step s1-print:
-	select count(*) from citus.pg_dist_object ;
+ select count(*) from citus.pg_dist_object ;
-	select extname, extversion, nspname from pg_extension, pg_namespace where pg_namespace.oid=pg_extension.extnamespace and extname='seg';
+ select extname, extversion, nspname from pg_extension, pg_namespace where pg_namespace.oid=pg_extension.extnamespace and extname='seg';
-	SELECT run_command_on_workers($$select extname from pg_extension where extname='seg'$$);
+ SELECT run_command_on_workers($$select extname from pg_extension where extname='seg'$$);
-	SELECT run_command_on_workers($$select extversion from pg_extension where extname='seg'$$);
+ SELECT run_command_on_workers($$select extversion from pg_extension where extname='seg'$$);
-	SELECT run_command_on_workers($$select nspname from pg_extension, pg_namespace where extname='seg' and pg_extension.extnamespace=pg_namespace.oid$$);
+ SELECT run_command_on_workers($$select nspname from pg_extension, pg_namespace where extname='seg' and pg_extension.extnamespace=pg_namespace.oid$$);
 
 count
 
@@ -561,39 +561,39 @@ master_remove_node
 
 starting permutation: s2-drop-extension s2-add-node-1 s2-create-extension-with-schema2 s2-begin s2-alter-extension-version-13 s1-remove-node-1 s2-commit s1-print
 step s2-drop-extension:
-	drop extension seg;
+ drop extension seg;
 
 step s2-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-create-extension-with-schema2:
-	CREATE extension seg with schema schema2;
+ CREATE extension seg with schema schema2;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-alter-extension-version-13:
-	ALTER extension seg update to "1.3";
+ ALTER extension seg update to "1.3";
 
 step s1-remove-node-1:
-	SELECT 1 FROM master_remove_node('localhost', 57637);
+ SELECT 1 FROM master_remove_node('localhost', 57637);
  <waiting ...>
-step s2-commit:
+step s2-commit: 
-	COMMIT;
+ COMMIT;
 
 step s1-remove-node-1: <... completed>
 ?column?
 
 1
 step s1-print:
-	select count(*) from citus.pg_dist_object ;
+ select count(*) from citus.pg_dist_object ;
-	select extname, extversion, nspname from pg_extension, pg_namespace where pg_namespace.oid=pg_extension.extnamespace and extname='seg';
+ select extname, extversion, nspname from pg_extension, pg_namespace where pg_namespace.oid=pg_extension.extnamespace and extname='seg';
-	SELECT run_command_on_workers($$select extname from pg_extension where extname='seg'$$);
+ SELECT run_command_on_workers($$select extname from pg_extension where extname='seg'$$);
-	SELECT run_command_on_workers($$select extversion from pg_extension where extname='seg'$$);
+ SELECT run_command_on_workers($$select extversion from pg_extension where extname='seg'$$);
-	SELECT run_command_on_workers($$select nspname from pg_extension, pg_namespace where extname='seg' and pg_extension.extnamespace=pg_namespace.oid$$);
+ SELECT run_command_on_workers($$select nspname from pg_extension, pg_namespace where extname='seg' and pg_extension.extnamespace=pg_namespace.oid$$);
 
 count
 
@@ -616,35 +616,35 @@ master_remove_node
 
 starting permutation: s2-drop-extension s2-add-node-1 s2-begin s2-create-extension-version-11 s1-remove-node-1 s2-commit s1-print
 step s2-drop-extension:
-	drop extension seg;
+ drop extension seg;
 
 step s2-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-create-extension-version-11:
-	CREATE extension seg VERSION "1.1";
+ CREATE extension seg VERSION "1.1";
 
 step s1-remove-node-1:
-	SELECT 1 FROM master_remove_node('localhost', 57637);
+ SELECT 1 FROM master_remove_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 step s1-print:
-	select count(*) from citus.pg_dist_object ;
+ select count(*) from citus.pg_dist_object ;
-	select extname, extversion, nspname from pg_extension, pg_namespace where pg_namespace.oid=pg_extension.extnamespace and extname='seg';
+ select extname, extversion, nspname from pg_extension, pg_namespace where pg_namespace.oid=pg_extension.extnamespace and extname='seg';
-	SELECT run_command_on_workers($$select extname from pg_extension where extname='seg'$$);
+ SELECT run_command_on_workers($$select extname from pg_extension where extname='seg'$$);
-	SELECT run_command_on_workers($$select extversion from pg_extension where extname='seg'$$);
+ SELECT run_command_on_workers($$select extversion from pg_extension where extname='seg'$$);
-	SELECT run_command_on_workers($$select nspname from pg_extension, pg_namespace where extname='seg' and pg_extension.extnamespace=pg_namespace.oid$$);
+ SELECT run_command_on_workers($$select nspname from pg_extension, pg_namespace where extname='seg' and pg_extension.extnamespace=pg_namespace.oid$$);
 
 count
 
@@ -667,45 +667,45 @@ master_remove_node
 
 starting permutation: s2-drop-extension s2-add-node-1 s2-create-extension-version-11 s2-remove-node-1 s2-begin s2-drop-extension s1-add-node-1 s2-commit s1-print
 step s2-drop-extension:
-	drop extension seg;
+ drop extension seg;
 
 step s2-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-create-extension-version-11:
-	CREATE extension seg VERSION "1.1";
+ CREATE extension seg VERSION "1.1";
 
 step s2-remove-node-1:
-	SELECT 1 FROM master_remove_node('localhost', 57637);
+ SELECT 1 FROM master_remove_node('localhost', 57637);
 
 ?column?
 
 1
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-drop-extension:
-	drop extension seg;
+ drop extension seg;
 
 step s1-add-node-1:
-	SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM master_add_node('localhost', 57637);
  <waiting ...>
-step s2-commit:
+step s2-commit: 
-	COMMIT;
+ COMMIT;
 
 step s1-add-node-1: <... completed>
 ?column?
 
 1
 step s1-print:
-	select count(*) from citus.pg_dist_object ;
+ select count(*) from citus.pg_dist_object ;
-	select extname, extversion, nspname from pg_extension, pg_namespace where pg_namespace.oid=pg_extension.extnamespace and extname='seg';
+ select extname, extversion, nspname from pg_extension, pg_namespace where pg_namespace.oid=pg_extension.extnamespace and extname='seg';
-	SELECT run_command_on_workers($$select extname from pg_extension where extname='seg'$$);
+ SELECT run_command_on_workers($$select extname from pg_extension where extname='seg'$$);
-	SELECT run_command_on_workers($$select extversion from pg_extension where extname='seg'$$);
+ SELECT run_command_on_workers($$select extversion from pg_extension where extname='seg'$$);
-	SELECT run_command_on_workers($$select nspname from pg_extension, pg_namespace where extname='seg' and pg_extension.extnamespace=pg_namespace.oid$$);
+ SELECT run_command_on_workers($$select nspname from pg_extension, pg_namespace where extname='seg' and pg_extension.extnamespace=pg_namespace.oid$$);
 
 count
 

src/test/regress/expected/isolation_get_distributed_wait_queries_mx.out

@@ -2,36 +2,36 @@ Parsed test spec with 4 sessions
 
 starting permutation: s1-begin s1-update-ref-table-from-coordinator s2-start-session-level-connection s2-begin-on-worker s2-update-ref-table s3-select-distributed-waiting-queries s1-commit s2-commit-worker s2-stop-connection
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-update-ref-table-from-coordinator:
-	UPDATE ref_table SET value_1 = 15;
+ UPDATE ref_table SET value_1 = 15;
 
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57638);
+ SELECT start_session_level_connection_to_node('localhost', 57638);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 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');
+ SELECT run_commands_on_session_level_connection_to_node('UPDATE ref_table SET value_1 = 12 WHERE user_id = 1');
  <waiting ...>
-step s3-select-distributed-waiting-queries:
+step s3-select-distributed-waiting-queries: 
-	SELECT blocked_statement, current_statement_in_blocking_process, waiting_node_name, blocking_node_name, waiting_node_port, blocking_node_port FROM citus_lock_waits;
+ SELECT blocked_statement, current_statement_in_blocking_process, waiting_node_name, blocking_node_name, waiting_node_port, blocking_node_port FROM citus_lock_waits;
 
 blocked_statementcurrent_statement_in_blocking_processwaiting_node_nameblocking_node_namewaiting_node_portblocking_node_port
 
 UPDATE ref_table SET value_1 = 12 WHERE user_id = 1
-	UPDATE ref_table SET value_1 = 15;
+ UPDATE ref_table SET value_1 = 15;
 localhost      coordinator_host57638          57636
 step s1-commit:
-	COMMIT;
+ COMMIT;
 
 step s2-update-ref-table: <... completed>
 run_commands_on_session_level_connection_to_node
@@ -44,7 +44,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -55,40 +55,40 @@ restore_isolation_tester_func
 
 starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-update-ref-table s2-start-session-level-connection s2-begin-on-worker s2-update-ref-table s3-select-distributed-waiting-queries s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-update-ref-table:
-	SELECT run_commands_on_session_level_connection_to_node('UPDATE ref_table SET value_1 = 12 WHERE user_id = 1');
+ SELECT run_commands_on_session_level_connection_to_node('UPDATE ref_table SET value_1 = 12 WHERE user_id = 1');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57638);
+ SELECT start_session_level_connection_to_node('localhost', 57638);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 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');
+ SELECT run_commands_on_session_level_connection_to_node('UPDATE ref_table SET value_1 = 12 WHERE user_id = 1');
  <waiting ...>
-step s3-select-distributed-waiting-queries:
+step s3-select-distributed-waiting-queries: 
-	SELECT blocked_statement, current_statement_in_blocking_process, waiting_node_name, blocking_node_name, waiting_node_port, blocking_node_port FROM citus_lock_waits;
+ SELECT blocked_statement, current_statement_in_blocking_process, waiting_node_name, blocking_node_name, waiting_node_port, blocking_node_port FROM citus_lock_waits;
 
 blocked_statementcurrent_statement_in_blocking_processwaiting_node_nameblocking_node_namewaiting_node_portblocking_node_port
 
@@ -110,13 +110,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -127,40 +127,40 @@ restore_isolation_tester_func
 
 starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-update-dist-table s2-start-session-level-connection s2-begin-on-worker s2-update-dist-table s3-select-distributed-waiting-queries s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-update-dist-table:
-	SELECT run_commands_on_session_level_connection_to_node('UPDATE tt1 SET value_1 = 4');
+ SELECT run_commands_on_session_level_connection_to_node('UPDATE tt1 SET value_1 = 4');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57638);
+ SELECT start_session_level_connection_to_node('localhost', 57638);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-update-dist-table:
-	SELECT run_commands_on_session_level_connection_to_node('UPDATE tt1 SET value_1 = 5');
+ SELECT run_commands_on_session_level_connection_to_node('UPDATE tt1 SET value_1 = 5');
  <waiting ...>
-step s3-select-distributed-waiting-queries:
+step s3-select-distributed-waiting-queries: 
-	SELECT blocked_statement, current_statement_in_blocking_process, waiting_node_name, blocking_node_name, waiting_node_port, blocking_node_port FROM citus_lock_waits;
+ SELECT blocked_statement, current_statement_in_blocking_process, waiting_node_name, blocking_node_name, waiting_node_port, blocking_node_port FROM citus_lock_waits;
 
 blocked_statementcurrent_statement_in_blocking_processwaiting_node_nameblocking_node_namewaiting_node_portblocking_node_port
 
@@ -182,13 +182,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -199,40 +199,40 @@ restore_isolation_tester_func
 
 starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-delete-from-ref-table s2-start-session-level-connection s2-begin-on-worker s2-update-ref-table s3-select-distributed-waiting-queries s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-delete-from-ref-table:
-	SELECT run_commands_on_session_level_connection_to_node('DELETE FROM ref_table WHERE user_id = 1');
+ SELECT run_commands_on_session_level_connection_to_node('DELETE FROM ref_table WHERE user_id = 1');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57638);
+ SELECT start_session_level_connection_to_node('localhost', 57638);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 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');
+ SELECT run_commands_on_session_level_connection_to_node('UPDATE ref_table SET value_1 = 12 WHERE user_id = 1');
  <waiting ...>
-step s3-select-distributed-waiting-queries:
+step s3-select-distributed-waiting-queries: 
-	SELECT blocked_statement, current_statement_in_blocking_process, waiting_node_name, blocking_node_name, waiting_node_port, blocking_node_port FROM citus_lock_waits;
+ SELECT blocked_statement, current_statement_in_blocking_process, waiting_node_name, blocking_node_name, waiting_node_port, blocking_node_port FROM citus_lock_waits;
 
 blocked_statementcurrent_statement_in_blocking_processwaiting_node_nameblocking_node_namewaiting_node_portblocking_node_port
 
@@ -254,13 +254,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -271,40 +271,40 @@ restore_isolation_tester_func
 
 starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert-into-ref-table s2-start-session-level-connection s2-begin-on-worker s2-update-ref-table s3-select-distributed-waiting-queries s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-insert-into-ref-table:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table VALUES(8,81),(9,91)');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table VALUES(8,81),(9,91)');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57638);
+ SELECT start_session_level_connection_to_node('localhost', 57638);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 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');
+ SELECT run_commands_on_session_level_connection_to_node('UPDATE ref_table SET value_1 = 12 WHERE user_id = 1');
  <waiting ...>
-step s3-select-distributed-waiting-queries:
+step s3-select-distributed-waiting-queries: 
-	SELECT blocked_statement, current_statement_in_blocking_process, waiting_node_name, blocking_node_name, waiting_node_port, blocking_node_port FROM citus_lock_waits;
+ SELECT blocked_statement, current_statement_in_blocking_process, waiting_node_name, blocking_node_name, waiting_node_port, blocking_node_port FROM citus_lock_waits;
 
 blocked_statementcurrent_statement_in_blocking_processwaiting_node_nameblocking_node_namewaiting_node_portblocking_node_port
 
@@ -326,13 +326,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -343,43 +343,43 @@ restore_isolation_tester_func
 
 starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert-into-ref-table s2-start-session-level-connection s2-begin-on-worker s2-insert-into-ref-table s3-select-distributed-waiting-queries s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-insert-into-ref-table:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table VALUES(8,81),(9,91)');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table VALUES(8,81),(9,91)');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57638);
+ SELECT start_session_level_connection_to_node('localhost', 57638);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-insert-into-ref-table:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table VALUES(8,81),(9,91)');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table VALUES(8,81),(9,91)');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s3-select-distributed-waiting-queries:
-	SELECT blocked_statement, current_statement_in_blocking_process, waiting_node_name, blocking_node_name, waiting_node_port, blocking_node_port FROM citus_lock_waits;
+ SELECT blocked_statement, current_statement_in_blocking_process, waiting_node_name, blocking_node_name, waiting_node_port, blocking_node_port FROM citus_lock_waits;
 
 blocked_statementcurrent_statement_in_blocking_processwaiting_node_nameblocking_node_namewaiting_node_portblocking_node_port
 
@@ -396,13 +396,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -413,40 +413,40 @@ restore_isolation_tester_func
 
 starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-copy-to-ref-table s2-start-session-level-connection s2-begin-on-worker s2-update-ref-table s3-select-distributed-waiting-queries s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-copy-to-ref-table:
-	SELECT run_commands_on_session_level_connection_to_node('COPY ref_table FROM PROGRAM ''echo 10, 101 && echo 11, 111'' WITH CSV');
+ SELECT run_commands_on_session_level_connection_to_node('COPY ref_table FROM PROGRAM ''echo 10, 101 && echo 11, 111'' WITH CSV');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57638);
+ SELECT start_session_level_connection_to_node('localhost', 57638);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 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');
+ SELECT run_commands_on_session_level_connection_to_node('UPDATE ref_table SET value_1 = 12 WHERE user_id = 1');
  <waiting ...>
-step s3-select-distributed-waiting-queries:
+step s3-select-distributed-waiting-queries: 
-	SELECT blocked_statement, current_statement_in_blocking_process, waiting_node_name, blocking_node_name, waiting_node_port, blocking_node_port FROM citus_lock_waits;
+ SELECT blocked_statement, current_statement_in_blocking_process, waiting_node_name, blocking_node_name, waiting_node_port, blocking_node_port FROM citus_lock_waits;
 
 blocked_statementcurrent_statement_in_blocking_processwaiting_node_nameblocking_node_namewaiting_node_portblocking_node_port
 
@@ -468,13 +468,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -485,43 +485,43 @@ restore_isolation_tester_func
 
 starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-copy-to-ref-table s2-start-session-level-connection s2-begin-on-worker s2-insert-into-ref-table s3-select-distributed-waiting-queries s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-copy-to-ref-table:
-	SELECT run_commands_on_session_level_connection_to_node('COPY ref_table FROM PROGRAM ''echo 10, 101 && echo 11, 111'' WITH CSV');
+ SELECT run_commands_on_session_level_connection_to_node('COPY ref_table FROM PROGRAM ''echo 10, 101 && echo 11, 111'' WITH CSV');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57638);
+ SELECT start_session_level_connection_to_node('localhost', 57638);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-insert-into-ref-table:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table VALUES(8,81),(9,91)');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table VALUES(8,81),(9,91)');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s3-select-distributed-waiting-queries:
-	SELECT blocked_statement, current_statement_in_blocking_process, waiting_node_name, blocking_node_name, waiting_node_port, blocking_node_port FROM citus_lock_waits;
+ SELECT blocked_statement, current_statement_in_blocking_process, waiting_node_name, blocking_node_name, waiting_node_port, blocking_node_port FROM citus_lock_waits;
 
 blocked_statementcurrent_statement_in_blocking_processwaiting_node_nameblocking_node_namewaiting_node_portblocking_node_port
 
@@ -538,13 +538,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -555,43 +555,43 @@ restore_isolation_tester_func
 
 starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-copy-to-ref-table s2-start-session-level-connection s2-begin-on-worker s2-copy-to-ref-table s3-select-distributed-waiting-queries s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-copy-to-ref-table:
-	SELECT run_commands_on_session_level_connection_to_node('COPY ref_table FROM PROGRAM ''echo 10, 101 && echo 11, 111'' WITH CSV');
+ SELECT run_commands_on_session_level_connection_to_node('COPY ref_table FROM PROGRAM ''echo 10, 101 && echo 11, 111'' WITH CSV');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57638);
+ SELECT start_session_level_connection_to_node('localhost', 57638);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-copy-to-ref-table:
-	SELECT run_commands_on_session_level_connection_to_node('COPY ref_table FROM PROGRAM ''echo 10, 101 && echo 11, 111'' WITH CSV');
+ SELECT run_commands_on_session_level_connection_to_node('COPY ref_table FROM PROGRAM ''echo 10, 101 && echo 11, 111'' WITH CSV');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s3-select-distributed-waiting-queries:
-	SELECT blocked_statement, current_statement_in_blocking_process, waiting_node_name, blocking_node_name, waiting_node_port, blocking_node_port FROM citus_lock_waits;
+ SELECT blocked_statement, current_statement_in_blocking_process, waiting_node_name, blocking_node_name, waiting_node_port, blocking_node_port FROM citus_lock_waits;
 
 blocked_statementcurrent_statement_in_blocking_processwaiting_node_nameblocking_node_namewaiting_node_portblocking_node_port
 
@@ -608,13 +608,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -625,40 +625,40 @@ restore_isolation_tester_func
 
 starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-select-for-update s2-start-session-level-connection s2-begin-on-worker s2-update-ref-table s3-select-distributed-waiting-queries s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-select-for-update:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM ref_table FOR UPDATE');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM ref_table FOR UPDATE');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57638);
+ SELECT start_session_level_connection_to_node('localhost', 57638);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 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');
+ SELECT run_commands_on_session_level_connection_to_node('UPDATE ref_table SET value_1 = 12 WHERE user_id = 1');
  <waiting ...>
-step s3-select-distributed-waiting-queries:
+step s3-select-distributed-waiting-queries: 
-	SELECT blocked_statement, current_statement_in_blocking_process, waiting_node_name, blocking_node_name, waiting_node_port, blocking_node_port FROM citus_lock_waits;
+ SELECT blocked_statement, current_statement_in_blocking_process, waiting_node_name, blocking_node_name, waiting_node_port, blocking_node_port FROM citus_lock_waits;
 
 blocked_statementcurrent_statement_in_blocking_processwaiting_node_nameblocking_node_namewaiting_node_portblocking_node_port
 
@@ -680,13 +680,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -697,36 +697,36 @@ restore_isolation_tester_func
 
 starting permutation: s2-start-session-level-connection s2-begin-on-worker s2-insert-into-ref-table s1-begin s1-alter-table s3-select-distributed-waiting-queries s2-commit-worker s1-commit s2-stop-connection
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57638);
+ SELECT start_session_level_connection_to_node('localhost', 57638);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-insert-into-ref-table:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table VALUES(8,81),(9,91)');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table VALUES(8,81),(9,91)');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-alter-table:
-	ALTER TABLE ref_table ADD CONSTRAINT rf_p_key PRIMARY KEY(user_id);
+ ALTER TABLE ref_table ADD CONSTRAINT rf_p_key PRIMARY KEY(user_id);
  <waiting ...>
-step s3-select-distributed-waiting-queries:
+step s3-select-distributed-waiting-queries: 
-	SELECT blocked_statement, current_statement_in_blocking_process, waiting_node_name, blocking_node_name, waiting_node_port, blocking_node_port FROM citus_lock_waits;
+ SELECT blocked_statement, current_statement_in_blocking_process, waiting_node_name, blocking_node_name, waiting_node_port, blocking_node_port FROM citus_lock_waits;
 
 blocked_statementcurrent_statement_in_blocking_processwaiting_node_nameblocking_node_namewaiting_node_portblocking_node_port
 
 
-	ALTER TABLE ref_table ADD CONSTRAINT rf_p_key PRIMARY KEY(user_id);
+ ALTER TABLE ref_table ADD CONSTRAINT rf_p_key PRIMARY KEY(user_id);
 INSERT INTO ref_table VALUES(8,81),(9,91)coordinator_hostlocalhost      57636          57638
 step s2-commit-worker:
     SELECT run_commands_on_session_level_connection_to_node('COMMIT');
@@ -736,10 +736,10 @@ run_commands_on_session_level_connection_to_node
 
 step s1-alter-table: <... completed>
 step s1-commit:
-	COMMIT;
+ COMMIT;
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -750,26 +750,26 @@ restore_isolation_tester_func
 
 starting permutation: s1-begin s1-update-on-the-coordinator s2-update-on-the-coordinator s3-select-distributed-waiting-queries s1-commit
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-update-on-the-coordinator:
-	UPDATE tt1 SET value_1 = 4;
+ UPDATE tt1 SET value_1 = 4;
 
 step s2-update-on-the-coordinator:
-	UPDATE tt1 SET value_1 = 4;
+ UPDATE tt1 SET value_1 = 4;
  <waiting ...>
-step s3-select-distributed-waiting-queries:
+step s3-select-distributed-waiting-queries: 
-	SELECT blocked_statement, current_statement_in_blocking_process, waiting_node_name, blocking_node_name, waiting_node_port, blocking_node_port FROM citus_lock_waits;
+ SELECT blocked_statement, current_statement_in_blocking_process, waiting_node_name, blocking_node_name, waiting_node_port, blocking_node_port FROM citus_lock_waits;
 
 blocked_statementcurrent_statement_in_blocking_processwaiting_node_nameblocking_node_namewaiting_node_portblocking_node_port
 
 
-	UPDATE tt1 SET value_1 = 4;
+ UPDATE tt1 SET value_1 = 4;
 
-	UPDATE tt1 SET value_1 = 4;
+ UPDATE tt1 SET value_1 = 4;
 coordinator_hostcoordinator_host57636          57636
 step s1-commit:
-	COMMIT;
+ COMMIT;
 
 step s2-update-on-the-coordinator: <... completed>
 restore_isolation_tester_func
@@ -778,40 +778,40 @@ restore_isolation_tester_func
 
 starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-update-dist-table s4-start-session-level-connection s4-begin-on-worker s4-update-dist-table s3-select-distributed-waiting-queries s1-commit-worker s4-commit-worker s1-stop-connection s4-stop-connection
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-update-dist-table:
-	SELECT run_commands_on_session_level_connection_to_node('UPDATE tt1 SET value_1 = 4');
+ SELECT run_commands_on_session_level_connection_to_node('UPDATE tt1 SET value_1 = 4');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s4-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s4-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s4-update-dist-table:
-	SELECT run_commands_on_session_level_connection_to_node('UPDATE tt1 SET value_1 = 5');
+ SELECT run_commands_on_session_level_connection_to_node('UPDATE tt1 SET value_1 = 5');
  <waiting ...>
-step s3-select-distributed-waiting-queries:
+step s3-select-distributed-waiting-queries: 
-	SELECT blocked_statement, current_statement_in_blocking_process, waiting_node_name, blocking_node_name, waiting_node_port, blocking_node_port FROM citus_lock_waits;
+ SELECT blocked_statement, current_statement_in_blocking_process, waiting_node_name, blocking_node_name, waiting_node_port, blocking_node_port FROM citus_lock_waits;
 
 blocked_statementcurrent_statement_in_blocking_processwaiting_node_nameblocking_node_namewaiting_node_portblocking_node_port
 
@@ -833,13 +833,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s4-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 

src/test/regress/expected/isolation_hash_copy_vs_all.out

@@ -590,7 +590,7 @@ step s1-drop: DROP TABLE hash_copy;
 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; <waiting ...>
 step s1-commit: COMMIT;
 step s2-copy: <... completed>
-error in steps s1-commit s2-copy: ERROR:  relation "hash_copy" does not exist
+ERROR:  relation "hash_copy" does not exist
 step s1-select-count: SELECT COUNT(*) FROM hash_copy;
 ERROR:  relation "hash_copy" does not exist
 
@@ -645,7 +645,7 @@ step s1-ddl-add-column: ALTER TABLE hash_copy ADD new_column int DEFAULT 0;
 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; <waiting ...>
 step s1-commit: COMMIT;
 step s2-copy: <... completed>
-error in steps s1-commit s2-copy: ERROR:  missing data for column "new_column"
+ERROR:  missing data for column "new_column"
 step s1-select-count: SELECT COUNT(*) FROM hash_copy;
 count
 
@@ -741,7 +741,7 @@ citus_drop_all_shards
 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; <waiting ...>
 step s1-commit: COMMIT;
 step s2-copy: <... completed>
-error in steps s1-commit s2-copy: ERROR:  could not find any shards into which to copy
+ERROR:  could not find any shards into which to copy
 step s1-select-count: SELECT COUNT(*) FROM hash_copy;
 count
 

src/test/regress/expected/isolation_insert_select_conflict.out

@@ -5,21 +5,21 @@ create_distributed_table
 
 
 step s1-begin:
-	SET citus.shard_replication_factor to 1;
+ SET citus.shard_replication_factor to 1;
-	BEGIN;
+ BEGIN;
 
 step s1-insert-into-select-conflict-update:
-	INSERT INTO target_table
+ INSERT INTO target_table
-	SELECT
+ SELECT
-		col_1, col_2
+  col_1, col_2
-	FROM (
+ FROM (
-		SELECT
+  SELECT
-			col_1, col_2, col_3
+   col_1, col_2, col_3
-		FROM
+  FROM
-			source_table
+   source_table
-		LIMIT 5
+  LIMIT 5
-	) as foo
+ ) as foo
-	ON CONFLICT(col_1) DO UPDATE SET col_2 = EXCLUDED.col_2 RETURNING *;
+ ON CONFLICT(col_1) DO UPDATE SET col_2 = EXCLUDED.col_2 RETURNING *;
 
 col_1          col_2
 
@@ -29,17 +29,17 @@ col_1          col_2
 4              4
 5              5
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-update:
-	UPDATE target_table SET col_2 = 5;
+ UPDATE target_table SET col_2 = 5;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-update: <... completed>
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 
 starting permutation: s1-begin s1-insert-into-select-conflict-do-nothing s2-begin s2-delete s1-commit s2-commit
@@ -47,34 +47,34 @@ create_distributed_table
 
 
 step s1-begin:
-	SET citus.shard_replication_factor to 1;
+ SET citus.shard_replication_factor to 1;
-	BEGIN;
+ BEGIN;
 
 step s1-insert-into-select-conflict-do-nothing:
-	INSERT INTO target_table
+ INSERT INTO target_table
-	SELECT
+ SELECT
-		col_1, col_2
+  col_1, col_2
-	FROM (
+ FROM (
-		SELECT
+  SELECT
-			col_1, col_2, col_3
+   col_1, col_2, col_3
-		FROM
+  FROM
-			source_table
+   source_table
-		LIMIT 5
+  LIMIT 5
-	) as foo
+ ) as foo
-	ON CONFLICT DO NOTHING;
+ ON CONFLICT DO NOTHING;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-delete:
-	DELETE FROM target_table;
+ DELETE FROM target_table;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-delete: <... completed>
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 
 starting permutation: s1-begin s1-insert-into-select-conflict-do-nothing s2-begin s2-insert-into-select-conflict-update s1-commit s2-commit
@@ -82,40 +82,40 @@ create_distributed_table
 
 
 step s1-begin:
-	SET citus.shard_replication_factor to 1;
+ SET citus.shard_replication_factor to 1;
-	BEGIN;
+ BEGIN;
 
 step s1-insert-into-select-conflict-do-nothing:
-	INSERT INTO target_table
+ INSERT INTO target_table
-	SELECT
+ SELECT
-		col_1, col_2
+  col_1, col_2
-	FROM (
+ FROM (
-		SELECT
+  SELECT
-			col_1, col_2, col_3
+   col_1, col_2, col_3
-		FROM
+  FROM
-			source_table
+   source_table
-		LIMIT 5
+  LIMIT 5
-	) as foo
+ ) as foo
-	ON CONFLICT DO NOTHING;
+ ON CONFLICT DO NOTHING;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-insert-into-select-conflict-update:
-	INSERT INTO target_table
+ INSERT INTO target_table
-	SELECT
+ SELECT
-		col_1, col_2
+  col_1, col_2
-	FROM (
+ FROM (
-		SELECT
+  SELECT
-			col_1, col_2, col_3
+   col_1, col_2, col_3
-		FROM
+  FROM
-			source_table
+   source_table
-		LIMIT 5
+  LIMIT 5
-	) as foo
+ ) as foo
-	ON CONFLICT(col_1) DO UPDATE SET col_2 = EXCLUDED.col_2 RETURNING *;
+ ON CONFLICT(col_1) DO UPDATE SET col_2 = EXCLUDED.col_2 RETURNING *;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-insert-into-select-conflict-update: <... completed>
 col_1          col_2
@@ -126,7 +126,7 @@ col_1          col_2
 4              4
 5              5
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 
 starting permutation: s1-begin s1-insert-into-select-conflict-update s2-begin s2-insert-into-select-conflict-update s1-commit s2-commit
@@ -134,21 +134,21 @@ create_distributed_table
 
 
 step s1-begin:
-	SET citus.shard_replication_factor to 1;
+ SET citus.shard_replication_factor to 1;
-	BEGIN;
+ BEGIN;
 
 step s1-insert-into-select-conflict-update:
-	INSERT INTO target_table
+ INSERT INTO target_table
-	SELECT
+ SELECT
-		col_1, col_2
+  col_1, col_2
-	FROM (
+ FROM (
-		SELECT
+  SELECT
-			col_1, col_2, col_3
+   col_1, col_2, col_3
-		FROM
+  FROM
-			source_table
+   source_table
-		LIMIT 5
+  LIMIT 5
-	) as foo
+ ) as foo
-	ON CONFLICT(col_1) DO UPDATE SET col_2 = EXCLUDED.col_2 RETURNING *;
+ ON CONFLICT(col_1) DO UPDATE SET col_2 = EXCLUDED.col_2 RETURNING *;
 
 col_1          col_2
 
@@ -158,23 +158,23 @@ col_1          col_2
 4              4
 5              5
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-insert-into-select-conflict-update:
-	INSERT INTO target_table
+ INSERT INTO target_table
-	SELECT
+ SELECT
-		col_1, col_2
+  col_1, col_2
-	FROM (
+ FROM (
-		SELECT
+  SELECT
-			col_1, col_2, col_3
+   col_1, col_2, col_3
-		FROM
+  FROM
-			source_table
+   source_table
-		LIMIT 5
+  LIMIT 5
-	) as foo
+ ) as foo
-	ON CONFLICT(col_1) DO UPDATE SET col_2 = EXCLUDED.col_2 RETURNING *;
+ ON CONFLICT(col_1) DO UPDATE SET col_2 = EXCLUDED.col_2 RETURNING *;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-insert-into-select-conflict-update: <... completed>
 col_1          col_2
@@ -185,7 +185,7 @@ col_1          col_2
 4              4
 5              5
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 
 starting permutation: s1-begin s1-insert-into-select-conflict-update s2-begin s2-insert-into-select-conflict-do-nothing s1-commit s2-commit
@@ -193,21 +193,21 @@ create_distributed_table
 
 
 step s1-begin:
-	SET citus.shard_replication_factor to 1;
+ SET citus.shard_replication_factor to 1;
-	BEGIN;
+ BEGIN;
 
 step s1-insert-into-select-conflict-update:
-	INSERT INTO target_table
+ INSERT INTO target_table
-	SELECT
+ SELECT
-		col_1, col_2
+  col_1, col_2
-	FROM (
+ FROM (
-		SELECT
+  SELECT
-			col_1, col_2, col_3
+   col_1, col_2, col_3
-		FROM
+  FROM
-			source_table
+   source_table
-		LIMIT 5
+  LIMIT 5
-	) as foo
+ ) as foo
-	ON CONFLICT(col_1) DO UPDATE SET col_2 = EXCLUDED.col_2 RETURNING *;
+ ON CONFLICT(col_1) DO UPDATE SET col_2 = EXCLUDED.col_2 RETURNING *;
 
 col_1          col_2
 
@@ -217,27 +217,27 @@ col_1          col_2
 4              4
 5              5
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-insert-into-select-conflict-do-nothing:
-	INSERT INTO target_table
+ INSERT INTO target_table
-	SELECT
+ SELECT
-		col_1, col_2
+  col_1, col_2
-	FROM (
+ FROM (
-		SELECT
+  SELECT
-			col_1, col_2, col_3
+   col_1, col_2, col_3
-		FROM
+  FROM
-			source_table
+   source_table
-		LIMIT 5
+  LIMIT 5
-	) as foo
+ ) as foo
-	ON CONFLICT DO NOTHING;
+ ON CONFLICT DO NOTHING;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-insert-into-select-conflict-do-nothing: <... completed>
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 
 starting permutation: s1-begin-replication-factor-2 s1-insert-into-select-conflict-update-replication-factor-2 s2-begin-replication-factor-2 s2-insert-into-select-conflict-update-replication-factor-2 s1-commit s2-commit
@@ -245,21 +245,21 @@ create_distributed_table
 
 
 step s1-begin-replication-factor-2:
-	SET citus.shard_replication_factor to 2;
+ SET citus.shard_replication_factor to 2;
-	BEGIN;
+ BEGIN;
 
 step s1-insert-into-select-conflict-update-replication-factor-2:
-	INSERT INTO target_table_2
+ INSERT INTO target_table_2
-	SELECT
+ SELECT
-		col_1, col_2
+  col_1, col_2
-	FROM (
+ FROM (
-		SELECT
+  SELECT
-			col_1, col_2, col_3
+   col_1, col_2, col_3
-		FROM
+  FROM
-			source_table
+   source_table
-		LIMIT 5
+  LIMIT 5
-	) as foo
+ ) as foo
-	ON CONFLICT(col_1) DO UPDATE SET col_2 = EXCLUDED.col_2 RETURNING *;
+ ON CONFLICT(col_1) DO UPDATE SET col_2 = EXCLUDED.col_2 RETURNING *;
 
 col_1          col_2          col_3
 
@@ -269,24 +269,24 @@ col_1          col_2          col_3
 4              4
 5              5
 step s2-begin-replication-factor-2:
-	SET citus.shard_replication_factor to 2;
+ SET citus.shard_replication_factor to 2;
-	BEGIN;
+ BEGIN;
 
 step s2-insert-into-select-conflict-update-replication-factor-2:
-	INSERT INTO target_table_2
+ INSERT INTO target_table_2
-	SELECT
+ SELECT
-		col_1, col_2
+  col_1, col_2
-	FROM (
+ FROM (
-		SELECT
+  SELECT
-			col_1, col_2, col_3
+   col_1, col_2, col_3
-		FROM
+  FROM
-			source_table
+   source_table
-		LIMIT 5
+  LIMIT 5
-	) as foo
+ ) as foo
-	ON CONFLICT(col_1) DO UPDATE SET col_2 = EXCLUDED.col_2 RETURNING *;
+ ON CONFLICT(col_1) DO UPDATE SET col_2 = EXCLUDED.col_2 RETURNING *;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-insert-into-select-conflict-update-replication-factor-2: <... completed>
 col_1          col_2          col_3
@@ -297,5 +297,5 @@ col_1          col_2          col_3
 4              4
 5              5
 step s2-commit:
-	COMMIT;
+ COMMIT;
 

src/test/regress/expected/isolation_insert_select_vs_all.out

@@ -5,10 +5,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-insert-select: INSERT INTO insert_of_insert_select_hash SELECT * FROM select_of_insert_select_hash ORDER BY 1, 2 LIMIT 5;;
@@ -24,10 +24,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-insert-select: INSERT INTO insert_of_insert_select_hash SELECT * FROM select_of_insert_select_hash ORDER BY 1, 2 LIMIT 5;;
@@ -43,10 +43,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-insert-select: INSERT INTO insert_of_insert_select_hash SELECT * FROM select_of_insert_select_hash ORDER BY 1, 2 LIMIT 5;;
@@ -62,10 +62,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-insert-select: INSERT INTO insert_of_insert_select_hash SELECT * FROM select_of_insert_select_hash ORDER BY 1, 2 LIMIT 5;;
@@ -82,10 +82,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-insert-select: INSERT INTO insert_of_insert_select_hash SELECT * FROM select_of_insert_select_hash ORDER BY 1, 2 LIMIT 5;;
@@ -102,10 +102,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-insert-select: INSERT INTO insert_of_insert_select_hash SELECT * FROM select_of_insert_select_hash ORDER BY 1, 2 LIMIT 5;;
@@ -127,10 +127,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-ddl-create-index-on-inserted: CREATE INDEX insert_of_insert_select_hash_index ON insert_of_insert_select_hash(id);
 step s1-begin: BEGIN;
@@ -153,10 +153,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-insert-select: INSERT INTO insert_of_insert_select_hash SELECT * FROM select_of_insert_select_hash ORDER BY 1, 2 LIMIT 5;;
@@ -178,10 +178,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-insert-select: INSERT INTO insert_of_insert_select_hash SELECT * FROM select_of_insert_select_hash ORDER BY 1, 2 LIMIT 5;;
@@ -203,10 +203,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-ddl-add-column-on-inserted: ALTER TABLE insert_of_insert_select_hash ADD new_column int DEFAULT 0;
 step s1-begin: BEGIN;
@@ -229,10 +229,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-insert-select: INSERT INTO insert_of_insert_select_hash SELECT * FROM select_of_insert_select_hash ORDER BY 1, 2 LIMIT 5;;
@@ -259,10 +259,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-insert-select: INSERT INTO insert_of_insert_select_hash SELECT * FROM select_of_insert_select_hash ORDER BY 1, 2 LIMIT 5;;
@@ -281,10 +281,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-insert-select: INSERT INTO insert_of_insert_select_hash SELECT * FROM select_of_insert_select_hash ORDER BY 1, 2 LIMIT 5;;
@@ -300,10 +300,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-insert-select: INSERT INTO insert_of_insert_select_hash SELECT * FROM select_of_insert_select_hash ORDER BY 1, 2 LIMIT 5;;
@@ -325,10 +325,10 @@ create_distributed_table
 step s1-drop-on-inserted: DROP TABLE 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-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-insert-select: INSERT INTO insert_of_insert_select_hash SELECT * FROM select_of_insert_select_hash ORDER BY 1, 2 LIMIT 5;;
@@ -348,10 +348,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-insert-select: INSERT INTO insert_of_insert_select_hash SELECT * FROM select_of_insert_select_hash ORDER BY 1, 2 LIMIT 5;;
@@ -367,10 +367,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-insert-select: INSERT INTO insert_of_insert_select_hash SELECT * FROM select_of_insert_select_hash ORDER BY 1, 2 LIMIT 5;;
@@ -386,10 +386,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-insert-select: INSERT INTO insert_of_insert_select_hash SELECT * FROM select_of_insert_select_hash ORDER BY 1, 2 LIMIT 5;;
@@ -406,10 +406,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-insert-select: INSERT INTO insert_of_insert_select_hash SELECT * FROM select_of_insert_select_hash ORDER BY 1, 2 LIMIT 5;;
@@ -424,10 +424,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-insert-select: INSERT INTO insert_of_insert_select_hash SELECT * FROM select_of_insert_select_hash ORDER BY 1, 2 LIMIT 5;;
@@ -448,10 +448,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-ddl-create-index-on-selected: CREATE INDEX select_of_insert_select_hash_index ON select_of_insert_select_hash(id);
 step s1-begin: BEGIN;
@@ -474,10 +474,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-insert-select: INSERT INTO insert_of_insert_select_hash SELECT * FROM select_of_insert_select_hash ORDER BY 1, 2 LIMIT 5;;
@@ -499,10 +499,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-insert-select: INSERT INTO insert_of_insert_select_hash SELECT * FROM select_of_insert_select_hash ORDER BY 1, 2 LIMIT 5;;
@@ -524,10 +524,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-ddl-add-column-on-selected: ALTER TABLE select_of_insert_select_hash ADD new_column int DEFAULT 0;
 step s1-begin: BEGIN;
@@ -550,10 +550,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-insert-select: INSERT INTO insert_of_insert_select_hash SELECT * FROM select_of_insert_select_hash ORDER BY 1, 2 LIMIT 5;;
@@ -575,10 +575,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-insert-select: INSERT INTO insert_of_insert_select_hash SELECT * FROM select_of_insert_select_hash ORDER BY 1, 2 LIMIT 5;;
@@ -597,10 +597,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-insert-select: INSERT INTO insert_of_insert_select_hash SELECT * FROM select_of_insert_select_hash ORDER BY 1, 2 LIMIT 5;;
@@ -616,10 +616,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-insert-select: INSERT INTO insert_of_insert_select_hash SELECT * FROM select_of_insert_select_hash ORDER BY 1, 2 LIMIT 5;;
@@ -641,10 +641,10 @@ create_distributed_table
 step s1-drop-on-selected: DROP TABLE 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-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-insert-select: INSERT INTO insert_of_insert_select_hash SELECT * FROM select_of_insert_select_hash ORDER BY 1, 2 LIMIT 5;;
@@ -663,10 +663,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-update-on-inserted: UPDATE insert_of_insert_select_hash SET data = 'l' WHERE id = 4;
@@ -682,10 +682,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-delete-on-inserted: DELETE FROM insert_of_insert_select_hash WHERE id = 4;
@@ -701,10 +701,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-truncate-on-inserted: TRUNCATE insert_of_insert_select_hash;
@@ -721,17 +721,17 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-drop-on-inserted: DROP TABLE insert_of_insert_select_hash;
 step s2-insert-select: INSERT INTO insert_of_insert_select_hash SELECT * FROM select_of_insert_select_hash ORDER BY 1, 2 LIMIT 5; <waiting ...>
 step s1-commit: COMMIT;
 step s2-insert-select: <... completed>
-error in steps s1-commit s2-insert-select: ERROR:  relation "insert_of_insert_select_hash" does not exist
+ERROR:  relation "insert_of_insert_select_hash" does not exist
 step s1-select-count: SELECT COUNT(*) FROM select_of_insert_select_hash;
 count
 
@@ -742,10 +742,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-ddl-create-index-on-inserted: CREATE INDEX insert_of_insert_select_hash_index ON insert_of_insert_select_hash(id);
@@ -767,10 +767,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-ddl-create-index-on-inserted: CREATE INDEX insert_of_insert_select_hash_index ON insert_of_insert_select_hash(id);
 step s1-begin: BEGIN;
@@ -793,10 +793,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-ddl-add-column-on-inserted: ALTER TABLE insert_of_insert_select_hash ADD new_column int DEFAULT 0;
@@ -818,10 +818,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-ddl-add-column-on-inserted: ALTER TABLE insert_of_insert_select_hash ADD new_column int DEFAULT 0;
 step s1-begin: BEGIN;
@@ -844,10 +844,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-ddl-rename-column-on-inserted: ALTER TABLE insert_of_insert_select_hash RENAME data TO new_column;
@@ -869,10 +869,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-table-size-on-inserted: SELECT citus_total_relation_size('insert_of_insert_select_hash');
@@ -891,10 +891,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-master-modify-multiple-shards-on-inserted: DELETE FROM insert_of_insert_select_hash;
@@ -910,10 +910,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 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');
@@ -923,7 +923,7 @@ citus_drop_all_shards
 step s2-insert-select: INSERT INTO insert_of_insert_select_hash SELECT * FROM select_of_insert_select_hash ORDER BY 1, 2 LIMIT 5; <waiting ...>
 step s1-commit: COMMIT;
 step s2-insert-select: <... completed>
-error in steps s1-commit s2-insert-select: ERROR:  could not find any shards into which to copy
+ERROR:  could not find any shards into which to copy
 step s1-select-count: SELECT COUNT(*) FROM select_of_insert_select_hash;
 count
 
@@ -936,10 +936,10 @@ create_distributed_table
 step s1-drop-on-inserted: DROP TABLE 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-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-distribute-table-on-inserted: SELECT create_distributed_table('insert_of_insert_select_hash', 'id');
@@ -959,10 +959,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-update-on-selected: UPDATE select_of_insert_select_hash SET data = 'l' WHERE id = 4;
@@ -978,10 +978,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-delete-on-selected: DELETE FROM select_of_insert_select_hash WHERE id = 4;
@@ -997,10 +997,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-truncate-on-selected: TRUNCATE select_of_insert_select_hash;
@@ -1017,17 +1017,17 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-drop-on-selected: DROP TABLE select_of_insert_select_hash;
 step s2-insert-select: INSERT INTO insert_of_insert_select_hash SELECT * FROM select_of_insert_select_hash ORDER BY 1, 2 LIMIT 5; <waiting ...>
 step s1-commit: COMMIT;
 step s2-insert-select: <... completed>
-error in steps s1-commit s2-insert-select: ERROR:  relation "select_of_insert_select_hash" does not exist
+ERROR:  relation "select_of_insert_select_hash" does not exist
 step s1-select-count: SELECT COUNT(*) FROM select_of_insert_select_hash;
 ERROR:  relation "select_of_insert_select_hash" does not exist
 
@@ -1036,10 +1036,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-ddl-create-index-on-selected: CREATE INDEX select_of_insert_select_hash_index ON select_of_insert_select_hash(id);
@@ -1060,10 +1060,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-ddl-create-index-on-selected: CREATE INDEX select_of_insert_select_hash_index ON select_of_insert_select_hash(id);
 step s1-begin: BEGIN;
@@ -1086,17 +1086,17 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-ddl-add-column-on-selected: ALTER TABLE select_of_insert_select_hash ADD new_column int DEFAULT 0;
 step s2-insert-select: INSERT INTO insert_of_insert_select_hash SELECT * FROM select_of_insert_select_hash ORDER BY 1, 2 LIMIT 5; <waiting ...>
 step s1-commit: COMMIT;
 step s2-insert-select: <... completed>
-error in steps s1-commit s2-insert-select: ERROR:  INSERT has more expressions than target columns
+ERROR:  INSERT has more expressions than target columns
 step s1-select-count: SELECT COUNT(*) FROM select_of_insert_select_hash;
 count
 
@@ -1112,10 +1112,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-ddl-add-column-on-selected: ALTER TABLE select_of_insert_select_hash ADD new_column int DEFAULT 0;
 step s1-begin: BEGIN;
@@ -1138,10 +1138,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-ddl-rename-column-on-selected: ALTER TABLE select_of_insert_select_hash RENAME data TO new_column;
@@ -1163,10 +1163,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-table-size-on-selected: SELECT citus_total_relation_size('select_of_insert_select_hash');
@@ -1185,10 +1185,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-master-modify-multiple-shards-on-selected: DELETE FROM select_of_insert_select_hash;
@@ -1204,10 +1204,10 @@ create_distributed_table
 
 
 step s1-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 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');
@@ -1229,10 +1229,10 @@ create_distributed_table
 step s1-drop-on-selected: DROP TABLE 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-initialize:
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 0, a && echo 1, b && echo 2, c && echo 3, d && echo 4, e' WITH CSV;
-	COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY insert_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
-	COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
+ COPY select_of_insert_select_hash FROM PROGRAM 'echo 5, a && echo 6, b && echo 7, c && echo 8, d && echo 9, e' WITH CSV;
 
 step s1-begin: BEGIN;
 step s1-distribute-table-on-selected: SELECT create_distributed_table('select_of_insert_select_hash', 'id');

src/test/regress/expected/isolation_insert_select_vs_all_on_mx.out

@@ -14,7 +14,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-colocated-insert-select:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT * FROM dist_table');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT * FROM dist_table');
 
 run_commands_on_session_level_connection_to_node
 
@@ -32,13 +32,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-colocated-insert-select:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT * FROM dist_table');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT * FROM dist_table');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -50,7 +50,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -62,7 +62,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM dist_table;
+ SELECT COUNT(*) FROM dist_table;
 
 count
 
@@ -85,7 +85,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-insert-select-via-coordinator:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT value, id FROM dist_table');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT value, id FROM dist_table');
 
 run_commands_on_session_level_connection_to_node
 
@@ -103,13 +103,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-colocated-insert-select:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT * FROM dist_table');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT * FROM dist_table');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -121,7 +121,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -133,7 +133,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM dist_table;
+ SELECT COUNT(*) FROM dist_table;
 
 count
 
@@ -156,7 +156,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-colocated-insert-select:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT * FROM dist_table');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT * FROM dist_table');
 
 run_commands_on_session_level_connection_to_node
 
@@ -174,13 +174,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-insert-select-via-coordinator:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT value, id FROM dist_table');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT value, id FROM dist_table');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -192,7 +192,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -204,7 +204,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM dist_table;
+ SELECT COUNT(*) FROM dist_table;
 
 count
 
@@ -227,7 +227,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-insert-select-via-coordinator:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT value, id FROM dist_table');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT value, id FROM dist_table');
 
 run_commands_on_session_level_connection_to_node
 
@@ -245,13 +245,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-insert-select-via-coordinator:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT value, id FROM dist_table');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT value, id FROM dist_table');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -263,7 +263,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -275,7 +275,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM dist_table;
+ SELECT COUNT(*) FROM dist_table;
 
 count
 
@@ -298,7 +298,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-insert-select-via-coordinator:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT value, id FROM dist_table');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT value, id FROM dist_table');
 
 run_commands_on_session_level_connection_to_node
 
@@ -316,13 +316,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-insert:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table VALUES (5, 50), (6, 60)')
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table VALUES (5, 50), (6, 60)')
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -334,7 +334,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -346,7 +346,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM dist_table;
+ SELECT COUNT(*) FROM dist_table;
 
 count
 
@@ -369,7 +369,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-insert-select-via-coordinator:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT value, id FROM dist_table');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT value, id FROM dist_table');
 
 run_commands_on_session_level_connection_to_node
 
@@ -387,13 +387,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-select:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM dist_table')
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM dist_table')
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -405,7 +405,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -417,7 +417,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM dist_table;
+ SELECT COUNT(*) FROM dist_table;
 
 count
 
@@ -440,7 +440,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-colocated-insert-select:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT * FROM dist_table');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT * FROM dist_table');
 
 run_commands_on_session_level_connection_to_node
 
@@ -464,7 +464,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -476,7 +476,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -488,7 +488,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM dist_table;
+ SELECT COUNT(*) FROM dist_table;
 
 count
 
@@ -511,7 +511,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-insert-select-via-coordinator:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT value, id FROM dist_table');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT value, id FROM dist_table');
 
 run_commands_on_session_level_connection_to_node
 
@@ -535,7 +535,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -547,7 +547,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -559,7 +559,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM dist_table;
+ SELECT COUNT(*) FROM dist_table;
 
 count
 
@@ -582,7 +582,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-colocated-insert-select:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT * FROM dist_table');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT * FROM dist_table');
 
 run_commands_on_session_level_connection_to_node
 
@@ -600,13 +600,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-copy:
-	SELECT run_commands_on_session_level_connection_to_node('COPY dist_table FROM PROGRAM ''echo 5, 50 && echo 9, 90 && echo 10, 100''WITH CSV');
+ SELECT run_commands_on_session_level_connection_to_node('COPY dist_table FROM PROGRAM ''echo 5, 50 && echo 9, 90 && echo 10, 100''WITH CSV');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -618,7 +618,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -630,7 +630,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM dist_table;
+ SELECT COUNT(*) FROM dist_table;
 
 count
 
@@ -653,7 +653,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-insert-select-via-coordinator:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT value, id FROM dist_table');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT value, id FROM dist_table');
 
 run_commands_on_session_level_connection_to_node
 
@@ -671,13 +671,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-copy:
-	SELECT run_commands_on_session_level_connection_to_node('COPY dist_table FROM PROGRAM ''echo 5, 50 && echo 9, 90 && echo 10, 100''WITH CSV');
+ SELECT run_commands_on_session_level_connection_to_node('COPY dist_table FROM PROGRAM ''echo 5, 50 && echo 9, 90 && echo 10, 100''WITH CSV');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -689,7 +689,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -701,7 +701,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM dist_table;
+ SELECT COUNT(*) FROM dist_table;
 
 count
 
@@ -724,29 +724,29 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-colocated-insert-select:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT * FROM dist_table');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT * FROM dist_table');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-coordinator-drop:
-	DROP TABLE dist_table;
+ DROP TABLE dist_table;
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-coordinator-drop: <... completed>
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -758,7 +758,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM dist_table;
+ SELECT COUNT(*) FROM dist_table;
 
 ERROR:  relation "dist_table" does not exist
 restore_isolation_tester_func
@@ -779,29 +779,29 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-insert-select-via-coordinator:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT value, id FROM dist_table');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT value, id FROM dist_table');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-coordinator-drop:
-	DROP TABLE dist_table;
+ DROP TABLE dist_table;
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-coordinator-drop: <... completed>
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -813,7 +813,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM dist_table;
+ SELECT COUNT(*) FROM dist_table;
 
 ERROR:  relation "dist_table" does not exist
 restore_isolation_tester_func
@@ -834,7 +834,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-colocated-insert-select:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT * FROM dist_table');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT * FROM dist_table');
 
 run_commands_on_session_level_connection_to_node
 
@@ -852,13 +852,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-select-for-update:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM dist_table WHERE id = 5 FOR UPDATE');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM dist_table WHERE id = 5 FOR UPDATE');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -870,7 +870,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -882,7 +882,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM dist_table;
+ SELECT COUNT(*) FROM dist_table;
 
 count
 
@@ -905,7 +905,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-insert-select-via-coordinator:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT value, id FROM dist_table');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO dist_table SELECT value, id FROM dist_table');
 
 run_commands_on_session_level_connection_to_node
 
@@ -923,13 +923,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-select-for-update:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM dist_table WHERE id = 5 FOR UPDATE');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM dist_table WHERE id = 5 FOR UPDATE');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -941,7 +941,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -953,7 +953,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM dist_table;
+ SELECT COUNT(*) FROM dist_table;
 
 count
 

src/test/regress/expected/isolation_insert_vs_all.out

@@ -366,7 +366,7 @@ step s1-drop: DROP TABLE insert_hash;
 step s2-insert: INSERT INTO insert_hash VALUES(7, 'k'); <waiting ...>
 step s1-commit: COMMIT;
 step s2-insert: <... completed>
-error in steps s1-commit s2-insert: ERROR:  relation "insert_hash" does not exist
+ERROR:  relation "insert_hash" does not exist
 step s1-select-count: SELECT COUNT(*) FROM insert_hash;
 ERROR:  relation "insert_hash" does not exist
 
@@ -833,7 +833,7 @@ step s1-drop: DROP TABLE insert_hash;
 step s2-insert-multi-row: INSERT INTO insert_hash VALUES(7, 'k'), (8, 'l'), (9, 'm'); <waiting ...>
 step s1-commit: COMMIT;
 step s2-insert-multi-row: <... completed>
-error in steps s1-commit s2-insert-multi-row: ERROR:  relation "insert_hash" does not exist
+ERROR:  relation "insert_hash" does not exist
 step s1-select-count: SELECT COUNT(*) FROM insert_hash;
 ERROR:  relation "insert_hash" does not exist
 

src/test/regress/expected/isolation_insert_vs_all_on_mx.out

@@ -14,7 +14,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-insert:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO insert_table VALUES(6, 60)');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO insert_table VALUES(6, 60)');
 
 run_commands_on_session_level_connection_to_node
 
@@ -38,7 +38,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -50,13 +50,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM insert_table;
+ SELECT COUNT(*) FROM insert_table;
 
 count
 
 7
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -85,7 +85,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-insert-multi-row:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO insert_table VALUES(6, 60), (7, 70), (8, 80)');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO insert_table VALUES(6, 60), (7, 70), (8, 80)');
 
 run_commands_on_session_level_connection_to_node
 
@@ -109,7 +109,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -121,13 +121,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM insert_table;
+ SELECT COUNT(*) FROM insert_table;
 
 count
 
 9
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -156,7 +156,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-insert:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO insert_table VALUES(6, 60)');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO insert_table VALUES(6, 60)');
 
 run_commands_on_session_level_connection_to_node
 
@@ -174,13 +174,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-insert-multi-row:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO insert_table VALUES(6, 60), (7, 70), (8, 80)');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO insert_table VALUES(6, 60), (7, 70), (8, 80)');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -192,13 +192,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM insert_table;
+ SELECT COUNT(*) FROM insert_table;
 
 count
 
 9
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -227,7 +227,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-insert-multi-row:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO insert_table VALUES(6, 60), (7, 70), (8, 80)');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO insert_table VALUES(6, 60), (7, 70), (8, 80)');
 
 run_commands_on_session_level_connection_to_node
 
@@ -245,13 +245,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-insert-multi-row:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO insert_table VALUES(6, 60), (7, 70), (8, 80)');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO insert_table VALUES(6, 60), (7, 70), (8, 80)');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -263,13 +263,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM insert_table;
+ SELECT COUNT(*) FROM insert_table;
 
 count
 
 11
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -298,7 +298,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-insert:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO insert_table VALUES(6, 60)');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO insert_table VALUES(6, 60)');
 
 run_commands_on_session_level_connection_to_node
 
@@ -316,13 +316,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-select:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM insert_table WHERE id = 6');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM insert_table WHERE id = 6');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -334,13 +334,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM insert_table;
+ SELECT COUNT(*) FROM insert_table;
 
 count
 
 6
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -369,7 +369,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-insert:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO insert_table VALUES(6, 60)');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO insert_table VALUES(6, 60)');
 
 run_commands_on_session_level_connection_to_node
 
@@ -387,13 +387,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-insert-select:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO insert_table SELECT * FROM insert_table');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO insert_table SELECT * FROM insert_table');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -405,13 +405,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM insert_table;
+ SELECT COUNT(*) FROM insert_table;
 
 count
 
 11
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -440,7 +440,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-insert:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO insert_table VALUES(6, 60)');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO insert_table VALUES(6, 60)');
 
 run_commands_on_session_level_connection_to_node
 
@@ -458,13 +458,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-update:
-	SELECT run_commands_on_session_level_connection_to_node('UPDATE insert_table SET value = 65 WHERE id = 6');
+ SELECT run_commands_on_session_level_connection_to_node('UPDATE insert_table SET value = 65 WHERE id = 6');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -476,13 +476,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM insert_table;
+ SELECT COUNT(*) FROM insert_table;
 
 count
 
 6
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -511,7 +511,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-insert-multi-row:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO insert_table VALUES(6, 60), (7, 70), (8, 80)');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO insert_table VALUES(6, 60), (7, 70), (8, 80)');
 
 run_commands_on_session_level_connection_to_node
 
@@ -529,13 +529,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-update-multi-row:
-	SELECT run_commands_on_session_level_connection_to_node('UPDATE insert_table SET value = 67 WHERE id IN (6, 7)');
+ SELECT run_commands_on_session_level_connection_to_node('UPDATE insert_table SET value = 67 WHERE id IN (6, 7)');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -547,13 +547,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM insert_table;
+ SELECT COUNT(*) FROM insert_table;
 
 count
 
 8
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -582,7 +582,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-insert:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO insert_table VALUES(6, 60)');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO insert_table VALUES(6, 60)');
 
 run_commands_on_session_level_connection_to_node
 
@@ -600,13 +600,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-copy:
-	SELECT run_commands_on_session_level_connection_to_node('COPY insert_table FROM PROGRAM ''echo 9, 90 && echo 10, 100''WITH CSV');
+ SELECT run_commands_on_session_level_connection_to_node('COPY insert_table FROM PROGRAM ''echo 9, 90 && echo 10, 100''WITH CSV');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -618,13 +618,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM insert_table;
+ SELECT COUNT(*) FROM insert_table;
 
 count
 
 8
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -653,7 +653,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-insert:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO insert_table VALUES(6, 60)');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO insert_table VALUES(6, 60)');
 
 run_commands_on_session_level_connection_to_node
 
@@ -671,10 +671,10 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-truncate:
-	SELECT run_commands_on_session_level_connection_to_node('TRUNCATE insert_table');
+ SELECT run_commands_on_session_level_connection_to_node('TRUNCATE insert_table');
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -690,13 +690,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM insert_table;
+ SELECT COUNT(*) FROM insert_table;
 
 count
 
 0
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -725,7 +725,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-insert:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO insert_table VALUES(6, 60)');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO insert_table VALUES(6, 60)');
 
 run_commands_on_session_level_connection_to_node
 
@@ -743,13 +743,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-select-for-update:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM insert_table WHERE id = 6 FOR UPDATE');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM insert_table WHERE id = 6 FOR UPDATE');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -761,13 +761,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM insert_table;
+ SELECT COUNT(*) FROM insert_table;
 
 count
 
 6
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 

src/test/regress/expected/isolation_insert_vs_vacuum.out

@@ -30,7 +30,7 @@ step s1-insert:
 step s2-vacuum-full:
     VACUUM FULL test_insert_vacuum;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-vacuum-full: <... completed>

src/test/regress/expected/isolation_master_append_table.out

@@ -26,7 +26,7 @@ step s2-master_append_table_to_shard:
  WHERE
   'table_to_append'::regclass::oid = logicalrelid;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-master_append_table_to_shard: <... completed>

src/test/regress/expected/isolation_master_apply_delete.out

@@ -5,18 +5,18 @@ step s1-begin:
     BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-master_apply_delete_command_all_shard:
-   	SELECT master_apply_delete_command($$DELETE FROM table_to_delete_from WHERE id >= 0$$);
+    SELECT master_apply_delete_command($$DELETE FROM table_to_delete_from WHERE id >= 0$$);
 
 master_apply_delete_command
 
 1
 step s2-master_apply_delete_command_all_shard:
-   	SELECT master_apply_delete_command($$DELETE FROM table_to_delete_from WHERE id >= 0$$);
+    SELECT master_apply_delete_command($$DELETE FROM table_to_delete_from WHERE id >= 0$$);
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-master_apply_delete_command_all_shard: <... completed>
@@ -24,7 +24,7 @@ master_apply_delete_command
 
 0
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 
 starting permutation: s1-begin s2-begin s1-master_apply_delete_command_all_shard s2-master_apply_delete_command_row s1-commit s2-commit
@@ -32,18 +32,18 @@ step s1-begin:
     BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-master_apply_delete_command_all_shard:
-   	SELECT master_apply_delete_command($$DELETE FROM table_to_delete_from WHERE id >= 0$$);
+    SELECT master_apply_delete_command($$DELETE FROM table_to_delete_from WHERE id >= 0$$);
 
 master_apply_delete_command
 
 1
 step s2-master_apply_delete_command_row:
-   	SELECT master_apply_delete_command($$DELETE FROM table_to_delete_from WHERE id >= 0 and id < 3$$);
+    SELECT master_apply_delete_command($$DELETE FROM table_to_delete_from WHERE id >= 0 and id < 3$$);
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-master_apply_delete_command_row: <... completed>
@@ -51,7 +51,7 @@ master_apply_delete_command
 
 0
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 
 starting permutation: s1-begin s2-begin s1-master_apply_delete_command_row s2-master_apply_delete_command_all_shard s1-commit s2-commit
@@ -59,18 +59,18 @@ step s1-begin:
     BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-master_apply_delete_command_row:
-   	SELECT master_apply_delete_command($$DELETE FROM table_to_delete_from WHERE id >= 0 and id < 3$$);
+    SELECT master_apply_delete_command($$DELETE FROM table_to_delete_from WHERE id >= 0 and id < 3$$);
 
 master_apply_delete_command
 
 0
 step s2-master_apply_delete_command_all_shard:
-   	SELECT master_apply_delete_command($$DELETE FROM table_to_delete_from WHERE id >= 0$$);
+    SELECT master_apply_delete_command($$DELETE FROM table_to_delete_from WHERE id >= 0$$);
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-master_apply_delete_command_all_shard: <... completed>
@@ -78,7 +78,7 @@ master_apply_delete_command
 
 1
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 
 starting permutation: s1-begin s2-begin s1-master_apply_delete_command_row s2-master_apply_delete_command_row s1-commit s2-commit
@@ -86,18 +86,18 @@ step s1-begin:
     BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-master_apply_delete_command_row:
-   	SELECT master_apply_delete_command($$DELETE FROM table_to_delete_from WHERE id >= 0 and id < 3$$);
+    SELECT master_apply_delete_command($$DELETE FROM table_to_delete_from WHERE id >= 0 and id < 3$$);
 
 master_apply_delete_command
 
 0
 step s2-master_apply_delete_command_row:
-   	SELECT master_apply_delete_command($$DELETE FROM table_to_delete_from WHERE id >= 0 and id < 3$$);
+    SELECT master_apply_delete_command($$DELETE FROM table_to_delete_from WHERE id >= 0 and id < 3$$);
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-master_apply_delete_command_row: <... completed>
@@ -105,5 +105,5 @@ master_apply_delete_command
 
 0
 step s2-commit:
-	COMMIT;
+ COMMIT;
 

src/test/regress/expected/isolation_master_update_node.out

@@ -45,7 +45,6 @@ master_update_node
 
 step s2-abort: ABORT;
 step s1-abort: ABORT;
-WARNING: this step had a leftover error message
 FATAL:  terminating connection due to administrator command
 server closed the connection unexpectedly
 	This probably means the server terminated abnormally

src/test/regress/expected/isolation_metadata_sync_deadlock.out

@@ -61,14 +61,14 @@ pg_sleep
 step s2-update-1-on-worker:
   SELECT run_commands_on_session_level_connection_to_node('UPDATE deadlock_detection_test SET some_val = 2 WHERE user_id = 1');
  <waiting ...>
-step s1-update-2:
+step s1-update-2: 
   UPDATE deadlock_detection_test SET some_val = 1 WHERE user_id = 2;
 
+ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step s2-update-1-on-worker: <... completed>
 run_commands_on_session_level_connection_to_node
 
 
-error in steps s1-update-2 s2-update-1-on-worker: ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step s1-commit:
   COMMIT;
 

src/test/regress/expected/isolation_modify_with_subquery_vs_dml.out

@@ -5,7 +5,7 @@ step s1-begin:
     BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-modify_with_subquery_v1:
     UPDATE users_test_table SET value_2 = 5 FROM events_test_table WHERE users_test_table.user_id = events_test_table.user_id;
@@ -13,8 +13,8 @@ step s2-modify_with_subquery_v1:
 step s1-insert_to_events_test_table:
     INSERT INTO events_test_table VALUES(4,6,8,10);
  <waiting ...>
-step s2-commit:
+step s2-commit: 
-	COMMIT;
+ COMMIT;
 
 step s1-insert_to_events_test_table: <... completed>
 step s1-commit:
@@ -26,16 +26,16 @@ step s1-begin:
     BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-modify_with_subquery_v1:
     UPDATE users_test_table SET value_2 = 5 FROM events_test_table WHERE users_test_table.user_id = events_test_table.user_id;
 
 step s1-update_events_test_table:
-	UPDATE users_test_table SET value_1 = 3;
+ UPDATE users_test_table SET value_1 = 3;
  <waiting ...>
-step s2-commit:
+step s2-commit: 
-	COMMIT;
+ COMMIT;
 
 step s1-update_events_test_table: <... completed>
 step s1-commit:
@@ -47,16 +47,16 @@ step s1-begin:
     BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-modify_with_subquery_v1:
     UPDATE users_test_table SET value_2 = 5 FROM events_test_table WHERE users_test_table.user_id = events_test_table.user_id;
 
 step s1-delete_events_test_table:
-	DELETE FROM events_test_table WHERE user_id = 1 or user_id = 3;
+ DELETE FROM events_test_table WHERE user_id = 1 or user_id = 3;
  <waiting ...>
-step s2-commit:
+step s2-commit: 
-	COMMIT;
+ COMMIT;
 
 step s1-delete_events_test_table: <... completed>
 step s1-commit:
@@ -68,7 +68,7 @@ step s1-begin:
     BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-insert_to_events_test_table:
     INSERT INTO events_test_table VALUES(4,6,8,10);
@@ -76,12 +76,12 @@ step s1-insert_to_events_test_table:
 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;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-modify_with_subquery_v1: <... completed>
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 
 starting permutation: s1-begin s2-begin s1-update_events_test_table s2-modify_with_subquery_v1 s1-commit s2-commit
@@ -89,20 +89,20 @@ step s1-begin:
     BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-update_events_test_table:
-	UPDATE users_test_table SET value_1 = 3;
+ UPDATE users_test_table SET value_1 = 3;
 
 step s2-modify_with_subquery_v1:
     UPDATE users_test_table SET value_2 = 5 FROM events_test_table WHERE users_test_table.user_id = events_test_table.user_id;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-modify_with_subquery_v1: <... completed>
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 
 starting permutation: s1-begin s2-begin s1-delete_events_test_table s2-modify_with_subquery_v1 s1-commit s2-commit
@@ -110,18 +110,18 @@ step s1-begin:
     BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-delete_events_test_table:
-	DELETE FROM events_test_table WHERE user_id = 1 or user_id = 3;
+ DELETE FROM events_test_table WHERE user_id = 1 or user_id = 3;
 
 step s2-modify_with_subquery_v1:
     UPDATE users_test_table SET value_2 = 5 FROM events_test_table WHERE users_test_table.user_id = events_test_table.user_id;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-modify_with_subquery_v1: <... completed>
 step s2-commit:
-	COMMIT;
+ COMMIT;
 

src/test/regress/expected/isolation_multi_shard_modify_vs_all.out

@@ -5,13 +5,13 @@ step s1-begin:
     BEGIN;
 
 step s1-update_all_value_1:
-	UPDATE users_test_table SET value_1 = 3;
+ UPDATE users_test_table SET value_1 = 3;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-select:
-	SELECT * FROM users_test_table ORDER BY value_2, value_3;
+ SELECT * FROM users_test_table ORDER BY value_2, value_3;
 
 user_id        value_1        value_2        value_3
 
@@ -26,7 +26,7 @@ step s1-commit:
     COMMIT;
 
 step s2-select:
-	SELECT * FROM users_test_table ORDER BY value_2, value_3;
+ SELECT * FROM users_test_table ORDER BY value_2, value_3;
 
 user_id        value_1        value_2        value_3
 
@@ -38,7 +38,7 @@ user_id        value_1        value_2        value_3
 6              3              11             25
 7              3              12             18
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 
 starting permutation: s1-begin s1-update_all_value_1 s2-begin s2-update_all_value_1 s1-commit s2-commit
@@ -46,20 +46,20 @@ step s1-begin:
     BEGIN;
 
 step s1-update_all_value_1:
-	UPDATE users_test_table SET value_1 = 3;
+ UPDATE users_test_table SET value_1 = 3;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-update_all_value_1:
-	UPDATE users_test_table SET value_1 = 6;
+ UPDATE users_test_table SET value_1 = 6;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-update_all_value_1: <... completed>
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 
 starting permutation: s1-begin s1-update_even_concurrently s2-begin s2-update_odd_concurrently s1-commit s2-commit
@@ -67,23 +67,23 @@ step s1-begin:
     BEGIN;
 
 step s1-update_even_concurrently:
-	SET citus.enable_deadlock_prevention TO off;
+ SET citus.enable_deadlock_prevention TO off;
-	UPDATE users_test_table SET value_1 = 3 WHERE user_id % 2 = 0;
+ UPDATE users_test_table SET value_1 = 3 WHERE user_id % 2 = 0;
-	SET citus.enable_deadlock_prevention TO on;
+ SET citus.enable_deadlock_prevention TO on;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-update_odd_concurrently:
-	SET citus.enable_deadlock_prevention = off;
+ SET citus.enable_deadlock_prevention = off;
-	UPDATE users_test_table SET value_1 = 3 WHERE user_id % 2 = 1;
+ UPDATE users_test_table SET value_1 = 3 WHERE user_id % 2 = 1;
-	SET citus.enable_deadlock_prevention TO on;
+ SET citus.enable_deadlock_prevention TO on;
 
 step s1-commit:
     COMMIT;
 
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 
 starting permutation: s1-begin s1-update_even_concurrently s2-begin s2-update_value_1_of_4_or_6_to_4 s1-commit s2-commit
@@ -91,22 +91,22 @@ step s1-begin:
     BEGIN;
 
 step s1-update_even_concurrently:
-	SET citus.enable_deadlock_prevention TO off;
+ SET citus.enable_deadlock_prevention TO off;
-	UPDATE users_test_table SET value_1 = 3 WHERE user_id % 2 = 0;
+ UPDATE users_test_table SET value_1 = 3 WHERE user_id % 2 = 0;
-	SET citus.enable_deadlock_prevention TO on;
+ SET citus.enable_deadlock_prevention TO on;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-update_value_1_of_4_or_6_to_4:
-	UPDATE users_test_table SET value_1 = 4 WHERE user_id = 4 or user_id = 6;
+ UPDATE users_test_table SET value_1 = 4 WHERE user_id = 4 or user_id = 6;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-update_value_1_of_4_or_6_to_4: <... completed>
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 
 starting permutation: s1-begin s1-update_value_1_of_1_or_3_to_5 s2-begin s2-update_value_1_of_4_or_6_to_4 s1-commit s2-commit s2-select
@@ -114,22 +114,22 @@ step s1-begin:
     BEGIN;
 
 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;
+ UPDATE users_test_table SET value_1 = 5 WHERE user_id = 1 or user_id = 3;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-update_value_1_of_4_or_6_to_4:
-	UPDATE users_test_table SET value_1 = 4 WHERE user_id = 4 or user_id = 6;
+ UPDATE users_test_table SET value_1 = 4 WHERE user_id = 4 or user_id = 6;
 
 step s1-commit:
     COMMIT;
 
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 step s2-select:
-	SELECT * FROM users_test_table ORDER BY value_2, value_3;
+ SELECT * FROM users_test_table ORDER BY value_2, value_3;
 
 user_id        value_1        value_2        value_3
 
@@ -146,23 +146,23 @@ step s1-begin:
     BEGIN;
 
 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;
+ UPDATE users_test_table SET value_1 = 5 WHERE user_id = 1 or user_id = 3;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-update_value_1_of_1_or_3_to_8:
-	UPDATE users_test_table SET value_1 = 8 WHERE user_id = 1 or user_id = 3;
+ UPDATE users_test_table SET value_1 = 8 WHERE user_id = 1 or user_id = 3;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-update_value_1_of_1_or_3_to_8: <... completed>
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 step s2-select:
-	SELECT * FROM users_test_table ORDER BY value_2, value_3;
+ SELECT * FROM users_test_table ORDER BY value_2, value_3;
 
 user_id        value_1        value_2        value_3
 
@@ -179,22 +179,22 @@ step s1-begin:
     BEGIN;
 
 step s1-update_all_value_1:
-	UPDATE users_test_table SET value_1 = 3;
+ UPDATE users_test_table SET value_1 = 3;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-insert-to-table:
-	INSERT INTO users_test_table VALUES (1,2,3,4);
+ INSERT INTO users_test_table VALUES (1,2,3,4);
 
 step s1-commit:
     COMMIT;
 
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 step s2-select:
-	SELECT * FROM users_test_table ORDER BY value_2, value_3;
+ SELECT * FROM users_test_table ORDER BY value_2, value_3;
 
 user_id        value_1        value_2        value_3
 
@@ -212,23 +212,23 @@ step s1-begin:
     BEGIN;
 
 step s1-update_all_value_1:
-	UPDATE users_test_table SET value_1 = 3;
+ UPDATE users_test_table SET value_1 = 3;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-insert-into-select:
-	INSERT INTO users_test_table SELECT * FROM events_test_table;
+ INSERT INTO users_test_table SELECT * FROM events_test_table;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-insert-into-select: <... completed>
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 step s2-select:
-	SELECT * FROM users_test_table ORDER BY value_2, value_3;
+ SELECT * FROM users_test_table ORDER BY value_2, value_3;
 
 user_id        value_1        value_2        value_3
 
@@ -252,20 +252,20 @@ step s1-begin:
     BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 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;
+ UPDATE users_test_table SET value_1 = 5 WHERE user_id = 1 or user_id = 3;
 
 step s2-update_value_1_of_1_or_3_to_8:
-	UPDATE users_test_table SET value_1 = 8 WHERE user_id = 1 or user_id = 3;
+ UPDATE users_test_table SET value_1 = 8 WHERE user_id = 1 or user_id = 3;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-update_value_1_of_1_or_3_to_8: <... completed>
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 
 starting permutation: s1-begin s2-begin s2-update_value_1_of_1_or_3_to_8 s1-update_value_1_of_2_or_4_to_5 s2-commit s1-commit
@@ -273,16 +273,16 @@ step s1-begin:
     BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-update_value_1_of_1_or_3_to_8:
-	UPDATE users_test_table SET value_1 = 8 WHERE user_id = 1 or user_id = 3;
+ UPDATE users_test_table SET value_1 = 8 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;
+ UPDATE users_test_table SET value_1 = 5 WHERE user_id = 2 or user_id = 4;
 
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 step s1-commit:
     COMMIT;
@@ -296,26 +296,26 @@ step s1-change_connection_mode_to_sequential:
     set citus.multi_shard_modify_mode to 'sequential';
 
 step s1-update_all_value_1:
-	UPDATE users_test_table SET value_1 = 3;
+ UPDATE users_test_table SET value_1 = 3;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-change_connection_mode_to_sequential:
     set citus.multi_shard_modify_mode to 'sequential';
 
 step s2-update_all_value_1:
-	UPDATE users_test_table SET value_1 = 6;
+ UPDATE users_test_table SET value_1 = 6;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-update_all_value_1: <... completed>
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 step s2-select:
-	SELECT * FROM users_test_table ORDER BY value_2, value_3;
+ SELECT * FROM users_test_table ORDER BY value_2, value_3;
 
 user_id        value_1        value_2        value_3
 
@@ -335,26 +335,26 @@ step s1-change_connection_mode_to_sequential:
     set citus.multi_shard_modify_mode to 'sequential';
 
 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;
+ UPDATE users_test_table SET value_1 = 5 WHERE user_id = 1 or user_id = 3;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-change_connection_mode_to_sequential:
     set citus.multi_shard_modify_mode to 'sequential';
 
 step s2-update_value_1_of_1_or_3_to_8:
-	UPDATE users_test_table SET value_1 = 8 WHERE user_id = 1 or user_id = 3;
+ UPDATE users_test_table SET value_1 = 8 WHERE user_id = 1 or user_id = 3;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-update_value_1_of_1_or_3_to_8: <... completed>
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 step s2-select:
-	SELECT * FROM users_test_table ORDER BY value_2, value_3;
+ SELECT * FROM users_test_table ORDER BY value_2, value_3;
 
 user_id        value_1        value_2        value_3
 
@@ -374,25 +374,25 @@ step s1-change_connection_mode_to_sequential:
     set citus.multi_shard_modify_mode to 'sequential';
 
 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;
+ UPDATE users_test_table SET value_1 = 5 WHERE user_id = 1 or user_id = 3;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-change_connection_mode_to_sequential:
     set citus.multi_shard_modify_mode to 'sequential';
 
 step s2-update_value_1_of_4_or_6_to_4:
-	UPDATE users_test_table SET value_1 = 4 WHERE user_id = 4 or user_id = 6;
+ UPDATE users_test_table SET value_1 = 4 WHERE user_id = 4 or user_id = 6;
 
 step s1-commit:
     COMMIT;
 
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 step s2-select:
-	SELECT * FROM users_test_table ORDER BY value_2, value_3;
+ SELECT * FROM users_test_table ORDER BY value_2, value_3;
 
 user_id        value_1        value_2        value_3
 
@@ -409,7 +409,7 @@ step s1-begin:
     BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-change_connection_mode_to_sequential:
     set citus.multi_shard_modify_mode to 'sequential';
@@ -418,17 +418,17 @@ step s2-change_connection_mode_to_sequential:
     set citus.multi_shard_modify_mode to 'sequential';
 
 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;
+ UPDATE users_test_table SET value_1 = 5 WHERE user_id = 1 or user_id = 3;
 
 step s2-update_value_1_of_1_or_3_to_8:
-	UPDATE users_test_table SET value_1 = 8 WHERE user_id = 1 or user_id = 3;
+ UPDATE users_test_table SET value_1 = 8 WHERE user_id = 1 or user_id = 3;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-update_value_1_of_1_or_3_to_8: <... completed>
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 
 starting permutation: s1-begin s2-begin s1-change_connection_mode_to_sequential s2-change_connection_mode_to_sequential s2-update_value_1_of_1_or_3_to_8 s1-update_value_1_of_2_or_4_to_5 s1-commit s2-commit
@@ -436,7 +436,7 @@ step s1-begin:
     BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-change_connection_mode_to_sequential:
     set citus.multi_shard_modify_mode to 'sequential';
@@ -445,14 +445,14 @@ step s2-change_connection_mode_to_sequential:
     set citus.multi_shard_modify_mode to 'sequential';
 
 step s2-update_value_1_of_1_or_3_to_8:
-	UPDATE users_test_table SET value_1 = 8 WHERE user_id = 1 or user_id = 3;
+ UPDATE users_test_table SET value_1 = 8 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;
+ UPDATE users_test_table SET value_1 = 5 WHERE user_id = 2 or user_id = 4;
 
 step s1-commit:
     COMMIT;
 
 step s2-commit:
-	COMMIT;
+ COMMIT;
 

src/test/regress/expected/isolation_multiuser_locking.out

@@ -2,283 +2,283 @@ Parsed test spec with 2 sessions
 
 starting permutation: s1-begin s2-begin s2-reindex s1-insert s2-commit s1-commit
 step s1-begin:
-	BEGIN;
+ BEGIN;
-	SET ROLE test_user_1;
+ SET ROLE test_user_1;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
-	SET ROLE test_user_2;
+ SET ROLE test_user_2;
 
 step s2-reindex:
-	REINDEX TABLE test_table;
+ REINDEX TABLE test_table;
 
 ERROR:  must be owner of table test_table
 step s1-insert:
-	UPDATE test_table SET column2 = 1;
+ UPDATE test_table SET column2 = 1;
 
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 step s1-commit:
-	COMMIT;
+ COMMIT;
 
 
 starting permutation: s1-grant s1-begin s2-begin s2-reindex s1-insert s2-insert s2-commit s1-commit
 step s1-grant:
-	SET ROLE test_user_1;
+ SET ROLE test_user_1;
-	SELECT bool_and(success) FROM run_command_on_placements('test_table', 'GRANT ALL ON TABLE %s TO test_user_2');
+ SELECT bool_and(success) FROM run_command_on_placements('test_table', 'GRANT ALL ON TABLE %s TO test_user_2');
-	GRANT ALL ON test_table TO test_user_2;
+ GRANT ALL ON test_table TO test_user_2;
 
 bool_and
 
 t
 step s1-begin:
-	BEGIN;
+ BEGIN;
-	SET ROLE test_user_1;
+ SET ROLE test_user_1;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
-	SET ROLE test_user_2;
+ SET ROLE test_user_2;
 
 step s2-reindex:
-	REINDEX TABLE test_table;
+ REINDEX TABLE test_table;
 
 ERROR:  must be owner of table test_table
 step s1-insert:
-	UPDATE test_table SET column2 = 1;
+ UPDATE test_table SET column2 = 1;
 
 step s2-insert:
-	UPDATE test_table SET column2 = 2;
+ UPDATE test_table SET column2 = 2;
 
 ERROR:  current transaction is aborted, commands ignored until end of transaction block
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 step s1-commit:
-	COMMIT;
+ COMMIT;
 
 
 starting permutation: s1-grant s1-begin s2-begin s1-reindex s2-insert s1-insert s1-commit s2-commit
 step s1-grant:
-	SET ROLE test_user_1;
+ SET ROLE test_user_1;
-	SELECT bool_and(success) FROM run_command_on_placements('test_table', 'GRANT ALL ON TABLE %s TO test_user_2');
+ SELECT bool_and(success) FROM run_command_on_placements('test_table', 'GRANT ALL ON TABLE %s TO test_user_2');
-	GRANT ALL ON test_table TO test_user_2;
+ GRANT ALL ON test_table TO test_user_2;
 
 bool_and
 
 t
 step s1-begin:
-	BEGIN;
+ BEGIN;
-	SET ROLE test_user_1;
+ SET ROLE test_user_1;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
-	SET ROLE test_user_2;
+ SET ROLE test_user_2;
 
 step s1-reindex:
-	REINDEX TABLE test_table;
+ REINDEX TABLE test_table;
 
 step s2-insert:
-	UPDATE test_table SET column2 = 2;
+ UPDATE test_table SET column2 = 2;
  <waiting ...>
-step s1-insert:
+step s1-insert: 
-	UPDATE test_table SET column2 = 1;
+ UPDATE test_table SET column2 = 1;
 
 step s1-commit:
-	COMMIT;
+ COMMIT;
 
 step s2-insert: <... completed>
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 
 starting permutation: s1-begin s2-begin s2-index s1-insert s2-commit s1-commit s2-drop-index
 step s1-begin:
-	BEGIN;
+ BEGIN;
-	SET ROLE test_user_1;
+ SET ROLE test_user_1;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
-	SET ROLE test_user_2;
+ SET ROLE test_user_2;
 
 step s2-index:
-	CREATE INDEX test_index ON test_table(column1);
+ CREATE INDEX test_index ON test_table(column1);
 
 ERROR:  must be owner of table test_table
 step s1-insert:
-	UPDATE test_table SET column2 = 1;
+ UPDATE test_table SET column2 = 1;
 
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 step s1-commit:
-	COMMIT;
+ COMMIT;
 
 step s2-drop-index:
-	DROP INDEX IF EXISTS test_index;
+ DROP INDEX IF EXISTS test_index;
 
 
 starting permutation: s1-grant s1-begin s2-begin s2-insert s1-index s2-insert s2-commit s1-commit s1-drop-index
 step s1-grant:
-	SET ROLE test_user_1;
+ SET ROLE test_user_1;
-	SELECT bool_and(success) FROM run_command_on_placements('test_table', 'GRANT ALL ON TABLE %s TO test_user_2');
+ SELECT bool_and(success) FROM run_command_on_placements('test_table', 'GRANT ALL ON TABLE %s TO test_user_2');
-	GRANT ALL ON test_table TO test_user_2;
+ GRANT ALL ON test_table TO test_user_2;
 
 bool_and
 
 t
 step s1-begin:
-	BEGIN;
+ BEGIN;
-	SET ROLE test_user_1;
+ SET ROLE test_user_1;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
-	SET ROLE test_user_2;
+ SET ROLE test_user_2;
 
 step s2-insert:
-	UPDATE test_table SET column2 = 2;
+ UPDATE test_table SET column2 = 2;
 
 step s1-index:
-	CREATE INDEX test_index ON test_table(column1);
+ CREATE INDEX test_index ON test_table(column1);
  <waiting ...>
-step s2-insert:
+step s2-insert: 
-	UPDATE test_table SET column2 = 2;
+ UPDATE test_table SET column2 = 2;
 
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 step s1-index: <... completed>
 step s1-commit:
-	COMMIT;
+ COMMIT;
 
 step s1-drop-index:
-	DROP INDEX IF EXISTS test_index;
+ DROP INDEX IF EXISTS test_index;
 
 
 starting permutation: s1-grant s1-begin s2-begin s1-index s2-index s1-insert s1-commit s2-commit s1-drop-index s2-drop-index
 step s1-grant:
-	SET ROLE test_user_1;
+ SET ROLE test_user_1;
-	SELECT bool_and(success) FROM run_command_on_placements('test_table', 'GRANT ALL ON TABLE %s TO test_user_2');
+ SELECT bool_and(success) FROM run_command_on_placements('test_table', 'GRANT ALL ON TABLE %s TO test_user_2');
-	GRANT ALL ON test_table TO test_user_2;
+ GRANT ALL ON test_table TO test_user_2;
 
 bool_and
 
 t
 step s1-begin:
-	BEGIN;
+ BEGIN;
-	SET ROLE test_user_1;
+ SET ROLE test_user_1;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
-	SET ROLE test_user_2;
+ SET ROLE test_user_2;
 
 step s1-index:
-	CREATE INDEX test_index ON test_table(column1);
+ CREATE INDEX test_index ON test_table(column1);
 
 step s2-index:
-	CREATE INDEX test_index ON test_table(column1);
+ CREATE INDEX test_index ON test_table(column1);
 
 ERROR:  must be owner of table test_table
 step s1-insert:
-	UPDATE test_table SET column2 = 1;
+ UPDATE test_table SET column2 = 1;
 
 step s1-commit:
-	COMMIT;
+ COMMIT;
 
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 step s1-drop-index:
-	DROP INDEX IF EXISTS test_index;
+ DROP INDEX IF EXISTS test_index;
 
 step s2-drop-index:
-	DROP INDEX IF EXISTS test_index;
+ DROP INDEX IF EXISTS test_index;
 
 
 starting permutation: s1-begin s2-begin s2-truncate s1-insert s2-commit s1-commit
 step s1-begin:
-	BEGIN;
+ BEGIN;
-	SET ROLE test_user_1;
+ SET ROLE test_user_1;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
-	SET ROLE test_user_2;
+ SET ROLE test_user_2;
 
 step s2-truncate:
-	TRUNCATE test_table;
+ TRUNCATE test_table;
 
 ERROR:  permission denied for table test_table
 step s1-insert:
-	UPDATE test_table SET column2 = 1;
+ UPDATE test_table SET column2 = 1;
 
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 step s1-commit:
-	COMMIT;
+ COMMIT;
 
 
 starting permutation: s1-grant s1-begin s2-begin s1-truncate s2-insert s1-insert s1-commit s2-commit
 step s1-grant:
-	SET ROLE test_user_1;
+ SET ROLE test_user_1;
-	SELECT bool_and(success) FROM run_command_on_placements('test_table', 'GRANT ALL ON TABLE %s TO test_user_2');
+ SELECT bool_and(success) FROM run_command_on_placements('test_table', 'GRANT ALL ON TABLE %s TO test_user_2');
-	GRANT ALL ON test_table TO test_user_2;
+ GRANT ALL ON test_table TO test_user_2;
 
 bool_and
 
 t
 step s1-begin:
-	BEGIN;
+ BEGIN;
-	SET ROLE test_user_1;
+ SET ROLE test_user_1;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
-	SET ROLE test_user_2;
+ SET ROLE test_user_2;
 
 step s1-truncate:
-	TRUNCATE test_table;
+ TRUNCATE test_table;
 
 step s2-insert:
-	UPDATE test_table SET column2 = 2;
+ UPDATE test_table SET column2 = 2;
  <waiting ...>
-step s1-insert:
+step s1-insert: 
-	UPDATE test_table SET column2 = 1;
+ UPDATE test_table SET column2 = 1;
 
 step s1-commit:
-	COMMIT;
+ COMMIT;
 
 step s2-insert: <... completed>
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 
 starting permutation: s1-grant s1-begin s2-begin s1-truncate s2-truncate s1-commit s2-commit
 step s1-grant:
-	SET ROLE test_user_1;
+ SET ROLE test_user_1;
-	SELECT bool_and(success) FROM run_command_on_placements('test_table', 'GRANT ALL ON TABLE %s TO test_user_2');
+ SELECT bool_and(success) FROM run_command_on_placements('test_table', 'GRANT ALL ON TABLE %s TO test_user_2');
-	GRANT ALL ON test_table TO test_user_2;
+ GRANT ALL ON test_table TO test_user_2;
 
 bool_and
 
 t
 step s1-begin:
-	BEGIN;
+ BEGIN;
-	SET ROLE test_user_1;
+ SET ROLE test_user_1;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
-	SET ROLE test_user_2;
+ SET ROLE test_user_2;
 
 step s1-truncate:
-	TRUNCATE test_table;
+ TRUNCATE test_table;
 
 step s2-truncate:
-	TRUNCATE test_table;
+ TRUNCATE test_table;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-truncate: <... completed>
 step s2-commit:
-	COMMIT;
+ COMMIT;
 

src/test/regress/expected/isolation_partitioned_copy_vs_all.out

@@ -433,7 +433,7 @@ step s1-drop: DROP TABLE partitioned_copy;
 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; <waiting ...>
 step s1-commit: COMMIT;
 step s2-copy: <... completed>
-error in steps s1-commit s2-copy: ERROR:  relation "partitioned_copy" does not exist
+ERROR:  relation "partitioned_copy" does not exist
 step s1-select-count: SELECT COUNT(*) FROM partitioned_copy;
 ERROR:  relation "partitioned_copy" does not exist
 
@@ -447,7 +447,7 @@ step s1-ddl-add-column: ALTER TABLE partitioned_copy ADD new_column int DEFAULT
 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; <waiting ...>
 step s1-commit: COMMIT;
 step s2-copy: <... completed>
-error in steps s1-commit s2-copy: ERROR:  missing data for column "new_column"
+ERROR:  missing data for column "new_column"
 step s1-select-count: SELECT COUNT(*) FROM partitioned_copy;
 count
 
@@ -543,7 +543,7 @@ citus_drop_all_shards
 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; <waiting ...>
 step s1-commit: COMMIT;
 step s2-copy: <... completed>
-error in steps s1-commit s2-copy: ERROR:  could not find any shards into which to copy
+ERROR:  could not find any shards into which to copy
 step s1-select-count: SELECT COUNT(*) FROM partitioned_copy;
 count
 

src/test/regress/expected/isolation_progress_monitoring.out

@@ -45,13 +45,13 @@ pg_advisory_lock
 step s1-start-operation:
  SELECT sample_operation(1337, 10, -1);
  <waiting ...>
-step s2-start-operation:
+step s2-start-operation: 
  SELECT sample_operation(1337, 20, 2);
  <waiting ...>
-step s3-start-operation:
+step s3-start-operation: 
  SELECT sample_operation(3778, 30, 9);
  <waiting ...>
-step show-progress:
+step show-progress: 
  SELECT show_progress(1337);
  SELECT show_progress(3778);
 

src/test/regress/expected/isolation_range_copy_vs_all.out

@@ -60,8 +60,8 @@ step s1-initialize: COPY range_copy FROM PROGRAM 'echo 0, a, 0 && echo 1, b, 1 &
 step s1-begin: BEGIN;
 step s1-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-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM range_copy AS t1 JOIN range_copy AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM range_copy AS t1 JOIN range_copy AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -413,8 +413,8 @@ create_distributed_table
 step s1-initialize: COPY range_copy FROM PROGRAM 'echo 0, a, 0 && echo 1, b, 1 && echo 2, c, 2 && echo 3, d, 3 && echo 4, e, 4' WITH CSV;
 step s1-begin: BEGIN;
 step s1-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM range_copy AS t1 JOIN range_copy AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM range_copy AS t1 JOIN range_copy AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -511,7 +511,7 @@ step s1-drop: DROP TABLE range_copy;
 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; <waiting ...>
 step s1-commit: COMMIT;
 step s2-copy: <... completed>
-error in steps s1-commit s2-copy: ERROR:  relation "range_copy" does not exist
+ERROR:  relation "range_copy" does not exist
 step s1-select-count: SELECT COUNT(*) FROM range_copy;
 ERROR:  relation "range_copy" does not exist
 
@@ -566,7 +566,7 @@ step s1-ddl-add-column: ALTER TABLE range_copy ADD new_column int DEFAULT 0;
 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; <waiting ...>
 step s1-commit: COMMIT;
 step s2-copy: <... completed>
-error in steps s1-commit s2-copy: ERROR:  missing data for column "new_column"
+ERROR:  missing data for column "new_column"
 step s1-select-count: SELECT COUNT(*) FROM range_copy;
 count
 
@@ -699,7 +699,7 @@ create_distributed_table
 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; <waiting ...>
 step s1-commit: COMMIT;
 step s2-copy: <... completed>
-error in steps s1-commit s2-copy: ERROR:  could not find any shards into which to copy
+ERROR:  could not find any shards into which to copy
 step s1-select-count: SELECT COUNT(*) FROM range_copy;
 count
 

src/test/regress/expected/isolation_ref2ref_foreign_keys.out

@@ -2,13 +2,13 @@ Parsed test spec with 2 sessions
 
 starting permutation: s2-begin s2-update-table-1 s1-begin s1-view-locks s1-rollback s2-rollback s1-view-locks
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-update-table-1:
     UPDATE ref_table_1 SET id = 2 WHERE id = 1;
 
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-view-locks:
     SELECT mode, count(*)
@@ -37,7 +37,7 @@ mode           count
 
 starting permutation: s2-begin s2-delete-table-1 s1-view-locks s2-rollback s1-view-locks
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-delete-table-1:
     DELETE FROM ref_table_1 WHERE id = 1;
@@ -66,7 +66,7 @@ mode           count
 
 starting permutation: s2-begin s2-update-table-2 s1-view-locks s2-rollback s1-view-locks
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-update-table-2:
     UPDATE ref_table_2 SET id = 2 WHERE id = 1;
@@ -95,7 +95,7 @@ mode           count
 
 starting permutation: s2-begin s2-delete-table-2 s1-view-locks s2-rollback s1-view-locks
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-delete-table-2:
     DELETE FROM ref_table_2 WHERE id = 1;
@@ -124,13 +124,13 @@ mode           count
 
 starting permutation: s2-begin s2-update-table-3 s1-begin s1-view-locks s1-rollback s2-rollback s1-view-locks
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-update-table-3:
     UPDATE ref_table_3 SET id = 2 WHERE id = 1;
 
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-view-locks:
     SELECT mode, count(*)
@@ -159,13 +159,13 @@ mode           count
 
 starting permutation: s2-begin s2-delete-table-3 s1-begin s1-view-locks s1-rollback s2-rollback s1-view-locks
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-delete-table-3:
     DELETE FROM ref_table_3 WHERE id = 1;
 
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-view-locks:
     SELECT mode, count(*)
@@ -194,7 +194,7 @@ mode           count
 
 starting permutation: s2-begin s2-insert-table-1 s1-view-locks s2-rollback s1-view-locks
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-insert-table-1:
     INSERT INTO ref_table_1 VALUES (7, 7);
@@ -223,7 +223,7 @@ mode           count
 
 starting permutation: s2-begin s2-insert-table-2 s1-view-locks s2-rollback s1-view-locks
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-insert-table-2:
     INSERT INTO ref_table_2 VALUES (7, 5);
@@ -252,7 +252,7 @@ mode           count
 
 starting permutation: s2-begin s2-insert-table-3 s1-view-locks s2-rollback s1-view-locks
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-insert-table-3:
     INSERT INTO ref_table_3 VALUES (7, 5);
@@ -281,10 +281,10 @@ mode           count
 
 starting permutation: s1-begin s2-begin s2-update-table-1 s1-delete-table-2 s2-commit s1-commit s1-select-table-2
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-update-table-1:
     UPDATE ref_table_1 SET id = 2 WHERE id = 1;
@@ -292,7 +292,7 @@ step s2-update-table-1:
 step s1-delete-table-2:
     DELETE FROM ref_table_2 WHERE value = 2;
  <waiting ...>
-step s2-commit:
+step s2-commit: 
     COMMIT;
 
 step s1-delete-table-2: <... completed>
@@ -309,10 +309,10 @@ id             value
 
 starting permutation: s1-begin s2-begin s2-update-table-1 s1-insert-table-2 s2-commit s1-commit s1-select-table-2
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-update-table-1:
     UPDATE ref_table_1 SET id = 2 WHERE id = 1;
@@ -320,7 +320,7 @@ step s2-update-table-1:
 step s1-insert-table-2:
     INSERT INTO ref_table_2 VALUES (7, 2);
  <waiting ...>
-step s2-commit:
+step s2-commit: 
     COMMIT;
 
 step s1-insert-table-2: <... completed>
@@ -339,10 +339,10 @@ id             value
 
 starting permutation: s1-begin s2-begin s2-update-table-1 s1-update-table-2 s2-commit s1-commit s1-select-table-2
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-update-table-1:
     UPDATE ref_table_1 SET id = 2 WHERE id = 1;
@@ -350,7 +350,7 @@ step s2-update-table-1:
 step s1-update-table-2:
     UPDATE ref_table_2 SET id = 0 WHERE value = 2;
  <waiting ...>
-step s2-commit:
+step s2-commit: 
     COMMIT;
 
 step s1-update-table-2: <... completed>
@@ -368,10 +368,10 @@ id             value
 
 starting permutation: s1-begin s2-begin s2-delete-table-1 s1-delete-table-2 s2-commit s1-commit s1-select-table-2
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-delete-table-1:
     DELETE FROM ref_table_1 WHERE id = 1;
@@ -379,7 +379,7 @@ step s2-delete-table-1:
 step s1-delete-table-2:
     DELETE FROM ref_table_2 WHERE value = 2;
  <waiting ...>
-step s2-commit:
+step s2-commit: 
     COMMIT;
 
 step s1-delete-table-2: <... completed>
@@ -396,10 +396,10 @@ id             value
 
 starting permutation: s1-begin s2-begin s2-delete-table-1 s1-insert-table-2 s2-commit s1-commit s1-select-table-2
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-delete-table-1:
     DELETE FROM ref_table_1 WHERE id = 1;
@@ -407,11 +407,11 @@ step s2-delete-table-1:
 step s1-insert-table-2:
     INSERT INTO ref_table_2 VALUES (7, 2);
  <waiting ...>
-step s2-commit:
+step s2-commit: 
     COMMIT;
 
 step s1-insert-table-2: <... completed>
-error in steps s2-commit s1-insert-table-2: ERROR:  insert or update on table "ref_table_2_xxxxxxx" violates foreign key constraint "ref_table_2_value_fkey_xxxxxxx"
+ERROR:  insert or update on table "ref_table_2_xxxxxxx" violates foreign key constraint "ref_table_2_value_fkey_xxxxxxx"
 step s1-commit:
     COMMIT;
 
@@ -425,10 +425,10 @@ id             value
 
 starting permutation: s1-begin s2-begin s2-delete-table-1 s1-update-table-2 s2-commit s1-commit s1-select-table-2
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-delete-table-1:
     DELETE FROM ref_table_1 WHERE id = 1;
@@ -436,7 +436,7 @@ step s2-delete-table-1:
 step s1-update-table-2:
     UPDATE ref_table_2 SET id = 0 WHERE value = 2;
  <waiting ...>
-step s2-commit:
+step s2-commit: 
     COMMIT;
 
 step s1-update-table-2: <... completed>
@@ -453,10 +453,10 @@ id             value
 
 starting permutation: s1-begin s2-begin s2-delete-table-1 s1-delete-table-3 s2-commit s1-commit s1-select-table-3
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-delete-table-1:
     DELETE FROM ref_table_1 WHERE id = 1;
@@ -464,7 +464,7 @@ step s2-delete-table-1:
 step s1-delete-table-3:
     DELETE FROM ref_table_3 WHERE value = 1 RETURNING id;
  <waiting ...>
-step s2-commit:
+step s2-commit: 
     COMMIT;
 
 step s1-delete-table-3: <... completed>
@@ -483,10 +483,10 @@ id             value
 
 starting permutation: s1-begin s2-begin s2-delete-table-1 s1-insert-table-3 s2-commit s1-commit s1-select-table-3
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-delete-table-1:
     DELETE FROM ref_table_1 WHERE id = 1;
@@ -494,11 +494,11 @@ step s2-delete-table-1:
 step s1-insert-table-3:
     INSERT INTO ref_table_3 VALUES (7, 1);
  <waiting ...>
-step s2-commit:
+step s2-commit: 
     COMMIT;
 
 step s1-insert-table-3: <... completed>
-error in steps s2-commit s1-insert-table-3: ERROR:  insert or update on table "ref_table_3_xxxxxxx" violates foreign key constraint "ref_table_3_value_fkey_xxxxxxx"
+ERROR:  insert or update on table "ref_table_3_xxxxxxx" violates foreign key constraint "ref_table_3_value_fkey_xxxxxxx"
 step s1-commit:
     COMMIT;
 
@@ -512,10 +512,10 @@ id             value
 
 starting permutation: s1-begin s2-begin s2-delete-table-1 s1-update-table-3 s2-commit s1-commit s1-select-table-3
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-delete-table-1:
     DELETE FROM ref_table_1 WHERE id = 1;
@@ -523,7 +523,7 @@ step s2-delete-table-1:
 step s1-update-table-3:
     UPDATE ref_table_3 SET id = 2 WHERE value = 1 RETURNING id;
  <waiting ...>
-step s2-commit:
+step s2-commit: 
     COMMIT;
 
 step s1-update-table-3: <... completed>
@@ -542,10 +542,10 @@ id             value
 
 starting permutation: s1-begin s2-begin s2-insert-table-1 s1-update-table-3 s2-commit s1-commit s1-select-table-3
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-insert-table-1:
     INSERT INTO ref_table_1 VALUES (7, 7);
@@ -553,7 +553,7 @@ step s2-insert-table-1:
 step s1-update-table-3:
     UPDATE ref_table_3 SET id = 2 WHERE value = 1 RETURNING id;
  <waiting ...>
-step s2-commit:
+step s2-commit: 
     COMMIT;
 
 step s1-update-table-3: <... completed>
@@ -574,10 +574,10 @@ id             value
 
 starting permutation: s1-begin s2-begin s1-update-table-3 s2-insert-table-1 s1-commit s2-commit s1-select-table-3
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-update-table-3:
     UPDATE ref_table_3 SET id = 2 WHERE value = 1 RETURNING id;
@@ -588,7 +588,7 @@ id
 step s2-insert-table-1:
     INSERT INTO ref_table_1 VALUES (7, 7);
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-insert-table-1: <... completed>
@@ -606,10 +606,10 @@ id             value
 
 starting permutation: s1-begin s2-begin s2-insert-table-1 s1-update-table-2 s2-commit s1-commit s1-select-table-3
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-insert-table-1:
     INSERT INTO ref_table_1 VALUES (7, 7);
@@ -617,7 +617,7 @@ step s2-insert-table-1:
 step s1-update-table-2:
     UPDATE ref_table_2 SET id = 0 WHERE value = 2;
  <waiting ...>
-step s2-commit:
+step s2-commit: 
     COMMIT;
 
 step s1-update-table-2: <... completed>
@@ -635,10 +635,10 @@ id             value
 
 starting permutation: s1-begin s2-begin s1-update-table-2 s2-insert-table-1 s1-commit s2-commit s1-select-table-3
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-update-table-2:
     UPDATE ref_table_2 SET id = 0 WHERE value = 2;
@@ -646,7 +646,7 @@ step s1-update-table-2:
 step s2-insert-table-1:
     INSERT INTO ref_table_1 VALUES (7, 7);
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-insert-table-1: <... completed>
@@ -664,10 +664,10 @@ id             value
 
 starting permutation: s1-begin s2-begin s2-insert-table-2 s1-update-table-3 s2-commit s1-commit s1-select-table-3
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-insert-table-2:
     INSERT INTO ref_table_2 VALUES (7, 5);
@@ -675,7 +675,7 @@ step s2-insert-table-2:
 step s1-update-table-3:
     UPDATE ref_table_3 SET id = 2 WHERE value = 1 RETURNING id;
  <waiting ...>
-step s2-commit:
+step s2-commit: 
     COMMIT;
 
 step s1-update-table-3: <... completed>
@@ -696,10 +696,10 @@ id             value
 
 starting permutation: s1-begin s2-begin s1-update-table-3 s2-insert-table-2 s1-commit s2-commit s1-select-table-3
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-update-table-3:
     UPDATE ref_table_3 SET id = 2 WHERE value = 1 RETURNING id;
@@ -710,7 +710,7 @@ id
 step s2-insert-table-2:
     INSERT INTO ref_table_2 VALUES (7, 5);
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-insert-table-2: <... completed>
@@ -728,10 +728,10 @@ id             value
 
 starting permutation: s1-begin s2-begin s2-insert-table-1 s1-select-table-1 s2-commit s1-commit
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-insert-table-1:
     INSERT INTO ref_table_1 VALUES (7, 7);
@@ -753,10 +753,10 @@ step s1-commit:
 
 starting permutation: s1-begin s2-begin s2-insert-table-1 s1-select-table-2 s2-commit s1-commit
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-insert-table-1:
     INSERT INTO ref_table_1 VALUES (7, 7);
@@ -778,10 +778,10 @@ step s1-commit:
 
 starting permutation: s1-begin s2-begin s2-insert-table-1 s1-select-table-3 s2-commit s1-commit
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-insert-table-1:
     INSERT INTO ref_table_1 VALUES (7, 7);
@@ -803,10 +803,10 @@ step s1-commit:
 
 starting permutation: s1-begin s2-begin s2-delete-table-2 s1-select-table-1 s2-commit s1-commit
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-delete-table-2:
     DELETE FROM ref_table_2 WHERE id = 1;
@@ -828,10 +828,10 @@ step s1-commit:
 
 starting permutation: s1-begin s2-begin s2-delete-table-2 s1-select-table-2 s2-commit s1-commit
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-delete-table-2:
     DELETE FROM ref_table_2 WHERE id = 1;
@@ -853,10 +853,10 @@ step s1-commit:
 
 starting permutation: s1-begin s2-begin s2-delete-table-2 s1-select-table-3 s2-commit s1-commit
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-delete-table-2:
     DELETE FROM ref_table_2 WHERE id = 1;
@@ -878,10 +878,10 @@ step s1-commit:
 
 starting permutation: s1-begin s2-begin s2-update-table-3 s1-select-table-1 s2-commit s1-commit
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-update-table-3:
     UPDATE ref_table_3 SET id = 2 WHERE id = 1;
@@ -903,10 +903,10 @@ step s1-commit:
 
 starting permutation: s1-begin s2-begin s2-update-table-3 s1-select-table-2 s2-commit s1-commit
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-update-table-3:
     UPDATE ref_table_3 SET id = 2 WHERE id = 1;
@@ -928,10 +928,10 @@ step s1-commit:
 
 starting permutation: s1-begin s2-begin s2-update-table-3 s1-select-table-3 s2-commit s1-commit
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-update-table-3:
     UPDATE ref_table_3 SET id = 2 WHERE id = 1;

src/test/regress/expected/isolation_ref2ref_foreign_keys_on_mx.out

@@ -2,13 +2,13 @@ Parsed test spec with 2 sessions
 
 starting permutation: s2-start-session-level-connection s2-begin-on-worker s2-update-table-1 s1-start-session-level-connection s1-view-locks s2-rollback-worker s1-view-locks s1-stop-connection s2-stop-connection
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
@@ -20,20 +20,20 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-view-locks:
     SELECT * FROM master_run_on_worker(
-		ARRAY['localhost']::text[],
+  ARRAY['localhost']::text[],
-		ARRAY[57637]::int[],
+  ARRAY[57637]::int[],
-		ARRAY[$$
+  ARRAY[$$
           SELECT array_agg(ROW(t.mode, t.count) ORDER BY t.mode) FROM
           (SELECT mode, count(*) count FROM pg_locks
            WHERE locktype='advisory' GROUP BY mode) t$$]::text[],
-		false);
+  false);
 
 node_name      node_port      success        result
 
@@ -46,25 +46,25 @@ run_commands_on_session_level_connection_to_node
 
 step s1-view-locks:
     SELECT * FROM master_run_on_worker(
-		ARRAY['localhost']::text[],
+  ARRAY['localhost']::text[],
-		ARRAY[57637]::int[],
+  ARRAY[57637]::int[],
-		ARRAY[$$
+  ARRAY[$$
           SELECT array_agg(ROW(t.mode, t.count) ORDER BY t.mode) FROM
           (SELECT mode, count(*) count FROM pg_locks
            WHERE locktype='advisory' GROUP BY mode) t$$]::text[],
-		false);
+  false);
 
 node_name      node_port      success        result
 
 localhost      57637          t
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -75,13 +75,13 @@ restore_isolation_tester_func
 
 starting permutation: s2-start-session-level-connection s2-begin-on-worker s2-delete-table-1 s1-start-session-level-connection s1-view-locks s2-rollback-worker s1-view-locks s1-stop-connection s2-stop-connection
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
@@ -93,20 +93,20 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-view-locks:
     SELECT * FROM master_run_on_worker(
-		ARRAY['localhost']::text[],
+  ARRAY['localhost']::text[],
-		ARRAY[57637]::int[],
+  ARRAY[57637]::int[],
-		ARRAY[$$
+  ARRAY[$$
           SELECT array_agg(ROW(t.mode, t.count) ORDER BY t.mode) FROM
           (SELECT mode, count(*) count FROM pg_locks
            WHERE locktype='advisory' GROUP BY mode) t$$]::text[],
-		false);
+  false);
 
 node_name      node_port      success        result
 
@@ -119,25 +119,25 @@ run_commands_on_session_level_connection_to_node
 
 step s1-view-locks:
     SELECT * FROM master_run_on_worker(
-		ARRAY['localhost']::text[],
+  ARRAY['localhost']::text[],
-		ARRAY[57637]::int[],
+  ARRAY[57637]::int[],
-		ARRAY[$$
+  ARRAY[$$
           SELECT array_agg(ROW(t.mode, t.count) ORDER BY t.mode) FROM
           (SELECT mode, count(*) count FROM pg_locks
            WHERE locktype='advisory' GROUP BY mode) t$$]::text[],
-		false);
+  false);
 
 node_name      node_port      success        result
 
 localhost      57637          t
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -148,13 +148,13 @@ restore_isolation_tester_func
 
 starting permutation: s2-start-session-level-connection s2-begin-on-worker s2-update-table-2 s1-start-session-level-connection s1-view-locks s2-rollback-worker s1-view-locks s1-stop-connection s2-stop-connection
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
@@ -166,20 +166,20 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-view-locks:
     SELECT * FROM master_run_on_worker(
-		ARRAY['localhost']::text[],
+  ARRAY['localhost']::text[],
-		ARRAY[57637]::int[],
+  ARRAY[57637]::int[],
-		ARRAY[$$
+  ARRAY[$$
           SELECT array_agg(ROW(t.mode, t.count) ORDER BY t.mode) FROM
           (SELECT mode, count(*) count FROM pg_locks
            WHERE locktype='advisory' GROUP BY mode) t$$]::text[],
-		false);
+  false);
 
 node_name      node_port      success        result
 
@@ -192,25 +192,25 @@ run_commands_on_session_level_connection_to_node
 
 step s1-view-locks:
     SELECT * FROM master_run_on_worker(
-		ARRAY['localhost']::text[],
+  ARRAY['localhost']::text[],
-		ARRAY[57637]::int[],
+  ARRAY[57637]::int[],
-		ARRAY[$$
+  ARRAY[$$
           SELECT array_agg(ROW(t.mode, t.count) ORDER BY t.mode) FROM
           (SELECT mode, count(*) count FROM pg_locks
            WHERE locktype='advisory' GROUP BY mode) t$$]::text[],
-		false);
+  false);
 
 node_name      node_port      success        result
 
 localhost      57637          t
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -221,13 +221,13 @@ restore_isolation_tester_func
 
 starting permutation: s2-start-session-level-connection s2-begin-on-worker s2-delete-table-2 s1-start-session-level-connection s1-view-locks s2-rollback-worker s1-view-locks s1-stop-connection s2-stop-connection
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
@@ -239,20 +239,20 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-view-locks:
     SELECT * FROM master_run_on_worker(
-		ARRAY['localhost']::text[],
+  ARRAY['localhost']::text[],
-		ARRAY[57637]::int[],
+  ARRAY[57637]::int[],
-		ARRAY[$$
+  ARRAY[$$
           SELECT array_agg(ROW(t.mode, t.count) ORDER BY t.mode) FROM
           (SELECT mode, count(*) count FROM pg_locks
            WHERE locktype='advisory' GROUP BY mode) t$$]::text[],
-		false);
+  false);
 
 node_name      node_port      success        result
 
@@ -265,25 +265,25 @@ run_commands_on_session_level_connection_to_node
 
 step s1-view-locks:
     SELECT * FROM master_run_on_worker(
-		ARRAY['localhost']::text[],
+  ARRAY['localhost']::text[],
-		ARRAY[57637]::int[],
+  ARRAY[57637]::int[],
-		ARRAY[$$
+  ARRAY[$$
           SELECT array_agg(ROW(t.mode, t.count) ORDER BY t.mode) FROM
           (SELECT mode, count(*) count FROM pg_locks
            WHERE locktype='advisory' GROUP BY mode) t$$]::text[],
-		false);
+  false);
 
 node_name      node_port      success        result
 
 localhost      57637          t
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -294,13 +294,13 @@ restore_isolation_tester_func
 
 starting permutation: s2-start-session-level-connection s2-begin-on-worker s2-update-table-3 s1-start-session-level-connection s1-view-locks s2-rollback-worker s1-view-locks s1-stop-connection s2-stop-connection
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
@@ -312,20 +312,20 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-view-locks:
     SELECT * FROM master_run_on_worker(
-		ARRAY['localhost']::text[],
+  ARRAY['localhost']::text[],
-		ARRAY[57637]::int[],
+  ARRAY[57637]::int[],
-		ARRAY[$$
+  ARRAY[$$
           SELECT array_agg(ROW(t.mode, t.count) ORDER BY t.mode) FROM
           (SELECT mode, count(*) count FROM pg_locks
            WHERE locktype='advisory' GROUP BY mode) t$$]::text[],
-		false);
+  false);
 
 node_name      node_port      success        result
 
@@ -338,25 +338,25 @@ run_commands_on_session_level_connection_to_node
 
 step s1-view-locks:
     SELECT * FROM master_run_on_worker(
-		ARRAY['localhost']::text[],
+  ARRAY['localhost']::text[],
-		ARRAY[57637]::int[],
+  ARRAY[57637]::int[],
-		ARRAY[$$
+  ARRAY[$$
           SELECT array_agg(ROW(t.mode, t.count) ORDER BY t.mode) FROM
           (SELECT mode, count(*) count FROM pg_locks
            WHERE locktype='advisory' GROUP BY mode) t$$]::text[],
-		false);
+  false);
 
 node_name      node_port      success        result
 
 localhost      57637          t
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -367,13 +367,13 @@ restore_isolation_tester_func
 
 starting permutation: s2-start-session-level-connection s2-begin-on-worker s2-delete-table-3 s1-start-session-level-connection s1-view-locks s2-rollback-worker s1-view-locks s1-stop-connection s2-stop-connection
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
@@ -385,20 +385,20 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-view-locks:
     SELECT * FROM master_run_on_worker(
-		ARRAY['localhost']::text[],
+  ARRAY['localhost']::text[],
-		ARRAY[57637]::int[],
+  ARRAY[57637]::int[],
-		ARRAY[$$
+  ARRAY[$$
           SELECT array_agg(ROW(t.mode, t.count) ORDER BY t.mode) FROM
           (SELECT mode, count(*) count FROM pg_locks
            WHERE locktype='advisory' GROUP BY mode) t$$]::text[],
-		false);
+  false);
 
 node_name      node_port      success        result
 
@@ -411,25 +411,25 @@ run_commands_on_session_level_connection_to_node
 
 step s1-view-locks:
     SELECT * FROM master_run_on_worker(
-		ARRAY['localhost']::text[],
+  ARRAY['localhost']::text[],
-		ARRAY[57637]::int[],
+  ARRAY[57637]::int[],
-		ARRAY[$$
+  ARRAY[$$
           SELECT array_agg(ROW(t.mode, t.count) ORDER BY t.mode) FROM
           (SELECT mode, count(*) count FROM pg_locks
            WHERE locktype='advisory' GROUP BY mode) t$$]::text[],
-		false);
+  false);
 
 node_name      node_port      success        result
 
 localhost      57637          t
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -440,13 +440,13 @@ restore_isolation_tester_func
 
 starting permutation: s2-start-session-level-connection s2-begin-on-worker s2-insert-table-1 s1-start-session-level-connection s1-view-locks s2-rollback-worker s1-view-locks s1-stop-connection s2-stop-connection
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
@@ -458,20 +458,20 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-view-locks:
     SELECT * FROM master_run_on_worker(
-		ARRAY['localhost']::text[],
+  ARRAY['localhost']::text[],
-		ARRAY[57637]::int[],
+  ARRAY[57637]::int[],
-		ARRAY[$$
+  ARRAY[$$
           SELECT array_agg(ROW(t.mode, t.count) ORDER BY t.mode) FROM
           (SELECT mode, count(*) count FROM pg_locks
            WHERE locktype='advisory' GROUP BY mode) t$$]::text[],
-		false);
+  false);
 
 node_name      node_port      success        result
 
@@ -484,25 +484,25 @@ run_commands_on_session_level_connection_to_node
 
 step s1-view-locks:
     SELECT * FROM master_run_on_worker(
-		ARRAY['localhost']::text[],
+  ARRAY['localhost']::text[],
-		ARRAY[57637]::int[],
+  ARRAY[57637]::int[],
-		ARRAY[$$
+  ARRAY[$$
           SELECT array_agg(ROW(t.mode, t.count) ORDER BY t.mode) FROM
           (SELECT mode, count(*) count FROM pg_locks
            WHERE locktype='advisory' GROUP BY mode) t$$]::text[],
-		false);
+  false);
 
 node_name      node_port      success        result
 
 localhost      57637          t
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -513,13 +513,13 @@ restore_isolation_tester_func
 
 starting permutation: s2-start-session-level-connection s2-begin-on-worker s2-insert-table-2 s1-start-session-level-connection s1-view-locks s2-rollback-worker s1-view-locks s1-stop-connection s2-stop-connection
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
@@ -531,20 +531,20 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-view-locks:
     SELECT * FROM master_run_on_worker(
-		ARRAY['localhost']::text[],
+  ARRAY['localhost']::text[],
-		ARRAY[57637]::int[],
+  ARRAY[57637]::int[],
-		ARRAY[$$
+  ARRAY[$$
           SELECT array_agg(ROW(t.mode, t.count) ORDER BY t.mode) FROM
           (SELECT mode, count(*) count FROM pg_locks
            WHERE locktype='advisory' GROUP BY mode) t$$]::text[],
-		false);
+  false);
 
 node_name      node_port      success        result
 
@@ -557,25 +557,25 @@ run_commands_on_session_level_connection_to_node
 
 step s1-view-locks:
     SELECT * FROM master_run_on_worker(
-		ARRAY['localhost']::text[],
+  ARRAY['localhost']::text[],
-		ARRAY[57637]::int[],
+  ARRAY[57637]::int[],
-		ARRAY[$$
+  ARRAY[$$
           SELECT array_agg(ROW(t.mode, t.count) ORDER BY t.mode) FROM
           (SELECT mode, count(*) count FROM pg_locks
            WHERE locktype='advisory' GROUP BY mode) t$$]::text[],
-		false);
+  false);
 
 node_name      node_port      success        result
 
 localhost      57637          t
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -586,13 +586,13 @@ restore_isolation_tester_func
 
 starting permutation: s2-start-session-level-connection s2-begin-on-worker s2-insert-table-3 s1-start-session-level-connection s1-view-locks s2-rollback-worker s1-view-locks s1-stop-connection s2-stop-connection
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
@@ -604,20 +604,20 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-view-locks:
     SELECT * FROM master_run_on_worker(
-		ARRAY['localhost']::text[],
+  ARRAY['localhost']::text[],
-		ARRAY[57637]::int[],
+  ARRAY[57637]::int[],
-		ARRAY[$$
+  ARRAY[$$
           SELECT array_agg(ROW(t.mode, t.count) ORDER BY t.mode) FROM
           (SELECT mode, count(*) count FROM pg_locks
            WHERE locktype='advisory' GROUP BY mode) t$$]::text[],
-		false);
+  false);
 
 node_name      node_port      success        result
 
@@ -630,25 +630,25 @@ run_commands_on_session_level_connection_to_node
 
 step s1-view-locks:
     SELECT * FROM master_run_on_worker(
-		ARRAY['localhost']::text[],
+  ARRAY['localhost']::text[],
-		ARRAY[57637]::int[],
+  ARRAY[57637]::int[],
-		ARRAY[$$
+  ARRAY[$$
           SELECT array_agg(ROW(t.mode, t.count) ORDER BY t.mode) FROM
           (SELECT mode, count(*) count FROM pg_locks
            WHERE locktype='advisory' GROUP BY mode) t$$]::text[],
-		false);
+  false);
 
 node_name      node_port      success        result
 
 localhost      57637          t
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 

src/test/regress/expected/isolation_ref_select_for_update_vs_all_on_mx.out

@@ -17,7 +17,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-select-for-update:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM ref_table WHERE id=1 OR id=2 FOR UPDATE');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM ref_table WHERE id=1 OR id=2 FOR UPDATE');
 
 run_commands_on_session_level_connection_to_node
 
@@ -35,10 +35,10 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-select-for-update:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM ref_table WHERE id=1 OR id=2 FOR UPDATE');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM ref_table WHERE id=1 OR id=2 FOR UPDATE');
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -54,7 +54,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -86,7 +86,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-select-for-update:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM ref_table WHERE id=1 OR id=2 FOR UPDATE');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM ref_table WHERE id=1 OR id=2 FOR UPDATE');
 
 run_commands_on_session_level_connection_to_node
 
@@ -104,10 +104,10 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-insert:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table VALUES (1, 10), (2, 20)');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table VALUES (1, 10), (2, 20)');
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -123,7 +123,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -135,7 +135,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM ref_table;
+ SELECT COUNT(*) FROM ref_table;
 
 count
 
@@ -161,7 +161,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-select-for-update:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM ref_table WHERE id=1 OR id=2 FOR UPDATE');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM ref_table WHERE id=1 OR id=2 FOR UPDATE');
 
 run_commands_on_session_level_connection_to_node
 
@@ -179,13 +179,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-select:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM ref_table WHERE id=1 OR id=2');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM ref_table WHERE id=1 OR id=2');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -197,7 +197,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -229,7 +229,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-select-for-update:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM ref_table WHERE id=1 OR id=2 FOR UPDATE');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM ref_table WHERE id=1 OR id=2 FOR UPDATE');
 
 run_commands_on_session_level_connection_to_node
 
@@ -247,10 +247,10 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-insert-select-ref-table:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table SELECT * FROM ref_table');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table SELECT * FROM ref_table');
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -266,7 +266,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -298,7 +298,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-select-for-update:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM ref_table WHERE id=1 OR id=2 FOR UPDATE');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM ref_table WHERE id=1 OR id=2 FOR UPDATE');
 
 run_commands_on_session_level_connection_to_node
 
@@ -316,10 +316,10 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-copy:
-	SELECT run_commands_on_session_level_connection_to_node('COPY ref_table FROM PROGRAM ''echo 1, 10 && echo 2, 20''WITH CSV');
+ SELECT run_commands_on_session_level_connection_to_node('COPY ref_table FROM PROGRAM ''echo 1, 10 && echo 2, 20''WITH CSV');
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -335,7 +335,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -347,7 +347,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM ref_table;
+ SELECT COUNT(*) FROM ref_table;
 
 count
 
@@ -373,7 +373,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-select-for-update:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM ref_table WHERE id=1 OR id=2 FOR UPDATE');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM ref_table WHERE id=1 OR id=2 FOR UPDATE');
 
 run_commands_on_session_level_connection_to_node
 
@@ -391,10 +391,10 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-alter:
-	ALTER TABLE ref_table DROP value;
+ ALTER TABLE ref_table DROP value;
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -407,7 +407,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -439,7 +439,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-select-for-update:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM ref_table WHERE id=1 OR id=2 FOR UPDATE');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM ref_table WHERE id=1 OR id=2 FOR UPDATE');
 
 run_commands_on_session_level_connection_to_node
 
@@ -457,10 +457,10 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-truncate:
-	SELECT run_commands_on_session_level_connection_to_node('TRUNCATE ref_table');
+ SELECT run_commands_on_session_level_connection_to_node('TRUNCATE ref_table');
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -476,7 +476,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -508,22 +508,22 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-select-for-update:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM ref_table WHERE id=1 OR id=2 FOR UPDATE');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM ref_table WHERE id=1 OR id=2 FOR UPDATE');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-coordinator-create-index-concurrently:
-	CREATE INDEX CONCURRENTLY ref_table_index ON ref_table(id);
+ CREATE INDEX CONCURRENTLY ref_table_index ON ref_table(id);
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 

src/test/regress/expected/isolation_ref_update_delete_upsert_vs_all_on_mx.out

@@ -5,7 +5,7 @@ create_reference_table
 
 
 step s1-add-primary-key:
-	ALTER TABLE ref_table ADD CONSTRAINT pri_key PRIMARY KEY (id);
+ ALTER TABLE ref_table ADD CONSTRAINT pri_key PRIMARY KEY (id);
 
 step s1-start-session-level-connection:
         SELECT start_session_level_connection_to_node('localhost', 57637);
@@ -20,7 +20,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-upsert:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table VALUES (1, 3), (2, 3) ON CONFLICT (id) DO UPDATE SET value=3');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table VALUES (1, 3), (2, 3) ON CONFLICT (id) DO UPDATE SET value=3');
 
 run_commands_on_session_level_connection_to_node
 
@@ -38,13 +38,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-select:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM ref_table WHERE id=1 OR id=2');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM ref_table WHERE id=1 OR id=2');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -56,7 +56,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -68,7 +68,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM ref_table;
+ SELECT COUNT(*) FROM ref_table;
 
 count
 
@@ -94,7 +94,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-delete:
-	SELECT run_commands_on_session_level_connection_to_node('DELETE FROM ref_table WHERE id=1 OR id=2');
+ SELECT run_commands_on_session_level_connection_to_node('DELETE FROM ref_table WHERE id=1 OR id=2');
 
 run_commands_on_session_level_connection_to_node
 
@@ -112,10 +112,10 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-insert-select-ref-table:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table SELECT * FROM ref_table');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table SELECT * FROM ref_table');
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -131,7 +131,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -143,7 +143,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM ref_table;
+ SELECT COUNT(*) FROM ref_table;
 
 count
 
@@ -157,7 +157,7 @@ create_reference_table
 
 
 step s1-add-primary-key:
-	ALTER TABLE ref_table ADD CONSTRAINT pri_key PRIMARY KEY (id);
+ ALTER TABLE ref_table ADD CONSTRAINT pri_key PRIMARY KEY (id);
 
 step s1-start-session-level-connection:
         SELECT start_session_level_connection_to_node('localhost', 57637);
@@ -172,7 +172,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-upsert:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table VALUES (1, 3), (2, 3) ON CONFLICT (id) DO UPDATE SET value=3');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table VALUES (1, 3), (2, 3) ON CONFLICT (id) DO UPDATE SET value=3');
 
 run_commands_on_session_level_connection_to_node
 
@@ -190,10 +190,10 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-drop:
-	DROP TABLE ref_table;
+ DROP TABLE ref_table;
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -206,7 +206,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -218,7 +218,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM ref_table;
+ SELECT COUNT(*) FROM ref_table;
 
 ERROR:  relation "ref_table" does not exist
 restore_isolation_tester_func
@@ -242,7 +242,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-delete:
-	SELECT run_commands_on_session_level_connection_to_node('DELETE FROM ref_table WHERE id=1 OR id=2');
+ SELECT run_commands_on_session_level_connection_to_node('DELETE FROM ref_table WHERE id=1 OR id=2');
 
 run_commands_on_session_level_connection_to_node
 
@@ -260,10 +260,10 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-truncate:
-	SELECT run_commands_on_session_level_connection_to_node('TRUNCATE ref_table');
+ SELECT run_commands_on_session_level_connection_to_node('TRUNCATE ref_table');
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -279,7 +279,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -291,7 +291,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM ref_table;
+ SELECT COUNT(*) FROM ref_table;
 
 count
 

src/test/regress/expected/isolation_reference_copy_vs_all.out

@@ -60,7 +60,7 @@ step s1-initialize: COPY reference_copy FROM PROGRAM 'echo 0, a, 0 && echo 1, b,
 step s1-begin: BEGIN;
 step s1-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-adaptive-select:
-		SELECT * FROM reference_copy AS t1 JOIN reference_copy AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+  SELECT * FROM reference_copy AS t1 JOIN reference_copy AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -381,7 +381,7 @@ create_reference_table
 step s1-initialize: 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-begin: BEGIN;
 step s1-adaptive-select:
-		SELECT * FROM reference_copy AS t1 JOIN reference_copy AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+  SELECT * FROM reference_copy AS t1 JOIN reference_copy AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -481,7 +481,7 @@ step s1-drop: DROP TABLE reference_copy;
 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; <waiting ...>
 step s1-commit: COMMIT;
 step s2-copy: <... completed>
-error in steps s1-commit s2-copy: ERROR:  relation "reference_copy" does not exist
+ERROR:  relation "reference_copy" does not exist
 step s1-select-count: SELECT COUNT(*) FROM reference_copy;
 ERROR:  relation "reference_copy" does not exist
 
@@ -536,7 +536,7 @@ step s1-ddl-add-column: ALTER TABLE reference_copy ADD new_column int DEFAULT 0;
 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; <waiting ...>
 step s1-commit: COMMIT;
 step s2-copy: <... completed>
-error in steps s1-commit s2-copy: ERROR:  missing data for column "new_column"
+ERROR:  missing data for column "new_column"
 step s1-select-count: SELECT COUNT(*) FROM reference_copy;
 count
 

src/test/regress/expected/isolation_reference_on_mx.out

@@ -2,39 +2,39 @@ Parsed test spec with 2 sessions
 
 starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-update-ref-table s2-start-session-level-connection s2-begin-on-worker s2-update-ref-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-update-ref-table:
-	SELECT run_commands_on_session_level_connection_to_node('UPDATE ref_table SET value_1 = 12 WHERE user_id = 1');
+ SELECT run_commands_on_session_level_connection_to_node('UPDATE ref_table SET value_1 = 12 WHERE user_id = 1');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57638);
+ SELECT start_session_level_connection_to_node('localhost', 57638);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 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');
+ SELECT run_commands_on_session_level_connection_to_node('UPDATE ref_table SET value_1 = 12 WHERE user_id = 1');
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
     SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
@@ -51,13 +51,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -68,39 +68,39 @@ restore_isolation_tester_func
 
 starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-delete-from-ref-table s2-start-session-level-connection s2-begin-on-worker s2-update-ref-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-delete-from-ref-table:
-	SELECT run_commands_on_session_level_connection_to_node('DELETE FROM ref_table WHERE user_id = 1');
+ SELECT run_commands_on_session_level_connection_to_node('DELETE FROM ref_table WHERE user_id = 1');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57638);
+ SELECT start_session_level_connection_to_node('localhost', 57638);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 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');
+ SELECT run_commands_on_session_level_connection_to_node('UPDATE ref_table SET value_1 = 12 WHERE user_id = 1');
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
     SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
@@ -117,13 +117,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -134,39 +134,39 @@ restore_isolation_tester_func
 
 starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert-into-ref-table s2-start-session-level-connection s2-begin-on-worker s2-update-ref-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-insert-into-ref-table:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table VALUES(8,81),(9,91)');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table VALUES(8,81),(9,91)');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57638);
+ SELECT start_session_level_connection_to_node('localhost', 57638);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 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');
+ SELECT run_commands_on_session_level_connection_to_node('UPDATE ref_table SET value_1 = 12 WHERE user_id = 1');
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
     SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
@@ -183,13 +183,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -200,37 +200,37 @@ restore_isolation_tester_func
 
 starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-insert-into-ref-table s2-start-session-level-connection s2-begin-on-worker s2-insert-into-ref-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-insert-into-ref-table:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table VALUES(8,81),(9,91)');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table VALUES(8,81),(9,91)');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57638);
+ SELECT start_session_level_connection_to_node('localhost', 57638);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-insert-into-ref-table:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table VALUES(8,81),(9,91)');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table VALUES(8,81),(9,91)');
 
 run_commands_on_session_level_connection_to_node
 
@@ -248,13 +248,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -265,39 +265,39 @@ restore_isolation_tester_func
 
 starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-copy-to-ref-table s2-start-session-level-connection s2-begin-on-worker s2-update-ref-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-copy-to-ref-table:
-	SELECT run_commands_on_session_level_connection_to_node('COPY ref_table FROM PROGRAM ''echo 10, 101 && echo 11, 111'' WITH CSV');
+ SELECT run_commands_on_session_level_connection_to_node('COPY ref_table FROM PROGRAM ''echo 10, 101 && echo 11, 111'' WITH CSV');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57638);
+ SELECT start_session_level_connection_to_node('localhost', 57638);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 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');
+ SELECT run_commands_on_session_level_connection_to_node('UPDATE ref_table SET value_1 = 12 WHERE user_id = 1');
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
     SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
@@ -314,13 +314,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -331,37 +331,37 @@ restore_isolation_tester_func
 
 starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-copy-to-ref-table s2-start-session-level-connection s2-begin-on-worker s2-insert-into-ref-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-copy-to-ref-table:
-	SELECT run_commands_on_session_level_connection_to_node('COPY ref_table FROM PROGRAM ''echo 10, 101 && echo 11, 111'' WITH CSV');
+ SELECT run_commands_on_session_level_connection_to_node('COPY ref_table FROM PROGRAM ''echo 10, 101 && echo 11, 111'' WITH CSV');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57638);
+ SELECT start_session_level_connection_to_node('localhost', 57638);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-insert-into-ref-table:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table VALUES(8,81),(9,91)');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table VALUES(8,81),(9,91)');
 
 run_commands_on_session_level_connection_to_node
 
@@ -379,13 +379,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -396,37 +396,37 @@ restore_isolation_tester_func
 
 starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-copy-to-ref-table s2-start-session-level-connection s2-begin-on-worker s2-copy-to-ref-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-copy-to-ref-table:
-	SELECT run_commands_on_session_level_connection_to_node('COPY ref_table FROM PROGRAM ''echo 10, 101 && echo 11, 111'' WITH CSV');
+ SELECT run_commands_on_session_level_connection_to_node('COPY ref_table FROM PROGRAM ''echo 10, 101 && echo 11, 111'' WITH CSV');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57638);
+ SELECT start_session_level_connection_to_node('localhost', 57638);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-copy-to-ref-table:
-	SELECT run_commands_on_session_level_connection_to_node('COPY ref_table FROM PROGRAM ''echo 10, 101 && echo 11, 111'' WITH CSV');
+ SELECT run_commands_on_session_level_connection_to_node('COPY ref_table FROM PROGRAM ''echo 10, 101 && echo 11, 111'' WITH CSV');
 
 run_commands_on_session_level_connection_to_node
 
@@ -444,13 +444,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -461,39 +461,39 @@ restore_isolation_tester_func
 
 starting permutation: s1-start-session-level-connection s1-begin-on-worker s1-select-for-update s2-start-session-level-connection s2-begin-on-worker s2-update-ref-table s1-commit-worker s2-commit-worker s1-stop-connection s2-stop-connection
 step s1-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57637);
+ SELECT start_session_level_connection_to_node('localhost', 57637);
 
 start_session_level_connection_to_node
 
 
 step s1-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-select-for-update:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM ref_table FOR UPDATE');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM ref_table FOR UPDATE');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57638);
+ SELECT start_session_level_connection_to_node('localhost', 57638);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 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');
+ SELECT run_commands_on_session_level_connection_to_node('UPDATE ref_table SET value_1 = 12 WHERE user_id = 1');
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
     SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
@@ -510,13 +510,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -527,30 +527,30 @@ restore_isolation_tester_func
 
 starting permutation: s2-start-session-level-connection s2-begin-on-worker s2-insert-into-ref-table s1-begin s1-alter-table s2-commit-worker s1-commit s2-stop-connection
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57638);
+ SELECT start_session_level_connection_to_node('localhost', 57638);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-insert-into-ref-table:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table VALUES(8,81),(9,91)');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO ref_table VALUES(8,81),(9,91)');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-alter-table:
-	ALTER TABLE ref_table ADD CONSTRAINT rf_p_key PRIMARY KEY(user_id);
+ ALTER TABLE ref_table ADD CONSTRAINT rf_p_key PRIMARY KEY(user_id);
  <waiting ...>
-step s2-commit-worker:
+step s2-commit-worker: 
     SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
@@ -558,10 +558,10 @@ run_commands_on_session_level_connection_to_node
 
 step s1-alter-table: <... completed>
 step s1-commit:
-	COMMIT;
+ COMMIT;
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -572,30 +572,30 @@ restore_isolation_tester_func
 
 starting permutation: s2-start-session-level-connection s2-begin-on-worker s2-select-from-ref-table s1-begin s1-alter-table s2-commit-worker s1-commit s2-stop-connection
 step s2-start-session-level-connection:
-	SELECT start_session_level_connection_to_node('localhost', 57638);
+ SELECT start_session_level_connection_to_node('localhost', 57638);
 
 start_session_level_connection_to_node
 
 
 step s2-begin-on-worker:
-	SELECT run_commands_on_session_level_connection_to_node('BEGIN');
+ SELECT run_commands_on_session_level_connection_to_node('BEGIN');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-select-from-ref-table:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT count(*) FROM ref_table');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT count(*) FROM ref_table');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-alter-table:
-	ALTER TABLE ref_table ADD CONSTRAINT rf_p_key PRIMARY KEY(user_id);
+ ALTER TABLE ref_table ADD CONSTRAINT rf_p_key PRIMARY KEY(user_id);
  <waiting ...>
-step s2-commit-worker:
+step s2-commit-worker: 
     SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
@@ -603,10 +603,10 @@ run_commands_on_session_level_connection_to_node
 
 step s1-alter-table: <... completed>
 step s1-commit:
-	COMMIT;
+ COMMIT;
 
 step s2-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 

src/test/regress/expected/isolation_replace_wait_function.out

@@ -12,11 +12,11 @@ step s2-insert:
   BEGIN;
   INSERT INTO test_locking (a) VALUES (1);
  <waiting ...>
-step s1-commit:
+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_1400001"
+ERROR:  duplicate key value violates unique constraint "test_locking_a_key_1400001"
 step s2-commit:
   COMMIT;
 

src/test/regress/expected/isolation_replicate_reference_tables_to_coordinator.out

@@ -31,10 +31,10 @@ step s1-lock-ref-table-placement-on-coordinator:
       END
     $$;
  <waiting ...>
-step s2-update-dist-table:
+step s2-update-dist-table: 
     update dist_table set b = 2 where a = 1;
  <waiting ...>
-step deadlock-checker-call:
+step deadlock-checker-call: 
   SELECT check_distributed_deadlocks();
 
 check_distributed_deadlocks
@@ -42,7 +42,7 @@ check_distributed_deadlocks
 t
 step s1-lock-ref-table-placement-on-coordinator: <... completed>
 step s2-update-dist-table: <... completed>
-error in steps deadlock-checker-call s1-lock-ref-table-placement-on-coordinator s2-update-dist-table: ERROR:  canceling the transaction since it was involved in a distributed deadlock
+ERROR:  canceling the transaction since it was involved in a distributed deadlock
 step s1-end:
     END;
 
@@ -67,13 +67,13 @@ step s1-update-ref-table:
     update ref_table set a = a + 1;
 
 step s2-sleep:
-	SELECT pg_sleep(0.5);
+ SELECT pg_sleep(0.5);
 
 pg_sleep
 
 
 step s2-view-dist:
-	SELECT query, query_hostname, query_hostport, distributed_query_host_name, distributed_query_host_port, state, wait_event_type, wait_event, usename, datname FROM citus_dist_stat_activity WHERE query NOT ILIKE '%pg_prepared_xacts%' AND query NOT ILIKE '%COMMIT%' ORDER BY query DESC;
+ SELECT query, query_hostname, query_hostport, distributed_query_host_name, distributed_query_host_port, state, wait_event_type, wait_event, usename, datname FROM citus_dist_stat_activity WHERE query NOT ILIKE '%pg_prepared_xacts%' AND query NOT ILIKE '%COMMIT%' ORDER BY query DESC;
 
 query          query_hostname query_hostport distributed_query_host_namedistributed_query_host_portstate          wait_event_typewait_event     usename        datname
 
@@ -84,7 +84,7 @@ coordinator_host57636          coordinator_host57636          idle in transactio
     update ref_table set a = a + 1;
 localhost      57636          coordinator_host57636          idle in transactionClient         ClientRead     postgres       regression
 step s2-view-worker:
-	SELECT query, query_hostname, query_hostport, distributed_query_host_name,
+ SELECT query, query_hostname, query_hostport, distributed_query_host_name,
            distributed_query_host_port, state, wait_event_type, wait_event, usename, datname
     FROM citus_worker_stat_activity
     WHERE query NOT ILIKE '%pg_prepared_xacts%' AND
@@ -122,9 +122,9 @@ step s1-update-ref-table:
     update ref_table set a = a + 1;
 
 step s2-active-transactions:
-	-- Admin should be able to see all transactions
+ -- Admin should be able to see all transactions
-	SELECT count(*) FROM get_all_active_transactions();
+ SELECT count(*) FROM get_all_active_transactions();
-	SELECT count(*) FROM get_global_active_transactions();
+ SELECT count(*) FROM get_global_active_transactions();
 
 count
 

src/test/regress/expected/isolation_select_for_update.out

@@ -20,7 +20,7 @@ step s2-begin:
 step s2-update-t1:
  UPDATE test_table_1_rf1 SET val_1 = 5 WHERE id = 1;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
  COMMIT;
 
 step s2-update-t1: <... completed>
@@ -51,7 +51,7 @@ step s2-begin:
 step s2-delete-t1:
  DELETE FROM test_table_1_rf1 WHERE id = 1;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
  COMMIT;
 
 step s2-delete-t1: <... completed>
@@ -82,7 +82,7 @@ step s2-begin:
 step s2-update-t1:
  UPDATE test_table_1_rf1 SET val_1 = 5 WHERE id = 1;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
  COMMIT;
 
 step s2-update-t1: <... completed>
@@ -114,7 +114,7 @@ step s2-begin:
 step s2-update-rt:
  UPDATE ref_table SET val_1 = 5 WHERE id = 1;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
  COMMIT;
 
 step s2-update-rt: <... completed>
@@ -217,7 +217,7 @@ step s2-select-from-t1-t2-for-update:
   ORDER BY 1
   FOR UPDATE;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
  COMMIT;
 
 step s2-select-from-t1-t2-for-update: <... completed>
@@ -252,7 +252,7 @@ step s2-select-from-t1-t2-for-update:
   ORDER BY 1
   FOR UPDATE;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
  COMMIT;
 
 step s2-select-from-t1-t2-for-update: <... completed>
@@ -283,7 +283,7 @@ step s2-begin:
 step s2-update-t1:
  UPDATE test_table_1_rf1 SET val_1 = 5 WHERE id = 1;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
  COMMIT;
 
 step s2-update-t1: <... completed>
@@ -314,7 +314,7 @@ step s2-begin:
 step s2-update-t1:
  UPDATE test_table_1_rf1 SET val_1 = 5 WHERE id = 1;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
  COMMIT;
 
 step s2-update-t1: <... completed>
@@ -341,7 +341,7 @@ step s2-begin:
 step s2-update-rt:
  UPDATE ref_table SET val_1 = 5 WHERE id = 1;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
  COMMIT;
 
 step s2-update-rt: <... completed>
@@ -368,7 +368,7 @@ step s2-begin:
 step s2-update-t1:
  UPDATE test_table_1_rf1 SET val_1 = 5 WHERE id = 1;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
  COMMIT;
 
 step s2-update-t1: <... completed>
@@ -393,7 +393,7 @@ step s2-begin:
 step s2-update-rt:
  UPDATE ref_table SET val_1 = 5 WHERE id = 1;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
  COMMIT;
 
 step s2-update-rt: <... completed>

src/test/regress/expected/isolation_select_vs_all.out

@@ -61,8 +61,8 @@ id             data           int_data
 
 1               b             1
 step s2-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -153,8 +153,8 @@ id             data           int_data
 3               d             3
 4               e             4
 step s2-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -179,8 +179,8 @@ create_distributed_table
 step s1-initialize: COPY select_append FROM PROGRAM 'echo 0, a, 0 && echo 1, b, 1 && echo 2, c, 2 && echo 3, d, 3 && echo 4, e, 4' WITH CSV;
 step s1-begin: BEGIN;
 step s1-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -209,8 +209,8 @@ create_distributed_table
 step s1-initialize: COPY select_append FROM PROGRAM 'echo 0, a, 0 && echo 1, b, 1 && echo 2, c, 2 && echo 3, d, 3 && echo 4, e, 4' WITH CSV;
 step s1-begin: BEGIN;
 step s1-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -243,8 +243,8 @@ create_distributed_table
 step s1-initialize: COPY select_append FROM PROGRAM 'echo 0, a, 0 && echo 1, b, 1 && echo 2, c, 2 && echo 3, d, 3 && echo 4, e, 4' WITH CSV;
 step s1-begin: BEGIN;
 step s1-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -254,8 +254,8 @@ id             data           int_data       id             data           int_d
 3               d             3              3               d             3
 4               e             4              4               e             4
 step s2-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -452,8 +452,8 @@ create_distributed_table
 step s1-initialize: COPY select_append FROM PROGRAM 'echo 0, a, 0 && echo 1, b, 1 && echo 2, c, 2 && echo 3, d, 3 && echo 4, e, 4' WITH CSV;
 step s1-begin: BEGIN;
 step s1-disable-binary-protocol:
-	-- Workaround router-select blocking blocking create-index-concurrently
+ -- Workaround router-select blocking blocking create-index-concurrently
-	SET citus.enable_binary_protocol TO false;
+ SET citus.enable_binary_protocol TO false;
 
 step s1-router-select: SELECT * FROM select_append WHERE id = 1;
 id             data           int_data
@@ -767,7 +767,7 @@ step s1-drop: DROP TABLE select_append;
 step s2-router-select: SELECT * FROM select_append WHERE id = 1; <waiting ...>
 step s1-commit: COMMIT;
 step s2-router-select: <... completed>
-error in steps s1-commit s2-router-select: ERROR:  relation "select_append" does not exist
+ERROR:  relation "select_append" does not exist
 step s1-select-count: SELECT COUNT(*) FROM select_append;
 ERROR:  relation "select_append" does not exist
 restore_isolation_tester_func
@@ -1533,7 +1533,7 @@ step s1-drop: DROP TABLE select_append;
 step s2-real-time-select: SELECT * FROM select_append ORDER BY 1, 2; <waiting ...>
 step s1-commit: COMMIT;
 step s2-real-time-select: <... completed>
-error in steps s1-commit s2-real-time-select: ERROR:  relation "select_append" does not exist
+ERROR:  relation "select_append" does not exist
 step s1-select-count: SELECT COUNT(*) FROM select_append;
 ERROR:  relation "select_append" does not exist
 restore_isolation_tester_func
@@ -1772,8 +1772,8 @@ create_distributed_table
 step s1-initialize: COPY select_append FROM PROGRAM 'echo 0, a, 0 && echo 1, b, 1 && echo 2, c, 2 && echo 3, d, 3 && echo 4, e, 4' WITH CSV;
 step s1-begin: BEGIN;
 step s1-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -1799,8 +1799,8 @@ create_distributed_table
 step s1-initialize: COPY select_append FROM PROGRAM 'echo 0, a, 0 && echo 1, b, 1 && echo 2, c, 2 && echo 3, d, 3 && echo 4, e, 4' WITH CSV;
 step s1-begin: BEGIN;
 step s1-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -1826,8 +1826,8 @@ create_distributed_table
 step s1-initialize: COPY select_append FROM PROGRAM 'echo 0, a, 0 && echo 1, b, 1 && echo 2, c, 2 && echo 3, d, 3 && echo 4, e, 4' WITH CSV;
 step s1-begin: BEGIN;
 step s1-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -1853,8 +1853,8 @@ create_distributed_table
 step s1-initialize: COPY select_append FROM PROGRAM 'echo 0, a, 0 && echo 1, b, 1 && echo 2, c, 2 && echo 3, d, 3 && echo 4, e, 4' WITH CSV;
 step s1-begin: BEGIN;
 step s1-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -1880,8 +1880,8 @@ create_distributed_table
 step s1-initialize: COPY select_append FROM PROGRAM 'echo 0, a, 0 && echo 1, b, 1 && echo 2, c, 2 && echo 3, d, 3 && echo 4, e, 4' WITH CSV;
 step s1-begin: BEGIN;
 step s1-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -1908,8 +1908,8 @@ create_distributed_table
 step s1-initialize: COPY select_append FROM PROGRAM 'echo 0, a, 0 && echo 1, b, 1 && echo 2, c, 2 && echo 3, d, 3 && echo 4, e, 4' WITH CSV;
 step s1-begin: BEGIN;
 step s1-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -1934,8 +1934,8 @@ create_distributed_table
 step s1-initialize: COPY select_append FROM PROGRAM 'echo 0, a, 0 && echo 1, b, 1 && echo 2, c, 2 && echo 3, d, 3 && echo 4, e, 4' WITH CSV;
 step s1-begin: BEGIN;
 step s1-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -1967,8 +1967,8 @@ step s1-initialize: COPY select_append FROM PROGRAM 'echo 0, a, 0 && echo 1, b,
 step s1-ddl-create-index: CREATE INDEX select_append_index ON select_append(id);
 step s1-begin: BEGIN;
 step s1-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -2000,8 +2000,8 @@ create_distributed_table
 step s1-initialize: COPY select_append FROM PROGRAM 'echo 0, a, 0 && echo 1, b, 1 && echo 2, c, 2 && echo 3, d, 3 && echo 4, e, 4' WITH CSV;
 step s1-begin: BEGIN;
 step s1-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -2032,8 +2032,8 @@ create_distributed_table
 step s1-initialize: COPY select_append FROM PROGRAM 'echo 0, a, 0 && echo 1, b, 1 && echo 2, c, 2 && echo 3, d, 3 && echo 4, e, 4' WITH CSV;
 step s1-begin: BEGIN;
 step s1-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -2066,8 +2066,8 @@ step s1-initialize: COPY select_append FROM PROGRAM 'echo 0, a, 0 && echo 1, b,
 step s1-ddl-add-column: ALTER TABLE select_append ADD new_column int DEFAULT 0;
 step s1-begin: BEGIN;
 step s1-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       new_column     id             data           int_data       new_column
 
@@ -2099,8 +2099,8 @@ create_distributed_table
 step s1-initialize: COPY select_append FROM PROGRAM 'echo 0, a, 0 && echo 1, b, 1 && echo 2, c, 2 && echo 3, d, 3 && echo 4, e, 4' WITH CSV;
 step s1-begin: BEGIN;
 step s1-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -2132,8 +2132,8 @@ create_distributed_table
 step s1-initialize: COPY select_append FROM PROGRAM 'echo 0, a, 0 && echo 1, b, 1 && echo 2, c, 2 && echo 3, d, 3 && echo 4, e, 4' WITH CSV;
 step s1-begin: BEGIN;
 step s1-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -2162,8 +2162,8 @@ create_distributed_table
 step s1-initialize: COPY select_append FROM PROGRAM 'echo 0, a, 0 && echo 1, b, 1 && echo 2, c, 2 && echo 3, d, 3 && echo 4, e, 4' WITH CSV;
 step s1-begin: BEGIN;
 step s1-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -2190,8 +2190,8 @@ step s1-drop: DROP TABLE select_append;
 step s1-create-non-distributed-table: CREATE TABLE select_append(id integer, data text, int_data int);
 step s1-begin: BEGIN;
 step s1-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -2216,8 +2216,8 @@ step s1-initialize: COPY select_append FROM PROGRAM 'echo 0, a, 0 && echo 1, b,
 step s1-begin: BEGIN;
 step s1-insert: INSERT INTO select_append VALUES(0, 'k', 0);
 step s2-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -2243,8 +2243,8 @@ step s1-initialize: COPY select_append FROM PROGRAM 'echo 0, a, 0 && echo 1, b,
 step s1-begin: BEGIN;
 step s1-insert-select: INSERT INTO select_append SELECT * FROM select_append;
 step s2-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -2270,8 +2270,8 @@ step s1-initialize: COPY select_append FROM PROGRAM 'echo 0, a, 0 && echo 1, b,
 step s1-begin: BEGIN;
 step s1-update: UPDATE select_append SET data = 'l' WHERE id = 0;
 step s2-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -2297,8 +2297,8 @@ step s1-initialize: COPY select_append FROM PROGRAM 'echo 0, a, 0 && echo 1, b,
 step s1-begin: BEGIN;
 step s1-delete: DELETE FROM select_append WHERE id = 1;
 step s2-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -2324,8 +2324,8 @@ step s1-initialize: COPY select_append FROM PROGRAM 'echo 0, a, 0 && echo 1, b,
 step s1-begin: BEGIN;
 step s1-truncate: TRUNCATE select_append;
 step s2-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
  <waiting ...>
 step s1-commit: COMMIT;
 step s2-adaptive-select: <... completed>
@@ -2347,12 +2347,12 @@ step s1-initialize: COPY select_append FROM PROGRAM 'echo 0, a, 0 && echo 1, b,
 step s1-begin: BEGIN;
 step s1-drop: DROP TABLE select_append;
 step s2-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
  <waiting ...>
 step s1-commit: COMMIT;
 step s2-adaptive-select: <... completed>
-error in steps s1-commit s2-adaptive-select: ERROR:  relation "select_append" does not exist
+ERROR:  relation "select_append" does not exist
 step s1-select-count: SELECT COUNT(*) FROM select_append;
 ERROR:  relation "select_append" does not exist
 restore_isolation_tester_func
@@ -2367,8 +2367,8 @@ step s1-initialize: COPY select_append FROM PROGRAM 'echo 0, a, 0 && echo 1, b,
 step s1-begin: BEGIN;
 step s1-ddl-create-index: CREATE INDEX select_append_index ON select_append(id);
 step s2-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -2400,8 +2400,8 @@ step s1-ddl-create-index: CREATE INDEX select_append_index ON select_append(id);
 step s1-begin: BEGIN;
 step s1-ddl-drop-index: DROP INDEX select_append_index;
 step s2-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
  <waiting ...>
 step s1-commit: COMMIT;
 step s2-adaptive-select: <... completed>
@@ -2433,8 +2433,8 @@ step s1-initialize: COPY select_append FROM PROGRAM 'echo 0, a, 0 && echo 1, b,
 step s1-begin: BEGIN;
 step s1-ddl-add-column: ALTER TABLE select_append ADD new_column int DEFAULT 0;
 step s2-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
  <waiting ...>
 step s1-commit: COMMIT;
 step s2-adaptive-select: <... completed>
@@ -2467,8 +2467,8 @@ step s1-ddl-add-column: ALTER TABLE select_append ADD new_column int DEFAULT 0;
 step s1-begin: BEGIN;
 step s1-ddl-drop-column: ALTER TABLE select_append DROP new_column;
 step s2-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
  <waiting ...>
 step s1-commit: COMMIT;
 step s2-adaptive-select: <... completed>
@@ -2500,8 +2500,8 @@ step s1-initialize: COPY select_append FROM PROGRAM 'echo 0, a, 0 && echo 1, b,
 step s1-begin: BEGIN;
 step s1-ddl-rename-column: ALTER TABLE select_append RENAME data TO new_column;
 step s2-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
  <waiting ...>
 step s1-commit: COMMIT;
 step s2-adaptive-select: <... completed>
@@ -2536,8 +2536,8 @@ citus_total_relation_size
 
 32768
 step s2-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -2563,8 +2563,8 @@ step s1-initialize: COPY select_append FROM PROGRAM 'echo 0, a, 0 && echo 1, b,
 step s1-begin: BEGIN;
 step s1-master-modify-multiple-shards: DELETE FROM select_append;
 step s2-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 
@@ -2594,8 +2594,8 @@ create_distributed_table
 
 
 step s2-adaptive-select:
-		SET citus.enable_repartition_joins TO ON;
+  SET citus.enable_repartition_joins TO ON;
-	SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
+ SELECT * FROM select_append AS t1 JOIN select_append AS t2 ON t1.id = t2.int_data ORDER BY 1, 2, 3, 4;
 
 id             data           int_data       id             data           int_data
 

src/test/regress/expected/isolation_select_vs_all_on_mx.out

@@ -14,7 +14,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-select:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM select_table');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM select_table');
 
 run_commands_on_session_level_connection_to_node
 
@@ -32,13 +32,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-select:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM select_table');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM select_table');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -50,7 +50,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -79,7 +79,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-select:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM select_table');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM select_table');
 
 run_commands_on_session_level_connection_to_node
 
@@ -97,13 +97,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-insert-select:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO select_table SELECT * FROM select_table');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO select_table SELECT * FROM select_table');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -115,7 +115,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -127,7 +127,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM select_table;
+ SELECT COUNT(*) FROM select_table;
 
 count
 
@@ -150,7 +150,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-select:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM select_table');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM select_table');
 
 run_commands_on_session_level_connection_to_node
 
@@ -168,13 +168,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-delete:
-	SELECT run_commands_on_session_level_connection_to_node('DELETE FROM select_table WHERE id = 1');
+ SELECT run_commands_on_session_level_connection_to_node('DELETE FROM select_table WHERE id = 1');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -186,7 +186,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -198,7 +198,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM select_table;
+ SELECT COUNT(*) FROM select_table;
 
 count
 
@@ -221,7 +221,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-select:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM select_table');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM select_table');
 
 run_commands_on_session_level_connection_to_node
 
@@ -239,13 +239,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-copy:
-	SELECT run_commands_on_session_level_connection_to_node('COPY select_table FROM PROGRAM ''echo 9, 90 && echo 10, 100''WITH CSV');
+ SELECT run_commands_on_session_level_connection_to_node('COPY select_table FROM PROGRAM ''echo 9, 90 && echo 10, 100''WITH CSV');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -257,7 +257,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -269,7 +269,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM select_table;
+ SELECT COUNT(*) FROM select_table;
 
 count
 
@@ -292,28 +292,28 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-select:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM select_table');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM select_table');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-index:
-	CREATE INDEX select_index ON select_table(id);
+ CREATE INDEX select_index ON select_table(id);
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -336,7 +336,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-select:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM select_table');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM select_table');
 
 run_commands_on_session_level_connection_to_node
 
@@ -354,13 +354,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-select-for-update:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM select_table WHERE id = 6 FOR UPDATE');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM select_table WHERE id = 6 FOR UPDATE');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -372,7 +372,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -408,22 +408,22 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-select:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM select_table');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM select_table');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s2-coordinator-create-index-concurrently:
-	CREATE INDEX CONCURRENTLY select_table_index ON select_table(id);
+ CREATE INDEX CONCURRENTLY select_table_index ON select_table(id);
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 

src/test/regress/expected/isolation_shouldhaveshards.out

@@ -5,43 +5,43 @@ starting permutation: s1-add-second-node s1-begin s2-begin s2-create-distributed
 
 1
 step s1-add-second-node:
-	SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM master_add_node('localhost', 57638);
 
 ?column?
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-create-distributed-table:
-	CREATE TABLE t1 (a int);
+ CREATE TABLE t1 (a int);
-	-- session needs to have replication factor set to 1, can't do in setup
+ -- session needs to have replication factor set to 1, can't do in setup
-	SET citus.shard_replication_factor TO 1;
+ SET citus.shard_replication_factor TO 1;
-	SELECT create_distributed_table('t1', 'a');
+ SELECT create_distributed_table('t1', 'a');
 
 create_distributed_table
 
 
 step s1-noshards:
-	SELECT * from master_set_node_property('localhost', 57637, 'shouldhaveshards', false);
+ SELECT * from master_set_node_property('localhost', 57637, 'shouldhaveshards', false);
  <waiting ...>
-step s2-commit:
+step s2-commit: 
-	COMMIT;
+ COMMIT;
 
 step s1-noshards: <... completed>
 master_set_node_property
 
 
 step s1-commit:
-	COMMIT;
+ COMMIT;
 
 step s2-shardcounts:
-	SELECT nodeport, count(*)
+ SELECT nodeport, count(*)
-	FROM pg_dist_shard JOIN pg_dist_shard_placement USING (shardid)
+ FROM pg_dist_shard JOIN pg_dist_shard_placement USING (shardid)
-	WHERE logicalrelid = 't1'::regclass GROUP BY nodeport ORDER BY nodeport;
+ WHERE logicalrelid = 't1'::regclass GROUP BY nodeport ORDER BY nodeport;
 
 nodeport       count
 
@@ -57,43 +57,43 @@ starting permutation: s1-add-second-node s1-begin s2-begin s1-noshards s2-create
 
 1
 step s1-add-second-node:
-	SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM master_add_node('localhost', 57638);
 
 ?column?
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-noshards:
-	SELECT * from master_set_node_property('localhost', 57637, 'shouldhaveshards', false);
+ SELECT * from master_set_node_property('localhost', 57637, 'shouldhaveshards', false);
 
 master_set_node_property
 
 
 step s2-create-distributed-table:
-	CREATE TABLE t1 (a int);
+ CREATE TABLE t1 (a int);
-	-- session needs to have replication factor set to 1, can't do in setup
+ -- session needs to have replication factor set to 1, can't do in setup
-	SET citus.shard_replication_factor TO 1;
+ SET citus.shard_replication_factor TO 1;
-	SELECT create_distributed_table('t1', 'a');
+ SELECT create_distributed_table('t1', 'a');
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-create-distributed-table: <... completed>
 create_distributed_table
 
 
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 step s2-shardcounts:
-	SELECT nodeport, count(*)
+ SELECT nodeport, count(*)
-	FROM pg_dist_shard JOIN pg_dist_shard_placement USING (shardid)
+ FROM pg_dist_shard JOIN pg_dist_shard_placement USING (shardid)
-	WHERE logicalrelid = 't1'::regclass GROUP BY nodeport ORDER BY nodeport;
+ WHERE logicalrelid = 't1'::regclass GROUP BY nodeport ORDER BY nodeport;
 
 nodeport       count
 
@@ -108,29 +108,29 @@ starting permutation: s1-begin s2-begin s1-noshards s2-update-node s1-commit s2-
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-noshards:
-	SELECT * from master_set_node_property('localhost', 57637, 'shouldhaveshards', false);
+ SELECT * from master_set_node_property('localhost', 57637, 'shouldhaveshards', false);
 
 master_set_node_property
 
 
 step s2-update-node:
-	select * from master_update_node((select nodeid from pg_dist_node where nodeport = 57637), 'localhost', 57638)
+ select * from master_update_node((select nodeid from pg_dist_node where nodeport = 57637), 'localhost', 57638)
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-update-node: <... completed>
 master_update_node
 
 
 step s2-commit:
-	COMMIT;
+ COMMIT;
 
 master_remove_node
 
@@ -141,27 +141,27 @@ starting permutation: s1-begin s2-begin s2-update-node s1-noshards s2-commit s1-
 
 1
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-begin:
-	BEGIN;
+ BEGIN;
 
 step s2-update-node:
-	select * from master_update_node((select nodeid from pg_dist_node where nodeport = 57637), 'localhost', 57638)
+ select * from master_update_node((select nodeid from pg_dist_node where nodeport = 57637), 'localhost', 57638)
 
 master_update_node
 
 
 step s1-noshards:
-	SELECT * from master_set_node_property('localhost', 57637, 'shouldhaveshards', false);
+ SELECT * from master_set_node_property('localhost', 57637, 'shouldhaveshards', false);
  <waiting ...>
-step s2-commit:
+step s2-commit: 
-	COMMIT;
+ COMMIT;
 
 step s1-noshards: <... completed>
-error in steps s2-commit s1-noshards: ERROR:  node at "localhost:xxxxx" does not exist
+ERROR:  node at "localhost:xxxxx" does not exist
 step s1-commit:
-	COMMIT;
+ COMMIT;
 
 master_remove_node
 

src/test/regress/expected/isolation_transaction_recovery.out

@@ -36,7 +36,7 @@ recover_prepared_transactions
 step s2-recover:
     SELECT recover_prepared_transactions();
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-recover: <... completed>

src/test/regress/expected/isolation_truncate_vs_all.out

@@ -352,7 +352,7 @@ step s1-drop: DROP TABLE truncate_append;
 step s2-truncate: TRUNCATE truncate_append; <waiting ...>
 step s1-commit: COMMIT;
 step s2-truncate: <... completed>
-error in steps s1-commit s2-truncate: ERROR:  relation "truncate_append" does not exist
+ERROR:  relation "truncate_append" does not exist
 step s2-commit: COMMIT;
 step s1-select-count: SELECT COUNT(*) FROM truncate_append;
 ERROR:  relation "truncate_append" does not exist

src/test/regress/expected/isolation_truncate_vs_all_on_mx.out

@@ -14,7 +14,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-truncate:
-	SELECT run_commands_on_session_level_connection_to_node('TRUNCATE truncate_table');
+ SELECT run_commands_on_session_level_connection_to_node('TRUNCATE truncate_table');
 
 run_commands_on_session_level_connection_to_node
 
@@ -32,10 +32,10 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-truncate:
-	SELECT run_commands_on_session_level_connection_to_node('TRUNCATE truncate_table');
+ SELECT run_commands_on_session_level_connection_to_node('TRUNCATE truncate_table');
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -51,7 +51,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -63,7 +63,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM truncate_table;
+ SELECT COUNT(*) FROM truncate_table;
 
 count
 
@@ -86,7 +86,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-select:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM truncate_table WHERE id = 6');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM truncate_table WHERE id = 6');
 
 run_commands_on_session_level_connection_to_node
 
@@ -104,10 +104,10 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-truncate:
-	SELECT run_commands_on_session_level_connection_to_node('TRUNCATE truncate_table');
+ SELECT run_commands_on_session_level_connection_to_node('TRUNCATE truncate_table');
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -123,7 +123,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -135,7 +135,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM truncate_table;
+ SELECT COUNT(*) FROM truncate_table;
 
 count
 
@@ -158,7 +158,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-insert-select:
-	SELECT run_commands_on_session_level_connection_to_node('INSERT INTO truncate_table SELECT * FROM truncate_table');
+ SELECT run_commands_on_session_level_connection_to_node('INSERT INTO truncate_table SELECT * FROM truncate_table');
 
 run_commands_on_session_level_connection_to_node
 
@@ -176,10 +176,10 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-truncate:
-	SELECT run_commands_on_session_level_connection_to_node('TRUNCATE truncate_table');
+ SELECT run_commands_on_session_level_connection_to_node('TRUNCATE truncate_table');
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -195,7 +195,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -207,7 +207,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM truncate_table;
+ SELECT COUNT(*) FROM truncate_table;
 
 count
 
@@ -230,7 +230,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-delete:
-	SELECT run_commands_on_session_level_connection_to_node('DELETE FROM truncate_table WHERE id IN (5, 6, 7)');
+ SELECT run_commands_on_session_level_connection_to_node('DELETE FROM truncate_table WHERE id IN (5, 6, 7)');
 
 run_commands_on_session_level_connection_to_node
 
@@ -248,10 +248,10 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-truncate:
-	SELECT run_commands_on_session_level_connection_to_node('TRUNCATE truncate_table');
+ SELECT run_commands_on_session_level_connection_to_node('TRUNCATE truncate_table');
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -267,7 +267,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -279,7 +279,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM truncate_table;
+ SELECT COUNT(*) FROM truncate_table;
 
 count
 
@@ -302,7 +302,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-copy:
-	SELECT run_commands_on_session_level_connection_to_node('COPY truncate_table FROM PROGRAM ''echo 5, 50 && echo 9, 90 && echo 10, 100''WITH CSV');
+ SELECT run_commands_on_session_level_connection_to_node('COPY truncate_table FROM PROGRAM ''echo 5, 50 && echo 9, 90 && echo 10, 100''WITH CSV');
 
 run_commands_on_session_level_connection_to_node
 
@@ -320,10 +320,10 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-truncate:
-	SELECT run_commands_on_session_level_connection_to_node('TRUNCATE truncate_table');
+ SELECT run_commands_on_session_level_connection_to_node('TRUNCATE truncate_table');
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -339,7 +339,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -351,7 +351,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM truncate_table;
+ SELECT COUNT(*) FROM truncate_table;
 
 count
 
@@ -362,10 +362,10 @@ restore_isolation_tester_func
 
 starting permutation: s1-begin s1-alter s2-start-session-level-connection s2-begin-on-worker s2-truncate s1-commit s2-commit-worker s2-stop-connection s3-select-count
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-alter:
-	ALTER TABLE truncate_table DROP value;
+ ALTER TABLE truncate_table DROP value;
 
 step s2-start-session-level-connection:
         SELECT start_session_level_connection_to_node('localhost', 57638);
@@ -380,10 +380,10 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-truncate:
-	SELECT run_commands_on_session_level_connection_to_node('TRUNCATE truncate_table');
+ SELECT run_commands_on_session_level_connection_to_node('TRUNCATE truncate_table');
  <waiting ...>
-step s1-commit:
+step s1-commit: 
-	COMMIT;
+ COMMIT;
 
 step s2-truncate: <... completed>
 run_commands_on_session_level_connection_to_node
@@ -402,7 +402,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM truncate_table;
+ SELECT COUNT(*) FROM truncate_table;
 
 count
 
@@ -425,7 +425,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-select-for-update:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM truncate_table WHERE id=5 FOR UPDATE');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM truncate_table WHERE id=5 FOR UPDATE');
 
 run_commands_on_session_level_connection_to_node
 
@@ -443,10 +443,10 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-truncate:
-	SELECT run_commands_on_session_level_connection_to_node('TRUNCATE truncate_table');
+ SELECT run_commands_on_session_level_connection_to_node('TRUNCATE truncate_table');
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -462,7 +462,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -474,7 +474,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM truncate_table;
+ SELECT COUNT(*) FROM truncate_table;
 
 count
 

src/test/regress/expected/isolation_undistribute_table.out

@@ -13,11 +13,11 @@ undistribute_table
 step s2-undistribute:
     SELECT undistribute_table('dist_table');
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-undistribute: <... completed>
-error in steps s1-commit s2-undistribute: ERROR:  cannot complete operation because no such table exists
+ERROR:  cannot complete operation because no such table exists
 
 starting permutation: s1-begin s1-undistribute s2-select s1-commit
 step s1-begin:
@@ -32,7 +32,7 @@ undistribute_table
 step s2-select:
     SELECT * FROM dist_table ORDER BY 1, 2;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-select: <... completed>
@@ -55,7 +55,7 @@ undistribute_table
 step s2-insert:
     INSERT INTO dist_table VALUES (7, 8), (9, 10);
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-insert: <... completed>
@@ -83,7 +83,7 @@ undistribute_table
 step s2-insert-select:
     INSERT INTO dist_table SELECT * FROM dist_table;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-insert-select: <... completed>
@@ -112,7 +112,7 @@ undistribute_table
 step s2-delete:
     DELETE FROM dist_table WHERE a = 3;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-delete: <... completed>
@@ -137,7 +137,7 @@ undistribute_table
 step s2-copy:
     COPY dist_table FROM PROGRAM 'echo 11, 12 && echo 13, 14' WITH CSV;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-copy: <... completed>
@@ -165,7 +165,7 @@ undistribute_table
 step s2-drop:
     DROP TABLE dist_table;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-drop: <... completed>
@@ -187,7 +187,7 @@ undistribute_table
 step s2-truncate:
     TRUNCATE dist_table;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-truncate: <... completed>
@@ -210,7 +210,7 @@ undistribute_table
 step s2-select-for-update:
     SELECT * FROM dist_table WHERE a = 5 FOR UPDATE;
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-select-for-update: <... completed>
@@ -231,7 +231,7 @@ undistribute_table
 step s2-create-index-concurrently:
     CREATE INDEX CONCURRENTLY idx ON dist_table (a);
  <waiting ...>
-step s1-commit:
+step s1-commit: 
     COMMIT;
 
 step s2-create-index-concurrently: <... completed>

src/test/regress/expected/isolation_update_delete_upsert_vs_all_on_mx.out

@@ -17,7 +17,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-update:
-	SELECT run_commands_on_session_level_connection_to_node('UPDATE dist_table SET value=15 WHERE id=5');
+ SELECT run_commands_on_session_level_connection_to_node('UPDATE dist_table SET value=15 WHERE id=5');
 
 run_commands_on_session_level_connection_to_node
 
@@ -35,13 +35,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-delete:
-	SELECT run_commands_on_session_level_connection_to_node('DELETE FROM dist_table WHERE id=5');
+ SELECT run_commands_on_session_level_connection_to_node('DELETE FROM dist_table WHERE id=5');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -53,7 +53,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -65,7 +65,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM dist_table;
+ SELECT COUNT(*) FROM dist_table;
 
 count
 
@@ -91,7 +91,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-delete:
-	SELECT run_commands_on_session_level_connection_to_node('DELETE FROM dist_table WHERE id=5');
+ SELECT run_commands_on_session_level_connection_to_node('DELETE FROM dist_table WHERE id=5');
 
 run_commands_on_session_level_connection_to_node
 
@@ -109,13 +109,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-copy:
-	SELECT run_commands_on_session_level_connection_to_node('COPY dist_table FROM PROGRAM ''echo 5, 50 && echo 9, 90 && echo 10, 100''WITH CSV');
+ SELECT run_commands_on_session_level_connection_to_node('COPY dist_table FROM PROGRAM ''echo 5, 50 && echo 9, 90 && echo 10, 100''WITH CSV');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -127,7 +127,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -139,7 +139,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM dist_table;
+ SELECT COUNT(*) FROM dist_table;
 
 count
 
@@ -165,7 +165,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-update:
-	SELECT run_commands_on_session_level_connection_to_node('UPDATE dist_table SET value=15 WHERE id=5');
+ SELECT run_commands_on_session_level_connection_to_node('UPDATE dist_table SET value=15 WHERE id=5');
 
 run_commands_on_session_level_connection_to_node
 
@@ -183,10 +183,10 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-alter-table:
-	ALTER TABLE dist_table DROP value;
+ ALTER TABLE dist_table DROP value;
  <waiting ...>
-step s1-commit-worker:
+step s1-commit-worker: 
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -199,7 +199,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 
@@ -211,7 +211,7 @@ stop_session_level_connection_to_node
 
 
 step s3-select-count:
-	SELECT COUNT(*) FROM dist_table;
+ SELECT COUNT(*) FROM dist_table;
 
 count
 
@@ -237,7 +237,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-update:
-	SELECT run_commands_on_session_level_connection_to_node('UPDATE dist_table SET value=15 WHERE id=5');
+ SELECT run_commands_on_session_level_connection_to_node('UPDATE dist_table SET value=15 WHERE id=5');
 
 run_commands_on_session_level_connection_to_node
 
@@ -255,13 +255,13 @@ run_commands_on_session_level_connection_to_node
 
 
 step s2-select-for-update:
-	SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM dist_table WHERE id=5 FOR UPDATE');
+ SELECT run_commands_on_session_level_connection_to_node('SELECT * FROM dist_table WHERE id=5 FOR UPDATE');
 
 run_commands_on_session_level_connection_to_node
 
 
 step s1-commit-worker:
-	SELECT run_commands_on_session_level_connection_to_node('COMMIT');
+ SELECT run_commands_on_session_level_connection_to_node('COMMIT');
 
 run_commands_on_session_level_connection_to_node
 
@@ -273,7 +273,7 @@ run_commands_on_session_level_connection_to_node
 
 
 step s1-stop-connection:
-	SELECT stop_session_level_connection_to_node();
+ SELECT stop_session_level_connection_to_node();
 
 stop_session_level_connection_to_node
 

src/test/regress/expected/isolation_update_node_lock_writes.out

@@ -28,7 +28,7 @@ step s1-commit:
  COMMIT;
 
 step s2-insert: <... completed>
-error in steps s1-commit s2-insert: ERROR:  relation "public.update_node_102012" does not exist
+ERROR:  relation "public.update_node_102012" does not exist
 step s2-abort:
  ABORT;
 

src/test/regress/expected/isolation_update_vs_all.out

@@ -655,7 +655,7 @@ step s1-drop: DROP TABLE update_hash;
 step s2-update: UPDATE update_hash SET data = 'l' WHERE id = 4; <waiting ...>
 step s1-commit: COMMIT;
 step s2-update: <... completed>
-error in steps s1-commit s2-update: ERROR:  relation "update_hash" does not exist
+ERROR:  relation "update_hash" does not exist
 step s2-commit: COMMIT;
 step s1-select-count: SELECT COUNT(*) FROM update_hash;
 ERROR:  relation "update_hash" does not exist
@@ -776,7 +776,7 @@ step s1-ddl-rename-column: ALTER TABLE update_hash RENAME data TO new_column;
 step s2-update: UPDATE update_hash SET data = 'l' WHERE id = 4; <waiting ...>
 step s1-commit: COMMIT;
 step s2-update: <... completed>
-error in steps s1-commit s2-update: ERROR:  column "data" of relation "update_hash" does not exist
+ERROR:  column "data" of relation "update_hash" does not exist
 step s2-commit: COMMIT;
 step s1-select-count: SELECT COUNT(*) FROM update_hash;
 count
@@ -913,7 +913,7 @@ step s1-drop: DROP TABLE update_hash;
 step s2-update-cte: WITH cte AS (UPDATE update_hash SET data = 'l' WHERE id = 4 RETURNING *) SELECT * FROM cte WHERE id = 4; <waiting ...>
 step s1-commit: COMMIT;
 step s2-update-cte: <... completed>
-error in steps s1-commit s2-update-cte: ERROR:  relation "update_hash" does not exist
+ERROR:  relation "update_hash" does not exist
 step s2-commit: COMMIT;
 step s1-select-count: SELECT COUNT(*) FROM update_hash;
 ERROR:  relation "update_hash" does not exist
@@ -1046,7 +1046,7 @@ step s1-ddl-rename-column: ALTER TABLE update_hash RENAME data TO new_column;
 step s2-update-cte: WITH cte AS (UPDATE update_hash SET data = 'l' WHERE id = 4 RETURNING *) SELECT * FROM cte WHERE id = 4; <waiting ...>
 step s1-commit: COMMIT;
 step s2-update-cte: <... completed>
-error in steps s1-commit s2-update-cte: ERROR:  column "data" of relation "update_hash" does not exist
+ERROR:  column "data" of relation "update_hash" does not exist
 step s2-commit: COMMIT;
 step s1-select-count: SELECT COUNT(*) FROM update_hash;
 count

src/test/regress/expected/isolation_upsert_vs_all.out

@@ -386,7 +386,7 @@ step s1-drop: DROP TABLE upsert_hash;
 step s2-upsert: INSERT INTO upsert_hash VALUES(4, 'k') ON CONFLICT(id) DO UPDATE SET data = 'k'; <waiting ...>
 step s1-commit: COMMIT;
 step s2-upsert: <... completed>
-error in steps s1-commit s2-upsert: ERROR:  relation "upsert_hash" does not exist
+ERROR:  relation "upsert_hash" does not exist
 step s2-commit: COMMIT;
 step s1-select-count: SELECT COUNT(*) FROM upsert_hash;
 ERROR:  relation "upsert_hash" does not exist
@@ -507,7 +507,7 @@ step s1-ddl-rename-column: ALTER TABLE upsert_hash RENAME data TO new_column;
 step s2-upsert: INSERT INTO upsert_hash VALUES(4, 'k') ON CONFLICT(id) DO UPDATE SET data = 'k'; <waiting ...>
 step s1-commit: COMMIT;
 step s2-upsert: <... completed>
-error in steps s1-commit s2-upsert: ERROR:  column "data" of relation "upsert_hash" does not exist
+ERROR:  column "data" of relation "upsert_hash" does not exist
 step s2-commit: COMMIT;
 step s1-select-count: SELECT COUNT(*) FROM upsert_hash;
 count

src/test/regress/expected/shared_connection_waits.out

@@ -2,22 +2,22 @@ Parsed test spec with 3 sessions
 
 starting permutation: s3-lower-pool-size s1-begin s1-count-slow s3-increase-pool-size s2-select s1-commit
 step s3-lower-pool-size:
-	SELECT set_max_shared_pool_size(5);
+ SELECT set_max_shared_pool_size(5);
 
 set_max_shared_pool_size
 
 
 step s1-begin:
-	BEGIN;
+ BEGIN;
 
 step s1-count-slow:
-	SELECT pg_sleep(0.1), count(*) FROM test;
+ SELECT pg_sleep(0.1), count(*) FROM test;
 
 pg_sleep       count
 
                101
 step s3-increase-pool-size:
-	SELECT set_max_shared_pool_size(100);
+ SELECT set_max_shared_pool_size(100);
 
 set_max_shared_pool_size
 
@@ -29,5 +29,5 @@ count
 
 101
 step s1-commit:
-	COMMIT;
+ COMMIT;