diff --git a/src/jrd/tra.cpp b/src/jrd/tra.cpp index 79846cfb98a..b85b4756071 100644 --- a/src/jrd/tra.cpp +++ b/src/jrd/tra.cpp @@ -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: * @@ -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; } diff --git a/src/jrd/vio.cpp b/src/jrd/vio.cpp index 4359ffa2966..115142ea435 100644 --- a/src/jrd/vio.cpp +++ b/src/jrd/vio.cpp @@ -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); @@ -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; } @@ -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) { @@ -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) { @@ -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) { /************************************** diff --git a/src/jrd/vio_proto.h b/src/jrd/vio_proto.h index 5520fe46848..ce6a9b9e12d 100644 --- a/src/jrd/vio_proto.h +++ b/src/jrd/vio_proto.h @@ -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 {