Since commit 742380f0429b6 included some of the same changes

schmiddy · dvarrazzo · commit 40626769d8b0 · 2012-11-16T15:27:53.000Z
already in 6a0af679e14d1d, go ahead and include a few more of
the error cleanup from 6a0af679e14d1d.
diff --git a/bin/pg_repack.c b/bin/pg_repack.c
@@ -331,7 +331,7 @@ repack_one_database(const char *orderby)
 		else
 		{
 			/* exit otherwise */
-			printf("%s", PQerrorMessage(connection));
+			elog(ERROR, "%s", PQerrorMessage(connection));
 			PQclear(res);
 			exit(1);
 		}
@@ -892,12 +892,9 @@ lock_access_share(PGconn *conn, Oid relid, const char *target_name)
 		}
 		else if (sqlstate_equals(res, SQLSTATE_QUERY_CANCELED))
 		{
-			/* XXX: does this ROLLBACK need any rethinking wrt. two connections
-			 * now? 
-			 */
 			/* retry if lock conflicted */
 			PQclear(res);
-			pgut_command(conn, "ROLLBACK", 0, NULL);
+			pgut_rollback(conn);
 			continue;
 		}
 		else
@@ -981,12 +978,9 @@ lock_exclusive(PGconn *conn, const char *relid, const char *lock_query, bool sta
 		}
 		else if (sqlstate_equals(res, SQLSTATE_QUERY_CANCELED))
 		{
-			/* XXX: does this ROLLBACK need any rethinking wrt. two connections
-			 * now? 
-			 */
 			/* retry if lock conflicted */
 			PQclear(res);
-			pgut_command(conn, "ROLLBACK", 0, NULL);
+			pgut_rollback(conn);
 			continue;
 		}
 		else

Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ repack_one_database(const char *orderby)`
`331`	`331`	`else`
`332`	`332`	`{`
`333`	`333`	`/* exit otherwise */`
`334`		`- printf("%s", PQerrorMessage(connection));`
	`334`	`+ elog(ERROR, "%s", PQerrorMessage(connection));`
`335`	`335`	`PQclear(res);`
`336`	`336`	`exit(1);`
`337`	`337`	`}`
`@@ -892,12 +892,9 @@ lock_access_share(PGconn conn, Oid relid, const char target_name)`
`892`	`892`	`}`
`893`	`893`	`else if (sqlstate_equals(res, SQLSTATE_QUERY_CANCELED))`
`894`	`894`	`{`
`895`		`- /* XXX: does this ROLLBACK need any rethinking wrt. two connections`
`896`		`- * now?`
`897`		`- */`
`898`	`895`	`/* retry if lock conflicted */`
`899`	`896`	`PQclear(res);`
`900`		`- pgut_command(conn, "ROLLBACK", 0, NULL);`
	`897`	`+ pgut_rollback(conn);`
`901`	`898`	`continue;`
`902`	`899`	`}`
`903`	`900`	`else`
`@@ -981,12 +978,9 @@ lock_exclusive(PGconn conn, const char relid, const char *lock_query, bool sta`
`981`	`978`	`}`
`982`	`979`	`else if (sqlstate_equals(res, SQLSTATE_QUERY_CANCELED))`
`983`	`980`	`{`
`984`		`- /* XXX: does this ROLLBACK need any rethinking wrt. two connections`
`985`		`- * now?`
`986`		`- */`
`987`	`981`	`/* retry if lock conflicted */`
`988`	`982`	`PQclear(res);`
`989`		`- pgut_command(conn, "ROLLBACK", 0, NULL);`
	`983`	`+ pgut_rollback(conn);`
`990`	`984`	`continue;`
`991`	`985`	`}`
`992`	`986`	`else`