Merge remote-tracking branch 'origin/3.0' into feature/qnode

source/dnode/mgmt/impl/src/dndEnv.c

@@ -293,7 +293,7 @@ int32_t dndInit(const SDnodeEnvCfg *pCfg) {
   if (vnodeInit(&vnodeOpt) != 0) {
     dError("failed to init vnode since %s", terrstr());
     dndCleanup();
-    return NULL;
+    return -1;
   }
 
   memcpy(&dndEnv.cfg, pCfg, sizeof(SDnodeEnvCfg));

source/dnode/vnode/inc/vnode.h

@@ -37,36 +37,18 @@ typedef int32_t (*PutReqToVQueryQFp)(SDnode *pDnode, struct SRpcMsg *pReq);
 typedef struct SVnodeCfg {
   int32_t vgId;
   SDnode *pDnode;
-
-  /** vnode buffer pool options */
   struct {
-    /** write buffer size */
     uint64_t wsize;
     uint64_t ssize;
     uint64_t lsize;
-    /** use heap allocator or arena allocator */
     bool isHeapAllocator;
   };
-
-  /** time to live of tables in this vnode */
   uint32_t ttl;
-
-  /** data to keep in this vnode */
   uint32_t keep;
-
-  /** if TS data is eventually consistency */
   bool isWeak;
-
-  /** TSDB config */
   STsdbCfg tsdbCfg;
-
-  /** META config */
   SMetaCfg metaCfg;
-
-  /** TQ config */
   STqCfg tqCfg;
-
-  /** WAL config */
   SWalCfg walCfg;
 } SVnodeCfg;
 

source/dnode/vnode/src/inc/vnodeDef.h

@@ -30,12 +30,9 @@
 #include "vnodeBufferPool.h"
 #include "vnodeCfg.h"
 #include "vnodeCommit.h"
-#include "vnodeFS.h"
 #include "vnodeMemAllocator.h"
 #include "vnodeQuery.h"
-#include "vnodeRequest.h"
 #include "vnodeStateMgr.h"
-#include "vnodeSync.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -73,8 +70,6 @@ struct SVnode {
   STsdb*      pTsdb;
   STQ*        pTq;
   SWal*       pWal;
-  SVnodeSync* pSync;
-  SVnodeFS*   pFs;
   tsem_t      canCommit;
   SQHandle*   pQuery;
   SDnode*     pDnode;
@@ -84,6 +79,16 @@ int vnodeScheduleTask(SVnodeTask* task);
 
 int32_t vnodePutReqToVQueryQ(SVnode *pVnode, struct SRpcMsg *pReq);
 
+// For Log
+extern int32_t vDebugFlag;
+
+#define vFatal(...) do { if (vDebugFlag & DEBUG_FATAL) { taosPrintLog("TDB FATAL ", 255, __VA_ARGS__); }}     while(0)
+#define vError(...) do { if (vDebugFlag & DEBUG_ERROR) { taosPrintLog("TDB ERROR ", 255, __VA_ARGS__); }}     while(0)
+#define vWarn(...)  do { if (vDebugFlag & DEBUG_WARN)  { taosPrintLog("TDB WARN ", 255, __VA_ARGS__); }}      while(0)
+#define vInfo(...)  do { if (vDebugFlag & DEBUG_INFO)  { taosPrintLog("TDB ", 255, __VA_ARGS__); }}           while(0)
+#define vDebug(...) do { if (vDebugFlag & DEBUG_DEBUG) { taosPrintLog("TDB ", tsdbDebugFlag, __VA_ARGS__); }} while(0)
+#define vTrace(...) do { if (vDebugFlag & DEBUG_TRACE) { taosPrintLog("TDB ", tsdbDebugFlag, __VA_ARGS__); }} while(0)
+
 #ifdef __cplusplus
 }
 #endif

source/dnode/vnode/src/inc/vnodeMAF.h

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _TD_VNODE_MAF_H_
-#define _TD_VNODE_MAF_H_
-
-#include "vnode.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int  vnodeOpenMAF(SVnode *pVnode);
-void vnodeCloseMAF(SVnode *pVnode);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*_TD_VNODE_MAF_H_*/
\ No newline at end of file

source/dnode/vnode/src/inc/vnodeQuery.h

@@ -19,13 +19,12 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "vnodeInt.h"
 #include "qworker.h"
+#include "vnode.h"
 
 
 typedef struct SQWorkerMgmt SQHandle;
 
