From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 20 Aug 2014 17:03:58 +0000 (-0400)
Subject: pg_upgrade:  adjust logging to use QUERY_ALLOC lengths
X-Git-Tag: REL9_5_ALPHA1~1597
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7567d94910c100a28a79122e86297cd7a4c90df6;p=postgresql

pg_upgrade:  adjust logging to use QUERY_ALLOC lengths

Allows the logging to print the entire text of failed queries, rather
than a truncated version.
---

diff --git a/contrib/pg_upgrade/server.c b/contrib/pg_upgrade/server.c
index 3d041efbfd..fc0d22e2df 100644
--- a/contrib/pg_upgrade/server.c
+++ b/contrib/pg_upgrade/server.c
@@ -104,22 +104,22 @@ cluster_conn_opts(ClusterInfo *cluster)
 PGresult *
 executeQueryOrDie(PGconn *conn, const char *fmt,...)
 {
-	static char command[8192];
+	static char query[QUERY_ALLOC];
 	va_list		args;
 	PGresult   *result;
 	ExecStatusType status;
 
 	va_start(args, fmt);
-	vsnprintf(command, sizeof(command), fmt, args);
+	vsnprintf(query, sizeof(query), fmt, args);
 	va_end(args);
 
-	pg_log(PG_VERBOSE, "executing: %s\n", command);
-	result = PQexec(conn, command);
+	pg_log(PG_VERBOSE, "executing: %s\n", query);
+	result = PQexec(conn, query);
 	status = PQresultStatus(result);
 
 	if ((status != PGRES_TUPLES_OK) && (status != PGRES_COMMAND_OK))
 	{
-		pg_log(PG_REPORT, "SQL command failed\n%s\n%s\n", command,
+		pg_log(PG_REPORT, "SQL command failed\n%s\n%s\n", query,
 			   PQerrorMessage(conn));
 		PQclear(result);
 		PQfinish(conn);
diff --git a/contrib/pg_upgrade/util.c b/contrib/pg_upgrade/util.c
index 3b94057696..79da8d7920 100644
--- a/contrib/pg_upgrade/util.c
+++ b/contrib/pg_upgrade/util.c
@@ -86,7 +86,7 @@ __attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 0)))
 void
 pg_log_v(eLogType type, const char *fmt, va_list ap)
 {
-	char		message[MAX_STRING];
+	char		message[QUERY_ALLOC];
 
 	vsnprintf(message, sizeof(message), fmt, ap);