Merge branch '2.0' of https://github.com/taosdata/TDengine into 2.0

src/CMakeLists.txt

@@ -4,11 +4,11 @@ PROJECT(TDengine)
 ADD_SUBDIRECTORY(os)
 ADD_SUBDIRECTORY(util)
 ADD_SUBDIRECTORY(rpc)
-#ADD_SUBDIRECTORY(client)
-#ADD_SUBDIRECTORY(kit)
-#ADD_SUBDIRECTORY(plugins)
-#ADD_SUBDIRECTORY(sdb)
-#ADD_SUBDIRECTORY(mnode)
-#ADD_SUBDIRECTORY(dnode)
+ADD_SUBDIRECTORY(client)
+ADD_SUBDIRECTORY(kit)
+ADD_SUBDIRECTORY(plugins)
+ADD_SUBDIRECTORY(sdb)
+ADD_SUBDIRECTORY(mnode)
+ADD_SUBDIRECTORY(dnode)
 #ADD_SUBDIRECTORY(vnode)
 #ADD_SUBDIRECTORY(connector/jdbc)

src/client/src/tscServer.c

@@ -57,7 +57,7 @@ void tscPrintMgmtIp() {
     tscError("invalid mgmt IP list:%d", tscMgmtIpList.numOfIps);
   } else {
     for (int i = 0; i < tscMgmtIpList.numOfIps; ++i) {
-      tscTrace("mgmt index:%d ip:%s", i, tscMgmtIpList.ipStr[i]);
+      tscTrace("mgmt index:%d ip:%d", i, tscMgmtIpList.ip[i]);
     }
   }
 }