-
 int vnodeQueryOpen(SVnode *pVnode);
 
 #ifdef __cplusplus

source/dnode/vnode/src/inc/vnodeRead.h

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _TD_VNODE_READ_H_
-#define _TD_VNODE_READ_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include "vnodeInt.h"
-
-void vnodeProcessReadMsg(SVnode *pVnode, SVnodeMsg *pMsg);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*_TD_VNODE_READ_H_*/

source/dnode/vnode/src/inc/vnodeRequest.h

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _TD_VNODE_REQUEST_H_
-#define _TD_VNODE_REQUEST_H_
-
-#include "vnode.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// SVDropTbReq
-// int   vnodeBuildDropTableReq(void **buf, const SVDropTbReq *pReq);
-// void *vnodeParseDropTableReq(void *buf, SVDropTbReq *pReq);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*_TD_VNODE_REQUEST_H_*/
\ No newline at end of file

source/dnode/vnode/src/meta/CMakeLists.txt

-set(META_DB_IMPL_LIST "BDB" "SQLITE")
-set(META_DB_IMPL "BDB" CACHE STRING "Use BDB as the default META implementation")
-set_property(CACHE META_DB_IMPL PROPERTY STRINGS ${META_DB_IMPL_LIST})
-
-if(META_DB_IMPL IN_LIST META_DB_IMPL_LIST)
-    message(STATUS "META DB Impl: ${META_DB_IMPL}==============")
-else()
-    message(FATAL_ERROR "Invalid META DB IMPL: ${META_DB_IMPL}==============")
-endif()
-
-aux_source_directory(src META_SRC)
-if(${META_DB_IMPL} STREQUAL "BDB")
-    list(REMOVE_ITEM META_SRC "src/metaSQLiteImpl.c")
-elseif(${META_DB_IMPL} STREQUAL "SQLITE")
-    list(REMOVE_ITEM META_SRC "src/metaBDBImpl.c")
-endif()
-
-add_library(meta STATIC ${META_SRC})
-target_include_directories(
-    meta
-    PUBLIC "${CMAKE_SOURCE_DIR}/include/dnode/vnode/meta"
-    PUBLIC "${CMAKE_SOURCE_DIR}/include/libs/index"
-    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
-)
-target_link_libraries(
-    meta
-    PUBLIC common
-    PUBLIC index 
-)
-
-if(${META_DB_IMPL} STREQUAL "BDB")
-    target_link_libraries(
-        meta
-        PUBLIC bdb
-    )
-elseif(${META_DB_IMPL} STREQUAL "SQLITE")
-    target_link_libraries(
-        meta
-        PUBLIC sqlite
-    )
-endif()
-
-
-if(${BUILD_TEST})
-    add_subdirectory(test)
-endif(${BUILD_TEST})

source/dnode/vnode/src/tq/CMakeLists.txt

-aux_source_directory(src TQ_SRC)
-add_library(tq ${TQ_SRC})
-target_include_directories(
-    tq
-    PUBLIC "${CMAKE_SOURCE_DIR}/include/dnode/vnode/tq"
-    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
-)
-
-target_link_libraries(
-    tq
-    PUBLIC wal
-    PUBLIC os
-    PUBLIC util
-    PUBLIC common
-    PUBLIC transport
-)
-
-if(${BUILD_TEST})
-    add_subdirectory(test)
-endif(${BUILD_TEST})

source/dnode/vnode/src/tsdb/CMakeLists.txt

-aux_source_directory(src TSDB_SRC)
-if(0)
-    add_library(tsdb ${TSDB_SRC})
-else(0)
-    add_library(tsdb STATIC "")
-    target_sources(tsdb
-        PRIVATE
-        "src/tsdbCommit.c"
-        "src/tsdbMain.c"
-        "src/tsdbMemTable.c"
-        "src/tsdbOptions.c"
-        "src/tsdbWrite.c"
-        "src/tsdbReadImpl.c"
-        "src/tsdbFile.c"
-        "src/tsdbFS.c"
-        "src/tsdbRead.c"
-    )
-endif(0)
-
-target_include_directories(
-    tsdb
-    PUBLIC "${CMAKE_SOURCE_DIR}/include/dnode/vnode/tsdb"
-    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
-)
-
-target_link_libraries(
-    tsdb
-    PUBLIC os
-    PUBLIC util
-    PUBLIC common
-    PUBLIC tkv
-    PUBLIC tfs
-    PUBLIC meta
-)
\ No newline at end of file

