NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitb101683

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.)Back-patch of commitebd4992 into v12. I'll separately push thisinto older branches, but this is as much change as v12 needs.Discussion:https://postgr.es/m/14616.1564251339@sss.pgh.pa.usDiscussion:https://postgr.es/m/E1i7IqC-0000Uc-5H@gemulon.postgresql.org

1 parent97fb88e commitb101683Copy full SHA for b101683

File tree

4 files changed

+54

-23

lines changed

src/test/isolation
- expected
  - insert-conflict-specconflict.out
  - plpgsql-toast.out
- isolationtester.c
- specs
  - plpgsql-toast.spec

4 files changed

+54

-23

lines changed

`‎src/test/isolation/expected/insert-conflict-specconflict.out`

Lines changed: 38 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,11 @@ pg_advisory_locksess lock`
`13`	`13`	`step controller_show: SELECT * FROM upserttest;`
`14`	`14`	`key data`
`15`	`15`
	`16`	`+s1: NOTICE: called for k1`
	`17`	`+s1: NOTICE: blocking 3`
`16`	`18`	`step s1_upsert: INSERT INTO upserttest(key, data) VALUES('k1', 'inserted s1') ON CONFLICT (blurt_and_lock(key)) DO UPDATE SET data = upserttest.data \|\| ' with conflict update s1'; <waiting ...>`
	`19`	`+s2: NOTICE: called for k1`
	`20`	`+s2: NOTICE: blocking 3`
`17`	`21`	`step s2_upsert: INSERT INTO upserttest(key, data) VALUES('k1', 'inserted s2') ON CONFLICT (blurt_and_lock(key)) DO UPDATE SET data = upserttest.data \|\| ' with conflict update s2'; <waiting ...>`
`18`	`22`	`step controller_show: SELECT * FROM upserttest;`
`19`	`23`	`key data`
`@@ -30,10 +34,14 @@ step controller_unlock_1_3: SELECT pg_advisory_unlock(1, 3);`
`30`	`34`	`pg_advisory_unlock`
`31`	`35`
`32`	`36`	`t`
	`37`	`+s1: NOTICE: called for k1`
	`38`	`+s1: NOTICE: blocking 2`
`33`	`39`	`step controller_unlock_2_3: SELECT pg_advisory_unlock(2, 3);`
`34`	`40`	`pg_advisory_unlock`
`35`	`41`
`36`	`42`	`t`
	`43`	`+s2: NOTICE: called for k1`
	`44`	`+s2: NOTICE: blocking 2`
`37`	`45`	`step controller_show: SELECT * FROM upserttest;`
`38`	`46`	`key data`
`39`	`47`
`@@ -50,6 +58,10 @@ step controller_unlock_1_2: SELECT pg_advisory_unlock(1, 2);`
`50`	`58`	`pg_advisory_unlock`
`51`	`59`
`52`	`60`	`t`
	`61`	`+s1: NOTICE: called for k1`
	`62`	`+s1: NOTICE: blocking 2`
	`63`	`+s1: NOTICE: called for k1`
	`64`	`+s1: NOTICE: blocking 2`
`53`	`65`	`step s1_upsert: <... completed>`
`54`	`66`	`step controller_show: SELECT * FROM upserttest;`
`55`	`67`	`key data`
`@@ -69,7 +81,11 @@ pg_advisory_locksess lock`
`69`	`81`	`step controller_show: SELECT * FROM upserttest;`
`70`	`82`	`key data`
`71`	`83`
	`84`	`+s1: NOTICE: called for k1`
	`85`	`+s1: NOTICE: blocking 3`
`72`	`86`	`step s1_upsert: INSERT INTO upserttest(key, data) VALUES('k1', 'inserted s1') ON CONFLICT (blurt_and_lock(key)) DO UPDATE SET data = upserttest.data \|\| ' with conflict update s1'; <waiting ...>`
	`87`	`+s2: NOTICE: called for k1`
	`88`	`+s2: NOTICE: blocking 3`
`73`	`89`	`step s2_upsert: INSERT INTO upserttest(key, data) VALUES('k1', 'inserted s2') ON CONFLICT (blurt_and_lock(key)) DO UPDATE SET data = upserttest.data \|\| ' with conflict update s2'; <waiting ...>`
`74`	`90`	`step controller_show: SELECT * FROM upserttest;`
`75`	`91`	`key data`
`@@ -86,10 +102,14 @@ step controller_unlock_1_3: SELECT pg_advisory_unlock(1, 3);`
`86`	`102`	`pg_advisory_unlock`
`87`	`103`
`88`	`104`	`t`
	`105`	`+s1: NOTICE: called for k1`
	`106`	`+s1: NOTICE: blocking 2`
`89`	`107`	`step controller_unlock_2_3: SELECT pg_advisory_unlock(2, 3);`
`90`	`108`	`pg_advisory_unlock`
`91`	`109`
`92`	`110`	`t`
	`111`	`+s2: NOTICE: called for k1`
	`112`	`+s2: NOTICE: blocking 2`
`93`	`113`	`step controller_show: SELECT * FROM upserttest;`
`94`	`114`	`key data`
`95`	`115`
`@@ -106,6 +126,10 @@ step controller_unlock_2_2: SELECT pg_advisory_unlock(2, 2);`
`106`	`126`	`pg_advisory_unlock`
`107`	`127`
`108`	`128`	`t`
	`129`	`+s2: NOTICE: called for k1`
	`130`	`+s2: NOTICE: blocking 2`
	`131`	`+s2: NOTICE: called for k1`
	`132`	`+s2: NOTICE: blocking 2`
`109`	`133`	`step s2_upsert: <... completed>`
`110`	`134`	`step controller_show: SELECT * FROM upserttest;`
`111`	`135`	`key data`
`@@ -127,7 +151,11 @@ key data`
`127`	`151`
`128`	`152`	`step s1_begin: BEGIN;`
`129`	`153`	`step s2_begin: BEGIN;`
	`154`	`+s1: NOTICE: called for k1`
	`155`	`+s1: NOTICE: blocking 3`
`130`	`156`	`step s1_upsert: INSERT INTO upserttest(key, data) VALUES('k1', 'inserted s1') ON CONFLICT (blurt_and_lock(key)) DO UPDATE SET data = upserttest.data \|\| ' with conflict update s1'; <waiting ...>`
	`157`	`+s2: NOTICE: called for k1`
	`158`	`+s2: NOTICE: blocking 3`
`131`	`159`	`step s2_upsert: INSERT INTO upserttest(key, data) VALUES('k1', 'inserted s2') ON CONFLICT (blurt_and_lock(key)) DO UPDATE SET data = upserttest.data \|\| ' with conflict update s2'; <waiting ...>`
`132`	`160`	`step controller_show: SELECT * FROM upserttest;`
`133`	`161`	`key data`
`@@ -144,10 +172,14 @@ step controller_unlock_1_3: SELECT pg_advisory_unlock(1, 3);`
`144`	`172`	`pg_advisory_unlock`
`145`	`173`
`146`	`174`	`t`
	`175`	`+s1: NOTICE: called for k1`
	`176`	`+s1: NOTICE: blocking 2`
`147`	`177`	`step controller_unlock_2_3: SELECT pg_advisory_unlock(2, 3);`
`148`	`178`	`pg_advisory_unlock`
`149`	`179`
`150`	`180`	`t`
	`181`	`+s2: NOTICE: called for k1`
	`182`	`+s2: NOTICE: blocking 2`
`151`	`183`	`step controller_show: SELECT * FROM upserttest;`
`152`	`184`	`key data`
`153`	`185`
`@@ -163,10 +195,16 @@ step controller_unlock_2_2: SELECT pg_advisory_unlock(2, 2);`
`163`	`195`	`pg_advisory_unlock`
`164`	`196`
`165`	`197`	`t`
	`198`	`+s2: NOTICE: called for k1`
	`199`	`+s2: NOTICE: blocking 2`
	`200`	`+s2: NOTICE: called for k1`
	`201`	`+s2: NOTICE: blocking 2`
`166`	`202`	`step controller_show: SELECT * FROM upserttest;`
`167`	`203`	`key data`
`168`	`204`
`169`	`205`	`step s1_commit: COMMIT;`
	`206`	`+s2: NOTICE: called for k1`
	`207`	`+s2: NOTICE: blocking 2`
`170`	`208`	`step s2_upsert: <... completed>`
`171`	`209`	`step controller_show: SELECT * FROM upserttest;`
`172`	`210`	`key data`

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

Lines changed: 10 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ do $$`
`22`	`22`	`delete from test1;`
`23`	`23`	`commit;`
`24`	`24`	`perform pg_advisory_lock(1);`
`25`		`- raise notice 'x = %',x;`
	`25`	`+ raise notice 'length(x) = %',length(x);`
