diff options
| author | Robert Haas <rhaas@postgresql.org> | 2016-05-03 10:52:25 -0400 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2016-05-03 10:52:25 -0400 |
| commit | 8826d850781cb328482c8f92af2a3d93385cd63b (patch) | |
| tree | 4fe1529d761610370259c5c8e3eab74b869c956b /src/backend/executor/execParallel.c | |
| parent | 1e77949e67b94af4d2a350c6dac9109419932608 (diff) | |
| download | postgresql-8826d850781cb328482c8f92af2a3d93385cd63b.tar.gz postgresql-8826d850781cb328482c8f92af2a3d93385cd63b.zip | |
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.
Diffstat (limited to 'src/backend/executor/execParallel.c')
| -rw-r--r-- | src/backend/executor/execParallel.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); |