source/dnode/vnode/src/vnd/CMakeLists.txt

-aux_source_directory(src VNODE_SRC)
-add_library(vnode STATIC ${VNODE_SRC})
-target_include_directories(
-    vnode
-    PUBLIC "${CMAKE_SOURCE_DIR}/include/dnode/vnode"
-    private "${CMAKE_CURRENT_SOURCE_DIR}/inc"
-)
-target_link_libraries(
-    vnode
-    PUBLIC os
-    PUBLIC transport
-    PUBLIC meta
-    PUBLIC tq
-    PUBLIC tsdb
-    PUBLIC wal
-    PUBLIC sync
-    PUBLIC cjson
-    PUBLIC qworker
-)
-
-# test
-if(${BUILD_TEST})
-#    add_subdirectory(test)
-endif(${BUILD_TEST})

source/dnode/vnode/src/vnd/vnodeFS.c

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "vnodeDef.h"
\ No newline at end of file

source/dnode/vnode/src/vnd/vnodeMgr.c

@@ -41,7 +41,7 @@ int vnodeInit(const SVnodeOpt *pOption) {
 
     for (uint16_t i = 0; i < pOption->nthreads; i++) {
       pthread_create(&(vnodeMgr.threads[i]), NULL, loop, NULL);
-      pthread_setname_np(vnodeMgr.threads[i], "VND Commit Thread");
+      // pthread_setname_np(vnodeMgr.threads[i], "VND Commit Thread");
     }
   } else {
     // TODO: if no commit thread is set, then another mechanism should be

source/dnode/vnode/src/vnd/vnodeRead.c

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "vnodeDef.h"
\ No newline at end of file

source/dnode/vnode/src/vnd/vnodeRequest.c

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "vnodeDef.h"
-
-#if 0
-
-static int   vnodeBuildCreateTableReq(void **buf, const SVCreateTableReq *pReq);
-static void *vnodeParseCreateTableReq(void *buf, SVCreateTableReq *pReq);
-
-int vnodeBuildReq(void **buf, const SVnodeReq *pReq, tmsg_t type) {
-  int tsize = 0;
-
-  tsize += taosEncodeFixedU64(buf, pReq->ver);
-  switch (type) {
-    case TDMT_VND_CREATE_STB:
-      tsize += vnodeBuildCreateTableReq(buf, &(pReq->ctReq));
-      break;
-    case TDMT_VND_SUBMIT:
-      /* code */
-      break;
-    default:
-      break;
-  }
-  /* TODO */
-  return tsize;
-}
-
-void *vnodeParseReq(void *buf, SVnodeReq *pReq, tmsg_t type) {
-  buf = taosDecodeFixedU64(buf, &(pReq->ver));
-
-  switch (type) {
-    case TDMT_VND_CREATE_STB:
-      buf = vnodeParseCreateTableReq(buf, &(pReq->ctReq));
-      break;
-
-    default:
-      break;
-  }
-
-  // TODO
-  return buf;
-}
-
-static int vnodeBuildCreateTableReq(void **buf, const SVCreateTableReq *pReq) {
-  int tsize = 0;
-
-  tsize += taosEncodeString(buf, pReq->name);
-  tsize += taosEncodeFixedU32(buf, pReq->ttl);
-  tsize += taosEncodeFixedU32(buf, pReq->keep);
-  tsize += taosEncodeFixedU8(buf, pReq->type);
-
-  switch (pReq->type) {
-    case META_SUPER_TABLE:
-      tsize += taosEncodeFixedU64(buf, pReq->stbCfg.suid);
-      tsize += tdEncodeSchema(buf, pReq->stbCfg.pSchema);
-      tsize += tdEncodeSchema(buf, pReq->stbCfg.pTagSchema);
-      break;
-    case META_CHILD_TABLE:
-      tsize += taosEncodeFixedU64(buf, pReq->ctbCfg.suid);
-      tsize += tdEncodeKVRow(buf, pReq->ctbCfg.pTag);
-      break;
-    case META_NORMAL_TABLE:
-      tsize += tdEncodeSchema(buf, pReq->ntbCfg.pSchema);
-      break;
-    default:
-      break;
-  }
-
-  return tsize;
-}
-
-static void *vnodeParseCreateTableReq(void *buf, SVCreateTableReq *pReq) {
-  buf = taosDecodeString(buf, &(pReq->name));
-  buf = taosDecodeFixedU32(buf, &(pReq->ttl));
-  buf = taosDecodeFixedU32(buf, &(pReq->keep));
-  buf = taosDecodeFixedU8(buf, &(pReq->type));
-
-  switch (pReq->type) {
-    case META_SUPER_TABLE:
-      buf = taosDecodeFixedU64(buf, &(pReq->stbCfg.suid));
-      buf = tdDecodeSchema(buf, &(pReq->stbCfg.pSchema));
-      buf = tdDecodeSchema(buf, &(pReq->stbCfg.pTagSchema));
-      break;
-    case META_CHILD_TABLE:
-      buf = taosDecodeFixedU64(buf, &(pReq->ctbCfg.suid));
-      buf = tdDecodeKVRow(buf, &(pReq->ctbCfg.pTag));
-      break;
-    case META_NORMAL_TABLE:
-      buf = tdDecodeSchema(buf, &(pReq->ntbCfg.pSchema));
-      break;
-    default:
-      break;
-  }
-
-  return buf;
-}
-
-int vnodeBuildDropTableReq(void **buf, const SVDropTbReq *pReq) {
-  // TODO
-  return 0;
-}
-
-void *vnodeParseDropTableReq(void *buf, SVDropTbReq *pReq) {
-  // TODO
-}
-#endif
\ No newline at end of file

source/dnode/vnode/src/vnd/vnodeSync.c

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
\ No newline at end of file

source/dnode/vnode/src/vnd/vnodeWrite.c

@@ -83,6 +83,7 @@ int vnodeApplyWMsg(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp) {
         if (metaCreateTable(pVnode->pMeta, pCreateTbReq) < 0) {
           // TODO: handle error
         }
+        vTrace("vgId:%d process create table %s", pVnode->vgId, pCreateTbReq->name);
         if (pCreateTbReq->type == TD_SUPER_TABLE) {
           free(pCreateTbReq->stbCfg.pSchema);
           free(pCreateTbReq->stbCfg.pTagSchema);

source/libs/CMakeLists.txt

 add_subdirectory(transport)
 add_subdirectory(sync)
-add_subdirectory(tkv)
+add_subdirectory(tdb)
 add_subdirectory(index)
 add_subdirectory(wal)
 add_subdirectory(parser)

source/libs/tkv/CMakeLists.txt → source/libs/tdb/CMakeLists.txt

-aux_source_directory(src TKV_SRC)
-add_library(tkv STATIC ${TKV_SRC})
+aux_source_directory(src TDB_SRC)
+add_library(tdb STATIC ${TDB_SRC})
 # target_include_directories(
 #     tkv
 #     PUBLIC "${CMAKE_SOURCE_DIR}/include/libs/tkv"
 #     PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 # )
 target_include_directories(
-    tkv
+    tdb
     PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/inc"
     PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/src/inc"
 )
 target_link_libraries(
-    tkv
+    tdb
     PUBLIC os
     PUBLIC util
-)
\ No newline at end of file
+)
+
+if(${BUILD_TEST})
+    # add_subdirectory(test)
+endif(${BUILD_TEST})

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

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TD_TKV_H_
-#define _TD_TKV_H_
+#ifndef _TD_TDB_H_
+#define _TD_TDB_H_
 
 #include "os.h"
 
@@ -22,18 +22,29 @@
 extern "C" {
 #endif
 
+typedef enum {
+  TDB_BTREE = 0,
+  TDB_HASH,
+  TDB_HEAP,
+} tdb_db_t;
+
 // Forward declaration
-typedef struct TDB     TDB;
-typedef struct TDB_ENV TDB_ENV;
+typedef struct TDB        TDB;
+typedef struct TDB_CURSOR TDB_CURSOR;
 
 // SKey
 typedef struct {
-  void *   bdata;
+  void*    bdata;
   uint32_t size;
 } TDB_KEY, TDB_VALUE;
 
+// TDB Operations
+int tdbCreateDB(TDB** dbpp);
+int tdbOpenDB(TDB* dbp, tdb_db_t type, uint32_t flags);
+int tdbCloseDB(TDB* dbp, uint32_t flags);
+
 #ifdef __cplusplus
 }
 #endif
 
-#endif /*_TD_TKV_H_*/
\ No newline at end of file
+#endif /*_TD_TDB_H_*/
\ No newline at end of file

source/dnode/vnode/src/inc/vnodeSync.h → source/libs/tdb/src/inc/tdbBtree.h

@@ -13,21 +13,21 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TD_VNODE_SYNC_H_
-#define _TD_VNODE_SYNC_H_
+#ifndef _TD_TDB_BTREE_H_
+#define _TD_TDB_BTREE_H_
 
-// #include "sync.h"
+#include "tkvDef.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 typedef struct {
-  /* data */
-} SVnodeSync;
+  pgid_t root;  // root page number
+} TDB_BTREE;
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /*_TD_VNODE_SYNC_H_*/
\ No newline at end of file
+#endif /*_TD_TDB_BTREE_H_*/
\ No newline at end of file

