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

refact

This commit is contained in:
Hongze Cheng 2022-03-03 07:23:02 +00:00
parent e91147f8cf
commit 081677b2cc
3 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/libs/tdb/src/db/tdbDb.c
View File

@ -49,11 +49,16 @@ int tdbDbOpen(const char *fname, int keyLen, int valLen, FKeyComparator keyCmprF
ASSERT(pPager != NULL); ASSERT(pPager != NULL);
// Try to open the database
ret = tdbPagerOpenDB(pPager, &pgno, true); ret = tdbPagerOpenDB(pPager, &pgno, true);
if (ret < 0) { if (ret < 0) {
return -1; return -1;
} }
if (pgno == 0) {
// TODO: Try to create a new database
}
// pDb->pBt // pDb->pBt
ret = tdbBtreeOpen(pgno, keyLen, valLen, pPager, keyCmprFn, &(pDb->pBt)); ret = tdbBtreeOpen(pgno, keyLen, valLen, pPager, keyCmprFn, &(pDb->pBt));
if (ret < 0) { if (ret < 0) {

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

@ -243,3 +243,18 @@ static int tdbPagerReadPage(SPager *pPager, SPage *pPage) {
} }
int tdbPagerGetPageSize(SPager *pPager) { return pPager->pageSize; } int tdbPagerGetPageSize(SPager *pPager) { return pPager->pageSize; }
static void tdbPagerZeroPage(SPage *pPage, int flags) {
SPager *pPager;
pPager = pPage->pPager;
memset(pPage->pData, 0, pPager->pageSize);
pPage->pPageHdr = (SPageHdr *)(pPage->pData);
pPage->aCellIdx = (u16 *)(&(pPage->pPageHdr[1]));
/* TODO */
}
static int tdbPagerInitPage(SPage *pPage) {
// TODO
return 0;
}

14
source/libs/tdb/src/inc/tdbPager.h
View File

@ -20,14 +20,14 @@
extern "C" { extern "C" {
#endif #endif
int tdbPagerOpen(SPCache *pCache, const char *fileName, SPager **ppFile); int tdbPagerOpen(SPCache *pCache, const char *fileName, SPager **ppPager);
int tdbPagerClose(SPager *pFile); int tdbPagerClose(SPager *pPager);
int tdbPagerOpenDB(SPager *pFile, SPgno *ppgno, bool toCreate); int tdbPagerOpenDB(SPager *pPager, SPgno *ppgno, bool toCreate);
SPage *tdbPagerGet(SPager *pPager, SPgno pgno, bool toLoad); SPage *tdbPagerGet(SPager *pPager, SPgno pgno, bool toLoad);
int tdbPagerWrite(SPager *pFile, SPage *pPage); int tdbPagerWrite(SPager *pPager, SPage *pPage);
int tdbPagerAllocPage(SPager *pFile, SPage **ppPage, SPgno *ppgno); int tdbPagerAllocPage(SPager *pPager, SPage **ppPage, SPgno *ppgno);
int tdbPagerBegin(SPager *pFile); int tdbPagerBegin(SPager *pPager);
int tdbPagerCommit(SPager *pFile); int tdbPagerCommit(SPager *pPager);
int tdbPagerGetPageSize(SPager *pPager); int tdbPagerGetPageSize(SPager *pPager);
#ifdef __cplusplus #ifdef __cplusplus