open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use stack allocated StringInfoDatas, where possible

Browse Source 
Various places that were using StringInfo but didn't need that
StringInfo to exist beyond the scope of the function were using
makeStringInfo(), which allocates both a StringInfoData and the buffer it
uses as two separate allocations.  It's more efficient for these cases to
use a StringInfoData on the stack and initialize it with initStringInfo(),
which only allocates the string buffer.  This also simplifies the cleanup,
in a few cases.

Author: Mats Kindahl <mats.kindahl@gmail.com>
Reviewed-by: David Rowley <dgrowleyml@gmail.com>
Reviewed-by: Chao Li <li.evan.chao@gmail.com>
Discussion: https://postgr.es/m/4379aac8-26f1-42f2-a356-ff0e886228d3@gmail.com
pull/246/head
David Rowley 1 month ago
parent cf638b46af
commit 6d0eba6627
12 changed files with 144 additions and 130 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 14
      contrib/postgres_fdw/postgres_fdw.c
  2. 19
      contrib/tcn/tcn.c
  3. 34
      src/backend/access/transam/xlogbackup.c
  4. 10
      src/backend/backup/basebackup.c
  5. 35
      src/backend/commands/subscriptioncmds.c
  6. 53
      src/backend/utils/adt/json.c
  7. 9
      src/backend/utils/adt/jsonb.c
  8. 18
      src/backend/utils/adt/jsonfuncs.c
  9. 13
      src/backend/utils/adt/multirangetypes.c
  10. 18
      src/backend/utils/adt/rangetypes.c
  11. 17
      src/backend/utils/adt/ruleutils.c
  12. 34
      src/backend/utils/adt/xml.c

14
contrib/postgres_fdw/postgres_fdw.c
Unescape View File

@ -2841,7 +2841,7 @@ postgresExplainForeignScan(ForeignScanState *node, ExplainState *es)
*/ */
if (list_length(fdw_private) > FdwScanPrivateRelations) if (list_length(fdw_private) > FdwScanPrivateRelations)
{ {
StringInfo relations; StringInfoData relations;
char *rawrelations; char *rawrelations;
char *ptr; char *ptr;
int minrti, int minrti,
@ -2875,7 +2875,7 @@ postgresExplainForeignScan(ForeignScanState *node, ExplainState *es)
rtoffset = bms_next_member(plan->fs_base_relids, -1) - minrti; rtoffset = bms_next_member(plan->fs_base_relids, -1) - minrti;
/* Now we can translate the string */ /* Now we can translate the string */
relations = makeStringInfo(); initStringInfo(&relations);
ptr = rawrelations; ptr = rawrelations;
while (*ptr) while (*ptr)
{ {
@ -2897,24 +2897,24 @@ postgresExplainForeignScan(ForeignScanState *node, ExplainState *es)
char *namespace; char *namespace;
namespace = get_namespace_name_or_temp(get_rel_namespace(rte->relid)); namespace = get_namespace_name_or_temp(get_rel_namespace(rte->relid));
appendStringInfo(relations, "%s.%s", appendStringInfo(&relations, "%s.%s",
quote_identifier(namespace), quote_identifier(namespace),
quote_identifier(relname)); quote_identifier(relname));
} }
else else
appendStringInfoString(relations, appendStringInfoString(&relations,
quote_identifier(relname)); quote_identifier(relname));
refname = (char *) list_nth(es->rtable_names, rti - 1); refname = (char *) list_nth(es->rtable_names, rti - 1);
if (refname == NULL) if (refname == NULL)
refname = rte->eref->aliasname; refname = rte->eref->aliasname;
if (strcmp(refname, relname) != 0) if (strcmp(refname, relname) != 0)
appendStringInfo(relations, " %s", appendStringInfo(&relations, " %s",
quote_identifier(refname)); quote_identifier(refname));
} }
else else
appendStringInfoChar(relations, *ptr++); appendStringInfoChar(&relations, *ptr++);
} }
ExplainPropertyText("Relations", relations->data, es); ExplainPropertyText("Relations", relations.data, es);
} }
/* /*

19
contrib/tcn/tcn.c
Unescape View File

@ -66,12 +66,13 @@ triggered_change_notification(PG_FUNCTION_ARGS)
TupleDesc tupdesc; TupleDesc tupdesc;
char *channel; char *channel;
char operation; char operation;
StringInfo payload = makeStringInfo(); StringInfoData payload;
bool foundPK; bool foundPK;
List *indexoidlist; List *indexoidlist;
ListCell *indexoidscan; ListCell *indexoidscan;
initStringInfo(&payload);
/* make sure it's called as a trigger */ /* make sure it's called as a trigger */
if (!CALLED_AS_TRIGGER(fcinfo)) if (!CALLED_AS_TRIGGER(fcinfo))
ereport(ERROR, ereport(ERROR,
@ -149,22 +150,22 @@ triggered_change_notification(PG_FUNCTION_ARGS)
foundPK = true; foundPK = true;
strcpy_quoted(payload, RelationGetRelationName(rel), '"'); strcpy_quoted(&payload, RelationGetRelationName(rel), '"');
appendStringInfoCharMacro(payload, ','); appendStringInfoCharMacro(&payload, ',');
appendStringInfoCharMacro(payload, operation); appendStringInfoCharMacro(&payload, operation);
for (i = 0; i < indnkeyatts; i++) for (i = 0; i < indnkeyatts; i++)
{ {
int colno = index->indkey.values[i]; int colno = index->indkey.values[i];
Form_pg_attribute attr = TupleDescAttr(tupdesc, colno - 1); Form_pg_attribute attr = TupleDescAttr(tupdesc, colno - 1);
appendStringInfoCharMacro(payload, ','); appendStringInfoCharMacro(&payload, ',');
strcpy_quoted(payload, NameStr(attr->attname), '"'); strcpy_quoted(&payload, NameStr(attr->attname), '"');
appendStringInfoCharMacro(payload, '='); appendStringInfoCharMacro(&payload, '=');
strcpy_quoted(payload, SPI_getvalue(trigtuple, tupdesc, colno), '\''); strcpy_quoted(&payload, SPI_getvalue(trigtuple, tupdesc, colno), '\'');
} }
Async_Notify(channel, payload->data); Async_Notify(channel, payload.data);
} }
ReleaseSysCache(indexTuple); ReleaseSysCache(indexTuple);
break; break;

