🌐 AI搜索 & 代理 主页
Skip to content

Commit a28e10e

Browse files
alvherrealvherre
committed
Indicate session name in isolationtester notices
When a session under isolationtester produces printable notices (NOTICE, WARNING) we were just printing them unadorned, which can be confusing when debugging. Prefix them with the session name, which makes things clearer. Author: Álvaro Herrera Reviewed-by: Hari Babu Kommi Discussion: https://postgr.es/m/20181024213451.75nh3f3dctmcdbfq@alvherre.pgsql
1 parent 319a810 commit a28e10e

File tree

4 files changed

+50
-19
lines changed

4 files changed

+50
-19
lines changed

‎src/test/isolation/expected/vacuum-concurrent-drop.out‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ step drop_and_commit:
1010
DROP TABLE part2;
1111
COMMIT;
1212

13-
WARNING: skipping vacuum of "part2" --- relation no longer exists
13+
s2: WARNING: skipping vacuum of "part2" --- relation no longer exists
1414
step vac_specified: <... completed>
1515

1616
starting permutation: lock vac_all_parts drop_and_commit
@@ -35,7 +35,7 @@ step drop_and_commit:
3535
DROP TABLE part2;
3636
COMMIT;
3737

38-
WARNING: skipping analyze of "part2" --- relation no longer exists
38+
s2: WARNING: skipping analyze of "part2" --- relation no longer exists
3939
step analyze_specified: <... completed>
4040

4141
starting permutation: lock analyze_all_parts drop_and_commit
@@ -60,7 +60,7 @@ step drop_and_commit:
6060
DROP TABLE part2;
6161
COMMIT;
6262

63-
WARNING: skipping vacuum of "part2" --- relation no longer exists
63+
s2: WARNING: skipping vacuum of "part2" --- relation no longer exists
6464
step vac_analyze_specified: <... completed>
6565

6666
starting permutation: lock vac_analyze_all_parts drop_and_commit

‎src/test/isolation/expected/vacuum-conflict.out‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ starting permutation: s1_begin s1_lock s2_auth s2_vacuum s1_commit s2_reset
44
step s1_begin: BEGIN;
55
step s1_lock: LOCK vacuum_tab IN SHARE UPDATE EXCLUSIVE MODE;
66
step s2_auth: SET ROLE regress_vacuum_conflict;
7-
WARNING: skipping "vacuum_tab" --- only table or database owner can vacuum it
7+
s2: WARNING: skipping "vacuum_tab" --- only table or database owner can vacuum it
88
step s2_vacuum: VACUUM vacuum_tab;
99
step s1_commit: COMMIT;
1010
step s2_reset: RESET ROLE;
1111

1212
starting permutation: s1_begin s2_auth s2_vacuum s1_lock s1_commit s2_reset
1313
step s1_begin: BEGIN;
1414
step s2_auth: SET ROLE regress_vacuum_conflict;
15-
WARNING: skipping "vacuum_tab" --- only table or database owner can vacuum it
15+
s2: WARNING: skipping "vacuum_tab" --- only table or database owner can vacuum it
1616
step s2_vacuum: VACUUM vacuum_tab;
1717
step s1_lock: LOCK vacuum_tab IN SHARE UPDATE EXCLUSIVE MODE;
1818
step s1_commit: COMMIT;
@@ -22,14 +22,14 @@ starting permutation: s1_begin s2_auth s1_lock s2_vacuum s1_commit s2_reset
2222
step s1_begin: BEGIN;
2323
step s2_auth: SET ROLE regress_vacuum_conflict;
2424
step s1_lock: LOCK vacuum_tab IN SHARE UPDATE EXCLUSIVE MODE;
25-
WARNING: skipping "vacuum_tab" --- only table or database owner can vacuum it
25+
s2: WARNING: skipping "vacuum_tab" --- only table or database owner can vacuum it
2626
step s2_vacuum: VACUUM vacuum_tab;
2727
step s1_commit: COMMIT;
2828
step s2_reset: RESET ROLE;
2929

