Skip to content

Commit cdcffe2

Browse files
anarazelanarazel
committed
Expand EPQ tests for UPDATEs and DELETEs
Previously there was basically no coverage for UPDATEs encountering deleted rows, and no coverage for DELETE having to perform EPQ. That's problematic for an upcoming commit in which EPQ is tought to integrate with tableams. Also, there was no test for UPDATE to encounter a row UPDATEd into another partition. Author: Andres Freund
1 parent e0090c8 commit cdcffe2

File tree

4 files changed

+288
-10
lines changed

4 files changed

+288
-10
lines changed

‎src/test/isolation/expected/eval-plan-qual.out‎

Lines changed: 246 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
Parsed test spec with 3 sessions
22

33
starting permutation: wx1 wx2 c1 c2 read
4-
step wx1: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking';
5-
step wx2: UPDATE accounts SET balance = balance + 450 WHERE accountid = 'checking'; <waiting ...>
4+
step wx1: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking' RETURNING balance;
5+
balance
6+
7+
400
8+
step wx2: UPDATE accounts SET balance = balance + 450 WHERE accountid = 'checking' RETURNING balance; <waiting ...>
69
step c1: COMMIT;
710
step wx2: <... completed>
11+
balance
12+
13+
850
814
step c2: COMMIT;
915
step read: SELECT * FROM accounts ORDER BY accountid;
1016
accountid balance
@@ -13,17 +19,245 @@ checking 850
1319
savings 600
1420

1521
starting permutation: wy1 wy2 c1 c2 read
16-
step wy1: UPDATE accounts SET balance = balance + 500 WHERE accountid = 'checking';
17-
step wy2: UPDATE accounts SET balance = balance + 1000 WHERE accountid = 'checking' AND balance < 1000; <waiting ...>
22+
step wy1: UPDATE accounts SET balance = balance + 500 WHERE accountid = 'checking' RETURNING balance;
23+
balance
24+
25+
1100
26+
step wy2: UPDATE accounts SET balance = balance + 1000 WHERE accountid = 'checking' AND balance < 1000 RETURNING balance; <waiting ...>
1827
step c1: COMMIT;
1928
step wy2: <... completed>
29+
balance
30+
2031
step c2: COMMIT;
2132
step read: SELECT * FROM accounts ORDER BY accountid;
2233
accountid balance
2334

2435
checking 1100
2536
savings 600
2637

