Commit7567d94

committed

pg_upgrade: adjust logging to use QUERY_ALLOC lengths

Allows the logging to print the entire text of failed queries, ratherthan a truncated version.

1 parent02587dc commit7567d94Copy full SHA for 7567d94

File tree

-6

lines changed

-6

lines changed

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -104,22 +104,22 @@ cluster_conn_opts(ClusterInfo *cluster)`
`104`	`104`	`PGresult*`
`105`	`105`	`executeQueryOrDie(PGconnconn,constcharfmt,...)`
`106`	`106`	`{`
`107`		`-staticcharcommand[8192];`
	`107`	`+staticcharquery[QUERY_ALLOC];`
`108`	`108`	`va_listargs;`
`109`	`109`	`PGresult*result;`
`110`	`110`	`ExecStatusTypestatus;`
`111`	`111`
`112`	`112`	`va_start(args,fmt);`
`113`		`-vsnprintf(command,sizeof(command),fmt,args);`
	`113`	`+vsnprintf(query,sizeof(query),fmt,args);`
`114`	`114`	`va_end(args);`
`115`	`115`
`116`		`-pg_log(PG_VERBOSE,"executing: %s\n",command);`
`117`		`-result=PQexec(conn,command);`
	`116`	`+pg_log(PG_VERBOSE,"executing: %s\n",query);`
	`117`	`+result=PQexec(conn,query);`
`118`	`118`	`status=PQresultStatus(result);`
`119`	`119`
`120`	`120`	`if ((status!=PGRES_TUPLES_OK)&& (status!=PGRES_COMMAND_OK))`
`121`	`121`	`{`
`122`		`-pg_log(PG_REPORT,"SQL command failed\n%s\n%s\n",command,`
	`122`	`+pg_log(PG_REPORT,"SQL command failed\n%s\n%s\n",query,`
`123`	`123`	`PQerrorMessage(conn));`
`124`	`124`	`PQclear(result);`
`125`	`125`	`PQfinish(conn);`

Lines changed: 1 addition & 1 deletion

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(eLogTypetype,constchar*fmt,va_listap)`
`88`	`88`	`{`
`89`		`-charmessage[MAX_STRING];`
	`89`	`+charmessage[QUERY_ALLOC];`
`90`	`90`
`91`	`91`	`vsnprintf(message,sizeof(message),fmt,ap);`
`92`	`92`

Comments

(0)