Merge branch '3.0' into 3.0_refact

CMakeLists.txt

@@ -42,14 +42,16 @@ execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
 execute_process(COMMAND "${CMAKE_COMMAND}" --build .
         WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/deps/deps-download")
 
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -gdwarf-2 -msse4.2 -mfma")
+
 # deps
 add_subdirectory(deps)
 
 # api
-aux_source_directory(include/client API_SRC)
-add_library(api INTERFACE ${API_SRC})
+add_library(api INTERFACE)
+target_include_directories(api INTERFACE "include/client")
 
 # src
 add_subdirectory(source)
 
-# tests (TODO)
\ No newline at end of file
+# tests (TODO)

deps/CMakeLists.txt

@@ -8,7 +8,13 @@ target_include_directories(
     # see https://stackoverflow.com/questions/25676277/cmake-target-include-directories-prints-an-error-when-i-try-to-add-the-source
     PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cJson>
 )
+
 add_subdirectory(lz4/build/cmake)
+target_include_directories(
+    lz4_static
+    PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/lz4/lib
+)
+
 add_subdirectory(zlib)
 target_include_directories(
     zlib

include/client/consumer/consumer.h

@@ -16,6 +16,10 @@
 #ifndef _TD_CONSUMER_H_
 #define _TD_CONSUMER_H_
 
+#include "tlist.h"
+#include "tarray.h"
+#include "hash.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -32,16 +36,15 @@ extern "C" {
   struct tmq_resp_err_t;
   typedef struct tmq_resp_err_t tmq_resp_err_t;
 
-  //topic list
-  //resouces are supposed to be free by users by calling tmq_list_destroy
-  struct tmq_topic_list_t;
-  typedef struct tmq_topic_list_t tmq_topic_list_t;
-  int32_t tmq_topic_list_add(tmq_topic_list_t*, const char*);
-  void    tmq_topic_list_destroy(tmq_topic_list_t*);
+  struct tmq_message_t;
+  typedef struct tmq_message_t tmq_message_t;
+
+  struct tmq_col_batch_t;
+  typedef struct tmq_col_batch_t tmq_col_batch_t;
 
   //get content of message
-  tmq_col_batch_t *tmq_get_msg_col_by_idx(tmq_message_t*, int32_t);
-  tmq_col_batch_t *tmq_get_msg_col_by_name(tmq_message_t*, const char*);
+  tmq_col_batch_t* tmq_get_msg_col_by_idx(tmq_message_t*, int32_t col_id);
+  tmq_col_batch_t* tmq_get_msg_col_by_name(tmq_message_t*, const char*);
 
   //consumer config
   int32_t tmq_conf_set(tmq_consumer_config_t* , const char* config_key, const char* config_value, char* errstr, int32_t errstr_cap);
@@ -51,11 +54,12 @@ extern "C" {
   tmq_consumer_t* tmq_consumer_new(tmq_consumer_config_t* , char* errstr, int32_t errstr_cap);
 
   //subscribe
-  tmq_resp_err_t tmq_subscribe(tmq_consumer_t*, const tmq_topic_list_t*);
+  tmq_resp_err_t tmq_subscribe(tmq_consumer_t*, const SList*);
+  tmq_resp_err_t tmq_unsubscribe(tmq_consumer_t*);
 
   //consume
   //resouces are supposed to be free by users by calling tmq_message_destroy
-  tmq_message_t tmq_consume_poll(tmq_consumer_t*, int64_t blocking_time);
+  tmq_message_t* tmq_consume_poll(tmq_consumer_t*, int64_t blocking_time);
 
   //destroy message and free memory
   void tmq_message_destroy(tmq_message_t*);

include/client/taos.h

@@ -172,10 +172,6 @@ DLL_EXPORT int taos_load_table_info(TAOS *taos, const char* tableNameList);
 
 DLL_EXPORT int taos_insert_lines(TAOS* taos, char* lines[], int numLines);
 
-DLL_EXPORT int taos_insert_telnet_lines(TAOS* taos, char* lines[], int numLines);
-
-DLL_EXPORT int taos_insert_json_payload(TAOS* taos, char* payload);
-
 #ifdef __cplusplus
 }
 #endif

include/common/common.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 TDENGINE_COMMON_H
+#define TDENGINE_COMMON_H
+
+#include "taosdef.h"
+
+//typedef struct STimeWindow {
+//  TSKEY skey;
+//  TSKEY ekey;
+//} STimeWindow;
+
+//typedef struct {
+//  int32_t dataLen;
+//  char    name[TSDB_TABLE_FNAME_LEN];
+//  char   *data;
+//} STagData;
+
+//typedef struct SSchema {
+//  uint8_t type;
+//  char    name[TSDB_COL_NAME_LEN];
+//  int16_t colId;
+//  int16_t bytes;
+//} SSchema;
+
+#endif  // TDENGINE_COMMON_H

include/common/schema.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TD_SCHEMA_H_
-#define _TD_SCHEMA_H_
+#ifndef _TD_COMMON_SCHEMA_H_
+#define _TD_COMMON_SCHEMA_H_
 
 #include "os.h"
 
@@ -100,4 +100,4 @@ STSchema *tdGetSchemaFromBuilder(STSchemaBuilder *pBuilder);
 }
 #endif
 
-#endif /*_TD_SCHEMA_H_*/
\ No newline at end of file
+#endif /*_TD_COMMON_SCHEMA_H_*/
\ No newline at end of file

include/common/taosMsg.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_TAOS_MSG_H_
-#define _TD_TAOS_MSG_H_
-
-typedef struct {
-  /* data */
-} SSubmitReq;
-
-typedef struct {
-  /* data */
-} SSubmitRsp;
-
-typedef struct {
-  /* data */
-} SSubmitReqReader;
-
-typedef struct {
-  /* data */
-} SCreateTableReq;
-
-typedef struct {
-  /* data */
-} SCreateTableRsp;
-
-typedef struct {
-  /* data */
-} SDropTableReq;
-
-typedef struct {
-  /* data */
-} SDropTableRsp;
-
-typedef struct {
-  /* data */
-} SAlterTableReq;
-
-typedef struct {
-  /* data */
-} SAlterTableRsp;
-
-#endif /*_TD_TAOS_MSG_H_*/
\ No newline at end of file

include/common/taosdef.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_COMMON_TAOS_DEF_H_
+#define _TD_COMMON_TAOS_DEF_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "tdef.h"
+#include "taos.h"
+
+#define TSWINDOW_INITIALIZER ((STimeWindow) {INT64_MIN, INT64_MAX})
+#define TSWINDOW_DESC_INITIALIZER ((STimeWindow) {INT64_MAX, INT64_MIN})
+#define IS_TSWINDOW_SPECIFIED(win) (((win).skey != INT64_MIN) || ((win).ekey != INT64_MAX))
+
+typedef enum {
+  TAOS_QTYPE_RPC   = 1,
+  TAOS_QTYPE_FWD   = 2,
+  TAOS_QTYPE_WAL   = 3,
+  TAOS_QTYPE_CQ    = 4,
+  TAOS_QTYPE_QUERY = 5
+} EQType;
+
+typedef enum {
+  TSDB_SUPER_TABLE  = 1,   // super table
+  TSDB_CHILD_TABLE  = 2,   // table created from super table
+  TSDB_NORMAL_TABLE = 3,   // ordinary table
+  TSDB_STREAM_TABLE = 4,   // table created from stream computing
+  TSDB_TEMP_TABLE   = 5,   // temp table created by nest query
+  TSDB_TABLE_MAX    = 6
+} ETableType;
+
+typedef enum {
+  TSDB_MOD_MNODE   = 1,
+  TSDB_MOD_HTTP    = 2,
+  TSDB_MOD_MONITOR = 3,
+  TSDB_MOD_MQTT    = 4,
+  TSDB_MOD_MAX     = 5
+} EModuleType;
+
+typedef enum {
+  TSDB_CHECK_ITEM_NETWORK,
+  TSDB_CHECK_ITEM_MEM,
+  TSDB_CHECK_ITEM_CPU,
+  TSDB_CHECK_ITEM_DISK,
+  TSDB_CHECK_ITEM_OS,
+  TSDB_CHECK_ITEM_ACCESS,
+  TSDB_CHECK_ITEM_VERSION,
+  TSDB_CHECK_ITEM_DATAFILE,
+  TSDB_CHECK_ITEM_MAX
+} ECheckItemType;
+
+typedef enum {
+  TD_ROW_DISCARD_UPDATE   = 0,
+  TD_ROW_OVERWRITE_UPDATE = 1,
+  TD_ROW_PARTIAL_UPDATE   = 2
+} TDUpdateConfig;
+
+extern char *qtypeStr[];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*_TD_COMMON_TAOS_DEF_H_*/

src/inc/taosmsg.h → include/common/taosmsg.h

@@ -13,19 +13,15 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_TAOSMSG_H
-#define TDENGINE_TAOSMSG_H
+#ifndef _TD_COMMON_TAOS_MSG_H_
+#define _TD_COMMON_TAOS_MSG_H_
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <stdbool.h>
-#include <stdint.h>
-
 #include "taosdef.h"
 #include "taoserror.h"
-#include "trpc.h"
 #include "tdataformat.h"
 
 // message type
@@ -256,12 +252,14 @@ typedef struct {
   SShellSubmitRspBlock failedBlocks[];
 } SShellSubmitRspMsg;
 
+//#if 0
 typedef struct SSchema {
   uint8_t type;
   char    name[TSDB_COL_NAME_LEN];
   int16_t colId;
   int16_t bytes;
 } SSchema;
+//#endif
 
 typedef struct {
   int32_t  contLen;
@@ -339,6 +337,13 @@ typedef struct {
   int32_t pid;
 } SConnectMsg;
 
+typedef struct SEpSet {
+  int8_t    inUse; 
+  int8_t    numOfEps;
+  uint16_t  port[TSDB_MAX_REPLICA];
+  char      fqdn[TSDB_MAX_REPLICA][TSDB_FQDN_LEN];
+} SEpSet;
+
 typedef struct {
   char      acctId[TSDB_ACCT_ID_LEN];
   char      serverVersion[TSDB_VERSION_LEN];
@@ -348,7 +353,7 @@ typedef struct {
   int8_t    reserved1;
   int8_t    reserved2;
   int32_t   connId;
-  SRpcEpSet epSet;
+  SEpSet    epSet;
 } SConnectRsp;
 
 typedef struct {
@@ -465,6 +470,21 @@ typedef struct {
   int32_t     tsOrder;          // ts comp block order
 } STsBufInfo;
 
+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 {
   SMsgHead    head;
   char        version[TSDB_VERSION_LEN];
@@ -492,7 +512,6 @@ typedef struct {
   SSessionWindow sw;            // session window
   uint16_t    tagCondLen;       // tag length in current query
   uint16_t    colCondLen;       // column length in current query
-  uint32_t    tbnameCondLen;    // table name filter condition string length
   int16_t     numOfGroupCols;   // num of group by columns
   int16_t     orderByIdx;
   int16_t     orderType;        // used in group by xx order by xxx
@@ -502,7 +521,6 @@ typedef struct {
   int64_t     offset;
   uint32_t    queryType;        // denote another query process
   int16_t     numOfOutput;      // final output columns numbers
-  int16_t     tagNameRelType;   // relation of tag criteria and tbname criteria
   int16_t     fillType;         // interpolate type
   uint64_t    fillVal;          // default value array list
   int32_t     secondStageOutput;
@@ -631,7 +649,7 @@ typedef struct {
   char    reserved[64];
 } SVnodeStatisticInfo;
 
-typedef struct {
+typedef struct SVgroupAccess {
   int32_t  vgId;
   int8_t   accessState;
 } SVgroupAccess;
@@ -660,7 +678,7 @@ typedef struct {
   char    mnodeEp[TSDB_EP_LEN];
 } SMInfo;
 
-typedef struct {
+typedef struct SMInfos {
   int8_t inUse;
   int8_t mnodeNum;
   SMInfo mnodeInfos[TSDB_MAX_REPLICA];
@@ -686,7 +704,7 @@ typedef struct {
   int8_t   reserved[4];
 } SClusterCfg;
 
-typedef struct {
+typedef struct SStatusMsg {
   uint32_t    version;
   int32_t     dnodeId;
   char        dnodeEp[TSDB_EP_LEN];
@@ -904,7 +922,7 @@ typedef struct {
   uint32_t  onlineDnodes;
   uint32_t  connId;
   int8_t    killConnection;
-  SRpcEpSet epSet;
+  SEpSet    epSet;
 } SHeartBeatRsp;
 
 typedef struct {
@@ -936,10 +954,46 @@ typedef struct {
   char    reserved2[64];
 } SStartupStep;
 
+typedef struct {
+  /* data */
+} SSubmitReq;
+
+typedef struct {
+  /* data */
+} SSubmitRsp;
+
+typedef struct {
+  /* data */
+} SSubmitReqReader;
+
+typedef struct {
+  /* data */
+} SCreateTableReq;
+
+typedef struct {
+  /* data */
+} SCreateTableRsp;
+
+typedef struct {
+  /* data */
+} SDropTableReq;
+
+typedef struct {
+  /* data */
+} SDropTableRsp;
+
+typedef struct {
+  /* data */
+} SAlterTableReq;
+
+typedef struct {
+  /* data */
+} SAlterTableRsp;
+
 #pragma pack(pop)
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif
+#endif /*_TD_COMMON_TAOS_MSG_H_*/

src/common/inc/tdataformat.h → include/common/tdataformat.h

@@ -12,12 +12,12 @@
  * 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_DATA_FORMAT_H_
-#define _TD_DATA_FORMAT_H_
+#ifndef _TD_COMMON_DATA_FORMAT_H_
+#define _TD_COMMON_DATA_FORMAT_H_
 
 #include "os.h"
 #include "talgo.h"
-#include "ttype.h"
+#include "ttypes.h"
 #include "tutil.h"
 
 #ifdef __cplusplus
@@ -51,6 +51,78 @@ extern "C" {
     memcpy(varDataVal(x), (str), (_size));      \
   } while (0);
 
+// ----------------- TSDB COLUMN DEFINITION
+typedef struct {
+  int8_t   type;    // Column type
+  int16_t  colId;   // column ID
+  int16_t  bytes;   // column bytes (restore to int16_t in case of misuse)
+  uint16_t offset;  // point offset in SDataRow after the header part.
+} STColumn;
+
+#define colType(col) ((col)->type)
+#define colColId(col) ((col)->colId)
+#define colBytes(col) ((col)->bytes)
+#define colOffset(col) ((col)->offset)
+
+#define colSetType(col, t) (colType(col) = (t))
+#define colSetColId(col, id) (colColId(col) = (id))
+#define colSetBytes(col, b) (colBytes(col) = (b))
+#define colSetOffset(col, o) (colOffset(col) = (o))
+
+// ----------------- TSDB SCHEMA DEFINITION
+typedef struct {
+  int      version;    // version
+  int      numOfCols;  // Number of columns appended
+  int      tlen;       // maximum length of a SDataRow without the header part (sizeof(VarDataOffsetT) + sizeof(VarDataLenT) + (bytes))
+  uint16_t flen;       // First part length in a SDataRow after the header part
+  uint16_t vlen;       // pure value part length, excluded the overhead (bytes only)
+  STColumn columns[];
+} STSchema;
+
+#define schemaNCols(s) ((s)->numOfCols)
+#define schemaVersion(s) ((s)->version)
+#define schemaTLen(s) ((s)->tlen)
+#define schemaFLen(s) ((s)->flen)
+#define schemaVLen(s) ((s)->vlen)
+#define schemaColAt(s, i) ((s)->columns + i)
+#define tdFreeSchema(s) tfree((s))
+
+STSchema *tdDupSchema(STSchema *pSchema);
+int       tdEncodeSchema(void **buf, STSchema *pSchema);
+void *    tdDecodeSchema(void *buf, STSchema **pRSchema);
+
+static FORCE_INLINE int comparColId(const void *key1, const void *key2) {
+  if (*(int16_t *)key1 > ((STColumn *)key2)->colId) {
+    return 1;
+  } else if (*(int16_t *)key1 < ((STColumn *)key2)->colId) {
+    return -1;
+  } else {
+    return 0;
+  }
+}
+
+static FORCE_INLINE STColumn *tdGetColOfID(STSchema *pSchema, int16_t colId) {
+  void *ptr = bsearch(&colId, (void *)pSchema->columns, schemaNCols(pSchema), sizeof(STColumn), comparColId);
+  if (ptr == NULL) return NULL;
+  return (STColumn *)ptr;
+}
+
+// ----------------- SCHEMA BUILDER DEFINITION
+typedef struct {
+  int       tCols;
+  int       nCols;
+  int       tlen;
+  uint16_t  flen;
+  uint16_t  vlen;
+  int       version;
+  STColumn *columns;
+} STSchemaBuilder;
+
+int       tdInitTSchemaBuilder(STSchemaBuilder *pBuilder, int32_t version);
+void      tdDestroyTSchemaBuilder(STSchemaBuilder *pBuilder);
+void      tdResetTSchemaBuilder(STSchemaBuilder *pBuilder, int32_t version);
+int       tdAddColToSchema(STSchemaBuilder *pBuilder, int8_t type, int16_t colId, int16_t bytes);
+STSchema *tdGetSchemaFromBuilder(STSchemaBuilder *pBuilder);
 
 // ----------------- Semantic timestamp key definition
 typedef uint64_t TKEY;
@@ -134,7 +206,7 @@ SDataRow tdDataRowDup(SDataRow row);
 // offset here not include dataRow header length
 static FORCE_INLINE int tdAppendDataColVal(SDataRow row, const void *value, bool isCopyVarData, int8_t type,
                                            int32_t offset) {
-  ASSERT(value != NULL);
+  assert(value != NULL);
   int32_t toffset = offset + TD_DATA_ROW_HEAD_SIZE;
 
   if (IS_VAR_DATA_TYPE(type)) {
@@ -145,7 +217,7 @@ static FORCE_INLINE int tdAppendDataColVal(SDataRow row, const void *value, bool
     dataRowLen(row) += varDataTLen(value);
   } else {
     if (offset == 0) {
-      ASSERT(type == TSDB_DATA_TYPE_TIMESTAMP);
+      assert(type == TSDB_DATA_TYPE_TIMESTAMP);
       TKEY tvalue = tdGetTKEY(*(TSKEY *)value);
       memcpy(POINTER_SHIFT(row, toffset), (const void *)(&tvalue), TYPE_BYTES[type]);
     } else {
@@ -199,7 +271,7 @@ static FORCE_INLINE void tdSetColOfRowNullBySchema(SDataRow row, STSchema *pSche
 
 static FORCE_INLINE void tdCopyColOfRowBySchema(SDataRow dst, STSchema *pDstSchema, int dstIdx, SDataRow src, STSchema *pSrcSchema, int srcIdx) {
   int8_t type = pDstSchema->columns[dstIdx].type;
-  ASSERT(type == pSrcSchema->columns[srcIdx].type);
+  assert(type == pSrcSchema->columns[srcIdx].type);
   void *pData = tdGetPtrToCol(dst, pDstSchema, dstIdx);
   void *value = tdGetPtrToCol(src, pSrcSchema, srcIdx);
 
@@ -285,7 +357,7 @@ static FORCE_INLINE const void *tdGetColDataOfRow(SDataCol *pCol, int row) {
 }
 
 static FORCE_INLINE int32_t dataColGetNEleLen(SDataCol *pDataCol, int rows) {
-  ASSERT(rows > 0);
+  assert(rows > 0);
 
   if (IS_VAR_DATA_TYPE(pDataCol->type)) {
     return pDataCol->dataOff[rows - 1] + varDataTLen(tdGetColDataOfRow(pDataCol, rows - 1));
@@ -315,7 +387,7 @@ static FORCE_INLINE TKEY dataColsTKeyFirst(SDataCols *pCols) {
 }
 
 static FORCE_INLINE TSKEY dataColsKeyAtRow(SDataCols *pCols, int row) {
-  ASSERT(row < pCols->numOfRows);
+  assert(row < pCols->numOfRows);
   return dataColsKeyAt(pCols, row);
 }
 
@@ -413,7 +485,7 @@ static FORCE_INLINE void *tdGetKVRowIdxOfCol(SKVRow row, int16_t colId) {
 // offset here not include kvRow header length
 static FORCE_INLINE int tdAppendKvColVal(SKVRow row, const void *value, bool isCopyValData, int16_t colId, int8_t type,
                                          int32_t offset) {
-  ASSERT(value != NULL);
+  assert(value != NULL);
   int32_t  toffset = offset + TD_KV_ROW_HEAD_SIZE;
   SColIdx *pColIdx = (SColIdx *)POINTER_SHIFT(row, toffset);
   char *   ptr = (char *)POINTER_SHIFT(row, kvRowLen(row));
@@ -428,7 +500,7 @@ static FORCE_INLINE int tdAppendKvColVal(SKVRow row, const void *value, bool isC
     kvRowLen(row) += varDataTLen(value);
   } else {
     if (offset == 0) {
-      ASSERT(type == TSDB_DATA_TYPE_TIMESTAMP);
+      assert(type == TSDB_DATA_TYPE_TIMESTAMP);
       TKEY tvalue = tdGetTKEY(*(TSKEY *)value);
       memcpy(ptr, (void *)(&tvalue), TYPE_BYTES[type]);
     } else {
@@ -741,4 +813,4 @@ static FORCE_INLINE char *payloadNextCol(char *pCol) { return (char *)POINTER_SH
 }
 #endif
 
-#endif  // _TD_DATA_FORMAT_H_
+#endif  /*_TD_COMMON_DATA_FORMAT_H_*/

src/common/inc/tglobal.h → include/common/tglobal.h

@@ -13,15 +13,15 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_COMMON_GLOBAL_H
-#define TDENGINE_COMMON_GLOBAL_H
-
-#include "taosdef.h"
+#ifndef _TD_COMMON_GLOBAL_H_
+#define _TD_COMMON_GLOBAL_H_
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#include "tdef.h"
+
 // cluster
 extern char     tsFirst[];
 extern char     tsSecond[];
@@ -36,12 +36,9 @@ extern int32_t  tsStatusInterval;
 extern int32_t  tsNumOfMnodes;
 extern int8_t   tsEnableVnodeBak;
 extern int8_t   tsEnableTelemetryReporting;
-extern char     tsEmail[];
 extern char     tsArbitrator[];
 extern int8_t   tsArbOnline;
 extern int64_t  tsArbOnlineTimestamp;
-extern int32_t  tsDnodeId;
-extern int64_t  tsDnodeStartTime;
 
 // common
 extern int      tsRpcTimer;
@@ -55,9 +52,6 @@ extern float    tsNumOfThreadsPerCore;
 extern int32_t  tsNumOfCommitThreads;
 extern float    tsRatioOfQueryCores;
 extern int8_t   tsDaylight;
-extern char     tsTimezone[];
-extern char     tsLocale[];
-extern char     tsCharset[];            // default encode string
 extern int8_t   tsEnableCoreFile;
 extern int32_t  tsCompressMsgSize;
 extern int32_t  tsCompressColData;
@@ -152,27 +146,16 @@ extern int32_t tsMonitorInterval;
 extern int8_t tsEnableStream;
 
 // internal
-extern int8_t  tsCompactMnodeWal;
 extern int8_t  tsPrintAuth;
 extern int8_t  tscEmbedded;
-extern char    configDir[];
 extern char    tsVnodeDir[];
-extern char    tsDnodeDir[];
 extern char    tsMnodeDir[];
 extern char    tsMnodeBakDir[];
 extern char    tsMnodeTmpDir[];
-extern char    tsDataDir[];
-extern char    tsLogDir[];
-extern char    tsScriptDir[];
 extern int64_t tsTickPerDay[3];
 extern int32_t tsTopicBianryLen;
 
 // system info
-extern char    tsOsName[];
-extern int64_t tsPageSize;
-extern int64_t tsOpenMax;
-extern int64_t tsStreamMax;
-extern int32_t tsNumOfCores;
 extern float   tsTotalLogDirGB;
 extern float   tsTotalTmpDirGB;
 extern float   tsTotalDataDirGB;
@@ -183,7 +166,6 @@ extern float   tsUsedDataDirGB;
 extern float   tsMinimalLogDirGB;
 extern float   tsReservedTmpDirectorySpace;
 extern float   tsMinimalDataDirGB;
-extern int32_t tsTotalMemoryMB;
 extern uint32_t tsVersion;
 
 // build info
@@ -193,28 +175,6 @@ extern char gitinfo[];
 extern char gitinfoOfInternal[];
 extern char buildinfo[];
 
-// log
-extern int8_t  tsAsyncLog;
-extern int32_t tsNumOfLogLines;
-extern int32_t tsLogKeepDays;
-extern int32_t dDebugFlag;
-extern int32_t vDebugFlag;
-extern int32_t mDebugFlag;
-extern uint32_t cDebugFlag;
-extern int32_t jniDebugFlag;
-extern int32_t tmrDebugFlag;
-extern int32_t sdbDebugFlag;
-extern int32_t httpDebugFlag;
-extern int32_t mqttDebugFlag;
-extern int32_t monDebugFlag;
-extern int32_t uDebugFlag;
-extern int32_t rpcDebugFlag;
-extern int32_t odbcDebugFlag;
-extern uint32_t qDebugFlag;
-extern int32_t wDebugFlag;
-extern int32_t cqDebugFlag;
-extern int32_t debugFlag;
-
 #ifdef TD_TSZ
 // lossy 
 extern char lossyColumns[];
@@ -239,7 +199,6 @@ extern SDiskCfg tsDiskCfg[];
 
 void    taosInitGlobalCfg();
 int32_t taosCheckGlobalCfg();
-void    taosSetAllDebugFlag();
 bool    taosCfgDynamicOptions(char *msg);
 int     taosGetFqdnPortFromEp(const char *ep, char *fqdn, uint16_t *port);
 bool    taosCheckBalanceCfgOptions(const char *option, int32_t *vnodeId, int32_t *dnodeId);
@@ -251,4 +210,4 @@ void    taosPrintDataDirCfg();
 }
 #endif
 
-#endif
+#endif /*_TD_COMMON_GLOBAL_H_*/

src/common/inc/tlocale.h → include/common/tlocale.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_COMMON_LOCALE_H
-#define TDENGINE_COMMON_LOCALE_H
+#ifndef _TD_COMMON_LOCALE_H_
+#define _TD_COMMON_LOCALE_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -24,6 +24,6 @@ void tsSetLocale();
 
 #ifdef __cplusplus
 }
-#endif
+#endif /*_TD_COMMON_LOCALE_H_*/
 
 #endif

src/common/inc/tcmdtype.h → include/common/tmsgtype.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_TSQLMSGTYPE_H
-#define TDENGINE_TSQLMSGTYPE_H
+#ifndef _TD_COMMON_SQLMSGTYPE_H_
+#define _TD_COMMON_SQLMSGTYPE_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -24,7 +24,7 @@ extern "C" {
 
 #ifdef TSDB_SQL_C
 #define TSDB_DEFINE_SQL_TYPE( name, msg ) msg, 
-char *sqlCmd[] = {
+char *sqlMsgType[] = {
   "null",
 #else
 #define TSDB_DEFINE_SQL_TYPE( name, msg ) name,
@@ -103,17 +103,15 @@ enum {
 };
 
 // create table operation type
-enum TSQL_TYPE {
-  TSQL_CREATE_TABLE = 0x1,
+enum TSQL_CREATE_TABLE_TYPE {
+  TSQL_CREATE_TABLE  = 0x1,
   TSQL_CREATE_STABLE = 0x2,
-  TSQL_CREATE_TABLE_FROM_STABLE = 0x3,
+  TSQL_CREATE_CTABLE = 0x3,
   TSQL_CREATE_STREAM = 0x4,
 };
 
-extern char *sqlCmd[];
-
 #ifdef __cplusplus
 }
 #endif
 
-#endif  // TDENGINE_TSQLMSGTYPE_H
+#endif  /*_TD_COMMON_SQLMSGTYPE_H_*/

src/os/src/windows/wSemaphore.c → include/common/tname.h

@@ -13,47 +13,47 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define _DEFAULT_SOURCE
+#ifndef TDENGINE_TNAME_H
+#define TDENGINE_TNAME_H
 
-#include "os.h"
-#include "taosdef.h"
-#include "tglobal.h"
-#include "ttimer.h"
-#include "tulog.h"
-#include "tutil.h"
-#include <windows.h>
+#define TSDB_DB_NAME_T     1
+#define TSDB_TABLE_NAME_T  2
 
-bool taosCheckPthreadValid(pthread_t thread) { return thread.p != NULL; }
+#define T_NAME_ACCT        0x1u
+#define T_NAME_DB          0x2u
+#define T_NAME_TABLE       0x4u
 
-void taosResetPthread(pthread_t* thread) { thread->p = 0; }
+typedef struct SName {
+  uint8_t type;  //db_name_t, table_name_t
+  char    acctId[TSDB_ACCT_ID_LEN];
+  char    dbname[TSDB_DB_NAME_LEN];
+  char    tname[TSDB_TABLE_NAME_LEN];
+} SName;
 
-int64_t taosGetPthreadId(pthread_t thread) {
-#ifdef PTW32_VERSION
-  return pthread_getw32threadid_np(thread);
-#else
-  return (int64_t)thread;
-#endif
-}
+int32_t tNameExtractFullName(const SName* name, char* dst);
+
+int32_t tNameLen(const SName* name);
+
+SName* tNameDup(const SName* name);
+
+bool tIsValidName(const SName* name);
 
-int64_t taosGetSelfPthreadId() { return GetCurrentThreadId(); }
+const char* tNameGetTableName(const SName* name);
 
-bool taosComparePthread(pthread_t first, pthread_t second) { return first.p == second.p; }
+int32_t tNameGetDbName(const SName* name, char* dst);
 
-int32_t taosGetPId() { return GetCurrentProcessId(); }
+int32_t tNameGetFullDbName(const SName* name, char* dst);
 
-int32_t taosGetCurrentAPPName(char* name, int32_t* len) {
-  char filepath[1024] = {0};
+bool tNameIsEmpty(const SName* name);
 
-  GetModuleFileName(NULL, filepath, MAX_PATH);
-  char* sub = strrchr(filepath, '.');
-  if (sub != NULL) {
-    *sub = '\0';
-  }
-  strcpy(name, filepath);
+void tNameAssign(SName* dst, const SName* src);
 
-  if (len != NULL) {
-    *len = (int32_t)strlen(filepath);
-  }
+int32_t tNameFromString(SName* dst, const char* str, uint32_t type);
+
+int32_t tNameSetAcctId(SName* dst, const char* acct);
+
+#if 0
+int32_t tNameSetDbName(SName* dst, const char* acct, SToken* dbToken);
+#endif
 
-  return 0;
-}
+#endif  // TDENGINE_TNAME_H

include/common/trow.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TD_TROW_H_
-#define _TD_TROW_H_
+#ifndef _TD_COMMON_ROW_H_
+#define _TD_COMMON_ROW_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -24,4 +24,4 @@ extern "C" {
 }
 #endif
 
-#endif /*_TD_TROW_H_*/
\ No newline at end of file
+#endif /*_TD_COMMON_ROW_H_*/
\ No newline at end of file

src/os/inc/osTime.h → include/common/ttime.h

@@ -13,54 +13,15 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_OS_TIME_H
-#define TDENGINE_OS_TIME_H
+#ifndef _TD_COMMON_TIME_H_
+#define _TD_COMMON_TIME_H_
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "os.h"
 #include "taosdef.h"
-
-#if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
-  #ifdef _TD_GO_DLL_
-    #define MILLISECOND_PER_SECOND (1000LL)
-  #else
-    #define MILLISECOND_PER_SECOND (1000i64)
-  #endif
-#else
-  #define MILLISECOND_PER_SECOND ((int64_t)1000L)
-#endif
-
-#define MILLISECOND_PER_MINUTE (MILLISECOND_PER_SECOND * 60)
-#define MILLISECOND_PER_HOUR   (MILLISECOND_PER_MINUTE * 60)
-#define MILLISECOND_PER_DAY    (MILLISECOND_PER_HOUR * 24)
-#define MILLISECOND_PER_WEEK   (MILLISECOND_PER_DAY * 7)
-
-//@return timestamp in second
-int32_t taosGetTimestampSec();
-
-//@return timestamp in millisecond
-static FORCE_INLINE int64_t taosGetTimestampMs() {
-  struct timeval systemTime;
-  gettimeofday(&systemTime, NULL);
-  return (int64_t)systemTime.tv_sec * 1000L + (int64_t)systemTime.tv_usec / 1000;
-}
-
-//@return timestamp in microsecond
-static FORCE_INLINE int64_t taosGetTimestampUs() {
-  struct timeval systemTime;
-  gettimeofday(&systemTime, NULL);
-  return (int64_t)systemTime.tv_sec * 1000000L + (int64_t)systemTime.tv_usec;
-}
-
-//@return timestamp in nanosecond
-static FORCE_INLINE int64_t taosGetTimestampNs() {
-  struct timespec systemTime = {0};
-  clock_gettime(CLOCK_REALTIME, &systemTime);
-  return (int64_t)systemTime.tv_sec * 1000000000L + (int64_t)systemTime.tv_nsec;
-}
+#include "taosmsg.h"
 
 /*
  * @return timestamp decided by global conf variable, tsTimePrecision
@@ -77,22 +38,6 @@ static FORCE_INLINE int64_t taosGetTimestamp(int32_t precision) {
   }
 }
 
-
-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;
-
 int64_t taosTimeAdd(int64_t t, int64_t duration, char unit, int32_t precision);
 int64_t taosTimeTruncate(int64_t t, const SInterval* pInterval, int32_t precision);
 int32_t taosTimeCountInterval(int64_t skey, int64_t ekey, int64_t interval, char unit, int32_t precision);
@@ -104,8 +49,10 @@ int32_t taosParseTime(char* timestr, int64_t* time, int32_t len, int32_t timePre
 void    deltaToUtcInitOnce();
 
 int64_t convertTimePrecision(int64_t time, int32_t fromPrecision, int32_t toPrecision);
+
+
 #ifdef __cplusplus
 }
 #endif
 
-#endif  // TDENGINE_TTIME_H
+#endif  /*_TD_COMMON_TIME_H_*/

src/common/inc/ttimezone.h → include/common/ttimezone.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_COMMON_TIMEZONE_H
-#define TDENGINE_COMMON_TIMEZONE_H
+#ifndef _TD_COMMON_TIMEZONE_H_
+#define _TD_COMMON_TIMEZONE_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -26,4 +26,4 @@ void tsSetTimeZone();
 }
 #endif
 
-#endif
+#endif /*_TD_COMMON_TIMEZONE_H_*/

include/common/ttokendef.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_COMMON_TOKEN_DEF_H_
+#define _TD_COMMON_TOKEN_DEF_H_
+
+#define TK_ID                               1
+#define TK_BOOL                             2
+#define TK_TINYINT                          3
+#define TK_SMALLINT                         4
+#define TK_INTEGER                          5
+#define TK_BIGINT                           6
+#define TK_FLOAT                            7
+#define TK_DOUBLE                           8
+#define TK_STRING                           9
+#define TK_TIMESTAMP                       10
+#define TK_BINARY                          11
+#define TK_NCHAR                           12
+#define TK_OR                              13
+#define TK_AND                             14
+#define TK_NOT                             15
+#define TK_EQ                              16
+#define TK_NE                              17
+#define TK_ISNULL                          18
+#define TK_NOTNULL                         19
+#define TK_IS                              20
+#define TK_LIKE                            21
+#define TK_MATCH                           22
+#define TK_NMATCH                          23
+#define TK_GLOB                            24
+#define TK_BETWEEN                         25
+#define TK_IN                              26
+#define TK_GT                              27
+#define TK_GE                              28
+#define TK_LT                              29
+#define TK_LE                              30
+#define TK_BITAND                          31
+#define TK_BITOR                           32
+#define TK_LSHIFT                          33
+#define TK_RSHIFT                          34
+#define TK_PLUS                            35
+#define TK_MINUS                           36
+#define TK_DIVIDE                          37
+#define TK_TIMES                           38
+#define TK_STAR                            39
+#define TK_SLASH                           40
+#define TK_REM                             41
+#define TK_CONCAT                          42
+#define TK_UMINUS                          43
+#define TK_UPLUS                           44
+#define TK_BITNOT                          45
+#define TK_SHOW                            46
+#define TK_DATABASES                       47
+#define TK_TOPICS                          48
+#define TK_FUNCTIONS                       49
+#define TK_MNODES                          50
+#define TK_DNODES                          51
+#define TK_ACCOUNTS                        52
+#define TK_USERS                           53
+#define TK_MODULES                         54
+#define TK_QUERIES                         55
+#define TK_CONNECTIONS                     56
+#define TK_STREAMS                         57
+#define TK_VARIABLES                       58
+#define TK_SCORES                          59
+#define TK_GRANTS                          60
+#define TK_VNODES                          61
+#define TK_DOT                             62
+#define TK_CREATE                          63
+#define TK_TABLE                           64
+#define TK_STABLE                          65
+#define TK_DATABASE                        66
+#define TK_TABLES                          67
+#define TK_STABLES                         68
+#define TK_VGROUPS                         69
+#define TK_DROP                            70
+#define TK_TOPIC                           71
+#define TK_FUNCTION                        72
+#define TK_DNODE                           73
+#define TK_USER                            74
+#define TK_ACCOUNT                         75
+#define TK_USE                             76
+#define TK_DESCRIBE                        77
+#define TK_DESC                            78
+#define TK_ALTER                           79
+#define TK_PASS                            80
+#define TK_PRIVILEGE                       81
+#define TK_LOCAL                           82
+#define TK_COMPACT                         83
+#define TK_LP                              84
+#define TK_RP                              85
+#define TK_IF                              86
+#define TK_EXISTS                          87
+#define TK_AS                              88
+#define TK_OUTPUTTYPE                      89
+#define TK_AGGREGATE                       90
+#define TK_BUFSIZE                         91
+#define TK_PPS                             92
+#define TK_TSERIES                         93
+#define TK_DBS                             94
+#define TK_STORAGE                         95
+#define TK_QTIME                           96
+#define TK_CONNS                           97
+#define TK_STATE                           98
+#define TK_COMMA                           99
+#define TK_KEEP                           100
+#define TK_CACHE                          101
+#define TK_REPLICA                        102
+#define TK_QUORUM                         103
+#define TK_DAYS                           104
+#define TK_MINROWS                        105
+#define TK_MAXROWS                        106
+#define TK_BLOCKS                         107
+#define TK_CTIME                          108
+#define TK_WAL                            109
+#define TK_FSYNC                          110
+#define TK_COMP                           111
+#define TK_PRECISION                      112
+#define TK_UPDATE                         113
+#define TK_CACHELAST                      114
+#define TK_PARTITIONS                     115
+#define TK_UNSIGNED                       116
+#define TK_TAGS                           117
+#define TK_USING                          118
+#define TK_NULL                           119
+#define TK_NOW                            120
+#define TK_SELECT                         121
+#define TK_UNION                          122
+#define TK_ALL                            123
+#define TK_DISTINCT                       124
+#define TK_FROM                           125
+#define TK_VARIABLE                       126
+#define TK_INTERVAL                       127
+#define TK_EVERY                          128
+#define TK_SESSION                        129
+#define TK_STATE_WINDOW                   130
+#define TK_FILL                           131
+#define TK_SLIDING                        132
+#define TK_ORDER                          133
+#define TK_BY                             134
+#define TK_ASC                            135
+#define TK_GROUP                          136
+#define TK_HAVING                         137
+#define TK_LIMIT                          138
+#define TK_OFFSET                         139
+#define TK_SLIMIT                         140
+#define TK_SOFFSET                        141
+#define TK_WHERE                          142
+#define TK_RESET                          143
+#define TK_QUERY                          144
+#define TK_SYNCDB                         145
+#define TK_ADD                            146
+#define TK_COLUMN                         147
+#define TK_MODIFY                         148
+#define TK_TAG                            149
+#define TK_CHANGE                         150
+#define TK_SET                            151
+#define TK_KILL                           152
+#define TK_CONNECTION                     153
+#define TK_STREAM                         154
+#define TK_COLON                          155
+#define TK_ABORT                          156
+#define TK_AFTER                          157
+#define TK_ATTACH                         158
+#define TK_BEFORE                         159
+#define TK_BEGIN                          160
+#define TK_CASCADE                        161
+#define TK_CLUSTER                        162
+#define TK_CONFLICT                       163
+#define TK_COPY                           164
+#define TK_DEFERRED                       165
+#define TK_DELIMITERS                     166
+#define TK_DETACH                         167
+#define TK_EACH                           168
+#define TK_END                            169
+#define TK_EXPLAIN                        170
+#define TK_FAIL                           171
+#define TK_FOR                            172
+#define TK_IGNORE                         173
+#define TK_IMMEDIATE                      174
+#define TK_INITIALLY                      175
+#define TK_INSTEAD                        176
+#define TK_KEY                            177
+#define TK_OF                             178
+#define TK_RAISE                          179
+#define TK_REPLACE                        180
+#define TK_RESTRICT                       181
+#define TK_ROW                            182
+#define TK_STATEMENT                      183
+#define TK_TRIGGER                        184
+#define TK_VIEW                           185
+#define TK_IPTOKEN                        186
+#define TK_SEMI                           187
+#define TK_NONE                           188
+#define TK_PREV                           189
+#define TK_LINEAR                         190
+#define TK_IMPORT                         191
+#define TK_TBNAME                         192
+#define TK_JOIN                           193
+#define TK_INSERT                         194
+#define TK_INTO                           195
+#define TK_VALUES                         196
+
+
+#define TK_SPACE                          300
+#define TK_COMMENT                        301
+#define TK_ILLEGAL                        302
+#define TK_HEX                            303   // hex number  0x123
+#define TK_OCT                            304   // oct number
+#define TK_BIN                            305   // bin format data 0b111
+#define TK_FILE                           306
+#define TK_QUESTION                       307   // denoting the placeholder of "?",when invoking statement bind query
+
+#endif /*_TD_COMMON_TOKEN_DEF_H_*/
+
+

src/inc/ttype.h → include/common/ttypes.h

@@ -5,8 +5,6 @@
 extern "C" {
 #endif
 
-#include <stdbool.h>
-#include <stdint.h>
 #include "taosdef.h"
 
 // ----------------- For variable data types such as TSDB_DATA_TYPE_BINARY and TSDB_DATA_TYPE_NCHAR
@@ -207,7 +205,6 @@ void operateVal(void *dst, void *s1, void *s2, int32_t optr, int32_t type);
 void* getDataMin(int32_t type);
 void* getDataMax(int32_t type);
 
-int32_t tStrToInteger(const char* z, int16_t type, int32_t n, int64_t* value, bool issigned);
 
 #define SET_DOUBLE_NULL(v) (*(uint64_t *)(v) = TSDB_DATA_DOUBLE_NULL)
 

src/common/inc/tvariant.h → include/common/tvariant.h

@@ -16,46 +16,47 @@
 #ifndef TDENGINE_TVARIANT_H
 #define TDENGINE_TVARIANT_H
 
-#include "tarray.h"
-#include "ttoken.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#include "tarray.h"
+
 // variant, each number/string/field_id has a corresponding struct during parsing sql
-typedef struct tVariant {
-  uint32_t nType;
-  int32_t  nLen;  // only used for string, for number, it is useless
+typedef struct SVariant {
+  uint32_t   nType;
+  int32_t    nLen;  // only used for string, for number, it is useless
   union {
     int64_t  i64;
     uint64_t u64;
-    double   dKey;
-    char *   pz;
+    double   d;
+    char    *pz;
     wchar_t *wpz;
     SArray  *arr; // only for 'in' query to hold value list, not value for a field
   };
-} tVariant;
+} SVariant;
 
-bool tVariantIsValid(tVariant *pVar);
+bool taosVariantIsValid(SVariant *pVar);
 
-void tVariantCreate(tVariant *pVar, SStrToken *token);
+void taosVariantCreate(SVariant *pVar, char* z, int32_t n, int32_t type);
 
-void tVariantCreateFromBinary(tVariant *pVar, const char *pz, size_t len, uint32_t type);
+void taosVariantCreateFromBinary(SVariant *pVar, const char *pz, size_t len, uint32_t type);
 
-void tVariantDestroy(tVariant *pV);
+void taosVariantDestroy(SVariant *pV);
 
-void tVariantAssign(tVariant *pDst, const tVariant *pSrc);
+void taosVariantAssign(SVariant *pDst, const SVariant *pSrc);
 
-int32_t tVariantCompare(const tVariant* p1, const tVariant* p2);
+int32_t taosVariantCompare(const SVariant* p1, const SVariant* p2);
 
-int32_t tVariantToString(tVariant *pVar, char *dst);
+int32_t taosVariantToString(SVariant *pVar, char *dst);
 
-int32_t tVariantDump(tVariant *pVariant, char *payload, int16_t type, bool includeLengthPrefix);
+int32_t taosVariantDump(SVariant *pVariant, char *payload, int16_t type, bool includeLengthPrefix);
 
-int32_t tVariantDumpEx(tVariant *pVariant, char *payload, int16_t type, bool includeLengthPrefix, bool *converted, char *extInfo);
+#if 0
+int32_t taosVariantDumpEx(SVariant *pVariant, char *payload, int16_t type, bool includeLengthPrefix, bool *converted, char *extInfo);
+#endif
 
-int32_t tVariantTypeSetType(tVariant *pVariant, char type);
+int32_t taosVariantTypeSetType(SVariant *pVariant, char type);
 
 #ifdef __cplusplus
 }

include/libs/catalog/catalog.h

@@ -20,6 +20,91 @@
 extern "C" {
 #endif
 
+#include "os.h"
+#include "thash.h"
+#include "tarray.h"
+#include "taosdef.h"
+#include "transport.h"
+#include "common.h"
+#include "taosmsg.h"
+
+struct SCatalog;
+
+typedef struct SMetaReq {
+  char    clusterId[TSDB_CLUSTER_ID_LEN];
+  SArray *pTableName;     // table full name
+  SArray *pVgroup;        // vgroup id
+  SArray *pUdf;           // udf name
+  bool    qNodeEpset;     // valid qnode
+} SMetaReq;
+
+typedef struct SMetaData {
+  SArray    *pTableMeta;  // tableMeta
+  SArray    *pVgroupInfo; // vgroupInfo list
+  SArray    *pUdfList;    // udf info list
+  SEpSet    *pEpSet;      // qnode epset list
+} SMetaData;
+
+typedef struct STableComInfo {
+  uint8_t numOfTags;      // the number of tags in schema
+  uint8_t precision;      // the number of precision
+  int16_t numOfColumns;   // the number of columns
+  int32_t rowSize;        // row size of the schema
+} STableComInfo;
+
+/*
+ * ASSERT(sizeof(SCTableMeta) == 24)
+ * ASSERT(tableType == TSDB_CHILD_TABLE)
+ * The cached child table meta info. For each child table, 24 bytes are required to keep the essential table info.
+ */
+typedef struct SCTableMeta {
+  int32_t  vgId:24;
+  int8_t   tableType;
+  uint32_t tid;
+  uint64_t uid;
+  uint64_t suid;
+} SCTableMeta;
+
+/*
+ * Note that the first 24 bytes of STableMeta are identical to SCTableMeta, it is safe to cast a STableMeta to be a SCTableMeta.
+ */
+typedef struct STableMeta {
+  int32_t        vgId:24;
+  int8_t         tableType;
+  uint32_t       tid;
+  uint64_t       uid;
+  uint64_t       suid;
+  // if the table is TSDB_CHILD_TABLE, the following information is acquired from the corresponding super table meta info
+  int16_t        sversion;
+  int16_t        tversion;
+  STableComInfo  tableInfo;
+  SSchema        schema[];
+} STableMeta;
+
+/**
+ * Catalog service object, which is utilized to hold tableMeta (meta/vgroupInfo/udfInfo) at the client-side.
+ * There is ONLY one SCatalog object for one process space, and this function returns a singleton.
+ * @param pMgmtEps
+ * @return
+ */
+struct SCatalog* getCatalogHandle(const SEpSet* pMgmtEps);
+
+/**
+ * Get the required meta data from mnode.
+ * Note that this is a synchronized API and is also thread-safety.
+ * @param pCatalog
+ * @param pMetaReq
+ * @param pMetaData
+ * @return
+ */
+int32_t catalogGetMetaData(struct SCatalog* pCatalog, const SMetaReq* pMetaReq, SMetaData* pMetaData);
+
+/**
+ * Destroy catalog service handle
+ * @param pCatalog
+ */
+void destroyCatalog(struct SCatalog* pCatalog);
+
 #ifdef __cplusplus
 }
 #endif

include/libs/executor/executor.h

@@ -20,6 +20,170 @@
 extern "C" {
 #endif
 
+typedef void* qinfo_t;
+
+/**
+ * create the qinfo object according to QueryTableMsg
+ * @param tsdb
+ * @param pQueryTableMsg
+ * @param qinfo
+ * @return
+ */
+int32_t qCreateQueryInfo(void* tsdb, int32_t vgId, SQueryTableInfo* pQueryTableMsg, qinfo_t* qinfo, uint64_t qId);
+
+/**
+ * the main query execution function, including query on both table and multiple tables,
+ * which are decided according to the tag or table name query conditions
+ *
+ * @param qinfo
+ * @return
+ */
+bool qTableQuery(qinfo_t qinfo, uint64_t *qId);
+
+/**
+ * Retrieve the produced results information, if current query is not paused or completed,
+ * this function will be blocked to wait for the query execution completed or paused,
+ * in which case enough results have been produced already.
+ *
+ * @param qinfo
+ * @return
+ */
+int32_t qRetrieveQueryResultInfo(qinfo_t qinfo, bool* buildRes, void* pRspContext);
+
+/**
+ *
+ * Retrieve the actual results to fill the response message payload.
+ * Note that this function must be executed after qRetrieveQueryResultInfo is invoked.
+ *
+ * @param qinfo  qinfo object
+ * @param pRsp    response message
+ * @param contLen payload length
+ * @return
+ */
+int32_t qDumpRetrieveResult(qinfo_t qinfo, SRetrieveTableRsp** pRsp, int32_t* contLen, bool* continueExec);
+
+/**
+ * return the transporter context (RPC)
+ * @param qinfo
+ * @return
+ */
+void* qGetResultRetrieveMsg(qinfo_t qinfo);
+
+/**
+ * kill the ongoing query and free the query handle and corresponding resources automatically
+ * @param qinfo  qhandle
+ * @return
+ */
+int32_t qKillQuery(qinfo_t qinfo);
+
+/**
+ * return whether query is completed or not
+ * @param qinfo
+ * @return
+ */
+int32_t qIsQueryCompleted(qinfo_t qinfo);
+
+/**
+ * destroy query info structure
+ * @param qHandle
+ */
+void qDestroyQueryInfo(qinfo_t qHandle);
+
+/**
+ * Get the queried table uid
+ * @param qHandle
+ * @return
+ */
+int64_t qGetQueriedTableUid(qinfo_t qHandle);
+
+/**
+ * Extract the qualified table id list, and than pass them to the TSDB driver to load the required table data blocks.
+ *
+ * @param iter  the table iterator to traverse all tables belongs to a super table, or an invert index
+ * @return
+ */
+int32_t qGetQualifiedTableIdList(void* pTableList, const char* tagCond, int32_t tagCondLen, SArray* pTableIdList);
+
+/**
+ * Create the table group according to the group by tags info
+ * @param pTableIdList
+ * @param skey
+ * @param groupInfo
+ * @param groupByIndex
+ * @param numOfIndex
+ * @return
+ */
+int32_t qCreateTableGroupByGroupExpr(SArray* pTableIdList, TSKEY skey, STableGroupInfo groupInfo, SColIndex* groupByIndex, int32_t numOfIndex);
+
+/**
+ * Update the table id list of a given query.
+ * @param uid   child table uid
+ * @param type  operation type: ADD|DROP
+ * @return
+ */
+int32_t qUpdateQueriedTableIdList(qinfo_t qinfo, int64_t uid, int32_t type);
+
+//================================================================================================
+// query handle management
+/**
+ * Query handle mgmt object
+ * @param vgId
+ * @return
+ */
+void* qOpenQueryMgmt(int32_t vgId);
+
+/**
+ * broadcast the close information and wait for all query stop.
+ * @param pExecutor
+ */
+void  qQueryMgmtNotifyClosed(void* pExecutor);
+
+/**
+ * Re-open the query handle management module when opening the vnode again.
+ * @param pExecutor
+ */
+void  qQueryMgmtReOpen(void *pExecutor);
+
+/**
+ * Close query mgmt and clean up resources.
+ * @param pExecutor
+ */
+void  qCleanupQueryMgmt(void* pExecutor);
+
+/**
+ * Add the query into the query mgmt object
+ * @param pMgmt
+ * @param qId
+ * @param qInfo
+ * @return
+ */
+void** qRegisterQInfo(void* pMgmt, uint64_t qId, void *qInfo);
+
+/**
+ * acquire the query handle according to the key from query mgmt object.
+ * @param pMgmt
+ * @param key
+ * @return
+ */
+void** qAcquireQInfo(void* pMgmt, uint64_t key);
+
+/**
+ * release the query handle and decrease the reference count in cache
+ * @param pMgmt
+ * @param pQInfo
+ * @param freeHandle
+ * @return
+ */
+void** qReleaseQInfo(void* pMgmt, void* pQInfo);
+
+/**
+ * De-register the query handle from the management module and free it immediately.
+ * @param pMgmt
+ * @param pQInfo
+ * @return
+ */
+void** qDeregisterQInfo(void* pMgmt, void* pQInfo);
+
 #ifdef __cplusplus
 }
 #endif

include/libs/parser/parser.h

@@ -20,6 +20,192 @@
 extern "C" {
 #endif
 
+#include "catalog.h"
+#include "common.h"
+#include "tname.h"
+
+//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;
+  int16_t  bytes;
+} SField;
+
+typedef struct SFieldInfo {
+  int16_t     numOfOutput;   // number of column in result
+  SField     *final;
+  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
+  char *   cond;
+} SCond;
+
+typedef struct SJoinNode {
+  uint64_t uid;
+  int16_t  tagColId;
+  SArray*  tsJoin;
+  SArray*  tagJoin;
+} SJoinNode;
+
+typedef struct SJoinInfo {
+  bool       hasJoin;
+  SJoinNode *joinTables[TSDB_MAX_JOIN_TABLE_NUM];
+} SJoinInfo;
+
+typedef struct STagCond {
+  int16_t   relType;     // relation between tbname list and query condition, including : TK_AND or TK_OR
+  SCond     tbnameCond;  // tbname query condition, only support tbname query condition on one table
+  SJoinInfo joinInfo;    // join condition, only support two tables join currently
+  SArray   *pCond;       // for different table, the query condition must be seperated
+} STagCond;
+
+typedef struct STableMetaInfo {
+  STableMeta    *pTableMeta;      // table meta, cached in client side and acquired by name
+  uint32_t       tableMetaSize;
+  size_t         tableMetaCapacity;
+  SVgroupsInfo  *vgroupList;
+  SArray        *pVgroupTables;   // SArray<SVgroupTableInfo>
+
+  /*
+   * 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
+} STableMetaInfo;
+
+typedef struct SQueryStmtInfo {
+  int16_t          command;       // the command may be different for each subclause, so keep it seperately.
+  uint32_t         type;          // query/insert type
+  STimeWindow      window;        // the whole query time window
+  SInterval        interval;      // tumble time window
+  SSessionWindow   sessionWindow; // session time window
+  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
+  SLimit           limit;
+  SLimit           slimit;
+  STagCond         tagCond;
+  SArray *         colCond;
+  SOrder           order;
+  int16_t          numOfTables;
+  int16_t          curTableIdx;
+  STableMetaInfo **pTableMetaInfo;
+  struct STSBuf   *tsBuf;
+
+  int16_t          fillType;      // final result fill type
+  int64_t *        fillVal;       // default value for fill
+  int32_t          numOfFillVal;  // fill value size
+
+  char *           msg;           // pointer to the pCmd->payload to keep error message temporarily
+  int64_t          clauseLimit;   // limit for current sub clause
+
+  int64_t          prjOffset;     // offset value in the original sql expression, only applied at client side
+  int64_t          vgroupLimit;    // table limit in case of super table projection query + global order + limit
+
+  int32_t          udColumnId;    // current user-defined constant output field column id, monotonically decreases from TSDB_UD_COLUMN_INDEX
+  bool             distinct;   // distinct tag or not
+  bool             onlyHasTagCond;
+  int32_t          bufLen;
+  char*            buf;
+  SArray          *pUdfInfo;
+
+  struct SQueryStmtInfo *sibling;     // sibling
+  SArray            *pUpstream;   // SArray<struct SQueryStmtInfo>
+  struct SQueryStmtInfo *pDownstream;
+  int32_t            havingFieldNum;
+  bool               stableQuery;
+  bool               groupbyColumn;
+  bool               simpleAgg;
+  bool               arithmeticOnAgg;
+  bool               projectionQuery;
+  bool               hasFilter;
+  bool               onlyTagQuery;
+  bool               orderProjectQuery;
+  bool               stateWindow;
+  bool               globalMerge;
+  bool               multigroupResult;
+} SQueryStmtInfo;
+
+struct SInsertStmtInfo;
+
+/**
+ * True will be returned if the input sql string is insert, false otherwise.
+ * @param pStr    sql string
+ * @param length  length of the sql string
+ * @return
+ */
+bool qIsInsertSql(const char* pStr, size_t length);
+
+/**
+ * Parse the sql statement and then return the SQueryStmtInfo as the result of bounded AST.
+ * @param pSql     sql string
+ * @param length   length of the sql string
+ * @param id       operator id, generated by uuid generator
+ * @param msg      extended error message if exists.
+ * @return         error code
+ */
+int32_t qParseQuerySql(const char* pStr, size_t length, struct SQueryStmtInfo** pQueryInfo, int64_t id, char* msg, int32_t msgLen);
+
+/**
+ * Parse the insert sql statement.
+ * @param pStr            sql string
+ * @param length          length of the sql string
+ * @param pInsertParam    data in binary format to submit to vnode directly.
+ * @param id              operator id, generated by uuid generator.
+ * @param msg             extended error message if exists to help avoid the problem in sql statement.
+ * @return
+ */
+int32_t qParseInsertSql(const char* pStr, size_t length, struct SInsertStmtInfo** pInsertInfo, int64_t id, char* msg, int32_t msgLen);
+
+/**
+ * Convert a normal sql statement to only query tags information to enable that the subscribe client can be aware quickly of the true vgroup ids that
+ * involved in the subscribe procedure.
+ * @param pSql
+ * @param length
+ * @param pConvertSql
+ * @return
+ */
+int32_t qParserConvertSql(const char* pStr, size_t length, char** pConvertSql);
+
 #ifdef __cplusplus
 }
 #endif

include/libs/planner/planner.h

@@ -20,6 +20,96 @@
 extern "C" {
 #endif
 
+#define QUERY_TYPE_MERGE       1
+#define QUERY_TYPE_PARTIAL     2
+
+struct SEpSet;
+struct SQueryNode;
+struct SQueryPhyNode;
+struct SQueryStmtInfo;
+
+typedef struct SSubquery {
+  int64_t   queryId;            // the subquery id created by qnode
+  int32_t   type;               // QUERY_TYPE_MERGE|QUERY_TYPE_PARTIAL
+  int32_t   level;              // the execution level of current subquery, starting from 0.
+  SArray   *pUpstream;          // the upstream,from which to fetch the result
+  struct SQueryPhyNode *pNode;  // physical plan of current subquery
+} SSubquery;
+
+typedef struct SQueryJob {
+  SArray  **pSubqueries;
+  int32_t   numOfLevels;
+  int32_t   currentLevel;
+} SQueryJob;
+
+
+/**
+ * Optimize the query execution plan, currently not implement yet.
+ * @param pQueryNode
+ * @return
+ */
+int32_t qOptimizeQueryPlan(struct SQueryNode* pQueryNode);
+
+/**
+ * Create the query plan according to the bound AST, which is in the form of pQueryInfo
+ * @param pQueryInfo
+ * @param pQueryNode
+ * @return
+ */
+int32_t qCreateQueryPlan(const struct SQueryStmtInfo* pQueryInfo, struct SQueryNode* pQueryNode);
+
+/**
+ * Convert the query plan to string, in order to display it in the shell.
+ * @param pQueryNode
+ * @return
+ */
+int32_t qQueryPlanToString(struct SQueryNode* pQueryNode, char** str);
+
+/**
+ * Restore the SQL statement according to the logic query plan.
+ * @param pQueryNode
+ * @param sql
+ * @return
+ */
+int32_t qQueryPlanToSql(struct SQueryNode* pQueryNode, char** sql);
+
+/**
+ * Create the physical plan for the query, according to the logic plan.
+ * @param pQueryNode
+ * @param pPhyNode
+ * @return
+ */
+int32_t qCreatePhysicalPlan(struct SQueryNode* pQueryNode, struct SEpSet* pQnode, struct SQueryPhyNode *pPhyNode);
+
+/**
+ * Convert to physical plan to string to enable to print it out in the shell.
+ * @param pPhyNode
+ * @param str
+ * @return
+ */
+int32_t qPhyPlanToString(struct SQueryPhyNode *pPhyNode, char** str);
+
+/**
+ * Destroy the query plan object.
+ * @return
+ */
+void* qDestroyQueryPlan(struct SQueryNode* pQueryNode);
+
+/**
+ * Destroy the physical plan.
+ * @param pQueryPhyNode
+ * @return
+ */
+void* qDestroyQueryPhyPlan(struct SQueryPhyNode* pQueryPhyNode);
+
+/**
+ * Create the query job from the physical execution plan
+ * @param pPhyNode
+ * @param pJob
+ * @return
+ */
+int32_t qCreateQueryJob(const struct SQueryPhyNode* pPhyNode, struct SQueryJob** pJob);
+
 #ifdef __cplusplus
 }
 #endif

include/libs/scheduler/scheduler.h

@@ -20,6 +20,32 @@
 extern "C" {
 #endif
 
+struct SQueryJob;
+
+/**
+ * Process the query job, generated according to the query physical plan.
+ * This is a synchronized API, and is also thread-safety.
+ * @param pJob
+ * @return
+ */
+int32_t qProcessQueryJob(struct SQueryJob* pJob);
+
+/**
+ * The SSqlObj should not be here????
+ * @param pSql
+ * @param pVgroupId
+ * @param pRetVgroupId
+ * @return
+ */
+//SArray* qGetInvolvedVgroupIdList(struct SSqlObj* pSql, SArray* pVgroupId, SArray* pRetVgroupId);
+
+/**
+ * Cancel query job
+ * @param pJob
+ * @return
+ */
+int32_t qKillQueryJob(struct SQueryJob* pJob);
+
 #ifdef __cplusplus
 }
 #endif

include/libs/transport/transport.h

@@ -20,6 +20,22 @@
 extern "C" {
 #endif
 
+//typedef struct SEpAddr {
+//  char       fqdn[TSDB_FQDN_LEN];
+//  uint16_t   port;
+//} SEpAddr;
+//
+//typedef struct SVgroup {
+//  int32_t    vgId;
+//  int8_t     numOfEps;
+//  SEpAddr    epAddr[TSDB_MAX_REPLICA];
+//} SVgroup;
+//
+//typedef struct SVgroupsInfo {
+//  int32_t    numOfVgroups;
+//  SVgroup    vgroups[];
+//} SVgroupsInfo;
+
 #ifdef __cplusplus
 }
 #endif

include/libs/wal/wal.h

@@ -15,13 +15,16 @@
 #ifndef _TD_WAL_H_
 #define _TD_WAL_H_
 
+#include "os.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 typedef enum {
   TAOS_WAL_NOLOG = 0,
-  TAOS_WAL_WRITE = 1
+  TAOS_WAL_WRITE = 1,
+  TAOS_WAL_FSYNC = 2
 } EWalType;
 
 typedef struct {
@@ -55,8 +58,8 @@ void     walStop(twalh);
 void     walClose(twalh);
 
 //write
-int32_t  walWrite(twalh, int8_t msgType, void* body, uint32_t bodyLen);
-void     walWaitFsync(twalh, bool forceHint);
+int64_t  walWrite(twalh, int8_t msgType, void* body, uint32_t bodyLen);
+void     walFsync(twalh, bool forceHint);
 //int32_t  walCommit(twalh, uint64_t ver);
 //int32_t  walRollback(twalh, uint64_t ver);
 
@@ -67,7 +70,7 @@ int32_t  walReadWithFp(twalh, FWalWrite writeFp, int64_t verStart, int readNum);
 //life cycle
 int32_t  walDataPersisted(twalh, int64_t ver);
 int32_t  walFirstVer(twalh);
-int32_t  walLastVer(twal);
+int32_t  walLastVer(twalh);
 //int32_t  walDataCorrupted(twalh);
 
 #ifdef __cplusplus

include/os/os.h

@@ -21,17 +21,52 @@ extern "C" {
 #endif
 
 #include <assert.h>
+#include <ctype.h>
+#include <errno.h>
+#include <float.h>
+#include <inttypes.h>
+#include <locale.h>
+#include <math.h>
+#include <setjmp.h>
+#include <signal.h>
+#include <stdarg.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
+#include <wctype.h>
+#include <wchar.h>
 #include <sched.h>
+#include <ctype.h>
+#include <errno.h>
+#include <float.h>
+#include <math.h>
 
 #include "osAtomic.h"
 #include "osDef.h"
+#include "osDir.h"
 #include "osEndian.h"
+#include "osEnv.h"
+#include "osFile.h"
+#include "osLz4.h"
+#include "osMath.h"
 #include "osMemory.h"
+#include "osRand.h"
+#include "osSemaphore.h"
+#include "osSignal.h"
+#include "osSleep.h"
+#include "osSocket.h"
+#include "osString.h"
+#include "osSysinfo.h"
+#include "osSystem.h"
+#include "osThread.h"
+#include "osTime.h"
+#include "osTimer.h"
+
+void osInit();
 
 #ifdef __cplusplus
 }

include/os/osAtomic.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_OS_ATOMIC_H
-#define TDENGINE_OS_ATOMIC_H
+#ifndef _TD_OS_ATOMIC_H_
+#define _TD_OS_ATOMIC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -355,4 +355,4 @@ extern "C" {
 }
 #endif
 
-#endif
+#endif /*_TD_OS_ATOMIC_H_*/

include/os/osDef.h

@@ -20,12 +20,164 @@
 extern "C" {
 #endif
 
+#if defined(_TD_DARWIN_64)
+  // specific
+  typedef int(*__compar_fn_t)(const void *, const void *);
+
+  // for send function in tsocket.c
+  #if defined(MSG_NOSIGNAL)
+    #undef MSG_NOSIGNAL
+  #endif
+
+  #define MSG_NOSIGNAL             0
+
+  #define SO_NO_CHECK              0x1234
+  #define SOL_TCP                  0x1234
+  #define TCP_KEEPIDLE             0x1234
+
+  #ifndef PTHREAD_MUTEX_RECURSIVE_NP
+    #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
+  #endif
+#endif
+
+#if defined(_ALPINE)
+  typedef int(*__compar_fn_t)(const void *, const void *);
+  void  error (int, int, const char *);
+  #ifndef PTHREAD_MUTEX_RECURSIVE_NP
+    #define  PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
+  #endif
+#endif
+
+
+#if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
+  char *stpcpy (char *dest, const char *src);
+  char *stpncpy (char *dest, const char *src, size_t n);
+
+  // specific
+  typedef int (*__compar_fn_t)(const void *, const void *);
+  #define ssize_t int
+  #define bzero(ptr, size) memset((ptr), 0, (size))
+  #define strcasecmp  _stricmp
+  #define strncasecmp _strnicmp
+  #define wcsncasecmp _wcsnicmp
+  #define strtok_r strtok_s
+  #define snprintf _snprintf
+  #define in_addr_t unsigned long
+  #define socklen_t int
+
+  struct tm *localtime_r(const time_t *timep, struct tm *result);
+  char *     strptime(const char *buf, const char *fmt, struct tm *tm);
+  char *     strsep(char **stringp, const char *delim);
+  char *     getpass(const char *prefix);
+  char *     strndup(const char *s, size_t n);
+  
+#endif
+
+#define POINTER_SHIFT(p, b) ((void *)((char *)(p) + (b)))
+#define POINTER_DISTANCE(p1, p2) ((char *)(p1) - (char *)(p2)) 
+
+#ifndef NDEBUG
+#define ASSERT(x) assert(x)
+#else
+#define ASSERT(x)
+#endif
+
+#ifndef UNUSED
+#define UNUSED(x) ((void)(x))
+#endif
+
+#ifdef UNUSED_FUNC
+#undefine UNUSED_FUNC
+#endif
+
+#ifdef UNUSED_PARAM
+#undef UNUSED_PARAM
+#endif
+
+#if defined(__GNUC__)
+#define UNUSED_PARAM(x) _UNUSED##x __attribute__((unused))
+#define UNUSED_FUNC __attribute__((unused))
+#else
+#define UNUSED_PARAM(x) x
+#define UNUSED_FUNC
+#endif
+
+#ifdef tListLen
+#undefine tListLen
+#endif
+#define tListLen(x) (sizeof(x) / sizeof((x)[0]))
+
 #if defined(__GNUC__)
 #define FORCE_INLINE inline __attribute__((always_inline))
 #else
 #define FORCE_INLINE
 #endif
 
+#define DEFAULT_UNICODE_ENCODEC "UCS-4LE"
+
+#define DEFAULT_COMP(x, y)       \
+  do {                           \
+    if ((x) == (y)) {            \
+      return 0;                  \
+    } else {                     \
+      return (x) < (y) ? -1 : 1; \
+    }                            \
+  } while (0)
+
+#define DEFAULT_DOUBLE_COMP(x, y)           \
+  do {                                      \
+    if (isnan(x) && isnan(y)) { return 0; } \
+    if (isnan(x)) { return -1; }            \
+    if (isnan(y)) { return 1; }             \
+    if ((x) == (y)) {                       \
+      return 0;                             \
+    } else {                                \
+      return (x) < (y) ? -1 : 1;            \
+    }                                       \
+  } while (0)
+
+#define DEFAULT_FLOAT_COMP(x, y) DEFAULT_DOUBLE_COMP(x, y)
+
+#define ALIGN_NUM(n, align) (((n) + ((align)-1)) & (~((align)-1)))
+
+// align to 8bytes
+#define ALIGN8(n) ALIGN_NUM(n, 8)
+
+#undef threadlocal
+#ifdef _ISOC11_SOURCE
+  #define threadlocal _Thread_local
+#elif defined(__APPLE__)
+  #define threadlocal __thread
+#elif defined(__GNUC__) && !defined(threadlocal)
+  #define threadlocal __thread
+#else
+  #define threadlocal __declspec( thread )
+#endif
+
+#if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
+  #define PRIzu "ld"  
+#else
+  #define PRIzu "zu"  
+#endif
+
+#if defined(_TD_LINUX_64) || defined(_TD_LINUX_32) || defined(_TD_MIPS_64)  || defined(_TD_ARM_32) || defined(_TD_ARM_64)  || defined(_TD_DARWIN_64)
+  #if defined(_TD_DARWIN_64)
+    // MacOS
+    #if !defined(_GNU_SOURCE)
+      #define setThreadName(name) do { pthread_setname_np((name)); } while (0)
+    #else
+      // pthread_setname_np not defined
+      #define setThreadName(name)
+    #endif
+  #else
+    // Linux, length of name must <= 16 (the last '\0' included)
+    #define setThreadName(name) do { prctl(PR_SET_NAME, (name)); } while (0)
+  #endif
+#else
+  // Windows
+  #define setThreadName(name)
+#endif
+
 #ifdef __cplusplus
 }
 #endif

src/dnode/inc/dnodeStep.h → include/os/osDir.h

@@ -13,21 +13,22 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_DNODE_STEP_H
-#define TDENGINE_DNODE_STEP_H
+#ifndef _TD_OS_DIR_H_
+#define _TD_OS_DIR_H_
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "dnodeInt.h"
 
-int32_t dnodeStepInit(SStep *pSteps, int32_t stepSize);
-void    dnodeStepCleanup(SStep *pSteps, int32_t stepSize);
-void    dnodeReportStep(char *name, char *desc, int8_t finished);
-void    dnodeSendStartupStep(SRpcMsg *pMsg);
+void taosRemoveDir(char *dirname);
+bool taosDirExist(char *dirname);
+bool taosMkDir(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);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif
\ No newline at end of file
+#endif /*_TD_OS_DIR_H_*/

src/dnode/inc/dnodeMain.h → include/os/osEnv.h

@@ -13,19 +13,22 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_DNODE_MAIN_H
-#define TDENGINE_DNODE_MAIN_H
+#ifndef _TD_OS_ENV_H_
+#define _TD_OS_ENV_H_
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "dnodeInt.h"
 
-int32_t dnodeInitSystem();
-void    dnodeCleanUpSystem();
+extern char tsOsName[];
+extern char tsDnodeDir[];
+extern char tsDataDir[];
+extern char tsLogDir[];
+extern char tsScriptDir[];
+extern char configDir[];
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif
+#endif /*_TD_OS_ENV_H_*/
\ No newline at end of file

src/os/inc/osFile.h → include/os/osFile.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_OS_FILE_H
-#define TDENGINE_OS_FILE_H
+#ifndef _TD_OS_FILE_H_
+#define _TD_OS_FILE_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -22,55 +22,52 @@ extern "C" {
 
 #include "osSocket.h"
 
-#define FD_VALID(x) ((x) > STDERR_FILENO)
-#define FD_INITIALIZER  ((int32_t)-1)
-
-#ifndef PATH_MAX
-  #define PATH_MAX 256
-#endif
-
 #if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
 typedef int32_t FileFd;
-typedef SOCKET  SocketFd;
 #else
 typedef int32_t FileFd;
-typedef int32_t SocketFd;
 #endif
 
-int64_t taosRead(FileFd fd, void *buf, int64_t count);
-int64_t taosWrite(FileFd fd, void *buf, int64_t count);
+#define FD_INITIALIZER ((int32_t)-1)
+
+#ifndef PATH_MAX
+#define PATH_MAX 256
+#endif
+
+int32_t taosLockFile(FileFd fd);
+int32_t taosUnLockFile(FileFd fd);
+
+int32_t taosUmaskFile(FileFd fd);
 
-int64_t taosLSeek(FileFd fd, int64_t offset, int32_t whence);
-int32_t taosFtruncate(FileFd fd, int64_t length);
-int32_t taosFsync(FileFd fd);
+int32_t taosStatFile(const char *path, int64_t *size, int32_t *mtime);
+int32_t taosFStatFile(FileFd fd, int64_t *size, int32_t *mtime);
 
-int32_t taosRename(char* oldName, char *newName);
-int64_t taosCopy(char *from, char *to);
+FileFd taosOpenFileWrite(const char *path);
+FileFd taosOpenFileCreateWrite(const char *path);
+FileFd taosOpenFileCreateWriteTrunc(const char *path);
+FileFd taosOpenFileCreateWriteAppend(const char *path);
+FileFd taosOpenFileRead(const char *path);
+FileFd taosOpenFileReadWrite(const char *path);
+
+int64_t taosLSeekFile(FileFd fd, int64_t offset, int32_t whence);
+int32_t taosFtruncateFile(FileFd fd, int64_t length);
+int32_t taosFsyncFile(FileFd fd);
+
+int64_t taosReadFile(FileFd fd, void *buf, int64_t count);
+int64_t taosWriteFile(FileFd fd, void *buf, int64_t count);
+
+void taosCloseFile(FileFd fd);
+
+int32_t taosRenameFile(char *oldName, char *newName);
+int64_t taosCopyFile(char *from, char *to);
+
+void taosGetTmpfilePath(const char *inputTmpDir, const char *fileNamePrefix, char *dstPath);
 
 int64_t taosSendFile(SocketFd dfd, FileFd sfd, int64_t *offset, int64_t size);
 int64_t taosFSendFile(FILE *outfile, FILE *infile, int64_t *offset, int64_t size);
 
-void taosGetTmpfilePath(const char *fileNamePrefix, char *dstPath);
-void taosClose(FileFd fd);
-
-#ifdef TAOS_RANDOM_FILE_FAIL
-  void taosSetRandomFileFailFactor(int32_t factor);
-  void taosSetRandomFileFailOutput(const char *path);
-  #ifdef TAOS_RANDOM_FILE_FAIL_TEST
-    int64_t taosReadFileRandomFail(int32_t fd, void *buf, int32_t count, const char *file, uint32_t line);
-    int64_t taosWriteFileRandomFail(int32_t fd, void *buf, int32_t count, const char *file, uint32_t line);
-    int64_t taosLSeekRandomFail(int32_t fd, int64_t offset, int32_t whence, const char *file, uint32_t line);
-    #undef taosRead
-    #undef taosWrite
-    #undef taosLSeek
-    #define taosRead(fd, buf, count) taosReadFileRandomFail(fd, buf, count, __FILE__, __LINE__)
-    #define taosWrite(fd, buf, count) taosWriteFileRandomFail(fd, buf, count, __FILE__, __LINE__)
-    #define taosLSeek(fd, offset, whence) taosLSeekRandomFail(fd, offset, whence, __FILE__, __LINE__)
-  #endif
-#endif
-
 #ifdef __cplusplus
 }
 #endif
 
-#endif
+#endif /*_TD_OS_FILE_H_*/

src/os/inc/osLz4.h → include/os/osLz4.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_OS_LZ4_H
-#define TDENGINE_OS_LZ4_H
+#ifndef _TD_OS_LZ4_H_
+#define _TD_OS_LZ4_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -46,4 +46,4 @@ extern "C" {
 }
 #endif
 
-#endif
+#endif /*_TD_OS_LZ4_H_*/

src/os/inc/osMath.h → include/os/osMath.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_OS_MATH_H
-#define TDENGINE_OS_MATH_H
+#ifndef _TD_OS_MATH_H_
+#define _TD_OS_MATH_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -62,4 +62,4 @@ extern "C" {
 }
 #endif
 
-#endif
+#endif /*_TD_OS_MATH_H_*/

src/os/inc/osRand.h → include/os/osRand.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_OS_RAND_H
-#define TDENGINE_OS_RAND_H
+#ifndef _TD_OS_RAND_H_
+#define _TD_OS_RAND_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -28,4 +28,4 @@ uint32_t taosSafeRand(void);
 }
 #endif
 
-#endif
+#endif /*_TD_OS_RAND_H_*/

src/os/inc/osSemaphore.h → include/os/osSemaphore.h

@@ -13,13 +13,15 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_OS_SEMAPHORE_H
-#define TDENGINE_OS_SEMAPHORE_H
+#ifndef _TD_OS_SEMPHONE_H_
+#define _TD_OS_SEMPHONE_H_
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#include <semaphore.h>
+
 #if defined (_TD_DARWIN_64)
   typedef struct tsem_s *tsem_t;
   int tsem_init(tsem_t *sem, int pshared, unsigned int value);
@@ -61,4 +63,4 @@ int32_t taosGetCurrentAPPName(char* name, int32_t* len);
 }
 #endif
 
-#endif
+#endif /*_TD_OS_SEMPHONE_H_*/

src/os/inc/osSignal.h → include/os/osSignal.h

@@ -13,15 +13,13 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_OS_SIGNAL_H
-#define TDENGINE_OS_SIGNAL_H
+#ifndef _TD_OS_SIGNAL_H_
+#define _TD_OS_SIGNAL_H_
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <signal.h>
-
 #ifndef SIGALRM
   #define SIGALRM 1234
 #endif
@@ -55,4 +53,4 @@ void taosDflSignal(int32_t signum);
 }
 #endif
 
-#endif  // TDENGINE_OS_SIGNAL_H
+#endif  /*_TD_OS_SIGNAL_H_*/

src/os/inc/osSleep.h → include/os/osSleep.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_OS_SLEEP_H
-#define TDENGINE_OS_SLEEP_H
+#ifndef _TD_OS_SLEEP_H_
+#define _TD_OS_SLEEP_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -26,4 +26,4 @@ void taosMsleep(int32_t ms);
 }
 #endif
 
-#endif
\ No newline at end of file
+#endif /*_TD_OS_SLEEP_H_*/
\ No newline at end of file

src/util/inc/tsocket.h → include/os/osSocket.h

@@ -13,15 +13,60 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_TSOCKET_H
-#define TDENGINE_TSOCKET_H
+#ifndef _TD_OS_SOCKET_H_
+#define _TD_OS_SOCKET_H_
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifdef WINDOWS
-#include "wepoll.h"
+#if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
+  #include "winsock2.h"
+  #include <WS2tcpip.h>
+  #include <winbase.h>
+  #include <Winsock2.h>
+#else
+  #include <netinet/in.h>
+  #include <sys/epoll.h>
+#endif
+
+#define TAOS_EPOLL_WAIT_TIME 500
+typedef int32_t SOCKET;
+typedef SOCKET  EpollFd;
+#define EpollClose(pollFd) taosCloseSocket(pollFd)
+
+#if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
+typedef SOCKET SocketFd;
+#else
+typedef int32_t SocketFd;
+#endif
+
+int32_t taosSendto(SocketFd fd, void * msg, int len, unsigned int flags, const struct sockaddr * to, int tolen);
+int32_t taosWriteSocket(SocketFd fd, void *msg, int len);
+int32_t taosReadSocket(SocketFd fd, void *msg, int len);
+int32_t taosCloseSocketNoCheck(SocketFd fd);
+int32_t taosCloseSocket(SocketFd fd);
+void    taosShutDownSocketRD(SOCKET fd);
+void    taosShutDownSocketWR(SOCKET fd);
+int32_t taosSetNonblocking(SOCKET sock, int32_t on);
+void    taosIgnSIGPIPE();
+void    taosBlockSIGPIPE();
+void    taosSetMaskSIGPIPE();
+int32_t taosSetSockOpt(SOCKET socketfd, int32_t level, int32_t optname, void *optval, int32_t optlen);
+int32_t taosGetSockOpt(SOCKET socketfd, int32_t level, int32_t optname, void *optval, int32_t *optlen);
+
+uint32_t    taosInetAddr(char *ipAddr);
+const char *taosInetNtoa(struct in_addr ipInt);
+
+#if (defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)) 
+  #define htobe64 htonll
+  #if defined(_TD_GO_DLL_)
+    uint64_t htonll(uint64_t val);
+  #endif
+#endif
+
+#if defined(_TD_DARWIN_64)
+  #define htobe64 htonll
 #endif
 
 int32_t taosReadn(SOCKET sock, char *buffer, int32_t len);
@@ -45,4 +90,4 @@ uint32_t ip2uint(const char *const ip_addr);
 }
 #endif
 
-#endif  // TDENGINE_TSOCKET_H
+#endif /*_TD_OS_SOCKET_H_*/

src/os/inc/osString.h → include/os/osString.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_OS_STRING_H
-#define TDENGINE_OS_STRING_H
+#ifndef _TD_OS_STRING_H_
+#define _TD_OS_STRING_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -43,7 +43,7 @@ int64_t taosStr2int64(char *str);
 // USE_LIBICONV
 int32_t taosUcs4ToMbs(void *ucs4, int32_t ucs4_max_len, char *mbs);
 bool    taosMbsToUcs4(char *mbs, size_t mbs_len, char *ucs4, int32_t ucs4_max_len, int32_t *len);
-int32_t tasoUcs4Compare(void *f1_ucs4, void *f2_ucs4, int32_t bytes);
+int32_t tasoUcs4Compare(void *f1_ucs4, void *f2_ucs4, int32_t bytes, int8_t ncharSize);
 bool    taosValidateEncodec(const char *encodec);
 char *  taosCharsetReplace(char *charsetstr);
 
@@ -51,4 +51,4 @@ char *  taosCharsetReplace(char *charsetstr);
 }
 #endif
 
-#endif
+#endif /*_TD_OS_STRING_H_*/

src/os/inc/osSysinfo.h → include/os/osSysinfo.h

@@ -13,13 +13,25 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_OS_SYSINFO_H
-#define TDENGINE_OS_SYSINFO_H
+#ifndef _TD_OS_SYSINFO_H_
+#define _TD_OS_SYSINFO_H_
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#define TSDB_LOCALE_LEN   64
+#define TSDB_TIMEZONE_LEN 96
+
+extern int64_t tsPageSize;
+extern int64_t tsOpenMax;
+extern int64_t tsStreamMax;
+extern int32_t tsNumOfCores;
+extern int32_t tsTotalMemoryMB;
+extern char     tsTimezone[];
+extern char     tsLocale[];
+extern char     tsCharset[];            // default encode string
+
 typedef struct {
   int64_t tsize;
   int64_t used;
@@ -27,25 +39,34 @@ typedef struct {
 } SysDiskSize;
 
 int32_t taosGetDiskSize(char *dataDir, SysDiskSize *diskSize);
-
 int32_t taosGetCpuCores();
-void taosGetSystemInfo();
-bool taosReadProcIO(int64_t* rchars, int64_t* wchars);
-bool taosGetProcIO(float *readKB, float *writeKB);
-bool taosGetCardInfo(int64_t *bytes, int64_t *rbytes, int64_t *tbytes);
-bool taosGetBandSpeed(float *bandSpeedKb);
-void taosGetDisk();
-bool taosGetCpuUsage(float *sysCpuUsage, float *procCpuUsage) ;
-bool taosGetProcMemory(float *memoryUsedMB) ;
-bool taosGetSysMemory(float *memoryUsedMB);
-void taosPrintOsInfo();
-void taosPrintDiskInfo();
-int  taosSystem(const char * cmd) ;
-void taosKillSystem();
-bool taosGetSystemUid(char *uid);
-char *taosGetCmdlineByPID(int pid);
-
-void taosSetCoreDump();
+void    taosGetSystemInfo();
+bool    taosReadProcIO(int64_t *rchars, int64_t *wchars);
+bool    taosGetProcIO(float *readKB, float *writeKB);
+bool    taosGetCardInfo(int64_t *bytes, int64_t *rbytes, int64_t *tbytes);
+bool    taosGetBandSpeed(float *bandSpeedKb);
+void    taosGetDisk();
+bool    taosGetCpuUsage(float *sysCpuUsage, float *procCpuUsage);
+bool    taosGetProcMemory(float *memoryUsedMB);
+bool    taosGetSysMemory(float *memoryUsedMB);
+void    taosPrintOsInfo();
+int     taosSystem(const char *cmd);
+void    taosKillSystem();
+bool    taosGetSystemUid(char *uid, int32_t uidlen);
+char *  taosGetCmdlineByPID(int pid);
+void    taosSetCoreDump(bool enable);
+
+typedef struct {
+  const char *sysname;
+  const char *nodename;
+  const char *release;
+  const char *version;
+  const char *machine;
+} SysNameInfo;
+
+SysNameInfo taosGetSysNameInfo();
+
+int64_t taosGetPid();
 
 #ifdef __cplusplus
 }

src/os/inc/osSystem.h → include/os/osSystem.h

@@ -13,21 +13,21 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_OS_SYSTEM_H
-#define TDENGINE_OS_SYSTEM_H
+#ifndef _TD_OS_SYSTEM_H_
+#define _TD_OS_SYSTEM_H_
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-void* taosLoadDll(const char *filename);
+void* taosLoadDll(const char* filename);
 void* taosLoadSym(void* handle, char* name);
-void taosCloseDll(void *handle);
+void  taosCloseDll(void* handle);
 
-int taosSetConsoleEcho(bool on);
+int32_t taosSetConsoleEcho(bool on);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif
+#endif /*_TD_OS_SYSTEM_H_*/

src/inc/module.h → include/os/osThread.h

@@ -13,18 +13,17 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_MODULE
-#define TDENGINE_MODULE
+#ifndef _TD_OS_THREAD_H_
+#define _TD_OS_THREAD_H_
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-int32_t moduleStart();
-void    moduleStop();
+#include <pthread.h>
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif
+#endif /*_TD_OS_THREAD_H_*/

include/os/osTime.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_OS_TIME_H_
+#define _TD_OS_TIME_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
+  #ifdef _TD_GO_DLL_
+    #define MILLISECOND_PER_SECOND (1000LL)
+  #else
+    #define MILLISECOND_PER_SECOND (1000i64)
+  #endif
+#else
+  #define MILLISECOND_PER_SECOND ((int64_t)1000L)
+#endif
+
+#define MILLISECOND_PER_MINUTE (MILLISECOND_PER_SECOND * 60)
+#define MILLISECOND_PER_HOUR   (MILLISECOND_PER_MINUTE * 60)
+#define MILLISECOND_PER_DAY    (MILLISECOND_PER_HOUR * 24)
+#define MILLISECOND_PER_WEEK   (MILLISECOND_PER_DAY * 7)
+
+int32_t taosGetTimeOfDay(struct timeval *tv);
+
+//@return timestamp in second
+int32_t taosGetTimestampSec();
+
+//@return timestamp in millisecond
+static FORCE_INLINE int64_t taosGetTimestampMs() {
+  struct timeval systemTime;
+  taosGetTimeOfDay(&systemTime);
+  return (int64_t)systemTime.tv_sec * 1000L + (int64_t)systemTime.tv_usec / 1000;
+}
+
+//@return timestamp in microsecond
+static FORCE_INLINE int64_t taosGetTimestampUs() {
+  struct timeval systemTime;
+  taosGetTimeOfDay(&systemTime);
+  return (int64_t)systemTime.tv_sec * 1000000L + (int64_t)systemTime.tv_usec;
+}
+
+//@return timestamp in nanosecond
+static FORCE_INLINE int64_t taosGetTimestampNs() {
+  struct timespec systemTime = {0};
+  clock_gettime(CLOCK_REALTIME, &systemTime);
+  return (int64_t)systemTime.tv_sec * 1000000000L + (int64_t)systemTime.tv_nsec;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /*_TD_OS_TIME_H_*/

src/os/inc/osTimer.h → include/os/osTimer.h

@@ -13,18 +13,22 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_OS_TIMER_H
-#define TDENGINE_OS_TIMER_H
+#ifndef _TD_OS_TIMER_H_
+#define _TD_OS_TIMER_H_
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-int taosInitTimer(void (*callback)(int), int ms);
-void taosUninitTimer();
+#define MSECONDS_PER_TICK 5
+
+int32_t taosInitTimer(void (*callback)(int32_t), int32_t ms);
+void    taosUninitTimer();
+int64_t taosGetMonotonicMs();
+const char *taosMonotonicInit();
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif
+#endif  /*_TD_OS_TIMER_H_*/

include/server/dnode/dnode.h

@@ -20,56 +20,55 @@
 extern "C" {
 #endif
 
-struct SRpcMsg;
 struct SRpcEpSet;
-
+struct SRpcMsg;
 /**
- * Initialize and start the dnode module
- * 
- * @return Error Code
+ * Initialize and start the dnode module.
+ *
+ * @return Error code.
  */
 int32_t dnodeInit();
 
 /**
- * Stop and cleanup dnode module
+ * Stop and cleanup dnode module.
  */
 void dnodeCleanup();
 
 /**
  * Send messages to other dnodes, such as create vnode message.
  *
- * @param epSet The endpoint list of the dnodes.
- * @param rpcMsg Message to be sent.
+ * @param epSet, the endpoint list of the dnodes.
+ * @param rpcMsg, message to be sent.
  */
-void dnodeSendMsgToDnode(SRpcEpSet *epSet, SRpcMsg *rpcMsg);
+void dnodeSendMsgToDnode(struct SRpcEpSet *epSet, struct SRpcMsg *rpcMsg);
 
 /**
  * Send messages to mnode, such as config message.
  *
- * @param rpcMsg Message to be sent.
+ * @param rpcMsg, message to be sent.
  */
-void dnodeSendMsgToMnode(SRpcMsg *rpcMsg);
+void dnodeSendMsgToMnode(struct SRpcMsg *rpcMsg);
 
 /**
- * Get the corresponding endpoint information from dnodeId.
+ * Send redirect message to dnode or shell.
  *
- * @param dnodeId
- * @param ep The endpoint of dnode
- * @param fqdn The fqdn of dnode
- * @param port The port of dnode
+ * @param rpcMsg, message to be sent.
+ * @param forShell, used to identify whether to send to shell or dnode.
  */
-void dnodeGetDnodeEp(int32_t dnodeId, char *ep, char *fqdn, uint16_t *port);
+void dnodeSendRedirectMsg(struct SRpcMsg *rpcMsg, bool forShell);
 
 /**
- * Report to dnode the start-up steps of other modules
+ * Get the corresponding endpoint information from dnodeId.
  *
- * @param name Name of the start-up phase.
- * @param desc Description of the start-up phase.
+ * @param dnodeId, the id ot dnode.
+ * @param ep, the endpoint of dnode.
+ * @param fqdn, the fqdn of dnode.
+ * @param port, the port of dnode.
  */
-void dnodeReportStartup(char *name, char *desc);
+void dnodeGetDnodeEp(int32_t dnodeId, char *ep, char *fqdn, uint16_t *port);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /*_TD_DNODE_H_*/
\ No newline at end of file
+#endif /*_TD_DNODE_H_*/

include/server/mnode/mnode.h

@@ -20,49 +20,125 @@
 extern "C" {
 #endif
 
-struct SRpcMsg;
+typedef struct {
+  /**
+   * Send messages to other dnodes, such as create vnode message.
+   *
+   * @param epSet, the endpoint list of the dnodes.
+   * @param rpcMsg, message to be sent.
+   */
+  void (*SendMsgToDnode)(struct SRpcEpSet *epSet, struct SRpcMsg *rpcMsg);
+
+  /**
+   * Send messages to mnode, such as config message.
+   *
+   * @param rpcMsg, message to be sent.
+   */
+  void (*SendMsgToMnode)(struct SRpcMsg *rpcMsg);
+
+  /**
+   * Send redirect message to dnode or shell.
+   *
+   * @param rpcMsg, message to be sent.
+   * @param forShell, used to identify whether to send to shell or dnode.
+   */
+  void (*SendRedirectMsg)(struct SRpcMsg *rpcMsg, bool forShell);
+
+  /**
+   * Get the corresponding endpoint information from dnodeId.
+   *
+   * @param dnode, the instance of dDnode module.
+   * @param dnodeId, the id ot dnode.
+   * @param ep, the endpoint of dnode.
+   * @param fqdn, the fqdn of dnode.
+   * @param port, the port of dnode.
+   */
+  void (*GetDnodeEp)(int32_t dnodeId, char *ep, char *fqdn, uint16_t *port);
+
+} SMnodeFp;
+
+typedef struct {
+  SMnodeFp      fp;
+  char          clusterId[TSDB_CLUSTER_ID_LEN];
+  int32_t       dnodeId;
+} SMnodePara;
+
+/**
+ * Initialize and start mnode module.
+ *
+ * @param para, initialization parameters.
+ * @return Error code.
+ */
+int32_t mnodeInit(SMnodePara para);
 
 /**
- * Deploy Mnode instances in Dnode.
- * 
+ * Stop and cleanup mnode module.
+ */
+void mnodeCleanup();
+
+/**
+ * Deploy mnode instances in dnode.
+ *
+ * @param minfos, server information used to deploy the mnode instance.
  * @return Error Code.
  */
-int32_t mnodeDeploy();
+int32_t mnodeDeploy(struct SMInfos *minfos);
 
 /**
- * Delete the Mnode instance deployed in Dnode.
+ * Delete the mnode instance deployed in dnode.
  */
 void mnodeUnDeploy();
 
 /**
- * Start Mnode service.
- * 
- * @return Error Code.
+ * Whether the mnode is in service.
+ *
+ * @return Server status.
  */
-int32_t mnodeStart();
+bool mnodeIsServing();
+
+typedef struct {
+  int64_t numOfDnode;
+  int64_t numOfMnode;
+  int64_t numOfVgroup;
+  int64_t numOfDatabase;
+  int64_t numOfSuperTable;
+  int64_t numOfChildTable;
+  int64_t numOfColumn;
+  int64_t totalPoints;
+  int64_t totalStorage;
+  int64_t compStorage;
+} SMnodeStat;
 
 /**
- * Stop Mnode service.
+ * Get the statistical information of Mnode.
+ *
+ * @param stat, statistical information.
+ * @return Error Code.
  */
-int32_t mnodeStop();
+int32_t mnodeGetStatistics(SMnodeStat *stat);
 
 /**
- * Interface for processing messages.
- * 
- * @param pMsg Message to be processed.
- * @return Error code
+ * Get the auth information.
+ *
+ * @param user, username.
+ * @param spi,  security parameter index.
+ * @param encrypt, encrypt algorithm.
+ * @param secret, key for authentication.
+ * @param ckey, ciphering key.
+ * @return Error Code.
  */
-int32_t mnodeProcessMsg(SRpcMsg *pMsg);
+int32_t mnodeRetriveAuth(char *user, char *spi, char *encrypt, char *secret, char *ckey);
 
 /**
- * Whether the Mnode is in service.
- * 
- * @return Server status.
+ * Interface for processing messages.
+ *
+ * @param rpcMsg, message to be processed.
+ * @return Error code.
  */
-bool mnodeIsServing();
+void mnodeProcessMsg(SRpcMsg *rpcMsg);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /*_TD_MNODE_H_*/
\ No newline at end of file
+#endif /*_TD_MNODE_H_*/

include/server/qnode/qnode.h

@@ -20,6 +20,94 @@
 extern "C" {
 #endif
 
+
+typedef struct {
+  uint64_t numOfStartTask;
+  uint64_t numOfStopTask;
+  uint64_t numOfRecvedFetch;
+  uint64_t numOfSentHb;
+  uint64_t numOfSentFetch;
+  uint64_t numOfTaskInQueue;
+  uint64_t numOfFetchInQueue;
+  uint64_t numOfErrors;
+} SQnodeStat;
+
+/* start Task msg */
+typedef struct {
+  uint32_t  schedulerIp;
+  uint16_t  schedulerPort;
+  int64_t   taskId;
+  int64_t   queryId;
+  uint32_t  srcIp;
+  uint16_t  srcPort;
+} SQnodeStartTaskMsg;
+
+/* stop Task msg */
+typedef struct {
+  int64_t   taskId;
+} SQnodeStopTaskMsg;
+
+/* start/stop Task msg response */
+typedef struct {
+  int64_t   taskId;
+  int32_t code;
+} SQnodeTaskRespMsg;
+
+/* Task status msg */
+typedef struct {
+  int64_t   taskId;
+  int32_t   status;
+  int64_t   queryId;
+} SQnodeTaskStatusMsg;
+
+/* Qnode/Scheduler heartbeat msg */
+typedef struct {
+  int32_t status;
+  int32_t load;
+  
+} SQnodeHeartbeatMsg;
+
+/* Qnode sent/received msg */
+typedef struct {
+  int8_t   msgType;
+  int32_t  msgLen;
+  char     msg[];
+} SQnodeMsg;
+
+
+/**
+ * Start one Qnode in Dnode.
+ * @return Error Code.
+ */
+int32_t qnodeStart();
+
+/**
+ * Stop Qnode in Dnode.
+ *
+ * @param qnodeId Qnode ID to stop, -1 for all Qnodes.
+ */
+void qnodeStop(int64_t qnodeId);
+
+ 
+/**
+ * Get the statistical information of Qnode
+ *
+ * @param qnodeId Qnode ID to get statistics, -1 for all 
+ * @param stat Statistical information.
+ * @return Error Code.
+ */
+int32_t qnodeGetStatistics(int64_t qnodeId, SQnodeStat *stat);
+
+/**
+ * Interface for processing Qnode messages.
+ * 
+ * @param pMsg Message to be processed.
+ * @return Error code
+ */
+void qnodeProcessReq(SRpcMsg *pMsg);
+
+
+
 #ifdef __cplusplus
 }
 #endif

include/server/vnode/meta/meta.h

@@ -16,7 +16,7 @@
 #ifndef _TD_META_H_
 #define _TD_META_H_
 
-#include "taosMsg.h"
+#include "taosmsg.h"
 
 #include "os.h"
 
@@ -59,4 +59,4 @@ void               metaQueryOptionsDestroy(SMetaQueryOptions *);
 }
 #endif
 
-#endif /*_TD_META_H_*/
\ No newline at end of file
+#endif /*_TD_META_H_*/

include/server/vnode/tq/tq.h

@@ -16,17 +16,35 @@
 #ifndef _TD_TQ_H_
 #define _TD_TQ_H_
 
+#include "os.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 typedef struct STQ STQ;
 
-int tqPushMsg(void *);
-int tqCommit(STQ *pTQ);
+STQ* tqInit(void* ref_func(void*), void* unref_func(void*));
+void tqCleanUp(STQ* pTq);
+
+//create persistent storage for meta info such as consuming offset
+//return value > 0: cgId
+//return value <= 0: error code
+int tqCreateGroup(STQ*);
+//create ring buffer in memory and load consuming offset
+int tqOpenGroup(STQ*, int cgId);
+//destroy ring buffer and persist consuming offset
+int tqCloseGroup(STQ*, int cgId);
+//delete persistent storage for meta info
+int tqDropGroup(STQ*, int cgId);
+
+int tqPushMsg(STQ*, void *, int64_t version);
+int tqCommit(STQ*);
+
+int tqHandleMsg(STQ*, void *msg);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /*_TD_TQ_H_*/
\ No newline at end of file
+#endif /*_TD_TQ_H_*/

include/server/vnode/tsdb/tsdb.h

@@ -17,7 +17,7 @@
 #define _TD_TSDB_H_
 
 #include "os.h"
-#include "taosMsg.h"
+#include "taosmsg.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -82,4 +82,4 @@ void           tsdbSnapshotDestroy(STsdbSnapshot *);
 }
 #endif
 
-#endif /*_TD_TSDB_H_*/
\ No newline at end of file
+#endif /*_TD_TSDB_H_*/

include/server/vnode/vnode.h

@@ -20,43 +20,87 @@
 extern "C" {
 #endif
 
-struct SRpcMsg;
+typedef struct {
+  /**
+   * Send messages to other dnodes, such as create vnode message.
+   *
+   * @param epSet, the endpoint list of dnodes.
+   * @param rpcMsg, message to be sent.
+   */
+  void (*SendMsgToDnode)(struct SRpcEpSet *epSet, struct SRpcMsg *rpcMsg);
+
+  /**
+   * Send messages to mnode, such as config message.
+   *
+   * @param rpcMsg, message to be sent.
+   */
+  void (*SendMsgToMnode)(struct SRpcMsg *rpcMsg);
+
+  /**
+   * Get the corresponding endpoint information from dnodeId.
+   *
+   * @param dnodeId, the id ot dnode.
+   * @param ep, the endpoint of dnode.
+   * @param fqdn, the fqdn of dnode.
+   * @param port, the port of dnode.
+   */
+  void (*GetDnodeEp)(int32_t dnodeId, char *ep, char *fqdn, uint16_t *port);
+
+} SVnodeFp;
+
+typedef struct {
+  SVnodeFp      fp;
+} SVnodePara;
 
 /**
- * Start Initialize Vnode module.
+ * Start initialize vnode module.
  *
- * @return Error Code.
+ * @param para, initialization parameters.
+ * @return Error code.
  */
-int32_t vnodeInit();
- 
+int32_t vnodeInit(SVnodePara para);
+
 /**
- * Cleanup Vnode module.
+ * Cleanup vnode module.
  */
 void vnodeCleanup();
- 
+
 typedef struct {
-  int64_t queryMsgCount;
-  int64_t writeMsgCount;
+  int32_t unused;
 } SVnodeStat;
- 
+
 /**
- * Get the statistical information of Vnode
+ * Get the statistical information of vnode.
  *
- * @param stat Statistical information.
+ * @param stat, statistical information.
  * @return Error Code.
  */
 int32_t vnodeGetStatistics(SVnodeStat *stat);
 
-/** 
+/**
+ * Get the status of all vnodes.
+ *
+ * @param status, status msg.
+ */
+void vnodeGetStatus(struct SStatusMsg *status);
+
+/**
+ * Set access permissions for all vnodes.
+ *
+ * @param access, access permissions of vnodes.
+ * @param numOfVnodes, the size of vnodes.
+ */
+void vnodeSetAccess(struct SVgroupAccess *access, int32_t numOfVnodes);
+
+/**
  * Interface for processing messages.
  *
- * @param pMsg Message to be processed.
- * @return Error code
+ * @param msg, message to be processed.
  */
-int32_t vnodeProcessMsg(SRpcMsg *pMsg);
+void vnodeProcessMsg(SRpcMsg *msg);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /*_TD_VNODE_H_*/
\ No newline at end of file
+#endif /*_TD_VNODE_H_*/

src/util/inc/exception.h → include/util/exception.h

@@ -13,13 +13,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_EXCEPTION_H
-#define TDENGINE_EXCEPTION_H
+#ifndef _TD_UTIL_EXCEPTION_H
+#define _TD_UTIL_EXCEPTION_H
 
-#include <setjmp.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <assert.h>
+#include "os.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -125,4 +122,4 @@ void exceptionThrow( int32_t code );
 }
 #endif
 
-#endif
+#endif /*_TD_UTIL_EXCEPTION_H*/

include/util/talgo.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_TALGO_H
-#define TDENGINE_TALGO_H
+#ifndef _TD_UTIL_TALGO_H
+#define _TD_UTIL_TALGO_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -95,4 +95,4 @@ void taosheapsort(void *base, int32_t size, int32_t len, const void *parcompar,
 #ifdef __cplusplus
 }
 #endif
-#endif  // TDENGINE_TALGO_H
+#endif  /*_TD_UTIL_TALGO_H*/

src/inc/taoserror.h → include/util/taoserror.h

@@ -13,16 +13,13 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_TAOSERROR_H
-#define TDENGINE_TAOSERROR_H
+#ifndef _TD_COMMON_TAOS_ERROR_H_
+#define _TD_COMMON_TAOS_ERROR_H_
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <stdint.h>
-#include <stdbool.h>
-
 #define TAOS_DEF_ERROR_CODE(mod, code) ((int32_t)((0x80000000 | ((mod)<<16) | (code))))
  
 #define TAOS_SYSTEM_ERROR(code)             (0x80ff0000 | (code))
@@ -463,4 +460,4 @@ int32_t* taosGetErrno();
 }
 #endif
 
-#endif //TDENGINE_TAOSERROR_H
+#endif /*_TD_COMMON_TAOS_ERROR_H_*/

include/util/tarray.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_TAOSARRAY_H
-#define TDENGINE_TAOSARRAY_H
+#ifndef _TD_UTIL_ARRAY_H
+#define _TD_UTIL_ARRAY_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -228,6 +228,4 @@ void taosArraySortPWithExt(SArray* pArray, __ext_compar_fn_t fn, const void *par
 }
 #endif
 
-
-
-#endif  // TDENGINE_TAOSARRAY_H
+#endif  /*_TD_UTIL_ARRAY_H*/

src/util/inc/tbuffer.h → include/util/tbuffer.h

@@ -13,11 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_TBUFFER_H
-#define TDENGINE_TBUFFER_H
-
-#include <stdint.h>
-#include <stdbool.h>
+#ifndef _TD_UTIL_BUFFER_H
+#define _TD_UTIL_BUFFER_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -175,4 +172,4 @@ void tbufWriteDoubleAt( SBufferWriter* buf, size_t pos, double data );
 }
 #endif
 
-#endif
+#endif /*_TD_UTIL_BUFFER_H*/

src/util/inc/tcache.h → include/util/tcache.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_TCACHE_H
-#define TDENGINE_TCACHE_H
+#ifndef _TD_UTIL_CACHE_H
+#define _TD_UTIL_CACHE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -22,7 +22,7 @@ extern "C" {
 
 #include "os.h"
 #include "tlockfree.h"
-#include "hash.h"
+#include "thash.h"
 
 #if defined(_TD_ARM_32) 
   #define TSDB_CACHE_PTR_KEY  TSDB_DATA_TYPE_INT
@@ -188,4 +188,4 @@ void taosStopCacheRefreshWorker();
 }
 #endif
 
-#endif  // TDENGINE_TCACHE_H
+#endif  /*_TD_UTIL_CACHE_H*/

src/util/inc/tchecksum.h → include/util/tchecksum.h

@@ -13,22 +13,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_TCHECKSUM_H
-#define TDENGINE_TCHECKSUM_H
+#ifndef _TD_UTIL_CHECKSUM_H
+#define _TD_UTIL_CHECKSUM_H
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <assert.h>
-#include <pthread.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-
+#include "os.h"
 #include "tcrc32c.h"
 #include "tutil.h"
 
@@ -64,4 +56,4 @@ static FORCE_INLINE int taosCheckChecksumWhole(const uint8_t *stream, uint32_t s
 }
 #endif
 
-#endif  // TDENGINE_TCHECKSUM_H
+#endif  /*_TD_UTIL_CHECKSUM_H*/

include/util/tcoding.h

@@ -12,14 +12,14 @@
  * 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_CODING_H_
-#define _TD_CODING_H_
+#ifndef _TD_UTIL_CODING_H
+#define _TD_UTIL_CODING_H
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "os.h "
+#include "os.h"
 
 #define ENCODE_LIMIT (((uint8_t)1) << 7)
 #define ZIGZAGE(T, v) ((u##T)((v) >> (sizeof(T) * 8 - 1))) ^ (((u##T)(v)) << 1)  // zigzag encode
@@ -361,4 +361,4 @@ static FORCE_INLINE void *taosDecodeString(void *buf, char **value) {
 }
 #endif
 
-#endif
\ No newline at end of file
+#endif /*_TD_UTIL_CODING_H*/
\ No newline at end of file

src/util/inc/tcompare.h → include/util/tcompare.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_TCOMPARE_H
-#define TDENGINE_TCOMPARE_H
+#ifndef _TD_UTIL_COMPARE_H
+#define _TD_UTIL_COMPARE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -93,4 +93,4 @@ int32_t compareWStrPatternComp(const void* pLeft, const void* pRight);
 }
 #endif
 
-#endif  // TDENGINE_TCOMPARE_H
+#endif  /*_TD_UTIL_COMPARE_H*/

src/util/inc/tscompression.h → include/util/tcompression.h

@@ -13,14 +13,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_TSCOMPRESSION_H
-#define TDENGINE_TSCOMPRESSION_H
+#ifndef _TD_UTIL_COMPRESSION_H
+#define _TD_UTIL_COMPRESSION_H
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "taosdef.h"
+#include "tdef.h"
 #include "tutil.h"
 
 #define COMP_OVERFLOW_BYTES 2
@@ -366,4 +366,4 @@ static FORCE_INLINE int tsDecompressTimestamp(const char *const input, int compr
 }
 #endif
 
-#endif  // TDENGINE_TSCOMPRESSION_H
\ No newline at end of file
+#endif  /*_TD_UTIL_COMPRESSION_H*/
\ No newline at end of file

src/util/inc/tconfig.h → include/util/tconfig.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_CFG_H
-#define TDENGINE_CFG_H
+#ifndef _TD_UTIL_CONFIG_H
+#define _TD_UTIL_CONFIG_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -87,11 +87,11 @@ bool taosReadGlobalCfg();
 void taosPrintGlobalCfg();
 void taosDumpGlobalCfg();
 
-void taosInitConfigOption(SGlobalCfg cfg);
-SGlobalCfg * taosGetConfigOption(const char *option);
+void        taosInitConfigOption(SGlobalCfg cfg);
+SGlobalCfg *taosGetConfigOption(const char *option);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif  // TDENGINE_TGLOBALCFG_H
+#endif  /*_TD_UTIL_CONFIG_H*/

src/util/inc/tcrc32c.h → include/util/tcrc32c.h

@@ -18,10 +18,8 @@
 	  3. This notice may not be removed or altered from any source distribution.
 	*/
 
-#ifndef TDENGINE_TCRC32C_H
-#define TDENGINE_TCRC32C_H
-
-#include <stdint.h>
+#ifndef _TD_UTIL_CRC32_H
+#define _TD_UTIL_CRC32_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -41,4 +39,4 @@ void taosResolveCRC();
 }
 #endif
 
-#endif  // TDENGINE_TCRC32C_H
+#endif  /*_TD_UTIL_CRC32_H*/

src/inc/taosdef.h → include/util/tdef.h

@@ -13,17 +13,15 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_TAOS_DEF_H
-#define TDENGINE_TAOS_DEF_H
+#ifndef _TD_UTIL_DEF_H
+#define _TD_UTIL_DEF_H
+
+#include "os.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <stdint.h>
-#include <stdbool.h>
-#include "taos.h"
-
 #define TSDB__packed
 
 #ifdef TSKEY32
@@ -32,10 +30,6 @@ extern "C" {
 #define TSKEY int64_t
 #endif
 
-#define TSWINDOW_INITIALIZER ((STimeWindow) {INT64_MIN, INT64_MAX})
-#define TSWINDOW_DESC_INITIALIZER ((STimeWindow) {INT64_MAX, INT64_MIN})
-#define IS_TSWINDOW_SPECIFIED(win) (((win).skey != INT64_MIN) || ((win).ekey != INT64_MAX))
-
 #define TSKEY_INITIAL_VAL    INT64_MIN
 
 // Bytes for each type.
@@ -51,12 +45,7 @@ extern const int32_t TYPE_BYTES[15];
 #define POINTER_BYTES sizeof(void *)  // 8 by default  assert(sizeof(ptrdiff_t) == sizseof(void*)
 
 #define TSDB_KEYSIZE            sizeof(TSKEY)
-
-#if LINUX
-#define TSDB_NCHAR_SIZE         sizeof(wchar_t)
-#else
 #define TSDB_NCHAR_SIZE         sizeof(int32_t)
-#endif
 
 // NULL definition
 #define TSDB_DATA_BOOL_NULL             0x02
@@ -84,6 +73,8 @@ extern const int32_t TYPE_BYTES[15];
 #define TSDB_DEFAULT_PASS               "powerdb"
 #elif (_TD_TQ_ == true)
 #define TSDB_DEFAULT_PASS               "tqueue"
+#elif (_TD_PRO_ == true)
+#define TSDB_DEFAULT_PASS               "prodb"
 #else
 #define TSDB_DEFAULT_PASS               "taosdata"
 #endif
@@ -219,8 +210,6 @@ do { \
 #define TSDB_AUTH_LEN             16
 #define TSDB_KEY_LEN              16
 #define TSDB_VERSION_LEN          12
-#define TSDB_LOCALE_LEN           64
-#define TSDB_TIMEZONE_LEN         96
 #define TSDB_LABEL_LEN            8 
 
 #define TSDB_CLUSTER_ID_LEN       40
@@ -403,54 +392,63 @@ do { \
 
 #define TSDB_ARB_DUMMY_TIME                    4765104000000 // 2121-01-01 00:00:00.000, :P
 
-typedef enum {
-  TAOS_QTYPE_RPC   = 0,
-  TAOS_QTYPE_FWD   = 1,
-  TAOS_QTYPE_WAL   = 2,
-  TAOS_QTYPE_CQ    = 3,
-  TAOS_QTYPE_QUERY = 4
-} EQType;
-
 #define TSDB_MAX_TIERS           3
 #define TSDB_MAX_DISKS_PER_TIER 16
 #define TSDB_MAX_DISKS           (TSDB_MAX_TIERS * TSDB_MAX_DISKS_PER_TIER)
 
-typedef enum {
-  TSDB_SUPER_TABLE  = 0,   // super table
-  TSDB_CHILD_TABLE  = 1,   // table created from super table
-  TSDB_NORMAL_TABLE = 2,   // ordinary table
-  TSDB_STREAM_TABLE = 3,   // table created from stream computing
-  TSDB_TEMP_TABLE   = 4,   // temp table created by nest query
-  TSDB_TABLE_MAX    = 5
-} ETableType;
-
-typedef enum {
-  TSDB_MOD_MNODE   = 0,
-  TSDB_MOD_HTTP    = 1,
-  TSDB_MOD_MONITOR = 2,
-  TSDB_MOD_MQTT    = 3,
-  TSDB_MOD_MAX     = 4
-} EModuleType;
-
-typedef enum {
-  TSDB_CHECK_ITEM_NETWORK,
-  TSDB_CHECK_ITEM_MEM,
-  TSDB_CHECK_ITEM_CPU,
-  TSDB_CHECK_ITEM_DISK,
-  TSDB_CHECK_ITEM_OS,
-  TSDB_CHECK_ITEM_ACCESS,
-  TSDB_CHECK_ITEM_VERSION,
-  TSDB_CHECK_ITEM_DATAFILE,
-  TSDB_CHECK_ITEM_MAX
-} ECheckItemType;
-
-typedef enum {
-  TD_ROW_DISCARD_UPDATE   = 0,
-  TD_ROW_OVERWRITE_UPDATE = 1,
-  TD_ROW_PARTIAL_UPDATE   = 2
-} TDUpdateConfig;
-
-extern char *qtypeStr[];
+#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
+
+// ----------------- For variable data types such as TSDB_DATA_TYPE_BINARY and TSDB_DATA_TYPE_NCHAR
+
+//typedef int32_t  VarDataOffsetT;
+//typedef int16_t  VarDataLenT;  // maxVarDataLen: 32767
+//typedef uint16_t TDRowLenT;    // not including overhead: 0 ~ 65535
+//typedef uint32_t TDRowTLenT;   // total length, including overhead
+//
+//typedef struct tstr {
+//  VarDataLenT len;
+//  char        data[];
+//} tstr;
+//
+//#pragma pack(push, 1)
+//typedef struct {
+//  VarDataLenT len;
+//  uint8_t     data;
+//} SBinaryNullT;
+//
+//typedef struct {
+//  VarDataLenT len;
+//  uint32_t    data;
+//} SNCharNullT;
+//#pragma pack(pop)
+//
+//#define VARSTR_HEADER_SIZE  sizeof(VarDataLenT)
+//
+//#define varDataLen(v)       ((VarDataLenT *)(v))[0]
+//#define varDataTLen(v)      (sizeof(VarDataLenT) + varDataLen(v))
+//#define varDataVal(v)       ((void *)((char *)v + VARSTR_HEADER_SIZE))
+//#define varDataCopy(dst, v) memcpy((dst), (void*) (v), varDataTLen(v))
+//#define varDataLenByData(v) (*(VarDataLenT *)(((char*)(v)) - VARSTR_HEADER_SIZE))
+//#define varDataSetLen(v, _len) (((VarDataLenT *)(v))[0] = (VarDataLenT) (_len))
+//#define IS_VAR_DATA_TYPE(t) (((t) == TSDB_DATA_TYPE_BINARY) || ((t) == TSDB_DATA_TYPE_NCHAR))
+//
+//#define varDataNetLen(v)       (htons(((VarDataLenT *)(v))[0]))
+//#define varDataNetTLen(v)      (sizeof(VarDataLenT) + varDataNetLen(v))
+
 
 #ifdef __cplusplus
 }

src/util/inc/tfile.h → include/util/tfile.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_TFILE_H
-#define TDENGINE_TFILE_H
+#ifndef _TD_UTIL_FILE_H
+#define _TD_UTIL_FILE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -28,8 +28,10 @@ void tfCleanup();
 
 // the same syntax as UNIX standard open/close/read/write
 // but FD is int64_t and will never be reused
-int64_t tfOpen(const char *pathname, int32_t flags);
-int64_t tfOpenM(const char *pathname, int32_t flags, mode_t mode);
+int64_t tfOpenReadWrite(const char *pathname);
+int64_t tfOpenCreateWrite(const char *pathname);
+int64_t tfOpenCreateWriteAppend(const char *pathname);
+
 int64_t tfClose(int64_t tfd);
 int64_t tfWrite(int64_t tfd, void *buf, int64_t count);
 int64_t tfRead(int64_t tfd, void *buf, int64_t count);
@@ -42,4 +44,4 @@ int32_t tfFtruncate(int64_t tfd, int64_t length);
 }
 #endif
 
-#endif  // TDENGINE_TFILE_H
+#endif  /*_TD_UTIL_FILE_H*/

src/util/inc/tfunctional.h → include/util/tfunctional.h

@@ -12,8 +12,8 @@
  * 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_TFUNCTIONAL_H
-#define TD_TFUNCTIONAL_H
+#ifndef _TD_UTIL_FUNCTIONAL_H
+#define _TD_UTIL_FUNCTIONAL_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -53,4 +53,4 @@ void voidInvoke(tVoidSavedFunc* const pSavedFunc);
 }
 #endif
 
-#endif
+#endif /*_TD_UTIL_FUNCTIONAL_H*/

src/util/inc/hash.h → include/util/thash.h

@@ -21,22 +21,45 @@ extern "C" {
 #endif
 
 #include "tarray.h"
-#include "hashfunc.h"
 #include "tlockfree.h"
 
+typedef uint32_t (*_hash_fn_t)(const char *, uint32_t);
+typedef int32_t  (*_equal_fn_t)(const void*, const void*, uint32_t len);
+typedef void (*_hash_before_fn_t)(void *);
+typedef void (*_hash_free_fn_t)(void *);
+
 #define HASH_MAX_CAPACITY (1024 * 1024 * 16)
 #define HASH_DEFAULT_LOAD_FACTOR (0.75)
+
 #define HASH_INDEX(v, c) ((v) & ((c)-1))
 
-typedef void (*_hash_free_fn_t)(void *param);
+/**
+ * murmur hash algorithm
+ * @key  usually string
+ * @len  key length
+ * @seed hash seed
+ * @out  an int32 value
+ */
+uint32_t MurmurHash3_32(const char *key, uint32_t len);
+
+/**
+ *
+ * @param key
+ * @param len
+ * @return
+ */
+uint32_t taosIntHash_32(const char *key, uint32_t len);
+uint32_t taosIntHash_64(const char *key, uint32_t len);
+
+_hash_fn_t taosGetDefaultHashFunction(int32_t type);
 
 typedef struct SHashNode {
   struct SHashNode *next;
   uint32_t          hashVal;     // the hash value of key
   uint32_t          dataLen;     // length of data
   uint32_t          keyLen;      // length of the key
+  uint16_t          count;       // reference count
   int8_t            removed;     // flag to indicate removed
-  int8_t            count;       // reference count
   char              data[];
 } SHashNode;
 
@@ -57,11 +80,13 @@ typedef struct SHashEntry {
 
 typedef struct SHashObj {
   SHashEntry    **hashList;
-  size_t          capacity;     // number of slots
-  size_t          size;         // number of elements in hash table
+  uint32_t        capacity;     // number of slots
+  uint32_t        size;         // number of elements in hash table
+
   _hash_fn_t      hashFp;       // hash function
   _hash_free_fn_t freeFp;       // hash node free callback function
-  _equal_fn_t     equalFp;       // equal function
+  _equal_fn_t     equalFp;      // equal function
+  _hash_before_fn_t callbackFp; // function invoked before return the value to caller
 
   SRWLatch        lock;         // read-write spin lock
   SHashLockTypeE  type;         // lock type
@@ -79,15 +104,6 @@ typedef struct SHashObj {
  */
 SHashObj *taosHashInit(size_t capacity, _hash_fn_t fn, bool update, SHashLockTypeE type);
 
-
-/**
- * set equal func of the hash table  
- * @param pHashObj    
- * @param equalFp       
- * @return
- */
-void taosHashSetEqualFp(SHashObj *pHashObj, _equal_fn_t fp);
-
 /**
  * return the size of hash table
  * @param pHashObj
@@ -117,26 +133,15 @@ int32_t taosHashPut(SHashObj *pHashObj, const void *key, size_t keyLen, void *da
 void *taosHashGet(SHashObj *pHashObj, const void *key, size_t keyLen);
 
 /**
- * apply the udf before return the result
+ * Clone the result to destination buffer
  * @param pHashObj
  * @param key
  * @param keyLen
- * @param fp
- * @param d
+ * @param destBuf
  * @return
  */
-void* taosHashGetClone(SHashObj *pHashObj, const void *key, size_t keyLen, void (*fp)(void *), void* d);
+void *taosHashGetClone(SHashObj *pHashObj, const void *key, size_t keyLen, void* destBuf);
 
-/**
- * @param pHashObj
- * @param key
- * @param keyLen
- * @param fp
- * @param d
- * @param sz 
- * @return
- */
-void* taosHashGetCloneExt(SHashObj *pHashObj, const void *key, size_t keyLen, void (*fp)(void *), void** d, size_t *sz);
 /**
  * remove item with the specified key
  * @param pHashObj
@@ -145,34 +150,54 @@ void* taosHashGetCloneExt(SHashObj *pHashObj, const void *key, size_t keyLen, vo
  */
 int32_t taosHashRemove(SHashObj *pHashObj, const void *key, size_t keyLen);
 
-int32_t taosHashRemoveWithData(SHashObj *pHashObj, const void *key, size_t keyLen, void* data, size_t dsize);
-
-int32_t taosHashCondTraverse(SHashObj *pHashObj, bool (*fp)(void *, void *), void *param);
-
+/**
+ * Clear the hash table.
+ * @param pHashObj
+ */
 void taosHashClear(SHashObj *pHashObj);
 
 /**
- * clean up hash table
+ * Clean up hash table and release all allocated resources.
  * @param handle
  */
 void taosHashCleanup(SHashObj *pHashObj);
 
 /**
- *
+ * Get the max overflow link list length
  * @param pHashObj
  * @return
  */
 int32_t taosHashGetMaxOverflowLinkLength(const SHashObj *pHashObj);
 
+/**
+ * Get the hash table size
+ * @param pHashObj
+ * @return
+ */
 size_t taosHashGetMemSize(const SHashObj *pHashObj);
 
+/**
+ * Create the hash table iterator
+ * @param pHashObj
+ * @param p
+ * @return
+ */
 void *taosHashIterate(SHashObj *pHashObj, void *p);
 
+/**
+ * Cancel the hash table iterator
+ * @param pHashObj
+ * @param p
+ */
 void  taosHashCancelIterate(SHashObj *pHashObj, void *p);
 
-void *taosHashGetDataKey(SHashObj *pHashObj, void *data);
-
-uint32_t taosHashGetDataKeyLen(SHashObj *pHashObj, void *data);
+/**
+ * Get the corresponding key information for a given data in hash table
+ * @param pHashObj
+ * @param data
+ * @return
+ */
+int32_t taosHashGetKey(SHashObj *pHashObj, void *data, void** key, size_t* keyLen);
 
 #ifdef __cplusplus
 }

src/util/inc/tidpool.h → include/util/tidpool.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_TIDPOOL_H
-#define TDENGINE_TIDPOOL_H
+#ifndef _TD_UTIL_IDPOOL_H
+#define _TD_UTIL_IDPOOL_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -40,4 +40,4 @@ bool taosIdPoolMarkStatus(void *handle, int id);
 }
 #endif
 
-#endif
+#endif /*_TD_UTIL_IDPOOL_H*/

include/util/tkey.h

@@ -12,8 +12,8 @@
  * 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 TDENGINE_TKEY_H
-#define TDENGINE_TKEY_H
+#ifndef _TD_UTIL_KEY_H
+#define _TD_UTIL_KEY_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -28,4 +28,4 @@ char *         taosDesDecode(int64_t key, char *src, int len);
 }
 #endif
 
-#endif
\ No newline at end of file
+#endif /*_TD_UTIL_KEY_H*/
\ No newline at end of file

include/util/tlist.h

@@ -12,8 +12,8 @@
  * 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_LIST_
-#define _TD_LIST_
+#ifndef _TD_UTIL_LIST_H
+#define _TD_UTIL_LIST_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -69,4 +69,4 @@ SListNode *tdListNext(SListIter *pIter);
 }
 #endif
 
-#endif
\ No newline at end of file
+#endif /*_TD_UTIL_LIST_H*/
\ No newline at end of file

include/util/tlockfree.h

@@ -12,8 +12,8 @@
  * 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_LOCK_FREE_H__
-#define __TD_LOCK_FREE_H__
+#ifndef _TD_UTIL_LOCK_FREE_H
+#define _TD_UTIL_LOCK_FREE_H
 
 #include "os.h"
 
@@ -21,7 +21,6 @@
 extern "C" {
 #endif
 
-
 // reference counting
 typedef void (*_ref_fn_t)(const void* pObj);
 
@@ -106,9 +105,8 @@ void taosRUnLockLatch(SRWLatch *pLatch);
     break; \
   }
 
-
 #ifdef __cplusplus
 }
 #endif
 
-#endif
+#endif /*_TD_UTIL_LOCK_FREE_H*/

include/util/tlog.h

@@ -13,13 +13,37 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_TLOG_H
-#define TDENGINE_TLOG_H
+#ifndef _TD_UTIL_LOG_H
+#define _TD_UTIL_LOG_H
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+// log
+extern int8_t  tsAsyncLog;
+extern int32_t tsNumOfLogLines;
+extern int32_t tsLogKeepDays;
+extern int32_t dDebugFlag;
+extern int32_t vDebugFlag;
+extern int32_t mDebugFlag;
+extern int32_t cDebugFlag;
+extern int32_t jniDebugFlag;
+extern int32_t tmrDebugFlag;
+extern int32_t sdbDebugFlag;
+extern int32_t httpDebugFlag;
+extern int32_t mqttDebugFlag;
+extern int32_t monDebugFlag;
+extern int32_t uDebugFlag;
+extern int32_t rpcDebugFlag;
+extern int32_t odbcDebugFlag;
+extern int32_t qDebugFlag;
+extern int32_t wDebugFlag;
+extern int32_t sDebugFlag;
+extern int32_t tsdbDebugFlag;
+extern int32_t cqDebugFlag;
+extern int32_t debugFlag;
+
 #define DEBUG_FATAL 1U
 #define DEBUG_ERROR DEBUG_FATAL
 #define DEBUG_WARN 2U
@@ -53,4 +77,4 @@ void taosDumpData(unsigned char *msg, int32_t len);
 }
 #endif
 
-#endif
+#endif /*_TD_UTIL_LOG_H*/

src/util/inc/tlosertree.h → include/util/tlosertree.h

@@ -13,15 +13,13 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_TLOSERTREE_H
-#define TDENGINE_TLOSERTREE_H
+#ifndef _TD_UTIL_LOSERTREE_H
+#define _TD_UTIL_LOSERTREE_H
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <stdint.h>
-
 typedef int (*__merge_compare_fn_t)(const void *, const void *, void *param);
 
 typedef struct SLoserTreeNode {
@@ -51,4 +49,4 @@ void tLoserTreeDisplay(SLoserTreeInfo *pTree);
 }
 #endif
 
-#endif  // TDENGINE_TLOSERTREE_H
+#endif  /*_TD_UTIL_LOSERTREE_H*/

src/util/inc/tmd5.h → include/util/tmd5.h

@@ -22,10 +22,8 @@
  ***********************************************************************
  */
 
-#ifndef _taos_md5_header_
-#define _taos_md5_header_
-
-#include <stdint.h>
+#ifndef _TD_UTIL_MD5_H
+#define _TD_UTIL_MD5_H
 
 typedef struct {
   uint32_t i[2];       /* number of _bits_ handled mod 2^64 */
@@ -38,4 +36,4 @@ void MD5Init(MD5_CTX *mdContext);
 void MD5Update(MD5_CTX *mdContext, uint8_t *inBuf, unsigned int inLen);
 void MD5Final(MD5_CTX *mdContext);
 
-#endif
+#endif /*_TD_UTIL_MD5_H*/

src/util/inc/tmempool.h → include/util/tmempool.h

@@ -12,8 +12,8 @@
  * 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 TDENGINE_TMEMPOOL_H
-#define TDENGINE_TMEMPOOL_H
+#ifndef _TD_UTIL_MEMPOOL_H
+#define _TD_UTIL_MEMPOOL_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -33,4 +33,4 @@ void taosMemPoolCleanUp(mpool_h handle);
 }
 #endif
 
-#endif
+#endif /*_TD_UTIL_MEMPOOL_H*/

src/util/inc/tnote.h → include/util/tnote.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_TNOTE_H
-#define TDENGINE_TNOTE_H
+#ifndef _TD_UTIL_NOTE_H
+#define _TD_UTIL_NOTE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -61,4 +61,4 @@ void taosNotePrintBuffer(SNoteObj *pNote, char *buffer, int32_t len);
 }
 #endif
 
-#endif
+#endif /*_TD_UTIL_NOTE_H*/

src/util/inc/tqueue.h → include/util/tqueue.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TAOS_QUEUE_H
-#define TAOS_QUEUE_H
+#ifndef _TD_UTIL_QUEUE_H
+#define _TD_UTIL_QUEUE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -71,6 +71,6 @@ int        taosGetQsetItemsNumber(taos_qset param);
 }
 #endif
 
-#endif
+#endif /*_TD_UTIL_QUEUE_H*/
 
 

src/util/inc/tref.h → include/util/tref.h

@@ -14,8 +14,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_TREF_H
-#define TDENGINE_TREF_H
+#ifndef _TD_UTIL_REF_H
+#define _TD_UTIL_REF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -74,4 +74,4 @@ void demoIterateRefs(int rsetId) {
 }
 #endif
 
-#endif  // TDENGINE_TREF_H
+#endif  /*_TD_UTIL_REF_H*/

src/util/inc/tsched.h → include/util/tsched.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_TSCHED_H
-#define TDENGINE_TSCHED_H
+#ifndef _TD_UTIL_SCHED_H
+#define _TD_UTIL_SCHED_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -68,4 +68,4 @@ void taosScheduleTask(void *queueScheduler, SSchedMsg *pMsg);
 }
 #endif
 
-#endif  // TDENGINE_TSCHED_H
+#endif  /*_TD_UTIL_SCHED_H*/

src/util/inc/tskiplist.h → include/util/tskiplist.h

@@ -13,15 +13,15 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_TSKIPLIST_H
-#define TDENGINE_TSKIPLIST_H
+#ifndef _TD_UTIL_SKILIST_H
+#define _TD_UTIL_SKILIST_H
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #include "os.h"
-#include "taosdef.h"
+#include "tdef.h"
 #include "tarray.h"
 #include "tfunctional.h"
 
@@ -159,4 +159,4 @@ void               tSkipListRemoveNode(SSkipList *pSkipList, SSkipListNode *pNod
 }
 #endif
 
-#endif  // TDENGINE_TSKIPLIST_H
+#endif  /*_TD_UTIL_SKILIST_H*/

src/os/inc/osDir.h → include/util/tstep.h

@@ -13,22 +13,24 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_OS_DIR_H
-#define TDENGINE_OS_DIR_H
+#ifndef _TD_UTIL_STEP_H_
+#define _TD_UTIL_STEP_H_
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-void    taosRemoveDir(char *rootDir);
-bool    taosDirExist(const char* dirname);
-int32_t taosMkDir(const char *pathname, mode_t mode);
-void    taosRemoveOldLogFiles(char *rootDir, int32_t keepDays);
-int32_t taosRename(char *oldName, char *newName);
-int32_t taosCompressFile(char *srcFileName, char *destFileName);
+typedef int32_t (*InitFp)(void **obj);
+typedef void (*CleanupFp)(void **obj);
+typedef void (*ReportFp)(char *name, char *desc);
+
+struct SSteps *taosStepInit(int32_t maxsize, ReportFp fp);
+int32_t        taosStepExec(struct SSteps *steps);
+void           taosStepCleanup(struct SSteps *steps);
+int32_t        taosStepAdd(struct SSteps *steps, char *name, void **obj, InitFp initFp, CleanupFp cleanupFp);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif
+#endif /*_TD_UTIL_STEP_H_*/

src/util/inc/tstrbuild.h → include/util/tstrbuild.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_STRING_BUILDER_H
-#define TDENGINE_STRING_BUILDER_H 
+#ifndef _TD_UTIL_STRING_BUILDER_H
+#define _TD_UTIL_STRING_BUILDER_H 
 
 #include <stddef.h>
 #include <stdint.h>
@@ -49,4 +49,4 @@ void taosStringBuilderAppendDouble(SStringBuilder* sb, double v);
 }
 #endif
 
-#endif
\ No newline at end of file
+#endif /*_TD_UTIL_STRING_BUILDER_H*/
\ No newline at end of file

src/util/inc/tthread.h → include/util/tthread.h

@@ -13,15 +13,15 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_TTHREAD_H
-#define TDENGINE_TTHREAD_H
+#ifndef _TD_UTIL_THREAD_H
+#define _TD_UTIL_THREAD_H
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #include "os.h"
-#include "taosdef.h"
+#include "tdef.h"
 
 // create new thread
 pthread_t* taosCreateThread( void *(*__start_routine) (void *), void* param);
@@ -34,4 +34,4 @@ bool taosThreadRunning(pthread_t* pthread);
 }
 #endif
 
-#endif  // TDENGINE_TTHREAD_H
+#endif  /*_TD_UTIL_THREAD_H*/

src/util/inc/ttimer.h → include/util/ttimer.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_TTIMER_H
-#define TDENGINE_TTIMER_H
+#ifndef _TD_UTIL_TIMER_H
+#define _TD_UTIL_TIMER_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -48,4 +48,4 @@ void taosUninitTimer();
 }
 #endif
 
-#endif  // TDENGINE_TTIMER_H
+#endif  /*_TD_UTIL_TIMER_H*/

src/util/inc/tutil.h → include/util/tutil.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_TUTIL_H
-#define TDENGINE_TUTIL_H
+#ifndef _TD_UTIL_UTIL_H
+#define _TD_UTIL_UTIL_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -23,7 +23,7 @@ extern "C" {
 #include "os.h"
 #include "tmd5.h"
 #include "tcrc32c.h"
