NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit6cffe54

committed

Fix pointer confusion

get_object_address_publication_rel() needed to check *relation, notrelation. Rename the variables to match style used nearby to avoid theconfusion.

1 parent16a6188 commit6cffe54Copy full SHA for 6cffe54

File tree

1 file changed

-5

lines changed

src/backend/catalog
- objectaddress.c

1 file changed

-5

lines changed

`‎src/backend/catalog/objectaddress.c`

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -729,7 +729,7 @@ static ObjectAddress get_object_address_opf_member(ObjectType objtype,`
`729`	`729`	`staticObjectAddressget_object_address_usermapping(List*objname,`
`730`	`730`	`List*objargs,boolmissing_ok);`
`731`	`731`	`staticObjectAddressget_object_address_publication_rel(List*objname,`
`732`		`-Listobjargs,Relationrelation,`
	`732`	`+Listobjargs,Relationrelp,`
`733`	`733`	`boolmissing_ok);`
`734`	`734`	`staticObjectAddressget_object_address_defacl(Listobjname,Listobjargs,`
`735`	`735`	`boolmissing_ok);`
`@@ -1815,15 +1815,16 @@ get_object_address_usermapping(List objname, List objargs, bool missing_ok)`
`1815`	`1815`	`*/`
`1816`	`1816`	`staticObjectAddress`
`1817`	`1817`	`get_object_address_publication_rel(Listobjname,Listobjargs,`
`1818`		`-Relation*relation,boolmissing_ok)`
	`1818`	`+Relation*relp,boolmissing_ok)`
`1819`	`1819`	`{`
`1820`	`1820`	`ObjectAddressaddress;`
	`1821`	`+Relationrelation;`
`1821`	`1822`	`char*pubname;`
`1822`	`1823`	`Publication*pub;`
`1823`	`1824`
`1824`	`1825`	`ObjectAddressSet(address,PublicationRelRelationId,InvalidOid);`
`1825`	`1826`
`1826`		`-*relation=relation_openrv_extended(makeRangeVarFromNameList(objname),`
	`1827`	`+relation=relation_openrv_extended(makeRangeVarFromNameList(objname),`
`1827`	`1828`	`AccessShareLock,missing_ok);`
`1828`	`1829`	`if (!relation)`
`1829`	`1830`	`returnaddress;`
`@@ -1839,18 +1840,19 @@ get_object_address_publication_rel(List objname, List objargs,`
`1839`	`1840`	`/* Find the publication relation mapping in syscache. */`
`1840`	`1841`	`address.objectId=`
`1841`	`1842`	`GetSysCacheOid2(PUBLICATIONRELMAP,`
`1842`		`-ObjectIdGetDatum(RelationGetRelid(*relation)),`
	`1843`	`+ObjectIdGetDatum(RelationGetRelid(relation)),`
`1843`	`1844`	`ObjectIdGetDatum(pub->oid));`
`1844`	`1845`	`if (!OidIsValid(address.objectId))`
`1845`	`1846`	`{`
`1846`	`1847`	`if (!missing_ok)`
`1847`	`1848`	`ereport(ERROR,`
`1848`	`1849`	`(errcode(ERRCODE_UNDEFINED_OBJECT),`
`1849`	`1850`	`errmsg("publication relation \"%s\" in publication \"%s\" does not exist",`
`1850`		`-RelationGetRelationName(*relation),pubname)));`
	`1851`	`+RelationGetRelationName(relation),pubname)));`
`1851`	`1852`	`returnaddress;`
`1852`	`1853`	`}`
`1853`	`1854`
	`1855`	`+*relp=relation;`
`1854`	`1856`	`returnaddress;`
`1855`	`1857`	`}`
`1856`	`1858`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit6cffe54

File tree

1 file changed

1 file changed

`‎src/backend/catalog/objectaddress.c`

0 commit comments