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

Style

Browse Source
This commit is contained in:
hvlad 2019-08-30 15:03:11 +03:00
parent 043f7b2361
commit 18e6c2fc12
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dsql/dsql.cpp
View File

@ -792,7 +792,8 @@ void DsqlDmlRequest::doExecute(thread_db* tdbb, jrd_tra** traHandle,
else else
{ {
// Prefetch first row of a query // Prefetch first row of a query
if (reqTypeWithCursor(statement->getType())) { if (reqTypeWithCursor(statement->getType()))
{
dsql_msg* message = (dsql_msg*) statement->getReceiveMsg(); dsql_msg* message = (dsql_msg*) statement->getReceiveMsg();
UCHAR* dsqlMsgBuffer = req_msg_buffers[message->msg_buffer_number]; UCHAR* dsqlMsgBuffer = req_msg_buffers[message->msg_buffer_number];
@ -862,7 +863,8 @@ void DsqlDmlRequest::execute(thread_db* tdbb, jrd_tra** traHandle,
if (!(req_request->req_flags & req_update_conflict)) if (!(req_request->req_flags & req_update_conflict))
break; break;
req_request->req_flags &= ~req_update_conflict; req_request->req_flags &= ~req_update_conflict;
if (numTries >= 10) { if (numTries >= 10)
{
gds__log("Update conflict: unable to get a stable set of rows in the source tables"); gds__log("Update conflict: unable to get a stable set of rows in the source tables");
ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-913) << ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-913) <<
Arg::Gds(isc_deadlock) << Arg::Gds(isc_deadlock) <<

3
src/jrd/Savepoint.cpp
View File

@ -268,7 +268,8 @@ void VerbAction::undo(thread_db* tdbb, jrd_tra* transaction, bool preserveLocks)
if (!have_undo) if (!have_undo)
{ {
if (preserveLocks && rpb.rpb_b_page) { if (preserveLocks && rpb.rpb_b_page)
{
// Fetch previous record version and update in place current version with it // Fetch previous record version and update in place current version with it
record_param temp = rpb; record_param temp = rpb;
temp.rpb_page = rpb.rpb_b_page; temp.rpb_page = rpb.rpb_b_page;

9
src/jrd/vio.cpp
View File

@ -1918,7 +1918,8 @@ bool VIO_erase(thread_db* tdbb, record_param* rpb, jrd_tra* transaction)
Arg::Gds(isc_update_conflict) << Arg::Gds(isc_update_conflict) <<
Arg::Gds(isc_concurrent_transaction) << Arg::Num(rpb->rpb_transaction_nr)); Arg::Gds(isc_concurrent_transaction) << Arg::Num(rpb->rpb_transaction_nr));
} }
if (prepare_result) { if (prepare_result)
{
jrd_req* top_request = request->req_snapshot.m_owner; jrd_req* top_request = request->req_snapshot.m_owner;
top_request->req_flags |= req_update_conflict; top_request->req_flags |= req_update_conflict;
top_request->req_conflict_txn = rpb->rpb_transaction_nr; top_request->req_conflict_txn = rpb->rpb_transaction_nr;
@ -3222,7 +3223,8 @@ bool VIO_modify(thread_db* tdbb, record_param* org_rpb, record_param* new_rpb, j
Arg::Gds(isc_update_conflict) << Arg::Gds(isc_update_conflict) <<
Arg::Gds(isc_concurrent_transaction) << Arg::Num(org_rpb->rpb_transaction_nr)); Arg::Gds(isc_concurrent_transaction) << Arg::Num(org_rpb->rpb_transaction_nr));
} }
if (prepare_result) { if (prepare_result)
{
jrd_req* top_request = tdbb->getRequest()->req_snapshot.m_owner; jrd_req* top_request = tdbb->getRequest()->req_snapshot.m_owner;
top_request->req_flags |= req_update_conflict; top_request->req_flags |= req_update_conflict;
top_request->req_conflict_txn = org_rpb->rpb_transaction_nr; top_request->req_conflict_txn = org_rpb->rpb_transaction_nr;
@ -4080,7 +4082,8 @@ bool VIO_writelock(thread_db* tdbb, record_param* org_rpb, jrd_tra* transaction)
{ {
case PREPARE_CONFLICT: case PREPARE_CONFLICT:
case PREPARE_DELETE: case PREPARE_DELETE:
if ((transaction->tra_flags & TRA_read_consistency)) { if ((transaction->tra_flags & TRA_read_consistency))
{
jrd_req* top_request = tdbb->getRequest()->req_snapshot.m_owner; jrd_req* top_request = tdbb->getRequest()->req_snapshot.m_owner;
top_request->req_flags |= req_update_conflict; top_request->req_flags |= req_update_conflict;
top_request->req_conflict_txn = org_rpb->rpb_transaction_nr; top_request->req_conflict_txn = org_rpb->rpb_transaction_nr;