Merge branch '3.0' into feature/vnode

include/common/common.h

@@ -55,10 +55,18 @@ typedef struct SDataBlockInfo {
   int64_t     uid;
 } SDataBlockInfo;
 
+typedef struct SConstantItem {
+  SColumnInfo info;
+  int32_t     startIndex;    // run-length-encoding to save the space for multiple rows
+  int32_t     endIndex;
+  SVariant    value;
+} SConstantItem;
+
 typedef struct SSDataBlock {
   SColumnDataAgg *pBlockAgg;
-  SArray         *pDataBlock;   // SArray<SColumnInfoData>
-  SDataBlockInfo info;
+  SArray         *pDataBlock;    // SArray<SColumnInfoData>
+  SArray         *pConstantList; // SArray<SConstantItem>, it is a constant/tags value of the corresponding result value.
+  SDataBlockInfo  info;
 } SSDataBlock;
 
 typedef struct SColumnInfoData {
@@ -82,7 +90,7 @@ typedef struct SLimit {
 
 typedef struct SOrder {
   uint32_t  order;
-  int32_t   orderColId;
+  SColumn   col;
 } SOrder;
 
 typedef struct SGroupbyExpr {

include/common/taosmsg.h

@@ -281,7 +281,7 @@ typedef struct SSchema {
   uint8_t type;
   char    name[TSDB_COL_NAME_LEN];
   int16_t colId;
-  int16_t bytes;
+  int32_t bytes;
 } SSchema;
 //#endif
 
@@ -360,10 +360,10 @@ typedef struct {
 } SConnectMsg;
 
 typedef struct SEpSet {
-  int8_t    inUse; 
-  int8_t    numOfEps;
-  uint16_t  port[TSDB_MAX_REPLICA];
-  char      fqdn[TSDB_MAX_REPLICA][TSDB_FQDN_LEN];
+  int8_t   inUse;
+  int8_t   numOfEps;
+  uint16_t port[TSDB_MAX_REPLICA];
+  char     fqdn[TSDB_MAX_REPLICA][TSDB_FQDN_LEN];
 } SEpSet;
 
 typedef struct {
@@ -383,14 +383,9 @@ typedef struct {
   int32_t maxUsers;
   int32_t maxDbs;
   int32_t maxTimeSeries;
-  int32_t maxConnections;
   int32_t maxStreams;
-  int32_t maxPointsPerSecond;
-  int64_t maxStorage;    // In unit of GB
-  int64_t maxQueryTime;  // In unit of hour
-  int64_t maxInbound;
-  int64_t maxOutbound;
-  int8_t  accessState;  // Configured only by command
+  int64_t maxStorage;   // In unit of GB
+  int32_t accessState;  // Configured only by command
 } SCreateAcctMsg, SAlterAcctMsg;
 
 typedef struct {
@@ -398,8 +393,8 @@ typedef struct {
 } SDropUserMsg, SDropAcctMsg;
 
 typedef struct {
-  char   user[TSDB_USER_LEN];
-  char   pass[TSDB_KEY_LEN];
+  char user[TSDB_USER_LEN];
+  char pass[TSDB_KEY_LEN];
 } SCreateUserMsg, SAlterUserMsg;
 
 typedef struct {
@@ -418,10 +413,10 @@ typedef struct {
 } SDropSTableMsg;
 
 typedef struct SColIndex {
-  int16_t  colId;      // column id
-  int16_t  colIndex;   // column index in colList if it is a normal column or index in tagColList if a tag
-  uint16_t flag;       // denote if it is a tag or a normal column
-  char     name[TSDB_COL_NAME_LEN + TSDB_DB_NAME_LEN + 1];
+  int16_t colId;     // column id
+  int16_t colIndex;  // column index in colList if it is a normal column or index in tagColList if a tag
+  int16_t flag;      // denote if it is a tag or a normal column
+  char    name[TSDB_COL_NAME_LEN + TSDB_DB_NAME_LEN + 1];
 } SColIndex;
 
 typedef struct SColumnFilterInfo {
@@ -515,8 +510,8 @@ typedef struct {
   int16_t     numOfCols;        // the number of columns will be load from vnode
   SInterval   interval;
 //  SSessionWindow sw;            // session window
-  uint16_t    tagCondLen;       // tag length in current query
-  uint16_t    colCondLen;       // column length in current query
+  int16_t     tagCondLen;       // tag length in current query
+  int16_t     colCondLen;       // column length in current query
   int16_t     numOfGroupCols;   // num of group by columns
   int16_t     orderByIdx;
   int16_t     orderType;        // used in group by xx order by xxx
@@ -524,10 +519,10 @@ typedef struct {
   int16_t     prjOrder;         // global order in super table projection query.
   int64_t     limit;
   int64_t     offset;
-  uint32_t    queryType;        // denote another query process
+  int32_t     queryType;        // denote another query process
   int16_t     numOfOutput;      // final output columns numbers
   int16_t     fillType;         // interpolate type
-  uint64_t    fillVal;          // default value array list
+  int64_t     fillVal;          // default value array list
   int32_t     secondStageOutput;
   STsBufInfo  tsBuf;            // tsBuf info
   int32_t     numOfTags;        // number of tags columns involved
@@ -542,63 +537,71 @@ typedef struct {
 } SQueryTableMsg;
 
 typedef struct {
-  int32_t  code;
-  union{uint64_t qhandle; uint64_t qId;}; // query handle
+  int32_t code;
+  union {
+    uint64_t qhandle;
+    uint64_t qId;
+  };  // query handle
 } SQueryTableRsp;
 
 // todo: the show handle should be replaced with id
 typedef struct {
   SMsgHead header;
-  union{uint64_t qhandle; uint64_t qId;}; // query handle
-  uint16_t free;
+  union {
+    int32_t showId;
+    int64_t qhandle;
+    int64_t qId;
+  };  // query handle
+  int8_t free;
 } SRetrieveTableMsg;
 
 typedef struct SRetrieveTableRsp {
   int32_t numOfRows;
-  int8_t  completed;  // all results are returned to client
-  int16_t precision;
-  int64_t offset;     // updated offset value for multi-vnode projection query
+  int64_t offset;  // updated offset value for multi-vnode projection query
   int64_t useconds;
+  int8_t  completed;  // all results are returned to client
+  int8_t  precision;
   int8_t  compressed;
+  int8_t  reserved;
   int32_t compLen;
   char    data[];
 } SRetrieveTableRsp;
 
 typedef struct {
-  char     db[TSDB_FULL_DB_NAME_LEN];
-  int32_t  cacheBlockSize; //MB
-  int32_t  totalBlocks;
-  int32_t  maxTables;
-  int32_t  daysPerFile;
-  int32_t  daysToKeep0;
-  int32_t  daysToKeep1;
-  int32_t  daysToKeep2;
-  int32_t  minRowsPerFileBlock;
-  int32_t  maxRowsPerFileBlock;
-  int32_t  commitTime;
-  int32_t  fsyncPeriod;
-  uint8_t  precision;   // time resolution
-  int8_t   compression;
-  int8_t   walLevel;
-  int8_t   replications;
-  int8_t   quorum;
-  int8_t   ignoreExist;
-  int8_t   update;
-  int8_t   cacheLastRow;
-  int8_t   dbType;
-  int16_t  partitions;
-  int8_t   reserve[5];
+  char    db[TSDB_FULL_DB_NAME_LEN];
+  int32_t cacheBlockSize;  // MB
+  int32_t totalBlocks;
+  int32_t maxTables;
+  int32_t daysPerFile;
+  int32_t daysToKeep0;
+  int32_t daysToKeep1;
+  int32_t daysToKeep2;
+  int32_t minRowsPerFileBlock;
+  int32_t maxRowsPerFileBlock;
+  int32_t commitTime;
+  int32_t fsyncPeriod;
+  int8_t  precision;  // time resolution
+  int8_t  compression;
+  int8_t  walLevel;
+  int8_t  replications;
+  int8_t  quorum;
+  int8_t  ignoreExist;
+  int8_t  update;
+  int8_t  cacheLastRow;
+  int8_t  dbType;
+  int16_t partitions;
+  int8_t  reserve[5];
 } SCreateDbMsg, SAlterDbMsg;
 
 typedef struct {
-  char     name[TSDB_FUNC_NAME_LEN];
-  char     path[PATH_MAX];
-  int32_t  funcType;
-  uint8_t  outputType;
-  int16_t  outputLen;
-  int32_t  bufSize;
-  int32_t  codeLen;
-  char     code[];
+  char    name[TSDB_FUNC_NAME_LEN];
+  char    path[PATH_MAX];
+  int32_t funcType;
+  int8_t  outputType;
+  int16_t outputLen;
+  int32_t bufSize;
+  int32_t codeLen;
+  char    code[];
 } SCreateFuncMsg;
 
 typedef struct {
@@ -626,8 +629,8 @@ typedef struct {
 } SDropFuncMsg;
 
 typedef struct {
-  char    db[TSDB_TABLE_FNAME_LEN];
-  uint8_t ignoreNotExists;
+  char   db[TSDB_TABLE_FNAME_LEN];
+  int8_t ignoreNotExists;
 } SDropDbMsg, SUseDbMsg, SSyncDbMsg;
 
 typedef struct {
@@ -701,7 +704,7 @@ typedef struct {
 
 typedef struct {
   char     db[TSDB_FULL_DB_NAME_LEN];
-  uint32_t vgId;
+  int32_t  vgId;
   int32_t  cacheBlockSize;
   int32_t  totalBlocks;
   int32_t  daysPerFile;
@@ -762,32 +765,31 @@ typedef struct {
 } SVgroupsMsg, SVgroupsInfo;
 
 typedef struct STableMetaMsg {
-  int32_t       contLen;
-  char          tableFname[TSDB_TABLE_FNAME_LEN];   // table id
-  uint8_t       numOfTags;
-  uint8_t       precision;
-  uint8_t       tableType;
-  int16_t       numOfColumns;
-  int16_t       sversion;
-  int16_t       tversion;
-  int32_t       tid;
-  uint64_t      uid;
-  SVgroupMsg    vgroup;
-
-  char          sTableName[TSDB_TABLE_FNAME_LEN];
-  uint64_t      suid;
-  SSchema       schema[];
+  int32_t    contLen;
+  char       tableFname[TSDB_TABLE_FNAME_LEN];  // table id
+  int8_t     numOfTags;
+  int8_t     precision;
+  int8_t     tableType;
+  int16_t    numOfColumns;
+  int16_t    sversion;
+  int16_t    tversion;
+  int32_t    tid;
+  int64_t    uid;
+  SVgroupMsg vgroup;
+  char       sTableName[TSDB_TABLE_FNAME_LEN];
+  int64_t    suid;
+  SSchema    schema[];
 } STableMetaMsg;
 
 typedef struct SMultiTableMeta {
-  int32_t       numOfTables;
-  int32_t       numOfVgroup;
-  int32_t       numOfUdf;
-  int32_t       contLen;
-  uint8_t       compressed;      // denote if compressed or not
-  uint32_t      rawLen;          // size before compress
-  uint8_t       metaClone;       // make meta clone after retrieve meta from mnode
-  char          meta[];
+  int32_t numOfTables;
+  int32_t numOfVgroup;
+  int32_t numOfUdf;
+  int32_t contLen;
+  int8_t  compressed;  // denote if compressed or not
+  int32_t rawLen;      // size before compress
+  uint8_t metaClone;   // make meta clone after retrieve meta from mnode
+  char    meta[];
 } SMultiTableMeta;
 
 typedef struct {
@@ -802,10 +804,10 @@ typedef struct {
  * payloadLen is the length of payload
  */
 typedef struct {
-  int8_t   type;
-  char     db[TSDB_FULL_DB_NAME_LEN];
-  uint16_t payloadLen;
-  char     payload[];
+  int8_t  type;
+  char    db[TSDB_FULL_DB_NAME_LEN];
+  int16_t payloadLen;
+  char    payload[];
 } SShowMsg;
 
 typedef struct {
@@ -815,7 +817,7 @@ typedef struct {
 } SCompactMsg;
 
 typedef struct SShowRsp {
-  uint64_t      qhandle;
+  int32_t       showId;
   STableMetaMsg tableMeta;
 } SShowRsp;
 
@@ -837,8 +839,8 @@ typedef struct {
 } SConfigTableMsg;
 
 typedef struct {
-  uint32_t dnodeId;
-  int32_t  vgId;
+  int32_t dnodeId;
+  int32_t vgId;
 } SConfigVnodeMsg;
 
 typedef struct {
@@ -847,29 +849,29 @@ typedef struct {
 } SCfgDnodeMsg;
 
 typedef struct {
-  char     sql[TSDB_SHOW_SQL_LEN];
-  uint32_t queryId;
-  int64_t  useconds;
-  int64_t  stime;
-  uint64_t qId;
-  uint64_t sqlObjId;
-  int32_t  pid;
-  char     fqdn[TSDB_FQDN_LEN];
-  uint8_t  stableQuery;
-  int32_t  numOfSub;
-  char     subSqlInfo[TSDB_SHOW_SUBQUERY_LEN]; //include subqueries' index, Obj IDs and states(C-complete/I-imcomplete)
+  char    sql[TSDB_SHOW_SQL_LEN];
+  int32_t queryId;
+  int64_t useconds;
+  int64_t stime;
+  int64_t qId;
+  int64_t sqlObjId;
+  int32_t pid;
+  char    fqdn[TSDB_FQDN_LEN];
+  int8_t  stableQuery;
+  int32_t numOfSub;
+  char    subSqlInfo[TSDB_SHOW_SUBQUERY_LEN];  // include subqueries' index, Obj IDs and states(C-complete/I-imcomplete)
 } SQueryDesc;
 
 typedef struct {
-  char     sql[TSDB_SHOW_SQL_LEN];
-  char     dstTable[TSDB_TABLE_NAME_LEN];
-  uint32_t streamId;
-  int64_t  num;  // number of computing/cycles
-  int64_t  useconds;
-  int64_t  ctime;
-  int64_t  stime;
-  int64_t  slidingTime;
-  int64_t  interval;
+  char    sql[TSDB_SHOW_SQL_LEN];
+  char    dstTable[TSDB_TABLE_NAME_LEN];
+  int32_t streamId;
+  int64_t num;  // number of computing/cycles
+  int64_t useconds;
+  int64_t ctime;
+  int64_t stime;
+  int64_t slidingTime;
+  int64_t interval;
 } SStreamDesc;
 
 typedef struct {
@@ -893,8 +895,18 @@ typedef struct {
 } SHeartBeatRsp;
 
 typedef struct {
-  char queryId[TSDB_KILL_MSG_LEN + 1];
-} SKillQueryMsg, SKillConnMsg;
+  int32_t connId;
+  int32_t streamId;
+} SKillStreamMsg;
+
+typedef struct {
+  int32_t connId;
+  int32_t queryId;
+} SKillQueryMsg;
+
+typedef struct {
+  int32_t connId;
+} SKillConnMsg;
 
 typedef struct {
   char user[TSDB_USER_LEN];

include/common/tglobal.h

@@ -54,6 +54,7 @@ extern int32_t  tsCompressColData;
 extern int32_t  tsMaxNumOfDistinctResults;
 extern char     tsTempDir[];
 extern int64_t  tsMaxVnodeQueuedBytes;
+extern int      tsCompatibleModel;     // 2.0 compatible model
 
 //query buffer management
 extern int32_t  tsQueryBufferSize;      // maximum allowed usage buffer size in MB for each data node during query processing

include/dnode/mgmt/dnode.h

@@ -31,6 +31,7 @@ typedef struct {
   int16_t  numOfSupportMnodes;
   int16_t  numOfSupportVnodes;
   int16_t  numOfSupportQnodes;
+  int8_t   enableTelem;
   int32_t  statusInterval;
   int32_t  mnodeEqualVnodeNum;
   float    numOfThreadsPerCore;
@@ -45,6 +46,8 @@ typedef struct {
   char     timezone[TSDB_TIMEZONE_LEN];
   char     locale[TSDB_LOCALE_LEN];
   char     charset[TSDB_LOCALE_LEN];
+  char     buildinfo[64];
+  char     gitinfo[48];
 } SDnodeOpt;
 
 /* ------------------------ SDnode ------------------------ */

include/dnode/mnode/mnode.h

@@ -43,24 +43,31 @@ typedef struct SMnodeLoad {
   int64_t compStorage;
 } SMnodeLoad;
 
+typedef struct SMnodeCfg {
+  int32_t sver;
+  int8_t  enableTelem;
+  int32_t statusInterval;
+  int32_t mnodeEqualVnodeNum;
+  int32_t shellActivityTimer;
+  char   *timezone;
+  char   *locale;
+  char   *charset;
+  char   *buildinfo;
+  char   *gitinfo;
+} SMnodeCfg;
+
 typedef struct {
   int32_t           dnodeId;
   int32_t           clusterId;
   int8_t            replica;
   int8_t            selfIndex;
   SReplica          replicas[TSDB_MAX_REPLICA];
+  SMnodeCfg         cfg;
   SDnode           *pDnode;
   PutMsgToMnodeQFp  putMsgToApplyMsgFp;
   SendMsgToDnodeFp  sendMsgToDnodeFp;
   SendMsgToMnodeFp  sendMsgToMnodeFp;
   SendRedirectMsgFp sendRedirectMsgFp;
-  int32_t           sver;
-  int32_t           statusInterval;
-  int32_t           mnodeEqualVnodeNum;
-  int32_t           shellActivityTimer;
-  char             *timezone;
-  char             *locale;
-  char             *charset;
 } SMnodeOpt;
 
 /* ------------------------ SMnode ------------------------ */

include/libs/function/function.h

@@ -229,7 +229,7 @@ typedef struct SScalarFunctionInfo {
 typedef struct SMultiFunctionsDesc {
   bool stableQuery;
   bool groupbyColumn;
-  bool simpleAgg;
+  bool agg;
   bool arithmeticOnAgg;
   bool projectionQuery;
   bool hasFilter;
@@ -261,6 +261,7 @@ int32_t qIsBuiltinFunction(const char* name, int32_t len, bool* scalarFunction);
 bool qIsValidUdf(SArray* pUdfInfo, const char* name, int32_t len, int32_t* functionId);
 
 bool qIsAggregateFunction(const char* functionName);
+bool qIsSelectivityFunction(const char* functionName);
 
 tExprNode* exprTreeFromBinary(const void* data, size_t size);
 

include/libs/parser/parser.h

@@ -86,7 +86,7 @@ typedef struct SQueryStmtInfo {
   SLimit           slimit;
   STagCond         tagCond;
   SArray *         colCond;
-  SOrder           order;
+  SArray *         order;
   int16_t          numOfTables;
   int16_t          curTableIdx;
   STableMetaInfo **pTableMetaInfo;
@@ -108,10 +108,10 @@ typedef struct SQueryStmtInfo {
   SArray          *pUdfInfo;
 
   struct SQueryStmtInfo *sibling;     // sibling
-  SArray            *pUpstream;   // SArray<struct SQueryStmtInfo>
   struct SQueryStmtInfo *pDownstream;
+  SMultiFunctionsDesc    info;
+  SArray            *pUpstream;   // SArray<struct SQueryStmtInfo>
   int32_t            havingFieldNum;
-  SMultiFunctionsDesc     info;
   int32_t            exprListLevelIndex;
 } SQueryStmtInfo;
 
@@ -176,6 +176,7 @@ typedef struct SSourceParam {
 
 SExprInfo* createExprInfo(STableMetaInfo* pTableMetaInfo, const char* funcName, SSourceParam* pSource, SSchema* pResSchema, int16_t interSize);
 int32_t copyExprInfoList(SArray* dst, const SArray* src, uint64_t uid, bool deepcopy);
+int32_t getExprFunctionLevel(SQueryStmtInfo* pQueryInfo);
 
 STableMetaInfo* getMetaInfo(SQueryStmtInfo* pQueryInfo, int32_t tableIndex);
 SSchema *getOneColumnSchema(const STableMeta* pTableMeta, int32_t colIndex);

include/libs/planner/planner.h

@@ -23,6 +23,35 @@ extern "C" {
 #define QUERY_TYPE_MERGE       1
 #define QUERY_TYPE_PARTIAL     2
 
+enum OPERATOR_TYPE_E {
+  OP_TableScan         = 1,
+  OP_DataBlocksOptScan = 2,
+  OP_TableSeqScan      = 3,
+  OP_TagScan           = 4,
+  OP_TableBlockInfoScan= 5,
+  OP_Aggregate         = 6,
+  OP_Project           = 7,
+  OP_Groupby           = 8,
+  OP_Limit             = 9,
+  OP_SLimit            = 10,
+  OP_TimeWindow        = 11,
+  OP_SessionWindow     = 12,
+  OP_StateWindow       = 22,
+  OP_Fill              = 13,
+  OP_MultiTableAggregate     = 14,
+  OP_MultiTableTimeInterval  = 15,
+//  OP_DummyInput        = 16,   //TODO remove it after fully refactor.
+//  OP_MultiwayMergeSort = 17,   // multi-way data merge into one input stream.
+//  OP_GlobalAggregate   = 18,   // global merge for the multi-way data sources.
+  OP_Filter            = 19,
+  OP_Distinct          = 20,
+  OP_Join              = 21,
+  OP_AllTimeWindow     = 23,
+  OP_AllMultiTableTimeInterval = 24,
+  OP_Order             = 25,
+  OP_Exchange          = 26,
+};
+
 struct SEpSet;
 struct SQueryPlanNode;
 struct SQueryDistPlanNode;

include/util/taoserror.h

@@ -76,6 +76,10 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_REF_ALREADY_EXIST             TAOS_DEF_ERROR_CODE(0, 0x0114)
 #define TSDB_CODE_REF_NOT_EXIST                 TAOS_DEF_ERROR_CODE(0, 0x0115)
 
+#define TSDB_CODE_INVALID_VERSION_NUMBER        TAOS_DEF_ERROR_CODE(0, 0x0120)
+#define TSDB_CODE_INVALID_VERSION_STRING        TAOS_DEF_ERROR_CODE(0, 0x0121)
+#define TSDB_CODE_VERSION_NOT_COMPATIBLE        TAOS_DEF_ERROR_CODE(0, 0x0122)
+
 //client
 #define TSDB_CODE_TSC_INVALID_OPERATION         TAOS_DEF_ERROR_CODE(0, 0x0200)  //"Invalid Operation")
 #define TSDB_CODE_TSC_INVALID_QHANDLE           TAOS_DEF_ERROR_CODE(0, 0x0201)  //"Invalid qhandle")

include/util/tversion.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_UTIL_VERSION_H
+#define _TD_UTIL_VERSION_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int32_t taosVersionStrToInt(const char *vstr, int32_t *vint);
+int32_t taosVersionIntToStr(int32_t vint, char *vstr, int32_t len);
+int32_t taosCheckVersionCompatible(int32_t clientVer, int32_t serverVer, int32_t comparedSegments);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*_TD_UTIL_VERSION_H*/

source/common/src/tglobal.c

@@ -75,6 +75,11 @@ int32_t tsCompressMsgSize = -1;
  */
 int32_t tsCompressColData = -1;
 
+/*
+ * denote if 3.0 query pattern compatible for 2.0
+ */
+int32_t tsCompatibleModel = 1;
+
 // client
 int32_t tsMaxSQLStringLen = TSDB_MAX_ALLOWED_SQL_LEN;
 int32_t tsMaxWildCardsLen = TSDB_PATTERN_STRING_DEFAULT_LEN;

source/common/src/versionUtil.c

-#include "os.h"
-#include "tdef.h"
-#include "ulog.h"
-#include "taoserror.h"
-
-bool taosGetVersionNumber(char *versionStr, int *versionNubmer) {
-  if (versionStr == NULL || versionNubmer == NULL) {
-    return false;
-  }
-
-  int versionNumberPos[5] = {0};
-  int len = (int)strlen(versionStr);
-  int dot = 0;
-  for (int pos = 0; pos < len && dot < 4; ++pos) {
-    if (versionStr[pos] == '.') {
-      versionStr[pos] = 0;
-      versionNumberPos[++dot] = pos + 1;
-    }
-  }
-
-  if (dot != 3) {
-    return false;
-  }
-
-  for (int pos = 0; pos < 4; ++pos) {
-    versionNubmer[pos] = atoi(versionStr + versionNumberPos[pos]);
-  }
-  versionStr[versionNumberPos[1] - 1] = '.';
-  versionStr[versionNumberPos[2] - 1] = '.';
-  versionStr[versionNumberPos[3] - 1] = '.';
-
-  return true;
-}
-
-int taosCheckVersion(char *input_client_version, char *input_server_version, int comparedSegments) {
-  char client_version[TSDB_VERSION_LEN] = {0};
-  char server_version[TSDB_VERSION_LEN] = {0};
-  int clientVersionNumber[4] = {0};
-  int serverVersionNumber[4] = {0};
-
-  tstrncpy(client_version, input_client_version, sizeof(client_version));
-  tstrncpy(server_version, input_server_version, sizeof(server_version));
-
-  if (!taosGetVersionNumber(client_version, clientVersionNumber)) {
-    uError("invalid client version:%s", client_version);
-    return TSDB_CODE_TSC_INVALID_VERSION;
-  }
-
-  if (!taosGetVersionNumber(server_version, serverVersionNumber)) {
-    uError("invalid server version:%s", server_version);
-    return TSDB_CODE_TSC_INVALID_VERSION;
-  }
-
-  for(int32_t i = 0; i < comparedSegments; ++i) {
-    if (clientVersionNumber[i] != serverVersionNumber[i]) {
-      uError("the %d-th number of server version:%s not matched with client version:%s", i, server_version,
-             client_version);
-      return TSDB_CODE_TSC_INVALID_VERSION;
-    }
-  }
-
-  return 0;
-}

source/dnode/mgmt/daemon/src/daemon.c

@@ -136,7 +136,7 @@ void dmnWaitSignal() {
 }
 
 void dmnInitOption(SDnodeOpt *pOption) {
-  pOption->sver = tsVersion;
+  pOption->sver = 30000000; //3.0.0.0
   pOption->numOfCores = tsNumOfCores;
   pOption->numOfSupportMnodes = 1;
   pOption->numOfSupportVnodes = 1;
@@ -155,6 +155,8 @@ void dmnInitOption(SDnodeOpt *pOption) {
   tstrncpy(pOption->timezone, tsTimezone, TSDB_TIMEZONE_LEN);
   tstrncpy(pOption->locale, tsLocale, TSDB_LOCALE_LEN);
   tstrncpy(pOption->charset, tsCharset, TSDB_LOCALE_LEN);
+  tstrncpy(pOption->buildinfo, buildinfo, 64);
+  tstrncpy(pOption->gitinfo, gitinfo, 48);
 }
 
 int dmnRunDnode() {

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

@@ -331,13 +331,16 @@ static void dndInitMnodeOption(SDnode *pDnode, SMnodeOpt *pOption) {
   pOption->putMsgToApplyMsgFp = dndPutMsgIntoMnodeApplyQueue;
   pOption->dnodeId = dndGetDnodeId(pDnode);
   pOption->clusterId = dndGetClusterId(pDnode);
-  pOption->sver = pDnode->opt.sver;
-  pOption->statusInterval = pDnode->opt.statusInterval;
-  pOption->mnodeEqualVnodeNum = pDnode->opt.mnodeEqualVnodeNum;
-  pOption->shellActivityTimer = pDnode->opt.shellActivityTimer;
-  pOption->timezone = pDnode->opt.timezone;
-  pOption->charset = pDnode->opt.charset;
-  pOption->locale = pDnode->opt.locale;
+  pOption->cfg.sver = pDnode->opt.sver;
+  pOption->cfg.enableTelem = pDnode->opt.enableTelem;
+  pOption->cfg.statusInterval = pDnode->opt.statusInterval;
+  pOption->cfg.mnodeEqualVnodeNum = pDnode->opt.mnodeEqualVnodeNum;
+  pOption->cfg.shellActivityTimer = pDnode->opt.shellActivityTimer;
+  pOption->cfg.timezone = pDnode->opt.timezone;
+  pOption->cfg.charset = pDnode->opt.charset;
+  pOption->cfg.locale = pDnode->opt.locale;
+  pOption->cfg.gitinfo = pDnode->opt.gitinfo;
+  pOption->cfg.buildinfo = pDnode->opt.buildinfo;
 }
 
 static void dndBuildMnodeDeployOption(SDnode *pDnode, SMnodeOpt *pOption) {

source/dnode/mgmt/impl/test/CMakeLists.txt

-add_subdirectory(test01)
\ No newline at end of file
+add_subdirectory(acct)
+add_subdirectory(cluster)
+add_subdirectory(profile)
+add_subdirectory(show)

source/dnode/mgmt/impl/test/test01/CMakeLists.txt → source/dnode/mgmt/impl/test/acct/CMakeLists.txt

-add_executable(dndTest01 "")
+add_executable(dndTestAcct "")
 
-target_sources(dndTest01
+target_sources(dndTestAcct
     PRIVATE
-    "test01.cpp"
+    "acct.cpp"
     "../sut/deploy.cpp"
 )
 
 target_link_libraries(
-    dndTest01
+    dndTestAcct
     PUBLIC dnode
     PUBLIC util
     PUBLIC os
     PUBLIC gtest_main
 )
 
-target_include_directories(dndTest01
+target_include_directories(dndTestAcct
     PUBLIC
     "${CMAKE_SOURCE_DIR}/include/server/dnode/mgmt"
     "${CMAKE_CURRENT_SOURCE_DIR}/../../inc"
@@ -24,6 +24,6 @@ target_include_directories(dndTest01
 enable_testing()
 
 add_test(
-    NAME dndTest01
-    COMMAND dndTest01
+    NAME dndTestAcct
+    COMMAND dndTestAcct
 )

source/dnode/mgmt/impl/test/acct/acct.cpp

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "deploy.h"
+
+class DndTestAcct : public ::testing::Test {
+ protected:
+  void SetUp() override {}
+  void TearDown() override {}
+
+  static void SetUpTestSuite() {
+    const char* user = "root";
+    const char* pass = "taosdata";
+    const char* path = "/tmp/dndTestAcct";
+    const char* fqdn = "localhost";
+    uint16_t    port = 9520;
+
+    pServer = createServer(path, fqdn, port);
+    ASSERT(pServer);
+    pClient = createClient(user, pass, fqdn, port);
+  }
+
+  static void TearDownTestSuite() {
+    dropServer(pServer);
+    dropClient(pClient);
+  }
+
+  static SServer* pServer;
+  static SClient* pClient;
+  static int32_t  connId;
+};
+
+SServer* DndTestAcct::pServer;
+SClient* DndTestAcct::pClient;
+int32_t  DndTestAcct::connId;
+
+TEST_F(DndTestAcct, CreateAcct) {
+  ASSERT_NE(pClient, nullptr);
+
+  SCreateAcctMsg* pReq = (SCreateAcctMsg*)rpcMallocCont(sizeof(SCreateAcctMsg));
+
+  SRpcMsg rpcMsg = {0};
+  rpcMsg.pCont = pReq;
+  rpcMsg.contLen = sizeof(SCreateAcctMsg);
+  rpcMsg.msgType = TSDB_MSG_TYPE_CREATE_ACCT;
+
+  sendMsg(pClient, &rpcMsg);
+  SRpcMsg* pMsg = pClient->pRsp;
+  ASSERT_NE(pMsg, nullptr);
+  ASSERT_EQ(pMsg->code, TSDB_CODE_MND_MSG_NOT_PROCESSED);
+}
+
+TEST_F(DndTestAcct, AlterAcct) {
+  ASSERT_NE(pClient, nullptr);
+
+  SAlterAcctMsg* pReq = (SAlterAcctMsg*)rpcMallocCont(sizeof(SAlterAcctMsg));
+
+  SRpcMsg rpcMsg = {0};
+  rpcMsg.pCont = pReq;
+  rpcMsg.contLen = sizeof(SAlterAcctMsg);
+  rpcMsg.msgType = TSDB_MSG_TYPE_ALTER_ACCT;
+
+  sendMsg(pClient, &rpcMsg);
+  SRpcMsg* pMsg = pClient->pRsp;
+  ASSERT_NE(pMsg, nullptr);
+  ASSERT_EQ(pMsg->code, TSDB_CODE_MND_MSG_NOT_PROCESSED);
+}
+
+TEST_F(DndTestAcct, DropAcct) {
+  ASSERT_NE(pClient, nullptr);
+
+  SDropAcctMsg* pReq = (SDropAcctMsg*)rpcMallocCont(sizeof(SDropAcctMsg));
+
+  SRpcMsg rpcMsg = {0};
+  rpcMsg.pCont = pReq;
+  rpcMsg.contLen = sizeof(SDropAcctMsg);
+  rpcMsg.msgType = TSDB_MSG_TYPE_DROP_ACCT;
+
+  sendMsg(pClient, &rpcMsg);
+  SRpcMsg* pMsg = pClient->pRsp;
+  ASSERT_NE(pMsg, nullptr);
+  ASSERT_EQ(pMsg->code, TSDB_CODE_MND_MSG_NOT_PROCESSED);
+}
+
+TEST_F(DndTestAcct, ShowAcct) {
+  ASSERT_NE(pClient, nullptr);
+
+  SShowMsg* pReq = (SShowMsg*)rpcMallocCont(sizeof(SShowMsg));
+  pReq->type = TSDB_MGMT_TABLE_ACCT;
+
+  SRpcMsg rpcMsg = {0};
+  rpcMsg.pCont = pReq;
+  rpcMsg.contLen = sizeof(SShowMsg);
+  rpcMsg.msgType = TSDB_MSG_TYPE_SHOW;
+
+  sendMsg(pClient, &rpcMsg);
+  SRpcMsg* pMsg = pClient->pRsp;
+  ASSERT_NE(pMsg, nullptr);
+  ASSERT_EQ(pMsg->code, TSDB_CODE_MND_INVALID_MSG_TYPE);
+}
\ No newline at end of file

source/dnode/mgmt/impl/test/cluster/CMakeLists.txt

+add_executable(dndTestCluster "")
+
+target_sources(dndTestCluster
+    PRIVATE
+    "cluster.cpp"
+    "../sut/deploy.cpp"
+)
+
+target_link_libraries(
+    dndTestCluster
+    PUBLIC dnode
+    PUBLIC util
+    PUBLIC os
+    PUBLIC gtest_main
+)
+
+target_include_directories(dndTestCluster
+    PUBLIC
+    "${CMAKE_SOURCE_DIR}/include/server/dnode/mgmt"
+    "${CMAKE_CURRENT_SOURCE_DIR}/../../inc"
+    "${CMAKE_CURRENT_SOURCE_DIR}/../sut"
+)
+
+enable_testing()
+
+add_test(
+    NAME dndTestCluster
+    COMMAND dndTestCluster
+)

source/dnode/mgmt/impl/test/cluster/cluster.cpp

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "deploy.h"
+
+class DndTestCluster : public ::testing::Test {
+ protected:
+  void SetUp() override {}
+  void TearDown() override {}
+
+  static void SetUpTestSuite() {
+    const char* user = "root";
+    const char* pass = "taosdata";
+    const char* path = "/tmp/dndTestCluster";
+    const char* fqdn = "localhost";
+    uint16_t    port = 9521;
+
+    pServer = createServer(path, fqdn, port);
+    ASSERT(pServer);
+    pClient = createClient(user, pass, fqdn, port);
+  }
+
+  static void TearDownTestSuite() {
+    dropServer(pServer);
+    dropClient(pClient);
+  }
+
+  static SServer* pServer;
+  static SClient* pClient;
+  static int32_t  connId;
+};
+
+SServer* DndTestCluster::pServer;
+SClient* DndTestCluster::pClient;
+int32_t  DndTestCluster::connId;
+
+TEST_F(DndTestCluster, ShowCluster) {
+  ASSERT_NE(pClient, nullptr);
+  int32_t showId = 0;
+
+  {
+    SShowMsg* pReq = (SShowMsg*)rpcMallocCont(sizeof(SShowMsg));
+    pReq->type = TSDB_MGMT_TABLE_CLUSTER;
+    strcpy(pReq->db, "");
+
+    SRpcMsg rpcMsg = {0};
+    rpcMsg.pCont = pReq;
+    rpcMsg.contLen = sizeof(SShowMsg);
+    rpcMsg.msgType = TSDB_MSG_TYPE_SHOW;
+
+    sendMsg(pClient, &rpcMsg);
+    SRpcMsg* pMsg = pClient->pRsp;
+    ASSERT_NE(pMsg, nullptr);
+
+    SShowRsp* pRsp = (SShowRsp*)pMsg->pCont;
+    ASSERT_NE(pRsp, nullptr);
+    pRsp->showId = htonl(pRsp->showId);
+    STableMetaMsg* pMeta = &pRsp->tableMeta;
+    pMeta->contLen = htonl(pMeta->contLen);
+    pMeta->numOfColumns = htons(pMeta->numOfColumns);
+    pMeta->sversion = htons(pMeta->sversion);
+    pMeta->tversion = htons(pMeta->tversion);
+    pMeta->tid = htonl(pMeta->tid);
+    pMeta->uid = htobe64(pMeta->uid);
+    pMeta->suid = htobe64(pMeta->suid);
+
+    showId = pRsp->showId;
+
+    EXPECT_NE(pRsp->showId, 0);
+    EXPECT_EQ(pMeta->contLen, 0);
+    EXPECT_STREQ(pMeta->tableFname, "show cluster");
+    EXPECT_EQ(pMeta->numOfTags, 0);
+    EXPECT_EQ(pMeta->precision, 0);
+    EXPECT_EQ(pMeta->tableType, 0);
+    EXPECT_EQ(pMeta->numOfColumns, 3);
+    EXPECT_EQ(pMeta->sversion, 0);
+    EXPECT_EQ(pMeta->tversion, 0);
+    EXPECT_EQ(pMeta->tid, 0);
+    EXPECT_EQ(pMeta->uid, 0);
+    EXPECT_STREQ(pMeta->sTableName, "");
+    EXPECT_EQ(pMeta->suid, 0);
+
+    SSchema* pSchema = NULL;
+    pSchema = &pMeta->schema[0];
+    pSchema->bytes = htons(pSchema->bytes);
+    EXPECT_EQ(pSchema->colId, 0);
+    EXPECT_EQ(pSchema->type, TSDB_DATA_TYPE_INT);
+    EXPECT_EQ(pSchema->bytes, 4);
+    EXPECT_STREQ(pSchema->name, "id");
+
+    pSchema = &pMeta->schema[1];
+    pSchema->bytes = htons(pSchema->bytes);
+    EXPECT_EQ(pSchema->colId, 0);
+    EXPECT_EQ(pSchema->type, TSDB_DATA_TYPE_BINARY);
+    EXPECT_EQ(pSchema->bytes, TSDB_CLUSTER_ID_LEN + VARSTR_HEADER_SIZE);
+    EXPECT_STREQ(pSchema->name, "name");
+
+    pSchema = &pMeta->schema[2];
+    pSchema->bytes = htons(pSchema->bytes);
+    EXPECT_EQ(pSchema->colId, 0);
+    EXPECT_EQ(pSchema->type, TSDB_DATA_TYPE_TIMESTAMP);
+    EXPECT_EQ(pSchema->bytes, 8);
+    EXPECT_STREQ(pSchema->name, "create_time");
+  }
+
+  {
+    SRetrieveTableMsg* pReq = (SRetrieveTableMsg*)rpcMallocCont(sizeof(SRetrieveTableMsg));
+    pReq->showId = htonl(showId);
+    pReq->free = 0;
+
+    SRpcMsg rpcMsg = {0};
+    rpcMsg.pCont = pReq;
+    rpcMsg.contLen = sizeof(SRetrieveTableMsg);
+    rpcMsg.msgType = TSDB_MSG_TYPE_SHOW_RETRIEVE;
+
+    sendMsg(pClient, &rpcMsg);
+    SRpcMsg* pMsg = pClient->pRsp;
+    ASSERT_NE(pMsg, nullptr);
+    ASSERT_EQ(pMsg->code, 0);
+
+    SRetrieveTableRsp* pRsp = (SRetrieveTableRsp*)pMsg->pCont;
+    ASSERT_NE(pRsp, nullptr);
+    pRsp->numOfRows = htonl(pRsp->numOfRows);
+    pRsp->offset = htobe64(pRsp->offset);
+    pRsp->useconds = htobe64(pRsp->useconds);
+    pRsp->compLen = htonl(pRsp->compLen);
+
+    EXPECT_EQ(pRsp->numOfRows, 1);
+    EXPECT_EQ(pRsp->offset, 0);
+    EXPECT_EQ(pRsp->useconds, 0);
+    EXPECT_EQ(pRsp->completed, 1);
+    EXPECT_EQ(pRsp->precision, TSDB_TIME_PRECISION_MILLI);
+    EXPECT_EQ(pRsp->compressed, 0);
+    EXPECT_EQ(pRsp->reserved, 0);
+    EXPECT_EQ(pRsp->compLen, 0);
+
+    char*   pData = pRsp->data;
+    int32_t pos = 0;
+
+    int32_t id = *((int32_t*)(pData + pos));
+    pos += sizeof(int32_t);
+
+    int32_t nameLen = varDataLen(pData + pos);
+    pos += sizeof(VarDataLenT);
+
+    char* name = (char*)(pData + pos);
+    pos += TSDB_CLUSTER_ID_LEN;
+
+    int64_t create_time = *((int64_t*)(pData + pos));
+    pos += sizeof(int64_t);
+
+    EXPECT_NE(id, 0);
+    EXPECT_EQ(nameLen, 36);
+    EXPECT_STRNE(name, "");
+    EXPECT_GT(create_time, 0);
+    printf("--- id:%d nameLen:%d name:%s time:%" PRId64 " --- \n", id, nameLen, name, create_time);
+  }
+}
\ No newline at end of file

source/dnode/mgmt/impl/test/profile/CMakeLists.txt

+add_executable(dndTestProfile "")
+
+target_sources(dndTestProfile
+    PRIVATE
+    "profile.cpp"
+    "../sut/deploy.cpp"
+)
+
+target_link_libraries(
+    dndTestProfile
+    PUBLIC dnode
+    PUBLIC util
+    PUBLIC os
+    PUBLIC gtest_main
+)
+
+target_include_directories(dndTestProfile
+    PUBLIC
+    "${CMAKE_SOURCE_DIR}/include/server/dnode/mgmt"
+    "${CMAKE_CURRENT_SOURCE_DIR}/../../inc"
+    "${CMAKE_CURRENT_SOURCE_DIR}/../sut"
+)
+
+enable_testing()
+
+add_test(
+    NAME dndTestProfile
+    COMMAND dndTestProfile
+)

source/dnode/mgmt/impl/test/show/CMakeLists.txt

+add_executable(dndTestShow "")
+
+target_sources(dndTestShow
+    PRIVATE
+    "show.cpp"
+    "../sut/deploy.cpp"
+)
+
+target_link_libraries(
+    dndTestShow
+    PUBLIC dnode
+    PUBLIC util
+    PUBLIC os
+    PUBLIC gtest_main
+)
+
+target_include_directories(dndTestShow
+    PUBLIC
+    "${CMAKE_SOURCE_DIR}/include/server/dnode/mgmt"
+    "${CMAKE_CURRENT_SOURCE_DIR}/../../inc"
+    "${CMAKE_CURRENT_SOURCE_DIR}/../sut"
+)
+
+enable_testing()
+
+add_test(
+    NAME dndTestShow
+    COMMAND dndTestShow
+)

source/dnode/mgmt/impl/test/show/show.cpp

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "deploy.h"
+
+class DndTestShow : public ::testing::Test {
+ protected:
+  void SetUp() override {}
+  void TearDown() override {}
+
+  static void SetUpTestSuite() {
+    const char* user = "root";
+    const char* pass = "taosdata";
+    const char* path = "/tmp/dndTestShow";
+    const char* fqdn = "localhost";
+    uint16_t    port = 9523;
+
+    pServer = createServer(path, fqdn, port);
+    ASSERT(pServer);
+    pClient = createClient(user, pass, fqdn, port);
+  }
+
+  static void TearDownTestSuite() {
+    dropServer(pServer);
+    dropClient(pClient);
+  }
+
+  static SServer* pServer;
+  static SClient* pClient;
+  static int32_t  connId;
+};
+
+SServer* DndTestShow::pServer;
+SClient* DndTestShow::pClient;
+int32_t  DndTestShow::connId;
+
+TEST_F(DndTestShow, SShowMsg_01) {
+  ASSERT_NE(pClient, nullptr);
+
+  SConnectMsg* pReq = (SConnectMsg*)rpcMallocCont(sizeof(SConnectMsg));
+  pReq->pid = htonl(1234);
+  strcpy(pReq->app, "dndTestShow");
+  strcpy(pReq->db, "");
+
+  SRpcMsg rpcMsg = {0};
+  rpcMsg.pCont = pReq;
+  rpcMsg.contLen = sizeof(SConnectMsg);
+  rpcMsg.msgType = TSDB_MSG_TYPE_CONNECT;
+
+  sendMsg(pClient, &rpcMsg);
+  SRpcMsg* pMsg = pClient->pRsp;
+  ASSERT_NE(pMsg, nullptr);
+
+  SConnectRsp* pRsp = (SConnectRsp*)pMsg->pCont;
+  ASSERT_NE(pRsp, nullptr);
+  pRsp->connId = htonl(pRsp->connId);
+
+  EXPECT_EQ(pRsp->connId, 1);
+  connId = pRsp->connId;
+}
+
+TEST_F(DndTestShow, SShowMsg_02) {
+  ASSERT_NE(pClient, nullptr);
+
+  SShowMsg* pReq = (SShowMsg*)rpcMallocCont(sizeof(SShowMsg));
+  pReq->type = TSDB_MGMT_TABLE_MAX;
+  strcpy(pReq->db, "");
+
+  SRpcMsg rpcMsg = {0};
+  rpcMsg.pCont = pReq;
+  rpcMsg.contLen = sizeof(SShowMsg);
+  rpcMsg.msgType = TSDB_MSG_TYPE_SHOW;
+
+  sendMsg(pClient, &rpcMsg);
+  SRpcMsg* pMsg = pClient->pRsp;
+  ASSERT_NE(pMsg, nullptr);
+  ASSERT_EQ(pMsg->code, TSDB_CODE_MND_INVALID_MSG_TYPE);
+}
+
+TEST_F(DndTestShow, SShowMsg_03) {
+  ASSERT_NE(pClient, nullptr);
+
+  SShowMsg* pReq = (SShowMsg*)rpcMallocCont(sizeof(SShowMsg));
+  pReq->type = TSDB_MGMT_TABLE_START;
+  strcpy(pReq->db, "");
+
+  SRpcMsg rpcMsg = {0};
+  rpcMsg.pCont = pReq;
+  rpcMsg.contLen = sizeof(SShowMsg);
+  rpcMsg.msgType = TSDB_MSG_TYPE_SHOW;
+
+  sendMsg(pClient, &rpcMsg);
+  SRpcMsg* pMsg = pClient->pRsp;
+  ASSERT_NE(pMsg, nullptr);
+  ASSERT_EQ(pMsg->code, TSDB_CODE_MND_INVALID_MSG_TYPE);
+}
+
+TEST_F(DndTestShow, SShowMsg_04) {
+  ASSERT_NE(pClient, nullptr);
+  int32_t showId = 0;
+
+  {
+    SShowMsg* pReq = (SShowMsg*)rpcMallocCont(sizeof(SShowMsg));
+    pReq->type = TSDB_MGMT_TABLE_CONNS;
+    strcpy(pReq->db, "");
+
+    SRpcMsg rpcMsg = {0};
+    rpcMsg.pCont = pReq;
+    rpcMsg.contLen = sizeof(SShowMsg);
+    rpcMsg.msgType = TSDB_MSG_TYPE_SHOW;
+
+    sendMsg(pClient, &rpcMsg);
+    SRpcMsg* pMsg = pClient->pRsp;
+    ASSERT_NE(pMsg, nullptr);
+
+    SShowRsp* pRsp = (SShowRsp*)pMsg->pCont;
+    ASSERT_NE(pRsp, nullptr);
+    pRsp->showId = htonl(pRsp->showId);
+    STableMetaMsg* pMeta = &pRsp->tableMeta;
+    pMeta->contLen = htonl(pMeta->contLen);
+    pMeta->numOfColumns = htons(pMeta->numOfColumns);
+    pMeta->sversion = htons(pMeta->sversion);
+    pMeta->tversion = htons(pMeta->tversion);
+    pMeta->tid = htonl(pMeta->tid);
+    pMeta->uid = htobe64(pMeta->uid);
+    pMeta->suid = htobe64(pMeta->suid);
+
+    showId = pRsp->showId;
+
+    EXPECT_NE(pRsp->showId, 0);
+    EXPECT_EQ(pMeta->contLen, 0);
+    EXPECT_STREQ(pMeta->tableFname, "");
+    EXPECT_EQ(pMeta->numOfTags, 0);
+    EXPECT_EQ(pMeta->precision, 0);
+    EXPECT_EQ(pMeta->tableType, 0);
+    EXPECT_EQ(pMeta->numOfColumns, 7);
+    EXPECT_EQ(pMeta->sversion, 0);
+    EXPECT_EQ(pMeta->tversion, 0);
+    EXPECT_EQ(pMeta->tid, 0);
+    EXPECT_EQ(pMeta->uid, 0);
+    EXPECT_STREQ(pMeta->sTableName, "");
+    EXPECT_EQ(pMeta->suid, 0);
+
+    SSchema* pSchema = NULL;
+    pSchema = &pMeta->schema[0];
+    pSchema->bytes = htons(pSchema->bytes);
+    EXPECT_EQ(pSchema->colId, 0);
+    EXPECT_EQ(pSchema->type, TSDB_DATA_TYPE_INT);
+    EXPECT_EQ(pSchema->bytes, 4);
+    EXPECT_STREQ(pSchema->name, "connId");
+
+    pSchema = &pMeta->schema[1];
+    pSchema->bytes = htons(pSchema->bytes);
+    EXPECT_EQ(pSchema->colId, 0);
+    EXPECT_EQ(pSchema->type, TSDB_DATA_TYPE_BINARY);
+    EXPECT_EQ(pSchema->bytes, TSDB_USER_LEN + VARSTR_HEADER_SIZE);
+    EXPECT_STREQ(pSchema->name, "user");
+
+    pSchema = &pMeta->schema[2];
+    pSchema->bytes = htons(pSchema->bytes);
+    EXPECT_EQ(pSchema->colId, 0);
+    EXPECT_EQ(pSchema->type, TSDB_DATA_TYPE_BINARY);
+    EXPECT_EQ(pSchema->bytes, TSDB_USER_LEN + VARSTR_HEADER_SIZE);
+    EXPECT_STREQ(pSchema->name, "program");
+
+    pSchema = &pMeta->schema[3];
+    pSchema->bytes = htons(pSchema->bytes);
+    EXPECT_EQ(pSchema->colId, 0);
+    EXPECT_EQ(pSchema->type, TSDB_DATA_TYPE_INT);
+    EXPECT_EQ(pSchema->bytes, 4);
+    EXPECT_STREQ(pSchema->name, "pid");
+
+    pSchema = &pMeta->schema[4];
+    pSchema->bytes = htons(pSchema->bytes);
+    EXPECT_EQ(pSchema->colId, 0);
+    EXPECT_EQ(pSchema->type, TSDB_DATA_TYPE_BINARY);
+    EXPECT_EQ(pSchema->bytes, TSDB_IPv4ADDR_LEN + 6 + VARSTR_HEADER_SIZE);
+    EXPECT_STREQ(pSchema->name, "ip:port");
+
+    pSchema = &pMeta->schema[5];
+    pSchema->bytes = htons(pSchema->bytes);
+    EXPECT_EQ(pSchema->colId, 0);
+    EXPECT_EQ(pSchema->type, TSDB_DATA_TYPE_TIMESTAMP);
+    EXPECT_EQ(pSchema->bytes, 8);
+    EXPECT_STREQ(pSchema->name, "login_time");
+
+    pSchema = &pMeta->schema[6];
+    pSchema->bytes = htons(pSchema->bytes);
+    EXPECT_EQ(pSchema->colId, 0);
+    EXPECT_EQ(pSchema->type, TSDB_DATA_TYPE_TIMESTAMP);
+    EXPECT_EQ(pSchema->bytes, 8);
+    EXPECT_STREQ(pSchema->name, "last_access");
+  }
+
+  {
+    SRetrieveTableMsg* pReq = (SRetrieveTableMsg*)rpcMallocCont(sizeof(SRetrieveTableMsg));
+    pReq->showId = htonl(showId);
+    pReq->free = 0;
+
+    SRpcMsg rpcMsg = {0};
+    rpcMsg.pCont = pReq;
+    rpcMsg.contLen = sizeof(SRetrieveTableMsg);
+    rpcMsg.msgType = TSDB_MSG_TYPE_SHOW_RETRIEVE;
+
+    sendMsg(pClient, &rpcMsg);
+    SRpcMsg* pMsg = pClient->pRsp;
+    ASSERT_NE(pMsg, nullptr);
+    ASSERT_EQ(pMsg->code, 0);
+
+    SRetrieveTableRsp* pRsp = (SRetrieveTableRsp*)pMsg->pCont;
+    ASSERT_NE(pRsp, nullptr);
+    pRsp->numOfRows = htonl(pRsp->numOfRows);
+    pRsp->offset = htobe64(pRsp->offset);
+    pRsp->useconds = htobe64(pRsp->useconds);
+    pRsp->compLen = htonl(pRsp->compLen);
+
+    EXPECT_EQ(pRsp->numOfRows, 1);
+    EXPECT_EQ(pRsp->offset, 0);
+    EXPECT_EQ(pRsp->useconds, 0);
+    EXPECT_EQ(pRsp->completed, 1);
+    EXPECT_EQ(pRsp->precision, TSDB_TIME_PRECISION_MILLI);
+    EXPECT_EQ(pRsp->compressed, 0);
+    EXPECT_EQ(pRsp->reserved, 0);
+    EXPECT_EQ(pRsp->compLen, 0);
+  }
+}

source/dnode/mgmt/impl/test/sut/deploy.cpp

@@ -15,8 +15,27 @@
 
 #include "deploy.h"
 
-void initLog(char *path) {
+void initLog(const char* path) {
+  dDebugFlag = 0;
+  vDebugFlag = 0;
   mDebugFlag = 207;
+  cDebugFlag = 0;
+  jniDebugFlag = 0;
+  tmrDebugFlag = 0;
+  sdbDebugFlag = 0;
+  httpDebugFlag = 0;
+  mqttDebugFlag = 0;
+  monDebugFlag = 0;
+  uDebugFlag = 0;
+  rpcDebugFlag = 0;
+  odbcDebugFlag = 0;
+  qDebugFlag = 0;
+  wDebugFlag = 0;
+  sDebugFlag = 0;
+  tsdbDebugFlag = 0;
+  cqDebugFlag = 0;
+  debugFlag = 0;
+
   char temp[PATH_MAX];
   snprintf(temp, PATH_MAX, "%s/taosdlog", path);
   if (taosInitLog(temp, tsNumOfLogLines, 1) != 0) {
@@ -32,7 +51,7 @@ void* runServer(void* param) {
   }
 }
 
-void initOption(SDnodeOpt* pOption, char *path) {
+void initOption(SDnodeOpt* pOption, const char* path, const char* fqdn, uint16_t port) {
   pOption->sver = 1;
   pOption->numOfCores = 1;
   pOption->numOfSupportMnodes = 1;
@@ -44,19 +63,20 @@ void initOption(SDnodeOpt* pOption, char *path) {
   pOption->ratioOfQueryCores = 1;
   pOption->maxShellConns = 1000;
   pOption->shellActivityTimer = 30;
-  pOption->serverPort = 9527;
+  pOption->serverPort = port;
   strcpy(pOption->dataDir, path);
-  strcpy(pOption->localEp, "localhost:9527");
-  strcpy(pOption->localFqdn, "localhost");
-  strcpy(pOption->firstEp, "localhost:9527");
+  snprintf(pOption->localEp, TSDB_EP_LEN, "%s:%u", fqdn, port);
+  snprintf(pOption->localFqdn, TSDB_FQDN_LEN, "%s", fqdn);
+  snprintf(pOption->firstEp, TSDB_EP_LEN, "%s:%u", fqdn, port);
+}
 
+SServer* createServer(const char* path, const char* fqdn, uint16_t port) {
   taosRemoveDir(path);
   taosMkDir(path);
-}
+  initLog(path);
 
-SServer* createServer(char *path) {
   SDnodeOpt option = {0};
-  initOption(&option, path);
+  initOption(&option, path, fqdn, port);
 
   SDnode* pDnode = dndInit(&option);
   ASSERT(pDnode);
@@ -80,11 +100,11 @@ void dropServer(SServer* pServer) {
 void processClientRsp(void* parent, SRpcMsg* pMsg, SEpSet* pEpSet) {
   SClient* pClient = (SClient*)parent;
   pClient->pRsp = pMsg;
-  //taosMsleep(1000000);
+  // taosMsleep(1000000);
   tsem_post(&pClient->sem);
 }
 
-SClient* createClient(char *user, char *pass) {
+SClient* createClient(const char* user, const char* pass, const char* fqdn, uint16_t port) {
   SClient* pClient = (SClient*)calloc(1, sizeof(SClient));
   ASSERT(pClient);
 
@@ -93,14 +113,14 @@ SClient* createClient(char *user, char *pass) {
 
   SRpcInit rpcInit;
   memset(&rpcInit, 0, sizeof(rpcInit));
-  rpcInit.label = "DND-C";
+  rpcInit.label = (char*)"DND-C";
   rpcInit.numOfThreads = 1;
   rpcInit.cfp = processClientRsp;
   rpcInit.sessions = 1024;
   rpcInit.connType = TAOS_CONN_CLIENT;
   rpcInit.idleTime = 30 * 1000;
-  rpcInit.user = user;
-  rpcInit.ckey = "key";
+  rpcInit.user = (char*)user;
+  rpcInit.ckey = (char*)"key";
   rpcInit.parent = pClient;
   rpcInit.secret = (char*)secretEncrypt;
   rpcInit.parent = pClient;
@@ -110,6 +130,8 @@ SClient* createClient(char *user, char *pass) {
   ASSERT(pClient->clientRpc);
 
   tsem_init(&pClient->sem, 0, 0);
+  strcpy(pClient->fqdn, fqdn);
+  pClient->port = port;
 
   return pClient;
 }
@@ -123,8 +145,8 @@ void sendMsg(SClient* pClient, SRpcMsg* pMsg) {
   SEpSet epSet = {0};
   epSet.inUse = 0;
   epSet.numOfEps = 1;
-  epSet.port[0] = 9527;
-  strcpy(epSet.fqdn[0], "localhost");
+  epSet.port[0] = pClient->port;
+  strcpy(epSet.fqdn[0], pClient->fqdn);
 
   rpcSendRequest(pClient->clientRpc, &epSet, pMsg, NULL);
   tsem_wait(&pClient->sem);

source/dnode/mgmt/impl/test/sut/deploy.h

@@ -24,6 +24,7 @@
 #include "trpc.h"
 #include "tthread.h"
 #include "ulog.h"
+#include "tdataformat.h"
 
 typedef struct {
   SDnode*    pDnode;
@@ -31,13 +32,15 @@ typedef struct {
 } SServer;
 
 typedef struct {
+  char     fqdn[TSDB_FQDN_LEN];
+  uint16_t port;
   void*    clientRpc;
   SRpcMsg* pRsp;
   tsem_t   sem;
 } SClient;
 
-SServer* createServer(char* path);
+SServer* createServer(const char* path, const char* fqdn, uint16_t port);
 void     dropServer(SServer* pServer);
-SClient* createClient(char *user, char *pass);
+SClient* createClient(const char* user, const char* pass, const char* fqdn, uint16_t port);
 void     dropClient(SClient* pClient);
 void     sendMsg(SClient* pClient, SRpcMsg* pMsg);

source/dnode/mgmt/impl/test/test01/test01.cpp

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "deploy.h"
-
-class DndTest01 : public ::testing::Test {
- protected:
-  void SetUp() override {
-    pServer = createServer("/tmp/dndTest01");
-    pClient = createClient("root", "taosdata");
-  }
-  void TearDown() override {
-    dropServer(pServer);
-    dropClient(pClient);
-  }
-
-  SServer* pServer;
-  SClient* pClient;
-};
-
-TEST_F(DndTest01, connectMsg) {
-  SConnectMsg* pReq = (SConnectMsg*)rpcMallocCont(sizeof(SConnectMsg));
-  pReq->pid = htonl(1234);
-  strcpy(pReq->app, "test01");
-  strcpy(pReq->db, "");
-
-  SRpcMsg rpcMsg = {0};
-  rpcMsg.pCont = pReq;
-  rpcMsg.contLen = sizeof(SConnectMsg);
-  rpcMsg.msgType = TSDB_MSG_TYPE_CONNECT;
-
-  sendMsg(pClient, &rpcMsg);
-
-  SConnectRsp* pRsp = (SConnectRsp*)pClient->pRsp->pCont;
-  ASSERT_NE(pRsp, nullptr);
-  pRsp->acctId = htonl(pRsp->acctId);
-  pRsp->clusterId = htonl(pRsp->clusterId);
-  pRsp->connId = htonl(pRsp->connId);
-  pRsp->epSet.port[0] = htons(pRsp->epSet.port[0]);
-
-  EXPECT_EQ(pRsp->acctId, 1);
-  EXPECT_GT(pRsp->clusterId, 0);
-  EXPECT_EQ(pRsp->connId, 1);
-  EXPECT_EQ(pRsp->superAuth, 1);
-  EXPECT_EQ(pRsp->readAuth, 1);
-  EXPECT_EQ(pRsp->writeAuth, 1);
-
-  EXPECT_EQ(pRsp->epSet.inUse, 0);
-  EXPECT_EQ(pRsp->epSet.numOfEps, 1);
-  EXPECT_EQ(pRsp->epSet.port[0], 9527);
-  EXPECT_STREQ(pRsp->epSet.fqdn[0], "localhost");
-}
-
-// TEST_F(DndTest01, heartbeatMsg) {
-//   SHeartBeatMsg* pReq = (SHeartBeatMsg*)rpcMallocCont(sizeof(SHeartBeatMsg));
-//   pReq->connId = htonl(1);
-//   pReq->pid = htonl(1234);
-//   pReq->numOfQueries = htonl(0);
-//   pReq->numOfStreams = htonl(0);
-//   strcpy(pReq->app, "test01");
-
-//   SRpcMsg rpcMsg = {0};
-//   rpcMsg.pCont = pReq;
-//   rpcMsg.contLen = sizeof(SHeartBeatMsg);
-//   rpcMsg.msgType = TSDB_MSG_TYPE_HEARTBEAT;
-
-//   sendMsg(pClient, &rpcMsg);
-
-//   SHeartBeatRsp* pRsp = (SHeartBeatRsp*)pClient->pRsp;
-//   ASSERT(pRsp);
-  // pRsp->epSet.port[0] = htonl(pRsp->epSet.port[0]);
-
-//   EXPECT_EQ(htonl(pRsp->connId), 1);
-//   EXPECT_GT(htonl(pRsp->queryId), 0);
-//   EXPECT_GT(htonl(pRsp->streamId), 1);
-//   EXPECT_EQ(htonl(pRsp->totalDnodes), 1);
-//   EXPECT_EQ(htonl(pRsp->onlineDnodes), 1);
-//   EXPECT_EQ(pRsp->killConnection, 0);
-  // EXPECT_EQ(pRsp->epSet.inUse, 0);
-  // EXPECT_EQ(pRsp->epSet.numOfEps, 1);
-  // EXPECT_EQ(pRsp->epSet.port[0], 9527);
-  // EXPECT_STREQ(pRsp->epSet.fqdn[0], "localhost");
-// }

source/dnode/mnode/impl/inc/mndCluster.h

@@ -24,6 +24,7 @@ extern "C" {
 
 int32_t mndInitCluster(SMnode *pMnode);
 void    mndCleanupCluster(SMnode *pMnode);
+int32_t mndGetClusterName(SMnode *pMnode, char *clusterName, int32_t len);
 
 #ifdef __cplusplus
 }

source/dnode/mnode/impl/inc/mndDef.h

@@ -116,7 +116,7 @@ typedef struct STrans {
 
 typedef struct SClusterObj {
   int32_t id;
-  char    uid[TSDB_CLUSTER_ID_LEN];
+  char    name[TSDB_CLUSTER_ID_LEN];
   int64_t createdTime;
   int64_t updateTime;
 } SClusterObj;
@@ -296,7 +296,6 @@ typedef struct SShowObj {
   void      *pIter;
   void      *pVgIter;
   SMnode    *pMnode;
-  SShowObj **ppShow;
   char       db[TSDB_FULL_DB_NAME_LEN];
   int16_t    offset[TSDB_MAX_COLUMNS];
   int32_t    bytes[TSDB_MAX_COLUMNS];

source/dnode/mnode/impl/inc/mndInt.h

@@ -51,6 +51,15 @@ typedef struct {
   SCacheObj *cache;
 } SProfileMgmt;
 
+typedef struct {
+  int8_t           enable;
+  pthread_mutex_t  lock;
+  pthread_cond_t   cond;
+  volatile int32_t exit;
+  pthread_t        thread;
+  char             email[TSDB_FQDN_LEN];
+} STelemMgmt;
+
 typedef struct SMnode {
   int32_t           dnodeId;
   int32_t           clusterId;
@@ -59,23 +68,18 @@ typedef struct SMnode {
   SReplica          replicas[TSDB_MAX_REPLICA];
   tmr_h             timer;
   char             *path;
+  SMnodeCfg         cfg;
   SSdb             *pSdb;
   SDnode           *pDnode;
   SArray           *pSteps;
   SShowMgmt         showMgmt;
   SProfileMgmt      profileMgmt;
+  STelemMgmt        telemMgmt;
   MndMsgFp          msgFp[TSDB_MSG_TYPE_MAX];
   SendMsgToDnodeFp  sendMsgToDnodeFp;
   SendMsgToMnodeFp  sendMsgToMnodeFp;
   SendRedirectMsgFp sendRedirectMsgFp;
   PutMsgToMnodeQFp  putMsgToApplyMsgFp;
-  int32_t           sver;
-  int32_t           statusInterval;
-  int32_t           mnodeEqualVnodeNum;
-  int32_t           shellActivityTimer;
-  char             *timezone;
-  char             *locale;
-  char             *charset;
 } SMnode;
 
 void mndSendMsgToDnode(SMnode *pMnode, SEpSet *pEpSet, SRpcMsg *rpcMsg);

source/dnode/mnode/impl/src/mndCluster.c

@@ -15,11 +15,52 @@
 
 #define _DEFAULT_SOURCE
 #include "mndCluster.h"
-#include "mndTrans.h"
 #include "mndShow.h"
+#include "mndTrans.h"
 
 #define SDB_CLUSTER_VER 1
 
+static SSdbRaw *mndClusterActionEncode(SClusterObj *pCluster);
+static SSdbRow *mndClusterActionDecode(SSdbRaw *pRaw);
+static int32_t  mndClusterActionInsert(SSdb *pSdb, SClusterObj *pCluster);
+static int32_t  mndClusterActionDelete(SSdb *pSdb, SClusterObj *pCluster);
+static int32_t  mndClusterActionUpdate(SSdb *pSdb, SClusterObj *pSrcCluster, SClusterObj *pDstCluster);
+static int32_t  mndCreateDefaultCluster(SMnode *pMnode);
+static int32_t  mndGetClusterMeta(SMnodeMsg *pMsg, SShowObj *pShow, STableMetaMsg *pMeta);
+static int32_t  mndRetrieveClusters(SMnodeMsg *pMsg, SShowObj *pShow, char *data, int32_t rows);
+static void     mndCancelGetNextCluster(SMnode *pMnode, void *pIter);
+
+int32_t mndInitCluster(SMnode *pMnode) {
+  SSdbTable table = {.sdbType = SDB_CLUSTER,
+                     .keyType = SDB_KEY_INT32,
+                     .deployFp = (SdbDeployFp)mndCreateDefaultCluster,
+                     .encodeFp = (SdbEncodeFp)mndClusterActionEncode,
+                     .decodeFp = (SdbDecodeFp)mndClusterActionDecode,
+                     .insertFp = (SdbInsertFp)mndClusterActionInsert,
+                     .updateFp = (SdbUpdateFp)mndClusterActionUpdate,
+                     .deleteFp = (SdbDeleteFp)mndClusterActionDelete};
+
+  mndAddShowMetaHandle(pMnode, TSDB_MGMT_TABLE_CLUSTER, mndGetClusterMeta);
+  mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_CLUSTER, mndRetrieveClusters);
+  mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_CLUSTER, mndCancelGetNextCluster);
+  return sdbSetTable(pMnode->pSdb, table);
+}
+
+void mndCleanupCluster(SMnode *pMnode) {}
+
+int32_t mndGetClusterName(SMnode *pMnode, char *clusterName, int32_t len) {
+  SSdb *pSdb = pMnode->pSdb;
+
+  SClusterObj *pCluster = sdbAcquire(pSdb, SDB_CLUSTER, &pMnode->clusterId);
+  if (pCluster = NULL) {
+    return -1;
+  }
+
+  tstrncpy(clusterName, pCluster->name, len);
+  sdbRelease(pSdb, pCluster);
+  return 0;
+}
+
 static SSdbRaw *mndClusterActionEncode(SClusterObj *pCluster) {
   SSdbRaw *pRaw = sdbAllocRaw(SDB_CLUSTER, SDB_CLUSTER_VER, sizeof(SClusterObj));
   if (pRaw == NULL) return NULL;
@@ -28,7 +69,7 @@ static SSdbRaw *mndClusterActionEncode(SClusterObj *pCluster) {
   SDB_SET_INT32(pRaw, dataPos, pCluster->id);
   SDB_SET_INT64(pRaw, dataPos, pCluster->createdTime)
   SDB_SET_INT64(pRaw, dataPos, pCluster->updateTime)
-  SDB_SET_BINARY(pRaw, dataPos, pCluster->uid, TSDB_CLUSTER_ID_LEN)
+  SDB_SET_BINARY(pRaw, dataPos, pCluster->name, TSDB_CLUSTER_ID_LEN)
 
   return pRaw;
 }
@@ -51,7 +92,7 @@ static SSdbRow *mndClusterActionDecode(SSdbRaw *pRaw) {
   SDB_GET_INT32(pRaw, pRow, dataPos, &pCluster->id)
   SDB_GET_INT64(pRaw, pRow, dataPos, &pCluster->createdTime)
   SDB_GET_INT64(pRaw, pRow, dataPos, &pCluster->updateTime)
-  SDB_GET_BINARY(pRaw, pRow, dataPos, pCluster->uid, TSDB_CLUSTER_ID_LEN)
+  SDB_GET_BINARY(pRaw, pRow, dataPos, pCluster->name, TSDB_CLUSTER_ID_LEN)
 
   return pRow;
 }
@@ -76,14 +117,14 @@ static int32_t mndCreateDefaultCluster(SMnode *pMnode) {
   clusterObj.createdTime = taosGetTimestampMs();
   clusterObj.updateTime = clusterObj.createdTime;
 
-  int32_t code = taosGetSystemUid(clusterObj.uid, TSDB_CLUSTER_ID_LEN);
+  int32_t code = taosGetSystemUid(clusterObj.name, TSDB_CLUSTER_ID_LEN);
   if (code != 0) {
-    strcpy(clusterObj.uid, "tdengine2.0");
-    mError("failed to get uid from system, set to default val %s", clusterObj.uid);
+    strcpy(clusterObj.name, "tdengine2.0");
+    mError("failed to get name from system, set to default val %s", clusterObj.name);
   } else {
-    mDebug("cluster:%d, uid is %s", clusterObj.id, clusterObj.uid);
+    mDebug("cluster:%d, name is %s", clusterObj.id, clusterObj.name);
   }
-  clusterObj.id = MurmurHash3_32(clusterObj.uid, TSDB_CLUSTER_ID_LEN);
+  clusterObj.id = MurmurHash3_32(clusterObj.name, TSDB_CLUSTER_ID_LEN);
   clusterObj.id = abs(clusterObj.id);
   pMnode->clusterId = clusterObj.id;
 
@@ -95,85 +136,79 @@ static int32_t mndCreateDefaultCluster(SMnode *pMnode) {
   return sdbWrite(pMnode->pSdb, pRaw);
 }
 
+static int32_t mndGetClusterMeta(SMnodeMsg *pMsg, SShowObj *pShow, STableMetaMsg *pMeta) {
+  int32_t  cols = 0;
+  SSchema *pSchema = pMeta->schema;
+
+  pShow->bytes[cols] = 4;
+  pSchema[cols].type = TSDB_DATA_TYPE_INT;
+  strcpy(pSchema[cols].name, "id");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = TSDB_CLUSTER_ID_LEN + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "name");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pShow->bytes[cols] = 8;
+  pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
+  strcpy(pSchema[cols].name, "create_time");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
+  pMeta->numOfColumns = htons(cols);
+  strcpy(pMeta->tableFname, "show cluster");
+  pShow->numOfColumns = cols;
+
+  pShow->offset[0] = 0;
+  for (int32_t i = 1; i < cols; ++i) {
+    pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
+  }
 
-// static int32_t mnodeGetClusterMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) {
-//   int32_t cols = 0;
-//   SSchema *pSchema = pMeta->schema;
-
-//   pShow->bytes[cols] = TSDB_CLUSTER_ID_LEN + VARSTR_HEADER_SIZE;
-//   pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
-//   strcpy(pSchema[cols].name, "clusterId");
-//   pSchema[cols].bytes = htons(pShow->bytes[cols]);
-//   cols++;
-
-//   pShow->bytes[cols] = 8;
-//   pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
-//   strcpy(pSchema[cols].name, "create_time");
-//   pSchema[cols].bytes = htons(pShow->bytes[cols]);
-//   cols++;
-
-//   pMeta->numOfColumns = htons(cols);
-//   strcpy(pMeta->tableFname, "show cluster");
-//   pShow->numOfColumns = cols;
-
-//   pShow->offset[0] = 0;
-//   for (int32_t i = 1; i < cols; ++i) {
-//     pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1];
-//   }
-
-//   pShow->numOfRows = 1;
-//   pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
-
-//   return 0;
-// }
+  pShow->numOfRows = 1;
+  pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
 
-// static int32_t mnodeRetrieveClusters(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
-//   int32_t numOfRows = 0;
-//   int32_t cols = 0;
-//   char *  pWrite;
-//   SClusterObj *pCluster = NULL;
+  return 0;
+}
 
-//   while (numOfRows < rows) {
-//     pShow->pIter = mnodeGetNextCluster(pShow->pIter, &pCluster);
-//     if (pCluster == NULL) break;
-    
-//     cols = 0;
+static int32_t mndRetrieveClusters(SMnodeMsg *pMsg, SShowObj *pShow, char *data, int32_t rows) {
+  SMnode      *pMnode = pMsg->pMnode;
+  SSdb        *pSdb = pMnode->pSdb;
+  int32_t      numOfRows = 0;
+  int32_t      cols = 0;
+  char        *pWrite;
+  SClusterObj *pCluster = NULL;
 
-//     pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-//     STR_WITH_MAXSIZE_TO_VARSTR(pWrite, pCluster->uid, TSDB_CLUSTER_ID_LEN);
-//     cols++;
+  while (numOfRows < rows) {
+    pShow->pIter = sdbFetch(pSdb, SDB_CLUSTER, pShow->pIter, (void **)&pCluster);
+    if (pShow->pIter == NULL) break;
 
-//     pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-//     *(int64_t *) pWrite = pCluster->createdTime;
-//     cols++;
+    cols = 0;
 
-//     mnodeDecClusterRef(pCluster);
-//     numOfRows++;
-//   }
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(int32_t *)pWrite = pCluster->id;
+    cols++;
 
-//   mnodeVacuumResult(data, pShow->numOfColumns, numOfRows, rows, pShow);
-//   pShow->numOfReads += numOfRows;
-//   return numOfRows;
-// }
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    STR_WITH_MAXSIZE_TO_VARSTR(pWrite, pCluster->name, TSDB_CLUSTER_ID_LEN);
+    cols++;
 
-// static void mnodeCancelGetNextCluster(void *pIter) {
-//   sdbFreeIter(tsClusterSdb, pIter);
-// }
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    *(int64_t *)pWrite = pCluster->createdTime;
+    cols++;
 
-int32_t mndInitCluster(SMnode *pMnode) {
-  SSdbTable table = {.sdbType = SDB_CLUSTER,
-                     .keyType = SDB_KEY_INT32,
-                     .deployFp = (SdbDeployFp)mndCreateDefaultCluster,
-                     .encodeFp = (SdbEncodeFp)mndClusterActionEncode,
-                     .decodeFp = (SdbDecodeFp)mndClusterActionDecode,
-                     .insertFp = (SdbInsertFp)mndClusterActionInsert,
-                     .updateFp = (SdbUpdateFp)mndClusterActionUpdate,
-                     .deleteFp = (SdbDeleteFp)mndClusterActionDelete};
+    sdbRelease(pSdb, pCluster);
+    numOfRows++;
+  }
 
-  // mndAddShowMetaHandle(TSDB_MGMT_TABLE_CLUSTER, mnodeGetClusterMeta);
-  // mndAddShowRetrieveHandle(TSDB_MGMT_TABLE_CLUSTER, mnodeRetrieveClusters);
-  // mndAddShowFreeIterHandle(TSDB_MGMT_TABLE_CLUSTER, mnodeCancelGetNextCluster);
-  return sdbSetTable(pMnode->pSdb, table);
+  mnodeVacuumResult(data, pShow->numOfColumns, numOfRows, rows, pShow);
+  pShow->numOfReads += numOfRows;
+  return numOfRows;
 }
 
-void mndCleanupCluster(SMnode *pMnode) {}
+static void mndCancelGetNextCluster(SMnode *pMnode, void *pIter) {
+  SSdb *pSdb = pMnode->pSdb;
+  sdbCancelFetch(pSdb, pIter);
+}

source/dnode/mnode/impl/src/mndDnode.c

@@ -179,32 +179,33 @@ static void mndGetDnodeData(SMnode *pMnode, SDnodeEps *pEps, int32_t numOfEps) {
 }
 
 static int32_t mndCheckClusterCfgPara(SMnode *pMnode, const SClusterCfg *pCfg) {
-  if (pCfg->mnodeEqualVnodeNum != pMnode->mnodeEqualVnodeNum) {
-    mError("\"mnodeEqualVnodeNum\"[%d - %d] cfg inconsistent", pCfg->mnodeEqualVnodeNum, pMnode->mnodeEqualVnodeNum);
+  if (pCfg->mnodeEqualVnodeNum != pMnode->cfg.mnodeEqualVnodeNum) {
+    mError("\"mnodeEqualVnodeNum\"[%d - %d] cfg inconsistent", pCfg->mnodeEqualVnodeNum,
+           pMnode->cfg.mnodeEqualVnodeNum);
     return DND_REASON_MN_EQUAL_VN_NOT_MATCH;
   }
 
-  if (pCfg->statusInterval != pMnode->statusInterval) {
-    mError("\"statusInterval\"[%d - %d] cfg inconsistent", pCfg->statusInterval, pMnode->statusInterval);
+  if (pCfg->statusInterval != pMnode->cfg.statusInterval) {
+    mError("\"statusInterval\"[%d - %d] cfg inconsistent", pCfg->statusInterval, pMnode->cfg.statusInterval);
     return DND_REASON_STATUS_INTERVAL_NOT_MATCH;
   }
 
   int64_t checkTime = 0;
   char    timestr[32] = "1970-01-01 00:00:00.00";
   (void)taosParseTime(timestr, &checkTime, (int32_t)strlen(timestr), TSDB_TIME_PRECISION_MILLI, 0);
-  if ((0 != strcasecmp(pCfg->timezone, pMnode->timezone)) && (checkTime != pCfg->checkTime)) {
-    mError("\"timezone\"[%s - %s] [%" PRId64 " - %" PRId64 "] cfg inconsistent", pCfg->timezone, tsTimezone,
+  if ((0 != strcasecmp(pCfg->timezone, pMnode->cfg.timezone)) && (checkTime != pCfg->checkTime)) {
+    mError("\"timezone\"[%s - %s] [%" PRId64 " - %" PRId64 "] cfg inconsistent", pCfg->timezone, pMnode->cfg.timezone,
            pCfg->checkTime, checkTime);
     return DND_REASON_TIME_ZONE_NOT_MATCH;
   }
 
-  if (0 != strcasecmp(pCfg->locale, pMnode->locale)) {
-    mError("\"locale\"[%s - %s]  cfg parameters inconsistent", pCfg->locale, pMnode->locale);
+  if (0 != strcasecmp(pCfg->locale, pMnode->cfg.locale)) {
+    mError("\"locale\"[%s - %s]  cfg parameters inconsistent", pCfg->locale, pMnode->cfg.locale);
     return DND_REASON_LOCALE_NOT_MATCH;
   }
 
-  if (0 != strcasecmp(pCfg->charset, pMnode->charset)) {
-    mError("\"charset\"[%s - %s] cfg parameters inconsistent.", pCfg->charset, pMnode->charset);
+  if (0 != strcasecmp(pCfg->charset, pMnode->cfg.charset)) {
+    mError("\"charset\"[%s - %s] cfg parameters inconsistent.", pCfg->charset, pMnode->cfg.charset);
     return DND_REASON_CHARSET_NOT_MATCH;
   }
 
@@ -251,12 +252,12 @@ static int32_t mndProcessStatusMsg(SMnodeMsg *pMsg) {
     }
   }
 
-  if (pStatus->sver != pMnode->sver) {
+  if (pStatus->sver != pMnode->cfg.sver) {
     if (pDnode != NULL && pDnode->status != DND_STATUS_READY) {
       pDnode->offlineReason = DND_REASON_VERSION_NOT_MATCH;
     }
     mndReleaseDnode(pMnode, pDnode);
-    mError("dnode:%d, status msg version:%d not match cluster:%d", pStatus->dnodeId, pStatus->sver, pMnode->sver);
+    mError("dnode:%d, status msg version:%d not match cluster:%d", pStatus->dnodeId, pStatus->sver, pMnode->cfg.sver);
     return TSDB_CODE_MND_INVALID_MSG_VERSION;
   }
 

source/dnode/mnode/impl/src/mndShow.c

@@ -16,19 +16,19 @@
 #define _DEFAULT_SOURCE
 #include "mndShow.h"
 
-static int32_t mndProcessShowMsg(SMnodeMsg *pMnodeMsg);
-static int32_t mndProcessRetrieveMsg( SMnodeMsg *pMsg);
-static bool    mndCheckRetrieveFinished(SShowObj *pShow);
-static int32_t mndAcquireShowObj(SMnode *pMnode, SShowObj *pShow);
-static void    mndReleaseShowObj(SShowObj *pShow, bool forceRemove);
-static int32_t mndPutShowObj(SMnode *pMnode, SShowObj *pShow);
-static void    mndFreeShowObj(void *ppShow);
-static char   *mndShowStr(int32_t showType);
+static SShowObj *mndCreateShowObj(SMnode *pMnode, SShowMsg *pMsg);
+static void      mndFreeShowObj(SShowObj *pShow);
+static SShowObj *mndAcquireShowObj(SMnode *pMnode, int32_t showId);
+static void      mndReleaseShowObj(SShowObj *pShow, bool forceRemove);
+static char     *mndShowStr(int32_t showType);
+static int32_t   mndProcessShowMsg(SMnodeMsg *pMnodeMsg);
+static int32_t   mndProcessRetrieveMsg(SMnodeMsg *pMsg);
+static bool      mndCheckRetrieveFinished(SShowObj *pShow);
 
 int32_t mndInitShow(SMnode *pMnode) {
   SShowMgmt *pMgmt = &pMnode->showMgmt;
 
-  pMgmt->cache = taosCacheInit(TSDB_CACHE_PTR_KEY, 5, true, mndFreeShowObj, "show");
+  pMgmt->cache = taosCacheInit(TSDB_DATA_TYPE_INT, 5, true, (__cache_free_fn_t)mndFreeShowObj, "show");
   if (pMgmt->cache == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     mError("failed to alloc show cache since %s", terrstr());
@@ -48,47 +48,41 @@ void mndCleanupShow(SMnode *pMnode) {
   }
 }
 
-static int32_t mndAcquireShowObj(SMnode *pMnode, SShowObj *pShow) {
-  TSDB_CACHE_PTR_TYPE handleVal = (TSDB_CACHE_PTR_TYPE)pShow;
-
-  SShowMgmt *pMgmt = &pMnode->showMgmt;
-  SShowObj **ppShow = taosCacheAcquireByKey(pMgmt->cache, &handleVal, sizeof(TSDB_CACHE_PTR_TYPE));
-  if (ppShow) {
-    mTrace("show:%d, data:%p acquired from cache", pShow->id, ppShow);
-    return 0;
-  }
-
-  return -1;
-}
-
-static void mndReleaseShowObj(SShowObj *pShow, bool forceRemove) {
-  SMnode    *pMnode = pShow->pMnode;
+static SShowObj *mndCreateShowObj(SMnode *pMnode, SShowMsg *pMsg) {
   SShowMgmt *pMgmt = &pMnode->showMgmt;
-  SShowObj **ppShow = (SShowObj **)pShow->ppShow;
-  taosCacheRelease(pMgmt->cache, (void **)(&ppShow), forceRemove);
-  mDebug("show:%d, data:%p released from cache, force:%d", pShow->id, ppShow, forceRemove);
-}
 
-static int32_t mndPutShowObj(SMnode *pMnode, SShowObj *pShow) {
-  SShowMgmt *pMgmt = &pMnode->showMgmt;
-  int32_t    lifeSpan = pMnode->shellActivityTimer * 6 * 1000;
+  int32_t showId = atomic_add_fetch_32(&pMgmt->showId, 1);
+  if (showId == 0) atomic_add_fetch_32(&pMgmt->showId, 1);
 
-  TSDB_CACHE_PTR_TYPE val = (TSDB_CACHE_PTR_TYPE)pShow;
-  pShow->id = atomic_add_fetch_32(&pMgmt->showId, 1);
-  SShowObj **ppShow =
-      taosCachePut(pMgmt->cache, &val, sizeof(TSDB_CACHE_PTR_TYPE), &pShow, sizeof(TSDB_CACHE_PTR_TYPE), lifeSpan);
-  if (ppShow == NULL) {
+  int32_t   size = sizeof(SShowObj) + pMsg->payloadLen;
+  SShowObj *pShow = calloc(1, size);
+  if (pShow != NULL) {
+    pShow->id = showId;
+    pShow->pMnode = pMnode;
+    pShow->type = pMsg->type;
+    pShow->payloadLen = pMsg->payloadLen;
+    memcpy(pShow->db, pMsg->db, TSDB_FULL_DB_NAME_LEN);
+    memcpy(pShow->payload, pMsg->payload, pMsg->payloadLen);
+  } else {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
-    mError("show:%d, failed to put into cache", pShow->id);
-    return -1;
+    mError("failed to process show-meta msg:%s since %s", mndShowStr(pMsg->type), terrstr());
+    return NULL;
   }
 
-  mTrace("show:%d, data:%p put into cache", pShow->id, ppShow);
-  return 0;
+  int32_t   keepTime = pMnode->cfg.shellActivityTimer * 6 * 1000;
+  SShowObj *pShowRet = taosCachePut(pMgmt->cache, &showId, sizeof(int32_t), pShow, size, keepTime);
+  free(pShow);
+  if (pShowRet == NULL) {
+    terrno = TSDB_CODE_OUT_OF_MEMORY;
+    mError("show:%d, failed to put into cache since %s", showId, terrstr());
+    return NULL;
+  } else {
+    mTrace("show:%d, data:%p created", showId, pShowRet);
+    return pShowRet;
+  }
 }
 
-static void mndFreeShowObj(void *ppShow) {
-  SShowObj  *pShow = *(SShowObj **)ppShow;
+static void mndFreeShowObj(SShowObj *pShow) {
   SMnode    *pMnode = pShow->pMnode;
   SShowMgmt *pMgmt = &pMnode->showMgmt;
 
@@ -103,8 +97,32 @@ static void mndFreeShowObj(void *ppShow) {
     }
   }
 
-  mDebug("show:%d, data:%p destroyed", pShow->id, ppShow);
-  tfree(pShow);
+  mTrace("show:%d, data:%p destroyed", pShow->id, pShow);
+}
+
+static SShowObj *mndAcquireShowObj(SMnode *pMnode, int32_t showId) {
+  SShowMgmt *pMgmt = &pMnode->showMgmt;
+
+  SShowObj *pShow = taosCacheAcquireByKey(pMgmt->cache, &showId, sizeof(int32_t));
+  if (pShow == NULL) {
+    mError("show:%d, already destroyed", showId);
+    return NULL;
+  }
+
+  mTrace("show:%d, data:%p acquired from cache", pShow->id, pShow);
+  return pShow;
+}
+
+static void mndReleaseShowObj(SShowObj *pShow, bool forceRemove) {
+  if (pShow == NULL) return;
+  mTrace("show:%d, data:%p released from cache, force:%d", pShow->id, pShow, forceRemove);
+  
+  // A bug in tcache.c
+  forceRemove = 0;
+
+  SMnode    *pMnode = pShow->pMnode;
+  SShowMgmt *pMgmt = &pMnode->showMgmt;
+  taosCacheRelease(pMgmt->cache, (void **)(&pShow), forceRemove);
 }
 
 static int32_t mndProcessShowMsg(SMnodeMsg *pMnodeMsg) {
@@ -112,7 +130,7 @@ static int32_t mndProcessShowMsg(SMnodeMsg *pMnodeMsg) {
   SShowMgmt *pMgmt = &pMnode->showMgmt;
   SShowMsg  *pMsg = pMnodeMsg->rpcMsg.pCont;
   int8_t     type = pMsg->type;
-  uint16_t   payloadLen = htonl(pMsg->payloadLen);
+  int16_t    payloadLen = htonl(pMsg->payloadLen);
 
   if (type <= TSDB_MGMT_TABLE_START || type >= TSDB_MGMT_TABLE_MAX) {
     terrno = TSDB_CODE_MND_INVALID_MSG_TYPE;
@@ -127,27 +145,13 @@ static int32_t mndProcessShowMsg(SMnodeMsg *pMnodeMsg) {
     return -1;
   }
 
-  int32_t   size = sizeof(SShowObj) + payloadLen;
-  SShowObj *pShow = calloc(1, size);
-  if (pShow != NULL) {
-    pShow->pMnode = pMnode;
-    pShow->type = type;
-    pShow->payloadLen = payloadLen;
-    memcpy(pShow->db, pMsg->db, TSDB_FULL_DB_NAME_LEN);
-    memcpy(pShow->payload, pMsg->payload, payloadLen);
-  } else {
-    terrno = TSDB_CODE_OUT_OF_MEMORY;
+  SShowObj *pShow = mndCreateShowObj(pMnode, pMsg);
+  if (pShow == NULL) {
     mError("failed to process show-meta msg:%s since %s", mndShowStr(type), terrstr());
     return -1;
   }
 
-  if (mndPutShowObj(pMnode, pShow) == 0) {
-    mError("failed to process show-meta msg:%s since %s", mndShowStr(type), terrstr());
-    free(pShow);
-    return -1;
-  }
-
-  size = sizeof(SShowRsp) + sizeof(SSchema) * TSDB_MAX_COLUMNS + TSDB_EXTRA_PAYLOAD_SIZE;
+  int32_t   size = sizeof(SShowRsp) + sizeof(SSchema) * TSDB_MAX_COLUMNS + TSDB_EXTRA_PAYLOAD_SIZE;
   SShowRsp *pRsp = rpcMallocCont(size);
   if (pRsp == NULL) {
     mndReleaseShowObj(pShow, true);
@@ -156,15 +160,14 @@ static int32_t mndProcessShowMsg(SMnodeMsg *pMnodeMsg) {
     return -1;
   }
 
-  pRsp->qhandle = htobe64((uint64_t)pShow);
-
-  int32_t code = (*metaFp)(pMnodeMsg,pShow, &pRsp->tableMeta);
-  mDebug("show:%d, type:%s, get meta finished, numOfRows:%d cols:%d result:%s", pShow->id, mndShowStr(type),
-         pShow->numOfRows, pShow->numOfColumns, tstrerror(code));
+  int32_t code = (*metaFp)(pMnodeMsg, pShow, &pRsp->tableMeta);
+  mDebug("show:%d, data:%p get meta finished, numOfRows:%d cols:%d type:%s result:%s", pShow->id, pShow,
+         pShow->numOfRows, pShow->numOfColumns, mndShowStr(type), tstrerror(code));
 
   if (code == TSDB_CODE_SUCCESS) {
     pMnodeMsg->contLen = sizeof(SShowRsp) + sizeof(SSchema) * pShow->numOfColumns;
     pMnodeMsg->pCont = pRsp;
+    pRsp->showId = htonl(pShow->id);
     mndReleaseShowObj(pShow, false);
     return TSDB_CODE_SUCCESS;
   } else {
@@ -182,14 +185,10 @@ static int32_t mndProcessRetrieveMsg(SMnodeMsg *pMnodeMsg) {
   int32_t    rowsRead = 0;
 
   SRetrieveTableMsg *pRetrieve = pMnodeMsg->rpcMsg.pCont;
-  pRetrieve->qhandle = htobe64(pRetrieve->qhandle);
-  SShowObj *pShow = (SShowObj *)pRetrieve->qhandle;
+  int32_t            showId = htonl(pRetrieve->showId);
 
-  /*
-   * in case of server restart, apps may hold qhandle created by server before
-   * restart, which is actually invalid, therefore, signature check is required.
-   */
-  if (mndAcquireShowObj(pMnode, pShow) != 0) {
+  SShowObj *pShow = mndAcquireShowObj(pMnode, showId);
+  if (pShow == NULL) {
     terrno = TSDB_CODE_MND_INVALID_SHOWOBJ;
     mError("failed to process show-retrieve msg:%p since %s", pShow, terrstr());
     return -1;
@@ -199,15 +198,16 @@ static int32_t mndProcessRetrieveMsg(SMnodeMsg *pMnodeMsg) {
   if (retrieveFp == NULL) {
     mndReleaseShowObj(pShow, false);
     terrno = TSDB_CODE_MSG_NOT_PROCESSED;
-    mError("show:%d, failed to retrieve data since %s", pShow->id, terrstr());
+    mError("show:%d, data:%p failed to retrieve data since %s", pShow->id, pShow, terrstr());
     return -1;
   }
 
-  mDebug("show:%d, type:%s, start retrieve data, numOfReads:%d numOfRows:%d", pShow->id, mndShowStr(pShow->type),
-         pShow->numOfReads, pShow->numOfRows);
+  mDebug("show:%d, data:%p start retrieve data, numOfReads:%d numOfRows:%d type:%s", pShow->id, pShow,
+         pShow->numOfReads, pShow->numOfRows, mndShowStr(pShow->type));
 
   if (mndCheckRetrieveFinished(pShow)) {
-    mDebug("show:%d, read finished, numOfReads:%d numOfRows:%d", pShow->id, pShow->numOfReads, pShow->numOfRows);
+    mDebug("show:%d, data:%p read finished, numOfReads:%d numOfRows:%d", pShow->id, pShow, pShow->numOfReads,
+           pShow->numOfRows);
     pShow->numOfReads = pShow->numOfRows;
   }
 
@@ -230,7 +230,7 @@ static int32_t mndProcessRetrieveMsg(SMnodeMsg *pMnodeMsg) {
   if (pRsp == NULL) {
     mndReleaseShowObj(pShow, false);
     terrno = TSDB_CODE_OUT_OF_MEMORY;
-    mError("show:%d, failed to retrieve data since %s", pShow->id, terrstr());
+    mError("show:%d, data:%p failed to retrieve data since %s", pShow->id, pShow, terrstr());
     return -1;
   }
 
@@ -239,20 +239,20 @@ static int32_t mndProcessRetrieveMsg(SMnodeMsg *pMnodeMsg) {
     rowsRead = (*retrieveFp)(pMnodeMsg, pShow, pRsp->data, rowsToRead);
   }
 
-  mDebug("show:%d, stop retrieve data, rowsRead:%d rowsToRead:%d", pShow->id, rowsRead, rowsToRead);
+  mDebug("show:%d, data:%p stop retrieve data, rowsRead:%d rowsToRead:%d", pShow->id, pShow, rowsRead, rowsToRead);
 
   pRsp->numOfRows = htonl(rowsRead);
-  pRsp->precision = (int16_t)htonl(TSDB_TIME_PRECISION_MILLI);  // millisecond time precision
+  pRsp->precision = TSDB_TIME_PRECISION_MILLI;  // millisecond time precision
 
   pMnodeMsg->pCont = pRsp;
   pMnodeMsg->contLen = size;
 
-  if (rowsToRead == 0 || (rowsRead == rowsToRead && pShow->numOfRows == pShow->numOfReads)) {
+  if (rowsRead == 0 || rowsToRead == 0 || (rowsRead == rowsToRead && pShow->numOfRows == pShow->numOfReads)) {
     pRsp->completed = 1;
-    mDebug("%p, retrieve completed", pShow);
+    mDebug("show:%d, data:%p retrieve completed", pShow->id, pShow);
     mndReleaseShowObj(pShow, true);
   } else {
-    mDebug("%p, retrieve not completed yet", pShow);
+    mDebug("show:%d, data:%p retrieve not completed yet", pShow->id, pShow);
     mndReleaseShowObj(pShow, false);
   }
 
@@ -307,7 +307,7 @@ static char *mndShowStr(int32_t showType) {
 static bool mndCheckRetrieveFinished(SShowObj *pShow) {
   if (pShow->pIter == NULL && pShow->numOfReads != 0) {
     return true;
-  } 
+  }
   return false;
 }
 

source/dnode/mnode/impl/src/mndTelem.c

@@ -15,27 +15,15 @@
 
 #define _DEFAULT_SOURCE
 #include "mndTelem.h"
-#include "tbuffer.h"
-#include "tglobal.h"
+#include "mndCluster.h"
 #include "mndSync.h"
+#include "tbuffer.h"
+#include "tversion.h"
 
 #define TELEMETRY_SERVER "telemetry.taosdata.com"
 #define TELEMETRY_PORT 80
 #define REPORT_INTERVAL 86400
 
-/*
- * sem_timedwait is NOT implemented on MacOSX
- * thus we use pthread_mutex_t/pthread_cond_t to simulate
- */
-static struct {
-  bool             enable;
-  pthread_mutex_t  lock;
-  pthread_cond_t   cond;
-  volatile int32_t exit;
-  pthread_t        thread;
-  char             email[TSDB_FQDN_LEN];
-} tsTelem;
-
 static void mndBeginObject(SBufferWriter* bw) { tbufWriteChar(bw, '{'); }
 
 static void mndCloseObject(SBufferWriter* bw) {
@@ -86,7 +74,7 @@ static void mndAddStringField(SBufferWriter* bw, const char* k, const char* v) {
   tbufWriteChar(bw, ',');
 }
 
-static void mndAddCpuInfo(SBufferWriter* bw) {
+static void mndAddCpuInfo(SMnode* pMnode, SBufferWriter* bw) {
   char*   line = NULL;
   size_t  size = 0;
   int32_t done = 0;
@@ -116,7 +104,7 @@ static void mndAddCpuInfo(SBufferWriter* bw) {
   fclose(fp);
 }
 
-static void mndAddOsInfo(SBufferWriter* bw) {
+static void mndAddOsInfo(SMnode* pMnode, SBufferWriter* bw) {
   char*  line = NULL;
   size_t size = 0;
 
@@ -142,7 +130,7 @@ static void mndAddOsInfo(SBufferWriter* bw) {
   fclose(fp);
 }
 
-static void mndAddMemoryInfo(SBufferWriter* bw) {
+static void mndAddMemoryInfo(SMnode* pMnode, SBufferWriter* bw) {
   char*  line = NULL;
   size_t size = 0;
 
@@ -165,16 +153,21 @@ static void mndAddMemoryInfo(SBufferWriter* bw) {
   fclose(fp);
 }
 
-static void mndAddVersionInfo(SBufferWriter* bw) {
-  mndAddStringField(bw, "version", version);
-  mndAddStringField(bw, "buildInfo", buildinfo);
-  mndAddStringField(bw, "gitInfo", gitinfo);
-  mndAddStringField(bw, "email", tsTelem.email);
+static void mndAddVersionInfo(SMnode* pMnode, SBufferWriter* bw) {
+  STelemMgmt* pMgmt = &pMnode->telemMgmt;
+
+  char vstr[32] = {0};
+  taosVersionIntToStr(pMnode->cfg.sver, vstr, 32);
+
+  mndAddStringField(bw, "version", vstr);
+  mndAddStringField(bw, "buildInfo", pMnode->cfg.buildinfo);
+  mndAddStringField(bw, "gitInfo", pMnode->cfg.gitinfo);
+  mndAddStringField(bw, "email", pMgmt->email);
 }
 
-static void mndAddRuntimeInfo(SBufferWriter* bw) {
+static void mndAddRuntimeInfo(SMnode* pMnode, SBufferWriter* bw) {
   SMnodeLoad load = {0};
-  if (mndGetLoad(NULL, &load) != 0) {
+  if (mndGetLoad(pMnode, &load) != 0) {
     return;
   }
 
@@ -190,11 +183,13 @@ static void mndAddRuntimeInfo(SBufferWriter* bw) {
   mndAddIntField(bw, "compStorage", load.compStorage);
 }
 
-static void mndSendTelemetryReport() {
+static void mndSendTelemetryReport(SMnode* pMnode) {
+  STelemMgmt* pMgmt = &pMnode->telemMgmt;
+
   char     buf[128] = {0};
   uint32_t ip = taosGetIpv4FromFqdn(TELEMETRY_SERVER);
   if (ip == 0xffffffff) {
-    mTrace("failed to get IP address of " TELEMETRY_SERVER ", reason:%s", strerror(errno));
+    mTrace("failed to get IP address of " TELEMETRY_SERVER " since :%s", strerror(errno));
     return;
   }
   SOCKET fd = taosOpenTcpClientSocket(ip, TELEMETRY_PORT, 0);
@@ -203,19 +198,18 @@ static void mndSendTelemetryReport() {
     return;
   }
 
-  int32_t clusterId = 0;
-  char    clusterIdStr[20] = {0};
-  snprintf(clusterIdStr, sizeof(clusterIdStr), "%d", clusterId);
+  char clusterName[64] = {0};
+  mndGetClusterName(pMnode, clusterName, sizeof(clusterName));
 
   SBufferWriter bw = tbufInitWriter(NULL, false);
   mndBeginObject(&bw);
-  mndAddStringField(&bw, "instanceId", clusterIdStr);
+  mndAddStringField(&bw, "instanceId", clusterName);
   mndAddIntField(&bw, "reportVersion", 1);
-  mndAddOsInfo(&bw);
-  mndAddCpuInfo(&bw);
-  mndAddMemoryInfo(&bw);
-  mndAddVersionInfo(&bw);
-  mndAddRuntimeInfo(&bw);
+  mndAddOsInfo(pMnode, &bw);
+  mndAddCpuInfo(pMnode, &bw);
+  mndAddMemoryInfo(pMnode, &bw);
+  mndAddVersionInfo(pMnode, &bw);
+  mndAddRuntimeInfo(pMnode, &bw);
   mndCloseObject(&bw);
 
   const char* header =
@@ -241,23 +235,26 @@ static void mndSendTelemetryReport() {
 }
 
 static void* mndTelemThreadFp(void* param) {
+  SMnode*     pMnode = param;
+  STelemMgmt* pMgmt = &pMnode->telemMgmt;
+
   struct timespec end = {0};
   clock_gettime(CLOCK_REALTIME, &end);
   end.tv_sec += 300;  // wait 5 minutes before send first report
 
   setThreadName("mnd-telem");
 
-  while (!tsTelem.exit) {
+  while (!pMgmt->exit) {
     int32_t         r = 0;
     struct timespec ts = end;
-    pthread_mutex_lock(&tsTelem.lock);
-    r = pthread_cond_timedwait(&tsTelem.cond, &tsTelem.lock, &ts);
-    pthread_mutex_unlock(&tsTelem.lock);
+    pthread_mutex_lock(&pMgmt->lock);
+    r = pthread_cond_timedwait(&pMgmt->cond, &pMgmt->lock, &ts);
+    pthread_mutex_unlock(&pMgmt->lock);
     if (r == 0) break;
     if (r != ETIMEDOUT) continue;
 
-    if (mndIsMaster(NULL)) {
-      mndSendTelemetryReport();
+    if (mndIsMaster(pMnode)) {
+      mndSendTelemetryReport(pMnode);
     }
     end.tv_sec += REPORT_INTERVAL;
   }
@@ -265,35 +262,39 @@ static void* mndTelemThreadFp(void* param) {
   return NULL;
 }
 
-static void mndGetEmail(char* filepath) {
+static void mndGetEmail(SMnode* pMnode, char* filepath) {
+  STelemMgmt* pMgmt = &pMnode->telemMgmt;
+
   int32_t fd = taosOpenFileRead(filepath);
   if (fd < 0) {
     return;
   }
 
-  if (taosReadFile(fd, (void*)tsTelem.email, TSDB_FQDN_LEN) < 0) {
+  if (taosReadFile(fd, (void*)pMgmt->email, TSDB_FQDN_LEN) < 0) {
     mError("failed to read %d bytes from file %s since %s", TSDB_FQDN_LEN, filepath, strerror(errno));
   }
 
   taosCloseFile(fd);
 }
 
-int32_t mndInitTelem(SMnode *pMnode) {
-  tsTelem.enable = tsEnableTelemetryReporting;
-  if (!tsTelem.enable) return 0;
+int32_t mndInitTelem(SMnode* pMnode) {
+  STelemMgmt* pMgmt = &pMnode->telemMgmt;
+  pMgmt->enable = pMnode->cfg.enableTelem;
+
+  if (!pMgmt->enable) return 0;
 
-  tsTelem.exit = 0;
-  pthread_mutex_init(&tsTelem.lock, NULL);
-  pthread_cond_init(&tsTelem.cond, NULL);
-  tsTelem.email[0] = 0;
+  pMgmt->exit = 0;
+  pthread_mutex_init(&pMgmt->lock, NULL);
+  pthread_cond_init(&pMgmt->cond, NULL);
+  pMgmt->email[0] = 0;
 
-  mndGetEmail("/usr/local/taos/email");
+  mndGetEmail(pMnode, "/usr/local/taos/email");
 
   pthread_attr_t attr;
   pthread_attr_init(&attr);
   pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
 
-  int32_t code = pthread_create(&tsTelem.thread, &attr, mndTelemThreadFp, NULL);
+  int32_t code = pthread_create(&pMgmt->thread, &attr, mndTelemThreadFp, pMnode);
   pthread_attr_destroy(&attr);
   if (code != 0) {
     mTrace("failed to create telemetry thread since :%s", strerror(code));
@@ -303,18 +304,19 @@ int32_t mndInitTelem(SMnode *pMnode) {
   return 0;
 }
 
-void mndCleanupTelem(SMnode *pMnode) {
-  if (!tsTelem.enable) return;
+void mndCleanupTelem(SMnode* pMnode) {
+  STelemMgmt* pMgmt = &pMnode->telemMgmt;
+  if (!pMgmt->enable) return;
 
-  if (taosCheckPthreadValid(tsTelem.thread)) {
-    pthread_mutex_lock(&tsTelem.lock);
-    tsTelem.exit = 1;
-    pthread_cond_signal(&tsTelem.cond);
-    pthread_mutex_unlock(&tsTelem.lock);
+  if (taosCheckPthreadValid(pMgmt->thread)) {
+    pthread_mutex_lock(&pMgmt->lock);
+    pMgmt->exit = 1;
+    pthread_cond_signal(&pMgmt->cond);
+    pthread_mutex_unlock(&pMgmt->lock);
 
-    pthread_join(tsTelem.thread, NULL);
+    pthread_join(pMgmt->thread, NULL);
   }
 
-  pthread_mutex_destroy(&tsTelem.lock);
-  pthread_cond_destroy(&tsTelem.cond);
+  pthread_mutex_destroy(&pMgmt->lock);
+  pthread_cond_destroy(&pMgmt->cond);
 }

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

@@ -203,22 +203,25 @@ static int32_t mndSetOptions(SMnode *pMnode, const SMnodeOpt *pOption) {
   pMnode->sendMsgToDnodeFp = pOption->sendMsgToDnodeFp;
   pMnode->sendMsgToMnodeFp = pOption->sendMsgToMnodeFp;
   pMnode->sendRedirectMsgFp = pOption->sendRedirectMsgFp;
-  pMnode->sver = pOption->sver;
-  pMnode->statusInterval = pOption->statusInterval;
-  pMnode->mnodeEqualVnodeNum = pOption->mnodeEqualVnodeNum;
-  pMnode->shellActivityTimer = pOption->shellActivityTimer;
-  pMnode->timezone = strdup(pOption->timezone);
-  pMnode->locale = strdup(pOption->locale);
-  pMnode->charset = strdup(pOption->charset);
+  pMnode->cfg.sver = pOption->cfg.sver;
+  pMnode->cfg.enableTelem = pOption->cfg.enableTelem;
+  pMnode->cfg.statusInterval = pOption->cfg.statusInterval;
+  pMnode->cfg.mnodeEqualVnodeNum = pOption->cfg.mnodeEqualVnodeNum;
+  pMnode->cfg.shellActivityTimer = pOption->cfg.shellActivityTimer;
+  pMnode->cfg.timezone = strdup(pOption->cfg.timezone);
+  pMnode->cfg.locale = strdup(pOption->cfg.locale);
+  pMnode->cfg.charset = strdup(pOption->cfg.charset);
+  pMnode->cfg.gitinfo = strdup(pOption->cfg.gitinfo);
+  pMnode->cfg.buildinfo = strdup(pOption->cfg.buildinfo);
 
   if (pMnode->sendMsgToDnodeFp == NULL || pMnode->sendMsgToMnodeFp == NULL || pMnode->sendRedirectMsgFp == NULL ||
       pMnode->putMsgToApplyMsgFp == NULL || pMnode->dnodeId < 0 || pMnode->clusterId < 0 ||
-      pMnode->statusInterval < 1 || pOption->mnodeEqualVnodeNum < 0) {
+      pMnode->cfg.statusInterval < 1 || pOption->cfg.mnodeEqualVnodeNum < 0) {
     terrno = TSDB_CODE_MND_INVALID_OPTIONS;
     return -1;
   }
 
-  if (pMnode->timezone == NULL || pMnode->locale == NULL || pMnode->charset == NULL) {
+  if (pMnode->cfg.timezone == NULL || pMnode->cfg.locale == NULL || pMnode->cfg.charset == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     return -1;
   }
@@ -289,9 +292,11 @@ void mndClose(SMnode *pMnode) {
     mDebug("start to close mnode");
     mndCleanupSteps(pMnode, -1);
     tfree(pMnode->path);
-    tfree(pMnode->charset);
-    tfree(pMnode->locale);
-    tfree(pMnode->timezone);
+    tfree(pMnode->cfg.charset);
+    tfree(pMnode->cfg.locale);
+    tfree(pMnode->cfg.timezone);
+    tfree(pMnode->cfg.gitinfo);
+    tfree(pMnode->cfg.buildinfo);
     tfree(pMnode);
     mDebug("mnode is closed");
   }

source/libs/executor/inc/executorimpl.h

@@ -279,34 +279,6 @@ enum {
   OP_EXEC_DONE      = 3,
 };
 
-enum OPERATOR_TYPE_E {
-  OP_TableScan         = 1,
-  OP_DataBlocksOptScan = 2,
-  OP_TableSeqScan      = 3,
-  OP_TagScan           = 4,
-  OP_TableBlockInfoScan= 5,
-  OP_Aggregate         = 6,
-  OP_Project           = 7,
-  OP_Groupby           = 8,
-  OP_Limit             = 9,
-  OP_SLimit            = 10,
-  OP_TimeWindow        = 11,
-  OP_SessionWindow     = 12,
-  OP_Fill              = 13,
-  OP_MultiTableAggregate     = 14,
-  OP_MultiTableTimeInterval  = 15,
-  OP_DummyInput        = 16,   //TODO remove it after fully refactor.
-  OP_MultiwayMergeSort = 17,   // multi-way data merge into one input stream.
-  OP_GlobalAggregate   = 18,   // global merge for the multi-way data sources.
-  OP_Filter            = 19,
-  OP_Distinct          = 20,
-  OP_Join              = 21,
-  OP_StateWindow       = 22,
-  OP_AllTimeWindow     = 23,
-  OP_AllMultiTableTimeInterval = 24,
-  OP_Order             = 25,
-};
-
 typedef struct SOperatorInfo {
   uint8_t               operatorType;
   bool                  blockingOptr;  // block operator or not

source/libs/function/src/taggfunction.c

@@ -4589,7 +4589,7 @@ SAggFunctionInfo aggFunc[35] = {{
                           },
                           {
                               // 16
-                              "ts",
+                              "dummy",
                               FUNCTION_TYPE_AGG,
                               FUNCTION_TS,
                               FUNCTION_TS,

source/libs/function/src/texpr.c

@@ -13,6 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "function.h"
 #include "os.h"
 
 #include "exception.h"
@@ -550,6 +551,15 @@ tExprNode* exprdup(tExprNode* pNode) {
   } else if (pNode->nodeType == TEXPR_COL_NODE) {
     pCloned->pSchema = calloc(1, sizeof(SSchema));
     *pCloned->pSchema = *pNode->pSchema;
+  } else if (pNode->nodeType == TEXPR_FUNCTION_NODE) {
+    strcpy(pCloned->_function.functionName, pNode->_function.functionName);
+
+    int32_t num = pNode->_function.num;
+    pCloned->_function.num = num;
+    pCloned->_function.pChild = calloc(num, POINTER_BYTES);
+    for(int32_t i = 0; i < num; ++i) {
+      pCloned->_function.pChild[i] = exprdup(pNode->_function.pChild[i]);
+    }
   }
 
   pCloned->nodeType = pNode->nodeType;

source/libs/function/src/tfunction.c

@@ -54,6 +54,18 @@ bool qIsAggregateFunction(const char* functionName) {
   return !scalarfunc;
 }
 
+bool qIsSelectivityFunction(const char* functionName) {
+  assert(functionName != NULL);
+  pthread_once(&functionHashTableInit, doInitFunctionHashTable);
+
+  size_t len = strlen(functionName);
+  SAggFunctionInfo** pInfo = taosHashGet(functionHashTable, functionName, len);
+  if (pInfo != NULL) {
+    return ((*pInfo)->status | FUNCSTATE_SELECTIVITY) != 0;
+  }
+
+  return false;
+}
 
 SAggFunctionInfo* qGetFunctionInfo(const char* name, int32_t len) {
   pthread_once(&functionHashTableInit, doInitFunctionHashTable);
@@ -79,16 +91,17 @@ void qRemoveUdfInfo(uint64_t id, SUdfInfo* pUdfInfo) {
 bool isTagsQuery(SArray* pFunctionIdList) {
   int32_t num = (int32_t) taosArrayGetSize(pFunctionIdList);
   for (int32_t i = 0; i < num; ++i) {
-    int16_t f = *(int16_t*) taosArrayGet(pFunctionIdList, i);
+    char* f = *(char**) taosArrayGet(pFunctionIdList, i);
+
+    // todo handle count(tbname) query
+    if (strcmp(f, "project") != 0 && strcmp(f, "count") != 0) {
+      return false;
+    }
 
     // "select count(tbname)" query
 //    if (functId == FUNCTION_COUNT && pExpr->base.colpDesc->colId == TSDB_TBNAME_COLUMN_INDEX) {
 //      continue;
 //    }
-
-    if (f != FUNCTION_TAGPRJ && f != FUNCTION_TID_TAG) {
-      return false;
-    }
   }
 
   return true;
@@ -113,23 +126,13 @@ bool isTagsQuery(SArray* pFunctionIdList) {
 bool isProjectionQuery(SArray* pFunctionIdList) {
   int32_t num = (int32_t) taosArrayGetSize(pFunctionIdList);
   for (int32_t i = 0; i < num; ++i) {
-    int32_t f = *(int16_t*) taosArrayGet(pFunctionIdList, i);
-    if (f == FUNCTION_TS_DUMMY) {
-      continue;
-    }
-
-    if (f != FUNCTION_PRJ &&
-        f != FUNCTION_TAGPRJ &&
-        f != FUNCTION_TAG &&
-        f != FUNCTION_TS &&
-        f != FUNCTION_ARITHM &&
-        f != FUNCTION_DIFF &&
-        f != FUNCTION_DERIVATIVE) {
-      return false;
+    char* f = *(char**) taosArrayGet(pFunctionIdList, i);
+    if (strcmp(f, "project") == 0) {
+      return true;
     }
   }
 
-  return true;
+  return false;
 }
 
 bool isDiffDerivativeQuery(SArray* pFunctionIdList) {
@@ -182,30 +185,19 @@ bool isArithmeticQueryOnAggResult(SArray* pFunctionIdList) {
   return false;
 }
 
-bool isGroupbyColumn(SArray* pFunctionIdList) {
-//  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
-//  int32_t         numOfCols = getNumOfColumns(pTableMetaInfo->pTableMeta);
-//
-//  SGroupbyExpr* pGroupbyExpr = &pQueryInfo->groupbyExpr;
-//  for (int32_t k = 0; k < pGroupbyExpr->numOfGroupCols; ++k) {
-//    SColIndex* pIndex = taosArrayGet(pGroupbyExpr->columnInfo, k);
-//    if (!TSDB_COL_IS_TAG(pIndex->flag) && pIndex->colIndex < numOfCols) {  // group by normal columns
-//      return true;
-//    }
-//  }
-
-  return false;
+bool isGroupbyColumn(SGroupbyExpr* pGroupby) {
+  return !pGroupby->groupbyTag;
 }
 
 bool isTopBotQuery(SArray* pFunctionIdList) {
   int32_t num = (int32_t) taosArrayGetSize(pFunctionIdList);
   for (int32_t i = 0; i < num; ++i) {
-    int32_t f = *(int16_t*) taosArrayGet(pFunctionIdList, i);
-    if (f == FUNCTION_TS) {
+    char* f = *(char**) taosArrayGet(pFunctionIdList, i);
+    if (strcmp(f, "project") == 0) {
       continue;
     }
 
-    if (f == FUNCTION_TOP || f == FUNCTION_BOTTOM) {
+    if (strcmp(f, "top") == 0 || strcmp(f, "bottom") == 0) {
       return true;
     }
   }
@@ -284,49 +276,26 @@ bool needReverseScan(SArray* pFunctionIdList) {
   return false;
 }
 
-bool isSimpleAggregateRv(SArray* pFunctionIdList) {
-//  if (pQueryInfo->interval.interval > 0 || pQueryInfo->sessionWindow.gap > 0) {
-//    return false;
-//  }
-//
-//  if (tscIsDiffDerivQuery(pQueryInfo)) {
-//    return false;
-//  }
-//
-//  size_t numOfExprs = getNumOfExprs(pQueryInfo);
-//  for (int32_t i = 0; i < numOfExprs; ++i) {
-//    SExprInfo* pExpr = getExprInfo(pQueryInfo, i);
-//    if (pExpr == NULL) {
-//      continue;
-//    }
-//
-//    int32_t functionId = pExpr->base.functionId;
-//    if (functionId < 0) {
-//      SUdfInfo* pUdfInfo = taosArrayGet(pQueryInfo->pUdfInfo, -1 * functionId - 1);
-//      if (pUdfInfo->funcType == TSDB_UDF_TYPE_AGGREGATE) {
-//        return true;
-//      }
-//
-//      continue;
-//    }
-//
-//    if (functionId == FUNCTION_TS || functionId == FUNCTION_TS_DUMMY) {
-//      continue;
-//    }
-//
-//    if ((!IS_MULTIOUTPUT(aAggs[functionId].status)) ||
-//        (functionId == FUNCTION_TOP || functionId == FUNCTION_BOTTOM || functionId == FUNCTION_TS_COMP)) {
-//      return true;
-//    }
-//  }
+bool isAgg(SArray* pFunctionIdList) {
+  size_t size = taosArrayGetSize(pFunctionIdList);
+  for (int32_t i = 0; i < size; ++i) {
+    char* f = *(char**) taosArrayGet(pFunctionIdList, i);
+    if (strcmp(f, "project") == 0) {
+      return false;
+    }
+
+    if (qIsAggregateFunction(f)) {
+      return true;
+    }
+  }
 
   return false;
 }
 
 bool isBlockDistQuery(SArray* pFunctionIdList) {
   int32_t num = (int32_t) taosArrayGetSize(pFunctionIdList);
-  int32_t f = *(int16_t*) taosArrayGet(pFunctionIdList, 0);
-  return (num == 1 && f == FUNCTION_BLKINFO);
+  char* f = *(char**) taosArrayGet(pFunctionIdList, 0);
+  return (num == 1 && strcmp(f, "block_dist") == 0);
 }
 
 bool isTwoStageSTableQuery(SArray* pFunctionIdList, int32_t tableIndex) {
@@ -432,13 +401,14 @@ bool hasTagValOutput(SArray* pFunctionIdList) {
 void extractFunctionDesc(SArray* pFunctionIdList, SMultiFunctionsDesc* pDesc) {
   assert(pFunctionIdList != NULL);
 
-
   pDesc->blockDistribution = isBlockDistQuery(pFunctionIdList);
   if (pDesc->blockDistribution) {
     return;
   }
 
-  pDesc->projectionQuery = isProjectionQuery(pFunctionIdList);
-  pDesc->onlyTagQuery    = isTagsQuery(pFunctionIdList);
+//  pDesc->projectionQuery = isProjectionQuery(pFunctionIdList);
+//  pDesc->onlyTagQuery    = isTagsQuery(pFunctionIdList);
   pDesc->interpQuery     = isInterpQuery(pFunctionIdList);
+  pDesc->topbotQuery     = isTopBotQuery(pFunctionIdList);
+  pDesc->agg             = isAgg(pFunctionIdList);
 }

source/libs/parser/inc/astGenerator.h

@@ -294,7 +294,10 @@ SCreateTableSql *tSetCreateTableInfo(SArray *pCols, SArray *pTags, SSqlNode *pSe
 SAlterTableInfo * tSetAlterTableInfo(SToken *pTableName, SArray *pCols, SArray *pVals, int32_t type, int16_t tableType);
 SCreatedTableInfo createNewChildTableInfo(SToken *pTableName, SArray *pTagNames, SArray *pTagVals, SToken *pToken,
                                           SToken *igExists);
-
+/*!
+ * test
+ * @param pSqlNode
+ */
 void destroyAllSqlNode(struct SSubclause *pSqlNode);
 void destroySqlNode(SSqlNode *pSql);
 void freeCreateTableInfo(void* p);

source/libs/parser/src/astGenerator.c

@@ -59,8 +59,7 @@ SArray *tListItemAppendToken(SArray *pList, SToken *pAliasToken, uint8_t sortOrd
 
   if (pAliasToken) {
     SListItem item;
-    assert(0);
-//    taosVariantCreate(&item.pVar, pAliasToken);
+    taosVariantCreate(&item.pVar, pAliasToken->z, pAliasToken->n, pAliasToken->type);
     item.sortOrder = sortOrder;
 
     taosArrayPush(pList, &item);

source/libs/parser/src/queryInfoUtil.c

@@ -223,7 +223,7 @@ void addExprInfoParam(SSqlExpr* pExpr, char* argument, int32_t type, int32_t byt
 }
 
 int32_t getExprFunctionId(SExprInfo *pExprInfo) {
-  assert(pExprInfo != NULL && pExprInfo->pExpr != NULL && pExprInfo->pExpr->nodeType == TEXPR_UNARYEXPR_NODE);
+  assert(pExprInfo != NULL && pExprInfo->pExpr != NULL && pExprInfo->pExpr->nodeType == TEXPR_FUNCTION_NODE);
   return 0;
 }
 
@@ -324,10 +324,17 @@ SArray* extractFunctionList(SArray* pExprInfoList) {
   assert(pExprInfoList != NULL);
 
   size_t len = taosArrayGetSize(pExprInfoList);
-  SArray* p = taosArrayInit(len, sizeof(int32_t));
+  SArray* p = taosArrayInit(len, POINTER_BYTES);
+
   for(int32_t i = 0; i < len; ++i) {
     SExprInfo* pExprInfo = taosArrayGetP(pExprInfoList, i);
-    taosArrayPush(p, &pExprInfo->pExpr->_function.functionName);
+    if (pExprInfo->pExpr->nodeType == TEXPR_FUNCTION_NODE) {
+      char* name = strdup(pExprInfo->pExpr->_function.functionName);
+      taosArrayPush(p, &name);
+    } else {
+      char* name = strdup("project");
+      taosArrayPush(p, &name);
+    }
   }
 
   return p;
@@ -350,11 +357,16 @@ bool tscHasColumnFilter(SQueryStmtInfo* pQueryInfo) {
   return false;
 }
 
-//void tscClearInterpInfo(SQueryStmtInfo* pQueryInfo) {
-//  if (!tscIsPointInterpQuery(pQueryInfo)) {
-//    return;
-//  }
-//
-//  pQueryInfo->fillType = TSDB_FILL_NONE;
-//  tfree(pQueryInfo->fillVal);
-//}
\ No newline at end of file
+int32_t getExprFunctionLevel(SQueryStmtInfo* pQueryInfo) {
+  int32_t n = 10;
+
+  int32_t level = 0;
+  for(int32_t i = 0; i < n; ++i) {
+    SArray* pList = pQueryInfo->exprList[i];
+    if (taosArrayGetSize(pList) > 0) {
+      level += 1;
+    }
+  }
+
+  return level;
+}
\ No newline at end of file

source/libs/parser/test/parserTests.cpp

@@ -16,6 +16,7 @@
 #include <function.h>
 #include <gtest/gtest.h>
 #include <iostream>
+#include "tglobal.h"
 #pragma GCC diagnostic ignored "-Wwrite-strings"
 
 #pragma GCC diagnostic ignored "-Wunused-function"
@@ -398,6 +399,7 @@ TEST(testCase, function_Test5) {
 TEST(testCase, function_Test10) {
   sqlCheck("select c from `t.1abc`", true);
   sqlCheck("select length(c) from `t.1abc`", true);
+  sqlCheck("select length(sum(col)) from `t.1abc`", true);
   sqlCheck("select sum(length(a+b)) from `t.1abc`", true);
   sqlCheck("select sum(sum(a+b)) from `t.1abc`", false);
   sqlCheck("select sum(length(a) + length(b)) from `t.1abc`", true);
@@ -406,12 +408,27 @@ TEST(testCase, function_Test10) {
   sqlCheck("select cov(a, b) from `t.1abc`", true);
   sqlCheck("select sum(length(a) + count(b)) from `t.1abc`", false);
 
+  sqlCheck("select concat(sum(a), count(b)) from `t.1abc`", true);
+
   sqlCheck("select concat(concat(a,b), concat(a,b)) from `t.1abc`", true);
   sqlCheck("select length(length(length(a))) from `t.1abc`", true);
   sqlCheck("select count() from `t.1abc`", false);
   sqlCheck("select block_dist() from `t.1abc`", true);
   sqlCheck("select block_dist(a) from `t.1abc`", false);
   sqlCheck("select count(*) from `t.1abc` interval(1s) group by a", false);
+
+  /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+  sqlCheck("select length119(a,b) from `t.1abc`", false);
+  sqlCheck("select length(a, b) from `t.1abc`", false);
+  sqlCheck("select block_dist() + 20 from `t.1abc`", true);
+  sqlCheck("select count(b), c from `t.1abc`", false);
+  sqlCheck("select top(a, 20), count(b) from `t.1abc`", false);
+  sqlCheck("select top(a, 20), b from `t.1abc`", false);
+  sqlCheck("select top(a, 20), a+20 from `t.1abc`", true);
+//  sqlCheck("select top(a, 20), bottom(a, 10) from `t.1abc`", false);
+//  sqlCheck("select last_row(*), count(b) from `t.1abc`", false);
+//  sqlCheck("select last_row(a, b) + 20 from `t.1abc`", false);
+//  sqlCheck("select last_row(count(*)) from `t.1abc`", false);
 }
 
 TEST(testCase, function_Test6) {
@@ -441,9 +458,14 @@ TEST(testCase, function_Test6) {
   ASSERT_EQ(ret, 0);
 
   SArray* pExprList = pQueryInfo->exprList[0];
-  ASSERT_EQ(taosArrayGetSize(pExprList), 5);
+  if (tsCompatibleModel) {
+      ASSERT_EQ(taosArrayGetSize(pExprList), 6);
+  } else {
+      ASSERT_EQ(taosArrayGetSize(pExprList), 5);
+  }
 
-  SExprInfo* p1 = (SExprInfo*)taosArrayGetP(pExprList, 0);
+  int32_t index = tsCompatibleModel? 1:0;
+  SExprInfo* p1 = (SExprInfo*)taosArrayGetP(pExprList, index);
   ASSERT_EQ(p1->base.pColumns->uid, 110);
   ASSERT_EQ(p1->base.numOfParams, 0);
   ASSERT_EQ(p1->base.resSchema.type, TSDB_DATA_TYPE_DOUBLE);
@@ -461,9 +483,12 @@ TEST(testCase, function_Test6) {
   ASSERT_STREQ(pParam->pSchema->name, "t.1abc.a+b");
 
   ASSERT_EQ(taosArrayGetSize(pQueryInfo->colList), 3);
-  ASSERT_EQ(pQueryInfo->fieldsInfo.numOfOutput, 5);
 
-  SExprInfo* p2 = (SExprInfo*)taosArrayGetP(pExprList, 1);
+  int32_t numOfResCol = tsCompatibleModel? 6:5;
+  ASSERT_EQ(pQueryInfo->fieldsInfo.numOfOutput, numOfResCol);
+
+  index = tsCompatibleModel? 2:1;
+  SExprInfo* p2 = (SExprInfo*)taosArrayGetP(pExprList, index);
   ASSERT_EQ(p2->base.pColumns->uid, 110);
   ASSERT_EQ(p2->base.numOfParams, 0);
   ASSERT_EQ(p2->base.resSchema.type, TSDB_DATA_TYPE_DOUBLE);
@@ -511,9 +536,10 @@ TEST(testCase, function_Test6) {
   ASSERT_EQ(ret, 0);
 
   SArray* pExprList = pQueryInfo->exprList[0];
-  ASSERT_EQ(taosArrayGetSize(pExprList), 2);
+  ASSERT_EQ(taosArrayGetSize(pExprList), 3);
 
-  SExprInfo* p1 = (SExprInfo*) taosArrayGetP(pExprList, 0);
+  int32_t index = tsCompatibleModel? 1:0;
+  SExprInfo* p1 = (SExprInfo*) taosArrayGetP(pExprList, index);
   ASSERT_EQ(p1->base.pColumns->uid, 110);
   ASSERT_EQ(p1->base.numOfParams, 0);
   ASSERT_EQ(p1->base.resSchema.type, TSDB_DATA_TYPE_BIGINT);
@@ -537,7 +563,9 @@ TEST(testCase, function_Test6) {
   ASSERT_EQ(pParam->pSchema->colId, p2->base.resSchema.colId);
 
   ASSERT_EQ(taosArrayGetSize(pQueryInfo->colList), 3);
-  ASSERT_EQ(pQueryInfo->fieldsInfo.numOfOutput, 2);
+
+  int32_t numOfCols = tsCompatibleModel? 3:2;
+  ASSERT_EQ(pQueryInfo->fieldsInfo.numOfOutput, numOfCols);
 
   destroyQueryInfo(pQueryInfo);
   qParserClearupMetaRequestInfo(&req);

source/libs/parser/test/plannerTest.cpp

@@ -15,6 +15,7 @@
 
 #include <function.h>
 #include <gtest/gtest.h>
+#include <tglobal.h>
 #include <iostream>
 #pragma GCC diagnostic ignored "-Wwrite-strings"
 
@@ -63,7 +64,6 @@ void setTableMetaInfo(SQueryStmtInfo* pQueryInfo, SMetaReq *req) {
   setSchema(&pSchema[1], TSDB_DATA_TYPE_INT, 4, "a", 1);
   setSchema(&pSchema[2], TSDB_DATA_TYPE_DOUBLE, 8, "b", 2);
   setSchema(&pSchema[3], TSDB_DATA_TYPE_DOUBLE, 8, "col", 3);
-
 }
 
 void generateLogicplan(const char* sql) {
@@ -132,7 +132,9 @@ TEST(testCase, planner_test) {
   ASSERT_EQ(ret, 0);
 
   SArray* pExprList = pQueryInfo->exprList[0];
-  ASSERT_EQ(taosArrayGetSize(pExprList), 2);
+
+  int32_t num = tsCompatibleModel? 2:1;
+  ASSERT_EQ(taosArrayGetSize(pExprList), num);
 
   SExprInfo* p1 = (SExprInfo*) taosArrayGetP(pExprList, 1);
   ASSERT_EQ(p1->base.pColumns->uid, 110);
@@ -172,6 +174,7 @@ TEST(testCase, displayPlan) {
   generateLogicplan("select count(A+B) from `t.1abc` group by a");
   generateLogicplan("select count(length(a)+b) from `t.1abc` group by a");
   generateLogicplan("select count(*) from `t.1abc` interval(10s, 5s) sliding(7s)");
+  generateLogicplan("select count(*) from `t.1abc` interval(10s, 5s) sliding(7s) order by 1 desc ");
   generateLogicplan("select count(*),sum(a),avg(b),min(a+b)+99 from `t.1abc`");
   generateLogicplan("select count(*), min(a) + 99 from `t.1abc`");
   generateLogicplan("select count(length(count(*) + 22)) from `t.1abc`");
@@ -179,14 +182,17 @@ TEST(testCase, displayPlan) {
   generateLogicplan("select count(*), first(a), last(b) from `t.1abc` state_window(a)");
   generateLogicplan("select count(*), first(a), last(b) from `t.1abc` session(ts, 20s)");
 
-  // order by + group by column + limit offset + fill
+  // order by + group by column + limit offset
+  generateLogicplan("select top(a, 20) k from `t.1abc` order by k asc limit 3 offset 1");
 
+  // fill
+  generateLogicplan("select min(a) from `t.1abc` where ts>now and ts<now+2h interval(1s) fill(linear)");
 
-  // join
+  // union + union all
 
 
-  // union
 
+  // join
 
   // Aggregate(count(*) [count(*) #5056], sum(a) [sum(a) #5057], avg(b) [avg(b) #5058], min(a+b) [min(a+b) #5060])
   // Projection(cols: [a+b #5059]) filters:(nil)

source/libs/planner/inc/plannerInt.h

@@ -26,18 +26,26 @@ extern "C" {
 #include "taosmsg.h"
 
 typedef struct SQueryNodeBasicInfo {
-  int32_t   type;
-  char     *name;
+  int32_t   type;          // operator type
+  char     *name;          // operator name
 } SQueryNodeBasicInfo;
 
+typedef struct SQueryDistPlanNodeInfo {
+  bool      stableQuery;   // super table query or not
+  int32_t   phase;         // merge|partial
+  int32_t   type;          // operator type
+  char     *name;          // operator name
+  SEpSet   *sourceEp;      // data source epset
+} SQueryDistPlanNodeInfo;
+
 typedef struct SQueryTableInfo {
-  char     *tableName;
-  uint64_t  uid;
+  char       *tableName;
+  uint64_t    uid;
+  STimeWindow window;
 } SQueryTableInfo;
 
 typedef struct SQueryPlanNode {
   SQueryNodeBasicInfo info;
-  SQueryTableInfo     tableInfo;
   SSchema            *pSchema;      // the schema of the input SSDatablock
   int32_t             numOfCols;    // number of input columns
   SArray             *pExpr;        // the query functions or sql aggregations
@@ -51,9 +59,49 @@ typedef struct SQueryPlanNode {
 
 typedef struct SQueryDistPlanNode {
   SQueryNodeBasicInfo info;
+  SSchema            *pSchema;      // the schema of the input SSDatablock
+  int32_t             numOfCols;    // number of input columns
+  SArray             *pExpr;        // the query functions or sql aggregations
+  int32_t             numOfExpr;    // number of result columns, which is also the number of pExprs
+  void               *pExtInfo;     // additional information
 
+  // previous operator to generated result for current node to process
+  // in case of join, multiple prev nodes exist.
+  SArray             *pPrevNodes;   // upstream nodes, or exchange operator to load data from multiple sources.
 } SQueryDistPlanNode;
 
+typedef struct SQueryCostSummary {
+  int64_t startTs;      // Object created and added into the message queue
+  int64_t endTs;        // the timestamp when the task is completed
+  int64_t cputime;      // total cpu cost, not execute elapsed time
+
+  int64_t loadRemoteDataDuration;       // remote io time
+  int64_t loadNativeDataDuration;       // native disk io time
+
+  uint64_t loadNativeData; // blocks + SMA + header files
+  uint64_t loadRemoteData; // remote data acquired by exchange operator.
+
+  uint64_t waitDuration; // the time to waiting to be scheduled in queue does matter, so we need to record it
+  int64_t  addQTs;       // the time to be added into the message queue, used to calculate the waiting duration in queue.
+
+  uint64_t totalRows;
+  uint64_t loadRows;
+  uint32_t totalBlocks;
+  uint32_t loadBlocks;
+  uint32_t loadBlockAgg;
+  uint32_t skipBlocks;
+  uint64_t resultSize;   // generated result size in Kb.
+} SQueryCostSummary;
+
+typedef struct SQueryTask {
+  uint64_t            queryId; // query id
+  uint64_t            taskId;  // task id
+  SQueryDistPlanNode *pNode;   // operator tree
+  uint64_t            status;  // task status
+  SQueryCostSummary   summary; // task execution summary
+  void               *pOutputHandle; // result buffer handle, to temporarily keep the output result for next stage
+} SQueryTask;
+
 #ifdef __cplusplus
 }
 #endif

source/util/src/terror.c

@@ -86,6 +86,9 @@ TAOS_DEFINE_ERROR(TSDB_CODE_REF_INVALID_ID,               "Invalid Ref ID")
 TAOS_DEFINE_ERROR(TSDB_CODE_REF_ALREADY_EXIST,            "Ref is already there")
 TAOS_DEFINE_ERROR(TSDB_CODE_REF_NOT_EXIST,                "Ref is not there")
 
+TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_VERSION_NUMBER,       "Invalid version number")
+TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_VERSION_STRING,       "Invalid version string")
+TAOS_DEFINE_ERROR(TSDB_CODE_VERSION_NOT_COMPATIBLE,       "Version not compatible")
 
 //client
 TAOS_DEFINE_ERROR(TSDB_CODE_TSC_INVALID_OPERATION,        "Invalid operation")

source/util/src/tversion.c

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define _DEFAULT_SOURCE
+#include "os.h"
+#include "taoserror.h"
+#include "tdef.h"
+#include "ulog.h"
+
+int32_t taosVersionStrToInt(const char *vstr, int32_t *vint) {
+  if (vstr == NULL) {
+    terrno = TSDB_CODE_INVALID_VERSION_STRING;
+    return -1;
+  }
+
+  int32_t vnum[4] = {0};
+  int32_t len = strlen(vstr);
+  char    tmp[16] = {0};
+
+  for (int32_t spos = 0, tpos = 0, vpos = 0; spos < len && vpos < 4; ++spos) {
+    if (vstr[spos] != '.') {
+      tmp[spos - tpos] = vstr[spos];
+    } else {
+      vnum[vpos] = atoi(tmp);
+      memset(tmp, 0, sizeof(tmp));
+      vpos++;
+      tpos = spos + 1;
+    }
+  }
+
+  if (vnum[0] <= 0) {
+    terrno = TSDB_CODE_INVALID_VERSION_STRING;
+    return -1;
+  }
+
+  *vint = vnum[0] * 1000000 + vnum[1] * 10000 + vnum[2] * 100 + vnum[3];
+  return 0;
+}
+
+int32_t taosVersionIntToStr(int32_t vint, char *vstr, int32_t len) {
+  int32_t s1 = (vint % 100000000) / 1000000;
+  int32_t s2 = (vint % 1000000) / 10000;
+  int32_t s3 = (vint % 10000) / 100;
+  int32_t s4 = vint % 100;
+  if (s1 <= 0) {
+    terrno = TSDB_CODE_INVALID_VERSION_NUMBER;
+    return -1;
+  }
+
+  snprintf(vstr, len, "%02d.%02d.%02d.%02d", s1, s2, s3, s4);
+  return 0;
+}
+
+int32_t taosCheckVersionCompatible(int32_t clientVer, int32_t serverVer, int32_t comparedSegments) {
+  switch (comparedSegments) {
+    case 4:
+      break;
+    case 3:
+      clientVer %= 100;
+      serverVer %= 100;
+      break;
+    case 2:
+      clientVer %= 10000;
+      serverVer %= 10000;
+      break;
+    case 1:
+      clientVer %= 1000000;
+      serverVer %= 1000000;
+      break;
+    default:
+      terrno = TSDB_CODE_INVALID_VERSION_NUMBER;
+      return -1;
+  }
+
+  if (clientVer == serverVer) {
+    return 0;
+  } else {
+    terrno = TSDB_CODE_VERSION_NOT_COMPATIBLE;
+    return -1;
+  }
+}