From e9d6bd5b003b9b8b4a6dc9eacc4e2440d338b58d Mon Sep 17 00:00:00 2001 From: Hayato Kuroda Date: Mon, 3 Mar 2025 19:41:04 +0900 Subject: [PATCH v9 2/2] Invalidate Relcaches while ALTER PUBLICATION RENAME TO --- src/backend/commands/alter.c | 4 +- src/backend/commands/publicationcmds.c | 111 ++++++++++++++++++++ src/backend/parser/gram.y | 2 +- src/backend/replication/pgoutput/pgoutput.c | 8 +- src/include/commands/publicationcmds.h | 2 + 5 files changed, 119 insertions(+), 8 deletions(-) diff --git a/src/backend/commands/alter.c b/src/backend/commands/alter.c index 78c1d4e1b8..a79329acc1 100644 --- a/src/backend/commands/alter.c +++ b/src/backend/commands/alter.c @@ -400,6 +400,9 @@ ExecRenameStmt(RenameStmt *stmt) case OBJECT_TYPE: return RenameType(stmt); + case OBJECT_PUBLICATION: + return RenamePublication(stmt->subname, stmt->newname); + case OBJECT_AGGREGATE: case OBJECT_COLLATION: case OBJECT_CONVERSION: @@ -417,7 +420,6 @@ ExecRenameStmt(RenameStmt *stmt) case OBJECT_TSDICTIONARY: case OBJECT_TSPARSER: case OBJECT_TSTEMPLATE: - case OBJECT_PUBLICATION: case OBJECT_SUBSCRIPTION: { ObjectAddress address; diff --git a/src/backend/commands/publicationcmds.c b/src/backend/commands/publicationcmds.c index 150a768d16..b1e38ed782 100644 --- a/src/backend/commands/publicationcmds.c +++ b/src/backend/commands/publicationcmds.c @@ -491,6 +491,105 @@ pub_contains_invalid_column(Oid pubid, Relation relation, List *ancestors, return *invalid_column_list || *invalid_gen_col; } +/* + * Execute ALTER PUBLICATION RENAME + */ +ObjectAddress +RenamePublication(const char *oldname, const char *newname) +{ + Relation rel; + HeapTuple tup; + ObjectAddress address; + Form_pg_publication pubform; + bool replaces[Natts_pg_publication]; + bool nulls[Natts_pg_publication]; + Datum values[Natts_pg_publication]; + + rel = table_open(PublicationRelationId, RowExclusiveLock); + + tup = SearchSysCacheCopy1(PUBLICATIONNAME, + CStringGetDatum(oldname)); + + if (!HeapTupleIsValid(tup)) + ereport(ERROR, + (errcode(ERRCODE_UNDEFINED_OBJECT), + errmsg("publication \"%s\" does not exist", + oldname))); + + pubform = (Form_pg_publication) GETSTRUCT(tup); + + /* must be owner */ + if (!object_ownercheck(PublicationRelationId, pubform->oid, GetUserId())) + aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_PUBLICATION, + NameStr(pubform->pubname)); + + /* Check if name is used */ + if (OidIsValid(GetSysCacheOid1(PUBLICATIONNAME, Anum_pg_publication_oid, + CStringGetDatum(newname)))) + ereport(ERROR, + (errcode(ERRCODE_DUPLICATE_OBJECT), + errmsg("publication \"%s\" already exists", + newname))); + + /* Everything ok, form a new tuple. */ + memset(values, 0, sizeof(values)); + memset(nulls, false, sizeof(nulls)); + memset(replaces, false, sizeof(replaces)); + + /* Only update the pubname */ + values[Anum_pg_publication_pubname - 1] = + DirectFunctionCall1(namein, CStringGetDatum(newname)); + replaces[Anum_pg_publication_pubname - 1] = true; + + tup = heap_modify_tuple(tup, RelationGetDescr(rel), values, nulls, + replaces); + + /* Update the catalog. */ + CatalogTupleUpdate(rel, &tup->t_self, tup); + + /* + * Invalidate caches on the logical decoding output plugin. + * + * Apart from the ALTER PUBLICATION ADD/SET/DROP commands, we do not have + * to invalidate relcaches. They are required to refresh the publication's + * descriptor. The publication's name is not recorded in the attribute, so + * the RENAME commands do not require a refresh. Instead, we only + * invalidate a cache on the output plugin to rebuild its cache. + */ + if (pubform->puballtables) + { + CacheInvalidateRelSyncAll(); + } + else + { + List *relids = NIL; + List *schemarelids = NIL; + + /* + * For partitioned tables, we must invalidate all partitions and + * itself. WAL records for INSERT/UPDATE/DELETE specify leaf + * tables as a target. However, WAL records for TRUNCATE specify + * both a root and its leaves. + */ + relids = GetPublicationRelations(pubform->oid, + PUBLICATION_PART_ALL); + schemarelids = GetAllSchemaPublicationRelations(pubform->oid, + PUBLICATION_PART_ALL); + + relids = list_concat_unique_oid(relids, schemarelids); + + InvalidateRelSyncCaches(relids); + } + + ObjectAddressSet(address, PublicationRelationId, pubform->oid); + + heap_freetuple(tup); + + table_close(rel, RowExclusiveLock); + + return address; +} + /* check_functions_in_node callback */ static bool contain_mutable_or_user_functions_checker(Oid func_id, void *context) @@ -2096,3 +2195,15 @@ defGetGeneratedColsOption(DefElem *def) return PUBLISH_GENCOLS_NONE; /* keep compiler quiet */ } + +/* + * Invalidate the caches on the logical decoding output plugin. + */ +void +InvalidateRelSyncCaches(List *relids) +{ + ListCell *lc; + + foreach(lc, relids) + CacheInvalidateRelSync(lfirst_oid(lc)); +} diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 271ae26cba..0fb4041f15 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -9541,7 +9541,7 @@ RenameStmt: ALTER AGGREGATE aggregate_with_argtypes RENAME TO name RenameStmt *n = makeNode(RenameStmt); n->renameType = OBJECT_PUBLICATION; - n->object = (Node *) makeString($3); + n->subname = $3; n->newname = $6; n->missing_ok = false; $$ = (Node *) n; diff --git a/src/backend/replication/pgoutput/pgoutput.c b/src/backend/replication/pgoutput/pgoutput.c index 9063af6e1d..ed806c5430 100644 --- a/src/backend/replication/pgoutput/pgoutput.c +++ b/src/backend/replication/pgoutput/pgoutput.c @@ -531,6 +531,8 @@ pgoutput_startup(LogicalDecodingContext *ctx, OutputPluginOptions *opt, CacheRegisterSyscacheCallback(PUBLICATIONOID, publication_invalidation_cb, (Datum) 0); + CacheRegisterRelSyncCallback(rel_sync_cache_relation_cb, + (Datum) 0); publication_callback_registered = true; } @@ -1789,12 +1791,6 @@ static void publication_invalidation_cb(Datum arg, int cacheid, uint32 hashvalue) { publications_valid = false; - - /* - * Also invalidate per-relation cache so that next time the filtering info - * is checked it will be updated with the new publication settings. - */ - rel_sync_cache_publication_cb(arg, cacheid, hashvalue); } /* diff --git a/src/include/commands/publicationcmds.h b/src/include/commands/publicationcmds.h index e11a942ea0..f130ea3090 100644 --- a/src/include/commands/publicationcmds.h +++ b/src/include/commands/publicationcmds.h @@ -38,5 +38,7 @@ extern bool pub_contains_invalid_column(Oid pubid, Relation relation, char pubgencols_type, bool *invalid_column_list, bool *invalid_gen_col); +extern ObjectAddress RenamePublication(const char *oldname, const char *newname); +extern void InvalidateRelSyncCaches(List *relids); #endif /* PUBLICATIONCMDS_H */ -- 2.43.5