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

Merge pull request #7737 from red-soft-ru/5_0_blob_precedence_fixes

Browse Source 
Fix cases where the precedence relationship between a record page and a blob page is not set
This commit is contained in:
Ilya Eremin 2023-09-06 16:21:28 +03:00 committed by GitHub
commit 4560aad1a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/jrd/blb.cpp
View File

@ -448,6 +448,7 @@ void BLB_garbage_collect(thread_db* tdbb,
**************************************/
SET_TDBB(tdbb);
fb_assert(prior_page > 0);
RecordBitmap bmGoing;
ULONG cntGoing = 0;

25
src/jrd/vio.cpp
View File

@ -2485,25 +2485,26 @@ static void delete_version_chain(thread_db* tdbb, record_param* rpb, bool delete
ULONG prior_page = 0;
if (!delete_head)
// Note that the page number of the oldest version in the chain should
// be stored in rpb->rpb_page before exiting this function because
// VIO_intermediate_gc will use it as a prior page number.
while (rpb->rpb_b_page != 0 || delete_head)
{
prior_page = rpb->rpb_page;
rpb->rpb_page = rpb->rpb_b_page;
rpb->rpb_line = rpb->rpb_b_line;
}
if (!delete_head)
{
prior_page = rpb->rpb_page;
rpb->rpb_page = rpb->rpb_b_page;
rpb->rpb_line = rpb->rpb_b_line;
}
else
delete_head = false;
while (rpb->rpb_page != 0)
{
if (!DPM_fetch(tdbb, rpb, LCK_write))
BUGCHECK(291); // msg 291 cannot find record back version
record_param temp_rpb = *rpb;
DPM_delete(tdbb, &temp_rpb, prior_page);
delete_tail(tdbb, &temp_rpb, temp_rpb.rpb_page);
prior_page = rpb->rpb_page;
rpb->rpb_page = rpb->rpb_b_page;
rpb->rpb_line = rpb->rpb_b_line;
}
}
@ -3678,6 +3679,8 @@ bool VIO_modify(thread_db* tdbb, record_param* org_rpb, record_param* new_rpb, j
org_rpb->rpb_flags &= ~(rpb_delta | rpb_uk_modified);
org_rpb->rpb_flags |= new_rpb->rpb_flags & (rpb_delta | rpb_uk_modified);
stack.merge(new_rpb->rpb_record->getPrecedence());
replace_record(tdbb, org_rpb, &stack, transaction);
if (!(transaction->tra_flags & TRA_system) &&