Skip to content

Commit ceecae3

Browse files
funbringerfunbringer
committed
reformat isolation tests
1 parent 36a338b commit ceecae3

File tree

4 files changed

+89
-44
lines changed

4 files changed

+89
-44
lines changed

‎expected/insert_nodes.out

Lines changed: 51 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,42 +5,63 @@ set_spawn_using_bgw
55

66

77
step s1b: BEGIN;
8-
step s1_insert_150: INSERT INTO range_rel SELECT generate_series(1, 150);
8+
step s1_insert_150: INSERT INTO range_rel SELECT generate_series(1, 150);
99
step s1r: ROLLBACK;
10-
step s1_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c ON c.conrelid = i.inhrelid AND c.consrc IS NOT NULL WHERE i.inhparent = 'range_rel'::regclass::oid ORDER BY c.oid;
10+
step s1_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c
11+
ON c.conrelid = i.inhrelid
12+
WHERE i.inhparent = 'range_rel'::regclass
13+
ORDER BY c.oid;
1114
consrc
1215

16+
1317
((id >= 1) AND (id < 101))
18+
1419
((id >= 101) AND (id < 201))
1520
step s2b: BEGIN;
16-
step s2_insert_150: INSERT INTO range_rel SELECT generate_series(1, 150);
21+
step s2_insert_150: INSERT INTO range_rel SELECT generate_series(1, 150);
1722
step s2c: COMMIT;
18-
step s2_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c ON c.conrelid = i.inhrelid AND c.consrc IS NOT NULL WHERE i.inhparent = 'range_rel'::regclass::oid ORDER BY c.oid;
23+
step s2_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c
24+
ON c.conrelid = i.inhrelid
25+
WHERE i.inhparent = 'range_rel'::regclass
26+
ORDER BY c.oid;
1927
consrc
2028

29+
2130
((id >= 1) AND (id < 101))
31+
2232
((id >= 101) AND (id < 201))
2333

2434
starting permutation: s1b s1_insert_150 s1r s1_show_partitions s2b s2_insert_300 s2c s2_show_partitions
2535
set_spawn_using_bgw
2636

2737

2838
step s1b: BEGIN;
29-
step s1_insert_150: INSERT INTO range_rel SELECT generate_series(1, 150);
39+
step s1_insert_150: INSERT INTO range_rel SELECT generate_series(1, 150);
3040
step s1r: ROLLBACK;
31-
step s1_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c ON c.conrelid = i.inhrelid AND c.consrc IS NOT NULL WHERE i.inhparent = 'range_rel'::regclass::oid ORDER BY c.oid;
41+
step s1_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c
42+
ON c.conrelid = i.inhrelid
43+
WHERE i.inhparent = 'range_rel'::regclass
44+
ORDER BY c.oid;
3245
consrc
3346

47+
3448
((id >= 1) AND (id < 101))
49+
3550
((id >= 101) AND (id < 201))
3651
step s2b: BEGIN;
3752
step s2_insert_300: INSERT INTO range_rel SELECT generate_series(151, 300);
3853
step s2c: COMMIT;
39-
step s2_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c ON c.conrelid = i.inhrelid AND c.consrc IS NOT NULL WHERE i.inhparent = 'range_rel'::regclass::oid ORDER BY c.oid;
54+
step s2_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c
55+
ON c.conrelid = i.inhrelid
56+
WHERE i.inhparent = 'range_rel'::regclass
57+
ORDER BY c.oid;
4058
consrc
4159

60+
4261
((id >= 1) AND (id < 101))
62+
4363
((id >= 101) AND (id < 201))
64+
4465
((id >= 201) AND (id < 301))
4566

4667
starting permutation: s1b s1_insert_300 s1r s1_show_partitions s2b s2_insert_150 s2c s2_show_partitions
@@ -50,35 +71,53 @@ set_spawn_using_bgw
5071
step s1b: BEGIN;
5172
step s1_insert_300: INSERT INTO range_rel SELECT generate_series(151, 300);
5273
step s1r: ROLLBACK;
53-
step s1_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c ON c.conrelid = i.inhrelid AND c.consrc IS NOT NULL WHERE i.inhparent = 'range_rel'::regclass::oid ORDER BY c.oid;
74+
step s1_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c
75+
ON c.conrelid = i.inhrelid
76+
WHERE i.inhparent = 'range_rel'::regclass
77+
ORDER BY c.oid;
5478
consrc
5579

