farrokhi/pg_repack
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Since commit 742380f0429b6 included some of the same changes

Browse Source 
already in 6a0af679e14d1d, go ahead and include a few more of
the error cleanup from 6a0af679e14d1d.
This commit is contained in:
Josh Kupershmidt
2012-11-14 20:47:47 -05:00
committed by Daniele Varrazzo
parent 34605aef27
commit 40626769d8
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bin/pg_repack.c
View File

@ -331,7 +331,7 @@ repack_one_database(const char *orderby)
else else
{ {
/* exit otherwise */ /* exit otherwise */
printf("%s", PQerrorMessage(connection)); elog(ERROR, "%s", PQerrorMessage(connection));
PQclear(res); PQclear(res);
exit(1); 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)) else if (sqlstate_equals(res, SQLSTATE_QUERY_CANCELED))
{ {
/* XXX: does this ROLLBACK need any rethinking wrt. two connections
* now?
*/
/* retry if lock conflicted */ /* retry if lock conflicted */
PQclear(res); PQclear(res);
pgut_command(conn, "ROLLBACK", 0, NULL); pgut_rollback(conn);
continue; continue;
} }
else 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)) else if (sqlstate_equals(res, SQLSTATE_QUERY_CANCELED))
{ {
/* XXX: does this ROLLBACK need any rethinking wrt. two connections
* now?
*/
/* retry if lock conflicted */ /* retry if lock conflicted */
PQclear(res); PQclear(res);
pgut_command(conn, "ROLLBACK", 0, NULL); pgut_rollback(conn);
continue; continue;
} }
else else