database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

Use "upgrade" in preference over "migrate" in pg_upgrade messages and

Browse Source 
documentation.  (Many were left over from the old pg_migrator naming.)
This commit is contained in:
Bruce Momjian
2010-12-15 07:11:31 -05:00
parent 34c70c7ac4
commit 16b5e08dec
10 changed files with 43 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/pg_upgrade/check.c
View File

@ -184,7 +184,7 @@ issue_warnings(char *sequence_script_file_name)
void
output_completion_banner(char *deletion_script_file_name)
{
/* Did we migrate the free space files? */
/* Did we copy the free space files? */
if (GET_MAJOR_VERSION(old_cluster.major_version) >= 804)
pg_log(PG_REPORT,
"| Optimizer statistics is not transferred by pg_upgrade\n"
@ -213,7 +213,7 @@ check_cluster_versions(void)
old_cluster.major_version = get_major_server_version(&old_cluster.major_version_str, CLUSTER_OLD);
new_cluster.major_version = get_major_server_version(&new_cluster.major_version_str, CLUSTER_NEW);
/* We allow migration from/to the same major version for beta upgrades */
/* We allow upgrades from/to the same major version for alpha/beta upgrades */
if (GET_MAJOR_VERSION(old_cluster.major_version) < 803)
pg_log(PG_FATAL, "This utility can only upgrade from PostgreSQL version 8.3 and later.\n");
@ -529,9 +529,9 @@ check_for_isn_and_int8_passing_mismatch(Cluster whichCluster)
"| which rely on the bigint data type. Your old and\n"
"| new clusters pass bigint values differently so this\n"
"| cluster cannot currently be upgraded. You can\n"
"| manually migrate data that use \"/contrib/isn\"\n"
"| manually upgrade data that use \"/contrib/isn\"\n"
"| facilities and remove \"/contrib/isn\" from the\n"
"| old cluster and restart the migration. A list\n"
"| old cluster and restart the upgrade. A list\n"
"| of the problem functions is in the file:\n"
"| \t%s\n\n", output_path);
}
@ -631,7 +631,7 @@ check_for_reg_data_type_usage(Cluster whichCluster)
"| user tables. These data types reference system oids that\n"
"| are not preserved by pg_upgrade, so this cluster cannot\n"
"| currently be upgraded. You can remove the problem tables\n"
"| and restart the migration. A list of the problem columns\n"
"| and restart the upgrade. A list of the problem columns\n"
"| is in the file:\n"
"| \t%s\n\n", output_path);
}

6
contrib/pg_upgrade/controldata.c
View File

