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

more TDB

This commit is contained in:
Hongze Cheng 2022-03-28 03:00:02 +00:00
parent a8882c5c14
commit 3146ac2d3b
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,7 +80,7 @@ int tdbPagerOpen(SPCache *pCache, const char *fileName, SPager **ppPager) {
// pPager->pCache // pPager->pCache
pPager->pCache = pCache; pPager->pCache = pCache;
pPager->fd = tdbOsOpen(pPager->dbFileName, O_RDWR | O_CREAT, 0755); pPager->fd = tdbOsOpen(pPager->dbFileName, O_RDWR | O_CREAT);
if (pPager->fd < 0) { if (pPager->fd < 0) {
return -1; return -1;
} }
@ -90,7 +90,7 @@ int tdbPagerOpen(SPCache *pCache, const char *fileName, SPager **ppPager) {
return -1; return -1;
} }
pPager->jfd = -1; // pPager->jfd = -1;
pPager->pageSize = tdbPCacheGetPageSize(pCache); pPager->pageSize = tdbPCacheGetPageSize(pCache);
*ppPager = pPager; *ppPager = pPager;
@ -168,7 +168,7 @@ int tdbPagerBegin(SPager *pPager) {
} }
// Open the journal // Open the journal
pPager->jfd = tdbOsOpen(pPager->jFileName, O_RDWR | O_CREAT, 0755); pPager->jfd = tdbOsOpen(pPager->jFileName, O_RDWR | O_CREAT);
if (pPager->jfd < 0) { if (pPager->jfd < 0) {
return -1; return -1;
} }
@ -210,7 +210,7 @@ int tdbPagerCommit(SPager *pPager) {
tdbOsClose(pPager->jfd); tdbOsClose(pPager->jfd);
remove(pPager->jFileName); remove(pPager->jFileName);
pPager->jfd = -1; // pPager->jfd = -1;
return 0; return 0;
} }

32
source/libs/tdb/src/inc/tdbOs.h
View File

@ -20,10 +20,10 @@
extern "C" { extern "C" {
#endif #endif
// TODO: kmake // TODO: use cmake to control the option
#define TDB_FOR_TDENGINE #define TDB_FOR_TDENGINE
// For memor // For memory
#ifdef TDB_FOR_TDENGINE #ifdef TDB_FOR_TDENGINE
#define tdbOsMalloc taosMemoryMalloc #define tdbOsMalloc taosMemoryMalloc
#define tdbOsCalloc taosMemoryCalloc #define tdbOsCalloc taosMemoryCalloc
@ -36,8 +36,10 @@ extern "C" {
#define tdbOsFree free #define tdbOsFree free
#endif #endif
// For file // For file and directory
#ifdef TDB_FOR_TDENGINE #ifdef TDB_FOR_TDENGINE
// file
typedef TdFilePtr tdb_fd_t; typedef TdFilePtr tdb_fd_t;
#define tdbOsOpen taosOpenFile #define tdbOsOpen taosOpenFile
@ -46,28 +48,42 @@ typedef TdFilePtr tdb_fd_t;
#define tdbOsPRead taosPReadFile #define tdbOsPRead taosPReadFile
#define tdbOsWrite taosWriteFile #define tdbOsWrite taosWriteFile
#define tdbOsFSync taosFsyncFile #define tdbOsFSync taosFsyncFile
// directory
#define tdbOsMkdir taosMkDir
#define tdbOsRmdir taosRemoveDir
#else #else
// file
typedef int tdb_fd_t;
#define tdbOsOpen open #define tdbOsOpen open
#define tdbOsClose close #define tdbOsClose close
#define tdbOsRead read // TODO #define tdbOsRead read // TODO
#define tdbOsPRead pread // TODO #define tdbOsPRead pread // TODO
#define tdbOsWrite write // TODO #define tdbOsWrite write // TODO
#define tdbOsFSync fsync #define tdbOsFSync fsync
// directory
#define tdbOsMkdir mkdir
#define tdbOsRmdir rmdir
#endif #endif
// For threads and lock // For threads and lock
#ifdef TDB_FOR_TDENGINE #ifdef TDB_FOR_TDENGINE
// spin lock /* spin lock */
typedef TdThreadSpinlock tdb_spinlock_t; typedef TdThreadSpinlock tdb_spinlock_t;
#define tdbSpinlockInit taosThreadSpinInit #define tdbSpinlockInit taosThreadSpinInit
#define tdbSpinlockDestroy taosThreadSpinDestroy #define tdbSpinlockDestroy taosThreadSpinDestroy
#define tdbSpinlockLock taosThreadSpinLock #define tdbSpinlockLock taosThreadSpinLock
#define tdbSpinlockUnlock taosThreadSpinUnlock #define tdbSpinlockUnlock taosThreadSpinUnlock
#define tdbSpinlockTrylock pthread_spin_trylock // TODO #define tdbSpinlockTrylock pthread_spin_trylock
// mutex lock /* mutex lock */
typedef TdThreadMutex tdb_mutex_t; typedef TdThreadMutex tdb_mutex_t;
#define tdbMutexInit taosThreadMutexInit #define tdbMutexInit taosThreadMutexInit
@ -77,7 +93,7 @@ typedef TdThreadMutex tdb_mutex_t;
#else #else
// spin lock /* spin lock */
typedef pthread_spinlock_t tdb_spinlock_t; typedef pthread_spinlock_t tdb_spinlock_t;
#define tdbSpinlockInit pthread_spin_init #define tdbSpinlockInit pthread_spin_init
@ -86,7 +102,7 @@ typedef pthread_spinlock_t tdb_spinlock_t;
#define tdbSpinlockUnlock pthread_spin_unlock #define tdbSpinlockUnlock pthread_spin_unlock
#define tdbSpinlockTrylock pthread_spin_trylock #define tdbSpinlockTrylock pthread_spin_trylock
// mutex lock /* mutex lock */
typedef pthread_mutex_t tdb_mutex_t; typedef pthread_mutex_t tdb_mutex_t;
#define tdbMutexInit pthread_mutex_init #define tdbMutexInit pthread_mutex_init