34
src/backend/access/transam/xlogbackup.c
Unescape View File

@ -31,18 +31,19 @@ build_backup_content(BackupState *state, bool ishistoryfile)
char startstrbuf[128]; char startstrbuf[128];
char startxlogfile[MAXFNAMELEN]; /* backup start WAL file */ char startxlogfile[MAXFNAMELEN]; /* backup start WAL file */
XLogSegNo startsegno; XLogSegNo startsegno;
StringInfo result = makeStringInfo(); StringInfoData result;
char *data;
Assert(state != NULL); Assert(state != NULL);
initStringInfo(&result);
/* Use the log timezone here, not the session timezone */ /* Use the log timezone here, not the session timezone */
pg_strftime(startstrbuf, sizeof(startstrbuf), "%Y-%m-%d %H:%M:%S %Z", pg_strftime(startstrbuf, sizeof(startstrbuf), "%Y-%m-%d %H:%M:%S %Z",
pg_localtime(&state->starttime, log_timezone)); pg_localtime(&state->starttime, log_timezone));
XLByteToSeg(state->startpoint, startsegno, wal_segment_size); XLByteToSeg(state->startpoint, startsegno, wal_segment_size);
XLogFileName(startxlogfile, state->starttli, startsegno, wal_segment_size); XLogFileName(startxlogfile, state->starttli, startsegno, wal_segment_size);
appendStringInfo(result, "START WAL LOCATION: %X/%08X (file %s)\n", appendStringInfo(&result, "START WAL LOCATION: %X/%08X (file %s)\n",
LSN_FORMAT_ARGS(state->startpoint), startxlogfile); LSN_FORMAT_ARGS(state->startpoint), startxlogfile);
if (ishistoryfile) if (ishistoryfile)
@ -52,18 +53,18 @@ build_backup_content(BackupState *state, bool ishistoryfile)
XLByteToSeg(state->stoppoint, stopsegno, wal_segment_size); XLByteToSeg(state->stoppoint, stopsegno, wal_segment_size);
XLogFileName(stopxlogfile, state->stoptli, stopsegno, wal_segment_size); XLogFileName(stopxlogfile, state->stoptli, stopsegno, wal_segment_size);
appendStringInfo(result, "STOP WAL LOCATION: %X/%08X (file %s)\n", appendStringInfo(&result, "STOP WAL LOCATION: %X/%08X (file %s)\n",
LSN_FORMAT_ARGS(state->stoppoint), stopxlogfile); LSN_FORMAT_ARGS(state->stoppoint), stopxlogfile);
} }
appendStringInfo(result, "CHECKPOINT LOCATION: %X/%08X\n", appendStringInfo(&result, "CHECKPOINT LOCATION: %X/%08X\n",
LSN_FORMAT_ARGS(state->checkpointloc)); LSN_FORMAT_ARGS(state->checkpointloc));
appendStringInfoString(result, "BACKUP METHOD: streamed\n"); appendStringInfoString(&result, "BACKUP METHOD: streamed\n");
appendStringInfo(result, "BACKUP FROM: %s\n", appendStringInfo(&result, "BACKUP FROM: %s\n",
state->started_in_recovery ? "standby" : "primary"); state->started_in_recovery ? "standby" : "primary");
appendStringInfo(result, "START TIME: %s\n", startstrbuf); appendStringInfo(&result, "START TIME: %s\n", startstrbuf);
appendStringInfo(result, "LABEL: %s\n", state->name); appendStringInfo(&result, "LABEL: %s\n", state->name);
appendStringInfo(result, "START TIMELINE: %u\n", state->starttli); appendStringInfo(&result, "START TIMELINE: %u\n", state->starttli);
if (ishistoryfile) if (ishistoryfile)
{ {
@ -73,22 +74,19 @@ build_backup_content(BackupState *state, bool ishistoryfile)
pg_strftime(stopstrfbuf, sizeof(stopstrfbuf), "%Y-%m-%d %H:%M:%S %Z", pg_strftime(stopstrfbuf, sizeof(stopstrfbuf), "%Y-%m-%d %H:%M:%S %Z",
pg_localtime(&state->stoptime, log_timezone)); pg_localtime(&state->stoptime, log_timezone));
appendStringInfo(result, "STOP TIME: %s\n", stopstrfbuf); appendStringInfo(&result, "STOP TIME: %s\n", stopstrfbuf);
appendStringInfo(result, "STOP TIMELINE: %u\n", state->stoptli); appendStringInfo(&result, "STOP TIMELINE: %u\n", state->stoptli);
} }
/* either both istartpoint and istarttli should be set, or neither */ /* either both istartpoint and istarttli should be set, or neither */
Assert(XLogRecPtrIsInvalid(state->istartpoint) == (state->istarttli == 0)); Assert(XLogRecPtrIsInvalid(state->istartpoint) == (state->istarttli == 0));
if (!XLogRecPtrIsInvalid(state->istartpoint)) if (!XLogRecPtrIsInvalid(state->istartpoint))
{ {
appendStringInfo(result, "INCREMENTAL FROM LSN: %X/%08X\n", appendStringInfo(&result, "INCREMENTAL FROM LSN: %X/%08X\n",
LSN_FORMAT_ARGS(state->istartpoint)); LSN_FORMAT_ARGS(state->istartpoint));
appendStringInfo(result, "INCREMENTAL FROM TLI: %u\n", appendStringInfo(&result, "INCREMENTAL FROM TLI: %u\n",
state->istarttli); state->istarttli);
} }
data = result->data; return result.data;
pfree(result);
return data;
} }