`26`	`26`	`end;`
`27`	`27`	`$$;`
`28`	`28`	`<waiting ...>`
`@@ -35,6 +35,7 @@ step unlock:`
`35`	`35`	`pg_advisory_unlock`
`36`	`36`
`37`	`37`	`t`
	`38`	`+s1: NOTICE: length(x) = 6000`
`38`	`39`	`step assign1: <... completed>`
`39`	`40`
`40`	`41`	`starting permutation: lock assign2 vacuum unlock`
`@@ -59,7 +60,7 @@ do $$`
`59`	`60`	`delete from test1;`
`60`	`61`	`commit;`
`61`	`62`	`perform pg_advisory_lock(1);`
`62`		`- raise notice 'x = %',x;`
	`63`	`+ raise notice 'length(x) = %',length(x);`
`63`	`64`	`end;`
`64`	`65`	`$$;`
`65`	`66`	`<waiting ...>`
`@@ -72,6 +73,7 @@ step unlock:`
`72`	`73`	`pg_advisory_unlock`
`73`	`74`
`74`	`75`	`t`
	`76`	`+s1: NOTICE: length(x) = 6000`
`75`	`77`	`step assign2: <... completed>`
`76`	`78`
`77`	`79`	`starting permutation: lock assign3 vacuum unlock`
`@@ -97,7 +99,7 @@ do $$`
`97`	`99`	`delete from test1;`
`98`	`100`	`commit;`
`99`	`101`	`perform pg_advisory_lock(1);`
`100`		`- raise notice 'r = %',r;`
	`102`	`+ raise notice 'length(r) = %',length(r::text);`
