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-02 07:49:42 +00:00
parent 41bce71cb8
commit a95d66907a
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,7 @@ struct SBTree {
SPgno root; SPgno root;
int keyLen; int keyLen;
int valLen; int valLen;
SPager * pFile; SPager * pPager;
FKeyComparator kcmpr; FKeyComparator kcmpr;
}; };
@ -52,7 +52,7 @@ static int tdbInitBtPage(SPage *pPage, SBtPage **ppBtPage);
static int tdbCompareKeyAndCell(const void *pKey, int kLen, const void *pCell); static int tdbCompareKeyAndCell(const void *pKey, int kLen, const void *pCell);
static int tdbDefaultKeyCmprFn(const void *pKey1, int keyLen1, const void *pKey2, int keyLen2); static int tdbDefaultKeyCmprFn(const void *pKey1, int keyLen1, const void *pKey2, int keyLen2);
int tdbBtreeOpen(SPgno rtPgno, int keyLen, int valLen, SPager *pFile, FKeyComparator kcmpr, SBTree **ppBt) { int tdbBtreeOpen(SPgno rtPgno, int keyLen, int valLen, SPager *pPager, FKeyComparator kcmpr, SBTree **ppBt) {
SBTree *pBt; SBTree *pBt;
*ppBt = NULL; *ppBt = NULL;
@ -68,8 +68,8 @@ int tdbBtreeOpen(SPgno rtPgno, int keyLen, int valLen, SPager *pFile, FKeyCompar
pBt->keyLen = keyLen; pBt->keyLen = keyLen;
// pBt->valLen // pBt->valLen
pBt->valLen = valLen; pBt->valLen = valLen;
// pBt->pFile // pBt->pPager
pBt->pFile = pFile; pBt->pPager = pPager;
// pBt->kcmpr // pBt->kcmpr
pBt->kcmpr = kcmpr ? kcmpr : tdbDefaultKeyCmprFn; pBt->kcmpr = kcmpr ? kcmpr : tdbDefaultKeyCmprFn;
@ -93,7 +93,7 @@ int tdbBtreeCursor(SBtCursor *pCur, SBTree *pBt) {
int tdbBtCursorInsert(SBtCursor *pCur, const void *pKey, int kLen, const void *pVal, int vLen) { int tdbBtCursorInsert(SBtCursor *pCur, const void *pKey, int kLen, const void *pVal, int vLen) {
int ret; int ret;
SPager * pFile; SPager * pPager;
SBtPage *pPage; SBtPage *pPage;
ret = tdbBtCursorMoveTo(pCur, pKey, kLen); ret = tdbBtCursorMoveTo(pCur, pKey, kLen);
@ -203,15 +203,15 @@ static int tdbEncodeLength(u8 *pBuf, uint len) {
static int tdbBtCursorMoveToRoot(SBtCursor *pCur) { static int tdbBtCursorMoveToRoot(SBtCursor *pCur) {
SBTree * pBt; SBTree * pBt;
SPager * pFile; SPager * pPager;
SPage * pPage; SPage * pPage;
SBtPage *pBtPage; SBtPage *pBtPage;
int ret; int ret;
pBt = pCur->pBt; pBt = pCur->pBt;
pFile = pBt->pFile; pPager = pBt->pPager;
pPage = tdbPagerGet(pFile, pBt->root); pPage = tdbPagerGet(pPager, pBt->root);
if (pPage == NULL) { if (pPage == NULL) {
// TODO: handle error // TODO: handle error
} }

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

@ -22,7 +22,7 @@ struct STDb {
int tdbDbOpen(const char *fname, int keyLen, int valLen, FKeyComparator keyCmprFn, STEnv *pEnv, STDb **ppDb) { int tdbDbOpen(const char *fname, int keyLen, int valLen, FKeyComparator keyCmprFn, STEnv *pEnv, STDb **ppDb) {
STDb * pDb; STDb * pDb;
SPager *pFile; SPager *pPager;
int ret; int ret;
char fFullName[TDB_FILENAME_LEN]; char fFullName[TDB_FILENAME_LEN];
SPage * pPage; SPage * pPage;
@ -38,24 +38,24 @@ int tdbDbOpen(const char *fname, int keyLen, int valLen, FKeyComparator keyCmprF
// pDb->pEnv // pDb->pEnv
pDb->pEnv = pEnv; pDb->pEnv = pEnv;
pFile = tdbEnvGetPager(pEnv, fname); pPager = tdbEnvGetPager(pEnv, fname);
if (pFile == NULL) { if (pPager == NULL) {
snprintf(fFullName, TDB_FILENAME_LEN, "%s/%s", pEnv->rootDir, fname); snprintf(fFullName, TDB_FILENAME_LEN, "%s/%s", pEnv->rootDir, fname);
ret = tdbPagerOpen(pEnv->pCache, fFullName, &pFile); ret = tdbPagerOpen(pEnv->pCache, fFullName, &pPager);
if (ret < 0) { if (ret < 0) {
return -1; return -1;
} }
} }
ASSERT(pFile != NULL); ASSERT(pPager != NULL);
ret = tdbPagerOpenDB(pFile, &pgno, true); ret = tdbPagerOpenDB(pPager, &pgno, true);
if (ret < 0) { if (ret < 0) {
return -1; return -1;
} }
// pDb->pBt // pDb->pBt
ret = tdbBtreeOpen(pgno, keyLen, valLen, pFile, keyCmprFn, &(pDb->pBt)); ret = tdbBtreeOpen(pgno, keyLen, valLen, pPager, keyCmprFn, &(pDb->pBt));
if (ret < 0) { if (ret < 0) {
return -1; return -1;
} }
@ -75,9 +75,9 @@ int tdbDbDrop(STDb *pDb) {
} }
int tdbDbInsert(STDb *pDb, const void *pKey, int keyLen, const void *pVal, int valLen) { int tdbDbInsert(STDb *pDb, const void *pKey, int keyLen, const void *pVal, int valLen) {
SBtCursor btc; SBtCursor btc;
SBtCursor *pCur; SBtCursor *pCur;
int ret; int ret;
pCur = &btc; pCur = &btc;
ret = tdbBtreeCursor(pCur, pDb->pBt); ret = tdbBtreeCursor(pCur, pDb->pBt);