source/dnode/vnode/src/inc/vnodeFS.h → source/libs/tdb/src/inc/tdbBufPool.h

@@ -13,35 +13,27 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TD_VNODE_FS_H_
-#define _TD_VNODE_FS_H_
+#ifndef _TD_TDB_BUF_POOL_H_
+#define _TD_TDB_BUF_POOL_H_
 
-#include "vnode.h"
+#include "tdbPage.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef struct {
-} SDir;
+typedef struct STdbBufPool STdbBufPool;
 
-typedef struct {
-} SFile;
-
-typedef struct SFS {
-  void *pImpl;
-  int (*startEdit)(struct SFS *);
-  int (*endEdit)(struct SFS *);
-} SFS;
-
-typedef struct {
-} SVnodeFS;
-
-int  vnodeOpenFS(SVnode *pVnode);
-void vnodeCloseFS(SVnode *pVnode);
+int       tbpOpen(STdbBufPool **ppTkvBufPool);
+int       tbpClose(STdbBufPool *pTkvBufPool);
+STdbPage *tbpNewPage(STdbBufPool *pTkvBufPool);
+int       tbpDelPage(STdbBufPool *pTkvBufPool);
+STdbPage *tbpFetchPage(STdbBufPool *pTkvBufPool, pgid_t pgid);
+int       tbpUnpinPage(STdbBufPool *pTkvBufPool, pgid_t pgid);
+void      tbpFlushPages(STdbBufPool *pTkvBufPool);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /*_TD_VNODE_FS_H_*/
\ No newline at end of file
+#endif /*_TD_TDB_BUF_POOL_H_*/
\ No newline at end of file

