From 0453eb6397803ce4dd607fd3a17a12d573eb2c90 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Thu, 30 Dec 2021 16:48:09 -0300 Subject: [PATCH v13 1/3] Small cleanups for publicationcmds.c and pg_publication.c This fixes a typo in a local function name, completes an existing comment, and renames an unhappily named local variable. --- src/backend/catalog/pg_publication.c | 11 ++++++----- src/backend/commands/publicationcmds.c | 16 +++++++++------- src/backend/commands/tablecmds.c | 3 +-- src/backend/parser/gram.y | 5 +++-- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/backend/catalog/pg_publication.c b/src/backend/catalog/pg_publication.c index 62f10bcbd2..b307bc2ed5 100644 --- a/src/backend/catalog/pg_publication.c +++ b/src/backend/catalog/pg_publication.c @@ -287,7 +287,7 @@ publication_add_relation(Oid pubid, PublicationRelInfo *targetrel, Datum values[Natts_pg_publication_rel]; bool nulls[Natts_pg_publication_rel]; Oid relid = RelationGetRelid(targetrel->relation); - Oid prrelid; + Oid pubreloid; Publication *pub = GetPublication(pubid); ObjectAddress myself, referenced; @@ -320,9 +320,9 @@ publication_add_relation(Oid pubid, PublicationRelInfo *targetrel, memset(values, 0, sizeof(values)); memset(nulls, false, sizeof(nulls)); - prrelid = GetNewOidWithIndex(rel, PublicationRelObjectIndexId, - Anum_pg_publication_rel_oid); - values[Anum_pg_publication_rel_oid - 1] = ObjectIdGetDatum(prrelid); + pubreloid = GetNewOidWithIndex(rel, PublicationRelObjectIndexId, + Anum_pg_publication_rel_oid); + values[Anum_pg_publication_rel_oid - 1] = ObjectIdGetDatum(pubreloid); values[Anum_pg_publication_rel_prpubid - 1] = ObjectIdGetDatum(pubid); values[Anum_pg_publication_rel_prrelid - 1] = @@ -334,7 +334,8 @@ publication_add_relation(Oid pubid, PublicationRelInfo *targetrel, CatalogTupleInsert(rel, tup); heap_freetuple(tup); - ObjectAddressSet(myself, PublicationRelRelationId, prrelid); + /* Register dependencies as needed */ + ObjectAddressSet(myself, PublicationRelRelationId, pubreloid); /* Add dependency on the publication */ ObjectAddressSet(referenced, PublicationRelationId, pubid); diff --git a/src/backend/commands/publicationcmds.c b/src/backend/commands/publicationcmds.c index 404bb5d0c8..3466c57dc0 100644 --- a/src/backend/commands/publicationcmds.c +++ b/src/backend/commands/publicationcmds.c @@ -48,7 +48,7 @@ #include "utils/syscache.h" #include "utils/varlena.h" -static List *OpenReliIdList(List *relids); +static List *OpenRelIdList(List *relids); static List *OpenTableList(List *tables); static void CloseTableList(List *rels); static void LockSchemaList(List *schemalist); @@ -499,8 +499,9 @@ AlterPublicationTables(AlterPublicationStmt *stmt, HeapTuple tup, Oid pubid = pubform->oid; /* - * It is quite possible that for the SET case user has not specified any - * tables in which case we need to remove all the existing tables. + * Nothing to do if no objects, except in SET: for that it is quite + * possible that user has not specified any schemas in which case we need + * to remove all the existing schemas. */ if (!tables && stmt->action != DEFELEM_SET) return; @@ -593,8 +594,9 @@ AlterPublicationSchemas(AlterPublicationStmt *stmt, Form_pg_publication pubform = (Form_pg_publication) GETSTRUCT(tup); /* - * It is quite possible that for the SET case user has not specified any - * schemas in which case we need to remove all the existing schemas. + * Nothing to do if no objects, except in SET: for that it is quite + * possible that user has not specified any schemas in which case we need + * to remove all the existing schemas. */ if (!schemaidlist && stmt->action != DEFELEM_SET) return; @@ -610,7 +612,7 @@ AlterPublicationSchemas(AlterPublicationStmt *stmt, List *reloids; reloids = GetPublicationRelations(pubform->oid, PUBLICATION_PART_ROOT); - rels = OpenReliIdList(reloids); + rels = OpenRelIdList(reloids); CheckObjSchemaNotAlreadyInPublication(rels, schemaidlist, PUBLICATIONOBJ_TABLE_IN_SCHEMA); @@ -868,7 +870,7 @@ RemovePublicationSchemaById(Oid psoid) * add them to a publication. */ static List * -OpenReliIdList(List *relids) +OpenRelIdList(List *relids) { ListCell *lc; List *rels = NIL; diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 45e59e3d5c..3631b8a929 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -40,8 +40,8 @@ #include "catalog/pg_inherits.h" #include "catalog/pg_namespace.h" #include "catalog/pg_opclass.h" -#include "catalog/pg_tablespace.h" #include "catalog/pg_statistic_ext.h" +#include "catalog/pg_tablespace.h" #include "catalog/pg_trigger.h" #include "catalog/pg_type.h" #include "catalog/storage.h" @@ -15626,7 +15626,6 @@ ATExecReplicaIdentity(Relation rel, ReplicaIdentityStmt *stmt, LOCKMODE lockmode else elog(ERROR, "unexpected identity type %u", stmt->identity_type); - /* Check that the index exists */ indexOid = get_relname_relid(stmt->name, rel->rd_rel->relnamespace); if (!OidIsValid(indexOid)) diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 2a319eecda..4415ba00fa 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -17433,8 +17433,9 @@ preprocess_pubobj_list(List *pubobjspec_list, core_yyscan_t yyscanner) { /* convert it to PublicationTable */ PublicationTable *pubtable = makeNode(PublicationTable); - pubtable->relation = makeRangeVar(NULL, pubobj->name, - pubobj->location); + + pubtable->relation = + makeRangeVar(NULL, pubobj->name, pubobj->location); pubobj->pubtable = pubtable; pubobj->name = NULL; } -- 2.30.2