pg_upgrade: adjust logging to use QUERY_ALLOC lengths

bmomjian · bmomjian · commit 7567d94910c1 · 2014-08-20T13:04:45.000-04:00
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
@@ -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
@@ -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);
 

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ __attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 0)))`
`86`	`86`	`void`
`87`	`87`	`pg_log_v(eLogType type, const char *fmt, va_list ap)`
`88`	`88`	`{`
`89`		`- char message[MAX_STRING];`
	`89`	`+ char message[QUERY_ALLOC];`
`90`	`90`
`91`	`91`	`vsnprintf(message, sizeof(message), fmt, ap);`
`92`	`92`