Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit846af54

Browse files
committed
Add support for blocked commands in isolationtester
This enables us to test that blocking commands (such as foreign keyschecks that conflict with some other lock) act as intended. The set oftests that this adds is pretty minimal, but can easily be extended byadding new specs.The intention is that this will serve as a basis for ensuring thatfurther tweaks of locking implementation preserve (or improve) existingbehavior.Author: Noah Misch
1 parentfd6913a commit846af54

File tree

9 files changed

+524
-30
lines changed

9 files changed

+524
-30
lines changed

‎src/test/isolation/README

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,16 @@ permutation "<step name>" ...
6363
all possible overlapping orderings of the given sessions.
6464

6565
Lines beginning with a # are considered comments.
66+
67+
68+
Support for blocking commands
69+
=============================
70+
71+
Each spec may contain commands that block until further action has been taken
72+
(most likely, some other session runs a step that unblocks it or causes a
73+
deadlock). Such a spec needs to be careful to manually specify valid
74+
permutations, i.e. those that would not expect a blocked session to execute a
75+
command. If the spec fails to follow that rule, the spec is aborted.
76+
77+
Only one command can be waiting at a time. As long as one command is waiting,
78+
other commands are run to completion synchronously.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
Parsed test spec with 2 sessions
2+
3+
starting permutation: ins com upd
4+
step ins: INSERT INTO bar VALUES (42);
5+
step com: COMMIT;
6+
step upd: UPDATE foo SET b = 'Hello World';
7+
8+
starting permutation: ins upd com
9+
step ins: INSERT INTO bar VALUES (42);
10+
step upd: UPDATE foo SET b = 'Hello World'; <waiting ...>
11+
step com: COMMIT;
12+
step upd: <... completed>
13+
14+
starting permutation: upd ins com
15+
step upd: UPDATE foo SET b = 'Hello World';
16+
step ins: INSERT INTO bar VALUES (42);
17+
step com: COMMIT;
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
Parsed test spec with 2 sessions
2+
3+
starting permutation: s1i s1u s1c s2i s2u s2c
4+
step s1i: INSERT INTO child VALUES (1, 1);
5+
step s1u: UPDATE parent SET aux = 'bar';
6+
step s1c: COMMIT;
7+
step s2i: INSERT INTO child VALUES (2, 1);
8+
step s2u: UPDATE parent SET aux = 'baz';
9+
step s2c: COMMIT;
10+
11+
starting permutation: s1i s1u s2i s1c s2u s2c
12+
step s1i: INSERT INTO child VALUES (1, 1);
13+
step s1u: UPDATE parent SET aux = 'bar';
14+
step s2i: INSERT INTO child VALUES (2, 1); <waiting ...>
15+
step s1c: COMMIT;
16+
step s2i: <... completed>
17+
step s2u: UPDATE parent SET aux = 'baz';
18+
step s2c: COMMIT;
19+
20+
starting permutation: s1i s2i s1u s2u s1c s2c
21+
step s1i: INSERT INTO child VALUES (1, 1);
22+
step s2i: INSERT INTO child VALUES (2, 1);
23+
step s1u: UPDATE parent SET aux = 'bar'; <waiting ...>
24+
step s2u: UPDATE parent SET aux = 'baz';
25+
step s1u: <... completed>
26+
ERROR: deadlock detected
27+
step s1c: COMMIT;
28+
step s2c: COMMIT;
29+
30+
starting permutation: s1i s2i s2u s1u s2c s1c
31+
step s1i: INSERT INTO child VALUES (1, 1);
32+
step s2i: INSERT INTO child VALUES (2, 1);
33+
step s2u: UPDATE parent SET aux = 'baz'; <waiting ...>
34+
step s1u: UPDATE parent SET aux = 'bar';
35+
step s2u: <... completed>
36+
ERROR: deadlock detected
37+
step s2c: COMMIT;
38+
step s1c: COMMIT;
39+
40+
starting permutation: s2i s1i s1u s2u s1c s2c
41+
step s2i: INSERT INTO child VALUES (2, 1);
42+
step s1i: INSERT INTO child VALUES (1, 1);
43+
step s1u: UPDATE parent SET aux = 'bar'; <waiting ...>
44+
step s2u: UPDATE parent SET aux = 'baz';
45+
step s1u: <... completed>
46+
ERROR: deadlock detected
47+
step s1c: COMMIT;
48+
step s2c: COMMIT;
49+
50+
starting permutation: s2i s1i s2u s1u s2c s1c
51+
step s2i: INSERT INTO child VALUES (2, 1);
52+
step s1i: INSERT INTO child VALUES (1, 1);
53+
step s2u: UPDATE parent SET aux = 'baz'; <waiting ...>
54+
step s1u: UPDATE parent SET aux = 'bar';
55+
step s2u: <... completed>
56+
ERROR: deadlock detected
57+
step s2c: COMMIT;
58+
step s1c: COMMIT;
59+
60+
starting permutation: s2i s2u s1i s2c s1u s1c
61+
step s2i: INSERT INTO child VALUES (2, 1);
62+
step s2u: UPDATE parent SET aux = 'baz';
63+
step s1i: INSERT INTO child VALUES (1, 1); <waiting ...>
64+
step s2c: COMMIT;
65+
step s1i: <... completed>
66+
step s1u: UPDATE parent SET aux = 'bar';
67+
step s1c: COMMIT;
Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
Parsed test spec with 2 sessions
2+
3+
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;
10+
11+
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;
16+
step s2u1: <... completed>
17+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
18+
step s2c: COMMIT;
19+
20+
starting permutation: s1u1 s2u1 s1u2 s2u2 s1c s2c
21+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
22+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
23+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
24+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
25+
step s1u2: <... completed>
26+
ERROR: deadlock detected
27+
step s1c: COMMIT;
28+
step s2c: COMMIT;
29+
30+
starting permutation: s1u1 s2u1 s1u2 s2u2 s2c s1c
31+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
32+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
33+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
34+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
35+
step s1u2: <... completed>
36+
ERROR: deadlock detected
37+
step s2c: COMMIT;
38+
step s1c: COMMIT;
39+
40+
starting permutation: s1u1 s2u1 s2u2 s1u2 s1c s2c
41+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
42+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
43+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
44+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
45+
step s2u2: <... completed>
46+
ERROR: deadlock detected
47+
step s1c: COMMIT;
48+
step s2c: COMMIT;
49+
50+
starting permutation: s1u1 s2u1 s2u2 s1u2 s2c s1c
51+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
52+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
53+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
54+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
55+
step s2u2: <... completed>
56+
ERROR: deadlock detected
57+
step s2c: COMMIT;
58+
step s1c: COMMIT;
59+
60+
starting permutation: s2u1 s1u1 s1u2 s2u2 s1c s2c
61+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
62+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
63+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
64+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
65+
step s1u2: <... completed>
66+
ERROR: deadlock detected
67+
step s1c: COMMIT;
68+
step s2c: COMMIT;
69+
70+
starting permutation: s2u1 s1u1 s1u2 s2u2 s2c s1c
71+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
72+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
73+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
74+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
75+
step s1u2: <... completed>
76+
ERROR: deadlock detected
77+
step s2c: COMMIT;
78+
step s1c: COMMIT;
79+
80+
starting permutation: s2u1 s1u1 s2u2 s1u2 s1c s2c
81+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
82+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
83+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
84+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
85+
step s2u2: <... completed>
86+
ERROR: deadlock detected
87+
step s1c: COMMIT;
88+
step s2c: COMMIT;
89+
90+
starting permutation: s2u1 s1u1 s2u2 s1u2 s2c s1c
91+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
92+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1;
93+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2; <waiting ...>
94+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
95+
step s2u2: <... completed>
96+
ERROR: deadlock detected
97+
step s2c: COMMIT;
98+
step s1c: COMMIT;
99+
100+
starting permutation: s2u1 s2u2 s1u1 s2c s1u2 s1c
101+
step s2u1: UPDATE B SET Col2 = 1 WHERE BID = 2;
102+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
103+
step s1u1: UPDATE A SET Col1 = 1 WHERE AID = 1; <waiting ...>
104+
step s2c: COMMIT;
105+
step s1u1: <... completed>
106+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
107+
step s1c: COMMIT;

‎src/test/isolation/isolation_schedule

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ test: ri-trigger
99
test: partial-index
1010
test: two-ids
1111
test: multiple-row-versions
12+
test: fk-contention
13+
test: fk-deadlock
14+
test: fk-deadlock2

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp