rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

In pg_upgrade, rename "CLUSTERNAME" to "CLUSTER_NAME".

This commit is contained in:
Bruce Momjian 2010-12-31 20:42:29 -05:00
parent 30aeda4394
commit f82b3e58f8
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/pg_upgrade/info.c
View File

@ -441,7 +441,7 @@ relarr_lookup_rel(RelInfoArr *rel_arr, const char *nspname,
}
}
pg_log(PG_FATAL, "Could not find %s.%s in %s cluster\n",
nspname, relname, CLUSTERNAME(whichCluster));
nspname, relname, CLUSTER_NAME(whichCluster));
return NULL;
}
@ -465,7 +465,7 @@ relarr_lookup_reloid(RelInfoArr *rel_arr, Oid oid,
return &rel_arr->rels[relnum];
}
pg_log(PG_FATAL, "Could not find %d in %s cluster\n",
oid, CLUSTERNAME(whichCluster));
oid, CLUSTER_NAME(whichCluster));
return NULL;
}
@ -495,7 +495,7 @@ dbarr_print(DbInfoArr *arr, Cluster whichCluster)
{
int dbnum;
pg_log(PG_DEBUG, "%s databases\n", CLUSTERNAME(whichCluster));
pg_log(PG_DEBUG, "%s databases\n", CLUSTER_NAME(whichCluster));
for (dbnum = 0; dbnum < arr->ndbs; dbnum++)
{

2
contrib/pg_upgrade/pg_upgrade.h
View File

@ -52,7 +52,7 @@
#define EXE_EXT ".exe"
#endif
#define CLUSTERNAME(cluster) ((cluster) == CLUSTER_OLD ? "old" : "new")
#define CLUSTER_NAME(cluster) ((cluster) == CLUSTER_OLD ? "old" : "new")
#define ACTIVE_CLUSTER(cluster) (((cluster) == CLUSTER_OLD) ? \
&old_cluster : &new_cluster)

4
contrib/pg_upgrade/server.c
View File

@ -195,7 +195,7 @@ start_postmaster(Cluster whichCluster, bool quiet)
if (test_server_conn(POSTMASTER_UPTIME, whichCluster) == false)
pg_log(PG_FATAL, " Unable to start %s postmaster with the command: %s\nPerhaps pg_hba.conf was not set to \"trust\".",
CLUSTERNAME(whichCluster), cmd);
CLUSTER_NAME(whichCluster), cmd);
if ((os_info.postmasterPID = get_postmaster_pid(datadir)) == 0)
pg_log(PG_FATAL, " Unable to get postmaster pid\n");
@ -275,7 +275,7 @@ test_server_conn(int timeout, Cluster whichCluster)
if (tries == STARTUP_WARNING_TRIES)
prep_status("Trying to start %s server ",
CLUSTERNAME(whichCluster));
CLUSTER_NAME(whichCluster));
else if (tries > STARTUP_WARNING_TRIES)
pg_log(PG_REPORT, ".");
}