diff options
Diffstat (limited to 'src/backend/commands')
| -rw-r--r-- | src/backend/commands/cluster.c | 14 | ||||
| -rw-r--r-- | src/backend/commands/tablecmds.c | 10 |
2 files changed, 17 insertions, 7 deletions
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index 0361ede0092..4858504f58d 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.103 2002/12/30 18:42:13 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.104 2002/12/30 19:45:15 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -26,7 +26,6 @@ #include "catalog/index.h" #include "catalog/indexing.h" #include "catalog/namespace.h" -#include "catalog/pg_constraint.h" #include "commands/cluster.h" #include "commands/tablecmds.h" #include "miscadmin.h" @@ -111,9 +110,9 @@ cluster(ClusterStmt *stmt) RelToCluster rvtc; /* Find and lock the table */ - tableOid = RangeVarGetRelid(stmt->relation, false); + rel = heap_openrv(stmt->relation, AccessExclusiveLock); - rel = heap_open(tableOid, AccessExclusiveLock); + tableOid = RelationGetRelid(rel); /* Check permissions */ if (!check_cluster_permitted(tableOid)) @@ -325,6 +324,13 @@ cluster_rel(RelToCluster *rvtc, bool recheck) elog(ERROR, "CLUSTER: cannot cluster system relation \"%s\"", RelationGetRelationName(OldHeap)); + /* + * Don't allow cluster on temp tables of other backends ... their + * local buffer manager is not going to cope. + */ + if (isOtherTempNamespace(RelationGetNamespace(OldHeap))) + elog(ERROR, "CLUSTER cannot be used on temp tables of other processes"); + /* Drop relcache refcnt on OldIndex, but keep lock */ index_close(OldIndex); diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 29edb61638e..3f9cad16ce4 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.63 2002/12/30 18:42:14 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.64 2002/12/30 19:45:17 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -423,8 +423,7 @@ TruncateRelation(const RangeVar *relation) Form_pg_constraint con = (Form_pg_constraint) GETSTRUCT(tuple); if (con->contype == 'f' && con->conrelid != relid) - elog(ERROR, "TRUNCATE cannot be used as table %s references " - "this one via foreign key constraint %s", + elog(ERROR, "TRUNCATE cannot be used as table %s references this one via foreign key constraint %s", get_rel_name(con->conrelid), NameStr(con->conname)); } @@ -439,6 +438,11 @@ TruncateRelation(const RangeVar *relation) rebuild_relation(rel, InvalidOid); /* NB: rebuild_relation does heap_close() */ + + /* + * You might think we need to truncate the rel's toast table here too, + * but actually we don't; it will have been rebuilt in an empty state. + */ } /*---------- |