NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit6bc8193

committed

Clean up sloppy coding in publicationcmds.c's OpenTableList().

Remove dead code (which would be incorrect if it weren't dead),per report from Pan Bian. Add a CHECK_FOR_INTERRUPTS in theinner loop over child relations, because there's little pointin having one in the outer loop if there's not one here too.Minor stylistic adjustments and comment improvements.Seems to be aboriginal to this code (cf commit665d1fa).Back-patch to v10 where that came in, not because any of thisis significant, but just to keep the branches looking similar.Discussion:https://postgr.es/m/15539-06d00ef6b1e2e1bb@postgresql.org

1 parent4c6d6ac commit6bc8193Copy full SHA for 6bc8193

File tree

1 file changed

-9

lines changed

src/backend/commands
- publicationcmds.c

1 file changed

-9

lines changed

`‎src/backend/commands/publicationcmds.c`

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -484,7 +484,7 @@ RemovePublicationRelById(Oid proid)`
`484`	`484`	`}`
`485`	`485`
`486`	`486`	`/*`
`487`		`- * Open relationsbased on provided by RangeVar list.`
	`487`	`+ * Open relationsspecified by a RangeVar list.`
`488`	`488`	`* The returned tables are locked in ShareUpdateExclusiveLock mode.`
`489`	`489`	`*/`
`490`	`490`	`staticList*`
`@@ -499,11 +499,12 @@ OpenTableList(List *tables)`
`499`	`499`	`*/`
`500`	`500`	`foreach(lc,tables)`
`501`	`501`	`{`
`502`		`-RangeVar*rv=lfirst(lc);`
`503`		`-Relationrel;`
	`502`	`+RangeVar*rv=castNode(RangeVar,lfirst(lc));`
`504`	`503`	`boolrecurse=rv->inh;`
	`504`	`+Relationrel;`
`505`	`505`	`Oidmyrelid;`
`506`	`506`
	`507`	`+/* Allow query cancel in case this takes a long time */`
`507`	`508`	`CHECK_FOR_INTERRUPTS();`
`508`	`509`
`509`	`510`	`rel=heap_openrv(rv,ShareUpdateExclusiveLock);`
`@@ -521,13 +522,15 @@ OpenTableList(List *tables)`
`521`	`522`	`heap_close(rel,ShareUpdateExclusiveLock);`
`522`	`523`	`continue;`
`523`	`524`	`}`
	`525`	`+`
`524`	`526`	`rels=lappend(rels,rel);`
`525`	`527`	`relids=lappend_oid(relids,myrelid);`
`526`	`528`
	`529`	`+/* Add children of this rel, if requested */`
`527`	`530`	`if (recurse)`
`528`	`531`	`{`
`529`		`-ListCell*child;`
`530`	`532`	`List*children;`
	`533`	`+ListCell*child;`
`531`	`534`
`532`	`535`	`children=find_all_inheritors(myrelid,ShareUpdateExclusiveLock,`
`533`	`536`	`NULL);`
`@@ -536,18 +539,15 @@ OpenTableList(List *tables)`
`536`	`539`	`{`
`537`	`540`	`Oidchildrelid=lfirst_oid(child);`
`538`	`541`
`539`		`-if (list_member_oid(relids,childrelid))`
`540`		`-continue;`
	`542`	`+/* Allow query cancel in case this takes a long time */`
	`543`	`+CHECK_FOR_INTERRUPTS();`
`541`	`544`
`542`	`545`	`/*`
`543`	`546`	`* Skip duplicates if user specified both parent and child`
`544`	`547`	`* tables.`
`545`	`548`	`*/`
`546`	`549`	`if (list_member_oid(relids,childrelid))`
`547`		`-{`
`548`		`-heap_close(rel,ShareUpdateExclusiveLock);`
`549`	`550`	`continue;`
`550`		`-}`
`551`	`551`
`552`	`552`	`/* find_all_inheritors already got lock */`
`553`	`553`	`rel=heap_open(childrelid,NoLock);`

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!

Commit6bc8193

File tree

1 file changed

1 file changed

`‎src/backend/commands/publicationcmds.c`

0 commit comments