mirror of
https://github.com/postgres/postgres.git
synced 2025-08-18 12:22:09 +03:00
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:
@@ -817,11 +817,14 @@ pg_size_bytes(PG_FUNCTION_ARGS)
|
||||
else if (pg_strcasecmp(strptr, "kb") == 0)
|
||||
multiplier = (int64) 1024;
|
||||
else if (pg_strcasecmp(strptr, "mb") == 0)
|
||||
multiplier = (int64) 1024 * 1024;
|
||||
multiplier = ((int64) 1024) * 1024;
|
||||
|
||||
else if (pg_strcasecmp(strptr, "gb") == 0)
|
||||
multiplier = (int64) 1024 * 1024 * 1024;
|
||||
multiplier = ((int64) 1024) * 1024 * 1024;
|
||||
|
||||
else if (pg_strcasecmp(strptr, "tb") == 0)
|
||||
multiplier = (int64) 1024 * 1024 * 1024 * 1024;
|
||||
multiplier = ((int64) 1024) * 1024 * 1024 * 1024;
|
||||
|
||||
else
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
|
||||
|
@@ -222,9 +222,10 @@ TS_execute_ternary(GinChkVal *gcv, QueryItem *curitem)
|
||||
check_stack_depth();
|
||||
|
||||
if (curitem->type == QI_VAL)
|
||||
return checkcondition_gin_internal(gcv,
|
||||
(QueryOperand *) curitem,
|
||||
NULL /* don't have any position info */);
|
||||
return
|
||||
checkcondition_gin_internal(gcv,
|
||||
(QueryOperand *) curitem,
|
||||
NULL /* don't have position info */ );
|
||||
|
||||
switch (curitem->qoperator.oper)
|
||||
{
|
||||
|
@@ -834,7 +834,8 @@ tsvector_filter(PG_FUNCTION_ARGS)
|
||||
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;
|
||||
|
||||
arrout[j].haspos = true;
|
||||
|
Reference in New Issue
Block a user