mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for recent pg_upgrade commit to fix large objects relfilenode

Browse Source 
handling.  (metadata user ids still an open issue).
This commit is contained in:
Bruce Momjian 2011-01-05 13:52:44 -05:00
parent b1f2a94fa2
commit a45beaac64
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
contrib/pg_upgrade/info.c
View File

@ -47,33 +47,33 @@ gen_db_file_maps(DbInfo *old_db, DbInfo *new_db,
for (relnum = 0; relnum < old_db->rel_arr.nrels; relnum++) for (relnum = 0; relnum < old_db->rel_arr.nrels; relnum++)
{ {
RelInfo *oldrel = &old_db->rel_arr.rels[relnum]; RelInfo *old_rel = &old_db->rel_arr.rels[relnum];
RelInfo *newrel; RelInfo *new_rel;
/* toast tables are handled by their parents */ /* toast tables are handled by their parents */
if (strcmp(oldrel->nspname, "pg_toast") == 0) if (strcmp(old_rel->nspname, "pg_toast") == 0)
continue; continue;
newrel = relarr_lookup_rel_name(&old_cluster, &old_db->rel_arr, new_rel = relarr_lookup_rel_name(&new_cluster, &new_db->rel_arr,
oldrel->nspname, oldrel->relname); old_rel->nspname, old_rel->relname);
create_rel_filename_map(old_pgdata, new_pgdata, old_db, new_db, create_rel_filename_map(old_pgdata, new_pgdata, old_db, new_db,
oldrel, newrel, maps + num_maps); old_rel, new_rel, maps + num_maps);
num_maps++; num_maps++;
/* /*
* So much for mapping this relation; now we need a mapping * So much for mapping this relation; now we need a mapping
* for its corresponding toast relation and toast index, if any. * for its corresponding toast relation and toast index, if any.
*/ */
if (oldrel->toastrelid > 0) if (old_rel->toastrelid > 0)
{ {
char old_name[MAXPGPATH], new_name[MAXPGPATH]; char old_name[MAXPGPATH], new_name[MAXPGPATH];
RelInfo *old_toast, *new_toast; RelInfo *old_toast, *new_toast;
old_toast = relarr_lookup_rel_oid(&old_cluster, &old_db->rel_arr, old_toast = relarr_lookup_rel_oid(&old_cluster, &old_db->rel_arr,
oldrel->toastrelid); old_rel->toastrelid);
new_toast = relarr_lookup_rel_oid(&new_cluster, &new_db->rel_arr, new_toast = relarr_lookup_rel_oid(&new_cluster, &new_db->rel_arr,
newrel->toastrelid); new_rel->toastrelid);
create_rel_filename_map(old_pgdata, new_pgdata, old_db, new_db, create_rel_filename_map(old_pgdata, new_pgdata, old_db, new_db,
old_toast, new_toast, maps + num_maps); old_toast, new_toast, maps + num_maps);