10
src/backend/backup/basebackup.c
Unescape View File

@ -239,7 +239,7 @@ perform_base_backup(basebackup_options *opt, bbsink *sink,
TimeLineID endtli; TimeLineID endtli;
backup_manifest_info manifest; backup_manifest_info manifest;
BackupState *backup_state; BackupState *backup_state;
StringInfo tablespace_map; StringInfoData tablespace_map;
/* Initial backup state, insofar as we know it now. */ /* Initial backup state, insofar as we know it now. */
state.tablespaces = NIL; state.tablespaces = NIL;
@ -263,11 +263,11 @@ perform_base_backup(basebackup_options *opt, bbsink *sink,
/* Allocate backup related variables. */ /* Allocate backup related variables. */
backup_state = (BackupState *) palloc0(sizeof(BackupState)); backup_state = (BackupState *) palloc0(sizeof(BackupState));
tablespace_map = makeStringInfo(); initStringInfo(&tablespace_map);
basebackup_progress_wait_checkpoint(); basebackup_progress_wait_checkpoint();
do_pg_backup_start(opt->label, opt->fastcheckpoint, &state.tablespaces, do_pg_backup_start(opt->label, opt->fastcheckpoint, &state.tablespaces,
backup_state, tablespace_map); backup_state, &tablespace_map);
state.startptr = backup_state->startpoint; state.startptr = backup_state->startpoint;
state.starttli = backup_state->starttli; state.starttli = backup_state->starttli;
@ -342,7 +342,7 @@ perform_base_backup(basebackup_options *opt, bbsink *sink,
if (opt->sendtblspcmapfile) if (opt->sendtblspcmapfile)
{ {
sendFileWithContent(sink, TABLESPACE_MAP, sendFileWithContent(sink, TABLESPACE_MAP,
tablespace_map->data, -1, &manifest); tablespace_map.data, -1, &manifest);
sendtblspclinks = false; sendtblspclinks = false;
} }
@ -399,7 +399,7 @@ perform_base_backup(basebackup_options *opt, bbsink *sink,
endtli = backup_state->stoptli; endtli = backup_state->stoptli;
/* Deallocate backup-related variables. */ /* Deallocate backup-related variables. */
destroyStringInfo(tablespace_map); pfree(tablespace_map.data);
pfree(backup_state); pfree(backup_state);
} }
PG_END_ENSURE_ERROR_CLEANUP(do_pg_abort_backup, BoolGetDatum(false)); PG_END_ENSURE_ERROR_CLEANUP(do_pg_abort_backup, BoolGetDatum(false));

35
src/backend/commands/subscriptioncmds.c
Unescape View File

@ -491,20 +491,20 @@ static void
check_publications(WalReceiverConn *wrconn, List *publications) check_publications(WalReceiverConn *wrconn, List *publications)
{ {
WalRcvExecResult *res; WalRcvExecResult *res;
StringInfo cmd; StringInfoData cmd;
TupleTableSlot *slot; TupleTableSlot *slot;
List *publicationsCopy = NIL; List *publicationsCopy = NIL;
Oid tableRow[1] = {TEXTOID}; Oid tableRow[1] = {TEXTOID};
cmd = makeStringInfo(); initStringInfo(&cmd);
appendStringInfoString(cmd, "SELECT t.pubname FROM\n" appendStringInfoString(&cmd, "SELECT t.pubname FROM\n"
" pg_catalog.pg_publication t WHERE\n" " pg_catalog.pg_publication t WHERE\n"
" t.pubname IN ("); " t.pubname IN (");
GetPublicationsStr(publications, cmd, true); GetPublicationsStr(publications, &cmd, true);
appendStringInfoChar(cmd, ')'); appendStringInfoChar(&cmd, ')');
res = walrcv_exec(wrconn, cmd->data, 1, tableRow); res = walrcv_exec(wrconn, cmd.data, 1, tableRow);
destroyStringInfo(cmd); pfree(cmd.data);
if (res->status != WALRCV_OK_TUPLES) if (res->status != WALRCV_OK_TUPLES)
ereport(ERROR, ereport(ERROR,
@ -535,15 +535,17 @@ check_publications(WalReceiverConn *wrconn, List *publications)
if (list_length(publicationsCopy)) if (list_length(publicationsCopy))
{ {
/* Prepare the list of non-existent publication(s) for error message. */ /* Prepare the list of non-existent publication(s) for error message. */
StringInfo pubnames = makeStringInfo(); StringInfoData pubnames;
initStringInfo(&pubnames);
GetPublicationsStr(publicationsCopy, pubnames, false); GetPublicationsStr(publicationsCopy, &pubnames, false);
ereport(WARNING, ereport(WARNING,
errcode(ERRCODE_UNDEFINED_OBJECT), errcode(ERRCODE_UNDEFINED_OBJECT),
errmsg_plural("publication %s does not exist on the publisher", errmsg_plural("publication %s does not exist on the publisher",
"publications %s do not exist on the publisher", "publications %s do not exist on the publisher",
list_length(publicationsCopy), list_length(publicationsCopy),
pubnames->data)); pubnames.data));
} }
} }
@ -2885,12 +2887,13 @@ fetch_relation_list(WalReceiverConn *wrconn, List *publications)
int server_version = walrcv_server_version(wrconn); int server_version = walrcv_server_version(wrconn);
bool check_columnlist = (server_version >= 150000); bool check_columnlist = (server_version >= 150000);
int column_count = check_columnlist ? 4 : 3; int column_count = check_columnlist ? 4 : 3;
StringInfo pub_names = makeStringInfo(); StringInfoData pub_names;
initStringInfo(&cmd); initStringInfo(&cmd);
initStringInfo(&pub_names);
/* Build the pub_names comma-separated string. */ /* Build the pub_names comma-separated string. */
GetPublicationsStr(publications, pub_names, true); GetPublicationsStr(publications, &pub_names, true);
/* Get the list of relations from the publisher */ /* Get the list of relations from the publisher */
if (server_version >= 160000) if (server_version >= 160000)
@ -2917,7 +2920,7 @@ fetch_relation_list(WalReceiverConn *wrconn, List *publications)
" FROM pg_publication\n" " FROM pg_publication\n"
" WHERE pubname IN ( %s )) AS gpt\n" " WHERE pubname IN ( %s )) AS gpt\n"
" ON gpt.relid = c.oid\n", " ON gpt.relid = c.oid\n",
pub_names->data); pub_names.data);
/* From version 19, inclusion of sequences in the target is supported */ /* From version 19, inclusion of sequences in the target is supported */
if (server_version >= 190000) if (server_version >= 190000)
@ -2926,7 +2929,7 @@ fetch_relation_list(WalReceiverConn *wrconn, List *publications)
" SELECT DISTINCT s.schemaname, s.sequencename, " CppAsString2(RELKIND_SEQUENCE) "::\"char\" AS relkind, NULL::int2vector AS attrs\n" " SELECT DISTINCT s.schemaname, s.sequencename, " CppAsString2(RELKIND_SEQUENCE) "::\"char\" AS relkind, NULL::int2vector AS attrs\n"
" FROM pg_catalog.pg_publication_sequences s\n" " FROM pg_catalog.pg_publication_sequences s\n"
" WHERE s.pubname IN ( %s )", " WHERE s.pubname IN ( %s )",
pub_names->data); pub_names.data);
} }
else else
{ {
@ -2939,10 +2942,10 @@ fetch_relation_list(WalReceiverConn *wrconn, List *publications)
appendStringInfo(&cmd, "FROM pg_catalog.pg_publication_tables t\n" appendStringInfo(&cmd, "FROM pg_catalog.pg_publication_tables t\n"
" WHERE t.pubname IN ( %s )", " WHERE t.pubname IN ( %s )",
pub_names->data); pub_names.data);
} }
destroyStringInfo(pub_names); pfree(pub_names.data);
res = walrcv_exec(wrconn, cmd.data, column_count, tableRow); res = walrcv_exec(wrconn, cmd.data, column_count, tableRow);
pfree(cmd.data); pfree(cmd.data);

