Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit f18795e

Browse files
alvherrealvherre
committed
Update FK alternative test output to new whitespace rules
With these changes, the isolation tests pass again on isolation levels serializable and repeatable read. Author: Kevin Grittner
1 parent d1d3886 commit f18795e

File tree

3 files changed

+174
-174
lines changed

3 files changed

+174
-174
lines changed

‎src/test/isolation/expected/fk-deadlock2_1.out

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,110 @@
11
Parsed test spec with 2 sessions
22

33
starting permutation: s1u1 s1u2 s1c s2u1 s2u2 s2c
4-
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
5-
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
6-
step s1c: COMMIT;
7-
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
8-
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
9-
step s2c: COMMIT;
4+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
5+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
6+
step s1c: COMMIT;
7+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
8+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
9+
step s2c: COMMIT;
1010

1111
starting permutation: s1u1 s1u2 s2u1 s1c s2u2 s2c
12-
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
13-
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
14-
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
15-
step s1c: COMMIT;
12+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
13+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
14+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
15+
step s1c: COMMIT;
1616
step s2u1: <... completed>
1717
ERROR: could not serialize access due to concurrent update
18-
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
18+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
1919
ERROR: current transaction is aborted, commands ignored until end of transaction block
20-
step s2c: COMMIT;
20+
step s2c: COMMIT;
2121

2222
starting permutation: s1u1 s2u1 s1u2 s2u2 s1c s2c
23-
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
24-
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
25-
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
26-
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
23+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
24+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
25+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
26+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
2727
step s1u2: <... completed>
2828
ERROR: deadlock detected
29-
step s1c: COMMIT;
30-
step s2c: COMMIT;
29+
step s1c: COMMIT;
30+
step s2c: COMMIT;
3131

3232
starting permutation: s1u1 s2u1 s1u2 s2u2 s2c s1c
33-
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
34-
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
35-
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
36-
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
33+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
34+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
35+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
36+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
3737
step s1u2: <... completed>
3838
ERROR: deadlock detected
39-
step s2c: COMMIT;
40-
step s1c: COMMIT;
39+
step s2c: COMMIT;
40+
step s1c: COMMIT;
4141

4242
starting permutation: s1u1 s2u1 s2u2 s1u2 s1c s2c
43-
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
44-
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
45-
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
46-
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
43+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
44+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
45+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
46+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
4747
ERROR: deadlock detected
4848
step s2u2: <... completed>
49-
step s1c: COMMIT;
50-
step s2c: COMMIT;
49+
step s1c: COMMIT;
50+
step s2c: COMMIT;
5151

5252
starting permutation: s1u1 s2u1 s2u2 s1u2 s2c s1c
53-
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
54-
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
55-
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
56-
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
53+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
54+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
55+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
56+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
5757
ERROR: deadlock detected
5858
step s2u2: <... completed>
59-
step s2c: COMMIT;
60-
step s1c: COMMIT;
59+
step s2c: COMMIT;
60+
step s1c: COMMIT;
6161

6262
starting permutation: s2u1 s1u1 s1u2 s2u2 s1c s2c
63-
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
64-
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
65-
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
66-
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
63+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
64+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
65+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
66+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
6767
step s1u2: <... completed>
6868
ERROR: deadlock detected
69-
step s1c: COMMIT;
70-
step s2c: COMMIT;
69+
step s1c: COMMIT;
70+
step s2c: COMMIT;
7171

7272
starting permutation: s2u1 s1u1 s1u2 s2u2 s2c s1c
73-
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
74-
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
75-
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
76-
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
73+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
74+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
75+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
76+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
7777
step s1u2: <... completed>
7878
ERROR: deadlock detected
79-
step s2c: COMMIT;
80-
step s1c: COMMIT;
79+
step s2c: COMMIT;
80+
step s1c: COMMIT;
8181

8282
starting permutation: s2u1 s1u1 s2u2 s1u2 s1c s2c
83-
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
84-
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
85-
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
86-
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
83+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
84+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
85+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
86+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
8787
ERROR: deadlock detected
8888
step s2u2: <... completed>
89-
step s1c: COMMIT;
90-
step s2c: COMMIT;
89+
step s1c: COMMIT;
90+
step s2c: COMMIT;
9191

9292
starting permutation: s2u1 s1u1 s2u2 s1u2 s2c s1c
93-
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
94-
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
95-
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
96-
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
93+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
94+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
95+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
96+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
9797
ERROR: deadlock detected
9898
step s2u2: <... completed>
99-
step s2c: COMMIT;
100-
step s1c: COMMIT;
99+
step s2c: COMMIT;
100+
step s1c: COMMIT;
101101

102102
starting permutation: s2u1 s2u2 s1u1 s2c s1u2 s1c
103-
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
104-
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
105-
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1; <waiting ...>
106-
step s2c: COMMIT;
103+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
104+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
105+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1; <waiting ...>
106+
step s2c: COMMIT;
107107
step s1u1: <... completed>
108-
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
108+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
109109
ERROR: could not serialize access due to read/write dependencies among transactions
110-
step s1c: COMMIT;
110+
step s1c: COMMIT;

