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

adjust some code

This commit is contained in:
Hongze Cheng 2022-03-30 11:07:58 +00:00
parent 110703f9df
commit 4ecbe41d13
5 changed files with 42 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,7 +101,7 @@ int tdbBtreeOpen(int keyLen, int valLen, SPager *pPager, FKeyComparator kcmpr, S
// pBt->kcmpr // pBt->kcmpr
pBt->kcmpr = kcmpr ? kcmpr : tdbDefaultKeyCmprFn; pBt->kcmpr = kcmpr ? kcmpr : tdbDefaultKeyCmprFn;
// pBt->pageSize // pBt->pageSize
pBt->pageSize = tdbPagerGetPageSize(pPager); pBt->pageSize = pPager->pageSize;
// pBt->maxLocal // pBt->maxLocal
pBt->maxLocal = tdbPageCapacity(pBt->pageSize, sizeof(SIntHdr)) / 4; pBt->maxLocal = tdbPageCapacity(pBt->pageSize, sizeof(SIntHdr)) / 4;
// pBt->minLocal: Should not be allowed smaller than 15, which is [nPayload][nKey][nData] // pBt->minLocal: Should not be allowed smaller than 15, which is [nPayload][nKey][nData]

25
source/libs/tdb/src/db/tdbEnv.c
View File

@ -19,6 +19,7 @@ int tdbEnvOpen(const char *rootDir, int pageSize, int cacheSize, TENV **ppEnv) {
TENV *pEnv; TENV *pEnv;
int dsize; int dsize;
int zsize; int zsize;
int tsize;
u8 *pPtr; u8 *pPtr;
int ret; int ret;
@ -53,6 +54,14 @@ int tdbEnvOpen(const char *rootDir, int pageSize, int cacheSize, TENV **ppEnv) {
return -1; return -1;
} }
pEnv->nHash = 8;
tsize = sizeof(SPager *) * pEnv->nHash;
pEnv->pagerHash = TDB_REALLOC(pEnv->pagerHash, tsize);
if (pEnv->pagerHash == NULL) {
return -1;
}
memset(pEnv->pagerHash, 0, tsize);
mkdir(rootDir, 0755); mkdir(rootDir, 0755);
*ppEnv = pEnv; *ppEnv = pEnv;
@ -65,17 +74,23 @@ int tdbEnvClose(TENV *pEnv) {
} }
int tdbBegin(TENV *pEnv) { int tdbBegin(TENV *pEnv) {
// TODO ASSERT(0);
return 0; return 0;
} }
int tdbCommit(TENV *pEnv) { int tdbCommit(TENV *pEnv) {
// TODO SPager *pPager;
pPager = pEnv->pagerList;
while (pPager) {
tdbPagerCommit(pPager);
}
return 0; return 0;
} }
int tdbRollback(TENV *pEnv) { int tdbRollback(TENV *pEnv) {
// TODO ASSERT(0);
return 0; return 0;
} }
@ -83,3 +98,7 @@ SPager *tdbEnvGetPager(TENV *pEnv, const char *fname) {
// TODO // TODO
return NULL; return NULL;
} }
static void tdbEnvAddPager(TENV *pEnv, SPager *pPager) {
}

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

@ -15,20 +15,6 @@
#include "tdbInt.h" #include "tdbInt.h"
struct SPager {
char *dbFileName;
char *jFileName;
int pageSize;
uint8_t fid[TDB_FILE_ID_LEN];
tdb_fd_t fd;
tdb_fd_t jfd;
SPCache *pCache;
SPgno dbFileSize;
SPgno dbOrigSize;
SPage *pDirty;
u8 inTran;
};
typedef struct __attribute__((__packed__)) { typedef struct __attribute__((__packed__)) {
u8 hdrString[16]; u8 hdrString[16];
u16 pageSize; u16 pageSize;
@ -229,8 +215,6 @@ static int tdbPagerReadPage(SPager *pPager, SPage *pPage) {
return 0; return 0;
} }
int tdbPagerGetPageSize(SPager *pPager) { return pPager->pageSize; }
int tdbPagerFetchPage(SPager *pPager, SPgno pgno, SPage **ppPage, int (*initPage)(SPage *, void *), void *arg) { int tdbPagerFetchPage(SPager *pPager, SPgno pgno, SPage **ppPage, int (*initPage)(SPage *, void *), void *arg) {
SPage *pPage; SPage *pPage;
SPgid pgid; SPgid pgid;

5
source/libs/tdb/src/inc/tdbEnv.h
View File

@ -20,11 +20,16 @@
extern "C" { extern "C" {
#endif #endif
#define TDB_PAGER_ENV_FIELDS \
SPager *pNext; \
SPager *pHashNext;
typedef struct STEnv { typedef struct STEnv {
char *rootDir; char *rootDir;
char *jfname; char *jfname;
int jfd; int jfd;
SPCache *pCache; SPCache *pCache;
SPager *pagerList;
int nHash; int nHash;
SPager **pagerHash; SPager **pagerHash;
} TENV; } TENV;

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

@ -20,13 +20,26 @@
extern "C" { extern "C" {
#endif #endif
struct SPager {
char *dbFileName;
char *jFileName;
int pageSize;
uint8_t fid[TDB_FILE_ID_LEN];
tdb_fd_t fd;
tdb_fd_t jfd;
SPCache *pCache;
SPgno dbFileSize;
SPgno dbOrigSize;
SPage *pDirty;
u8 inTran;
};
int tdbPagerOpen(SPCache *pCache, const char *fileName, SPager **ppPager); int tdbPagerOpen(SPCache *pCache, const char *fileName, SPager **ppPager);
int tdbPagerClose(SPager *pPager); int tdbPagerClose(SPager *pPager);
int tdbPagerOpenDB(SPager *pPager, SPgno *ppgno, bool toCreate); int tdbPagerOpenDB(SPager *pPager, SPgno *ppgno, bool toCreate);
int tdbPagerWrite(SPager *pPager, SPage *pPage); int tdbPagerWrite(SPager *pPager, SPage *pPage);
int tdbPagerBegin(SPager *pPager); int tdbPagerBegin(SPager *pPager);
int tdbPagerCommit(SPager *pPager); int tdbPagerCommit(SPager *pPager);
int tdbPagerGetPageSize(SPager *pPager);
int tdbPagerFetchPage(SPager *pPager, SPgno pgno, SPage **ppPage, int (*initPage)(SPage *, void *), void *arg); int tdbPagerFetchPage(SPager *pPager, SPgno pgno, SPage **ppPage, int (*initPage)(SPage *, void *), void *arg);
int tdbPagerNewPage(SPager *pPager, SPgno *ppgno, SPage **ppPage, int (*initPage)(SPage *, void *), void *arg); int tdbPagerNewPage(SPager *pPager, SPgno *ppgno, SPage **ppPage, int (*initPage)(SPage *, void *), void *arg);
void tdbPagerReturnPage(SPager *pPager, SPage *pPage); void tdbPagerReturnPage(SPager *pPager, SPage *pPage);