Commitaeecdac

committed

Uncomment assert

1 parent1c1434b commitaeecdacCopy full SHA for aeecdac

File tree

-7

lines changed

-7

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -352,10 +352,10 @@ TransactionIdSetStatusBit(TransactionId xid, XidStatus status, XLogRecPtr lsn, i`
`352`	`352`	`* Current state change should be from 0 or subcommitted to target state`
`353`	`353`	`* or we should already be there when replaying changes during recovery.`
`354`	`354`	`*/`
`355`		`-/Assert(curval == 0 \|\| /`
`356`		`-/* (curval == TRANSACTION_STATUS_SUB_COMMITTED && */`
`357`		`-/status != TRANSACTION_STATUS_IN_PROGRESS) \|\| /`
`358`		`-/* curval == status); */`
	`355`	`+Assert(curval==0\|\|`
	`356`	`+ (curval==TRANSACTION_STATUS_SUB_COMMITTED&&`
	`357`	`+status!=TRANSACTION_STATUS_IN_PROGRESS)\|\|`
	`358`	`+curval==status);`
`359`	`359`
`360`	`360`	`/* note this assumes exclusive access to the clog page */`
`361`	`361`	`byteval=*byteptr;`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1543,9 +1543,9 @@ RecordTransactionAbort(bool isSubXact)`
`1543`	`1543`	`/*`
`1544`	`1544`	`* Check that we haven't aborted halfway through RecordTransactionCommit.`
`1545`	`1545`	`*/`
`1546`		`-/if (TransactionIdDidCommit(xid)) /`
`1547`		`-/elog(PANIC, "cannot abort transaction %u, it was already committed", /`
`1548`		`-/* xid); */`
	`1546`	`+if (TransactionIdDidCommit(xid))`
	`1547`	`+elog(PANIC,"cannot abort transaction %u, it was already committed",`
	`1548`	`+xid);`
`1549`	`1549`
`1550`	`1550`	`/* Fetch the data we need for the abort record */`
`1551`	`1551`	`nrels=smgrGetPendingDeletes(false,&rels);`

Comments

(0)