Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitf82b3e5

Browse files
committed
In pg_upgrade, rename "CLUSTERNAME" to "CLUSTER_NAME".
1 parent30aeda4 commitf82b3e5

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

‎contrib/pg_upgrade/info.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ relarr_lookup_rel(RelInfoArr *rel_arr, const char *nspname,
441441
}
442442
}
443443
pg_log(PG_FATAL,"Could not find %s.%s in %s cluster\n",
444-
nspname,relname,CLUSTERNAME(whichCluster));
444+
nspname,relname,CLUSTER_NAME(whichCluster));
445445
returnNULL;
446446
}
447447

@@ -465,7 +465,7 @@ relarr_lookup_reloid(RelInfoArr *rel_arr, Oid oid,
465465
return&rel_arr->rels[relnum];
466466
}
467467
pg_log(PG_FATAL,"Could not find %d in %s cluster\n",
468-
oid,CLUSTERNAME(whichCluster));
468+
oid,CLUSTER_NAME(whichCluster));
469469
returnNULL;
470470
}
471471

@@ -495,7 +495,7 @@ dbarr_print(DbInfoArr *arr, Cluster whichCluster)
495495
{
496496
intdbnum;
497497

498-
pg_log(PG_DEBUG,"%s databases\n",CLUSTERNAME(whichCluster));
498+
pg_log(PG_DEBUG,"%s databases\n",CLUSTER_NAME(whichCluster));
499499

500500
for (dbnum=0;dbnum<arr->ndbs;dbnum++)
501501
{

‎contrib/pg_upgrade/pg_upgrade.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
#defineEXE_EXT".exe"
5353
#endif
5454

55-
#defineCLUSTERNAME(cluster)((cluster) == CLUSTER_OLD ? "old" : "new")
55+
#defineCLUSTER_NAME(cluster)((cluster) == CLUSTER_OLD ? "old" : "new")
5656
#defineACTIVE_CLUSTER(cluster) (((cluster) == CLUSTER_OLD) ? \
5757
&old_cluster : &new_cluster)
5858

‎contrib/pg_upgrade/server.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ start_postmaster(Cluster whichCluster, bool quiet)
195195

196196
if (test_server_conn(POSTMASTER_UPTIME,whichCluster)== false)
197197
pg_log(PG_FATAL," Unable to start %s postmaster with the command: %s\nPerhaps pg_hba.conf was not set to \"trust\".",
198-
CLUSTERNAME(whichCluster),cmd);
198+
CLUSTER_NAME(whichCluster),cmd);
199199

200200
if ((os_info.postmasterPID=get_postmaster_pid(datadir))==0)
201201
pg_log(PG_FATAL," Unable to get postmaster pid\n");
@@ -275,7 +275,7 @@ test_server_conn(int timeout, Cluster whichCluster)
275275

276276
if (tries==STARTUP_WARNING_TRIES)
277277
prep_status("Trying to start %s server ",
278-
CLUSTERNAME(whichCluster));
278+
CLUSTER_NAME(whichCluster));
279279
elseif (tries>STARTUP_WARNING_TRIES)
280280
pg_log(PG_REPORT,".");
281281
}

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp