database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-16 15:02:33 +03:00
Code Activity

pg_upgrade: prevent oid conflicts with new-cluster TOAST tables

Browse Source 
Previously, TOAST tables only required in the new cluster could cause
oid conflicts if they were auto-numbered and a later conflicting oid had
to be assigned.

Backpatch through 9.3
This commit is contained in:
Bruce Momjian
2014-08-07 14:56:13 -04:00
parent ec903d20e3
commit 4c6780fd17
5 changed files with 123 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/backend/catalog/toasting.c
View File

@@ -165,16 +165,51 @@ create_toast_table(Relation rel, Oid toastOid, Oid toastIndexOid,
if (rel->rd_rel->reltoastrelid != InvalidOid)
return false;
/*
* Check to see whether the table actually needs a TOAST table.
*
* If an update-in-place toast relfilenode is specified, force toast file
* creation even if it seems not to need one.
*/
if (!needs_toast_table(rel) &&
(!IsBinaryUpgrade ||
!OidIsValid(binary_upgrade_next_toast_pg_class_oid)))
return false;
if (!IsBinaryUpgrade)
{
if (!needs_toast_table(rel))
return false;
}
else
{
/*
* Check to see whether the table needs a TOAST table.
*
* If an update-in-place TOAST relfilenode is specified, force TOAST file
* creation even if it seems not to need one. This handles the case
* where the old cluster needed a TOAST table but the new cluster
* would not normally create one.
*/
/*
* If a TOAST oid is not specified, skip TOAST creation as we will do
* it later so we don't create a TOAST table whose OID later conflicts
* with a user-supplied OID. This handles cases where the old cluster
* didn't need a TOAST table, but the new cluster does.
*/
if (!OidIsValid(binary_upgrade_next_toast_pg_class_oid))
return false;
/*
* If a special TOAST value has been passed in, it means we are in
* cleanup mode --- we are creating needed TOAST tables after all user
* tables with specified OIDs have been created. We let the system
* assign a TOAST oid for us. The tables are empty so the missing
* TOAST tables were not a problem.
*/
if (binary_upgrade_next_toast_pg_class_oid == OPTIONALLY_CREATE_TOAST_OID)
{
/* clear as it is not to be used; it is just a flag */
binary_upgrade_next_toast_pg_class_oid = InvalidOid;
if (!needs_toast_table(rel))
return false;
}
/* both should be set, or not set */
Assert(OidIsValid(binary_upgrade_next_toast_pg_class_oid) ==
OidIsValid(binary_upgrade_next_toast_pg_type_oid));
}
/*
* If requested check lockmode is sufficient. This is a cross check in

5
src/include/catalog/binary_upgrade.h
View File

@@ -14,6 +14,11 @@
#ifndef BINARY_UPGRADE_H
#define BINARY_UPGRADE_H
#include "catalog/pg_authid.h"
/* pick a OID that will never be used for TOAST tables */
#define OPTIONALLY_CREATE_TOAST_OID BOOTSTRAP_SUPERUSERID
extern PGDLLIMPORT Oid binary_upgrade_next_pg_type_oid;
extern PGDLLIMPORT Oid binary_upgrade_next_array_pg_type_oid;
extern PGDLLIMPORT Oid binary_upgrade_next_toast_pg_type_oid;