Commit292794f

committed

Remove PID from 'parallel worker' context message.

Discussion: <bfd204ab-ab1a-792a-b345-0274a09a4b5f@2ndquadrant.com>

1 parent103512c commit292794fCopy full SHA for 292794f

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -788,7 +788,7 @@ HandleParallelMessage(ParallelContext *pcxt, int i, StringInfo msg)`
`788`	`788`	`*/`
`789`	`789`	`save_error_context_stack=error_context_stack;`
`790`	`790`	`errctx.callback=ParallelErrorContext;`
`791`		`-errctx.arg=&pcxt->worker[i].pid;`
	`791`	`+errctx.arg=NULL;`
`792`	`792`	`errctx.previous=pcxt->error_context_stack;`
`793`	`793`	`error_context_stack=&errctx;`
`794`	`794`
`@@ -1095,7 +1095,7 @@ static void`
`1095`	`1095`	`ParallelErrorContext(void*arg)`
`1096`	`1096`	`{`
`1097`	`1097`	`if (force_parallel_mode!=FORCE_PARALLEL_REGRESS)`
`1098`		`-errcontext("parallel worker, PID %d",(int32)arg);`
	`1098`	`+errcontext("parallel worker");`
`1099`	`1099`	`}`
`1100`	`1100`
`1101`	`1101`	`/*`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,8 @@ explain (costs off)`
`64`	`64`	`(5 rows)`
`65`	`65`
`66`	`66`	`do $$begin`
`67`		`- -- Provoke errorin worker.The original message CONTEXT contains a worker`
`68`		`- --PID that mustbehidden in the test output.`
	`67`	`+ -- Provoke error, possiblyin worker.If this error happens to occur in`
	`68`	`+ --the worker, there willbea CONTEXT line which must be hidden.`
`69`	`69`	`perform stringu1::int2 from tenk1 where unique1 = 1;`
`70`	`70`	`exception`
`71`	`71`	`when others then`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ explain (costs off)`
`30`	`30`	`select stringu1::int2from tenk1where unique1=1;`
`31`	`31`
`32`	`32`	`do $$begin`
`33`		`--- Provoke errorin worker.The original message CONTEXT contains a worker`
`34`		`---PID that mustbehidden in the test output.`
	`33`	`+-- Provoke error, possiblyin worker.If this error happens to occur in`
	`34`	`+--the worker, there willbea CONTEXT line which must be hidden.`
`35`	`35`	`perform stringu1::int2from tenk1where unique1=1;`
`36`	`36`	`exception`
`37`	`37`	`when others then`

Comments

(0)