mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-15 08:20:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

In pg_upgrade, remove unnecessary separate handling of toast tables now

Browse Source 
that we restore by oid;  they can be handled like regular tables when
creating the file mapping structure.
This commit is contained in:
Bruce Momjian 2011-01-08 08:01:12 -05:00
parent af84bee43e
commit a60b32b3dc
1 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
contrib/pg_upgrade/info.c
View File

@ -50,10 +50,6 @@ gen_db_file_maps(DbInfo *old_db, DbInfo *new_db,
RelInfo *old_rel = &old_db->rel_arr.rels[relnum];
RelInfo *new_rel;
/* toast tables are handled by their parents */
if (strcmp(old_rel->nspname, "pg_toast") == 0)
continue;
/* old/new relation names always match */
new_rel = relarr_lookup_rel_name(&new_cluster, &new_db->rel_arr,
old_rel->nspname, old_rel->relname);
@ -61,39 +57,6 @@ gen_db_file_maps(DbInfo *old_db, DbInfo *new_db,
create_rel_filename_map(old_pgdata, new_pgdata, old_db, new_db,
old_rel, new_rel, maps + num_maps);
num_maps++;
/*
* So much for mapping this relation; now we need a mapping
* for its corresponding toast relation and toast index, if any.
*/
if (old_rel->toastrelid > 0)
{
char old_name[MAXPGPATH], new_name[MAXPGPATH];
RelInfo *old_toast, *new_toast;
/* use the toast relids from the rel_arr for lookups */
old_toast = relarr_lookup_rel_oid(&old_cluster, &old_db->rel_arr,
old_rel->toastrelid);
new_toast = relarr_lookup_rel_oid(&new_cluster, &new_db->rel_arr,
new_rel->toastrelid);
create_rel_filename_map(old_pgdata, new_pgdata, old_db, new_db,
old_toast, new_toast, maps + num_maps);
num_maps++;
/* toast indexes are the same, except with an "_index" suffix */
snprintf(old_name, sizeof(old_name), "%s_index", old_toast->relname);
snprintf(new_name, sizeof(new_name), "%s_index", new_toast->relname);
old_toast = relarr_lookup_rel_name(&old_cluster, &old_db->rel_arr,
"pg_toast", old_name);
new_toast = relarr_lookup_rel_name(&new_cluster, &new_db->rel_arr,
"pg_toast", new_name);
create_rel_filename_map(old_pgdata, new_pgdata, old_db,
new_db, old_toast, new_toast, maps + num_maps);
num_maps++;
}
}
*nmaps = num_maps;