53
src/backend/utils/adt/json.c
Unescape View File

@ -631,13 +631,13 @@ Datum
array_to_json(PG_FUNCTION_ARGS) array_to_json(PG_FUNCTION_ARGS)
{ {
Datum array = PG_GETARG_DATUM(0); Datum array = PG_GETARG_DATUM(0);
StringInfo result; StringInfoData result;
result = makeStringInfo(); initStringInfo(&result);
array_to_json_internal(array, result, false); array_to_json_internal(array, &result, false);
PG_RETURN_TEXT_P(cstring_to_text_with_len(result->data, result->len)); PG_RETURN_TEXT_P(cstring_to_text_with_len(result.data, result.len));
} }
/* /*
@ -648,13 +648,13 @@ array_to_json_pretty(PG_FUNCTION_ARGS)
{ {
Datum array = PG_GETARG_DATUM(0); Datum array = PG_GETARG_DATUM(0);
bool use_line_feeds = PG_GETARG_BOOL(1); bool use_line_feeds = PG_GETARG_BOOL(1);
StringInfo result; StringInfoData result;
result = makeStringInfo(); initStringInfo(&result);
array_to_json_internal(array, result, use_line_feeds); array_to_json_internal(array, &result, use_line_feeds);
PG_RETURN_TEXT_P(cstring_to_text_with_len(result->data, result->len)); PG_RETURN_TEXT_P(cstring_to_text_with_len(result.data, result.len));
} }
/* /*
@ -664,13 +664,13 @@ Datum
row_to_json(PG_FUNCTION_ARGS) row_to_json(PG_FUNCTION_ARGS)
{ {
Datum array = PG_GETARG_DATUM(0); Datum array = PG_GETARG_DATUM(0);
StringInfo result; StringInfoData result;
result = makeStringInfo(); initStringInfo(&result);
composite_to_json(array, result, false); composite_to_json(array, &result, false);
PG_RETURN_TEXT_P(cstring_to_text_with_len(result->data, result->len)); PG_RETURN_TEXT_P(cstring_to_text_with_len(result.data, result.len));
} }
/* /*
@ -681,13 +681,13 @@ row_to_json_pretty(PG_FUNCTION_ARGS)
{ {
Datum array = PG_GETARG_DATUM(0); Datum array = PG_GETARG_DATUM(0);
bool use_line_feeds = PG_GETARG_BOOL(1); bool use_line_feeds = PG_GETARG_BOOL(1);
StringInfo result; StringInfoData result;
result = makeStringInfo(); initStringInfo(&result);
composite_to_json(array, result, use_line_feeds); composite_to_json(array, &result, use_line_feeds);
PG_RETURN_TEXT_P(cstring_to_text_with_len(result->data, result->len)); PG_RETURN_TEXT_P(cstring_to_text_with_len(result.data, result.len));
} }
/* /*
@ -763,12 +763,13 @@ to_json(PG_FUNCTION_ARGS)
Datum Datum
datum_to_json(Datum val, JsonTypeCategory tcategory, Oid outfuncoid) datum_to_json(Datum val, JsonTypeCategory tcategory, Oid outfuncoid)
{ {
StringInfo result = makeStringInfo(); StringInfoData result;
datum_to_json_internal(val, false, result, tcategory, outfuncoid, initStringInfo(&result);
datum_to_json_internal(val, false, &result, tcategory, outfuncoid,
false); false);
return PointerGetDatum(cstring_to_text_with_len(result->data, result->len)); return PointerGetDatum(cstring_to_text_with_len(result.data, result.len));
} }
/* /*
@ -1347,25 +1348,25 @@ json_build_array_worker(int nargs, const Datum *args, const bool *nulls, const O
{ {
int i; int i;
const char *sep = ""; const char *sep = "";
StringInfo result; StringInfoData result;
result = makeStringInfo(); initStringInfo(&result);
appendStringInfoChar(result, '['); appendStringInfoChar(&result, '[');
for (i = 0; i < nargs; i++) for (i = 0; i < nargs; i++)
{ {
if (absent_on_null && nulls[i]) if (absent_on_null && nulls[i])
continue; continue;
appendStringInfoString(result, sep); appendStringInfoString(&result, sep);
sep = ", "; sep = ", ";
add_json(args[i], nulls[i], result, types[i], false); add_json(args[i], nulls[i], &result, types[i], false);
} }
appendStringInfoChar(result, ']'); appendStringInfoChar(&result, ']');
return PointerGetDatum(cstring_to_text_with_len(result->data, result->len)); return PointerGetDatum(cstring_to_text_with_len(result.data, result.len));
} }
/* /*

9
src/backend/utils/adt/jsonb.c
Unescape View File

@ -125,15 +125,16 @@ jsonb_send(PG_FUNCTION_ARGS)
{ {
Jsonb *jb = PG_GETARG_JSONB_P(0); Jsonb *jb = PG_GETARG_JSONB_P(0);
StringInfoData buf; StringInfoData buf;
StringInfo jtext = makeStringInfo(); StringInfoData jtext;
int version = 1; int version = 1;
(void) JsonbToCString(jtext, &jb->root, VARSIZE(jb)); initStringInfo(&jtext);
(void) JsonbToCString(&jtext, &jb->root, VARSIZE(jb));
pq_begintypsend(&buf); pq_begintypsend(&buf);
pq_sendint8(&buf, version); pq_sendint8(&buf, version);
pq_sendtext(&buf, jtext->data, jtext->len); pq_sendtext(&buf, jtext.data, jtext.len);
destroyStringInfo(jtext); pfree(jtext.data);
PG_RETURN_BYTEA_P(pq_endtypsend(&buf)); PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
} }

18
src/backend/utils/adt/jsonfuncs.c
Unescape View File

@ -4507,14 +4507,16 @@ json_strip_nulls(PG_FUNCTION_ARGS)
text *json = PG_GETARG_TEXT_PP(0); text *json = PG_GETARG_TEXT_PP(0);
bool strip_in_arrays = PG_NARGS() == 2 ? PG_GETARG_BOOL(1) : false; bool strip_in_arrays = PG_NARGS() == 2 ? PG_GETARG_BOOL(1) : false;
StripnullState *state; StripnullState *state;
StringInfoData strbuf;
JsonLexContext lex; JsonLexContext lex;
JsonSemAction *sem; JsonSemAction *sem;
state = palloc0(sizeof(StripnullState)); state = palloc0(sizeof(StripnullState));
sem = palloc0(sizeof(JsonSemAction)); sem = palloc0(sizeof(JsonSemAction));
initStringInfo(&strbuf);
state->lex = makeJsonLexContext(&lex, json, true); state->lex = makeJsonLexContext(&lex, json, true);
state->strval = makeStringInfo(); state->strval = &strbuf;
state->skip_next_null = false; state->skip_next_null = false;
state->strip_in_arrays = strip_in_arrays; state->strip_in_arrays = strip_in_arrays;
@ -4607,11 +4609,12 @@ Datum
jsonb_pretty(PG_FUNCTION_ARGS) jsonb_pretty(PG_FUNCTION_ARGS)
{ {
Jsonb *jb = PG_GETARG_JSONB_P(0); Jsonb *jb = PG_GETARG_JSONB_P(0);
StringInfo str = makeStringInfo(); StringInfoData str;
JsonbToCStringIndent(str, &jb->root, VARSIZE(jb)); initStringInfo(&str);
JsonbToCStringIndent(&str, &jb->root, VARSIZE(jb));
PG_RETURN_TEXT_P(cstring_to_text_with_len(str->data, str->len)); PG_RETURN_TEXT_P(cstring_to_text_with_len(str.data, str.len));
} }
/* /*
@ -5846,7 +5849,7 @@ transform_jsonb_string_values(Jsonb *jsonb, void *action_state,
* Iterate over a json, and apply a specified JsonTransformStringValuesAction * Iterate over a json, and apply a specified JsonTransformStringValuesAction
* to every string value or element. Any necessary context for a * to every string value or element. Any necessary context for a
* JsonTransformStringValuesAction can be passed in the action_state variable. * JsonTransformStringValuesAction can be passed in the action_state variable.
* Function returns a StringInfo, which is a copy of an original json with * Function returns a Text Datum, which is a copy of an original json with
* transformed values. * transformed values.
*/ */
text * text *
@ -5856,9 +5859,12 @@ transform_json_string_values(text *json, void *action_state,
JsonLexContext lex; JsonLexContext lex;
JsonSemAction *sem = palloc0(sizeof(JsonSemAction)); JsonSemAction *sem = palloc0(sizeof(JsonSemAction));
TransformJsonStringValuesState *state = palloc0(sizeof(TransformJsonStringValuesState)); TransformJsonStringValuesState *state = palloc0(sizeof(TransformJsonStringValuesState));
StringInfoData strbuf;
initStringInfo(&strbuf);
state->lex = makeJsonLexContext(&lex, json, true); state->lex = makeJsonLexContext(&lex, json, true);
state->strval = makeStringInfo(); state->strval = &strbuf;
state->action = transform_action; state->action = transform_action;
state->action_state = action_state; state->action_state = action_state;

13
src/backend/utils/adt/multirangetypes.c
Unescape View File

@ -378,17 +378,18 @@ multirange_send(PG_FUNCTION_ARGS)
{ {
MultirangeType *multirange = PG_GETARG_MULTIRANGE_P(0); MultirangeType *multirange = PG_GETARG_MULTIRANGE_P(0);
Oid mltrngtypoid = MultirangeTypeGetOid(multirange); Oid mltrngtypoid = MultirangeTypeGetOid(multirange);
StringInfo buf = makeStringInfo(); StringInfoData buf;
RangeType **ranges; RangeType **ranges;
int32 range_count; int32 range_count;
MultirangeIOData *cache; MultirangeIOData *cache;
initStringInfo(&buf);
cache = get_multirange_io_data(fcinfo, mltrngtypoid, IOFunc_send); cache = get_multirange_io_data(fcinfo, mltrngtypoid, IOFunc_send);
/* construct output */ /* construct output */
pq_begintypsend(buf); pq_begintypsend(&buf);
pq_sendint32(buf, multirange->rangeCount); pq_sendint32(&buf, multirange->rangeCount);
multirange_deserialize(cache->typcache->rngtype, multirange, &range_count, &ranges); multirange_deserialize(cache->typcache->rngtype, multirange, &range_count, &ranges);
for (int i = 0; i < range_count; i++) for (int i = 0; i < range_count; i++)
@ -399,11 +400,11 @@ multirange_send(PG_FUNCTION_ARGS)
range = RangeTypePGetDatum(ranges[i]); range = RangeTypePGetDatum(ranges[i]);
outputbytes = SendFunctionCall(&cache->typioproc, range); outputbytes = SendFunctionCall(&cache->typioproc, range);
pq_sendint32(buf, VARSIZE(outputbytes) - VARHDRSZ); pq_sendint32(&buf, VARSIZE(outputbytes) - VARHDRSZ);
pq_sendbytes(buf, VARDATA(outputbytes), VARSIZE(outputbytes) - VARHDRSZ); pq_sendbytes(&buf, VARDATA(outputbytes), VARSIZE(outputbytes) - VARHDRSZ);
} }
PG_RETURN_BYTEA_P(pq_endtypsend(buf)); PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
} }
/* /*

18
src/backend/utils/adt/rangetypes.c
Unescape View File

@ -264,7 +264,7 @@ Datum
range_send(PG_FUNCTION_ARGS) range_send(PG_FUNCTION_ARGS)
{ {
RangeType *range = PG_GETARG_RANGE_P(0); RangeType *range = PG_GETARG_RANGE_P(0);
StringInfo buf = makeStringInfo(); StringInfoData buf;
RangeIOData *cache; RangeIOData *cache;
char flags; char flags;
RangeBound lower; RangeBound lower;
@ -273,6 +273,8 @@ range_send(PG_FUNCTION_ARGS)
check_stack_depth(); /* recurses when subtype is a range type */ check_stack_depth(); /* recurses when subtype is a range type */
initStringInfo(&buf);
cache = get_range_io_data(fcinfo, RangeTypeGetOid(range), IOFunc_send); cache = get_range_io_data(fcinfo, RangeTypeGetOid(range), IOFunc_send);
/* deserialize */ /* deserialize */
@ -280,9 +282,9 @@ range_send(PG_FUNCTION_ARGS)
flags = range_get_flags(range); flags = range_get_flags(range);
/* construct output */ /* construct output */
pq_begintypsend(buf); pq_begintypsend(&buf);
pq_sendbyte(buf, flags); pq_sendbyte(&buf, flags);
if (RANGE_HAS_LBOUND(flags)) if (RANGE_HAS_LBOUND(flags))
{ {
@ -290,8 +292,8 @@ range_send(PG_FUNCTION_ARGS)
uint32 bound_len = VARSIZE(bound) - VARHDRSZ; uint32 bound_len = VARSIZE(bound) - VARHDRSZ;
char *bound_data = VARDATA(bound); char *bound_data = VARDATA(bound);
pq_sendint32(buf, bound_len); pq_sendint32(&buf, bound_len);
pq_sendbytes(buf, bound_data, bound_len); pq_sendbytes(&buf, bound_data, bound_len);
} }
if (RANGE_HAS_UBOUND(flags)) if (RANGE_HAS_UBOUND(flags))
@ -300,11 +302,11 @@ range_send(PG_FUNCTION_ARGS)
uint32 bound_len = VARSIZE(bound) - VARHDRSZ; uint32 bound_len = VARSIZE(bound) - VARHDRSZ;
char *bound_data = VARDATA(bound); char *bound_data = VARDATA(bound);
pq_sendint32(buf, bound_len); pq_sendint32(&buf, bound_len);
pq_sendbytes(buf, bound_data, bound_len); pq_sendbytes(&buf, bound_data, bound_len);
} }
PG_RETURN_BYTEA_P(pq_endtypsend(buf)); PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
} }
/* /*

17
src/backend/utils/adt/ruleutils.c
Unescape View File

@ -13711,25 +13711,26 @@ char *
get_range_partbound_string(List *bound_datums) get_range_partbound_string(List *bound_datums)
{ {
deparse_context context; deparse_context context;
StringInfo buf = makeStringInfo(); StringInfoData buf;
ListCell *cell; ListCell *cell;
char *sep; char *sep;
initStringInfo(&buf);
memset(&context, 0, sizeof(deparse_context)); memset(&context, 0, sizeof(deparse_context));
context.buf = buf; context.buf = &buf;
appendStringInfoChar(buf, '('); appendStringInfoChar(&buf, '(');
sep = ""; sep = "";
foreach(cell, bound_datums) foreach(cell, bound_datums)
{ {
PartitionRangeDatum *datum = PartitionRangeDatum *datum =
lfirst_node(PartitionRangeDatum, cell); lfirst_node(PartitionRangeDatum, cell);
appendStringInfoString(buf, sep); appendStringInfoString(&buf, sep);
if (datum->kind == PARTITION_RANGE_DATUM_MINVALUE) if (datum->kind == PARTITION_RANGE_DATUM_MINVALUE)
appendStringInfoString(buf, "MINVALUE"); appendStringInfoString(&buf, "MINVALUE");
else if (datum->kind == PARTITION_RANGE_DATUM_MAXVALUE) else if (datum->kind == PARTITION_RANGE_DATUM_MAXVALUE)
appendStringInfoString(buf, "MAXVALUE"); appendStringInfoString(&buf, "MAXVALUE");
else else
{ {
Const *val = castNode(Const, datum->value); Const *val = castNode(Const, datum->value);
@ -13738,7 +13739,7 @@ get_range_partbound_string(List *bound_datums)
} }
sep = ", "; sep = ", ";
} }
appendStringInfoChar(buf, ')'); appendStringInfoChar(&buf, ')');
return buf->data; return buf.data;
} }

34
src/backend/utils/adt/xml.c
Unescape View File

@ -2133,7 +2133,7 @@ xml_errorHandler(void *data, PgXmlErrorPtr error)
node->type == XML_ELEMENT_NODE) ? node->name : NULL; node->type == XML_ELEMENT_NODE) ? node->name : NULL;
int domain = error->domain; int domain = error->domain;
int level = error->level; int level = error->level;
StringInfo errorBuf; StringInfoData errorBuf;
/* /*
* Defend against someone passing us a bogus context struct. * Defend against someone passing us a bogus context struct.
@ -2210,16 +2210,16 @@ xml_errorHandler(void *data, PgXmlErrorPtr error)
} }
/* Prepare error message in errorBuf */ /* Prepare error message in errorBuf */
errorBuf = makeStringInfo(); initStringInfo(&errorBuf);
if (error->line > 0) if (error->line > 0)
appendStringInfo(errorBuf, "line %d: ", error->line); appendStringInfo(&errorBuf, "line %d: ", error->line);
if (name != NULL) if (name != NULL)
appendStringInfo(errorBuf, "element %s: ", name); appendStringInfo(&errorBuf, "element %s: ", name);
if (error->message != NULL) if (error->message != NULL)
appendStringInfoString(errorBuf, error->message); appendStringInfoString(&errorBuf, error->message);
else else
appendStringInfoString(errorBuf, "(no message provided)"); appendStringInfoString(&errorBuf, "(no message provided)");
/* /*
* Append context information to errorBuf. * Append context information to errorBuf.
@ -2237,11 +2237,11 @@ xml_errorHandler(void *data, PgXmlErrorPtr error)
xmlGenericErrorFunc errFuncSaved = xmlGenericError; xmlGenericErrorFunc errFuncSaved = xmlGenericError;
void *errCtxSaved = xmlGenericErrorContext; void *errCtxSaved = xmlGenericErrorContext;
xmlSetGenericErrorFunc(errorBuf, xmlSetGenericErrorFunc(&errorBuf,
(xmlGenericErrorFunc) appendStringInfo); (xmlGenericErrorFunc) appendStringInfo);
/* Add context information to errorBuf */ /* Add context information to errorBuf */
appendStringInfoLineSeparator(errorBuf); appendStringInfoLineSeparator(&errorBuf);
xmlParserPrintFileContext(input); xmlParserPrintFileContext(input);
@ -2250,7 +2250,7 @@ xml_errorHandler(void *data, PgXmlErrorPtr error)
} }
/* Get rid of any trailing newlines in errorBuf */ /* Get rid of any trailing newlines in errorBuf */
chopStringInfoNewlines(errorBuf); chopStringInfoNewlines(&errorBuf);
/* /*
* Legacy error handling mode. err_occurred is never set, we just add the * Legacy error handling mode. err_occurred is never set, we just add the
@ -2263,10 +2263,10 @@ xml_errorHandler(void *data, PgXmlErrorPtr error)
if (xmlerrcxt->strictness == PG_XML_STRICTNESS_LEGACY) if (xmlerrcxt->strictness == PG_XML_STRICTNESS_LEGACY)
{ {
appendStringInfoLineSeparator(&xmlerrcxt->err_buf); appendStringInfoLineSeparator(&xmlerrcxt->err_buf);
appendBinaryStringInfo(&xmlerrcxt->err_buf, errorBuf->data, appendBinaryStringInfo(&xmlerrcxt->err_buf, errorBuf.data,
errorBuf->len); errorBuf.len);
destroyStringInfo(errorBuf); pfree(errorBuf.data);
return; return;
} }
@ -2281,23 +2281,23 @@ xml_errorHandler(void *data, PgXmlErrorPtr error)
if (level >= XML_ERR_ERROR) if (level >= XML_ERR_ERROR)
{ {
appendStringInfoLineSeparator(&xmlerrcxt->err_buf); appendStringInfoLineSeparator(&xmlerrcxt->err_buf);
appendBinaryStringInfo(&xmlerrcxt->err_buf, errorBuf->data, appendBinaryStringInfo(&xmlerrcxt->err_buf, errorBuf.data,
errorBuf->len); errorBuf.len);
xmlerrcxt->err_occurred = true; xmlerrcxt->err_occurred = true;
} }
else if (level >= XML_ERR_WARNING) else if (level >= XML_ERR_WARNING)
{ {
ereport(WARNING, ereport(WARNING,
(errmsg_internal("%s", errorBuf->data))); (errmsg_internal("%s", errorBuf.data)));
} }
else else
{ {
ereport(NOTICE, ereport(NOTICE,
(errmsg_internal("%s", errorBuf->data))); (errmsg_internal("%s", errorBuf.data)));
} }
destroyStringInfo(errorBuf); pfree(errorBuf.data);
} }

Write Preview
Loading…
Cancel
Save