-#include "taosdef.h"
+#include "tdef.h"
 
 int32_t strdequote(char *src);
 int32_t strRmquote(char *z, int32_t len);
@@ -40,8 +40,8 @@ char *  paGetToken(char *src, char **token, int32_t *tokenLen);
 int32_t taosByteArrayToHexStr(char bytes[], int32_t len, char hexstr[]);
 int32_t taosHexStrToByteArray(char hexstr[], char bytes[]);
 
-bool taosGetVersionNumber(char *versionStr, int *versionNubmer);
-int  taosCheckVersion(char *input_client_version, char *input_server_version, int compared_segments);
+//bool taosGetVersionNumber(char *versionStr, int *versionNubmer);
+//int  taosCheckVersion(char *input_client_version, char *input_server_version, int compared_segments);
 
 char *   taosIpStr(uint32_t ipInt);
 uint32_t ip2uint(const char *const ip_addr);
@@ -58,4 +58,4 @@ static FORCE_INLINE void taosEncryptPass(uint8_t *inBuf, size_t inLen, char *tar
 }
 #endif
 
-#endif  // TDENGINE_TUTIL_H
+#endif  /*_TD_UTIL_UTIL_H*/

src/util/inc/tworker.h → include/util/tworker.h

@@ -13,30 +13,33 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_TWORKER_H
-#define TDENGINE_TWORKER_H
+#ifndef _TD_UTIL_WORKER_H
+#define _TD_UTIL_WORKER_H
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef void *(*FWorkerThread)(void *pWorker);
+typedef int32_t (*ProcessReqFp)(void *ahandle, void *msg);
+typedef void (*SendRspFp)(void *ahandle, void *msg, int32_t qtype, int32_t code);
+
 struct SWorkerPool;
 
 typedef struct {
-  pthread_t thread;  // thread
-  int32_t   id;      // worker ID
-  struct SWorkerPool *pPool;
+  pthread_t           thread;  // thread
+  int32_t             id;      // worker ID
+  struct SWorkerPool *pool;
 } SWorker;
 
 typedef struct SWorkerPool {
-  int32_t  max;  // max number of workers
-  int32_t  min;  // min number of workers
-  int32_t  num;  // current number of workers
-  void *   qset;
-  char *   name;
-  SWorker *worker;
-  FWorkerThread   workerFp;
+  int32_t         max;  // max number of workers
+  int32_t         min;  // min number of workers
+  int32_t         num;  // current number of workers
+  void *          qset;
+  const char *    name;
+  SWorker *       workers;
+  ProcessReqFp    reqFp;
+  SendRspFp       rspFp;
   pthread_mutex_t mutex;
 } SWorkerPool;
 
