Commit867540b

committed

Ensure backwards compatibility for GetStableLatestTransactionId()

1 parentafe86a9 commit867540bCopy full SHA for 867540b

File tree

-6

lines changed

-6

lines changed

Lines changed: 8 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -390,11 +390,10 @@ GetCurrentTransactionIdIfAny(void)`
`390`	`390`	`returnCurrentTransactionState->transactionId;`
`391`	`391`	`}`
`392`	`392`
`393`		`-`
`394`	`393`	`/*`
`395`		`- *GetStableLatestTransactionIdIfAny`
	`394`	`+ *GetStableLatestTransactionId`
`396`	`395`	`*`
`397`		`- * Get thelatestXID once and then return same value for rest of transaction.`
	`396`	`+ * Get the XID once and then return same value for rest of transaction.`
`398`	`397`	`* Acts as a useful reference point for maintenance tasks.`
`399`	`398`	`*/`
`400`	`399`	`TransactionId`
`@@ -403,13 +402,16 @@ GetStableLatestTransactionId(void)`
`403`	`402`	`staticLocalTransactionIdlxid=InvalidLocalTransactionId;`
`404`	`403`	`staticTransactionIdstablexid=InvalidTransactionId;`
`405`	`404`
`406`		`-if (lxid!=MyProc->lxid\|\|`
`407`		`-!TransactionIdIsValid(stablexid))`
	`405`	`+if (lxid!=MyProc->lxid)`
`408`	`406`	`{`
`409`	`407`	`lxid=MyProc->lxid;`
`410`		`-stablexid=ReadNewTransactionId();`
	`408`	`+stablexid=GetTopTransactionIdIfAny();`
	`409`	`+if (!TransactionIdIsValid(stablexid))`
	`410`	`+stablexid=ReadNewTransactionId();`
`411`	`411`	`}`
`412`	`412`
	`413`	`+Assert(TransactionIdIsValid(stablexid));`
	`414`	`+`
`413`	`415`	`returnstablexid;`
`414`	`416`	`}`
`415`	`417`

Comments

(0)