3030
starting permutation: s2_auth s2_vacuum s1_begin s1_lock s1_commit s2_reset
3131
step s2_auth: SET ROLE regress_vacuum_conflict;
32-
WARNING: skipping "vacuum_tab" --- only table or database owner can vacuum it
32+
s2: WARNING: skipping "vacuum_tab" --- only table or database owner can vacuum it
3333
step s2_vacuum: VACUUM vacuum_tab;
3434
step s1_begin: BEGIN;
3535
step s1_lock: LOCK vacuum_tab IN SHARE UPDATE EXCLUSIVE MODE;
@@ -40,15 +40,15 @@ starting permutation: s1_begin s1_lock s2_auth s2_analyze s1_commit s2_reset
4040
step s1_begin: BEGIN;
4141
step s1_lock: LOCK vacuum_tab IN SHARE UPDATE EXCLUSIVE MODE;
4242
step s2_auth: SET ROLE regress_vacuum_conflict;
43-
WARNING: skipping "vacuum_tab" --- only table or database owner can analyze it
43+
s2: WARNING: skipping "vacuum_tab" --- only table or database owner can analyze it
4444
step s2_analyze: ANALYZE vacuum_tab;
4545
step s1_commit: COMMIT;
4646
step s2_reset: RESET ROLE;
4747

4848
starting permutation: s1_begin s2_auth s2_analyze s1_lock s1_commit s2_reset
4949
step s1_begin: BEGIN;
5050
step s2_auth: SET ROLE regress_vacuum_conflict;
51-
WARNING: skipping "vacuum_tab" --- only table or database owner can analyze it
51+
s2: WARNING: skipping "vacuum_tab" --- only table or database owner can analyze it
5252
step s2_analyze: ANALYZE vacuum_tab;
5353
step s1_lock: LOCK vacuum_tab IN SHARE UPDATE EXCLUSIVE MODE;
5454
step s1_commit: COMMIT;
@@ -58,14 +58,14 @@ starting permutation: s1_begin s2_auth s1_lock s2_analyze s1_commit s2_reset
5858
step s1_begin: BEGIN;
5959
step s2_auth: SET ROLE regress_vacuum_conflict;
6060
step s1_lock: LOCK vacuum_tab IN SHARE UPDATE EXCLUSIVE MODE;
61-
WARNING: skipping "vacuum_tab" --- only table or database owner can analyze it
61+
s2: WARNING: skipping "vacuum_tab" --- only table or database owner can analyze it
6262
step s2_analyze: ANALYZE vacuum_tab;
6363
step s1_commit: COMMIT;
6464
step s2_reset: RESET ROLE;
6565

6666
starting permutation: s2_auth s2_analyze s1_begin s1_lock s1_commit s2_reset
6767
step s2_auth: SET ROLE regress_vacuum_conflict;
68-
WARNING: skipping "vacuum_tab" --- only table or database owner can analyze it
68+
s2: WARNING: skipping "vacuum_tab" --- only table or database owner can analyze it
6969
step s2_analyze: ANALYZE vacuum_tab;
7070
step s1_begin: BEGIN;
7171
step s1_lock: LOCK vacuum_tab IN SHARE UPDATE EXCLUSIVE MODE;

‎src/test/isolation/expected/vacuum-skip-locked.out‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ step lock_share:
55
BEGIN;
66
LOCK part1 IN SHARE MODE;
77

8-
WARNING: skipping vacuum of "part1" --- lock not available
8+
s2: WARNING: skipping vacuum of "part1" --- lock not available
99
step vac_specified: VACUUM (SKIP_LOCKED) part1, part2;
1010
step commit:
1111
COMMIT;
@@ -26,7 +26,7 @@ step lock_share:
2626
BEGIN;
2727
LOCK part1 IN SHARE MODE;
2828

29-
WARNING: skipping analyze of "part1" --- lock not available
29+
s2: WARNING: skipping analyze of "part1" --- lock not available
3030
step analyze_specified: ANALYZE (SKIP_LOCKED) part1, part2;
3131
step commit:
3232
COMMIT;
@@ -47,7 +47,7 @@ step lock_share:
4747
BEGIN;
4848
LOCK part1 IN SHARE MODE;
4949

