Skip to content

Commit 7d8f937

Browse files
craig[bot]yuzefovichstevendanna
committed
142774: roachtest/pg_regress: update and improve the runner r=yuzefovich a=yuzefovich This PR improves the pg_regress setup by splitting the large `regression.diffs` file into a separate diff file for each sub-test which should make reviewing of the changes going forward easier. Additionally it adds automatic handling of `_version_` markers. It unskips `oidjoins` file. It also accepts diffs that have been accumulated over the last several months. Several issues have been filed to track separately. Please see each commit for more details. Fixes: #137482 Release note: None 143357: kvserver: deflake TestLeaseTransferReplicatesLocks r=yuzefovich a=stevendanna If the Txn closure retries for some reason, this test would fail with a close-of-closed-channel panic. I've been unable to reproduce this to better describe why this transaction might see a retry. Epic: none Release note: None Co-authored-by: Yahor Yuzefovich <[email protected]> Co-authored-by: Steven Danna <[email protected]>
3 parents 87b5f83 + 1e7de30 + 58bf21e commit 7d8f937

File tree

193 files changed

+263175
-264837
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

193 files changed

+263175
-264837
lines changed

‎pkg/cmd/roachtest/testdata/pg_regress/advisory_lock.diffs‎

Lines changed: 245 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,245 @@
1+
diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/advisory_lock.out --label=/mnt/data1/postgres/src/test/regress/results/advisory_lock.out /mnt/data1/postgres/src/test/regress/expected/advisory_lock.out /mnt/data1/postgres/src/test/regress/results/advisory_lock.out
2+
--- /mnt/data1/postgres/src/test/regress/expected/advisory_lock.out
3+
+++ /mnt/data1/postgres/src/test/regress/results/advisory_lock.out
4+
@@ -6,48 +6,21 @@
5+
SELECT
6+
pg_advisory_xact_lock(1), pg_advisory_xact_lock_shared(2),
7+
pg_advisory_xact_lock(1, 1), pg_advisory_xact_lock_shared(2, 2);
8+
- pg_advisory_xact_lock | pg_advisory_xact_lock_shared | pg_advisory_xact_lock | pg_advisory_xact_lock_shared
9+
------------------------+------------------------------+-----------------------+------------------------------
10+
- | | |
11+
-(1 row)
12+
-
13+
+ERROR: unknown function: pg_advisory_xact_lock()
14+
SELECT locktype, classid, objid, objsubid, mode, granted
15+
FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
16+
ORDER BY classid, objid, objsubid;
17+
- locktype | classid | objid | objsubid | mode | granted
18+
-----------+---------+-------+----------+---------------+---------
19+
- advisory | 0 | 1 | 1 | ExclusiveLock | t
20+
- advisory | 0 | 2 | 1 | ShareLock | t
21+
- advisory | 1 | 1 | 2 | ExclusiveLock | t
22+
- advisory | 2 | 2 | 2 | ShareLock | t
23+
-(4 rows)
24+
-
25+
+ERROR: current transaction is aborted, commands ignored until end of transaction block
26+
-- pg_advisory_unlock_all() shouldn't release xact locks
27+
SELECT pg_advisory_unlock_all();
28+
- pg_advisory_unlock_all
29+
-------------------------
30+
-
31+
-(1 row)
32+
-
33+
+ERROR: current transaction is aborted, commands ignored until end of transaction block
34+
SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid;
35+
- count
36+
--------
37+
- 4
38+
-(1 row)
39+
-
40+
+ERROR: current transaction is aborted, commands ignored until end of transaction block
41+
-- can't unlock xact locks
42+
SELECT
43+
pg_advisory_unlock(1), pg_advisory_unlock_shared(2),
44+
pg_advisory_unlock(1, 1), pg_advisory_unlock_shared(2, 2);
45+
-WARNING: you don't own a lock of type ExclusiveLock
46+
-WARNING: you don't own a lock of type ShareLock
47+
-WARNING: you don't own a lock of type ExclusiveLock
48+
-WARNING: you don't own a lock of type ShareLock
49+
- pg_advisory_unlock | pg_advisory_unlock_shared | pg_advisory_unlock | pg_advisory_unlock_shared
50+
---------------------+---------------------------+--------------------+---------------------------
51+
- f | f | f | f
52+
-(1 row)
53+
-
54+
+ERROR: current transaction is aborted, commands ignored until end of transaction block
55+
-- automatically release xact locks at commit
56+
COMMIT;
57+
SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid;
58+
@@ -61,41 +34,22 @@
59+
SELECT
60+
pg_advisory_xact_lock(1), pg_advisory_xact_lock_shared(2),
61+
pg_advisory_xact_lock(1, 1), pg_advisory_xact_lock_shared(2, 2);
62+
- pg_advisory_xact_lock | pg_advisory_xact_lock_shared | pg_advisory_xact_lock | pg_advisory_xact_lock_shared
63+
------------------------+------------------------------+-----------------------+------------------------------
64+
- | | |
65+
-(1 row)
66+
-
67+
+ERROR: unknown function: pg_advisory_xact_lock()
68+
SELECT locktype, classid, objid, objsubid, mode, granted
69+
FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
70+
ORDER BY classid, objid, objsubid;
71+
- locktype | classid | objid | objsubid | mode | granted
72+
-----------+---------+-------+----------+---------------+---------
73+
- advisory | 0 | 1 | 1 | ExclusiveLock | t
74+
- advisory | 0 | 2 | 1 | ShareLock | t
75+
- advisory | 1 | 1 | 2 | ExclusiveLock | t
76+
- advisory | 2 | 2 | 2 | ShareLock | t
77+
-(4 rows)
78+
-
79+
+ERROR: current transaction is aborted, commands ignored until end of transaction block
80+
SELECT
81+
pg_advisory_lock(1), pg_advisory_lock_shared(2),
82+
pg_advisory_lock(1, 1), pg_advisory_lock_shared(2, 2);
83+
- pg_advisory_lock | pg_advisory_lock_shared | pg_advisory_lock | pg_advisory_lock_shared
84+
-------------------+-------------------------+------------------+-------------------------
85+
- | | |
86+
-(1 row)
87+
-
88+
+ERROR: current transaction is aborted, commands ignored until end of transaction block
89+
ROLLBACK;
90+
SELECT locktype, classid, objid, objsubid, mode, granted
91+
FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
92+
ORDER BY classid, objid, objsubid;
93+
- locktype | classid | objid | objsubid | mode | granted
94+
-----------+---------+-------+----------+---------------+---------
95+
- advisory | 0 | 1 | 1 | ExclusiveLock | t
96+
- advisory | 0 | 2 | 1 | ShareLock | t
97+
- advisory | 1 | 1 | 2 | ExclusiveLock | t
98+
- advisory | 2 | 2 | 2 | ShareLock | t
99+
-(4 rows)
100+
+ locktype | classid | objid | objsubid | mode | granted
101+
+----------+---------+-------+----------+------+---------
102+
+(0 rows)
103+
104+
-- unlocking session locks
105+
SELECT
106+
@@ -103,13 +57,9 @@
107+
pg_advisory_unlock_shared(2), pg_advisory_unlock_shared(2),
108+
pg_advisory_unlock(1, 1), pg_advisory_unlock(1, 1),
109+
pg_advisory_unlock_shared(2, 2), pg_advisory_unlock_shared(2, 2);
110+
-WARNING: you don't own a lock of type ExclusiveLock
111+
-WARNING: you don't own a lock of type ShareLock
112+
-WARNING: you don't own a lock of type ExclusiveLock
113+
-WARNING: you don't own a lock of type ShareLock
114+
pg_advisory_unlock | pg_advisory_unlock | pg_advisory_unlock_shared | pg_advisory_unlock_shared | pg_advisory_unlock | pg_advisory_unlock | pg_advisory_unlock_shared | pg_advisory_unlock_shared
115+
--------------------+--------------------+---------------------------+---------------------------+--------------------+--------------------+---------------------------+---------------------------
116+
- t | f | t | f | t | f | t | f
117+
+ t | t | t | t | t | t | t | t
118+
(1 row)
119+
120+
SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid;
121+
@@ -123,41 +73,22 @@
122+
SELECT
123+
pg_advisory_lock(1), pg_advisory_lock_shared(2),
124+
pg_advisory_lock(1, 1), pg_advisory_lock_shared(2, 2);
125+
- pg_advisory_lock | pg_advisory_lock_shared | pg_advisory_lock | pg_advisory_lock_shared
126+
-------------------+-------------------------+------------------+-------------------------
127+
- | | |
128+
-(1 row)
129+
-
130+
+ERROR: unknown function: pg_advisory_lock()
131+
SELECT locktype, classid, objid, objsubid, mode, granted
132+
FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
133+
ORDER BY classid, objid, objsubid;
134+
- locktype | classid | objid | objsubid | mode | granted
135+
-----------+---------+-------+----------+---------------+---------
136+
- advisory | 0 | 1 | 1 | ExclusiveLock | t
137+
- advisory | 0 | 2 | 1 | ShareLock | t
138+
- advisory | 1 | 1 | 2 | ExclusiveLock | t
139+
- advisory | 2 | 2 | 2 | ShareLock | t
140+
-(4 rows)
141+
-
142+
+ERROR: current transaction is aborted, commands ignored until end of transaction block
143+
SELECT
144+
pg_advisory_xact_lock(1), pg_advisory_xact_lock_shared(2),
145+
pg_advisory_xact_lock(1, 1), pg_advisory_xact_lock_shared(2, 2);
146+
- pg_advisory_xact_lock | pg_advisory_xact_lock_shared | pg_advisory_xact_lock | pg_advisory_xact_lock_shared
147+
------------------------+------------------------------+-----------------------+------------------------------
148+
- | | |
149+
-(1 row)
150+
-
151+
+ERROR: current transaction is aborted, commands ignored until end of transaction block
152+
ROLLBACK;
153+
SELECT locktype, classid, objid, objsubid, mode, granted
154+
FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
155+
ORDER BY classid, objid, objsubid;
156+
- locktype | classid | objid | objsubid | mode | granted
157+
-----------+---------+-------+----------+---------------+---------
158+
- advisory | 0 | 1 | 1 | ExclusiveLock | t
159+
- advisory | 0 | 2 | 1 | ShareLock | t
160+
- advisory | 1 | 1 | 2 | ExclusiveLock | t
161+
- advisory | 2 | 2 | 2 | ShareLock | t
162+
-(4 rows)
163+
+ locktype | classid | objid | objsubid | mode | granted
164+
+----------+---------+-------+----------+------+---------
165+
+(0 rows)
166+
167+
-- releasing all session locks
168+
SELECT pg_advisory_unlock_all();
169+
@@ -179,22 +110,11 @@
170+
pg_advisory_xact_lock_shared(2), pg_advisory_xact_lock_shared(2),
171+
pg_advisory_xact_lock(1, 1), pg_advisory_xact_lock(1, 1),
172+
pg_advisory_xact_lock_shared(2, 2), pg_advisory_xact_lock_shared(2, 2);
173+
- pg_advisory_xact_lock | pg_advisory_xact_lock | pg_advisory_xact_lock_shared | pg_advisory_xact_lock_shared | pg_advisory_xact_lock | pg_advisory_xact_lock | pg_advisory_xact_lock_shared | pg_advisory_xact_lock_shared
174+
------------------------+-----------------------+------------------------------+------------------------------+-----------------------+-----------------------+------------------------------+------------------------------
175+
- | | | | | | |
176+
-(1 row)
177+
-
178+
+ERROR: unknown function: pg_advisory_xact_lock()
179+
SELECT locktype, classid, objid, objsubid, mode, granted
180+
FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
181+
ORDER BY classid, objid, objsubid;
182+
- locktype | classid | objid | objsubid | mode | granted
183+
-----------+---------+-------+----------+---------------+---------
184+
- advisory | 0 | 1 | 1 | ExclusiveLock | t
185+
- advisory | 0 | 2 | 1 | ShareLock | t
186+
- advisory | 1 | 1 | 2 | ExclusiveLock | t
187+
- advisory | 2 | 2 | 2 | ShareLock | t
188+
-(4 rows)
189+
-
190+
+ERROR: current transaction is aborted, commands ignored until end of transaction block
191+
COMMIT;
192+
SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid;
193+
count
194+
@@ -208,21 +128,13 @@
195+
pg_advisory_lock_shared(2), pg_advisory_lock_shared(2),
196+
pg_advisory_lock(1, 1), pg_advisory_lock(1, 1),
197+
pg_advisory_lock_shared(2, 2), pg_advisory_lock_shared(2, 2);
198+
- pg_advisory_lock | pg_advisory_lock | pg_advisory_lock_shared | pg_advisory_lock_shared | pg_advisory_lock | pg_advisory_lock | pg_advisory_lock_shared | pg_advisory_lock_shared
199+
-------------------+------------------+-------------------------+-------------------------+------------------+------------------+-------------------------+-------------------------
200+
- | | | | | | |
201+
-(1 row)
202+
-
203+
+ERROR: unknown function: pg_advisory_lock()
204+
SELECT locktype, classid, objid, objsubid, mode, granted
205+
FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
206+
ORDER BY classid, objid, objsubid;
207+
- locktype | classid | objid | objsubid | mode | granted
208+
-----------+---------+-------+----------+---------------+---------
209+
- advisory | 0 | 1 | 1 | ExclusiveLock | t
210+
- advisory | 0 | 2 | 1 | ShareLock | t
211+
- advisory | 1 | 1 | 2 | ExclusiveLock | t
212+
- advisory | 2 | 2 | 2 | ShareLock | t
213+
-(4 rows)
214+
+ locktype | classid | objid | objsubid | mode | granted
215+
+----------+---------+-------+----------+------+---------
216+
+(0 rows)
217+
218+
SELECT
219+
pg_advisory_unlock(1), pg_advisory_unlock(1),
220+
@@ -246,21 +158,13 @@
221+
pg_advisory_lock_shared(2), pg_advisory_lock_shared(2),
222+
pg_advisory_lock(1, 1), pg_advisory_lock(1, 1),
223+
pg_advisory_lock_shared(2, 2), pg_advisory_lock_shared(2, 2);
224+
- pg_advisory_lock | pg_advisory_lock | pg_advisory_lock_shared | pg_advisory_lock_shared | pg_advisory_lock | pg_advisory_lock | pg_advisory_lock_shared | pg_advisory_lock_shared
225+
-------------------+------------------+-------------------------+-------------------------+------------------+------------------+-------------------------+-------------------------
226+
- | | | | | | |
227+
-(1 row)
228+
-
229+
+ERROR: unknown function: pg_advisory_lock()
230+
SELECT locktype, classid, objid, objsubid, mode, granted
231+
FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
232+
ORDER BY classid, objid, objsubid;
233+
- locktype | classid | objid | objsubid | mode | granted
234+
-----------+---------+-------+----------+---------------+---------
235+
- advisory | 0 | 1 | 1 | ExclusiveLock | t
236+
- advisory | 0 | 2 | 1 | ShareLock | t
237+
- advisory | 1 | 1 | 2 | ExclusiveLock | t
238+
- advisory | 2 | 2 | 2 | ShareLock | t
239+
-(4 rows)
240+
+ locktype | classid | objid | objsubid | mode | granted
241+
+----------+---------+-------+----------+------+---------
242+
+(0 rows)
243+
244+
SELECT pg_advisory_unlock_all();
245+
pg_advisory_unlock_all

0 commit comments

Comments
 (0)