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.
This commit is contained in:
parent
1e77949e67
commit
8826d85078
|
@ -229,11 +229,12 @@ heap_page_items(PG_FUNCTION_ARGS)
|
||||||
{
|
{
|
||||||
if (tuphdr->t_infomask & HEAP_HASNULL)
|
if (tuphdr->t_infomask & HEAP_HASNULL)
|
||||||
{
|
{
|
||||||
int bits_len =
|
int bits_len;
|
||||||
((tuphdr->t_infomask2 & HEAP_NATTS_MASK) / 8 + 1) * 8;
|
|
||||||
|
|
||||||
|
bits_len =
|
||||||
|
((tuphdr->t_infomask2 & HEAP_NATTS_MASK) / 8 + 1) * 8;
|
||||||
values[11] = CStringGetTextDatum(
|
values[11] = CStringGetTextDatum(
|
||||||
bits_to_text(tuphdr->t_bits, bits_len));
|
bits_to_text(tuphdr->t_bits, bits_len));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
nulls[11] = true;
|
nulls[11] = true;
|
||||||
|
|
|
@ -400,8 +400,8 @@ ExecInitParallelPlan(PlanState *planstate, EState *estate, int nworkers)
|
||||||
if (estate->es_instrument)
|
if (estate->es_instrument)
|
||||||
{
|
{
|
||||||
instrumentation_len =
|
instrumentation_len =
|
||||||
offsetof(SharedExecutorInstrumentation, plan_node_id)
|
offsetof(SharedExecutorInstrumentation, plan_node_id) +
|
||||||
+ sizeof(int) * e.nnodes;
|
sizeof(int) * e.nnodes;
|
||||||
instrumentation_len = MAXALIGN(instrumentation_len);
|
instrumentation_len = MAXALIGN(instrumentation_len);
|
||||||
instrument_offset = instrumentation_len;
|
instrument_offset = instrumentation_len;
|
||||||
instrumentation_len += sizeof(Instrumentation) * e.nnodes * nworkers;
|
instrumentation_len += sizeof(Instrumentation) * e.nnodes * nworkers;
|
||||||
|
@ -513,7 +513,7 @@ ExecParallelRetrieveInstrumentation(PlanState *planstate,
|
||||||
/* Also store the per-worker detail. */
|
/* Also store the per-worker detail. */
|
||||||
ibytes = instrumentation->num_workers * sizeof(Instrumentation);
|
ibytes = instrumentation->num_workers * sizeof(Instrumentation);
|
||||||
planstate->worker_instrument =
|
planstate->worker_instrument =
|
||||||
palloc(offsetof(WorkerInstrumentation, instrument) + ibytes);
|
palloc(ibytes + offsetof(WorkerInstrumentation, instrument));
|
||||||
planstate->worker_instrument->num_workers = instrumentation->num_workers;
|
planstate->worker_instrument->num_workers = instrumentation->num_workers;
|
||||||
memcpy(&planstate->worker_instrument->instrument, instrument, ibytes);
|
memcpy(&planstate->worker_instrument->instrument, instrument, ibytes);
|
||||||
|
|
||||||
|
|
|
@ -3016,7 +3016,8 @@ build_pertrans_for_aggref(AggStatePerTrans pertrans,
|
||||||
Expr *transfnexpr;
|
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,
|
build_aggregate_transfn_expr(inputTypes,
|
||||||
numArguments,
|
numArguments,
|
||||||
|
@ -3025,7 +3026,7 @@ build_pertrans_for_aggref(AggStatePerTrans pertrans,
|
||||||
aggtranstype,
|
aggtranstype,
|
||||||
aggref->inputcollid,
|
aggref->inputcollid,
|
||||||
aggtransfn,
|
aggtransfn,
|
||||||
InvalidOid, /* invtrans is not needed here */
|
InvalidOid,
|
||||||
&transfnexpr,
|
&transfnexpr,
|
||||||
NULL);
|
NULL);
|
||||||
fmgr_info(aggtransfn, &pertrans->transfn);
|
fmgr_info(aggtransfn, &pertrans->transfn);
|
||||||
|
|
|
@ -1338,9 +1338,10 @@ NIImportOOAffixes(IspellDict *Conf, const char *filename)
|
||||||
|| (sflaglen > 2 && Conf->flagMode == FM_LONG))
|
|| (sflaglen > 2 && Conf->flagMode == FM_LONG))
|
||||||
goto nextline;
|
goto nextline;
|
||||||
|
|
||||||
/*
|
/*--------
|
||||||
* Affix header. For example:
|
* Affix header. For example:
|
||||||
* SFX \ N 1
|
* SFX \ N 1
|
||||||
|
*--------
|
||||||
*/
|
*/
|
||||||
if (fields_read == 4)
|
if (fields_read == 4)
|
||||||
{
|
{
|
||||||
|
@ -1350,9 +1351,10 @@ NIImportOOAffixes(IspellDict *Conf, const char *filename)
|
||||||
else
|
else
|
||||||
flagflags = 0;
|
flagflags = 0;
|
||||||
}
|
}
|
||||||
/*
|
/*--------
|
||||||
* Affix fields. For example:
|
* Affix fields. For example:
|
||||||
* SFX \ 0 Y/L [^Y]
|
* SFX \ 0 Y/L [^Y]
|
||||||
|
*--------
|
||||||
*/
|
*/
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -311,7 +311,8 @@ pushval_morph(Datum opaque, TSQueryParserState state, char *strval, int lenval,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pos = prs.words[count].pos.pos; /* save current word's position */
|
/* save current word's position */
|
||||||
|
pos = prs.words[count].pos.pos;
|
||||||
|
|
||||||
/* Go through all variants obtained from this token */
|
/* Go through all variants obtained from this token */
|
||||||
cntvar = 0;
|
cntvar = 0;
|
||||||
|
@ -343,7 +344,11 @@ pushval_morph(Datum opaque, TSQueryParserState state, char *strval, int lenval,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cntpos)
|
if (cntpos)
|
||||||
pushOperator(state, data->qoperator, 1); /* distance may be useful */
|
{
|
||||||
|
/* distance may be useful */
|
||||||
|
pushOperator(state, data->qoperator, 1);
|
||||||
|
}
|
||||||
|
|
||||||
cntpos++;
|
cntpos++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -817,11 +817,14 @@ pg_size_bytes(PG_FUNCTION_ARGS)
|
||||||
else if (pg_strcasecmp(strptr, "kb") == 0)
|
else if (pg_strcasecmp(strptr, "kb") == 0)
|
||||||
multiplier = (int64) 1024;
|
multiplier = (int64) 1024;
|
||||||
else if (pg_strcasecmp(strptr, "mb") == 0)
|
else if (pg_strcasecmp(strptr, "mb") == 0)
|
||||||
multiplier = (int64) 1024 * 1024;
|
multiplier = ((int64) 1024) * 1024;
|
||||||
|
|
||||||
else if (pg_strcasecmp(strptr, "gb") == 0)
|
else if (pg_strcasecmp(strptr, "gb") == 0)
|
||||||
multiplier = (int64) 1024 * 1024 * 1024;
|
multiplier = ((int64) 1024) * 1024 * 1024;
|
||||||
|
|
||||||
else if (pg_strcasecmp(strptr, "tb") == 0)
|
else if (pg_strcasecmp(strptr, "tb") == 0)
|
||||||
multiplier = (int64) 1024 * 1024 * 1024 * 1024;
|
multiplier = ((int64) 1024) * 1024 * 1024 * 1024;
|
||||||
|
|
||||||
else
|
else
|
||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
|
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
|
||||||
|
|
|
@ -222,9 +222,10 @@ TS_execute_ternary(GinChkVal *gcv, QueryItem *curitem)
|
||||||
check_stack_depth();
|
check_stack_depth();
|
||||||
|
|
||||||
if (curitem->type == QI_VAL)
|
if (curitem->type == QI_VAL)
|
||||||
return checkcondition_gin_internal(gcv,
|
return
|
||||||
(QueryOperand *) curitem,
|
checkcondition_gin_internal(gcv,
|
||||||
NULL /* don't have any position info */);
|
(QueryOperand *) curitem,
|
||||||
|
NULL /* don't have position info */ );
|
||||||
|
|
||||||
switch (curitem->qoperator.oper)
|
switch (curitem->qoperator.oper)
|
||||||
{
|
{
|
||||||
|
|
|
@ -834,7 +834,8 @@ tsvector_filter(PG_FUNCTION_ARGS)
|
||||||
posvout->pos[npos++] = posvin->pos[k];
|
posvout->pos[npos++] = posvin->pos[k];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!npos) /* no satisfactory positions found, so skip that lexeme */
|
/* if no satisfactory positions found, skip lexeme */
|
||||||
|
if (!npos)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
arrout[j].haspos = true;
|
arrout[j].haspos = true;
|
||||||
|
|
Loading…
Reference in New Issue