mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove PID from 'parallel worker' context message.

Browse Source 
Discussion: <bfd204ab-ab1a-792a-b345-0274a09a4b5f@2ndquadrant.com>
This commit is contained in:
Robert Haas 2016-06-17 09:24:29 -04:00
parent 103512cee9
commit 292794f82b
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/access/transam/parallel.c
View File

@ -788,7 +788,7 @@ HandleParallelMessage(ParallelContext *pcxt, int i, StringInfo msg)
*/ */
save_error_context_stack = error_context_stack; save_error_context_stack = error_context_stack;
errctx.callback = ParallelErrorContext; errctx.callback = ParallelErrorContext;
errctx.arg = &pcxt->worker[i].pid; errctx.arg = NULL;
errctx.previous = pcxt->error_context_stack; errctx.previous = pcxt->error_context_stack;
error_context_stack = &errctx; error_context_stack = &errctx;
@ -1095,7 +1095,7 @@ static void
ParallelErrorContext(void *arg) ParallelErrorContext(void *arg)
{ {
if (force_parallel_mode != FORCE_PARALLEL_REGRESS) if (force_parallel_mode != FORCE_PARALLEL_REGRESS)
errcontext("parallel worker, PID %d", *(int32 *) arg); errcontext("parallel worker");
} }
/* /*

4
src/test/regress/expected/select_parallel.out
View File

@ -64,8 +64,8 @@ explain (costs off)
(5 rows) (5 rows)
do $$begin do $$begin
-- Provoke error in worker. The original message CONTEXT contains a worker -- Provoke error, possibly in worker. If this error happens to occur in
-- PID that must be hidden in the test output. -- the worker, there will be a CONTEXT line which must be hidden.
perform stringu1::int2 from tenk1 where unique1 = 1; perform stringu1::int2 from tenk1 where unique1 = 1;
exception exception
when others then when others then

4
src/test/regress/sql/select_parallel.sql
View File

@ -30,8 +30,8 @@ explain (costs off)
select stringu1::int2 from tenk1 where unique1 = 1; select stringu1::int2 from tenk1 where unique1 = 1;
do $$begin do $$begin
-- Provoke error in worker. The original message CONTEXT contains a worker -- Provoke error, possibly in worker. If this error happens to occur in
-- PID that must be hidden in the test output. -- the worker, there will be a CONTEXT line which must be hidden.
perform stringu1::int2 from tenk1 where unique1 = 1; perform stringu1::int2 from tenk1 where unique1 = 1;
exception exception
when others then when others then