@@ -49,4 +52,4 @@ void    tWorkerFreeQueue(SWorkerPool *pPool, void *pQueue);
 }
 #endif
 
-#endif
+#endif /*_TD_UTIL_WORKER_H*/

src/common/inc/tulog.h → include/util/ulog.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_COMMON_ULOG_H
-#define TDENGINE_COMMON_ULOG_H
+#ifndef _TD_UTIL_ULOG_H
+#define _TD_UTIL_ULOG_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -39,4 +39,4 @@ extern int8_t  tscEmbedded;
 }
 #endif
 
-#endif
+#endif /*_TD_UTIL_ULOG_H*/

source/client/consumer/consumer.c

@@ -11,4 +11,6 @@
  *
  * 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
+ */
+
+#include "consumer.h"

source/client/src/client.c

@@ -11,4 +11,11 @@
  *
  * 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
+ */
+
+//#include "taos.h"
+
+//TAOS_RES *taos_query(TAOS *taos, const char *sql) {
+//
+//}
+

source/common/CMakeLists.txt

@@ -4,4 +4,10 @@ target_include_directories(
     common
     PUBLIC "${CMAKE_SOURCE_DIR}/include/common"
     PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
+)
+target_link_libraries(
+    common
+    PUBLIC os
+    PUBLIC util
+    INTERFACE api
 )
