Merge branch '3.0' into feature/tq

CMakeLists.txt

@@ -50,6 +50,11 @@ if(${BUILD_WITH_LUCENE})
     cat("${CMAKE_SUPPORT_DIR}/lucene_CMakeLists.txt.in" ${DEPS_TMP_FILE})
 endif(${BUILD_WITH_LUCENE})
 
+## NuRaft
+if(${BUILD_WITH_NURAFT})
+    cat("${CMAKE_SUPPORT_DIR}/nuraft_CMakeLists.txt.in" ${DEPS_TMP_FILE})
+endif(${BUILD_WITH_NURAFT})
+
 ## download dependencies
 configure_file(${DEPS_TMP_FILE} "${CMAKE_SOURCE_DIR}/deps/deps-download/CMakeLists.txt")
 execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
@@ -69,4 +74,7 @@ target_include_directories(api INTERFACE "include/client")
 # src
 add_subdirectory(source)
 
+# docs 
+add_subdirectory(docs)
+
 # tests (TODO)

Jenkinsfile

@@ -142,7 +142,7 @@ pipeline {
           }
       }
   //     stage('Parallel test stage') {
-  //       //only build pr
+  //     skip defaultCheckout 
   //       options { skipDefaultCheckout() } 
   //       when {
   //         allOf{

cmake/cmake.options

@@ -16,7 +16,7 @@ option(
 option(
     BUILD_WITH_ROCKSDB 
     "If build with rocksdb" 
-    OFF
+    ON
 )
 
 option(
@@ -25,8 +25,20 @@ option(
     OFF
 )
 
+option(
+    BUILD_WITH_NURAFT
+    "If build with NuRaft" 
+    OFF
+)
+
 option(
     BUILD_DEPENDENCY_TESTS 
     "If build dependency tests" 
     OFF
 )
+
+option(
+    BUILD_DOCS
+    "If use doxygen build documents" 
+    ON
+)
\ No newline at end of file

cmake/nuraft_CMakeLists.txt.in

+
+# NuRaft
+ExternalProject_Add(NuRaft
+        GIT_REPOSITORY https://github.com/eBay/NuRaft.git
+        GIT_TAG v1.3.0
+        SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/nuraft"
+        BINARY_DIR "${CMAKE_SOURCE_DIR}/deps/nuraft"
+        CONFIGURE_COMMAND "./prepare.sh"
+        BUILD_COMMAND ""
+        INSTALL_COMMAND ""
+        TEST_COMMAND ""
+        )
\ No newline at end of file

deps/CMakeLists.txt

@@ -67,6 +67,12 @@ if(${BUILD_WITH_LUCENE})
     add_subdirectory(lucene)
 endif(${BUILD_WITH_LUCENE})
 
+# NuRaft
+if(${BUILD_WITH_NURAFT})
+    add_subdirectory(nuraft)
+endif(${BUILD_WITH_NURAFT})
+
+
 # ================================================================================================
 # DEPENDENCY TEST
 # ================================================================================================

docs/CMakeLists.txt

+# Generate API documentation
+## https://vicrucann.github.io/tutorials/quick-cmake-doxygen/
+if(${BUILD_DOCS})
+    find_package(Doxygen)
+    if (DOXYGEN_FOUND)
+        # Build the doc
+        set(DOXYGEN_IN ${CMAKE_SOURCE_DIR}/docs/Doxyfile.in)
+        set(DOXYGEN_OUT ${CMAKE_BINARY_DIR}/Doxyfile)
+
+        configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT} @ONLY)
+        message("Doxygen build start")
+
+        add_custom_target(
+            tdengine_doxygen ALL
+            COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT}
+            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+            COMMENT "Generating API doxumentation with Doxygen"
+            VERBATIM
+        )
+    else(DOXYGEN_FOUND)
+        message("Doxygen need to be installed to generate the doxygen documentation")
+    endif(DOXYGEN_FOUND)
+endif(${BUILD_DOCS})
\ No newline at end of file

include/common/common.h

@@ -19,7 +19,7 @@
 #include "taosdef.h"
 #include "taosmsg.h"
 #include "tarray.h"
-
+#include "tvariant.h"
 //typedef struct STimeWindow {
 //  TSKEY skey;
 //  TSKEY ekey;
@@ -66,4 +66,59 @@ typedef struct SColumnInfoData {
   char       *pData;    // the corresponding block data in memory
 } SColumnInfoData;
 
+//======================================================================================================================
+// the following structure shared by parser and executor
+typedef struct SColumn {
+  uint64_t     uid;
+  char         name[TSDB_COL_NAME_LEN];
+  int8_t       flag;      // column type: normal column, tag, or user-input column (integer/float/string)
+  SColumnInfo  info;
+} SColumn;
+
+typedef struct SLimit {
+  int64_t   limit;
+  int64_t   offset;
+} SLimit;
+
+typedef struct SOrder {
+  uint32_t  order;
+  int32_t   orderColId;
+} SOrder;
+
+typedef struct SGroupbyExpr {
+  SArray*  columnInfo;  // SArray<SColIndex>, group by columns information
+  bool     groupbyTag;  // group by tag or column
+} SGroupbyExpr;
+
+// the structure for sql function in select clause
+typedef struct SSqlExpr {
+  char      token[TSDB_COL_NAME_LEN];      // original token
+  SSchema   resSchema;
+
+  int32_t   numOfCols;
+  SColumn*  pColumns;       // data columns that are required by query
+  int32_t   interBytes;     // inter result buffer size
+  int16_t   numOfParams;    // argument value of each function
+  SVariant  param[3];       // parameters are not more than 3
+} SSqlExpr;
+
+typedef struct SExprInfo {
+  struct SSqlExpr    base;
+  struct tExprNode  *pExpr;
+} SExprInfo;
+
+typedef struct SStateWindow {
+  SColumn col;
+} SStateWindow;
+
+typedef struct SSessionWindow {
+  int64_t gap;             // gap between two session window(in microseconds)
+  SColumn col;
+} SSessionWindow;
+
+#define QUERY_ASC_FORWARD_STEP   1
+#define QUERY_DESC_FORWARD_STEP -1
+
+#define GET_FORWARD_DIRECTION_FACTOR(ord) (((ord) == TSDB_ORDER_ASC) ? QUERY_ASC_FORWARD_STEP : QUERY_DESC_FORWARD_STEP)
+
 #endif  // TDENGINE_COMMON_H

include/common/taosmsg.h

