From 8826d850781cb328482c8f92af2a3d93385cd63b Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Tue, 3 May 2016 10:52:25 -0400 Subject: Tweak a few more things in preparation for upcoming pgindent run. These adjustments adjust code and comments in minor ways to prevent pgindent from mangling them. Among other things, I tried to avoid situations where pgindent would emit "a +b" instead of "a + b", and I tried to avoid having it break up inline comments across multiple lines. --- src/backend/executor/execParallel.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/backend/executor/execParallel.c') diff --git a/src/backend/executor/execParallel.c b/src/backend/executor/execParallel.c index bdc6b433e4b..6df62a7dccb 100644 --- a/src/backend/executor/execParallel.c +++ b/src/backend/executor/execParallel.c @@ -400,8 +400,8 @@ ExecInitParallelPlan(PlanState *planstate, EState *estate, int nworkers) if (estate->es_instrument) { instrumentation_len = - offsetof(SharedExecutorInstrumentation, plan_node_id) - + sizeof(int) * e.nnodes; + offsetof(SharedExecutorInstrumentation, plan_node_id) + + sizeof(int) * e.nnodes; instrumentation_len = MAXALIGN(instrumentation_len); instrument_offset = instrumentation_len; instrumentation_len += sizeof(Instrumentation) * e.nnodes * nworkers; @@ -513,7 +513,7 @@ ExecParallelRetrieveInstrumentation(PlanState *planstate, /* Also store the per-worker detail. */ ibytes = instrumentation->num_workers * sizeof(Instrumentation); planstate->worker_instrument = - palloc(offsetof(WorkerInstrumentation, instrument) + ibytes); + palloc(ibytes + offsetof(WorkerInstrumentation, instrument)); planstate->worker_instrument->num_workers = instrumentation->num_workers; memcpy(&planstate->worker_instrument->instrument, instrument, ibytes); -- cgit v1.2.3