Tidy-up some appendStringInfo*() usages

david-rowley · david-rowley · commit 2075ba9dc9af · 2023-10-03T17:09:52.000+13:00
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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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))

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ infobits_desc(StringInfo buf, uint8 infobits, const char *keyname)`
`47`	`47`	`buf->data[buf->len] = '\0';`
`48`	`48`	`}`
`49`	`49`
`50`		`- appendStringInfoString(buf, "]");`
	`50`	`+ appendStringInfoChar(buf, ']');`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`static void`
`@@ -68,7 +68,7 @@ truncate_flags_desc(StringInfo buf, uint8 flags)`
`68`	`68`	`buf->data[buf->len] = '\0';`
`69`	`69`	`}`
`70`	`70`
`71`		`- appendStringInfoString(buf, "]");`
	`71`	`+ appendStringInfoChar(buf, ']');`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`static void`
`@@ -88,7 +88,7 @@ plan_elem_desc(StringInfo buf, void plan, void data)`
`88`	`88`
`89`	`89`	`*offsets += new_plan->ntuples;`
`90`	`90`
`91`		`- appendStringInfo(buf, " }");`
	`91`	`+ appendStringInfoString(buf, " }");`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`void`
Original file line number	Diff line number	Diff line change
`@@ -248,5 +248,5 @@ delvacuum_desc(StringInfo buf, char *block_data,`
`248`	`248`	`((char *) updates + SizeOfBtreeUpdate +`
`249`	`249`	`updates->ndeletedtids * sizeof(uint16));`
`250`	`250`	`}`
`251`		`- appendStringInfoString(buf, "]");`
	`251`	`+ appendStringInfoChar(buf, ']');`
`252`	`252`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ array_desc(StringInfo buf, void *array, size_t elem_size, int count,`
`37`	`37`	`if (i < count - 1)`
`38`	`38`	`appendStringInfoString(buf, ", ");`
`39`	`39`	`}`
`40`		`- appendStringInfoString(buf, "]");`
	`40`	`+ appendStringInfoChar(buf, ']');`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`void`
Original file line number	Diff line number	Diff line change
`@@ -10395,7 +10395,7 @@ get_func_sql_syntax(FuncExpr expr, deparse_context context)`
`10395`	`10395`
`10396`	`10396`	`case F_IS_NORMALIZED:`
`10397`	`10397`	`/* IS xxx NORMALIZED */`
`10398`		`- appendStringInfoString(buf, "(");`
	`10398`	`+ appendStringInfoChar(buf, '(');`
`10399`	`10399`	`get_rule_expr_paren((Node *) linitial(expr->args), context, false,`
`10400`	`10400`	`(Node *) expr);`
`10401`	`10401`	`appendStringInfoString(buf, " IS");`
`@@ -10884,7 +10884,7 @@ get_json_constructor(JsonConstructorExpr ctor, deparse_context context,`
`10884`	`10884`	`}`
`10885`	`10885`
`10886`	`10886`	`get_json_constructor_options(ctor, buf);`
`10887`		`- appendStringInfo(buf, ")");`
	`10887`	`+ appendStringInfoChar(buf, ')');`
`10888`	`10888`	`}`
`10889`	`10889`
`10890`	`10890`	`/*`