source/libs/tkv/src/inc/tkvEnv.h → source/libs/tdb/src/inc/tdbDB.h

@@ -13,19 +13,28 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TD_TKV_ENV_H_
-#define _TD_TKV_ENV_H_
+#ifndef _TD_TDB_DB_H_
+#define _TD_TDB_DB_H_
+
+#include "tdbBtree.h"
+#include "tdbHash.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct TDB_ENV {
-  char *homeDir;
+
+struct TDB {
+  pgsize_t pageSize;
+  tdb_db_t type;
+  union {
+    TDB_BTREE btree;
+    TDB_HASH  hash;
+  } dbam;  // Different access methods
 };
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /*_TD_TKV_ENV_H_*/
\ No newline at end of file
+#endif /*_TD_TDB_DB_H_*/
\ No newline at end of file

source/libs/tkv/src/inc/tkvDef.h → source/libs/tdb/src/inc/tdbDef.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TD_TKV_DEF_H_
-#define _TD_TKV_DEF_H_
+#ifndef _TD_TDB_DEF_H_
+#define _TD_TDB_DEF_H_
 
 #include "os.h"
 
@@ -39,4 +39,4 @@ typedef int32_t pgsize_t;
 }
 #endif
 
-#endif /*_TD_TKV_DEF_H_*/
\ No newline at end of file
+#endif /*_TD_TDB_DEF_H_*/
\ No newline at end of file

source/libs/tkv/src/inc/tkvDiskMgr.h → source/libs/tdb/src/inc/tdbDiskMgr.h

@@ -22,7 +22,7 @@ extern "C" {
 
 #include "os.h"
 
-#include "tkvDef.h"
+#include "tdbDef.h"
 
 typedef struct STkvDiskMgr STkvDiskMgr;
 

source/libs/tkv/src/inc/tkvDB.h → source/libs/tdb/src/inc/tdbHash.h

@@ -13,19 +13,21 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TD_TKV_DB_H_
-#define _TD_TKV_DB_H_
+#ifndef _TD_TKV_HAHS_H_
+#define _TD_TKV_HAHS_H_
+
+#include "tdbDef.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct TDB {
+typedef struct {
   // TODO
-};
+} TDB_HASH;
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /*_TD_TKV_DB_H_*/
\ No newline at end of file
+#endif /*_TD_TKV_HAHS_H_*/
\ No newline at end of file

