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

Commitebd4992

Browse files
committed
Don't drop NOTICE messages in isolation tests.
For its entire existence, isolationtester.c has forced client_min_messagesto WARNING, but that seems like a very poor choice of test design. Itshould be up to individual test scripts to manage whether they emit noticesand to ensure that the results are stable. (There were no NOTICE messagesin the original set of isolation tests, so this was certainly dead codewhen committed, but perhaps it was needed at some earlier point.)It's possible that the original motivation was due to platform-dependentvariations in the timing of stdout vs. stderr output. That should bemoot since commits73bcb76/6eda3e9c2, but just in case, adjustisotesterNoticeProcessor to print to stdout not stderr. (stderr seemslike the wrong thing anyway: it should be for error printouts not expectedtest output.)Testing shows that the notices in insert-conflict-specconflict are indeeda bit timing-unstable on very slow machines, so hide them; maybe we canimprove that later. Also, make the notices in plpgsql-toast a bit lessverbose than the original code would've had them.Discussion:https://postgr.es/m/14616.1564251339@sss.pgh.pa.us
1 parent5ab892c commitebd4992

File tree

4 files changed

+22
-23
lines changed

4 files changed

+22
-23
lines changed

‎src/test/isolation/expected/plpgsql-toast.out

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ do $$
2222
delete from test1;
2323
commit;
2424
perform pg_advisory_lock(1);
25-
raise notice 'x = %',x;
25+
raise notice 'length(x) = %',length(x);
2626
end;
2727
$$;
2828
<waiting ...>
@@ -35,6 +35,7 @@ step unlock:
3535
pg_advisory_unlock
3636

3737
t
38+
s1: NOTICE: length(x) = 6000
3839
step assign1: <... completed>
3940

4041
starting permutation: lock assign2 vacuum unlock
@@ -59,7 +60,7 @@ do $$
5960
delete from test1;
6061
commit;
6162
perform pg_advisory_lock(1);
62-
raise notice 'x = %',x;
63+
raise notice 'length(x) = %',length(x);
6364
end;
6465
$$;
6566
<waiting ...>
@@ -72,6 +73,7 @@ step unlock:
7273
pg_advisory_unlock
7374

7475
t
76+
s1: NOTICE: length(x) = 6000
7577
step assign2: <... completed>
7678

7779
starting permutation: lock assign3 vacuum unlock
@@ -97,7 +99,7 @@ do $$
9799
delete from test1;
98100
commit;
99101
perform pg_advisory_lock(1);
100-
raise notice 'r = %',r;
102+
raise notice 'length(r) = %',length(r::text);
101103
end;
102104
$$;
103105
<waiting ...>
@@ -110,6 +112,7 @@ step unlock:
110112
pg_advisory_unlock
111113

112114
t
115+
s1: NOTICE: length(r) = 6004
113116
step assign3: <... completed>
114117

115118
starting permutation: lock assign4 vacuum unlock
@@ -134,7 +137,7 @@ do $$
134137
delete from test1;
135138
commit;
136139
perform pg_advisory_lock(1);
137-
raise notice 'r = %',r;
140+
raise notice 'length(r) = %',length(r::text);
138141
end;
139142
$$;
140143
<waiting ...>
@@ -147,6 +150,7 @@ step unlock:
147150
pg_advisory_unlock
148151

149152
t
153+
s1: NOTICE: length(r) = 6004
150154
step assign4: <... completed>
151155

152156
starting permutation: lock assign5 vacuum unlock
@@ -173,7 +177,7 @@ do $$
173177
delete from test1;
174178
commit;
175179
perform pg_advisory_lock(1);
176-
raise notice 'r = %',r;
180+
raise notice 'length(r) = %',length(r::text);
177181
end;
178182
$$;
179183
<waiting ...>
@@ -186,4 +190,5 @@ step unlock:
186190
pg_advisory_unlock
187191

188192
t
193+
s1: NOTICE: length(r) = 6002
189194
step assign5: <... completed>

‎src/test/isolation/isolationtester.c

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -187,18 +187,6 @@ main(int argc, char **argv)
187187
blackholeNoticeProcessor,
188188
NULL);
189189

190-
/*
191-
* Suppress NOTIFY messages, which otherwise pop into results at odd
192-
* places.
193-
*/
194-
res=PQexec(conns[i],"SET client_min_messages = warning;");
195-
if (PQresultStatus(res)!=PGRES_COMMAND_OK)
196-
{
197-
fprintf(stderr,"message level setup failed: %s",PQerrorMessage(conns[i]));
198-
exit(1);
199-
}
200-
PQclear(res);
201-
202190
/* Get the backend pid for lock wait checking. */
203191
res=PQexec(conns[i],"SELECT pg_catalog.pg_backend_pid()");
204192
if (PQresultStatus(res)==PGRES_TUPLES_OK)
@@ -899,7 +887,7 @@ printResultSet(PGresult *res)
899887
staticvoid
900888
isotesterNoticeProcessor(void*arg,constchar*message)
901889
{
902-
fprintf(stderr,"%s: %s", (char*)arg,message);
890+
printf("%s: %s", (char*)arg,message);
903891
}
904892

905893
/* notice processor, hides the message */

‎src/test/isolation/specs/insert-conflict-specconflict.spec

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ session "s1"
5151
setup
5252
{
5353
SETdefault_transaction_isolation='read committed';
54+
--onveryslowmachines,thenoticescomeoutinunpredictableorder,
55+
--sohidethem
56+
SETclient_min_messages=warning;
5457
SETspec.session=1;
5558
}
5659
step"s1_begin"{BEGIN;}
@@ -61,6 +64,9 @@ session "s2"
6164
setup
6265
{
6366
SETdefault_transaction_isolation='read committed';
67+
--onveryslowmachines,thenoticescomeoutinunpredictableorder,
68+
--sohidethem
69+
SETclient_min_messages=warning;
6470
SETspec.session=2;
6571
}
6672
step"s2_begin"{BEGIN;}

‎src/test/isolation/specs/plpgsql-toast.spec

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ do $$
4040
deletefromtest1;
4141
commit;
4242
performpg_advisory_lock(1);
43-
raisenotice'x = %',x;
43+
raisenotice'length(x) = %',length(x);
4444
end;
4545
$$;
4646
}
@@ -56,7 +56,7 @@ do $$
5656
deletefromtest1;
5757
commit;
5858
performpg_advisory_lock(1);
59-
raisenotice'x = %',x;
59+
raisenotice'length(x) = %',length(x);
6060
end;
6161
$$;
6262
}
@@ -73,7 +73,7 @@ do $$
7373
deletefromtest1;
7474
commit;
7575
performpg_advisory_lock(1);
76-
raisenotice'r = %',r;
76+
raisenotice'length(r) = %',length(r::text);
7777
end;
7878
$$;
7979
}
@@ -89,7 +89,7 @@ do $$
8989
deletefromtest1;
9090
commit;
9191
performpg_advisory_lock(1);
92-
raisenotice'r = %',r;
92+
raisenotice'length(r) = %',length(r::text);
9393
end;
9494
$$;
9595
}
@@ -107,7 +107,7 @@ do $$
107107
deletefromtest1;
108108
commit;
109109
performpg_advisory_lock(1);
110-
raisenotice'r = %',r;
110+
raisenotice'length(r) = %',length(r::text);
111111
end;
112112
$$;
113113
}

0 commit comments

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