From 292794f82b4ebde33ec7f2a572ddd1dedba8ce37 Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Fri, 17 Jun 2016 09:24:29 -0400 Subject: [PATCH] Remove PID from 'parallel worker' context message. Discussion: --- src/backend/access/transam/parallel.c | 4 ++-- src/test/regress/expected/select_parallel.out | 4 ++-- src/test/regress/sql/select_parallel.sql | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/backend/access/transam/parallel.c b/src/backend/access/transam/parallel.c index 9325b628da..088700e17c 100644 --- a/src/backend/access/transam/parallel.c +++ b/src/backend/access/transam/parallel.c @@ -788,7 +788,7 @@ HandleParallelMessage(ParallelContext *pcxt, int i, StringInfo msg) */ save_error_context_stack = error_context_stack; errctx.callback = ParallelErrorContext; - errctx.arg = &pcxt->worker[i].pid; + errctx.arg = NULL; errctx.previous = pcxt->error_context_stack; error_context_stack = &errctx; @@ -1095,7 +1095,7 @@ static void ParallelErrorContext(void *arg) { if (force_parallel_mode != FORCE_PARALLEL_REGRESS) - errcontext("parallel worker, PID %d", *(int32 *) arg); + errcontext("parallel worker"); } /* diff --git a/src/test/regress/expected/select_parallel.out b/src/test/regress/expected/select_parallel.out index 58ab425add..6f1f24748b 100644 --- a/src/test/regress/expected/select_parallel.out +++ b/src/test/regress/expected/select_parallel.out @@ -64,8 +64,8 @@ explain (costs off) (5 rows) do $$begin - -- Provoke error in worker. The original message CONTEXT contains a worker - -- PID that must be hidden in the test output. + -- Provoke error, possibly in worker. If this error happens to occur in + -- the worker, there will be a CONTEXT line which must be hidden. perform stringu1::int2 from tenk1 where unique1 = 1; exception when others then diff --git a/src/test/regress/sql/select_parallel.sql b/src/test/regress/sql/select_parallel.sql index bb02ee0019..7b607c203a 100644 --- a/src/test/regress/sql/select_parallel.sql +++ b/src/test/regress/sql/select_parallel.sql @@ -30,8 +30,8 @@ explain (costs off) select stringu1::int2 from tenk1 where unique1 = 1; do $$begin - -- Provoke error in worker. The original message CONTEXT contains a worker - -- PID that must be hidden in the test output. + -- Provoke error, possibly in worker. If this error happens to occur in + -- the worker, there will be a CONTEXT line which must be hidden. perform stringu1::int2 from tenk1 where unique1 = 1; exception when others then