source/libs/tkv/src/inc/tkvPage.h → source/libs/tdb/src/inc/tdbPage.h

@@ -17,30 +17,24 @@
 #define _TD_TKV_PAGE_H_
 
 #include "os.h"
-#include "tkvDef.h"
+#include "tdbDef.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef struct STkvPage {
+typedef struct {
   pgid_t  pgid;
   int32_t pinCount;
   bool    idDirty;
   char*   pData;
-} STkvPage;
+} STdbPage;
 
 typedef struct {
   uint16_t dbver;
   uint16_t pgsize;
   uint32_t cksm;
-} STkvPgHdr;
-
-// typedef struct {
-//   SPgHdr   chdr;
-//   uint16_t used;     // number of used slots
-//   uint16_t loffset;  // the offset of the starting location of the last slot used
-// } SSlottedPgHdr;
+} STdbPgHdr;
 
 #ifdef __cplusplus
 }

source/libs/tkv/src/tkvBufPool.c → source/libs/tdb/src/tdbBufPool.c

@@ -16,17 +16,17 @@
 #include "thash.h"
 #include "tlist.h"
 
-#include "tkvBufPool.h"
-#include "tkvDiskMgr.h"
-#include "tkvPage.h"
+#include "tdbBufPool.h"
+#include "tdbDiskMgr.h"
+#include "tdbPage.h"
 
 struct SFrameIdWrapper {
   TD_SLIST_NODE(SFrameIdWrapper);
   frame_id_t id;
 };
 
-struct STkvBufPool {
-  STkvPage*    pages;
+struct STdbBufPool {
+  STdbPage*    pages;
   STkvDiskMgr* pDiskMgr;
   SHashObj*    pgTb;  // page_id_t --> frame_id_t
   TD_SLIST(SFrameIdWrapper) freeList;

source/libs/tkv/src/tDiskMgr.c → source/libs/tdb/src/tdbDiskMgr.c

@@ -13,7 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "tkvDiskMgr.h"
+#include "tdbDiskMgr.h"
 
 struct STkvDiskMgr {
   char *   fname;

source/libs/tdb/test/CMakeLists.txt

+# tdbTest
+add_executable(tdbTest "tdbTest.cpp")
+target_link_libraries(tdbTest tdb gtest gtest_main)
\ No newline at end of file

source/libs/tdb/test/tdbTest.cpp

+#include "gtest/gtest.h"
+
+#include "tdb.h"
+
+TEST(tdb_api_test, tdb_create_open_close_db_test) {
+  int  ret;
+  TDB *dbp;
+
+  tdbCreateDB(&dbp);
+
+  tdbOpenDB(dbp, TDB_BTREE, 0);
+
+  tdbCloseDB(dbp, 0);
+}
\ No newline at end of file

source/libs/tkv/src/inc/tkvBufPool.h

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _TD_TKV_BUF_POOL_H_
-#define _TD_TKV_BUF_POOL_H_
-
-#include "tkvPage.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct STkvBufPool STkvBufPool;
-
-int       tbpOpen(STkvBufPool **ppTkvBufPool);
-int       tbpClose(STkvBufPool *pTkvBufPool);
-STkvPage *tbpNewPage(STkvBufPool *pTkvBufPool);
-int       tbpDelPage(STkvBufPool *pTkvBufPool);
-STkvPage *tbpFetchPage(STkvBufPool *pTkvBufPool, pgid_t pgid);
-int       tbpUnpinPage(STkvBufPool *pTkvBufPool, pgid_t pgid);
-void      tbpFlushPages(STkvBufPool *pTkvBufPool);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*_TD_TKV_BUF_POOL_H_*/
\ No newline at end of file

source/libs/tkv/test/tDiskMgrTest.cpp

-#include "gtest/gtest.h"
-
-#include "iostream"
-
-#include "tDiskMgr.h"
-
-TEST(tDiskMgrTest, simple_test) {
-  // TODO
-  std::cout << "This is in tDiskMgrTest::simple_test" << std::endl;
-}
\ No newline at end of file