Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Added VIO prefix as requested by Adriano #11

Merged
merged 1 commit into from
Mar 29, 2016
Merged

Added VIO prefix as requested by Adriano #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/jrd/tra.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3994,7 +3994,7 @@ void VerbAction::garbage_collect_idx_lite(thread_db* tdbb, jrd_tra* transaction,
*
* Functional description
* Clean up index entries and referenced BLOBs.
* This routine uses smaller set of staying record than original garbage_collect_idx().
* This routine uses smaller set of staying record than original VIO_garbage_collect_idx().
*
* Notes:
*
Expand Down Expand Up @@ -4208,11 +4208,11 @@ void VerbAction::undo(thread_db* tdbb, jrd_tra* transaction)
new_rpb.rpb_flags = 0;
Record* dead_record = rpb.rpb_record;
// This record will be in staying list twice. Ignorable overhead.
update_in_place(tdbb, transaction, &rpb, &new_rpb);
VIO_update_in_place(tdbb, transaction, &rpb, &new_rpb);
if (dead_record)
{
rpb.rpb_record = NULL; // garbage_collect_idx will play with this record dirty tricks
garbage_collect_idx(tdbb, transaction, &rpb, dead_record);
rpb.rpb_record = NULL; // VIO_garbage_collect_idx will play with this record dirty tricks
VIO_garbage_collect_idx(tdbb, transaction, &rpb, dead_record);
}
rpb.rpb_record = save_record;
}
Expand Down
10 changes: 5 additions & 5 deletions src/jrd/vio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1824,7 +1824,7 @@ void VIO_erase(thread_db* tdbb, record_param* rpb, jrd_tra* transaction)

if (rpb->rpb_transaction_nr == transaction->tra_number)
{
update_in_place(tdbb, transaction, rpb, &temp);
VIO_update_in_place(tdbb, transaction, rpb, &temp);
if (transaction->tra_save_point && transaction->tra_save_point->sav_verb_count)
{
verb_post(tdbb, transaction, rpb, rpb->rpb_undo);
Expand Down Expand Up @@ -2462,7 +2462,7 @@ void VIO_modify(thread_db* tdbb, record_param* org_rpb, record_param* new_rpb, j

if (transaction->tra_flags & TRA_system)
{
update_in_place(tdbb, transaction, org_rpb, new_rpb);
VIO_update_in_place(tdbb, transaction, org_rpb, new_rpb);
tdbb->bumpRelStats(RuntimeStatistics::RECORD_UPDATES, relation->rel_id);
return;
}
Expand Down Expand Up @@ -2815,7 +2815,7 @@ void VIO_modify(thread_db* tdbb, record_param* org_rpb, record_param* new_rpb, j
org_rpb->rpb_format_number == new_rpb->rpb_format_number)
{
IDX_modify_flag_uk_modified(tdbb, org_rpb, new_rpb, transaction);
update_in_place(tdbb, transaction, org_rpb, new_rpb);
VIO_update_in_place(tdbb, transaction, org_rpb, new_rpb);
if (!(transaction->tra_flags & TRA_system) &&
transaction->tra_save_point && transaction->tra_save_point->sav_verb_count)
{
Expand Down Expand Up @@ -4347,7 +4347,7 @@ static void garbage_collect(thread_db* tdbb, record_param* rpb, ULONG prior_page
clearRecordStack(going);
}

void garbage_collect_idx(thread_db* tdbb, jrd_tra* transaction,
void VIO_garbage_collect_idx(thread_db* tdbb, jrd_tra* transaction,
record_param* org_rpb,
Record* old_data)
{
Expand Down Expand Up @@ -5773,7 +5773,7 @@ static void set_system_flag(thread_db* tdbb, Record* record, USHORT field_id)
}


void update_in_place(thread_db* tdbb,
void VIO_update_in_place(thread_db* tdbb,
jrd_tra* transaction, record_param* org_rpb, record_param* new_rpb)
{
/**************************************
Expand Down
4 changes: 2 additions & 2 deletions src/jrd/vio_proto.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ void VIO_store(Jrd::thread_db*, Jrd::record_param*, Jrd::jrd_tra*);
bool VIO_sweep(Jrd::thread_db*, Jrd::jrd_tra*, Jrd::TraceSweepEvent*);
void VIO_verb_cleanup(Jrd::thread_db*, Jrd::jrd_tra*);
void VIO_temp_cleanup(Jrd::jrd_tra*);
void garbage_collect_idx(Jrd::thread_db*, Jrd::jrd_tra*, Jrd::record_param*, Jrd::Record*);
void update_in_place(Jrd::thread_db*, Jrd::jrd_tra*, Jrd::record_param*, Jrd::record_param*);
void VIO_garbage_collect_idx(Jrd::thread_db*, Jrd::jrd_tra*, Jrd::record_param*, Jrd::Record*);
void VIO_update_in_place(Jrd::thread_db*, Jrd::jrd_tra*, Jrd::record_param*, Jrd::record_param*);

namespace Jrd
{
Expand Down