NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commita87e759

committed

Move ModifyTableContext->lockmode to UpdateContext

Should have been done this way to start with, but I failed to noticeThis way we avoid some pointless initialization, and better contains thevariable to exist in the scope where it is really used.Reviewed-by: Michaël Paquier <michael@paquier.xyz>Discussion:https://postgr.es/m/202204191345.qerjy3kxi3eb@alvherre.pgsql

1 parent3dcc6bf commita87e759Copy full SHA for a87e759

File tree

1 file changed

-15

lines changed

src/backend/executor
- nodeModifyTable.c

1 file changed

-15

lines changed

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

Lines changed: 8 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -116,12 +116,6 @@ typedef struct ModifyTableContext`
`116`	`116`	`* cross-partition UPDATE`
`117`	`117`	`*/`
`118`	`118`	`TupleTableSlot*cpUpdateReturningSlot;`
`119`		`-`
`120`		`-/*`
`121`		`- * Lock mode to acquire on the latest tuple version before performing`
`122`		`- * EvalPlanQual on it`
`123`		`- */`
`124`		`-LockTupleModelockmode;`
`125`	`119`	`}ModifyTableContext;`
`126`	`120`
`127`	`121`	`/*`
`@@ -132,6 +126,12 @@ typedef struct UpdateContext`
`132`	`126`	`boolupdated;/* did UPDATE actually occur? */`
`133`	`127`	`boolupdateIndexes;/* index update required? */`
`134`	`128`	`boolcrossPartUpdate;/* was it a cross-partition update? */`
	`129`	`+`
	`130`	`+/*`
	`131`	`+ * Lock mode to acquire on the latest tuple version before performing`
	`132`	`+ * EvalPlanQual on it`
	`133`	`+ */`
	`134`	`+LockTupleModelockmode;`
`135`	`135`	`}UpdateContext;`
`136`	`136`
`137`	`137`
`@@ -1971,7 +1971,7 @@ lreplace:;`
`1971`	`1971`	`estate->es_snapshot,`
`1972`	`1972`	`estate->es_crosscheck_snapshot,`
`1973`	`1973`	`true/* wait for commit */ ,`
`1974`		`-&context->tmfd,&context->lockmode,`
	`1974`	`+&context->tmfd,&updateCxt->lockmode,`
`1975`	`1975`	`&updateCxt->updateIndexes);`
`1976`	`1976`	`if (result==TM_Ok)`
`1977`	`1977`	`updateCxt->updated= true;`
`@@ -2251,7 +2251,7 @@ ExecUpdate(ModifyTableContext context, ResultRelInfo resultRelInfo,`
`2251`	`2251`	`result=table_tuple_lock(resultRelationDesc,tupleid,`
`2252`	`2252`	`estate->es_snapshot,`
`2253`	`2253`	`inputslot,estate->es_output_cid,`
`2254`		`-context->lockmode,LockWaitBlock,`
	`2254`	`+updateCxt.lockmode,LockWaitBlock,`
`2255`	`2255`	`TUPLE_LOCK_FLAG_FIND_LAST_VERSION,`
`2256`	`2256`	`&context->tmfd);`
`2257`	`2257`
`@@ -3557,8 +3557,6 @@ ExecModifyTable(PlanState *pstate)`
`3557`	`3557`	`{`
`3558`	`3558`	`EvalPlanQualSetSlot(&node->mt_epqstate,context.planSlot);`
`3559`	`3559`
`3560`		`-context.lockmode=0;`
`3561`		`-`
`3562`	`3560`	`ExecMerge(&context,node->resultRelInfo,NULL,node->canSetTag);`
`3563`	`3561`	`continue;/* no RETURNING support yet */`
`3564`	`3562`	`}`
`@@ -3637,8 +3635,6 @@ ExecModifyTable(PlanState *pstate)`
`3637`	`3635`	`{`
`3638`	`3636`	`EvalPlanQualSetSlot(&node->mt_epqstate,context.planSlot);`
`3639`	`3637`
`3640`		`-context.lockmode=0;`
`3641`		`-`
`3642`	`3638`	`ExecMerge(&context,node->resultRelInfo,NULL,node->canSetTag);`
`3643`	`3639`	`continue;/* no RETURNING support yet */`
`3644`	`3640`	`}`
`@@ -3694,9 +3690,6 @@ ExecModifyTable(PlanState *pstate)`
`3694`	`3690`	`}`
`3695`	`3691`	`}`
`3696`	`3692`
`3697`		`-/* complete context setup */`
`3698`		`-context.lockmode=0;`
`3699`		`-`
`3700`	`3693`	`switch (operation)`
`3701`	`3694`	`{`
`3702`	`3695`	`caseCMD_INSERT:`

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!

Commita87e759

File tree

1 file changed

1 file changed

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

0 commit comments