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

refact TDB

This commit is contained in:
Hongze Cheng 2022-05-18 12:05:39 +00:00
parent fba964778b
commit bad77f8e84
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/libs/tdb/inc/tdb.h
View File

@ -31,13 +31,13 @@ typedef struct STBC TBC;
typedef struct STxn TXN; typedef struct STxn TXN;
// TDB // TDB
int tdbOpen(const char *rootDir, int szPage, int pages, TDB **ppDb); int tdbOpen(const char *dbname, int szPage, int pages, TDB **ppDb);
int tdbClose(TDB *pDb); int tdbClose(TDB *pDb);
int tdbBegin(TDB *pDb, TXN *pTxn); int tdbBegin(TDB *pDb, TXN *pTxn);
int tdbCommit(TDB *pDb, TXN *pTxn); int tdbCommit(TDB *pDb, TXN *pTxn);
// TTB // TTB
int tdbTbOpen(const char *fname, int keyLen, int valLen, tdb_cmpr_fn_t keyCmprFn, TDB *pEnv, TTB **ppTb); int tdbTbOpen(const char *tbname, int keyLen, int valLen, tdb_cmpr_fn_t keyCmprFn, TDB *pEnv, TTB **ppTb);
int tdbTbClose(TTB *pTb); int tdbTbClose(TTB *pTb);
int tdbTbDrop(TTB *pTb); int tdbTbDrop(TTB *pTb);
int tdbTbInsert(TTB *pTb, const void *pKey, int keyLen, const void *pVal, int valLen, TXN *pTxn); int tdbTbInsert(TTB *pTb, const void *pKey, int keyLen, const void *pVal, int valLen, TXN *pTxn);

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

@ -15,7 +15,7 @@
#include "tdbInt.h" #include "tdbInt.h"
int tdbOpen(const char *rootDir, int szPage, int pages, TDB **ppDb) { int tdbOpen(const char *dbname, int szPage, int pages, TDB **ppDb) {
TDB *pDb; TDB *pDb;
int dsize; int dsize;
int zsize; int zsize;
@ -25,7 +25,7 @@ int tdbOpen(const char *rootDir, int szPage, int pages, TDB **ppDb) {
*ppDb = NULL; *ppDb = NULL;
dsize = strlen(rootDir); dsize = strlen(dbname);
zsize = sizeof(*pDb) + dsize * 2 + strlen(TDB_JOURNAL_NAME) + 3; zsize = sizeof(*pDb) + dsize * 2 + strlen(TDB_JOURNAL_NAME) + 3;
pPtr = (uint8_t *)tdbOsCalloc(1, zsize); pPtr = (uint8_t *)tdbOsCalloc(1, zsize);
@ -37,12 +37,12 @@ int tdbOpen(const char *rootDir, int szPage, int pages, TDB **ppDb) {
pPtr += sizeof(*pDb); pPtr += sizeof(*pDb);
// pDb->rootDir // pDb->rootDir
pDb->rootDir = pPtr; pDb->rootDir = pPtr;
memcpy(pDb->rootDir, rootDir, dsize); memcpy(pDb->rootDir, dbname, dsize);
pDb->rootDir[dsize] = '\0'; pDb->rootDir[dsize] = '\0';
pPtr = pPtr + dsize + 1; pPtr = pPtr + dsize + 1;
// pDb->jfname // pDb->jfname
pDb->jfname = pPtr; pDb->jfname = pPtr;
memcpy(pDb->jfname, rootDir, dsize); memcpy(pDb->jfname, dbname, dsize);
pDb->jfname[dsize] = '/'; pDb->jfname[dsize] = '/';
memcpy(pDb->jfname + dsize + 1, TDB_JOURNAL_NAME, strlen(TDB_JOURNAL_NAME)); memcpy(pDb->jfname + dsize + 1, TDB_JOURNAL_NAME, strlen(TDB_JOURNAL_NAME));
pDb->jfname[dsize + 1 + strlen(TDB_JOURNAL_NAME)] = '\0'; pDb->jfname[dsize + 1 + strlen(TDB_JOURNAL_NAME)] = '\0';
@ -62,7 +62,7 @@ int tdbOpen(const char *rootDir, int szPage, int pages, TDB **ppDb) {
} }
memset(pDb->pgrHash, 0, tsize); memset(pDb->pgrHash, 0, tsize);
mkdir(rootDir, 0755); mkdir(dbname, 0755);
*ppDb = pDb; *ppDb = pDb;
return 0; return 0;

6
source/libs/tdb/src/db/tdbTable.c
View File

@ -24,7 +24,7 @@ struct STBC {
SBTC btc; SBTC btc;
}; };
int tdbTbOpen(const char *fname, int keyLen, int valLen, tdb_cmpr_fn_t keyCmprFn, TDB *pEnv, TTB **ppTb) { int tdbTbOpen(const char *tbname, int keyLen, int valLen, tdb_cmpr_fn_t keyCmprFn, TDB *pEnv, TTB **ppTb) {
TTB *pTb; TTB *pTb;
SPager *pPager; SPager *pPager;
int ret; int ret;
@ -42,9 +42,9 @@ int tdbTbOpen(const char *fname, int keyLen, int valLen, tdb_cmpr_fn_t keyCmprFn
// pTb->pEnv // pTb->pEnv
pTb->pEnv = pEnv; pTb->pEnv = pEnv;
pPager = tdbEnvGetPager(pEnv, fname); pPager = tdbEnvGetPager(pEnv, tbname);
if (pPager == NULL) { if (pPager == NULL) {
snprintf(fFullName, TDB_FILENAME_LEN, "%s/%s", pEnv->rootDir, fname); snprintf(fFullName, TDB_FILENAME_LEN, "%s/%s", pEnv->rootDir, tbname);
ret = tdbPagerOpen(pEnv->pCache, fFullName, &pPager); ret = tdbPagerOpen(pEnv->pCache, fFullName, &pPager);
if (ret < 0) { if (ret < 0) {
return -1; return -1;