database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-23 14:01:44 +03:00
Code Activity

Further cleanup of ReorderBufferCommit().

Browse Source 
On closer inspection, we can remove the "volatile" qualifier on
"using_subtxn" so long as we initialize that before the PG_TRY block,
which there's no particularly good reason not to do.
Also, push the "change" variable inside the PG_TRY so as to remove
all question of whether it needs "volatile", and remove useless
early initializations of "snapshow_now" and "using_subtxn".
This commit is contained in:
Tom Lane
2015-01-25 22:49:56 -05:00
parent bf007a27ac
commit c70f9e8988
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/backend/replication/logical/reorderbuffer.c
View File

@ -1258,12 +1258,10 @@ ReorderBufferCommit(ReorderBuffer *rb, TransactionId xid,
TimestampTz commit_time) TimestampTz commit_time)
{ {
ReorderBufferTXN *txn; ReorderBufferTXN *txn;
ReorderBufferIterTXNState *volatile iterstate = NULL; volatile Snapshot snapshot_now;
ReorderBufferChange *change;
volatile CommandId command_id = FirstCommandId; volatile CommandId command_id = FirstCommandId;
volatile Snapshot snapshot_now = NULL; bool using_subtxn;
volatile bool using_subtxn = false; ReorderBufferIterTXNState *volatile iterstate = NULL;
txn = ReorderBufferTXNByXid(rb, xid, false, NULL, InvalidXLogRecPtr, txn = ReorderBufferTXNByXid(rb, xid, false, NULL, InvalidXLogRecPtr,
false); false);
@ -1301,19 +1299,21 @@ ReorderBufferCommit(ReorderBuffer *rb, TransactionId xid,
/* setup the initial snapshot */ /* setup the initial snapshot */
SetupHistoricSnapshot(snapshot_now, txn->tuplecid_hash); SetupHistoricSnapshot(snapshot_now, txn->tuplecid_hash);
/*
* Decoding needs access to syscaches et al., which in turn use
* heavyweight locks and such. Thus we need to have enough state around to
* keep track of those. The easiest way is to simply use a transaction
* internally. That also allows us to easily enforce that nothing writes
* to the database by checking for xid assignments.
*
* When we're called via the SQL SRF there's already a transaction
* started, so start an explicit subtransaction there.
*/
using_subtxn = IsTransactionOrTransactionBlock();
PG_TRY(); PG_TRY();
{ {
/* ReorderBufferChange *change;
* Decoding needs access to syscaches et al., which in turn use
* heavyweight locks and such. Thus we need to have enough state
* around to keep track of those. The easiest way is to simply use a
* transaction internally. That also allows us to easily enforce that
* nothing writes to the database by checking for xid assignments.
*
* When we're called via the SQL SRF there's already a transaction
* started, so start an explicit subtransaction there.
*/
using_subtxn = IsTransactionOrTransactionBlock();
if (using_subtxn) if (using_subtxn)
BeginInternalSubTransaction("replay"); BeginInternalSubTransaction("replay");
@ -1323,7 +1323,7 @@ ReorderBufferCommit(ReorderBuffer *rb, TransactionId xid,
rb->begin(rb, txn); rb->begin(rb, txn);
iterstate = ReorderBufferIterTXNInit(rb, txn); iterstate = ReorderBufferIterTXNInit(rb, txn);
while ((change = ReorderBufferIterTXNNext(rb, iterstate))) while ((change = ReorderBufferIterTXNNext(rb, iterstate)) != NULL)
{ {
Relation relation = NULL; Relation relation = NULL;
Oid reloid; Oid reloid;