From 0579e8a112c51a384b920e7bb676a7d444e7ab29 Mon Sep 17 00:00:00 2001 From: reshke kirill Date: Mon, 9 Dec 2024 11:49:01 +0000 Subject: [PATCH v5] When making dependency changes, lock the tuple for in-place updates. Also provide regression test for reassigning ownership of non-locals objects (e.g. DATABASE). Reported-By: Alexander Kukushkin Reviewed-By: Noah Misch --- src/backend/catalog/objectaddress.c | 19 ++++++++++++++++++- src/backend/commands/alter.c | 8 +++++++- src/include/catalog/objectaddress.h | 1 + src/test/regress/expected/database.out | 6 ++++++ src/test/regress/sql/database.sql | 7 +++++++ 5 files changed, 39 insertions(+), 2 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index be7e4a5dd0..25dc59c18a 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -2784,6 +2784,16 @@ get_object_property_data(Oid class_id) */ HeapTuple get_catalog_object_by_oid(Relation catalog, AttrNumber oidcol, Oid objectId) +{ + return get_catalog_object_by_oid_extended(catalog, oidcol, objectId, false); +} + +/* +* Workhorse for get_catalog_object_by_oid. +* Accepts an extra locktup parameter that indicates whether a tuple lock is required. +*/ +HeapTuple +get_catalog_object_by_oid_extended(Relation catalog, AttrNumber oidcol, Oid objectId, bool locktup) { HeapTuple tuple; Oid classId = RelationGetRelid(catalog); @@ -2791,7 +2801,10 @@ get_catalog_object_by_oid(Relation catalog, AttrNumber oidcol, Oid objectId) if (oidCacheId > 0) { - tuple = SearchSysCacheCopy1(oidCacheId, ObjectIdGetDatum(objectId)); + if (locktup) + tuple = SearchSysCacheLockedCopy1(oidCacheId, ObjectIdGetDatum(objectId)); + else + tuple = SearchSysCacheCopy1(oidCacheId, ObjectIdGetDatum(objectId)); if (!HeapTupleIsValid(tuple)) /* should not happen */ return NULL; } @@ -2816,6 +2829,10 @@ get_catalog_object_by_oid(Relation catalog, AttrNumber oidcol, Oid objectId) systable_endscan(scan); return NULL; } + + if (locktup) + LockTuple(catalog, &tuple->t_self, InplaceUpdateTupleLock); + tuple = heap_copytuple(tuple); systable_endscan(scan); diff --git a/src/backend/commands/alter.c b/src/backend/commands/alter.c index a45f3bb6b8..910d1b1463 100644 --- a/src/backend/commands/alter.c +++ b/src/backend/commands/alter.c @@ -59,6 +59,7 @@ #include "miscadmin.h" #include "replication/logicalworker.h" #include "rewrite/rewriteDefine.h" +#include "storage/lmgr.h" #include "utils/acl.h" #include "utils/builtins.h" #include "utils/lsyscache.h" @@ -924,7 +925,8 @@ AlterObjectOwner_internal(Oid classId, Oid objectId, Oid new_ownerId) rel = table_open(catalogId, RowExclusiveLock); - oldtup = get_catalog_object_by_oid(rel, Anum_oid, objectId); + /* Search tuple and lock it. */ + oldtup = get_catalog_object_by_oid_extended(rel, Anum_oid, objectId, true); if (oldtup == NULL) elog(ERROR, "cache lookup failed for object %u of catalog \"%s\"", objectId, RelationGetRelationName(rel)); @@ -1024,6 +1026,8 @@ AlterObjectOwner_internal(Oid classId, Oid objectId, Oid new_ownerId) /* Perform actual update */ CatalogTupleUpdate(rel, &newtup->t_self, newtup); + UnlockTuple(rel, &oldtup->t_self, InplaceUpdateTupleLock); + /* Update owner dependency reference */ changeDependencyOnOwner(classId, objectId, new_ownerId); @@ -1032,6 +1036,8 @@ AlterObjectOwner_internal(Oid classId, Oid objectId, Oid new_ownerId) pfree(nulls); pfree(replaces); } + else + UnlockTuple(rel, &oldtup->t_self, InplaceUpdateTupleLock); /* Note the post-alter hook gets classId not catalogId */ InvokeObjectPostAlterHook(classId, objectId, 0); diff --git a/src/include/catalog/objectaddress.h b/src/include/catalog/objectaddress.h index 3a70d80e32..067e1662e4 100644 --- a/src/include/catalog/objectaddress.h +++ b/src/include/catalog/objectaddress.h @@ -69,6 +69,7 @@ extern bool get_object_namensp_unique(Oid class_id); extern HeapTuple get_catalog_object_by_oid(Relation catalog, AttrNumber oidcol, Oid objectId); +extern HeapTuple get_catalog_object_by_oid_extended(Relation catalog, AttrNumber oidcol, Oid objectId, bool locktup); extern char *getObjectDescription(const ObjectAddress *object, bool missing_ok); diff --git a/src/test/regress/expected/database.out b/src/test/regress/expected/database.out index 454db91ec0..3b1014b0e7 100644 --- a/src/test/regress/expected/database.out +++ b/src/test/regress/expected/database.out @@ -12,4 +12,10 @@ WHERE datname = 'regression_utf8'; -- load catcache entry, if nothing else does ALTER DATABASE regression_utf8 RESET TABLESPACE; ROLLBACK; +CREATE ROLE regress_temp_role1; +CREATE ROLE regress_temp_role2; +ALTER DATABASE regression_utf8 OWNER TO regress_temp_role1; +REASSIGN OWNED BY regress_temp_role1 TO regress_temp_role2; DROP DATABASE regression_utf8; +DROP ROLE regress_temp_role1; +DROP ROLE regress_temp_role2; diff --git a/src/test/regress/sql/database.sql b/src/test/regress/sql/database.sql index 0367c0e37a..f8d2462c7d 100644 --- a/src/test/regress/sql/database.sql +++ b/src/test/regress/sql/database.sql @@ -14,4 +14,11 @@ WHERE datname = 'regression_utf8'; ALTER DATABASE regression_utf8 RESET TABLESPACE; ROLLBACK; +CREATE ROLE regress_temp_role1; +CREATE ROLE regress_temp_role2; +ALTER DATABASE regression_utf8 OWNER TO regress_temp_role1; +REASSIGN OWNED BY regress_temp_role1 TO regress_temp_role2; + DROP DATABASE regression_utf8; +DROP ROLE regress_temp_role1; +DROP ROLE regress_temp_role2; -- 2.34.1