38+
starting permutation: wx1 wx2 r1 c2 read
39+
step wx1: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking' RETURNING balance;
40+
balance
41+
42+
400
43+
step wx2: UPDATE accounts SET balance = balance + 450 WHERE accountid = 'checking' RETURNING balance; <waiting ...>
44+
step r1: ROLLBACK;
45+
step wx2: <... completed>
46+
balance
47+
48+
1050
49+
step c2: COMMIT;
50+
step read: SELECT * FROM accounts ORDER BY accountid;
51+
accountid balance
52+
53+
checking 1050
54+
savings 600
55+
56+
starting permutation: wy1 wy2 r1 c2 read
57+
step wy1: UPDATE accounts SET balance = balance + 500 WHERE accountid = 'checking' RETURNING balance;
58+
balance
59+
60+
1100
61+
step wy2: UPDATE accounts SET balance = balance + 1000 WHERE accountid = 'checking' AND balance < 1000 RETURNING balance; <waiting ...>
62+
step r1: ROLLBACK;
63+
step wy2: <... completed>
64+
balance
65+
66+
1600
67+
step c2: COMMIT;
68+
step read: SELECT * FROM accounts ORDER BY accountid;
69+
accountid balance
70+
71+
checking 1600
72+
savings 600
73+
74+
starting permutation: wx1 d1 wx2 c1 c2 read
75+
step wx1: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking' RETURNING balance;
76+
balance
77+
78+
400
79+
step d1: DELETE FROM accounts WHERE accountid = 'checking' AND balance < 1500 RETURNING balance;
80+
balance
81+
82+
400
83+
step wx2: UPDATE accounts SET balance = balance + 450 WHERE accountid = 'checking' RETURNING balance; <waiting ...>
84+
step c1: COMMIT;
85+
step wx2: <... completed>
86+
balance
87+
88+
step c2: COMMIT;
89+
step read: SELECT * FROM accounts ORDER BY accountid;
90+
accountid balance
91+
92+
savings 600
93+
94+
starting permutation: wx2 d1 c2 c1 read
95+
step wx2: UPDATE accounts SET balance = balance + 450 WHERE accountid = 'checking' RETURNING balance;
96+
balance
97+
98+
1050
99+
step d1: DELETE FROM accounts WHERE accountid = 'checking' AND balance < 1500 RETURNING balance; <waiting ...>
100+
step c2: COMMIT;
101+
step d1: <... completed>
102+
balance
103+
104+
1050
105+
step c1: COMMIT;
106+
step read: SELECT * FROM accounts ORDER BY accountid;
107+
accountid balance
108+
109+
savings 600
110+
111+
starting permutation: wx2 wx2 d1 c2 c1 read
112+
step wx2: UPDATE accounts SET balance = balance + 450 WHERE accountid = 'checking' RETURNING balance;
113+
balance
114+
115+
1050
116+
step wx2: UPDATE accounts SET balance = balance + 450 WHERE accountid = 'checking' RETURNING balance;
117+
balance
118+
119+
1500
120+
step d1: DELETE FROM accounts WHERE accountid = 'checking' AND balance < 1500 RETURNING balance; <waiting ...>
121+
step c2: COMMIT;
122+
step d1: <... completed>
123+
balance
124+
125+
step c1: COMMIT;
126+
step read: SELECT * FROM accounts ORDER BY accountid;
127+
accountid balance
128+
129+
checking 1500
130+
savings 600
131+
132+
starting permutation: wx2 d2 d1 c2 c1 read
133+
step wx2: UPDATE accounts SET balance = balance + 450 WHERE accountid = 'checking' RETURNING balance;
134+
balance
135+
136+
1050
137+
step d2: DELETE FROM accounts WHERE accountid = 'checking';
138+
step d1: DELETE FROM accounts WHERE accountid = 'checking' AND balance < 1500 RETURNING balance; <waiting ...>
139+
step c2: COMMIT;
140+
step d1: <... completed>
141+
balance
142+
143+
step c1: COMMIT;
144+
step read: SELECT * FROM accounts ORDER BY accountid;
145+
accountid balance
146+
147+
savings 600
148+
149+
starting permutation: wx1 d1 wx2 r1 c2 read
150+
step wx1: UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking' RETURNING balance;
151+
balance
152+
153+
400
154+
step d1: DELETE FROM accounts WHERE accountid = 'checking' AND balance < 1500 RETURNING balance;
155+
balance
156+
157+
400
158+
step wx2: UPDATE accounts SET balance = balance + 450 WHERE accountid = 'checking' RETURNING balance; <waiting ...>
159+
step r1: ROLLBACK;
160+
step wx2: <... completed>
161+
balance
162+
163+
1050
164+
step c2: COMMIT;
165+
step read: SELECT * FROM accounts ORDER BY accountid;
166+
accountid balance
167+
168+
checking 1050
169+
savings 600
170+
171+
starting permutation: wx2 d1 r2 c1 read
172+
step wx2: UPDATE accounts SET balance = balance + 450 WHERE accountid = 'checking' RETURNING balance;
173+
balance
174+
175+
1050
176+
step d1: DELETE FROM accounts WHERE accountid = 'checking' AND balance < 1500 RETURNING balance; <waiting ...>
177+
step r2: ROLLBACK;
178+
step d1: <... completed>
179+
balance
180+
181+
600
182+
step c1: COMMIT;
183+
step read: SELECT * FROM accounts ORDER BY accountid;
184+
accountid balance
185+
186+
savings 600
187+
188+
starting permutation: wx2 wx2 d1 r2 c1 read
189+
step wx2: UPDATE accounts SET balance = balance + 450 WHERE accountid = 'checking' RETURNING balance;
190+
balance
191+
192+
1050
193+
step wx2: UPDATE accounts SET balance = balance + 450 WHERE accountid = 'checking' RETURNING balance;
194+
balance
195+
196+
1500
197+
step d1: DELETE FROM accounts WHERE accountid = 'checking' AND balance < 1500 RETURNING balance; <waiting ...>
198+
step r2: ROLLBACK;
199+
step d1: <... completed>
200+
balance
201+
202+
600
203+
step c1: COMMIT;
204+
step read: SELECT * FROM accounts ORDER BY accountid;
205+
accountid balance
206+
207+
savings 600
208+
209+
starting permutation: wx2 d2 d1 r2 c1 read
210+
step wx2: UPDATE accounts SET balance = balance + 450 WHERE accountid = 'checking' RETURNING balance;
211+
balance
212+
213+
1050
214+
step d2: DELETE FROM accounts WHERE accountid = 'checking';
215+
step d1: DELETE FROM accounts WHERE accountid = 'checking' AND balance < 1500 RETURNING balance; <waiting ...>
216+
step r2: ROLLBACK;
217+
step d1: <... completed>
218+
balance
219+
220+
600
221+
step c1: COMMIT;
222+
step read: SELECT * FROM accounts ORDER BY accountid;
223+
accountid balance
224+
225+
savings 600
226+
227+
starting permutation: d1 wx2 c1 c2 read
228+
step d1: DELETE FROM accounts WHERE accountid = 'checking' AND balance < 1500 RETURNING balance;
229+
balance
230+
231+
600
232+
step wx2: UPDATE accounts SET balance = balance + 450 WHERE accountid = 'checking' RETURNING balance; <waiting ...>
233+
step c1: COMMIT;
234+
step wx2: <... completed>
235+
balance
236+
237+
step c2: COMMIT;
238+
step read: SELECT * FROM accounts ORDER BY accountid;
239+
accountid balance
240+
241+
savings 600
242+
243+
starting permutation: d1 wx2 r1 c2 read
244+
step d1: DELETE FROM accounts WHERE accountid = 'checking' AND balance < 1500 RETURNING balance;
245+
balance
246+
247+
600
248+
step wx2: UPDATE accounts SET balance = balance + 450 WHERE accountid = 'checking' RETURNING balance; <waiting ...>
249+
step r1: ROLLBACK;
250+
step wx2: <... completed>
251+
balance
252+
253+
1050
254+
step c2: COMMIT;
255+
step read: SELECT * FROM accounts ORDER BY accountid;
256+
accountid balance
257+
258+
checking 1050
259+
savings 600
260+
27261
starting permutation: upsert1 upsert2 c1 c2 read
28262
step upsert1:
29263
WITH upsert AS
@@ -106,7 +340,10 @@ a b c
106340
step c2: COMMIT;
107341

