database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-10-25 13:17:41 +03:00
Code Activity

Force pg_upgrade's to preserve pg_class.oid, not pg_class.relfilenode.

Browse Source 
Toast tables have identical pg_class.oid and pg_class.relfilenode, but
for clarity it is good to preserve the pg_class.oid.

Update comments regarding what is preserved, and do some
variable/function renaming for clarity.
This commit is contained in:
Bruce Momjian
2011-01-07 21:25:34 -05:00
parent 541fc3d4df
commit 2896c87ce4
10 changed files with 112 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/commands/typecmds.c
View File

@@ -75,7 +75,7 @@ typedef struct
} RelToCheck;
/* Potentially set by contrib/pg_upgrade_support functions */
Oid binary_upgrade_next_pg_type_array_oid = InvalidOid;
Oid binary_upgrade_next_array_pg_type_oid = InvalidOid;
static Oid findTypeInputFunction(List *procname, Oid typeOid);
static Oid findTypeOutputFunction(List *procname, Oid typeOid);
@@ -1519,10 +1519,10 @@ AssignTypeArrayOid(void)
Oid type_array_oid;
/* Use binary-upgrade override for pg_type.typarray, if supplied. */
if (OidIsValid(binary_upgrade_next_pg_type_array_oid))
if (OidIsValid(binary_upgrade_next_array_pg_type_oid))
{
type_array_oid = binary_upgrade_next_pg_type_array_oid;
binary_upgrade_next_pg_type_array_oid = InvalidOid;
type_array_oid = binary_upgrade_next_array_pg_type_oid;
binary_upgrade_next_array_pg_type_oid = InvalidOid;
}
else
{