`101`	`103`	`end;`
`102`	`104`	`$$;`
`103`	`105`	`<waiting ...>`
`@@ -110,6 +112,7 @@ step unlock:`
`110`	`112`	`pg_advisory_unlock`
`111`	`113`
`112`	`114`	`t`
	`115`	`+s1: NOTICE: length(r) = 6004`
`113`	`116`	`step assign3: <... completed>`
`114`	`117`
`115`	`118`	`starting permutation: lock assign4 vacuum unlock`
`@@ -134,7 +137,7 @@ do $$`
`134`	`137`	`delete from test1;`
`135`	`138`	`commit;`
`136`	`139`	`perform pg_advisory_lock(1);`
`137`		`- raise notice 'r = %',r;`
	`140`	`+ raise notice 'length(r) = %',length(r::text);`
`138`	`141`	`end;`
`139`	`142`	`$$;`
`140`	`143`	`<waiting ...>`
`@@ -147,6 +150,7 @@ step unlock:`
`147`	`150`	`pg_advisory_unlock`
`148`	`151`
`149`	`152`	`t`
	`153`	`+s1: NOTICE: length(r) = 6004`
`150`	`154`	`step assign4: <... completed>`
`151`	`155`
`152`	`156`	`starting permutation: lock assign5 vacuum unlock`
`@@ -173,7 +177,7 @@ do $$`
`173`	`177`	`delete from test1;`
`174`	`178`	`commit;`
`175`	`179`	`perform pg_advisory_lock(1);`
`176`		`- raise notice 'r = %',r;`
	`180`	`+ raise notice 'length(r) = %',length(r::text);`
