* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/catalog/toasting.c,v 1.16 2009/06/11 14:48:55 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/catalog/toasting.c,v 1.17 2009/06/11 20:46:11 tgl Exp $
*
*-------------------------------------------------------------------------
*/
* then create a toast table for it. (With the force option, make
* a toast table even if it appears unnecessary.)
*
+ * The caller can also specify the OID to be used for the toast table.
+ * Usually, toastOid should be InvalidOid to allow a free OID to be assigned.
+ * (This option, as well as the force option, is not used by core Postgres,
+ * but is provided to support pg_migrator.)
+ *
* reloptions for the toast table can be passed, too. Pass (Datum) 0
* for default reloptions.
*
* to end with CommandCounterIncrement if it makes any changes.
*/
void
-AlterTableCreateToastTable(Oid relOid, Datum reloptions, bool force)
+AlterTableCreateToastTable(Oid relOid, Oid toastOid,
+ Datum reloptions, bool force)
{
Relation rel;
rel = heap_open(relOid, AccessExclusiveLock);
/* create_toast_table does all the work */
- (void) create_toast_table(rel, InvalidOid, InvalidOid, reloptions, force);
+ (void) create_toast_table(rel, toastOid, InvalidOid, reloptions, force);
heap_close(rel, NoLock);
}
* create_toast_table --- internal workhorse
*
* rel is already opened and exclusive-locked
- * toastOid and toastIndexOid are normally InvalidOid, but during
- * bootstrap they can be nonzero to specify hand-assigned OIDs
+ * toastOid and toastIndexOid are normally InvalidOid, but
+ * either or both can be nonzero to specify caller-assigned OIDs
*/
static bool
create_toast_table(Relation rel, Oid toastOid, Oid toastIndexOid,
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/commands/cluster.c,v 1.185 2009/06/11 14:48:55 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/commands/cluster.c,v 1.186 2009/06/11 20:46:11 tgl Exp $
*
*-------------------------------------------------------------------------
*/
if (isNull)
reloptions = (Datum) 0;
}
- AlterTableCreateToastTable(OIDNewHeap, reloptions, false);
+ AlterTableCreateToastTable(OIDNewHeap, InvalidOid, reloptions, false);
if (OidIsValid(toastid))
ReleaseSysCache(tuple);
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.286 2009/06/11 14:48:56 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.287 2009/06/11 20:46:11 tgl Exp $
*
*-------------------------------------------------------------------------
*/
(tab->subcmds[AT_PASS_ADD_COL] ||
tab->subcmds[AT_PASS_ALTER_TYPE] ||
tab->subcmds[AT_PASS_COL_ATTRS]))
- AlterTableCreateToastTable(tab->relid, (Datum) 0, false);
+ AlterTableCreateToastTable(tab->relid, InvalidOid,
+ (Datum) 0, false);
}
}
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.325 2009/06/11 14:48:56 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.326 2009/06/11 20:46:11 tgl Exp $
*
*-------------------------------------------------------------------------
*/
(void) heap_reloptions(RELKIND_TOASTVALUE, reloptions, true);
- AlterTableCreateToastTable(intoRelationId, reloptions, false);
+ AlterTableCreateToastTable(intoRelationId, InvalidOid, reloptions, false);
/*
* And open the constructed table for writing.
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.308 2009/06/11 14:49:02 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.309 2009/06/11 20:46:11 tgl Exp $
*
*-------------------------------------------------------------------------
*/
true);
AlterTableCreateToastTable(relOid,
+ InvalidOid,
toast_options,
false);
}
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/include/catalog/toasting.h,v 1.7 2009/05/07 22:58:28 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/toasting.h,v 1.8 2009/06/11 20:46:11 tgl Exp $
*
*-------------------------------------------------------------------------
*/
/*
* toasting.c prototypes
*/
-extern void AlterTableCreateToastTable(Oid relOid, Datum reloptions, bool force);
+extern void AlterTableCreateToastTable(Oid relOid, Oid toastOid,
+ Datum reloptions, bool force);
extern void BootstrapToastTable(char *relName,
Oid toastOid, Oid toastIndexOid);