NotificationsYou must be signed in to change notification settings
Fork28
Star153

Commitaa4b8c6

committed

Handle table_complete_speculative's succeeded argument as documented.

For some reason both callsite and the implementation for heapam hadthe meaning inverted (i.e. succeeded == true was passed in case ofconflict). That's confusing.I (Andres) briefly pondered whether it'd be better to renametable_complete_speculative's argument to 'bool specConflict' or such,but decided not to. The 'complete' in the function name for me makes`succeeded` sound a bit better.Reported-By: Ashwin Agrawal, Melanie Plageman, Heikki LinnakangasDiscussion:https://postgr.es/m/CALfoeitk7-TACwYv3hCw45FNPjkA86RfXg4iQ5kAOPhR+F1Y4w@mail.gmail.com https://postgr.es/m/97673451-339f-b21e-a781-998d06b1067c@iki.fi

1 parent08e2edc commitaa4b8c6Copy full SHA for aa4b8c6

File tree

2 files changed

-2

lines changed

src/backend
- access/heap
  - heapam_handler.c
- executor
  - nodeModifyTable.c

2 files changed

-2

lines changed

`‎src/backend/access/heap/heapam_handler.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ heapam_tuple_complete_speculative(Relation relation, TupleTableSlot *slot,`
`282`	`282`	`HeapTupletuple=ExecFetchSlotHeapTuple(slot, true,&shouldFree);`
`283`	`283`
`284`	`284`	`/* adjust the tuple's state accordingly */`
`285`		`-if (!succeeded)`
	`285`	`+if (succeeded)`
`286`	`286`	`heap_finish_speculative(relation,&slot->tts_tid);`
`287`	`287`	`else`
`288`	`288`	`heap_abort_speculative(relation,&slot->tts_tid);`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -556,7 +556,7 @@ ExecInsert(ModifyTableState *mtstate,`
`556`	`556`
`557`	`557`	`/* adjust the tuple's state accordingly */`
`558`	`558`	`table_complete_speculative(resultRelationDesc,slot,`
`559`		`-specToken,specConflict);`
	`559`	`+specToken,!specConflict);`
`560`	`560`
`561`	`561`	`/*`
`562`	`562`	`* Wake up anyone waiting for our decision. They will re-check`

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!

Commitaa4b8c6

File tree

2 files changed

2 files changed

`‎src/backend/access/heap/heapam_handler.c‎`

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

0 commit comments