@ -26,7 +26,7 @@ static void putenv2(const char *var, const char *val);
* and then pipe its output. With little string parsing we get the
* pg_control data. pg_resetxlog cannot be run while the server is running
* so we use pg_controldata; pg_controldata doesn't provide all the fields
* we need to actually perform the migration, but it provides enough for
* we need to actually perform the upgrade, but it provides enough for
* check mode. We do not implement pg_resetxlog -n because it is hard to
* return valid xid data for a running server.
*/
@ -505,8 +505,8 @@ check_control_data(ControlData *oldctrl,
"\nOld and new pg_controldata date/time storage types do not match.\n");
/*
* This is a common 8.3 -> 8.4 migration problem, so we are more
* verboase
* This is a common 8.3 -> 8.4 upgrade problem, so we are more
* verbose
*/
pg_log(PG_FATAL,
"You will need to rebuild the new server with configure\n"

4
contrib/pg_upgrade/info.c
View File

@ -313,10 +313,10 @@ get_rel_infos(const DbInfo *dbinfo, RelInfoArr *relarr, Cluster whichCluster)
/*
* pg_largeobject contains user data that does not appear the pg_dumpall
* --schema-only output, so we have to migrate that system table heap and
* --schema-only output, so we have to upgrade that system table heap and
* index. Ideally we could just get the relfilenode from template1 but
* pg_largeobject_loid_pn_index's relfilenode can change if the table was
* reindexed so we get the relfilenode for each database and migrate it as
* reindexed so we get the relfilenode for each database and upgrade it as
* a normal user table.
* Order by tablespace so we can cache the directory contents efficiently.
*/

3
contrib/pg_upgrade/option.c
View File

@ -29,8 +29,7 @@ UserOpts user_opts;
/*
* parseCommandLine()
*
* Parses the command line (argc, argv[]) into the given migratorContext object
* and initializes the rest of the object.
* Parses the command line (argc, argv[]) and loads structures
*/
void
parseCommandLine(int argc, char *argv[])

4
contrib/pg_upgrade/pg_upgrade.c
View File

@ -51,8 +51,8 @@ main(int argc, char **argv)
check_new_cluster();
report_clusters_compatible();
pg_log(PG_REPORT, "\nPerforming Migration\n");
pg_log(PG_REPORT, "--------------------\n");
pg_log(PG_REPORT, "\nPerforming Upgrade\n");
pg_log(PG_REPORT, "------------------\n");
disable_old_cluster();
prepare_new_cluster();

2
contrib/pg_upgrade/relfilenode.c
View File

@ -231,7 +231,7 @@ transfer_relfile(pageCnvCtx *pageConverter, const char *oldfile,
const char *msg;
if ((user_opts.transfer_mode == TRANSFER_MODE_LINK) && (pageConverter != NULL))
pg_log(PG_FATAL, "this migration requires page-by-page conversion, "
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)

2
contrib/pg_upgrade/tablespace.c
View File

@ -25,7 +25,7 @@ init_tablespaces(void)
if (os_info.num_tablespaces > 0 &&
strcmp(old_cluster.tablespace_suffix, new_cluster.tablespace_suffix) == 0)
pg_log(PG_FATAL,
"Cannot migrate to/from the same system catalog version when\n"
"Cannot upgrade to/from the same system catalog version when\n"
"using tablespaces.\n");
}

2
contrib/pg_upgrade/version.c
View File

@ -73,7 +73,7 @@ new_9_0_populate_pg_largeobject_metadata(bool check_mode,
pg_log(PG_WARNING, "\n"
"| Your installation contains large objects.\n"
"| The new database has an additional large object\n"
"| permission table. After migration, you will be\n"
"| permission table. After upgrading, you will be\n"
"| given a command to populate the pg_largeobject\n"
"| permission table with default permissions.\n\n");
else

12
contrib/pg_upgrade/version_old_8_3.c
View File

@ -97,7 +97,7 @@ old_8_3_check_for_name_data_type_usage(Cluster whichCluster)
"| user tables. This data type changed its internal\n"
"| alignment between your old and new clusters so this\n"
"| cluster cannot currently be upgraded. You can\n"
"| remove the problem tables and restart the migration.\n"
"| remove the problem tables and restart the upgrade.\n"
"| A list of the problem columns is in the file:\n"
"| \t%s\n\n", output_path);
}
@ -110,7 +110,7 @@ old_8_3_check_for_name_data_type_usage(Cluster whichCluster)
* old_8_3_check_for_tsquery_usage()
* 8.3 -> 8.4
* A new 'prefix' field was added to the 'tsquery' data type in 8.4
* so migration of such fields is impossible.
* so upgrading of such fields is impossible.
*/
void
old_8_3_check_for_tsquery_usage(Cluster whichCluster)
@ -186,7 +186,7 @@ old_8_3_check_for_tsquery_usage(Cluster whichCluster)
"| This data type added a new internal field between\n"
"| your old and new clusters so this cluster cannot\n"
"| currently be upgraded. You can remove the problem\n"
"| columns and restart the migration. A list of the\n"
"| columns and restart the upgrade. A list of the\n"
"| problem columns is in the file:\n"
"| \t%s\n\n", output_path);
}
@ -328,7 +328,7 @@ old_8_3_rebuild_tsvector_tables(bool check_mode,
"| Your installation contains tsvector columns.\n"
"| The tsvector internal storage format changed\n"
"| between your old and new clusters so the tables\n"
"| must be rebuilt. After migration, you will be\n"
"| must be rebuilt. After upgrading, you will be\n"
"| given instructions.\n\n");
else
pg_log(PG_WARNING, "\n"
@ -441,7 +441,7 @@ old_8_3_invalidate_hash_gin_indexes(bool check_mode,
"| indexes. These indexes have different\n"
"| internal formats between your old and new\n"
"| clusters so they must be reindexed with the\n"
"| REINDEX command. After migration, you will\n"
"| REINDEX command. After upgrading, you will\n"
"| be given REINDEX instructions.\n\n");
else
pg_log(PG_WARNING, "\n"
@ -571,7 +571,7 @@ old_8_3_invalidate_bpchar_pattern_ops_indexes(bool check_mode,
"| \"bpchar_pattern_ops\". These indexes have\n"
"| different internal formats between your old and\n"
"| new clusters so they must be reindexed with the\n"
"| REINDEX command. After migration, you will be\n"
"| REINDEX command. After upgrading, you will be\n"
"| given REINDEX instructions.\n\n");
else
pg_log(PG_WARNING, "\n"