80+
5681
((id >= 1) AND (id < 101))
82+
5783
((id >= 101) AND (id < 201))
84+
5885
((id >= 201) AND (id < 301))
5986
step s2b: BEGIN;
60-
step s2_insert_150: INSERT INTO range_rel SELECT generate_series(1, 150);
87+
step s2_insert_150: INSERT INTO range_rel SELECT generate_series(1, 150);
6188
step s2c: COMMIT;
62-
step s2_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c ON c.conrelid = i.inhrelid AND c.consrc IS NOT NULL WHERE i.inhparent = 'range_rel'::regclass::oid ORDER BY c.oid;
89+
step s2_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c
90+
ON c.conrelid = i.inhrelid
91+
WHERE i.inhparent = 'range_rel'::regclass
92+
ORDER BY c.oid;
6393
consrc
6494

95+
6596
((id >= 1) AND (id < 101))
97+
6698
((id >= 101) AND (id < 201))
99+
67100
((id >= 201) AND (id < 301))
68101

69102
starting permutation: s1b s1_insert_150 s2b s2_insert_300 s1r s2r s2_show_partitions
70103
set_spawn_using_bgw
71104

72105

73106
step s1b: BEGIN;
74-
step s1_insert_150: INSERT INTO range_rel SELECT generate_series(1, 150);
107+
step s1_insert_150: INSERT INTO range_rel SELECT generate_series(1, 150);
75108
step s2b: BEGIN;
76109
step s2_insert_300: INSERT INTO range_rel SELECT generate_series(151, 300);
77110
step s1r: ROLLBACK;
78111
step s2r: ROLLBACK;
79-
step s2_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c ON c.conrelid = i.inhrelid AND c.consrc IS NOT NULL WHERE i.inhparent = 'range_rel'::regclass::oid ORDER BY c.oid;
112+
step s2_show_partitions: SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c
113+
ON c.conrelid = i.inhrelid
114+
WHERE i.inhparent = 'range_rel'::regclass
115+
ORDER BY c.oid;
80116
consrc
81117

118+
82119
((id >= 1) AND (id < 101))
120+
83121
((id >= 101) AND (id < 201))
122+
84123
((id >= 201) AND (id < 301))

‎specs/for_update.spec

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ teardown
1313
}
1414

1515
session "s1"
16-
step "s1_b" { begin; }
17-
step "s1_c" { commit; }
18-
step "s1_r" { rollback; }
19-
step "s1_update" { update test_tbl set id = 2 where id = 1; }
16+
step "s1_b" { begin; }
17+
step "s1_c" { commit; }
18+
step "s1_r" { rollback; }
19+
step "s1_update" { update test_tbl set id = 2 where id = 1; }
2020

2121
session "s2"
22-
step "s2_b" { begin; }
23-
step "s2_c" { commit; }
24-
step "s2_select_locked" { select * from test_tbl where id = 1 for share; }
25-
step "s2_select" { select * from test_tbl where id = 1; }
22+
step "s2_b" { begin; }
23+
step "s2_c" { commit; }
24+
step "s2_select_locked" { select * from test_tbl where id = 1 for share; }
25+
step "s2_select" { select * from test_tbl where id = 1; }
2626

2727

2828
permutation "s1_b" "s1_update" "s2_select" "s1_r"

‎specs/insert_nodes.spec

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,26 @@ teardown
1414
}
1515

