Merge branch '3.0' into feature/TD-13066-3.0

3ab9b88d · Cary Xu · 9a022bca · 3558d6d1 · 3ab9b88d · 3ab9b88d
174 changed file
--- a/Jenkinsfile2
+++ b/Jenkinsfile2
@@ -121,7 +121,7 @@ def pre_test_win(){
        set
        date /t
        time /t
-        rd /s /Q C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\debug
+        rd /s /Q C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal\\debug || exit 0
    '''
    bat '''
        cd C:\\workspace\\%EXECUTOR_NUMBER%\\TDinternal

--- a/include/common/tmsg.h
+++ b/include/common/tmsg.h
@@ -1648,6 +1648,15 @@ typedef struct {
 int32_t tSerializeSMDropTopicReq(void* buf, int32_t bufLen, SMDropTopicReq* pReq);
 int32_t tDeserializeSMDropTopicReq(void* buf, int32_t bufLen, SMDropTopicReq* pReq);
+typedef struct {
+  char   topic[TSDB_TOPIC_FNAME_LEN];
+  char   cgroup[TSDB_CGROUP_LEN];
+  int8_t igNotExists;
+} SMDropCgroupReq;
+int32_t tSerializeSMDropCgroupReq(void* buf, int32_t bufLen, SMDropCgroupReq* pReq);
+int32_t tDeserializeSMDropCgroupReq(void* buf, int32_t bufLen, SMDropCgroupReq* pReq);
 typedef struct {
  char    name[TSDB_TABLE_FNAME_LEN];
  int8_t  alterType;

--- a/include/dnode/mnode/sdb/sdb.h
+++ b/include/dnode/mnode/sdb/sdb.h
@@ -333,23 +333,23 @@ SSdbRow *sdbAllocRow(int32_t objSize);
 void    *sdbGetRowObj(SSdbRow *pRow);
 typedef struct SSdb {
-  SMnode     *pMnode;
+  SMnode        *pMnode;
-  char       *currDir;
+  char          *currDir;
-  char       *syncDir;
+  char          *syncDir;
-  char       *tmpDir;
+  char          *tmpDir;
-  int64_t     lastCommitVer;
+  int64_t        lastCommitVer;
-  int64_t     curVer;
+  int64_t        curVer;
-  int64_t     tableVer[SDB_MAX];
+  int64_t        tableVer[SDB_MAX];
-  int64_t     maxId[SDB_MAX];
+  int64_t        maxId[SDB_MAX];
-  EKeyType    keyTypes[SDB_MAX];
+  EKeyType       keyTypes[SDB_MAX];
-  SHashObj   *hashObjs[SDB_MAX];
+  SHashObj      *hashObjs[SDB_MAX];
-  SRWLatch    locks[SDB_MAX];
+  TdThreadRwlock locks[SDB_MAX];
-  SdbInsertFp insertFps[SDB_MAX];
+  SdbInsertFp    insertFps[SDB_MAX];
-  SdbUpdateFp updateFps[SDB_MAX];
+  SdbUpdateFp    updateFps[SDB_MAX];
-  SdbDeleteFp deleteFps[SDB_MAX];
+  SdbDeleteFp    deleteFps[SDB_MAX];
-  SdbDeployFp deployFps[SDB_MAX];
+  SdbDeployFp    deployFps[SDB_MAX];
-  SdbEncodeFp encodeFps[SDB_MAX];
+  SdbEncodeFp    encodeFps[SDB_MAX];
-  SdbDecodeFp decodeFps[SDB_MAX];
+  SdbDecodeFp    decodeFps[SDB_MAX];
 } SSdb;
 #ifdef __cplusplus

--- a/include/libs/executor/executor.h
+++ b/include/libs/executor/executor.h
@@ -95,6 +95,15 @@ int32_t qUpdateQualifiedTableId(qTaskInfo_t tinfo, const SArray* tableIdList, bo
 int32_t qCreateExecTask(SReadHandle* readHandle, int32_t vgId, uint64_t taskId, struct SSubplan* pPlan,
                        qTaskInfo_t* pTaskInfo, DataSinkHandle* handle, EOPTR_EXEC_MODEL model);
+/**
+ *
+ * @param tinfo
+ * @param sversion
+ * @param tversion
+ * @return
+ */
+int32_t qGetQueriedTableSchemaVersion(qTaskInfo_t tinfo, char* dbName, char* tableName, int32_t* sversion, int32_t* tversion);
 /**
 * The main task execution function, including query on both table and multiple tables,
 * which are decided according to the tag or table name query conditions

--- a/include/libs/nodes/querynodes.h
+++ b/include/libs/nodes/querynodes.h
@@ -236,6 +236,7 @@ typedef struct SSelectStmt {
  bool        isTimeOrderQuery;
  bool        hasAggFuncs;
  bool        hasRepeatScanFuncs;
+  bool        hasNonstdSQLFunc;
 } SSelectStmt;
 typedef enum ESetOperatorType { SET_OP_TYPE_UNION_ALL = 1, SET_OP_TYPE_UNION } ESetOperatorType;

--- a/include/libs/sync/sync.h
+++ b/include/libs/sync/sync.h
@@ -20,14 +20,11 @@
 extern "C" {
 #endif
-#include <stdbool.h>
+#include "os.h"
-#include <stdint.h>
-//#include <tdatablock.h>
 #include "cJSON.h"
 #include "tdef.h"
-//#include "taosdef.h"
+#include "tmsgcb.h"
-//#include "trpc.h"
-//#include "wal.h"
 typedef uint64_t SyncNodeId;
 typedef int32_t  SyncGroupId;
@@ -132,11 +129,10 @@ typedef struct SSyncInfo {
  char        path[TSDB_FILENAME_LEN];
  SWal*       pWal;
  SSyncFSM*   pFsm;
+  SMsgCb*     msgcb;
-  void* rpcClient;
+  int32_t (*FpSendMsg)(const SEpSet* pEpSet, SRpcMsg* pMsg);
-  int32_t (*FpSendMsg)(void* rpcClient, const SEpSet* pEpSet, SRpcMsg* pMsg);
+  int32_t (*FpEqMsg)(const SMsgCb* msgcb, SRpcMsg* pMsg);
-  void* queue;
-  int32_t (*FpEqMsg)(void* queue, SRpcMsg* pMsg);
 } SSyncInfo;

--- a/include/libs/sync/syncTools.h
+++ b/include/libs/sync/syncTools.h
@@ -20,13 +20,10 @@
 extern "C" {
 #endif
-#include <stdbool.h>
+#include "os.h"
-#include <stdint.h>
-//#include <tdatablock.h>
 #include "cJSON.h"
-//#include "taosdef.h"
 #include "trpc.h"
-//#include "wal.h"
 // ------------------ ds -------------------
 typedef struct SRaftId {
@@ -43,8 +40,7 @@ void       syncNodeRelease(SSyncNode* pNode);
 int32_t syncGetRespRpc(int64_t rid, uint64_t index, SRpcMsg* msg);
 int32_t syncGetAndDelRespRpc(int64_t rid, uint64_t index, SRpcMsg* msg);
-void    syncSetQ(int64_t rid, void* queueHandle);
+void    syncSetMsgCb(int64_t rid, const SMsgCb* msgcb);
-void    syncSetRpc(int64_t rid, void* rpcHandle);
 char*   sync2SimpleStr(int64_t rid);
 // set timer ms

--- a/include/libs/transport/trpc.h
+++ b/include/libs/transport/trpc.h
@@ -38,7 +38,7 @@ typedef struct {
 typedef struct SRpcHandleInfo {
  // rpc info
-  void   *handle;         // rpc handle returned to app
+  void *  handle;         // rpc handle returned to app
  int64_t refId;          // refid, used by server
  int32_t noResp;         // has response or not(default 0, 0: resp, 1: no resp);
  int32_t persistHandle;  // persist handle or not
@@ -49,13 +49,13 @@ typedef struct SRpcHandleInfo {
  void *node;     // node mgmt handle
  // resp info
-  void   *rsp;
+  void *  rsp;
  int32_t rspLen;
 } SRpcHandleInfo;
 typedef struct SRpcMsg {
  tmsg_t         msgType;
-  void          *pCont;
+  void *         pCont;
  int32_t        contLen;
  int32_t        code;
  SRpcHandleInfo info;
@@ -63,11 +63,6 @@ typedef struct SRpcMsg {
 } SRpcMsg;
 typedef void (*RpcCfp)(void *parent, SRpcMsg *, SEpSet *rf);
-typedef int (*RpcAfp)(void *parent, char *tableId, char *spi, char *encrypt, char *secret, char *ckey);
-///
-// // SRpcMsg code
-// REDIERE,
-// NOT READY, EpSet
 typedef bool (*RpcRfp)(int32_t code);
 typedef struct SRpcInit {
@@ -80,18 +75,11 @@ typedef struct SRpcInit {
  int      idleTime;      // milliseconds, 0 means idle timer is disabled
  // the following is for client app ecurity only
-  char *user;     // user name
+  char *user;  // user name
-  char  spi;      // security parameter index
-  char  encrypt;  // encrypt algorithm
-  char *secret;   // key for authentication
-  char *ckey;     // ciphering key
  // call back to process incoming msg, code shall be ignored by server app
  RpcCfp cfp;
-  // call back to retrieve the client auth info, for server app only
-  RpcAfp afp;
  // user defined retry func
  RpcRfp rfp;

--- a/include/util/taoserror.h
+++ b/include/util/taoserror.h
@@ -649,6 +649,7 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_PAR_INVALID_TBNAME            TAOS_DEF_ERROR_CODE(0, 0x264C)
 #define TSDB_CODE_PAR_INVALID_FUNCTION_NAME     TAOS_DEF_ERROR_CODE(0, 0x264D)
 #define TSDB_CODE_PAR_COMMENT_TOO_LONG          TAOS_DEF_ERROR_CODE(0, 0x264E)
+#define TSDB_CODE_PAR_NOT_ALLOWED_FUNC          TAOS_DEF_ERROR_CODE(0, 0x264F)
 //planner
 #define TSDB_CODE_PLAN_INTERNAL_ERROR           TAOS_DEF_ERROR_CODE(0, 0x2700)

--- a/packaging/cfg/nginxd.service
+++ b/packaging/cfg/nginxd.service
 [Unit]
 Description=Nginx For TDengine Service
 After=network-online.target
 Wants=network-online.target
 [Service]
 Type=forking
 PIDFile=/usr/local/nginxd/logs/nginx.pid
 ExecStart=/usr/local/nginxd/sbin/nginx
 ExecStop=/usr/local/nginxd/sbin/nginx -s stop
 TimeoutStopSec=1000000s
 LimitNOFILE=infinity
 LimitNPROC=infinity
 LimitCORE=infinity
 TimeoutStartSec=0
 StandardOutput=null
 Restart=always
 StartLimitBurst=3
 StartLimitInterval=60s
 [Install]
 WantedBy=multi-user.target
--- a/packaging/cfg/taos.cfg
+++ b/packaging/cfg/taos.cfg
 ########################################################
 #                                                      #
 #                  TDengine Configuration              #
 #   Any questions, please email support@taosdata.com   #
 #                                                      #
 ########################################################
 # first fully qualified domain name (FQDN) for TDengine system
 # firstEp                   hostname:6030
 # local fully qualified domain name (FQDN)
 # fqdn                      hostname
 # first port number for the connection (12 continuous UDP/TCP port number are used) 
 # serverPort                6030
 # log file's directory
 # logDir                    /var/log/taos
 # data file's directory
 # dataDir                   /var/lib/taos
 # temporary file's directory
 # tempDir                   /tmp/
 # the arbitrator's fully qualified domain name (FQDN) for TDengine system, for cluster only   
 # arbitrator                arbitrator_hostname:6042     
 # number of threads per CPU core
 # numOfThreadsPerCore       1.0
 # number of threads to commit cache data
 # numOfCommitThreads        4
 # the proportion of total CPU cores available for query processing
 # 2.0: the query threads will be set to double of the CPU cores.
 # 1.0: all CPU cores are available for query processing [default].
 # 0.5: only half of the CPU cores are available for query.
 # 0.0: only one core available.
 # ratioOfQueryCores        1.0
 # the last_row/first/last aggregator will not change the original column name in the result fields
 keepColumnName            1
 # number of management nodes in the system
 # numOfMnodes               1
 # enable/disable backuping vnode directory when removing vnode
 # vnodeBak                  1
 # enable/disable installation / usage report
 # telemetryReporting        1
 # enable/disable load balancing
 # balance                   1
 # role for dnode. 0 - any, 1 - mnode, 2 - dnode
 # role                      0
 # max timer control blocks
 # maxTmrCtrl                512
 # time interval of system monitor, seconds 
 # monitorInterval           30
 # number of seconds allowed for a dnode to be offline, for cluster only 
 # offlineThreshold          864000
 # RPC re-try timer, millisecond
 # rpcTimer                  300
 # RPC maximum time for ack, seconds. 
 # rpcMaxTime                600
 # time interval of dnode status reporting to mnode, seconds, for cluster only 
 # statusInterval            1
 # time interval of heart beat from shell to dnode, seconds
 # shellActivityTimer        3
 # minimum sliding window time, milli-second
 # minSlidingTime            10
 # minimum time window, milli-second
 # minIntervalTime           10
 # maximum delay before launching a stream computation, milli-second
 # maxStreamCompDelay        20000
 # maximum delay before launching a stream computation for the first time, milli-second
 # maxFirstStreamCompDelay   10000
 # retry delay when a stream computation fails, milli-second
 # retryStreamCompDelay      10
 # the delayed time for launching a stream computation, from 0.1(default, 10% of whole computing time window) to 0.9
 # streamCompDelayRatio      0.1
 # max number of vgroups per db, 0 means configured automatically
 # maxVgroupsPerDb           0
 # max number of tables per vnode
 # maxTablesPerVnode         1000000
 # cache block size (Mbyte)
 # cache                     16
 # number of cache blocks per vnode
 # blocks                    6
 # number of days per DB file
 # days                  10
 # number of days to keep DB file
 # keep                  3650
 # minimum rows of records in file block
 # minRows               100
 # maximum rows of records in file block
 # maxRows               4096
 # the number of acknowledgments required for successful data writing
 # quorum                1     
 # enable/disable compression
 # comp                  2
 # write ahead log (WAL) level, 0: no wal; 1: write wal, but no fysnc; 2: write wal, and call fsync
 # walLevel              1
 # if walLevel is set to 2, the cycle of fsync being executed, if set to 0, fsync is called right away
 # fsync                 3000
 # number of replications, for cluster only 
 # replica               1
 # the compressed rpc message, option:
 #  -1 (no compression)
 #   0 (all message compressed),
 # > 0 (rpc message body which larger than this value will be compressed)
 # compressMsgSize       -1
 # query retrieved column data compression option:
 #  -1 (no compression)
 #   0 (all retrieved column data compressed),
 # > 0 (any retrieved column size greater than this value all data will be compressed.)
 # compressColData       -1
 # max length of an SQL
 # maxSQLLength          65480
 # max length of WildCards
 # maxWildCardsLength    100
 # the maximum number of records allowed for super table time sorting
 # maxNumOfOrderedRes    100000
 # system time zone
 # timezone              Asia/Shanghai (CST, +0800)
 # system time zone (for windows 10)
 # timezone              UTC-8
 # system locale
 # locale                en_US.UTF-8
 # default system charset
 # charset               UTF-8
 # max number of connections allowed in dnode
 # maxShellConns         5000
 # max number of connections allowed in client
 # maxConnections        5000
 # stop writing logs when the disk size of the log folder is less than this value
 # minimalLogDirGB       1.0
 # stop writing temporary files when the disk size of the tmp folder is less than this value
 # minimalTmpDirGB       1.0
 # if disk free space is less than this value, taosd service exit directly within startup process
 # minimalDataDirGB      2.0
 # One mnode is equal to the number of vnode consumed
 # mnodeEqualVnodeNum    4
 # enbale/disable http service
 # http                  1
 # enable/disable system monitor 
 # monitor               1
 # enable/disable recording the SQL statements via restful interface
 # httpEnableRecordSql   0
 # number of threads used to process http requests
 # httpMaxThreads        2
 # maximum number of rows returned by the restful interface
 # restfulRowLimit       10240
 # database name must be specified in restful interface if the following parameter is set, off by default
 # httpDbNameMandatory 1
 # http keep alive, default is 30 seconds
 # httpKeepAlive   30000
 # The following parameter is used to limit the maximum number of lines in log files.
 # max number of lines per log filters
 # numOfLogLines         10000000
 # enable/disable async log
 # asyncLog              1
 # time of keeping log files, days
 # logKeepDays           0
 # The following parameters are used for debug purpose only.
 # debugFlag 8 bits mask: FILE-SCREEN-UNUSED-HeartBeat-DUMP-TRACE_WARN-ERROR
 # 131: output warning and error 
 # 135: output debug, warning and error
 # 143: output trace, debug, warning and error to log
 # 199: output debug, warning and error to both screen and file
 # 207: output trace, debug, warning and error to both screen and file
 # debug flag for all log type, take effect when non-zero value
 # debugFlag             0
 # debug flag for meta management messages
 # mDebugFlag            135
 # debug flag for dnode messages
 # dDebugFlag            135
 # debug flag for sync module
 # sDebugFlag            135
 # debug flag for WAL
 # wDebugFlag            135
 # debug flag for SDB
 # sdbDebugFlag          135
 # debug flag for RPC 
 # rpcDebugFlag          131
 # debug flag for TAOS TIMER
 # tmrDebugFlag          131
 # debug flag for TDengine client 
 # cDebugFlag            131
 # debug flag for JNI
 # jniDebugFlag          131
 # debug flag for storage
 # uDebugFlag            131
 # debug flag for http server
 # httpDebugFlag         131
 # debug flag for monitor
 # monDebugFlag          131
 # debug flag for query
 # qDebugFlag            131
 # debug flag for vnode
 # vDebugFlag            131
 # debug flag for TSDB
 # tsdbDebugFlag         131
 # debug flag for continue query
 # cqDebugFlag           131
 # enable/disable recording the SQL in taos client
 # enableRecordSql    0
 # generate core file when service crash
 # enableCoreFile        1
 # maximum display width of binary and nchar fields in the shell. The parts exceeding this limit will be hidden
 # maxBinaryDisplayWidth 30
 # enable/disable stream (continuous query)
 # stream                1
 # in retrieve blocking model, only in 50% query threads will be used in query processing in dnode
 # retrieveBlockingModel    0
 # the maximum allowed query buffer size in MB during query processing for each data node
 # -1 no limit (default)
 # 0  no query allowed, queries are disabled
 # queryBufferSize         -1
 # percent of redundant data in tsdb meta will compact meta data,0 means donot compact
 # tsdbMetaCompactRatio    0
 # default string type used for storing JSON String, options can be binary/nchar, default is nchar
 # defaultJSONStrType      nchar
 # force TCP transmission 
 # rpcForceTcp        0
 # unit MB. Flush vnode wal file if walSize > walFlushSize and walSize > cache*0.5*blocks
 # walFlushSize         1024
 # unit Hour. Latency of data migration
 # keepTimeOffset     0
--- a/packaging/cfg/taosd.service
+++ b/packaging/cfg/taosd.service
 [Unit]
 Description=TDengine server service
 After=network-online.target
 Wants=network-online.target
 [Service]
 Type=simple
 ExecStart=/usr/bin/taosd
 ExecStartPre=/usr/local/taos/bin/startPre.sh
 TimeoutStopSec=1000000s
 LimitNOFILE=infinity
 LimitNPROC=infinity
 LimitCORE=infinity
 TimeoutStartSec=0
 StandardOutput=null
 Restart=always
 StartLimitBurst=3
 StartLimitInterval=60s
 [Install]
 WantedBy=multi-user.target
--- a/packaging/cfg/tarbitratord.service
+++ b/packaging/cfg/tarbitratord.service
 [Unit]
 Description=TDengine arbitrator service
 After=network-online.target
 Wants=network-online.target
 [Service]
 Type=simple
 ExecStart=/usr/bin/tarbitrator
 TimeoutStopSec=1000000s
 LimitNOFILE=infinity
 LimitNPROC=infinity
 LimitCORE=infinity
 TimeoutStartSec=0
 StandardOutput=null
 Restart=always
 StartLimitBurst=3
 StartLimitInterval=60s
 [Install]
 WantedBy=multi-user.target
--- a/packaging/check_package.sh
+++ b/packaging/check_package.sh
 #!/bin/bash
 #
 # This file is used to install database on linux systems. The operating system
 # is required to use systemd to manage services at boot
 set -e
 #set -x
 verMode=edge
 pagMode=full
 iplist=""
 serverFqdn=""
 # -----------------------Variables definition---------------------
 script_dir="../release"
 # Dynamic directory
 data_dir="/var/lib/taos"
 log_dir="/var/log/taos"
 data_link_dir="/usr/local/taos/data"
 log_link_dir="/usr/local/taos/log"
 cfg_install_dir="/etc/taos"
 bin_link_dir="/usr/bin"
 lib_link_dir="/usr/lib"
 lib64_link_dir="/usr/lib64"
 inc_link_dir="/usr/include"
 #install main path
 install_main_dir="/usr/local/taos"
 # old bin dir
 sbin_dir="/usr/local/taos/bin"
 temp_version=""
 fin_result=""
 service_config_dir="/etc/systemd/system"
 nginx_port=6060
 nginx_dir="/usr/local/nginxd"
 # Color setting
 RED='\033[0;31m'
 GREEN='\033[1;32m'
 GREEN_DARK='\033[0;32m'
 GREEN_UNDERLINE='\033[4;32m'
 NC='\033[0m'
 csudo=""
 if command -v sudo > /dev/null; then
    csudo="sudo "
 fi
 # =============================  get input parameters =================================================
 # install.sh -v [server | client]  -e [yes | no] -i [systemd | service | ...]
 # set parameters by default value
 interactiveFqdn=yes   # [yes | no]
 verType=server        # [server | client]
 initType=systemd      # [systemd | service | ...]
 while getopts "hv:d:" arg
 do
  case $arg in
    d)
      #echo "interactiveFqdn=$OPTARG"
      script_dir=$( echo $OPTARG )
      ;;
    h)
      echo "Usage: `basename $0` -d scripy_path"
      exit 0
      ;;
    ?) #unknow option
      echo "unkonw argument"
      exit 1
      ;;
  esac
 done
 #echo "verType=${verType} interactiveFqdn=${interactiveFqdn}"
 function kill_process() {
  pid=$(ps -ef | grep "$1" | grep -v "grep" | awk '{print $2}')
  if [ -n "$pid" ]; then
    ${csudo}kill -9 $pid   || :
  fi
 }
 function check_file() {
    #check file whether exists
    if [ ! -e $1/$2 ];then
        echo -e "$1/$2 \033[31mnot exists\033[0m!quit"
        fin_result=$fin_result"\033[31m$temp_version\033[0m test failed!\n"
        echo -e $fin_result
        exit 8
    fi
 }
 function get_package_name() {
  var=$1
 	if [[ $1 =~ 'aarch' ]];then
 		echo ${var::-21}
 	else
 		echo ${var::-17}
 	fi
 }
 function check_link() {
    #check Link whether exists or broken
    if [ -L $1 ] ; then
        if [ ! -e $1 ] ; then
            echo -e "$1 \033[31Broken link\033[0m"
            fin_result=$fin_result"\033[31m$temp_version\033[0m test failed!\n"
            echo -e $fin_result
            exit 8
        fi
    else
        echo -e "$1 \033[31mnot exists\033[0m!quit"
        fin_result=$fin_result"\033[31m$temp_version\033[0m test failed!\n"
        echo -e $fin_result
        exit 8
    fi
 }
 function check_main_path() {
    #check install main dir and all sub dir
    main_dir=("" "cfg" "bin" "connector" "driver" "examples" "include" "init.d")
    for i in "${main_dir[@]}";do
        check_file ${install_main_dir} $i
    done
    if [ "$verMode" == "cluster" ]; then
        nginx_main_dir=("admin" "conf" "html" "sbin" "logs")
        for i in "${nginx_main_dir[@]}";do
            check_file ${nginx_dir}  $i
        done
    fi
    echo -e "Check main path:\033[32mOK\033[0m!"
 }
 function check_bin_path() {
    # check install bin dir and all sub dir
    bin_dir=("taos" "taosd" "taosadapter" "taosdemo" "remove.sh" "tarbitrator" "set_core.sh")
    for i in "${bin_dir[@]}";do
        check_file ${sbin_dir} $i
    done
    lbin_dir=("taos" "taosd" "taosadapter" "taosdemo" "rmtaos" "tarbitrator" "set_core")
    for i in "${lbin_dir[@]}";do
        check_link ${bin_link_dir}/$i
    done
    if [ "$verMode" == "cluster" ]; then
        check_file ${nginx_dir}/sbin nginx
    fi
    echo -e "Check bin  path:\033[32mOK\033[0m!"
 }
 function check_lib_path() {
    # check all links
    check_link ${lib_link_dir}/libtaos.so
    check_link ${lib_link_dir}/libtaos.so.1
    if [[ -d ${lib64_link_dir}  ]]; then
        check_link ${lib64_link_dir}/libtaos.so
        check_link ${lib64_link_dir}/libtaos.so.1
    fi
    echo -e "Check lib  path:\033[32mOK\033[0m!"
 }
 function check_header_path() {
 	# check all header
 	header_dir=("taos.h" "taosdef.h" "taoserror.h")
    for i in "${header_dir[@]}";do
        check_link ${inc_link_dir}/$i
    done
    echo -e "Check bin  path:\033[32mOK\033[0m!"
 }
 function check_taosadapter_config_dir() {
 	# check all config
 	check_file ${cfg_install_dir} taosadapter.toml
 	check_file ${cfg_install_dir} taosadapter.service
 	check_file ${install_main_dir}/cfg taosadapter.toml.org
 	echo -e "Check conf path:\033[32mOK\033[0m!"
 }
 function check_config_dir() {
 	# check all config
 	check_file ${cfg_install_dir} taos.cfg
 	check_file ${install_main_dir}/cfg taos.cfg.org
 	echo -e "Check conf path:\033[32mOK\033[0m!"
 }
 function check_log_path() {
 	# check log path
 	check_file ${log_dir}
 	echo -e "Check log  path:\033[32mOK\033[0m!"
 }
 function check_data_path() {
 	# check data path
 	check_file ${data_dir}
 	echo -e "Check data path:\033[32mOK\033[0m!"
 }
 function install_TDengine() {
 	cd ${script_dir}
 	tar zxf $1
  temp_version=$(get_package_name $1)
 	cd $(get_package_name $1)
  echo -e "\033[32muninstall TDengine && install TDengine...\033[0m"
 	rmtaos >/dev/null 2>&1 || echo 'taosd not installed' && echo -e '\n\n' |./install.sh >/dev/null 2>&1
  echo -e "\033[32mTDengine has been installed!\033[0m"
  echo -e "\033[32mTDengine is starting...\033[0m"
  kill_process taos && systemctl start taosd && sleep 10
 }
 function test_TDengine() {
    check_main_path
    check_bin_path
    check_lib_path
    check_header_path
    check_config_dir
    check_taosadapter_config_dir
    check_log_path
    check_data_path
    result=`taos -s 'create database test ;create table test.tt(ts timestamp ,i int);insert into test.tt values(now,11);select * from test.tt' 2>&1 ||:`
    if [[ $result =~ "Unable to establish" ]];then
        echo -e "\033[31mTDengine connect failed\033[0m"
        fin_result=$fin_result"\033[31m$temp_version\033[0m test failed!\n"
        echo -e $fin_result
        exit 8
    fi
    echo -e "Check TDengine connect:\033[32mOK\033[0m!"
    fin_result=$fin_result"\033[32m$temp_version\033[0m test OK!\n"
 }
 # ## ==============================Main program starts from here============================
 TD_package_name=`ls ${script_dir}/*server*gz |awk -F '/' '{print $NF}' `
 temp=`pwd`
 for i in $TD_package_name;do
 	if [[ $i =~ 'enterprise' ]];then
 		verMode="cluster"
 	else
 		verMode=""
 	fi
  cd $temp
 	install_TDengine $i
 	test_TDengine
 done
 echo "============================================================"
 echo -e $fin_result
--- a/packaging/deb/DEBIAN/control
+++ b/packaging/deb/DEBIAN/control
 Package: tdengine
 Version: 1.0.0
 Section: utils
 Priority: optional
 #Essential: no
 #Depends: no
 #Suggests: no
 Architecture: amd64
 Installed-Size: 66666
 Maintainer: support@taosdata.com
 Provides: taosdata
 Homepage: http://taosdata.com
 Description: Big Data Platform Designed and Optimized for IoT.
--- a/packaging/deb/DEBIAN/postinst
+++ b/packaging/deb/DEBIAN/postinst
 #!/bin/bash
 #set -x
 #path=`pwd`
 insmetaPath="/usr/local/taos/script"
 csudo=""
 if command -v sudo > /dev/null; then
    csudo="sudo "
 fi
 ${csudo}chmod -R 744 ${insmetaPath}
 cd ${insmetaPath}
 ${csudo}./post.sh
--- a/packaging/deb/DEBIAN/postrm
+++ b/packaging/deb/DEBIAN/postrm
 #!/bin/bash
--- a/packaging/deb/DEBIAN/preinst
+++ b/packaging/deb/DEBIAN/preinst
 #!/bin/bash
 csudo=""
 if command -v sudo > /dev/null; then
    csudo="sudo "
 fi
 # Stop the service if running
 if pidof taosd &> /dev/null; then
    if pidof systemd &> /dev/null; then
        ${csudo}systemctl stop taosd || :
    elif $(which service  &> /dev/null); then
        ${csudo}service taosd stop || :
    else
        pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
        if [ -n "$pid" ]; then
           ${csudo}kill -9 $pid   || :
        fi
    fi
    echo "Stop taosd service success!"
    sleep 1
 fi
 # if taos.cfg already softlink, remove it
 cfg_install_dir="/etc/taos"
 install_main_dir="/usr/local/taos"
 if [ -f "${install_main_dir}/taos.cfg" ]; then
    ${csudo}rm -f ${install_main_dir}/cfg/taos.cfg   || :
 fi
 if [ -f "${install_main_dir}/taosadapter.toml" ]; then
    ${csudo}rm -f ${install_main_dir}/cfg/taosadapter.toml     || :
 fi
 if [ -f "${install_main_dir}/taosadapter.service" ]; then
    ${csudo}rm -f ${install_main_dir}/cfg/taosadapter.service || :
 fi
 # there can not libtaos.so*, otherwise ln -s  error
 ${csudo}rm -f ${install_main_dir}/driver/libtaos*   || :
--- a/packaging/deb/DEBIAN/prerm
+++ b/packaging/deb/DEBIAN/prerm
 #!/bin/bash
 insmetaPath="/usr/local/taos/script"
 csudo=""
 if command -v sudo > /dev/null; then
    csudo="sudo "
 fi
 ${csudo}chmod -R 744 ${insmetaPath}  || :
 #cd ${insmetaPath}
 #${csudo}./preun.sh
 if [ -f ${insmetaPath}/preun.sh ]; then
    cd ${insmetaPath}
    ${csudo}./preun.sh
 else
    bin_link_dir="/usr/bin"
    lib_link_dir="/usr/lib"
    inc_link_dir="/usr/include"
    data_link_dir="/usr/local/taos/data"
    log_link_dir="/usr/local/taos/log"
    cfg_link_dir="/usr/local/taos/cfg"
    # Remove all links
    ${csudo}rm -f ${bin_link_dir}/taos       || :
    ${csudo}rm -f ${bin_link_dir}/taosd      || :
    ${csudo}rm -f ${bin_link_dir}/taosadapter       || :
    ${csudo}rm -f ${bin_link_dir}/taosdemo   || :
    ${csudo}rm -f ${cfg_link_dir}/*          || :
    ${csudo}rm -f ${inc_link_dir}/taos.h     || :
    ${csudo}rm -f ${lib_link_dir}/libtaos.*  || :
    ${csudo}rm -f ${log_link_dir}            || :
    ${csudo}rm -f ${data_link_dir}           || :
    pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
    if [ -n "$pid" ]; then
        ${csudo}kill -9 $pid   || :
    fi
 fi
--- a/packaging/deb/makedeb.sh
+++ b/packaging/deb/makedeb.sh
 #!/bin/bash
 #
 # Generate deb package for ubuntu
 set -e
 # set -x
 #curr_dir=$(pwd)
 compile_dir=$1
 output_dir=$2
 tdengine_ver=$3
 cpuType=$4
 osType=$5
 verMode=$6
 verType=$7
 script_dir="$(dirname $(readlink -f $0))"
 top_dir="$(readlink -f ${script_dir}/../..)"
 pkg_dir="${top_dir}/debworkroom"
 #echo "curr_dir: ${curr_dir}"
 #echo "top_dir: ${top_dir}"
 #echo "script_dir: ${script_dir}"
 echo "compile_dir: ${compile_dir}"
 echo "pkg_dir: ${pkg_dir}"
 if [ -d ${pkg_dir} ]; then
    rm -rf ${pkg_dir}
 fi
 mkdir -p ${pkg_dir}
 cd ${pkg_dir}
 libfile="libtaos.so.${tdengine_ver}"
 # create install dir
 install_home_path="/usr/local/taos"
 mkdir -p ${pkg_dir}${install_home_path}
 mkdir -p ${pkg_dir}${install_home_path}/bin
 mkdir -p ${pkg_dir}${install_home_path}/cfg
 #mkdir -p ${pkg_dir}${install_home_path}/connector
 mkdir -p ${pkg_dir}${install_home_path}/driver
 mkdir -p ${pkg_dir}${install_home_path}/examples
 mkdir -p ${pkg_dir}${install_home_path}/include
 #mkdir -p ${pkg_dir}${install_home_path}/init.d
 mkdir -p ${pkg_dir}${install_home_path}/script
 cp ${compile_dir}/../packaging/cfg/taos.cfg         ${pkg_dir}${install_home_path}/cfg
 if [ -f "${compile_dir}/test/cfg/taosadapter.toml" ]; then
    cp ${compile_dir}/test/cfg/taosadapter.toml		${pkg_dir}${install_home_path}/cfg || :
 fi
 if [ -f "${compile_dir}/test/cfg/taosadapter.service" ]; then
    cp ${compile_dir}/test/cfg/taosadapter.service	${pkg_dir}${install_home_path}/cfg || :
 fi
 #cp ${compile_dir}/../packaging/deb/taosd            ${pkg_dir}${install_home_path}/init.d
 cp ${compile_dir}/../packaging/tools/post.sh        ${pkg_dir}${install_home_path}/script
 cp ${compile_dir}/../packaging/tools/preun.sh       ${pkg_dir}${install_home_path}/script
 cp ${compile_dir}/../packaging/tools/startPre.sh    ${pkg_dir}${install_home_path}/bin
 cp ${compile_dir}/../packaging/tools/set_core.sh    ${pkg_dir}${install_home_path}/bin
 cp ${compile_dir}/../packaging/tools/taosd-dump-cfg.gdb    ${pkg_dir}${install_home_path}/bin
 cp ${compile_dir}/build/bin/taosd                   ${pkg_dir}${install_home_path}/bin
 #cp ${compile_dir}/build/bin/taosBenchmark           ${pkg_dir}${install_home_path}/bin
 if [ -f "${compile_dir}/build/bin/taosadapter" ]; then
    cp ${compile_dir}/build/bin/taosadapter                    ${pkg_dir}${install_home_path}/bin ||:
 fi
 cp ${compile_dir}/build/bin/taos                    ${pkg_dir}${install_home_path}/bin
 cp ${compile_dir}/build/lib/${libfile}              ${pkg_dir}${install_home_path}/driver
-cp ${compile_dir}/../src/inc/taos.h                 ${pkg_dir}${install_home_path}/include
+cp ${compile_dir}/../include/client/taos.h          ${pkg_dir}${install_home_path}/include
-cp ${compile_dir}/../src/inc/taosdef.h              ${pkg_dir}${install_home_path}/include
+cp ${compile_dir}/../include/common/taosdef.h       ${pkg_dir}${install_home_path}/include
-cp ${compile_dir}/../src/inc/taoserror.h            ${pkg_dir}${install_home_path}/include
+cp ${compile_dir}/../include/util/taoserror.h       ${pkg_dir}${install_home_path}/include
 cp -r ${top_dir}/examples/*                         ${pkg_dir}${install_home_path}/examples
 #cp -r ${top_dir}/src/connector/python               ${pkg_dir}${install_home_path}/connector
 #cp -r ${top_dir}/src/connector/go                   ${pkg_dir}${install_home_path}/connector
 #cp -r ${top_dir}/src/connector/nodejs               ${pkg_dir}${install_home_path}/connector
 #cp ${compile_dir}/build/lib/taos-jdbcdriver*.*  ${pkg_dir}${install_home_path}/connector ||:
 install_user_local_path="/usr/local"
 if [ -f ${compile_dir}/build/bin/jemalloc-config ]; then
    mkdir -p ${pkg_dir}${install_user_local_path}/{bin,lib,lib/pkgconfig,include/jemalloc,share/doc/jemalloc,share/man/man3}
    cp ${compile_dir}/build/bin/jemalloc-config ${pkg_dir}${install_user_local_path}/bin/
    if [ -f ${compile_dir}/build/bin/jemalloc.sh ]; then
        cp ${compile_dir}/build/bin/jemalloc.sh ${pkg_dir}${install_user_local_path}/bin/
    fi
    if [ -f ${compile_dir}/build/bin/jeprof ]; then
        cp ${compile_dir}/build/bin/jeprof ${pkg_dir}${install_user_local_path}/bin/
    fi
    if [ -f ${compile_dir}/build/include/jemalloc/jemalloc.h ]; then
        cp ${compile_dir}/build/include/jemalloc/jemalloc.h ${pkg_dir}${install_user_local_path}/include/jemalloc/
    fi
    if [ -f ${compile_dir}/build/lib/libjemalloc.so.2 ]; then
        cp ${compile_dir}/build/lib/libjemalloc.so.2 ${pkg_dir}${install_user_local_path}/lib/
        ln -sf libjemalloc.so.2 ${pkg_dir}${install_user_local_path}/lib/libjemalloc.so
    fi
    if [ -f ${compile_dir}/build/lib/libjemalloc.a ]; then
        cp ${compile_dir}/build/lib/libjemalloc.a ${pkg_dir}${install_user_local_path}/lib/
    fi
    if [ -f ${compile_dir}/build/lib/libjemalloc_pic.a ]; then
        cp ${compile_dir}/build/lib/libjemalloc_pic.a ${pkg_dir}${install_user_local_path}/lib/
    fi
    if [ -f ${compile_dir}/build/lib/pkgconfig/jemalloc.pc ]; then
        cp ${compile_dir}/build/lib/pkgconfig/jemalloc.pc ${pkg_dir}${install_user_local_path}/lib/pkgconfig/
    fi
    if [ -f ${compile_dir}/build/share/doc/jemalloc/jemalloc.html ]; then
        cp ${compile_dir}/build/share/doc/jemalloc/jemalloc.html ${pkg_dir}${install_user_local_path}/share/doc/jemalloc/
    fi
    if [ -f ${compile_dir}/build/share/man/man3/jemalloc.3 ]; then
        cp ${compile_dir}/build/share/man/man3/jemalloc.3 ${pkg_dir}${install_user_local_path}/share/man/man3/
    fi
 fi
 cp -r ${compile_dir}/../packaging/deb/DEBIAN        ${pkg_dir}/
 chmod 755 ${pkg_dir}/DEBIAN/*
 # modify version of control
 debver="Version: "$tdengine_ver
 sed -i "2c$debver" ${pkg_dir}/DEBIAN/control
 #get taos version, then set deb name
 if [ "$verMode" == "cluster" ]; then
  debname="TDengine-server-"${tdengine_ver}-${osType}-${cpuType}
 elif [ "$verMode" == "edge" ]; then
  debname="TDengine-server"-${tdengine_ver}-${osType}-${cpuType}
 else
  echo "unknow verMode, nor cluster or edge"
  exit 1
 fi
 if [ "$verType" == "beta" ]; then
  debname="TDengine-server-"${tdengine_ver}-${verType}-${osType}-${cpuType}".deb"
 elif [ "$verType" == "stable" ]; then
  debname=${debname}".deb"
 else
  echo "unknow verType, nor stabel or beta"
  exit 1
 fi
 # make deb package
 dpkg -b ${pkg_dir} $debname
 echo "make deb package success!"
 cp ${pkg_dir}/*.deb ${output_dir}
 # clean temp dir
 rm -rf ${pkg_dir}
--- a/packaging/deb/taosd
+++ b/packaging/deb/taosd
 #!/bin/bash
 #
 # Modified from original source: Elastic Search
 # https://github.com/elasticsearch/elasticsearch
 # Thank you to the Elastic Search authors
 #
 # chkconfig: 2345 99 01
 #
 ### BEGIN INIT INFO
 # Provides:          TDengine
 # Required-Start:    $local_fs $network $syslog
 # Required-Stop:     $local_fs $network $syslog
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Starts TDengine taosd
 # Description:       Starts TDengine taosd, a time-series database engine
 ### END INIT INFO
 set -e
 PATH="/bin:/usr/bin:/sbin:/usr/sbin"
 NAME="TDengine"
 USER="root"
 GROUP="root"
 DAEMON="/usr/local/taos/bin/taosd"
 DAEMON_OPTS=""
 HTTPD_NAME="taosadapter"
 DAEMON_HTTPD_NAME=$HTTPD_NAME
 DAEMON_HTTPD="/usr/local/taos/bin/$HTTPD_NAME"
 PID_FILE="/var/run/$NAME.pid"
 APPARGS=""
 # Maximum number of open files
 MAX_OPEN_FILES=65535
 . /lib/lsb/init-functions
 case "$1" in
    start)
        log_action_begin_msg "Starting TDengine..."
        $DAEMON_HTTPD &
        if start-stop-daemon --test --start --chuid "$USER:$GROUP" --background --make-pidfile --pidfile "$PID_FILE" --exec "$DAEMON" -- $APPARGS &> /dev/null; then
            touch "$PID_FILE" && chown "$USER":"$GROUP" "$PID_FILE"
            if [ -n "$MAX_OPEN_FILES" ]; then
                ulimit -n $MAX_OPEN_FILES
            fi
            start-stop-daemon --start --chuid "$USER:$GROUP" --background --make-pidfile --pidfile "$PID_FILE" --exec "$DAEMON" -- $APPARGS
            log_end_msg $?
        fi
        ;;
    stop)
        log_action_begin_msg "Stopping TDengine..."
        pkill -9 $DAEMON_HTTPD_NAME
        set +e
        if [ -f "$PID_FILE" ]; then
            start-stop-daemon --stop --pidfile "$PID_FILE" --user "$USER" --retry=TERM/120/KILL/5 > /dev/null
            if [ $? -eq 1 ]; then
                log_action_cont_msg "TSD is not running but pid file exists, cleaning up"
            elif [ $? -eq 3 ]; then
                PID="`cat $PID_FILE`"
                log_failure_msg "Failed to stop TDengine (pid $PID)"
                exit 1
            fi
            rm -f "$PID_FILE"
        else
            log_action_cont_msg "TDengine was not running"
        fi
        log_action_end_msg 0
        set -e
        ;;
    restart|force-reload)
        if [ -f "$PID_FILE" ]; then
            $0 stop
            sleep 1
        fi
        $0 start
        ;;
    status)
        status_of_proc -p "$PID_FILE" "$DAEMON" "$NAME"
        ;;
    *)
        exit 1
        ;;
 esac
 exit 0
--- a/packaging/deb/tarbitratord
+++ b/packaging/deb/tarbitratord
 #!/bin/bash 
 #
 # Modified from original source: Elastic Search
 # https://github.com/elasticsearch/elasticsearch
 # Thank you to the Elastic Search authors
 #
 # chkconfig: 2345 99 01
 #
 ### BEGIN INIT INFO
 # Provides:          taoscluster
 # Required-Start:    $local_fs $network $syslog
 # Required-Stop:     $local_fs $network $syslog
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Starts taoscluster tarbitrator
 # Description:       Starts taoscluster tarbitrator, a arbitrator
 ### END INIT INFO
 set -e
 PATH="/bin:/usr/bin:/sbin:/usr/sbin"
 NAME="taoscluster"
 USER="root"
 GROUP="root"
 DAEMON="/usr/local/taos/bin/tarbitrator"
 DAEMON_OPTS=""
 PID_FILE="/var/run/$NAME.pid"
 APPARGS=""
 # Maximum number of open files
 MAX_OPEN_FILES=65535
 . /lib/lsb/init-functions
 case "$1" in
    start)
        log_action_begin_msg "Starting tarbitrator..."
        if start-stop-daemon --test --start --chuid "$USER:$GROUP" --background --make-pidfile --pidfile "$PID_FILE" --exec "$DAEMON" -- $APPARGS &> /dev/null; then
            touch "$PID_FILE" && chown "$USER":"$GROUP" "$PID_FILE"
            if [ -n "$MAX_OPEN_FILES" ]; then
                ulimit -n $MAX_OPEN_FILES
            fi
            start-stop-daemon --start --chuid "$USER:$GROUP" --background --make-pidfile --pidfile "$PID_FILE" --exec "$DAEMON" -- $APPARGS
            log_end_msg $?
        fi
        ;;
    stop)
        log_action_begin_msg "Stopping tarbitrator..."
        set +e
        if [ -f "$PID_FILE" ]; then
            start-stop-daemon --stop --pidfile "$PID_FILE" --user "$USER" --retry=TERM/120/KILL/5 > /dev/null
            if [ $? -eq 1 ]; then
                log_action_cont_msg "TSD is not running but pid file exists, cleaning up"
            elif [ $? -eq 3 ]; then
                PID="`cat $PID_FILE`"
                log_failure_msg "Failed to stop tarbitrator (pid $PID)"
                exit 1
            fi
            rm -f "$PID_FILE"
        else
            log_action_cont_msg "tarbitrator was not running"
        fi
        log_action_end_msg 0
        set -e
        ;;
    restart|force-reload)
        if [ -f "$PID_FILE" ]; then
            $0 stop
            sleep 1
        fi
        $0 start
        ;;
    status)
        status_of_proc -p "$PID_FILE" "$DAEMON" "$NAME"
        ;;
    *)
        exit 1
        ;;
 esac
 exit 0
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
 FROM ubuntu:18.04
 WORKDIR /root
 ARG pkgFile
 ARG dirName
 ARG cpuType
 RUN echo ${pkgFile} && echo ${dirName}
 COPY ${pkgFile} /root/
 RUN tar -zxf ${pkgFile}
 WORKDIR /root/
 RUN cd /root/${dirName}/ && /bin/bash install.sh -e no && cd /root
 RUN rm /root/${pkgFile}
 RUN rm -rf /root/${dirName}
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get clean && apt-get update && apt-get install -y locales tzdata netcat && locale-gen en_US.UTF-8
 ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib" \
    LC_CTYPE=en_US.UTF-8 \
    LANG=en_US.UTF-8 \
    LC_ALL=en_US.UTF-8
 COPY ./bin/* /usr/bin/
 ENV TINI_VERSION v0.19.0
 RUN bash -c 'echo -e "Downloading tini-${cpuType} ..."'
 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${cpuType} /tini
 RUN chmod +x /tini
 ENTRYPOINT ["/tini", "--", "/usr/bin/entrypoint.sh"]
 CMD ["taosd"]
 VOLUME [ "/var/lib/taos", "/var/log/taos", "/corefile" ]
--- a/packaging/docker/README.md
+++ b/packaging/docker/README.md
--- a/packaging/docker/bin/entrypoint.sh
+++ b/packaging/docker/bin/entrypoint.sh
 #!/bin/sh
 set -e
 # for TZ awareness
 if [ "$TZ" != "" ]; then
    ln -sf /usr/share/zoneinfo/$TZ /etc/localtime
    echo $TZ >/etc/timezone
 fi
 # option to disable taosadapter, default is no
 DISABLE_ADAPTER=${TAOS_DISABLE_ADAPTER:-0}
 unset TAOS_DISABLE_ADAPTER
 # to get mnodeEpSet from data dir
 DATA_DIR=${TAOS_DATA_DIR:-/var/lib/taos}
 # append env to custom taos.cfg
 CFG_DIR=/tmp/taos
 CFG_FILE=$CFG_DIR/taos.cfg
 mkdir -p $CFG_DIR >/dev/null 2>&1
 [ -f /etc/taos/taos.cfg ] && cat /etc/taos/taos.cfg | grep -E -v "^#|^\s*$" >$CFG_FILE
 env-to-cfg >>$CFG_FILE
 FQDN=$(cat $CFG_FILE | grep -E -v "^#|^$" | grep fqdn | tail -n1 | sed -E 's/.*fqdn\s+//')
 # ensure the fqdn is resolved as localhost
 grep "$FQDN" /etc/hosts >/dev/null || echo "127.0.0.1 $FQDN" >>/etc/hosts
 # parse first ep host and port
 FIRST_EP_HOST=${TAOS_FIRST_EP%:*}
 FIRST_EP_PORT=${TAOS_FIRST_EP#*:}
 # in case of custom server port
 SERVER_PORT=$(cat $CFG_FILE | grep -E -v "^#|^$" | grep serverPort | tail -n1 | sed -E 's/.*serverPort\s+//')
 SERVER_PORT=${SERVER_PORT:-6030}
 # for other binaries like interpreters
 if echo $1 | grep -E "taosd$" - >/dev/null; then
    true # will run taosd
 else
    cp -f $CFG_FILE /etc/taos/taos.cfg || true
    $@
    exit $?
 fi
 set +e
 ulimit -c unlimited
 # set core files pattern, maybe failed
 sysctl -w kernel.core_pattern=/corefile/core-$FQDN-%e-%p >/dev/null >&1
 set -e
 if [ "$DISABLE_ADAPTER" = "0" ]; then
    which taosadapter >/dev/null && taosadapter &
    # wait for 6041 port ready
    for _ in $(seq 1 20); do
        nc -z localhost 6041 && break
        sleep 0.5
    done
 fi
 # if has mnode ep set or the host is first ep or not for cluster, just start.
 if [ -f "$DATA_DIR/dnode/mnodeEpSet.json" ] ||
    [ "$TAOS_FQDN" = "$FIRST_EP_HOST" ]; then
    $@ -c $CFG_DIR
 # others will first wait the first ep ready.
 else
    if [ "$TAOS_FIRST_EP" = "" ]; then
        echo "run TDengine with single node."
        $@ -c $CFG_DIR
        exit $?
    fi
    while true; do
        es=0
        taos -h $FIRST_EP_HOST -P $FIRST_EP_PORT -n startup >/dev/null || es=$?
        if [ "$es" -eq 0 ]; then
            taos -h $FIRST_EP_HOST -P $FIRST_EP_PORT -s "create dnode \"$FQDN:$SERVER_PORT\";"
            break
        fi
        sleep 1s
    done
    $@ -c $CFG_DIR
 fi
--- a/packaging/docker/bin/env-to-cfg
+++ b/packaging/docker/bin/env-to-cfg
 #!/bin/sh
 set -e
 self=$0
 snake_to_camel_case() {
  echo $1 | awk -F _ '{printf "%s", $1; for(i=2; i<=NF; i++) printf "%s", toupper(substr($i,1,1)) substr($i,2); print"";}'
 }
 if echo $1 | grep -E "^$" - >/dev/null; then
  export |grep -E 'TAOS_.*' -o| sed 's/TAOS_//' |tr A-Z a-z | awk -F"=" '{print "name=$(""'$self' " $1"); echo $name "$2}' |sh
 else
  snake_to_camel_case $1
 fi
--- a/packaging/docker/docker-compose.yml
+++ b/packaging/docker/docker-compose.yml
 version: "3"
 networks:
  inter:
  api:
 services:
  arbitrator:
    image: tdengine/tdengine:$VERSION
    command: tarbitrator
    networks:
      - inter
  td-1:
    image: tdengine/tdengine:$VERSION
    networks:
      - inter
    environment:
      TAOS_FQDN: "td-1"
      TAOS_FIRST_EP: "td-1"
      TAOS_NUM_OF_MNODES: "2"
      TAOS_REPLICA: "2"
      TAOS_ARBITRATOR: arbitrator:6042
    volumes:
      - taosdata-td1:/var/lib/taos/
      - taoslog-td1:/var/log/taos/
  td-2:
    image: tdengine/tdengine:$VERSION
    networks:
      - inter
    environment:
      TAOS_FQDN: "td-2"
      TAOS_FIRST_EP: "td-1"
      TAOS_NUM_OF_MNODES: "2"
      TAOS_REPLICA: "2"
      TAOS_ARBITRATOR: arbitrator:6042
    volumes:
      - taosdata-td2:/var/lib/taos/
      - taoslog-td2:/var/log/taos/
  adapter:
    image: tdengine/tdengine:$VERSION
    command: taosadapter
    networks:
      - inter
    environment:
      TAOS_FIRST_EP: "td-1"
      TOAS_SECOND_EP: "td-2"
    deploy:
      replicas: 4
      update_config:
        parallelism: 4
  nginx:
    image: nginx
    depends_on:
      - adapter
    networks:
      - inter
      - api
    ports:
      - 6041:6041
      - 6044:6044/udp
    command: [
        "sh",
        "-c",
        "while true;
        do curl -s http://adapter:6041/-/ping >/dev/null && break;
        done;
        printf 'server{listen 6041;location /{proxy_pass http://adapter:6041;}}'
        > /etc/nginx/conf.d/rest.conf;
        printf 'stream{server{listen 6044 udp;proxy_pass adapter:6044;}}'
        >> /etc/nginx/nginx.conf;cat /etc/nginx/nginx.conf;
        nginx -g 'daemon off;'",
      ]
 volumes:
  taosdata-td1:
  taoslog-td1:
  taosdata-td2:
  taoslog-td2:
--- a/packaging/docker/dockerManifest.sh
+++ b/packaging/docker/dockerManifest.sh
 #!/bin/bash
 set -e
 #set -x
 # dockerbuild.sh 
 #             -n [version number]
 #             -p [xxxx]
 #             -V [stable | beta]
 # set parameters by default value
 version=""
 passWord=""
 verType=""
 while getopts "hn:p:V:" arg
 do
  case $arg in
    n)
      #echo "version=$OPTARG"
      version=$(echo $OPTARG)
      ;;
    p)
      #echo "passWord=$OPTARG"
      passWord=$(echo $OPTARG)
      ;;
    V)
      #echo "verType=$OPTARG"
      verType=$(echo $OPTARG)
      ;;    
    h)
      echo "Usage: `basename $0` -n [version number] "
      echo "                      -p [password for docker hub] "
      exit 0
      ;;
    ?) #unknow option 
      echo "unkonw argument"
      exit 1
      ;;
  esac
 done
 echo "version=${version}"
 #docker manifest rm tdengine/tdengine
 #docker manifest rm tdengine/tdengine:${version}
 if [ "$verType" == "beta" ]; then
  docker manifest create -a tdengine/tdengine-beta:${version} tdengine/tdengine-amd64-beta:${version} tdengine/tdengine-aarch64-beta:${version} tdengine/tdengine-aarch32-beta:${version}
  docker manifest create -a tdengine/tdengine-beta:latest tdengine/tdengine-amd64-beta:latest tdengine/tdengine-aarch64-beta:latest tdengine/tdengine-aarch32-beta:latest
  docker manifest rm tdengine/tdengine-beta:${version}
  docker manifest rm tdengine/tdengine-beta:latest
  docker manifest create -a tdengine/tdengine-beta:${version} tdengine/tdengine-amd64-beta:${version} tdengine/tdengine-aarch64-beta:${version} tdengine/tdengine-aarch32-beta:${version}
  docker manifest create -a tdengine/tdengine-beta:latest tdengine/tdengine-amd64-beta:latest tdengine/tdengine-aarch64-beta:latest tdengine/tdengine-aarch32-beta:latest
  docker manifest inspect  tdengine/tdengine:latest 
  docker manifest inspect  tdengine/tdengine:${version}
  docker login -u tdengine -p ${passWord}  #replace the docker registry username and password
  docker manifest push tdengine/tdengine-beta:${version}
  docker manifest push tdengine/tdengine-beta:latest
 elif [ "$verType" == "stable" ]; then
  docker manifest create -a tdengine/tdengine:${version} tdengine/tdengine-amd64:${version} tdengine/tdengine-aarch64:${version} tdengine/tdengine-aarch32:${version}
  docker manifest create -a tdengine/tdengine:latest tdengine/tdengine-amd64:latest tdengine/tdengine-aarch64:latest tdengine/tdengine-aarch32:latest
  docker manifest rm tdengine/tdengine:latest
  docker manifest rm tdengine/tdengine:${version}
  docker manifest create -a tdengine/tdengine:${version} tdengine/tdengine-amd64:${version} tdengine/tdengine-aarch64:${version} tdengine/tdengine-aarch32:${version}
  docker manifest create -a tdengine/tdengine:latest tdengine/tdengine-amd64:latest tdengine/tdengine-aarch64:latest tdengine/tdengine-aarch32:latest
  docker manifest inspect  tdengine/tdengine:latest 
  docker manifest inspect  tdengine/tdengine:${version}
  docker login -u tdengine -p ${passWord}  #replace the docker registry username and password
  docker manifest push tdengine/tdengine:${version}
  docker manifest push tdengine/tdengine:latest
 else
  echo "unknow verType, nor stabel or beta"
  exit 1
 fi
 # docker manifest create -a tdengine/${dockername}:${version} tdengine/tdengine-amd64:${version} tdengine/tdengine-aarch64:${version} tdengine/tdengine-aarch32:${version}
 # docker manifest create -a tdengine/${dockername}:latest tdengine/tdengine-amd64:latest tdengine/tdengine-aarch64:latest tdengine/tdengine-aarch32:latest
 # docker login -u tdengine -p ${passWord}  #replace the docker registry username and password
 # docker manifest push tdengine/tdengine:latest
 # # how set latest version ???
--- a/packaging/docker/dockerbuild.sh
+++ b/packaging/docker/dockerbuild.sh
 #!/bin/bash
 #
 set -e
 #set -x
 # dockerbuild.sh 
 #             -c [aarch32 | aarch64 | amd64 | x86 | mips64 ...]  
 #             -n [version number]
 #             -p [password for docker hub]
 #             -V [stable | beta]
 #             -f [pkg file]
 # set parameters by default value
 cpuType=""
 cpuTypeAlias=""
 version=""
 passWord=""
 pkgFile=""
 verType="stable"
 dockerLatest="n"
 while getopts "hc:n:p:f:V:a:b:" arg
 do
  case $arg in
    c)
      #echo "cpuType=$OPTARG"
      cpuType=$(echo $OPTARG)
      ;;
    n)
      #echo "version=$OPTARG"
      version=$(echo $OPTARG)
      ;;
    p)
      #echo "passWord=$OPTARG"
      passWord=$(echo $OPTARG)
      ;;
    f)
      #echo "pkgFile=$OPTARG"
      pkgFile=$(echo $OPTARG)
      ;;
    b)
      #echo "branchName=$OPTARG"
      branchName=$(echo $OPTARG)
      ;;
    V)
      #echo "verType=$OPTARG"
      verType=$(echo $OPTARG)
      ;;
    a)
      #echo "dockerLatest=$OPTARG"
      dockerLatest=$(echo $OPTARG)
      ;;
    h)
      echo "Usage: `basename $0`  -c [aarch32 | aarch64 | amd64 | x86 | mips64 ...] "
      echo "                      -n [version number] "
      echo "                      -p [password for docker hub] "
      echo "                      -V [stable | beta] "
      echo "                      -f [pkg file] "
      echo "                      -a [y | n ]   "
      exit 0
      ;;
    ?) #unknow option 
      echo "unkonw argument"
      exit 1
      ;;
  esac
 done
 # Check_verison()
 # {
 # }
 if [ "$verType" == "beta" ]; then
  dockername=${cpuType}-${verType}
  dirName=${pkgFile%-beta*}
 elif [ "$verType" == "stable" ]; then
  dockername=${cpuType}
  dirName=${pkgFile%-Linux*}
 else
  echo "unknow verType, nor stabel or beta"
  exit 1
 fi
 echo "cpuType=${cpuType} version=${version} pkgFile=${pkgFile} verType=${verType} "
 echo "$(pwd)"
 echo "====NOTES: ${pkgFile} must be in the same directory as dockerbuild.sh===="
 scriptDir=$(dirname $(readlink -f $0))
 comunityArchiveDir=/nas/TDengine/v$version/community   # community version’package directory
 communityDir=${scriptDir}/../../../community
 DockerfilePath=${communityDir}/packaging/docker/
 Dockerfile=${communityDir}/packaging/docker/Dockerfile
 cd ${scriptDir}
 cp -f ${comunityArchiveDir}/${pkgFile}  .
 echo "dirName=${dirName}"
 if [[ "${cpuType}" == "x64" ]] || [[ "${cpuType}" == "amd64" ]]; then
    cpuTypeAlias="amd64"
 elif [[ "${cpuType}" == "aarch64" ]]; then
    cpuTypeAlias="arm64"
 elif [[ "${cpuType}" == "aarch32" ]]; then
    cpuTypeAlias="armhf"
 else
    echo "Unknown cpuType: ${cpuType}"
    exit 1
 fi
 docker build --rm -f "${Dockerfile}"  --network=host -t tdengine/tdengine-${dockername}:${version} "." --build-arg pkgFile=${pkgFile} --build-arg dirName=${dirName} --build-arg cpuType=${cpuTypeAlias}
 docker login -u tdengine -p ${passWord}  #replace the docker registry username and password
 docker push tdengine/tdengine-${dockername}:${version}
 if [ -n "$(docker ps -aq)" ] ;then 
  echo "delete docker process"
  docker stop $(docker ps -aq)
  docker rm $(docker ps -aq)
 fi
 if [  -n "$(pidof taosd)" ] ;then
   echo "kill taosd "
   kill -9 $(pidof taosd)
 fi
 if [ -n "$(pidof power)" ]  ;then
  echo "kill power "
  kill -9 $(pidof power)
 fi
 echo ">>>>>>>>>>>>> check whether  tdengine/tdengine-${dockername}:${version}  has been published"
 docker run -d --name doctest -p 6030-6049:6030-6049 -p 6030-6049:6030-6049/udp  tdengine/tdengine-${dockername}:${version}
 sleep 2
 curl -u root:taosdata -d 'show variables;'  127.0.0.1:6041/rest/sql > temp1.data
 data_version=$( cat temp1.data |jq .data| jq '.[]' |grep "version" -A 2 -B 1  | jq ".[1]")
 echo "${data_version}" 
 if [ "${data_version}" == "\"${version}\"" ] ; then
    echo  "docker version is right "
 else
    echo  "docker version is wrong "
    exit 1
 fi
 rm -rf  temp1.data
 # set this version to latest version 
 if  [ ${dockerLatest} == 'y' ]  ;then
  docker tag tdengine/tdengine-${dockername}:${version} tdengine/tdengine-${dockername}:latest
  docker push tdengine/tdengine-${dockername}:latest
  echo ">>>>>>>>>>>>> check whether  tdengine/tdengine-${dockername}:latest has been published correctly"
  docker run -d --name doctestla -p 7030-7049:6030-6049 -p 7030-7049:6030-6049/udp   tdengine/tdengine-${dockername}:latest 
  sleep 2
  curl -u root:taosdata -d 'show variables;'  127.0.0.1:7041/rest/sql >  temp2.data
  version_latest=` cat temp2.data |jq .data| jq '.[]' |grep "version" -A 2 -B 1  | jq ".[1]" `
  echo "${version_latest}" 
  if [ "${version_latest}" == "\"${version}\"" ] ; then
      echo  "docker version is right "
  else 
      echo  "docker version is wrong "
      exit 1 
  fi
 fi
 rm -rf  temp2.data
 if [ -n "$(docker ps -aq)" ] ;then 
  echo "delte docker process"
  docker stop $(docker ps -aq)
  docker rm $(docker ps -aq)
 fi
 cd ${scriptDir}
 rm -f ${pkgFile}
--- a/packaging/docker/dockerbuildi.sh
+++ b/packaging/docker/dockerbuildi.sh
 #!/bin/bash
 #
 set -e
 #set -x
 # dockerbuild.sh 
 #             -c [aarch32 | aarch64 | amd64 | x86 | mips64 ...]  
 #             -n [version number]
 #             -p [password for docker hub]
 # set parameters by default value
 cpuType=aarch64
 verNumber=""
 passWord=""
 while getopts "hc:n:p:f:" arg
 do
  case $arg in
    c)
      #echo "cpuType=$OPTARG"
      cpuType=$(echo $OPTARG)
      ;;
    n)
      #echo "verNumber=$OPTARG"
      verNumber=$(echo $OPTARG)
      ;;
    p)
      #echo "passWord=$OPTARG"
      passWord=$(echo $OPTARG)
      ;;
    h)
      echo "Usage: `basename $0` -c [aarch32 | aarch64 | amd64 | x86 | mips64 ...] "
      echo "                      -n [version number] "
      echo "                      -p [password for docker hub] "
      exit 0
      ;;
    ?) #unknow option 
      echo "unkonw argument"
      exit 1
      ;;
  esac
 done
 pkgFile=TDengine-server-${verNumber}-Linux-${cpuType}.tar.gz
 echo "cpuType=${cpuType} verNumber=${verNumber} pkgFile=${pkgFile} "
 scriptDir=`pwd`
 pkgDir=$scriptDir/../../release/
 cp -f ${pkgDir}/${pkgFile} .
 ./dockerbuild.sh -c ${cpuType} -f ${pkgFile} -n ${verNumber} -p ${passWord}
 rm -f ${pkgFile}
--- a/packaging/release.bat
+++ b/packaging/release.bat
 @echo off
 set internal_dir=%~dp0\..\..\
 set community_dir=%~dp0\..
 cd %community_dir%
 git checkout -- .
 cd %community_dir%\packaging
 :: %1 name %2 version
 if !%1==! GOTO USAGE
 if !%2==! GOTO USAGE
 if %1 == taos GOTO TAOS
 if %1 == power GOTO POWER
 if %1 == tq GOTO TQ
 if %1 == pro GOTO PRO
 if %1 == kh GOTO KH
 if %1 == jh GOTO JH
 GOTO USAGE
 :TAOS
 goto RELEASE
 :POWER
 call sed_power.bat %community_dir%
 goto RELEASE
 :TQ
 call sed_tq.bat %community_dir%
 goto RELEASE
 :PRO
 call sed_pro.bat %community_dir%
 goto RELEASE
 :KH
 call sed_kh.bat %community_dir%
 goto RELEASE
 :JH
 call sed_jh.bat %community_dir%
 goto RELEASE
 :RELEASE
 echo release windows-client-64 for %1, version: %2
 if not exist %internal_dir%\debug\ver-%2-64bit-%1 (
 	md %internal_dir%\debug\ver-%2-64bit-%1
 ) else (
 	rd /S /Q %internal_dir%\debug\ver-%2-64bit-%1
 	md %internal_dir%\debug\ver-%2-64bit-%1
 )
 cd %internal_dir%\debug\ver-%2-64bit-%1
 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
 cmake ../../ -G "NMake Makefiles" -DVERNUMBER=%2 -DCPUTYPE=x64
 set CL=/MP4
 nmake install
 goto EXIT0
 :USAGE
 echo Usage: release.bat $productName $version
 goto EXIT0
 :EXIT0
\ No newline at end of file
--- a/packaging/release.sh
+++ b/packaging/release.sh
--- a/packaging/rpm/makerpm.sh
+++ b/packaging/rpm/makerpm.sh
 #!/bin/bash
 #
 # Generate rpm package for centos
 set -e
 # set -x
 #curr_dir=$(pwd)
 compile_dir=$1
 output_dir=$2
 tdengine_ver=$3
 cpuType=$4
 osType=$5
 verMode=$6
 verType=$7
 script_dir="$(dirname $(readlink -f $0))"
 top_dir="$(readlink -f ${script_dir}/../..)"
 pkg_dir="${top_dir}/rpmworkroom"
 spec_file="${script_dir}/tdengine.spec"
 #echo "curr_dir: ${curr_dir}"
 #echo "top_dir: ${top_dir}"
 #echo "script_dir: ${script_dir}"
 echo "compile_dir: ${compile_dir}"
 echo "pkg_dir: ${pkg_dir}"
 echo "spec_file: ${spec_file}"
 csudo=""
 if command -v sudo > /dev/null; then
    csudo="sudo "
 fi
 function cp_rpm_package() {
    local cur_dir
    cd $1
    cur_dir=$(pwd)
    for dirlist in "$(ls ${cur_dir})"; do
        if test -d ${dirlist}; then
            cd ${dirlist}
            cp_rpm_package ${cur_dir}/${dirlist}
            cd ..
        fi
        if test -e ${dirlist}; then
            cp ${cur_dir}/${dirlist} ${output_dir}/TDengine-${tdengine_ver}.rpm
        fi
    done
 }
 if [ -d ${pkg_dir} ]; then
  ${csudo}rm -rf ${pkg_dir}
 fi
 ${csudo}mkdir -p ${pkg_dir}
 cd ${pkg_dir}
 ${csudo}mkdir -p BUILD BUILDROOT RPMS SOURCES SPECS SRPMS
 ${csudo}rpmbuild --define="_version ${tdengine_ver}" --define="_topdir ${pkg_dir}" --define="_compiledir ${compile_dir}" -bb ${spec_file}
 # copy rpm package to output_dir, and modify package name, then clean temp dir
 #${csudo}cp -rf RPMS/* ${output_dir}
 cp_rpm_package ${pkg_dir}/RPMS
 if [ "$verMode" == "cluster" ]; then
  rpmname="TDengine-server-"${tdengine_ver}-${osType}-${cpuType}
 elif [ "$verMode" == "edge" ]; then
  rpmname="TDengine-server"-${tdengine_ver}-${osType}-${cpuType}
 else
  echo "unknow verMode, nor cluster or edge"
  exit 1
 fi
 if [ "$verType" == "beta" ]; then
  rpmname="TDengine-server-"${tdengine_ver}-${verType}-${osType}-${cpuType}".rpm"
 elif [ "$verType" == "stable" ]; then
  rpmname=${rpmname}".rpm"
 else
  echo "unknow verType, nor stabel or beta"
  exit 1
 fi
 mv ${output_dir}/TDengine-${tdengine_ver}.rpm ${output_dir}/${rpmname}
 cd ..
 ${csudo}rm -rf ${pkg_dir}
--- a/packaging/rpm/taosd
+++ b/packaging/rpm/taosd
--- a/packaging/rpm/tarbitratord
+++ b/packaging/rpm/tarbitratord
--- a/packaging/rpm/tdengine.spec
+++ b/packaging/rpm/tdengine.spec
--- a/packaging/tools/check_os.sh
+++ b/packaging/tools/check_os.sh
--- a/packaging/tools/get_client.sh
+++ b/packaging/tools/get_client.sh
--- a/packaging/tools/get_os.sh
+++ b/packaging/tools/get_os.sh
--- a/packaging/tools/get_version.sh
+++ b/packaging/tools/get_version.sh
--- a/packaging/tools/install.sh
+++ b/packaging/tools/install.sh
--- a/packaging/tools/install_arbi.sh
+++ b/packaging/tools/install_arbi.sh
--- a/packaging/tools/install_client.sh
+++ b/packaging/tools/install_client.sh
--- a/packaging/tools/makearbi.sh
+++ b/packaging/tools/makearbi.sh
--- a/packaging/tools/makeclient.sh
+++ b/packaging/tools/makeclient.sh
--- a/packaging/tools/makepkg.sh
+++ b/packaging/tools/makepkg.sh
--- a/packaging/tools/post.sh
+++ b/packaging/tools/post.sh
--- a/packaging/tools/preun.sh
+++ b/packaging/tools/preun.sh
--- a/packaging/tools/release_note
+++ b/packaging/tools/release_note
--- a/packaging/tools/remove.sh
+++ b/packaging/tools/remove.sh
--- a/packaging/tools/remove_arbi.sh
+++ b/packaging/tools/remove_arbi.sh
--- a/packaging/tools/remove_client.sh
+++ b/packaging/tools/remove_client.sh
--- a/packaging/tools/repair_link.sh
+++ b/packaging/tools/repair_link.sh
--- a/packaging/tools/run_taosd_and_taosadapter.sh
+++ b/packaging/tools/run_taosd_and_taosadapter.sh
 #!/bin/bash
 [[ -x /usr/bin/taosadapter ]] && /usr/bin/taosadapter &
 taosd
--- a/packaging/tools/set_core.sh
+++ b/packaging/tools/set_core.sh
--- a/packaging/tools/startPre.sh
+++ b/packaging/tools/startPre.sh
--- a/packaging/tools/taosd-dump-cfg.gdb
+++ b/packaging/tools/taosd-dump-cfg.gdb
--- a/source/client/src/clientEnv.c
+++ b/source/client/src/clientEnv.c
--- a/source/client/src/clientImpl.c
+++ b/source/client/src/clientImpl.c
--- a/source/client/src/tmq.c
+++ b/source/client/src/tmq.c
--- a/source/common/src/tmsg.c
+++ b/source/common/src/tmsg.c
--- a/source/dnode/mgmt/mgmt_bnode/inc/bmInt.h
+++ b/source/dnode/mgmt/mgmt_bnode/inc/bmInt.h
--- a/source/dnode/mgmt/mgmt_bnode/src/bmHandle.c
+++ b/source/dnode/mgmt/mgmt_bnode/src/bmHandle.c
--- a/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c
+++ b/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c
--- a/source/dnode/mgmt/mgmt_mnode/inc/mmInt.h
+++ b/source/dnode/mgmt/mgmt_mnode/inc/mmInt.h
--- a/source/dnode/mgmt/mgmt_mnode/src/mmFile.c
+++ b/source/dnode/mgmt/mgmt_mnode/src/mmFile.c
--- a/source/dnode/mgmt/mgmt_mnode/src/mmHandle.c
+++ b/source/dnode/mgmt/mgmt_mnode/src/mmHandle.c
--- a/source/dnode/mgmt/mgmt_mnode/src/mmInt.c
+++ b/source/dnode/mgmt/mgmt_mnode/src/mmInt.c
--- a/source/dnode/mgmt/mgmt_mnode/src/mmWorker.c
+++ b/source/dnode/mgmt/mgmt_mnode/src/mmWorker.c
--- a/source/dnode/mgmt/mgmt_qnode/inc/qmInt.h
+++ b/source/dnode/mgmt/mgmt_qnode/inc/qmInt.h
--- a/source/dnode/mgmt/mgmt_qnode/src/qmHandle.c
+++ b/source/dnode/mgmt/mgmt_qnode/src/qmHandle.c
--- a/source/dnode/mgmt/mgmt_snode/inc/smInt.h
+++ b/source/dnode/mgmt/mgmt_snode/inc/smInt.h
--- a/source/dnode/mgmt/mgmt_snode/src/smHandle.c
+++ b/source/dnode/mgmt/mgmt_snode/src/smHandle.c
--- a/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h
+++ b/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h
--- a/source/dnode/mgmt/mgmt_vnode/src/vmFile.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmFile.c
--- a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
--- a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c
--- a/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c
--- a/source/dnode/mgmt/node_mgmt/inc/dmMgmt.h
+++ b/source/dnode/mgmt/node_mgmt/inc/dmMgmt.h
--- a/source/dnode/mgmt/node_mgmt/src/dmMgmt.c
+++ b/source/dnode/mgmt/node_mgmt/src/dmMgmt.c
--- a/source/dnode/mgmt/node_mgmt/src/dmNodes.c
+++ b/source/dnode/mgmt/node_mgmt/src/dmNodes.c
--- a/source/dnode/mgmt/node_mgmt/src/dmProc.c
+++ b/source/dnode/mgmt/node_mgmt/src/dmProc.c
--- a/source/dnode/mgmt/node_mgmt/src/dmTransport.c
+++ b/source/dnode/mgmt/node_mgmt/src/dmTransport.c
--- a/source/dnode/mgmt/node_util/inc/dmUtil.h
+++ b/source/dnode/mgmt/node_util/inc/dmUtil.h
--- a/source/dnode/mgmt/node_util/src/dmEps.c
+++ b/source/dnode/mgmt/node_util/src/dmEps.c
--- a/source/dnode/mgmt/test/sut/src/client.cpp
+++ b/source/dnode/mgmt/test/sut/src/client.cpp
--- a/source/dnode/mnode/impl/src/mndConsumer.c
+++ b/source/dnode/mnode/impl/src/mndConsumer.c
--- a/source/dnode/mnode/impl/src/mndDnode.c
+++ b/source/dnode/mnode/impl/src/mndDnode.c
--- a/source/dnode/mnode/sdb/src/sdb.c
+++ b/source/dnode/mnode/sdb/src/sdb.c
--- a/source/dnode/mnode/sdb/src/sdbFile.c
+++ b/source/dnode/mnode/sdb/src/sdbFile.c
--- a/source/dnode/mnode/sdb/src/sdbHash.c
+++ b/source/dnode/mnode/sdb/src/sdbHash.c
--- a/source/dnode/vnode/inc/vnode.h
+++ b/source/dnode/vnode/inc/vnode.h
--- a/source/dnode/vnode/src/inc/tq.h
+++ b/source/dnode/vnode/src/inc/tq.h
--- a/source/dnode/vnode/src/inc/vnd.h
+++ b/source/dnode/vnode/src/inc/vnd.h
--- a/source/dnode/vnode/src/inc/vnodeInt.h
+++ b/source/dnode/vnode/src/inc/vnodeInt.h
--- a/source/dnode/vnode/src/meta/metaOpen.c
+++ b/source/dnode/vnode/src/meta/metaOpen.c
--- a/source/dnode/vnode/src/meta/metaTable.c
+++ b/source/dnode/vnode/src/meta/metaTable.c
--- a/source/dnode/vnode/src/tq/tq.c
+++ b/source/dnode/vnode/src/tq/tq.c
--- a/source/dnode/vnode/src/tq/tqRead.c
+++ b/source/dnode/vnode/src/tq/tqRead.c
--- a/source/dnode/vnode/src/tsdb/tsdbOpen.c
+++ b/source/dnode/vnode/src/tsdb/tsdbOpen.c
--- a/source/dnode/vnode/src/tsdb/tsdbRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead.c
--- a/source/dnode/vnode/src/vnd/vnodeOpen.c
+++ b/source/dnode/vnode/src/vnd/vnodeOpen.c
--- a/source/dnode/vnode/src/vnd/vnodeSvr.c
+++ b/source/dnode/vnode/src/vnd/vnodeSvr.c
--- a/source/dnode/vnode/src/vnd/vnodeSync.c
+++ b/source/dnode/vnode/src/vnd/vnodeSync.c
--- a/source/libs/executor/inc/executorimpl.h
+++ b/source/libs/executor/inc/executorimpl.h
--- a/source/libs/executor/src/executor.c
+++ b/source/libs/executor/src/executor.c
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
--- a/source/libs/function/src/functionMgt.c
+++ b/source/libs/function/src/functionMgt.c
--- a/source/libs/function/src/udfd.c
+++ b/source/libs/function/src/udfd.c
--- a/source/libs/function/test/udf2.c
+++ b/source/libs/function/test/udf2.c
--- a/source/libs/index/src/indexCache.c
+++ b/source/libs/index/src/indexCache.c
--- a/source/libs/index/src/indexFst.c
+++ b/source/libs/index/src/indexFst.c
--- a/source/libs/index/src/indexTfile.c
+++ b/source/libs/index/src/indexTfile.c
--- a/source/libs/index/src/indexUtil.c
+++ b/source/libs/index/src/indexUtil.c
--- a/source/libs/index/test/CMakeLists.txt
+++ b/source/libs/index/test/CMakeLists.txt
--- a/source/libs/index/test/fstTest.cc
+++ b/source/libs/index/test/fstTest.cc
--- a/source/libs/index/test/indexTests.cc
+++ b/source/libs/index/test/indexTests.cc
--- a/source/libs/index/test/jsonUT.cc
+++ b/source/libs/index/test/jsonUT.cc
--- a/source/libs/parser/src/parInsert.c
+++ b/source/libs/parser/src/parInsert.c
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
--- a/source/libs/parser/src/parUtil.c
+++ b/source/libs/parser/src/parUtil.c
--- a/source/libs/parser/test/parSelectTest.cpp
+++ b/source/libs/parser/test/parSelectTest.cpp
--- a/source/libs/planner/src/planSpliter.c
+++ b/source/libs/planner/src/planSpliter.c
--- a/source/libs/qworker/src/qworkerMsg.c
+++ b/source/libs/qworker/src/qworkerMsg.c
--- a/source/libs/sync/inc/syncIO.h
+++ b/source/libs/sync/inc/syncIO.h
--- a/source/libs/sync/inc/syncInt.h
+++ b/source/libs/sync/inc/syncInt.h
--- a/source/libs/sync/src/syncIO.c
+++ b/source/libs/sync/src/syncIO.c
--- a/source/libs/sync/src/syncMain.c
+++ b/source/libs/sync/src/syncMain.c
--- a/source/libs/sync/test/syncConfigChangeTest.cpp
+++ b/source/libs/sync/test/syncConfigChangeTest.cpp
--- a/source/libs/sync/test/syncElectTest.cpp
+++ b/source/libs/sync/test/syncElectTest.cpp
--- a/source/libs/sync/test/syncEncodeTest.cpp
+++ b/source/libs/sync/test/syncEncodeTest.cpp
--- a/source/libs/sync/test/syncEnqTest.cpp
+++ b/source/libs/sync/test/syncEnqTest.cpp
--- a/source/libs/sync/test/syncIOClientTest.cpp
+++ b/source/libs/sync/test/syncIOClientTest.cpp
--- a/source/libs/sync/test/syncIOSendMsgTest.cpp
+++ b/source/libs/sync/test/syncIOSendMsgTest.cpp
--- a/source/libs/sync/test/syncIndexMgrTest.cpp
+++ b/source/libs/sync/test/syncIndexMgrTest.cpp
--- a/source/libs/sync/test/syncInitTest.cpp
+++ b/source/libs/sync/test/syncInitTest.cpp
--- a/source/libs/sync/test/syncPingSelfTest.cpp
+++ b/source/libs/sync/test/syncPingSelfTest.cpp
--- a/source/libs/sync/test/syncPingTimerTest.cpp
+++ b/source/libs/sync/test/syncPingTimerTest.cpp
--- a/source/libs/sync/test/syncPingTimerTest2.cpp
+++ b/source/libs/sync/test/syncPingTimerTest2.cpp
--- a/source/libs/sync/test/syncReplicateTest.cpp
+++ b/source/libs/sync/test/syncReplicateTest.cpp
--- a/source/libs/sync/test/syncSnapshotTest.cpp
+++ b/source/libs/sync/test/syncSnapshotTest.cpp
--- a/source/libs/sync/test/syncVotesGrantedTest.cpp
+++ b/source/libs/sync/test/syncVotesGrantedTest.cpp
--- a/source/libs/sync/test/syncVotesRespondTest.cpp
+++ b/source/libs/sync/test/syncVotesRespondTest.cpp
--- a/source/libs/sync/test/syncWriteTest.cpp
+++ b/source/libs/sync/test/syncWriteTest.cpp
--- a/source/libs/tdb/src/db/tdbPager.c
+++ b/source/libs/tdb/src/db/tdbPager.c
--- a/source/libs/tdb/test/tdbTest.cpp
+++ b/source/libs/tdb/test/tdbTest.cpp
--- a/source/libs/tfs/src/tfs.c
+++ b/source/libs/tfs/src/tfs.c
--- a/source/libs/transport/inc/transportInt.h
+++ b/source/libs/transport/inc/transportInt.h
--- a/source/libs/transport/src/trans.c
+++ b/source/libs/transport/src/trans.c
--- a/source/libs/transport/test/CMakeLists.txt
+++ b/source/libs/transport/test/CMakeLists.txt
--- a/source/libs/transport/test/pushServer.c
+++ b/source/libs/transport/test/pushServer.c
--- a/source/libs/transport/test/rclient.c
+++ b/source/libs/transport/test/rclient.c
--- a/source/libs/transport/test/rserver.c
+++ b/source/libs/transport/test/rserver.c
--- a/source/libs/transport/test/syncClient.c
+++ b/source/libs/transport/test/syncClient.c
--- a/source/libs/transport/test/transUT.cpp
+++ b/source/libs/transport/test/transUT.cpp
--- a/source/libs/transport/test/transportTests.cpp
+++ b/source/libs/transport/test/transportTests.cpp
--- a/source/libs/transport/test/uv.c
+++ b/source/libs/transport/test/uv.c
--- a/tests/script/tsim/sync/threeReplica1VgElectWihtInsert.sim
+++ b/tests/script/tsim/sync/threeReplica1VgElectWihtInsert.sim
--- a/tests/script/tsim/tstream/basic1.sim
+++ b/tests/script/tsim/tstream/basic1.sim
--- a/tests/system-test/0-others/udfTest.py
+++ b/tests/system-test/0-others/udfTest.py
--- a/tests/system-test/0-others/udf_cluster.py
+++ b/tests/system-test/0-others/udf_cluster.py
--- a/tests/system-test/0-others/user_control.py
+++ b/tests/system-test/0-others/user_control.py
--- a/tests/system-test/1-insert/insertWithMoreVgroup.py
+++ b/tests/system-test/1-insert/insertWithMoreVgroup.py
--- a/tests/system-test/1-insert/manyVgroups.json
+++ b/tests/system-test/1-insert/manyVgroups.json
--- a/tests/system-test/2-query/abs.py
+++ b/tests/system-test/2-query/abs.py
--- a/tests/system-test/2-query/nestedQuery.py
+++ b/tests/system-test/2-query/nestedQuery.py
--- a/tests/system-test/7-tmq/subscribeDb1.py
+++ b/tests/system-test/7-tmq/subscribeDb1.py
--- a/tests/system-test/7-tmq/subscribeStb.py
+++ b/tests/system-test/7-tmq/subscribeStb.py
--- a/tests/system-test/fulltest.sh
+++ b/tests/system-test/fulltest.sh
--- a/tests/test/c/tmqSim.c
+++ b/tests/test/c/tmqSim.c
--- a/tests/tsim/src/simParse.c
+++ b/tests/tsim/src/simParse.c
--- a/tools/shell/src/shellNettest.c
+++ b/tools/shell/src/shellNettest.c