108342
starting permutation: wx2 partiallock c2 c1 read
109-
step wx2: UPDATE accounts SET balance = balance + 450 WHERE accountid = 'checking';
343+
step wx2: UPDATE accounts SET balance = balance + 450 WHERE accountid = 'checking' RETURNING balance;
344+
balance
345+
346+
1050
110347
step partiallock:
111348
SELECT * FROM accounts a1, accounts a2
112349
WHERE a1.accountid = a2.accountid
@@ -126,7 +363,10 @@ checking 1050
126363
savings 600
127364

128365
starting permutation: wx2 lockwithvalues c2 c1 read
129-
step wx2: UPDATE accounts SET balance = balance + 450 WHERE accountid = 'checking';
366+
step wx2: UPDATE accounts SET balance = balance + 450 WHERE accountid = 'checking' RETURNING balance;
367+
balance
368+
369+
1050
130370
step lockwithvalues:
131371
SELECT * FROM accounts a1, (values('checking'),('savings')) v(id)
132372
WHERE a1.accountid = v.id

‎src/test/isolation/expected/partition-key-update-1.out‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,16 @@ step s2d: <... completed>
1818
error in steps s1c s2d: ERROR: tuple to be deleted was already moved to another partition due to concurrent update
1919
step s2c: COMMIT;
2020

21+
starting permutation: s1b s2b s1u s2u s1c s2c
22+
step s1b: BEGIN ISOLATION LEVEL READ COMMITTED;
23+
step s2b: BEGIN ISOLATION LEVEL READ COMMITTED;
24+
step s1u: UPDATE foo SET a=2 WHERE a=1;
25+
step s2u: UPDATE foo SET b='EFG' WHERE a=1; <waiting ...>
26+
step s1c: COMMIT;
27+
step s2u: <... completed>
28+
error in steps s1c s2u: ERROR: tuple to be updated was already moved to another partition due to concurrent update
29+
step s2c: COMMIT;
30+
2131
starting permutation: s1b s2b s2d s1u s2c s1c
2232
step s1b: BEGIN ISOLATION LEVEL READ COMMITTED;
2333
step s2b: BEGIN ISOLATION LEVEL READ COMMITTED;

