summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rowley2023-10-03 04:09:52 +0000
committerDavid Rowley2023-10-03 04:09:52 +0000
commit2075ba9dc9af8833b1147996c15246e44a1e4fab (patch)
treebe7b822bafcf2e6fdaf7a68b56f1458e868965c8
parent6b18b3fe2c2f375d4a5d8a69b67bc59d13d4c844 (diff)
Tidy-up some appendStringInfo*() usages
Make a few newish calls to appendStringInfo() which have no special formatting use appendStringInfoString() instead. Also, adjust usages of appendStringInfoString() which only append a string containing a single character to make use of appendStringInfoChar() instead. This makes the code marginally faster, but primarily this change is so we use the StringInfo type as it was intended to be used. Discussion: https://postgr.es/m/CAApHDvpXKQmL+r=VDNS98upqhr9yGBhv2Jw3GBFFk_wKHcB39A@mail.gmail.com
-rw-r--r--src/backend/access/rmgrdesc/heapdesc.c6
-rw-r--r--src/backend/access/rmgrdesc/nbtdesc.c2
-rw-r--r--src/backend/access/rmgrdesc/rmgrdesc_utils.c2
-rw-r--r--src/backend/access/transam/xlogbackup.c2
-rw-r--r--src/backend/replication/slot.c2
-rw-r--r--src/backend/utils/adt/ruleutils.c4
-rw-r--r--src/test/regress/pg_regress.c4
7 files changed, 11 insertions, 11 deletions
diff --git a/src/backend/access/rmgrdesc/heapdesc.c b/src/backend/access/rmgrdesc/heapdesc.c
index d73248abddf..f382c0f6236 100644
--- a/src/backend/access/rmgrdesc/heapdesc.c
+++ b/src/backend/access/rmgrdesc/heapdesc.c
@@ -47,7 +47,7 @@ infobits_desc(StringInfo buf, uint8 infobits, const char *keyname)
buf->data[buf->len] = '\0';
}
- appendStringInfoString(buf, "]");
+ appendStringInfoChar(buf, ']');
}
static void
@@ -68,7 +68,7 @@ truncate_flags_desc(StringInfo buf, uint8 flags)
buf->data[buf->len] = '\0';
}
- appendStringInfoString(buf, "]");
+ appendStringInfoChar(buf, ']');
}
static void
@@ -88,7 +88,7 @@ plan_elem_desc(StringInfo buf, void *plan, void *data)
*offsets += new_plan->ntuples;
- appendStringInfo(buf, " }");
+ appendStringInfoString(buf, " }");
}
void
diff --git a/src/backend/access/rmgrdesc/nbtdesc.c b/src/backend/access/rmgrdesc/nbtdesc.c
index e4fbaa4d5d5..f3d725a274e 100644
--- a/src/backend/access/rmgrdesc/nbtdesc.c
+++ b/src/backend/access/rmgrdesc/nbtdesc.c
@@ -248,5 +248,5 @@ delvacuum_desc(StringInfo buf, char *block_data,
((char *) updates + SizeOfBtreeUpdate +
updates->ndeletedtids * sizeof(uint16));
}
- appendStringInfoString(buf, "]");
+ appendStringInfoChar(buf, ']');
}
diff --git a/src/backend/access/rmgrdesc/rmgrdesc_utils.c b/src/backend/access/rmgrdesc/rmgrdesc_utils.c
index 808770524d6..ef89179bb47 100644
--- a/src/backend/access/rmgrdesc/rmgrdesc_utils.c
+++ b/src/backend/access/rmgrdesc/rmgrdesc_utils.c
@@ -37,7 +37,7 @@ array_desc(StringInfo buf, void *array, size_t elem_size, int count,
if (i < count - 1)
appendStringInfoString(buf, ", ");
}
- appendStringInfoString(buf, "]");
+ appendStringInfoChar(buf, ']');
}
void
diff --git a/src/backend/access/transam/xlogbackup.c b/src/backend/access/transam/xlogbackup.c
index 23461c9d2ca..21d68133ae1 100644
--- a/src/backend/access/transam/xlogbackup.c
+++ b/src/backend/access/transam/xlogbackup.c
@@ -58,7 +58,7 @@ build_backup_content(BackupState *state, bool ishistoryfile)
appendStringInfo(result, "CHECKPOINT LOCATION: %X/%X\n",
LSN_FORMAT_ARGS(state->checkpointloc));
- appendStringInfo(result, "BACKUP METHOD: streamed\n");
+ appendStringInfoString(result, "BACKUP METHOD: streamed\n");
appendStringInfo(result, "BACKUP FROM: %s\n",
state->started_in_recovery ? "standby" : "primary");
appendStringInfo(result, "START TIME: %s\n", startstrbuf);
diff --git a/src/backend/replication/slot.c b/src/backend/replication/slot.c
index 3ded3c1473c..7e5ec500d89 100644
--- a/src/backend/replication/slot.c
+++ b/src/backend/replication/slot.c
@@ -1282,7 +1282,7 @@ ReportSlotInvalidation(ReplicationSlotInvalidationCause cause,
break;
case RS_INVAL_WAL_LEVEL:
- appendStringInfo(&err_detail, _("Logical decoding on standby requires wal_level >= logical on the primary server."));
+ appendStringInfoString(&err_detail, _("Logical decoding on standby requires wal_level >= logical on the primary server."));
break;
case RS_INVAL_NONE:
pg_unreachable();
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index 8d5eac47916..442205382e3 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -10395,7 +10395,7 @@ get_func_sql_syntax(FuncExpr *expr, deparse_context *context)
case F_IS_NORMALIZED:
/* IS xxx NORMALIZED */
- appendStringInfoString(buf, "(");
+ appendStringInfoChar(buf, '(');
get_rule_expr_paren((Node *) linitial(expr->args), context, false,
(Node *) expr);
appendStringInfoString(buf, " IS");
@@ -10884,7 +10884,7 @@ get_json_constructor(JsonConstructorExpr *ctor, deparse_context *context,
}
get_json_constructor_options(ctor, buf);
- appendStringInfo(buf, ")");
+ appendStringInfoChar(buf, ')');
}
/*
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index ec67588cf58..7f704da730b 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -2339,9 +2339,9 @@ regression_main(int argc, char *argv[],
bindir ? "/" : "",
temp_instance);
if (debug)
- appendStringInfo(&cmd, " --debug");
+ appendStringInfoString(&cmd, " --debug");
if (nolocale)
- appendStringInfo(&cmd, " --no-locale");
+ appendStringInfoString(&cmd, " --no-locale");
appendStringInfo(&cmd, " > \"%s/log/initdb.log\" 2>&1", outputdir);
fflush(NULL);
if (system(cmd.data))