github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-25 16:16:29 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

res1 -> res

Browse Source
This commit is contained in:
Ian Barwick
2015-01-09 11:20:07 +09:00
parent 17de82493a
commit dd064cb47c
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
repmgr.c
View File

@@ -2231,19 +2231,19 @@ create_schema(PGconn *conn)
/* /*
* copy_configuration() * copy_configuration()
* *
* Copy record's in master's `repl_nodes` table to witness database * Copy records in master's `repl_nodes` table to witness database
*/ */
static bool static bool
copy_configuration(PGconn *masterconn, PGconn *witnessconn) copy_configuration(PGconn *masterconn, PGconn *witnessconn)
{ {
char sqlquery[MAXLEN]; char sqlquery[MAXLEN];
PGresult *res1; PGresult *res;
int i; int i;
sqlquery_snprintf(sqlquery, "TRUNCATE TABLE %s.repl_nodes", repmgr_schema); sqlquery_snprintf(sqlquery, "TRUNCATE TABLE %s.repl_nodes", repmgr_schema);
log_debug("copy_configuration: %s\n", sqlquery); log_debug("copy_configuration: %s\n", sqlquery);
res1 = PQexec(witnessconn, sqlquery); res = PQexec(witnessconn, sqlquery);
if (!res1 || PQresultStatus(res1) != PGRES_COMMAND_OK) if (!res || PQresultStatus(res) != PGRES_COMMAND_OK)
{ {
fprintf(stderr, "Cannot clean node details in the witness, %s\n", fprintf(stderr, "Cannot clean node details in the witness, %s\n",
PQerrorMessage(witnessconn)); PQerrorMessage(witnessconn));
@@ -2253,26 +2253,26 @@ copy_configuration(PGconn *masterconn, PGconn *witnessconn)
sqlquery_snprintf(sqlquery, sqlquery_snprintf(sqlquery,
"SELECT id, name, conninfo, priority, witness FROM %s.repl_nodes", "SELECT id, name, conninfo, priority, witness FROM %s.repl_nodes",
repmgr_schema); repmgr_schema);
res1 = PQexec(masterconn, sqlquery); res = PQexec(masterconn, sqlquery);
if (PQresultStatus(res1) != PGRES_TUPLES_OK) if (PQresultStatus(res) != PGRES_TUPLES_OK)
{ {
fprintf(stderr, "Can't get configuration from master: %s\n", fprintf(stderr, "Can't get configuration from master: %s\n",
PQerrorMessage(masterconn)); PQerrorMessage(masterconn));
PQclear(res1); PQclear(res);
return false; return false;
} }
for (i = 0; i < PQntuples(res1); i++) for (i = 0; i < PQntuples(res); i++)
{ {
bool node_record_created; bool node_record_created;
char *witness = PQgetvalue(res1, i, 4); char *witness = PQgetvalue(res, i, 4);
node_record_created = create_node_record(witnessconn, node_record_created = create_node_record(witnessconn,
NULL, NULL,
atoi(PQgetvalue(res1, i, 0)), atoi(PQgetvalue(res, i, 0)),
options.cluster_name, options.cluster_name,
PQgetvalue(res1, i, 1), PQgetvalue(res, i, 1),
PQgetvalue(res1, i, 2), PQgetvalue(res, i, 2),
atoi(PQgetvalue(res1, i, 3)), atoi(PQgetvalue(res, i, 3)),
strcmp(witness, "t") ? true : false); strcmp(witness, "t") ? true : false);
@@ -2283,7 +2283,7 @@ copy_configuration(PGconn *masterconn, PGconn *witnessconn)
return false; return false;
} }
} }
PQclear(res1); PQclear(res);
return true; return true;
} }