‎src/test/isolation/specs/eval-plan-qual.spec‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,16 @@ teardown
4242
session "s1"
4343
setup { BEGIN ISOLATION LEVEL READ COMMITTED; }
4444
# wx1 then wx2 checks the basic case of re-fetching up-to-date values
45-
step "wx1" { UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking'; }
45+
step "wx1" { UPDATE accounts SET balance = balance - 200 WHERE accountid = 'checking' RETURNING balance; }
4646
# wy1 then wy2 checks the case where quals pass then fail
47-
step "wy1" { UPDATE accounts SET balance = balance + 500 WHERE accountid = 'checking'; }
47+
step "wy1" { UPDATE accounts SET balance = balance + 500 WHERE accountid = 'checking' RETURNING balance; }
48+
49+
# d1 then wx1 checks that update can deal with the updated row vanishing
50+
# wx2 then d1 checks that the delete affects the updated row
51+
# wx2, wx2 then d1 checks that the delete checks the quals correctly (balance too high)
52+
# wx2, d2, then d1 checks that delete handles a vanishing row correctly
53+
step "d1" { DELETE FROM accounts WHERE accountid = 'checking' AND balance < 1500 RETURNING balance; }
54+
4855
# upsert tests are to check writable-CTE cases
4956
step "upsert1" {
5057
WITH upsert AS
@@ -64,6 +71,7 @@ step "readp1" { SELECT tableoid::regclass, ctid, * FROM p WHERE b IN (0, 1) AND
6471
step "writep1" { UPDATE p SET b = -1 WHERE a = 1 AND b = 1 AND c = 0; }
6572
step "writep2" { UPDATE p SET b = -b WHERE a = 1 AND c = 0; }
6673
step "c1" { COMMIT; }
74+
step "r1" { ROLLBACK; }
6775

6876
# these tests are meant to exercise EvalPlanQualFetchRowMarks,
6977
# ie, handling non-locked tables in an EvalPlanQual recheck
@@ -128,8 +136,10 @@ step "selectresultforupdate" {
128136

129137
session "s2"
130138
setup { BEGIN ISOLATION LEVEL READ COMMITTED; }
131-
step "wx2" { UPDATE accounts SET balance = balance + 450 WHERE accountid = 'checking'; }
132-
step "wy2" { UPDATE accounts SET balance = balance + 1000 WHERE accountid = 'checking' AND balance < 1000; }
139+
step "wx2" { UPDATE accounts SET balance = balance + 450 WHERE accountid = 'checking' RETURNING balance; }
140+
step "wy2" { UPDATE accounts SET balance = balance + 1000 WHERE accountid = 'checking' AND balance < 1000 RETURNING balance; }
141+
step "d2" { DELETE FROM accounts WHERE accountid = 'checking'; }
142+
133143
step "upsert2" {
134144
WITH upsert AS
135145
(UPDATE accounts SET balance = balance + 1234
@@ -161,6 +171,7 @@ step "updateforcip3" {
161171
step "wrtwcte" { UPDATE table_a SET value = 'tableAValue2' WHERE id = 1; }
162172
step "wrjt" { UPDATE jointest SET data = 42 WHERE id = 7; }
163173
step "c2" { COMMIT; }
174+
step "r2" { ROLLBACK; }
164175

165176
session "s3"
166177
setup { BEGIN ISOLATION LEVEL READ COMMITTED; }
@@ -192,8 +203,24 @@ step "multireadwcte" {
192203

193204
teardown { COMMIT; }
194205

206+
# test that normal update follows update chains, and reverifies quals
195207
permutation "wx1" "wx2" "c1" "c2" "read"
196208
permutation "wy1" "wy2" "c1" "c2" "read"
209+
permutation "wx1" "wx2" "r1" "c2" "read"
210+
permutation "wy1" "wy2" "r1" "c2" "read"
211+
212+
# test that deletes follow chains, and if necessary reverifies quals
213+
permutation "wx1" "d1" "wx2" "c1" "c2" "read"
214+
permutation "wx2" "d1" "c2" "c1" "read"
215+
permutation "wx2" "wx2" "d1" "c2" "c1" "read"
216+
permutation "wx2" "d2" "d1" "c2" "c1" "read"
217+
permutation "wx1" "d1" "wx2" "r1" "c2" "read"
218+
permutation "wx2" "d1" "r2" "c1" "read"
219+
permutation "wx2" "wx2" "d1" "r2" "c1" "read"
220+
permutation "wx2" "d2" "d1" "r2" "c1" "read"
221+
permutation "d1" "wx2" "c1" "c2" "read"
222+
permutation "d1" "wx2" "r1" "c2" "read"
223+
197224
permutation "upsert1" "upsert2" "c1" "c2" "read"
198225
permutation "readp1" "writep1" "readp2" "c1" "c2"
199226
permutation "writep2" "returningp1" "c1" "c2"

‎src/test/isolation/specs/partition-key-update-1.spec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ step "s2c" { COMMIT; }
6666
# Concurrency error from ExecUpdate and ExecDelete.
6767
permutation "s1b" "s2b" "s1u" "s1c" "s2d" "s2c"
6868
permutation "s1b" "s2b" "s1u" "s2d" "s1c" "s2c"
69+
permutation "s1b" "s2b" "s1u" "s2u" "s1c" "s2c"
6970
permutation "s1b" "s2b" "s2d" "s1u" "s2c" "s1c"
7071

7172
# Concurrency error from GetTupleForTrigger

0 commit comments

Comments
 (0)