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

Switch to using pgut_command() and pgut_execute() for conn2.

Browse Source
This commit is contained in:
Josh Kupershmidt 2012-10-20 17:15:17 -07:00 committed by Daniele Varrazzo
parent 78bae38718
commit 3606e0a957
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/pg_repack.c
View File

@ -446,13 +446,13 @@ repack_one_table(const repack_table *table, const char *orderby)
command(sql.data, 0, NULL); command(sql.data, 0, NULL);
command("COMMIT", 0, NULL); command("COMMIT", 0, NULL);
PQclear(PQexec(conn2, "BEGIN ISOLATION LEVEL READ COMMITTED")); pgut_command(conn2, "BEGIN ISOLATION LEVEL READ COMMITTED", 0, NULL);
elog(DEBUG2, "Obtaining ACCESS SHARE lock for %s", table->target_name); elog(DEBUG2, "Obtaining ACCESS SHARE lock for %s", table->target_name);
/* XXX: table name escaping? */ /* XXX: table name escaping? */
printfStringInfo(&sql, "LOCK TABLE %s IN ACCESS SHARE MODE", printfStringInfo(&sql, "LOCK TABLE %s IN ACCESS SHARE MODE",
table->target_name); table->target_name);
res = PQexec(conn2, sql.data); res = pgut_execute(conn2, sql.data, 0, NULL);
if (PQresultStatus(res) != PGRES_COMMAND_OK) if (PQresultStatus(res) != PGRES_COMMAND_OK)
{ {
printf("%s", PQerrorMessage(conn2)); printf("%s", PQerrorMessage(conn2));
@ -466,7 +466,7 @@ repack_one_table(const repack_table *table, const char *orderby)
/* store the backend PID of our connection keeping an ACCESS SHARE /* store the backend PID of our connection keeping an ACCESS SHARE
lock on the target table. lock on the target table.
*/ */
res = PQexec(conn2, "SELECT pg_backend_pid()"); res = pgut_execute(conn2, "SELECT pg_backend_pid()", 0, NULL);
if (PQresultStatus(res) != PGRES_TUPLES_OK) if (PQresultStatus(res) != PGRES_TUPLES_OK)
{ {
printf("%s", PQerrorMessage(conn2)); printf("%s", PQerrorMessage(conn2));
@ -688,7 +688,7 @@ lock_exclusive(const char *relid, const char *lock_query, bool release_conn2)
* lock. * lock.
*/ */
if (release_conn2) if (release_conn2)
PQclear(PQexec(conn2, "COMMIT")); pgut_command(conn2, "COMMIT", 0, NULL);
/* wait for a while to lock the table. */ /* wait for a while to lock the table. */
wait_msec = Min(1000, i * 100); wait_msec = Min(1000, i * 100);
@ -740,7 +740,7 @@ repack_cleanup(bool fatal, void *userdata)
/* Rollback current transaction */ /* Rollback current transaction */
if (conn2) if (conn2)
PQclear(PQexec(conn2, "ROLLBACK")); pgut_command(conn2, "ROLLBACK", 0, NULL);
if (connection) if (connection)
command("ROLLBACK", 0, NULL); command("ROLLBACK", 0, NULL);