NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitdffad02

Neil Conway

committed

Slight refactor for ExecOpenScanRelation(): we can use

ExecRelationIsTargetRelation() to check if the relation is a targetrel, rather than scanning through the result relation array ourselves.

1 parentdc6dc0f commitdffad02Copy full SHA for dffad02

File tree

1 file changed

-15

lines changed

src/backend/executor
- execUtils.c

1 file changed

-15

lines changed

`‎src/backend/executor/execUtils.c‎`

Lines changed: 6 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/executor/execUtils.c,v 1.147 2007/02/2701:11:25 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/executor/execUtils.c,v 1.148 2007/07/2719:09:04 neilc Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -814,24 +814,16 @@ ExecOpenScanRelation(EState *estate, Index scanrelid)`
`814`	`814`	`{`
`815`	`815`	`Oidreloid;`
`816`	`816`	`LOCKMODElockmode;`
`817`		`-ResultRelInfo*resultRelInfos;`
`818`		`-inti;`
`819`	`817`
`820`	`818`	`/*`
`821`		`- *First determinethe lock type we need.Scanto see if target relation`
`822`		`- *is either a resultrelationor aFOR UPDATE/FOR SHARE relation.`
	`819`	`+ *Determinethe lock type we need.First, scanto see if target`
	`820`	`+ * relationis aresult relation.`
`823`	`821`	`*/`
`824`	`822`	`lockmode=AccessShareLock;`
`825`		`-resultRelInfos=estate->es_result_relations;`
`826`		`-for (i=0;i<estate->es_num_result_relations;i++)`
`827`		`-{`
`828`		`-if (resultRelInfos[i].ri_RangeTableIndex==scanrelid)`
`829`		`-{`
`830`		`-lockmode=NoLock;`
`831`		`-break;`
`832`		`-}`
`833`		`-}`
	`823`	`+if (ExecRelationIsTargetRelation(estate,scanrelid))`
	`824`	`+lockmode=NoLock;`
`834`	`825`
	`826`	`+/* If not, check if it's a FOR UPDATE/FOR SHARE relation */`
`835`	`827`	`if (lockmode==AccessShareLock)`
`836`	`828`	`{`
`837`	`829`	`ListCell*l;`
`@@ -850,7 +842,6 @@ ExecOpenScanRelation(EState *estate, Index scanrelid)`
`850`	`842`
`851`	`843`	`/* OK, open the relation and acquire lock as needed */`
`852`	`844`	`reloid=getrelid(scanrelid,estate->es_range_table);`
`853`		`-`
`854`	`845`	`returnheap_open(reloid,lockmode);`
`855`	`846`	`}`
`856`	`847`

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!

Commitdffad02

File tree

1 file changed

1 file changed

`‎src/backend/executor/execUtils.c‎`

0 commit comments