1616
session "s1"
17-
step "s1b" { BEGIN; }
18-
step "s1_insert_150" { INSERT INTO range_rel SELECT generate_series(1, 150); }
19-
step "s1_insert_300" { INSERT INTO range_rel SELECT generate_series(151, 300); }
20-
step "s1_show_partitions" { SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c ON c.conrelid = i.inhrelid AND c.consrc IS NOT NULL WHERE i.inhparent = 'range_rel'::regclass::oid ORDER BY c.oid; }
21-
step "s1r" { ROLLBACK; }
22-
step "s1c" { COMMIT; }
17+
step "s1b" { BEGIN; }
18+
step "s1_insert_150" { INSERT INTO range_rel SELECT generate_series(1, 150); }
19+
step "s1_insert_300" { INSERT INTO range_rel SELECT generate_series(151, 300); }
20+
step "s1_show_partitions" { SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c
21+
ON c.conrelid = i.inhrelid
22+
WHERE i.inhparent = 'range_rel'::regclass
23+
ORDER BY c.oid; }
24+
step "s1r" { ROLLBACK; }
25+
step "s1c" { COMMIT; }
2326

2427
session "s2"
25-
step "s2b" { BEGIN; }
26-
step "s2_insert_150" { INSERT INTO range_rel SELECT generate_series(1, 150); }
27-
step "s2_insert_300" { INSERT INTO range_rel SELECT generate_series(151, 300); }
28-
step "s2_show_partitions" { SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c ON c.conrelid = i.inhrelid AND c.consrc IS NOT NULL WHERE i.inhparent = 'range_rel'::regclass::oid ORDER BY c.oid; }
29-
step "s2r" { ROLLBACK; }
30-
step "s2c" { COMMIT; }
28+
step "s2b" { BEGIN; }
29+
step "s2_insert_150" { INSERT INTO range_rel SELECT generate_series(1, 150); }
30+
step "s2_insert_300" { INSERT INTO range_rel SELECT generate_series(151, 300); }
31+
step "s2_show_partitions" { SELECT c.consrc FROM pg_inherits i LEFT JOIN pg_constraint c
32+
ON c.conrelid = i.inhrelid
33+
WHERE i.inhparent = 'range_rel'::regclass
34+
ORDER BY c.oid; }
35+
step "s2r" { ROLLBACK; }
36+
step "s2c" { COMMIT; }
3137

3238
# Rollback first transactions
3339
permutation "s1b" "s1_insert_150" "s1r" "s1_show_partitions" "s2b" "s2_insert_150" "s2c" "s2_show_partitions"

‎specs/rollback_on_create_partitions.spec

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ teardown
1111
}
1212

1313
session "s1"
14-
step "begin" { BEGIN; }
15-
step "rollback" { ROLLBACK; }
16-
step "commit" { COMMIT; }
17-
step "insert_data" { INSERT INTO range_rel SELECT generate_series(1, 10000); }
18-
step "create_partitions" { SELECT create_range_partitions('range_rel', 'id', 1, 1000); }
19-
step "drop_partitions" { SELECT drop_partitions('range_rel'); }
20-
step "savepoint_a" { SAVEPOINT a; }
21-
step "rollback_a" { ROLLBACK TO SAVEPOINT a; }
22-
step "savepoint_b" { SAVEPOINT b; }
23-
step "rollback_b" { ROLLBACK TO SAVEPOINT b; }
24-
step "savepoint_c" { SAVEPOINT c; }
25-
step "show_rel" { EXPLAIN (COSTS OFF) SELECT * FROM range_rel; }
14+
step "begin" { BEGIN; }
15+
step "rollback" { ROLLBACK; }
16+
step "commit" { COMMIT; }
17+
step "insert_data" { INSERT INTO range_rel SELECT generate_series(1, 10000); }
18+
step "create_partitions" { SELECT create_range_partitions('range_rel', 'id', 1, 1000); }
19+
step "drop_partitions" { SELECT drop_partitions('range_rel'); }
20+
step "savepoint_a" { SAVEPOINT a; }
21+
step "rollback_a" { ROLLBACK TO SAVEPOINT a; }
22+
step "savepoint_b" { SAVEPOINT b; }
23+
step "rollback_b" { ROLLBACK TO SAVEPOINT b; }
24+
step "savepoint_c" { SAVEPOINT c; }
25+
step "show_rel" { EXPLAIN (COSTS OFF) SELECT * FROM range_rel; }
2626

2727
permutation "begin" "insert_data" "create_partitions" "show_rel" "rollback" "show_rel"
2828

0 commit comments

Comments
 (0)