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

fix wal kill case

This commit is contained in:
Minglei Jin 2022-07-17 14:27:13 +08:00
parent 24e40fcc39
commit 73e91f6491
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,7 +132,8 @@ int tdbBtreeOpen(int keyLen, int valLen, SPager *pPager, char const *tbname, SPg
} }
} }
tdbUnrefPage(pPage); // tdbUnrefPage(pPage);
tdbPCacheRelease(pPager->pCache, pPage, &txn);
tdbCommit(pPager->pEnv, &txn); tdbCommit(pPager->pEnv, &txn);
tdbTxnClose(&txn); tdbTxnClose(&txn);
} }

15
source/libs/tdb/src/db/tdbPager.c
View File

@ -474,7 +474,7 @@ int tdbPagerRestore(SPager *pPager, SBTree *pBt) {
} }
TXN txn; TXN txn;
tdbTxnOpen(&txn, 0, tdbDefaultMalloc, tdbDefaultFree, NULL, 0); tdbTxnOpen(&txn, 0, tdbDefaultMalloc, tdbDefaultFree, NULL, TDB_TXN_WRITE | TDB_TXN_READ_UNCOMMITTED);
SBtreeInitPageArg iArg; SBtreeInitPageArg iArg;
iArg.pBt = pBt; iArg.pBt = pBt;
iArg.flags = 0; iArg.flags = 0;
@ -494,6 +494,7 @@ int tdbPagerRestore(SPager *pPager, SBTree *pBt) {
return -1; return -1;
} }
/*
ret = tdbPagerFetchPage(pPager, &pgno, &pPage, tdbBtreeInitPage, &iArg, &txn); ret = tdbPagerFetchPage(pPager, &pgno, &pPage, tdbBtreeInitPage, &iArg, &txn);
if (ret < 0) { if (ret < 0) {
return -1; return -1;
@ -506,6 +507,18 @@ int tdbPagerRestore(SPager *pPager, SBTree *pBt) {
} }
tdbPCacheRelease(pPager->pCache, pPage, &txn); tdbPCacheRelease(pPager->pCache, pPage, &txn);
*/
i64 offset = pPager->pageSize * (pgno - 1);
if (tdbOsLSeek(pPager->fd, offset, SEEK_SET) < 0) {
ASSERT(0);
return -1;
}
ret = tdbOsWrite(pPager->fd, pageBuf, pPager->pageSize);
if (ret < 0) {
ASSERT(0);
return -1;
}
} }
tdbOsFSync(pPager->fd); tdbOsFSync(pPager->fd);