1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Repair 'expected both swapped tables to have TOAST tables' bug in 7.4

Browse Source 
branch.  I wasn't excited about doing this when the first report came in,
but now that we have two of 'em, I suppose it had better get fixed.
This commit is contained in:
Tom Lane 2004-08-31 23:16:36 +00:00
parent 4d608ac197
commit aa1c232be7
1 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/backend/commands/cluster.c
View File

@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.116 2003/09/25 06:57:58 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.116.2.1 2004/08/31 23:16:36 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -787,9 +787,8 @@ swap_relfilenodes(Oid r1, Oid r2)
* their new owning relations. Otherwise the wrong one will get * their new owning relations. Otherwise the wrong one will get
* dropped ... * dropped ...
* *
* NOTE: for now, we can assume the new table will have a TOAST table if * NOTE: it is possible that only one table has a toast table; this can
* and only if the old one does. This logic might need work if we get * happen in CLUSTER if there were dropped columns in the old table.
* smarter about dropped columns.
* *
* NOTE: at present, a TOAST table's only dependency is the one on its * NOTE: at present, a TOAST table's only dependency is the one on its
* owning table. If more are ever created, we'd need to use something * owning table. If more are ever created, we'd need to use something
@ -802,36 +801,44 @@ swap_relfilenodes(Oid r1, Oid r2)
toastobject; toastobject;
long count; long count;
if (!(relform1->reltoastrelid && relform2->reltoastrelid))
elog(ERROR, "expected both swapped tables to have TOAST tables");
/* Delete old dependencies */ /* Delete old dependencies */
if (relform1->reltoastrelid)
{
count = deleteDependencyRecordsFor(RelOid_pg_class, count = deleteDependencyRecordsFor(RelOid_pg_class,
relform1->reltoastrelid); relform1->reltoastrelid);
if (count != 1) if (count != 1)
elog(ERROR, "expected one dependency record for TOAST table, found %ld", elog(ERROR, "expected one dependency record for TOAST table, found %ld",
count); count);
}
if (relform2->reltoastrelid)
{
count = deleteDependencyRecordsFor(RelOid_pg_class, count = deleteDependencyRecordsFor(RelOid_pg_class,
relform2->reltoastrelid); relform2->reltoastrelid);
if (count != 1) if (count != 1)
elog(ERROR, "expected one dependency record for TOAST table, found %ld", elog(ERROR, "expected one dependency record for TOAST table, found %ld",
count); count);
}
/* Register new dependencies */ /* Register new dependencies */
baseobject.classId = RelOid_pg_class; baseobject.classId = RelOid_pg_class;
baseobject.objectId = r1;
baseobject.objectSubId = 0; baseobject.objectSubId = 0;
toastobject.classId = RelOid_pg_class; toastobject.classId = RelOid_pg_class;
toastobject.objectId = relform1->reltoastrelid;
toastobject.objectSubId = 0; toastobject.objectSubId = 0;
if (relform1->reltoastrelid)
{
baseobject.objectId = r1;
toastobject.objectId = relform1->reltoastrelid;
recordDependencyOn(&toastobject, &baseobject, DEPENDENCY_INTERNAL); recordDependencyOn(&toastobject, &baseobject, DEPENDENCY_INTERNAL);
}
if (relform2->reltoastrelid)
{
baseobject.objectId = r2; baseobject.objectId = r2;
toastobject.objectId = relform2->reltoastrelid; toastobject.objectId = relform2->reltoastrelid;
recordDependencyOn(&toastobject, &baseobject, DEPENDENCY_INTERNAL); recordDependencyOn(&toastobject, &baseobject, DEPENDENCY_INTERNAL);
} }
}
/* /*
* Blow away the old relcache entries now. We need this kluge because * Blow away the old relcache entries now. We need this kluge because