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

Commit62fd1af

Browse files
committed
Strip whitespace from SQL blocks in the isolation test suite. This is purely
cosmetic, it removes a lot of IMHO ugly whitespace from the expected output.
1 parent0f7acbe commit62fd1af

15 files changed

+3059
-3059
lines changed

‎src/test/isolation/expected/classroom-scheduling.out

Lines changed: 120 additions & 120 deletions
Large diffs are not rendered by default.
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
Parsed test spec with 2 sessions
22

33
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';
4+
step ins: INSERT INTO bar VALUES (42);
5+
step com: COMMIT;
6+
step upd: UPDATE foo SET b = 'Hello World';
77

88
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;
9+
step ins: INSERT INTO bar VALUES (42);
10+
step upd: UPDATE foo SET b = 'Hello World'; <waiting ...>
11+
step com: COMMIT;
1212
step upd: <... completed>
1313

1414
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;
15+
step upd: UPDATE foo SET b = 'Hello World';
16+
step ins: INSERT INTO bar VALUES (42);
17+
step com: COMMIT;
Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
11
Parsed test spec with 2 sessions
22

33
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;
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;
1010

1111
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;
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;
1616
step s2i: <... completed>
17-
step s2u:UPDATE parent SET aux = 'baz';
18-
step s2c:COMMIT;
17+
step s2u: UPDATE parent SET aux = 'baz';
18+
step s2c: COMMIT;
1919

2020
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';
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';
2525
step s1u: <... completed>
2626
ERROR: deadlock detected
27-
step s1c:COMMIT;
28-
step s2c:COMMIT;
27+
step s1c: COMMIT;
28+
step s2c: COMMIT;
2929

3030
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';
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';
3535
ERROR: deadlock detected
3636
step s2u: <... completed>
37-
step s2c:COMMIT;
38-
step s1c:COMMIT;
37+
step s2c: COMMIT;
38+
step s1c: COMMIT;
3939

4040
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';
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';
4545
step s1u: <... completed>
4646
ERROR: deadlock detected
47-
step s1c:COMMIT;
48-
step s2c:COMMIT;
47+
step s1c: COMMIT;
48+
step s2c: COMMIT;
4949

5050
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';
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';
5555
ERROR: deadlock detected
5656
step s2u: <... completed>
57-
step s2c:COMMIT;
58-
step s1c:COMMIT;
57+
step s2c: COMMIT;
58+
step s1c: COMMIT;
5959

6060
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;
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;
6565
step s1i: <... completed>
66-
step s1u:UPDATE parent SET aux = 'bar';
67-
step s1c:COMMIT;
66+
step s1u: UPDATE parent SET aux = 'bar';
67+
step s1c: COMMIT;
Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,107 @@
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>
17-
step s2u2:UPDATE B SET Col2 = 1 WHERE BID = 2;
18-
step s2c:COMMIT;
17+
step s2u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
18+
step s2c: COMMIT;
1919

2020
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;
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;
2525
step s1u2: <... completed>
2626
ERROR: deadlock detected
27-
step s1c:COMMIT;
28-
step s2c:COMMIT;
27+
step s1c: COMMIT;
28+
step s2c: COMMIT;
2929

3030
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;
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;
3535
step s1u2: <... completed>
3636
ERROR: deadlock detected
37-
step s2c:COMMIT;
38-
step s1c:COMMIT;
37+
step s2c: COMMIT;
38+
step s1c: COMMIT;
3939

4040
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;
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;
4545
ERROR: deadlock detected
4646
step s2u2: <... completed>
47-
step s1c:COMMIT;
48-
step s2c:COMMIT;
47+
step s1c: COMMIT;
48+
step s2c: COMMIT;
4949

5050
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;
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;
5555
ERROR: deadlock detected
5656
step s2u2: <... completed>
57-
step s2c:COMMIT;
58-
step s1c:COMMIT;
57+
step s2c: COMMIT;
58+
step s1c: COMMIT;
5959

6060
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;
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;
6565
step s1u2: <... completed>
6666
ERROR: deadlock detected
67-
step s1c:COMMIT;
68-
step s2c:COMMIT;
67+
step s1c: COMMIT;
68+
step s2c: COMMIT;
6969

7070
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;
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;
7575
step s1u2: <... completed>
7676
ERROR: deadlock detected
77-
step s2c:COMMIT;
78-
step s1c:COMMIT;
77+
step s2c: COMMIT;
78+
step s1c: COMMIT;
7979

8080
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;
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;
8585
ERROR: deadlock detected
8686
step s2u2: <... completed>
87-
step s1c:COMMIT;
88-
step s2c:COMMIT;
87+
step s1c: COMMIT;
88+
step s2c: COMMIT;
8989

9090
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;
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;
9595
ERROR: deadlock detected
9696
step s2u2: <... completed>
97-
step s2c:COMMIT;
98-
step s1c:COMMIT;
97+
step s2c: COMMIT;
98+
step s1c: COMMIT;
9999

100100
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;
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;
105105
step s1u1: <... completed>
106-
step s1u2:UPDATE B SET Col2 = 1 WHERE BID = 2;
107-
step s1c:COMMIT;
106+
step s1u2: UPDATE B SET Col2 = 1 WHERE BID = 2;
107+
step s1c: COMMIT;
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
Parsed test spec with 4 sessions
22

33
starting permutation: rx1 wx2 c2 wx3 ry3 wy4 rz4 c4 c3 wz1 c1
4-
step rx1:SELECT * FROM t WHERE id = 1000000;
4+
step rx1: SELECT * FROM t WHERE id = 1000000;
55
id txt
66

77
1000000
8-
step wx2:UPDATE t SET txt = 'b' WHERE id = 1000000;
9-
step c2:COMMIT;
10-
step wx3:UPDATE t SET txt = 'c' WHERE id = 1000000;
11-
step ry3:SELECT * FROM t WHERE id = 500000;
8+
step wx2: UPDATE t SET txt = 'b' WHERE id = 1000000;
9+
step c2: COMMIT;
10+
step wx3: UPDATE t SET txt = 'c' WHERE id = 1000000;
11+
step ry3: SELECT * FROM t WHERE id = 500000;
1212
id txt
1313

1414
500000
15-
step wy4:UPDATE t SET txt = 'd' WHERE id = 500000;
16-
step rz4:SELECT * FROM t WHERE id = 1;
15+
step wy4: UPDATE t SET txt = 'd' WHERE id = 500000;
16+
step rz4: SELECT * FROM t WHERE id = 1;
1717
id txt
1818

1919
1
20-
step c4:COMMIT;
21-
step c3:COMMIT;
22-
step wz1:UPDATE t SET txt = 'a' WHERE id = 1;
20+
step c4: COMMIT;
21+
step c3: COMMIT;
22+
step wz1: UPDATE t SET txt = 'a' WHERE id = 1;
2323
ERROR: could not serialize access due to read/write dependencies among transactions
24-
step c1:COMMIT;
24+
step c1: COMMIT;

0 commit comments

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