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

diff --git a/contrib/pg_upgrade/info.c b/contrib/pg_upgrade/info.c
index 5141602adab7f2821d6f8c24962bdbe14557fe9b..99a1548a58732013393117d41b89df2ae389d384 100644 (file)
--- a/contrib/pg_upgrade/info.c
+++ b/contrib/pg_upgrade/info.c
@@ -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++)
        {

diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h
index 439c0a7425abee56850ee6a92086c340dfdf5533..c53f935a78c5ee524022ab4771ede72764f805b2 100644 (file)
--- a/contrib/pg_upgrade/pg_upgrade.h
+++ b/contrib/pg_upgrade/pg_upgrade.h
@@ -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)
 

diff --git a/contrib/pg_upgrade/server.c b/contrib/pg_upgrade/server.c
index 3f6cb641e7b2fb4ce76b2eeb30426d2711535b05..127f9c4fc0dccbb5e6f6af57252679d55c1ddd77 100644 (file)
--- a/contrib/pg_upgrade/server.c
+++ b/contrib/pg_upgrade/server.c
@@ -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, ".");
        }