\ No newline at end of file

src/common/src/sqlcmdstr.c → source/common/src/sqlcmdstr.c

@@ -15,4 +15,4 @@
 
 #define TSDB_SQL_C
 
-#include "tcmdtype.h"
+#include "tmsgtype.h"

src/util/src/tcompare.c → source/common/src/tcompare.c

@@ -17,12 +17,12 @@
 #define _XOPEN_SOURCE
 #define _DEFAULT_SOURCE
 
+#include "os.h"
 #include "tcompare.h"
-#include "tulog.h"
-#include "hash.h"
+#include "ulog.h"
+#include "thash.h"
 #include "regex.h"
-#include "os.h"
-#include "ttype.h"
+#include "ttypes.h"
 
 int32_t setCompareBytes1(const void *pLeft, const void *pRight) {
   return NULL != taosHashGet((SHashObj *)pRight, pLeft, 1) ? 1 : 0;
@@ -233,14 +233,20 @@ int patternMatch(const char *patterStr, const char *str, size_t size, const SPat
 
   int32_t i = 0;
   int32_t j = 0;
+  int32_t o = 0;
+  int32_t m = 0;
 
   while ((c = patterStr[i++]) != 0) {
     if (c == pInfo->matchAll) { /* Match "*" */
 
       while ((c = patterStr[i++]) == pInfo->matchAll || c == pInfo->matchOne) {
-        if (c == pInfo->matchOne && (j > size || str[j++] == 0)) {
-          // empty string, return not match
-          return TSDB_PATTERN_NOWILDCARDMATCH;
+        if (c == pInfo->matchOne) {
+          if (j > size || str[j++] == 0) {
+            // empty string, return not match
+            return TSDB_PATTERN_NOWILDCARDMATCH;
+          } else {
+            ++o;
+          }
         }
       }
 
@@ -249,9 +255,10 @@ int patternMatch(const char *patterStr, const char *str, size_t size, const SPat
       }
 
       char next[3] = {toupper(c), tolower(c), 0};
+      m = o;
       while (1) {
-        size_t n = strcspn(str, next);
-        str += n;
+        size_t n = strcspn(str + m, next);
+        str += m + n;
 
         if (str[0] == 0 || (n >= size)) {
           break;
@@ -261,12 +268,14 @@ int patternMatch(const char *patterStr, const char *str, size_t size, const SPat
         if (ret != TSDB_PATTERN_NOMATCH) {
           return ret;
         }
+        m = 0;
       }
       return TSDB_PATTERN_NOWILDCARDMATCH;
     }
 
     c1 = str[j++];
-
+    ++o; 
+    
     if (j <= size) {
       if (c == '\\' && patterStr[i] == '_' && c1 == '_') { i++; continue; }
       if (c == c1 || tolower(c) == tolower(c1) || (c == pInfo->matchOne && c1 != 0)) {
@@ -292,7 +301,7 @@ int WCSPatternMatch(const wchar_t *patterStr, const wchar_t *str, size_t size, c
     if (c == matchAll) { /* Match "%" */
 
       while ((c = patterStr[i++]) == matchAll || c == matchOne) {
-        if (c == matchOne && (j > size || str[j++] == 0)) {
+        if (c == matchOne && (j >= size || str[j++] == 0)) {
           return TSDB_PATTERN_NOWILDCARDMATCH;
         }
       }

src/common/src/tdataformat.c → source/common/src/tdataformat.c

@@ -13,7 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 #include "tdataformat.h"
-#include "tulog.h"
+#include "ulog.h"
 #include "talgo.h"
 #include "tcoding.h"
 #include "wchar.h"

src/common/src/tglobal.c → source/common/src/tglobal.c

@@ -17,15 +17,14 @@
 #include "os.h"
 #include "taosdef.h"
 #include "taoserror.h"
-#include "tulog.h"
+#include "ulog.h"
+#include "tlog.h"
 #include "tconfig.h"
 #include "tglobal.h"
-#include "monitor.h"
-#include "tsocket.h"
+#include "tcompare.h"
 #include "tutil.h"
-#include "tlocale.h"
 #include "ttimezone.h"
-#include "tcompare.h"
+#include "tlocale.h"
 
 // cluster
 char     tsFirst[TSDB_EP_LEN] = {0};
@@ -59,9 +58,6 @@ float   tsNumOfThreadsPerCore = 1.0f;
 int32_t tsNumOfCommitThreads = 4;
 float   tsRatioOfQueryCores = 1.0f;
 int8_t  tsDaylight       = 0;
-char    tsTimezone[TSDB_TIMEZONE_LEN] = {0};
-char    tsLocale[TSDB_LOCALE_LEN] = {0};
-char    tsCharset[TSDB_LOCALE_LEN] = {0};  // default encode string
 int8_t  tsEnableCoreFile = 0;
 int32_t tsMaxBinaryDisplayWidth = 30;
 
@@ -201,15 +197,11 @@ int8_t  tsEnableStream = 1;
 int8_t tsCompactMnodeWal = 0;
 int8_t tsPrintAuth = 0;
 int8_t tscEmbedded = 0;
-char   configDir[PATH_MAX] = {0};
 char   tsVnodeDir[PATH_MAX] = {0};
 char   tsDnodeDir[PATH_MAX] = {0};
 char   tsMnodeDir[PATH_MAX] = {0};
 char   tsMnodeTmpDir[PATH_MAX] = {0};
 char   tsMnodeBakDir[PATH_MAX] = {0};
-char   tsDataDir[PATH_MAX] = {0};
-char   tsScriptDir[PATH_MAX] = {0};
-char   tsTempDir[PATH_MAX] = "/tmp/";
 
 int32_t  tsDiskCfgNum = 0;
 int32_t tsTopicBianryLen = 16000;
@@ -229,11 +221,6 @@ SDiskCfg tsDiskCfg[TSDB_MAX_DISKS];
 int64_t tsTickPerDay[] = {86400000L, 86400000000L, 86400000000000L};
 
 // system info
-char    tsOsName[10] = "Linux";
-int64_t tsPageSize;
-int64_t tsOpenMax;
-int64_t tsStreamMax;
-int32_t tsNumOfCores = 1;
 float   tsTotalTmpDirGB = 0;
 float   tsTotalDataDirGB = 0;
 float   tsAvailTmpDirectorySpace = 0;
@@ -244,28 +231,6 @@ float   tsMinimalDataDirGB = 2.0f;
 int32_t tsTotalMemoryMB = 0;
 uint32_t tsVersion = 0;
 
-// log
-int32_t tsNumOfLogLines = 10000000;
-int32_t mDebugFlag = 131;
-int32_t sdbDebugFlag = 131;
-int32_t dDebugFlag = 135;
-int32_t vDebugFlag = 135;
-uint32_t cDebugFlag = 131;
-int32_t jniDebugFlag = 131;
-int32_t odbcDebugFlag = 131;
-int32_t httpDebugFlag = 131;
-int32_t mqttDebugFlag = 131;
-int32_t monDebugFlag = 131;
-uint32_t qDebugFlag = 131;
-int32_t rpcDebugFlag = 131;
-int32_t uDebugFlag = 131;
-int32_t debugFlag = 0;
-int32_t sDebugFlag = 135;
-int32_t wDebugFlag = 135;
-int32_t tsdbDebugFlag = 131;
-int32_t cqDebugFlag = 131;
-int32_t fsDebugFlag = 135;
-
 #ifdef TD_TSZ
 //
 // lossy compress 6
@@ -419,23 +384,6 @@ static void taosCheckDataDirCfg() {
   }
 }
 
-static int32_t taosCheckTmpDir(void) {
-  if (strlen(tsTempDir) <= 0){
-    uError("tempDir is not set");
-    return -1;
-  }
-
-  DIR *dir = opendir(tsTempDir);
-  if (dir == NULL) {
-    uError("can not open tempDir:%s, error:%s", tsTempDir, strerror(errno));
-    return -1;
-  }
-
-  closedir(dir);
-
-  return 0;
-}
-
 static void doInitGlobalConfig(void) {
   osInit();
   srand(taosSafeRand());
@@ -1096,7 +1044,7 @@ static void doInitGlobalConfig(void) {
   cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLIENT;
   cfg.minValue = 0;
   cfg.maxValue = 0;
-  cfg.ptrLength = tListLen(tsTimezone);
+  cfg.ptrLength = TSDB_TIMEZONE_LEN;
   cfg.unitType = TAOS_CFG_UTYPE_NONE;
   taosInitConfigOption(cfg);
 
@@ -1106,7 +1054,7 @@ static void doInitGlobalConfig(void) {
   cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLIENT;
   cfg.minValue = 0;
   cfg.maxValue = 0;
-  cfg.ptrLength = tListLen(tsLocale);
+  cfg.ptrLength = TSDB_LOCALE_LEN;
   cfg.unitType = TAOS_CFG_UTYPE_NONE;
   taosInitConfigOption(cfg);
 
@@ -1116,7 +1064,7 @@ static void doInitGlobalConfig(void) {
   cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLIENT;
   cfg.minValue = 0;
   cfg.maxValue = 0;
-  cfg.ptrLength = tListLen(tsCharset);
+  cfg.ptrLength = TSDB_LOCALE_LEN;
   cfg.unitType = TAOS_CFG_UTYPE_NONE;
   taosInitConfigOption(cfg);
 
@@ -1612,7 +1560,7 @@ static void doInitGlobalConfig(void) {
   cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT;
   cfg.minValue = 0;
   cfg.maxValue = 0;
-  cfg.ptrLength = tListLen(tsTempDir);
+  cfg.ptrLength = PATH_MAX;
   cfg.unitType = TAOS_CFG_UTYPE_NONE;
   taosInitConfigOption(cfg);
 
@@ -1732,7 +1680,7 @@ int32_t taosCheckGlobalCfg() {
 
   taosCheckDataDirCfg();
 
-  if (taosCheckTmpDir()) {
+  if (!taosDirExist(tsTempDir)) {
     return -1;
   }
   

src/common/src/tlocale.c → source/common/src/tlocale.c

@@ -15,7 +15,7 @@
 
 #define _DEFAULT_SOURCE
 #include "os.h"
-#include "tulog.h"
+#include "ulog.h"
 #include "tglobal.h"
 #include "tconfig.h"
 #include "tutil.h"