From 18e6c2fc12dff667abef221f1f928ab1ea905b2e Mon Sep 17 00:00:00 2001 From: hvlad Date: Fri, 30 Aug 2019 15:03:11 +0300 Subject: [PATCH] Style --- src/dsql/dsql.cpp | 6 ++++-- src/jrd/Savepoint.cpp | 3 ++- src/jrd/vio.cpp | 9 ++++++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/dsql/dsql.cpp b/src/dsql/dsql.cpp index 362ebba4ea..61ad594c8a 100644 --- a/src/dsql/dsql.cpp +++ b/src/dsql/dsql.cpp @@ -792,7 +792,8 @@ void DsqlDmlRequest::doExecute(thread_db* tdbb, jrd_tra** traHandle, else { // Prefetch first row of a query - if (reqTypeWithCursor(statement->getType())) { + if (reqTypeWithCursor(statement->getType())) + { dsql_msg* message = (dsql_msg*) statement->getReceiveMsg(); 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)) break; 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"); ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-913) << Arg::Gds(isc_deadlock) << diff --git a/src/jrd/Savepoint.cpp b/src/jrd/Savepoint.cpp index 02aecc1b88..1bb90eb997 100644 --- a/src/jrd/Savepoint.cpp +++ b/src/jrd/Savepoint.cpp @@ -268,7 +268,8 @@ void VerbAction::undo(thread_db* tdbb, jrd_tra* transaction, bool preserveLocks) 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 record_param temp = rpb; temp.rpb_page = rpb.rpb_b_page; diff --git a/src/jrd/vio.cpp b/src/jrd/vio.cpp index e6fef4a78d..dc562f5590 100644 --- a/src/jrd/vio.cpp +++ b/src/jrd/vio.cpp @@ -1918,7 +1918,8 @@ bool VIO_erase(thread_db* tdbb, record_param* rpb, jrd_tra* transaction) Arg::Gds(isc_update_conflict) << 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; top_request->req_flags |= req_update_conflict; 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_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; top_request->req_flags |= req_update_conflict; 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_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; top_request->req_flags |= req_update_conflict; top_request->req_conflict_txn = org_rpb->rpb_transaction_nr;