Since commit 742380f0429b6 included some of the same changes
already in 6a0af679e14d1d, go ahead and include a few more of the error cleanup from 6a0af679e14d1d.
This commit is contained in:
parent
34605aef27
commit
40626769d8
@ -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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user