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

Change 'have_error' to 'ret' for simplicity.

Browse Source
This commit is contained in:
Josh Kupershmidt 2013-06-22 08:59:47 -04:00
parent d79d342eea
commit 673eac7b42
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bin/pg_repack.c
View File

@ -965,7 +965,7 @@ repack_one_table(const repack_table *table, const char *orderby)
char *vxid = NULL; char *vxid = NULL;
char buffer[12]; char buffer[12];
StringInfoData sql; StringInfoData sql;
bool have_error = false; bool ret = false;
/* Keep track of whether we have gotten through setup to install /* Keep track of whether we have gotten through setup to install
* the z_repack_trigger, log table, etc. ourselves. We don't want to * the z_repack_trigger, log table, etc. ourselves. We don't want to
@ -1015,13 +1015,11 @@ repack_one_table(const repack_table *table, const char *orderby)
if (PQresultStatus(res) != PGRES_TUPLES_OK) if (PQresultStatus(res) != PGRES_TUPLES_OK)
{ {
elog(ERROR, "%s", PQerrorMessage(connection)); elog(ERROR, "%s", PQerrorMessage(connection));
have_error = true;
goto cleanup; goto cleanup;
} }
else if (strcmp(getstr(res, 0, 0), "t") != 0) else if (strcmp(getstr(res, 0, 0), "t") != 0)
{ {
elog(WARNING, "Another pg_repack command may be running on the table. Please try again later."); elog(WARNING, "Another pg_repack command may be running on the table. Please try again later.");
have_error = true;
goto cleanup; goto cleanup;
} }
CLEARPGRES(res); CLEARPGRES(res);
@ -1029,7 +1027,6 @@ repack_one_table(const repack_table *table, const char *orderby)
if (!(lock_exclusive(connection, utoa(table->target_oid, buffer), table->lock_table, TRUE))) if (!(lock_exclusive(connection, utoa(table->target_oid, buffer), table->lock_table, TRUE)))
{ {
elog(WARNING, "lock_exclusive() failed for %s", table->target_name); elog(WARNING, "lock_exclusive() failed for %s", table->target_name);
have_error = true;
goto cleanup; goto cleanup;
} }
@ -1069,7 +1066,6 @@ repack_one_table(const repack_table *table, const char *orderby)
PQgetvalue(res, 0, 0), table->target_name))); PQgetvalue(res, 0, 0), table->target_name)));
} }
have_error = true;
goto cleanup; goto cleanup;
} }
CLEARPGRES(res); CLEARPGRES(res);
@ -1108,14 +1104,12 @@ repack_one_table(const repack_table *table, const char *orderby)
if (PQsetnonblocking(conn2, 1)) if (PQsetnonblocking(conn2, 1))
{ {
elog(WARNING, "Unable to set conn2 nonblocking."); elog(WARNING, "Unable to set conn2 nonblocking.");
have_error = true;
goto cleanup; goto cleanup;
} }
if (!(PQsendQuery(conn2, sql.data))) if (!(PQsendQuery(conn2, sql.data)))
{ {
elog(WARNING, "Error sending async query: %s\n%s", sql.data, elog(WARNING, "Error sending async query: %s\n%s", sql.data,
PQerrorMessage(conn2)); PQerrorMessage(conn2));
have_error = true;
goto cleanup; goto cleanup;
} }
@ -1132,7 +1126,6 @@ repack_one_table(const repack_table *table, const char *orderby)
if (!(kill_ddl(connection, table->target_oid, true))) if (!(kill_ddl(connection, table->target_oid, true)))
{ {
elog(WARNING, "kill_ddl() failed."); elog(WARNING, "kill_ddl() failed.");
have_error = true;
goto cleanup; goto cleanup;
} }
@ -1156,7 +1149,6 @@ repack_one_table(const repack_table *table, const char *orderby)
if (PQresultStatus(res) != PGRES_COMMAND_OK) if (PQresultStatus(res) != PGRES_COMMAND_OK)
{ {
elog(WARNING, "Error with LOCK TABLE: %s", PQerrorMessage(conn2)); elog(WARNING, "Error with LOCK TABLE: %s", PQerrorMessage(conn2));
have_error = true;
goto cleanup; goto cleanup;
} }
CLEARPGRES(res); CLEARPGRES(res);
@ -1166,7 +1158,6 @@ repack_one_table(const repack_table *table, const char *orderby)
if (PQsetnonblocking(conn2, 0)) if (PQsetnonblocking(conn2, 0))
{ {
elog(WARNING, "Unable to set conn2 blocking."); elog(WARNING, "Unable to set conn2 blocking.");
have_error = true;
goto cleanup; goto cleanup;
} }
@ -1194,7 +1185,6 @@ repack_one_table(const repack_table *table, const char *orderby)
{ {
elog(WARNING, "Unable to allocate vxid, length: %d\n", elog(WARNING, "Unable to allocate vxid, length: %d\n",
PQgetlength(res, 0, 0)); PQgetlength(res, 0, 0));
have_error = true;
goto cleanup; goto cleanup;
} }
CLEARPGRES(res); CLEARPGRES(res);
@ -1219,10 +1209,7 @@ repack_one_table(const repack_table *table, const char *orderby)
* AccessShare lock. * AccessShare lock.
*/ */
if (!(lock_access_share(connection, table->target_oid, table->target_name))) if (!(lock_access_share(connection, table->target_oid, table->target_name)))
{
have_error = true;
goto cleanup; goto cleanup;
}
command(table->create_table, 0, NULL); command(table->create_table, 0, NULL);
printfStringInfo(&sql, "SELECT repack.disable_autovacuum('repack.table_%u')", table->target_oid); printfStringInfo(&sql, "SELECT repack.disable_autovacuum('repack.table_%u')", table->target_oid);
@ -1234,10 +1221,9 @@ repack_one_table(const repack_table *table, const char *orderby)
/* /*
* 3. Create indexes on temp table. * 3. Create indexes on temp table.
*/ */
if (!rebuild_indexes(table)) { if (!rebuild_indexes(table))
have_error = true;
goto cleanup; goto cleanup;
}
CLEARPGRES(res); CLEARPGRES(res);
/* /*
@ -1294,7 +1280,6 @@ repack_one_table(const repack_table *table, const char *orderby)
{ {
elog(WARNING, "lock_exclusive() failed in conn2 for %s", elog(WARNING, "lock_exclusive() failed in conn2 for %s",
table->target_name); table->target_name);
have_error = true;
goto cleanup; goto cleanup;
} }
@ -1330,6 +1315,7 @@ repack_one_table(const repack_table *table, const char *orderby)
/* Release advisory lock on table. */ /* Release advisory lock on table. */
res = pgut_execute(connection, "SELECT pg_advisory_unlock($1::bigint)", res = pgut_execute(connection, "SELECT pg_advisory_unlock($1::bigint)",
1, params); 1, params);
ret = true;
cleanup: cleanup:
CLEARPGRES(res); CLEARPGRES(res);
@ -1344,7 +1330,7 @@ cleanup:
/* XXX: distinguish between fatal and non-fatal errors via the first /* XXX: distinguish between fatal and non-fatal errors via the first
* arg to repack_cleanup(). * arg to repack_cleanup().
*/ */
if (have_error && table_init) if ((!ret) && table_init)
repack_cleanup(false, table); repack_cleanup(false, table);
} }