‎src/test/isolation/expected/fk-deadlock2_2.out

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,110 @@
11
Parsed test spec with 2 sessions
22

33
starting permutation: s1u1 s1u2 s1c s2u1 s2u2 s2c
4-
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
5-
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
6-
step s1c: COMMIT;
7-
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
8-
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
9-
step s2c: COMMIT;
4+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
5+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
6+
step s1c: COMMIT;
7+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
8+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
9+
step s2c: COMMIT;
1010

1111
starting permutation: s1u1 s1u2 s2u1 s1c s2u2 s2c
12-
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
13-
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
14-
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
15-
step s1c: COMMIT;
12+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
13+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
14+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
15+
step s1c: COMMIT;
1616
step s2u1: <... completed>
1717
ERROR: could not serialize access due to concurrent update
18-
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
18+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
1919
ERROR: current transaction is aborted, commands ignored until end of transaction block
20-
step s2c: COMMIT;
20+
step s2c: COMMIT;
2121

2222
starting permutation: s1u1 s2u1 s1u2 s2u2 s1c s2c
23-
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
24-
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
25-
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
26-
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
23+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
24+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
25+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
26+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
2727
step s1u2: <... completed>
2828
ERROR: deadlock detected
29-
step s1c: COMMIT;
30-
step s2c: COMMIT;
29+
step s1c: COMMIT;
30+
step s2c: COMMIT;
3131

3232
starting permutation: s1u1 s2u1 s1u2 s2u2 s2c s1c
33-
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
34-
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
35-
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
36-
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
33+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
34+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
35+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
36+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
3737
step s1u2: <... completed>
3838
ERROR: deadlock detected
39-
step s2c: COMMIT;
40-
step s1c: COMMIT;
39+
step s2c: COMMIT;
40+
step s1c: COMMIT;
4141

4242
starting permutation: s1u1 s2u1 s2u2 s1u2 s1c s2c
43-
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
44-
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
45-
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
46-
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
43+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
44+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
45+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
46+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
4747
ERROR: deadlock detected
4848
step s2u2: <... completed>
49-
step s1c: COMMIT;
50-
step s2c: COMMIT;
49+
step s1c: COMMIT;
50+
step s2c: COMMIT;
5151

5252
starting permutation: s1u1 s2u1 s2u2 s1u2 s2c s1c
53-
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
54-
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
55-
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
56-
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
53+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
54+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
55+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
56+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
5757
ERROR: deadlock detected
5858
step s2u2: <... completed>
59-
step s2c: COMMIT;
60-
step s1c: COMMIT;
59+
step s2c: COMMIT;
60+
step s1c: COMMIT;
6161

6262
starting permutation: s2u1 s1u1 s1u2 s2u2 s1c s2c
63-
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
64-
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
65-
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
66-
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
63+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
64+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
65+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
66+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
6767
step s1u2: <... completed>
6868
ERROR: deadlock detected
69-
step s1c: COMMIT;
70-
step s2c: COMMIT;
69+
step s1c: COMMIT;
70+
step s2c: COMMIT;
7171

7272
starting permutation: s2u1 s1u1 s1u2 s2u2 s2c s1c
73-
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
74-
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
75-
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
76-
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
73+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
74+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
75+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
76+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
7777
step s1u2: <... completed>
7878
ERROR: deadlock detected
79-
step s2c: COMMIT;
80-
step s1c: COMMIT;
79+
step s2c: COMMIT;
80+
step s1c: COMMIT;
8181

8282
starting permutation: s2u1 s1u1 s2u2 s1u2 s1c s2c
83-
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
84-
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
85-
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
86-
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
83+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
84+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
85+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
86+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
8787
ERROR: deadlock detected
8888
step s2u2: <... completed>
89-
step s1c: COMMIT;
90-
step s2c: COMMIT;
89+
step s1c: COMMIT;
90+
step s2c: COMMIT;
9191

9292
starting permutation: s2u1 s1u1 s2u2 s1u2 s2c s1c
93-
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
94-
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
95-
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
96-
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
93+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
94+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
95+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
96+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
9797
ERROR: deadlock detected
9898
step s2u2: <... completed>
99-
step s2c: COMMIT;
100-
step s1c: COMMIT;
99+
step s2c: COMMIT;
100+
step s1c: COMMIT;
101101

102102
starting permutation: s2u1 s2u2 s1u1 s2c s1u2 s1c
103-
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
104-
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
105-
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1; <waiting ...>
106-
step s2c: COMMIT;
103+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
104+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
105+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1; <waiting ...>
106+
step s2c: COMMIT;
107107
step s1u1: <... completed>
108-
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
108+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
109109
ERROR: could not serialize access due to concurrent update
110-
step s1c: COMMIT;
110+
step s1c: COMMIT;

0 commit comments

Comments
 (0)