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

Make some fast hacks to quote schema names

Browse Source 
Signed-off-by: Dan Farina <drfarina@acm.org>
This commit is contained in:
Dan Farina
2011-02-06 19:35:20 -08:00
committed by Dan Farina
parent bfd3aed33b
commit c1b84fe9fc
2 changed files with 82 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
dbutils.c
View File

@@ -181,12 +181,15 @@ PGconn *
getMasterConnection(PGconn *standby_conn, int id, char *cluster,
int *master_id, char *master_conninfo_out)
{
PGconn *master_conn = NULL;
PGresult *res1;
PGresult *res2;
char sqlquery[QUERY_STR_LEN];
char master_conninfo_stack[MAXCONNINFO];
char *master_conninfo = &*master_conninfo_stack;
PGconn *master_conn = NULL;
PGresult *res1;
PGresult *res2;
char sqlquery[QUERY_STR_LEN];
char master_conninfo_stack[MAXCONNINFO];
char *master_conninfo = &*master_conninfo_stack;
char schema_str[MAXLEN];
char schema_quoted[MAXLEN];
int i;
/*
@@ -196,10 +199,24 @@ getMasterConnection(PGconn *standby_conn, int id, char *cluster,
if (master_conninfo_out != NULL)
master_conninfo = master_conninfo_out;
/*
* XXX: This is copied in at least two other procedures
*
* Assemble the unquoted schema name
*/
maxlen_snprintf(schema_str, "repmgr_%s", cluster);
{
char *identifier = PQescapeIdentifier(standby_conn, schema_str,
strlen(schema_str));
maxlen_snprintf(schema_quoted, "%s", identifier);
free(identifier);
}
/* find all nodes belonging to this cluster */
sqlquery_snprintf(sqlquery, "SELECT * FROM repmgr_%s.repl_nodes "
sqlquery_snprintf(sqlquery, "SELECT * FROM %s.repl_nodes "
" WHERE cluster = '%s' and id <> %d",
cluster, cluster, id);
schema_quoted, cluster, id);
res1 = PQexec(standby_conn, sqlquery);
if (PQresultStatus(res1) != PGRES_TUPLES_OK)

82
repmgr.c
View File

@@ -316,6 +316,8 @@ do_master_register(void)
PGconn *conn;
PGresult *res;
char sqlquery[QUERY_STR_LEN];
char schema_str[MAXLEN];
char schema_quoted[MAXLEN];
bool schema_exists = false;
char master_version[MAXVERSIONSTR];
@@ -340,9 +342,20 @@ do_master_register(void)
return;
}
/* Assemble the unquoted schema name */
maxlen_snprintf(schema_str, "repmgr_%s", config.cluster_name);
{
char *identifier = PQescapeIdentifier(conn, schema_str,
strlen(schema_str));
maxlen_snprintf(schema_quoted, "%s", identifier);
free(identifier);
}
/* Check if there is a schema for this cluster */
sqlquery_snprintf(sqlquery, "SELECT 1 FROM pg_namespace "
"WHERE nspname = 'repmgr_%s'", config.cluster_name);
sqlquery_snprintf(sqlquery,
"SELECT 1 FROM pg_namespace "
"WHERE nspname = '%s'", schema_str);
res = PQexec(conn, sqlquery);
if (PQresultStatus(res) != PGRES_TUPLES_OK)
{
@@ -357,7 +370,7 @@ do_master_register(void)
{
if (!force) /* and we are not forcing so error */
{
fprintf(stderr, "Schema repmgr_%s already exists.", config.cluster_name);
fprintf(stderr, "Schema %s already exists.", schema_quoted);
PQclear(res);
PQfinish(conn);
return;
@@ -369,20 +382,20 @@ do_master_register(void)
if (!schema_exists)
{
/* ok, create the schema */
sqlquery_snprintf(sqlquery, "CREATE SCHEMA repmgr_%s", config.cluster_name);
sqlquery_snprintf(sqlquery, "CREATE SCHEMA %s", schema_quoted);
if (!PQexec(conn, sqlquery))
{
fprintf(stderr, "Cannot create the schema repmgr_%s: %s\n",
config.cluster_name, PQerrorMessage(conn));
fprintf(stderr, "Cannot create the schema %s: %s\n", schema_quoted,
PQerrorMessage(conn));
PQfinish(conn);
return;
}
/* ... the tables */
sqlquery_snprintf(sqlquery, "CREATE TABLE repmgr_%s.repl_nodes ( "
sqlquery_snprintf(sqlquery, "CREATE TABLE %s.repl_nodes ( "
" id integer primary key, "
" cluster text not null, "
" conninfo text not null)", config.cluster_name);
" conninfo text not null)", schema_quoted);
if (!PQexec(conn, sqlquery))
{
fprintf(stderr,
@@ -391,7 +404,7 @@ do_master_register(void)
return;
}
sqlquery_snprintf(sqlquery, "CREATE TABLE repmgr_%s.repl_monitor ( "
sqlquery_snprintf(sqlquery, "CREATE TABLE %s.repl_monitor ( "
" primary_node INTEGER NOT NULL, "
" standby_node INTEGER NOT NULL, "
" last_monitor_time TIMESTAMP WITH TIME ZONE NOT NULL, "
@@ -399,7 +412,7 @@ do_master_register(void)
" last_wal_standby_location TEXT NOT NULL, "
" replication_lag BIGINT NOT NULL, "
" apply_lag BIGINT NOT NULL) ",
config.cluster_name);
schema_quoted);
}
if (!PQexec(conn, sqlquery))
@@ -411,15 +424,17 @@ do_master_register(void)
}
/* and the view */
sqlquery_snprintf(sqlquery, "CREATE VIEW repmgr_%s.repl_status AS "
sqlquery_snprintf(sqlquery, "CREATE VIEW %s.repl_status AS "
" WITH monitor_info AS (SELECT *, ROW_NUMBER() OVER (PARTITION BY primary_node, standby_node "
" ORDER BY last_monitor_time desc) "
" FROM repmgr_%s.repl_monitor) "
" FROM %s.repl_monitor) "
" SELECT primary_node, standby_node, last_monitor_time, last_wal_primary_location, "
" last_wal_standby_location, pg_size_pretty(replication_lag) replication_lag, "
" pg_size_pretty(apply_lag) apply_lag, age(now(), last_monitor_time) AS time_lag "
" FROM monitor_info a "
" WHERE row_number = 1", config.cluster_name, config.cluster_name);
" WHERE row_number = 1",
schema_quoted, schema_quoted);
if (!PQexec(conn, sqlquery))
{
fprintf(stderr,
@@ -447,9 +462,9 @@ do_master_register(void)
/* Now register the master */
if (force)
{
sqlquery_snprintf(sqlquery, "DELETE FROM repmgr_%s.repl_nodes "
" WHERE id = %d",
config.cluster_name, config.node);
sqlquery_snprintf(sqlquery,
"DELETE FROM %s.repl_nodes WHERE id = %d",
schema_quoted, config.node);
if (!PQexec(conn, sqlquery))
{
@@ -460,9 +475,9 @@ do_master_register(void)
}
}
sqlquery_snprintf(sqlquery, "INSERT INTO repmgr_%s.repl_nodes "
sqlquery_snprintf(sqlquery, "INSERT INTO %s.repl_nodes "
"VALUES (%d, '%s', '%s')",
config.cluster_name, config.node, config.cluster_name,
schema_quoted, config.node, config.cluster_name,
config.conninfo);
if (!PQexec(conn, sqlquery))
@@ -487,12 +502,16 @@ do_standby_register(void)
PGresult *res;
char sqlquery[QUERY_STR_LEN];
char schema_str[MAXLEN];
char schema_quoted[MAXLEN];
char master_version[MAXVERSIONSTR];
char standby_version[MAXVERSIONSTR];
conn = establishDBConnection(config.conninfo, true);
/* XXX: A lot of copied code from do_master_register! Refactor */
/* should be v9 or better */
pg_version(conn, standby_version);
if (strcmp(standby_version, "") == 0)
@@ -511,9 +530,20 @@ do_standby_register(void)
return;
}
/* Assemble the unquoted schema name */
maxlen_snprintf(schema_str, "repmgr_%s", config.cluster_name);
{
char *identifier = PQescapeIdentifier(conn, schema_str,
strlen(schema_str));
maxlen_snprintf(schema_quoted, "%s", identifier);
free(identifier);
}
/* Check if there is a schema for this cluster */
sqlquery_snprintf(sqlquery, "SELECT 1 FROM pg_namespace "
"WHERE nspname = 'repmgr_%s'", config.cluster_name);
sqlquery_snprintf(sqlquery,
"SELECT 1 FROM pg_namespace "
" WHERE nspname = 'repmgr_%s'", schema_str);
res = PQexec(conn, sqlquery);
if (PQresultStatus(res) != PGRES_TUPLES_OK)
@@ -527,7 +557,7 @@ do_standby_register(void)
if (PQntuples(res) == 0) /* schema doesn't exists */
{
fprintf(stderr, "Schema repmgr_%s doesn't exists.", config.cluster_name);
fprintf(stderr, "Schema %s doesn't exists.", schema_quoted);
PQclear(res);
PQfinish(conn);
return;
@@ -566,9 +596,10 @@ do_standby_register(void)
/* Now register the standby */
if (force)
{
sqlquery_snprintf(sqlquery, "DELETE FROM repmgr_%s.repl_nodes "
sqlquery_snprintf(sqlquery,
"DELETE FROM %s.repl_nodes "
" WHERE id = %d",
config.cluster_name, config.node);
schema_quoted, config.node);
if (!PQexec(master_conn, sqlquery))
{
@@ -580,9 +611,10 @@ do_standby_register(void)
}
}
sqlquery_snprintf(sqlquery, "INSERT INTO repmgr_%s.repl_nodes "
sqlquery_snprintf(sqlquery, "INSERT INTO %s.repl_nodes "
"VALUES (%d, '%s', '%s')",
config.cluster_name, config.node, config.cluster_name, config.conninfo);
schema_quoted, config.node, config.cluster_name,
config.conninfo);
if (!PQexec(master_conn, sqlquery))
{