@@ -204,14 +204,14 @@ enum _mgmt_table {
 #define TSDB_COL_NORMAL             0x0u    // the normal column of the table
 #define TSDB_COL_TAG                0x1u    // the tag column type
 #define TSDB_COL_UDC                0x2u    // the user specified normal string column, it is a dummy column
-#define TSDB_COL_NULL               0x4u    // the column filter NULL or not
+#define TSDB_COL_TMP                0x4u    // internal column generated by the previous operators
+#define TSDB_COL_NULL               0x8u    // the column filter NULL or not
 
 #define TSDB_COL_IS_TAG(f)          (((f&(~(TSDB_COL_NULL)))&TSDB_COL_TAG) != 0)
 #define TSDB_COL_IS_NORMAL_COL(f)   ((f&(~(TSDB_COL_NULL))) == TSDB_COL_NORMAL)
 #define TSDB_COL_IS_UD_COL(f)       ((f&(~(TSDB_COL_NULL))) == TSDB_COL_UDC)
 #define TSDB_COL_REQ_NULL(f)        (((f)&TSDB_COL_NULL) != 0)
 
-
 extern char *taosMsg[];
 
 #pragma pack(push, 1)
@@ -399,8 +399,6 @@ typedef struct {
 typedef struct {
   char   user[TSDB_USER_LEN];
   char   pass[TSDB_KEY_LEN];
-  int8_t privilege;
-  int8_t flag;
 } SCreateUserMsg, SAlterUserMsg;
 
 typedef struct {
@@ -491,11 +489,6 @@ typedef struct SInterval {
   int64_t offset;
 } SInterval;
 
-typedef struct SSessionWindow {
-  int64_t gap;             // gap between two session window(in microseconds)
-  int32_t primaryColId;    // primary timestamp column
-} SSessionWindow;
-
 typedef struct {
   SMsgHead    head;
   char        version[TSDB_VERSION_LEN];
@@ -520,7 +513,7 @@ typedef struct {
   int16_t     orderColId;
   int16_t     numOfCols;        // the number of columns will be load from vnode
   SInterval   interval;
-  SSessionWindow sw;            // session window
+//  SSessionWindow sw;            // session window
   uint16_t    tagCondLen;       // tag length in current query
   uint16_t    colCondLen;       // column length in current query
   int16_t     numOfGroupCols;   // num of group by columns

include/common/tname.h

@@ -16,6 +16,8 @@
 #ifndef TDENGINE_TNAME_H
 #define TDENGINE_TNAME_H
 
+#include "taosmsg.h"
+
 #define TSDB_DB_NAME_T     1
 #define TSDB_TABLE_NAME_T  2
 
@@ -52,6 +54,8 @@ int32_t tNameFromString(SName* dst, const char* str, uint32_t type);
 
 int32_t tNameSetAcctId(SName* dst, const char* acct);
 
+SSchema* tGetTbnameColumnSchema();
+
 #if 0
 int32_t tNameSetDbName(SName* dst, const char* acct, SToken* dbToken);
 #endif

include/common/trequest.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_TREQUEST_H_
+#define _TD_TREQUEST_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* ------------------------ TYPES EXPOSED ------------------------ */
+typedef struct SRequest      SRequest;
+typedef struct SReqBatch     SReqBatch;
+typedef struct SReqBatchIter SReqBatchIter;
+
+// SRequest
+
+// SReqBatch
+
+// SReqBatchIter
+void            tdInitRBIter(SReqBatchIter *pIter, SReqBatch *pReqBatch);
+const SRequest *tdRBIterNext(SReqBatchIter *pIter);
+void            tdClearRBIter(SReqBatchIter *pIter);
+
+/* ------------------------ TYPES DEFINITION ------------------------ */
+struct SReqBatchIter {
+  int        iReq;
+  SReqBatch *pReqBatch;
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*_TD_TREQUEST_H_*/
\ No newline at end of file

source/libs/function/inc/ttszip.h → include/common/ttszip.h

@@ -21,7 +21,7 @@ extern "C" {
 #endif
 
 #include "os.h"
-#include "taosdef.h"
+#include "tdef.h"
 #include "tvariant.h"
 
 #define MEM_BUF_SIZE (1 << 20)

include/server/mnode/mnode.h → include/dnode/mnode/mnode.h

@@ -55,17 +55,16 @@ typedef struct {
 int32_t mnodeInit(SMnodePara para);
 void    mnodeCleanup();
 
-int32_t mnodeDeploy(char *path, SMnodeCfg *pCfg);
-void    mnodeUnDeploy(char *path);
-int32_t mnodeStart(char *path, SMnodeCfg *pCfg);
+int32_t mnodeDeploy(SMnodeCfg *pCfg);
+void    mnodeUnDeploy();
+int32_t mnodeStart(SMnodeCfg *pCfg);
 int32_t mnodeAlter(SMnodeCfg *pCfg);
 void    mnodeStop();
 
 int32_t mnodeGetLoad(SMnodeLoad *pLoad);
 int32_t mnodeRetriveAuth(char *user, char *spi, char *encrypt, char *secret, char *ckey);
 
-SMnodeMsg *mnodeInitMsg(int32_t msgNum);
-int32_t    mnodeAppendMsg(SMnodeMsg *pMsg, SRpcMsg *pRpcMsg);
+SMnodeMsg *mnodeInitMsg(SRpcMsg *pRpcMsg);
 void       mnodeCleanupMsg(SMnodeMsg *pMsg);
 void       mnodeProcessMsg(SMnodeMsg *pMsg, EMnMsgType msgType);
 

include/dnode/mnode/sdb/sdb.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_SDB_H_
+#define _TD_SDB_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define SDB_GET_INT64(pData, pRow, dataPos, val)   \
+  {                                                \
+    if (sdbGetRawInt64(pRaw, dataPos, val) != 0) { \
+      sdbFreeRow(pRow);                            \
+      return NULL;                                 \
+    }                                              \
+    dataPos += sizeof(int64_t);                    \
+  }
+
+#define SDB_GET_INT32(pData, pRow, dataPos, val)   \
+  {                                                \
+    if (sdbGetRawInt32(pRaw, dataPos, val) != 0) { \
+      sdbFreeRow(pRow);                            \
+      return NULL;                                 \
+    }                                              \
+    dataPos += sizeof(int32_t);                    \
+  }
+
+#define SDB_GET_INT8(pData, pRow, dataPos, val)   \
+  {                                               \
+    if (sdbGetRawInt8(pRaw, dataPos, val) != 0) { \
+      sdbFreeRow(pRow);                           \
+      return NULL;                                \
+    }                                             \
+    dataPos += sizeof(int8_t);                    \
+  }
+
+#define SDB_GET_BINARY(pRaw, pRow, dataPos, val, valLen)    \
+  {                                                         \
+    if (sdbGetRawBinary(pRaw, dataPos, val, valLen) != 0) { \
+      sdbFreeRow(pRow);                                     \
+      return NULL;                                          \
+    }                                                       \
+    dataPos += valLen;                                      \
+  }
+
+#define SDB_SET_INT64(pData, dataPos, val)         \
+  {                                                \
+    if (sdbSetRawInt64(pRaw, dataPos, val) != 0) { \
+      sdbFreeRaw(pRaw);                               \
+      return NULL;                                 \
+    };                                             \
+    dataPos += sizeof(int64_t);                    \
+  }
+
+#define SDB_SET_INT32(pData, dataPos, val)         \
+  {                                                \
+    if (sdbSetRawInt32(pRaw, dataPos, val) != 0) { \
+      sdbFreeRaw(pRaw);                               \
+      return NULL;                                 \
+    };                                             \
+    dataPos += sizeof(int32_t);                    \
+  }
+
+#define SDB_SET_INT8(pData, dataPos, val)         \
+  {                                               \
+    if (sdbSetRawInt8(pRaw, dataPos, val) != 0) { \
+      sdbFreeRaw(pRaw);                              \
+      return NULL;                                \
+    };                                            \
+    dataPos += sizeof(int8_t);                    \
+  }
+
+#define SDB_SET_BINARY(pRaw, dataPos, val, valLen)          \
+  {                                                         \
+    if (sdbSetRawBinary(pRaw, dataPos, val, valLen) != 0) { \
+      sdbFreeRaw(pRaw);                                        \
+      return NULL;                                          \
+    };                                                      \
+    dataPos += valLen;                                      \
+  }
+
+#define SDB_SET_DATALEN(pRaw, dataLen)          \
+  {                                             \
+    if (sdbSetRawDataLen(pRaw, dataLen) != 0) { \
+      sdbFreeRaw(pRaw);                         \
+      return NULL;                              \
+    };                                          \
+  }
+
+typedef struct SSdbRaw SSdbRaw;
+typedef struct SSdbRow SSdbRow;
+typedef enum { SDB_KEY_BINARY = 1, SDB_KEY_INT32 = 2, SDB_KEY_INT64 = 3 } EKeyType;
+typedef enum {
+  SDB_STATUS_CREATING = 1,
+  SDB_STATUS_READY = 2,
+  SDB_STATUS_DROPPING = 3,
+  SDB_STATUS_DROPPED = 4
+} ESdbStatus;
+
+typedef enum {
+  SDB_START = 0,
+  SDB_TRANS = 1,
+  SDB_CLUSTER = 2,
+  SDB_DNODE = 3,
+  SDB_MNODE = 4,
+  SDB_USER = 5,
+  SDB_AUTH = 6,
+  SDB_ACCT = 7,
+  SDB_DB = 8,
+  SDB_VGROUP = 9,
+  SDB_STABLE = 10,
+  SDB_FUNC = 11,
+  SDB_MAX = 12
+} ESdbType;
+
+typedef int32_t (*SdbInsertFp)(void *pObj);
+typedef int32_t (*SdbUpdateFp)(void *pSrcObj, void *pDstObj);
+typedef int32_t (*SdbDeleteFp)(void *pObj);
+typedef int32_t (*SdbDeployFp)();
+typedef SSdbRow *(*SdbDecodeFp)(SSdbRaw *pRaw);
+typedef SSdbRaw *(*SdbEncodeFp)(void *pObj);
+
+typedef struct {
+  ESdbType    sdbType;
+  EKeyType    keyType;
+  SdbDeployFp deployFp;
+  SdbEncodeFp encodeFp;
+  SdbDecodeFp decodeFp;
+  SdbInsertFp insertFp;
+  SdbUpdateFp updateFp;
+  SdbDeleteFp deleteFp;
+} SSdbTable;
+
+int32_t sdbInit();
+void    sdbCleanup();
+void    sdbSetTable(SSdbTable table);
+
+int32_t sdbOpen();
+void    sdbClose();
+int32_t sdbWrite(SSdbRaw *pRaw);
+
+int32_t sdbDeploy();
+void    sdbUnDeploy();
+
+void   *sdbAcquire(ESdbType sdb, void *pKey);
+void    sdbRelease(void *pObj);
+void   *sdbFetch(ESdbType sdb, void *pIter, void **ppObj);
+void    sdbCancelFetch(void *pIter);
+int32_t sdbGetSize(ESdbType sdb);
+
+SSdbRaw *sdbAllocRaw(ESdbType sdb, int8_t sver, int32_t dataLen);
+void     sdbFreeRaw(SSdbRaw *pRaw);
+int32_t  sdbSetRawInt8(SSdbRaw *pRaw, int32_t dataPos, int8_t val);
+int32_t  sdbSetRawInt32(SSdbRaw *pRaw, int32_t dataPos, int32_t val);
+int32_t  sdbSetRawInt64(SSdbRaw *pRaw, int32_t dataPos, int64_t val);
+int32_t  sdbSetRawBinary(SSdbRaw *pRaw, int32_t dataPos, const char *pVal, int32_t valLen);
+int32_t  sdbSetRawDataLen(SSdbRaw *pRaw, int32_t dataLen);
+int32_t  sdbSetRawStatus(SSdbRaw *pRaw, ESdbStatus status);
+int32_t  sdbGetRawInt8(SSdbRaw *pRaw, int32_t dataPos, int8_t *val);
+int32_t  sdbGetRawInt32(SSdbRaw *pRaw, int32_t dataPos, int32_t *val);
+int32_t  sdbGetRawInt64(SSdbRaw *pRaw, int32_t dataPos, int64_t *val);
+int32_t  sdbGetRawBinary(SSdbRaw *pRaw, int32_t dataPos, char *pVal, int32_t valLen);
+int32_t  sdbGetRawSoftVer(SSdbRaw *pRaw, int8_t *sver);
+int32_t  sdbGetRawTotalSize(SSdbRaw *pRaw);
+
+SSdbRow *sdbAllocRow(int32_t objSize);
+void     sdbFreeRow(SSdbRow *pRow);
+void    *sdbGetRowObj(SSdbRow *pRow);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*_TD_SDB_H_*/

source/dnode/mnode/inc/mnodeSdb.h → include/dnode/mnode/transaction/trn.h

@@ -13,40 +13,37 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TD_MNODE_SDB_H_
-#define _TD_MNODE_SDB_H_
+#ifndef _TD_TRANSACTION_H_
+#define _TD_TRANSACTION_H_
 
-#include "mnodeInt.h"
+#include "sdb.h"
+#include "taosmsg.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef void (*SdbDeployFp)();
-typedef void *(*SdbDecodeFp)(cJSON *root);
-typedef int32_t (*SdbEncodeFp)(void *pHead, char *buf, int32_t maxLen);
+typedef struct STrans STrans;
+typedef enum { TRN_POLICY_ROLLBACK = 1, TRN_POLICY_RETRY = 2 } ETrnPolicy;
 
-int32_t sdbInit();
-void    sdbCleanup();
+int32_t trnInit();
+void    trnCleanup();
 
-int32_t sdbRead();
-int32_t sdbCommit();
+STrans *trnCreate(ETrnPolicy);
+void    trnDrop(STrans *pTrans);
+void    trnSetRpcHandle(STrans *pTrans, void *rpcHandle);
+int32_t trnAppendRedoLog(STrans *pTrans, SSdbRaw *pRaw);
+int32_t trnAppendUndoLog(STrans *pTrans, SSdbRaw *pRaw);
+int32_t trnAppendCommitLog(STrans *pTrans, SSdbRaw *pRaw);
+int32_t trnAppendRedoAction(STrans *pTrans, SEpSet *, void *pMsg);
+int32_t trnAppendUndoAction(STrans *pTrans, SEpSet *, void *pMsg);
 
-int32_t sdbDeploy();
-void    sdbUnDeploy();
-
-void   *sdbInsertRow(EMnSdb sdb, void *pObj);
-void    sdbDeleteRow(EMnSdb sdb, void *pHead);
-void   *sdbUpdateRow(EMnSdb sdb, void *pHead);
-void   *sdbGetRow(EMnSdb sdb, void *pKey);
-void   *sdbFetchRow(EMnSdb sdb, void *pIter);
-void    sdbCancelFetch(EMnSdb sdb, void *pIter);
-int32_t sdbGetCount(EMnSdb sdb);
-
-void sdbSetFp(EMnSdb, EMnKey, SdbDeployFp, SdbEncodeFp, SdbDecodeFp, int32_t dataSize);
+int32_t trnPrepare(STrans *pTrans, int32_t (*syncfp)(SSdbRaw *pRaw, void *pData));
+int32_t trnApply(SSdbRaw *pRaw, void *pData, int32_t code);
+int32_t trnExecute(int32_t tranId);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /*_TD_MNODE_INT_H_*/
+#endif /*_TD_TRANSACTION_H_*/

include/util/amalloc.h → include/dnode/vnode/meta/impl/metaImpl.h

@@ -13,40 +13,63 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TD_AMALLOC_H_
-#define _TD_AMALLOC_H_
+#ifndef _TD_META_IMPL_H_
+#define _TD_META_IMPL_H_
 
 #include "os.h"
 
+#include "taosmsg.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
+typedef uint64_t tb_uid_t;
+
+/* ------------------------ SMetaOptions ------------------------ */
+struct SMetaOptions {
+  size_t lruCacheSize;  // LRU cache size
+};
+
+/* ------------------------ STbOptions ------------------------ */
+#define META_NORMAL_TABLE ((uint8_t)1)
+#define META_SUPER_TABLE ((uint8_t)2)
+#define META_CHILD_TABLE ((uint8_t)3)
 
-#define AMALLOC_APIS                                  \
-  void *(*malloc)(void *, size_t size);               \
-  void *(*calloc)(void *, size_t nmemb, size_t size); \
-  void *(*realloc)(void *, size_t size);              \
-  void (*free)(void *ptr);
+typedef struct {
+} SSMAOptions;
+
+// super table options
+typedef struct {
+  tb_uid_t  uid;
+  STSchema* pSchema;
+  STSchema* pTagSchema;
+} SSTbOptions;
 
-// Interfaces to implement
+// child table options
 typedef struct {
-  AMALLOC_APIS
-} SMemAllocatorIf;
+  tb_uid_t suid;
+  SKVRow   tags;
+} SCTbOptions;
 
+// normal table options
 typedef struct {
-  void *impl;
-  AMALLOC_APIS
-} SMemAllocator;
+  STSchema* pSchame;
+} SNTbOptions;
 
-#define amalloc(allocator, size) ((allocator) ? (*((allocator)->malloc))((allocator)->impl, (size)) : malloc(size))
-#define acalloc(allocator, nmemb, size) \
-  ((allocator) ? (*((allocator)->calloc))((allocator)->impl, (nmemb), (size)) : calloc((nmemb), (size)))
-#define arealloc(allocator, ptr, size) \
-  ((allocator) ? (*((allocator)->realloc))((allocator)->impl, (ptr), (size)) : realloc((ptr), (size)))
-#define afree(allocator, ptr, size) ((allocator) ? (*((allocator)->free))((allocator)->impl, (ptr), (size)) : free(ptr))
+struct STbOptions {
+  uint8_t     type;
+  char*       name;
+  uint32_t    ttl;   // time to live in (SECONDS)
+  SSMAOptions bsma;  // Block-wise sma
+  union {
+    SSTbOptions stbOptions;
+    SNTbOptions ntbOptions;
+    SCTbOptions ctbOptions;
+  };
+};
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /*_TD_AMALLOC_H_*/
\ No newline at end of file
+#endif /*_TD_META_IMPL_H_*/
\ No newline at end of file

include/dnode/vnode/meta/meta.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_META_H_
+#define _TD_META_H_
+
+#include "impl/metaImpl.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Types exported
+typedef struct SMeta        SMeta;
+typedef struct SMetaOptions SMetaOptions;
+typedef struct STbOptions   STbOptions;
+
+// SMeta operations
+SMeta *metaOpen(const char *path, const SMetaOptions *);
+void   metaClose(SMeta *);
+void   metaRemove(const char *path);
+int    metaCreateTable(SMeta *pMeta, const STbOptions *);
+int    metaDropTable(SMeta *pMeta, tb_uid_t uid);
+int    metaCommit(SMeta *);
+
+// Options
+void metaOptionsInit(SMetaOptions *);
+void metaOptionsClear(SMetaOptions *);
+
+// STableOpts
+#define META_TABLE_OPTS_DECLARE(name) STableOpts name = {0}
+void metaNormalTableOptsInit(STbOptions *, const char *name, const STSchema *pSchema);
+void metaSuperTableOptsInit(STbOptions *, const char *name, tb_uid_t uid, const STSchema *pSchema,
+                            const STSchema *pTagSchema);
+void metaChildTableOptsInit(STbOptions *, const char *name, tb_uid_t suid, const SKVRow tags);
+void metaTableOptsClear(STbOptions *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*_TD_META_H_*/

include/server/vnode/tsdb/impl/tsdbImpl.h → include/dnode/vnode/tsdb/impl/tsdbImpl.h

@@ -23,6 +23,7 @@ extern "C" {
 #endif
 
 struct STsdbOptions {
+  size_t lruCacheSize;
   /* TODO */
 };
 

include/server/vnode/vnode.h → include/dnode/vnode/vnode.h

@@ -17,14 +17,80 @@
 #define _TD_VNODE_H_
 
 #include "os.h"
-#include "taosmsg.h"
-#include "trpc.h"
+#include "trequest.h"
+
+#include "meta.h"
+#include "tq.h"
+#include "tsdb.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+/* ------------------------ TYPES EXPOSED ------------------------ */
 typedef struct SVnode        SVnode;
+typedef struct SVnodeOptions SVnodeOptions;
+
+/* ------------------------ SVnode ------------------------ */
+SVnode *vnodeOpen(const char *path, const SVnodeOptions *pVnodeOptions);
+void    vnodeClose(SVnode *pVnode);
+void    vnodeDestroy(const char *path);
+int     vnodeProcessWriteReqs(SVnode *pVnode, SReqBatch *pReqBatch);
+int     vnodeApplyWriteRequest(SVnode *pVnode, const SRequest *pRequest);
+int     vnodeProcessReadReq(SVnode *pVnode, SRequest *pReq);
+int     vnodeProcessSyncReq(SVnode *pVnode, SRequest *pReq);
+
+/* ------------------------ SVnodeOptions ------------------------ */
+void vnodeOptionsInit(SVnodeOptions *);
+void vnodeOptionsClear(SVnodeOptions *);
+
+/* ------------------------ STRUCT DEFINITIONS ------------------------ */
+struct SVnodeOptions {
+  /**
+   * @brief write buffer size in BYTES
+   *
+   */
+  uint64_t wsize;
+
+  /**
+   * @brief time to live of tables in this vnode
+   * in SECONDS
+   *
+   */
+  uint32_t ttl;
+
+  /**
+   * @brief if time-series requests eventual consistency
+   *
+   */
+  bool isWeak;
+
+  /**
+   * @brief if the allocator is heap allcator or arena allocator
+   *
+   */
+  bool isHeapAllocator;
+
+  /**
+   * @brief TSDB options
+   *
+   */
+  STsdbOptions tsdbOptions;
+
+  /**
+   * @brief META options
+   *
+   */
+  SMetaOptions metaOptions;
+  // STqOptions   tqOptions; // TODO
+};
+
+/* ------------------------ FOR COMPILE ------------------------ */
+
+#if 1
+
+#include "taosmsg.h"
+#include "trpc.h"
 
 typedef struct {
   char     db[TSDB_FULL_DB_NAME_LEN];
@@ -71,8 +137,6 @@ typedef struct {
 int32_t vnodeInit(SVnodePara);
 void    vnodeCleanup();
 
-SVnode *vnodeOpen(int32_t vgId, const char *path);
-void    vnodeClose(SVnode *pVnode);
 int32_t vnodeAlter(SVnode *pVnode, const SVnodeCfg *pCfg);
 SVnode *vnodeCreate(int32_t vgId, const char *path, const SVnodeCfg *pCfg);
 void    vnodeDrop(SVnode *pVnode);
@@ -86,6 +150,8 @@ int32_t    vnodeAppendMsg(SVnodeMsg *pMsg, SRpcMsg *pRpcMsg);
 void       vnodeCleanupMsg(SVnodeMsg *pMsg);
 void       vnodeProcessMsg(SVnode *pVnode, SVnodeMsg *pMsg, EVnMsgType msgType);
 
+#endif
+
 #ifdef __cplusplus
 }
 #endif

include/libs/function/function.h

@@ -26,8 +26,8 @@ extern "C" {
 
 #define MAX_INTERVAL_TIME_WINDOW 1000000  // maximum allowed time windows in final results
 
-#define FUNCTION_SCALAR       1
-#define FUNCTION_AGG          2
+#define FUNCTION_TYPE_SCALAR       1
+#define FUNCTION_TYPE_AGG          2
 
 #define TOP_BOTTOM_QUERY_LIMIT    100
 #define FUNCTIONS_NAME_MAX_LENGTH 16
@@ -78,13 +78,30 @@ extern "C" {
 #define FUNCTION_MODE         36
 #define FUNCTION_SAMPLE       37
 
+#define FUNCTION_COV          38
+
+// determine the real data need to calculated the result
+enum {
+  BLK_DATA_NO_NEEDED     = 0x0,
+  BLK_DATA_STATIS_NEEDED = 0x1,
+  BLK_DATA_ALL_NEEDED    = 0x3,
+  BLK_DATA_DISCARD       = 0x4,   // discard current data block since it is not qualified for filter
+};
+
+enum {
+  MASTER_SCAN   = 0x0u,
+  REVERSE_SCAN  = 0x1u,
+  REPEAT_SCAN   = 0x2u,  //repeat scan belongs to the master scan
+  MERGE_STAGE   = 0x20u,
+};
+
 typedef struct SPoint1 {
   int64_t   key;
   union{double  val; char* ptr;};
 } SPoint1;
 
 struct SQLFunctionCtx;
-struct SResultRowCellInfo;
+struct SResultRowEntryInfo;
 
 //for selectivity query, the corresponding tag value is assigned if the data is qualified
 typedef struct SExtTagsInfo {
@@ -93,6 +110,23 @@ typedef struct SExtTagsInfo {
   struct SQLFunctionCtx **pTagCtxList;
 } SExtTagsInfo;
 
+typedef struct SResultDataInfo {
+  int16_t type;
+  int16_t bytes;
+  int32_t intermediateBytes;
+} SResultDataInfo;
+
+#define GET_RES_INFO(ctx) ((ctx)->resultInfo)
+
+typedef struct SFunctionFpSet {
+  bool (*init)(struct SQLFunctionCtx *pCtx, struct SResultRowEntryInfo* pResultCellInfo);  // setup the execute environment
+  void (*addInput)(struct SQLFunctionCtx *pCtx);
+
+  // finalizer must be called after all exec has been executed to generated final result.
+  void (*finalize)(struct SQLFunctionCtx *pCtx);
+  void (*combine)(struct SQLFunctionCtx *pCtx);
+} SFunctionFpSet;
+
 // sql function runtime context
 typedef struct SQLFunctionCtx {
   int32_t      size;      // number of rows
@@ -101,9 +135,7 @@ typedef struct SQLFunctionCtx {
   int16_t      inputType;
   int16_t      inputBytes;
 
-  int16_t      outputType;
-  int16_t      outputBytes;   // size of results, determined by function and input column data type
-  int32_t      interBufBytes; // internal buffer size
+  SResultDataInfo resDataInfo;
   bool         hasNull;       // null value exist in current block
   bool         requireNull;   // require null in some function
   bool         stableQuery;
@@ -117,18 +149,21 @@ typedef struct SQLFunctionCtx {
   void        *ptsOutputBuf;  // corresponding output buffer for timestamp of each result, e.g., top/bottom*/
   SVariant     tag;
 
-  bool         isSmaSet;
-  SColumnDataAgg sma;
-  struct  SResultRowCellInfo *resultInfo;
+  bool        isAggSet;
+  SColumnDataAgg agg;
+  struct  SResultRowEntryInfo *resultInfo;
   SExtTagsInfo tagInfo;
   SPoint1      start;
   SPoint1      end;
+
+  SFunctionFpSet* fpSet;
 } SQLFunctionCtx;
 
 enum {
   TEXPR_NODE_DUMMY     = 0x0,
   TEXPR_BINARYEXPR_NODE= 0x1,
   TEXPR_UNARYEXPR_NODE = 0x2,
+  TEXPR_FUNCTION_NODE  = 0x3,
   TEXPR_COL_NODE       = 0x4,
   TEXPR_VALUE_NODE     = 0x8,
 };
@@ -137,10 +172,7 @@ typedef struct tExprNode {
   uint8_t nodeType;
   union {
     struct {
-      union {
       int32_t           optr;   // binary operator
-        int32_t         functionId;// unary operator
-      };
       void             *info;   // support filter operation on this expression only available for leaf node
       struct tExprNode *pLeft;  // left child pointer
       struct tExprNode *pRight; // right child pointer
@@ -148,44 +180,52 @@ typedef struct tExprNode {
 
     SSchema            *pSchema;// column node
     struct SVariant    *pVal;   // value node
+
+    struct {// function node
+      char              functionName[FUNCTIONS_NAME_MAX_LENGTH];
+//      int32_t           functionId;
+      int32_t           num;
+
+      // Note that the attribute of pChild is not the parameter of function, it is the columns that involved in the
+      // calculation instead.
+      // E.g., Cov(col1, col2), the column information, w.r.t. the col1 and col2, is kept in pChild nodes.
+      //  The concat function, concat(col1, col2), is a binary scalar
+      //  operator and is kept in the attribute of _node.
+      struct tExprNode **pChild;
+    } _function;
   };
 } tExprNode;
 
+//TODO create?
 void exprTreeToBinary(SBufferWriter* bw, tExprNode* pExprTree);
 void tExprTreeDestroy(tExprNode *pNode, void (*fp)(void *));
 
 typedef struct SAggFunctionInfo {
   char      name[FUNCTIONS_NAME_MAX_LENGTH];
   int8_t    type;         // Scalar function or aggregation function
-  uint8_t  functionId;   // Function Id
+  uint32_t  functionId;   // Function Id
   int8_t    sFunctionId;  // Transfer function for super table query
   uint16_t  status;
 
-  bool (*init)(SQLFunctionCtx *pCtx, struct SResultRowCellInfo* pResultCellInfo);  // setup the execute environment
-  void (*exec)(SQLFunctionCtx *pCtx);
+  bool (*init)(SQLFunctionCtx *pCtx, struct SResultRowEntryInfo* pResultCellInfo);  // setup the execute environment
+  void (*addInput)(SQLFunctionCtx *pCtx);
 
   // finalizer must be called after all exec has been executed to generated final result.
-  void (*xFinalize)(SQLFunctionCtx *pCtx);
-  void (*mergeFunc)(SQLFunctionCtx *pCtx);
+  void (*finalize)(SQLFunctionCtx *pCtx);
+  void (*combine)(SQLFunctionCtx *pCtx);
 
   int32_t (*dataReqFunc)(SQLFunctionCtx *pCtx, STimeWindow* w, int32_t colId);
 } SAggFunctionInfo;
 
+struct SScalarFuncParam;
+
 typedef struct SScalarFunctionInfo {
   char      name[FUNCTIONS_NAME_MAX_LENGTH];
   int8_t    type;              // scalar function or aggregation function
-  uint8_t  functionId;        // index of scalar function
-
-  bool    (*init)(SQLFunctionCtx *pCtx, struct SResultRowCellInfo* pResultCellInfo);  // setup the execute environment
-  void    (*exec)(SQLFunctionCtx *pCtx);
+  uint32_t  functionId;        // index of scalar function
+  void     (*process)(struct SScalarFuncParam* pOutput, size_t numOfInput, const struct SScalarFuncParam *pInput);
 } SScalarFunctionInfo;
 
-typedef struct SResultDataInfo {
-  int16_t type;
-  int16_t bytes;
-  int32_t intermediateBytes;
-} SResultDataInfo;
-
 typedef struct SMultiFunctionsDesc {
   bool stableQuery;
   bool groupbyColumn;
@@ -195,11 +235,12 @@ typedef struct SMultiFunctionsDesc {
   bool hasFilter;
   bool onlyTagQuery;
   bool orderProjectQuery;
-  bool stateWindow;
   bool globalMerge;
   bool multigroupResult;
   bool blockDistribution;
+  bool stateWindow;
   bool timewindow;
+  bool sessionWindow;
   bool topbotQuery;
   bool interpQuery;
   bool distinct;
@@ -215,16 +256,61 @@ int32_t getResultDataInfo(int32_t dataType, int32_t dataBytes, int32_t functionI
  * @param len
  * @return
  */
-int32_t qIsBuiltinFunction(const char* name, int32_t len);
+int32_t qIsBuiltinFunction(const char* name, int32_t len, bool* scalarFunction);
 
 bool qIsValidUdf(SArray* pUdfInfo, const char* name, int32_t len, int32_t* functionId);
 
-const char* qGetFunctionName(int32_t functionId);
+bool qIsAggregateFunction(const char* functionName);
+
+tExprNode* exprTreeFromBinary(const void* data, size_t size);
 
 void extractFunctionDesc(SArray* pFunctionIdList, SMultiFunctionsDesc* pDesc);
 
 tExprNode* exprdup(tExprNode* pTree);
 
+void resetResultRowEntryResult(SQLFunctionCtx* pCtx, int32_t num);
+void cleanupResultRowEntry(struct SResultRowEntryInfo* pCell);
+int32_t getNumOfResult(SQLFunctionCtx* pCtx, int32_t num);
+bool isRowEntryCompleted(struct SResultRowEntryInfo* pEntry);
+bool isRowEntryInitialized(struct SResultRowEntryInfo* pEntry);
+
+struct SScalarFunctionSupport* createScalarFuncSupport(int32_t num);
+void destroyScalarFuncSupport(struct SScalarFunctionSupport* pSupport, int32_t num);
+struct SScalarFunctionSupport* getScalarFuncSupport(struct SScalarFunctionSupport* pSupport, int32_t index);
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// fill api
+struct SFillInfo;
+struct SFillColInfo;
+
+typedef struct SPoint {
+  int64_t key;
+  void *  val;
+} SPoint;
+
+void taosFillSetStartInfo(struct SFillInfo* pFillInfo, int32_t numOfRows, TSKEY endKey);
+void taosResetFillInfo(struct SFillInfo* pFillInfo, TSKEY startTimestamp);
+void taosFillSetInputDataBlock(struct SFillInfo* pFillInfo, const struct SSDataBlock* pInput);
+struct SFillColInfo* createFillColInfo(SExprInfo* pExpr, int32_t numOfOutput, const int64_t* fillVal);
+bool taosFillHasMoreResults(struct SFillInfo* pFillInfo);
+
+struct SFillInfo* taosCreateFillInfo(int32_t order, TSKEY skey, int32_t numOfTags, int32_t capacity, int32_t numOfCols,
+                              int64_t slidingTime, int8_t slidingUnit, int8_t precision, int32_t fillType,
+                              struct SFillColInfo* pFillCol, void* handle);
+
+void* taosDestroyFillInfo(struct SFillInfo *pFillInfo);
+int64_t taosFillResultDataBlock(struct SFillInfo* pFillInfo, void** output, int32_t capacity);
+int64_t getFillInfoStart(struct SFillInfo *pFillInfo);
+
+int32_t taosGetLinearInterpolationVal(SPoint* point, int32_t outputType, SPoint* point1, SPoint* point2, int32_t inputType);
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// udf api
+struct SUdfInfo;
+
+void qAddUdfInfo(uint64_t id, struct SUdfInfo* pUdfInfo);
+void qRemoveUdfInfo(uint64_t id, struct SUdfInfo* pUdfInfo);
+
 #ifdef __cplusplus
 }
 #endif

include/libs/parser/parser.h

@@ -26,50 +26,6 @@ extern "C" {
 #include "tvariant.h"
 #include "function.h"
 
-typedef struct SColumn {
-  uint64_t     tableUid;
-  int32_t      columnIndex;
-  SColumnInfo  info;
-} SColumn;
-
-// the structure for sql function in select clause
-typedef struct SSqlExpr {
-  char      token[TSDB_COL_NAME_LEN];      // original token
-  SSchema   resSchema;
-  SColIndex colInfo;
-  uint64_t  uid;            // table uid, todo refactor use the pointer
-  int32_t   interBytes;     // inter result buffer size
-  int16_t   numOfParams;    // argument value of each function
-  SVariant  param[3];       // parameters are not more than 3
-} SSqlExpr;
-
-typedef struct SExprInfo {
-  SSqlExpr           base;
-  struct tExprNode  *pExpr;
-} SExprInfo;
-
-//typedef struct SInterval {
-//  int32_t  tz;            // query client timezone
-//  char     intervalUnit;
-//  char     slidingUnit;
-//  char     offsetUnit;
-//  int64_t  interval;
-//  int64_t  sliding;
-//  int64_t  offset;
-//} SInterval;
-//
-//typedef struct SSessionWindow {
-//  int64_t  gap;             // gap between two session window(in microseconds)
-//  int32_t  primaryColId;    // primary timestamp column
-//} SSessionWindow;
-
-typedef struct SGroupbyExpr {
-  int16_t  tableIndex;
-  SArray*  columnInfo;  // SArray<SColIndex>, group by columns information
-  int16_t  orderIndex;  // order by column index
-  int16_t  orderType;   // order by type: asc/desc
-} SGroupbyExpr;
-
 typedef struct SField {
   char     name[TSDB_COL_NAME_LEN];
   uint8_t  type;
@@ -82,16 +38,6 @@ typedef struct SFieldInfo {
   SArray     *internalField; // SArray<SInternalField>
 } SFieldInfo;
 
-typedef struct SLimit {
-  int64_t   limit;
-  int64_t   offset;
-} SLimit;
-
-typedef struct SOrder {
-  uint32_t  order;
-  int32_t   orderColId;
-} SOrder;
-
 typedef struct SCond {
   uint64_t uid;
   int32_t  len;  // length of tag query condition data
@@ -120,12 +66,6 @@ typedef struct STagCond {
 typedef struct STableMetaInfo {
   STableMeta    *pTableMeta;      // table meta, cached in client side and acquired by name
   SVgroupsInfo  *vgroupList;
-
-  /*
-   * 1. keep the vgroup index during the multi-vnode super table projection query
-   * 2. keep the vgroup index for multi-vnode insertion
-   */
-  int32_t       vgroupIndex;
   SName         name;
   char          aliasName[TSDB_TABLE_NAME_LEN];    // alias name of table specified in query sql
   SArray       *tagColList;                        // SArray<SColumn*>, involved tag columns
@@ -137,11 +77,11 @@ typedef struct SQueryStmtInfo {
   STimeWindow      window;        // the whole query time window
   SInterval        interval;      // tumble time window
   SSessionWindow   sessionWindow; // session time window
+  SStateWindow     stateWindow;   // state window query
   SGroupbyExpr     groupbyExpr;   // groupby tags info
   SArray *         colList;       // SArray<SColumn*>
   SFieldInfo       fieldsInfo;
-  SArray *         exprList;      // SArray<SExprInfo*>
-  SArray *         exprList1;     // final exprlist in case of arithmetic expression exists
+  SArray**         exprList;      // SArray<SExprInfo*>
   SLimit           limit;
   SLimit           slimit;
   STagCond         tagCond;
@@ -172,6 +112,7 @@ typedef struct SQueryStmtInfo {
   struct SQueryStmtInfo *pDownstream;
   int32_t            havingFieldNum;
   SMultiFunctionsDesc     info;
+  int32_t            exprListLevelIndex;
 } SQueryStmtInfo;
 
 typedef struct SColumnIndex {
@@ -225,14 +166,23 @@ void assignExprInfo(SExprInfo* dst, const SExprInfo* src);
 void columnListCopy(SArray* dst, const SArray* src, uint64_t uid);
 void columnListDestroy(SArray* pColumnList);
 
-void dropAllExprInfo(SArray* pExprInfo);
-SExprInfo* createExprInfo(STableMetaInfo* pTableMetaInfo, int16_t functionId, SColumnIndex* pColIndex, struct tExprNode* pParamExpr, SSchema* pResSchema, int16_t interSize);
+void dropAllExprInfo(SArray** pExprInfo, int32_t numOfLevel);
+
+typedef struct SSourceParam {
+  SArray            *pExprNodeList; //Array<struct tExprNode*>
+  SArray            *pColumnList;   //Array<struct SColumn>
+  int32_t    num;
+} SSourceParam;
+
+SExprInfo* createExprInfo(STableMetaInfo* pTableMetaInfo, const char* funcName, SSourceParam* pSource, SSchema* pResSchema, int16_t interSize);
 int32_t copyExprInfoList(SArray* dst, const SArray* src, uint64_t uid, bool deepcopy);
 
 STableMetaInfo* getMetaInfo(SQueryStmtInfo* pQueryInfo, int32_t tableIndex);
 SSchema *getOneColumnSchema(const STableMeta* pTableMeta, int32_t colIndex);
+SSchema createSchema(uint8_t type, int16_t bytes, int16_t colId, const char* name);
 
 int32_t getNewResColId();
+void addIntoSourceParam(SSourceParam* pSourceParam, tExprNode* pNode, SColumn* pColumn);
 
 #ifdef __cplusplus
 }

include/os/os.h

@@ -45,6 +45,8 @@ extern "C" {
 #include <float.h>
 #include <math.h>
 #include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #include "osAtomic.h"
 #include "osDef.h"

include/os/osDir.h

@@ -22,7 +22,7 @@ extern "C" {
 
 void taosRemoveDir(const char *dirname);
 bool taosDirExist(char *dirname);
-bool taosMkDir(char *dirname);
+bool taosMkDir(const char *dirname);
 void taosRemoveOldFiles(char *dirname, int32_t keepDays);
 bool taosExpandDir(char *dirname, char *outname, int32_t maxlen);
 bool taosRealPath(char *dirname, int32_t maxlen);

include/server/vnode/meta/meta.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_META_H_
-#define _TD_META_H_
-
-#include "taosmsg.h"
-
-#include "os.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* ------------------------ APIs Exposed ------------------------ */
-
-// Types exported
-typedef uint64_t                tb_uid_t;
-typedef struct SMeta            SMeta;
-typedef struct SMetaOpts        SMetaOpts;
-typedef struct SMetaQueryHandle SMetaQueryHandle;
-typedef struct SMetaQueryOpts   SMetaQueryOpts;
-typedef struct STableOpts       STableOpts;
-
-// SMeta operations
-int    metaCreate(const char *path);
-void   metaDestroy(const char *path);
-SMeta *metaOpen(SMetaOpts *);
-void   metaClose(SMeta *);
-int    metaCreateTable(SMeta *, const STableOpts *);
-int    metaDropTable(SMeta *, uint64_t tuid_t);
-int    metaAlterTable(SMeta *, void *);
-int    metaCommit(SMeta *);
-
-// Options
-SMetaOpts *metaOptionsCreate();
-void       metaOptionsDestroy(SMetaOpts *);
-void       metaOptionsSetCache(SMetaOpts *, size_t capacity);
-
-// SMetaQueryHandle
-SMetaQueryHandle *metaQueryHandleCreate(SMetaQueryOpts *);
-void              metaQueryHandleDestroy(SMetaQueryHandle *);
-
-// SMetaQueryOpts
-SMetaQueryOpts *metaQueryOptionsCreate();
-void            metaQueryOptionsDestroy(SMetaQueryOpts *);
-
-// STableOpts
-#define META_TABLE_OPTS_DECLARE(name) STableOpts name = {0}
-void metaNormalTableOptsInit(STableOpts *, const char *name, const STSchema *pSchema);
-void metaSuperTableOptsInit(STableOpts *, const char *name, tb_uid_t uid, const STSchema *pSchema,
-                            const STSchema *pTagSchema);
-void metaChildTableOptsInit(STableOpts *, const char *name, tb_uid_t suid, const SKVRow tags);
-void metaTableOptsClear(STableOpts *);
-
-/* ------------------------ Impl should hidden ------------------------ */
-typedef enum { META_INIT_TABLE = 0, META_SUPER_TABLE = 1, META_CHILD_TABLE = 2, META_NORMAL_TABLE = 3 } EMetaTableT;
-typedef struct SSuperTableOpts {
-  tb_uid_t  uid;
-  STSchema *pSchema;     // (ts timestamp, a int)
-  STSchema *pTagSchema;  // (tag1 binary(10), tag2 int)
-} SSuperTableOpts;
-
-typedef struct SChildTableOpts {
-  tb_uid_t suid;  // super table uid
-  SKVRow   tags;  // tag value of the child table
-} SChildTableOpts;
-
-typedef struct SNormalTableOpts {
-  STSchema *pSchema;
-} SNormalTableOpts;
-
-struct STableOpts {
-  int8_t type;
-  char * name;
-  union {
-    SSuperTableOpts  superOpts;
-    SChildTableOpts  childOpts;
-    SNormalTableOpts normalOpts;
-  };
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*_TD_META_H_*/

include/util/mallocator.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_MALLOCATOR_H_
+#define _TD_MALLOCATOR_H_
+
+#include "os.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct SMemAllocator SMemAllocator;
+
+#define MALLOCATOR_APIS                                        \
+  void *(*malloc)(SMemAllocator *, size_t size);               \
+  void *(*calloc)(SMemAllocator *, size_t nmemb, size_t size); \
+  void *(*realloc)(SMemAllocator *, void *ptr, size_t size);   \
+  void (*free)(SMemAllocator *, void *ptr);                    \
+  size_t (*usage)(SMemAllocator *);
+
+// Interfaces to implement
+typedef struct {
+  MALLOCATOR_APIS
+} SMemAllocatorIf;
+
+struct SMemAllocator {
+  void * impl;
+  size_t usize;
+  MALLOCATOR_APIS
+};
+
+// heap allocator
+SMemAllocator *tdCreateHeapAllocator();
+void           tdDestroyHeapAllocator(SMemAllocator *pMemAllocator);
+
+// arena allocator
+SMemAllocator *tdCreateArenaAllocator(size_t size);
+void           tdDestroyArenaAllocator(SMemAllocator *);
+
+#define mMalloc(pMemAllocator, size) (*(pMemAllocator->malloc))(pMemAllocator, size)
+#define mCalloc(pMemAllocator, nmemb, size) (*(pMemAllocator->calloc))(pMemAllocator, nmemb, size)
+#define mRealloc(pMemAllocator, ptr, size) (*(pMemAllocator->realloc))(pMemAllocator, ptr, size)
+#define mFree(pMemAllocator, ptr) (*(pMemAllocator->free))(pMemAllocator, ptr)
+#define mUsage(pMemAllocator) (*(pMemAllocator->usage))(pMemAllocator)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*_TD_MALLOCATOR_H_*/
\ No newline at end of file

include/util/taoserror.h

@@ -27,6 +27,7 @@ extern "C" {
 #define TAOS_FAILED(err)                    ((err) < 0)
 
 const char* tstrerror(int32_t err);
+const char* terrstr();
 
 int32_t* taosGetErrno();
 #define terrno                              (*taosGetErrno())
@@ -59,17 +60,20 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_RPC_INVALID_VERSION           TAOS_DEF_ERROR_CODE(0, 0x0016)  //"Invalid app version")
 
 //common & util
-#define TSDB_CODE_COM_OPS_NOT_SUPPORT           TAOS_DEF_ERROR_CODE(0, 0x0100)  //"Operation not supported")
-#define TSDB_CODE_COM_MEMORY_CORRUPTED          TAOS_DEF_ERROR_CODE(0, 0x0101)  //"Memory corrupted")
-#define TSDB_CODE_COM_OUT_OF_MEMORY             TAOS_DEF_ERROR_CODE(0, 0x0102)  //"Out of memory")
-#define TSDB_CODE_COM_INVALID_CFG_MSG           TAOS_DEF_ERROR_CODE(0, 0x0103)  //"Invalid config message")
-#define TSDB_CODE_COM_FILE_CORRUPTED            TAOS_DEF_ERROR_CODE(0, 0x0104)  //"Data file corrupted")
-#define TSDB_CODE_REF_NO_MEMORY                 TAOS_DEF_ERROR_CODE(0, 0x0105)  //"Ref out of memory")
-#define TSDB_CODE_REF_FULL                      TAOS_DEF_ERROR_CODE(0, 0x0106)  //"too many Ref Objs")
-#define TSDB_CODE_REF_ID_REMOVED                TAOS_DEF_ERROR_CODE(0, 0x0107)  //"Ref ID is removed")
-#define TSDB_CODE_REF_INVALID_ID                TAOS_DEF_ERROR_CODE(0, 0x0108)  //"Invalid Ref ID")
-#define TSDB_CODE_REF_ALREADY_EXIST             TAOS_DEF_ERROR_CODE(0, 0x0109)  //"Ref is already there")
-#define TSDB_CODE_REF_NOT_EXIST                 TAOS_DEF_ERROR_CODE(0, 0x010A)  //"Ref is not there")
+#define TSDB_CODE_OPS_NOT_SUPPORT               TAOS_DEF_ERROR_CODE(0, 0x0100)
+#define TSDB_CODE_OUT_OF_MEMORY                 TAOS_DEF_ERROR_CODE(0, 0x0101)
+#define TSDB_CODE_OUT_OF_RANGE                  TAOS_DEF_ERROR_CODE(0, 0x0102)
+#define TSDB_CODE_INVALID_PTR                   TAOS_DEF_ERROR_CODE(0, 0x0103)
+#define TSDB_CODE_MEMORY_CORRUPTED              TAOS_DEF_ERROR_CODE(0, 0x0104)
+#define TSDB_CODE_FILE_CORRUPTED                TAOS_DEF_ERROR_CODE(0, 0x0106)
+#define TSDB_CODE_CHECKSUM_ERROR                TAOS_DEF_ERROR_CODE(0, 0x0107)
+#define TSDB_CODE_INVALID_MSG                   TAOS_DEF_ERROR_CODE(0, 0x0108)
+#define TSDB_CODE_REF_NO_MEMORY                 TAOS_DEF_ERROR_CODE(0, 0x0109)
+#define TSDB_CODE_REF_FULL                      TAOS_DEF_ERROR_CODE(0, 0x010A)
+#define TSDB_CODE_REF_ID_REMOVED                TAOS_DEF_ERROR_CODE(0, 0x010B)
+#define TSDB_CODE_REF_INVALID_ID                TAOS_DEF_ERROR_CODE(0, 0x010C)
+#define TSDB_CODE_REF_ALREADY_EXIST             TAOS_DEF_ERROR_CODE(0, 0x010D)
+#define TSDB_CODE_REF_NOT_EXIST                 TAOS_DEF_ERROR_CODE(0, 0x010E)
 
 //client
 #define TSDB_CODE_TSC_INVALID_OPERATION         TAOS_DEF_ERROR_CODE(0, 0x0200)  //"Invalid Operation")
@@ -120,7 +124,6 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_MND_INVALID_MSG_LEN           TAOS_DEF_ERROR_CODE(0, 0x0307)  //"Invalid message length")
 #define TSDB_CODE_MND_INVALID_MSG_TYPE          TAOS_DEF_ERROR_CODE(0, 0x0308)  //"Invalid message type")
 #define TSDB_CODE_MND_TOO_MANY_SHELL_CONNS      TAOS_DEF_ERROR_CODE(0, 0x0309)  //"Too many connections")
-#define TSDB_CODE_MND_OUT_OF_MEMORY             TAOS_DEF_ERROR_CODE(0, 0x030A)  //"Out of memory in mnode")
 #define TSDB_CODE_MND_INVALID_SHOWOBJ           TAOS_DEF_ERROR_CODE(0, 0x030B)  //"Data expired")
 #define TSDB_CODE_MND_INVALID_QUERY_ID          TAOS_DEF_ERROR_CODE(0, 0x030C)  //"Invalid query id")
 #define TSDB_CODE_MND_INVALID_STREAM_ID         TAOS_DEF_ERROR_CODE(0, 0x030D)  //"Invalid stream id")
@@ -131,12 +134,18 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_MND_FAILED_TO_CREATE_DIR      TAOS_DEF_ERROR_CODE(0, 0x0313)  //"failed to create mnode dir")
 #define TSDB_CODE_MND_FAILED_TO_INIT_STEP       TAOS_DEF_ERROR_CODE(0, 0x0314)  //"failed to init components")
 
-#define TSDB_CODE_MND_SDB_OBJ_ALREADY_THERE     TAOS_DEF_ERROR_CODE(0, 0x0320)  //"Object already there")
-#define TSDB_CODE_MND_SDB_ERROR                 TAOS_DEF_ERROR_CODE(0, 0x0321)  //"Unexpected generic error in sdb")
-#define TSDB_CODE_MND_SDB_INVALID_TABLE_TYPE    TAOS_DEF_ERROR_CODE(0, 0x0322)  //"Invalid table type")
-#define TSDB_CODE_MND_SDB_OBJ_NOT_THERE         TAOS_DEF_ERROR_CODE(0, 0x0323)  //"Object not there")
-#define TSDB_CODE_MND_SDB_INVAID_META_ROW       TAOS_DEF_ERROR_CODE(0, 0x0324)  //"Invalid meta row")
-#define TSDB_CODE_MND_SDB_INVAID_KEY_TYPE       TAOS_DEF_ERROR_CODE(0, 0x0325)  //"Invalid key type")
+#define TSDB_CODE_SDB_APP_ERROR                 TAOS_DEF_ERROR_CODE(0, 0x0320)
+#define TSDB_CODE_SDB_OBJ_ALREADY_THERE         TAOS_DEF_ERROR_CODE(0, 0x0321)
+#define TSDB_CODE_SDB_OBJ_NOT_THERE             TAOS_DEF_ERROR_CODE(0, 0x0322)
+#define TSDB_CODE_SDB_OBJ_CREATING              TAOS_DEF_ERROR_CODE(0, 0x0323)
+#define TSDB_CODE_SDB_OBJ_DROPPING              TAOS_DEF_ERROR_CODE(0, 0x0324)
+#define TSDB_CODE_SDB_INVALID_TABLE_TYPE        TAOS_DEF_ERROR_CODE(0, 0x0325)
+#define TSDB_CODE_SDB_INVALID_KEY_TYPE          TAOS_DEF_ERROR_CODE(0, 0x0326)
+#define TSDB_CODE_SDB_INVALID_ACTION_TYPE       TAOS_DEF_ERROR_CODE(0, 0x0327)
+#define TSDB_CODE_SDB_INVALID_STATUS_TYPE       TAOS_DEF_ERROR_CODE(0, 0x0328)
+#define TSDB_CODE_SDB_INVALID_DATA_VER          TAOS_DEF_ERROR_CODE(0, 0x0329)
+#define TSDB_CODE_SDB_INVALID_DATA_LEN          TAOS_DEF_ERROR_CODE(0, 0x032A)
+#define TSDB_CODE_SDB_INVALID_DATA_CONTENT      TAOS_DEF_ERROR_CODE(0, 0x032B)
 
 #define TSDB_CODE_MND_DNODE_ALREADY_EXIST       TAOS_DEF_ERROR_CODE(0, 0x0330)  //"DNode already exists")
 #define TSDB_CODE_MND_DNODE_NOT_EXIST           TAOS_DEF_ERROR_CODE(0, 0x0331)  //"DNode does not exist")
@@ -155,12 +164,12 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_MND_DNODE_EP_NOT_CONFIGURED   TAOS_DEF_ERROR_CODE(0, 0x033E)  //"Dnode Ep not configured")
 
 #define TSDB_CODE_MND_ACCT_ALREADY_EXIST        TAOS_DEF_ERROR_CODE(0, 0x0340)  //"Account already exists")
-#define TSDB_CODE_MND_INVALID_ACCT              TAOS_DEF_ERROR_CODE(0, 0x0341)  //"Invalid account")
+#define TSDB_CODE_MND_ACCT_NOT_EXIST            TAOS_DEF_ERROR_CODE(0, 0x0341)  //"Invalid account")
 #define TSDB_CODE_MND_INVALID_ACCT_OPTION       TAOS_DEF_ERROR_CODE(0, 0x0342)  //"Invalid account options")
 #define TSDB_CODE_MND_ACCT_EXPIRED              TAOS_DEF_ERROR_CODE(0, 0x0343)  //"Account authorization has expired")
 
 #define TSDB_CODE_MND_USER_ALREADY_EXIST        TAOS_DEF_ERROR_CODE(0, 0x0350)  //"User already exists")
-#define TSDB_CODE_MND_INVALID_USER              TAOS_DEF_ERROR_CODE(0, 0x0351)  //"Invalid user")
+#define TSDB_CODE_MND_USER_NOT_EXIST            TAOS_DEF_ERROR_CODE(0, 0x0351)  //"Invalid user")
 #define TSDB_CODE_MND_INVALID_USER_FORMAT       TAOS_DEF_ERROR_CODE(0, 0x0352)  //"Invalid user format")
 #define TSDB_CODE_MND_INVALID_PASS_FORMAT       TAOS_DEF_ERROR_CODE(0, 0x0353)  //"Invalid password format")
 #define TSDB_CODE_MND_NO_USER_FROM_CONN         TAOS_DEF_ERROR_CODE(0, 0x0354)  //"Can not get user from conn")

include/util/tcompression.h

@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-#include "tdef.h"
+#include "taos.h"
 #include "tutil.h"
 
 #define COMP_OVERFLOW_BYTES 2

include/util/tdef.h

@@ -134,6 +134,15 @@ do { \
 #define TSDB_BINARY_OP_REMAINDER  4004
 #define TSDB_BINARY_OP_CONCAT     4005
 
+#define FUNCTION_CEIL        4500
+#define FUNCTION_FLOOR       4501
+#define FUNCTION_ABS         4502
+#define FUNCTION_ROUND       4503
+
+#define FUNCTION_LENGTH      4800
+#define FUNCTION_CONCAT      4801
+#define FUNCTION_LTRIM       4802
+#define FUNCTION_RTRIM       4803
 
 #define IS_RELATION_OPTR(op) (((op) >= TSDB_RELATION_LESS) && ((op) < TSDB_RELATION_IN))
 #define IS_ARITHMETIC_OPTR(op) (((op) >= TSDB_BINARY_OP_ADD) && ((op) <= TSDB_BINARY_OP_REMAINDER))
@@ -311,10 +320,6 @@ do { \
 #define TSDB_QUERY_TYPE_NON_TYPE               0x00u     // none type
 #define TSDB_QUERY_TYPE_FREE_RESOURCE          0x01u     // free qhandle at vnode
 
-#define TSDB_UDF_TYPE_SCALAR       1
-#define TSDB_UDF_TYPE_AGGREGATE    2
-
-
 /*
  * 1. ordinary sub query for select * from super_table
  * 2. all sqlobj generated by createSubqueryObj with this flag
@@ -367,21 +372,6 @@ do { \
 #define TSDB_MAX_DISKS_PER_TIER 16
 #define TSDB_MAX_DISKS           (TSDB_MAX_TIERS * TSDB_MAX_DISKS_PER_TIER)
 
-#define TSDB_DATA_TYPE_NULL       0     // 1 bytes
-#define TSDB_DATA_TYPE_BOOL       1     // 1 bytes
-#define TSDB_DATA_TYPE_TINYINT    2     // 1 byte
-#define TSDB_DATA_TYPE_SMALLINT   3     // 2 bytes
-#define TSDB_DATA_TYPE_INT        4     // 4 bytes
-#define TSDB_DATA_TYPE_BIGINT     5     // 8 bytes
-#define TSDB_DATA_TYPE_FLOAT      6     // 4 bytes
-#define TSDB_DATA_TYPE_DOUBLE     7     // 8 bytes
-#define TSDB_DATA_TYPE_BINARY     8     // string
-#define TSDB_DATA_TYPE_TIMESTAMP  9     // 8 bytes
-#define TSDB_DATA_TYPE_NCHAR      10    // unicode string
-#define TSDB_DATA_TYPE_UTINYINT   11    // 1 byte
-#define TSDB_DATA_TYPE_USMALLINT  12    // 2 bytes
-#define TSDB_DATA_TYPE_UINT       13    // 4 bytes
-#define TSDB_DATA_TYPE_UBIGINT    14    // 8 bytes
 
 enum { TRANS_STAT_INIT = 0, TRANS_STAT_EXECUTING, TRANS_STAT_EXECUTED, TRANS_STAT_ROLLBACKING, TRANS_STAT_ROLLBACKED };
 enum { TRANS_OPER_INIT = 0, TRANS_OPER_EXECUTE, TRANS_OPER_ROLLBACK };

include/util/tskiplist.h

@@ -21,7 +21,7 @@ extern "C" {
 #endif
 
 #include "os.h"
-//#include "tdef.h"
+#include "taos.h"
 #include "tarray.h"
 #include "tfunctional.h"
 

source/common/src/tglobal.c

@@ -40,7 +40,7 @@ uint16_t tsArbitratorPort = 6042;
 int32_t  tsStatusInterval = 1;  // second
 int32_t  tsNumOfMnodes = 1;
 int8_t   tsEnableVnodeBak = 1;
-int8_t   tsEnableTelemetryReporting = 1;
+int8_t   tsEnableTelemetryReporting = 0;
 int8_t   tsArbOnline = 0;
 int64_t  tsArbOnlineTimestamp = TSDB_ARB_DUMMY_TIME;
 char     tsEmail[TSDB_FQDN_LEN] = {0};

source/dnode/mgmt/CMakeLists.txt

@@ -11,6 +11,6 @@ target_link_libraries(
 )
 target_include_directories(
     taosd
-    PUBLIC "${CMAKE_SOURCE_DIR}/include/server/dnode"
+    PUBLIC "${CMAKE_SOURCE_DIR}/include/dnode"
     private "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )

source/dnode/mgmt/src/dnodeDnode.c

@@ -302,6 +302,13 @@ PRASE_DNODE_OVER:
     return -1;
   }
 
+  if (tsDnode.dnodeEps == NULL) {
+    tsDnode.dnodeEps = calloc(1, sizeof(SDnodeEps) + sizeof(SDnodeEp));
+    tsDnode.dnodeEps->dnodeNum = 1;
+    tsDnode.dnodeEps->dnodeEps[0].dnodePort = tsServerPort;
+    tstrncpy(tsDnode.dnodeEps->dnodeEps[0].dnodeFqdn, tsLocalFqdn, TSDB_FQDN_LEN);
+  }
+
   dnodeResetDnodes(tsDnode.dnodeEps);
 
   terrno = 0;

source/dnode/mgmt/src/dnodeInt.c

@@ -135,7 +135,7 @@ static int32_t dnodeInitMain() {
 
   dnodeInitDir();
 
-  return -1;
+  return 0;
 }
 
 static void dnodeCleanupMain() {
@@ -145,14 +145,14 @@ static void dnodeCleanupMain() {
 }
 
 int32_t dnodeInit() {
-  SSteps *steps = taosStepInit(24, dnodeReportStartup);
+  SSteps *steps = taosStepInit(10, dnodeReportStartup);
   if (steps == NULL) return -1;
 
   taosStepAdd(steps, "dnode-main", dnodeInitMain, dnodeCleanupMain);
   taosStepAdd(steps, "dnode-rpc", rpcInit, rpcCleanup);
   taosStepAdd(steps, "dnode-tfs", NULL, NULL);
   taosStepAdd(steps, "dnode-wal", walInit, walCleanUp);
-  taosStepAdd(steps, "dnode-sync", syncInit, syncCleanUp);
+  //taosStepAdd(steps, "dnode-sync", syncInit, syncCleanUp);
   taosStepAdd(steps, "dnode-dnode", dnodeInitDnode, dnodeCleanupDnode);
   taosStepAdd(steps, "dnode-vnodes", dnodeInitVnodes, dnodeCleanupVnodes);
   taosStepAdd(steps, "dnode-mnode", dnodeInitMnode, dnodeCleanupMnode);

source/dnode/mgmt/src/dnodeMnode.c

@@ -136,8 +136,8 @@ static int32_t dnodeWriteMnodeFile() {
   char   *content = calloc(1, maxLen + 1);
 
   len += snprintf(content + len, maxLen - len, "{\n");
-  len += snprintf(content + len, maxLen - len, "  \"deployed\": \"%d\",\n", tsMnode.dropped);
-  len += snprintf(content + len, maxLen - len, "  \"dropped\": \"%d\",\n", tsMnode.dropped);
+  len += snprintf(content + len, maxLen - len, "  \"deployed\": \"%d\",\n", tsMnode.deployed);
+  len += snprintf(content + len, maxLen - len, "  \"dropped\": \"%d\"\n", tsMnode.dropped);
   len += snprintf(content + len, maxLen - len, "}\n");
 
   fwrite(content, 1, len, fp);
@@ -180,7 +180,7 @@ static int32_t dnodeStartMnode() {
   tsMnode.deployed = 1;
   taosWUnLockLatch(&tsMnode.latch);
 
-  return code;
+  return mnodeStart(NULL);
 }
 
 static void dnodeStopMnode() {
@@ -212,14 +212,14 @@ static int32_t dnodeUnDeployMnode() {
   }
 
   dnodeStopMnode();
-  mnodeUnDeploy(tsMnodeDir);
+  mnodeUnDeploy();
   dnodeWriteMnodeFile();
 
   return code;
 }
 
 static int32_t dnodeDeployMnode(SMnodeCfg *pCfg) {
-  int32_t code = mnodeDeploy(tsMnodeDir, pCfg);
+  int32_t code = mnodeDeploy(pCfg);
   if (code != 0) {
     dError("failed to deploy mnode since %s", tstrerror(code));
     return code;
@@ -335,12 +335,9 @@ static int32_t dnodeWriteMnodeMsgToQueue(taos_queue pQueue, SRpcMsg *pRpcMsg) {
   if (pQueue == NULL) {
     code = TSDB_CODE_DND_MSG_NOT_PROCESSED;
   } else {
-    SMnodeMsg *pMsg = mnodeInitMsg(1);
+    SMnodeMsg *pMsg = mnodeInitMsg(pRpcMsg);
     if (pMsg == NULL) {
-      code = TSDB_CODE_DND_OUT_OF_MEMORY;
-    } else {
-      mnodeAppendMsg(pMsg, pRpcMsg);
-      code = taosWriteQitem(pQueue, pMsg);
+      code = terrno;
     }
   }
 
@@ -539,7 +536,7 @@ static int32_t dnodeOpenMnode() {
     SMnodeCfg cfg = {.replica = 1};
     cfg.replicas[0].port = tsServerPort;
     tstrncpy(cfg.replicas[0].fqdn, tsLocalFqdn, TSDB_FQDN_LEN);
-    return dnodeDeployMnode(&cfg);
+    code = dnodeDeployMnode(&cfg);
   } else {
     dInfo("start to open mnode");
     return dnodeStartMnode();

source/dnode/mgmt/src/dnodeVnodes.c

@@ -376,7 +376,7 @@ static void *dnodeOpenVnodeFunc(void *param) {
 
     char path[PATH_MAX + 20] = {0};
     snprintf(path, sizeof(path),"%s/vnode%d", tsVnodeDir, pVnode->vgId);
-    SVnode *pImpl = vnodeOpen(pVnode->vgId, path);
+    SVnode *pImpl = vnodeOpen(path, NULL);
     if (pImpl == NULL) {
       dError("vgId:%d, failed to open vnode by thread:%d", pVnode->vgId, pThread->threadIndex);
       pThread->failed++;

source/dnode/mnode/CMakeLists.txt

-aux_source_directory(src MNODE_SRC)
-add_library(mnode ${MNODE_SRC})
-target_include_directories(
-    mnode
-    PUBLIC "${CMAKE_SOURCE_DIR}/include/server/mnode"
-    private "${CMAKE_CURRENT_SOURCE_DIR}/inc"
-)
-target_link_libraries(
-    mnode
-    PUBLIC transport
-    PUBLIC cjson
-)
\ No newline at end of file
+add_subdirectory(impl)
+add_subdirectory(sdb)
+add_subdirectory(transaction)

source/dnode/mnode/impl/CMakeLists.txt

+aux_source_directory(src MNODE_SRC)
+add_library(mnode ${MNODE_SRC})
+target_include_directories(
+    mnode
+    PUBLIC "${CMAKE_SOURCE_DIR}/include/dnode/mnode"
+    private "${CMAKE_CURRENT_SOURCE_DIR}/inc"
+)
+target_link_libraries(
+    mnode
+    PRIVATE sdb
+    PRIVATE transaction
+    PUBLIC transport
+    PUBLIC cjson
+)
\ No newline at end of file

source/dnode/mnode/inc/mnodeDef.h → source/dnode/mnode/impl/inc/mnodeDef.h

@@ -57,27 +57,6 @@ typedef struct SVgObj SVgObj;
 typedef struct SSTableObj SSTableObj;
 typedef struct SFuncObj SFuncObj; 
 typedef struct SOperObj SOperObj;
-typedef struct SMnMsg SMnMsg;
-
-typedef enum {
-  MN_SDB_START = 0,
-  MN_SDB_CLUSTER = 1,
-  MN_SDB_DNODE = 2,
-  MN_SDB_MNODE = 3,
-  MN_SDB_ACCT = 4,
-  MN_SDB_AUTH = 5,
-  MN_SDB_USER = 6,
-  MN_SDB_DB = 7,
-  MN_SDB_VGROUP = 8,
-  MN_SDB_STABLE = 9,
-  MN_SDB_FUNC = 10,
-  MN_SDB_OPER = 11,
-  MN_SDB_MAX = 12
-} EMnSdb;
-
-typedef enum { MN_OP_START = 0, MN_OP_INSERT = 1, MN_OP_UPDATE = 2, MN_OP_DELETE = 3, MN_OP_MAX = 4 } EMnOp;
-
-typedef enum { MN_KEY_START = 0, MN_KEY_BINARY = 1, MN_KEY_INT32 = 2, MN_KEY_INT64 = 3, MN_KEY_MAX } EMnKey;
 
 typedef enum {
   MN_AUTH_ACCT_START = 0,
@@ -97,16 +76,9 @@ typedef enum {
   MN_AUTH_MAX
 } EMnAuthOp;
 
-typedef enum { MN_SDB_STAT_AVAIL = 0, MN_SDB_STAT_DROPPED = 1 } EMnSdbStat;
 
-typedef struct {
-  int8_t type;
-  int8_t status;
-  int8_t align[6];
-} SdbHead;
 
 typedef struct SClusterObj {
-  SdbHead head;
   int64_t id;
   char    uid[TSDB_CLUSTER_ID_LEN];
   int64_t createdTime;
@@ -114,7 +86,6 @@ typedef struct SClusterObj {
 } SClusterObj;
 
 typedef struct SDnodeObj {
-  SdbHead  head;
   int32_t  id;
   int32_t  vnodes;
   int64_t  createdTime;
@@ -131,7 +102,6 @@ typedef struct SDnodeObj {
 } SDnodeObj;
 
 typedef struct SMnodeObj {
-  SdbHead    head;
   int32_t    id;
   int8_t     status;
   int8_t     role;
@@ -148,7 +118,7 @@ typedef struct {
   int32_t maxTimeSeries;
   int32_t maxStreams;
   int64_t maxStorage;   // In unit of GB
-  int8_t  accessState;  // Configured only by command
+  int32_t accessState;  // Configured only by command
 } SAcctCfg;
 
 typedef struct {
@@ -161,18 +131,16 @@ typedef struct {
 } SAcctInfo;
 
 typedef struct SAcctObj {
-  SdbHead   head;
   char      acct[TSDB_USER_LEN];
   int64_t   createdTime;
   int64_t   updateTime;
   int32_t   acctId;
-  int8_t    status;
+  int32_t   status;
   SAcctCfg  cfg;
   SAcctInfo info;
 } SAcctObj;
 
 typedef struct SUserObj {
-  SdbHead   head;
   char      user[TSDB_USER_LEN];
   char      pass[TSDB_KEY_LEN];
   char      acct[TSDB_USER_LEN];
@@ -207,7 +175,6 @@ typedef struct {
 } SDbCfg;
 
 typedef struct SDbObj {
-  SdbHead   head;
   char      name[TSDB_FULL_DB_NAME_LEN];
   char      acct[TSDB_USER_LEN];
   int64_t   createdTime;
@@ -251,7 +218,6 @@ typedef struct SVgObj {
 } SVgObj;
 
 typedef struct SSTableObj {
-  SdbHead    head;
   char       tableId[TSDB_TABLE_NAME_LEN];
   uint64_t   uid;
   int64_t    createdTime;
@@ -262,7 +228,6 @@ typedef struct SSTableObj {
 } SSTableObj;
 
 typedef struct SFuncObj {
-  SdbHead head;
   char    name[TSDB_FUNC_NAME_LEN];
   char    path[128];
   int32_t contLen;
@@ -299,8 +264,9 @@ typedef struct {
   void   *rsp;
 } SMnRsp;
 
-typedef struct SMnMsg {
-  void (*fp)(SMnMsg *pMsg, int32_t code);
+typedef struct SMnodeMsg {
+  void (*fp)(SMnodeMsg *pMsg, int32_t code);
+  SRpcConnInfo conn;
   SUserObj *pUser;
   int16_t   received;
   int16_t   successed;
@@ -311,7 +277,7 @@ typedef struct SMnMsg {
   SMnRsp    rpcRsp;
   SRpcMsg   rpcMsg;
   char      pCont[];
-} SMnReq;
+} SMnodeMsg;
 
 #ifdef __cplusplus
 }

source/dnode/mnode/inc/mnodeInt.h → source/dnode/mnode/impl/inc/mnodeInt.h

@@ -17,22 +17,25 @@
 #define _TD_MNODE_INT_H_
 
 #include "mnodeDef.h"
+#include "sdb.h"
+#include "trn.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef enum { MN_STATUS_UNINIT = 0, MN_STATUS_INIT = 1, MN_STATUS_READY = 2, MN_STATUS_CLOSING = 3 } EMnStatus;
+typedef void (*MnodeRpcFp)(SMnodeMsg *pMsg);
 
 tmr_h   mnodeGetTimer();
 int32_t mnodeGetDnodeId();
 int64_t mnodeGetClusterId();
-EMnStatus mnodeGetStatus();
 
 void mnodeSendMsgToDnode(struct SEpSet *epSet, struct SRpcMsg *rpcMsg);
 void mnodeSendMsgToMnode(struct SRpcMsg *rpcMsg);
 void mnodeSendRedirectMsg(struct SRpcMsg *rpcMsg, bool forShell);
 
+void mnodeSetMsgFp(int32_t msgType, MnodeRpcFp fp);
+
 #ifdef __cplusplus
 }
 #endif

source/dnode/mnode/inc/mnodeSync.h → source/dnode/mnode/impl/inc/mnodeSync.h

@@ -24,6 +24,7 @@ extern "C" {
 
 int32_t mnodeInitSync();
 void    mnodeCleanUpSync();
+int32_t mnodeSyncPropose(SSdbRaw *pRaw, void *pData);
 
 bool mnodeIsMaster();
 

source/dnode/mnode/impl/src/mnode.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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "tglobal.h"
+#include "tstep.h"
+#include "tqueue.h"
+#include "mnodeAcct.h"
+#include "mnodeAuth.h"
+#include "mnodeBalance.h"
+#include "mnodeCluster.h"
+#include "mnodeDb.h"
+#include "mnodeDnode.h"
+#include "mnodeFunc.h"
+#include "mnodeMnode.h"
+#include "mnodeOper.h"
+#include "mnodeProfile.h"
+#include "mnodeShow.h"
+#include "mnodeStable.h"
+#include "mnodeSync.h"
+#include "mnodeTelem.h"
+#include "mnodeUser.h"
+#include "mnodeVgroup.h"
+
+static struct {
+  int32_t    dnodeId;
+  int64_t    clusterId;
+  tmr_h      timer;
+  SSteps    *pInitSteps;
+  SSteps    *pStartSteps;
+  SMnodePara para;
+  MnodeRpcFp msgFp[TSDB_MSG_TYPE_MAX];
+} tsMint;
+
+int32_t mnodeGetDnodeId() { return tsMint.para.dnodeId; }
+
+int64_t mnodeGetClusterId() { return tsMint.para.clusterId; }
+
+void mnodeSendMsgToDnode(struct SEpSet *epSet, struct SRpcMsg *rpcMsg) { (*tsMint.para.SendMsgToDnode)(epSet, rpcMsg); }
+
+void mnodeSendMsgToMnode(struct SRpcMsg *rpcMsg) { return (*tsMint.para.SendMsgToMnode)(rpcMsg); }
+
+void mnodeSendRedirectMsg(struct SRpcMsg *rpcMsg, bool forShell) { (*tsMint.para.SendRedirectMsg)(rpcMsg, forShell); }
+
+static int32_t mnodeInitTimer() {
+  if (tsMint.timer == NULL) {
+    tsMint.timer = taosTmrInit(tsMaxShellConns, 200, 3600000, "MND");
+  }
+
+  if (tsMint.timer == NULL) {
+    return -1;
+  }
+
+  return 0;
+}
+
+static void mnodeCleanupTimer() {
+  if (tsMint.timer != NULL) {
+    taosTmrCleanUp(tsMint.timer);
+    tsMint.timer = NULL;
+  }
+}
+
+tmr_h mnodeGetTimer() { return tsMint.timer; }
+
+static int32_t mnodeSetPara(SMnodePara para) {
+  tsMint.para = para;
+
+  if (tsMint.para.SendMsgToDnode == NULL) {
+    terrno = TSDB_CODE_MND_APP_ERROR;
+    return -1;
+  }
+
+  if (tsMint.para.SendMsgToMnode == NULL) {
+    terrno = TSDB_CODE_MND_APP_ERROR;
+    return -1;
+  }
+
+  if (tsMint.para.SendRedirectMsg == NULL) {
+    terrno = TSDB_CODE_MND_APP_ERROR;
+    return -1;
+  }
+
+  if (tsMint.para.PutMsgIntoApplyQueue == NULL) {
+    terrno = TSDB_CODE_MND_APP_ERROR;
+    return -1;
+  }
+
+  if (tsMint.para.dnodeId < 0) {
+    terrno = TSDB_CODE_MND_APP_ERROR;
+    return -1;
+  }
+
+  if (tsMint.para.clusterId < 0) {
+    terrno = TSDB_CODE_MND_APP_ERROR;
+    return -1;
+  }
+
+  return 0;
+}
+
+static int32_t mnodeAllocInitSteps() {
+  struct SSteps *steps = taosStepInit(16, NULL);
+  if (steps == NULL) return -1;
+
+  if (taosStepAdd(steps, "mnode-trans", trnInit, trnCleanup) != 0) return -1;
+  if (taosStepAdd(steps, "mnode-cluster", mnodeInitCluster, mnodeCleanupCluster) != 0) return -1;
+  if (taosStepAdd(steps, "mnode-dnode", mnodeInitDnode, mnodeCleanupDnode) != 0) return -1;
+  if (taosStepAdd(steps, "mnode-mnode", mnodeInitMnode, mnodeCleanupMnode) != 0) return -1;
+  if (taosStepAdd(steps, "mnode-acct", mnodeInitAcct, mnodeCleanupAcct) != 0) return -1;
+  if (taosStepAdd(steps, "mnode-auth", mnodeInitAuth, mnodeCleanupAuth) != 0) return -1;
+  if (taosStepAdd(steps, "mnode-user", mnodeInitUser, mnodeCleanupUser) != 0) return -1;
+  if (taosStepAdd(steps, "mnode-db", mnodeInitDb, mnodeCleanupDb) != 0) return -1;
+  if (taosStepAdd(steps, "mnode-vgroup", mnodeInitVgroup, mnodeCleanupVgroup) != 0) return -1;
+  if (taosStepAdd(steps, "mnode-stable", mnodeInitStable, mnodeCleanupStable) != 0) return -1;
+  if (taosStepAdd(steps, "mnode-func", mnodeInitFunc, mnodeCleanupFunc) != 0) return -1;
+  if (taosStepAdd(steps, "mnode-sdb", sdbInit, sdbCleanup) != 0) return -1;
+
+  tsMint.pInitSteps = steps;
+  return 0;
+}
+
+static int32_t mnodeAllocStartSteps() {
+  struct SSteps *steps = taosStepInit(8, NULL);
+  if (steps == NULL) return -1;
+
+  taosStepAdd(steps, "mnode-timer", mnodeInitTimer, NULL);
+  taosStepAdd(steps, "mnode-sdb-file", sdbOpen, sdbClose);
+  taosStepAdd(steps, "mnode-balance", mnodeInitBalance, mnodeCleanupBalance);
+  taosStepAdd(steps, "mnode-profile", mnodeInitProfile, mnodeCleanupProfile);
+  taosStepAdd(steps, "mnode-show", mnodeInitShow, mnodeCleanUpShow);
+  taosStepAdd(steps, "mnode-sync", mnodeInitSync, mnodeCleanUpSync);
+  taosStepAdd(steps, "mnode-telem", mnodeInitTelem, mnodeCleanupTelem);
+  taosStepAdd(steps, "mnode-timer", NULL, mnodeCleanupTimer);
+
+  tsMint.pStartSteps = steps;
+  return 0;
+}
+
+int32_t mnodeInit(SMnodePara para) {
+  if (mnodeSetPara(para) != 0) {
+    mError("failed to init mnode para since %s", terrstr());
+    return -1;
+  }
+
+  if (mnodeAllocInitSteps() != 0) {
+    mError("failed to alloc init steps since %s", terrstr());
+    return -1;
+  }
+
+  if (mnodeAllocStartSteps() != 0) {
+    mError("failed to alloc start steps since %s", terrstr());
+    return -1;
+  }
+
+  return taosStepExec(tsMint.pInitSteps);
+}
+
+void mnodeCleanup() { taosStepCleanup(tsMint.pInitSteps); }
+
+int32_t mnodeDeploy(SMnodeCfg *pCfg) {
+  if (tsMint.para.dnodeId <= 0 && tsMint.para.clusterId <= 0) {
+    if (sdbDeploy() != 0) {
+      mError("failed to deploy sdb since %s", terrstr());
+      return -1;
+    }
+  }
+
+  mDebug("mnode is deployed");
+  return 0;
+}
+
+void mnodeUnDeploy() { sdbUnDeploy(); }
+
+int32_t mnodeStart(SMnodeCfg *pCfg) { return taosStepExec(tsMint.pStartSteps); }
+
+int32_t mnodeAlter(SMnodeCfg *pCfg) { return 0; }
+
+void mnodeStop() { taosStepCleanup(tsMint.pStartSteps); }
+
+int32_t mnodeGetLoad(SMnodeLoad *pLoad) { return 0; }
+
+SMnodeMsg *mnodeInitMsg(SRpcMsg *pRpcMsg) {
+  SMnodeMsg *pMsg = taosAllocateQitem(sizeof(SMnodeMsg));
+  if (pMsg == NULL) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    return NULL;
+  }
+
+  if (rpcGetConnInfo(pRpcMsg->handle, &pMsg->conn) != 0) {
+    mnodeCleanupMsg(pMsg);
+    mError("can not get user from conn:%p", pMsg->rpcMsg.handle);
+    terrno = TSDB_CODE_MND_NO_USER_FROM_CONN;
+    return NULL;
+  }
+
+  pMsg->rpcMsg = *pRpcMsg;
+  pMsg->createdTime = taosGetTimestampSec();
+
+  return pMsg;
+}
+
+void mnodeCleanupMsg(SMnodeMsg *pMsg) {
+  if (pMsg->pUser != NULL) {
+    sdbRelease(pMsg->pUser);
+  }
+
+  taosFreeQitem(pMsg);
+}
+
+static void mnodeProcessRpcMsg(SMnodeMsg *pMsg) {
+  int32_t msgType = pMsg->rpcMsg.msgType;
+
+  if (tsMint.msgFp[msgType] == NULL) {
+  }
+
+  (*tsMint.msgFp[msgType])(pMsg);
+}
+
+void mnodeSetMsgFp(int32_t msgType, MnodeRpcFp fp) {
+  if (msgType > 0 || msgType < TSDB_MSG_TYPE_MAX) {
+    tsMint.msgFp[msgType] = fp;
+  }
+}
+
+void mnodeProcessMsg(SMnodeMsg *pMsg, EMnMsgType msgType) {
+  if (!mnodeIsMaster()) {
+    mnodeSendRedirectMsg(&pMsg->rpcMsg, true);
+    mnodeCleanupMsg(pMsg);
+    return;
+  }
+
+  switch (msgType) {
+    case MN_MSG_TYPE_READ:
+    case MN_MSG_TYPE_WRITE:
+    case MN_MSG_TYPE_SYNC:
+      mnodeProcessRpcMsg(pMsg);
+      break;
+    case MN_MSG_TYPE_APPLY:
+      break;
+    default:
+      break;
+  }
+}
+
+#if 0
+
+static void mnodeProcessWriteReq(SMnodeMsg *pMsg, void *unused) {
+  int32_t msgType = pMsg->rpcMsg.msgType;
+  void   *ahandle = pMsg->rpcMsg.ahandle;
+  int32_t code = 0;
+
+  if (pMsg->rpcMsg.pCont == NULL) {
+    mError("msg:%p, app:%p type:%s content is null", pMsg, ahandle, taosMsg[msgType]);
+    code = TSDB_CODE_MND_INVALID_MSG_LEN;
+    goto PROCESS_WRITE_REQ_END;
+  }
+
+  if (!mnodeIsMaster()) {
+    SMnRsp *rpcRsp = &pMsg->rpcRsp;
+    SEpSet *epSet = rpcMallocCont(sizeof(SEpSet));
+    mnodeGetMnodeEpSetForShell(epSet, true);
+    rpcRsp->rsp = epSet;
+    rpcRsp->len = sizeof(SEpSet);
+
+    mDebug("msg:%p, app:%p type:%s in write queue, is redirected, numOfEps:%d inUse:%d", pMsg, ahandle,
+           taosMsg[msgType], epSet->numOfEps, epSet->inUse);
+
+    code = TSDB_CODE_RPC_REDIRECT;
+    goto PROCESS_WRITE_REQ_END;
+  }
+
+  if (tsMworker.writeMsgFp[msgType] == NULL) {
+    mError("msg:%p, app:%p type:%s not processed", pMsg, ahandle, taosMsg[msgType]);
+    code = TSDB_CODE_MND_MSG_NOT_PROCESSED;
+    goto PROCESS_WRITE_REQ_END;
+  }
+
+  code = (*tsMworker.writeMsgFp[msgType])(pMsg);
+
+PROCESS_WRITE_REQ_END:
+  mnodeSendRsp(pMsg, code);
+}
+
+static void mnodeProcessReadReq(SMnodeMsg *pMsg, void *unused) {
+  int32_t msgType = pMsg->rpcMsg.msgType;
+  void   *ahandle = pMsg->rpcMsg.ahandle;
+  int32_t code = 0;
+
+  if (pMsg->rpcMsg.pCont == NULL) {
+    mError("msg:%p, app:%p type:%s in mread queue, content is null", pMsg, ahandle, taosMsg[msgType]);
+    code = TSDB_CODE_MND_INVALID_MSG_LEN;
+    goto PROCESS_READ_REQ_END;
+  }
+
+  if (!mnodeIsMaster()) {
+    SMnRsp *rpcRsp = &pMsg->rpcRsp;
+    SEpSet *epSet = rpcMallocCont(sizeof(SEpSet));
+    if (!epSet) {
+      code = TSDB_CODE_OUT_OF_MEMORY;
+      goto PROCESS_READ_REQ_END;
+    }
+    mnodeGetMnodeEpSetForShell(epSet, true);
+    rpcRsp->rsp = epSet;
+    rpcRsp->len = sizeof(SEpSet);
+
+    mDebug("msg:%p, app:%p type:%s in mread queue is redirected, numOfEps:%d inUse:%d", pMsg, ahandle, taosMsg[msgType],
+           epSet->numOfEps, epSet->inUse);
+    code = TSDB_CODE_RPC_REDIRECT;
+    goto PROCESS_READ_REQ_END;
+  }
+
+  if (tsMworker.readMsgFp[msgType] == NULL) {
+    mError("msg:%p, app:%p type:%s in mread queue, not processed", pMsg, ahandle, taosMsg[msgType]);
+    code = TSDB_CODE_MND_MSG_NOT_PROCESSED;
+    goto PROCESS_READ_REQ_END;
+  }
+
+  mTrace("msg:%p, app:%p type:%s will be processed in mread queue", pMsg, ahandle, taosMsg[msgType]);
+  code = (*tsMworker.readMsgFp[msgType])(pMsg);
+
+PROCESS_READ_REQ_END:
+  mnodeSendRsp(pMsg, code);
+}
+
+static void mnodeProcessPeerReq(SMnodeMsg *pMsg, void *unused) {
+  int32_t msgType = pMsg->rpcMsg.msgType;
+  void   *ahandle = pMsg->rpcMsg.ahandle;
+  int32_t code = 0;
+
+  if (pMsg->rpcMsg.pCont == NULL) {
+    mError("msg:%p, ahandle:%p type:%s in mpeer queue, content is null", pMsg, ahandle, taosMsg[msgType]);
+    code = TSDB_CODE_MND_INVALID_MSG_LEN;
+    goto PROCESS_PEER_REQ_END;
+  }
+
+  if (!mnodeIsMaster()) {
+    SMnRsp *rpcRsp = &pMsg->rpcRsp;
+    SEpSet *epSet = rpcMallocCont(sizeof(SEpSet));
+    mnodeGetMnodeEpSetForPeer(epSet, true);
+    rpcRsp->rsp = epSet;
+    rpcRsp->len = sizeof(SEpSet);
+
+    mDebug("msg:%p, ahandle:%p type:%s in mpeer queue is redirected, numOfEps:%d inUse:%d", pMsg, ahandle,
+           taosMsg[msgType], epSet->numOfEps, epSet->inUse);
+
+    code = TSDB_CODE_RPC_REDIRECT;
+    goto PROCESS_PEER_REQ_END;
+  }
+
+  if (tsMworker.peerReqFp[msgType] == NULL) {
+    mError("msg:%p, ahandle:%p type:%s in mpeer queue, not processed", pMsg, ahandle, taosMsg[msgType]);
+    code = TSDB_CODE_MND_MSG_NOT_PROCESSED;
+    goto PROCESS_PEER_REQ_END;
+  }
+
+  code = (*tsMworker.peerReqFp[msgType])(pMsg);
+
+PROCESS_PEER_REQ_END:
+  mnodeSendRsp(pMsg, code);
+}
+
+static void mnodeProcessPeerRsp(SMnodeMsg *pMsg, void *unused) {
+  int32_t  msgType = pMsg->rpcMsg.msgType;
+  SRpcMsg *pRpcMsg = &pMsg->rpcMsg;
+
+  if (!mnodeIsMaster()) {
+    mError("msg:%p, ahandle:%p type:%s not processed for not master", pRpcMsg, pRpcMsg->ahandle, taosMsg[msgType]);
+    mnodeCleanupMsg2(pMsg);
+  }
+
+  if (tsMworker.peerRspFp[msgType]) {
+    (*tsMworker.peerRspFp[msgType])(pRpcMsg);
+  } else {
+    mError("msg:%p, ahandle:%p type:%s is not processed", pRpcMsg, pRpcMsg->ahandle, taosMsg[msgType]);
+  }
+
+  mnodeCleanupMsg2(pMsg);
+}
+#endif
\ No newline at end of file

source/dnode/mnode/impl/src/mnodeAcct.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/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "mnodeInt.h"
+
+#define SDB_ACCT_VER 1
+
+static SSdbRaw *mnodeAcctActionEncode(SAcctObj *pAcct) {
+  SSdbRaw *pRaw = sdbAllocRaw(SDB_ACCT, SDB_ACCT_VER, sizeof(SAcctObj));
+  if (pRaw == NULL) return NULL;
+
+  int32_t dataPos = 0;
+  SDB_SET_BINARY(pRaw, dataPos, pAcct->acct, TSDB_USER_LEN)
+  SDB_SET_INT64(pRaw, dataPos, pAcct->createdTime)
+  SDB_SET_INT64(pRaw, dataPos, pAcct->updateTime)
+  SDB_SET_INT32(pRaw, dataPos, pAcct->acctId)
+  SDB_SET_INT32(pRaw, dataPos, pAcct->status)
+  SDB_SET_INT32(pRaw, dataPos, pAcct->cfg.maxUsers)
+  SDB_SET_INT32(pRaw, dataPos, pAcct->cfg.maxDbs)
+  SDB_SET_INT32(pRaw, dataPos, pAcct->cfg.maxTimeSeries)
+  SDB_SET_INT32(pRaw, dataPos, pAcct->cfg.maxStreams)
+  SDB_SET_INT64(pRaw, dataPos, pAcct->cfg.maxStorage)
+  SDB_SET_INT32(pRaw, dataPos, pAcct->cfg.accessState)
+  SDB_SET_DATALEN(pRaw, dataPos);
+
+  return pRaw;
+}
+
+static SSdbRow *mnodeAcctActionDecode(SSdbRaw *pRaw) {
+  int8_t sver = 0;
+  if (sdbGetRawSoftVer(pRaw, &sver) != 0) return NULL;
+
+  if (sver != SDB_ACCT_VER) {
+    terrno = TSDB_CODE_SDB_INVALID_DATA_VER;
+    return NULL;
+  }
+
+  SSdbRow *pRow = sdbAllocRow(sizeof(SAcctObj));
+  SAcctObj *pAcct = sdbGetRowObj(pRow);
+  if (pAcct == NULL) return NULL;
+  
+  int32_t dataPos = 0;
+  SDB_GET_BINARY(pRaw, pRow, dataPos, pAcct->acct, TSDB_USER_LEN)
+  SDB_GET_INT64(pRaw, pRow, dataPos, &pAcct->createdTime)
+  SDB_GET_INT64(pRaw, pRow, dataPos, &pAcct->updateTime)
+  SDB_GET_INT32(pRaw, pRow, dataPos, &pAcct->acctId)
+  SDB_GET_INT32(pRaw, pRow, dataPos, &pAcct->status)
+  SDB_GET_INT32(pRaw, pRow, dataPos, &pAcct->cfg.maxUsers)
+  SDB_GET_INT32(pRaw, pRow, dataPos, &pAcct->cfg.maxDbs)
+  SDB_GET_INT32(pRaw, pRow, dataPos, &pAcct->cfg.maxTimeSeries)
+  SDB_GET_INT32(pRaw, pRow, dataPos, &pAcct->cfg.maxStreams)
+  SDB_GET_INT64(pRaw, pRow, dataPos, &pAcct->cfg.maxStorage)
+  SDB_GET_INT32(pRaw, pRow, dataPos, &pAcct->cfg.accessState)
+
+  return pRow;
+}
+
+static int32_t mnodeAcctActionInsert(SAcctObj *pAcct) { return 0; }
+
+static int32_t mnodeAcctActionDelete(SAcctObj *pAcct) { return 0; }
+
+static int32_t mnodeAcctActionUpdate(SAcctObj *pSrcAcct, SAcctObj *pDstAcct) {
+  SAcctObj tObj;
+  int32_t  len = (int32_t)((int8_t *)&tObj.info - (int8_t *)&tObj);
+  memcpy(pDstAcct, pSrcAcct, len);
+  return 0;
+}
+
+static int32_t mnodeCreateDefaultAcct() {
+  int32_t code = 0;
+
+  SAcctObj acctObj = {0};
+  tstrncpy(acctObj.acct, TSDB_DEFAULT_USER, TSDB_USER_LEN);
+  acctObj.createdTime = taosGetTimestampMs();
+  acctObj.updateTime = acctObj.createdTime;
+  acctObj.acctId = 1;
+  acctObj.cfg = (SAcctCfg){.maxUsers = 1024,
+                           .maxDbs = 1024,
+                           .maxTimeSeries = INT32_MAX,
+                           .maxStreams = 8092,
+                           .maxStorage = INT64_MAX,
+                           .accessState = TSDB_VN_ALL_ACCCESS};
+
+  SSdbRaw *pRaw = mnodeAcctActionEncode(&acctObj);
+  if (pRaw == NULL) return -1;
+  sdbSetRawStatus(pRaw, SDB_STATUS_READY);
+
+  return sdbWrite(pRaw);
+}
+
+int32_t mnodeInitAcct() {
+  SSdbTable table = {.sdbType = SDB_ACCT,
+                     .keyType = SDB_KEY_BINARY,
+                     .deployFp = (SdbDeployFp)mnodeCreateDefaultAcct,
+                     .encodeFp = (SdbEncodeFp)mnodeAcctActionEncode,
+                     .decodeFp = (SdbDecodeFp)mnodeAcctActionDecode,
+                     .insertFp = (SdbInsertFp)mnodeAcctActionInsert,
+                     .updateFp = (SdbUpdateFp)mnodeAcctActionUpdate,
+                     .deleteFp = (SdbDeleteFp)mnodeAcctActionDelete};
+  sdbSetTable(table);
+
+  return 0;
+}
+
+void mnodeCleanupAcct() {}

source/dnode/mnode/src/mnodeSync.c → source/dnode/mnode/impl/src/mnodeSync.c

@@ -20,4 +20,10 @@
 int32_t mnodeInitSync() { return 0; }
 void    mnodeCleanUpSync() {}
 
+int32_t mnodeSyncPropose(SSdbRaw *pRaw, void *pData) {
+  trnApply(pData, pData, 0);
+  free(pData);
+  return 0;
+}
+
 bool mnodeIsMaster() { return true; }
\ No newline at end of file

source/dnode/mnode/src/mnodeTelem.c → source/dnode/mnode/impl/src/mnodeTelem.c

@@ -17,6 +17,7 @@
 #include "mnodeTelem.h"
 #include "tbuffer.h"
 #include "tglobal.h"
+#include "mnodeSync.h"
 
 #define TELEMETRY_SERVER "telemetry.taosdata.com"
 #define TELEMETRY_PORT 80
@@ -255,7 +256,7 @@ static void* mnodeTelemThreadFp(void* param) {
     if (r == 0) break;
     if (r != ETIMEDOUT) continue;
 
-    if (mnodeGetStatus() == MN_STATUS_READY) {
+    if (mnodeIsMaster()) {
       mnodeSendTelemetryReport();
     }
     end.tv_sec += REPORT_INTERVAL;

source/dnode/mnode/inc/mnodeWorker.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_MNODE_WORKER_H_
-#define _TD_MNODE_WORKER_H_
-
-#include "mnodeInt.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int32_t mnodeInitWorker();
-void    mnodeCleanupWorker();
-void    mnodeSendRsp(SMnMsg *pMsg, int32_t code);
-void    mnodeReDispatchToWriteQueue(SMnMsg *pMsg);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*_TD_MNODE_WORKER_H_*/

source/dnode/mnode/sdb/CMakeLists.txt

+aux_source_directory(src MNODE_SRC)
+add_library(sdb ${MNODE_SRC})
+target_include_directories(
+    sdb
+    PUBLIC "${CMAKE_SOURCE_DIR}/include/dnode/mnode/sdb"
+    private "${CMAKE_CURRENT_SOURCE_DIR}/inc"
+)
+target_link_libraries(
+    sdb
+    PRIVATE os
+    PRIVATE common
+    PRIVATE util
+)
\ No newline at end of file

source/dnode/mnode/transaction/CMakeLists.txt

+aux_source_directory(src MNODE_SRC)
+add_library(transaction ${MNODE_SRC})
+target_include_directories(
+    transaction
+    PUBLIC "${CMAKE_SOURCE_DIR}/include/dnode/mnode/transaction"
+    private "${CMAKE_CURRENT_SOURCE_DIR}/inc"
+)
+target_link_libraries(
+    transaction
+    PRIVATE os
+    PRIVATE common
+    PRIVATE util
+    PRIVATE sdb
+    PRIVATE transport
+)

source/dnode/qnode/CMakeLists.txt

@@ -2,6 +2,6 @@ aux_source_directory(src QNODE_SRC)
 add_library(qnode ${QNODE_SRC})
 target_include_directories(
     qnode
-    PUBLIC "${CMAKE_SOURCE_DIR}/include/server/qnode"
+    PUBLIC "${CMAKE_SOURCE_DIR}/include/dnode/qnode"
     private "${CMAKE_CURRENT_SOURCE_DIR}/inc"
 )
\ No newline at end of file