database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Tweak a few more things in preparation for upcoming pgindent run.

Browse Source 
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.
This commit is contained in:
Robert Haas
2016-05-03 10:52:25 -04:00
parent 1e77949e67
commit 8826d85078
8 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/executor/execParallel.c
View File

@ -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);

5
src/backend/executor/nodeAgg.c
View File

@ -3016,7 +3016,8 @@ build_pertrans_for_aggref(AggStatePerTrans pertrans,
Expr *transfnexpr;
/*
* Set up infrastructure for calling the transfn
* Set up infrastructure for calling the transfn. Note that invtrans
* is not needed here.
*/
build_aggregate_transfn_expr(inputTypes,
numArguments,
@ -3025,7 +3026,7 @@ build_pertrans_for_aggref(AggStatePerTrans pertrans,
aggtranstype,
aggref->inputcollid,
aggtransfn,
InvalidOid, /* invtrans is not needed here */
InvalidOid,
&transfnexpr,
NULL);
fmgr_info(aggtransfn, &pertrans->transfn);