more tkv

source/libs/tkv/inc/tDiskMgr.h

@@ -26,11 +26,12 @@ extern "C" {
 
 typedef struct SDiskMgr SDiskMgr;
 
-int     tdmOpen(SDiskMgr **ppDiskMgr, const char *fname, uint16_t pgsize);
-int     tdmClose(SDiskMgr *pDiskMgr);
-int     tdmReadPage(SDiskMgr *pDiskMgr, pgid_t pgid, void *pData);
-int     tdmWritePage(SDiskMgr *pDiskMgr, pgid_t pgid, const void *pData);
-int32_t tdmAllocPage(SDiskMgr *pDiskMgr);
+int    tdmOpen(SDiskMgr **ppDiskMgr, const char *fname, uint16_t pgsize);
+int    tdmClose(SDiskMgr *pDiskMgr);
+int    tdmReadPage(SDiskMgr *pDiskMgr, pgid_t pgid, void *pData);
+int    tdmWritePage(SDiskMgr *pDiskMgr, pgid_t pgid, const void *pData);
+int    tdmFlush(SDiskMgr *pDiskMgr);
+pgid_t tdmAllocPage(SDiskMgr *pDiskMgr);
 
 #ifdef __cplusplus
 }

include/libs/tkv/tkv.h → source/libs/tkv/inc/tkv.h

@@ -16,49 +16,17 @@
 #ifndef _TD_TKV_H_
 #define _TD_TKV_H_
 
-#if 0
-#include "os.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-// Types exported
-typedef struct STkvDb        STkvDb;
-typedef struct STkvOpts      STkvOpts;
-typedef struct STkvCache     STkvCache;
-typedef struct STkvReadOpts  STkvReadOpts;
-typedef struct STkvWriteOpts STkvWriteOpts;
-
-// DB operations
-STkvDb *tkvOpen(const STkvOpts *options, const char *path);
-void    tkvClose(STkvDb *db);
-void    tkvPut(STkvDb *db, const STkvWriteOpts *, const char *key, size_t keylen, const char *val, size_t vallen);
-char *  tkvGet(STkvDb *db, const STkvReadOpts *, const char *key, size_t keylen, size_t *vallen);
-void    tkvCommit(STkvDb *db);
-
-// DB options
-STkvOpts *tkvOptsCreate();
-void      tkvOptsDestroy(STkvOpts *);
-void      tkvOptionsSetCache(STkvOpts *, STkvCache *);
-void      tkvOptsSetCreateIfMissing(STkvOpts *, unsigned char);
-
-// DB cache
-typedef enum { TKV_LRU_CACHE = 0, TKV_LFU_CACHE = 1 } ETkvCacheType;
-STkvCache *tkvCacheCreate(size_t capacity, ETkvCacheType type);
-void       tkvCacheDestroy(STkvCache *);
-
-// STkvReadOpts
-STkvReadOpts *tkvReadOptsCreate();
-void          tkvReadOptsDestroy(STkvReadOpts *);
-
-// STkvWriteOpts
-STkvWriteOpts *tkvWriteOptsCreate();
-void           tkvWriteOptsDestroy(STkvWriteOpts *);
+// SKey
+typedef struct SKey {
+  void *bdata;
+} SKey, SValue;
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif
 #endif /*_TD_TKV_H_*/
\ No newline at end of file

source/libs/tkv/src/tDiskMgr.c

@@ -16,10 +16,10 @@
 #include "tDiskMgr.h"
 
 struct SDiskMgr {
-  const char *fname;
-  uint16_t    pgsize;
-  FileFd      fd;
-  int32_t     npgid;
+  char *   fname;
+  uint16_t pgsize;
+  FileFd   fd;
+  pgid_t   npgid;
 };
 
 #define PAGE_OFFSET(PGID, PGSIZE) ((PGID) * (PGSIZE))
@@ -69,4 +69,6 @@ int tdmWritePage(SDiskMgr *pDiskMgr, pgid_t pgid, const void *pData) {
   return 0;
 }
 
+int tdmFlush(SDiskMgr *pDiskMgr) { return taosFsyncFile(pDiskMgr->fd); }
+
 int32_t tdmAllocPage(SDiskMgr *pDiskMgr) { return pDiskMgr->npgid++; }
\ No newline at end of file