From 3146ac2d3b33cbc8b908de0e11d62cd531fe78c3 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Mon, 28 Mar 2022 03:00:02 +0000
Subject: [PATCH] more TDB

---
 source/libs/tdb/src/db/tdbPager.c |  8 ++++----
 source/libs/tdb/src/inc/tdbOs.h   | 32 +++++++++++++++++++++++--------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/source/libs/tdb/src/db/tdbPager.c b/source/libs/tdb/src/db/tdbPager.c
index f55f427b36..b811fcb135 100644
--- a/source/libs/tdb/src/db/tdbPager.c
+++ b/source/libs/tdb/src/db/tdbPager.c
@@ -80,7 +80,7 @@ int tdbPagerOpen(SPCache *pCache, const char *fileName, SPager **ppPager) {
   // pPager->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) {
     return -1;
   }
@@ -90,7 +90,7 @@ int tdbPagerOpen(SPCache *pCache, const char *fileName, SPager **ppPager) {
     return -1;
   }
 
-  pPager->jfd = -1;
+  // pPager->jfd = -1;
   pPager->pageSize = tdbPCacheGetPageSize(pCache);
 
   *ppPager = pPager;
@@ -168,7 +168,7 @@ int tdbPagerBegin(SPager *pPager) {
   }
 
   // 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) {
     return -1;
   }
@@ -210,7 +210,7 @@ int tdbPagerCommit(SPager *pPager) {
 
   tdbOsClose(pPager->jfd);
   remove(pPager->jFileName);
-  pPager->jfd = -1;
+  // pPager->jfd = -1;
 
   return 0;
 }
diff --git a/source/libs/tdb/src/inc/tdbOs.h b/source/libs/tdb/src/inc/tdbOs.h
index ac538341f1..12d81e3fcc 100644
--- a/source/libs/tdb/src/inc/tdbOs.h
+++ b/source/libs/tdb/src/inc/tdbOs.h
@@ -20,10 +20,10 @@
 extern "C" {
 #endif
 
-// TODO: kmake
+// TODO: use cmake to control the option
 #define TDB_FOR_TDENGINE
 
-// For memor
+// For memory
 #ifdef TDB_FOR_TDENGINE
 #define tdbOsMalloc  taosMemoryMalloc
 #define tdbOsCalloc  taosMemoryCalloc
@@ -36,8 +36,10 @@ extern "C" {
 #define tdbOsFree    free
 #endif
 
-// For file
+// For file and directory
 #ifdef TDB_FOR_TDENGINE
+
+// file
 typedef TdFilePtr tdb_fd_t;
 
 #define tdbOsOpen  taosOpenFile
@@ -46,28 +48,42 @@ typedef TdFilePtr tdb_fd_t;
 #define tdbOsPRead taosPReadFile
 #define tdbOsWrite taosWriteFile
 #define tdbOsFSync taosFsyncFile
+
+// directory
+#define tdbOsMkdir taosMkDir
+#define tdbOsRmdir taosRemoveDir
+
 #else
+
+// file
+typedef int tdb_fd_t;
+
 #define tdbOsOpen  open
 #define tdbOsClose close
 #define tdbOsRead  read   // TODO
 #define tdbOsPRead pread  // TODO
 #define tdbOsWrite write  // TODO
 #define tdbOsFSync fsync
+
+// directory
+#define tdbOsMkdir mkdir
+#define tdbOsRmdir rmdir
+
 #endif
 
 // For threads and lock
 #ifdef TDB_FOR_TDENGINE
 
-// spin lock
+/* spin lock */
 typedef TdThreadSpinlock tdb_spinlock_t;
 
 #define tdbSpinlockInit    taosThreadSpinInit
 #define tdbSpinlockDestroy taosThreadSpinDestroy
 #define tdbSpinlockLock    taosThreadSpinLock
 #define tdbSpinlockUnlock  taosThreadSpinUnlock
-#define tdbSpinlockTrylock pthread_spin_trylock  // TODO
+#define tdbSpinlockTrylock pthread_spin_trylock
 
-// mutex lock
+/* mutex lock */
 typedef TdThreadMutex tdb_mutex_t;
 
 #define tdbMutexInit    taosThreadMutexInit
@@ -77,7 +93,7 @@ typedef TdThreadMutex tdb_mutex_t;
 
 #else
 
-// spin lock
+/* spin lock */
 typedef pthread_spinlock_t tdb_spinlock_t;
 
 #define tdbSpinlockInit    pthread_spin_init
@@ -86,7 +102,7 @@ typedef pthread_spinlock_t tdb_spinlock_t;
 #define tdbSpinlockUnlock  pthread_spin_unlock
 #define tdbSpinlockTrylock pthread_spin_trylock
 
-// mutex lock
+/* mutex lock */
 typedef pthread_mutex_t tdb_mutex_t;
 
 #define tdbMutexInit    pthread_mutex_init