mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Standardize usages of appendStringInfo and appendPQExpBuffer

Browse Source 
Fix a few places that were using appendStringInfo() when they should have
been using appendStringInfoString().  Also some cases of
appendPQExpBuffer() that would have been better suited to use
appendPQExpBufferChar(), and finally, some places that used
appendPQExpBuffer() when appendPQExpBufferStr() would have suited better.

There are no bugs are being fixed here.  The aim is just to make the code
use the most optimal function for the job.

All the code being changed here is new to PG14.  It makes sense to fix
these before we branch for PG15.  There are a few other places that we
could fix, but those cases are older code so fixing those seems less
worthwhile as it may cause unnecessary back-patching pain in the future.

Author: Hou Zhijie
Discussion: https://postgr.es/m/OS0PR01MB5716732158B1C4142C6FE375943D9@OS0PR01MB5716.jpnprd01.prod.outlook.com
This commit is contained in:
David Rowley 2021-06-03 16:38:03 +12:00
parent 8279f68a1b
commit f736e188ce
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/access/brin/brin_minmax_multi.c
View File

@ -3084,7 +3084,7 @@ brin_minmax_multi_summary_out(PG_FUNCTION_ARGS)
a = FunctionCall1(&fmgrinfo, ranges_deserialized->values[idx++]);
appendStringInfo(&str, "%s", DatumGetPointer(a));
appendStringInfoString(&str, DatumGetPointer(a));
b = cstring_to_text(str.data);

8
src/backend/access/heap/vacuumlazy.c
View File

@ -783,18 +783,18 @@ heap_vacuum_rel(Relation rel, VacuumParams *params,
msgfmt = _(" %u pages from table (%.2f%% of total) had %lld dead item identifiers removed\n");
if (vacrel->nindexes == 0 || vacrel->num_index_scans == 0)
appendStringInfo(&buf, _("index scan not needed:"));
appendStringInfoString(&buf, _("index scan not needed:"));
else
appendStringInfo(&buf, _("index scan needed:"));
appendStringInfoString(&buf, _("index scan needed:"));
}
else
{
msgfmt = _(" %u pages from table (%.2f%% of total) have %lld dead item identifiers\n");
if (!vacrel->do_failsafe)
appendStringInfo(&buf, _("index scan bypassed:"));
appendStringInfoString(&buf, _("index scan bypassed:"));
else
appendStringInfo(&buf, _("index scan bypassed by failsafe:"));
appendStringInfoString(&buf, _("index scan bypassed by failsafe:"));
}
orig_rel_pages = vacrel->rel_pages + vacrel->pages_removed;
appendStringInfo(&buf, msgfmt,

2
src/bin/pg_amcheck/pg_amcheck.c
View File

@ -844,7 +844,7 @@ prepare_heap_command(PQExpBuffer sql, RelationInfo *rel, PGconn *conn)
if (opts.endblock >= 0)
appendPQExpBuffer(sql, ", endblock := " INT64_FORMAT, opts.endblock);
appendPQExpBuffer(sql, ")");
appendPQExpBufferChar(sql, ')');
}
/*

6
src/bin/psql/describe.c
View File

@ -2934,7 +2934,7 @@ describeOneTableDetails(const char *schemaname,
if (has_some && !has_all)
{
appendPQExpBuffer(&buf, " (");
appendPQExpBufferStr(&buf, " (");
/* options */
if (has_ndistinct)
@ -2954,7 +2954,7 @@ describeOneTableDetails(const char *schemaname,
appendPQExpBuffer(&buf, "%smcv", gotone ? ", " : "");
}
appendPQExpBuffer(&buf, ")");
appendPQExpBufferChar(&buf, ')');
}
appendPQExpBuffer(&buf, " ON %s FROM %s",
@ -3577,7 +3577,7 @@ describeOneTableDetails(const char *schemaname,
child_relkind == RELKIND_PARTITIONED_INDEX)
appendPQExpBufferStr(&buf, ", PARTITIONED");
if (strcmp(PQgetvalue(result, i, 2), "t") == 0)
appendPQExpBuffer(&buf, " (DETACH PENDING)");
appendPQExpBufferStr(&buf, " (DETACH PENDING)");
if (i < tuples - 1)
appendPQExpBufferChar(&buf, ',');