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

If rpb_incomplete flag is cleared, clear rpb_large flag as well

Browse Source
This commit is contained in:
Ilya Eremin 2023-07-05 14:41:25 +03:00
parent b44a4a9497
commit 2508339ea5
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jrd/dpm.epp
View File

@ -2312,6 +2312,8 @@ void DPM_update( thread_db* tdbb, record_param* rpb, PageStack* stack, const jrd
Database* dbb = tdbb->getDatabase(); Database* dbb = tdbb->getDatabase();
CHECK_DBB(dbb); CHECK_DBB(dbb);
rpb->rpb_flags &= ~(rpb_fragment | rpb_incomplete | rpb_large | rpb_chained | rpb_gc_active | rpb_long_tranum);
#ifdef VIO_DEBUG #ifdef VIO_DEBUG
jrd_rel* relation = rpb->rpb_relation; jrd_rel* relation = rpb->rpb_relation;
VIO_trace(DEBUG_WRITES, VIO_trace(DEBUG_WRITES,
@ -2581,6 +2583,7 @@ static void delete_tail(thread_db* tdbb, rhdf* header, const USHORT page_space,
{ {
USHORT flags = header->rhdf_flags; USHORT flags = header->rhdf_flags;
ULONG page_number = header->rhdf_f_page; ULONG page_number = header->rhdf_f_page;
fb_assert(flags & rhd_incomplete);
while (flags & rhd_incomplete) while (flags & rhd_incomplete)
{ {
@ -2597,7 +2600,10 @@ static void delete_tail(thread_db* tdbb, rhdf* header, const USHORT page_space,
PAG_release_page(tdbb, window.win_page, ZERO_PAGE_NUMBER); PAG_release_page(tdbb, window.win_page, ZERO_PAGE_NUMBER);
} }
else else
{
fb_assert(false);
break; break;
}
} }
return; return;
} }

3
src/jrd/vio.cpp
View File

@ -1093,8 +1093,6 @@ void VIO_backout(thread_db* tdbb, record_param* rpb, const jrd_tra* transaction)
else else
{ {
// There is cleanup to be done. Bring the old version forward first // There is cleanup to be done. Bring the old version forward first
rpb->rpb_flags &= ~(rpb_fragment | rpb_incomplete | rpb_chained | rpb_gc_active | rpb_long_tranum);
DPM_update(tdbb, rpb, 0, transaction); DPM_update(tdbb, rpb, 0, transaction);
delete_tail(tdbb, &temp2, rpb->rpb_page); delete_tail(tdbb, &temp2, rpb->rpb_page);
} }
@ -6530,7 +6528,6 @@ static void replace_record(thread_db* tdbb,
#endif #endif
record_param temp = *rpb; record_param temp = *rpb;
rpb->rpb_flags &= ~(rpb_fragment | rpb_incomplete | rpb_chained | rpb_gc_active | rpb_long_tranum);
DPM_update(tdbb, rpb, stack, transaction); DPM_update(tdbb, rpb, stack, transaction);
delete_tail(tdbb, &temp, rpb->rpb_page); delete_tail(tdbb, &temp, rpb->rpb_page);