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

Ensure that unsigned 4-byte OIDs are able to squeeze into the signed

Browse Source 
4-byte int accepted by the two-argument form of pg_try_advisory_lock()
we are using.

Fixes #30. Thanks to Mark Steben and Greg Sabino Mullane for the report
and diagnosis.
This commit is contained in:
Josh Kupershmidt 2014-11-13 20:54:48 -05:00
parent 649e72c0a4
commit 4b334745a3
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bin/pg_repack.c
View File

@ -1359,8 +1359,8 @@ repack_one_table(const repack_table *table, const char *orderby)
/* Release advisory lock on table. */ /* Release advisory lock on table. */
params[0] = REPACK_LOCK_PREFIX_STR; params[0] = REPACK_LOCK_PREFIX_STR;
params[1] = buffer; params[1] = buffer;
res = pgut_execute(connection, "SELECT pg_advisory_unlock($1, $2)", res = pgut_execute(connection, "SELECT pg_advisory_unlock($1, -2147483648 + $2)",
2, params); 2, params);
ret = true; ret = true;
cleanup: cleanup:
@ -1525,8 +1525,13 @@ static bool advisory_lock(PGconn *conn, const char *relid)
params[0] = REPACK_LOCK_PREFIX_STR; params[0] = REPACK_LOCK_PREFIX_STR;
params[1] = relid; params[1] = relid;
res = pgut_execute(conn, "SELECT pg_try_advisory_lock($1, $2)", /* For the 2-argument form of pg_try_advisory_lock, we need to
2, params); * pass in two signed 4-byte integers. But a table OID is an
* *unsigned* 4-byte integer. Add -2147483648 to that OID to make
* it fit reliably into signed int space.
*/
res = pgut_execute(conn, "SELECT pg_try_advisory_lock($1, -2147483648 + $2)",
2, params);
if (PQresultStatus(res) != PGRES_TUPLES_OK) { if (PQresultStatus(res) != PGRES_TUPLES_OK) {
elog(ERROR, "%s", PQerrorMessage(connection)); elog(ERROR, "%s", PQerrorMessage(connection));