database/openGauss-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!6416 reinforce checkneedswitch

Browse Source 
Merge pull request !6416 from lyannaa/checkundozone
This commit is contained in:
opengauss_bot
2024-09-23 11:29:15 +00:00
committed by Gitee
parent 9c2ebd0872 eb38f83807
commit 58fe50409d
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gausskernel/storage/access/ubtree/ubtpage.cpp
View File

@ -869,6 +869,7 @@ static bool UBTreeMarkPageHalfDead(Relation rel, Buffer leafbuf, BTStack stack)
itemid = PageGetItemId(page, nextoffset);
itup = (IndexTuple) PageGetItem(page, itemid);
if (UBTreeTupleGetDownLink(itup) != rightsib) {
OffsetNumber topparentblkno = BufferGetBlockNumber(topparent);
_bt_relbuf(rel, topparent);
Buffer rbuf = _bt_getbuf(rel, rightsib, BT_READ);
Page rpage = BufferGetPage(rbuf);
@ -880,7 +881,7 @@ static bool UBTreeMarkPageHalfDead(Relation rel, Buffer leafbuf, BTStack stack)
}
elog(ERROR, "right sibling %u of block %u is not next child %u of block %u in index \"%s\"",
rightsib, target, UBTreeTupleGetDownLink(itup) != rightsib,
BufferGetBlockNumber(topparent), RelationGetRelationName(rel));
topparentblkno, RelationGetRelationName(rel));
}
/*

6
src/gausskernel/storage/access/ustore/undo/knl_uundoapi.cpp
View File

@ -56,10 +56,8 @@ bool CheckNeedSwitch(UndoPersistence upersistence)
if (uzone == NULL) {
ereport(PANIC, (errmsg("CheckNeedSwitch: uzone is NULL")));
}
if ((uint64)UNDO_PTR_GET_OFFSET(uzone->GetInsertURecPtr()) + UNDO_LOG_SEGMENT_SIZE > UNDO_LOG_MAX_SIZE) {
return true;
}
return false;
return uzone->CheckNeedSwitch();
}
void RollbackIfUndoExceeds(TransactionId xid, uint64 size)