50-
WARNING: skipping vacuum of "part1" --- lock not available
50+
s2: WARNING: skipping vacuum of "part1" --- lock not available
5151
step vac_analyze_specified: VACUUM (ANALYZE, SKIP_LOCKED) part1, part2;
5252
step commit:
5353
COMMIT;
@@ -68,7 +68,7 @@ step lock_share:
6868
BEGIN;
6969
LOCK part1 IN SHARE MODE;
7070

71-
WARNING: skipping vacuum of "part1" --- lock not available
71+
s2: WARNING: skipping vacuum of "part1" --- lock not available
7272
step vac_full_specified: VACUUM (SKIP_LOCKED, FULL) part1, part2;
7373
step commit:
7474
COMMIT;
@@ -89,7 +89,7 @@ step lock_access_exclusive:
8989
BEGIN;
9090
LOCK part1 IN ACCESS EXCLUSIVE MODE;
9191

92-
WARNING: skipping vacuum of "part1" --- lock not available
92+
s2: WARNING: skipping vacuum of "part1" --- lock not available
9393
step vac_specified: VACUUM (SKIP_LOCKED) part1, part2;
9494
step commit:
9595
COMMIT;
@@ -110,7 +110,7 @@ step lock_access_exclusive:
110110
BEGIN;
111111
LOCK part1 IN ACCESS EXCLUSIVE MODE;
112112

113-
WARNING: skipping analyze of "part1" --- lock not available
113+
s2: WARNING: skipping analyze of "part1" --- lock not available
114114
step analyze_specified: ANALYZE (SKIP_LOCKED) part1, part2;
115115
step commit:
116116
COMMIT;
@@ -132,7 +132,7 @@ step lock_access_exclusive:
132132
BEGIN;
133133
LOCK part1 IN ACCESS EXCLUSIVE MODE;
134134

135-
WARNING: skipping vacuum of "part1" --- lock not available
135+
s2: WARNING: skipping vacuum of "part1" --- lock not available
136136
step vac_analyze_specified: VACUUM (ANALYZE, SKIP_LOCKED) part1, part2;
137137
step commit:
138138
COMMIT;
@@ -154,7 +154,7 @@ step lock_access_exclusive:
154154
BEGIN;
155155
LOCK part1 IN ACCESS EXCLUSIVE MODE;
156156

157-
WARNING: skipping vacuum of "part1" --- lock not available
157+
s2: WARNING: skipping vacuum of "part1" --- lock not available
158158
step vac_full_specified: VACUUM (SKIP_LOCKED, FULL) part1, part2;
159159
step commit:
160160
COMMIT;

‎src/test/isolation/isolationtester.c‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ static int step_qsort_cmp(const void *a, const void *b);
4848
static int step_bsearch_cmp(const void *a, const void *b);
4949

5050
static void printResultSet(PGresult *res);
51+
static void isotesterNoticeProcessor(void *arg, const char *message);
52+
static void blackholeNoticeProcessor(void *arg, const char *message);
5153

5254
/* close all connections and exit */
5355
static void
@@ -171,6 +173,21 @@ main(int argc, char **argv)
171173
exit_nicely();
172174
}
173175

176+
/*
177+
* Set up notice processors for the user-defined connections, so that
178+
* messages can get printed prefixed with the session names. The
179+
* control connection gets a "blackhole" processor instead (hides all
180+
* messages).
181+
*/
182+
if (i != 0)
183+
PQsetNoticeProcessor(conns[i],
184+
isotesterNoticeProcessor,
185+
(void *) (testspec->sessions[i - 1]->name));
186+
else
187+
PQsetNoticeProcessor(conns[i],
188+
blackholeNoticeProcessor,
189+
NULL);
190+
174191
/*
175192
* Suppress NOTIFY messages, which otherwise pop into results at odd
176193
* places.
@@ -881,3 +898,17 @@ printResultSet(PGresult *res)
881898
printf("\n");
882899
}
883900
}
901+
902+
/* notice processor, prefixes each message with the session name */
903+
static void
904+
isotesterNoticeProcessor(void *arg, const char *message)
905+
{
906+
fprintf(stderr, "%s: %s", (char *) arg, message);
907+
}
908+
909+
/* notice processor, hides the message */
910+
static void
911+
blackholeNoticeProcessor(void *arg, const char *message)
912+
{
913+
/* do nothing */
914+
}

0 commit comments

Comments
 (0)