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

refact more

This commit is contained in:
Hongze Cheng 2022-03-30 10:51:07 +00:00
parent cb4bd33c80
commit 110703f9df
6 changed files with 43 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,6 +64,21 @@ int tdbEnvClose(TENV *pEnv) {
return 0; return 0;
} }
int tdbBegin(TENV *pEnv) {
// TODO
return 0;
}
int tdbCommit(TENV *pEnv) {
// TODO
return 0;
}
int tdbRollback(TENV *pEnv) {
// TODO
return 0;
}
SPager *tdbEnvGetPager(TENV *pEnv, const char *fname) { SPager *tdbEnvGetPager(TENV *pEnv, const char *fname) {
// TODO // TODO
return NULL; return NULL;

44
source/libs/tdb/src/db/tdbTxn.c
View File

@ -15,29 +15,29 @@
#include "tdbInt.h" #include "tdbInt.h"
int tdbTxnBegin(TENV *pEnv) { // int tdbTxnBegin(TENV *pEnv) {
// TODO // // TODO
return 0; // return 0;
} // }
int tdbTxnCommit(TENV *pEnv) { // int tdbTxnCommit(TENV *pEnv) {
SPager *pPager = NULL; // SPager *pPager = NULL;
int ret; // int ret;
for (;;) { // for (;;) {
break; // break;
ret = tdbPagerCommit(pPager); // ret = tdbPagerCommit(pPager);
if (ret < 0) { // if (ret < 0) {
ASSERT(0); // ASSERT(0);
return -1; // return -1;
} // }
} // }
// TODO // // TODO
return 0; // return 0;
} // }
int tdbTxnRollback(TENV *pEnv) { // int tdbTxnRollback(TENV *pEnv) {
// TODO // // TODO
return 0; // return 0;
} // }

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

@ -25,10 +25,15 @@ typedef struct STEnv {
char *jfname; char *jfname;
int jfd; int jfd;
SPCache *pCache; SPCache *pCache;
int nHash;
SPager **pagerHash;
} TENV; } TENV;
int tdbEnvOpen(const char *rootDir, int pageSize, int cacheSize, TENV **ppEnv); int tdbEnvOpen(const char *rootDir, int pageSize, int cacheSize, TENV **ppEnv);
int tdbEnvClose(TENV *pEnv); int tdbEnvClose(TENV *pEnv);
int tdbBegin(TENV *pEnv);
int tdbCommit(TENV *pEnv);
int tdbRollback(TENV *pEnv);
SPager *tdbEnvGetPager(TENV *pEnv, const char *fname); SPager *tdbEnvGetPager(TENV *pEnv, const char *fname);

17
source/libs/tdb/src/inc/tdbInt.h
View File

@ -91,23 +91,6 @@ static FORCE_INLINE int tdbCmprPgId(const void *p1, const void *p2) {
// dbname // dbname
#define TDB_MAX_DBNAME_LEN 24 #define TDB_MAX_DBNAME_LEN 24
// tdb_log
#define tdbError(var)
#define TERR_A(val, op, flag) \
do { \
if (((val) = (op)) != 0) { \
goto flag; \
} \
} while (0)
#define TERR_B(val, op, flag) \
do { \
if (((val) = (op)) == NULL) { \
goto flag; \
} \
} while (0)
#define TDB_VARIANT_LEN ((int)-1) #define TDB_VARIANT_LEN ((int)-1)
typedef int (*FKeyComparator)(const void *pKey1, int kLen1, const void *pKey2, int kLen2); typedef int (*FKeyComparator)(const void *pKey1, int kLen1, const void *pKey2, int kLen2);

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

@ -28,10 +28,6 @@ struct STxn {
void *xArg; void *xArg;
}; };
int tdbTxnBegin(TENV *pEnv);
int tdbTxnCommit(TENV *pEnv);
int tdbTxnRollback(TENV *pEnv);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

2
source/libs/tdb/test/tdbTest.cpp
View File

@ -147,7 +147,7 @@ TEST(tdb_test, simple_test) {
i++; i++;
} }
tdbTxnCommit(pEnv); tdbCommit(pEnv);
} }
{ // Query the data { // Query the data