firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-02-02 10:00:38 +01:00
Code Issues

Fixed code formatting accidentally broken by my recent commit

Browse Source
This commit is contained in:
hvlad 2016-04-08 23:11:06 +03:00
parent e8f21f7e63
commit 3f06ba27c2
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/jrd/tra.cpp
View File

@ -403,7 +403,7 @@ void TRA_commit(thread_db* tdbb, jrd_tra* transaction, const bool retaining_flag
while (transaction->tra_save_point)
{
transaction->rollforwardSavepoint(tdbb);
}
}
transaction_flush(tdbb, FLUSH_TRAN, transaction->tra_number);
}
@ -748,7 +748,7 @@ void TRA_invalidate(thread_db* tdbb, ULONG mask)
Jrd::Attachment::SyncGuard attGuard(attachment, FB_FUNCTION);
for (jrd_tra* transaction = attachment->att_transactions; transaction;
transaction = transaction->tra_next)
transaction = transaction->tra_next)
{
const ULONG transaction_mask = 1L << (transaction->tra_number & (BITS_PER_LONG - 1));
if ((transaction_mask & mask) && (transaction->tra_flags & TRA_write))
@ -1221,7 +1221,7 @@ void TRA_release_transaction(thread_db* tdbb, jrd_tra* transaction, Jrd::TraceTr
if (relation && (relation->rel_flags & REL_temp_tran))
relation->delPages(tdbb, transaction->tra_number);
}
}
} // end scope
@ -1336,33 +1336,33 @@ void TRA_rollback(thread_db* tdbb, jrd_tra* transaction, const bool retaining_fl
// the transaction as dead.
try
{
{
// Release all user savepoints except transaction one
// It will clean up blob ids and temporary space anyway but faster than rollback
// because record data won't be updated with intermediate versions
while (transaction->tra_save_point && !(transaction->tra_save_point->sav_flags & SAV_trans_level))
{
{
transaction->rollforwardSavepoint(tdbb);
}
}
if (transaction->tra_save_point) // we still can use undo log for rollback, it wasn't reset because of no_auto_undo flag or size
{
// In an attempt to avoid deadlocks, clear the precedence by writing
// all dirty buffers for this transaction.
if (transaction->tra_flags & TRA_write)
{
// In an attempt to avoid deadlocks, clear the precedence by writing
// all dirty buffers for this transaction.
if (transaction->tra_flags & TRA_write)
{
transaction_flush(tdbb, FLUSH_TRAN, transaction->tra_number);
transaction->rollbackSavepoint(tdbb);
transaction_flush(tdbb, FLUSH_TRAN, transaction->tra_number);
}
else
}
else
transaction->rollbackSavepoint(tdbb);
// All changes are undone, so we may mark the transaction
// as committed
state = tra_committed;
}
// All changes are undone, so we may mark the transaction
// as committed
state = tra_committed;
}
}
catch (const Firebird::Exception&)
{
@ -1747,7 +1747,7 @@ void TRA_sweep(thread_db* tdbb)
int oldest_state = 0;
const TraNumber oldest_limbo =
TPC_find_states(tdbb, transaction->tra_oldest, transaction->tra_top - 1,
1 << tra_limbo, oldest_state);
1 << tra_limbo, oldest_state);
const TraNumber active = oldest_limbo ? oldest_limbo : transaction->tra_top;
@ -2333,11 +2333,11 @@ static void restart_requests(thread_db* tdbb, jrd_tra* trans)
if (request && request->req_transaction)
{
EXE_unwind(tdbb, request);
EXE_start(tdbb, request, trans);
}
}
EXE_unwind(tdbb, request);
EXE_start(tdbb, request, trans);
}
}
}
}
@ -2449,8 +2449,8 @@ static void retain_context(thread_db* tdbb, jrd_tra* transaction, bool commit, i
if (!transaction->tra_save_point && !(transaction->tra_flags & TRA_no_auto_undo))
{
VIO_start_save_point(tdbb, transaction); // start new savepoint if necessary
transaction->tra_save_point->sav_flags |= SAV_trans_level;
}
transaction->tra_save_point->sav_flags |= SAV_trans_level;
}
if (transaction->tra_flags & TRA_precommitted)
{
@ -2502,9 +2502,9 @@ static void start_sweeper(thread_db* tdbb)
}
catch (const Firebird::Exception& ex)
{
gds__free(database);
gds__free(database);
iscLogException("cannot start sweep thread", ex);
}
}
}
else
{