`177`	`181`	`end;`
`178`	`182`	`$$;`
`179`	`183`	`<waiting ...>`
`@@ -186,4 +190,5 @@ step unlock:`
`186`	`190`	`pg_advisory_unlock`
`187`	`191`
`188`	`192`	`t`
	`193`	`+s1: NOTICE: length(r) = 6002`
`189`	`194`	`step assign5: <... completed>`

`‎src/test/isolation/isolationtester.c`

Lines changed: 1 addition & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -187,18 +187,6 @@ main(int argc, char **argv)`
`187`	`187`	`blackholeNoticeProcessor,`
`188`	`188`	`NULL);`
`189`	`189`
`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`		`-`
`202`	`190`	`/* Get the backend pid for lock wait checking. */`
`203`	`191`	`res=PQexec(conns[i],"SELECT pg_catalog.pg_backend_pid()");`
`204`	`192`	`if (PQresultStatus(res)==PGRES_TUPLES_OK)`
`@@ -921,7 +909,7 @@ printResultSet(PGresult *res)`
`921`	`909`	`staticvoid`
`922`	`910`	`isotesterNoticeProcessor(voidarg,constcharmessage)`
`923`	`911`	`{`
`924`		`-fprintf(stderr,"%s: %s", (char*)arg,message);`
	`912`	`+printf("%s: %s", (char*)arg,message);`
`925`	`913`	`}`
`926`	`914`
`927`	`915`	`/* notice processor, hides the message */`

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

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ do $$`
`40`	`40`	`deletefromtest1;`
`41`	`41`	`commit;`
`42`	`42`	`performpg_advisory_lock(1);`
`43`		`-raisenotice'x = %',x;`
	`43`	`+raisenotice'length(x) = %',length(x);`
`44`	`44`	`end;`
`45`	`45`	`$$;`
`46`	`46`	`}`
`@@ -56,7 +56,7 @@ do $$`
`56`	`56`	`deletefromtest1;`
`57`	`57`	`commit;`
`58`	`58`	`performpg_advisory_lock(1);`
`59`		`-raisenotice'x = %',x;`
	`59`	`+raisenotice'length(x) = %',length(x);`
`60`	`60`	`end;`
`61`	`61`	`$$;`
`62`	`62`	`}`
`@@ -73,7 +73,7 @@ do $$`
`73`	`73`	`deletefromtest1;`
`74`	`74`	`commit;`
`75`	`75`	`performpg_advisory_lock(1);`
`76`		`-raisenotice'r = %',r;`
	`76`	`+raisenotice'length(r) = %',length(r::text);`
`77`	`77`	`end;`
`78`	`78`	`$$;`
`79`	`79`	`}`
`@@ -89,7 +89,7 @@ do $$`
`89`	`89`	`deletefromtest1;`
`90`	`90`	`commit;`
`91`	`91`	`performpg_advisory_lock(1);`
`92`		`-raisenotice'r = %',r;`
	`92`	`+raisenotice'length(r) = %',length(r::text);`
`93`	`93`	`end;`
`94`	`94`	`$$;`
`95`	`95`	`}`
`@@ -107,7 +107,7 @@ do $$`
`107`	`107`	`deletefromtest1;`
`108`	`108`	`commit;`
`109`	`109`	`performpg_advisory_lock(1);`
`110`		`-raisenotice'r = %',r;`
	`110`	`+raisenotice'length(r) = %',length(r::text);`
`111`	`111`	`end;`
`112`	`112`	`$$;`
`113`	`113`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitb101683

File tree

4 files changed

4 files changed

`‎src/test/isolation/expected/insert-conflict-specconflict.out`

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

`‎src/test/isolation/isolationtester.c`

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

0 commit comments