From 8e3889d0667b5ce7e8e60066e7e29952d9ba5301 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Tue, 6 Feb 2024 17:34:42 -0800 Subject: [PATCH v3 02/10] stringinfo: Remove in-core use of appendStringInfoCharMacro() Kept seperate only to reduce size of patch moving to more inlining for stringinfo. Author: Andres Freund Discussion: https://postgr.es/m/20200603015559.qc7ry5jqmoxlpu4y@alap3.anarazel.de --- src/backend/commands/copyto.c | 2 +- src/backend/commands/explain.c | 8 +++---- src/backend/libpq/pqformat.c | 10 ++++---- src/backend/utils/adt/json.c | 6 ++--- src/backend/utils/adt/jsonb.c | 10 ++++---- src/backend/utils/adt/jsonfuncs.c | 28 +++++++++++------------ src/backend/utils/adt/jsonpath.c | 6 ++--- src/backend/utils/adt/rowtypes.c | 8 +++---- src/backend/utils/adt/varlena.c | 4 ++-- src/backend/utils/adt/xml.c | 2 +- src/backend/utils/error/csvlog.c | 8 +++---- src/backend/utils/error/elog.c | 4 ++-- src/backend/utils/mb/stringinfo_mb.c | 2 +- src/bin/pg_combinebackup/write_manifest.c | 6 ++--- src/bin/pg_rewind/libpq_source.c | 8 +++---- contrib/tcn/tcn.c | 16 ++++++------- 16 files changed, 64 insertions(+), 64 deletions(-) diff --git a/src/backend/commands/copyto.c b/src/backend/commands/copyto.c index 20ffc90363d..b7f8b04ed8d 100644 --- a/src/backend/commands/copyto.c +++ b/src/backend/commands/copyto.c @@ -187,7 +187,7 @@ CopySendString(CopyToState cstate, const char *str) static void CopySendChar(CopyToState cstate, char c) { - appendStringInfoCharMacro(cstate->fe_msgbuf, c); + appendStringInfoChar(cstate->fe_msgbuf, c); } static void diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index 83d00a46638..ddae81e5d7a 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -5098,16 +5098,16 @@ ExplainXMLTag(const char *tagname, int flags, ExplainState *es) if ((flags & X_NOWHITESPACE) == 0) appendStringInfoSpaces(es->str, 2 * es->indent); - appendStringInfoCharMacro(es->str, '<'); + appendStringInfoChar(es->str, '<'); if ((flags & X_CLOSING) != 0) - appendStringInfoCharMacro(es->str, '/'); + appendStringInfoChar(es->str, '/'); for (s = tagname; *s; s++) appendStringInfoChar(es->str, strchr(valid, *s) ? *s : '-'); if ((flags & X_CLOSE_IMMEDIATE) != 0) appendStringInfoString(es->str, " /"); - appendStringInfoCharMacro(es->str, '>'); + appendStringInfoChar(es->str, '>'); if ((flags & X_NOWHITESPACE) == 0) - appendStringInfoCharMacro(es->str, '\n'); + appendStringInfoChar(es->str, '\n'); } /* diff --git a/src/backend/libpq/pqformat.c b/src/backend/libpq/pqformat.c index a697ccfbbf9..4708a7988a6 100644 --- a/src/backend/libpq/pqformat.c +++ b/src/backend/libpq/pqformat.c @@ -235,7 +235,7 @@ pq_send_ascii_string(StringInfo buf, const char *str) if (IS_HIGHBIT_SET(ch)) ch = '?'; - appendStringInfoCharMacro(buf, ch); + appendStringInfoChar(buf, ch); } appendStringInfoChar(buf, '\0'); } @@ -330,10 +330,10 @@ pq_begintypsend(StringInfo buf) { initStringInfo(buf); /* Reserve four bytes for the bytea length word */ - appendStringInfoCharMacro(buf, '\0'); - appendStringInfoCharMacro(buf, '\0'); - appendStringInfoCharMacro(buf, '\0'); - appendStringInfoCharMacro(buf, '\0'); + appendStringInfoChar(buf, '\0'); + appendStringInfoChar(buf, '\0'); + appendStringInfoChar(buf, '\0'); + appendStringInfoChar(buf, '\0'); } /* -------------------------------- diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c index d719a61f16b..a8826fd45c6 100644 --- a/src/backend/utils/adt/json.c +++ b/src/backend/utils/adt/json.c @@ -1550,7 +1550,7 @@ escape_json(StringInfo buf, const char *str) { const char *p; - appendStringInfoCharMacro(buf, '"'); + appendStringInfoChar(buf, '"'); for (p = str; *p; p++) { switch (*p) @@ -1580,11 +1580,11 @@ escape_json(StringInfo buf, const char *str) if ((unsigned char) *p < ' ') appendStringInfo(buf, "\\u%04x", (int) *p); else - appendStringInfoCharMacro(buf, *p); + appendStringInfoChar(buf, *p); break; } } - appendStringInfoCharMacro(buf, '"'); + appendStringInfoChar(buf, '"'); } /* Semantic actions for key uniqueness check */ diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c index c10b3fbedf1..4dc820b92b2 100644 --- a/src/backend/utils/adt/jsonb.c +++ b/src/backend/utils/adt/jsonb.c @@ -533,7 +533,7 @@ JsonbToCStringWorker(StringInfo out, JsonbContainer *in, int estimated_len, bool if (!v.val.array.rawScalar) { add_indent(out, use_indent && !last_was_key, level); - appendStringInfoCharMacro(out, '['); + appendStringInfoChar(out, '['); } else raw_scalar = true; @@ -546,7 +546,7 @@ JsonbToCStringWorker(StringInfo out, JsonbContainer *in, int estimated_len, bool appendBinaryStringInfo(out, ", ", ispaces); add_indent(out, use_indent && !last_was_key, level); - appendStringInfoCharMacro(out, '{'); + appendStringInfoChar(out, '{'); first = true; level++; @@ -594,14 +594,14 @@ JsonbToCStringWorker(StringInfo out, JsonbContainer *in, int estimated_len, bool if (!raw_scalar) { add_indent(out, use_indent, level); - appendStringInfoCharMacro(out, ']'); + appendStringInfoChar(out, ']'); } first = false; break; case WJB_END_OBJECT: level--; add_indent(out, use_indent, level); - appendStringInfoCharMacro(out, '}'); + appendStringInfoChar(out, '}'); first = false; break; default: @@ -621,7 +621,7 @@ add_indent(StringInfo out, bool indent, int level) { if (indent) { - appendStringInfoCharMacro(out, '\n'); + appendStringInfoChar(out, '\n'); appendStringInfoSpaces(out, level * 4); } } diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c index 1b0f4943292..4a81bc15cf2 100644 --- a/src/backend/utils/adt/jsonfuncs.c +++ b/src/backend/utils/adt/jsonfuncs.c @@ -4311,7 +4311,7 @@ sn_object_start(void *state) { StripnullState *_state = (StripnullState *) state; - appendStringInfoCharMacro(_state->strval, '{'); + appendStringInfoChar(_state->strval, '{'); return JSON_SUCCESS; } @@ -4321,7 +4321,7 @@ sn_object_end(void *state) { StripnullState *_state = (StripnullState *) state; - appendStringInfoCharMacro(_state->strval, '}'); + appendStringInfoChar(_state->strval, '}'); return JSON_SUCCESS; } @@ -4331,7 +4331,7 @@ sn_array_start(void *state) { StripnullState *_state = (StripnullState *) state; - appendStringInfoCharMacro(_state->strval, '['); + appendStringInfoChar(_state->strval, '['); return JSON_SUCCESS; } @@ -4341,7 +4341,7 @@ sn_array_end(void *state) { StripnullState *_state = (StripnullState *) state; - appendStringInfoCharMacro(_state->strval, ']'); + appendStringInfoChar(_state->strval, ']'); return JSON_SUCCESS; } @@ -4363,7 +4363,7 @@ sn_object_field_start(void *state, char *fname, bool isnull) } if (_state->strval->data[_state->strval->len - 1] != '{') - appendStringInfoCharMacro(_state->strval, ','); + appendStringInfoChar(_state->strval, ','); /* * Unfortunately we don't have the quoted and escaped string any more, so @@ -4371,7 +4371,7 @@ sn_object_field_start(void *state, char *fname, bool isnull) */ escape_json(_state->strval, fname); - appendStringInfoCharMacro(_state->strval, ':'); + appendStringInfoChar(_state->strval, ':'); return JSON_SUCCESS; } @@ -4382,7 +4382,7 @@ sn_array_element_start(void *state, bool isnull) StripnullState *_state = (StripnullState *) state; if (_state->strval->data[_state->strval->len - 1] != '[') - appendStringInfoCharMacro(_state->strval, ','); + appendStringInfoChar(_state->strval, ','); return JSON_SUCCESS; } @@ -5785,7 +5785,7 @@ transform_string_values_object_start(void *state) { TransformJsonStringValuesState *_state = (TransformJsonStringValuesState *) state; - appendStringInfoCharMacro(_state->strval, '{'); + appendStringInfoChar(_state->strval, '{'); return JSON_SUCCESS; } @@ -5795,7 +5795,7 @@ transform_string_values_object_end(void *state) { TransformJsonStringValuesState *_state = (TransformJsonStringValuesState *) state; - appendStringInfoCharMacro(_state->strval, '}'); + appendStringInfoChar(_state->strval, '}'); return JSON_SUCCESS; } @@ -5805,7 +5805,7 @@ transform_string_values_array_start(void *state) { TransformJsonStringValuesState *_state = (TransformJsonStringValuesState *) state; - appendStringInfoCharMacro(_state->strval, '['); + appendStringInfoChar(_state->strval, '['); return JSON_SUCCESS; } @@ -5815,7 +5815,7 @@ transform_string_values_array_end(void *state) { TransformJsonStringValuesState *_state = (TransformJsonStringValuesState *) state; - appendStringInfoCharMacro(_state->strval, ']'); + appendStringInfoChar(_state->strval, ']'); return JSON_SUCCESS; } @@ -5826,14 +5826,14 @@ transform_string_values_object_field_start(void *state, char *fname, bool isnull TransformJsonStringValuesState *_state = (TransformJsonStringValuesState *) state; if (_state->strval->data[_state->strval->len - 1] != '{') - appendStringInfoCharMacro(_state->strval, ','); + appendStringInfoChar(_state->strval, ','); /* * Unfortunately we don't have the quoted and escaped string any more, so * we have to re-escape it. */ escape_json(_state->strval, fname); - appendStringInfoCharMacro(_state->strval, ':'); + appendStringInfoChar(_state->strval, ':'); return JSON_SUCCESS; } @@ -5844,7 +5844,7 @@ transform_string_values_array_element_start(void *state, bool isnull) TransformJsonStringValuesState *_state = (TransformJsonStringValuesState *) state; if (_state->strval->data[_state->strval->len - 1] != '[') - appendStringInfoCharMacro(_state->strval, ','); + appendStringInfoChar(_state->strval, ','); return JSON_SUCCESS; } diff --git a/src/backend/utils/adt/jsonpath.c b/src/backend/utils/adt/jsonpath.c index 258ed8eb117..a760b3ba8de 100644 --- a/src/backend/utils/adt/jsonpath.c +++ b/src/backend/utils/adt/jsonpath.c @@ -484,13 +484,13 @@ alignStringInfoInt(StringInfo buf) switch (INTALIGN(buf->len) - buf->len) { case 3: - appendStringInfoCharMacro(buf, 0); + appendStringInfoChar(buf, 0); /* FALLTHROUGH */ case 2: - appendStringInfoCharMacro(buf, 0); + appendStringInfoChar(buf, 0); /* FALLTHROUGH */ case 1: - appendStringInfoCharMacro(buf, 0); + appendStringInfoChar(buf, 0); /* FALLTHROUGH */ default: break; diff --git a/src/backend/utils/adt/rowtypes.c b/src/backend/utils/adt/rowtypes.c index adc02702fca..d489dab9f54 100644 --- a/src/backend/utils/adt/rowtypes.c +++ b/src/backend/utils/adt/rowtypes.c @@ -452,17 +452,17 @@ record_out(PG_FUNCTION_ARGS) /* And emit the string */ if (nq) - appendStringInfoCharMacro(&buf, '"'); + appendStringInfoChar(&buf, '"'); for (tmp = value; *tmp; tmp++) { char ch = *tmp; if (ch == '"' || ch == '\\') - appendStringInfoCharMacro(&buf, ch); - appendStringInfoCharMacro(&buf, ch); + appendStringInfoChar(&buf, ch); + appendStringInfoChar(&buf, ch); } if (nq) - appendStringInfoCharMacro(&buf, '"'); + appendStringInfoChar(&buf, '"'); } appendStringInfoChar(&buf, ')'); diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c index 543afb66e58..01d5d0dbb63 100644 --- a/src/backend/utils/adt/varlena.c +++ b/src/backend/utils/adt/varlena.c @@ -5689,7 +5689,7 @@ text_format(PG_FUNCTION_ARGS) */ if (*cp != '%') { - appendStringInfoCharMacro(&str, *cp); + appendStringInfoChar(&str, *cp); continue; } @@ -5698,7 +5698,7 @@ text_format(PG_FUNCTION_ARGS) /* Easy case: %% outputs a single % */ if (*cp == '%') { - appendStringInfoCharMacro(&str, *cp); + appendStringInfoChar(&str, *cp); continue; } diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c index 3e24aba546f..24967a1caf2 100644 --- a/src/backend/utils/adt/xml.c +++ b/src/backend/utils/adt/xml.c @@ -2655,7 +2655,7 @@ escape_xml(const char *str) appendStringInfoString(&buf, " "); break; default: - appendStringInfoCharMacro(&buf, *p); + appendStringInfoChar(&buf, *p); break; } } diff --git a/src/backend/utils/error/csvlog.c b/src/backend/utils/error/csvlog.c index 1b62b07f231..9d6f1f661a7 100644 --- a/src/backend/utils/error/csvlog.c +++ b/src/backend/utils/error/csvlog.c @@ -45,14 +45,14 @@ appendCSVLiteral(StringInfo buf, const char *data) if (p == NULL) return; - appendStringInfoCharMacro(buf, '"'); + appendStringInfoChar(buf, '"'); while ((c = *p++) != '\0') { if (c == '"') - appendStringInfoCharMacro(buf, '"'); - appendStringInfoCharMacro(buf, c); + appendStringInfoChar(buf, '"'); + appendStringInfoChar(buf, c); } - appendStringInfoCharMacro(buf, '"'); + appendStringInfoChar(buf, '"'); } /* diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index bba00a0087f..4dce794a989 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -3689,9 +3689,9 @@ append_with_tabs(StringInfo buf, const char *str) while ((ch = *str++) != '\0') { - appendStringInfoCharMacro(buf, ch); + appendStringInfoChar(buf, ch); if (ch == '\n') - appendStringInfoCharMacro(buf, '\t'); + appendStringInfoChar(buf, '\t'); } } diff --git a/src/backend/utils/mb/stringinfo_mb.c b/src/backend/utils/mb/stringinfo_mb.c index f4af3909e88..b90aa9830a1 100644 --- a/src/backend/utils/mb/stringinfo_mb.c +++ b/src/backend/utils/mb/stringinfo_mb.c @@ -61,7 +61,7 @@ appendStringInfoStringQuoted(StringInfo str, const char *s, int maxlen) ellipsis = false; } - appendStringInfoCharMacro(str, '\''); + appendStringInfoChar(str, '\''); while ((chunk_end = strchr(chunk_search_start, '\'')) != NULL) { diff --git a/src/bin/pg_combinebackup/write_manifest.c b/src/bin/pg_combinebackup/write_manifest.c index 01deb82cc9f..fae1043d2d0 100644 --- a/src/bin/pg_combinebackup/write_manifest.c +++ b/src/bin/pg_combinebackup/write_manifest.c @@ -194,7 +194,7 @@ escape_json(StringInfo buf, const char *str) { const char *p; - appendStringInfoCharMacro(buf, '"'); + appendStringInfoChar(buf, '"'); for (p = str; *p; p++) { switch (*p) @@ -224,11 +224,11 @@ escape_json(StringInfo buf, const char *str) if ((unsigned char) *p < ' ') appendStringInfo(buf, "\\u%04x", (int) *p); else - appendStringInfoCharMacro(buf, *p); + appendStringInfoChar(buf, *p); break; } } - appendStringInfoCharMacro(buf, '"'); + appendStringInfoChar(buf, '"'); } /* diff --git a/src/bin/pg_rewind/libpq_source.c b/src/bin/pg_rewind/libpq_source.c index 7d898c3b501..476cc4249cd 100644 --- a/src/bin/pg_rewind/libpq_source.c +++ b/src/bin/pg_rewind/libpq_source.c @@ -613,19 +613,19 @@ process_queued_fetch_requests(libpq_source *src) static void appendArrayEscapedString(StringInfo buf, const char *str) { - appendStringInfoCharMacro(buf, '\"'); + appendStringInfoChar(buf, '\"'); while (*str) { char ch = *str; if (ch == '"' || ch == '\\') - appendStringInfoCharMacro(buf, '\\'); + appendStringInfoChar(buf, '\\'); - appendStringInfoCharMacro(buf, ch); + appendStringInfoChar(buf, ch); str++; } - appendStringInfoCharMacro(buf, '\"'); + appendStringInfoChar(buf, '\"'); } /* diff --git a/contrib/tcn/tcn.c b/contrib/tcn/tcn.c index 8d23c824c1b..754deae54e7 100644 --- a/contrib/tcn/tcn.c +++ b/contrib/tcn/tcn.c @@ -32,15 +32,15 @@ PG_MODULE_MAGIC; static void strcpy_quoted(StringInfo r, const char *s, const char q) { - appendStringInfoCharMacro(r, q); + appendStringInfoChar(r, q); while (*s) { if (*s == q) - appendStringInfoCharMacro(r, q); - appendStringInfoCharMacro(r, *s); + appendStringInfoChar(r, q); + appendStringInfoChar(r, *s); s++; } - appendStringInfoCharMacro(r, q); + appendStringInfoChar(r, q); } /* @@ -147,17 +147,17 @@ triggered_change_notification(PG_FUNCTION_ARGS) foundPK = true; strcpy_quoted(payload, RelationGetRelationName(rel), '"'); - appendStringInfoCharMacro(payload, ','); - appendStringInfoCharMacro(payload, operation); + appendStringInfoChar(payload, ','); + appendStringInfoChar(payload, operation); for (i = 0; i < indnkeyatts; i++) { int colno = index->indkey.values[i]; Form_pg_attribute attr = TupleDescAttr(tupdesc, colno - 1); - appendStringInfoCharMacro(payload, ','); + appendStringInfoChar(payload, ','); strcpy_quoted(payload, NameStr(attr->attname), '"'); - appendStringInfoCharMacro(payload, '='); + appendStringInfoChar(payload, '='); strcpy_quoted(payload, SPI_getvalue(trigtuple, tupdesc, colno), '\''); } -- 2.38.0