diff --git a/source/libs/tdb/inc/tdb.h b/source/libs/tdb/inc/tdb.h index 467e40325e73505e91abf45046e03adff52561ec..71ac3d97ed87eea6b81b7a16ecddb206a66b0cb0 100644 --- a/source/libs/tdb/inc/tdb.h +++ b/source/libs/tdb/inc/tdb.h @@ -22,43 +22,6 @@ extern "C" { #endif -// typedef struct STDb TDB; -// typedef struct STDbEnv TENV; -// typedef struct STDbCurosr TDBC; - -// typedef int32_t pgsz_t; -// typedef int32_t cachesz_t; - -// typedef int (*TdbKeyCmprFn)(int keyLen1, const void *pKey1, int keyLen2, const void *pKey2); - -// // TEVN -// int tdbEnvCreate(TENV **ppEnv, const char *rootDir); -// int tdbEnvOpen(TENV *ppEnv); -// int tdbEnvClose(TENV *pEnv); - -// int tdbEnvSetCache(TENV *pEnv, pgsz_t pgSize, cachesz_t cacheSize); -// pgsz_t tdbEnvGetPageSize(TENV *pEnv); -// cachesz_t tdbEnvGetCacheSize(TENV *pEnv); - -// int tdbEnvBeginTxn(TENV *pEnv); -// int tdbEnvCommit(TENV *pEnv); - -// // TDB -// int tdbCreate(TDB **ppDb); -// int tdbOpen(TDB *pDb, const char *fname, const char *dbname, TENV *pEnv); -// int tdbClose(TDB *pDb); -// int tdbDrop(TDB *pDb); - -// int tdbSetKeyLen(TDB *pDb, int klen); -// int tdbSetValLen(TDB *pDb, int vlen); -// int tdbSetDup(TDB *pDb, int dup); -// int tdbSetCmprFunc(TDB *pDb, TdbKeyCmprFn fn); -// int tdbGetKeyLen(TDB *pDb); -// int tdbGetValLen(TDB *pDb); -// int tdbGetDup(TDB *pDb); - -// int tdbInsert(TDB *pDb, const void *pKey, int nKey, const void *pData, int nData); - #ifdef __cplusplus } #endif diff --git a/source/libs/tdb/src/db/tdbPager.c b/source/libs/tdb/src/db/tdbPager.c index b811fcb135d77a8d4378996e99f845a7f318b12b..0abc64d0b084927efb5a7b80256cfb263c74f2b2 100644 --- a/source/libs/tdb/src/db/tdbPager.c +++ b/source/libs/tdb/src/db/tdbPager.c @@ -377,12 +377,12 @@ static int tdbPagerWritePageToJournal(SPager *pPager, SPage *pPage) { pgno = TDB_PAGE_PGNO(pPage); - ret = tdbWrite(pPager->jfd, &pgno, sizeof(pgno)); + ret = tdbOsWrite(pPager->jfd, &pgno, sizeof(pgno)); if (ret < 0) { return -1; } - ret = tdbWrite(pPager->jfd, pPage->pData, pPage->pageSize); + ret = tdbOsWrite(pPager->jfd, pPage->pData, pPage->pageSize); if (ret < 0) { return -1; } @@ -395,12 +395,12 @@ static int tdbPagerWritePageToDB(SPager *pPager, SPage *pPage) { int ret; offset = pPage->pageSize * TDB_PAGE_PGNO(pPage); - if (lseek(pPager->fd, offset, SEEK_SET) < 0) { + if (tdbOsLSeek(pPager->fd, offset, SEEK_SET) < 0) { ASSERT(0); return -1; } - ret = tdbWrite(pPager->fd, pPage->pData, pPage->pageSize); + ret = tdbOsWrite(pPager->fd, pPage->pData, pPage->pageSize); if (ret < 0) { ASSERT(0); return -1; diff --git a/source/libs/tdb/src/inc/tdbInt.h b/source/libs/tdb/src/inc/tdbInt.h index c926d9358c31332b5f92a48c269552547bde2dfc..84c92f896c312f363adf38cda580436b6403d3ac 100644 --- a/source/libs/tdb/src/inc/tdbInt.h +++ b/source/libs/tdb/src/inc/tdbInt.h @@ -16,10 +16,11 @@ #ifndef _TD_TDB_INTERNAL_H_ #define _TD_TDB_INTERNAL_H_ +#include "os.h" #include "tlist.h" #include "tlockfree.h" -// #include "tdb.h" +#include "tdb.h" #ifdef __cplusplus extern "C" { diff --git a/source/libs/tdb/src/inc/tdbOs.h b/source/libs/tdb/src/inc/tdbOs.h index c737ed867d1dc28f7865693897f474cbb7e1e27b..fd511369574cf2afaa86c3b80884b368ee273f49 100644 --- a/source/libs/tdb/src/inc/tdbOs.h +++ b/source/libs/tdb/src/inc/tdbOs.h @@ -23,7 +23,7 @@ extern "C" { // TODO: use cmake to control the option #define TDB_FOR_TDENGINE -// For memory +// For memory ----------------- #ifdef TDB_FOR_TDENGINE #define tdbOsMalloc taosMemoryMalloc @@ -40,18 +40,19 @@ extern "C" { #endif -// For file and directory +// For file and directory ----------------- #ifdef TDB_FOR_TDENGINE /* file */ typedef TdFilePtr tdb_fd_t; -#define tdbOsOpen taosOpenFile -#define tdbOsClose taosCloseFile -#define tdbOsRead taosReadFile -#define tdbOsPRead taosPReadFile -#define tdbOsWrite taosWriteFile -#define tdbOsFSync taosFsyncFile +#define tdbOsOpen taosOpenFile +#define tdbOsClose(FD) taosCloseFile(&(FD)) +#define tdbOsRead taosReadFile +#define tdbOsPRead taosPReadFile +#define tdbOsWrite taosWriteFile +#define tdbOsFSync taosFsyncFile +#define tdbOsLSeek taosLSeekFile /* directory */ #define tdbOsMkdir taosMkDir @@ -68,6 +69,7 @@ typedef int tdb_fd_t; #define tdbOsPRead pread // TODO #define tdbOsWrite write // TODO #define tdbOsFSync fsync +#define tdbOsLSeek lseek /* directory */ #define tdbOsMkdir mkdir @@ -75,7 +77,7 @@ typedef int tdb_fd_t; #endif -// For threads and lock +// For threads and lock ----------------- #ifdef TDB_FOR_TDENGINE /* spin lock */