From 72d4eb76093119c4b8e8ae49ab59454770a90608 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Wed, 12 Sep 2007 15:16:24 +0000 Subject: [PATCH] Fix the database-wide version of CLUSTER to silently skip temp tables of remote sessions, instead of erroring out in the middle of the operation. This is a backpatch of a previous fix applied to CLUSTER to HEAD and 8.2, all the way back that it is relevant to. --- src/backend/commands/cluster.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index f0214e7e7b..a940714205 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -308,6 +308,25 @@ cluster_rel(RelToCluster *rvtc, bool recheck) */ OldHeap = heap_open(rvtc->tableOid, AccessExclusiveLock); + /* + * Don't allow cluster on temp tables of other backends ... their local + * buffer manager is not going to cope. We silently skip it in the + * "recheck" case, because it means somebody is executing a database-wide + * CLUSTER. In the single relation case, we must cause a hard error. + */ + if (isOtherTempNamespace(RelationGetNamespace(OldHeap))) + { + if (recheck) + { + heap_close(OldHeap, AccessExclusiveLock); + return; + } + else + ereport(ERROR, + (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), + errmsg("cannot cluster temporary tables of other sessions"))); + } + OldIndex = index_open(rvtc->indexOid); LockRelation(OldIndex, AccessExclusiveLock); @@ -379,15 +398,6 @@ cluster_rel(RelToCluster *rvtc, bool recheck) errmsg("\"%s\" is a system catalog", 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))) - ereport(ERROR, - (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("cannot cluster temporary tables of other sessions"))); - /* Drop relcache refcnt on OldIndex, but keep lock */ index_close(OldIndex); -- 2.39.5