From 84b69b3bd4b879330284eca179a8d1ca8fdeb943 Mon Sep 17 00:00:00 2001 From: Dan Farina Date: Tue, 7 Dec 2010 21:37:56 -0800 Subject: [PATCH] Whitespace to adjust for longer snprintf identifier This is done in a separate patch to try and reduce the sound and fury of the patch that actually did the conversion from sprintf to snprintf-alikes. Signed-off-by: Dan Farina Signed-off-by: Peter van Hardenberg --- config.c | 2 +- dbutils.c | 15 +++++---- repmgr.c | 97 ++++++++++++++++++++++++++++++++----------------------- repmgrd.c | 39 +++++++++++----------- 4 files changed, 85 insertions(+), 68 deletions(-) diff --git a/config.c b/config.c index 6ae49e5b..2aac8c16 100644 --- a/config.c +++ b/config.c @@ -43,7 +43,7 @@ parse_config(const char *config_file, char *cluster_name, int *node, strncpy (conninfo, value, MAXLEN); else printf("WARNING: %s/%s: Unknown name/value pair!\n", - name, value); + name, value); } /* Close file */ diff --git a/dbutils.c b/dbutils.c index e3f5577f..9a771dfd 100644 --- a/dbutils.c +++ b/dbutils.c @@ -116,8 +116,8 @@ guc_setted(PGconn *conn, const char *parameter, const char *op, char sqlquery[QUERY_STR_LEN]; sqlquery_snprintf(sqlquery, "SELECT true FROM pg_settings " - " WHERE name = '%s' AND setting %s '%s'", - parameter, op, value); + " WHERE name = '%s' AND setting %s '%s'", + parameter, op, value); res = PQexec(conn, sqlquery); if (PQresultStatus(res) != PGRES_TUPLES_OK) @@ -145,9 +145,10 @@ get_cluster_size(PGconn *conn) const char *size; char sqlquery[QUERY_STR_LEN]; - sqlquery_snprintf(sqlquery, - "SELECT pg_size_pretty(SUM(pg_database_size(oid))::bigint) " - " FROM pg_database "); + sqlquery_snprintf( + sqlquery, + "SELECT pg_size_pretty(SUM(pg_database_size(oid))::bigint) " + " FROM pg_database "); res = PQexec(conn, sqlquery); if (PQresultStatus(res) != PGRES_TUPLES_OK) @@ -179,8 +180,8 @@ getMasterConnection(PGconn *standby_conn, int id, char *cluster, /* find all nodes belonging to this cluster */ sqlquery_snprintf(sqlquery, "SELECT * FROM repmgr_%s.repl_nodes " - " WHERE cluster = '%s' and id <> %d", - cluster, cluster, id); + " WHERE cluster = '%s' and id <> %d", + cluster, cluster, id); res1 = PQexec(standby_conn, sqlquery); if (PQresultStatus(res1) != PGRES_TUPLES_OK) diff --git a/repmgr.c b/repmgr.c index 61d1e85f..d9d96006 100644 --- a/repmgr.c +++ b/repmgr.c @@ -335,7 +335,7 @@ do_master_register(void) /* Check if there is a schema for this cluster */ sqlquery_snprintf(sqlquery, "SELECT 1 FROM pg_namespace WHERE nspname = 'repmgr_%s'", - myClusterName); + myClusterName); res = PQexec(conn, sqlquery); if (PQresultStatus(res) != PGRES_TUPLES_OK) { @@ -373,9 +373,9 @@ do_master_register(void) /* ... the tables */ sqlquery_snprintf(sqlquery, "CREATE TABLE repmgr_%s.repl_nodes ( " - " id integer primary key, " - " cluster text not null, " - " conninfo text not null)", myClusterName); + " id integer primary key, " + " cluster text not null, " + " conninfo text not null)", myClusterName); if (!PQexec(conn, sqlquery)) { fprintf(stderr, @@ -386,14 +386,14 @@ do_master_register(void) } sqlquery_snprintf(sqlquery, "CREATE TABLE repmgr_%s.repl_monitor ( " - " primary_node INTEGER NOT NULL, " - " standby_node INTEGER NOT NULL, " - " last_monitor_time TIMESTAMP WITH TIME ZONE NOT NULL, " - " last_wal_primary_location TEXT NOT NULL, " - " last_wal_standby_location TEXT NOT NULL, " - " replication_lag BIGINT NOT NULL, " - " apply_lag BIGINT NOT NULL) ", - myClusterName); + " primary_node INTEGER NOT NULL, " + " standby_node INTEGER NOT NULL, " + " last_monitor_time TIMESTAMP WITH TIME ZONE NOT NULL, " + " last_wal_primary_location TEXT NOT NULL, " + " last_wal_standby_location TEXT NOT NULL, " + " replication_lag BIGINT NOT NULL, " + " apply_lag BIGINT NOT NULL) ", + myClusterName); if (!PQexec(conn, sqlquery)) { fprintf(stderr, @@ -405,14 +405,14 @@ do_master_register(void) /* and the view */ sqlquery_snprintf(sqlquery, "CREATE VIEW repmgr_%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) " - " 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", myClusterName, myClusterName); + " 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) " + " 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", myClusterName, myClusterName); if (!PQexec(conn, sqlquery)) { fprintf(stderr, @@ -441,8 +441,8 @@ do_master_register(void) if (force) { sqlquery_snprintf(sqlquery, "DELETE FROM repmgr_%s.repl_nodes " - " WHERE id = %d", - myClusterName, myLocalId); + " WHERE id = %d", + myClusterName, myLocalId); if (!PQexec(conn, sqlquery)) { @@ -454,8 +454,8 @@ do_master_register(void) } sqlquery_snprintf(sqlquery, "INSERT INTO repmgr_%s.repl_nodes " - "VALUES (%d, '%s', '%s')", - myClusterName, myLocalId, myClusterName, conninfo); + "VALUES (%d, '%s', '%s')", + myClusterName, myLocalId, myClusterName, conninfo); if (!PQexec(conn, sqlquery)) { @@ -519,8 +519,9 @@ do_standby_register(void) } /* Check if there is a schema for this cluster */ - sqlquery_snprintf(sqlquery, "SELECT 1 FROM pg_namespace WHERE nspname = 'repmgr_%s'", - myClusterName); + sqlquery_snprintf(sqlquery, + "SELECT 1 FROM pg_namespace WHERE nspname = 'repmgr_%s'", + myClusterName); res = PQexec(conn, sqlquery); if (PQresultStatus(res) != PGRES_TUPLES_OK) { @@ -572,8 +573,8 @@ do_standby_register(void) if (force) { sqlquery_snprintf(sqlquery, "DELETE FROM repmgr_%s.repl_nodes " - " WHERE id = %d", - myClusterName, myLocalId); + " WHERE id = %d", + myClusterName, myLocalId); if (!PQexec(master_conn, sqlquery)) { @@ -586,8 +587,8 @@ do_standby_register(void) } sqlquery_snprintf(sqlquery, "INSERT INTO repmgr_%s.repl_nodes " - "VALUES (%d, '%s', '%s')", - myClusterName, myLocalId, myClusterName, conninfo); + "VALUES (%d, '%s', '%s')", + myClusterName, myLocalId, myClusterName, conninfo); if (!PQexec(master_conn, sqlquery)) { @@ -748,8 +749,13 @@ do_standby_clone(void) if (verbose) printf(_("Succesfully connected to primary. Current installation size is %s\n"), get_cluster_size(conn)); - /* Check if the tablespace locations exists and that we can write to them */ - sqlquery_snprintf(sqlquery, "select spclocation from pg_tablespace where spcname not in ('pg_default', 'pg_global')"); + /* + * Check if the tablespace locations exists and that we can write to them. + */ + sqlquery_snprintf(sqlquery, + "SELECT spclocation " + " FROM pg_tablespace " + "WHERE spcname NOT IN ('pg_default', 'pg_global')"); res = PQexec(conn, sqlquery); if (PQresultStatus(res) != PGRES_TUPLES_OK) { @@ -824,9 +830,12 @@ do_standby_clone(void) fprintf(stderr, "Starting backup...\n"); /* Get the data directory full path and the configuration files location */ - sqlquery_snprintf(sqlquery, "SELECT name, setting " - " FROM pg_settings " - " WHERE name IN ('data_directory', 'config_file', 'hba_file', 'ident_file')"); + sqlquery_snprintf( + sqlquery, + "SELECT name, setting " + " FROM pg_settings " + " WHERE name IN ('data_directory', 'config_file', 'hba_file', " + " 'ident_file')"); res = PQexec(conn, sqlquery); if (PQresultStatus(res) != PGRES_TUPLES_OK) { @@ -854,7 +863,10 @@ do_standby_clone(void) * inform the master we will start a backup and get the first XLog filename * so we can say to the user we need those files */ - sqlquery_snprintf(sqlquery, "SELECT pg_xlogfile_name(pg_start_backup('repmgr_standby_clone_%ld'))", time(NULL)); + sqlquery_snprintf( + sqlquery, + "SELECT pg_xlogfile_name(pg_start_backup('repmgr_standby_clone_%ld'))", + time(NULL)); res = PQexec(conn, sqlquery); if (PQresultStatus(res) != PGRES_TUPLES_OK) { @@ -906,7 +918,10 @@ do_standby_clone(void) * find and appropiate rsync option but besides we could someday make all * these rsync happen concurrently */ - sqlquery_snprintf(sqlquery, "select spclocation from pg_tablespace where spcname not in ('pg_default', 'pg_global')"); + sqlquery_snprintf(sqlquery, + "SELECT spclocation " + " FROM pg_tablespace " + " WHERE spcname NOT IN ('pg_default', 'pg_global')"); res = PQexec(conn, sqlquery); if (PQresultStatus(res) != PGRES_TUPLES_OK) { @@ -1062,7 +1077,7 @@ do_standby_promote(void) /* Get the data directory full path and the last subdirectory */ sqlquery_snprintf(sqlquery, "SELECT setting " - " FROM pg_settings WHERE name = 'data_directory'"); + " FROM pg_settings WHERE name = 'data_directory'"); res = PQexec(conn, sqlquery); if (PQresultStatus(res) != PGRES_TUPLES_OK) { @@ -1212,7 +1227,7 @@ do_standby_follow(void) /* Get the data directory full path */ sqlquery_snprintf(sqlquery, "SELECT setting " - " FROM pg_settings WHERE name = 'data_directory'"); + " FROM pg_settings WHERE name = 'data_directory'"); res = PQexec(conn, sqlquery); if (PQresultStatus(res) != PGRES_TUPLES_OK) { @@ -1305,7 +1320,7 @@ create_recovery_file(const char *data_dir) } maxlen_snprintf(line, "primary_conninfo = 'host=%s port=%s'\n", host, - ((masterport==NULL) ? "5432" : masterport)); + ((masterport==NULL) ? "5432" : masterport)); if (fputs(line, recovery_file) == EOF) { fprintf(stderr, "recovery file could not be written, it could be necesary to create it manually\n"); @@ -1348,7 +1363,7 @@ copy_remote_files(char *host, char *remote_user, char *remote_path, strcat(options, " --exclude=pg_xlog* --exclude=pg_control --exclude=*.pid"); maxlen_snprintf(script, "rsync %s %s:%s/* %s", - options, host_string, remote_path, local_path); + options, host_string, remote_path, local_path); } else { diff --git a/repmgrd.c b/repmgrd.c index d4f41131..03e3d78b 100644 --- a/repmgrd.c +++ b/repmgrd.c @@ -61,7 +61,7 @@ static void setup_cancel_handler(void); /* * Every 3 seconds, insert monitor info */ -#define MonitorCheck() \ +#define MonitorCheck() \ for (;;) \ { \ MonitorExecute(); \ @@ -273,9 +273,10 @@ MonitorExecute(void) CancelQuery(); /* Get local xlog info */ - sqlquery_snprintf(sqlquery, - "SELECT CURRENT_TIMESTAMP, pg_last_xlog_receive_location(), " - "pg_last_xlog_replay_location()"); + sqlquery_snprintf( + sqlquery, + "SELECT CURRENT_TIMESTAMP, pg_last_xlog_receive_location(), " + "pg_last_xlog_replay_location()"); res = PQexec(myLocalConn, sqlquery); if (PQresultStatus(res) != PGRES_TUPLES_OK) @@ -314,15 +315,15 @@ MonitorExecute(void) * Build the SQL to execute on primary */ sqlquery_snprintf(sqlquery, - "INSERT INTO repmgr_%s.repl_monitor " - "VALUES(%d, %d, '%s'::timestamp with time zone, " - " '%s', '%s', " - " %lld, %lld)", myClusterName, - primaryId, myLocalId, monitor_standby_timestamp, - last_wal_primary_location, - last_wal_standby_received, - (lsn_primary - lsn_standby_received), - (lsn_standby_received - lsn_standby_applied)); + "INSERT INTO repmgr_%s.repl_monitor " + "VALUES(%d, %d, '%s'::timestamp with time zone, " + " '%s', '%s', " + " %lld, %lld)", myClusterName, + primaryId, myLocalId, monitor_standby_timestamp, + last_wal_primary_location, + last_wal_standby_received, + (lsn_primary - lsn_standby_received), + (lsn_standby_received - lsn_standby_applied)); /* * Execute the query asynchronously, but don't check for a result. We @@ -340,8 +341,8 @@ checkClusterConfiguration(void) PGresult *res; sqlquery_snprintf(sqlquery, "SELECT oid FROM pg_class " - " WHERE oid = 'repmgr_%s.repl_nodes'::regclass", - myClusterName); + " WHERE oid = 'repmgr_%s.repl_nodes'::regclass", + myClusterName); res = PQexec(myLocalConn, sqlquery); if (PQresultStatus(res) != PGRES_TUPLES_OK) { @@ -378,8 +379,8 @@ checkNodeConfiguration(char *conninfo) /* Check if we have my node information in repl_nodes */ sqlquery_snprintf(sqlquery, "SELECT * FROM repmgr_%s.repl_nodes " - " WHERE id = %d AND cluster = '%s' ", - myClusterName, myLocalId, myClusterName); + " WHERE id = %d AND cluster = '%s' ", + myClusterName, myLocalId, myClusterName); res = PQexec(myLocalConn, sqlquery); if (PQresultStatus(res) != PGRES_TUPLES_OK) @@ -401,8 +402,8 @@ checkNodeConfiguration(char *conninfo) /* Adding the node */ sqlquery_snprintf(sqlquery, "INSERT INTO repmgr_%s.repl_nodes " - "VALUES (%d, '%s', '%s')", - myClusterName, myLocalId, myClusterName, conninfo); + "VALUES (%d, '%s', '%s')", + myClusterName, myLocalId, myClusterName, conninfo); if (!PQexec(primaryConn, sqlquery)) {