From e12e3988856e22a889b518097bf5ae125a169114 Mon Sep 17 00:00:00 2001 From: Ashutosh Bapat Date: Tue, 2 Jun 2026 11:34:58 +0530 Subject: [PATCH v20260602 9/9] Cosmetic adjustments ... to make the code look consistent with the surrounding code. Author: Ashutosh Bapat --- src/backend/catalog/objectaddress.c | 52 +++++++++++++---------------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index 7b0d163cec9..a70f17cc52f 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -4077,9 +4077,7 @@ getObjectDescription(const ObjectAddress *object, bool missing_ok) { HeapTuple tup; Form_pg_propgraph_element pgeform; - StringInfoData objdesc; - - initStringInfo(&objdesc); + StringInfoData rel; tup = SearchSysCache1(PROPGRAPHELOID, ObjectIdGetDatum(object->objectId)); if (!HeapTupleIsValid(tup)) @@ -4092,16 +4090,17 @@ getObjectDescription(const ObjectAddress *object, bool missing_ok) pgeform = (Form_pg_propgraph_element) GETSTRUCT(tup); - getRelationDescription(&objdesc, pgeform->pgepgid, false); + initStringInfo(&rel); + getRelationDescription(&rel, pgeform->pgepgid, false); if (pgeform->pgekind == PGEKIND_VERTEX) - appendStringInfo(&buffer, _("vertex %s of %s"), NameStr(pgeform->pgealias), objdesc.data); + appendStringInfo(&buffer, _("vertex %s of %s"), NameStr(pgeform->pgealias), rel.data); else if (pgeform->pgekind == PGEKIND_EDGE) - appendStringInfo(&buffer, _("edge %s of %s"), NameStr(pgeform->pgealias), objdesc.data); + appendStringInfo(&buffer, _("edge %s of %s"), NameStr(pgeform->pgealias), rel.data); else - appendStringInfo(&buffer, "??? element %s of %s", NameStr(pgeform->pgealias), objdesc.data); + appendStringInfo(&buffer, "??? element %s of %s", NameStr(pgeform->pgealias), rel.data); - pfree(objdesc.data); + pfree(rel.data); ReleaseSysCache(tup); break; } @@ -4112,7 +4111,6 @@ getObjectDescription(const ObjectAddress *object, bool missing_ok) HeapTuple tuple; Form_pg_propgraph_element_label pgelform; ObjectAddress oa; - char *objdesc; rel = table_open(PropgraphElementLabelRelationId, AccessShareLock); tuple = get_catalog_object_by_oid(rel, @@ -4131,11 +4129,10 @@ getObjectDescription(const ObjectAddress *object, bool missing_ok) ObjectAddressSet(oa, PropgraphElementRelationId, pgelform->pgelelid); - objdesc = getObjectDescription(&oa, false); + appendStringInfo(&buffer, _("label %s of %s"), + get_propgraph_label_name(pgelform->pgellabelid), + getObjectDescription(&oa, false)); - appendStringInfo(&buffer, _("label %s of %s"), get_propgraph_label_name(pgelform->pgellabelid), objdesc); - - pfree(objdesc); table_close(rel, AccessShareLock); break; } @@ -4144,9 +4141,7 @@ getObjectDescription(const ObjectAddress *object, bool missing_ok) { HeapTuple tuple; Form_pg_propgraph_label pglform; - StringInfoData objdesc; - - initStringInfo(&objdesc); + StringInfoData rel; tuple = SearchSysCache1(PROPGRAPHLABELOID, ObjectIdGetDatum(object->objectId)); if (!HeapTupleIsValid(tuple)) @@ -4158,11 +4153,12 @@ getObjectDescription(const ObjectAddress *object, bool missing_ok) pglform = (Form_pg_propgraph_label) GETSTRUCT(tuple); - getRelationDescription(&objdesc, pglform->pglpgid, false); + initStringInfo(&rel); + getRelationDescription(&rel, pglform->pglpgid, false); - appendStringInfo(&buffer, _("label %s of %s"), NameStr(pglform->pgllabel), objdesc.data); + appendStringInfo(&buffer, _("label %s of %s"), NameStr(pglform->pgllabel), rel.data); - pfree(objdesc.data); + pfree(rel.data); ReleaseSysCache(tuple); break; } @@ -4173,7 +4169,6 @@ getObjectDescription(const ObjectAddress *object, bool missing_ok) HeapTuple tuple; Form_pg_propgraph_label_property plpform; ObjectAddress oa; - char *objdesc; rel = table_open(PropgraphLabelPropertyRelationId, AccessShareLock); tuple = get_catalog_object_by_oid(rel, @@ -4192,11 +4187,11 @@ getObjectDescription(const ObjectAddress *object, bool missing_ok) ObjectAddressSet(oa, PropgraphElementLabelRelationId, plpform->plpellabelid); - objdesc = getObjectDescription(&oa, false); - appendStringInfo(&buffer, _("property %s of %s"), get_propgraph_property_name(plpform->plppropid), objdesc); + appendStringInfo(&buffer, _("property %s of %s"), + get_propgraph_property_name(plpform->plppropid), + getObjectDescription(&oa, false)); - pfree(objdesc); table_close(rel, AccessShareLock); break; } @@ -4205,9 +4200,7 @@ getObjectDescription(const ObjectAddress *object, bool missing_ok) { HeapTuple tuple; Form_pg_propgraph_property pgpform; - StringInfoData objdesc; - - initStringInfo(&objdesc); + StringInfoData rel; tuple = SearchSysCache1(PROPGRAPHPROPOID, ObjectIdGetDatum(object->objectId)); if (!HeapTupleIsValid(tuple)) @@ -4219,10 +4212,11 @@ getObjectDescription(const ObjectAddress *object, bool missing_ok) pgpform = (Form_pg_propgraph_property) GETSTRUCT(tuple); - getRelationDescription(&objdesc, pgpform->pgppgid, false); + initStringInfo(&rel); + getRelationDescription(&rel, pgpform->pgppgid, false); - appendStringInfo(&buffer, _("property %s of %s"), NameStr(pgpform->pgpname), objdesc.data); - pfree(objdesc.data); + appendStringInfo(&buffer, _("property %s of %s"), NameStr(pgpform->pgpname), rel.data); + pfree(rel.data); ReleaseSysCache(tuple); break; } -- 2.34.1