firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 06:43:04 +01:00
Code Issues

Rollback my optimization as being no longer necessary

Browse Source
This commit is contained in:
Dmitry Yemanov 2020-09-25 13:26:16 +03:00
parent f78e801bc2
commit 0b0a23f053
1 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/jrd/replication/Replicator.cpp
View File

@ -157,32 +157,23 @@ bool Replicator::commitTransaction(Transaction* transaction)
auto& txnData = transaction->getData();
// Do not replicate this transaction if it's de-facto read-only.
// If there were no flushes yet and the buffer contains just one tag
// (this should be opStartTransaction), it means nothing was changed.
// Assert this transaction being de-facto dirty
const auto dataLength = txnData.buffer->getCount() - sizeof(Block);
fb_assert(txnData.flushes || dataLength > sizeof(UCHAR));
if (txnData.flushes || dataLength > sizeof(UCHAR))
for (const auto& generator : m_generators)
{
for (const auto& generator : m_generators)
{
fb_assert(generator.name.hasData());
fb_assert(generator.name.hasData());
txnData.putTag(opSetSequence);
txnData.putMetaName(generator.name.c_str());
txnData.putBigInt(generator.value);
}
m_generators.clear();
txnData.putTag(opCommitTransaction);
flush(txnData, FLUSH_SYNC, BLOCK_END_TRANS);
}
else
{
fb_assert((*txnData.buffer)[sizeof(Block)] == opStartTransaction);
txnData.putTag(opSetSequence);
txnData.putMetaName(generator.name.c_str());
txnData.putBigInt(generator.value);
}
m_generators.clear();
txnData.putTag(opCommitTransaction);
flush(txnData, FLUSH_SYNC, BLOCK_END_TRANS);
}
catch (const Exception& ex)
{
@ -206,10 +197,6 @@ bool Replicator::rollbackTransaction(Transaction* transaction)
txnData.putTag(opRollbackTransaction);
flush(txnData, FLUSH_SYNC, BLOCK_END_TRANS);
}
else
{
fb_assert((*txnData.buffer)[sizeof(Block)] == opStartTransaction);
}
}
catch (const Exception& ex)
{