Skip to content

T
TDengine

taosdata / TDengine
大约 2 年 前同步成功

通知 1192
Star 22018
Fork 4786
T
TDengine
提交 29058645 编写于 作者: S slguan
浏览文件
操作

fix compile errors

上级 e9470f0a
显示空白变更内容
内联 并排
Showing with 1801 addition and 2007 deletion
src/CMakeLists.txt
浏览文件 @ 29058645
...@@ -4,11 +4,11 @@ PROJECT(TDengine) ...@@ -4,11 +4,11 @@ PROJECT(TDengine)
ADD_SUBDIRECTORY(os) ADD_SUBDIRECTORY(os)
ADD_SUBDIRECTORY(util) ADD_SUBDIRECTORY(util)
ADD_SUBDIRECTORY(rpc) ADD_SUBDIRECTORY(rpc)
#ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(client)
#ADD_SUBDIRECTORY(kit) ADD_SUBDIRECTORY(kit)
#ADD_SUBDIRECTORY(plugins) ADD_SUBDIRECTORY(plugins)
#ADD_SUBDIRECTORY(sdb) ADD_SUBDIRECTORY(sdb)
#ADD_SUBDIRECTORY(mnode) ADD_SUBDIRECTORY(mnode)
#ADD_SUBDIRECTORY(dnode) ADD_SUBDIRECTORY(dnode)
#ADD_SUBDIRECTORY(vnode) #ADD_SUBDIRECTORY(vnode)
#ADD_SUBDIRECTORY(connector/jdbc) #ADD_SUBDIRECTORY(connector/jdbc)
src/client/src/tscServer.c
浏览文件 @ 29058645
...@@ -57,7 +57,7 @@ void tscPrintMgmtIp() { ...@@ -57,7 +57,7 @@ void tscPrintMgmtIp() {
tscError("invalid mgmt IP list:%d", tscMgmtIpList.numOfIps); tscError("invalid mgmt IP list:%d", tscMgmtIpList.numOfIps);
} else { } else {
for (int i = 0; i < tscMgmtIpList.numOfIps; ++i) { 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) { ...@@ -66,7 +66,7 @@ void tscSetMgmtIpListFromCluster(SIpList *pIpList) {
tscMgmtIpList.numOfIps = pIpList->numOfIps; tscMgmtIpList.numOfIps = pIpList->numOfIps;
if (memcmp(tscMgmtIpList.ip, pIpList->ip, pIpList->numOfIps * 4) != 0) { if (memcmp(tscMgmtIpList.ip, pIpList->ip, pIpList->numOfIps * 4) != 0) {
for (int i = 0; i < pIpList->numOfIps; ++i) { 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]; tscMgmtIpList.ip[i] = pIpList->ip[i];
} }
tscTrace("cluster mgmt IP list:"); tscTrace("cluster mgmt IP list:");
...@@ -77,9 +77,7 @@ void tscSetMgmtIpListFromCluster(SIpList *pIpList) { ...@@ -77,9 +77,7 @@ void tscSetMgmtIpListFromCluster(SIpList *pIpList) {
void tscSetMgmtIpListFromEdge() { void tscSetMgmtIpListFromEdge() {
if (tscMgmtIpList.numOfIps != 2) { if (tscMgmtIpList.numOfIps != 2) {
tscMgmtIpList.numOfIps = 2; tscMgmtIpList.numOfIps = 2;
strcpy(tscMgmtIpList.ipStr[0], tsMasterIp);
tscMgmtIpList.ip[0] = inet_addr(tsMasterIp); tscMgmtIpList.ip[0] = inet_addr(tsMasterIp);
strcpy(tscMgmtIpList.ipStr[1], tsMasterIp);
tscMgmtIpList.ip[1] = inet_addr(tsMasterIp); tscMgmtIpList.ip[1] = inet_addr(tsMasterIp);
tscTrace("edge mgmt IP list:"); tscTrace("edge mgmt IP list:");
tscPrintMgmtIp(); tscPrintMgmtIp();
...@@ -351,17 +349,14 @@ int tscSendMsgToServer(SSqlObj *pSql) { ...@@ -351,17 +349,14 @@ int tscSendMsgToServer(SSqlObj *pSql) {
uint64_t signature = (uint64_t)pSql->signature; uint64_t signature = (uint64_t)pSql->signature;
//if (tscUpdateVnodeMsg[pSql->cmd.command]) (*tscUpdateVnodeMsg[pSql->cmd.command])(pSql, pStart); //if (tscUpdateVnodeMsg[pSql->cmd.command]) (*tscUpdateVnodeMsg[pSql->cmd.command])(pSql, pStart);
int ret; if (pSql->cmd.command < TSDB_SQL_MGMT) {
if (pSql->cmd.command < TSDB_SQL_MGMT) rpcSendRequest(pTscMgmtConn, tscMgmtIpList, pSql->cmd.msgType, pStart, pSql->cmd.payloadLen, pSql);
ret = rpcSendRequest(pTscMgmtConn, pSql->cmd.msgType, pStart, pSql->cmd.payloadLen, pSql); } else {
else SRpcIpSet rpcSet = tscMgmtIpList;
ret = rpcSendRequest(pVnodeConn, pSql->cmd.msgType, pStart, pSql->cmd.payloadLen, pSql); rpcSendRequest(pVnodeConn, rpcSet, pSql->cmd.msgType, pStart, pSql->cmd.payloadLen, pSql);
if (ret >= 0) {
code = 0;
} }
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) { ...@@ -1327,7 +1322,7 @@ void tscKillMetricQuery(SSqlObj *pSql) {
* sub-queries not correctly released and master sql object of metric query reaches an abnormal state. * 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; pSql->pSubs[i]->res.code = TSDB_CODE_QUERY_CANCELLED;
taosStopRpcConn(pSql->pSubs[i]->thandle); //taosStopRpcConn(pSql->pSubs[i]->thandle);
} }
pSql->numOfSubs = 0; pSql->numOfSubs = 0;
...@@ -1491,9 +1486,9 @@ void tscUpdateVnodeInSubmitMsg(SSqlObj *pSql, char *buf) { ...@@ -1491,9 +1486,9 @@ void tscUpdateVnodeInSubmitMsg(SSqlObj *pSql, char *buf) {
pMsg = buf + tsRpcHeadSize; pMsg = buf + tsRpcHeadSize;
pShellMsg = (SShellSubmitMsg *)pMsg; pShellMsg = (SShellSubmitMsg *)pMsg;
pShellMsg->vnode = htons(pMeterMeta->vpeerDesc[pSql->index].vnode); //pShellMsg->vnode = htons(pMeterMeta->vpeerDesc[pSql->index].vnode);
tscTrace("%p update submit msg vnode:%s:%d", pSql, taosIpStr(pMeterMeta->vpeerDesc[pSql->index].ip), //tscTrace("%p update submit msg vnode:%s:%d", pSql, taosIpStr(pMeterMeta->vpeerDesc[pSql->index].ip),
htons(pShellMsg->vnode)); // htons(pShellMsg->vnode));
} }
int tscBuildSubmitMsg(SSqlObj *pSql, SSqlInfo *pInfo) { int tscBuildSubmitMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
...@@ -1511,13 +1506,13 @@ int tscBuildSubmitMsg(SSqlObj *pSql, SSqlInfo *pInfo) { ...@@ -1511,13 +1506,13 @@ int tscBuildSubmitMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
pShellMsg = (SShellSubmitMsg *)pMsg; pShellMsg = (SShellSubmitMsg *)pMsg;
pShellMsg->import = htons(TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_INSERT) ? 0 : 1); 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 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.payloadLen is set during parse sql routine, so we do not use it here
pSql->cmd.msgType = TSDB_MSG_TYPE_DNODE_SUBMIT; pSql->cmd.msgType = TSDB_MSG_TYPE_DNODE_SUBMIT;
tscTrace("%p update submit msg vnode:%s:%d", pSql, taosIpStr(pMeterMeta->vpeerDesc[pMeterMeta->index].ip), //tscTrace("%p update submit msg vnode:%s:%d", pSql, taosIpStr(pMeterMeta->vpeerDesc[pMeterMeta->index].ip),
htons(pShellMsg->vnode)); // htons(pShellMsg->vnode));
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
......
src/client/src/tscSql.c
浏览文件 @ 29058645
...@@ -65,11 +65,8 @@ TAOS *taos_connect_imp(const char *ip, const char *user, const char *pass, const ...@@ -65,11 +65,8 @@ TAOS *taos_connect_imp(const char *ip, const char *user, const char *pass, const
if (ip && ip[0]) { if (ip && ip[0]) {
tscMgmtIpList.numOfIps = 3; tscMgmtIpList.numOfIps = 3;
strcpy(tscMgmtIpList.ipStr[0], ip);
tscMgmtIpList.ip[0] = inet_addr(ip); tscMgmtIpList.ip[0] = inet_addr(ip);
strcpy(tscMgmtIpList.ipStr[1], tsMasterIp);
tscMgmtIpList.ip[1] = inet_addr(tsMasterIp); tscMgmtIpList.ip[1] = inet_addr(tsMasterIp);
strcpy(tscMgmtIpList.ipStr[2], tsSecondIp);
tscMgmtIpList.ip[2] = inet_addr(tsSecondIp); tscMgmtIpList.ip[2] = inet_addr(tsSecondIp);
tscMgmtIpList.index = 0; tscMgmtIpList.index = 0;
tscMgmtIpList.port = tsMgmtShellPort; tscMgmtIpList.port = tsMgmtShellPort;
...@@ -907,7 +904,7 @@ void taos_stop_query(TAOS_RES *res) { ...@@ -907,7 +904,7 @@ void taos_stop_query(TAOS_RES *res) {
return; return;
} }
taosStopRpcConn(pSql->thandle); //taosStopRpcConn(pSql->thandle);
tscTrace("%p query is cancelled", res); tscTrace("%p query is cancelled", res);
} }
......
src/client/src/tscSystem.c
浏览文件 @ 29058645
...@@ -99,12 +99,10 @@ void taos_init_imp() { ...@@ -99,12 +99,10 @@ void taos_init_imp() {
tscMgmtIpList.index = 0; tscMgmtIpList.index = 0;
tscMgmtIpList.port = tsMgmtShellPort; tscMgmtIpList.port = tsMgmtShellPort;
tscMgmtIpList.numOfIps = 1; tscMgmtIpList.numOfIps = 1;
strcpy(tscMgmtIpList.ipStr[0], tsMasterIp);
tscMgmtIpList.ip[0] = inet_addr(tsMasterIp); tscMgmtIpList.ip[0] = inet_addr(tsMasterIp);
if (tsSecondIp[0]) { if (tsSecondIp[0]) {
tscMgmtIpList.numOfIps = 2; tscMgmtIpList.numOfIps = 2;
strcpy(tscMgmtIpList.ipStr[1], tsSecondIp);
tscMgmtIpList.ip[1] = inet_addr(tsSecondIp); tscMgmtIpList.ip[1] = inet_addr(tsSecondIp);
} }
...@@ -131,7 +129,7 @@ void taos_init_imp() { ...@@ -131,7 +129,7 @@ void taos_init_imp() {
rpcInit.localPort = 0; rpcInit.localPort = 0;
rpcInit.label = "TSC-vnode"; rpcInit.label = "TSC-vnode";
rpcInit.numOfThreads = tscNumOfThreads; rpcInit.numOfThreads = tscNumOfThreads;
rpcInit.fp = tscProcessMsgFromServer; rpcInit.afp = tscProcessMsgFromServer;
rpcInit.sessions = tsMaxVnodeConnections; rpcInit.sessions = tsMaxVnodeConnections;
rpcInit.connType = TAOS_CONN_SOCKET_TYPE_C(); rpcInit.connType = TAOS_CONN_SOCKET_TYPE_C();
pVnodeConn = rpcOpen(&rpcInit); pVnodeConn = rpcOpen(&rpcInit);
...@@ -145,7 +143,7 @@ void taos_init_imp() { ...@@ -145,7 +143,7 @@ void taos_init_imp() {
rpcInit.localPort = 0; rpcInit.localPort = 0;
rpcInit.label = "TSC-mgmt"; rpcInit.label = "TSC-mgmt";
rpcInit.numOfThreads = 1; rpcInit.numOfThreads = 1;
rpcInit.fp = tscProcessMsgFromServer; rpcInit.afp = tscProcessMsgFromServer;
rpcInit.sessions = tsMaxMgmtConnections; rpcInit.sessions = tsMaxMgmtConnections;
rpcInit.connType = TAOS_CONN_SOCKET_TYPE_C(); rpcInit.connType = TAOS_CONN_SOCKET_TYPE_C();
pTscMgmtConn = rpcOpen(&rpcInit); pTscMgmtConn = rpcOpen(&rpcInit);
......
src/dnode/CMakeLists.txt
浏览文件 @ 29058645
...@@ -9,9 +9,8 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM)) ...@@ -9,9 +9,8 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
INCLUDE_DIRECTORIES(inc) INCLUDE_DIRECTORIES(inc)
AUX_SOURCE_DIRECTORY(src SRC) AUX_SOURCE_DIRECTORY(src SRC)
ADD_LIBRARY(dnode ${SRC}) ADD_EXECUTABLE(taosd ${SRC})
#ADD_EXECUTABLE(taosd ${SRC}) TARGET_LINK_LIBRARIES(taosd mnode sdb taos_static monitor http)
#TARGET_LINK_LIBRARIES(taosd mnode sdb vnode taos_static monitor http)
#IF (TD_CLUSTER) #IF (TD_CLUSTER)
# TARGET_LINK_LIBRARIES(taosd dcluster) # TARGET_LINK_LIBRARIES(taosd dcluster)
......
src/dnode/src/dnodeShell.c
浏览文件 @ 29058645
...@@ -50,7 +50,7 @@ void* dnodeProcessMsgFromShell(int8_t msgType, void *pCont, int32_t contLen, voi ...@@ -50,7 +50,7 @@ void* dnodeProcessMsgFromShell(int8_t msgType, void *pCont, int32_t contLen, voi
} }
if (dnodeGetRunStatus() != TSDB_DNODE_RUN_STATUS_RUNING) { 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); dTrace("conn:%p, query msg is ignored since dnode not running", handle);
return NULL; return NULL;
} }
...@@ -83,7 +83,7 @@ int32_t dnodeInitShell() { ...@@ -83,7 +83,7 @@ int32_t dnodeInitShell() {
rpcInit.localPort = tsVnodeShellPort; rpcInit.localPort = tsVnodeShellPort;
rpcInit.label = "DND-shell"; rpcInit.label = "DND-shell";
rpcInit.numOfThreads = numOfThreads; rpcInit.numOfThreads = numOfThreads;
rpcInit.fp = dnodeProcessMsgFromShell; rpcInit.cfp = dnodeProcessMsgFromShell;
rpcInit.sessions = TSDB_SESSIONS_PER_DNODE; rpcInit.sessions = TSDB_SESSIONS_PER_DNODE;
rpcInit.connType = TAOS_CONN_SOCKET_TYPE_S(); rpcInit.connType = TAOS_CONN_SOCKET_TYPE_S();
rpcInit.idleTime = tsShellActivityTimer * 2000; rpcInit.idleTime = tsShellActivityTimer * 2000;
...@@ -118,7 +118,7 @@ void dnodeProcessQueryRequestCb(int code, void *pQInfo, void *pConn) { ...@@ -118,7 +118,7 @@ void dnodeProcessQueryRequestCb(int code, void *pQInfo, void *pConn) {
queryRsp->code = htonl(code); queryRsp->code = htonl(code);
queryRsp->qhandle = (uint64_t) (pQInfo); 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) { static void dnodeProcessQueryRequest(int8_t *pCont, int32_t contLen, void *pConn) {
...@@ -134,7 +134,7 @@ void dnodeProcessRetrieveRequestCb(int32_t code, void *pQInfo, void *pConn) { ...@@ -134,7 +134,7 @@ void dnodeProcessRetrieveRequestCb(int32_t code, void *pQInfo, void *pConn) {
assert(pConn != NULL); assert(pConn != NULL);
if (code != TSDB_CODE_SUCCESS) { if (code != TSDB_CODE_SUCCESS) {
rpcSendSimpleRsp(pConn, code); rpcSendResponse(pConn, code, 0, 0);
return; return;
} }
...@@ -142,13 +142,13 @@ void dnodeProcessRetrieveRequestCb(int32_t code, void *pQInfo, void *pConn) { ...@@ -142,13 +142,13 @@ void dnodeProcessRetrieveRequestCb(int32_t code, void *pQInfo, void *pConn) {
int32_t contLen = dnodeGetRetrieveDataSize(pQInfo); int32_t contLen = dnodeGetRetrieveDataSize(pQInfo);
SRetrieveMeterRsp *retrieveRsp = (SRetrieveMeterRsp *) rpcMallocCont(contLen); SRetrieveMeterRsp *retrieveRsp = (SRetrieveMeterRsp *) rpcMallocCont(contLen);
if (retrieveRsp == NULL) { if (retrieveRsp == NULL) {
rpcSendSimpleRsp(pConn, TSDB_CODE_SERV_OUT_OF_MEMORY); rpcSendResponse(pConn, TSDB_CODE_SERV_OUT_OF_MEMORY, 0, 0);
return; return;
} }
code = dnodeGetRetrieveData(pQInfo, retrieveRsp); code = dnodeGetRetrieveData(pQInfo, retrieveRsp);
if (code != TSDB_CODE_SUCCESS) { if (code != TSDB_CODE_SUCCESS) {
rpcSendSimpleRsp(pConn, TSDB_CODE_INVALID_QHANDLE); rpcSendResponse(pConn, TSDB_CODE_INVALID_QHANDLE, 0, 0);
} }
retrieveRsp->numOfRows = htonl(retrieveRsp->numOfRows); retrieveRsp->numOfRows = htonl(retrieveRsp->numOfRows);
...@@ -156,7 +156,7 @@ void dnodeProcessRetrieveRequestCb(int32_t code, void *pQInfo, void *pConn) { ...@@ -156,7 +156,7 @@ void dnodeProcessRetrieveRequestCb(int32_t code, void *pQInfo, void *pConn) {
retrieveRsp->offset = htobe64(retrieveRsp->offset); retrieveRsp->offset = htobe64(retrieveRsp->offset);
retrieveRsp->useconds = htobe64(retrieveRsp->useconds); 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) { static void dnodeProcessRetrieveRequest(int8_t *pCont, int32_t contLen, void *pConn) {
...@@ -170,14 +170,14 @@ void dnodeProcessShellSubmitRequestCb(SShellSubmitRspMsg *result, void *pConn) { ...@@ -170,14 +170,14 @@ void dnodeProcessShellSubmitRequestCb(SShellSubmitRspMsg *result, void *pConn) {
assert(result != NULL); assert(result != NULL);
if (result->code != 0) { if (result->code != 0) {
rpcSendSimpleRsp(pConn, result->code); rpcSendResponse(pConn, result->code, 0, 0);
return; return;
} }
int32_t contLen = sizeof(SShellSubmitRspMsg) + result->numOfFailedBlocks * sizeof(SShellSubmitRspBlock); int32_t contLen = sizeof(SShellSubmitRspMsg) + result->numOfFailedBlocks * sizeof(SShellSubmitRspBlock);
SShellSubmitRspMsg *submitRsp = (SShellSubmitRspMsg *) rpcMallocCont(contLen); SShellSubmitRspMsg *submitRsp = (SShellSubmitRspMsg *) rpcMallocCont(contLen);
if (submitRsp == NULL) { if (submitRsp == NULL) {
rpcSendSimpleRsp(pConn, TSDB_CODE_SERV_OUT_OF_MEMORY); rpcSendResponse(pConn, TSDB_CODE_SERV_OUT_OF_MEMORY, 0, 0);
return; return;
} }
...@@ -202,7 +202,7 @@ void dnodeProcessShellSubmitRequestCb(SShellSubmitRspMsg *result, void *pConn) { ...@@ -202,7 +202,7 @@ void dnodeProcessShellSubmitRequestCb(SShellSubmitRspMsg *result, void *pConn) {
submitRsp->failedRows = htonl(submitRsp->failedRows); submitRsp->failedRows = htonl(submitRsp->failedRows);
submitRsp->numOfFailedBlocks = htonl(submitRsp->numOfFailedBlocks); 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) { static void dnodeProcessShellSubmitRequest(int8_t *pCont, int32_t contLen, void *pConn) {
......
src/dnode/src/dnodeVnodeMgmt.c
浏览文件 @ 29058645
...@@ -19,14 +19,34 @@ ...@@ -19,14 +19,34 @@
#include "taoserror.h" #include "taoserror.h"
#include "dnodeVnodeMgmt.h" #include "dnodeVnodeMgmt.h"
EVnodeStatus dnodeGetVnodeStatus(int32_t vnode) { int32_t dnodeOpenVnodes() {
return TSDB_VN_STATUS_MASTER; return 0;
}
int32_t dnodeCleanupVnodes() {
return 0;
} }
bool dnodeCheckVnodeExist(int32_t vnode) { bool dnodeCheckVnodeExist(int32_t vnode) {
return true; 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) { bool dnodeCheckTableExist(int32_t vnode, int32_t sid, int64_t uid) {
return true; return true;
} }
......
src/inc/mnode.h
浏览文件 @ 29058645
...@@ -152,9 +152,7 @@ typedef struct SSuperTableObj { ...@@ -152,9 +152,7 @@ typedef struct SSuperTableObj {
int8_t reserved[7]; int8_t reserved[7];
int8_t updateEnd[1]; int8_t updateEnd[1];
pthread_rwlock_t rwLock; pthread_rwlock_t rwLock;
struct SSuperTableObj *prev, *next;
int16_t nextColId; int16_t nextColId;
int8_t *schema; int8_t *schema;
...@@ -221,7 +219,7 @@ typedef struct _vg_obj { ...@@ -221,7 +219,7 @@ typedef struct _vg_obj {
int8_t updateEnd[1]; int8_t updateEnd[1];
struct _vg_obj *prev, *next; struct _vg_obj *prev, *next;
void * idPool; void * idPool;
STabObj ** meterList; void ** meterList;
} SVgObj; } SVgObj;
typedef struct _db_obj { typedef struct _db_obj {
......
src/kit/shell/CMakeLists.txt
浏览文件 @ 29058645
...@@ -2,6 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) ...@@ -2,6 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
PROJECT(TDengine) PROJECT(TDengine)
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc) 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_COMMUNITY_DIR}/src/client/inc)
INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc) INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
INCLUDE_DIRECTORIES(inc) INCLUDE_DIRECTORIES(inc)
......
src/kit/taosdemo/CMakeLists.txt
浏览文件 @ 29058645
...@@ -3,6 +3,7 @@ PROJECT(TDengine) ...@@ -3,6 +3,7 @@ PROJECT(TDengine)
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc) INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/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(${TD_OS_DIR}/inc)
INCLUDE_DIRECTORIES(inc) INCLUDE_DIRECTORIES(inc)
......
src/kit/taosdump/CMakeLists.txt
浏览文件 @ 29058645
...@@ -3,6 +3,7 @@ PROJECT(TDengine) ...@@ -3,6 +3,7 @@ PROJECT(TDengine)
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc) INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/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(${TD_OS_DIR}/inc)
INCLUDE_DIRECTORIES(inc) INCLUDE_DIRECTORIES(inc)
......
src/mnode/CMakeLists.txt
浏览文件 @ 29058645
...@@ -11,7 +11,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM)) ...@@ -11,7 +11,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
AUX_SOURCE_DIRECTORY(src SRC) AUX_SOURCE_DIRECTORY(src SRC)
ADD_LIBRARY(mnode ${SRC}) ADD_LIBRARY(mnode ${SRC})
#TARGET_LINK_LIBRARIES(mnode trpc tutil sdb pthread) TARGET_LINK_LIBRARIES(mnode trpc tutil sdb pthread)
#IF (TD_CLUSTER) #IF (TD_CLUSTER)
# TARGET_LINK_LIBRARIES(mnode mcluster) # TARGET_LINK_LIBRARIES(mnode mcluster)
......
src/mnode/inc/mgmtDb.h
浏览文件 @ 29058645
...@@ -28,8 +28,6 @@ int mgmtUseDb(SConnObj *pConn, char *name); ...@@ -28,8 +28,6 @@ int mgmtUseDb(SConnObj *pConn, char *name);
int mgmtAddVgroupIntoDb(SDbObj *pDb, SVgObj *pVgroup); int mgmtAddVgroupIntoDb(SDbObj *pDb, SVgObj *pVgroup);
int mgmtAddVgroupIntoDbTail(SDbObj *pDb, SVgObj *pVgroup); int mgmtAddVgroupIntoDbTail(SDbObj *pDb, SVgObj *pVgroup);
int mgmtRemoveVgroupFromDb(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 mgmtMoveVgroupToTail(SDbObj *pDb, SVgObj *pVgroup);
int mgmtMoveVgroupToHead(SDbObj *pDb, SVgObj *pVgroup); int mgmtMoveVgroupToHead(SDbObj *pDb, SVgObj *pVgroup);
int mgmtGetDbMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn); int mgmtGetDbMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn);
......
src/mnode/inc/mgmtDnodeInt.h
浏览文件 @ 29058645
...@@ -38,8 +38,8 @@ int mgmtSendOneFreeVnodeMsg(SVnodeGid *pVnodeGid); ...@@ -38,8 +38,8 @@ int mgmtSendOneFreeVnodeMsg(SVnodeGid *pVnodeGid);
char *taosBuildRspMsgToDnode(SDnodeObj *pObj, char type); char *taosBuildRspMsgToDnode(SDnodeObj *pObj, char type);
char *taosBuildReqMsgToDnode(SDnodeObj *pObj, char type); char *taosBuildReqMsgToDnode(SDnodeObj *pObj, char type);
extern int32_t (*mgmtSendSimpleRspToDnode)(int32_t msgType, int32_t code); extern int32_t (*mgmtSendSimpleRspToDnode)(void *pConn, int32_t msgType, int32_t code);
extern int32_t (*mgmtSendMsgToDnode)(SDnodeObj *pObj, char *msg, int msgLen); extern int32_t (*mgmtSendMsgToDnode)(int8_t *pCont, int32_t contLen, int8_t msgType);
extern int32_t (*mgmtInitDnodeInt)(); extern int32_t (*mgmtInitDnodeInt)();
extern void (*mgmtCleanUpDnodeInt)(); extern void (*mgmtCleanUpDnodeInt)();
extern void (*mgmtProcessDnodeStatus)(void *handle, void *tmrId); extern void (*mgmtProcessDnodeStatus)(void *handle, void *tmrId);
......
src/mnode/inc/mgmtNormalTable.h
浏览文件 @ 29058645
...@@ -34,7 +34,7 @@ int32_t mgmtDropNormalTableColumnByName(SNormalTableObj *pTable, char * ...@@ -34,7 +34,7 @@ int32_t mgmtDropNormalTableColumnByName(SNormalTableObj *pTable, char *
SNormalTableObj* mgmtGetNormalTable(char *tableId); SNormalTableObj* mgmtGetNormalTable(char *tableId);
SSchema* mgmtGetNormalTableSchema(SNormalTableObj *pTable); 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 #ifdef __cplusplus
} }
......
src/mnode/inc/mgmtTable.h
浏览文件 @ 29058645
...@@ -33,6 +33,7 @@ typedef struct { ...@@ -33,6 +33,7 @@ typedef struct {
int mgmtInitMeters(); int mgmtInitMeters();
STableObj mgmtGetTable(char *tableId); STableObj mgmtGetTable(char *tableId);
STableObj mgmtGetTableByPos(uint32_t dnodeIp, int32_t vnode, int32_t sid);
STabObj *mgmtGetTableInfo(char *src, char *tags[]); STabObj *mgmtGetTableInfo(char *src, char *tags[]);
int mgmtRetrieveMetricMeta(SConnObj *pConn, char **pStart, SSuperTableMetaMsg *pInfo); int mgmtRetrieveMetricMeta(SConnObj *pConn, char **pStart, SSuperTableMetaMsg *pInfo);
......
src/mnode/inc/mgmtUtil.h
浏览文件 @ 29058645
...@@ -28,8 +28,7 @@ extern "C" { ...@@ -28,8 +28,7 @@ extern "C" {
bool mgmtTableCreateFromSuperTable(STabObj *pTableObj); bool mgmtTableCreateFromSuperTable(STabObj *pTableObj);
bool mgmtIsSuperTable(STabObj *pTableObj); bool mgmtIsSuperTable(STabObj *pTableObj);
bool mgmtIsNormalTable(STabObj *pTableObj); bool mgmtIsNormalTable(STabObj *pTableObj);
char* mgmtTableGetTag(STabObj* pTable, int32_t col, SSchema* pTagColSchema); int32_t mgmtGetTagsLength(SSuperTableObj* pSuperTable, int32_t col);
int32_t mgmtGetTagsLength(STabObj* pSuperTable, int32_t col);
bool mgmtCheckIsMonitorDB(char *db, char *monitordb); bool mgmtCheckIsMonitorDB(char *db, char *monitordb);
int32_t mgmtCheckDBParams(SCreateDbMsg *pCreate); int32_t mgmtCheckDBParams(SCreateDbMsg *pCreate);
......
src/mnode/src/mgmtAcct.c
浏览文件 @ 29058645
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include "mgmtTable.h" #include "mgmtTable.h"
#include "mgmtUser.h" #include "mgmtUser.h"
#include "tschemautil.h" #include "tschemautil.h"
#include "taoserror.h"
extern void *userSdb; extern void *userSdb;
extern void *dbSdb; extern void *dbSdb;
...@@ -156,7 +157,7 @@ int32_t mgmtCheckDbLimitImp(SAcctObj *pAcct) { ...@@ -156,7 +157,7 @@ int32_t mgmtCheckDbLimitImp(SAcctObj *pAcct) {
int numOfDbs = sdbGetNumOfRows(dbSdb); int numOfDbs = sdbGetNumOfRows(dbSdb);
if (numOfDbs >= tsMaxDbs) { if (numOfDbs >= tsMaxDbs) {
mWarn("numOfDbs:%d, exceed tsMaxDbs:%d", numOfDbs, tsMaxDbs); mWarn("numOfDbs:%d, exceed tsMaxDbs:%d", numOfDbs, tsMaxDbs);
return TSDB_CODE_TOO_MANY_DATABSES; return TSDB_CODE_TOO_MANY_DATABASES;
} }
return 0; return 0;
} }
......
src/mnode/src/mgmtChildTable.c
浏览文件 @ 29058645
...@@ -208,86 +208,86 @@ void mgmtCleanUpChildTables() { ...@@ -208,86 +208,86 @@ void mgmtCleanUpChildTables() {
int8_t *mgmtBuildCreateChildTableMsg(SChildTableObj *pTable, int8_t *pMsg, int32_t vnode, int32_t tagDataLen, int8_t *mgmtBuildCreateChildTableMsg(SChildTableObj *pTable, int8_t *pMsg, int32_t vnode, int32_t tagDataLen,
int8_t *pTagData) { int8_t *pTagData) {
SCreateChildTableMsg *pCreateTable = (SCreateChildTableMsg *) pMsg; SCreateTableMsg *pCreateTable = (SCreateTableMsg *) pMsg;
memcpy(pCreateTable->tableId, pTable->tableId, TSDB_TABLE_ID_LEN); // memcpy(pCreateTable->tableId, pTable->tableId, TSDB_TABLE_ID_LEN);
memcpy(pCreateTable->superTableId, pTable->superTable->tableId, TSDB_TABLE_ID_LEN); // memcpy(pCreateTable->superTableId, pTable->superTable->tableId, TSDB_TABLE_ID_LEN);
pCreateTable->vnode = htonl(vnode); // pCreateTable->vnode = htonl(vnode);
pCreateTable->sid = htonl(pTable->sid); // pCreateTable->sid = htonl(pTable->sid);
pCreateTable->uid = pTable->uid; // pCreateTable->uid = pTable->uid;
pCreateTable->createdTime = htobe64(pTable->createdTime); // pCreateTable->createdTime = htobe64(pTable->createdTime);
pCreateTable->sversion = htonl(pTable->superTable->sversion); // pCreateTable->sversion = htonl(pTable->superTable->sversion);
pCreateTable->numOfColumns = htons(pTable->superTable->numOfColumns); // pCreateTable->numOfColumns = htons(pTable->superTable->numOfColumns);
pCreateTable->numOfTags = htons(pTable->superTable->numOfTags); // pCreateTable->numOfTags = htons(pTable->superTable->numOfTags);
//
SSchema *pSchema = pTable->superTable->schema; // SSchema *pSchema = pTable->superTable->schema;
int32_t totalCols = pCreateTable->numOfColumns + pCreateTable->numOfTags; // int32_t totalCols = pCreateTable->numOfColumns + pCreateTable->numOfTags;
//
for (int32_t col = 0; col < totalCols; ++col) { // for (int32_t col = 0; col < totalCols; ++col) {
SMColumn *colData = &((SMColumn *) (pCreateTable->data))[col]; // SMColumn *colData = &((SMColumn *) (pCreateTable->data))[col];
colData->type = pSchema[col].type; // colData->type = pSchema[col].type;
colData->bytes = htons(pSchema[col].bytes); // colData->bytes = htons(pSchema[col].bytes);
colData->colId = htons(pSchema[col].colId); // colData->colId = htons(pSchema[col].colId);
} // }
//
int32_t totalColsSize = sizeof(SMColumn *) * totalCols; // int32_t totalColsSize = sizeof(SMColumn *) * totalCols;
pMsg = pCreateTable->data + totalColsSize + tagDataLen; // pMsg = pCreateTable->data + totalColsSize + tagDataLen;
//
memcpy(pCreateTable->data + totalColsSize, pTagData, tagDataLen); // memcpy(pCreateTable->data + totalColsSize, pTagData, tagDataLen);
pCreateTable->tagDataLen = htonl(tagDataLen); // pCreateTable->tagDataLen = htonl(tagDataLen);
return pMsg; return pMsg;
} }
int32_t mgmtCreateChildTable(SDbObj *pDb, SCreateTableMsg *pCreate, SVgObj *pVgroup, int32_t sid) { int32_t mgmtCreateChildTable(SDbObj *pDb, SCreateTableMsg *pCreate, SVgObj *pVgroup, int32_t sid) {
int numOfTables = sdbGetNumOfRows(tsChildTableSdb); // int numOfTables = sdbGetNumOfRows(tsChildTableSdb);
if (numOfTables >= tsMaxTables) { // if (numOfTables >= tsMaxTables) {
mError("table:%s, numOfTables:%d exceed maxTables:%d", pCreate->meterId, numOfTables, tsMaxTables); // mError("table:%s, numOfTables:%d exceed maxTables:%d", pCreate->meterId, numOfTables, tsMaxTables);
return TSDB_CODE_TOO_MANY_TABLES; // return TSDB_CODE_TOO_MANY_TABLES;
} // }
//
char *pTagData = (char *) pCreate->schema; // it is a tag key // char *pTagData = (char *) pCreate->schema; // it is a tag key
SSuperTableObj *pSuperTable = mgmtGetSuperTable(pTagData); // SSuperTableObj *pSuperTable = mgmtGetSuperTable(pTagData);
if (pSuperTable == NULL) { // if (pSuperTable == NULL) {
mError("table:%s, corresponding super table does not exist", pCreate->meterId); // mError("table:%s, corresponding super table does not exist", pCreate->meterId);
return TSDB_CODE_INVALID_TABLE; // return TSDB_CODE_INVALID_TABLE;
} // }
//
SChildTableObj *pTable = (SChildTableObj *) calloc(sizeof(SChildTableObj), 1); // SChildTableObj *pTable = (SChildTableObj *) calloc(sizeof(SChildTableObj), 1);
if (pTable == NULL) { // if (pTable == NULL) {
return TSDB_CODE_SERV_OUT_OF_MEMORY; // return TSDB_CODE_SERV_OUT_OF_MEMORY;
} // }
strcpy(pTable->tableId, pCreate->meterId); // strcpy(pTable->tableId, pCreate->meterId);
strcpy(pTable->superTableId, pSuperTable->tableId); // strcpy(pTable->superTableId, pSuperTable->tableId);
pTable->createdTime = taosGetTimestampMs(); // pTable->createdTime = taosGetTimestampMs();
pTable->superTable = pSuperTable; // pTable->superTable = pSuperTable;
pTable->vgId = pVgroup->vgId; // pTable->vgId = pVgroup->vgId;
pTable->sid = sid; // pTable->sid = sid;
pTable->uid = (((uint64_t) pTable->vgId) << 40) + ((((uint64_t) pTable->sid) & ((1ul << 24) - 1ul)) << 16) + // pTable->uid = (((uint64_t) pTable->vgId) << 40) + ((((uint64_t) pTable->sid) & ((1ul << 24) - 1ul)) << 16) +
((uint64_t) sdbGetVersion() & ((1ul << 16) - 1ul)); // ((uint64_t) sdbGetVersion() & ((1ul << 16) - 1ul));
//
SVariableMsg tags = {0}; // SVariableMsg tags = {0};
tags.size = mgmtGetTagsLength(pSuperTable, INT_MAX) + (uint32_t) TSDB_TABLE_ID_LEN; // tags.size = mgmtGetTagsLength(pSuperTable, INT_MAX) + (uint32_t) TSDB_TABLE_ID_LEN;
tags.data = (char *) calloc(1, tags.size); // tags.data = (char *) calloc(1, tags.size);
if (tags.data == NULL) { // if (tags.data == NULL) {
free(pTable); // free(pTable);
mError("table:%s, corresponding super table schema is null", pCreate->meterId); // mError("table:%s, corresponding super table schema is null", pCreate->meterId);
return TSDB_CODE_INVALID_TABLE; // return TSDB_CODE_INVALID_TABLE;
} // }
memcpy(tags.data, pTagData, tags.size); // memcpy(tags.data, pTagData, tags.size);
//
if (sdbInsertRow(tsStreamTableSdb, pTable, 0) < 0) { // if (sdbInsertRow(tsStreamTableSdb, pTable, 0) < 0) {
mError("table:%s, update sdb error", pCreate->meterId); // mError("table:%s, update sdb error", pCreate->meterId);
return TSDB_CODE_SDB_ERROR; // return TSDB_CODE_SDB_ERROR;
} // }
//
mgmtAddTimeSeries(pTable->superTable->numOfColumns - 1); // mgmtAddTimeSeries(pTable->superTable->numOfColumns - 1);
//
mgmtSendCreateChildTableMsg(pTable, pVgroup, tags.size, tags.data); // mgmtSendCreateChildTableMsg(pTable, pVgroup, tags.size, tags.data);
//
mTrace("table:%s, create table in vgroup, vgId:%d sid:%d vnode:%d uid:%" // mTrace("table:%s, create table in vgroup, vgId:%d sid:%d vnode:%d uid:%"
PRIu64 // PRIu64
" db:%s", // " db:%s",
pTable->tableId, pVgroup->vgId, sid, pVgroup->vnodeGid[0].vnode, pTable->uid, pDb->name); // pTable->tableId, pVgroup->vgId, sid, pVgroup->vnodeGid[0].vnode, pTable->uid, pDb->name);
return 0; return 0;
} }
...@@ -323,14 +323,14 @@ SChildTableObj* mgmtGetChildTable(char *tableId) { ...@@ -323,14 +323,14 @@ SChildTableObj* mgmtGetChildTable(char *tableId) {
} }
int32_t mgmtModifyChildTableTagValueByName(SChildTableObj *pTable, char *tagName, char *nContent) { int32_t mgmtModifyChildTableTagValueByName(SChildTableObj *pTable, char *tagName, char *nContent) {
int col = mgmtFindTagCol(pTable->superTable, tagName); // int col = mgmtFindTagCol(pTable->superTable, tagName);
if (col < 0 || col > pTable->superTable->numOfTags) { // if (col < 0 || col > pTable->superTable->numOfTags) {
return TSDB_CODE_APP_ERROR; // return TSDB_CODE_APP_ERROR;
} // }
//
//TODO send msg to dnode // //TODO send msg to dnode
mTrace("Succeed to modify tag column %d of table %s", col, pTable->tableId); // mTrace("Succeed to modify tag column %d of table %s", col, pTable->tableId);
return TSDB_CODE_SUCCESS; // return TSDB_CODE_SUCCESS;
// int rowSize = 0; // int rowSize = 0;
// SSchema *schema = (SSchema *)(pSuperTable->schema + (pSuperTable->numOfColumns + col) * sizeof(SSchema)); // SSchema *schema = (SSchema *)(pSuperTable->schema + (pSuperTable->numOfColumns + col) * sizeof(SSchema));
......
src/mnode/src/mgmtDb.c
浏览文件 @ 29058645
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "tschemautil.h" #include "tschemautil.h"
#include "tstatus.h" #include "tstatus.h"
#include "mnode.h" #include "mnode.h"
#include "taoserror.h"
void *dbSdb = NULL; void *dbSdb = NULL;
extern void *vgSdb; extern void *vgSdb;
...@@ -324,7 +325,7 @@ int mgmtDropDbByName(SAcctObj *pAcct, char *name, short ignoreNotExists) { ...@@ -324,7 +325,7 @@ int mgmtDropDbByName(SAcctObj *pAcct, char *name, short ignoreNotExists) {
} }
if (mgmtCheckIsMonitorDB(pDb->name, tsMonitorDbName)) { if (mgmtCheckIsMonitorDB(pDb->name, tsMonitorDbName)) {
return TSDB_CODE_MONITOR_DB_FORBEIDEN; return TSDB_CODE_MONITOR_DB_FORBIDDEN;
} }
return mgmtDropDb(pDb); return mgmtDropDb(pDb);
...@@ -479,33 +480,6 @@ int mgmtMoveVgroupToHead(SDbObj *pDb, SVgObj *pVgroup) { ...@@ -479,33 +480,6 @@ int mgmtMoveVgroupToHead(SDbObj *pDb, SVgObj *pVgroup) {
return 0; 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 mgmtShowTables(SAcctObj *pAcct, char *db) {
int code; int code;
......
src/mnode/src/mgmtDnodeInt.c
浏览文件 @ 29058645
...@@ -28,162 +28,179 @@ ...@@ -28,162 +28,179 @@
#include "tstatus.h" #include "tstatus.h"
#include "tsystem.h" #include "tsystem.h"
#include "tsched.h" #include "tsched.h"
#include "taoserror.h"
#include "dnodeSystem.h" #include "dnodeSystem.h"
#include "mgmtChildTable.h" #include "mgmtChildTable.h"
#include "mgmtNormalTable.h" #include "mgmtNormalTable.h"
#include "mgmtStreamTable.h" #include "mgmtStreamTable.h"
void mgmtProcessMsgFromDnode(char *content, int msgLen, int msgType, SDnodeObj *pObj); void mgmtProcessMsgFromDnode(int8_t *pCont, int32_t contLen, int32_t msgType, void *pConn);
int mgmtSendVPeersMsg(SVgObj *pVgroup); int mgmtSendVPeersMsg(SVgObj *pVgroup);
char *mgmtBuildVpeersIe(char *pMsg, SVgObj *pVgroup, int vnode); char *mgmtBuildVpeersIe(char *pMsg, SVgObj *pVgroup, int vnode);
char *mgmtBuildCreateMeterIe(STabObj *pTable, char *pMsg, int vnode); char *mgmtBuildCreateMeterIe(STabObj *pTable, char *pMsg, int vnode);
extern void *tsDnodeMgmtQhandle;
void * mgmtStatusTimer = NULL;
void mgmtSendMsgToDnodeImpFp(SSchedMsg *sched) {
int8_t msgType = *(int8_t *) (sched->msg - sizeof(int32_t) - sizeof(int8_t));
int32_t contLen = *(int32_t *) (sched->msg - sizeof(int8_t));
int8_t *pCont = sched->msg;
void *pConn = NULL;
int mgmtProcessMeterCfgMsg(char *cont, int contLen, SDnodeObj *pObj) { dnodeProcessMsgFromMgmt(pCont, contLen, msgType, pConn);
char * pMsg, *pStart; rpcFreeCont(sched->msg);
int msgLen = 0; }
STabObj * pTable = NULL;
SMeterCfgMsg *pCfg = (SMeterCfgMsg *)cont;
SVgObj * pVgroup;
if (!sdbMaster) {
mgmtSendSimpleRspToDnode(pObj, TSDB_MSG_TYPE_TABLE_CFG_RSP, TSDB_CODE_REDIRECT);
return 0;
}
int vnode = htonl(pCfg->vnode);
int sid = htonl(pCfg->sid);
pStart = taosBuildRspMsgToDnodeWithSize(pObj, TSDB_MSG_TYPE_TABLE_CFG_RSP, 64000); int32_t mgmtSendMsgToDnodeImp(int8_t *pCont, int32_t contLen, int8_t msgType) {
if (pStart == NULL) { mTrace("msg:%s is sent to dnode", taosMsg[msgType]);
mgmtSendSimpleRspToDnode(pObj, TSDB_MSG_TYPE_TABLE_CFG_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY); *(int8_t *) (pCont - sizeof(int32_t) - sizeof(int8_t)) = msgType;
return 0; *(int32_t *) (pCont - sizeof(int8_t)) = contLen;
}
pMsg = pStart; SSchedMsg schedMsg = {0};
schedMsg.fp = mgmtSendMsgToDnodeImpFp;
schedMsg.msg = pCont;
if (vnode < pObj->numOfVnodes) { taosScheduleTask(tsDnodeMgmtQhandle, &schedMsg);
int vgId = pObj->vload[vnode].vgId;
pVgroup = mgmtGetVgroup(vgId); return TSDB_CODE_SUCCESS;
if (pVgroup) pTable = pVgroup->meterList[sid]; }
}
if (pTable) { int32_t (*mgmtSendMsgToDnode)(int8_t *pCont, int32_t contLen, int8_t msgType) = mgmtSendMsgToDnodeImp;
*pMsg = 0; // code
pMsg++;
pMsg = mgmtBuildCreateMeterIe(pTable, pMsg, vnode);
} else {
mTrace("dnode:%s, vnode:%d sid:%d, meter not there", taosIpStr(pObj->privateIp), vnode, sid);
*pMsg = TSDB_CODE_INVALID_TABLE_ID;
pMsg++;
*(int32_t *)pMsg = htonl(vnode);
pMsg += sizeof(int32_t);
*(int32_t *)pMsg = htonl(sid);
pMsg += sizeof(int32_t);
}
msgLen = pMsg - pStart; int32_t mgmtSendSimpleRspToDnodeImp(void *pConn, int32_t msgType, int32_t code) {
mgmtSendMsgToDnode(pObj, pStart, msgLen); int8_t *pCont = rpcMallocCont(sizeof(int32_t));
*(int32_t *) pCont = code;
return 0; mgmtSendMsgToDnodeImp(pCont, sizeof(int32_t), msgType);
return TSDB_CODE_SUCCESS;
} }
int mgmtProcessVpeerCfgMsg(char *cont, int contLen, SDnodeObj *pObj) { int32_t (*mgmtSendSimpleRspToDnode)(void *pConn, int32_t msgType, int32_t code) = mgmtSendSimpleRspToDnodeImp;
char * pMsg, *pStart;
int msgLen = 0;
SVpeerCfgMsg *pCfg = (SVpeerCfgMsg *)cont;
SVgObj * pVgroup = NULL;
int32_t mgmtProcessMeterCfgMsg(int8_t *pCont, int32_t contLen, void *pConn) {
if (!sdbMaster) { if (!sdbMaster) {
mgmtSendSimpleRspToDnode(pObj, TSDB_MSG_TYPE_VNODE_CFG_RSP, TSDB_CODE_REDIRECT); mgmtSendSimpleRspToDnode(pConn, TSDB_MSG_TYPE_TABLE_CFG_RSP, TSDB_CODE_REDIRECT);
return 0; return TSDB_CODE_REDIRECT;
} }
int vnode = htonl(pCfg->vnode); SMeterCfgMsg *cfg = (SMeterCfgMsg *) pConn;
int32_t vnode = htonl(cfg->vnode);
int32_t sid = htonl(cfg->sid);
pStart = taosBuildRspMsgToDnode(pObj, TSDB_MSG_TYPE_VNODE_CFG_RSP); STableObj table = mgmtGetTableByPos(0, vnode, sid);
if (pStart == NULL) { if (table.obj == NULL) {
mgmtSendSimpleRspToDnode(pObj, TSDB_MSG_TYPE_VNODE_CFG_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY); mgmtSendSimpleRspToDnode(pConn, TSDB_MSG_TYPE_TABLE_CFG_RSP, TSDB_CODE_INVALID_TABLE);
return 0; return TSDB_CODE_INVALID_TABLE_ID;
} }
pMsg = pStart;
if (vnode < pObj->numOfVnodes) pVgroup = mgmtGetVgroup(pObj->vload[vnode].vgId); int8_t *pCreateTableMsg = NULL;
if (table.type == TSDB_TABLE_TYPE_NORMAL_TABLE) {
pCreateTableMsg = mgmtBuildCreateNormalTableMsg((SNormalTableObj *)table.obj, vnode);
} else if (table.type == TSDB_TABLE_TYPE_CHILD_TABLE) {
pCreateTableMsg = mgmtBuildCreateNormalTableMsg((SNormalTableObj *)table.obj, vnode);
} else if (table.type == TSDB_TABLE_TYPE_STREAM_TABLE) {
pCreateTableMsg = mgmtBuildCreateNormalTableMsg((SNormalTableObj *)table.obj, vnode);
} else {}
if (pVgroup) { if (pCreateTableMsg != NULL) {
*pMsg = 0; mgmtSendMsgToDnode(pCreateTableMsg, 0, TSDB_MSG_TYPE_TABLE_CFG_RSP);
pMsg++; return TSDB_CODE_SUCCESS;
pMsg = mgmtBuildVpeersIe(pMsg, pVgroup, vnode);
mTrace("dnode:%s, vnode:%d, vgroup:%d, send create vnode msg, code:%d", taosIpStr(pObj->privateIp), vnode, pVgroup->vgId, *pMsg);
} else { } else {
mTrace("dnode:%s, vnode:%d, no vgroup info, vgroup:%d", taosIpStr(pObj->privateIp), vnode, pObj->vload[vnode].vgId); mgmtSendSimpleRspToDnode(pConn, TSDB_MSG_TYPE_TABLE_CFG_RSP, TSDB_CODE_INVALID_TABLE);
*pMsg = TSDB_CODE_NOT_ACTIVE_VNODE; return TSDB_CODE_INVALID_TABLE;
pMsg++;
*(int32_t *)pMsg = htonl(vnode);
pMsg += sizeof(int32_t);
} }
msgLen = pMsg - pStart;
mgmtSendMsgToDnode(pObj, pStart, msgLen);
return 0;
} }
int mgmtProcessCreateRsp(char *msg, int msgLen, SDnodeObj *pObj) { return 0; } int mgmtProcessVpeerCfgMsg(int8_t *pCont, int32_t contLen, void *pConn) {
// char * pMsg, *pStart;
int mgmtProcessFreeVnodeRsp(char *msg, int msgLen, SDnodeObj *pObj) { return 0; } // int msgLen = 0;
// SVpeerCfgMsg *pCfg = (SVpeerCfgMsg *)cont;
int mgmtProcessVPeersRsp(char *msg, int msgLen, SDnodeObj *pObj) { // SVgObj * pVgroup = NULL;
STaosRsp *pRsp = (STaosRsp *)msg; //
// if (!sdbMaster) {
if (!sdbMaster) { // mgmtSendSimpleRspToDnode(pObj, TSDB_MSG_TYPE_VNODE_CFG_RSP, TSDB_CODE_REDIRECT);
mgmtSendSimpleRspToDnode(pObj, TSDB_MSG_TYPE_DNODE_VPEERS_RSP, TSDB_CODE_REDIRECT); // return 0;
return 0; // }
} //
// int vnode = htonl(pCfg->vnode);
SDbObj *pDb = mgmtGetDb(pRsp->more); //
if (!pDb) { // pStart = taosBuildRspMsgToDnode(pObj, TSDB_MSG_TYPE_VNODE_CFG_RSP);
mError("dnode:%s, db:%s not find, code:%d", taosIpStr(pObj->privateIp), pRsp->more, pRsp->code); // if (pStart == NULL) {
return 0; // mgmtSendSimpleRspToDnode(pObj, TSDB_MSG_TYPE_VNODE_CFG_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
} // return 0;
// }
if (pDb->vgStatus != TSDB_VG_STATUS_IN_PROGRESS) { // pMsg = pStart;
mTrace("dnode:%s, db:%s vpeer rsp already disposed, vgroup status:%s code:%d", //
taosIpStr(pObj->privateIp), pRsp->more, taosGetVgroupStatusStr(pDb->vgStatus), pRsp->code); // if (vnode < pObj->numOfVnodes) pVgroup = mgmtGetVgroup(pObj->vload[vnode].vgId);
return 0; //
} // if (pVgroup) {
// *pMsg = 0;
// pMsg++;
// pMsg = mgmtBuildVpeersIe(pMsg, pVgroup, vnode);
// mTrace("dnode:%s, vnode:%d, vgroup:%d, send create vnode msg, code:%d", taosIpStr(pObj->privateIp), vnode, pVgroup->vgId, *pMsg);
// } else {
// mTrace("dnode:%s, vnode:%d, no vgroup info, vgroup:%d", taosIpStr(pObj->privateIp), vnode, pObj->vload[vnode].vgId);
// *pMsg = TSDB_CODE_NOT_ACTIVE_VNODE;
// pMsg++;
// *(int32_t *)pMsg = htonl(vnode);
// pMsg += sizeof(int32_t);
// }
//
// msgLen = pMsg - pStart;
// mgmtSendMsgToDnode(pObj, pStart, msgLen);
if (pRsp->code == TSDB_CODE_SUCCESS) {
pDb->vgStatus = TSDB_VG_STATUS_READY;
mTrace("dnode:%s, db:%s vgroup is created in dnode", taosIpStr(pObj->privateIp), pRsp->more);
return 0; return 0;
} }
pDb->vgStatus = pRsp->code; int mgmtProcessCreateRsp(int8_t *pCont, int32_t contLen, void *pConn) { return 0; }
mError("dnode:%s, db:%s vgroup init failed, code:%d %s",
taosIpStr(pObj->privateIp), pRsp->more, pRsp->code, taosGetVgroupStatusStr(pDb->vgStatus)); int mgmtProcessFreeVnodeRsp(int8_t *pCont, int32_t contLen, void *pConn) { return 0; }
int mgmtProcessVPeersRsp(int8_t *pCont, int32_t contLen, void *pConn) {
// STaosRsp *pRsp = (STaosRsp *)msg;
//
// if (!sdbMaster) {
// mgmtSendSimpleRspToDnode(pObj, TSDB_MSG_TYPE_DNODE_VPEERS_RSP, TSDB_CODE_REDIRECT);
// return 0;
// }
//
// SDbObj *pDb = mgmtGetDb(pRsp->more);
// if (!pDb) {
// mError("dnode:%s, db:%s not find, code:%d", taosIpStr(pObj->privateIp), pRsp->more, pRsp->code);
// return 0;
// }
//
// if (pDb->vgStatus != TSDB_VG_STATUS_IN_PROGRESS) {
// mTrace("dnode:%s, db:%s vpeer rsp already disposed, vgroup status:%s code:%d",
// taosIpStr(pObj->privateIp), pRsp->more, taosGetVgroupStatusStr(pDb->vgStatus), pRsp->code);
// return 0;
// }
//
// if (pRsp->code == TSDB_CODE_SUCCESS) {
// pDb->vgStatus = TSDB_VG_STATUS_READY;
// mTrace("dnode:%s, db:%s vgroup is created in dnode", taosIpStr(pObj->privateIp), pRsp->more);
// return 0;
// }
//
// pDb->vgStatus = pRsp->code;
// mError("dnode:%s, db:%s vgroup init failed, code:%d %s",
// taosIpStr(pObj->privateIp), pRsp->more, pRsp->code, taosGetVgroupStatusStr(pDb->vgStatus));
return 0; return 0;
} }
void mgmtProcessMsgFromDnode(int8_t *pCont, int32_t contLen, int32_t msgType, void *pConn) {
void mgmtProcessMsgFromDnode(char *content, int msgLen, int msgType, SDnodeObj *pObj) {
if (msgType == TSDB_MSG_TYPE_TABLE_CFG) { if (msgType == TSDB_MSG_TYPE_TABLE_CFG) {
mgmtProcessMeterCfgMsg(content, msgLen - sizeof(SIntMsg), pObj); mgmtProcessMeterCfgMsg(pCont, contLen, pConn);
} else if (msgType == TSDB_MSG_TYPE_VNODE_CFG) { } else if (msgType == TSDB_MSG_TYPE_VNODE_CFG) {
mgmtProcessVpeerCfgMsg(content, msgLen - sizeof(SIntMsg), pObj); mgmtProcessVpeerCfgMsg(pCont, contLen, pConn);
} else if (msgType == TSDB_MSG_TYPE_DNODE_CREATE_CHILD_TABLE_RSP) { } else if (msgType == TSDB_MSG_TYPE_DNODE_CREATE_TABLE_RSP) {
mgmtProcessCreateRsp(content, msgLen - sizeof(SIntMsg), pObj); mgmtProcessCreateRsp(pCont, contLen, pConn);
} else if (msgType == TSDB_MSG_TYPE_REMOVE_RSP) { } else if (msgType == TSDB_MSG_TYPE_DNODE_REMOVE_TABLE_RSP) {
// do nothing // do nothing
} else if (msgType == TSDB_MSG_TYPE_DNODE_VPEERS_RSP) { } else if (msgType == TSDB_MSG_TYPE_DNODE_VPEERS_RSP) {
mgmtProcessVPeersRsp(content, msgLen - sizeof(SIntMsg), pObj); mgmtProcessVPeersRsp(pCont, contLen, pConn);
} else if (msgType == TSDB_MSG_TYPE_DNODE_FREE_VNODE_RSP) { } else if (msgType == TSDB_MSG_TYPE_DNODE_FREE_VNODE_RSP) {
mgmtProcessFreeVnodeRsp(content, msgLen - sizeof(SIntMsg), pObj); mgmtProcessFreeVnodeRsp(pCont, contLen, pConn);
} else if (msgType == TSDB_MSG_TYPE_DNODE_CFG_RSP) { } else if (msgType == TSDB_MSG_TYPE_DNODE_CFG_RSP) {
// do nothing; // do nothing;
} else if (msgType == TSDB_MSG_TYPE_ALTER_STREAM_RSP) { } else if (msgType == TSDB_MSG_TYPE_ALTER_STREAM_RSP) {
...@@ -193,186 +210,145 @@ void mgmtProcessMsgFromDnode(char *content, int msgLen, int msgType, SDnodeObj * ...@@ -193,186 +210,145 @@ void mgmtProcessMsgFromDnode(char *content, int msgLen, int msgType, SDnodeObj *
} }
} }
char *mgmtBuildCreateMeterIe(STabObj *pTable, char *pMsg, int vnode) {
SCreateMsg *pCreateMeter;
pCreateMeter = (SCreateMsg *)pMsg;
pCreateMeter->vnode = htons(vnode);
pCreateMeter->sid = htonl(pTable->gid.sid);
pCreateMeter->uid = pTable->uid;
memcpy(pCreateMeter->meterId, pTable->meterId, TSDB_TABLE_ID_LEN);
// pCreateMeter->lastCreate = htobe64(pVgroup->lastCreate);
pCreateMeter->timeStamp = htobe64(pTable->createdTime);
/*
pCreateMeter->spi = pSec->spi;
pCreateMeter->encrypt = pSec->encrypt;
memcpy(pCreateMeter->cipheringKey, pSec->cipheringKey, TSDB_KEY_LEN);
memcpy(pCreateMeter->secret, pSec->secret, TSDB_KEY_LEN);
*/
pCreateMeter->sversion = htonl(pTable->sversion);
pCreateMeter->numOfColumns = htons(pTable->numOfColumns);
SSchema *pSchema = mgmtGetTableSchema(pTable);
for (int i = 0; i < pTable->numOfColumns; ++i) {
pCreateMeter->schema[i].type = pSchema[i].type;
/* strcpy(pCreateMeter->schema[i].name, pColumnModel[i].name); */
pCreateMeter->schema[i].bytes = htons(pSchema[i].bytes);
pCreateMeter->schema[i].colId = htons(pSchema[i].colId);
}
pMsg = ((char *)(pCreateMeter->schema)) + pTable->numOfColumns * sizeof(SMColumn);
pCreateMeter->sqlLen = 0;
if (pTable->pSql) {
int len = strlen(pTable->pSql) + 1;
pCreateMeter->sqlLen = htons(len);
strcpy(pMsg, pTable->pSql);
pMsg += len;
}
return pMsg;
}
int32_t mgmtSendCreateChildTableMsg(SChildTableObj *pTable, SVgObj *pVgroup, int32_t tagDataLen, int8_t *pTagData) { int32_t mgmtSendCreateChildTableMsg(SChildTableObj *pTable, SVgObj *pVgroup, int32_t tagDataLen, int8_t *pTagData) {
uint64_t timeStamp = taosGetTimestampMs(); // uint64_t timeStamp = taosGetTimestampMs();
//
for (int32_t index = 0; index < pVgroup->numOfVnodes; ++index) { // for (int32_t index = 0; index < pVgroup->numOfVnodes; ++index) {
SDnodeObj *pObj = mgmtGetDnode(pVgroup->vnodeGid[index].ip); // SDnodeObj *pObj = mgmtGetDnode(pVgroup->vnodeGid[index].ip);
if (pObj == NULL) { // if (pObj == NULL) {
continue; // continue;
} // }
//
int8_t *pStart = taosBuildReqMsgToDnodeWithSize(pObj, TSDB_MSG_TYPE_DNODE_CREATE_CHILD_TABLE, 64000); // int8_t *pStart = taosBuildReqMsgToDnodeWithSize(pObj, TSDB_MSG_TYPE_DNODE_CREATE_CHILD_TABLE, 64000);
if (pStart == NULL) { // if (pStart == NULL) {
continue; // continue;
} // }
//
int8_t *pMsg = mgmtBuildCreateChildTableMsg(pTable, pStart, pVgroup->vnodeGid[index].vnode, tagDataLen, pTagData); // int8_t *pMsg = mgmtBuildCreateChildTableMsg(pTable, pStart, pVgroup->vnodeGid[index].vnode, tagDataLen, pTagData);
int32_t msgLen = pMsg - pStart; // int32_t msgLen = pMsg - pStart;
//
mgmtSendMsgToDnode(pObj, pStart, msgLen); // mgmtSendMsgToDnode(pObj, pStart, msgLen);
} // }
//
pVgroup->lastCreate = timeStamp; // pVgroup->lastCreate = timeStamp;
return 0; return 0;
} }
int32_t mgmtSendCreateStreamTableMsg(SStreamTableObj *pTable, SVgObj *pVgroup) { int32_t mgmtSendCreateStreamTableMsg(SStreamTableObj *pTable, SVgObj *pVgroup) {
uint64_t timeStamp = taosGetTimestampMs(); // uint64_t timeStamp = taosGetTimestampMs();
//
for (int32_t index = 0; index < pVgroup->numOfVnodes; ++index) { // for (int32_t index = 0; index < pVgroup->numOfVnodes; ++index) {
SDnodeObj *pObj = mgmtGetDnode(pVgroup->vnodeGid[index].ip); // SDnodeObj *pObj = mgmtGetDnode(pVgroup->vnodeGid[index].ip);
if (pObj == NULL) { // if (pObj == NULL) {
continue; // continue;
} // }
//
int8_t *pStart = taosBuildReqMsgToDnodeWithSize(pObj, TSDB_MSG_TYPE_DNODE_CREATE_CHILD_TABLE, 64000); // int8_t *pStart = taosBuildReqMsgToDnodeWithSize(pObj, TSDB_MSG_TYPE_DNODE_CREATE_CHILD_TABLE, 64000);
if (pStart == NULL) { // if (pStart == NULL) {
continue; // continue;
} // }
//
int8_t *pMsg = mgmtBuildCreateStreamTableMsg(pTable, pStart, pVgroup->vnodeGid[index].vnode); // int8_t *pMsg = mgmtBuildCreateStreamTableMsg(pTable, pStart, pVgroup->vnodeGid[index].vnode);
int32_t msgLen = pMsg - pStart; // int32_t msgLen = pMsg - pStart;
//
mgmtSendMsgToDnode(pObj, pStart, msgLen); // mgmtSendMsgToDnode(pObj, pStart, msgLen);
} // }
//
pVgroup->lastCreate = timeStamp; // pVgroup->lastCreate = timeStamp;
return 0; return 0;
} }
int32_t mgmtSendCreateNormalTableMsg(SNormalTableObj *pTable, SVgObj *pVgroup) { int32_t mgmtSendCreateNormalTableMsg(SNormalTableObj *pTable, SVgObj *pVgroup) {
uint64_t timeStamp = taosGetTimestampMs(); // uint64_t timeStamp = taosGetTimestampMs();
//
for (int32_t index = 0; index < pVgroup->numOfVnodes; ++index) { // for (int32_t index = 0; index < pVgroup->numOfVnodes; ++index) {
SDnodeObj *pObj = mgmtGetDnode(pVgroup->vnodeGid[index].ip); // SDnodeObj *pObj = mgmtGetDnode(pVgroup->vnodeGid[index].ip);
if (pObj == NULL) { // if (pObj == NULL) {
continue; // continue;
} // }
//
int8_t *pStart = taosBuildReqMsgToDnodeWithSize(pObj, TSDB_MSG_TYPE_DNODE_CREATE_CHILD_TABLE, 64000); // int8_t *pStart = taosBuildReqMsgToDnodeWithSize(pObj, TSDB_MSG_TYPE_DNODE_CREATE_CHILD_TABLE, 64000);
if (pStart == NULL) { // if (pStart == NULL) {
continue; // continue;
} // }
//
int8_t *pMsg = mgmtBuildCreateNormalTableMsg(pTable, pStart, pVgroup->vnodeGid[index].vnode); // int8_t *pMsg = mgmtBuildCreateNormalTableMsg(pTable, pStart, pVgroup->vnodeGid[index].vnode);
int32_t msgLen = pMsg - pStart; // int32_t msgLen = pMsg - pStart;
//
mgmtSendMsgToDnode(pObj, pStart, msgLen); // mgmtSendMsgToDnode(pObj, pStart, msgLen);
} // }
//
pVgroup->lastCreate = timeStamp; // pVgroup->lastCreate = timeStamp;
return 0; // return 0;
} }
int mgmtSendRemoveMeterMsgToDnode(STabObj *pTable, SVgObj *pVgroup) { int mgmtSendRemoveMeterMsgToDnode(STabObj *pTable, SVgObj *pVgroup) {
SDRemoveTableMsg *pRemove; // SDRemoveTableMsg *pRemove;
char * pMsg, *pStart; // char * pMsg, *pStart;
int i, msgLen = 0; // int i, msgLen = 0;
SDnodeObj * pObj; // SDnodeObj * pObj;
char ipstr[20]; // char ipstr[20];
uint64_t timeStamp; // uint64_t timeStamp;
//
timeStamp = taosGetTimestampMs(); // timeStamp = taosGetTimestampMs();
//
for (i = 0; i < pVgroup->numOfVnodes; ++i) { // for (i = 0; i < pVgroup->numOfVnodes; ++i) {
//if (pVgroup->vnodeGid[i].ip == 0) continue; // //if (pVgroup->vnodeGid[i].ip == 0) continue;
//
pObj = mgmtGetDnode(pVgroup->vnodeGid[i].ip); // pObj = mgmtGetDnode(pVgroup->vnodeGid[i].ip);
if (pObj == NULL) continue; // if (pObj == NULL) continue;
//
pStart = taosBuildReqMsgToDnode(pObj, TSDB_MSG_TYPE_DNODE_REMOVE_CHILD_TABLE); // pStart = taosBuildReqMsgToDnode(pObj, TSDB_MSG_TYPE_DNODE_REMOVE_CHILD_TABLE);
if (pStart == NULL) continue; // if (pStart == NULL) continue;
pMsg = pStart; // pMsg = pStart;
//
pRemove = (SDRemoveTableMsg *)pMsg; // pRemove = (SDRemoveTableMsg *)pMsg;
pRemove->vnode = htons(pVgroup->vnodeGid[i].vnode); // pRemove->vnode = htons(pVgroup->vnodeGid[i].vnode);
pRemove->sid = htonl(pTable->gid.sid); // pRemove->sid = htonl(pTable->gid.sid);
memcpy(pRemove->meterId, pTable->meterId, TSDB_TABLE_ID_LEN); // memcpy(pRemove->meterId, pTable->meterId, TSDB_TABLE_ID_LEN);
//
pMsg += sizeof(SDRemoveTableMsg); // pMsg += sizeof(SDRemoveTableMsg);
msgLen = pMsg - pStart; // msgLen = pMsg - pStart;
//
mgmtSendMsgToDnode(pObj, pStart, msgLen); // mgmtSendMsgToDnode(pObj, pStart, msgLen);
//
tinet_ntoa(ipstr, pVgroup->vnodeGid[i].ip); // tinet_ntoa(ipstr, pVgroup->vnodeGid[i].ip);
mTrace("dnode:%s vid:%d, send remove meter msg, sid:%d status:%d", ipstr, pVgroup->vnodeGid[i].vnode, // mTrace("dnode:%s vid:%d, send remove meter msg, sid:%d status:%d", ipstr, pVgroup->vnodeGid[i].vnode,
pTable->gid.sid, pObj->status); // pTable->gid.sid, pObj->status);
} // }
//
pVgroup->lastRemove = timeStamp; // pVgroup->lastRemove = timeStamp;
return 0; return 0;
} }
int mgmtSendAlterStreamMsgToDnode(STabObj *pTable, SVgObj *pVgroup) { int mgmtSendAlterStreamMsgToDnode(STabObj *pTable, SVgObj *pVgroup) {
SAlterStreamMsg *pAlter; // SAlterStreamMsg *pAlter;
char * pMsg, *pStart; // char * pMsg, *pStart;
int i, msgLen = 0; // int i, msgLen = 0;
SDnodeObj * pObj; // SDnodeObj * pObj;
//
for (i = 0; i < pVgroup->numOfVnodes; ++i) { // for (i = 0; i < pVgroup->numOfVnodes; ++i) {
if (pVgroup->vnodeGid[i].ip == 0) continue; // if (pVgroup->vnodeGid[i].ip == 0) continue;
//
pObj = mgmtGetDnode(pVgroup->vnodeGid[i].ip); // pObj = mgmtGetDnode(pVgroup->vnodeGid[i].ip);
if (pObj == NULL) continue; // if (pObj == NULL) continue;
//
pStart = taosBuildReqMsgToDnode(pObj, TSDB_MSG_TYPE_ALTER_STREAM); // pStart = taosBuildReqMsgToDnode(pObj, TSDB_MSG_TYPE_ALTER_STREAM);
if (pStart == NULL) continue; // if (pStart == NULL) continue;
pMsg = pStart; // pMsg = pStart;
//
pAlter = (SAlterStreamMsg *)pMsg; // pAlter = (SAlterStreamMsg *)pMsg;
pAlter->vnode = htons(pVgroup->vnodeGid[i].vnode); // pAlter->vnode = htons(pVgroup->vnodeGid[i].vnode);
pAlter->sid = htonl(pTable->gid.sid); // pAlter->sid = htonl(pTable->gid.sid);
pAlter->uid = pTable->uid; // pAlter->uid = pTable->uid;
pAlter->status = pTable->status; // pAlter->status = pTable->status;
//
pMsg += sizeof(SAlterStreamMsg); // pMsg += sizeof(SAlterStreamMsg);
msgLen = pMsg - pStart; // msgLen = pMsg - pStart;
//
mgmtSendMsgToDnode(pObj, pStart, msgLen); // mgmtSendMsgToDnode(pObj, pStart, msgLen);
} // }
return 0; return 0;
} }
...@@ -413,61 +389,61 @@ char *mgmtBuildVpeersIe(char *pMsg, SVgObj *pVgroup, int vnode) { ...@@ -413,61 +389,61 @@ char *mgmtBuildVpeersIe(char *pMsg, SVgObj *pVgroup, int vnode) {
} }
int mgmtSendVPeersMsg(SVgObj *pVgroup) { int mgmtSendVPeersMsg(SVgObj *pVgroup) {
SDnodeObj *pDnode; // SDnodeObj *pDnode;
char * pMsg, *pStart; // char * pMsg, *pStart;
int msgLen = 0; // int msgLen = 0;
//
for (int i = 0; i < pVgroup->numOfVnodes; ++i) { // for (int i = 0; i < pVgroup->numOfVnodes; ++i) {
pDnode = mgmtGetDnode(pVgroup->vnodeGid[i].ip); // pDnode = mgmtGetDnode(pVgroup->vnodeGid[i].ip);
if (pDnode == NULL) { // if (pDnode == NULL) {
mError("dnode:%s not there", taosIpStr(pVgroup->vnodeGid[i].ip)); // mError("dnode:%s not there", taosIpStr(pVgroup->vnodeGid[i].ip));
continue; // continue;
} // }
//
pDnode->vload[pVgroup->vnodeGid[i].vnode].vgId = pVgroup->vgId; // pDnode->vload[pVgroup->vnodeGid[i].vnode].vgId = pVgroup->vgId;
mgmtUpdateDnode(pDnode); // mgmtUpdateDnode(pDnode);
//
if (pDnode->thandle && pVgroup->numOfVnodes >= 1) { // if (pDnode->thandle && pVgroup->numOfVnodes >= 1) {
pStart = taosBuildReqMsgToDnode(pDnode, TSDB_MSG_TYPE_DNODE_VPEERS); // pStart = taosBuildReqMsgToDnode(pDnode, TSDB_MSG_TYPE_DNODE_VPEERS);
if (pStart == NULL) continue; // if (pStart == NULL) continue;
pMsg = mgmtBuildVpeersIe(pStart, pVgroup, pVgroup->vnodeGid[i].vnode); // pMsg = mgmtBuildVpeersIe(pStart, pVgroup, pVgroup->vnodeGid[i].vnode);
msgLen = pMsg - pStart; // msgLen = pMsg - pStart;
//
mgmtSendMsgToDnode(pDnode, pStart, msgLen); // mgmtSendMsgToDnode(pDnode, pStart, msgLen);
} // }
} // }
return 0; return 0;
} }
int mgmtSendOneFreeVnodeMsg(SVnodeGid *pVnodeGid) { int mgmtSendOneFreeVnodeMsg(SVnodeGid *pVnodeGid) {
SFreeVnodeMsg *pFreeVnode; // SFreeVnodeMsg *pFreeVnode;
char * pMsg, *pStart; // char * pMsg, *pStart;
int msgLen = 0; // int msgLen = 0;
SDnodeObj * pDnode; // SDnodeObj * pDnode;
//
pDnode = mgmtGetDnode(pVnodeGid->ip); // pDnode = mgmtGetDnode(pVnodeGid->ip);
if (pDnode == NULL) { // if (pDnode == NULL) {
mError("dnode:%s not there", taosIpStr(pVnodeGid->ip)); // mError("dnode:%s not there", taosIpStr(pVnodeGid->ip));
return -1; // return -1;
} // }
//
if (pDnode->thandle == NULL) { // if (pDnode->thandle == NULL) {
mTrace("dnode:%s offline, failed to send Vpeer msg", taosIpStr(pVnodeGid->ip)); // mTrace("dnode:%s offline, failed to send Vpeer msg", taosIpStr(pVnodeGid->ip));
return -1; // return -1;
} // }
//
pStart = taosBuildReqMsgToDnode(pDnode, TSDB_MSG_TYPE_DNODE_FREE_VNODE); // pStart = taosBuildReqMsgToDnode(pDnode, TSDB_MSG_TYPE_DNODE_FREE_VNODE);
if (pStart == NULL) return -1; // if (pStart == NULL) return -1;
pMsg = pStart; // pMsg = pStart;
//
pFreeVnode = (SFreeVnodeMsg *)pMsg; // pFreeVnode = (SFreeVnodeMsg *)pMsg;
pFreeVnode->vnode = htons(pVnodeGid->vnode); // pFreeVnode->vnode = htons(pVnodeGid->vnode);
//
pMsg += sizeof(SFreeVnodeMsg); // pMsg += sizeof(SFreeVnodeMsg);
//
msgLen = pMsg - pStart; // msgLen = pMsg - pStart;
mgmtSendMsgToDnode(pDnode, pStart, msgLen); // mgmtSendMsgToDnode(pDnode, pStart, msgLen);
return 0; return 0;
} }
...@@ -554,52 +530,6 @@ int mgmtSendCfgDnodeMsg(char *cont) { ...@@ -554,52 +530,6 @@ int mgmtSendCfgDnodeMsg(char *cont) {
return 0; return 0;
} }
/*
* functions for communicate between dnode and mnode
*/
extern void *tsDnodeMgmtQhandle;
void * mgmtStatusTimer = NULL;
void mgmtProcessMsgFromDnode(char *content, int msgLen, int msgType, SDnodeObj *pObj);
void mgmtSendMsgToDnodeImpFp(SSchedMsg *sched) {
int8_t msgType = *(int8_t *) (sched->msg - sizeof(int32_t) - sizeof(int8_t));
int32_t contLen = *(int32_t *) (sched->msg - sizeof(int8_t));
int8_t *pCont = sched->msg;
void *pConn = NULL;
dnodeProcessMsgFromMgmt(pCont, contLen, msgType, pConn);
rpcFreeCont(sched->msg);
}
int32_t mgmtSendMsgToDnodeImp(int8_t *pCont, int32_t contLen, int8_t msgType) {
mTrace("msg:%s is sent to dnode", taosMsg[msgType]);
*(int8_t *) (pCont - sizeof(int32_t) - sizeof(int8_t)) = msgType;
*(int32_t *) (pCont - sizeof(int8_t)) = contLen;
SSchedMsg schedMsg = {0};
schedMsg.fp = mgmtSendMsgToDnodeImpFp;
schedMsg.msg = pCont;
taosScheduleTask(tsDnodeMgmtQhandle, &schedMsg);
return TSDB_CODE_SUCCESS;
}
int32_t (*mgmtSendMsgToDnode)(SDnodeObj *pObj, char *msg, int msgLen) = mgmtSendMsgToDnodeImp;
int32_t mgmtSendSimpleRspToDnodeImp(int32_t msgType, int32_t code) {
int8_t *pCont = rpcMallocCont(sizeof(int32_t));
*(int32_t *) pCont = code;
mgmtSendMsgToDnodeImp(pCont, sizeof(int32_t), msgType);
return TSDB_CODE_SUCCESS;
}
int32_t (*mgmtSendSimpleRspToDnode)(int32_t msgType, int32_t code) = mgmtSendSimpleRspToDnodeImp;
int32_t mgmtInitDnodeIntImp() { return 0; } int32_t mgmtInitDnodeIntImp() { return 0; }
int32_t (*mgmtInitDnodeInt)() = mgmtInitDnodeIntImp; int32_t (*mgmtInitDnodeInt)() = mgmtInitDnodeIntImp;
......
src/mnode/src/mgmtNormalTable.c
浏览文件 @ 29058645
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include "mgmtNormalTable.h" #include "mgmtNormalTable.h"
void *tsSuperTableSdb; void *tsNormalTableSdb;
void *(*mgmtNormalTableActionFp[SDB_MAX_ACTION_TYPES])(void *row, char *str, int size, int *ssize); void *(*mgmtNormalTableActionFp[SDB_MAX_ACTION_TYPES])(void *row, char *str, int size, int *ssize);
void *mgmtNormalTableActionInsert(void *row, char *str, int size, int *ssize); void *mgmtNormalTableActionInsert(void *row, char *str, int size, int *ssize);
...@@ -218,8 +218,9 @@ void mgmtCleanUpNormalTables() { ...@@ -218,8 +218,9 @@ void mgmtCleanUpNormalTables() {
sdbCloseTable(tsNormalTableSdb); sdbCloseTable(tsNormalTableSdb);
} }
int8_t *mgmtBuildCreateNormalTableMsg(SNormalTableObj *pTable, int8_t *pMsg, int32_t vnode) { int8_t *mgmtBuildCreateNormalTableMsg(SNormalTableObj *pTable, int32_t vnode) {
SCreateNormalTableMsg *pCreateTable = (SCreateNormalTableMsg *) pMsg; int8_t *pMsg = NULL;
SDCreateTableMsg *pCreateTable = (SDCreateTableMsg *) pMsg;
memcpy(pCreateTable->tableId, pTable->tableId, TSDB_TABLE_ID_LEN); memcpy(pCreateTable->tableId, pTable->tableId, TSDB_TABLE_ID_LEN);
pCreateTable->vnode = htobe32(vnode); pCreateTable->vnode = htobe32(vnode);
pCreateTable->sid = htobe32(pTable->sid); pCreateTable->sid = htobe32(pTable->sid);
...@@ -231,15 +232,15 @@ int8_t *mgmtBuildCreateNormalTableMsg(SNormalTableObj *pTable, int8_t *pMsg, int ...@@ -231,15 +232,15 @@ int8_t *mgmtBuildCreateNormalTableMsg(SNormalTableObj *pTable, int8_t *pMsg, int
SSchema *pSchema = pTable->schema; SSchema *pSchema = pTable->schema;
int32_t totalCols = pCreateTable->numOfColumns; int32_t totalCols = pCreateTable->numOfColumns;
for (int32_t col = 0; col < totalCols; ++col) { // for (int32_t col = 0; col < totalCols; ++col) {
SMColumn *colData = &((SMColumn *) (pCreateTable->data))[col]; // SMColumn *colData = &((SMColumn *) (pCreateTable->data))[col];
colData->type = pSchema[col].type; // colData->type = pSchema[col].type;
colData->bytes = htons(pSchema[col].bytes); // colData->bytes = htons(pSchema[col].bytes);
colData->colId = htons(pSchema[col].colId); // colData->colId = htons(pSchema[col].colId);
} // }
int32_t totalColsSize = sizeof(SMColumn *) * totalCols; // int32_t totalColsSize = sizeof(SMColumn *) * totalCols;
pMsg = pCreateTable->data + totalColsSize; // pMsg = pCreateTable->data + totalColsSize;
return pMsg; return pMsg;
} }
......
src/mnode/src/mgmtShell.c
浏览文件 @ 29058645
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
#include "taosmsg.h" #include "taosmsg.h"
#include "tlog.h" #include "tlog.h"
#include "tstatus.h" #include "tstatus.h"
#include "tsched.h"
#include "trpc.h"
#define MAX_LEN_OF_METER_META (sizeof(SMultiMeterMeta) + sizeof(SSchema) * TSDB_MAX_COLUMNS + sizeof(SSchema) * TSDB_MAX_TAGS + TSDB_MAX_TAGS_LEN) #define MAX_LEN_OF_METER_META (sizeof(SMultiMeterMeta) + sizeof(SSchema) * TSDB_MAX_COLUMNS + sizeof(SSchema) * TSDB_MAX_TAGS + TSDB_MAX_TAGS_LEN)
...@@ -87,17 +89,13 @@ int mgmtInitShell() { ...@@ -87,17 +89,13 @@ int mgmtInitShell() {
rpcInit.localPort = tsMgmtShellPort; rpcInit.localPort = tsMgmtShellPort;
rpcInit.label = "MND-shell"; rpcInit.label = "MND-shell";
rpcInit.numOfThreads = numOfThreads; rpcInit.numOfThreads = numOfThreads;
rpcInit.fp = mgmtProcessMsgFromShell; rpcInit.cfp = mgmtProcessMsgFromShell;
rpcInit.bits = 20; rpcInit.sessions = tsMaxShellConns;
rpcInit.numOfChanns = 1;
rpcInit.sessionsPerChann = tsMaxShellConns;
rpcInit.idMgmt = TAOS_ID_FREE;
rpcInit.connType = TAOS_CONN_SOCKET_TYPE_S(); rpcInit.connType = TAOS_CONN_SOCKET_TYPE_S();
rpcInit.idleTime = tsShellActivityTimer * 2000; rpcInit.idleTime = tsShellActivityTimer * 2000;
rpcInit.qhandle = mgmtQhandle;
rpcInit.afp = mgmtRetriveUserAuthInfo; rpcInit.afp = mgmtRetriveUserAuthInfo;
pShellConn = taosOpenRpc(&rpcInit); pShellConn = rpcOpen(&rpcInit);
if (pShellConn == NULL) { if (pShellConn == NULL) {
mError("failed to init tcp connection to shell"); mError("failed to init tcp connection to shell");
return -1; return -1;
...@@ -107,8 +105,10 @@ int mgmtInitShell() { ...@@ -107,8 +105,10 @@ int mgmtInitShell() {
} }
void mgmtCleanUpShell() { void mgmtCleanUpShell() {
if (pShellConn) taosCloseRpc(pShellConn); if (pShellConn) {
rpcClose(pShellConn);
pShellConn = NULL; pShellConn = NULL;
}
tfree(connList); tfree(connList);
} }
...@@ -138,21 +138,23 @@ static uint32_t mgmtSetMeterTagValue(char *pTags, STabObj *pMetric, STabObj *pMe ...@@ -138,21 +138,23 @@ static uint32_t mgmtSetMeterTagValue(char *pTags, STabObj *pMetric, STabObj *pMe
} }
static char *mgmtAllocMsg(SConnObj *pConn, int32_t size, char **pMsg, STaosRsp **pRsp) { static char *mgmtAllocMsg(SConnObj *pConn, int32_t size, char **pMsg, STaosRsp **pRsp) {
char *pStart = taosBuildRspMsgWithSize(pConn->thandle, TSDB_MSG_TYPE_TABLE_META_RSP, size); // char *pStart = taosBuildRspMsgWithSize(pConn->thandle, TSDB_MSG_TYPE_TABLE_META_RSP, size);
if (pStart == NULL) return 0; // if (pStart == NULL) return 0;
*pMsg = pStart; // *pMsg = pStart;
*pRsp = (STaosRsp *)(*pMsg); // *pRsp = (STaosRsp *)(*pMsg);
//
return pStart; // return pStart;
return 0;
} }
static char *mgmtForMultiAllocMsg(SConnObj *pConn, int32_t size, char **pMsg, STaosRsp **pRsp) { static char *mgmtForMultiAllocMsg(SConnObj *pConn, int32_t size, char **pMsg, STaosRsp **pRsp) {
char *pStart = taosBuildRspMsgWithSize(pConn->thandle, TSDB_MSG_TYPE_MULTI_TABLE_META_RSP, size); // char *pStart = taosBuildRspMsgWithSize(pConn->thandle, TSDB_MSG_TYPE_MULTI_TABLE_META_RSP, size);
if (pStart == NULL) return 0; // if (pStart == NULL) return 0;
*pMsg = pStart; // *pMsg = pStart;
*pRsp = (STaosRsp *)(*pMsg); // *pRsp = (STaosRsp *)(*pMsg);
//
return pStart; // return pStart;
return 0;
} }
/** /**
...@@ -165,175 +167,178 @@ bool mgmtCheckMeterMetaMsgType(char *pMsg) { ...@@ -165,175 +167,178 @@ bool mgmtCheckMeterMetaMsgType(char *pMsg) {
SMeterInfoMsg *pInfo = (SMeterInfoMsg *)pMsg; SMeterInfoMsg *pInfo = (SMeterInfoMsg *)pMsg;
int16_t autoCreate = htons(pInfo->createFlag); int16_t autoCreate = htons(pInfo->createFlag);
STabObj *pMeterObj = mgmtGetTable(pInfo->meterId); STableObj table = mgmtGetTable(pInfo->meterId);
// If table does not exists and autoCreate flag is set, we add the handler into another task queue, namely tranQueue // If table does not exists and autoCreate flag is set, we add the handler into another task queue, namely tranQueue
bool addIntoTranQueue = (pMeterObj == NULL && autoCreate == 1); // bool addIntoTranQueue = (pMeterObj == NULL && autoCreate == 1);
if (addIntoTranQueue) { // if (addIntoTranQueue) {
mTrace("meter:%s auto created task added", pInfo->meterId); // mTrace("meter:%s auto created task added", pInfo->meterId);
} // }
bool addIntoTranQueue = true;
return addIntoTranQueue; return addIntoTranQueue;
} }
int mgmtProcessMeterMetaMsg(char *pMsg, int msgLen, SConnObj *pConn) { int mgmtProcessMeterMetaMsg(char *pMsg, int msgLen, SConnObj *pConn) {
SMeterInfoMsg *pInfo = (SMeterInfoMsg *)pMsg; // SMeterInfoMsg *pInfo = (SMeterInfoMsg *)pMsg;
STabObj * pMeterObj = NULL; // STabObj * pMeterObj = NULL;
SVgObj * pVgroup = NULL; // SVgObj * pVgroup = NULL;
SMeterMeta * pMeta = NULL; // SMeterMeta * pMeta = NULL;
SSchema * pSchema = NULL; // SSchema * pSchema = NULL;
STaosRsp * pRsp = NULL; // STaosRsp * pRsp = NULL;
char * pStart = NULL; // char * pStart = NULL;
//
pInfo->createFlag = htons(pInfo->createFlag); // pInfo->createFlag = htons(pInfo->createFlag);
//
int size = sizeof(STaosHeader) + sizeof(STaosRsp) + sizeof(SMeterMeta) + sizeof(SSchema) * TSDB_MAX_COLUMNS + // int size = sizeof(STaosHeader) + sizeof(STaosRsp) + sizeof(SMeterMeta) + sizeof(SSchema) * TSDB_MAX_COLUMNS +
sizeof(SSchema) * TSDB_MAX_TAGS + TSDB_MAX_TAGS_LEN + TSDB_EXTRA_PAYLOAD_SIZE; // sizeof(SSchema) * TSDB_MAX_TAGS + TSDB_MAX_TAGS_LEN + TSDB_EXTRA_PAYLOAD_SIZE;
//
SDbObj *pDb = NULL; // SDbObj *pDb = NULL;
if (pConn->pDb != NULL) pDb = mgmtGetDb(pConn->pDb->name); // if (pConn->pDb != NULL) pDb = mgmtGetDb(pConn->pDb->name);
//
// todo db check should be extracted // // todo db check should be extracted
if (pDb == NULL || (pDb != NULL && pDb->dropStatus != TSDB_DB_STATUS_READY)) { // if (pDb == NULL || (pDb != NULL && pDb->dropStatus != TSDB_DB_STATUS_READY)) {
//
if ((pStart = mgmtAllocMsg(pConn, size, &pMsg, &pRsp)) == NULL) { // if ((pStart = mgmtAllocMsg(pConn, size, &pMsg, &pRsp)) == NULL) {
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_TABLE_META_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY); // taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_TABLE_META_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
return 0; // return 0;
} // }
//
pRsp->code = TSDB_CODE_INVALID_DB; // pRsp->code = TSDB_CODE_INVALID_DB;
pMsg++; // pMsg++;
//
goto _exit_code; // goto _exit_code;
} // }
//
pMeterObj = mgmtGetTable(pInfo->meterId); // pMeterObj = mgmtGetTable(pInfo->meterId);
//
// on demand create table from super table if meter does not exists // // on demand create table from super table if meter does not exists
if (pMeterObj == NULL && pInfo->createFlag == 1) { // if (pMeterObj == NULL && pInfo->createFlag == 1) {
// write operation needs to redirect to master mnode // // write operation needs to redirect to master mnode
if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_TABLE_META_RSP) != 0) { // if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_TABLE_META_RSP) != 0) {
return 0; // return 0;
} // }
//
SCreateTableMsg *pCreateMsg = calloc(1, sizeof(SCreateTableMsg) + sizeof(STagData)); // SCreateTableMsg *pCreateMsg = calloc(1, sizeof(SCreateTableMsg) + sizeof(STagData));
if (pCreateMsg == NULL) { // if (pCreateMsg == NULL) {
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_TABLE_META_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY); // taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_TABLE_META_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
// return 0;
// }
//
// memcpy(pCreateMsg->schema, pInfo->tags, sizeof(STagData));
// strcpy(pCreateMsg->meterId, pInfo->meterId);
//
// SDbObj* pMeterDb = mgmtGetDbByMeterId(pCreateMsg->meterId);
// mTrace("meter:%s, pConnDb:%p, pConnDbName:%s, pMeterDb:%p, pMeterDbName:%s",
// pCreateMsg->meterId, pDb, pDb->name, pMeterDb, pMeterDb->name);
// assert(pDb == pMeterDb);
//
// int32_t code = mgmtCreateTable(pDb, pCreateMsg);
//
// char stableName[TSDB_TABLE_ID_LEN] = {0};
// strncpy(stableName, pInfo->tags, TSDB_TABLE_ID_LEN);
// mTrace("meter:%s is automatically created by %s from %s, code:%d", pCreateMsg->meterId, pConn->pUser->user,
// stableName, code);
//
// tfree(pCreateMsg);
//
// if (code != TSDB_CODE_SUCCESS) {
// if ((pStart = mgmtAllocMsg(pConn, size, &pMsg, &pRsp)) == NULL) {
// taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_TABLE_META_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
// return 0;
// }
//
// pRsp->code = code;
// pMsg++;
//
// goto _exit_code;
// }
//
// pMeterObj = mgmtGetTable(pInfo->meterId);
// }
//
// if ((pStart = mgmtAllocMsg(pConn, size, &pMsg, &pRsp)) == NULL) {
// taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_TABLE_META_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
// return 0;
// }
//
// if (pMeterObj == NULL) {
// if (pDb)
// pRsp->code = TSDB_CODE_INVALID_TABLE;
// else
// pRsp->code = TSDB_CODE_DB_NOT_SELECTED;
// pMsg++;
// } else {
// mTrace("%s, uid:%" PRIu64 " meter meta is retrieved", pInfo->meterId, pMeterObj->uid);
// pRsp->code = 0;
// pMsg += sizeof(STaosRsp);
// *pMsg = TSDB_IE_TYPE_META;
// pMsg++;
//
// pMeta = (SMeterMeta *)pMsg;
// pMeta->uid = htobe64(pMeterObj->uid);
// pMeta->sid = htonl(pMeterObj->gid.sid);
// pMeta->vgid = htonl(pMeterObj->gid.vgId);
// pMeta->sversion = htons(pMeterObj->sversion);
//
// pMeta->precision = pDb->cfg.precision;
//
// pMeta->numOfTags = pMeterObj->numOfTags;
// pMeta->numOfColumns = htons(pMeterObj->numOfColumns);
// pMeta->tableType = pMeterObj->tableType;
//
// pMsg += sizeof(SMeterMeta);
// pSchema = (SSchema *)pMsg; // schema locates at the end of SMeterMeta struct
//
// if (mgmtTableCreateFromSuperTable(pMeterObj)) {
// assert(pMeterObj->numOfTags == 0);
//
// STabObj *pMetric = mgmtGetTable(pMeterObj->pTagData);
// uint32_t numOfTotalCols = (uint32_t)pMetric->numOfTags + pMetric->numOfColumns;
//
// pMeta->numOfTags = pMetric->numOfTags; // update the numOfTags info
// mgmtSetSchemaFromMeters(pSchema, pMetric, numOfTotalCols);
// pMsg += numOfTotalCols * sizeof(SSchema);
//
// // for meters created from metric, we need the metric tag schema to parse the tag data
// int32_t tagsLen = mgmtSetMeterTagValue(pMsg, pMetric, pMeterObj);
// pMsg += tagsLen;
// } else {
// /*
// * for metrics, or meters that are not created from metric, set the schema directly
// * for meters created from metric, we use the schema of metric instead
// */
// uint32_t numOfTotalCols = (uint32_t)pMeterObj->numOfTags + pMeterObj->numOfColumns;
// mgmtSetSchemaFromMeters(pSchema, pMeterObj, numOfTotalCols);
// pMsg += numOfTotalCols * sizeof(SSchema);
// }
//
// if (mgmtIsNormalTable(pMeterObj)) {
// pVgroup = mgmtGetVgroup(pMeterObj->gid.vgId);
// if (pVgroup == NULL) {
// pRsp->code = TSDB_CODE_INVALID_TABLE;
// goto _exit_code;
// }
// for (int i = 0; i < TSDB_VNODES_SUPPORT; ++i) {
// if (pConn->usePublicIp) {
// pMeta->vpeerDesc[i].ip = pVgroup->vnodeGid[i].publicIp;
// pMeta->vpeerDesc[i].vnode = htonl(pVgroup->vnodeGid[i].vnode);
// } else {
// pMeta->vpeerDesc[i].ip = pVgroup->vnodeGid[i].ip;
// pMeta->vpeerDesc[i].vnode = htonl(pVgroup->vnodeGid[i].vnode);
// }
// }
// }
// }
//
//_exit_code:
// msgLen = pMsg - pStart;
//
// taosSendMsgToPeer(pConn->thandle, pStart, msgLen);
//
// return msgLen;
return 0; return 0;
}
memcpy(pCreateMsg->schema, pInfo->tags, sizeof(STagData));
strcpy(pCreateMsg->meterId, pInfo->meterId);
SDbObj* pMeterDb = mgmtGetDbByMeterId(pCreateMsg->meterId);
mTrace("meter:%s, pConnDb:%p, pConnDbName:%s, pMeterDb:%p, pMeterDbName:%s",
pCreateMsg->meterId, pDb, pDb->name, pMeterDb, pMeterDb->name);
assert(pDb == pMeterDb);
int32_t code = mgmtCreateTable(pDb, pCreateMsg);
char stableName[TSDB_TABLE_ID_LEN] = {0};
strncpy(stableName, pInfo->tags, TSDB_TABLE_ID_LEN);
mTrace("meter:%s is automatically created by %s from %s, code:%d", pCreateMsg->meterId, pConn->pUser->user,
stableName, code);
tfree(pCreateMsg);
if (code != TSDB_CODE_SUCCESS) {
if ((pStart = mgmtAllocMsg(pConn, size, &pMsg, &pRsp)) == NULL) {
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_TABLE_META_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
return 0;
}
pRsp->code = code;
pMsg++;
goto _exit_code;
}
pMeterObj = mgmtGetTable(pInfo->meterId);
}
if ((pStart = mgmtAllocMsg(pConn, size, &pMsg, &pRsp)) == NULL) {
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_TABLE_META_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
return 0;
}
if (pMeterObj == NULL) {
if (pDb)
pRsp->code = TSDB_CODE_INVALID_TABLE;
else
pRsp->code = TSDB_CODE_DB_NOT_SELECTED;
pMsg++;
} else {
mTrace("%s, uid:%" PRIu64 " meter meta is retrieved", pInfo->meterId, pMeterObj->uid);
pRsp->code = 0;
pMsg += sizeof(STaosRsp);
*pMsg = TSDB_IE_TYPE_META;
pMsg++;
pMeta = (SMeterMeta *)pMsg;
pMeta->uid = htobe64(pMeterObj->uid);
pMeta->sid = htonl(pMeterObj->gid.sid);
pMeta->vgid = htonl(pMeterObj->gid.vgId);
pMeta->sversion = htons(pMeterObj->sversion);
pMeta->precision = pDb->cfg.precision;
pMeta->numOfTags = pMeterObj->numOfTags;
pMeta->numOfColumns = htons(pMeterObj->numOfColumns);
pMeta->tableType = pMeterObj->tableType;
pMsg += sizeof(SMeterMeta);
pSchema = (SSchema *)pMsg; // schema locates at the end of SMeterMeta struct
if (mgmtTableCreateFromSuperTable(pMeterObj)) {
assert(pMeterObj->numOfTags == 0);
STabObj *pMetric = mgmtGetTable(pMeterObj->pTagData);
uint32_t numOfTotalCols = (uint32_t)pMetric->numOfTags + pMetric->numOfColumns;
pMeta->numOfTags = pMetric->numOfTags; // update the numOfTags info
mgmtSetSchemaFromMeters(pSchema, pMetric, numOfTotalCols);
pMsg += numOfTotalCols * sizeof(SSchema);
// for meters created from metric, we need the metric tag schema to parse the tag data
int32_t tagsLen = mgmtSetMeterTagValue(pMsg, pMetric, pMeterObj);
pMsg += tagsLen;
} else {
/*
* for metrics, or meters that are not created from metric, set the schema directly
* for meters created from metric, we use the schema of metric instead
*/
uint32_t numOfTotalCols = (uint32_t)pMeterObj->numOfTags + pMeterObj->numOfColumns;
mgmtSetSchemaFromMeters(pSchema, pMeterObj, numOfTotalCols);
pMsg += numOfTotalCols * sizeof(SSchema);
}
if (mgmtIsNormalTable(pMeterObj)) {
pVgroup = mgmtGetVgroup(pMeterObj->gid.vgId);
if (pVgroup == NULL) {
pRsp->code = TSDB_CODE_INVALID_TABLE;
goto _exit_code;
}
for (int i = 0; i < TSDB_VNODES_SUPPORT; ++i) {
if (pConn->usePublicIp) {
pMeta->vpeerDesc[i].ip = pVgroup->vnodeGid[i].publicIp;
pMeta->vpeerDesc[i].vnode = htonl(pVgroup->vnodeGid[i].vnode);
} else {
pMeta->vpeerDesc[i].ip = pVgroup->vnodeGid[i].ip;
pMeta->vpeerDesc[i].vnode = htonl(pVgroup->vnodeGid[i].vnode);
}
}
}
}
_exit_code:
msgLen = pMsg - pStart;
taosSendMsgToPeer(pConn->thandle, pStart, msgLen);
return msgLen;
} }
/** /**
...@@ -348,541 +353,544 @@ _exit_code: ...@@ -348,541 +353,544 @@ _exit_code:
* pStart pCurMeter pTail * pStart pCurMeter pTail
**/ **/
int mgmtProcessMultiMeterMetaMsg(char *pMsg, int msgLen, SConnObj *pConn) { int mgmtProcessMultiMeterMetaMsg(char *pMsg, int msgLen, SConnObj *pConn) {
SDbObj * pDbObj = NULL; // SDbObj * pDbObj = NULL;
STabObj * pMeterObj = NULL; // STabObj * pMeterObj = NULL;
SVgObj * pVgroup = NULL; // SVgObj * pVgroup = NULL;
SMultiMeterMeta * pMeta = NULL; // SMultiMeterMeta * pMeta = NULL;
SSchema * pSchema = NULL; // SSchema * pSchema = NULL;
STaosRsp * pRsp = NULL; // STaosRsp * pRsp = NULL;
char * pStart = NULL; // char * pStart = NULL;
//
SMultiMeterInfoMsg * pInfo = (SMultiMeterInfoMsg *)pMsg; // SMultiMeterInfoMsg * pInfo = (SMultiMeterInfoMsg *)pMsg;
char * str = pMsg + sizeof(SMultiMeterInfoMsg); // char * str = pMsg + sizeof(SMultiMeterInfoMsg);
pInfo->numOfMeters = htonl(pInfo->numOfMeters); // pInfo->numOfMeters = htonl(pInfo->numOfMeters);
//
int size = 4*1024*1024; // first malloc 4 MB, subsequent reallocation as twice // int size = 4*1024*1024; // first malloc 4 MB, subsequent reallocation as twice
//
char *pNewMsg; // char *pNewMsg;
if ((pStart = mgmtForMultiAllocMsg(pConn, size, &pNewMsg, &pRsp)) == NULL) { // if ((pStart = mgmtForMultiAllocMsg(pConn, size, &pNewMsg, &pRsp)) == NULL) {
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_MULTI_TABLE_META_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY); // taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_MULTI_TABLE_META_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
// return 0;
// }
//
// int32_t totalNum = 0;
// char tblName[TSDB_TABLE_ID_LEN];
// char* nextStr;
//
// char* pCurMeter = pStart + sizeof(STaosRsp) + sizeof(SMultiMeterInfoMsg) + 1; // 1: ie type byte
// char* pTail = pStart + size;
//
// while (str - pMsg < msgLen) {
// nextStr = strchr(str, ',');
// if (nextStr == NULL) {
// break;
// }
//
// memcpy(tblName, str, nextStr - str);
// tblName[nextStr - str] = '\0';
// str = nextStr + 1;
//
// // judge whether the remaining memory is adequate
// if ((pTail - pCurMeter) < MAX_LEN_OF_METER_META) {
// char* pMsgHdr = pStart - sizeof(STaosHeader);
// size *= 2;
// pMsgHdr = (char*)realloc(pMsgHdr, size);
// if (NULL == pMsgHdr) {
// char* pTmp = pStart - sizeof(STaosHeader);
// tfree(pTmp);
// taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_MULTI_TABLE_META_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
// break;
// }
//
// pCurMeter = (char*)pMsgHdr + sizeof(STaosHeader) + (pCurMeter - pStart);
// pStart = (char*)pMsgHdr + sizeof(STaosHeader);
// pNewMsg = pStart;
// pRsp = (STaosRsp *)pStart;
// pTail = pMsgHdr + size;
// }
//
// // get meter schema, and fill into resp payload
// pMeterObj = mgmtGetTable(tblName);
// pDbObj = mgmtGetDbByMeterId(tblName);
//
// if (pMeterObj == NULL || (pDbObj == NULL)) {
// continue;
// } else {
// mTrace("%s, uid:%" PRIu64 " sversion:%d meter meta is retrieved", tblName, pMeterObj->uid, pMeterObj->sversion);
// pMeta = (SMultiMeterMeta *)pCurMeter;
//
// memcpy(pMeta->meterId, tblName, strlen(tblName));
// pMeta->meta.uid = htobe64(pMeterObj->uid);
// pMeta->meta.sid = htonl(pMeterObj->gid.sid);
// pMeta->meta.vgid = htonl(pMeterObj->gid.vgId);
// pMeta->meta.sversion = htons(pMeterObj->sversion);
// pMeta->meta.precision = pDbObj->cfg.precision;
// pMeta->meta.numOfTags = pMeterObj->numOfTags;
// pMeta->meta.numOfColumns = htons(pMeterObj->numOfColumns);
// pMeta->meta.tableType = pMeterObj->tableType;
//
// pCurMeter += sizeof(SMultiMeterMeta);
// pSchema = (SSchema *)pCurMeter; // schema locates at the end of SMeterMeta struct
//
// if (mgmtTableCreateFromSuperTable(pMeterObj)) {
// assert(pMeterObj->numOfTags == 0);
//
// STabObj *pMetric = mgmtGetTable(pMeterObj->pTagData);
// uint32_t numOfTotalCols = (uint32_t)pMetric->numOfTags + pMetric->numOfColumns;
//
// pMeta->meta.numOfTags = pMetric->numOfTags; // update the numOfTags info
// mgmtSetSchemaFromMeters(pSchema, pMetric, numOfTotalCols);
// pCurMeter += numOfTotalCols * sizeof(SSchema);
//
// // for meters created from metric, we need the metric tag schema to parse the tag data
// int32_t tagsLen = mgmtSetMeterTagValue(pCurMeter, pMetric, pMeterObj);
// pCurMeter += tagsLen;
// } else {
// /*
// * for metrics, or meters that are not created from metric, set the schema directly
// * for meters created from metric, we use the schema of metric instead
// */
// uint32_t numOfTotalCols = (uint32_t)pMeterObj->numOfTags + pMeterObj->numOfColumns;
// mgmtSetSchemaFromMeters(pSchema, pMeterObj, numOfTotalCols);
// pCurMeter += numOfTotalCols * sizeof(SSchema);
// }
//
// if (mgmtIsNormalTable(pMeterObj)) {
// pVgroup = mgmtGetVgroup(pMeterObj->gid.vgId);
// if (pVgroup == NULL) {
// pRsp->code = TSDB_CODE_INVALID_TABLE;
// pNewMsg++;
// mError("%s, uid:%" PRIu64 " sversion:%d vgId:%d pVgroup is NULL", tblName, pMeterObj->uid, pMeterObj->sversion,
// pMeterObj->gid.vgId);
// goto _error_exit_code;
// }
//
// for (int i = 0; i < TSDB_VNODES_SUPPORT; ++i) {
// if (pConn->usePublicIp) {
// pMeta->meta.vpeerDesc[i].ip = pVgroup->vnodeGid[i].publicIp;
// pMeta->meta.vpeerDesc[i].vnode = htonl(pVgroup->vnodeGid[i].vnode);
// } else {
// pMeta->meta.vpeerDesc[i].ip = pVgroup->vnodeGid[i].ip;
// pMeta->meta.vpeerDesc[i].vnode = htonl(pVgroup->vnodeGid[i].vnode);
// }
// }
// }
// }
//
// totalNum++;
// if (totalNum > pInfo->numOfMeters) {
// pNewMsg++;
// break;
// }
// }
//
// // fill rsp code, ieType
// msgLen = pCurMeter - pNewMsg;
//
// pRsp->code = 0;
// pNewMsg += sizeof(STaosRsp);
// *pNewMsg = TSDB_IE_TYPE_META;
// pNewMsg++;
//
// SMultiMeterInfoMsg *pRspInfo = (SMultiMeterInfoMsg *)pNewMsg;
//
// pRspInfo->numOfMeters = htonl(totalNum);
// goto _exit_code;
//
//_error_exit_code:
// msgLen = pNewMsg - pStart;
//
//_exit_code:
// taosSendMsgToPeer(pConn->thandle, pStart, msgLen);
//
// return msgLen;
return 0; return 0;
}
int32_t totalNum = 0;
char tblName[TSDB_TABLE_ID_LEN];
char* nextStr;
char* pCurMeter = pStart + sizeof(STaosRsp) + sizeof(SMultiMeterInfoMsg) + 1; // 1: ie type byte
char* pTail = pStart + size;
while (str - pMsg < msgLen) {
nextStr = strchr(str, ',');
if (nextStr == NULL) {
break;
}
memcpy(tblName, str, nextStr - str);
tblName[nextStr - str] = '\0';
str = nextStr + 1;
// judge whether the remaining memory is adequate
if ((pTail - pCurMeter) < MAX_LEN_OF_METER_META) {
char* pMsgHdr = pStart - sizeof(STaosHeader);
size *= 2;
pMsgHdr = (char*)realloc(pMsgHdr, size);
if (NULL == pMsgHdr) {
char* pTmp = pStart - sizeof(STaosHeader);
tfree(pTmp);
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_MULTI_TABLE_META_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
break;
}
pCurMeter = (char*)pMsgHdr + sizeof(STaosHeader) + (pCurMeter - pStart);
pStart = (char*)pMsgHdr + sizeof(STaosHeader);
pNewMsg = pStart;
pRsp = (STaosRsp *)pStart;
pTail = pMsgHdr + size;
}
// get meter schema, and fill into resp payload
pMeterObj = mgmtGetTable(tblName);
pDbObj = mgmtGetDbByMeterId(tblName);
if (pMeterObj == NULL || (pDbObj == NULL)) {
continue;
} else {
mTrace("%s, uid:%" PRIu64 " sversion:%d meter meta is retrieved", tblName, pMeterObj->uid, pMeterObj->sversion);
pMeta = (SMultiMeterMeta *)pCurMeter;
memcpy(pMeta->meterId, tblName, strlen(tblName));
pMeta->meta.uid = htobe64(pMeterObj->uid);
pMeta->meta.sid = htonl(pMeterObj->gid.sid);
pMeta->meta.vgid = htonl(pMeterObj->gid.vgId);
pMeta->meta.sversion = htons(pMeterObj->sversion);
pMeta->meta.precision = pDbObj->cfg.precision;
pMeta->meta.numOfTags = pMeterObj->numOfTags;
pMeta->meta.numOfColumns = htons(pMeterObj->numOfColumns);
pMeta->meta.tableType = pMeterObj->tableType;
pCurMeter += sizeof(SMultiMeterMeta);
pSchema = (SSchema *)pCurMeter; // schema locates at the end of SMeterMeta struct
if (mgmtTableCreateFromSuperTable(pMeterObj)) {
assert(pMeterObj->numOfTags == 0);
STabObj *pMetric = mgmtGetTable(pMeterObj->pTagData);
uint32_t numOfTotalCols = (uint32_t)pMetric->numOfTags + pMetric->numOfColumns;
pMeta->meta.numOfTags = pMetric->numOfTags; // update the numOfTags info
mgmtSetSchemaFromMeters(pSchema, pMetric, numOfTotalCols);
pCurMeter += numOfTotalCols * sizeof(SSchema);
// for meters created from metric, we need the metric tag schema to parse the tag data
int32_t tagsLen = mgmtSetMeterTagValue(pCurMeter, pMetric, pMeterObj);
pCurMeter += tagsLen;
} else {
/*
* for metrics, or meters that are not created from metric, set the schema directly
* for meters created from metric, we use the schema of metric instead
*/
uint32_t numOfTotalCols = (uint32_t)pMeterObj->numOfTags + pMeterObj->numOfColumns;
mgmtSetSchemaFromMeters(pSchema, pMeterObj, numOfTotalCols);
pCurMeter += numOfTotalCols * sizeof(SSchema);
}
if (mgmtIsNormalTable(pMeterObj)) {
pVgroup = mgmtGetVgroup(pMeterObj->gid.vgId);
if (pVgroup == NULL) {
pRsp->code = TSDB_CODE_INVALID_TABLE;
pNewMsg++;
mError("%s, uid:%" PRIu64 " sversion:%d vgId:%d pVgroup is NULL", tblName, pMeterObj->uid, pMeterObj->sversion,
pMeterObj->gid.vgId);
goto _error_exit_code;
}
for (int i = 0; i < TSDB_VNODES_SUPPORT; ++i) {
if (pConn->usePublicIp) {
pMeta->meta.vpeerDesc[i].ip = pVgroup->vnodeGid[i].publicIp;
pMeta->meta.vpeerDesc[i].vnode = htonl(pVgroup->vnodeGid[i].vnode);
} else {
pMeta->meta.vpeerDesc[i].ip = pVgroup->vnodeGid[i].ip;
pMeta->meta.vpeerDesc[i].vnode = htonl(pVgroup->vnodeGid[i].vnode);
}
}
}
}
totalNum++;
if (totalNum > pInfo->numOfMeters) {
pNewMsg++;
break;
}
}
// fill rsp code, ieType
msgLen = pCurMeter - pNewMsg;
pRsp->code = 0;
pNewMsg += sizeof(STaosRsp);
*pNewMsg = TSDB_IE_TYPE_META;
pNewMsg++;
SMultiMeterInfoMsg *pRspInfo = (SMultiMeterInfoMsg *)pNewMsg;
pRspInfo->numOfMeters = htonl(totalNum);
goto _exit_code;
_error_exit_code:
msgLen = pNewMsg - pStart;
_exit_code:
taosSendMsgToPeer(pConn->thandle, pStart, msgLen);
return msgLen;
} }
int mgmtProcessMetricMetaMsg(char *pMsg, int msgLen, SConnObj *pConn) { int mgmtProcessMetricMetaMsg(char *pMsg, int msgLen, SConnObj *pConn) {
SSuperTableMetaMsg *pSuperTableMetaMsg = (SSuperTableMetaMsg *)pMsg; // SSuperTableMetaMsg *pSuperTableMetaMsg = (SSuperTableMetaMsg *)pMsg;
STabObj * pMetric; // STabObj * pMetric;
STaosRsp * pRsp; // STaosRsp * pRsp;
char * pStart; // char * pStart;
//
pSuperTableMetaMsg->numOfMeters = htonl(pSuperTableMetaMsg->numOfMeters); // pSuperTableMetaMsg->numOfMeters = htonl(pSuperTableMetaMsg->numOfMeters);
//
pSuperTableMetaMsg->join = htonl(pSuperTableMetaMsg->join); // pSuperTableMetaMsg->join = htonl(pSuperTableMetaMsg->join);
pSuperTableMetaMsg->joinCondLen = htonl(pSuperTableMetaMsg->joinCondLen); // pSuperTableMetaMsg->joinCondLen = htonl(pSuperTableMetaMsg->joinCondLen);
//
for (int32_t i = 0; i < pSuperTableMetaMsg->numOfMeters; ++i) { // for (int32_t i = 0; i < pSuperTableMetaMsg->numOfMeters; ++i) {
pSuperTableMetaMsg->metaElem[i] = htonl(pSuperTableMetaMsg->metaElem[i]); // pSuperTableMetaMsg->metaElem[i] = htonl(pSuperTableMetaMsg->metaElem[i]);
} // }
//
SMetricMetaElemMsg *pElem = (SMetricMetaElemMsg *)(((char *)pSuperTableMetaMsg) + pSuperTableMetaMsg->metaElem[0]); // SMetricMetaElemMsg *pElem = (SMetricMetaElemMsg *)(((char *)pSuperTableMetaMsg) + pSuperTableMetaMsg->metaElem[0]);
pMetric = mgmtGetTable(pElem->meterId); // pMetric = mgmtGetTable(pElem->meterId);
//
SDbObj *pDb = NULL; // SDbObj *pDb = NULL;
if (pConn->pDb != NULL) pDb = mgmtGetDb(pConn->pDb->name); // if (pConn->pDb != NULL) pDb = mgmtGetDb(pConn->pDb->name);
//
if (pMetric == NULL || (pDb != NULL && pDb->dropStatus != TSDB_DB_STATUS_READY)) { // if (pMetric == NULL || (pDb != NULL && pDb->dropStatus != TSDB_DB_STATUS_READY)) {
pStart = taosBuildRspMsg(pConn->thandle, TSDB_MSG_TYPE_STABLE_META_RSP); // pStart = taosBuildRspMsg(pConn->thandle, TSDB_MSG_TYPE_STABLE_META_RSP);
if (pStart == NULL) { // if (pStart == NULL) {
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_STABLE_META_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY); // taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_STABLE_META_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
// return 0;
// }
//
// pMsg = pStart;
// pRsp = (STaosRsp *)pMsg;
// if (pDb)
// pRsp->code = TSDB_CODE_INVALID_TABLE;
// else
// pRsp->code = TSDB_CODE_DB_NOT_SELECTED;
// pMsg++;
//
// msgLen = pMsg - pStart;
// } else {
// msgLen = mgmtRetrieveMetricMeta(pConn, &pStart, pSuperTableMetaMsg);
// if (msgLen <= 0) {
// taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_STABLE_META_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
// return 0;
// }
// }
//
// taosSendMsgToPeer(pConn->thandle, pStart, msgLen);
//
// return msgLen;
return 0; return 0;
}
pMsg = pStart;
pRsp = (STaosRsp *)pMsg;
if (pDb)
pRsp->code = TSDB_CODE_INVALID_TABLE;
else
pRsp->code = TSDB_CODE_DB_NOT_SELECTED;
pMsg++;
msgLen = pMsg - pStart;
} else {
msgLen = mgmtRetrieveMetricMeta(pConn, &pStart, pSuperTableMetaMsg);
if (msgLen <= 0) {
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_STABLE_META_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
return 0;
}
}
taosSendMsgToPeer(pConn->thandle, pStart, msgLen);
return msgLen;
} }
int mgmtProcessCreateDbMsg(char *pMsg, int msgLen, SConnObj *pConn) { int mgmtProcessCreateDbMsg(char *pMsg, int msgLen, SConnObj *pConn) {
SCreateDbMsg *pCreate = (SCreateDbMsg *)pMsg; // SCreateDbMsg *pCreate = (SCreateDbMsg *)pMsg;
int code = 0; // int code = 0;
//
if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_CREATE_DB_RSP) != 0) { // if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_CREATE_DB_RSP) != 0) {
return 0; // return 0;
} // }
//
pCreate->maxSessions = htonl(pCreate->maxSessions); // pCreate->maxSessions = htonl(pCreate->maxSessions);
pCreate->cacheBlockSize = htonl(pCreate->cacheBlockSize); // pCreate->cacheBlockSize = htonl(pCreate->cacheBlockSize);
// pCreate->cacheNumOfBlocks = htonl(pCreate->cacheNumOfBlocks); // // pCreate->cacheNumOfBlocks = htonl(pCreate->cacheNumOfBlocks);
pCreate->daysPerFile = htonl(pCreate->daysPerFile); // pCreate->daysPerFile = htonl(pCreate->daysPerFile);
pCreate->daysToKeep = htonl(pCreate->daysToKeep); // pCreate->daysToKeep = htonl(pCreate->daysToKeep);
pCreate->daysToKeep1 = htonl(pCreate->daysToKeep1); // pCreate->daysToKeep1 = htonl(pCreate->daysToKeep1);
pCreate->daysToKeep2 = htonl(pCreate->daysToKeep2); // pCreate->daysToKeep2 = htonl(pCreate->daysToKeep2);
pCreate->commitTime = htonl(pCreate->commitTime); // pCreate->commitTime = htonl(pCreate->commitTime);
pCreate->blocksPerMeter = htons(pCreate->blocksPerMeter); // pCreate->blocksPerMeter = htons(pCreate->blocksPerMeter);
pCreate->rowsInFileBlock = htonl(pCreate->rowsInFileBlock); // pCreate->rowsInFileBlock = htonl(pCreate->rowsInFileBlock);
//
if (mgmtCheckExpired()) { // if (mgmtCheckExpired()) {
code = TSDB_CODE_GRANT_EXPIRED; // code = TSDB_CODE_GRANT_EXPIRED;
} else if (!pConn->writeAuth) { // } else if (!pConn->writeAuth) {
code = TSDB_CODE_NO_RIGHTS; // code = TSDB_CODE_NO_RIGHTS;
} else { // } else {
code = mgmtCreateDb(pConn->pAcct, pCreate); // code = mgmtCreateDb(pConn->pAcct, pCreate);
if (code == TSDB_CODE_SUCCESS) { // if (code == TSDB_CODE_SUCCESS) {
mLPrint("DB:%s is created by %s", pCreate->db, pConn->pUser->user); // mLPrint("DB:%s is created by %s", pCreate->db, pConn->pUser->user);
} // }
} // }
//
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_CREATE_DB_RSP, code); // taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_CREATE_DB_RSP, code);
return 0; return 0;
} }
int mgmtProcessCreateMnodeMsg(char *pMsg, int msgLen, SConnObj *pConn) { int mgmtProcessCreateMnodeMsg(char *pMsg, int msgLen, SConnObj *pConn) {
return taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_CREATE_MNODE_RSP, TSDB_CODE_OPS_NOT_SUPPORT); // return rpcSendResponse(pConn->thandle, TSDB_MSG_TYPE_CREATE_MNODE_RSP, TSDB_CODE_OPS_NOT_SUPPORT);
return 0;
} }
int mgmtProcessAlterDbMsg(char *pMsg, int msgLen, SConnObj *pConn) { int mgmtProcessAlterDbMsg(char *pMsg, int msgLen, SConnObj *pConn) {
SAlterDbMsg *pAlter = (SAlterDbMsg *)pMsg; // SAlterDbMsg *pAlter = (SAlterDbMsg *)pMsg;
int code = 0; // int code = 0;
//
if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_ALTER_DB_RSP) != 0) { // if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_ALTER_DB_RSP) != 0) {
return 0; // return 0;
} // }
//
pAlter->daysPerFile = htonl(pAlter->daysPerFile); // pAlter->daysPerFile = htonl(pAlter->daysPerFile);
pAlter->daysToKeep = htonl(pAlter->daysToKeep); // pAlter->daysToKeep = htonl(pAlter->daysToKeep);
pAlter->maxSessions = htonl(pAlter->maxSessions) + 1; // pAlter->maxSessions = htonl(pAlter->maxSessions) + 1;
//
if (!pConn->writeAuth) { // if (!pConn->writeAuth) {
code = TSDB_CODE_NO_RIGHTS; // code = TSDB_CODE_NO_RIGHTS;
} else { // } else {
code = mgmtAlterDb(pConn->pAcct, pAlter); // code = mgmtAlterDb(pConn->pAcct, pAlter);
if (code == TSDB_CODE_SUCCESS) { // if (code == TSDB_CODE_SUCCESS) {
mLPrint("DB:%s is altered by %s", pAlter->db, pConn->pUser->user); // mLPrint("DB:%s is altered by %s", pAlter->db, pConn->pUser->user);
} // }
} // }
//
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_ALTER_DB_RSP, code); // taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_ALTER_DB_RSP, code);
return 0; return 0;
} }
int mgmtProcessKillQueryMsg(char *pMsg, int msgLen, SConnObj *pConn) { int mgmtProcessKillQueryMsg(char *pMsg, int msgLen, SConnObj *pConn) {
int code = 0; // int code = 0;
SKillQuery *pKill = (SKillQuery *)pMsg; // SKillQuery *pKill = (SKillQuery *)pMsg;
//
if (!pConn->writeAuth) { // if (!pConn->writeAuth) {
code = TSDB_CODE_NO_RIGHTS; // code = TSDB_CODE_NO_RIGHTS;
} else { // } else {
code = mgmtKillQuery(pKill->queryId, pConn); // code = mgmtKillQuery(pKill->queryId, pConn);
} // }
//
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_KILL_QUERY_RSP, code); // taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_KILL_QUERY_RSP, code);
return 0; return 0;
} }
int mgmtProcessKillStreamMsg(char *pMsg, int msgLen, SConnObj *pConn) { int mgmtProcessKillStreamMsg(char *pMsg, int msgLen, SConnObj *pConn) {
int code = 0; // int code = 0;
SKillStream *pKill = (SKillStream *)pMsg; // SKillStream *pKill = (SKillStream *)pMsg;
//
if (!pConn->writeAuth) { // if (!pConn->writeAuth) {
code = TSDB_CODE_NO_RIGHTS; // code = TSDB_CODE_NO_RIGHTS;
} else { // } else {
code = mgmtKillStream(pKill->queryId, pConn); // code = mgmtKillStream(pKill->queryId, pConn);
} // }
//
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_KILL_STREAM_RSP, code); // taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_KILL_STREAM_RSP, code);
return 0; return 0;
} }
int mgmtProcessKillConnectionMsg(char *pMsg, int msgLen, SConnObj *pConn) { int mgmtProcessKillConnectionMsg(char *pMsg, int msgLen, SConnObj *pConn) {
int code = 0; // int code = 0;
SKillConnection *pKill = (SKillConnection *)pMsg; // SKillConnection *pKill = (SKillConnection *)pMsg;
//
if (!pConn->superAuth) { // if (!pConn->superAuth) {
code = TSDB_CODE_NO_RIGHTS; // code = TSDB_CODE_NO_RIGHTS;
} else { // } else {
code = mgmtKillConnection(pKill->queryId, pConn); // code = mgmtKillConnection(pKill->queryId, pConn);
} // }
//
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_KILL_CONNECTION_RSP, code); // taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_KILL_CONNECTION_RSP, code);
return 0; return 0;
} }
int mgmtProcessCreateUserMsg(char *pMsg, int msgLen, SConnObj *pConn) { int mgmtProcessCreateUserMsg(char *pMsg, int msgLen, SConnObj *pConn) {
SCreateUserMsg *pCreate = (SCreateUserMsg *)pMsg; // SCreateUserMsg *pCreate = (SCreateUserMsg *)pMsg;
int code = 0; // int code = 0;
//
if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_CREATE_USER_RSP) != 0) { // if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_CREATE_USER_RSP) != 0) {
return 0; // return 0;
} // }
//
if (pConn->superAuth) { // if (pConn->superAuth) {
code = mgmtCreateUser(pConn->pAcct, pCreate->user, pCreate->pass); // code = mgmtCreateUser(pConn->pAcct, pCreate->user, pCreate->pass);
if (code == TSDB_CODE_SUCCESS) { // if (code == TSDB_CODE_SUCCESS) {
mLPrint("user:%s is created by %s", pCreate->user, pConn->pUser->user); // mLPrint("user:%s is created by %s", pCreate->user, pConn->pUser->user);
} // }
} else { // } else {
code = TSDB_CODE_NO_RIGHTS; // code = TSDB_CODE_NO_RIGHTS;
} // }
//
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_CREATE_USER_RSP, code); // taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_CREATE_USER_RSP, code);
return 0; return 0;
} }
int mgmtProcessAlterUserMsg(char *pMsg, int msgLen, SConnObj *pConn) { int mgmtProcessAlterUserMsg(char *pMsg, int msgLen, SConnObj *pConn) {
SAlterUserMsg *pAlter = (SAlterUserMsg *)pMsg; // SAlterUserMsg *pAlter = (SAlterUserMsg *)pMsg;
int code = 0; // int code = 0;
SUserObj * pUser; // SUserObj * pUser;
SUserObj * pOperUser; // SUserObj * pOperUser;
//
if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_ALTER_USER_RSP) != 0) { // if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_ALTER_USER_RSP) != 0) {
return 0; // return 0;
} // }
//
pUser = mgmtGetUser(pAlter->user); // pUser = mgmtGetUser(pAlter->user);
pOperUser = mgmtGetUser(pConn->pUser->user); // pOperUser = mgmtGetUser(pConn->pUser->user);
//
if (pUser == NULL) { // if (pUser == NULL) {
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_ALTER_USER_RSP, TSDB_CODE_INVALID_USER); // taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_ALTER_USER_RSP, TSDB_CODE_INVALID_USER);
return 0; // return 0;
} // }
//
if (pOperUser == NULL) { // if (pOperUser == NULL) {
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_ALTER_USER_RSP, TSDB_CODE_INVALID_USER); // taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_ALTER_USER_RSP, TSDB_CODE_INVALID_USER);
return 0; // return 0;
} // }
//
if (strcmp(pUser->user, "monitor") == 0 || (strcmp(pUser->user + 1, pUser->acct) == 0 && pUser->user[0] == '_')) { // if (strcmp(pUser->user, "monitor") == 0 || (strcmp(pUser->user + 1, pUser->acct) == 0 && pUser->user[0] == '_')) {
code = TSDB_CODE_NO_RIGHTS; // code = TSDB_CODE_NO_RIGHTS;
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_ALTER_USER_RSP, code); // taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_ALTER_USER_RSP, code);
return 0; // return 0;
} // }
//
if ((pAlter->flag & TSDB_ALTER_USER_PASSWD) != 0) { // if ((pAlter->flag & TSDB_ALTER_USER_PASSWD) != 0) {
bool hasRight = false; // bool hasRight = false;
if (strcmp(pOperUser->user, "root") == 0) { // if (strcmp(pOperUser->user, "root") == 0) {
hasRight = true; // hasRight = true;
} else if (strcmp(pUser->user, pOperUser->user) == 0) { // } else if (strcmp(pUser->user, pOperUser->user) == 0) {
hasRight = true; // hasRight = true;
} else if (pOperUser->superAuth) { // } else if (pOperUser->superAuth) {
if (strcmp(pUser->user, "root") == 0) { // if (strcmp(pUser->user, "root") == 0) {
hasRight = false; // hasRight = false;
} else if (strcmp(pOperUser->acct, pUser->acct) != 0) { // } else if (strcmp(pOperUser->acct, pUser->acct) != 0) {
hasRight = false; // hasRight = false;
} else { // } else {
hasRight = true; // hasRight = true;
} // }
} // }
//
if (hasRight) { // if (hasRight) {
memset(pUser->pass, 0, sizeof(pUser->pass)); // memset(pUser->pass, 0, sizeof(pUser->pass));
taosEncryptPass((uint8_t*)pAlter->pass, strlen(pAlter->pass), pUser->pass); // taosEncryptPass((uint8_t*)pAlter->pass, strlen(pAlter->pass), pUser->pass);
code = mgmtUpdateUser(pUser); // code = mgmtUpdateUser(pUser);
mLPrint("user:%s password is altered by %s, code:%d", pAlter->user, pConn->pUser->user, code); // mLPrint("user:%s password is altered by %s, code:%d", pAlter->user, pConn->pUser->user, code);
} else { // } else {
code = TSDB_CODE_NO_RIGHTS; // code = TSDB_CODE_NO_RIGHTS;
} // }
//
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_ALTER_USER_RSP, code); // taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_ALTER_USER_RSP, code);
return 0; // return 0;
} // }
//
if ((pAlter->flag & TSDB_ALTER_USER_PRIVILEGES) != 0) { // if ((pAlter->flag & TSDB_ALTER_USER_PRIVILEGES) != 0) {
bool hasRight = false; // bool hasRight = false;
//
if (strcmp(pUser->user, "root") == 0) { // if (strcmp(pUser->user, "root") == 0) {
hasRight = false; // hasRight = false;
} else if (strcmp(pUser->user, pUser->acct) == 0) { // } else if (strcmp(pUser->user, pUser->acct) == 0) {
hasRight = false; // hasRight = false;
} else if (strcmp(pOperUser->user, "root") == 0) { // } else if (strcmp(pOperUser->user, "root") == 0) {
hasRight = true; // hasRight = true;
} else if (strcmp(pUser->user, pOperUser->user) == 0) { // } else if (strcmp(pUser->user, pOperUser->user) == 0) {
hasRight = false; // hasRight = false;
} else if (pOperUser->superAuth) { // } else if (pOperUser->superAuth) {
if (strcmp(pUser->user, "root") == 0) { // if (strcmp(pUser->user, "root") == 0) {
hasRight = false; // hasRight = false;
} else if (strcmp(pOperUser->acct, pUser->acct) != 0) { // } else if (strcmp(pOperUser->acct, pUser->acct) != 0) {
hasRight = false; // hasRight = false;
} else { // } else {
hasRight = true; // hasRight = true;
} // }
} // }
//
if (pAlter->privilege == 1) { // super // if (pAlter->privilege == 1) { // super
hasRight = false; // hasRight = false;
} // }
//
if (hasRight) { // if (hasRight) {
//if (pAlter->privilege == 1) { // super // //if (pAlter->privilege == 1) { // super
// pUser->superAuth = 1; // // pUser->superAuth = 1;
// pUser->writeAuth = 1; // // pUser->writeAuth = 1;
//} // //}
if (pAlter->privilege == 2) { // read // if (pAlter->privilege == 2) { // read
pUser->superAuth = 0; // pUser->superAuth = 0;
pUser->writeAuth = 0; // pUser->writeAuth = 0;
} // }
if (pAlter->privilege == 3) { // write // if (pAlter->privilege == 3) { // write
pUser->superAuth = 0; // pUser->superAuth = 0;
pUser->writeAuth = 1; // pUser->writeAuth = 1;
} // }
//
code = mgmtUpdateUser(pUser); // code = mgmtUpdateUser(pUser);
mLPrint("user:%s privilege is altered by %s, code:%d", pAlter->user, pConn->pUser->user, code); // mLPrint("user:%s privilege is altered by %s, code:%d", pAlter->user, pConn->pUser->user, code);
} else { // } else {
code = TSDB_CODE_NO_RIGHTS; // code = TSDB_CODE_NO_RIGHTS;
} // }
//
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_ALTER_USER_RSP, code); // taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_ALTER_USER_RSP, code);
return 0; // return 0;
} // }
//
code = TSDB_CODE_NO_RIGHTS; // code = TSDB_CODE_NO_RIGHTS;
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_ALTER_USER_RSP, code); // taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_ALTER_USER_RSP, code);
return 0; return 0;
} }
int mgmtProcessDropUserMsg(char *pMsg, int msgLen, SConnObj *pConn) { int mgmtProcessDropUserMsg(char *pMsg, int msgLen, SConnObj *pConn) {
SDropUserMsg *pDrop = (SDropUserMsg *)pMsg; // SDropUserMsg *pDrop = (SDropUserMsg *)pMsg;
int code = 0; // int code = 0;
SUserObj * pUser; // SUserObj * pUser;
SUserObj * pOperUser; // SUserObj * pOperUser;
//
if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_DROP_USER_RSP) != 0) { // if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_DROP_USER_RSP) != 0) {
return 0; // return 0;
} // }
//
pUser = mgmtGetUser(pDrop->user); // pUser = mgmtGetUser(pDrop->user);
pOperUser = mgmtGetUser(pConn->pUser->user); // pOperUser = mgmtGetUser(pConn->pUser->user);
//
if (pUser == NULL) { // if (pUser == NULL) {
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DROP_USER_RSP, TSDB_CODE_INVALID_USER); // taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DROP_USER_RSP, TSDB_CODE_INVALID_USER);
return 0; // return 0;
} // }
//
if (pOperUser == NULL) { // if (pOperUser == NULL) {
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DROP_USER_RSP, TSDB_CODE_INVALID_USER); // taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DROP_USER_RSP, TSDB_CODE_INVALID_USER);
return 0; // return 0;
} // }
//
if (strcmp(pUser->user, "monitor") == 0 || (strcmp(pUser->user + 1, pUser->acct) == 0 && pUser->user[0] == '_')) { // if (strcmp(pUser->user, "monitor") == 0 || (strcmp(pUser->user + 1, pUser->acct) == 0 && pUser->user[0] == '_')) {
code = TSDB_CODE_NO_RIGHTS; // code = TSDB_CODE_NO_RIGHTS;
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DROP_USER_RSP, code); // taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DROP_USER_RSP, code);
return 0; // return 0;
} // }
//
bool hasRight = false; // bool hasRight = false;
if (strcmp(pUser->user, "root") == 0) { // if (strcmp(pUser->user, "root") == 0) {
hasRight = false; // hasRight = false;
} else if (strcmp(pOperUser->user, "root") == 0) { // } else if (strcmp(pOperUser->user, "root") == 0) {
hasRight = true; // hasRight = true;
} else if (strcmp(pUser->user, pOperUser->user) == 0) { // } else if (strcmp(pUser->user, pOperUser->user) == 0) {
hasRight = false; // hasRight = false;
} else if (pOperUser->superAuth) { // } else if (pOperUser->superAuth) {
if (strcmp(pUser->user, "root") == 0) { // if (strcmp(pUser->user, "root") == 0) {
hasRight = false; // hasRight = false;
} else if (strcmp(pOperUser->acct, pUser->acct) != 0) { // } else if (strcmp(pOperUser->acct, pUser->acct) != 0) {
hasRight = false; // hasRight = false;
} else { // } else {
hasRight = true; // hasRight = true;
} // }
} // }
//
if (hasRight) { // if (hasRight) {
code = mgmtDropUser(pConn->pAcct, pDrop->user); // code = mgmtDropUser(pConn->pAcct, pDrop->user);
if (code == 0) { // if (code == 0) {
mLPrint("user:%s is dropped by %s", pDrop->user, pConn->pUser->user); // mLPrint("user:%s is dropped by %s", pDrop->user, pConn->pUser->user);
} // }
} else { // } else {
code = TSDB_CODE_NO_RIGHTS; // code = TSDB_CODE_NO_RIGHTS;
} // }
//
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DROP_USER_RSP, code); // taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DROP_USER_RSP, code);
return 0; return 0;
} }
int mgmtProcessDropDbMsg(char *pMsg, int msgLen, SConnObj *pConn) { int mgmtProcessDropDbMsg(char *pMsg, int msgLen, SConnObj *pConn) {
SDropDbMsg *pDrop = (SDropDbMsg *)pMsg; // SDropDbMsg *pDrop = (SDropDbMsg *)pMsg;
int code; // int code;
//
if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_DROP_DB_RSP) != 0) { // if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_DROP_DB_RSP) != 0) {
return 0; // return 0;
} // }
//
if (!pConn->writeAuth) { // if (!pConn->writeAuth) {
code = TSDB_CODE_NO_RIGHTS; // code = TSDB_CODE_NO_RIGHTS;
} else { // } else {
code = mgmtDropDbByName(pConn->pAcct, pDrop->db, pDrop->ignoreNotExists); // code = mgmtDropDbByName(pConn->pAcct, pDrop->db, pDrop->ignoreNotExists);
if (code == 0) { // if (code == 0) {
mLPrint("DB:%s is dropped by %s", pDrop->db, pConn->pUser->user); // mLPrint("DB:%s is dropped by %s", pDrop->db, pConn->pUser->user);
} // }
} // }
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DROP_DB_RSP, code); // taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DROP_DB_RSP, code);
return 0; return 0;
} }
int mgmtProcessUseDbMsg(char *pMsg, int msgLen, SConnObj *pConn) { int mgmtProcessUseDbMsg(char *pMsg, int msgLen, SConnObj *pConn) {
SUseDbMsg *pUse = (SUseDbMsg *)pMsg; // SUseDbMsg *pUse = (SUseDbMsg *)pMsg;
int code; // int code;
//
code = mgmtUseDb(pConn, pUse->db); // code = mgmtUseDb(pConn, pUse->db);
if (code == 0) mTrace("DB is change to:%s by %s", pUse->db, pConn->pUser->user); // if (code == 0) mTrace("DB is change to:%s by %s", pUse->db, pConn->pUser->user);
//
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_USE_DB_RSP, code); // taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_USE_DB_RSP, code);
return 0; return 0;
} }
...@@ -926,364 +934,366 @@ static void mgmtInitShowMsgFp() { ...@@ -926,364 +934,366 @@ static void mgmtInitShowMsgFp() {
} }
int mgmtProcessShowMsg(char *pMsg, int msgLen, SConnObj *pConn) { int mgmtProcessShowMsg(char *pMsg, int msgLen, SConnObj *pConn) {
SShowMsg * pShowMsg = (SShowMsg *)pMsg; // SShowMsg * pShowMsg = (SShowMsg *)pMsg;
STaosRsp * pRsp; // STaosRsp * pRsp;
char * pStart; // char * pStart;
int code = 0; // int code = 0;
SShowRspMsg *pShowRsp; // SShowRspMsg *pShowRsp;
SShowObj * pShow = NULL; // SShowObj * pShow = NULL;
//
if (pShowMsg->type == TSDB_MGMT_TABLE_DNODE || TSDB_MGMT_TABLE_GRANTS || TSDB_MGMT_TABLE_SCORES) { // if (pShowMsg->type == TSDB_MGMT_TABLE_DNODE || TSDB_MGMT_TABLE_GRANTS || TSDB_MGMT_TABLE_SCORES) {
if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_SHOW_RSP) != 0) { // if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_SHOW_RSP) != 0) {
// return 0;
// }
// }
//
// int size = sizeof(STaosHeader) + sizeof(STaosRsp) + sizeof(SShowRspMsg) + sizeof(SSchema) * TSDB_MAX_COLUMNS +
// TSDB_EXTRA_PAYLOAD_SIZE;
// pStart = taosBuildRspMsgWithSize(pConn->thandle, TSDB_MSG_TYPE_SHOW_RSP, size);
// if (pStart == NULL) {
// taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_SHOW_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
// return 0;
// }
//
// pMsg = pStart;
// pRsp = (STaosRsp *)pMsg;
// pMsg = (char *)pRsp->more;
//
// if (pShowMsg->type >= TSDB_MGMT_TABLE_MAX) {
// code = -1;
// } else {
// pShow = (SShowObj *)calloc(1, sizeof(SShowObj) + htons(pShowMsg->payloadLen));
// pShow->signature = pShow;
// pShow->type = pShowMsg->type;
// mTrace("pShow:%p is allocated", pShow);
//
// // set the table name query condition
// pShow->payloadLen = htons(pShowMsg->payloadLen);
// memcpy(pShow->payload, pShowMsg->payload, pShow->payloadLen);
//
// pShowRsp = (SShowRspMsg *)pMsg;
// pShowRsp->qhandle = (uint64_t)pShow; // qhandle;
// pConn->qhandle = pShowRsp->qhandle;
//
// code = (*mgmtGetMetaFp[(uint8_t)pShowMsg->type])(&pShowRsp->meterMeta, pShow, pConn);
// if (code == 0) {
// pMsg += sizeof(SShowRspMsg) + sizeof(SSchema) * pShow->numOfColumns;
// } else {
// mError("pShow:%p, type:%d %s, failed to get Meta, code:%d", pShow, pShowMsg->type, taosMsg[(uint8_t)pShowMsg->type], code);
// free(pShow);
// }
// }
//
// pRsp->code = code;
// msgLen = pMsg - pStart;
// taosSendMsgToPeer(pConn->thandle, pStart, msgLen);
//
// return msgLen;
return 0; return 0;
}
}
int size = sizeof(STaosHeader) + sizeof(STaosRsp) + sizeof(SShowRspMsg) + sizeof(SSchema) * TSDB_MAX_COLUMNS +
TSDB_EXTRA_PAYLOAD_SIZE;
pStart = taosBuildRspMsgWithSize(pConn->thandle, TSDB_MSG_TYPE_SHOW_RSP, size);
if (pStart == NULL) {
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_SHOW_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
return 0;
}
pMsg = pStart;
pRsp = (STaosRsp *)pMsg;
pMsg = (char *)pRsp->more;
if (pShowMsg->type >= TSDB_MGMT_TABLE_MAX) {
code = -1;
} else {
pShow = (SShowObj *)calloc(1, sizeof(SShowObj) + htons(pShowMsg->payloadLen));
pShow->signature = pShow;
pShow->type = pShowMsg->type;
mTrace("pShow:%p is allocated", pShow);
// set the table name query condition
pShow->payloadLen = htons(pShowMsg->payloadLen);
memcpy(pShow->payload, pShowMsg->payload, pShow->payloadLen);
pShowRsp = (SShowRspMsg *)pMsg;
pShowRsp->qhandle = (uint64_t)pShow; // qhandle;
pConn->qhandle = pShowRsp->qhandle;
code = (*mgmtGetMetaFp[(uint8_t)pShowMsg->type])(&pShowRsp->meterMeta, pShow, pConn);
if (code == 0) {
pMsg += sizeof(SShowRspMsg) + sizeof(SSchema) * pShow->numOfColumns;
} else {
mError("pShow:%p, type:%d %s, failed to get Meta, code:%d", pShow, pShowMsg->type, taosMsg[(uint8_t)pShowMsg->type], code);
free(pShow);
}
}
pRsp->code = code;
msgLen = pMsg - pStart;
taosSendMsgToPeer(pConn->thandle, pStart, msgLen);
return msgLen;
} }
int mgmtProcessRetrieveMsg(char *pMsg, int msgLen, SConnObj *pConn) { int mgmtProcessRetrieveMsg(char *pMsg, int msgLen, SConnObj *pConn) {
SRetrieveMeterMsg *pRetrieve; // SRetrieveMeterMsg *pRetrieve;
SRetrieveMeterRsp *pRsp; // SRetrieveMeterRsp *pRsp;
int rowsToRead = 0, size = 0, rowsRead = 0; // int rowsToRead = 0, size = 0, rowsRead = 0;
char * pStart; // char * pStart;
int code = 0; // int code = 0;
SShowObj * pShow; // SShowObj * pShow;
//
pRetrieve = (SRetrieveMeterMsg *)pMsg; // pRetrieve = (SRetrieveMeterMsg *)pMsg;
//
/* // /*
* in case of server restart, apps may hold qhandle created by server before // * in case of server restart, apps may hold qhandle created by server before
* restart, which is actually invalid, therefore, signature check is required. // * restart, which is actually invalid, therefore, signature check is required.
*/ // */
if (pRetrieve->qhandle != pConn->qhandle) { // if (pRetrieve->qhandle != pConn->qhandle) {
mError("retrieve:%p, qhandle:%p is not matched with saved:%p", pRetrieve, pRetrieve->qhandle, pConn->qhandle); // mError("retrieve:%p, qhandle:%p is not matched with saved:%p", pRetrieve, pRetrieve->qhandle, pConn->qhandle);
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DNODE_RETRIEVE_RSP, TSDB_CODE_MEMORY_CORRUPTED); // taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DNODE_RETRIEVE_RSP, TSDB_CODE_MEMORY_CORRUPTED);
return -1; // return -1;
} // }
//
pShow = (SShowObj *)pRetrieve->qhandle; // pShow = (SShowObj *)pRetrieve->qhandle;
if (pShow->signature != (void *)pShow) { // if (pShow->signature != (void *)pShow) {
mError("pShow:%p, signature:%p, query memory is corrupted", pShow, pShow->signature); // mError("pShow:%p, signature:%p, query memory is corrupted", pShow, pShow->signature);
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DNODE_RETRIEVE_RSP, TSDB_CODE_MEMORY_CORRUPTED); // taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DNODE_RETRIEVE_RSP, TSDB_CODE_MEMORY_CORRUPTED);
return -1; // return -1;
} else { // } else {
if ((pRetrieve->free & TSDB_QUERY_TYPE_FREE_RESOURCE) != TSDB_QUERY_TYPE_FREE_RESOURCE) { // if ((pRetrieve->free & TSDB_QUERY_TYPE_FREE_RESOURCE) != TSDB_QUERY_TYPE_FREE_RESOURCE) {
rowsToRead = pShow->numOfRows - pShow->numOfReads; // rowsToRead = pShow->numOfRows - pShow->numOfReads;
} // }
//
/* return no more than 100 meters in one round trip */ // /* return no more than 100 meters in one round trip */
if (rowsToRead > 100) rowsToRead = 100; // if (rowsToRead > 100) rowsToRead = 100;
//
/* // /*
* the actual number of table may be larger than the value of pShow->numOfRows, if a query is // * the actual number of table may be larger than the value of pShow->numOfRows, if a query is
* issued during a continuous create table operation. Therefore, rowToRead may be less than 0. // * issued during a continuous create table operation. Therefore, rowToRead may be less than 0.
*/ // */
if (rowsToRead < 0) rowsToRead = 0; // if (rowsToRead < 0) rowsToRead = 0;
size = pShow->rowSize * rowsToRead; // size = pShow->rowSize * rowsToRead;
} // }
//
pStart = taosBuildRspMsgWithSize(pConn->thandle, TSDB_MSG_TYPE_DNODE_RETRIEVE_RSP, size + 100); // pStart = taosBuildRspMsgWithSize(pConn->thandle, TSDB_MSG_TYPE_DNODE_RETRIEVE_RSP, size + 100);
if (pStart == NULL) { // if (pStart == NULL) {
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DNODE_RETRIEVE_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY); // taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DNODE_RETRIEVE_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
// return 0;
// }
//
// pMsg = pStart;
//
// STaosRsp *pTaosRsp = (STaosRsp *)pStart;
// pTaosRsp->code = code;
// pMsg = pTaosRsp->more;
//
// if (code == 0) {
// pRsp = (SRetrieveMeterRsp *)pMsg;
// pMsg = pRsp->data;
//
// // if free flag is set, client wants to clean the resources
// if ((pRetrieve->free & TSDB_QUERY_TYPE_FREE_RESOURCE) != TSDB_QUERY_TYPE_FREE_RESOURCE)
// rowsRead = (*mgmtRetrieveFp[(uint8_t)pShow->type])(pShow, pRsp->data, rowsToRead, pConn);
//
// if (rowsRead < 0) {
// rowsRead = 0;
// pTaosRsp->code = TSDB_CODE_ACTION_IN_PROGRESS;
// }
//
// pRsp->numOfRows = htonl(rowsRead);
// pRsp->precision = htonl(TSDB_TIME_PRECISION_MILLI); // millisecond time precision
// pMsg += size;
// }
//
// msgLen = pMsg - pStart;
// taosSendMsgToPeer(pConn->thandle, pStart, msgLen);
//
// if (rowsToRead == 0) {
// uintptr_t oldSign = (uintptr_t)atomic_val_compare_exchange_ptr(&pShow->signature, pShow, 0);
// if (oldSign != (uintptr_t)pShow) {
// return msgLen;
// }
// // pShow->signature = 0;
// mTrace("pShow:%p is released", pShow);
// tfree(pShow);
// }
//
// return msgLen;
return 0; return 0;
}
pMsg = pStart;
STaosRsp *pTaosRsp = (STaosRsp *)pStart;
pTaosRsp->code = code;
pMsg = pTaosRsp->more;
if (code == 0) {
pRsp = (SRetrieveMeterRsp *)pMsg;
pMsg = pRsp->data;
// if free flag is set, client wants to clean the resources
if ((pRetrieve->free & TSDB_QUERY_TYPE_FREE_RESOURCE) != TSDB_QUERY_TYPE_FREE_RESOURCE)
rowsRead = (*mgmtRetrieveFp[(uint8_t)pShow->type])(pShow, pRsp->data, rowsToRead, pConn);
if (rowsRead < 0) {
rowsRead = 0;
pTaosRsp->code = TSDB_CODE_ACTION_IN_PROGRESS;
}
pRsp->numOfRows = htonl(rowsRead);
pRsp->precision = htonl(TSDB_TIME_PRECISION_MILLI); // millisecond time precision
pMsg += size;
}
msgLen = pMsg - pStart;
taosSendMsgToPeer(pConn->thandle, pStart, msgLen);
if (rowsToRead == 0) {
uintptr_t oldSign = (uintptr_t)atomic_val_compare_exchange_ptr(&pShow->signature, pShow, 0);
if (oldSign != (uintptr_t)pShow) {
return msgLen;
}
// pShow->signature = 0;
mTrace("pShow:%p is released", pShow);
tfree(pShow);
}
return msgLen;
} }
int mgmtProcessCreateTableMsg(char *pMsg, int msgLen, SConnObj *pConn) { int mgmtProcessCreateTableMsg(char *pMsg, int msgLen, SConnObj *pConn) {
SCreateTableMsg *pCreate = (SCreateTableMsg *)pMsg; // SCreateTableMsg *pCreate = (SCreateTableMsg *)pMsg;
int code; // int code;
SSchema * pSchema; // SSchema * pSchema;
//
if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_CREATE_TABLE_RSP) != 0) { // if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_CREATE_TABLE_RSP) != 0) {
return 0; // return 0;
} // }
//
if (!pConn->writeAuth) { // if (!pConn->writeAuth) {
code = TSDB_CODE_NO_RIGHTS; // code = TSDB_CODE_NO_RIGHTS;
} else { // } else {
pCreate->numOfColumns = htons(pCreate->numOfColumns); // pCreate->numOfColumns = htons(pCreate->numOfColumns);
pCreate->numOfTags = htons(pCreate->numOfTags); // pCreate->numOfTags = htons(pCreate->numOfTags);
//
pCreate->sqlLen = htons(pCreate->sqlLen); // pCreate->sqlLen = htons(pCreate->sqlLen);
pSchema = pCreate->schema; // pSchema = pCreate->schema;
for (int i = 0; i < pCreate->numOfColumns + pCreate->numOfTags; ++i) { // for (int i = 0; i < pCreate->numOfColumns + pCreate->numOfTags; ++i) {
pSchema->bytes = htons(pSchema->bytes); // pSchema->bytes = htons(pSchema->bytes);
pSchema->colId = i; // pSchema->colId = i;
pSchema++; // pSchema++;
} // }
//
SDbObj *pDb = NULL; // SDbObj *pDb = NULL;
if (pConn->pDb != NULL) pDb = mgmtGetDb(pConn->pDb->name); // if (pConn->pDb != NULL) pDb = mgmtGetDb(pConn->pDb->name);
//
if (pDb) { // if (pDb) {
code = mgmtCreateTable(pDb, pCreate); // code = mgmtCreateTable(pDb, pCreate);
} else { // } else {
code = TSDB_CODE_DB_NOT_SELECTED; // code = TSDB_CODE_DB_NOT_SELECTED;
} // }
} // }
//
if (code == 1) { // if (code == 1) {
//mTrace("table:%s, wait vgroup create finish", pCreate->meterId, code); // //mTrace("table:%s, wait vgroup create finish", pCreate->meterId, code);
} else if (code != TSDB_CODE_SUCCESS) { // } else if (code != TSDB_CODE_SUCCESS) {
if (code == TSDB_CODE_TABLE_ALREADY_EXIST) { // table already created when the second attempt to create table // if (code == TSDB_CODE_TABLE_ALREADY_EXIST) { // table already created when the second attempt to create table
//
STabObj* pTable = mgmtGetTable(pCreate->meterId); // STabObj* pTable = mgmtGetTable(pCreate->meterId);
assert(pTable != NULL); // assert(pTable != NULL);
//
mWarn("table:%s, table already created, failed to create table, ts:%" PRId64 ", code:%d", pCreate->meterId, // mWarn("table:%s, table already created, failed to create table, ts:%" PRId64 ", code:%d", pCreate->meterId,
pTable->createdTime, code); // pTable->createdTime, code);
} else { // other errors // } else { // other errors
mError("table:%s, failed to create table, code:%d", pCreate->meterId, code); // mError("table:%s, failed to create table, code:%d", pCreate->meterId, code);
} // }
} else { // } else {
mTrace("table:%s, table is created by %s", pCreate->meterId, pConn->pUser->user); // mTrace("table:%s, table is created by %s", pCreate->meterId, pConn->pUser->user);
} // }
//
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_CREATE_TABLE_RSP, code); // taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_CREATE_TABLE_RSP, code);
return 0; return 0;
} }
int mgmtProcessDropTableMsg(char *pMsg, int msgLen, SConnObj *pConn) { int mgmtProcessDropTableMsg(char *pMsg, int msgLen, SConnObj *pConn) {
SDropTableMsg *pDrop = (SDropTableMsg *)pMsg; // SDropTableMsg *pDrop = (SDropTableMsg *)pMsg;
int code; // int code;
//
if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_DROP_TABLE_RSP) != 0) { // if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_DROP_TABLE_RSP) != 0) {
return 0; // return 0;
} // }
//
if (!pConn->writeAuth) { // if (!pConn->writeAuth) {
code = TSDB_CODE_NO_RIGHTS; // code = TSDB_CODE_NO_RIGHTS;
} else { // } else {
SDbObj *pDb = NULL; // SDbObj *pDb = NULL;
if (pConn->pDb != NULL) pDb = mgmtGetDb(pConn->pDb->name); // if (pConn->pDb != NULL) pDb = mgmtGetDb(pConn->pDb->name);
//
code = mgmtDropTable(pDb, pDrop->meterId, pDrop->igNotExists); // code = mgmtDropTable(pDb, pDrop->meterId, pDrop->igNotExists);
if (code == 0) { // if (code == 0) {
mTrace("meter:%s is dropped by user:%s", pDrop->meterId, pConn->pUser->user); // mTrace("meter:%s is dropped by user:%s", pDrop->meterId, pConn->pUser->user);
// mLPrint("meter:%s is dropped by user:%s", pDrop->meterId, pConn->pUser->user); // // mLPrint("meter:%s is dropped by user:%s", pDrop->meterId, pConn->pUser->user);
} // }
//
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DROP_TABLE_RSP, code); // taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DROP_TABLE_RSP, code);
} // }
return 0; return 0;
} }
int mgmtProcessAlterTableMsg(char *pMsg, int msgLen, SConnObj *pConn) { int mgmtProcessAlterTableMsg(char *pMsg, int msgLen, SConnObj *pConn) {
SAlterTableMsg *pAlter = (SAlterTableMsg *)pMsg; // SAlterTableMsg *pAlter = (SAlterTableMsg *)pMsg;
int code; // int code;
//
if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_ALTER_TABLE_RSP) != 0) { // if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_ALTER_TABLE_RSP) != 0) {
return 0; // return 0;
} // }
//
if (!pConn->writeAuth) { // if (!pConn->writeAuth) {
code = TSDB_CODE_NO_RIGHTS; // code = TSDB_CODE_NO_RIGHTS;
} else { // } else {
pAlter->type = htons(pAlter->type); // pAlter->type = htons(pAlter->type);
pAlter->numOfCols = htons(pAlter->numOfCols); // pAlter->numOfCols = htons(pAlter->numOfCols);
//
if (pAlter->numOfCols > 2) { // if (pAlter->numOfCols > 2) {
mError("meter:%s error numOfCols:%d in alter table", pAlter->meterId, pAlter->numOfCols); // mError("meter:%s error numOfCols:%d in alter table", pAlter->meterId, pAlter->numOfCols);
code = TSDB_CODE_APP_ERROR; // code = TSDB_CODE_APP_ERROR;
} else { // } else {
SDbObj *pDb = NULL; // SDbObj *pDb = NULL;
if (pConn->pDb != NULL) pDb = mgmtGetDb(pConn->pDb->name); // if (pConn->pDb != NULL) pDb = mgmtGetDb(pConn->pDb->name);
//
if (pDb) { // if (pDb) {
for (int32_t i = 0; i < pAlter->numOfCols; ++i) { // for (int32_t i = 0; i < pAlter->numOfCols; ++i) {
pAlter->schema[i].bytes = htons(pAlter->schema[i].bytes); // pAlter->schema[i].bytes = htons(pAlter->schema[i].bytes);
} // }
//
code = mgmtAlterTable(pDb, pAlter); // code = mgmtAlterTable(pDb, pAlter);
if (code == 0) { // if (code == 0) {
mLPrint("meter:%s is altered by %s", pAlter->meterId, pConn->pUser->user); // mLPrint("meter:%s is altered by %s", pAlter->meterId, pConn->pUser->user);
} // }
} else { // } else {
code = TSDB_CODE_DB_NOT_SELECTED; // code = TSDB_CODE_DB_NOT_SELECTED;
} // }
} // }
} // }
//
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_ALTER_TABLE_RSP, code); // taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_ALTER_TABLE_RSP, code);
return 0; return 0;
} }
int mgmtProcessCfgDnodeMsg(char *pMsg, int msgLen, SConnObj *pConn) { int mgmtProcessCfgDnodeMsg(char *pMsg, int msgLen, SConnObj *pConn) {
int code = 0; // int code = 0;
SCfgMsg *pCfg = (SCfgMsg *)pMsg; // SCfgMsg *pCfg = (SCfgMsg *)pMsg;
//
if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_CFG_MNODE_RSP) != 0) { // if (mgmtCheckRedirectMsg(pConn, TSDB_MSG_TYPE_CFG_MNODE_RSP) != 0) {
return 0; // return 0;
} // }
//
if (strcmp(pConn->pAcct->user, "root") != 0) { // if (strcmp(pConn->pAcct->user, "root") != 0) {
code = TSDB_CODE_NO_RIGHTS; // code = TSDB_CODE_NO_RIGHTS;
} else { // } else {
code = mgmtSendCfgDnodeMsg(pMsg); // code = mgmtSendCfgDnodeMsg(pMsg);
} // }
//
taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DNODE_CFG_RSP, code); // taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DNODE_CFG_RSP, code);
//
if (code == 0) mTrace("dnode:%s is configured by %s", pCfg->ip, pConn->pUser->user); // if (code == 0) mTrace("dnode:%s is configured by %s", pCfg->ip, pConn->pUser->user);
//
return 0; // return 0;
} //}
//
int mgmtProcessHeartBeatMsg(char *cont, int contLen, SConnObj *pConn) { //int mgmtProcessHeartBeatMsg(char *cont, int contLen, SConnObj *pConn) {
char * pStart, *pMsg; // char * pStart, *pMsg;
int msgLen; // int msgLen;
STaosRsp *pRsp; // STaosRsp *pRsp;
//
mgmtSaveQueryStreamList(cont, contLen, pConn); // mgmtSaveQueryStreamList(cont, contLen, pConn);
//
pStart = taosBuildRspMsgWithSize(pConn->thandle, TSDB_MSG_TYPE_HEARTBEAT_RSP, 128); // pStart = taosBuildRspMsgWithSize(pConn->thandle, TSDB_MSG_TYPE_HEARTBEAT_RSP, 128);
if (pStart == NULL) return 0; // if (pStart == NULL) return 0;
pMsg = pStart; // pMsg = pStart;
pRsp = (STaosRsp *)pMsg; // pRsp = (STaosRsp *)pMsg;
pRsp->code = 0; // pRsp->code = 0;
pMsg = (char *)pRsp->more; // pMsg = (char *)pRsp->more;
//
SHeartBeatRsp *pHBRsp = (SHeartBeatRsp *)pRsp->more; // SHeartBeatRsp *pHBRsp = (SHeartBeatRsp *)pRsp->more;
pHBRsp->queryId = pConn->queryId; // pHBRsp->queryId = pConn->queryId;
pConn->queryId = 0; // pConn->queryId = 0;
pHBRsp->streamId = pConn->streamId; // pHBRsp->streamId = pConn->streamId;
pHBRsp->streamId = pConn->streamId; // pHBRsp->streamId = pConn->streamId;
pConn->streamId = 0; // pConn->streamId = 0;
pHBRsp->killConnection = pConn->killConnection; // pHBRsp->killConnection = pConn->killConnection;
//
if (pConn->usePublicIp) { // if (pConn->usePublicIp) {
if (pSdbPublicIpList != NULL) { // if (pSdbPublicIpList != NULL) {
int size = pSdbPublicIpList->numOfIps * 4; // int size = pSdbPublicIpList->numOfIps * 4;
pHBRsp->ipList.numOfIps = pSdbPublicIpList->numOfIps; // pHBRsp->ipList.numOfIps = pSdbPublicIpList->numOfIps;
memcpy(pHBRsp->ipList.ip, pSdbPublicIpList->ip, size); // memcpy(pHBRsp->ipList.ip, pSdbPublicIpList->ip, size);
pMsg += sizeof(SHeartBeatRsp) + size; // pMsg += sizeof(SHeartBeatRsp) + size;
} else { // } else {
pHBRsp->ipList.numOfIps = 0; // pHBRsp->ipList.numOfIps = 0;
pMsg += sizeof(SHeartBeatRsp); // pMsg += sizeof(SHeartBeatRsp);
} // }
//
} else { // } else {
if (pSdbIpList != NULL) { // if (pSdbIpList != NULL) {
int size = pSdbIpList->numOfIps * 4; // int size = pSdbIpList->numOfIps * 4;
pHBRsp->ipList.numOfIps = pSdbIpList->numOfIps; // pHBRsp->ipList.numOfIps = pSdbIpList->numOfIps;
memcpy(pHBRsp->ipList.ip, pSdbIpList->ip, size); // memcpy(pHBRsp->ipList.ip, pSdbIpList->ip, size);
pMsg += sizeof(SHeartBeatRsp) + size; // pMsg += sizeof(SHeartBeatRsp) + size;
} else { // } else {
pHBRsp->ipList.numOfIps = 0; // pHBRsp->ipList.numOfIps = 0;
pMsg += sizeof(SHeartBeatRsp); // pMsg += sizeof(SHeartBeatRsp);
} // }
} // }
msgLen = pMsg - pStart; // msgLen = pMsg - pStart;
//
taosSendMsgToPeer(pConn->thandle, pStart, msgLen); // taosSendMsgToPeer(pConn->thandle, pStart, msgLen);
return 0; return 0;
} }
void mgmtEstablishConn(SConnObj *pConn) { void mgmtEstablishConn(SConnObj *pConn) {
atomic_fetch_add_32(&mgmtShellConns, 1); // atomic_fetch_add_32(&mgmtShellConns, 1);
atomic_fetch_add_32(&sdbExtConns, 1); // atomic_fetch_add_32(&sdbExtConns, 1);
pConn->stime = taosGetTimestampMs(); // pConn->stime = taosGetTimestampMs();
//
if (strcmp(pConn->pUser->user, "root") == 0) { // if (strcmp(pConn->pUser->user, "root") == 0) {
pConn->superAuth = 1; // pConn->superAuth = 1;
pConn->writeAuth = 1; // pConn->writeAuth = 1;
} else { // } else {
pConn->superAuth = pConn->pUser->superAuth; // pConn->superAuth = pConn->pUser->superAuth;
pConn->writeAuth = pConn->pUser->writeAuth; // pConn->writeAuth = pConn->pUser->writeAuth;
if (pConn->superAuth) { // if (pConn->superAuth) {
pConn->writeAuth = 1; // pConn->writeAuth = 1;
} // }
} // }
//
int32_t tempint32; // int32_t tempint32;
uint32_t tempuint32; // uint32_t tempuint32;
taosGetRpcConnInfo(pConn->thandle, &tempuint32, &pConn->ip, &pConn->port, &tempint32, &tempint32); // taosGetRpcConnInfo(pConn->thandle, &tempuint32, &pConn->ip, &pConn->port, &tempint32, &tempint32);
mgmtAddConnIntoAcct(pConn); // mgmtAddConnIntoAcct(pConn);
} }
int mgmtRetriveUserAuthInfo(char *user, char *spi, char *encrypt, uint8_t *secret, uint8_t *ckey) { int mgmtRetriveUserAuthInfo(char *user, char *spi, char *encrypt, uint8_t *secret, uint8_t *ckey) {
...@@ -1305,196 +1315,198 @@ int mgmtRetriveUserAuthInfo(char *user, char *spi, char *encrypt, uint8_t *secre ...@@ -1305,196 +1315,198 @@ int mgmtRetriveUserAuthInfo(char *user, char *spi, char *encrypt, uint8_t *secre
} }
int mgmtProcessConnectMsg(char *pMsg, int msgLen, SConnObj *pConn) { int mgmtProcessConnectMsg(char *pMsg, int msgLen, SConnObj *pConn) {
STaosRsp * pRsp; // STaosRsp * pRsp;
SConnectRsp *pConnectRsp; // SConnectRsp *pConnectRsp;
SConnectMsg *pConnectMsg; // SConnectMsg *pConnectMsg;
char * pStart; // char * pStart;
int code = TSDB_CODE_INVALID_USER; // int code = TSDB_CODE_INVALID_USER;
SAcctObj * pAcct = NULL; // SAcctObj * pAcct = NULL;
SUserObj * pUser = NULL; // SUserObj * pUser = NULL;
SDbObj * pDb = NULL; // SDbObj * pDb = NULL;
char dbName[256] = {0}; // char dbName[256] = {0};
//
pConnectMsg = (SConnectMsg *)pMsg; // pConnectMsg = (SConnectMsg *)pMsg;
//
pUser = mgmtGetUser(pConn->user); // pUser = mgmtGetUser(pConn->user);
if (pUser == NULL) { // if (pUser == NULL) {
code = TSDB_CODE_INVALID_USER; // code = TSDB_CODE_INVALID_USER;
goto _rsp; // goto _rsp;
} // }
//
if (mgmtCheckExpired()) { // if (mgmtCheckExpired()) {
code = TSDB_CODE_GRANT_EXPIRED; // code = TSDB_CODE_GRANT_EXPIRED;
goto _rsp; // goto _rsp;
} // }
//
pAcct = mgmtGetAcct(pUser->acct); // pAcct = mgmtGetAcct(pUser->acct);
//
code = taosCheckVersion(pConnectMsg->clientVersion, version, 3); // code = taosCheckVersion(pConnectMsg->clientVersion, version, 3);
if (code != 0) { // if (code != 0) {
mError("invalid client version:%s", pConnectMsg->clientVersion); // mError("invalid client version:%s", pConnectMsg->clientVersion);
goto _rsp; // goto _rsp;
} // }
//
if (pConnectMsg->db[0]) { // if (pConnectMsg->db[0]) {
sprintf(dbName, "%x%s%s", pAcct->acctId, TS_PATH_DELIMITER, pConnectMsg->db); // sprintf(dbName, "%x%s%s", pAcct->acctId, TS_PATH_DELIMITER, pConnectMsg->db);
pDb = mgmtGetDb(dbName); // pDb = mgmtGetDb(dbName);
if (pDb == NULL) { // if (pDb == NULL) {
code = TSDB_CODE_INVALID_DB; // code = TSDB_CODE_INVALID_DB;
goto _rsp; // goto _rsp;
} // }
} // }
//
if (pConn->pAcct) { // if (pConn->pAcct) {
mgmtRemoveConnFromAcct(pConn); // mgmtRemoveConnFromAcct(pConn);
atomic_fetch_sub_32(&mgmtShellConns, 1); // atomic_fetch_sub_32(&mgmtShellConns, 1);
atomic_fetch_sub_32(&sdbExtConns, 1); // atomic_fetch_sub_32(&sdbExtConns, 1);
} // }
//
code = 0; // code = 0;
pConn->pAcct = pAcct; // pConn->pAcct = pAcct;
pConn->pDb = pDb; // pConn->pDb = pDb;
pConn->pUser = pUser; // pConn->pUser = pUser;
mgmtEstablishConn(pConn); // mgmtEstablishConn(pConn);
//
_rsp: //_rsp:
pStart = taosBuildRspMsgWithSize(pConn->thandle, TSDB_MSG_TYPE_CONNECT_RSP, 128); // pStart = taosBuildRspMsgWithSize(pConn->thandle, TSDB_MSG_TYPE_CONNECT_RSP, 128);
if (pStart == NULL) return 0; // if (pStart == NULL) return 0;
//
pMsg = pStart; // pMsg = pStart;
pRsp = (STaosRsp *)pMsg; // pRsp = (STaosRsp *)pMsg;
pRsp->code = code; // pRsp->code = code;
pMsg += sizeof(STaosRsp); // pMsg += sizeof(STaosRsp);
//
if (code == 0) { // if (code == 0) {
pConnectRsp = (SConnectRsp *)pRsp->more; // pConnectRsp = (SConnectRsp *)pRsp->more;
sprintf(pConnectRsp->acctId, "%x", pConn->pAcct->acctId); // sprintf(pConnectRsp->acctId, "%x", pConn->pAcct->acctId);
strcpy(pConnectRsp->version, version); // strcpy(pConnectRsp->version, version);
pConnectRsp->writeAuth = pConn->writeAuth; // pConnectRsp->writeAuth = pConn->writeAuth;
pConnectRsp->superAuth = pConn->superAuth; // pConnectRsp->superAuth = pConn->superAuth;
pMsg += sizeof(SConnectRsp); // pMsg += sizeof(SConnectRsp);
//
int size; // int size;
if (pSdbPublicIpList != NULL && pSdbIpList != NULL) { // if (pSdbPublicIpList != NULL && pSdbIpList != NULL) {
size = pSdbPublicIpList->numOfIps * 4 + sizeof(SIpList); // size = pSdbPublicIpList->numOfIps * 4 + sizeof(SIpList);
if (pConn->usePublicIp) { // if (pConn->usePublicIp) {
memcpy(pMsg, pSdbPublicIpList, size); // memcpy(pMsg, pSdbPublicIpList, size);
} else { // } else {
memcpy(pMsg, pSdbIpList, size); // memcpy(pMsg, pSdbIpList, size);
} // }
} else { // } else {
SIpList tmpIpList; // SIpList tmpIpList;
tmpIpList.numOfIps = 0; // tmpIpList.numOfIps = 0;
size = tmpIpList.numOfIps * 4 + sizeof(SIpList); // size = tmpIpList.numOfIps * 4 + sizeof(SIpList);
memcpy(pMsg, &tmpIpList, size); // memcpy(pMsg, &tmpIpList, size);
} // }
//
pMsg += size; // pMsg += size;
//
// set the time resolution: millisecond or microsecond // // set the time resolution: millisecond or microsecond
*((uint32_t *)pMsg) = tsTimePrecision; // *((uint32_t *)pMsg) = tsTimePrecision;
pMsg += sizeof(uint32_t); // pMsg += sizeof(uint32_t);
//
} else { // } else {
pConn->pAcct = NULL; // pConn->pAcct = NULL;
pConn->pUser = NULL; // pConn->pUser = NULL;
} // }
//
msgLen = pMsg - pStart; // msgLen = pMsg - pStart;
taosSendMsgToPeer(pConn->thandle, pStart, msgLen); // taosSendMsgToPeer(pConn->thandle, pStart, msgLen);
//
char ipstr[24]; // char ipstr[24];
tinet_ntoa(ipstr, pConn->ip); // tinet_ntoa(ipstr, pConn->ip);
mLPrint("user:%s login from %s, code:%d", pConn->user, ipstr, code); // mLPrint("user:%s login from %s, code:%d", pConn->user, ipstr, code);
//
return code; // return code;
return 0;
} }
void *mgmtProcessMsgFromShell(char *msg, void *ahandle, void *thandle) { void *mgmtProcessMsgFromShell(char *msg, void *ahandle, void *thandle) {
SIntMsg * pMsg = (SIntMsg *)msg; // SIntMsg * pMsg = (SIntMsg *)msg;
SConnObj *pConn = (SConnObj *)ahandle; // SConnObj *pConn = (SConnObj *)ahandle;
//
if (msg == NULL) { // if (msg == NULL) {
if (pConn) { // if (pConn) {
mgmtRemoveConnFromAcct(pConn); // mgmtRemoveConnFromAcct(pConn);
atomic_fetch_sub_32(&mgmtShellConns, 1); // atomic_fetch_sub_32(&mgmtShellConns, 1);
atomic_fetch_sub_32(&sdbExtConns, 1); // atomic_fetch_sub_32(&sdbExtConns, 1);
mTrace("connection from %s is closed", pConn->pUser->user); // mTrace("connection from %s is closed", pConn->pUser->user);
memset(pConn, 0, sizeof(SConnObj)); // memset(pConn, 0, sizeof(SConnObj));
} // }
//
// return NULL;
// }
//
//#ifdef CLUSTER
// if (sdbInited == NULL || sdbStatus != SDB_STATUS_SERVING) {
// taosSendSimpleRsp(thandle, pMsg->msgType + 1, TSDB_CODE_NOT_READY);
// mTrace("shell msg is ignored since SDB is not ready");
// }
//#endif
//
// if (pConn == NULL) {
// pConn = connList + pMsg->destId;
// pConn->thandle = thandle;
// strcpy(pConn->user, pMsg->meterId);
// pConn->usePublicIp = (pMsg->destIp == tsPublicIpInt ? 1 : 0);
// mTrace("pConn:%p is rebuild, destIp:%s publicIp:%s usePublicIp:%u",
// pConn, taosIpStr(pMsg->destIp), taosIpStr(tsPublicIpInt), pConn->usePublicIp);
// }
//
// if (pMsg->msgType == TSDB_MSG_TYPE_CONNECT) {
// (*mgmtProcessShellMsg[pMsg->msgType])((char *)pMsg->content, pMsg->msgLen - sizeof(SIntMsg), pConn);
// } else {
// SMgmtHead *pHead = (SMgmtHead *)pMsg->content;
// if (pConn->pAcct == NULL) {
// pConn->pUser = mgmtGetUser(pConn->user);
// if (pConn->pUser) {
// pConn->pAcct = mgmtGetAcct(pConn->pUser->acct);
// mgmtEstablishConn(pConn);
// mTrace("login from:%x:%hu", pConn->ip, htons(pConn->port));
// }
// }
//
// if (pConn->pAcct) {
// if (pConn->pDb == NULL || strncmp(pConn->pDb->name, pHead->db, tListLen(pConn->pDb->name)) != 0) {
// pConn->pDb = mgmtGetDb(pHead->db);
// }
//
// char *cont = (char *)pMsg->content + sizeof(SMgmtHead);
// int contLen = pMsg->msgLen - sizeof(SIntMsg) - sizeof(SMgmtHead);
//
// // read-only request can be executed concurrently
// if ((pMsg->msgType == TSDB_MSG_TYPE_TABLE_META && (!mgmtCheckMeterMetaMsgType(cont))) ||
// pMsg->msgType == TSDB_MSG_TYPE_STABLE_META || pMsg->msgType == TSDB_MSG_TYPE_DNODE_RETRIEVE ||
// pMsg->msgType == TSDB_MSG_TYPE_SHOW || pMsg->msgType == TSDB_MSG_TYPE_MULTI_TABLE_META) {
// (*mgmtProcessShellMsg[pMsg->msgType])(cont, contLen, pConn);
// } else {
// if (mgmtProcessShellMsg[pMsg->msgType]) {
// SSchedMsg schedMsg;
// schedMsg.msg = malloc(pMsg->msgLen); // Message to deal with
// memcpy(schedMsg.msg, pMsg, pMsg->msgLen);
//
// schedMsg.fp = mgmtProcessTranRequest;
// schedMsg.tfp = NULL;
// schedMsg.thandle = pConn;
//
// taosScheduleTask(mgmtTranQhandle, &schedMsg);
// } else {
// mError("%s from shell is not processed", taosMsg[pMsg->msgType]);
// }
// }
// } else {
// taosSendSimpleRsp(thandle, pMsg->msgType + 1, TSDB_CODE_DISCONNECTED);
// }
// }
//
// if (pConn->pAcct == NULL) {
// taosCloseRpcConn(pConn->thandle);
// memset(pConn, 0, sizeof(SConnObj)); // close the connection;
// pConn = NULL;
// }
//
// return pConn;
return NULL; return NULL;
}
#ifdef CLUSTER
if (sdbInited == NULL || sdbStatus != SDB_STATUS_SERVING) {
taosSendSimpleRsp(thandle, pMsg->msgType + 1, TSDB_CODE_NOT_READY);
mTrace("shell msg is ignored since SDB is not ready");
}
#endif
if (pConn == NULL) {
pConn = connList + pMsg->destId;
pConn->thandle = thandle;
strcpy(pConn->user, pMsg->meterId);
pConn->usePublicIp = (pMsg->destIp == tsPublicIpInt ? 1 : 0);
mTrace("pConn:%p is rebuild, destIp:%s publicIp:%s usePublicIp:%u",
pConn, taosIpStr(pMsg->destIp), taosIpStr(tsPublicIpInt), pConn->usePublicIp);
}
if (pMsg->msgType == TSDB_MSG_TYPE_CONNECT) {
(*mgmtProcessShellMsg[pMsg->msgType])((char *)pMsg->content, pMsg->msgLen - sizeof(SIntMsg), pConn);
} else {
SMgmtHead *pHead = (SMgmtHead *)pMsg->content;
if (pConn->pAcct == NULL) {
pConn->pUser = mgmtGetUser(pConn->user);
if (pConn->pUser) {
pConn->pAcct = mgmtGetAcct(pConn->pUser->acct);
mgmtEstablishConn(pConn);
mTrace("login from:%x:%hu", pConn->ip, htons(pConn->port));
}
}
if (pConn->pAcct) {
if (pConn->pDb == NULL || strncmp(pConn->pDb->name, pHead->db, tListLen(pConn->pDb->name)) != 0) {
pConn->pDb = mgmtGetDb(pHead->db);
}
char *cont = (char *)pMsg->content + sizeof(SMgmtHead);
int contLen = pMsg->msgLen - sizeof(SIntMsg) - sizeof(SMgmtHead);
// read-only request can be executed concurrently
if ((pMsg->msgType == TSDB_MSG_TYPE_TABLE_META && (!mgmtCheckMeterMetaMsgType(cont))) ||
pMsg->msgType == TSDB_MSG_TYPE_STABLE_META || pMsg->msgType == TSDB_MSG_TYPE_DNODE_RETRIEVE ||
pMsg->msgType == TSDB_MSG_TYPE_SHOW || pMsg->msgType == TSDB_MSG_TYPE_MULTI_TABLE_META) {
(*mgmtProcessShellMsg[pMsg->msgType])(cont, contLen, pConn);
} else {
if (mgmtProcessShellMsg[pMsg->msgType]) {
SSchedMsg schedMsg;
schedMsg.msg = malloc(pMsg->msgLen); // Message to deal with
memcpy(schedMsg.msg, pMsg, pMsg->msgLen);
schedMsg.fp = mgmtProcessTranRequest;
schedMsg.tfp = NULL;
schedMsg.thandle = pConn;
taosScheduleTask(mgmtTranQhandle, &schedMsg);
} else {
mError("%s from shell is not processed", taosMsg[pMsg->msgType]);
}
}
} else {
taosSendSimpleRsp(thandle, pMsg->msgType + 1, TSDB_CODE_DISCONNECTED);
}
}
if (pConn->pAcct == NULL) {
taosCloseRpcConn(pConn->thandle);
memset(pConn, 0, sizeof(SConnObj)); // close the connection;
pConn = NULL;
}
return pConn;
} }
void mgmtInitProcessShellMsg() { void mgmtInitProcessShellMsg() {
...@@ -1519,7 +1531,7 @@ void mgmtInitProcessShellMsg() { ...@@ -1519,7 +1531,7 @@ void mgmtInitProcessShellMsg() {
mgmtProcessShellMsg[TSDB_MSG_TYPE_DNODE_RETRIEVE] = mgmtProcessRetrieveMsg; mgmtProcessShellMsg[TSDB_MSG_TYPE_DNODE_RETRIEVE] = mgmtProcessRetrieveMsg;
mgmtProcessShellMsg[TSDB_MSG_TYPE_SHOW] = mgmtProcessShowMsg; mgmtProcessShellMsg[TSDB_MSG_TYPE_SHOW] = mgmtProcessShowMsg;
mgmtProcessShellMsg[TSDB_MSG_TYPE_CONNECT] = mgmtProcessConnectMsg; mgmtProcessShellMsg[TSDB_MSG_TYPE_CONNECT] = mgmtProcessConnectMsg;
mgmtProcessShellMsg[TSDB_MSG_TYPE_HEARTBEAT] = mgmtProcessHeartBeatMsg; // mgmtProcessShellMsg[TSDB_MSG_TYPE_HEARTBEAT] = mgmtProcessHeartBeatMsg;
mgmtProcessShellMsg[TSDB_MSG_TYPE_CREATE_DNODE] = mgmtProcessCreateDnodeMsg; mgmtProcessShellMsg[TSDB_MSG_TYPE_CREATE_DNODE] = mgmtProcessCreateDnodeMsg;
mgmtProcessShellMsg[TSDB_MSG_TYPE_DROP_DNODE] = mgmtProcessDropDnodeMsg; mgmtProcessShellMsg[TSDB_MSG_TYPE_DROP_DNODE] = mgmtProcessDropDnodeMsg;
mgmtProcessShellMsg[TSDB_MSG_TYPE_CREATE_MNODE] = mgmtProcessCreateMnodeMsg; mgmtProcessShellMsg[TSDB_MSG_TYPE_CREATE_MNODE] = mgmtProcessCreateMnodeMsg;
...@@ -1537,36 +1549,43 @@ int32_t mgmtCheckRedirectMsgImp(SConnObj *pConn, int32_t msgType) { ...@@ -1537,36 +1549,43 @@ int32_t mgmtCheckRedirectMsgImp(SConnObj *pConn, int32_t msgType) {
int32_t (*mgmtCheckRedirectMsg)(SConnObj *pConn, int32_t msgType) = mgmtCheckRedirectMsgImp; int32_t (*mgmtCheckRedirectMsg)(SConnObj *pConn, int32_t msgType) = mgmtCheckRedirectMsgImp;
int32_t mgmtProcessAlterAcctMsgImp(char *pMsg, int32_t msgLen, SConnObj *pConn) { int32_t mgmtProcessAlterAcctMsgImp(char *pMsg, int32_t msgLen, SConnObj *pConn) {
return taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_ALTER_ACCT_RSP, TSDB_CODE_OPS_NOT_SUPPORT); //return taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_ALTER_ACCT_RSP, TSDB_CODE_OPS_NOT_SUPPORT);
return 0;
} }
int32_t (*mgmtProcessAlterAcctMsg)(char *pMsg, int32_t msgLen, SConnObj *pConn) = mgmtProcessAlterAcctMsgImp; int32_t (*mgmtProcessAlterAcctMsg)(char *pMsg, int32_t msgLen, SConnObj *pConn) = mgmtProcessAlterAcctMsgImp;
int32_t mgmtProcessCreateDnodeMsgImp(char *pMsg, int32_t msgLen, SConnObj *pConn) { int32_t mgmtProcessCreateDnodeMsgImp(char *pMsg, int32_t msgLen, SConnObj *pConn) {
return taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_CREATE_DNODE_RSP, TSDB_CODE_OPS_NOT_SUPPORT); //return taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_CREATE_DNODE_RSP, TSDB_CODE_OPS_NOT_SUPPORT);
return 0;
} }
int32_t (*mgmtProcessCreateDnodeMsg)(char *pMsg, int32_t msgLen, SConnObj *pConn) = mgmtProcessCreateDnodeMsgImp; int32_t (*mgmtProcessCreateDnodeMsg)(char *pMsg, int32_t msgLen, SConnObj *pConn) = mgmtProcessCreateDnodeMsgImp;
int32_t mgmtProcessCfgMnodeMsgImp(char *pMsg, int32_t msgLen, SConnObj *pConn) { int32_t mgmtProcessCfgMnodeMsgImp(char *pMsg, int32_t msgLen, SConnObj *pConn) {
return taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_CFG_MNODE_RSP, TSDB_CODE_OPS_NOT_SUPPORT); //return taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_CFG_MNODE_RSP, TSDB_CODE_OPS_NOT_SUPPORT);
return 0;
} }
int32_t (*mgmtProcessCfgMnodeMsg)(char *pMsg, int32_t msgLen, SConnObj *pConn) = mgmtProcessCfgMnodeMsgImp; int32_t (*mgmtProcessCfgMnodeMsg)(char *pMsg, int32_t msgLen, SConnObj *pConn) = mgmtProcessCfgMnodeMsgImp;
int32_t mgmtProcessDropMnodeMsgImp(char *pMsg, int32_t msgLen, SConnObj *pConn) { int32_t mgmtProcessDropMnodeMsgImp(char *pMsg, int32_t msgLen, SConnObj *pConn) {
return taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DROP_MNODE_RSP, TSDB_CODE_OPS_NOT_SUPPORT); //return taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DROP_MNODE_RSP, TSDB_CODE_OPS_NOT_SUPPORT);
return 0;
} }
int32_t (*mgmtProcessDropMnodeMsg)(char *pMsg, int32_t msgLen, SConnObj *pConn) = mgmtProcessDropMnodeMsgImp; int32_t (*mgmtProcessDropMnodeMsg)(char *pMsg, int32_t msgLen, SConnObj *pConn) = mgmtProcessDropMnodeMsgImp;
int32_t mgmtProcessDropDnodeMsgImp(char *pMsg, int32_t msgLen, SConnObj *pConn) { int32_t mgmtProcessDropDnodeMsgImp(char *pMsg, int32_t msgLen, SConnObj *pConn) {
return taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DROP_DNODE_RSP, TSDB_CODE_OPS_NOT_SUPPORT); //return taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DROP_DNODE_RSP, TSDB_CODE_OPS_NOT_SUPPORT);
return 0;
} }
int32_t (*mgmtProcessDropDnodeMsg)(char *pMsg, int32_t msgLen, SConnObj *pConn) = mgmtProcessDropDnodeMsgImp; int32_t (*mgmtProcessDropDnodeMsg)(char *pMsg, int32_t msgLen, SConnObj *pConn) = mgmtProcessDropDnodeMsgImp;
int32_t mgmtProcessDropAcctMsgImp(char *pMsg, int32_t msgLen, SConnObj *pConn) { int32_t mgmtProcessDropAcctMsgImp(char *pMsg, int32_t msgLen, SConnObj *pConn) {
return taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DROP_ACCT_RSP, TSDB_CODE_OPS_NOT_SUPPORT); // return taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_DROP_ACCT_RSP, TSDB_CODE_OPS_NOT_SUPPORT);
return 0;
} }
int32_t (*mgmtProcessDropAcctMsg)(char *pMsg, int32_t msgLen, SConnObj *pConn) = mgmtProcessDropAcctMsgImp; int32_t (*mgmtProcessDropAcctMsg)(char *pMsg, int32_t msgLen, SConnObj *pConn) = mgmtProcessDropAcctMsgImp;
int32_t mgmtProcessCreateAcctMsgImp(char *pMsg, int32_t msgLen, SConnObj *pConn) { int32_t mgmtProcessCreateAcctMsgImp(char *pMsg, int32_t msgLen, SConnObj *pConn) {
return taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_CREATE_ACCT_RSP, TSDB_CODE_OPS_NOT_SUPPORT); // return taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_CREATE_ACCT_RSP, TSDB_CODE_OPS_NOT_SUPPORT);
return 0;
} }
int32_t (*mgmtProcessCreateAcctMsg)(char *pMsg, int32_t msgLen, SConnObj *pConn) = mgmtProcessCreateAcctMsgImp; int32_t (*mgmtProcessCreateAcctMsg)(char *pMsg, int32_t msgLen, SConnObj *pConn) = mgmtProcessCreateAcctMsgImp;
\ No newline at end of file
src/mnode/src/mgmtStreamTable.c
浏览文件 @ 29058645
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include "mgmtStreamTable.h" #include "mgmtStreamTable.h"
void *tsSuperTableSdb; void *tsStreamTableSdb;
void *(*mgmtStreamTableActionFp[SDB_MAX_ACTION_TYPES])(void *row, char *str, int size, int *ssize); void *(*mgmtStreamTableActionFp[SDB_MAX_ACTION_TYPES])(void *row, char *str, int size, int *ssize);
void *mgmtStreamTableActionInsert(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) { ...@@ -78,7 +78,7 @@ void *mgmtStreamTableActionReset(void *row, char *str, int size, int *ssize) {
} }
void *mgmtStreamTableActionDestroy(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); mgmtDestroyStreamTable(pTable);
return NULL; return NULL;
} }
...@@ -230,7 +230,7 @@ void mgmtCleanUpStreamTables() { ...@@ -230,7 +230,7 @@ void mgmtCleanUpStreamTables() {
} }
int8_t *mgmtBuildCreateStreamTableMsg(SStreamTableObj *pTable, int8_t *pMsg, int32_t vnode) { 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); memcpy(pCreateTable->tableId, pTable->tableId, TSDB_TABLE_ID_LEN);
pCreateTable->vnode = htonl(vnode); pCreateTable->vnode = htonl(vnode);
pCreateTable->sid = htonl(pTable->sid); pCreateTable->sid = htonl(pTable->sid);
...@@ -238,23 +238,23 @@ int8_t *mgmtBuildCreateStreamTableMsg(SStreamTableObj *pTable, int8_t *pMsg, int ...@@ -238,23 +238,23 @@ int8_t *mgmtBuildCreateStreamTableMsg(SStreamTableObj *pTable, int8_t *pMsg, int
pCreateTable->createdTime = htobe64(pTable->createdTime); pCreateTable->createdTime = htobe64(pTable->createdTime);
pCreateTable->sversion = htonl(pTable->sversion); pCreateTable->sversion = htonl(pTable->sversion);
pCreateTable->numOfColumns = htons(pTable->numOfColumns); pCreateTable->numOfColumns = htons(pTable->numOfColumns);
pCreateTable->sqlLen = htons(pTable->sqlLen); //pCreateTable->sqlLen = htons(pTable->sqlLen);
SSchema *pSchema = pTable->schema; SSchema *pSchema = pTable->schema;
int32_t totalCols = pCreateTable->numOfColumns; int32_t totalCols = pCreateTable->numOfColumns;
for (int32_t col = 0; col < totalCols; ++col) { // for (int32_t col = 0; col < totalCols; ++col) {
SMColumn *colData = &((SMColumn *) (pCreateTable->data))[col]; // SMColumn *colData = &((SMColumn *) (pCreateTable->data))[col];
colData->type = pSchema[col].type; // colData->type = pSchema[col].type;
colData->bytes = htons(pSchema[col].bytes); // colData->bytes = htons(pSchema[col].bytes);
colData->colId = htons(pSchema[col].colId); // colData->colId = htons(pSchema[col].colId);
} // }
int32_t totalColsSize = sizeof(SMColumn *) * totalCols; // int32_t totalColsSize = sizeof(SMColumn *) * totalCols;
pMsg = pCreateTable->data + totalColsSize + pTable->sqlLen; // pMsg = pCreateTable->data + totalColsSize + pTable->sqlLen;
char *sql = pTable->schema + pTable->schemaSize; // char *sql = pTable->schema + pTable->schemaSize;
memcpy(pCreateTable->data + totalColsSize, pTable->sqlLen, sql); // memcpy(pCreateTable->data + totalColsSize, pTable->sqlLen, sql);
return pMsg; return pMsg;
} }
...@@ -345,6 +345,6 @@ int32_t mgmtDropStreamTable(SDbObj *pDb, SStreamTableObj *pTable) { ...@@ -345,6 +345,6 @@ int32_t mgmtDropStreamTable(SDbObj *pDb, SStreamTableObj *pTable) {
return 0; return 0;
} }
SStreamTableObj* mgmtGetStreamTable(char *tableId); { SStreamTableObj* mgmtGetStreamTable(char *tableId) {
return (SStreamTableObj *)sdbGetRow(tsStreamTableSdb, tableId); return (SStreamTableObj *)sdbGetRow(tsStreamTableSdb, tableId);
} }
\ No newline at end of file
src/mnode/src/mgmtSuperTable.c
浏览文件 @ 29058645
...@@ -93,7 +93,7 @@ void *mgmtSuperTableActionReset(void *row, char *str, int size, int *ssize) { ...@@ -93,7 +93,7 @@ void *mgmtSuperTableActionReset(void *row, char *str, int size, int *ssize) {
SSuperTableObj *pTable = (SSuperTableObj *) row; SSuperTableObj *pTable = (SSuperTableObj *) row;
int tsize = pTable->updateEnd - (int8_t *) pTable; int tsize = pTable->updateEnd - (int8_t *) pTable;
memcpy(pTable, str, tsize); 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); memcpy(pTable->schema, str + tsize, pTable->schemaSize);
return NULL; return NULL;
} }
...@@ -105,20 +105,10 @@ void *mgmtSuperTableActionDestroy(void *row, char *str, int size, int *ssize) { ...@@ -105,20 +105,10 @@ void *mgmtSuperTableActionDestroy(void *row, char *str, int size, int *ssize) {
} }
void *mgmtSuperTableActionInsert(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; return NULL;
} }
void *mgmtSuperTableActionDelete(void *row, char *str, int size, int *ssize) { 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; return NULL;
} }
...@@ -159,7 +149,7 @@ void *mgmtSuperTableActionDecode(void *row, char *str, int size, int *ssize) { ...@@ -159,7 +149,7 @@ void *mgmtSuperTableActionDecode(void *row, char *str, int size, int *ssize) {
} }
memcpy(pTable, str, tsize); memcpy(pTable, str, tsize);
pTable->schema = (char *)malloc(pTable->schemaSize); pTable->schema = malloc(pTable->schemaSize);
if (pTable->schema == NULL) { if (pTable->schema == NULL) {
mgmtDestroySuperTable(pTable); mgmtDestroySuperTable(pTable);
return NULL; return NULL;
...@@ -179,95 +169,38 @@ void *mgmtSuperTableAction(char action, void *row, char *str, int size, int *ssi ...@@ -179,95 +169,38 @@ void *mgmtSuperTableAction(char action, void *row, char *str, int size, int *ssi
int32_t mgmtInitSuperTables() { int32_t mgmtInitSuperTables() {
void * pNode = NULL; void * pNode = NULL;
void * pLastNode = NULL; void * pLastNode = NULL;
SVgObj * pVgroup = NULL; SSuperTableObj * pTable = NULL;
STabObj * pTable = NULL;
STabObj * pMetric = NULL;
SDbObj * pDb = NULL;
SAcctObj *pAcct = NULL;
// TODO: Make sure this function only run once // TODO: Make sure this function only run once
mgmtSuperTableActionInit(); mgmtSuperTableActionInit();
tsSuperTableSdb = sdbOpenTable(tsMaxTables, sizeof(STabObj) + sizeof(SSchema) * TSDB_MAX_COLUMNS + TSDB_MAX_SQL_LEN, tsSuperTableSdb = sdbOpenTable(tsMaxTables, sizeof(STabObj) + sizeof(SSchema) * TSDB_MAX_COLUMNS + TSDB_MAX_SQL_LEN,
"meters", SDB_KEYTYPE_STRING, mgmtDirectory, mgmtSuperTableAction); "meters", SDB_KEYTYPE_STRING, mgmtDirectory, mgmtSuperTableAction);
if (meterSdb == NULL) { if (tsSuperTableSdb == NULL) {
mError("failed to init meter data"); mError("failed to init meter data");
return -1; return -1;
} }
pNode = NULL; pNode = NULL;
while (1) { while (1) {
pNode = sdbFetchRow(meterSdb, pNode, (void **)&pTable); pNode = sdbFetchRow(tsSuperTableSdb, pNode, (void **)&pTable);
if (pTable == NULL) break; if (pTable == NULL) {
if (mgmtIsSuperTable(pTable)) pTable->numOfMeters = 0; break;
} }
pNode = NULL; SDbObj *pDb = mgmtGetDbByMeterId(pTable->tableId);
while (1) {
pLastNode = pNode;
pNode = sdbFetchRow(meterSdb, pNode, (void **)&pTable);
if (pTable == NULL) break;
pDb = mgmtGetDbByMeterId(pTable->meterId);
if (pDb == NULL) { if (pDb == NULL) {
mError("meter:%s, failed to get db, discard it", pTable->meterId, pTable->gid.vgId, pTable->gid.sid); mError("super table:%s, failed to get db, discard it", pTable->tableId);
pTable->gid.vgId = 0; sdbDeleteRow(tsSuperTableSdb, pTable);
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; pNode = pLastNode;
continue; continue;
} }
pTable->numOfMeters = 0;
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);
}
} }
mgmtSetVgroupIdPool(); mgmtSetVgroupIdPool();
mTrace("meter is initialized"); mTrace("super table is initialized");
return 0; return 0;
} }
...@@ -321,11 +254,8 @@ int32_t mgmtCreateSuperTable(SDbObj *pDb, SCreateTableMsg *pCreate) { ...@@ -321,11 +254,8 @@ int32_t mgmtCreateSuperTable(SDbObj *pDb, SCreateTableMsg *pCreate) {
} }
int32_t mgmtDropSuperTable(SDbObj *pDb, SSuperTableObj *pSuperTable) { int32_t mgmtDropSuperTable(SDbObj *pDb, SSuperTableObj *pSuperTable) {
SChildTableObj *pMetric; //TODO drop all child tables
while ((pMetric = pSuperTable->pHead) != NULL) { return sdbDeleteRow(tsSuperTableSdb, pSuperTable);
mgmtDropChildTable(pDb, pMetric);
}
sdbDeleteRow(tsSuperTableSdb, pMetric);
} }
SSuperTableObj* mgmtGetSuperTable(char *tableId) { SSuperTableObj* mgmtGetSuperTable(char *tableId) {
...@@ -477,7 +407,7 @@ int32_t mgmtModifySuperTableTagNameByName(SSuperTableObj *pMetric, char *oldTagN ...@@ -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; SSchema *schema = (SSchema *) pMetric->schema;
for (int32_t i = 0; i < pMetric->numOfColumns; i++) { for (int32_t i = 0; i < pMetric->numOfColumns; i++) {
if (strcasecmp(schema[i].name, colName) == 0) { if (strcasecmp(schema[i].name, colName) == 0) {
...@@ -650,7 +580,7 @@ int mgmtRetrieveSuperTables(SShowObj *pShow, char *data, int rows, SConnObj *pCo ...@@ -650,7 +580,7 @@ int mgmtRetrieveSuperTables(SShowObj *pShow, char *data, int rows, SConnObj *pCo
while (numOfRows < rows) { while (numOfRows < rows) {
pTable = (SSuperTableObj *)pShow->pNode; pTable = (SSuperTableObj *)pShow->pNode;
if (pTable == NULL) break; if (pTable == NULL) break;
pShow->pNode = (void *)pTable->next; //pShow->pNode = (void *)pTable->next;
if (strncmp(pTable->tableId, prefix, prefixLen)) { if (strncmp(pTable->tableId, prefix, prefixLen)) {
continue; continue;
...@@ -706,8 +636,6 @@ int mgmtAddMeterIntoMetric(STabObj *pMetric, STabObj *pTable) { ...@@ -706,8 +636,6 @@ int mgmtAddMeterIntoMetric(STabObj *pMetric, STabObj *pTable) {
pMetric->pHead = pTable; pMetric->pHead = pTable;
pMetric->numOfMeters++; pMetric->numOfMeters++;
addMeterIntoMetricIndex(pMetric, pTable);
pthread_rwlock_unlock(&(pMetric->rwLock)); pthread_rwlock_unlock(&(pMetric->rwLock));
return 0; return 0;
...@@ -724,8 +652,6 @@ int mgmtRemoveMeterFromMetric(STabObj *pMetric, STabObj *pTable) { ...@@ -724,8 +652,6 @@ int mgmtRemoveMeterFromMetric(STabObj *pMetric, STabObj *pTable) {
pMetric->numOfMeters--; pMetric->numOfMeters--;
removeMeterFromMetricIndex(pMetric, pTable);
pthread_rwlock_unlock(&(pMetric->rwLock)); pthread_rwlock_unlock(&(pMetric->rwLock));
return 0; return 0;
......
src/mnode/src/mgmtTable.c
浏览文件 @ 29058645
...@@ -44,21 +44,6 @@ ...@@ -44,21 +44,6 @@
extern int64_t sdbVersion; 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) { static int32_t mgmtGetReqTagsLength(STabObj *pMetric, int16_t *cols, int32_t numOfCols) {
assert(mgmtIsSuperTable(pMetric) && numOfCols >= 0 && numOfCols <= TSDB_MAX_TAGS + 1); 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_ ...@@ -87,98 +72,27 @@ static void mgmtVacuumResult(char *data, int32_t numOfCols, int32_t rows, int32_
} }
int mgmtInitMeters() { int mgmtInitMeters() {
void * pNode = NULL; int32_t code = mgmtInitSuperTables();
void * pLastNode = NULL; if (code != TSDB_CODE_SUCCESS) {
SVgObj * pVgroup = NULL; return code;
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;
}
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;
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; code = mgmtInitNormalTables();
taosIdPoolMarkStatus(pVgroup->idPool, pTable->gid.sid, 1); if (code != TSDB_CODE_SUCCESS) {
return code;
if (pTable->tableType == TSDB_TABLE_TYPE_STREAM_TABLE) {
pTable->pSql = (char *)pTable->schema + sizeof(SSchema) * pTable->numOfColumns;
} }
if (mgmtTableCreateFromSuperTable(pTable)) { code = mgmtInitStreamTables();
pTable->pTagData = (char *)pTable->schema; // + sizeof(SSchema)*pTable->numOfColumns; if (code != TSDB_CODE_SUCCESS) {
pMetric = mgmtGetTable(pTable->pTagData); return code;
if (pMetric) mgmtAddMeterIntoMetric(pMetric, pTable);
} }
pAcct = mgmtGetAcct(pDb->cfg.acct); code = mgmtInitChildTables();
if (pAcct) mgmtAddMeterStatisticToAcct(pTable, pAcct); if (code != TSDB_CODE_SUCCESS) {
} else { return code;
if (pDb) mgmtAddMetricIntoDb(pDb, pTable);
}
} }
mgmtSetVgroupIdPool(); return TSDB_CODE_SUCCESS;
mTrace("meter is initialized");
return 0;
} }
STableObj mgmtGetTable(char *tableId) { STableObj mgmtGetTable(char *tableId) {
...@@ -211,6 +125,11 @@ STableObj mgmtGetTable(char *tableId) { ...@@ -211,6 +125,11 @@ STableObj mgmtGetTable(char *tableId) {
return table; 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) { int32_t mgmtCreateTable(SDbObj *pDb, SCreateTableMsg *pCreate) {
STableObj table = mgmtGetTable(pCreate->meterId); STableObj table = mgmtGetTable(pCreate->meterId);
if (table.obj != NULL) { if (table.obj != NULL) {
...@@ -293,7 +212,7 @@ int mgmtDropTable(SDbObj *pDb, char *tableId, int ignore) { ...@@ -293,7 +212,7 @@ int mgmtDropTable(SDbObj *pDb, char *tableId, int ignore) {
} }
int mgmtAlterTable(SDbObj *pDb, SAlterTableMsg *pAlter) { int mgmtAlterTable(SDbObj *pDb, SAlterTableMsg *pAlter) {
STableObj table = mgmtGetTable(tableId); STableObj table = mgmtGetTable(pAlter->meterId);
if (table.obj == NULL) { if (table.obj == NULL) {
return TSDB_CODE_INVALID_TABLE; return TSDB_CODE_INVALID_TABLE;
} }
...@@ -503,9 +422,9 @@ int32_t mgmtRetrieveTables(SShowObj *pShow, char *data, int rows, SConnObj *pCon ...@@ -503,9 +422,9 @@ int32_t mgmtRetrieveTables(SShowObj *pShow, char *data, int rows, SConnObj *pCon
cols++; cols++;
pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
if (pTable->pTagData) { // if (pTable->pTagData) {
extractTableName(superTableId, pWrite); // extractTableName(superTableId, pWrite);
} // }
cols++; cols++;
numOfRows++; numOfRows++;
......
src/mnode/src/mgmtUtil.c
浏览文件 @ 29058645
...@@ -31,34 +31,32 @@ bool mgmtIsSuperTable(STabObj* pTableObj) { ...@@ -31,34 +31,32 @@ bool mgmtIsSuperTable(STabObj* pTableObj) {
bool mgmtIsNormalTable(STabObj* pTableObj) { bool mgmtIsNormalTable(STabObj* pTableObj) {
return !mgmtIsSuperTable(pTableObj); return !mgmtIsSuperTable(pTableObj);
} }
//
/** ///**
* TODO: the tag offset value should be kept in memory to avoid dynamically calculating the value // * TODO: the tag offset value should be kept in memory to avoid dynamically calculating the value
* // *
* @param pTable // * @param pTable
* @param col // * @param col
* @param pTagColSchema // * @param pTagColSchema
* @return // * @return
*/ // */
char* mgmtTableGetTag(STabObj* pTable, int32_t col, SSchema* pTagColSchema) { //char* mgmtTableGetTag(STabObj* pTable, int32_t col, SSchema* pTagColSchema) {
if (!mgmtTableCreateFromSuperTable(pTable)) { // if (!mgmtTableCreateFromSuperTable(pTable)) {
return NULL; // return NULL;
} // }
//
STabObj* pSuperTable = mgmtGetTable(pTable->pTagData); // STabObj* pSuperTable = mgmtGetTable(pTable->pTagData);
int32_t offset = mgmtGetTagsLength(pSuperTable, col) + TSDB_TABLE_ID_LEN; // int32_t offset = mgmtGetTagsLength(pSuperTable, col) + TSDB_TABLE_ID_LEN;
assert(offset > 0); // assert(offset > 0);
//
if (pTagColSchema != NULL) { // if (pTagColSchema != NULL) {
*pTagColSchema = ((SSchema*)pSuperTable->schema)[pSuperTable->numOfColumns + col]; // *pTagColSchema = ((SSchema*)pSuperTable->schema)[pSuperTable->numOfColumns + col];
} // }
//
return (pTable->pTagData + offset); // return (pTable->pTagData + offset);
} //}
int32_t mgmtGetTagsLength(STabObj* pSuperTable, int32_t col) { // length before column col int32_t mgmtGetTagsLength(SSuperTableObj* pSuperTable, int32_t col) { // length before column col
assert(mgmtIsSuperTable(pSuperTable) && col >= 0);
int32_t len = 0; int32_t len = 0;
int32_t tagColumnIndexOffset = pSuperTable->numOfColumns; int32_t tagColumnIndexOffset = pSuperTable->numOfColumns;
......
src/mnode/src/mgmtVgroup.c
浏览文件 @ 29058645
...@@ -74,7 +74,7 @@ int mgmtInitVgroups() { ...@@ -74,7 +74,7 @@ int mgmtInitVgroups() {
mgmtVgroupActionInit(); mgmtVgroupActionInit();
SVgObj tObj; SVgObj tObj;
tsVgUpdateSize = tObj.updateEnd - (char *)&tObj; tsVgUpdateSize = tObj.updateEnd - (int8_t *)&tObj;
vgSdb = sdbOpenTable(tsMaxVGroups, sizeof(SVgObj), "vgroups", SDB_KEYTYPE_AUTO, mgmtDirectory, mgmtVgroupAction); vgSdb = sdbOpenTable(tsMaxVGroups, sizeof(SVgObj), "vgroups", SDB_KEYTYPE_AUTO, mgmtDirectory, mgmtVgroupAction);
if (vgSdb == NULL) { if (vgSdb == NULL) {
...@@ -294,14 +294,14 @@ int mgmtGetVgroupMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn) { ...@@ -294,14 +294,14 @@ int mgmtGetVgroupMeta(SMeterMeta *pMeta, SShowObj *pShow, SConnObj *pConn) {
SVgObj *pVgroup = NULL; SVgObj *pVgroup = NULL;
STabObj *pTable = NULL; STabObj *pTable = NULL;
if (pShow->payloadLen > 0 ) { if (pShow->payloadLen > 0 ) {
pTable = mgmtGetTable(pShow->payload); // pTable = mgmtGetTable(pShow->payload);
if (NULL == pTable) { // if (NULL == pTable) {
return TSDB_CODE_INVALID_TABLE_ID; // return TSDB_CODE_INVALID_TABLE_ID;
} // }
//
pVgroup = mgmtGetVgroup(pTable->gid.vgId); // pVgroup = mgmtGetVgroup(pTable->gid.vgId);
if (NULL == pVgroup) return TSDB_CODE_INVALID_TABLE_ID; // if (NULL == pVgroup) return TSDB_CODE_INVALID_TABLE_ID;
//
maxReplica = pVgroup->numOfVnodes > maxReplica ? pVgroup->numOfVnodes : maxReplica; maxReplica = pVgroup->numOfVnodes > maxReplica ? pVgroup->numOfVnodes : maxReplica;
} else { } else {
SVgObj *pVgroup = pDb->pHead; SVgObj *pVgroup = pDb->pHead;
...@@ -476,7 +476,7 @@ void *mgmtVgroupActionUpdate(void *row, char *str, int size, int *ssize) { ...@@ -476,7 +476,7 @@ void *mgmtVgroupActionUpdate(void *row, char *str, int size, int *ssize) {
} }
void *mgmtVgroupActionEncode(void *row, char *str, int size, int *ssize) { void *mgmtVgroupActionEncode(void *row, char *str, int size, int *ssize) {
SVgObj *pVgroup = (SVgObj *)row; SVgObj *pVgroup = (SVgObj *)row;
int tsize = pVgroup->updateEnd - (char *)pVgroup; int tsize = pVgroup->updateEnd - (int8_t *)pVgroup;
if (size < tsize) { if (size < tsize) {
*ssize = -1; *ssize = -1;
} else { } else {
...@@ -491,7 +491,7 @@ void *mgmtVgroupActionDecode(void *row, char *str, int size, int *ssize) { ...@@ -491,7 +491,7 @@ void *mgmtVgroupActionDecode(void *row, char *str, int size, int *ssize) {
if (pVgroup == NULL) return NULL; if (pVgroup == NULL) return NULL;
memset(pVgroup, 0, sizeof(SVgObj)); memset(pVgroup, 0, sizeof(SVgObj));
int tsize = pVgroup->updateEnd - (char *)pVgroup; int tsize = pVgroup->updateEnd - (int8_t *)pVgroup;
memcpy(pVgroup, str, tsize); memcpy(pVgroup, str, tsize);
return (void *)pVgroup; return (void *)pVgroup;
...@@ -501,7 +501,7 @@ void *mgmtVgroupActionBatchUpdate(void *row, char *str, int size, int *ssize) { ...@@ -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 *mgmtVgroupActionAfterBatchUpdate(void *row, char *str, int size, int *ssize) { return NULL; }
void *mgmtVgroupActionReset(void *row, char *str, int size, int *ssize) { void *mgmtVgroupActionReset(void *row, char *str, int size, int *ssize) {
SVgObj *pVgroup = (SVgObj *)row; SVgObj *pVgroup = (SVgObj *)row;
int tsize = pVgroup->updateEnd - (char *)pVgroup; int tsize = pVgroup->updateEnd - (int8_t *)pVgroup;
memcpy(pVgroup, str, tsize); memcpy(pVgroup, str, tsize);
......
src/plugins/http/CMakeLists.txt
浏览文件 @ 29058645
...@@ -4,6 +4,7 @@ PROJECT(TDengine) ...@@ -4,6 +4,7 @@ PROJECT(TDengine)
IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM)) IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc) INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/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_COMMUNITY_DIR}/deps/zlib-1.2.11/inc)
INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc) INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
INCLUDE_DIRECTORIES(inc) INCLUDE_DIRECTORIES(inc)
......
src/plugins/http/src/gcHandle.c
浏览文件 @ 29058645
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "cJSON.h" #include "cJSON.h"
#include "gcJson.h" #include "gcJson.h"
#include "taosdef.h" #include "taosdef.h"
#include "tlog.h"
static HttpDecodeMethod gcDecodeMethod = {"grafana", gcProcessRequest}; static HttpDecodeMethod gcDecodeMethod = {"grafana", gcProcessRequest};
static HttpEncodeMethod gcHeartBeatMethod = {NULL, gcSendHeartBeatResp, NULL, NULL, NULL, NULL, NULL, NULL}; static HttpEncodeMethod gcHeartBeatMethod = {NULL, gcSendHeartBeatResp, NULL, NULL, NULL, NULL, NULL, NULL};
......
src/plugins/http/src/httpHandle.c
浏览文件 @ 29058645
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "tglobalcfg.h" #include "tglobalcfg.h"
#include "tsocket.h" #include "tsocket.h"
#include "ttimer.h" #include "ttimer.h"
#include "tlog.h"
void httpToLowerUrl(char* url) { void httpToLowerUrl(char* url) {
/*ignore case */ /*ignore case */
......
src/plugins/http/src/httpJson.c
浏览文件 @ 29058645
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#include "httpJson.h" #include "httpJson.h"
#include "httpResp.h" #include "httpResp.h"
#include "taosmsg.h" #include "taosmsg.h"
#include "tlog.h"
#include "taoserror.h"
#define MAX_NUM_STR_SZ 25 #define MAX_NUM_STR_SZ 25
...@@ -451,7 +453,7 @@ void httpJsonPairStatus(JsonBuf* buf, int code) { ...@@ -451,7 +453,7 @@ void httpJsonPairStatus(JsonBuf* buf, int code) {
} else if (code == TSDB_CODE_INVALID_TABLE) { } else if (code == TSDB_CODE_INVALID_TABLE) {
httpJsonPair(buf, "desc", 4, "failed to create table", 22); httpJsonPair(buf, "desc", 4, "failed to create table", 22);
} else } 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
浏览文件 @ 29058645
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
#include "httpCode.h" #include "httpCode.h"
#include "httpJson.h" #include "httpJson.h"
#include "taosmsg.h" #include "taosmsg.h"
#include "tlog.h"
#include "taoserror.h"
const char *httpKeepAliveStr[] = {"", "Connection: Keep-Alive\r\n", "Connection: Close\r\n"}; const char *httpKeepAliveStr[] = {"", "Connection: Keep-Alive\r\n", "Connection: Close\r\n"};
...@@ -182,7 +184,7 @@ void httpSendErrorResp(HttpContext *pContext, int errNo) { httpSendErrorRespWith ...@@ -182,7 +184,7 @@ void httpSendErrorResp(HttpContext *pContext, int errNo) { httpSendErrorRespWith
void httpSendTaosdErrorResp(HttpContext *pContext, int errCode) { void httpSendTaosdErrorResp(HttpContext *pContext, int errCode) {
int httpCode = 400; 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) { void httpSendTaosdInvalidSqlErrorResp(HttpContext *pContext, char* errMsg) {
......
src/plugins/http/src/httpSession.c
浏览文件 @ 29058645
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include "taos.h" #include "taos.h"
#include "ttime.h" #include "ttime.h"
#include "ttimer.h" #include "ttimer.h"
#include "tlog.h"
void httpAccessSession(HttpContext *pContext) { void httpAccessSession(HttpContext *pContext) {
HttpServer *server = pContext->pThread->pServer; HttpServer *server = pContext->pThread->pServer;
......
src/plugins/http/src/httpSystem.c
浏览文件 @ 29058645
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "httpHandle.h" #include "httpHandle.h"
#include "restHandle.h" #include "restHandle.h"
#include "tgHandle.h" #include "tgHandle.h"
#include "tlog.h"
#ifdef CLUSTER #ifdef CLUSTER
void adminInitHandle(HttpServer* pServer); void adminInitHandle(HttpServer* pServer);
......
src/plugins/http/src/httpUtil.c
浏览文件 @ 29058645
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include "shash.h" #include "shash.h"
#include "taos.h" #include "taos.h"
#include "tlog.h"
bool httpCheckUsedbSql(char *sql) { bool httpCheckUsedbSql(char *sql) {
if (strstr(sql, "use ") != NULL) { if (strstr(sql, "use ") != NULL) {
......
src/plugins/http/src/restHandle.c
浏览文件 @ 29058645
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "restHandle.h" #include "restHandle.h"
#include "restJson.h" #include "restJson.h"
#include "tlog.h"
static HttpDecodeMethod restDecodeMethod = {"rest", restProcessRequest}; static HttpDecodeMethod restDecodeMethod = {"rest", restProcessRequest};
static HttpDecodeMethod restDecodeMethod2 = {"restful", restProcessRequest}; static HttpDecodeMethod restDecodeMethod2 = {"restful", restProcessRequest};
...@@ -70,8 +71,7 @@ bool restProcessSqlRequest(HttpContext* pContext, int timestampFmt) { ...@@ -70,8 +71,7 @@ bool restProcessSqlRequest(HttpContext* pContext, int timestampFmt) {
/* /*
* for async test * for async test
* / *
/*
if (httpCheckUsedbSql(sql)) { if (httpCheckUsedbSql(sql)) {
httpSendErrorResp(pContext, HTTP_NO_EXEC_USEDB); httpSendErrorResp(pContext, HTTP_NO_EXEC_USEDB);
return false; return false;
......
src/plugins/http/src/restJson.c
浏览文件 @ 29058645
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <sys/time.h> #include <sys/time.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include "tlog.h"
#include "httpJson.h" #include "httpJson.h"
#include "restHandle.h" #include "restHandle.h"
#include "restJson.h" #include "restJson.h"
......
src/plugins/http/src/tgHandle.c
浏览文件 @ 29058645
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include "taosmsg.h" #include "taosmsg.h"
#include "tgJson.h" #include "tgJson.h"
#include "taosdef.h" #include "taosdef.h"
#include "tlog.h"
/* /*
* taos.telegraf.cfg formats like * taos.telegraf.cfg formats like
......
src/plugins/http/src/tgJson.c
浏览文件 @ 29058645
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "taosmsg.h" #include "taosmsg.h"
#include "tgHandle.h" #include "tgHandle.h"
#include "tgJson.h" #include "tgJson.h"
#include "tlog.h"
void tgInitQueryJson(HttpContext *pContext) { void tgInitQueryJson(HttpContext *pContext) {
JsonBuf *jsonBuf = httpMallocJsonBuf(pContext); JsonBuf *jsonBuf = httpMallocJsonBuf(pContext);
......
src/plugins/monitor/CMakeLists.txt
浏览文件 @ 29058645
...@@ -4,6 +4,7 @@ PROJECT(TDengine) ...@@ -4,6 +4,7 @@ PROJECT(TDengine)
IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM)) IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc) INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/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(${TD_OS_DIR}/inc)
INCLUDE_DIRECTORIES(inc) INCLUDE_DIRECTORIES(inc)
AUX_SOURCE_DIRECTORY(./src SRC) AUX_SOURCE_DIRECTORY(./src SRC)
......
src/plugins/monitor/src/monitorSystem.c
浏览文件 @ 29058645
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "dnode.h"
#include "monitorSystem.h" #include "monitorSystem.h"
#include "tsclient.h" #include "tsclient.h"
#include "taosdef.h" #include "taosdef.h"
......
src/sdb/src/sdbEngine.c
浏览文件 @ 29058645
...@@ -53,6 +53,10 @@ SSdbTable *tableList[20]; ...@@ -53,6 +53,10 @@ SSdbTable *tableList[20];
int sdbNumOfTables; int sdbNumOfTables;
int64_t sdbVersion; int64_t sdbVersion;
int64_t sdbGetVersion() {
return sdbVersion;
};
void sdbFinishCommit(void *handle) { void sdbFinishCommit(void *handle) {
SSdbTable *pTable = (SSdbTable *)handle; SSdbTable *pTable = (SSdbTable *)handle;
uint32_t sdbEcommit = SDB_ENDCOMMIT; uint32_t sdbEcommit = SDB_ENDCOMMIT;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或