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

Commit5586327

Browse files
committed
pg_upgrade: update C comments about pg_dumpall
There were some C comments that hadn't been updated from the switch ofusing only pg_dumpall to using pg_dump and pg_dumpall, so update them.Also, don't bother using --schema-only for pg_dumpall --globals-only.Backpatch through 9.4
1 parent9d0826c commit5586327

File tree

6 files changed

+9
-8
lines changed

6 files changed

+9
-8
lines changed

‎contrib/pg_upgrade/check.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,9 +285,9 @@ check_cluster_versions(void)
285285
PG_MAJORVERSION);
286286

287287
/*
288-
* We can't allow downgrading because we use the targetpg_dumpall, and
289-
*pg_dumpall cannot operate onnew database versions, onlyolder
290-
* versions.
288+
* We can't allow downgrading because we use the targetpg_dump, and
289+
*pg_dump cannot operate onnewer database versions, onlycurrent and
290+
*olderversions.
291291
*/
292292
if (old_cluster.major_version>new_cluster.major_version)
293293
pg_fatal("This utility cannot be used to downgrade to older major PostgreSQL versions.\n");

‎contrib/pg_upgrade/dump.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ generate_old_dump(void)
2323

2424
/* run new pg_dumpall binary for globals */
2525
exec_prog(UTILITY_LOG_FILE,NULL, true,
26-
"\"%s/pg_dumpall\" %s --schema-only --globals-only "
27-
"--quote-all-identifiers --binary-upgrade %s -f %s",
26+
"\"%s/pg_dumpall\" %s --globals-only --quote-all-identifiers "
27+
"--binary-upgrade %s -f %s",
2828
new_cluster.bindir,cluster_conn_opts(&old_cluster),
2929
log_opts.verbose ?"--verbose" :"",
3030
GLOBALS_DUMP_FILE);

‎contrib/pg_upgrade/exec.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ check_bin_dir(ClusterInfo *cluster)
321321
{
322322
/* these are only needed in the new cluster */
323323
validate_exec(cluster->bindir,"psql");
324+
validate_exec(cluster->bindir,"pg_dump");
324325
validate_exec(cluster->bindir,"pg_dumpall");
325326
}
326327
}

‎contrib/pg_upgrade/function.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ get_loadable_libraries(void)
161161
/*
162162
* Systems that install plpython before 8.1 have
163163
* plpython_call_handler() defined in the "public" schema, causing
164-
*pg_dumpall to dump it. However that function still references
164+
*pg_dump to dump it. However that function still references
165165
* "plpython" (no "2"), so it throws an error on restore. This code
166166
* checks for the problem function, reports affected databases to the
167167
* user and explains how to remove them. 8.1 git commit:

‎contrib/pg_upgrade/info.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo)
274274
*last_tablespace=NULL;
275275

276276
/*
277-
* pg_largeobject contains user data that does not appear inpg_dumpall
277+
* pg_largeobject contains user data that does not appear inpg_dump
278278
* --schema-only output, so we have to copy that system table heap and
279279
* index. We could grab the pg_largeobject oids from template1, but it is
280280
* easy to treat it as a normal table. Order by oid so we can join old/new

‎contrib/pg_upgrade/pg_upgrade.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ copy_clog_xlog_xid(void)
491491
*
492492
*We have frozen all xids, so set relfrozenxid and datfrozenxid
493493
*to be the old cluster's xid counter, which we just set in the new
494-
*cluster. User-table frozenxid values will be set bypg_dumpall
494+
*cluster. User-table frozenxid values will be set bypg_dump
495495
*--binary-upgrade, but objects not set by the pg_dump must have
496496
*proper frozen counters.
497497
*/

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp