diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c index 3b91d02605a..b1fbfca087e 100644 --- a/src/backend/access/heap/vacuumlazy.c +++ b/src/backend/access/heap/vacuumlazy.c @@ -534,7 +534,7 @@ heap_vacuum_eager_scan_setup(LVRelState *vacrel, VacuumParams *params) * Tuples with XIDs older than OldestXmin or MXIDs older than OldestMxact * are technically freezable, but we won't freeze them unless the criteria * for opportunistic freezing is met. Only tuples with XIDs/MXIDs older - * than the the FreezeLimit/MultiXactCutoff are frozen in the common case. + * than the FreezeLimit/MultiXactCutoff are frozen in the common case. * * So, as a heuristic, we wait until the FreezeLimit has advanced past the * relfrozenxid or the MultiXactCutoff has advanced past the relminmxid to diff --git a/src/backend/commands/publicationcmds.c b/src/backend/commands/publicationcmds.c index 3091d36ce98..0b23d94c38e 100644 --- a/src/backend/commands/publicationcmds.c +++ b/src/backend/commands/publicationcmds.c @@ -2052,7 +2052,7 @@ AlterPublicationOwner_internal(Relation rel, HeapTuple tup, Oid newOwnerId) ObjectAddress AlterPublicationOwner(const char *name, Oid newOwnerId) { - Oid subid; + Oid pubid; HeapTuple tup; Relation rel; ObjectAddress address; @@ -2068,11 +2068,11 @@ AlterPublicationOwner(const char *name, Oid newOwnerId) errmsg("publication \"%s\" does not exist", name))); pubform = (Form_pg_publication) GETSTRUCT(tup); - subid = pubform->oid; + pubid = pubform->oid; AlterPublicationOwner_internal(rel, tup, newOwnerId); - ObjectAddressSet(address, PublicationRelationId, subid); + ObjectAddressSet(address, PublicationRelationId, pubid); heap_freetuple(tup); @@ -2085,19 +2085,19 @@ AlterPublicationOwner(const char *name, Oid newOwnerId) * Change publication owner -- by OID */ void -AlterPublicationOwner_oid(Oid subid, Oid newOwnerId) +AlterPublicationOwner_oid(Oid pubid, Oid newOwnerId) { HeapTuple tup; Relation rel; rel = table_open(PublicationRelationId, RowExclusiveLock); - tup = SearchSysCacheCopy1(PUBLICATIONOID, ObjectIdGetDatum(subid)); + tup = SearchSysCacheCopy1(PUBLICATIONOID, ObjectIdGetDatum(pubid)); if (!HeapTupleIsValid(tup)) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), - errmsg("publication with OID %u does not exist", subid))); + errmsg("publication with OID %u does not exist", pubid))); AlterPublicationOwner_internal(rel, tup, newOwnerId); diff --git a/src/include/commands/publicationcmds.h b/src/include/commands/publicationcmds.h index e41df6db038..f90cf1ef896 100644 --- a/src/include/commands/publicationcmds.h +++ b/src/include/commands/publicationcmds.h @@ -29,7 +29,7 @@ extern void RemovePublicationRelById(Oid proid); extern void RemovePublicationSchemaById(Oid psoid); extern ObjectAddress AlterPublicationOwner(const char *name, Oid newOwnerId); -extern void AlterPublicationOwner_oid(Oid subid, Oid newOwnerId); +extern void AlterPublicationOwner_oid(Oid pubid, Oid newOwnerId); extern void InvalidatePublicationRels(List *relids); extern bool pub_rf_contains_invalid_column(Oid pubid, Relation relation, List *ancestors, bool pubviaroot);