@@ -66,7 +66,7 @@ void tscSetMgmtIpListFromCluster(SIpList *pIpList) {
   tscMgmtIpList.numOfIps = pIpList->numOfIps;
   if (memcmp(tscMgmtIpList.ip, pIpList->ip, pIpList->numOfIps * 4) != 0) {
     for (int i = 0; i < pIpList->numOfIps; ++i) {
-      tinet_ntoa(tscMgmtIpList.ipStr[i], pIpList->ip[i]);
+      //tinet_ntoa(tscMgmtIpList.ipStr[i], pIpList->ip[i]);
       tscMgmtIpList.ip[i] = pIpList->ip[i];
     }
     tscTrace("cluster mgmt IP list:");
@@ -77,9 +77,7 @@ void tscSetMgmtIpListFromCluster(SIpList *pIpList) {
 void tscSetMgmtIpListFromEdge() {
   if (tscMgmtIpList.numOfIps != 2) {
     tscMgmtIpList.numOfIps = 2;
-    strcpy(tscMgmtIpList.ipStr[0], tsMasterIp);
     tscMgmtIpList.ip[0] = inet_addr(tsMasterIp);
-    strcpy(tscMgmtIpList.ipStr[1], tsMasterIp);
     tscMgmtIpList.ip[1] = inet_addr(tsMasterIp);
     tscTrace("edge mgmt IP list:");
     tscPrintMgmtIp();
@@ -351,17 +349,14 @@ int tscSendMsgToServer(SSqlObj *pSql) {
       uint64_t signature = (uint64_t)pSql->signature;
       //if (tscUpdateVnodeMsg[pSql->cmd.command]) (*tscUpdateVnodeMsg[pSql->cmd.command])(pSql, pStart);
 
-      int ret;
-      if (pSql->cmd.command < TSDB_SQL_MGMT)
-        ret = rpcSendRequest(pTscMgmtConn, pSql->cmd.msgType, pStart, pSql->cmd.payloadLen, pSql);
-      else
-        ret = rpcSendRequest(pVnodeConn, pSql->cmd.msgType, pStart, pSql->cmd.payloadLen, pSql);
-
-      if (ret >= 0) {
-        code = 0;
+      if (pSql->cmd.command < TSDB_SQL_MGMT) {
+        rpcSendRequest(pTscMgmtConn, tscMgmtIpList, pSql->cmd.msgType, pStart, pSql->cmd.payloadLen, pSql);
+      } else {
+        SRpcIpSet rpcSet = tscMgmtIpList;
+        rpcSendRequest(pVnodeConn, rpcSet, pSql->cmd.msgType, pStart, pSql->cmd.payloadLen, pSql);
       }
 
-      tscTrace("%p send msg ret:%d code:%d sig:%p", pSql, ret, code, signature);
+      tscTrace("%p send msg code:%d sig:%p", pSql, code, signature);
     }
   }
 
@@ -1327,7 +1322,7 @@ void tscKillMetricQuery(SSqlObj *pSql) {
      * sub-queries not correctly released and master sql object of metric query reaches an abnormal state.
      */
     pSql->pSubs[i]->res.code = TSDB_CODE_QUERY_CANCELLED;
-    taosStopRpcConn(pSql->pSubs[i]->thandle);
+    //taosStopRpcConn(pSql->pSubs[i]->thandle);
   }
 
   pSql->numOfSubs = 0;
@@ -1491,9 +1486,9 @@ void tscUpdateVnodeInSubmitMsg(SSqlObj *pSql, char *buf) {
   pMsg = buf + tsRpcHeadSize;
 
   pShellMsg = (SShellSubmitMsg *)pMsg;
-  pShellMsg->vnode = htons(pMeterMeta->vpeerDesc[pSql->index].vnode);
-  tscTrace("%p update submit msg vnode:%s:%d", pSql, taosIpStr(pMeterMeta->vpeerDesc[pSql->index].ip),
-           htons(pShellMsg->vnode));
+  //pShellMsg->vnode = htons(pMeterMeta->vpeerDesc[pSql->index].vnode);
+  //tscTrace("%p update submit msg vnode:%s:%d", pSql, taosIpStr(pMeterMeta->vpeerDesc[pSql->index].ip),
+  //         htons(pShellMsg->vnode));
 }
 
 int tscBuildSubmitMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
@@ -1511,13 +1506,13 @@ int tscBuildSubmitMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   pShellMsg = (SShellSubmitMsg *)pMsg;
 
   pShellMsg->import = htons(TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_INSERT) ? 0 : 1);
-  pShellMsg->vnode = htons(pMeterMeta->vpeerDesc[pMeterMeta->index].vnode);
+  //pShellMsg->vnode = htons(pMeterMeta->vpeerDesc[pMeterMeta->index].vnode);
   pShellMsg->numOfSid = htonl(pSql->cmd.numOfTablesInSubmit);  // number of meters to be inserted
 
   // pSql->cmd.payloadLen is set during parse sql routine, so we do not use it here
   pSql->cmd.msgType = TSDB_MSG_TYPE_DNODE_SUBMIT;
-  tscTrace("%p update submit msg vnode:%s:%d", pSql, taosIpStr(pMeterMeta->vpeerDesc[pMeterMeta->index].ip),
-           htons(pShellMsg->vnode));
+  //tscTrace("%p update submit msg vnode:%s:%d", pSql, taosIpStr(pMeterMeta->vpeerDesc[pMeterMeta->index].ip),
+  //         htons(pShellMsg->vnode));
   
   return TSDB_CODE_SUCCESS;
 }

src/client/src/tscSql.c

@@ -65,11 +65,8 @@ TAOS *taos_connect_imp(const char *ip, const char *user, const char *pass, const
 
   if (ip && ip[0]) {
     tscMgmtIpList.numOfIps = 3;
-    strcpy(tscMgmtIpList.ipStr[0], ip);
     tscMgmtIpList.ip[0] = inet_addr(ip);
-    strcpy(tscMgmtIpList.ipStr[1], tsMasterIp);
     tscMgmtIpList.ip[1] = inet_addr(tsMasterIp);
-    strcpy(tscMgmtIpList.ipStr[2], tsSecondIp);
     tscMgmtIpList.ip[2] = inet_addr(tsSecondIp);
     tscMgmtIpList.index = 0;
     tscMgmtIpList.port = tsMgmtShellPort;
@@ -907,7 +904,7 @@ void taos_stop_query(TAOS_RES *res) {
     return;
   }
 
-  taosStopRpcConn(pSql->thandle);
+  //taosStopRpcConn(pSql->thandle);
   tscTrace("%p query is cancelled", res);
 }
 

src/client/src/tscSystem.c

@@ -99,12 +99,10 @@ void taos_init_imp() {
   tscMgmtIpList.index = 0;
   tscMgmtIpList.port = tsMgmtShellPort;
   tscMgmtIpList.numOfIps = 1;
-  strcpy(tscMgmtIpList.ipStr[0], tsMasterIp);
   tscMgmtIpList.ip[0] = inet_addr(tsMasterIp);
 
   if (tsSecondIp[0]) {
     tscMgmtIpList.numOfIps = 2;
-    strcpy(tscMgmtIpList.ipStr[1], tsSecondIp);
     tscMgmtIpList.ip[1] = inet_addr(tsSecondIp);
   }
 
@@ -131,7 +129,7 @@ void taos_init_imp() {
   rpcInit.localPort = 0;
   rpcInit.label = "TSC-vnode";
   rpcInit.numOfThreads = tscNumOfThreads;
-  rpcInit.fp = tscProcessMsgFromServer;
+  rpcInit.afp = tscProcessMsgFromServer;
   rpcInit.sessions = tsMaxVnodeConnections;
   rpcInit.connType = TAOS_CONN_SOCKET_TYPE_C();
   pVnodeConn = rpcOpen(&rpcInit);
@@ -145,7 +143,7 @@ void taos_init_imp() {
   rpcInit.localPort = 0;
   rpcInit.label = "TSC-mgmt";
   rpcInit.numOfThreads = 1;
-  rpcInit.fp = tscProcessMsgFromServer;
+  rpcInit.afp = tscProcessMsgFromServer;
   rpcInit.sessions = tsMaxMgmtConnections;
   rpcInit.connType = TAOS_CONN_SOCKET_TYPE_C();
   pTscMgmtConn = rpcOpen(&rpcInit);

src/dnode/CMakeLists.txt

@@ -9,9 +9,8 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   INCLUDE_DIRECTORIES(inc)
   AUX_SOURCE_DIRECTORY(src SRC)
 
-  ADD_LIBRARY(dnode ${SRC})
-  #ADD_EXECUTABLE(taosd ${SRC})
-  #TARGET_LINK_LIBRARIES(taosd mnode sdb vnode taos_static monitor http)
+  ADD_EXECUTABLE(taosd ${SRC})
+  TARGET_LINK_LIBRARIES(taosd mnode sdb taos_static monitor http)
 
   #IF (TD_CLUSTER)
   #  TARGET_LINK_LIBRARIES(taosd dcluster)

src/dnode/src/dnodeShell.c

@@ -50,7 +50,7 @@ void* dnodeProcessMsgFromShell(int8_t msgType, void *pCont, int32_t contLen, voi
   }
 
   if (dnodeGetRunStatus() != TSDB_DNODE_RUN_STATUS_RUNING) {
-    rpcSendSimpleRsp(handle, TSDB_CODE_NOT_READY);
+    rpcSendResponse(handle, TSDB_CODE_NOT_READY, 0, 0);
     dTrace("conn:%p, query msg is ignored since dnode not running", handle);
     return NULL;
   }
@@ -83,7 +83,7 @@ int32_t dnodeInitShell() {
   rpcInit.localPort    = tsVnodeShellPort;
   rpcInit.label        = "DND-shell";
   rpcInit.numOfThreads = numOfThreads;
-  rpcInit.fp           = dnodeProcessMsgFromShell;
+  rpcInit.cfp           = dnodeProcessMsgFromShell;
   rpcInit.sessions     = TSDB_SESSIONS_PER_DNODE;
   rpcInit.connType     = TAOS_CONN_SOCKET_TYPE_S();
   rpcInit.idleTime     = tsShellActivityTimer * 2000;
@@ -118,7 +118,7 @@ void dnodeProcessQueryRequestCb(int code, void *pQInfo, void *pConn) {
   queryRsp->code    = htonl(code);
   queryRsp->qhandle = (uint64_t) (pQInfo);
 
-  rpcSendResponse(pConn, queryRsp, contLen);
+  rpcSendResponse(pConn, TSDB_CODE_SUCCESS, queryRsp, contLen);
 }
 
 static void dnodeProcessQueryRequest(int8_t *pCont, int32_t contLen, void *pConn) {
@@ -134,7 +134,7 @@ void dnodeProcessRetrieveRequestCb(int32_t code, void *pQInfo, void *pConn) {
 
   assert(pConn != NULL);
   if (code != TSDB_CODE_SUCCESS) {
-    rpcSendSimpleRsp(pConn, code);
+    rpcSendResponse(pConn, code, 0, 0);
     return;
   }
 
@@ -142,13 +142,13 @@ void dnodeProcessRetrieveRequestCb(int32_t code, void *pQInfo, void *pConn) {
   int32_t contLen = dnodeGetRetrieveDataSize(pQInfo);
   SRetrieveMeterRsp *retrieveRsp = (SRetrieveMeterRsp *) rpcMallocCont(contLen);
   if (retrieveRsp == NULL) {
-    rpcSendSimpleRsp(pConn, TSDB_CODE_SERV_OUT_OF_MEMORY);
+    rpcSendResponse(pConn, TSDB_CODE_SERV_OUT_OF_MEMORY, 0, 0);
     return;
   }
 
   code = dnodeGetRetrieveData(pQInfo, retrieveRsp);
   if (code != TSDB_CODE_SUCCESS) {
-    rpcSendSimpleRsp(pConn, TSDB_CODE_INVALID_QHANDLE);
+    rpcSendResponse(pConn, TSDB_CODE_INVALID_QHANDLE, 0, 0);
   }
 
   retrieveRsp->numOfRows = htonl(retrieveRsp->numOfRows);
@@ -156,7 +156,7 @@ void dnodeProcessRetrieveRequestCb(int32_t code, void *pQInfo, void *pConn) {
   retrieveRsp->offset    = htobe64(retrieveRsp->offset);
   retrieveRsp->useconds  = htobe64(retrieveRsp->useconds);
 
-  rpcSendResponse(pConn, retrieveRsp, contLen);
+  rpcSendResponse(pConn, TSDB_CODE_SUCCESS, retrieveRsp, contLen);
 }
 
 static void dnodeProcessRetrieveRequest(int8_t *pCont, int32_t contLen, void *pConn) {
@@ -170,14 +170,14 @@ void dnodeProcessShellSubmitRequestCb(SShellSubmitRspMsg *result, void *pConn) {
   assert(result != NULL);
 
   if (result->code != 0) {
-    rpcSendSimpleRsp(pConn, result->code);
+    rpcSendResponse(pConn, result->code, 0, 0);
     return;
   }
 
   int32_t contLen = sizeof(SShellSubmitRspMsg) + result->numOfFailedBlocks * sizeof(SShellSubmitRspBlock);
   SShellSubmitRspMsg *submitRsp = (SShellSubmitRspMsg *) rpcMallocCont(contLen);
   if (submitRsp == NULL) {
-    rpcSendSimpleRsp(pConn, TSDB_CODE_SERV_OUT_OF_MEMORY);
+    rpcSendResponse(pConn, TSDB_CODE_SERV_OUT_OF_MEMORY, 0, 0);
     return;
   }
 
@@ -202,7 +202,7 @@ void dnodeProcessShellSubmitRequestCb(SShellSubmitRspMsg *result, void *pConn) {
   submitRsp->failedRows        = htonl(submitRsp->failedRows);
   submitRsp->numOfFailedBlocks = htonl(submitRsp->numOfFailedBlocks);
 
-  rpcSendResponse(pConn, submitRsp, contLen);
+  rpcSendResponse(pConn, TSDB_CODE_SUCCESS, submitRsp, contLen);
 }
 
 static void dnodeProcessShellSubmitRequest(int8_t *pCont, int32_t contLen, void *pConn) {

src/dnode/src/dnodeVnodeMgmt.c

@@ -19,14 +19,34 @@
 #include "taoserror.h"
 #include "dnodeVnodeMgmt.h"
 
-EVnodeStatus dnodeGetVnodeStatus(int32_t vnode) {
-  return TSDB_VN_STATUS_MASTER;
+int32_t dnodeOpenVnodes() {
+  return 0;
+}
+
+int32_t dnodeCleanupVnodes() {
+  return 0;
 }
 
 bool dnodeCheckVnodeExist(int32_t vnode) {
   return true;
 }
 
+int32_t dnodeCreateVnode(int32_t vnode, SVPeersMsg *cfg) {
+  return 0;
+}
+
+int32_t dnodeDropVnode(int32_t vnode) {
+  return 0;
+}
+
+void* dnodeGetVnode(int vid) {
+  return NULL;
+}
+
+EVnodeStatus dnodeGetVnodeStatus(int32_t vnode) {
+  return TSDB_VN_STATUS_MASTER;
+}
+
 bool dnodeCheckTableExist(int32_t vnode, int32_t sid, int64_t uid) {
   return true;
 }

src/inc/mnode.h

@@ -152,9 +152,7 @@ typedef struct SSuperTableObj {
   int8_t   reserved[7];
   int8_t   updateEnd[1];
 
-
   pthread_rwlock_t rwLock;
-  struct SSuperTableObj *prev, *next;
   int16_t  nextColId;
 
   int8_t   *schema;
@@ -217,11 +215,11 @@ typedef struct _vg_obj {
   int32_t         lbIp;
   int32_t         lbTime;
   int8_t          lbStatus;
-  int8_t            reserved[16];
-  int8_t            updateEnd[1];
+  int8_t          reserved[16];
+  int8_t          updateEnd[1];
   struct _vg_obj *prev, *next;
   void *          idPool;
-  STabObj **      meterList;
+  void **         meterList;
 } SVgObj;
 
 typedef struct _db_obj {

src/kit/shell/CMakeLists.txt

@@ -2,6 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc)
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
 INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
 INCLUDE_DIRECTORIES(inc)

src/kit/taosdemo/CMakeLists.txt

@@ -3,6 +3,7 @@ PROJECT(TDengine)
 
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc)
 INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
 INCLUDE_DIRECTORIES(inc)
 

src/kit/taosdump/CMakeLists.txt

@@ -3,6 +3,7 @@ PROJECT(TDengine)
 
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc)
 INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
 INCLUDE_DIRECTORIES(inc)
 

src/mnode/CMakeLists.txt

@@ -11,7 +11,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   AUX_SOURCE_DIRECTORY(src SRC)
 
   ADD_LIBRARY(mnode ${SRC})
-  #TARGET_LINK_LIBRARIES(mnode trpc tutil sdb pthread)
+  TARGET_LINK_LIBRARIES(mnode trpc tutil sdb pthread)
 
   #IF (TD_CLUSTER)
   #  TARGET_LINK_LIBRARIES(mnode mcluster)

src/mnode/inc/mgmtDb.h

@@ -28,8 +28,6 @@ int mgmtUseDb(SConnObj *pConn, char *name);
 int mgmtAddVgroupIntoDb(SDbObj *pDb, SVgObj *pVgroup);
 int mgmtAddVgroupIntoDbTail(SDbObj *pDb, SVgObj *pVgroup);
 int mgmtRemoveVgroupFromDb(SDbObj *pDb, SVgObj *pVgroup);
-int mgmtAddMetricIntoDb(SDbObj *pDb, STabObj *pMetric);
-int mgmtRemoveMetricFromDb(SDbObj *pDb, STabObj *pMetric);
 int mgmtMoveVgroupToTail(SDbObj *pDb, SVgObj *pVgroup);
 int mgmtMoveVgroupToHead(SDbObj *pDb, SVgObj *pVgroup);
 int mgmtGetDbMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn);

src/mnode/inc/mgmtDnodeInt.h

@@ -38,8 +38,8 @@ int mgmtSendOneFreeVnodeMsg(SVnodeGid *pVnodeGid);
 char *taosBuildRspMsgToDnode(SDnodeObj *pObj, char type);
 char *taosBuildReqMsgToDnode(SDnodeObj *pObj, char type);
 
-extern int32_t (*mgmtSendSimpleRspToDnode)(int32_t msgType, int32_t code);
-extern int32_t (*mgmtSendMsgToDnode)(SDnodeObj *pObj, char *msg, int msgLen);
+extern int32_t (*mgmtSendSimpleRspToDnode)(void *pConn, int32_t msgType, int32_t code);
+extern int32_t (*mgmtSendMsgToDnode)(int8_t *pCont, int32_t contLen, int8_t msgType);
 extern int32_t (*mgmtInitDnodeInt)();
 extern void    (*mgmtCleanUpDnodeInt)();
 extern void    (*mgmtProcessDnodeStatus)(void *handle, void *tmrId);

src/mnode/inc/mgmtNormalTable.h

@@ -34,7 +34,7 @@ int32_t          mgmtDropNormalTableColumnByName(SNormalTableObj *pTable, char *
 SNormalTableObj* mgmtGetNormalTable(char *tableId);
 SSchema*        mgmtGetNormalTableSchema(SNormalTableObj *pTable);
 
-int8_t *         mgmtBuildCreateNormalTableMsg(SNormalTableObj *pTable, int8_t *pMsg, int32_t vnode);
+int8_t *         mgmtBuildCreateNormalTableMsg(SNormalTableObj *pTable, int32_t vnode);
 
 #ifdef __cplusplus
 }

src/mnode/inc/mgmtTable.h

@@ -33,6 +33,7 @@ typedef struct {
 
 int      mgmtInitMeters();
 STableObj mgmtGetTable(char *tableId);
+STableObj mgmtGetTableByPos(uint32_t dnodeIp, int32_t vnode, int32_t sid);
 
 STabObj *mgmtGetTableInfo(char *src, char *tags[]);
 int      mgmtRetrieveMetricMeta(SConnObj *pConn, char **pStart, SSuperTableMetaMsg *pInfo);

src/mnode/inc/mgmtUtil.h

@@ -28,8 +28,7 @@ extern "C" {
 bool    mgmtTableCreateFromSuperTable(STabObj *pTableObj);
 bool    mgmtIsSuperTable(STabObj *pTableObj);
 bool    mgmtIsNormalTable(STabObj *pTableObj);
-char*   mgmtTableGetTag(STabObj* pTable, int32_t col, SSchema* pTagColSchema);
-int32_t mgmtGetTagsLength(STabObj* pSuperTable, int32_t col);
+int32_t mgmtGetTagsLength(SSuperTableObj* pSuperTable, int32_t col);
 bool    mgmtCheckIsMonitorDB(char *db, char *monitordb);
 int32_t mgmtCheckDBParams(SCreateDbMsg *pCreate);
 

src/mnode/src/mgmtAcct.c

@@ -20,6 +20,7 @@
 #include "mgmtTable.h"
 #include "mgmtUser.h"
 #include "tschemautil.h"
+#include "taoserror.h"
 
 extern void *userSdb;
 extern void *dbSdb;
@@ -156,7 +157,7 @@ int32_t mgmtCheckDbLimitImp(SAcctObj *pAcct) {
   int numOfDbs = sdbGetNumOfRows(dbSdb);
   if (numOfDbs >= tsMaxDbs) {
     mWarn("numOfDbs:%d, exceed tsMaxDbs:%d", numOfDbs, tsMaxDbs);
-    return TSDB_CODE_TOO_MANY_DATABSES;
+    return TSDB_CODE_TOO_MANY_DATABASES;
   }
   return 0;
 }

src/mnode/src/mgmtChildTable.c

@@ -208,86 +208,86 @@ void mgmtCleanUpChildTables() {
 
 int8_t *mgmtBuildCreateChildTableMsg(SChildTableObj *pTable, int8_t *pMsg, int32_t vnode, int32_t tagDataLen,
                                      int8_t *pTagData) {
-  SCreateChildTableMsg *pCreateTable = (SCreateChildTableMsg *) pMsg;
-  memcpy(pCreateTable->tableId, pTable->tableId, TSDB_TABLE_ID_LEN);
-  memcpy(pCreateTable->superTableId, pTable->superTable->tableId, TSDB_TABLE_ID_LEN);
-  pCreateTable->vnode        = htonl(vnode);
-  pCreateTable->sid          = htonl(pTable->sid);
-  pCreateTable->uid          = pTable->uid;
-  pCreateTable->createdTime  = htobe64(pTable->createdTime);
-  pCreateTable->sversion     = htonl(pTable->superTable->sversion);
-  pCreateTable->numOfColumns = htons(pTable->superTable->numOfColumns);
-  pCreateTable->numOfTags    = htons(pTable->superTable->numOfTags);
-
-  SSchema *pSchema  = pTable->superTable->schema;
-  int32_t totalCols = pCreateTable->numOfColumns + pCreateTable->numOfTags;
-
-  for (int32_t col = 0; col < totalCols; ++col) {
-    SMColumn *colData = &((SMColumn *) (pCreateTable->data))[col];
-    colData->type  = pSchema[col].type;
-    colData->bytes = htons(pSchema[col].bytes);
-    colData->colId = htons(pSchema[col].colId);
-  }
-
-  int32_t totalColsSize = sizeof(SMColumn *) * totalCols;
-  pMsg = pCreateTable->data + totalColsSize + tagDataLen;
-
-  memcpy(pCreateTable->data + totalColsSize, pTagData, tagDataLen);
-  pCreateTable->tagDataLen = htonl(tagDataLen);
+  SCreateTableMsg *pCreateTable = (SCreateTableMsg *) pMsg;
+//  memcpy(pCreateTable->tableId, pTable->tableId, TSDB_TABLE_ID_LEN);
+//  memcpy(pCreateTable->superTableId, pTable->superTable->tableId, TSDB_TABLE_ID_LEN);
+//  pCreateTable->vnode        = htonl(vnode);
+//  pCreateTable->sid          = htonl(pTable->sid);
+//  pCreateTable->uid          = pTable->uid;
+//  pCreateTable->createdTime  = htobe64(pTable->createdTime);
+//  pCreateTable->sversion     = htonl(pTable->superTable->sversion);
+//  pCreateTable->numOfColumns = htons(pTable->superTable->numOfColumns);
+//  pCreateTable->numOfTags    = htons(pTable->superTable->numOfTags);
+//
+//  SSchema *pSchema  = pTable->superTable->schema;
+//  int32_t totalCols = pCreateTable->numOfColumns + pCreateTable->numOfTags;
+//
+//  for (int32_t col = 0; col < totalCols; ++col) {
+//    SMColumn *colData = &((SMColumn *) (pCreateTable->data))[col];
+//    colData->type  = pSchema[col].type;
+//    colData->bytes = htons(pSchema[col].bytes);
+//    colData->colId = htons(pSchema[col].colId);
+//  }
+//
+//  int32_t totalColsSize = sizeof(SMColumn *) * totalCols;
+//  pMsg = pCreateTable->data + totalColsSize + tagDataLen;
+//
+//  memcpy(pCreateTable->data + totalColsSize, pTagData, tagDataLen);
+//  pCreateTable->tagDataLen = htonl(tagDataLen);
 
   return pMsg;
 }
 
 int32_t mgmtCreateChildTable(SDbObj *pDb, SCreateTableMsg *pCreate, SVgObj *pVgroup, int32_t sid) {
-  int numOfTables = sdbGetNumOfRows(tsChildTableSdb);
-  if (numOfTables >= tsMaxTables) {
-    mError("table:%s, numOfTables:%d exceed maxTables:%d", pCreate->meterId, numOfTables, tsMaxTables);
-    return TSDB_CODE_TOO_MANY_TABLES;
-  }
-
-  char           *pTagData    = (char *) pCreate->schema;  // it is a tag key
-  SSuperTableObj *pSuperTable = mgmtGetSuperTable(pTagData);
-  if (pSuperTable == NULL) {
-    mError("table:%s, corresponding super table does not exist", pCreate->meterId);
-    return TSDB_CODE_INVALID_TABLE;
-  }
-
-  SChildTableObj *pTable = (SChildTableObj *) calloc(sizeof(SChildTableObj), 1);
-  if (pTable == NULL) {
-    return TSDB_CODE_SERV_OUT_OF_MEMORY;
-  }
-  strcpy(pTable->tableId, pCreate->meterId);
-  strcpy(pTable->superTableId, pSuperTable->tableId);
-  pTable->createdTime = taosGetTimestampMs();
-  pTable->superTable  = pSuperTable;
-  pTable->vgId        = pVgroup->vgId;
-  pTable->sid         = sid;
-  pTable->uid         = (((uint64_t) pTable->vgId) << 40) + ((((uint64_t) pTable->sid) & ((1ul << 24) - 1ul)) << 16) +
-                        ((uint64_t) sdbGetVersion() & ((1ul << 16) - 1ul));
-
-  SVariableMsg tags = {0};
-  tags.size = mgmtGetTagsLength(pSuperTable, INT_MAX) + (uint32_t) TSDB_TABLE_ID_LEN;
-  tags.data = (char *) calloc(1, tags.size);
-  if (tags.data == NULL) {
-    free(pTable);
-    mError("table:%s, corresponding super table schema is null", pCreate->meterId);
-    return TSDB_CODE_INVALID_TABLE;
-  }
-  memcpy(tags.data, pTagData, tags.size);
-
-  if (sdbInsertRow(tsStreamTableSdb, pTable, 0) < 0) {
-    mError("table:%s, update sdb error", pCreate->meterId);
-    return TSDB_CODE_SDB_ERROR;
-  }
-
-  mgmtAddTimeSeries(pTable->superTable->numOfColumns - 1);
-
-  mgmtSendCreateChildTableMsg(pTable, pVgroup, tags.size, tags.data);
-
-  mTrace("table:%s, create table in vgroup, vgId:%d sid:%d vnode:%d uid:%"
-             PRIu64
-             " db:%s",
-         pTable->tableId, pVgroup->vgId, sid, pVgroup->vnodeGid[0].vnode, pTable->uid, pDb->name);
+//  int numOfTables = sdbGetNumOfRows(tsChildTableSdb);
+//  if (numOfTables >= tsMaxTables) {
+//    mError("table:%s, numOfTables:%d exceed maxTables:%d", pCreate->meterId, numOfTables, tsMaxTables);
+//    return TSDB_CODE_TOO_MANY_TABLES;
+//  }
+//
+//  char           *pTagData    = (char *) pCreate->schema;  // it is a tag key
+//  SSuperTableObj *pSuperTable = mgmtGetSuperTable(pTagData);
+//  if (pSuperTable == NULL) {
+//    mError("table:%s, corresponding super table does not exist", pCreate->meterId);
+//    return TSDB_CODE_INVALID_TABLE;
+//  }
+//
+//  SChildTableObj *pTable = (SChildTableObj *) calloc(sizeof(SChildTableObj), 1);
+//  if (pTable == NULL) {
+//    return TSDB_CODE_SERV_OUT_OF_MEMORY;
+//  }
+//  strcpy(pTable->tableId, pCreate->meterId);
+//  strcpy(pTable->superTableId, pSuperTable->tableId);
+//  pTable->createdTime = taosGetTimestampMs();
+//  pTable->superTable  = pSuperTable;
+//  pTable->vgId        = pVgroup->vgId;
+//  pTable->sid         = sid;
+//  pTable->uid         = (((uint64_t) pTable->vgId) << 40) + ((((uint64_t) pTable->sid) & ((1ul << 24) - 1ul)) << 16) +
+//                        ((uint64_t) sdbGetVersion() & ((1ul << 16) - 1ul));
+//
+//  SVariableMsg tags = {0};
+//  tags.size = mgmtGetTagsLength(pSuperTable, INT_MAX) + (uint32_t) TSDB_TABLE_ID_LEN;
+//  tags.data = (char *) calloc(1, tags.size);
+//  if (tags.data == NULL) {
+//    free(pTable);
+//    mError("table:%s, corresponding super table schema is null", pCreate->meterId);
+//    return TSDB_CODE_INVALID_TABLE;
+//  }
+//  memcpy(tags.data, pTagData, tags.size);
+//
+//  if (sdbInsertRow(tsStreamTableSdb, pTable, 0) < 0) {
+//    mError("table:%s, update sdb error", pCreate->meterId);
+//    return TSDB_CODE_SDB_ERROR;
+//  }
+//
+//  mgmtAddTimeSeries(pTable->superTable->numOfColumns - 1);
+//
+//  mgmtSendCreateChildTableMsg(pTable, pVgroup, tags.size, tags.data);
+//
+//  mTrace("table:%s, create table in vgroup, vgId:%d sid:%d vnode:%d uid:%"
+//             PRIu64
+//             " db:%s",
+//         pTable->tableId, pVgroup->vgId, sid, pVgroup->vnodeGid[0].vnode, pTable->uid, pDb->name);
 
   return 0;
 }
@@ -323,14 +323,14 @@ SChildTableObj* mgmtGetChildTable(char *tableId) {
 }
 
 int32_t mgmtModifyChildTableTagValueByName(SChildTableObj *pTable, char *tagName, char *nContent) {
-  int col = mgmtFindTagCol(pTable->superTable, tagName);
-  if (col < 0 || col > pTable->superTable->numOfTags) {
-    return TSDB_CODE_APP_ERROR;
-  }
-
-  //TODO send msg to dnode
-  mTrace("Succeed to modify tag column %d of table %s", col, pTable->tableId);
-  return TSDB_CODE_SUCCESS;
+//  int col = mgmtFindTagCol(pTable->superTable, tagName);
+//  if (col < 0 || col > pTable->superTable->numOfTags) {
+//    return TSDB_CODE_APP_ERROR;
+//  }
+//
+//  //TODO send msg to dnode
+//  mTrace("Succeed to modify tag column %d of table %s", col, pTable->tableId);
+//  return TSDB_CODE_SUCCESS;
 
 //  int rowSize = 0;
 //  SSchema *schema = (SSchema *)(pSuperTable->schema + (pSuperTable->numOfColumns + col) * sizeof(SSchema));

src/mnode/src/mgmtDb.c

@@ -27,6 +27,7 @@
 #include "tschemautil.h"
 #include "tstatus.h"
 #include "mnode.h"
+#include "taoserror.h"
 
 void *dbSdb = NULL;
 extern void *vgSdb;
@@ -324,7 +325,7 @@ int mgmtDropDbByName(SAcctObj *pAcct, char *name, short ignoreNotExists) {
   }
 
   if (mgmtCheckIsMonitorDB(pDb->name, tsMonitorDbName)) {
-    return TSDB_CODE_MONITOR_DB_FORBEIDEN;
+    return TSDB_CODE_MONITOR_DB_FORBIDDEN;
   }
 
   return mgmtDropDb(pDb);
@@ -479,33 +480,6 @@ int mgmtMoveVgroupToHead(SDbObj *pDb, SVgObj *pVgroup) {
   return 0;
 }
 
-int mgmtAddMetricIntoDb(SDbObj *pDb, STabObj *pMetric) {
-  pMetric->next = pDb->pMetric;
-  pMetric->prev = NULL;
-
-  if (pDb->pMetric) pDb->pMetric->prev = pMetric;
-
-  pDb->pMetric = pMetric;
-  pDb->numOfMetrics++;
-
-  return 0;
-}
-
-int mgmtRemoveMetricFromDb(SDbObj *pDb, STabObj *pMetric) {
-  if (pMetric->prev) pMetric->prev->next = pMetric->next;
-
-  if (pMetric->next) pMetric->next->prev = pMetric->prev;
-
-  if (pMetric->prev == NULL) pDb->pMetric = pMetric->next;
-
-  pDb->numOfMetrics--;
-
-  if (pMetric->pSkipList != NULL) {
-    pMetric->pSkipList = tSkipListDestroy(pMetric->pSkipList);
-  }
-  return 0;
-}
-
 int mgmtShowTables(SAcctObj *pAcct, char *db) {
   int code;
 

src/mnode/src/mgmtNormalTable.c

@@ -39,7 +39,7 @@
 #include "mgmtNormalTable.h"
 
 
-void *tsSuperTableSdb;
+void *tsNormalTableSdb;
 void *(*mgmtNormalTableActionFp[SDB_MAX_ACTION_TYPES])(void *row, char *str, int size, int *ssize);
 
 void *mgmtNormalTableActionInsert(void *row, char *str, int size, int *ssize);
@@ -218,8 +218,9 @@ void mgmtCleanUpNormalTables() {
   sdbCloseTable(tsNormalTableSdb);
 }
 
-int8_t *mgmtBuildCreateNormalTableMsg(SNormalTableObj *pTable, int8_t *pMsg, int32_t vnode) {
-  SCreateNormalTableMsg *pCreateTable = (SCreateNormalTableMsg *) pMsg;
+int8_t *mgmtBuildCreateNormalTableMsg(SNormalTableObj *pTable, int32_t vnode) {
+  int8_t *pMsg = NULL;
+  SDCreateTableMsg *pCreateTable = (SDCreateTableMsg *) pMsg;
   memcpy(pCreateTable->tableId, pTable->tableId, TSDB_TABLE_ID_LEN);
   pCreateTable->vnode        = htobe32(vnode);
   pCreateTable->sid          = htobe32(pTable->sid);
@@ -231,15 +232,15 @@ int8_t *mgmtBuildCreateNormalTableMsg(SNormalTableObj *pTable, int8_t *pMsg, int
   SSchema *pSchema  = pTable->schema;
   int32_t totalCols = pCreateTable->numOfColumns;
 
-  for (int32_t col = 0; col < totalCols; ++col) {
-    SMColumn *colData = &((SMColumn *) (pCreateTable->data))[col];
-    colData->type  = pSchema[col].type;
-    colData->bytes = htons(pSchema[col].bytes);
-    colData->colId = htons(pSchema[col].colId);
-  }
+//  for (int32_t col = 0; col < totalCols; ++col) {
+//    SMColumn *colData = &((SMColumn *) (pCreateTable->data))[col];
+//    colData->type  = pSchema[col].type;
+//    colData->bytes = htons(pSchema[col].bytes);
+//    colData->colId = htons(pSchema[col].colId);
+//  }
 
-  int32_t totalColsSize = sizeof(SMColumn *) * totalCols;
-  pMsg = pCreateTable->data + totalColsSize;
+//  int32_t totalColsSize = sizeof(SMColumn *) * totalCols;
+//  pMsg = pCreateTable->data + totalColsSize;
 
   return pMsg;
 }

src/mnode/src/mgmtStreamTable.c

@@ -39,7 +39,7 @@
 #include "mgmtStreamTable.h"
 
 
-void *tsSuperTableSdb;
+void *tsStreamTableSdb;
 void *(*mgmtStreamTableActionFp[SDB_MAX_ACTION_TYPES])(void *row, char *str, int size, int *ssize);
 
 void *mgmtStreamTableActionInsert(void *row, char *str, int size, int *ssize);
@@ -78,7 +78,7 @@ void *mgmtStreamTableActionReset(void *row, char *str, int size, int *ssize) {
 }
 
 void *mgmtStreamTableActionDestroy(void *row, char *str, int size, int *ssize) {
-  SSuperTableObj *pTable = (STabObj *)row;
+  SStreamTableObj *pTable = (SStreamTableObj *)row;
   mgmtDestroyStreamTable(pTable);
   return NULL;
 }
@@ -230,7 +230,7 @@ void mgmtCleanUpStreamTables() {
 }
 
 int8_t *mgmtBuildCreateStreamTableMsg(SStreamTableObj *pTable, int8_t *pMsg, int32_t vnode) {
-  SCreateStreamTableMsg *pCreateTable = (SCreateStreamTableMsg *) pMsg;
+  SDCreateTableMsg *pCreateTable = (SDCreateTableMsg *) pMsg;
   memcpy(pCreateTable->tableId, pTable->tableId, TSDB_TABLE_ID_LEN);
   pCreateTable->vnode        = htonl(vnode);
   pCreateTable->sid          = htonl(pTable->sid);
@@ -238,23 +238,23 @@ int8_t *mgmtBuildCreateStreamTableMsg(SStreamTableObj *pTable, int8_t *pMsg, int
   pCreateTable->createdTime  = htobe64(pTable->createdTime);
   pCreateTable->sversion     = htonl(pTable->sversion);
   pCreateTable->numOfColumns = htons(pTable->numOfColumns);
-  pCreateTable->sqlLen       = htons(pTable->sqlLen);
+  //pCreateTable->sqlLen       = htons(pTable->sqlLen);
 
   SSchema *pSchema  = pTable->schema;
   int32_t totalCols = pCreateTable->numOfColumns;
 
-  for (int32_t col = 0; col < totalCols; ++col) {
-    SMColumn *colData = &((SMColumn *) (pCreateTable->data))[col];
-    colData->type  = pSchema[col].type;
-    colData->bytes = htons(pSchema[col].bytes);
-    colData->colId = htons(pSchema[col].colId);
-  }
+//  for (int32_t col = 0; col < totalCols; ++col) {
+//    SMColumn *colData = &((SMColumn *) (pCreateTable->data))[col];
+//    colData->type  = pSchema[col].type;
+//    colData->bytes = htons(pSchema[col].bytes);
+//    colData->colId = htons(pSchema[col].colId);
+//  }
 
-  int32_t totalColsSize = sizeof(SMColumn *) * totalCols;
-  pMsg = pCreateTable->data + totalColsSize + pTable->sqlLen;
+//  int32_t totalColsSize = sizeof(SMColumn *) * totalCols;
+//  pMsg = pCreateTable->data + totalColsSize + pTable->sqlLen;
 
-  char *sql = pTable->schema + pTable->schemaSize;
-  memcpy(pCreateTable->data + totalColsSize, pTable->sqlLen, sql);
+//  char *sql = pTable->schema + pTable->schemaSize;
+//  memcpy(pCreateTable->data + totalColsSize, pTable->sqlLen, sql);
 
   return pMsg;
 }
@@ -345,6 +345,6 @@ int32_t mgmtDropStreamTable(SDbObj *pDb, SStreamTableObj *pTable) {
   return 0;
 }
 
-SStreamTableObj* mgmtGetStreamTable(char *tableId); {
+SStreamTableObj* mgmtGetStreamTable(char *tableId) {
   return (SStreamTableObj *)sdbGetRow(tsStreamTableSdb, tableId);
 }
\ No newline at end of file

src/mnode/src/mgmtSuperTable.c

@@ -93,7 +93,7 @@ void *mgmtSuperTableActionReset(void *row, char *str, int size, int *ssize) {
   SSuperTableObj *pTable = (SSuperTableObj *) row;
   int tsize = pTable->updateEnd - (int8_t *) pTable;
   memcpy(pTable, str, tsize);
-  pTable->schema = (char *) realloc(pTable->schema, pTable->schemaSize);
+  pTable->schema = realloc(pTable->schema, pTable->schemaSize);
   memcpy(pTable->schema, str + tsize, pTable->schemaSize);
   return NULL;
 }
@@ -105,20 +105,10 @@ void *mgmtSuperTableActionDestroy(void *row, char *str, int size, int *ssize) {
 }
 
 void *mgmtSuperTableActionInsert(void *row, char *str, int size, int *ssize) {
-  SSuperTableObj *pTable = (SSuperTableObj *) row;
-  SDbObj *pDb = mgmtGetDbByMeterId(pTable->tableId);
-  if (pDb) {
-    mgmtAddMetricIntoDb(pDb, pTable);
-  }
   return NULL;
 }
 
 void *mgmtSuperTableActionDelete(void *row, char *str, int size, int *ssize) {
-  SSuperTableObj *pTable = (SSuperTableObj *) row;
-  SDbObj *pDb = mgmtGetDbByMeterId(pTable->tableId);
-  if (pDb) {
-    mgmtRemoveMetricFromDb(pDb, pTable);
-  }
   return NULL;
 }
 
@@ -159,7 +149,7 @@ void *mgmtSuperTableActionDecode(void *row, char *str, int size, int *ssize) {
   }
   memcpy(pTable, str, tsize);
 
-  pTable->schema = (char *)malloc(pTable->schemaSize);
+  pTable->schema = malloc(pTable->schemaSize);
   if (pTable->schema == NULL) {
     mgmtDestroySuperTable(pTable);
     return NULL;
@@ -179,95 +169,38 @@ void *mgmtSuperTableAction(char action, void *row, char *str, int size, int *ssi
 int32_t mgmtInitSuperTables() {
   void *    pNode = NULL;
   void *    pLastNode = NULL;
-  SVgObj *  pVgroup = NULL;
-  STabObj * pTable = NULL;
-  STabObj * pMetric = NULL;
-  SDbObj *  pDb = NULL;
-  SAcctObj *pAcct = NULL;
+  SSuperTableObj * pTable = NULL;
 
   // TODO: Make sure this function only run once
   mgmtSuperTableActionInit();
 
   tsSuperTableSdb = sdbOpenTable(tsMaxTables, sizeof(STabObj) + sizeof(SSchema) * TSDB_MAX_COLUMNS + TSDB_MAX_SQL_LEN,
                           "meters", SDB_KEYTYPE_STRING, mgmtDirectory, mgmtSuperTableAction);
-  if (meterSdb == NULL) {
+  if (tsSuperTableSdb == NULL) {
     mError("failed to init meter data");
     return -1;
   }
 
   pNode = NULL;
   while (1) {
-    pNode = sdbFetchRow(meterSdb, pNode, (void **)&pTable);
-    if (pTable == NULL) break;
-    if (mgmtIsSuperTable(pTable)) pTable->numOfMeters = 0;
-  }
-
-  pNode = NULL;
-  while (1) {
-    pLastNode = pNode;
-    pNode = sdbFetchRow(meterSdb, pNode, (void **)&pTable);
-    if (pTable == NULL) break;
+    pNode = sdbFetchRow(tsSuperTableSdb, pNode, (void **)&pTable);
+    if (pTable == NULL) {
+      break;
+    }
 
-    pDb = mgmtGetDbByMeterId(pTable->meterId);
+    SDbObj *pDb = mgmtGetDbByMeterId(pTable->tableId);
     if (pDb == NULL) {
-      mError("meter:%s, failed to get db, discard it", pTable->meterId, pTable->gid.vgId, pTable->gid.sid);
-      pTable->gid.vgId = 0;
-      sdbDeleteRow(meterSdb, pTable);
+      mError("super table:%s, failed to get db, discard it", pTable->tableId);
+      sdbDeleteRow(tsSuperTableSdb, pTable);
       pNode = pLastNode;
       continue;
     }
-
-    if (mgmtIsNormalTable(pTable)) {
-      pVgroup = mgmtGetVgroup(pTable->gid.vgId);
-
-      if (pVgroup == NULL) {
-        mError("meter:%s, failed to get vgroup:%d sid:%d, discard it", pTable->meterId, pTable->gid.vgId, pTable->gid.sid);
-        pTable->gid.vgId = 0;
-        sdbDeleteRow(meterSdb, pTable);
-        pNode = pLastNode;
-        continue;
-      }
-
-      if (strcmp(pVgroup->dbName, pDb->name) != 0) {
-        mError("meter:%s, db:%s not match with vgroup:%d db:%s sid:%d, discard it",
-               pTable->meterId, pDb->name, pTable->gid.vgId, pVgroup->dbName, pTable->gid.sid);
-        pTable->gid.vgId = 0;
-        sdbDeleteRow(meterSdb, pTable);
-        pNode = pLastNode;
-        continue;
-      }
-
-      if ( pVgroup->meterList == NULL) {
-        mError("meter:%s, vgroup:%d meterlist is null", pTable->meterId, pTable->gid.vgId);
-        pTable->gid.vgId = 0;
-        sdbDeleteRow(meterSdb, pTable);
-        pNode = pLastNode;
-        continue;
-      }
-
-      pVgroup->meterList[pTable->gid.sid] = pTable;
-      taosIdPoolMarkStatus(pVgroup->idPool, pTable->gid.sid, 1);
-
-      if (pTable->tableType == TSDB_TABLE_TYPE_STREAM_TABLE) {
-        pTable->pSql = (char *)pTable->schema + sizeof(SSchema) * pTable->numOfColumns;
-      }
-
-      if (mgmtTableCreateFromSuperTable(pTable)) {
-        pTable->pTagData = (char *)pTable->schema;  // + sizeof(SSchema)*pTable->numOfColumns;
-        pMetric = mgmtGetTable(pTable->pTagData);
-        if (pMetric) mgmtAddMeterIntoMetric(pMetric, pTable);
-      }
-
-      pAcct = mgmtGetAcct(pDb->cfg.acct);
-      if (pAcct) mgmtAddMeterStatisticToAcct(pTable, pAcct);
-    } else {
-      if (pDb) mgmtAddMetricIntoDb(pDb, pTable);
-    }
+    pTable->numOfMeters = 0;
   }
 
   mgmtSetVgroupIdPool();
 
-  mTrace("meter is initialized");
+  mTrace("super table is initialized");
   return 0;
 }
 
@@ -321,11 +254,8 @@ int32_t mgmtCreateSuperTable(SDbObj *pDb, SCreateTableMsg *pCreate) {
 }
 
 int32_t mgmtDropSuperTable(SDbObj *pDb, SSuperTableObj *pSuperTable) {
-  SChildTableObj *pMetric;
-  while ((pMetric = pSuperTable->pHead) != NULL) {
-    mgmtDropChildTable(pDb, pMetric);
-  }
-  sdbDeleteRow(tsSuperTableSdb, pMetric);
+  //TODO drop all child tables
+  return sdbDeleteRow(tsSuperTableSdb, pSuperTable);
 }
 
 SSuperTableObj* mgmtGetSuperTable(char *tableId) {
@@ -477,7 +407,7 @@ int32_t mgmtModifySuperTableTagNameByName(SSuperTableObj *pMetric, char *oldTagN
 }
 
 
-static int32_t mgmtFindSuperTableColumnIndex(SNormalTableObj *pMetric, char *colName) {
+static int32_t mgmtFindSuperTableColumnIndex(SSuperTableObj *pMetric, char *colName) {
   SSchema *schema = (SSchema *) pMetric->schema;
   for (int32_t i = 0; i < pMetric->numOfColumns; i++) {
     if (strcasecmp(schema[i].name, colName) == 0) {
@@ -650,7 +580,7 @@ int mgmtRetrieveSuperTables(SShowObj *pShow, char *data, int rows, SConnObj *pCo
   while (numOfRows < rows) {
     pTable = (SSuperTableObj *)pShow->pNode;
     if (pTable == NULL) break;
-    pShow->pNode = (void *)pTable->next;
+    //pShow->pNode = (void *)pTable->next;
 
     if (strncmp(pTable->tableId, prefix, prefixLen)) {
       continue;
@@ -706,8 +636,6 @@ int mgmtAddMeterIntoMetric(STabObj *pMetric, STabObj *pTable) {
   pMetric->pHead = pTable;
   pMetric->numOfMeters++;
 
-  addMeterIntoMetricIndex(pMetric, pTable);
-
   pthread_rwlock_unlock(&(pMetric->rwLock));
 
   return 0;
@@ -724,8 +652,6 @@ int mgmtRemoveMeterFromMetric(STabObj *pMetric, STabObj *pTable) {
 
   pMetric->numOfMeters--;
 
-  removeMeterFromMetricIndex(pMetric, pTable);
-
   pthread_rwlock_unlock(&(pMetric->rwLock));
 
   return 0;

src/mnode/src/mgmtTable.c

@@ -44,21 +44,6 @@
 
 extern int64_t sdbVersion;
 
-
-void *meterSdb = NULL;
-void *(*mgmtMeterActionFp[SDB_MAX_ACTION_TYPES])(void *row, char *str, int size, int *ssize);
-
-int32_t mgmtMeterAddTags(STabObj *pMetric, SSchema schema[], int ntags);
-static void removeMeterFromMetricIndex(STabObj *pMetric, STabObj *pTable);
-static void addMeterIntoMetricIndex(STabObj *pMetric, STabObj *pTable);
-int32_t mgmtMeterDropTagByName(STabObj *pMetric, char *name);
-int32_t mgmtMeterModifyTagNameByName(STabObj *pMetric, const char *oname, const char *nname);
-int32_t mgmtMeterModifyTagValueByName(STabObj *pTable, char *tagName, char *nContent);
-int32_t mgmtMeterAddColumn(STabObj *pTable, SSchema schema[], int ncols);
-int32_t mgmtMeterDropColumnByName(STabObj *pTable, const char *name);
-static int dropMeterImp(SDbObj *pDb, STabObj * pTable, SAcctObj *pAcct);
-static void dropAllMetersOfMetric(SDbObj *pDb, STabObj * pMetric, SAcctObj *pAcct);
-
 static int32_t mgmtGetReqTagsLength(STabObj *pMetric, int16_t *cols, int32_t numOfCols) {
   assert(mgmtIsSuperTable(pMetric) && numOfCols >= 0 && numOfCols <= TSDB_MAX_TAGS + 1);
 
@@ -87,98 +72,27 @@ static void mgmtVacuumResult(char *data, int32_t numOfCols, int32_t rows, int32_
 }
 
 int mgmtInitMeters() {
-  void *    pNode = NULL;
-  void *    pLastNode = NULL;
-  SVgObj *  pVgroup = NULL;
-  STabObj * pTable = NULL;
-  STabObj * pMetric = NULL;
-  SDbObj *  pDb = NULL;
-  SAcctObj *pAcct = NULL;
-
-  // TODO: Make sure this function only run once
-  mgmtMeterActionInit();
-
-  meterSdb = sdbOpenTable(tsMaxTables, sizeof(STabObj) + sizeof(SSchema) * TSDB_MAX_COLUMNS + TSDB_MAX_SQL_LEN,
-                          "meters", SDB_KEYTYPE_STRING, mgmtDirectory, mgmtMeterAction);
-  if (meterSdb == NULL) {
-    mError("failed to init meter data");
-    return -1;
+  int32_t code = mgmtInitSuperTables();
+  if (code != TSDB_CODE_SUCCESS) {
+    return code;
   }
 
-  pNode = NULL;
-  while (1) {
-    pNode = sdbFetchRow(meterSdb, pNode, (void **)&pTable);
-    if (pTable == NULL) break;
-    if (mgmtIsSuperTable(pTable)) pTable->numOfMeters = 0;
+  code = mgmtInitNormalTables();
+  if (code != TSDB_CODE_SUCCESS) {
+    return code;
   }
 
-  pNode = NULL;
-  while (1) {
-    pLastNode = pNode;
-    pNode = sdbFetchRow(meterSdb, pNode, (void **)&pTable);
-    if (pTable == NULL) break;
-
-    pDb = mgmtGetDbByMeterId(pTable->meterId);
-    if (pDb == NULL) {
-      mError("meter:%s, failed to get db, discard it", pTable->meterId, pTable->gid.vgId, pTable->gid.sid);
-      pTable->gid.vgId = 0;
-      sdbDeleteRow(meterSdb, pTable);
-      pNode = pLastNode;
-      continue;
-    }
-
-    if (mgmtIsNormalTable(pTable)) {
-      pVgroup = mgmtGetVgroup(pTable->gid.vgId);
-
-      if (pVgroup == NULL) {
-        mError("meter:%s, failed to get vgroup:%d sid:%d, discard it", pTable->meterId, pTable->gid.vgId, pTable->gid.sid);
-        pTable->gid.vgId = 0;
-        sdbDeleteRow(meterSdb, pTable);
-        pNode = pLastNode;
-        continue;
-      }
-
-      if (strcmp(pVgroup->dbName, pDb->name) != 0) {
-        mError("meter:%s, db:%s not match with vgroup:%d db:%s sid:%d, discard it",
-               pTable->meterId, pDb->name, pTable->gid.vgId, pVgroup->dbName, pTable->gid.sid);
-        pTable->gid.vgId = 0;
-        sdbDeleteRow(meterSdb, pTable);
-        pNode = pLastNode;
-        continue;
-      }
-
-      if ( pVgroup->meterList == NULL) {
-        mError("meter:%s, vgroup:%d meterlist is null", pTable->meterId, pTable->gid.vgId);
-        pTable->gid.vgId = 0;
-        sdbDeleteRow(meterSdb, pTable);
-        pNode = pLastNode;
-        continue;
-      }
-
-      pVgroup->meterList[pTable->gid.sid] = pTable;
-      taosIdPoolMarkStatus(pVgroup->idPool, pTable->gid.sid, 1);
-
-      if (pTable->tableType == TSDB_TABLE_TYPE_STREAM_TABLE) {
-        pTable->pSql = (char *)pTable->schema + sizeof(SSchema) * pTable->numOfColumns;
-      }
-
-      if (mgmtTableCreateFromSuperTable(pTable)) {
-        pTable->pTagData = (char *)pTable->schema;  // + sizeof(SSchema)*pTable->numOfColumns;
-        pMetric = mgmtGetTable(pTable->pTagData);
-        if (pMetric) mgmtAddMeterIntoMetric(pMetric, pTable);
-      }
-
-      pAcct = mgmtGetAcct(pDb->cfg.acct);
-      if (pAcct) mgmtAddMeterStatisticToAcct(pTable, pAcct);
-    } else {
-      if (pDb) mgmtAddMetricIntoDb(pDb, pTable);
-    }
+  code = mgmtInitStreamTables();
+  if (code != TSDB_CODE_SUCCESS) {
+    return code;
   }
 
-  mgmtSetVgroupIdPool();
+  code = mgmtInitChildTables();
+  if (code != TSDB_CODE_SUCCESS) {
+    return code;
+  }
 
-  mTrace("meter is initialized");
-  return 0;
+  return TSDB_CODE_SUCCESS;
 }
 
 STableObj mgmtGetTable(char *tableId) {
@@ -211,6 +125,11 @@ STableObj mgmtGetTable(char *tableId) {
   return table;
 }
 
+STableObj mgmtGetTableByPos(uint32_t dnodeIp, int32_t vnode, int32_t sid) {
+  STableObj table = {0};
+  return table;
+}
+
 int32_t mgmtCreateTable(SDbObj *pDb, SCreateTableMsg *pCreate) {
   STableObj table = mgmtGetTable(pCreate->meterId);
   if (table.obj != NULL) {
@@ -293,7 +212,7 @@ int mgmtDropTable(SDbObj *pDb, char *tableId, int ignore) {
 }
 
 int mgmtAlterTable(SDbObj *pDb, SAlterTableMsg *pAlter) {
-  STableObj table = mgmtGetTable(tableId);
+  STableObj table = mgmtGetTable(pAlter->meterId);
   if (table.obj == NULL) {
     return TSDB_CODE_INVALID_TABLE;
   }
@@ -503,9 +422,9 @@ int32_t mgmtRetrieveTables(SShowObj *pShow, char *data, int rows, SConnObj *pCon
     cols++;
 
     pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
-    if (pTable->pTagData) {
-      extractTableName(superTableId, pWrite);
-    }
+//    if (pTable->pTagData) {
+//      extractTableName(superTableId, pWrite);
+//    }
     cols++;
 
     numOfRows++;

src/mnode/src/mgmtUtil.c

@@ -31,34 +31,32 @@ bool mgmtIsSuperTable(STabObj* pTableObj) {
 bool mgmtIsNormalTable(STabObj* pTableObj) {
   return !mgmtIsSuperTable(pTableObj);
 }
+//
+///**
+// * TODO: the tag offset value should be kept in memory to avoid dynamically calculating the value
+// *
+// * @param pTable
+// * @param col
+// * @param pTagColSchema
+// * @return
+// */
+//char* mgmtTableGetTag(STabObj* pTable, int32_t col, SSchema* pTagColSchema) {
+//  if (!mgmtTableCreateFromSuperTable(pTable)) {
+//    return NULL;
+//  }
+//
+//  STabObj* pSuperTable = mgmtGetTable(pTable->pTagData);
+//  int32_t  offset = mgmtGetTagsLength(pSuperTable, col) + TSDB_TABLE_ID_LEN;
+//  assert(offset > 0);
+//
+//  if (pTagColSchema != NULL) {
+//    *pTagColSchema = ((SSchema*)pSuperTable->schema)[pSuperTable->numOfColumns + col];
+//  }
+//
+//  return (pTable->pTagData + offset);
+//}
 
-/**
- * TODO: the tag offset value should be kept in memory to avoid dynamically calculating the value
- *
- * @param pTable
- * @param col
- * @param pTagColSchema
- * @return
- */
-char* mgmtTableGetTag(STabObj* pTable, int32_t col, SSchema* pTagColSchema) {
-  if (!mgmtTableCreateFromSuperTable(pTable)) {
-    return NULL;
-  }
-
-  STabObj* pSuperTable = mgmtGetTable(pTable->pTagData);
-  int32_t  offset = mgmtGetTagsLength(pSuperTable, col) + TSDB_TABLE_ID_LEN;
-  assert(offset > 0);
-
-  if (pTagColSchema != NULL) {
-    *pTagColSchema = ((SSchema*)pSuperTable->schema)[pSuperTable->numOfColumns + col];
-  }
-
-  return (pTable->pTagData + offset);
-}
-
-int32_t mgmtGetTagsLength(STabObj* pSuperTable, int32_t col) {  // length before column col
-  assert(mgmtIsSuperTable(pSuperTable) && col >= 0);
-
+int32_t mgmtGetTagsLength(SSuperTableObj* pSuperTable, int32_t col) {  // length before column col
   int32_t len = 0;
   int32_t tagColumnIndexOffset = pSuperTable->numOfColumns;
 

src/mnode/src/mgmtVgroup.c

@@ -74,7 +74,7 @@ int mgmtInitVgroups() {
   mgmtVgroupActionInit();
 
   SVgObj tObj;
-  tsVgUpdateSize = tObj.updateEnd - (char *)&tObj;
+  tsVgUpdateSize = tObj.updateEnd - (int8_t *)&tObj;
 
   vgSdb = sdbOpenTable(tsMaxVGroups, sizeof(SVgObj), "vgroups", SDB_KEYTYPE_AUTO, mgmtDirectory, mgmtVgroupAction);
   if (vgSdb == NULL) {
@@ -294,14 +294,14 @@ int mgmtGetVgroupMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn) {
   SVgObj  *pVgroup    = NULL;
   STabObj *pTable     = NULL;
   if (pShow->payloadLen > 0 ) {
-    pTable = mgmtGetTable(pShow->payload);
-    if (NULL == pTable) {
-      return TSDB_CODE_INVALID_TABLE_ID;
-    }
-
-    pVgroup = mgmtGetVgroup(pTable->gid.vgId);
-    if (NULL == pVgroup) return TSDB_CODE_INVALID_TABLE_ID;
-    
+//    pTable = mgmtGetTable(pShow->payload);
+//    if (NULL == pTable) {
+//      return TSDB_CODE_INVALID_TABLE_ID;
+//    }
+//
+//    pVgroup = mgmtGetVgroup(pTable->gid.vgId);
+//    if (NULL == pVgroup) return TSDB_CODE_INVALID_TABLE_ID;
+//
     maxReplica = pVgroup->numOfVnodes > maxReplica ? pVgroup->numOfVnodes : maxReplica;
   } else {
     SVgObj *pVgroup = pDb->pHead;
@@ -476,7 +476,7 @@ void *mgmtVgroupActionUpdate(void *row, char *str, int size, int *ssize) {
 }
 void *mgmtVgroupActionEncode(void *row, char *str, int size, int *ssize) {
   SVgObj *pVgroup = (SVgObj *)row;
-  int     tsize = pVgroup->updateEnd - (char *)pVgroup;
+  int     tsize = pVgroup->updateEnd - (int8_t *)pVgroup;
   if (size < tsize) {
     *ssize = -1;
   } else {
@@ -491,7 +491,7 @@ void *mgmtVgroupActionDecode(void *row, char *str, int size, int *ssize) {
   if (pVgroup == NULL) return NULL;
   memset(pVgroup, 0, sizeof(SVgObj));
 
-  int tsize = pVgroup->updateEnd - (char *)pVgroup;
+  int tsize = pVgroup->updateEnd - (int8_t *)pVgroup;
   memcpy(pVgroup, str, tsize);
 
   return (void *)pVgroup;
@@ -501,7 +501,7 @@ void *mgmtVgroupActionBatchUpdate(void *row, char *str, int size, int *ssize) {
 void *mgmtVgroupActionAfterBatchUpdate(void *row, char *str, int size, int *ssize) { return NULL; }
 void *mgmtVgroupActionReset(void *row, char *str, int size, int *ssize) {
   SVgObj *pVgroup = (SVgObj *)row;
-  int     tsize = pVgroup->updateEnd - (char *)pVgroup;
+  int     tsize = pVgroup->updateEnd - (int8_t *)pVgroup;
 
   memcpy(pVgroup, str, tsize);
 

src/plugins/http/CMakeLists.txt

@@ -4,6 +4,7 @@ PROJECT(TDengine)
 IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/zlib-1.2.11/inc)
   INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
   INCLUDE_DIRECTORIES(inc)

src/plugins/http/src/gcHandle.c

@@ -17,6 +17,7 @@
 #include "cJSON.h"
 #include "gcJson.h"
 #include "taosdef.h"
+#include "tlog.h"
 
 static HttpDecodeMethod gcDecodeMethod = {"grafana", gcProcessRequest};
 static HttpEncodeMethod gcHeartBeatMethod = {NULL, gcSendHeartBeatResp, NULL, NULL, NULL, NULL, NULL, NULL};

src/plugins/http/src/httpHandle.c

@@ -27,6 +27,7 @@
 #include "tglobalcfg.h"
 #include "tsocket.h"
 #include "ttimer.h"
+#include "tlog.h"
 
 void httpToLowerUrl(char* url) {
   /*ignore case */

src/plugins/http/src/httpJson.c

@@ -25,6 +25,8 @@
 #include "httpJson.h"
 #include "httpResp.h"
 #include "taosmsg.h"
+#include "tlog.h"
+#include "taoserror.h"
 
 #define MAX_NUM_STR_SZ 25
 
@@ -451,7 +453,7 @@ void httpJsonPairStatus(JsonBuf* buf, int code) {
       } else if (code == TSDB_CODE_INVALID_TABLE) {
         httpJsonPair(buf, "desc", 4, "failed to create table", 22);
       } else
-        httpJsonPair(buf, "desc", 4, tstrerror(code), (int)strlen(tstrerror(code)));
+        httpJsonPair(buf, "desc", 4, (char*)tstrerror(code), (int)strlen(tstrerror(code)));
     }
   }
 }
\ No newline at end of file

src/plugins/http/src/httpResp.c

@@ -19,6 +19,8 @@
 #include "httpCode.h"
 #include "httpJson.h"
 #include "taosmsg.h"
+#include "tlog.h"
+#include "taoserror.h"
 
 const char *httpKeepAliveStr[] = {"", "Connection: Keep-Alive\r\n", "Connection: Close\r\n"};
 
@@ -182,7 +184,7 @@ void httpSendErrorResp(HttpContext *pContext, int errNo) { httpSendErrorRespWith
 
 void httpSendTaosdErrorResp(HttpContext *pContext, int errCode) {
   int httpCode = 400;
-  httpSendErrorRespImp(pContext, httpCode, "Bad Request", errCode, tstrerror(errCode));
+  httpSendErrorRespImp(pContext, httpCode, "Bad Request", errCode, (char*)tstrerror(errCode));
 }
 
 void httpSendTaosdInvalidSqlErrorResp(HttpContext *pContext, char* errMsg) {

src/plugins/http/src/httpSession.c

@@ -26,6 +26,7 @@
 #include "taos.h"
 #include "ttime.h"
 #include "ttimer.h"
+#include "tlog.h"
 
 void httpAccessSession(HttpContext *pContext) {
   HttpServer *server = pContext->pThread->pServer;

src/plugins/http/src/httpSystem.c

@@ -32,6 +32,7 @@
 #include "httpHandle.h"
 #include "restHandle.h"
 #include "tgHandle.h"
+#include "tlog.h"
 
 #ifdef CLUSTER
   void adminInitHandle(HttpServer* pServer);

src/plugins/http/src/httpUtil.c

@@ -26,6 +26,7 @@
 
 #include "shash.h"
 #include "taos.h"
+#include "tlog.h"
 
 bool httpCheckUsedbSql(char *sql) {
   if (strstr(sql, "use ") != NULL) {

src/plugins/http/src/restHandle.c

@@ -15,6 +15,7 @@
 
 #include "restHandle.h"
 #include "restJson.h"
+#include "tlog.h"
 
 static HttpDecodeMethod restDecodeMethod = {"rest", restProcessRequest};
 static HttpDecodeMethod restDecodeMethod2 = {"restful", restProcessRequest};
@@ -70,8 +71,7 @@ bool restProcessSqlRequest(HttpContext* pContext, int timestampFmt) {
 
   /*
    * for async test
-   * /
-  /*
+   *
   if (httpCheckUsedbSql(sql)) {
     httpSendErrorResp(pContext, HTTP_NO_EXEC_USEDB);
     return false;

src/plugins/http/src/restJson.c

@@ -18,7 +18,7 @@
 #include <sys/time.h>
 #include <time.h>
 #include <unistd.h>
-
+#include "tlog.h"
 #include "httpJson.h"
 #include "restHandle.h"
 #include "restJson.h"

src/plugins/http/src/tgHandle.c

@@ -18,6 +18,7 @@
 #include "taosmsg.h"
 #include "tgJson.h"
 #include "taosdef.h"
+#include "tlog.h"
 
 /*
  * taos.telegraf.cfg formats like

src/plugins/http/src/tgJson.c

@@ -22,6 +22,7 @@
 #include "taosmsg.h"
 #include "tgHandle.h"
 #include "tgJson.h"
+#include "tlog.h"
 
 void tgInitQueryJson(HttpContext *pContext) {
   JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);

src/plugins/monitor/CMakeLists.txt

@@ -4,6 +4,7 @@ PROJECT(TDengine)
 IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc)
   INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
   INCLUDE_DIRECTORIES(inc)
   AUX_SOURCE_DIRECTORY(./src SRC)

src/plugins/monitor/src/monitorSystem.c

@@ -18,6 +18,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include "dnode.h"
 #include "monitorSystem.h"
 #include "tsclient.h"
 #include "taosdef.h"

src/sdb/src/sdbEngine.c

@@ -53,6 +53,10 @@ SSdbTable *tableList[20];
 int        sdbNumOfTables;
 int64_t    sdbVersion;
 
+int64_t sdbGetVersion() {
+  return sdbVersion;
+};
+
 void sdbFinishCommit(void *handle) {
   SSdbTable *pTable = (SSdbTable *)handle;
   uint32_t   sdbEcommit = SDB_ENDCOMMIT;