diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2011-07-12 07:13:51 +0300 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2011-07-12 07:13:51 +0300 |
| commit | 912bc4f038b3daaea4477c4b4e79fbd8c15e67a0 (patch) | |
| tree | 3abbc8e1ae427b65afc1566f63b31d88c41826d2 /contrib/pg_upgrade/relfilenode.c | |
| parent | afc9635c600ace716294a12d78abd37f65abd0ea (diff) | |
| download | postgresql-912bc4f038b3daaea4477c4b4e79fbd8c15e67a0.tar.gz postgresql-912bc4f038b3daaea4477c4b4e79fbd8c15e67a0.zip | |
Make pg_upgrade output more consistent with project style
Add errno-based output to error messages where appropriate, reformat
blocks to about 72 characters per line, use spaces instead of tabs for
indentation, and other style adjustments.
Diffstat (limited to 'contrib/pg_upgrade/relfilenode.c')
| -rw-r--r-- | contrib/pg_upgrade/relfilenode.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/contrib/pg_upgrade/relfilenode.c b/contrib/pg_upgrade/relfilenode.c index 9a0a3ac18d9..d4a420fe2cd 100644 --- a/contrib/pg_upgrade/relfilenode.c +++ b/contrib/pg_upgrade/relfilenode.c @@ -91,9 +91,9 @@ get_pg_database_relfilenode(ClusterInfo *cluster) res = executeQueryOrDie(conn, "SELECT c.relname, c.relfilenode " - "FROM pg_catalog.pg_class c, " + "FROM pg_catalog.pg_class c, " " pg_catalog.pg_namespace n " - "WHERE c.relnamespace = n.oid AND " + "WHERE c.relnamespace = n.oid AND " " n.nspname = 'pg_catalog' AND " " c.relname = 'pg_database' " "ORDER BY c.relname"); @@ -232,24 +232,24 @@ transfer_relfile(pageCnvCtx *pageConverter, const char *old_file, const char *msg; if ((user_opts.transfer_mode == TRANSFER_MODE_LINK) && (pageConverter != NULL)) - pg_log(PG_FATAL, "this upgrade requires page-by-page conversion, " - "you must use copy-mode instead of link-mode\n"); + pg_log(PG_FATAL, "This upgrade requires page-by-page conversion, " + "you must use copy mode instead of link mode.\n"); if (user_opts.transfer_mode == TRANSFER_MODE_COPY) { - pg_log(PG_INFO, "copying %s to %s\n", old_file, new_file); + pg_log(PG_INFO, "copying \"%s\" to \"%s\"\n", old_file, new_file); if ((msg = copyAndUpdateFile(pageConverter, old_file, new_file, true)) != NULL) - pg_log(PG_FATAL, "error while copying %s.%s (%s to %s): %s\n", + pg_log(PG_FATAL, "error while copying relation \"%s.%s\" (\"%s\" to \"%s\"): %s\n", nspname, relname, old_file, new_file, msg); } else { - pg_log(PG_INFO, "linking %s to %s\n", old_file, new_file); + pg_log(PG_INFO, "linking \"%s\" to \"%s\"\n", old_file, new_file); if ((msg = linkAndUpdateFile(pageConverter, old_file, new_file)) != NULL) pg_log(PG_FATAL, - "error while creating link from %s.%s (%s to %s): %s\n", + "error while creating link for relation \"%s.%s\" (\"%s\" to \"%s\"): %s\n", nspname, relname, old_file, new_file, msg); } return; |