Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitcbe24a6

Browse files
committed
Improve behavior of concurrent CLUSTER.
In the previous coding, a user could queue up for an AccessExclusiveLockon a table they did not have permission to cluster, thus potentiallyinterfering with access by authorized users who got stuck waiting behindthe AccessExclusiveLock. This approach avoids that. cluster() has thesame permissions-checking requirements as REINDEX TABLE, so this commitmoves the now-shared callback to tablecmds.c and renames it, perdiscussion with Noah Misch.
1 parentd573e23 commitcbe24a6

File tree

4 files changed

+47
-43
lines changed

4 files changed

+47
-43
lines changed

‎src/backend/commands/cluster.c‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include"catalog/dependency.h"
2626
#include"catalog/heap.h"
2727
#include"catalog/index.h"
28+
#include"catalog/namespace.h"
2829
#include"catalog/toasting.h"
2930
#include"commands/cluster.h"
3031
#include"commands/tablecmds.h"
@@ -106,15 +107,12 @@ cluster(ClusterStmt *stmt, bool isTopLevel)
106107
indexOid=InvalidOid;
107108
Relationrel;
108109

109-
/* Find and lock the table */
110-
rel=heap_openrv(stmt->relation,AccessExclusiveLock);
111-
112-
tableOid=RelationGetRelid(rel);
113-
114-
/* Check permissions */
115-
if (!pg_class_ownercheck(tableOid,GetUserId()))
116-
aclcheck_error(ACLCHECK_NOT_OWNER,ACL_KIND_CLASS,
117-
RelationGetRelationName(rel));
110+
/* Find, lock, and check permissions on the table */
111+
tableOid=RangeVarGetRelidExtended(stmt->relation,
112+
AccessExclusiveLock,
113+
false, false,
114+
RangeVarCallbackOwnsTable,NULL);
115+
rel=heap_open(tableOid,NoLock);
118116

119117
/*
120118
* Reject clustering a remote temp table ... their local buffer

‎src/backend/commands/indexcmds.c‎

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include"catalog/pg_tablespace.h"
2626
#include"commands/dbcommands.h"
2727
#include"commands/defrem.h"
28+
#include"commands/tablecmds.h"
2829
#include"commands/tablespace.h"
2930
#include"mb/pg_wchar.h"
3031
#include"miscadmin.h"
@@ -63,8 +64,6 @@ static void ComputeIndexAttrs(IndexInfo *indexInfo,
6364
staticOidGetIndexOpClass(List*opclass,OidattrType,
6465
char*accessMethodName,OidaccessMethodId);
6566
staticchar*ChooseIndexNameAddition(List*colnames);
66-
staticvoidRangeVarCallbackForReindexTable(constRangeVar*relation,
67-
OidrelId,OidoldRelId,void*arg);
6867
staticvoidRangeVarCallbackForReindexIndex(constRangeVar*relation,
6968
OidrelId,OidoldRelId,void*arg);
7069

@@ -1809,45 +1808,14 @@ ReindexTable(RangeVar *relation)
18091808

18101809
/* The lock level used here should match reindex_relation(). */
18111810
heapOid=RangeVarGetRelidExtended(relation,ShareLock, false, false,
1812-
RangeVarCallbackForReindexTable,NULL);
1811+
RangeVarCallbackOwnsTable,NULL);
18131812

18141813
if (!reindex_relation(heapOid,REINDEX_REL_PROCESS_TOAST))
18151814
ereport(NOTICE,
18161815
(errmsg("table \"%s\" has no indexes",
18171816
relation->relname)));
18181817
}
18191818

1820-
/*
1821-
* Check permissions on table before acquiring relation lock.
1822-
*/
1823-
staticvoid
1824-
RangeVarCallbackForReindexTable(constRangeVar*relation,
1825-
OidrelId,OidoldRelId,void*arg)
1826-
{
1827-
charrelkind;
1828-
1829-
/* Nothing to do if the relation was not found. */
1830-
if (!OidIsValid(relId))
1831-
return;
1832-
1833-
/*
1834-
* If the relation does exist, check whether it's an index. But note
1835-
* that the relation might have been dropped between the time we did the
1836-
* name lookup and now. In that case, there's nothing to do.
1837-
*/
1838-
relkind=get_rel_relkind(relId);
1839-
if (!relkind)
1840-
return;
1841-
if (relkind!=RELKIND_RELATION&&relkind!=RELKIND_TOASTVALUE)
1842-
ereport(ERROR,
1843-
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
1844-
errmsg("\"%s\" is not a table",relation->relname)));
1845-
1846-
/* Check permissions */
1847-
if (!pg_class_ownercheck(relId,GetUserId()))
1848-
aclcheck_error(ACLCHECK_NOT_OWNER,ACL_KIND_CLASS,relation->relname);
1849-
}
1850-
18511819
/*
18521820
* ReindexDatabase
18531821
*Recreate indexes of a database.

‎src/backend/commands/tablecmds.c‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9933,3 +9933,38 @@ AtEOSubXact_on_commit_actions(bool isCommit, SubTransactionId mySubid,
99339933
}
99349934
}
99359935
}
9936+
9937+
/*
9938+
* This is intended as a callback for RangeVarGetRelidExtended(). It allows
9939+
* the table to be locked only if (1) it's a plain table or TOAST table and
9940+
* (2) the current user is the owner (or the superuser). This meets the
9941+
* permission-checking needs of both CLUTER and REINDEX TABLE; we expose it
9942+
* here so that it can be used by both.
9943+
*/
9944+
void
9945+
RangeVarCallbackOwnsTable(constRangeVar*relation,
9946+
OidrelId,OidoldRelId,void*arg)
9947+
{
9948+
charrelkind;
9949+
9950+
/* Nothing to do if the relation was not found. */
9951+
if (!OidIsValid(relId))
9952+
return;
9953+
9954+
/*
9955+
* If the relation does exist, check whether it's an index. But note
9956+
* that the relation might have been dropped between the time we did the
9957+
* name lookup and now. In that case, there's nothing to do.
9958+
*/
9959+
relkind=get_rel_relkind(relId);
9960+
if (!relkind)
9961+
return;
9962+
if (relkind!=RELKIND_RELATION&&relkind!=RELKIND_TOASTVALUE)
9963+
ereport(ERROR,
9964+
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
9965+
errmsg("\"%s\" is not a table",relation->relname)));
9966+
9967+
/* Check permissions */
9968+
if (!pg_class_ownercheck(relId,GetUserId()))
9969+
aclcheck_error(ACLCHECK_NOT_OWNER,ACL_KIND_CLASS,relation->relname);
9970+
}

‎src/include/commands/tablecmds.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,7 @@ extern void AtEOSubXact_on_commit_actions(bool isCommit,
7171
SubTransactionIdmySubid,
7272
SubTransactionIdparentSubid);
7373

74+
externvoidRangeVarCallbackOwnsTable(constRangeVar*relation,
75+
OidrelId,OidoldRelId,void*arg);
76+
7477
#endif/* TABLECMDS_H */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp