xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix page lock problem

This commit is contained in:
Hongze Cheng 2022-03-04 07:31:34 +00:00
parent 139b9b7323
commit c479c85a88
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/libs/tdb/src/db/tdbBtree.c
View File

@ -284,7 +284,7 @@ static int tdbBtreeOpenImpl(SBTree *pBt) {
int ret; int ret;
{ {
// TODO: Search the main DB to check if the DB exists // 1. TODO: Search the main DB to check if the DB exists
pgno = 0; pgno = 0;
} }
@ -294,13 +294,16 @@ static int tdbBtreeOpenImpl(SBTree *pBt) {
} }
// Try to create a new database // Try to create a new database
// ret = tdbPagerNewPage(pBt->pPager, &pgno, &pPage); SBtreeZeroPageArg zArg = {.flags = TDB_BTREE_ROOT | TDB_BTREE_LEAF, .pBt = pBt};
// if (ret < 0) { ret = tdbPagerNewPage(pBt->pPager, &pgno, &pPage, tdbBtreeZeroPage, &zArg);
// return -1; if (ret < 0) {
// } return -1;
}
// ASSERT(pgno != 0); // TODO: Unref the page
// pBt->root = pgno;
ASSERT(pgno != 0);
pBt->root = pgno;
return 0; return 0;
} }

1
source/libs/tdb/src/db/tdbPCache.c
View File

@ -235,6 +235,7 @@ static int tdbPCacheOpenImpl(SPCache *pCache) {
} }
pPage = (SPage *)(&(pPtr[pCache->pageSize])); pPage = (SPage *)(&(pPtr[pCache->pageSize]));
TDB_INIT_PAGE_LOCK(pPage);
pPage->pData = (void *)pPtr; pPage->pData = (void *)pPtr;
// pPage->pgid = 0; // pPage->pgid = 0;
pPage->isAnchor = 0; pPage->isAnchor = 0;