Skip to content

T
TDengine

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

通知 1192
Star 22018
Fork 4786
T
TDengine
提交 59a77a36 编写于 作者: H hjxilinx
浏览文件
操作

Merge branch 'develop' into feature/query

上级 64545fb9 dcb309ce
展开全部 显示空白变更内容
内联 并排
Showing with 113799 addition and 862 deletion
.travis.yml
浏览文件 @ 59a77a36
...@@ -24,10 +24,11 @@ matrix: ...@@ -24,10 +24,11 @@ matrix:
- python-setuptools - python-setuptools
- python3-pip - python3-pip
- python3-setuptools - python3-setuptools
- valgrind
before_install: before_install:
- sudo apt update -y -qq - sudo apt update -y -qq
- sudo apt install -y net-tools python-pip python-setuptools python3-pip python3-setuptools - sudo apt install -y net-tools python-pip python-setuptools python3-pip python3-setuptools valgrind
before_script: before_script:
- cd ${TRAVIS_BUILD_DIR} - cd ${TRAVIS_BUILD_DIR}
...@@ -43,16 +44,32 @@ matrix: ...@@ -43,16 +44,32 @@ matrix:
case $TRAVIS_OS_NAME in case $TRAVIS_OS_NAME in
linux) linux)
cd ${TRAVIS_BUILD_DIR}/debug cd ${TRAVIS_BUILD_DIR}/debug
sudo make install || exit $? sudo make install || travis_terminate $?
pip install --user ${TRAVIS_BUILD_DIR}/src/connector/python/linux/python2/ pip install --user ${TRAVIS_BUILD_DIR}/src/connector/python/linux/python2/
pip3 install --user ${TRAVIS_BUILD_DIR}/src/connector/python/linux/python3/ pip3 install --user ${TRAVIS_BUILD_DIR}/src/connector/python/linux/python3/
cd ${TRAVIS_BUILD_DIR}/tests cd ${TRAVIS_BUILD_DIR}/tests
bash ./test-all.sh ./test-all.sh || travis_terminate $?
if [ "$?" -ne "0" ]; then cd ${TRAVIS_BUILD_DIR}/tests/pytest
exit $? ./simpletest.sh -g 2>&1 | tee mem-error-out.txt
sleep 1
# Color setting
RED='\033[0;31m'
GREEN='\033[1;32m'
GREEN_DARK='\033[0;32m'
GREEN_UNDERLINE='\033[4;32m'
NC='\033[0m'
memError=`grep -m 1 'ERROR SUMMARY' mem-error-out.txt | awk '{print $4}'`
if [ -n "$memError" ]; then
if [ "$memError" -gt 23 ]; then
echo -e "${RED} ## Memory errors number valgrind reports is $memError. More than our threshold! ## ${NC} "
travis_terminate $memError
fi
fi fi
;; ;;
...@@ -74,20 +91,20 @@ matrix: ...@@ -74,20 +91,20 @@ matrix:
# GitHub project metadata # GitHub project metadata
# ** specific to your project ** # ** specific to your project **
project: project:
name: sangshuduo/TDengine name: TDengine
version: 2.x version: 2.x
description: sangshuduo/TDengine description: taosdata/TDengine
# Where email notification of build analysis results will be sent # Where email notification of build analysis results will be sent
notification_email: sangshuduo@gmail.com notification_email: sdsang@taosdata.com
# Commands to prepare for build_command # Commands to prepare for build_command
# ** likely specific to your build ** # ** likely specific to your build **
build_command_prepend: cmake .. build_command_prepend: cmake .
# The command that will be added as an argument to "cov-build" to compile your project for analysis, # The command that will be added as an argument to "cov-build" to compile your project for analysis,
# ** likely specific to your build ** # ** likely specific to your build **
build_command: cmake --build . build_command: make
# Pattern to match selecting branches that will run analysis. We recommend leaving this set to 'coverity_scan'. # Pattern to match selecting branches that will run analysis. We recommend leaving this set to 'coverity_scan'.
# Take care in resource usage, and consider the build frequency allowances per # Take care in resource usage, and consider the build frequency allowances per
...@@ -132,22 +149,25 @@ matrix: ...@@ -132,22 +149,25 @@ matrix:
case $TRAVIS_OS_NAME in case $TRAVIS_OS_NAME in
linux) linux)
cd ${TRAVIS_BUILD_DIR}/debug cd ${TRAVIS_BUILD_DIR}/debug
sudo make install || exit $? sudo make install || travis_terminate $?
pip install --user ${TRAVIS_BUILD_DIR}/src/connector/python/linux/python2/ pip install --user ${TRAVIS_BUILD_DIR}/src/connector/python/linux/python2/
pip3 install --user ${TRAVIS_BUILD_DIR}/src/connector/python/linux/python3/ pip3 install --user ${TRAVIS_BUILD_DIR}/src/connector/python/linux/python3/
cd ${TRAVIS_BUILD_DIR}/tests cd ${TRAVIS_BUILD_DIR}/tests
bash ./test-all.sh ./test-all.sh
if [ "$?" -ne "0" ]; then if [ "$?" -ne "0" ]; then
exit $? travis_terminate $?
fi fi
sudo pkill taosd
sleep 1
cd ${TRAVIS_BUILD_DIR} cd ${TRAVIS_BUILD_DIR}
lcov -d . --capture --rc lcov_branch_coverage=1 -o coverage.info lcov -d . --capture --rc lcov_branch_coverage=1 -o coverage.info
lcov -l --rc lcov_branch_coverage=1 coverage.info || exit $? lcov -l --rc lcov_branch_coverage=1 coverage.info || travis_terminate $?
gem install coveralls-lcov gem install coveralls-lcov
...@@ -163,7 +183,6 @@ matrix: ...@@ -163,7 +183,6 @@ matrix:
echo -e "${GREEN} ## Uploaded to Coveralls.io! ## ${NC}" echo -e "${GREEN} ## Uploaded to Coveralls.io! ## ${NC}"
else else
echo -e "${RED} ## Coveralls.io not collect coverage report! ## ${NC} " echo -e "${RED} ## Coveralls.io not collect coverage report! ## ${NC} "
exit $?
fi fi
bash <(curl -s https://codecov.io/bash) -y .codecov.yml -f coverage.info bash <(curl -s https://codecov.io/bash) -y .codecov.yml -f coverage.info
...@@ -171,7 +190,6 @@ matrix: ...@@ -171,7 +190,6 @@ matrix:
echo -e "${GREEN} ## Uploaded to Codecov! ## ${NC} " echo -e "${GREEN} ## Uploaded to Codecov! ## ${NC} "
else else
echo -e "${RED} ## Codecov did not collect coverage report! ## ${NC} " echo -e "${RED} ## Codecov did not collect coverage report! ## ${NC} "
exit $?
fi fi
;; ;;
......
src/client/inc/tsclient.h
浏览文件 @ 59a77a36
...@@ -451,7 +451,7 @@ extern void * tscQhandle; ...@@ -451,7 +451,7 @@ extern void * tscQhandle;
extern int tscKeepConn[]; extern int tscKeepConn[];
extern int tsInsertHeadSize; extern int tsInsertHeadSize;
extern int tscNumOfThreads; extern int tscNumOfThreads;
extern SRpcIpSet tscMgmtIpList; extern SRpcIpSet tscMgmtIpSet;
typedef void (*__async_cb_func_t)(void *param, TAOS_RES *tres, int numOfRows); typedef void (*__async_cb_func_t)(void *param, TAOS_RES *tres, int numOfRows);
......
src/client/src/tscServer.c
浏览文件 @ 59a77a36
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#define TSC_MGMT_VNODE 999 #define TSC_MGMT_VNODE 999
SRpcIpSet tscMgmtIpList; SRpcIpSet tscMgmtIpSet;
SRpcIpSet tscDnodeIpSet; SRpcIpSet tscDnodeIpSet;
int (*tscBuildMsg[TSDB_SQL_MAX])(SSqlObj *pSql, SSqlInfo *pInfo) = {0}; int (*tscBuildMsg[TSDB_SQL_MAX])(SSqlObj *pSql, SSqlInfo *pInfo) = {0};
...@@ -58,35 +58,40 @@ static void tscSetDnodeIpList(SSqlObj* pSql, STableMeta* pTableMeta) { ...@@ -58,35 +58,40 @@ static void tscSetDnodeIpList(SSqlObj* pSql, STableMeta* pTableMeta) {
} }
void tscPrintMgmtIp() { void tscPrintMgmtIp() {
if (tscMgmtIpList.numOfIps <= 0) { if (tscMgmtIpSet.numOfIps <= 0) {
tscError("invalid mgmt IP list:%d", tscMgmtIpList.numOfIps); tscError("invalid mgmt IP list:%d", tscMgmtIpSet.numOfIps);
} else { } else {
for (int i = 0; i < tscMgmtIpList.numOfIps; ++i) { for (int i = 0; i < tscMgmtIpSet.numOfIps; ++i) {
tscTrace("mgmt index:%d ip:%d", i, tscMgmtIpList.ip[i]); tscTrace("mgmt index:%d ip:%d", i, tscMgmtIpSet.ip[i]);
} }
} }
} }
void tscSetMgmtIpListFromCluster(SRpcIpSet *pIpList) { void tscSetMgmtIpListFromCluster(SRpcIpSet *pIpList) {
tscMgmtIpList.numOfIps = htons(pIpList->numOfIps); tscMgmtIpSet.numOfIps = pIpList->numOfIps;
tscMgmtIpList.inUse = htons(pIpList->inUse); tscMgmtIpSet.inUse = pIpList->inUse;
tscMgmtIpList.port = htons(pIpList->port); tscMgmtIpSet.port = htons(pIpList->port);
for (int32_t i = 0; i <tscMgmtIpList.numOfIps; ++i) { for (int32_t i = 0; i < tscMgmtIpSet.numOfIps; ++i) {
tscMgmtIpList.ip[i] = pIpList->ip[i]; tscMgmtIpSet.ip[i] = htonl(pIpList->ip[i]);
} }
} }
void tscSetMgmtIpListFromEdge() { void tscSetMgmtIpListFromEdge() {
if (tscMgmtIpList.numOfIps != 1) { if (tscMgmtIpSet.numOfIps != 1) {
tscMgmtIpList.numOfIps = 1; tscMgmtIpSet.numOfIps = 1;
tscMgmtIpList.inUse = 0; tscMgmtIpSet.inUse = 0;
tscMgmtIpList.port = tsMnodeShellPort; tscMgmtIpSet.port = tsMnodeShellPort;
tscMgmtIpList.ip[0] = inet_addr(tsMasterIp); tscMgmtIpSet.ip[0] = inet_addr(tsMasterIp);
tscTrace("edge mgmt IP list:"); tscTrace("edge mgmt IP list:");
tscPrintMgmtIp(); tscPrintMgmtIp();
} }
} }
void tscUpdateIpSet(void *ahandle, SRpcIpSet *pIpSet) {
tscTrace("mgmt IP list is changed for ufp is called");
tscMgmtIpSet = *pIpSet;
}
void tscSetMgmtIpList(SRpcIpSet *pIpList) { void tscSetMgmtIpList(SRpcIpSet *pIpList) {
/* /*
* The iplist returned by the cluster edition is the current management nodes * The iplist returned by the cluster edition is the current management nodes
...@@ -109,7 +114,7 @@ void tscSetMgmtIpList(SRpcIpSet *pIpList) { ...@@ -109,7 +114,7 @@ void tscSetMgmtIpList(SRpcIpSet *pIpList) {
UNUSED_FUNC UNUSED_FUNC
static int32_t tscGetMgmtConnMaxRetryTimes() { static int32_t tscGetMgmtConnMaxRetryTimes() {
int32_t factor = 2; int32_t factor = 2;
return tscMgmtIpList.numOfIps * factor; return tscMgmtIpSet.numOfIps * factor;
} }
void tscProcessHeartBeatRsp(void *param, TAOS_RES *tres, int code) { void tscProcessHeartBeatRsp(void *param, TAOS_RES *tres, int code) {
...@@ -204,7 +209,7 @@ int tscSendMsgToServer(SSqlObj *pSql) { ...@@ -204,7 +209,7 @@ int tscSendMsgToServer(SSqlObj *pSql) {
}; };
rpcSendRequest(pVnodeConn, &pSql->ipList, &rpcMsg); rpcSendRequest(pVnodeConn, &pSql->ipList, &rpcMsg);
} else { } else {
pSql->ipList = tscMgmtIpList; pSql->ipList = tscMgmtIpSet;
pSql->ipList.port = tsMnodeShellPort; pSql->ipList.port = tsMnodeShellPort;
tscTrace("%p msg:%s is sent to server %d", pSql, taosMsg[pSql->cmd.msgType], pSql->ipList.port); tscTrace("%p msg:%s is sent to server %d", pSql, taosMsg[pSql->cmd.msgType], pSql->ipList.port);
...@@ -425,7 +430,7 @@ int tscProcessSql(SSqlObj *pSql) { ...@@ -425,7 +430,7 @@ int tscProcessSql(SSqlObj *pSql) {
return pSql->res.code; return pSql->res.code;
} }
} else if (pSql->cmd.command < TSDB_SQL_LOCAL) { } else if (pSql->cmd.command < TSDB_SQL_LOCAL) {
pSql->ipList = tscMgmtIpList; pSql->ipList = tscMgmtIpSet;
} else { // local handler } else { // local handler
return (*tscProcessMsgRsp[pCmd->command])(pSql); return (*tscProcessMsgRsp[pCmd->command])(pSql);
} }
...@@ -2229,10 +2234,7 @@ int tscProcessConnectRsp(SSqlObj *pSql) { ...@@ -2229,10 +2234,7 @@ int tscProcessConnectRsp(SSqlObj *pSql) {
assert(len <= tListLen(pObj->db)); assert(len <= tListLen(pObj->db));
strncpy(pObj->db, temp, tListLen(pObj->db)); strncpy(pObj->db, temp, tListLen(pObj->db));
// SIpList * pIpList; tscSetMgmtIpList(&pConnect->ipList);
// char *rsp = pRes->pRsp + sizeof(SCMConnectRsp);
// pIpList = (SIpList *)rsp;
// tscSetMgmtIpList(pIpList);
strcpy(pObj->sversion, pConnect->serverVersion); strcpy(pObj->sversion, pConnect->serverVersion);
pObj->writeAuth = pConnect->writeAuth; pObj->writeAuth = pConnect->writeAuth;
......
src/client/src/tscSql.c
浏览文件 @ 59a77a36
...@@ -72,23 +72,23 @@ STscObj *taosConnectImpl(const char *ip, const char *user, const char *pass, con ...@@ -72,23 +72,23 @@ STscObj *taosConnectImpl(const char *ip, const char *user, const char *pass, con
} }
if (ip && ip[0]) { if (ip && ip[0]) {
tscMgmtIpList.inUse = 0; tscMgmtIpSet.inUse = 0;
tscMgmtIpList.port = tsMnodeShellPort; tscMgmtIpSet.port = tsMnodeShellPort;
tscMgmtIpList.numOfIps = 1; tscMgmtIpSet.numOfIps = 1;
tscMgmtIpList.ip[0] = inet_addr(ip); tscMgmtIpSet.ip[0] = inet_addr(ip);
if (tsMasterIp[0] && strcmp(ip, tsMasterIp) != 0) { if (tsMasterIp[0] && strcmp(ip, tsMasterIp) != 0) {
tscMgmtIpList.numOfIps = 2; tscMgmtIpSet.numOfIps = 2;
tscMgmtIpList.ip[1] = inet_addr(tsMasterIp); tscMgmtIpSet.ip[1] = inet_addr(tsMasterIp);
} }
if (tsSecondIp[0] && strcmp(tsSecondIp, tsMasterIp) != 0) { if (tsSecondIp[0] && strcmp(tsSecondIp, tsMasterIp) != 0) {
tscMgmtIpList.numOfIps = 3; tscMgmtIpSet.numOfIps = 3;
tscMgmtIpList.ip[2] = inet_addr(tsSecondIp); tscMgmtIpSet.ip[2] = inet_addr(tsSecondIp);
} }
} }
tscMgmtIpList.port = port ? port : tsMnodeShellPort; tscMgmtIpSet.port = port ? port : tsMnodeShellPort;
STscObj *pObj = (STscObj *)calloc(1, sizeof(STscObj)); STscObj *pObj = (STscObj *)calloc(1, sizeof(STscObj));
if (NULL == pObj) { if (NULL == pObj) {
......
src/client/src/tscSystem.c
浏览文件 @ 59a77a36
...@@ -42,11 +42,13 @@ void * tscTmr; ...@@ -42,11 +42,13 @@ void * tscTmr;
void * tscQhandle; void * tscQhandle;
void * tscCheckDiskUsageTmr; void * tscCheckDiskUsageTmr;
int tsInsertHeadSize; int tsInsertHeadSize;
char tsLastUser[TSDB_USER_LEN + 1];
int tscNumOfThreads; int tscNumOfThreads;
static pthread_once_t tscinit = PTHREAD_ONCE_INIT; static pthread_once_t tscinit = PTHREAD_ONCE_INIT;
void taosInitNote(int numOfNoteLines, int maxNotes, char* lable); void taosInitNote(int numOfNoteLines, int maxNotes, char* lable);
void tscUpdateIpSet(void *ahandle, SRpcIpSet *pIpSet);
void tscCheckDiskUsage(void *para, void *unused) { void tscCheckDiskUsage(void *para, void *unused) {
taosGetDisk(); taosGetDisk();
...@@ -65,6 +67,7 @@ int32_t tscInitRpc(const char *user, const char *secret) { ...@@ -65,6 +67,7 @@ int32_t tscInitRpc(const char *user, const char *secret) {
rpcInit.label = "TSC-vnode"; rpcInit.label = "TSC-vnode";
rpcInit.numOfThreads = tscNumOfThreads; rpcInit.numOfThreads = tscNumOfThreads;
rpcInit.cfp = tscProcessMsgFromServer; rpcInit.cfp = tscProcessMsgFromServer;
rpcInit.ufp = tscUpdateIpSet;
rpcInit.sessions = tsMaxVnodeConnections; rpcInit.sessions = tsMaxVnodeConnections;
rpcInit.connType = TAOS_CONN_CLIENT; rpcInit.connType = TAOS_CONN_CLIENT;
rpcInit.user = (char*)user; rpcInit.user = (char*)user;
...@@ -79,6 +82,13 @@ int32_t tscInitRpc(const char *user, const char *secret) { ...@@ -79,6 +82,13 @@ int32_t tscInitRpc(const char *user, const char *secret) {
} }
} }
// not stop service, switch users
if (strcmp(tsLastUser, user) != 0 && pTscMgmtConn != NULL) {
tscTrace("switch user from %s to %s", user, tsLastUser);
rpcClose(pTscMgmtConn);
pTscMgmtConn = NULL;
}
if (pTscMgmtConn == NULL) { if (pTscMgmtConn == NULL) {
memset(&rpcInit, 0, sizeof(rpcInit)); memset(&rpcInit, 0, sizeof(rpcInit));
rpcInit.localIp = tsLocalIp; rpcInit.localIp = tsLocalIp;
...@@ -92,6 +102,7 @@ int32_t tscInitRpc(const char *user, const char *secret) { ...@@ -92,6 +102,7 @@ int32_t tscInitRpc(const char *user, const char *secret) {
rpcInit.user = (char*)user; rpcInit.user = (char*)user;
rpcInit.ckey = "key"; rpcInit.ckey = "key";
rpcInit.secret = secretEncrypt; rpcInit.secret = secretEncrypt;
strcpy(tsLastUser, user);
pTscMgmtConn = rpcOpen(&rpcInit); pTscMgmtConn = rpcOpen(&rpcInit);
if (pTscMgmtConn == NULL) { if (pTscMgmtConn == NULL) {
...@@ -145,14 +156,14 @@ void taos_init_imp() { ...@@ -145,14 +156,14 @@ void taos_init_imp() {
taosInitNote(tsNumOfLogLines / 10, 1, (char*)"tsc_note"); taosInitNote(tsNumOfLogLines / 10, 1, (char*)"tsc_note");
} }
tscMgmtIpList.inUse = 0; tscMgmtIpSet.inUse = 0;
tscMgmtIpList.port = tsMnodeShellPort; tscMgmtIpSet.port = tsMnodeShellPort;
tscMgmtIpList.numOfIps = 1; tscMgmtIpSet.numOfIps = 1;
tscMgmtIpList.ip[0] = inet_addr(tsMasterIp); tscMgmtIpSet.ip[0] = inet_addr(tsMasterIp);
if (tsSecondIp[0] && strcmp(tsSecondIp, tsMasterIp) != 0) { if (tsSecondIp[0] && strcmp(tsSecondIp, tsMasterIp) != 0) {
tscMgmtIpList.numOfIps = 2; tscMgmtIpSet.numOfIps = 2;
tscMgmtIpList.ip[1] = inet_addr(tsSecondIp); tscMgmtIpSet.ip[1] = inet_addr(tsSecondIp);
} }
tscInitMsgsFp(); tscInitMsgsFp();
......
src/common/inc/tglobal.h
浏览文件 @ 59a77a36
...@@ -59,6 +59,7 @@ extern uint16_t tsMnodeDnodePort; ...@@ -59,6 +59,7 @@ extern uint16_t tsMnodeDnodePort;
extern uint16_t tsMnodeShellPort; extern uint16_t tsMnodeShellPort;
extern uint16_t tsDnodeShellPort; extern uint16_t tsDnodeShellPort;
extern uint16_t tsDnodeMnodePort; extern uint16_t tsDnodeMnodePort;
extern uint16_t tsSyncPort;
extern int tsStatusInterval; extern int tsStatusInterval;
extern int tsShellActivityTimer; extern int tsShellActivityTimer;
......
src/common/inc/tulog.h
浏览文件 @ 59a77a36
...@@ -44,6 +44,11 @@ extern int32_t tscEmbedded; ...@@ -44,6 +44,11 @@ extern int32_t tscEmbedded;
#define uPrint(...) \ #define uPrint(...) \
{ taosPrintLog("UTL ", tscEmbedded ? 255 : uDebugFlag, __VA_ARGS__); } { taosPrintLog("UTL ", tscEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }
#define pError(...) \
{ taosPrintLog("ERROR APP ", 255, __VA_ARGS__); }
#define pPrint(...) \
{ taosPrintLog("APP ", 255, __VA_ARGS__); }
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
......
src/common/src/tglobal.c
浏览文件 @ 59a77a36
...@@ -65,7 +65,8 @@ char tsSecondIp[TSDB_IPv4ADDR_LEN] = {0}; ...@@ -65,7 +65,8 @@ char tsSecondIp[TSDB_IPv4ADDR_LEN] = {0};
uint16_t tsMnodeShellPort = 6030; // udp[6030-6034] tcp[6030] uint16_t tsMnodeShellPort = 6030; // udp[6030-6034] tcp[6030]
uint16_t tsDnodeShellPort = 6035; // udp[6035-6039] tcp[6035] uint16_t tsDnodeShellPort = 6035; // udp[6035-6039] tcp[6035]
uint16_t tsMnodeDnodePort = 6040; // udp/tcp uint16_t tsMnodeDnodePort = 6040; // udp/tcp
uint16_t tsDnodeMnodePort = 6041; // udp/tcp uint16_t tsDnodeMnodePort = 6045; // udp/tcp
uint16_t tsSyncPort = 6050;
int32_t tsStatusInterval = 1; // second int32_t tsStatusInterval = 1; // second
int32_t tsShellActivityTimer = 3; // second int32_t tsShellActivityTimer = 3; // second
......
src/dnode/src/dnodeMClient.c
浏览文件 @ 59a77a36
...@@ -34,26 +34,33 @@ ...@@ -34,26 +34,33 @@
#define MPEER_CONTENT_LEN 2000 #define MPEER_CONTENT_LEN 2000
static bool dnodeReadMnodeIpList(); static void dnodeUpdateMnodeInfos(SDMMnodeInfos *pMnodes);
static void dnodeSaveMnodeIpList(); static bool dnodeReadMnodeInfos();
static void dnodeReadDnodeInfo(); static void dnodeSaveMnodeInfos();
static void dnodeUpdateDnodeInfo(int32_t dnodeId); static void dnodeUpdateDnodeCfg(SDMDnodeCfg *pCfg);
static bool dnodeReadDnodeCfg();
static void dnodeSaveDnodeCfg();
static void dnodeProcessRspFromMnode(SRpcMsg *pMsg); static void dnodeProcessRspFromMnode(SRpcMsg *pMsg);
static void dnodeProcessStatusRsp(SRpcMsg *pMsg); static void dnodeProcessStatusRsp(SRpcMsg *pMsg);
static void dnodeSendStatusMsg(void *handle, void *tmrId); static void dnodeSendStatusMsg(void *handle, void *tmrId);
static void (*tsDnodeProcessMgmtRspFp[TSDB_MSG_TYPE_MAX])(SRpcMsg *); static void (*tsDnodeProcessMgmtRspFp[TSDB_MSG_TYPE_MAX])(SRpcMsg *);
static void *tsDnodeMClientRpc = NULL; static void *tsDnodeMClientRpc = NULL;
static SRpcIpSet tsMnodeIpList = {0};
static SDMNodeInfos tsMnodeInfos = {0};
static void *tsDnodeTmr = NULL; static void *tsDnodeTmr = NULL;
static void *tsStatusTimer = NULL; static void *tsStatusTimer = NULL;
static uint32_t tsRebootTime; static uint32_t tsRebootTime;
static int32_t tsDnodeId = 0;
static char tsDnodeName[TSDB_NODE_NAME_LEN]; static SRpcIpSet tsMnodeIpSet = {0};
static SDMMnodeInfos tsMnodeInfos = {0};
static SDMDnodeCfg tsDnodeCfg = {0};
void dnodeUpdateIpSet(void *ahandle, SRpcIpSet *pIpSet) {
dTrace("mgmt IP list is changed for ufp is called");
tsMnodeIpSet = *pIpSet;
}
int32_t dnodeInitMClient() { int32_t dnodeInitMClient() {
dnodeReadDnodeInfo(); dnodeReadDnodeCfg();
tsRebootTime = taosGetTimestampSec(); tsRebootTime = taosGetTimestampSec();
tsDnodeTmr = taosTmrInit(100, 200, 60000, "DND-DM"); tsDnodeTmr = taosTmrInit(100, 200, 60000, "DND-DM");
...@@ -62,22 +69,22 @@ int32_t dnodeInitMClient() { ...@@ -62,22 +69,22 @@ int32_t dnodeInitMClient() {
return -1; return -1;
} }
if (!dnodeReadMnodeIpList()) { if (!dnodeReadMnodeInfos()) {
memset(&tsMnodeIpList, 0, sizeof(SRpcIpSet)); memset(&tsMnodeIpSet, 0, sizeof(SRpcIpSet));
memset(&tsMnodeInfos, 0, sizeof(SDMNodeInfos)); memset(&tsMnodeInfos, 0, sizeof(SDMMnodeInfos));
tsMnodeIpList.port = tsMnodeDnodePort; tsMnodeIpSet.port = tsMnodeDnodePort;
tsMnodeIpList.numOfIps = 1; tsMnodeIpSet.numOfIps = 1;
tsMnodeIpList.ip[0] = inet_addr(tsMasterIp); tsMnodeIpSet.ip[0] = inet_addr(tsMasterIp);
if (strcmp(tsSecondIp, tsMasterIp) != 0) { if (strcmp(tsSecondIp, tsMasterIp) != 0) {
tsMnodeIpList.numOfIps = 2; tsMnodeIpSet.numOfIps = 2;
tsMnodeIpList.ip[1] = inet_addr(tsSecondIp); tsMnodeIpSet.ip[1] = inet_addr(tsSecondIp);
} }
} else { } else {
tsMnodeIpList.inUse = tsMnodeInfos.inUse; tsMnodeIpSet.inUse = tsMnodeInfos.inUse;
tsMnodeIpList.numOfIps = tsMnodeInfos.nodeNum; tsMnodeIpSet.numOfIps = tsMnodeInfos.nodeNum;
tsMnodeIpList.port = tsMnodeInfos.nodeInfos[0].nodePort; tsMnodeIpSet.port = tsMnodeInfos.nodeInfos[0].nodePort;
for (int32_t i = 0; i < tsMnodeInfos.nodeNum; i++) { for (int32_t i = 0; i < tsMnodeInfos.nodeNum; i++) {
tsMnodeIpList.ip[i] = tsMnodeInfos.nodeInfos[i].nodeIp; tsMnodeIpSet.ip[i] = tsMnodeInfos.nodeInfos[i].nodeIp;
} }
} }
...@@ -88,6 +95,7 @@ int32_t dnodeInitMClient() { ...@@ -88,6 +95,7 @@ int32_t dnodeInitMClient() {
rpcInit.label = "DND-MC"; rpcInit.label = "DND-MC";
rpcInit.numOfThreads = 1; rpcInit.numOfThreads = 1;
rpcInit.cfp = dnodeProcessRspFromMnode; rpcInit.cfp = dnodeProcessRspFromMnode;
rpcInit.ufp = dnodeUpdateIpSet;
rpcInit.sessions = 100; rpcInit.sessions = 100;
rpcInit.connType = TAOS_CONN_CLIENT; rpcInit.connType = TAOS_CONN_CLIENT;
rpcInit.idleTime = tsShellActivityTimer * 2000; rpcInit.idleTime = tsShellActivityTimer * 2000;
...@@ -144,58 +152,68 @@ static void dnodeProcessStatusRsp(SRpcMsg *pMsg) { ...@@ -144,58 +152,68 @@ static void dnodeProcessStatusRsp(SRpcMsg *pMsg) {
} }
SDMStatusRsp *pStatusRsp = pMsg->pCont; SDMStatusRsp *pStatusRsp = pMsg->pCont;
SDMNodeInfos *mnodes = &pStatusRsp->mnodes; SDMMnodeInfos *pMnodes = &pStatusRsp->mnodes;
if (mnodes->nodeNum <= 0) { if (pMnodes->nodeNum <= 0) {
dError("status msg is invalid, num of ips is %d", mnodes->nodeNum); dError("status msg is invalid, num of ips is %d", pMnodes->nodeNum);
taosTmrReset(dnodeSendStatusMsg, tsStatusInterval * 1000, NULL, tsDnodeTmr, &tsStatusTimer); taosTmrReset(dnodeSendStatusMsg, tsStatusInterval * 1000, NULL, tsDnodeTmr, &tsStatusTimer);
return; return;
} }
SDnodeState *pState = &pStatusRsp->dnodeState; SDMDnodeCfg *pCfg = &pStatusRsp->dnodeCfg;
pState->numOfVnodes = htonl(pState->numOfVnodes); pCfg->numOfVnodes = htonl(pCfg->numOfVnodes);
pState->moduleStatus = htonl(pState->moduleStatus); pCfg->moduleStatus = htonl(pCfg->moduleStatus);
pState->createdTime = htonl(pState->createdTime); pCfg->dnodeId = htonl(pCfg->dnodeId);
pState->dnodeId = htonl(pState->dnodeId);
for (int32_t i = 0; i < pMnodes->nodeNum; ++i) {
dnodeProcessModuleStatus(pState->moduleStatus); SDMMnodeInfo *pMnodeInfo = &pMnodes->nodeInfos[i];
dnodeUpdateDnodeInfo(pState->dnodeId); pMnodeInfo->nodeId = htonl(pMnodeInfo->nodeId);
pMnodeInfo->nodeIp = htonl(pMnodeInfo->nodeIp);
SRpcIpSet mgmtIpSet = {0}; pMnodeInfo->nodePort = htons(pMnodeInfo->nodePort);
mgmtIpSet.inUse = mnodes->inUse; pMnodeInfo->syncPort = htons(pMnodeInfo->syncPort);
mgmtIpSet.numOfIps = mnodes->nodeNum;
mgmtIpSet.port = htons(mnodes->nodeInfos[0].nodePort);
for (int32_t i = 0; i < mnodes->nodeNum; i++) {
mgmtIpSet.ip[i] = htonl(mnodes->nodeInfos[i].nodeIp);
}
if (memcmp(&mgmtIpSet, &tsMnodeIpList, sizeof(SRpcIpSet)) != 0 || tsMnodeInfos.nodeNum == 0) {
memcpy(&tsMnodeIpList, &mgmtIpSet, sizeof(SRpcIpSet));
tsMnodeInfos.inUse = mnodes->inUse;
tsMnodeInfos.nodeNum = mnodes->nodeNum;
dPrint("mnode ip list is changed, numOfIps:%d inUse:%d", tsMnodeInfos.nodeNum, tsMnodeInfos.inUse);
for (int32_t i = 0; i < mnodes->nodeNum; i++) {
tsMnodeInfos.nodeInfos[i].nodeId = htonl(mnodes->nodeInfos[i].nodeId);
tsMnodeInfos.nodeInfos[i].nodeIp = htonl(mnodes->nodeInfos[i].nodeIp);
tsMnodeInfos.nodeInfos[i].nodePort = htons(mnodes->nodeInfos[i].nodePort);
strcpy(tsMnodeInfos.nodeInfos[i].nodeName, mnodes->nodeInfos[i].nodeName);
dPrint("mnode:%d, ip:%s:%u name:%s", tsMnodeInfos.nodeInfos[i].nodeId,
taosIpStr(tsMnodeInfos.nodeInfos[i].nodeIp), tsMnodeInfos.nodeInfos[i].nodePort,
tsMnodeInfos.nodeInfos[i].nodeName);
} }
dnodeSaveMnodeIpList();
sdbUpdateSync(); SDMVgroupAccess *pVgAcccess = pStatusRsp->vgAccess;
for (int32_t i = 0; i < pCfg->numOfVnodes; ++i) {
pVgAcccess[i].vgId = htonl(pVgAcccess[i].vgId);
} }
dnodeProcessModuleStatus(pCfg->moduleStatus);
dnodeUpdateDnodeCfg(pCfg);
dnodeUpdateMnodeInfos(pMnodes);
taosTmrReset(dnodeSendStatusMsg, tsStatusInterval * 1000, NULL, tsDnodeTmr, &tsStatusTimer); taosTmrReset(dnodeSendStatusMsg, tsStatusInterval * 1000, NULL, tsDnodeTmr, &tsStatusTimer);
} }
static void dnodeUpdateMnodeInfos(SDMMnodeInfos *pMnodes) {
bool mnodesChanged = (memcmp(&tsMnodeInfos, pMnodes, sizeof(SDMMnodeInfos)) != 0);
bool mnodesNotInit = (tsMnodeInfos.nodeNum == 0);
if (!(mnodesChanged || mnodesNotInit)) return;
memcpy(&tsMnodeInfos, pMnodes, sizeof(SDMMnodeInfos));
tsMnodeIpSet.inUse = tsMnodeInfos.inUse;
tsMnodeIpSet.numOfIps = tsMnodeInfos.nodeNum;
tsMnodeIpSet.port = tsMnodeInfos.nodeInfos[0].nodePort;
for (int32_t i = 0; i < tsMnodeInfos.nodeNum; i++) {
tsMnodeIpSet.ip[i] = tsMnodeInfos.nodeInfos[i].nodeIp;
}
dPrint("mnodes is changed, nodeNum:%d inUse:%d", tsMnodeInfos.nodeNum, tsMnodeInfos.inUse);
for (int32_t i = 0; i < tsMnodeInfos.nodeNum; i++) {
dPrint("mnode:%d, ip:%s:%u name:%s", tsMnodeInfos.nodeInfos[i].nodeId, taosIpStr(tsMnodeInfos.nodeInfos[i].nodeIp),
tsMnodeInfos.nodeInfos[i].nodePort, tsMnodeInfos.nodeInfos[i].nodeName);
}
dnodeSaveMnodeInfos();
sdbUpdateSync();
}
void dnodeSendMsgToMnode(SRpcMsg *rpcMsg) { void dnodeSendMsgToMnode(SRpcMsg *rpcMsg) {
if (tsDnodeMClientRpc) { if (tsDnodeMClientRpc) {
rpcSendRequest(tsDnodeMClientRpc, &tsMnodeIpList, rpcMsg); rpcSendRequest(tsDnodeMClientRpc, &tsMnodeIpSet, rpcMsg);
} }
} }
static bool dnodeReadMnodeIpList() { static bool dnodeReadMnodeInfos() {
char ipFile[TSDB_FILENAME_LEN] = {0}; char ipFile[TSDB_FILENAME_LEN] = {0};
sprintf(ipFile, "%s/mgmtIpList.json", tsDnodeDir); sprintf(ipFile, "%s/mgmtIpList.json", tsDnodeDir);
FILE *fp = fopen(ipFile, "r"); FILE *fp = fopen(ipFile, "r");
...@@ -272,8 +290,15 @@ static bool dnodeReadMnodeIpList() { ...@@ -272,8 +290,15 @@ static bool dnodeReadMnodeIpList() {
} }
tsMnodeInfos.nodeInfos[i].nodePort = (uint16_t)nodePort->valueint; tsMnodeInfos.nodeInfos[i].nodePort = (uint16_t)nodePort->valueint;
cJSON *syncPort = cJSON_GetObjectItem(nodeInfo, "syncPort");
if (!syncPort || syncPort->type != cJSON_Number) {
dError("failed to read mnode mgmtIpList.json, syncPort not found");
goto PARSE_OVER;
}
tsMnodeInfos.nodeInfos[i].syncPort = (uint16_t)syncPort->valueint;
cJSON *nodeName = cJSON_GetObjectItem(nodeInfo, "nodeName"); cJSON *nodeName = cJSON_GetObjectItem(nodeInfo, "nodeName");
if (!nodeIp || nodeName->type != cJSON_String || nodeName->valuestring == NULL) { if (!nodeName || nodeName->type != cJSON_String || nodeName->valuestring == NULL) {
dError("failed to read mnode mgmtIpList.json, nodeName not found"); dError("failed to read mnode mgmtIpList.json, nodeName not found");
goto PARSE_OVER; goto PARSE_OVER;
} }
...@@ -285,7 +310,7 @@ static bool dnodeReadMnodeIpList() { ...@@ -285,7 +310,7 @@ static bool dnodeReadMnodeIpList() {
dPrint("read mnode iplist successed, numOfIps:%d inUse:%d", tsMnodeInfos.nodeNum, tsMnodeInfos.inUse); dPrint("read mnode iplist successed, numOfIps:%d inUse:%d", tsMnodeInfos.nodeNum, tsMnodeInfos.inUse);
for (int32_t i = 0; i < tsMnodeInfos.nodeNum; i++) { for (int32_t i = 0; i < tsMnodeInfos.nodeNum; i++) {
dPrint("mnode:%d, ip:%s:%u name:%s", tsMnodeInfos.nodeInfos[i].nodeId, dPrint("mnode:%d, ip:%s:%u name:%s", tsMnodeInfos.nodeInfos[i].nodeId,
taosIpStr(tsMnodeInfos.nodeInfos[i].nodeId), tsMnodeInfos.nodeInfos[i].nodePort, taosIpStr(tsMnodeInfos.nodeInfos[i].nodeIp), tsMnodeInfos.nodeInfos[i].nodePort,
tsMnodeInfos.nodeInfos[i].nodeName); tsMnodeInfos.nodeInfos[i].nodeName);
} }
...@@ -296,7 +321,7 @@ PARSE_OVER: ...@@ -296,7 +321,7 @@ PARSE_OVER:
return ret; return ret;
} }
static void dnodeSaveMnodeIpList() { static void dnodeSaveMnodeInfos() {
char ipFile[TSDB_FILENAME_LEN] = {0}; char ipFile[TSDB_FILENAME_LEN] = {0};
sprintf(ipFile, "%s/mgmtIpList.json", tsDnodeDir); sprintf(ipFile, "%s/mgmtIpList.json", tsDnodeDir);
FILE *fp = fopen(ipFile, "w"); FILE *fp = fopen(ipFile, "w");
...@@ -314,6 +339,7 @@ static void dnodeSaveMnodeIpList() { ...@@ -314,6 +339,7 @@ static void dnodeSaveMnodeIpList() {
len += snprintf(content + len, maxLen - len, " \"nodeId\": %d,\n", tsMnodeInfos.nodeInfos[i].nodeId); len += snprintf(content + len, maxLen - len, " \"nodeId\": %d,\n", tsMnodeInfos.nodeInfos[i].nodeId);
len += snprintf(content + len, maxLen - len, " \"nodeIp\": \"%s\",\n", taosIpStr(tsMnodeInfos.nodeInfos[i].nodeIp)); len += snprintf(content + len, maxLen - len, " \"nodeIp\": \"%s\",\n", taosIpStr(tsMnodeInfos.nodeInfos[i].nodeIp));
len += snprintf(content + len, maxLen - len, " \"nodePort\": %u,\n", tsMnodeInfos.nodeInfos[i].nodePort); len += snprintf(content + len, maxLen - len, " \"nodePort\": %u,\n", tsMnodeInfos.nodeInfos[i].nodePort);
len += snprintf(content + len, maxLen - len, " \"syncPort\": %u,\n", tsMnodeInfos.nodeInfos[i].syncPort);
len += snprintf(content + len, maxLen - len, " \"nodeName\": \"%s\"\n", tsMnodeInfos.nodeInfos[i].nodeName); len += snprintf(content + len, maxLen - len, " \"nodeName\": \"%s\"\n", tsMnodeInfos.nodeInfos[i].nodeName);
if (i < tsMnodeInfos.nodeNum -1) { if (i < tsMnodeInfos.nodeNum -1) {
len += snprintf(content + len, maxLen - len, " },{\n"); len += snprintf(content + len, maxLen - len, " },{\n");
...@@ -331,10 +357,10 @@ static void dnodeSaveMnodeIpList() { ...@@ -331,10 +357,10 @@ static void dnodeSaveMnodeIpList() {
} }
uint32_t dnodeGetMnodeMasteIp() { uint32_t dnodeGetMnodeMasteIp() {
return tsMnodeIpList.ip[tsMnodeIpList.inUse]; return tsMnodeIpSet.ip[tsMnodeIpSet.inUse];
} }
void* dnodeGetMnodeList() { void* dnodeGetMnodeInfos() {
return &tsMnodeInfos; return &tsMnodeInfos;
} }
...@@ -358,9 +384,9 @@ static void dnodeSendStatusMsg(void *handle, void *tmrId) { ...@@ -358,9 +384,9 @@ static void dnodeSendStatusMsg(void *handle, void *tmrId) {
return; return;
} }
strcpy(pStatus->dnodeName, tsDnodeName); //strcpy(pStatus->dnodeName, tsDnodeName);
pStatus->version = htonl(tsVersion); pStatus->version = htonl(tsVersion);
pStatus->dnodeId = htonl(tsDnodeId); pStatus->dnodeId = htonl(tsDnodeCfg.dnodeId);
pStatus->privateIp = htonl(inet_addr(tsPrivateIp)); pStatus->privateIp = htonl(inet_addr(tsPrivateIp));
pStatus->publicIp = htonl(inet_addr(tsPublicIp)); pStatus->publicIp = htonl(inet_addr(tsPublicIp));
pStatus->lastReboot = htonl(tsRebootTime); pStatus->lastReboot = htonl(tsRebootTime);
...@@ -382,47 +408,81 @@ static void dnodeSendStatusMsg(void *handle, void *tmrId) { ...@@ -382,47 +408,81 @@ static void dnodeSendStatusMsg(void *handle, void *tmrId) {
dnodeSendMsgToMnode(&rpcMsg); dnodeSendMsgToMnode(&rpcMsg);
} }
static void dnodeReadDnodeInfo() { static bool dnodeReadDnodeCfg() {
char dnodeIdFile[TSDB_FILENAME_LEN] = {0}; char dnodeCfgFile[TSDB_FILENAME_LEN] = {0};
sprintf(dnodeIdFile, "%s/dnodeId", tsDnodeDir); sprintf(dnodeCfgFile, "%s/dnodeCfg.json", tsDnodeDir);
FILE *fp = fopen(dnodeIdFile, "r"); FILE *fp = fopen(dnodeCfgFile, "r");
if (!fp) return; if (!fp) {
dTrace("failed to read dnodeCfg.json, file not exist");
return false;
}
char option[32] = {0}; bool ret = false;
int32_t value = 0; int maxLen = 100;
int32_t num = 0; char *content = calloc(1, maxLen + 1);
int len = fread(content, 1, maxLen, fp);
if (len <= 0) {
free(content);
fclose(fp);
dError("failed to read dnodeCfg.json, content is null");
return false;
}
num = fscanf(fp, "%s %d", option, &value); cJSON* root = cJSON_Parse(content);
if (num != 2) return; if (root == NULL) {
if (strcmp(option, "dnodeId") != 0) return; dError("failed to read dnodeCfg.json, invalid json format");
tsDnodeId = value;; goto PARSE_CFG_OVER;
}
cJSON* dnodeId = cJSON_GetObjectItem(root, "dnodeId");
if (!dnodeId || dnodeId->type != cJSON_Number) {
dError("failed to read dnodeCfg.json, dnodeId not found");
goto PARSE_CFG_OVER;
}
tsDnodeCfg.dnodeId = dnodeId->valueint;
ret = true;
dPrint("read numOfVnodes successed, dnodeId:%d", tsDnodeCfg.dnodeId);
PARSE_CFG_OVER:
free(content);
cJSON_Delete(root);
fclose(fp); fclose(fp);
dPrint("read dnodeId:%d successed", tsDnodeId); return ret;
} }
static void dnodeSaveDnodeInfo() { static void dnodeSaveDnodeCfg() {
char dnodeIdFile[TSDB_FILENAME_LEN] = {0}; char dnodeCfgFile[TSDB_FILENAME_LEN] = {0};
sprintf(dnodeIdFile, "%s/dnodeId", tsDnodeDir); sprintf(dnodeCfgFile, "%s/dnodeCfg.json", tsDnodeDir);
FILE *fp = fopen(dnodeIdFile, "w"); FILE *fp = fopen(dnodeCfgFile, "w");
if (!fp) return; if (!fp) return;
fprintf(fp, "dnodeId %d\n", tsDnodeId); int32_t len = 0;
int32_t maxLen = 100;
char * content = calloc(1, maxLen + 1);
len += snprintf(content + len, maxLen - len, "{\n");
len += snprintf(content + len, maxLen - len, " \"dnodeId\": %d\n", tsDnodeCfg.dnodeId);
len += snprintf(content + len, maxLen - len, "}\n");
fwrite(content, 1, len, fp);
fclose(fp); fclose(fp);
free(content);
dPrint("save dnodeId successed"); dPrint("save dnodeId successed");
} }
void dnodeUpdateDnodeInfo(int32_t dnodeId) { void dnodeUpdateDnodeCfg(SDMDnodeCfg *pCfg) {
if (tsDnodeId == 0) { if (tsDnodeCfg.dnodeId == 0) {
dPrint("dnodeId is set to %d", dnodeId); dPrint("dnodeId is set to %d", pCfg->dnodeId);
tsDnodeId = dnodeId; tsDnodeCfg.dnodeId = pCfg->dnodeId;
dnodeSaveDnodeInfo(); dnodeSaveDnodeCfg();
} }
} }
int32_t dnodeGetDnodeId() { int32_t dnodeGetDnodeId() {
return tsDnodeId; return tsDnodeCfg.dnodeId;
} }
\ No newline at end of file
src/dnode/src/dnodeMgmt.c
浏览文件 @ 59a77a36
...@@ -33,7 +33,6 @@ static int32_t dnodeOpenVnodes(); ...@@ -33,7 +33,6 @@ static int32_t dnodeOpenVnodes();
static void dnodeCloseVnodes(); static void dnodeCloseVnodes();
static int32_t dnodeProcessCreateVnodeMsg(SRpcMsg *pMsg); static int32_t dnodeProcessCreateVnodeMsg(SRpcMsg *pMsg);
static int32_t dnodeProcessDropVnodeMsg(SRpcMsg *pMsg); static int32_t dnodeProcessDropVnodeMsg(SRpcMsg *pMsg);
static int32_t dnodeProcessAlterVnodeMsg(SRpcMsg *pMsg);
static int32_t dnodeProcessAlterStreamMsg(SRpcMsg *pMsg); static int32_t dnodeProcessAlterStreamMsg(SRpcMsg *pMsg);
static int32_t dnodeProcessConfigDnodeMsg(SRpcMsg *pMsg); static int32_t dnodeProcessConfigDnodeMsg(SRpcMsg *pMsg);
static int32_t (*dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MAX])(SRpcMsg *pMsg); static int32_t (*dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MAX])(SRpcMsg *pMsg);
...@@ -41,7 +40,6 @@ static int32_t (*dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MAX])(SRpcMsg *pMsg); ...@@ -41,7 +40,6 @@ static int32_t (*dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MAX])(SRpcMsg *pMsg);
int32_t dnodeInitMgmt() { int32_t dnodeInitMgmt() {
dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_CREATE_VNODE] = dnodeProcessCreateVnodeMsg; dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_CREATE_VNODE] = dnodeProcessCreateVnodeMsg;
dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_DROP_VNODE] = dnodeProcessDropVnodeMsg; dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_DROP_VNODE] = dnodeProcessDropVnodeMsg;
dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_ALTER_VNODE] = dnodeProcessAlterVnodeMsg;
dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_ALTER_STREAM] = dnodeProcessAlterStreamMsg; dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_ALTER_STREAM] = dnodeProcessAlterStreamMsg;
dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_CONFIG_DNODE] = dnodeProcessConfigDnodeMsg; dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_CONFIG_DNODE] = dnodeProcessConfigDnodeMsg;
...@@ -130,24 +128,30 @@ static void dnodeCloseVnodes() { ...@@ -130,24 +128,30 @@ static void dnodeCloseVnodes() {
static int32_t dnodeProcessCreateVnodeMsg(SRpcMsg *rpcMsg) { static int32_t dnodeProcessCreateVnodeMsg(SRpcMsg *rpcMsg) {
SMDCreateVnodeMsg *pCreate = rpcMsg->pCont; SMDCreateVnodeMsg *pCreate = rpcMsg->pCont;
pCreate->cfg.vgId = htonl(pCreate->cfg.vgId); pCreate->cfg.vgId = htonl(pCreate->cfg.vgId);
pCreate->cfg.maxSessions = htonl(pCreate->cfg.maxSessions); pCreate->cfg.maxTables = htonl(pCreate->cfg.maxTables);
pCreate->cfg.cacheBlockSize = htonl(pCreate->cfg.cacheBlockSize); pCreate->cfg.maxCacheSize = htobe64(pCreate->cfg.maxCacheSize);
pCreate->cfg.minRowsPerFileBlock = htonl(pCreate->cfg.minRowsPerFileBlock);
pCreate->cfg.maxRowsPerFileBlock = htonl(pCreate->cfg.maxRowsPerFileBlock);
pCreate->cfg.daysPerFile = htonl(pCreate->cfg.daysPerFile); pCreate->cfg.daysPerFile = htonl(pCreate->cfg.daysPerFile);
pCreate->cfg.daysToKeep1 = htonl(pCreate->cfg.daysToKeep1); pCreate->cfg.daysToKeep1 = htonl(pCreate->cfg.daysToKeep1);
pCreate->cfg.daysToKeep2 = htonl(pCreate->cfg.daysToKeep2); pCreate->cfg.daysToKeep2 = htonl(pCreate->cfg.daysToKeep2);
pCreate->cfg.daysToKeep = htonl(pCreate->cfg.daysToKeep); pCreate->cfg.daysToKeep = htonl(pCreate->cfg.daysToKeep);
pCreate->cfg.commitTime = htonl(pCreate->cfg.commitTime); pCreate->cfg.commitTime = htonl(pCreate->cfg.commitTime);
pCreate->cfg.rowsInFileBlock = htonl(pCreate->cfg.rowsInFileBlock); pCreate->cfg.arbitratorIp = htonl(pCreate->cfg.arbitratorIp);
pCreate->cfg.blocksPerTable = htons(pCreate->cfg.blocksPerTable);
pCreate->cfg.cacheNumOfBlocks.totalBlocks = htonl(pCreate->cfg.cacheNumOfBlocks.totalBlocks);
for (int32_t j = 0; j < pCreate->cfg.replications; ++j) { for (int32_t j = 0; j < pCreate->cfg.replications; ++j) {
pCreate->vpeerDesc[j].vgId = htonl(pCreate->vpeerDesc[j].vgId); pCreate->nodes[j].nodeId = htonl(pCreate->nodes[j].nodeId);
pCreate->vpeerDesc[j].dnodeId = htonl(pCreate->vpeerDesc[j].dnodeId); pCreate->nodes[j].nodeIp = htonl(pCreate->nodes[j].nodeIp);
pCreate->vpeerDesc[j].ip = htonl(pCreate->vpeerDesc[j].ip);
} }
void *pVnode = vnodeAccquireVnode(pCreate->cfg.vgId);
if (pVnode != NULL) {
int32_t code = vnodeAlter(pVnode, pCreate);
vnodeRelease(pVnode);
return code;
} else {
return vnodeCreate(pCreate); return vnodeCreate(pCreate);
}
} }
static int32_t dnodeProcessDropVnodeMsg(SRpcMsg *rpcMsg) { static int32_t dnodeProcessDropVnodeMsg(SRpcMsg *rpcMsg) {
...@@ -157,15 +161,6 @@ static int32_t dnodeProcessDropVnodeMsg(SRpcMsg *rpcMsg) { ...@@ -157,15 +161,6 @@ static int32_t dnodeProcessDropVnodeMsg(SRpcMsg *rpcMsg) {
return vnodeDrop(pDrop->vgId); return vnodeDrop(pDrop->vgId);
} }
static int32_t dnodeProcessAlterVnodeMsg(SRpcMsg *rpcMsg) {
SMDCreateVnodeMsg *pCreate = rpcMsg->pCont;
pCreate->cfg.vgId = htonl(pCreate->cfg.vgId);
pCreate->cfg.maxSessions = htonl(pCreate->cfg.maxSessions);
pCreate->cfg.daysPerFile = htonl(pCreate->cfg.daysPerFile);
return 0;
}
static int32_t dnodeProcessAlterStreamMsg(SRpcMsg *pMsg) { static int32_t dnodeProcessAlterStreamMsg(SRpcMsg *pMsg) {
// SMDAlterStreamMsg *pStream = pCont; // SMDAlterStreamMsg *pStream = pCont;
// pStream->uid = htobe64(pStream->uid); // pStream->uid = htobe64(pStream->uid);
......
src/dnode/src/dnodeMnode.c
浏览文件 @ 59a77a36
...@@ -33,7 +33,6 @@ int32_t dnodeInitMnode() { ...@@ -33,7 +33,6 @@ int32_t dnodeInitMnode() {
dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_DROP_STABLE] = dnodeWrite; dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_DROP_STABLE] = dnodeWrite;
dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_CREATE_VNODE] = dnodeMgmt; dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_CREATE_VNODE] = dnodeMgmt;
dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_DROP_VNODE] = dnodeMgmt; dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_DROP_VNODE] = dnodeMgmt;
dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_ALTER_VNODE] = dnodeMgmt;
dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_ALTER_STREAM] = dnodeMgmt; dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_ALTER_STREAM] = dnodeMgmt;
dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_CONFIG_DNODE] = dnodeMgmt; dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_CONFIG_DNODE] = dnodeMgmt;
......
src/inc/dnode.h
浏览文件 @ 59a77a36
...@@ -43,7 +43,7 @@ void dnodeSendRpcWriteRsp(void *pVnode, void *param, int32_t code); ...@@ -43,7 +43,7 @@ void dnodeSendRpcWriteRsp(void *pVnode, void *param, int32_t code);
bool dnodeIsFirstDeploy(); bool dnodeIsFirstDeploy();
uint32_t dnodeGetMnodeMasteIp(); uint32_t dnodeGetMnodeMasteIp();
void * dnodeGetMnodeList(); void * dnodeGetMnodeInfos();
int32_t dnodeGetDnodeId(); int32_t dnodeGetDnodeId();
#ifdef __cplusplus #ifdef __cplusplus
......
src/inc/taoserror.h
浏览文件 @ 59a77a36
...@@ -75,14 +75,19 @@ TAOS_DEFINE_ERROR(TSDB_CODE_NOT_CONFIGURED, 0, 27, "not configured") ...@@ -75,14 +75,19 @@ TAOS_DEFINE_ERROR(TSDB_CODE_NOT_CONFIGURED, 0, 27, "not configured")
TAOS_DEFINE_ERROR(TSDB_CODE_NODE_OFFLINE, 0, 28, "node offline") TAOS_DEFINE_ERROR(TSDB_CODE_NODE_OFFLINE, 0, 28, "node offline")
TAOS_DEFINE_ERROR(TSDB_CODE_NETWORK_UNAVAIL, 0, 29, "network unavailable") TAOS_DEFINE_ERROR(TSDB_CODE_NETWORK_UNAVAIL, 0, 29, "network unavailable")
// db & user // db
TAOS_DEFINE_ERROR(TSDB_CODE_DB_NOT_SELECTED, 0, 100, "db not selected") TAOS_DEFINE_ERROR(TSDB_CODE_DB_NOT_SELECTED, 0, 100, "db not selected")
TAOS_DEFINE_ERROR(TSDB_CODE_DB_ALREADY_EXIST, 0, 101, "database aleady exist") TAOS_DEFINE_ERROR(TSDB_CODE_DB_ALREADY_EXIST, 0, 101, "database aleady exist")
TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_DB, 0, 102, "invalid database") TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_DB, 0, 102, "invalid database")
TAOS_DEFINE_ERROR(TSDB_CODE_MONITOR_DB_FORBIDDEN, 0, 103, "monitor db forbidden") TAOS_DEFINE_ERROR(TSDB_CODE_MONITOR_DB_FORBIDDEN, 0, 103, "monitor db forbidden")
TAOS_DEFINE_ERROR(TSDB_CODE_USER_ALREADY_EXIST, 0, 104, "user already exist")
TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_USER, 0, 105, "invalid user") // user
TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_PASS, 0, 106, "invalid password") TAOS_DEFINE_ERROR(TSDB_CODE_USER_ALREADY_EXIST, 0, 150, "user already exist")
TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_USER, 0, 151, "invalid user")
TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_PASS, 0, 152, "invalid password")
TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_USER_FORMAT, 0, 153, "invalid user format")
TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_PASS_FORMAT, 0, 154, "invalid password format")
TAOS_DEFINE_ERROR(TSDB_CODE_NO_USER_FROM_CONN, 0, 155, "can not get user from conn")
// table // table
TAOS_DEFINE_ERROR(TSDB_CODE_TABLE_ALREADY_EXIST, 0, 200, "table already exist") TAOS_DEFINE_ERROR(TSDB_CODE_TABLE_ALREADY_EXIST, 0, 200, "table already exist")
......
src/inc/taosmsg.h
浏览文件 @ 59a77a36
...@@ -48,14 +48,12 @@ extern "C" { ...@@ -48,14 +48,12 @@ extern "C" {
#define TSDB_MSG_TYPE_MD_CREATE_VNODE_RSP 16 #define TSDB_MSG_TYPE_MD_CREATE_VNODE_RSP 16
#define TSDB_MSG_TYPE_MD_DROP_VNODE 17 #define TSDB_MSG_TYPE_MD_DROP_VNODE 17
#define TSDB_MSG_TYPE_MD_DROP_VNODE_RSP 18 #define TSDB_MSG_TYPE_MD_DROP_VNODE_RSP 18
#define TSDB_MSG_TYPE_MD_ALTER_VNODE 19 #define TSDB_MSG_TYPE_MD_DROP_STABLE 19
#define TSDB_MSG_TYPE_MD_ALTER_VNODE_RSP 20 #define TSDB_MSG_TYPE_MD_DROP_STABLE_RSP 20
#define TSDB_MSG_TYPE_MD_DROP_STABLE 21 #define TSDB_MSG_TYPE_MD_ALTER_STREAM 21
#define TSDB_MSG_TYPE_MD_DROP_STABLE_RSP 22 #define TSDB_MSG_TYPE_MD_ALTER_STREAM_RSP 22
#define TSDB_MSG_TYPE_MD_ALTER_STREAM 23 #define TSDB_MSG_TYPE_MD_CONFIG_DNODE 23
#define TSDB_MSG_TYPE_MD_ALTER_STREAM_RSP 24 #define TSDB_MSG_TYPE_MD_CONFIG_DNODE_RSP 24
#define TSDB_MSG_TYPE_MD_CONFIG_DNODE 25
#define TSDB_MSG_TYPE_MD_CONFIG_DNODE_RSP 26
// message from client to mnode // message from client to mnode
#define TSDB_MSG_TYPE_CM_CONNECT 31 #define TSDB_MSG_TYPE_CM_CONNECT 31
...@@ -245,12 +243,6 @@ typedef struct SSchema { ...@@ -245,12 +243,6 @@ typedef struct SSchema {
int16_t bytes; int16_t bytes;
} SSchema; } SSchema;
typedef struct {
int32_t vgId;
int32_t dnodeId;
uint32_t ip;
} SVnodeDesc;
typedef struct { typedef struct {
int32_t contLen; int32_t contLen;
int32_t vgId; int32_t vgId;
...@@ -518,18 +510,10 @@ typedef struct { ...@@ -518,18 +510,10 @@ typedef struct {
uint8_t status; uint8_t status;
uint8_t role; uint8_t role;
uint8_t accessState; uint8_t accessState;
uint8_t replica;
uint8_t reserved[5]; uint8_t reserved[5];
} SVnodeLoad; } SVnodeLoad;
typedef struct {
uint32_t vnode;
uint8_t accessState;
uint8_t reserved[3];
} SVnodeAccess;
/*
* NOTE: sizeof(SVnodeCfg) < TSDB_FILE_HEADER_LEN / 4
*/
typedef struct { typedef struct {
char acct[TSDB_USER_LEN + 1]; char acct[TSDB_USER_LEN + 1];
char db[TSDB_DB_NAME_LEN + 1]; char db[TSDB_DB_NAME_LEN + 1];
...@@ -554,7 +538,7 @@ typedef struct { ...@@ -554,7 +538,7 @@ typedef struct {
int8_t loadLatest; // load into mem or not int8_t loadLatest; // load into mem or not
uint8_t precision; // time resolution uint8_t precision; // time resolution
int8_t reserved[16]; int8_t reserved[16];
} SVnodeCfg, SDbCfg, SCMCreateDbMsg, SCMAlterDbMsg; } SDbCfg, SCMCreateDbMsg, SCMAlterDbMsg;
typedef struct { typedef struct {
char db[TSDB_TABLE_ID_LEN + 1]; char db[TSDB_TABLE_ID_LEN + 1];
...@@ -571,12 +555,30 @@ typedef struct { ...@@ -571,12 +555,30 @@ typedef struct {
char reserved[64]; char reserved[64];
} SVnodeStatisticInfo; } SVnodeStatisticInfo;
typedef struct {
int32_t vgId;
int8_t accessState;
} SDMVgroupAccess;
typedef struct { typedef struct {
int32_t dnodeId; int32_t dnodeId;
uint32_t moduleStatus; uint32_t moduleStatus;
uint32_t createdTime;
uint32_t numOfVnodes; uint32_t numOfVnodes;
} SDnodeState; } SDMDnodeCfg;
typedef struct {
int32_t nodeId;
uint32_t nodeIp;
uint16_t nodePort;
uint16_t syncPort;
char nodeName[TSDB_NODE_NAME_LEN + 1];
} SDMMnodeInfo;
typedef struct {
int8_t inUse;
int8_t nodeNum;
SDMMnodeInfo nodeInfos[TSDB_MAX_MPEERS];
} SDMMnodeInfos;
typedef struct { typedef struct {
uint32_t version; uint32_t version;
...@@ -596,27 +598,41 @@ typedef struct { ...@@ -596,27 +598,41 @@ typedef struct {
} SDMStatusMsg; } SDMStatusMsg;
typedef struct { typedef struct {
int32_t nodeId; SDMMnodeInfos mnodes;
uint32_t nodeIp; SDMDnodeCfg dnodeCfg;
uint16_t nodePort; SDMVgroupAccess vgAccess[];
char nodeName[TSDB_NODE_NAME_LEN + 1]; } SDMStatusRsp;
} SDMNodeInfo;
typedef struct { typedef struct {
int8_t inUse; uint32_t vgId;
int8_t nodeNum; int32_t maxTables;
SDMNodeInfo nodeInfos[TSDB_MAX_MPEERS]; int64_t maxCacheSize;
} SDMNodeInfos; int32_t minRowsPerFileBlock;
int32_t maxRowsPerFileBlock;
int32_t daysPerFile;
int32_t daysToKeep;
int32_t daysToKeep1;
int32_t daysToKeep2;
int32_t commitTime;
uint8_t precision; // time resolution
int8_t compression;
int8_t wals;
int8_t commitLog;
int8_t replications;
int8_t quorum;
uint32_t arbitratorIp;
int8_t reserved[16];
} SMDVnodeCfg;
typedef struct { typedef struct {
SDMNodeInfos mnodes; int32_t nodeId;
SDnodeState dnodeState; uint32_t nodeIp;
SVnodeAccess vnodeAccess[]; char nodeName[TSDB_NODE_NAME_LEN + 1];
} SDMStatusRsp; } SMDVnodeDesc;
typedef struct { typedef struct {
SVnodeCfg cfg; SMDVnodeCfg cfg;
SVnodeDesc vpeerDesc[TSDB_MAX_MPEERS]; SMDVnodeDesc nodes[TSDB_MAX_MPEERS];
} SMDCreateVnodeMsg; } SMDCreateVnodeMsg;
typedef struct { typedef struct {
...@@ -674,9 +690,16 @@ typedef struct { ...@@ -674,9 +690,16 @@ typedef struct {
int32_t metaElem[TSDB_MAX_JOIN_TABLE_NUM]; int32_t metaElem[TSDB_MAX_JOIN_TABLE_NUM];
} SSuperTableMetaMsg; } SSuperTableMetaMsg;
typedef struct {
int32_t nodeId;
uint32_t nodeIp;
uint16_t nodePort;
} SVnodeDesc;
typedef struct { typedef struct {
SVnodeDesc vpeerDesc[TSDB_REPLICA_MAX_NUM]; SVnodeDesc vpeerDesc[TSDB_REPLICA_MAX_NUM];
int16_t index; // used locally int16_t index; // used locally
int32_t vgId;
int32_t numOfSids; int32_t numOfSids;
int32_t pSidExtInfoList[]; // offset value of STableIdInfo int32_t pSidExtInfoList[]; // offset value of STableIdInfo
} SVnodeSidList; } SVnodeSidList;
......
src/inc/tsync.h
浏览文件 @ 59a77a36
...@@ -104,10 +104,10 @@ extern char *syncRole[]; ...@@ -104,10 +104,10 @@ extern char *syncRole[];
extern int tsMaxSyncNum; extern int tsMaxSyncNum;
extern int tsSyncTcpThreads; extern int tsSyncTcpThreads;
extern int tsMaxWatchFiles; extern int tsMaxWatchFiles;
extern short tsSyncPort;
extern int tsSyncTimer; extern int tsSyncTimer;
extern int tsMaxFwdInfo; extern int tsMaxFwdInfo;
extern int sDebugFlag; extern int sDebugFlag;
extern uint16_t tsSyncPort;
#ifdef __cplusplus #ifdef __cplusplus
} }
......
src/inc/vnode.h
浏览文件 @ 59a77a36
...@@ -38,6 +38,7 @@ typedef struct { ...@@ -38,6 +38,7 @@ typedef struct {
int32_t vnodeCreate(SMDCreateVnodeMsg *pVnodeCfg); int32_t vnodeCreate(SMDCreateVnodeMsg *pVnodeCfg);
int32_t vnodeDrop(int32_t vgId); int32_t vnodeDrop(int32_t vgId);
int32_t vnodeOpen(int32_t vgId, char *rootDir); int32_t vnodeOpen(int32_t vgId, char *rootDir);
int32_t vnodeAlter(void *pVnode, SMDCreateVnodeMsg *pVnodeCfg);
int32_t vnodeClose(int32_t vgId); int32_t vnodeClose(int32_t vgId);
void vnodeRelease(void *pVnode); void vnodeRelease(void *pVnode);
......
src/mnode/inc/mgmtAcct.h
浏览文件 @ 59a77a36
...@@ -24,10 +24,10 @@ extern "C" { ...@@ -24,10 +24,10 @@ extern "C" {
int32_t mgmtInitAccts(); int32_t mgmtInitAccts();
void mgmtCleanUpAccts(); void mgmtCleanUpAccts();
void *mgmtGetAcct(char *acctName); void * mgmtGetAcct(char *acctName);
void * mgmtGetNextAcct(void *pNode, SAcctObj **pAcct);
void mgmtIncAcctRef(SAcctObj *pAcct); void mgmtIncAcctRef(SAcctObj *pAcct);
void mgmtDecAcctRef(SAcctObj *pAcct); void mgmtDecAcctRef(SAcctObj *pAcct);
void mgmtAddDbToAcct(SAcctObj *pAcct, SDbObj *pDb); void mgmtAddDbToAcct(SAcctObj *pAcct, SDbObj *pDb);
void mgmtDropDbFromAcct(SAcctObj *pAcct, SDbObj *pDb); void mgmtDropDbFromAcct(SAcctObj *pAcct, SDbObj *pDb);
void mgmtAddUserToAcct(SAcctObj *pAcct, SUserObj *pUser); void mgmtAddUserToAcct(SAcctObj *pAcct, SUserObj *pUser);
......
src/mnode/inc/mgmtDef.h
浏览文件 @ 59a77a36
...@@ -51,7 +51,6 @@ typedef struct SDnodeObj { ...@@ -51,7 +51,6 @@ typedef struct SDnodeObj {
int8_t reserved[15]; int8_t reserved[15];
int8_t updateEnd[1]; int8_t updateEnd[1];
int32_t refCount; int32_t refCount;
SVnodeLoad vload[TSDB_MAX_VNODES];
uint32_t moduleStatus; uint32_t moduleStatus;
uint32_t lastReboot; // time stamp for last reboot uint32_t lastReboot; // time stamp for last reboot
float score; // calc in balance function float score; // calc in balance function
...@@ -72,13 +71,6 @@ typedef struct SMnodeObj { ...@@ -72,13 +71,6 @@ typedef struct SMnodeObj {
SDnodeObj *pDnode; SDnodeObj *pDnode;
} SMnodeObj; } SMnodeObj;
typedef struct {
int32_t dnodeId;
uint32_t privateIp;
uint32_t publicIp;
} SVnodeGid;
typedef struct { typedef struct {
char tableId[TSDB_TABLE_ID_LEN + 1]; char tableId[TSDB_TABLE_ID_LEN + 1];
int8_t type; int8_t type;
...@@ -120,6 +112,13 @@ typedef struct { ...@@ -120,6 +112,13 @@ typedef struct {
SSuperTableObj *superTable; SSuperTableObj *superTable;
} SChildTableObj; } SChildTableObj;
typedef struct {
int32_t dnodeId;
int8_t role;
int8_t reserved[3];
SDnodeObj* pDnode;
} SVnodeGid;
typedef struct SVgObj { typedef struct SVgObj {
uint32_t vgId; uint32_t vgId;
char dbName[TSDB_DB_NAME_LEN + 1]; char dbName[TSDB_DB_NAME_LEN + 1];
...@@ -136,8 +135,11 @@ typedef struct SVgObj { ...@@ -136,8 +135,11 @@ typedef struct SVgObj {
struct SVgObj *prev, *next; struct SVgObj *prev, *next;
struct SDbObj *pDb; struct SDbObj *pDb;
int32_t numOfTables; int32_t numOfTables;
int64_t totalStorage;
int64_t compStorage;
int64_t pointsWritten;
void * idPool; void * idPool;
SChildTableObj ** tableList; SChildTableObj **tableList;
} SVgObj; } SVgObj;
typedef struct SDbObj { typedef struct SDbObj {
......
src/mnode/inc/mgmtDnode.h
浏览文件 @ 59a77a36
...@@ -35,12 +35,15 @@ void mgmtMonitorDnodeModule(); ...@@ -35,12 +35,15 @@ void mgmtMonitorDnodeModule();
int32_t mgmtGetDnodesNum(); int32_t mgmtGetDnodesNum();
void * mgmtGetNextDnode(void *pNode, SDnodeObj **pDnode); void * mgmtGetNextDnode(void *pNode, SDnodeObj **pDnode);
void mgmtReleaseDnode(SDnodeObj *pDnode); void mgmtIncDnodeRef(SDnodeObj *pDnode);
void mgmtDecDnodeRef(SDnodeObj *pDnode);
void * mgmtGetDnode(int32_t dnodeId); void * mgmtGetDnode(int32_t dnodeId);
void * mgmtGetDnodeByIp(uint32_t ip); void * mgmtGetDnodeByIp(uint32_t ip);
void mgmtUpdateDnode(SDnodeObj *pDnode); void mgmtUpdateDnode(SDnodeObj *pDnode);
int32_t mgmtDropDnode(SDnodeObj *pDnode); int32_t mgmtDropDnode(SDnodeObj *pDnode);
extern int32_t tsAccessSquence;
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
......
src/mnode/inc/mgmtMnode.h
浏览文件 @ 59a77a36
...@@ -40,8 +40,8 @@ void * mgmtGetNextMnode(void *pNode, struct SMnodeObj **pMnode); ...@@ -40,8 +40,8 @@ void * mgmtGetNextMnode(void *pNode, struct SMnodeObj **pMnode);
void mgmtReleaseMnode(struct SMnodeObj *pMnode); void mgmtReleaseMnode(struct SMnodeObj *pMnode);
char * mgmtGetMnodeRoleStr(); char * mgmtGetMnodeRoleStr();
void mgmtGetMnodeIpList(SRpcIpSet *ipSet, bool usePublicIp); void mgmtGetMnodeIpSet(SRpcIpSet *ipSet, bool usePublicIp);
void mgmtGetMnodeList(void *mnodes); void mgmtGetMnodeInfos(void *mnodes);
#ifdef __cplusplus #ifdef __cplusplus
} }
......
src/mnode/inc/mgmtUser.h
浏览文件 @ 59a77a36
...@@ -24,7 +24,9 @@ extern "C" { ...@@ -24,7 +24,9 @@ extern "C" {
int32_t mgmtInitUsers(); int32_t mgmtInitUsers();
void mgmtCleanUpUsers(); void mgmtCleanUpUsers();
SUserObj *mgmtGetUser(char *name); SUserObj *mgmtGetUser(char *name);
void mgmtReleaseUser(SUserObj *pUser); void * mgmtGetNextUser(void *pNode, SUserObj **pUser);
void mgmtIncUserRef(SUserObj *pUser);
void mgmtDecUserRef(SUserObj *pUser);
SUserObj *mgmtGetUserFromConn(void *pConn, bool *usePublicIp); SUserObj *mgmtGetUserFromConn(void *pConn, bool *usePublicIp);
int32_t mgmtCreateUser(SAcctObj *pAcct, char *name, char *pass); int32_t mgmtCreateUser(SAcctObj *pAcct, char *name, char *pass);
void mgmtDropAllUsers(SAcctObj *pAcct); void mgmtDropAllUsers(SAcctObj *pAcct);
......
src/mnode/inc/mgmtVgroup.h
浏览文件 @ 59a77a36
...@@ -30,12 +30,13 @@ enum _TSDB_VG_STATUS { ...@@ -30,12 +30,13 @@ enum _TSDB_VG_STATUS {
int32_t mgmtInitVgroups(); int32_t mgmtInitVgroups();
void mgmtCleanUpVgroups(); void mgmtCleanUpVgroups();
SVgObj *mgmtGetVgroup(int32_t vgId); SVgObj *mgmtGetVgroup(int32_t vgId);
void mgmtReleaseVgroup(SVgObj *pVgroup); void mgmtIncVgroupRef(SVgObj *pVgroup);
void mgmtDecVgroupRef(SVgObj *pVgroup);
void mgmtDropAllVgroups(SDbObj *pDropDb); void mgmtDropAllVgroups(SDbObj *pDropDb);
void * mgmtGetNextVgroup(void *pNode, SVgObj **pVgroup); void * mgmtGetNextVgroup(void *pNode, SVgObj **pVgroup);
void mgmtUpdateVgroup(SVgObj *pVgroup); void mgmtUpdateVgroup(SVgObj *pVgroup);
void mgmtUpdateVgroupStatus(SVgObj *pVgroup, int32_t dnodeId, SVnodeLoad *pVload); void mgmtUpdateVgroupStatus(SVgObj *pVgroup, SDnodeObj *dnodeId, SVnodeLoad *pVload);
void mgmtCreateVgroup(SQueuedMsg *pMsg, SDbObj *pDb); void mgmtCreateVgroup(SQueuedMsg *pMsg, SDbObj *pDb);
void mgmtDropVgroup(SVgObj *pVgroup, void *ahandle); void mgmtDropVgroup(SVgObj *pVgroup, void *ahandle);
...@@ -46,6 +47,7 @@ void mgmtAddTableIntoVgroup(SVgObj *pVgroup, SChildTableObj *pTable); ...@@ -46,6 +47,7 @@ void mgmtAddTableIntoVgroup(SVgObj *pVgroup, SChildTableObj *pTable);
void mgmtRemoveTableFromVgroup(SVgObj *pVgroup, SChildTableObj *pTable); void mgmtRemoveTableFromVgroup(SVgObj *pVgroup, SChildTableObj *pTable);
void mgmtSendCreateVnodeMsg(SVgObj *pVgroup, SRpcIpSet *ipSet, void *ahandle); void mgmtSendCreateVnodeMsg(SVgObj *pVgroup, SRpcIpSet *ipSet, void *ahandle);
void mgmtSendDropVnodeMsg(int32_t vgId, SRpcIpSet *ipSet, void *ahandle); void mgmtSendDropVnodeMsg(int32_t vgId, SRpcIpSet *ipSet, void *ahandle);
void mgmtSendCreateVgroupMsg(SVgObj *pVgroup, void *ahandle);
SRpcIpSet mgmtGetIpSetFromVgroup(SVgObj *pVgroup); SRpcIpSet mgmtGetIpSetFromVgroup(SVgObj *pVgroup);
SRpcIpSet mgmtGetIpSetFromIp(uint32_t ip); SRpcIpSet mgmtGetIpSetFromIp(uint32_t ip);
......
src/mnode/src/mgmtAcct.c
浏览文件 @ 59a77a36
...@@ -58,6 +58,7 @@ static int32_t mgmtActionAcctUpdate(SSdbOper *pOper) { ...@@ -58,6 +58,7 @@ static int32_t mgmtActionAcctUpdate(SSdbOper *pOper) {
memcpy(pSaved, pAcct, tsAcctUpdateSize); memcpy(pSaved, pAcct, tsAcctUpdateSize);
free(pAcct); free(pAcct);
} }
mgmtDecAcctRef(pSaved);
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
...@@ -106,11 +107,11 @@ int32_t mgmtInitAccts() { ...@@ -106,11 +107,11 @@ int32_t mgmtInitAccts() {
tsAcctSdb = sdbOpenTable(&tableDesc); tsAcctSdb = sdbOpenTable(&tableDesc);
if (tsAcctSdb == NULL) { if (tsAcctSdb == NULL) {
mError("failed to init acct data"); mError("table:%s, failed to create hash", tableDesc.tableName);
return -1; return -1;
} }
mTrace("table:accounts table is created"); mTrace("table:%s, hash is created", tableDesc.tableName);
return acctInit(); return acctInit();
} }
...@@ -123,6 +124,10 @@ void *mgmtGetAcct(char *name) { ...@@ -123,6 +124,10 @@ void *mgmtGetAcct(char *name) {
return sdbGetRow(tsAcctSdb, name); return sdbGetRow(tsAcctSdb, name);
} }
void *mgmtGetNextAcct(void *pNode, SAcctObj **pAcct) {
return sdbFetchRow(tsAcctSdb, pNode, (void **)pAcct);
}
void mgmtIncAcctRef(SAcctObj *pAcct) { void mgmtIncAcctRef(SAcctObj *pAcct) {
sdbIncRef(tsAcctSdb, pAcct); sdbIncRef(tsAcctSdb, pAcct);
} }
......
src/mnode/src/mgmtBalance.c
浏览文件 @ 59a77a36
...@@ -47,7 +47,7 @@ int32_t balanceAllocVnodes(SVgObj *pVgroup) { ...@@ -47,7 +47,7 @@ int32_t balanceAllocVnodes(SVgObj *pVgroup) {
vnodeUsage = usage; vnodeUsage = usage;
} }
} }
mgmtReleaseDnode(pDnode); mgmtDecDnodeRef(pDnode);
} }
if (pSelDnode == NULL) { if (pSelDnode == NULL) {
...@@ -56,8 +56,7 @@ int32_t balanceAllocVnodes(SVgObj *pVgroup) { ...@@ -56,8 +56,7 @@ int32_t balanceAllocVnodes(SVgObj *pVgroup) {
} }
pVgroup->vnodeGid[0].dnodeId = pSelDnode->dnodeId; pVgroup->vnodeGid[0].dnodeId = pSelDnode->dnodeId;
pVgroup->vnodeGid[0].privateIp = pSelDnode->privateIp; pVgroup->vnodeGid[0].pDnode = pSelDnode;
pVgroup->vnodeGid[0].publicIp = pSelDnode->publicIp;
mTrace("dnode:%d, alloc one vnode to vgroup, openVnodes:%d", pSelDnode->dnodeId, pSelDnode->openVnodes); mTrace("dnode:%d, alloc one vnode to vgroup, openVnodes:%d", pSelDnode->dnodeId, pSelDnode->openVnodes);
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
......
src/mnode/src/mgmtDServer.c
浏览文件 @ 59a77a36
...@@ -28,8 +28,10 @@ ...@@ -28,8 +28,10 @@
#include "mgmtLog.h" #include "mgmtLog.h"
#include "mgmtDb.h" #include "mgmtDb.h"
#include "mgmtDServer.h" #include "mgmtDServer.h"
#include "mgmtMnode.h"
#include "mgmtProfile.h" #include "mgmtProfile.h"
#include "mgmtShell.h" #include "mgmtShell.h"
#include "mgmtSdb.h"
#include "mgmtTable.h" #include "mgmtTable.h"
#include "mgmtVgroup.h" #include "mgmtVgroup.h"
...@@ -100,6 +102,18 @@ static void mgmtProcessMsgFromDnode(SRpcMsg *rpcMsg) { ...@@ -100,6 +102,18 @@ static void mgmtProcessMsgFromDnode(SRpcMsg *rpcMsg) {
return; return;
} }
if (!sdbIsMaster()) {
SRpcConnInfo connInfo;
rpcGetConnInfo(rpcMsg->handle, &connInfo);
bool usePublicIp = false;
SRpcIpSet ipSet = {0};
mgmtGetMnodeIpSet(&ipSet, usePublicIp);
mTrace("conn from dnode ip:%s redirect msg", taosIpStr(connInfo.clientIp));
rpcSendRedirectRsp(rpcMsg->handle, &ipSet);
return;
}
if (mgmtProcessDnodeMsgFp[rpcMsg->msgType]) { if (mgmtProcessDnodeMsgFp[rpcMsg->msgType]) {
SRpcMsg *pMsg = malloc(sizeof(SRpcMsg)); SRpcMsg *pMsg = malloc(sizeof(SRpcMsg));
memcpy(pMsg, rpcMsg, sizeof(SRpcMsg)); memcpy(pMsg, rpcMsg, sizeof(SRpcMsg));
......
src/mnode/src/mgmtDb.c
浏览文件 @ 59a77a36
...@@ -63,6 +63,7 @@ static int32_t mgmtDbActionInsert(SSdbOper *pOper) { ...@@ -63,6 +63,7 @@ static int32_t mgmtDbActionInsert(SSdbOper *pOper) {
if (pAcct != NULL) { if (pAcct != NULL) {
mgmtAddDbToAcct(pAcct, pDb); mgmtAddDbToAcct(pAcct, pDb);
mgmtDecAcctRef(pAcct);
} }
else { else {
mError("db:%s, acct:%s info not exist in sdb", pDb->name, pDb->cfg.acct); mError("db:%s, acct:%s info not exist in sdb", pDb->name, pDb->cfg.acct);
...@@ -80,6 +81,7 @@ static int32_t mgmtDbActionDelete(SSdbOper *pOper) { ...@@ -80,6 +81,7 @@ static int32_t mgmtDbActionDelete(SSdbOper *pOper) {
mgmtDropAllChildTables(pDb); mgmtDropAllChildTables(pDb);
mgmtDropAllSuperTables(pDb); mgmtDropAllSuperTables(pDb);
mgmtDropAllVgroups(pDb); mgmtDropAllVgroups(pDb);
mgmtDecAcctRef(pAcct);
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
...@@ -527,7 +529,7 @@ static int32_t mgmtGetDbMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) ...@@ -527,7 +529,7 @@ static int32_t mgmtGetDbMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn)
pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1]; pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
pShow->numOfRows = pUser->pAcct->acctInfo.numOfDbs; pShow->numOfRows = pUser->pAcct->acctInfo.numOfDbs;
mgmtReleaseUser(pUser); mgmtDecUserRef(pUser);
return 0; return 0;
} }
...@@ -647,7 +649,7 @@ static int32_t mgmtRetrieveDbs(SShowObj *pShow, char *data, int32_t rows, void * ...@@ -647,7 +649,7 @@ static int32_t mgmtRetrieveDbs(SShowObj *pShow, char *data, int32_t rows, void *
} }
pShow->numOfReads += numOfRows; pShow->numOfReads += numOfRows;
mgmtReleaseUser(pUser); mgmtDecUserRef(pUser);
return numOfRows; return numOfRows;
} }
......
src/mnode/src/mgmtDnode.c
浏览文件 @ 59a77a36
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
#include "ttime.h" #include "ttime.h"
#include "tutil.h" #include "tutil.h"
#include "tsocket.h" #include "tsocket.h"
#include "tbalance.h"
#include "tsync.h"
#include "dnode.h" #include "dnode.h"
#include "mgmtDef.h" #include "mgmtDef.h"
#include "mgmtLog.h" #include "mgmtLog.h"
...@@ -36,6 +38,8 @@ ...@@ -36,6 +38,8 @@
void *tsDnodeSdb = NULL; void *tsDnodeSdb = NULL;
int32_t tsDnodeUpdateSize = 0; int32_t tsDnodeUpdateSize = 0;
int32_t tsAccessSquence = 0;
extern void * tsMnodeSdb;
extern void * tsVgroupSdb; extern void * tsVgroupSdb;
static int32_t mgmtCreateDnode(uint32_t ip); static int32_t mgmtCreateDnode(uint32_t ip);
...@@ -68,7 +72,7 @@ static int32_t mgmtDnodeActionInsert(SSdbOper *pOper) { ...@@ -68,7 +72,7 @@ static int32_t mgmtDnodeActionInsert(SSdbOper *pOper) {
pDnode->mnodeDnodePort = tsMnodeDnodePort; pDnode->mnodeDnodePort = tsMnodeDnodePort;
pDnode->dnodeShellPort = tsDnodeShellPort; pDnode->dnodeShellPort = tsDnodeShellPort;
pDnode->dnodeMnodePort = tsDnodeMnodePort; pDnode->dnodeMnodePort = tsDnodeMnodePort;
pDnode->syncPort = 0; pDnode->syncPort = tsSyncPort;
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
...@@ -98,6 +102,15 @@ static int32_t mgmtDnodeActionDelete(SSdbOper *pOper) { ...@@ -98,6 +102,15 @@ static int32_t mgmtDnodeActionDelete(SSdbOper *pOper) {
} }
} }
SMnodeObj *pMnode = mgmtGetMnode(pDnode->dnodeId);
if (pMnode != NULL) {
SSdbOper oper = {.type = SDB_OPER_LOCAL, .table = tsMnodeSdb, .pObj = pMnode};
sdbDeleteRow(&oper);
mgmtReleaseMnode(pMnode);
}
balanceNotify();
mTrace("dnode:%d, all vgroups:%d is dropped from sdb", pDnode->dnodeId, numOfVgroups); mTrace("dnode:%d, all vgroups:%d is dropped from sdb", pDnode->dnodeId, numOfVgroups);
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
...@@ -135,7 +148,7 @@ static int32_t mgmtDnodeActionRestored() { ...@@ -135,7 +148,7 @@ static int32_t mgmtDnodeActionRestored() {
mgmtCreateDnode(ip); mgmtCreateDnode(ip);
SDnodeObj *pDnode = mgmtGetDnodeByIp(ip); SDnodeObj *pDnode = mgmtGetDnodeByIp(ip);
mgmtAddMnode(pDnode->dnodeId); mgmtAddMnode(pDnode->dnodeId);
mgmtReleaseDnode(pDnode); mgmtDecDnodeRef(pDnode);
} }
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
...@@ -211,13 +224,17 @@ void *mgmtGetDnodeByIp(uint32_t ip) { ...@@ -211,13 +224,17 @@ void *mgmtGetDnodeByIp(uint32_t ip) {
if (ip == pDnode->privateIp) { if (ip == pDnode->privateIp) {
return pDnode; return pDnode;
} }
mgmtReleaseDnode(pDnode); mgmtDecDnodeRef(pDnode);
} }
return NULL; return NULL;
} }
void mgmtReleaseDnode(SDnodeObj *pDnode) { void mgmtIncDnodeRef(SDnodeObj *pDnode) {
sdbIncRef(tsDnodeSdb, pDnode);
}
void mgmtDecDnodeRef(SDnodeObj *pDnode) {
sdbDecRef(tsDnodeSdb, pDnode); sdbDecRef(tsDnodeSdb, pDnode);
} }
...@@ -314,27 +331,27 @@ void mgmtProcessDnodeStatusMsg(SRpcMsg *rpcMsg) { ...@@ -314,27 +331,27 @@ void mgmtProcessDnodeStatusMsg(SRpcMsg *rpcMsg) {
pDnode->alternativeRole = pStatus->alternativeRole; pDnode->alternativeRole = pStatus->alternativeRole;
pDnode->totalVnodes = pStatus->numOfTotalVnodes; pDnode->totalVnodes = pStatus->numOfTotalVnodes;
pDnode->moduleStatus = pStatus->moduleStatus; pDnode->moduleStatus = pStatus->moduleStatus;
pDnode->lastAccess = tsAccessSquence;
if (pStatus->dnodeId == 0) { if (pStatus->dnodeId == 0) {
mTrace("dnode:%d, first access, privateIp:%s, name:%s", pDnode->dnodeId, taosIpStr(pDnode->privateIp), pDnode->dnodeName); mTrace("dnode:%d, first access, privateIp:%s, name:%s", pDnode->dnodeId, taosIpStr(pDnode->privateIp), pDnode->dnodeName);
} else {
//mTrace("dnode:%d, status received, access times %d", pDnode->dnodeId, pDnode->lastAccess);
} }
int32_t openVnodes = htons(pStatus->openVnodes); int32_t openVnodes = htons(pStatus->openVnodes);
for (int32_t j = 0; j < openVnodes; ++j) { for (int32_t j = 0; j < openVnodes; ++j) {
SVnodeLoad *pVload = &pStatus->load[j]; SVnodeLoad *pVload = &pStatus->load[j];
pDnode->vload[j].vgId = htonl(pVload->vgId); pVload->vgId = htonl(pVload->vgId);
pDnode->vload[j].totalStorage = htobe64(pVload->totalStorage);
pDnode->vload[j].compStorage = htobe64(pVload->compStorage);
pDnode->vload[j].pointsWritten = htobe64(pVload->pointsWritten);
SVgObj *pVgroup = mgmtGetVgroup(pDnode->vload[j].vgId); SVgObj *pVgroup = mgmtGetVgroup(pVload->vgId);
if (pVgroup == NULL) { if (pVgroup == NULL) {
SRpcIpSet ipSet = mgmtGetIpSetFromIp(pDnode->privateIp); SRpcIpSet ipSet = mgmtGetIpSetFromIp(pDnode->privateIp);
mPrint("dnode:%d, vgroup:%d not exist in mnode, drop it", pDnode->dnodeId, pDnode->vload[j].vgId); mPrint("dnode:%d, vgroup:%d not exist in mnode, drop it", pDnode->dnodeId, pVload->vgId);
mgmtSendDropVnodeMsg(pDnode->vload[j].vgId, &ipSet, NULL); mgmtSendDropVnodeMsg(pVload->vgId, &ipSet, NULL);
} else { } else {
mgmtUpdateVgroupStatus(pVgroup, pDnode->dnodeId, pVload); mgmtUpdateVgroupStatus(pVgroup, pDnode, pVload);
mgmtReleaseVgroup(pVgroup); mgmtDecVgroupRef(pVgroup);
} }
} }
...@@ -344,21 +361,20 @@ void mgmtProcessDnodeStatusMsg(SRpcMsg *rpcMsg) { ...@@ -344,21 +361,20 @@ void mgmtProcessDnodeStatusMsg(SRpcMsg *rpcMsg) {
balanceNotify(); balanceNotify();
} }
mgmtReleaseDnode(pDnode); mgmtDecDnodeRef(pDnode);
int32_t contLen = sizeof(SDMStatusRsp) + TSDB_MAX_VNODES * sizeof(SVnodeAccess); int32_t contLen = sizeof(SDMStatusRsp) + TSDB_MAX_VNODES * sizeof(SDMVgroupAccess);
SDMStatusRsp *pRsp = rpcMallocCont(contLen); SDMStatusRsp *pRsp = rpcMallocCont(contLen);
if (pRsp == NULL) { if (pRsp == NULL) {
mgmtSendSimpleResp(rpcMsg->handle, TSDB_CODE_SERV_OUT_OF_MEMORY); mgmtSendSimpleResp(rpcMsg->handle, TSDB_CODE_SERV_OUT_OF_MEMORY);
return; return;
} }
mgmtGetMnodeList(&pRsp->mnodes); mgmtGetMnodeInfos(&pRsp->mnodes);
pRsp->dnodeState.dnodeId = htonl(pDnode->dnodeId); pRsp->dnodeCfg.dnodeId = htonl(pDnode->dnodeId);
pRsp->dnodeState.moduleStatus = htonl((int32_t)pDnode->isMgmt); pRsp->dnodeCfg.moduleStatus = htonl((int32_t)pDnode->isMgmt);
pRsp->dnodeState.createdTime = htonl(pDnode->createdTime / 1000); pRsp->dnodeCfg.numOfVnodes = 0;
pRsp->dnodeState.numOfVnodes = 0;
contLen = sizeof(SDMStatusRsp); contLen = sizeof(SDMStatusRsp);
...@@ -433,7 +449,7 @@ static int32_t mgmtDropDnodeByIp(uint32_t ip) { ...@@ -433,7 +449,7 @@ static int32_t mgmtDropDnodeByIp(uint32_t ip) {
SDnodeObj *pDnode = mgmtGetDnodeByIp(ip); SDnodeObj *pDnode = mgmtGetDnodeByIp(ip);
if (pDnode == NULL) { if (pDnode == NULL) {
mError("dnode:%s, is not exist", taosIpStr(ip)); mError("dnode:%s, is not exist", taosIpStr(ip));
return TSDB_CODE_INVALID_VALUE; return TSDB_CODE_DNODE_NOT_EXIST;
} }
if (pDnode->privateIp == dnodeGetMnodeMasteIp()) { if (pDnode->privateIp == dnodeGetMnodeMasteIp()) {
...@@ -441,7 +457,7 @@ static int32_t mgmtDropDnodeByIp(uint32_t ip) { ...@@ -441,7 +457,7 @@ static int32_t mgmtDropDnodeByIp(uint32_t ip) {
return TSDB_CODE_NO_REMOVE_MASTER; return TSDB_CODE_NO_REMOVE_MASTER;
} }
#ifndef _VPEER #ifndef _SYNC
return mgmtDropDnode(pDnode); return mgmtDropDnode(pDnode);
#else #else
return balanceDropDnode(pDnode); return balanceDropDnode(pDnode);
...@@ -492,7 +508,10 @@ static int32_t mgmtGetDnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pCo ...@@ -492,7 +508,10 @@ static int32_t mgmtGetDnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pCo
SUserObj *pUser = mgmtGetUserFromConn(pConn, NULL); SUserObj *pUser = mgmtGetUserFromConn(pConn, NULL);
if (pUser == NULL) return 0; if (pUser == NULL) return 0;
if (strcmp(pUser->pAcct->user, "root") != 0) return TSDB_CODE_NO_RIGHTS; if (strcmp(pUser->pAcct->user, "root") != 0) {
mgmtDecUserRef(pUser);
return TSDB_CODE_NO_RIGHTS;
}
int32_t cols = 0; int32_t cols = 0;
SSchema *pSchema = pMeta->schema; SSchema *pSchema = pMeta->schema;
...@@ -515,18 +534,6 @@ static int32_t mgmtGetDnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pCo ...@@ -515,18 +534,6 @@ static int32_t mgmtGetDnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pCo
pSchema[cols].bytes = htons(pShow->bytes[cols]); pSchema[cols].bytes = htons(pShow->bytes[cols]);
cols++; cols++;
pShow->bytes[cols] = 8;
pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
strcpy(pSchema[cols].name, "create time");
pSchema[cols].bytes = htons(pShow->bytes[cols]);
cols++;
pShow->bytes[cols] = 10;
pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
strcpy(pSchema[cols].name, "status");
pSchema[cols].bytes = htons(pShow->bytes[cols]);
cols++;
pShow->bytes[cols] = 2; pShow->bytes[cols] = 2;
pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT; pSchema[cols].type = TSDB_DATA_TYPE_SMALLINT;
strcpy(pSchema[cols].name, "open vnodes"); strcpy(pSchema[cols].name, "open vnodes");
...@@ -539,13 +546,17 @@ static int32_t mgmtGetDnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pCo ...@@ -539,13 +546,17 @@ static int32_t mgmtGetDnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pCo
pSchema[cols].bytes = htons(pShow->bytes[cols]); pSchema[cols].bytes = htons(pShow->bytes[cols]);
cols++; cols++;
#ifdef _VPEER pShow->bytes[cols] = 10;
pShow->bytes[cols] = 18;
pSchema[cols].type = TSDB_DATA_TYPE_BINARY; pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
strcpy(pSchema[cols].name, "balance"); strcpy(pSchema[cols].name, "status");
pSchema[cols].bytes = htons(pShow->bytes[cols]);
cols++;
pShow->bytes[cols] = 8;
pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
strcpy(pSchema[cols].name, "create time");
pSchema[cols].bytes = htons(pShow->bytes[cols]); pSchema[cols].bytes = htons(pShow->bytes[cols]);
cols++; cols++;
#endif
pMeta->numOfColumns = htons(cols); pMeta->numOfColumns = htons(cols);
pShow->numOfColumns = cols; pShow->numOfColumns = cols;
...@@ -559,7 +570,7 @@ static int32_t mgmtGetDnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pCo ...@@ -559,7 +570,7 @@ static int32_t mgmtGetDnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pCo
pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1]; pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
pShow->pNode = NULL; pShow->pNode = NULL;
mgmtReleaseUser(pUser); mgmtDecUserRef(pUser);
return 0; return 0;
} }
...@@ -592,29 +603,24 @@ static int32_t mgmtRetrieveDnodes(SShowObj *pShow, char *data, int32_t rows, voi ...@@ -592,29 +603,24 @@ static int32_t mgmtRetrieveDnodes(SShowObj *pShow, char *data, int32_t rows, voi
cols++; cols++;
pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
*(int64_t *)pWrite = pDnode->createdTime; *(int16_t *)pWrite = pDnode->openVnodes;
cols++; cols++;
pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
strcpy(pWrite, mgmtGetDnodeStatusStr(pDnode->status)); *(int16_t *)pWrite = pDnode->totalVnodes;
cols++; cols++;
pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
*(int16_t *)pWrite = pDnode->openVnodes; strcpy(pWrite, mgmtGetDnodeStatusStr(pDnode->status));
cols++; cols++;
pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
*(int16_t *)pWrite = pDnode->totalVnodes; *(int64_t *)pWrite = pDnode->createdTime;
cols++; cols++;
#ifdef _VPEER
pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
strcpy(pWrite, mgmtGetDnodeStatusStr(pDnode->status));
cols++;
#endif
numOfRows++; numOfRows++;
mgmtReleaseDnode(pDnode); mgmtDecDnodeRef(pDnode);
} }
pShow->numOfReads += numOfRows; pShow->numOfReads += numOfRows;
...@@ -632,7 +638,10 @@ static int32_t mgmtGetModuleMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pC ...@@ -632,7 +638,10 @@ static int32_t mgmtGetModuleMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pC
SUserObj *pUser = mgmtGetUserFromConn(pConn, NULL); SUserObj *pUser = mgmtGetUserFromConn(pConn, NULL);
if (pUser == NULL) return 0; if (pUser == NULL) return 0;
if (strcmp(pUser->user, "root") != 0) return TSDB_CODE_NO_RIGHTS; if (strcmp(pUser->user, "root") != 0) {
mgmtDecUserRef(pUser);
return TSDB_CODE_NO_RIGHTS;
}
SSchema *pSchema = pMeta->schema; SSchema *pSchema = pMeta->schema;
...@@ -671,7 +680,7 @@ static int32_t mgmtGetModuleMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pC ...@@ -671,7 +680,7 @@ static int32_t mgmtGetModuleMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pC
pShow->numOfRows = mgmtGetDnodesNum() * TSDB_MOD_MAX; pShow->numOfRows = mgmtGetDnodesNum() * TSDB_MOD_MAX;
pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1]; pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
pShow->pNode = NULL; pShow->pNode = NULL;
mgmtReleaseUser(pUser); mgmtDecUserRef(pUser);
return 0; return 0;
} }
...@@ -722,7 +731,7 @@ int32_t mgmtRetrieveModules(SShowObj *pShow, char *data, int32_t rows, void *pCo ...@@ -722,7 +731,7 @@ int32_t mgmtRetrieveModules(SShowObj *pShow, char *data, int32_t rows, void *pCo
numOfRows++; numOfRows++;
} }
mgmtReleaseDnode(pDnode); mgmtDecDnodeRef(pDnode);
} }
pShow->numOfReads += numOfRows; pShow->numOfReads += numOfRows;
...@@ -741,7 +750,10 @@ static int32_t mgmtGetConfigMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pC ...@@ -741,7 +750,10 @@ static int32_t mgmtGetConfigMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pC
SUserObj *pUser = mgmtGetUserFromConn(pConn, NULL); SUserObj *pUser = mgmtGetUserFromConn(pConn, NULL);
if (pUser == NULL) return 0; if (pUser == NULL) return 0;
if (strcmp(pUser->user, "root") != 0) return TSDB_CODE_NO_RIGHTS; if (strcmp(pUser->user, "root") != 0) {
mgmtDecUserRef(pUser);
return TSDB_CODE_NO_RIGHTS;
}
SSchema *pSchema = pMeta->schema; SSchema *pSchema = pMeta->schema;
...@@ -772,7 +784,7 @@ static int32_t mgmtGetConfigMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pC ...@@ -772,7 +784,7 @@ static int32_t mgmtGetConfigMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pC
pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1]; pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
pShow->pNode = NULL; pShow->pNode = NULL;
mgmtReleaseUser(pUser); mgmtDecUserRef(pUser);
return 0; return 0;
} }
...@@ -824,7 +836,11 @@ static int32_t mgmtGetVnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pCo ...@@ -824,7 +836,11 @@ static int32_t mgmtGetVnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pCo
int32_t cols = 0; int32_t cols = 0;
SUserObj *pUser = mgmtGetUserFromConn(pConn, NULL); SUserObj *pUser = mgmtGetUserFromConn(pConn, NULL);
if (pUser == NULL) return 0; if (pUser == NULL) return 0;
if (strcmp(pUser->user, "root") != 0) return TSDB_CODE_NO_RIGHTS;
if (strcmp(pUser->user, "root") != 0) {
mgmtDecUserRef(pUser);
return TSDB_CODE_NO_RIGHTS;
}
SSchema *pSchema = pMeta->schema; SSchema *pSchema = pMeta->schema;
...@@ -850,35 +866,18 @@ static int32_t mgmtGetVnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pCo ...@@ -850,35 +866,18 @@ static int32_t mgmtGetVnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pCo
if (pShow->payloadLen > 0 ) { if (pShow->payloadLen > 0 ) {
uint32_t ip = ip2uint(pShow->payload); uint32_t ip = ip2uint(pShow->payload);
pDnode = mgmtGetDnodeByIp(ip); pDnode = mgmtGetDnodeByIp(ip);
if (NULL == pDnode) {
return TSDB_CODE_NODE_OFFLINE;
}
SVnodeLoad* pVnode;
pShow->numOfRows = 0;
for (int32_t i = 0 ; i < TSDB_MAX_VNODES; i++) {
pVnode = &pDnode->vload[i];
if (0 != pVnode->vgId) {
pShow->numOfRows++;
}
}
pShow->pNode = pDnode;
} else { } else {
while (true) { mgmtGetNextDnode(NULL, (SDnodeObj **)&pDnode);
pShow->pNode = mgmtGetNextDnode(pShow->pNode, (SDnodeObj **)&pDnode);
if (pDnode == NULL) break;
pShow->numOfRows += pDnode->openVnodes;
if (0 == pShow->numOfRows) return TSDB_CODE_NODE_OFFLINE;
} }
pShow->pNode = NULL; if (pDnode != NULL) {
pShow->numOfRows += pDnode->openVnodes;
mgmtDecDnodeRef(pDnode);
} }
pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1]; pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
mgmtReleaseDnode(pDnode); pShow->pNode = pDnode;
mgmtReleaseUser(pUser); mgmtDecUserRef(pUser);
return 0; return 0;
} }
...@@ -891,32 +890,32 @@ static int32_t mgmtRetrieveVnodes(SShowObj *pShow, char *data, int32_t rows, voi ...@@ -891,32 +890,32 @@ static int32_t mgmtRetrieveVnodes(SShowObj *pShow, char *data, int32_t rows, voi
if (0 == rows) return 0; if (0 == rows) return 0;
if (pShow->payloadLen) {
// output the vnodes info of the designated dnode. And output all vnodes of this dnode, instead of rows (max 100)
pDnode = (SDnodeObj *)(pShow->pNode); pDnode = (SDnodeObj *)(pShow->pNode);
if (pDnode != NULL) { if (pDnode != NULL) {
SVnodeLoad* pVnode; void *pNode = NULL;
for (int32_t i = 0 ; i < TSDB_MAX_VNODES; i++) { SVgObj *pVgroup;
pVnode = &pDnode->vload[i]; while (1) {
if (0 == pVnode->vgId) { pNode = mgmtGetNextVgroup(pNode, &pVgroup);
continue; if (pVgroup == NULL) break;
}
for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
SVnodeGid *pVgid = &pVgroup->vnodeGid[i];
if (pVgid->pDnode == pDnode) {
cols = 0; cols = 0;
pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
*(uint32_t *)pWrite = pVnode->vgId; *(uint32_t *)pWrite = pVgroup->vgId;
cols++; cols++;
pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
strcpy(pWrite, pVnode->status ? "ready" : "offline"); strcpy(pWrite, mgmtGetMnodeRoleStr(pVgid->role));
cols++; cols++;
numOfRows++;
} }
} }
mgmtDecVgroupRef(pVgroup);
}
} else { } else {
// TODO: output all vnodes of all dnodes
numOfRows = 0; numOfRows = 0;
} }
......
src/mnode/src/mgmtMain.c
浏览文件 @ 59a77a36
...@@ -149,12 +149,12 @@ void mgmtCleanUpSystem() { ...@@ -149,12 +149,12 @@ void mgmtCleanUpSystem() {
mgmtCleanUpShell(); mgmtCleanUpShell();
mgmtCleanupDClient(); mgmtCleanupDClient();
mgmtCleanupDServer(); mgmtCleanupDServer();
mgmtCleanUpAccts();
mgmtCleanUpTables(); mgmtCleanUpTables();
mgmtCleanUpVgroups(); mgmtCleanUpVgroups();
mgmtCleanUpDbs(); mgmtCleanUpDbs();
mgmtCleanupDnodes(); mgmtCleanupDnodes();
mgmtCleanUpUsers(); mgmtCleanUpUsers();
mgmtCleanUpAccts();
sdbCleanUp(); sdbCleanUp();
taosTmrCleanUp(tsMgmtTmr); taosTmrCleanUp(tsMgmtTmr);
tsMgmtIsRunning = false; tsMgmtIsRunning = false;
......
src/mnode/src/mgmtMnode.c
浏览文件 @ 59a77a36
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "mgmtShell.h" #include "mgmtShell.h"
#include "mgmtUser.h" #include "mgmtUser.h"
static void * tsMnodeSdb = NULL; void * tsMnodeSdb = NULL;
static int32_t tsMnodeUpdateSize = 0; static int32_t tsMnodeUpdateSize = 0;
static int32_t mgmtGetMnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn); static int32_t mgmtGetMnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn);
static int32_t mgmtRetrieveMnodes(SShowObj *pShow, char *data, int32_t rows, void *pConn); static int32_t mgmtRetrieveMnodes(SShowObj *pShow, char *data, int32_t rows, void *pConn);
...@@ -47,7 +47,7 @@ static int32_t mgmtMnodeActionInsert(SSdbOper *pOper) { ...@@ -47,7 +47,7 @@ static int32_t mgmtMnodeActionInsert(SSdbOper *pOper) {
pMnode->pDnode = pDnode; pMnode->pDnode = pDnode;
pDnode->isMgmt = true; pDnode->isMgmt = true;
mgmtReleaseDnode(pDnode); mgmtDecDnodeRef(pDnode);
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
...@@ -58,7 +58,7 @@ static int32_t mgmtMnodeActionDelete(SSdbOper *pOper) { ...@@ -58,7 +58,7 @@ static int32_t mgmtMnodeActionDelete(SSdbOper *pOper) {
SDnodeObj *pDnode = mgmtGetDnode(pMnode->mnodeId); SDnodeObj *pDnode = mgmtGetDnode(pMnode->mnodeId);
if (pDnode == NULL) return TSDB_CODE_DNODE_NOT_EXIST; if (pDnode == NULL) return TSDB_CODE_DNODE_NOT_EXIST;
pDnode->isMgmt = false; pDnode->isMgmt = false;
mgmtReleaseDnode(pDnode); mgmtDecDnodeRef(pDnode);
mTrace("mnode:%d, is dropped from sdb", pMnode->mnodeId); mTrace("mnode:%d, is dropped from sdb", pMnode->mnodeId);
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
...@@ -171,7 +171,7 @@ char *mgmtGetMnodeRoleStr(int32_t role) { ...@@ -171,7 +171,7 @@ char *mgmtGetMnodeRoleStr(int32_t role) {
} }
} }
void mgmtGetMnodeIpList(SRpcIpSet *ipSet, bool usePublicIp) { void mgmtGetMnodeIpSet(SRpcIpSet *ipSet, bool usePublicIp) {
void *pNode = NULL; void *pNode = NULL;
while (1) { while (1) {
SMnodeObj *pMnode = NULL; SMnodeObj *pMnode = NULL;
...@@ -195,8 +195,8 @@ void mgmtGetMnodeIpList(SRpcIpSet *ipSet, bool usePublicIp) { ...@@ -195,8 +195,8 @@ void mgmtGetMnodeIpList(SRpcIpSet *ipSet, bool usePublicIp) {
} }
} }
void mgmtGetMnodeList(void *param) { void mgmtGetMnodeInfos(void *param) {
SDMNodeInfos *mnodes = param; SDMMnodeInfos *mnodes = param;
mnodes->inUse = 0; mnodes->inUse = 0;
int32_t index = 0; int32_t index = 0;
...@@ -209,6 +209,7 @@ void mgmtGetMnodeList(void *param) { ...@@ -209,6 +209,7 @@ void mgmtGetMnodeList(void *param) {
mnodes->nodeInfos[index].nodeId = htonl(pMnode->mnodeId); mnodes->nodeInfos[index].nodeId = htonl(pMnode->mnodeId);
mnodes->nodeInfos[index].nodeIp = htonl(pMnode->pDnode->privateIp); mnodes->nodeInfos[index].nodeIp = htonl(pMnode->pDnode->privateIp);
mnodes->nodeInfos[index].nodePort = htons(pMnode->pDnode->mnodeDnodePort); mnodes->nodeInfos[index].nodePort = htons(pMnode->pDnode->mnodeDnodePort);
mnodes->nodeInfos[index].syncPort = htons(pMnode->pDnode->syncPort);
strcpy(mnodes->nodeInfos[index].nodeName, pMnode->pDnode->dnodeName); strcpy(mnodes->nodeInfos[index].nodeName, pMnode->pDnode->dnodeName);
if (pMnode->role == TAOS_SYNC_ROLE_MASTER) { if (pMnode->role == TAOS_SYNC_ROLE_MASTER) {
mnodes->inUse = index; mnodes->inUse = index;
...@@ -267,7 +268,10 @@ static int32_t mgmtGetMnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pCo ...@@ -267,7 +268,10 @@ static int32_t mgmtGetMnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pCo
SUserObj *pUser = mgmtGetUserFromConn(pConn, NULL); SUserObj *pUser = mgmtGetUserFromConn(pConn, NULL);
if (pUser == NULL) return 0; if (pUser == NULL) return 0;
if (strcmp(pUser->pAcct->user, "root") != 0) return TSDB_CODE_NO_RIGHTS; if (strcmp(pUser->pAcct->user, "root") != 0) {
mgmtDecUserRef(pUser);
return TSDB_CODE_NO_RIGHTS;
}
int32_t cols = 0; int32_t cols = 0;
SSchema *pSchema = pMeta->schema; SSchema *pSchema = pMeta->schema;
...@@ -290,18 +294,18 @@ static int32_t mgmtGetMnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pCo ...@@ -290,18 +294,18 @@ static int32_t mgmtGetMnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pCo
pSchema[cols].bytes = htons(pShow->bytes[cols]); pSchema[cols].bytes = htons(pShow->bytes[cols]);
cols++; cols++;
pShow->bytes[cols] = 8;
pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
strcpy(pSchema[cols].name, "create time");
pSchema[cols].bytes = htons(pShow->bytes[cols]);
cols++;
pShow->bytes[cols] = 10; pShow->bytes[cols] = 10;
pSchema[cols].type = TSDB_DATA_TYPE_BINARY; pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
strcpy(pSchema[cols].name, "role"); strcpy(pSchema[cols].name, "role");
pSchema[cols].bytes = htons(pShow->bytes[cols]); pSchema[cols].bytes = htons(pShow->bytes[cols]);
cols++; cols++;
pShow->bytes[cols] = 8;
pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
strcpy(pSchema[cols].name, "create time");
pSchema[cols].bytes = htons(pShow->bytes[cols]);
cols++;
pMeta->numOfColumns = htons(cols); pMeta->numOfColumns = htons(cols);
pShow->numOfColumns = cols; pShow->numOfColumns = cols;
...@@ -313,7 +317,7 @@ static int32_t mgmtGetMnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pCo ...@@ -313,7 +317,7 @@ static int32_t mgmtGetMnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pCo
pShow->numOfRows = mgmtGetMnodesNum(); pShow->numOfRows = mgmtGetMnodesNum();
pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1]; pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
pShow->pNode = NULL; pShow->pNode = NULL;
mgmtReleaseUser(pUser); mgmtDecUserRef(pUser);
return 0; return 0;
} }
...@@ -346,11 +350,11 @@ static int32_t mgmtRetrieveMnodes(SShowObj *pShow, char *data, int32_t rows, voi ...@@ -346,11 +350,11 @@ static int32_t mgmtRetrieveMnodes(SShowObj *pShow, char *data, int32_t rows, voi
cols++; cols++;
pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
*(int64_t *)pWrite = pMnode->createdTime; strcpy(pWrite, mgmtGetMnodeRoleStr(pMnode->role));
cols++; cols++;
pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
strcpy(pWrite, mgmtGetMnodeRoleStr(pMnode->role)); *(int64_t *)pWrite = pMnode->createdTime;
cols++; cols++;
numOfRows++; numOfRows++;
......
src/mnode/src/mgmtProfile.c
浏览文件 @ 59a77a36
...@@ -704,6 +704,7 @@ void mgmtProcessKillQueryMsg(SQueuedMsg *pMsg) { ...@@ -704,6 +704,7 @@ void mgmtProcessKillQueryMsg(SQueuedMsg *pMsg) {
rpcRsp.code = code; rpcRsp.code = code;
rpcSendResponse(&rpcRsp); rpcSendResponse(&rpcRsp);
mgmtDecUserRef(pUser);
} }
void mgmtProcessKillStreamMsg(SQueuedMsg *pMsg) { void mgmtProcessKillStreamMsg(SQueuedMsg *pMsg) {
...@@ -727,6 +728,7 @@ void mgmtProcessKillStreamMsg(SQueuedMsg *pMsg) { ...@@ -727,6 +728,7 @@ void mgmtProcessKillStreamMsg(SQueuedMsg *pMsg) {
rpcRsp.code = code; rpcRsp.code = code;
rpcSendResponse(&rpcRsp); rpcSendResponse(&rpcRsp);
mgmtDecUserRef(pUser);
} }
void mgmtProcessKillConnectionMsg(SQueuedMsg *pMsg) { void mgmtProcessKillConnectionMsg(SQueuedMsg *pMsg) {
...@@ -750,6 +752,7 @@ void mgmtProcessKillConnectionMsg(SQueuedMsg *pMsg) { ...@@ -750,6 +752,7 @@ void mgmtProcessKillConnectionMsg(SQueuedMsg *pMsg) {
rpcRsp.code = code; rpcRsp.code = code;
rpcSendResponse(&rpcRsp); rpcSendResponse(&rpcRsp);
mgmtDecUserRef(pUser);
} }
int32_t mgmtInitProfile() { int32_t mgmtInitProfile() {
...@@ -790,12 +793,12 @@ void *mgmtMallocQueuedMsg(SRpcMsg *rpcMsg) { ...@@ -790,12 +793,12 @@ void *mgmtMallocQueuedMsg(SRpcMsg *rpcMsg) {
void mgmtFreeQueuedMsg(SQueuedMsg *pMsg) { void mgmtFreeQueuedMsg(SQueuedMsg *pMsg) {
if (pMsg != NULL) { if (pMsg != NULL) {
rpcFreeCont(pMsg->pCont); rpcFreeCont(pMsg->pCont);
if (pMsg->pUser) mgmtReleaseUser(pMsg->pUser); if (pMsg->pUser) mgmtDecUserRef(pMsg->pUser);
if (pMsg->pDb) mgmtDecDbRef(pMsg->pDb); if (pMsg->pDb) mgmtDecDbRef(pMsg->pDb);
if (pMsg->pVgroup) mgmtReleaseVgroup(pMsg->pVgroup); if (pMsg->pVgroup) mgmtDecVgroupRef(pMsg->pVgroup);
if (pMsg->pTable) mgmtDecTableRef(pMsg->pTable); if (pMsg->pTable) mgmtDecTableRef(pMsg->pTable);
if (pMsg->pAcct) mgmtDecAcctRef(pMsg->pAcct); if (pMsg->pAcct) mgmtDecAcctRef(pMsg->pAcct);
if (pMsg->pDnode) mgmtReleaseDnode(pMsg->pDnode); if (pMsg->pDnode) mgmtDecDnodeRef(pMsg->pDnode);
free(pMsg); free(pMsg);
} }
} }
......
src/mnode/src/mgmtSdb.c
浏览文件 @ 59a77a36
...@@ -146,7 +146,7 @@ static int32_t sdbInitWal() { ...@@ -146,7 +146,7 @@ static int32_t sdbInitWal() {
} }
sdbTrace("open sdb wal for restore"); sdbTrace("open sdb wal for restore");
walRestore(tsSdbObj.wal, &tsSdbObj, sdbWrite); walRestore(tsSdbObj.wal, NULL, sdbWrite);
return 0; return 0;
} }
...@@ -174,12 +174,12 @@ void sdbUpdateMnodeRoles() { ...@@ -174,12 +174,12 @@ void sdbUpdateMnodeRoles() {
SNodesRole roles = {0}; SNodesRole roles = {0};
syncGetNodesRole(tsSdbObj.sync, &roles); syncGetNodesRole(tsSdbObj.sync, &roles);
mPrint("update mnodes:%d sync roles", tsSdbObj.cfg.replica); sdbPrint("update mnodes:%d sync roles", tsSdbObj.cfg.replica);
for (int32_t i = 0; i < tsSdbObj.cfg.replica; ++i) { for (int32_t i = 0; i < tsSdbObj.cfg.replica; ++i) {
SMnodeObj *pMnode = mgmtGetMnode(roles.nodeId[i]); SMnodeObj *pMnode = mgmtGetMnode(roles.nodeId[i]);
if (pMnode != NULL) { if (pMnode != NULL) {
pMnode->role = roles.role[i]; pMnode->role = roles.role[i];
mPrint("mnode:%d, role:%s", pMnode->mnodeId, mgmtGetMnodeRoleStr(pMnode->role)); sdbPrint("mnode:%d, role:%s", pMnode->mnodeId, mgmtGetMnodeRoleStr(pMnode->role));
mgmtReleaseMnode(pMnode); mgmtReleaseMnode(pMnode);
} }
} }
...@@ -196,7 +196,7 @@ static int sdbGetWalInfo(void *ahandle, char *name, uint32_t *index) { ...@@ -196,7 +196,7 @@ static int sdbGetWalInfo(void *ahandle, char *name, uint32_t *index) {
} }
static void sdbNotifyRole(void *ahandle, int8_t role) { static void sdbNotifyRole(void *ahandle, int8_t role) {
mPrint("mnode role changed from %s to %s", mgmtGetMnodeRoleStr(tsSdbObj.role), mgmtGetMnodeRoleStr(role)); sdbPrint("mnode role changed from %s to %s", mgmtGetMnodeRoleStr(tsSdbObj.role), mgmtGetMnodeRoleStr(role));
if (role == TAOS_SYNC_ROLE_MASTER && tsSdbObj.role != TAOS_SYNC_ROLE_MASTER) { if (role == TAOS_SYNC_ROLE_MASTER && tsSdbObj.role != TAOS_SYNC_ROLE_MASTER) {
balanceReset(); balanceReset();
...@@ -208,8 +208,8 @@ static void sdbNotifyRole(void *ahandle, int8_t role) { ...@@ -208,8 +208,8 @@ static void sdbNotifyRole(void *ahandle, int8_t role) {
static void sdbConfirmForward(void *ahandle, void *param, int32_t code) { static void sdbConfirmForward(void *ahandle, void *param, int32_t code) {
tsSdbObj.code = code; tsSdbObj.code = code;
sdbTrace("sdb forward request confirmed, result:%s", tstrerror(code));
sem_post(&tsSdbObj.sem); sem_post(&tsSdbObj.sem);
mPrint("sdb forward request confirmed, result:%s", tstrerror(code));
} }
static int32_t sdbForwardToPeer(void *pHead) { static int32_t sdbForwardToPeer(void *pHead) {
...@@ -227,9 +227,9 @@ void sdbUpdateSync() { ...@@ -227,9 +227,9 @@ void sdbUpdateSync() {
SSyncCfg syncCfg = {0}; SSyncCfg syncCfg = {0};
int32_t index = 0; int32_t index = 0;
SDMNodeInfos *mnodes = dnodeGetMnodeList(); SDMMnodeInfos *mnodes = dnodeGetMnodeInfos();
for (int32_t i = 0; i < mnodes->nodeNum; ++i) { for (int32_t i = 0; i < mnodes->nodeNum; ++i) {
SDMNodeInfo *node = &mnodes->nodeInfos[i]; SDMMnodeInfo *node = &mnodes->nodeInfos[i];
syncCfg.nodeInfo[i].nodeId = node->nodeId; syncCfg.nodeInfo[i].nodeId = node->nodeId;
syncCfg.nodeInfo[i].nodeIp = node->nodeIp; syncCfg.nodeInfo[i].nodeIp = node->nodeIp;
strcpy(syncCfg.nodeInfo[i].name, node->nodeName); strcpy(syncCfg.nodeInfo[i].name, node->nodeName);
...@@ -271,9 +271,9 @@ void sdbUpdateSync() { ...@@ -271,9 +271,9 @@ void sdbUpdateSync() {
if (!hasThisDnode) return; if (!hasThisDnode) return;
if (memcmp(&syncCfg, &tsSdbObj.cfg, sizeof(SSyncCfg)) == 0) return; if (memcmp(&syncCfg, &tsSdbObj.cfg, sizeof(SSyncCfg)) == 0) return;
mPrint("work as mnode, replica:%d arbitratorIp:%s", syncCfg.replica, taosIpStr(syncCfg.arbitratorIp)); sdbPrint("work as mnode, replica:%d arbitratorIp:%s", syncCfg.replica, taosIpStr(syncCfg.arbitratorIp));
for (int32_t i = 0; i < syncCfg.replica; ++i) { for (int32_t i = 0; i < syncCfg.replica; ++i) {
mPrint("mnode:%d, ip:%s name:%s", syncCfg.nodeInfo[i].nodeId, taosIpStr(syncCfg.nodeInfo[i].nodeIp), sdbPrint("mnode:%d, ip:%s name:%s", syncCfg.nodeInfo[i].nodeId, taosIpStr(syncCfg.nodeInfo[i].nodeIp),
syncCfg.nodeInfo[i].name); syncCfg.nodeInfo[i].name);
} }
...@@ -476,9 +476,13 @@ static int sdbWrite(void *param, void *data, int type) { ...@@ -476,9 +476,13 @@ static int sdbWrite(void *param, void *data, int type) {
pthread_mutex_unlock(&tsSdbObj.mutex); pthread_mutex_unlock(&tsSdbObj.mutex);
// from app, oper is created // from app, oper is created
if (param == NULL) return code; if (param != NULL) return code;
// from wal or forward msg, should create oper
if (tsSdbObj.sync != NULL) {
syncConfirmForward(tsSdbObj.sync, pHead->version, code);
}
// from wal, should create oper
if (action == SDB_ACTION_INSERT) { if (action == SDB_ACTION_INSERT) {
SSdbOper oper = {.rowSize = pHead->len, .rowData = pHead->cont, .table = pTable}; SSdbOper oper = {.rowSize = pHead->len, .rowData = pHead->cont, .table = pTable};
code = (*pTable->decodeFp)(&oper); code = (*pTable->decodeFp)(&oper);
...@@ -529,7 +533,7 @@ int32_t sdbInsertRow(SSdbOper *pOper) { ...@@ -529,7 +533,7 @@ int32_t sdbInsertRow(SSdbOper *pOper) {
(*pTable->encodeFp)(pOper); (*pTable->encodeFp)(pOper);
pHead->len = pOper->rowSize; pHead->len = pOper->rowSize;
int32_t code = sdbWrite(NULL, pHead, pHead->msgType); int32_t code = sdbWrite(pOper, pHead, pHead->msgType);
taosFreeQitem(pHead); taosFreeQitem(pHead);
if (code < 0) return code; if (code < 0) return code;
} }
...@@ -571,7 +575,7 @@ int32_t sdbDeleteRow(SSdbOper *pOper) { ...@@ -571,7 +575,7 @@ int32_t sdbDeleteRow(SSdbOper *pOper) {
pHead->msgType = pTable->tableId * 10 + SDB_ACTION_DELETE; pHead->msgType = pTable->tableId * 10 + SDB_ACTION_DELETE;
memcpy(pHead->cont, pOper->pObj, rowSize); memcpy(pHead->cont, pOper->pObj, rowSize);
int32_t code = sdbWrite(NULL, pHead, pHead->msgType); int32_t code = sdbWrite(pOper, pHead, pHead->msgType);
taosFreeQitem(pHead); taosFreeQitem(pHead);
if (code < 0) return code; if (code < 0) return code;
} }
...@@ -602,7 +606,7 @@ int32_t sdbUpdateRow(SSdbOper *pOper) { ...@@ -602,7 +606,7 @@ int32_t sdbUpdateRow(SSdbOper *pOper) {
(*pTable->encodeFp)(pOper); (*pTable->encodeFp)(pOper);
pHead->len = pOper->rowSize; pHead->len = pOper->rowSize;
int32_t code = sdbWrite(NULL, pHead, pHead->msgType); int32_t code = sdbWrite(pOper, pHead, pHead->msgType);
taosFreeQitem(pHead); taosFreeQitem(pHead);
if (code < 0) return code; if (code < 0) return code;
} }
......
src/mnode/src/mgmtShell.c
浏览文件 @ 59a77a36
...@@ -141,13 +141,19 @@ void mgmtDealyedAddToShellQueue(SQueuedMsg *queuedMsg) { ...@@ -141,13 +141,19 @@ void mgmtDealyedAddToShellQueue(SQueuedMsg *queuedMsg) {
static void mgmtProcessMsgFromShell(SRpcMsg *rpcMsg) { static void mgmtProcessMsgFromShell(SRpcMsg *rpcMsg) {
if (rpcMsg == NULL || rpcMsg->pCont == NULL) { if (rpcMsg == NULL || rpcMsg->pCont == NULL) {
mgmtSendSimpleResp(rpcMsg->handle, TSDB_CODE_INVALID_MSG_LEN);
return; return;
} }
if (!sdbIsMaster()) { if (!sdbIsMaster()) {
// rpcSendRedirectRsp(rpcMsg->handle, mgmtGetMnodeIpListForRedirect()); SRpcConnInfo connInfo;
mgmtSendSimpleResp(rpcMsg->handle, TSDB_CODE_NO_MASTER); rpcGetConnInfo(rpcMsg->handle, &connInfo);
rpcFreeCont(rpcMsg->pCont); bool usePublicIp = (connInfo.serverIp == tsPublicIpInt);
SRpcIpSet ipSet = {0};
mgmtGetMnodeIpSet(&ipSet, usePublicIp);
mTrace("conn from ip:%s user:%s redirect msg", taosIpStr(connInfo.clientIp), connInfo.user);
rpcSendRedirectRsp(rpcMsg->handle, &ipSet);
return; return;
} }
...@@ -332,7 +338,7 @@ static void mgmtProcessHeartBeatMsg(SQueuedMsg *pMsg) { ...@@ -332,7 +338,7 @@ static void mgmtProcessHeartBeatMsg(SQueuedMsg *pMsg) {
return; return;
} }
mgmtGetMnodeIpList(&pHBRsp->ipList, pMsg->usePublicIp); mgmtGetMnodeIpSet(&pHBRsp->ipList, pMsg->usePublicIp);
/* /*
* TODO * TODO
...@@ -357,14 +363,18 @@ static int mgmtShellRetriveAuth(char *user, char *spi, char *encrypt, char *secr ...@@ -357,14 +363,18 @@ static int mgmtShellRetriveAuth(char *user, char *spi, char *encrypt, char *secr
*encrypt = 0; *encrypt = 0;
*ckey = 0; *ckey = 0;
if (!sdbIsMaster()) {
*secret = 0;
return TSDB_CODE_SUCCESS;
}
SUserObj *pUser = mgmtGetUser(user); SUserObj *pUser = mgmtGetUser(user);
if (pUser == NULL) { if (pUser == NULL) {
*secret = 0; *secret = 0;
mgmtReleaseUser(pUser);
return TSDB_CODE_INVALID_USER; return TSDB_CODE_INVALID_USER;
} else { } else {
memcpy(secret, pUser->pass, TSDB_KEY_LEN); memcpy(secret, pUser->pass, TSDB_KEY_LEN);
mgmtReleaseUser(pUser); mgmtDecUserRef(pUser);
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
} }
...@@ -414,7 +424,7 @@ static void mgmtProcessConnectMsg(SQueuedMsg *pMsg) { ...@@ -414,7 +424,7 @@ static void mgmtProcessConnectMsg(SQueuedMsg *pMsg) {
pConnectRsp->writeAuth = pUser->writeAuth; pConnectRsp->writeAuth = pUser->writeAuth;
pConnectRsp->superAuth = pUser->superAuth; pConnectRsp->superAuth = pUser->superAuth;
mgmtGetMnodeIpList(&pConnectRsp->ipList, pMsg->usePublicIp); mgmtGetMnodeIpSet(&pConnectRsp->ipList, pMsg->usePublicIp);
connect_over: connect_over:
rpcRsp.code = code; rpcRsp.code = code;
......
src/mnode/src/mgmtTable.c
浏览文件 @ 59a77a36
...@@ -97,7 +97,7 @@ static int32_t mgmtChildTableActionInsert(SSdbOper *pOper) { ...@@ -97,7 +97,7 @@ static int32_t mgmtChildTableActionInsert(SSdbOper *pOper) {
mError("ctable:%s, not in vgroup:%d", pTable->info.tableId, pTable->vgId); mError("ctable:%s, not in vgroup:%d", pTable->info.tableId, pTable->vgId);
return TSDB_CODE_INVALID_VGROUP_ID; return TSDB_CODE_INVALID_VGROUP_ID;
} }
mgmtReleaseVgroup(pVgroup); mgmtDecVgroupRef(pVgroup);
SDbObj *pDb = mgmtGetDb(pVgroup->dbName); SDbObj *pDb = mgmtGetDb(pVgroup->dbName);
if (pDb == NULL) { if (pDb == NULL) {
...@@ -108,7 +108,7 @@ static int32_t mgmtChildTableActionInsert(SSdbOper *pOper) { ...@@ -108,7 +108,7 @@ static int32_t mgmtChildTableActionInsert(SSdbOper *pOper) {
SAcctObj *pAcct = mgmtGetAcct(pDb->cfg.acct); SAcctObj *pAcct = mgmtGetAcct(pDb->cfg.acct);
if (pAcct == NULL) { if (pAcct == NULL) {
mError("ctable:%s, account:%s not exists", pTable->info.tableId, pDb->cfg.acct); mError("ctable:%s, acct:%s not exists", pTable->info.tableId, pDb->cfg.acct);
return TSDB_CODE_INVALID_ACCT; return TSDB_CODE_INVALID_ACCT;
} }
mgmtDecAcctRef(pAcct); mgmtDecAcctRef(pAcct);
...@@ -139,7 +139,7 @@ static int32_t mgmtChildTableActionDelete(SSdbOper *pOper) { ...@@ -139,7 +139,7 @@ static int32_t mgmtChildTableActionDelete(SSdbOper *pOper) {
if (pVgroup == NULL) { if (pVgroup == NULL) {
return TSDB_CODE_INVALID_VGROUP_ID; return TSDB_CODE_INVALID_VGROUP_ID;
} }
mgmtReleaseVgroup(pVgroup); mgmtDecVgroupRef(pVgroup);
SDbObj *pDb = mgmtGetDb(pVgroup->dbName); SDbObj *pDb = mgmtGetDb(pVgroup->dbName);
if (pDb == NULL) { if (pDb == NULL) {
...@@ -150,7 +150,7 @@ static int32_t mgmtChildTableActionDelete(SSdbOper *pOper) { ...@@ -150,7 +150,7 @@ static int32_t mgmtChildTableActionDelete(SSdbOper *pOper) {
SAcctObj *pAcct = mgmtGetAcct(pDb->cfg.acct); SAcctObj *pAcct = mgmtGetAcct(pDb->cfg.acct);
if (pAcct == NULL) { if (pAcct == NULL) {
mError("ctable:%s, account:%s not exists", pTable->info.tableId, pDb->cfg.acct); mError("ctable:%s, acct:%s not exists", pTable->info.tableId, pDb->cfg.acct);
return TSDB_CODE_INVALID_ACCT; return TSDB_CODE_INVALID_ACCT;
} }
mgmtDecAcctRef(pAcct); mgmtDecAcctRef(pAcct);
...@@ -275,7 +275,7 @@ static int32_t mgmtChildTableActionRestored() { ...@@ -275,7 +275,7 @@ static int32_t mgmtChildTableActionRestored() {
pNode = pLastNode; pNode = pLastNode;
continue; continue;
} }
mgmtReleaseVgroup(pVgroup); mgmtDecVgroupRef(pVgroup);
if (strcmp(pVgroup->dbName, pDb->name) != 0) { if (strcmp(pVgroup->dbName, pDb->name) != 0) {
mError("ctable:%s, db:%s not match with vgroup:%d db:%s sid:%d, discard it", mError("ctable:%s, db:%s not match with vgroup:%d db:%s sid:%d, discard it",
...@@ -1194,17 +1194,15 @@ static void mgmtProcessSuperTableVgroupMsg(SQueuedMsg *pMsg) { ...@@ -1194,17 +1194,15 @@ static void mgmtProcessSuperTableVgroupMsg(SQueuedMsg *pMsg) {
pRsp->vgroups[vg].vgId = htonl(vgId); pRsp->vgroups[vg].vgId = htonl(vgId);
for (int32_t vn = 0; vn < pVgroup->numOfVnodes; ++vn) { for (int32_t vn = 0; vn < pVgroup->numOfVnodes; ++vn) {
SDnodeObj *pDnode = mgmtGetDnode(pVgroup->vnodeGid[vn].dnodeId); SDnodeObj *pDnode = pVgroup->vnodeGid[vn].pDnode;
if (pDnode == NULL) break; if (pDnode == NULL) break;
pRsp->vgroups[vg].ipAddr[vn].ip = htonl(pDnode->privateIp); pRsp->vgroups[vg].ipAddr[vn].ip = htonl(pDnode->privateIp);
pRsp->vgroups[vg].ipAddr[vn].port = htons(tsDnodeShellPort); pRsp->vgroups[vg].ipAddr[vn].port = htons(tsDnodeShellPort);
pRsp->vgroups[vg].numOfIps++; pRsp->vgroups[vg].numOfIps++;
mgmtReleaseDnode(pDnode);
} }
mgmtReleaseVgroup(pVgroup); mgmtDecVgroupRef(pVgroup);
} }
pRsp->numOfVgroups = htonl(vg); pRsp->numOfVgroups = htonl(vg);
...@@ -1613,7 +1611,7 @@ static int32_t mgmtDoGetChildTableMeta(SQueuedMsg *pMsg, STableMetaMsg *pMeta) { ...@@ -1613,7 +1611,7 @@ static int32_t mgmtDoGetChildTableMeta(SQueuedMsg *pMsg, STableMetaMsg *pMeta) {
pMeta->vgroup.ipAddr[i].port = htonl(tsDnodeShellPort); pMeta->vgroup.ipAddr[i].port = htonl(tsDnodeShellPort);
} }
pMeta->vgroup.numOfIps++; pMeta->vgroup.numOfIps++;
mgmtReleaseDnode(pDnode); mgmtDecDnodeRef(pDnode);
} }
pMeta->vgroup.vgId = htonl(pVgroup->vgId); pMeta->vgroup.vgId = htonl(pVgroup->vgId);
...@@ -1742,7 +1740,7 @@ static SChildTableObj* mgmtGetTableByPos(uint32_t dnodeId, int32_t vnode, int32_ ...@@ -1742,7 +1740,7 @@ static SChildTableObj* mgmtGetTableByPos(uint32_t dnodeId, int32_t vnode, int32_
SChildTableObj *pTable = pVgroup->tableList[sid]; SChildTableObj *pTable = pVgroup->tableList[sid];
mgmtIncTableRef((STableObj *)pTable); mgmtIncTableRef((STableObj *)pTable);
mgmtReleaseVgroup(pVgroup); mgmtDecVgroupRef(pVgroup);
return pTable; return pTable;
} }
......
src/mnode/src/mgmtUser.c
浏览文件 @ 59a77a36
...@@ -19,17 +19,17 @@ ...@@ -19,17 +19,17 @@
#include "ttime.h" #include "ttime.h"
#include "tutil.h" #include "tutil.h"
#include "tglobal.h" #include "tglobal.h"
#include "tgrant.h"
#include "dnode.h" #include "dnode.h"
#include "mgmtDef.h" #include "mgmtDef.h"
#include "mgmtLog.h" #include "mgmtLog.h"
#include "mgmtAcct.h" #include "mgmtAcct.h"
#include "tgrant.h"
#include "mgmtMnode.h" #include "mgmtMnode.h"
#include "mgmtSdb.h" #include "mgmtSdb.h"
#include "mgmtShell.h" #include "mgmtShell.h"
#include "mgmtUser.h" #include "mgmtUser.h"
void * tsUserSdb = NULL; static void * tsUserSdb = NULL;
static int32_t tsUserUpdateSize = 0; static int32_t tsUserUpdateSize = 0;
static int32_t mgmtGetUserMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn); static int32_t mgmtGetUserMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn);
static int32_t mgmtRetrieveUsers(SShowObj *pShow, char *data, int32_t rows, void *pConn); static int32_t mgmtRetrieveUsers(SShowObj *pShow, char *data, int32_t rows, void *pConn);
...@@ -48,8 +48,8 @@ static int32_t mgmtUserActionInsert(SSdbOper *pOper) { ...@@ -48,8 +48,8 @@ static int32_t mgmtUserActionInsert(SSdbOper *pOper) {
if (pAcct != NULL) { if (pAcct != NULL) {
mgmtAddUserToAcct(pAcct, pUser); mgmtAddUserToAcct(pAcct, pUser);
} mgmtDecAcctRef(pAcct);
else { } else {
mError("user:%s, acct:%s info not exist in sdb", pUser->user, pUser->acct); mError("user:%s, acct:%s info not exist in sdb", pUser->user, pUser->acct);
return TSDB_CODE_INVALID_ACCT; return TSDB_CODE_INVALID_ACCT;
} }
...@@ -63,6 +63,7 @@ static int32_t mgmtUserActionDelete(SSdbOper *pOper) { ...@@ -63,6 +63,7 @@ static int32_t mgmtUserActionDelete(SSdbOper *pOper) {
if (pAcct != NULL) { if (pAcct != NULL) {
mgmtDropUserFromAcct(pAcct, pUser); mgmtDropUserFromAcct(pAcct, pUser);
mgmtDecAcctRef(pAcct);
} }
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
...@@ -72,9 +73,10 @@ static int32_t mgmtUserActionUpdate(SSdbOper *pOper) { ...@@ -72,9 +73,10 @@ static int32_t mgmtUserActionUpdate(SSdbOper *pOper) {
SUserObj *pUser = pOper->pObj; SUserObj *pUser = pOper->pObj;
SUserObj *pSaved = mgmtGetUser(pUser->user); SUserObj *pSaved = mgmtGetUser(pUser->user);
if (pUser != pSaved) { if (pUser != pSaved) {
memcpy(pSaved, pUser, pOper->rowSize); memcpy(pSaved, pUser, tsUserUpdateSize);
free(pUser); free(pUser);
} }
mgmtDecUserRef(pSaved);
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
...@@ -86,7 +88,7 @@ static int32_t mgmtUserActionEncode(SSdbOper *pOper) { ...@@ -86,7 +88,7 @@ static int32_t mgmtUserActionEncode(SSdbOper *pOper) {
} }
static int32_t mgmtUserActionDecode(SSdbOper *pOper) { static int32_t mgmtUserActionDecode(SSdbOper *pOper) {
SUserObj *pUser = (SUserObj *) calloc(1, sizeof(SUserObj)); SUserObj *pUser = (SUserObj *)calloc(1, sizeof(SUserObj));
if (pUser == NULL) return TSDB_CODE_SERV_OUT_OF_MEMORY; if (pUser == NULL) return TSDB_CODE_SERV_OUT_OF_MEMORY;
memcpy(pUser, pOper->rowData, tsUserUpdateSize); memcpy(pUser, pOper->rowData, tsUserUpdateSize);
...@@ -103,7 +105,7 @@ static int32_t mgmtUserActionRestored() { ...@@ -103,7 +105,7 @@ static int32_t mgmtUserActionRestored() {
mgmtDecAcctRef(pAcct); mgmtDecAcctRef(pAcct);
} }
return 0; return TSDB_CODE_SUCCESS;
} }
int32_t mgmtInitUsers() { int32_t mgmtInitUsers() {
...@@ -128,7 +130,7 @@ int32_t mgmtInitUsers() { ...@@ -128,7 +130,7 @@ int32_t mgmtInitUsers() {
tsUserSdb = sdbOpenTable(&tableDesc); tsUserSdb = sdbOpenTable(&tableDesc);
if (tsUserSdb == NULL) { if (tsUserSdb == NULL) {
mError("failed to init user data"); mError("table:%s, failed to create hash", tableDesc.tableName);
return -1; return -1;
} }
...@@ -138,7 +140,7 @@ int32_t mgmtInitUsers() { ...@@ -138,7 +140,7 @@ int32_t mgmtInitUsers() {
mgmtAddShellShowMetaHandle(TSDB_MGMT_TABLE_USER, mgmtGetUserMeta); mgmtAddShellShowMetaHandle(TSDB_MGMT_TABLE_USER, mgmtGetUserMeta);
mgmtAddShellShowRetrieveHandle(TSDB_MGMT_TABLE_USER, mgmtRetrieveUsers); mgmtAddShellShowRetrieveHandle(TSDB_MGMT_TABLE_USER, mgmtRetrieveUsers);
mTrace("table:users table is created"); mTrace("table:%s, hash is created", tableDesc.tableName);
return 0; return 0;
} }
...@@ -150,7 +152,15 @@ SUserObj *mgmtGetUser(char *name) { ...@@ -150,7 +152,15 @@ SUserObj *mgmtGetUser(char *name) {
return (SUserObj *)sdbGetRow(tsUserSdb, name); return (SUserObj *)sdbGetRow(tsUserSdb, name);
} }
void mgmtReleaseUser(SUserObj *pUser) { void *mgmtGetNextUser(void *pNode, SUserObj **pUser) {
return sdbFetchRow(tsUserSdb, pNode, (void **)pUser);
}
void mgmtIncUserRef(SUserObj *pUser) {
return sdbIncRef(tsUserSdb, pUser);
}
void mgmtDecUserRef(SUserObj *pUser) {
return sdbDecRef(tsUserSdb, pUser); return sdbDecRef(tsUserSdb, pUser);
} }
...@@ -172,18 +182,22 @@ static int32_t mgmtUpdateUser(SUserObj *pUser) { ...@@ -172,18 +182,22 @@ static int32_t mgmtUpdateUser(SUserObj *pUser) {
int32_t mgmtCreateUser(SAcctObj *pAcct, char *name, char *pass) { int32_t mgmtCreateUser(SAcctObj *pAcct, char *name, char *pass) {
int32_t code = acctCheck(pAcct, ACCT_GRANT_USER); int32_t code = acctCheck(pAcct, ACCT_GRANT_USER);
if (code != 0) { if (code != TSDB_CODE_SUCCESS) {
return code; return code;
} }
if (name[0] == 0 || pass[0] == 0) { if (name[0] == 0) {
return TSDB_CODE_INVALID_MSG_CONTENT; return TSDB_CODE_INVALID_USER_FORMAT;
}
if (pass[0] == 0) {
return TSDB_CODE_INVALID_PASS_FORMAT;
} }
SUserObj *pUser = mgmtGetUser(name); SUserObj *pUser = mgmtGetUser(name);
if (pUser != NULL) { if (pUser != NULL) {
mTrace("user:%s is already there", name); mTrace("user:%s, is already there", name);
mgmtReleaseUser(pUser); mgmtDecUserRef(pUser);
return TSDB_CODE_USER_ALREADY_EXIST; return TSDB_CODE_USER_ALREADY_EXIST;
} }
...@@ -237,7 +251,7 @@ static int32_t mgmtDropUser(SUserObj *pUser) { ...@@ -237,7 +251,7 @@ static int32_t mgmtDropUser(SUserObj *pUser) {
static int32_t mgmtGetUserMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) { static int32_t mgmtGetUserMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) {
SUserObj *pUser = mgmtGetUserFromConn(pConn, NULL); SUserObj *pUser = mgmtGetUserFromConn(pConn, NULL);
if (pUser == NULL) { if (pUser == NULL) {
return TSDB_CODE_INVALID_USER; return TSDB_CODE_NO_USER_FROM_CONN;
} }
int32_t cols = 0; int32_t cols = 0;
...@@ -273,7 +287,7 @@ static int32_t mgmtGetUserMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pCon ...@@ -273,7 +287,7 @@ static int32_t mgmtGetUserMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pCon
pShow->numOfRows = pUser->pAcct->acctInfo.numOfUsers; pShow->numOfRows = pUser->pAcct->acctInfo.numOfUsers;
pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1]; pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1];
mgmtReleaseUser(pUser); mgmtDecUserRef(pUser);
return 0; return 0;
} }
...@@ -308,8 +322,9 @@ static int32_t mgmtRetrieveUsers(SShowObj *pShow, char *data, int32_t rows, void ...@@ -308,8 +322,9 @@ static int32_t mgmtRetrieveUsers(SShowObj *pShow, char *data, int32_t rows, void
cols++; cols++;
numOfRows++; numOfRows++;
mgmtReleaseUser(pUser); mgmtDecUserRef(pUser);
} }
pShow->numOfReads += numOfRows; pShow->numOfReads += numOfRows;
return numOfRows; return numOfRows;
} }
...@@ -321,20 +336,21 @@ SUserObj *mgmtGetUserFromConn(void *pConn, bool *usePublicIp) { ...@@ -321,20 +336,21 @@ SUserObj *mgmtGetUserFromConn(void *pConn, bool *usePublicIp) {
*usePublicIp = (connInfo.serverIp == tsPublicIpInt); *usePublicIp = (connInfo.serverIp == tsPublicIpInt);
} }
return mgmtGetUser(connInfo.user); return mgmtGetUser(connInfo.user);
} } else {
mError("can not get user from conn:%p", pConn);
return NULL; return NULL;
}
} }
static void mgmtProcessCreateUserMsg(SQueuedMsg *pMsg) { static void mgmtProcessCreateUserMsg(SQueuedMsg *pMsg) {
int32_t code; int32_t code;
SUserObj *pUser = pMsg->pUser; SUserObj *pOperUser = pMsg->pUser;
if (pUser->superAuth) { if (pOperUser->superAuth) {
SCMCreateUserMsg *pCreate = pMsg->pCont; SCMCreateUserMsg *pCreate = pMsg->pCont;
code = mgmtCreateUser(pUser->pAcct, pCreate->user, pCreate->pass); code = mgmtCreateUser(pOperUser->pAcct, pCreate->user, pCreate->pass);
if (code == TSDB_CODE_SUCCESS) { if (code == TSDB_CODE_SUCCESS) {
mLPrint("user:%s is created by %s", pCreate->user, pUser->user); mLPrint("user:%s, is created by %s", pCreate->user, pOperUser->user);
} }
} else { } else {
code = TSDB_CODE_NO_RIGHTS; code = TSDB_CODE_NO_RIGHTS;
...@@ -356,7 +372,7 @@ static void mgmtProcessAlterUserMsg(SQueuedMsg *pMsg) { ...@@ -356,7 +372,7 @@ static void mgmtProcessAlterUserMsg(SQueuedMsg *pMsg) {
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] == '_')) {
mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_NO_RIGHTS); mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_NO_RIGHTS);
mgmtReleaseUser(pUser); mgmtDecUserRef(pUser);
return; return;
} }
...@@ -380,7 +396,7 @@ static void mgmtProcessAlterUserMsg(SQueuedMsg *pMsg) { ...@@ -380,7 +396,7 @@ static void mgmtProcessAlterUserMsg(SQueuedMsg *pMsg) {
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, result:%d", pUser->user, pOperUser->user, tstrerror(code)); mLPrint("user:%s, password is altered by %s, result:%s", pUser->user, pOperUser->user, tstrerror(code));
} else { } else {
code = TSDB_CODE_NO_RIGHTS; code = TSDB_CODE_NO_RIGHTS;
} }
...@@ -422,7 +438,7 @@ static void mgmtProcessAlterUserMsg(SQueuedMsg *pMsg) { ...@@ -422,7 +438,7 @@ static void mgmtProcessAlterUserMsg(SQueuedMsg *pMsg) {
} }
code = mgmtUpdateUser(pUser); code = mgmtUpdateUser(pUser);
mLPrint("user:%s privilege is altered by %s, result:%d", pUser->user, pOperUser->user, tstrerror(code)); mLPrint("user:%s, privilege is altered by %s, result:%s", pUser->user, pOperUser->user, tstrerror(code));
} else { } else {
code = TSDB_CODE_NO_RIGHTS; code = TSDB_CODE_NO_RIGHTS;
} }
...@@ -432,7 +448,7 @@ static void mgmtProcessAlterUserMsg(SQueuedMsg *pMsg) { ...@@ -432,7 +448,7 @@ static void mgmtProcessAlterUserMsg(SQueuedMsg *pMsg) {
mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_NO_RIGHTS); mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_NO_RIGHTS);
} }
mgmtReleaseUser(pUser); mgmtDecUserRef(pUser);
} }
static void mgmtProcessDropUserMsg(SQueuedMsg *pMsg) { static void mgmtProcessDropUserMsg(SQueuedMsg *pMsg) {
...@@ -443,13 +459,13 @@ static void mgmtProcessDropUserMsg(SQueuedMsg *pMsg) { ...@@ -443,13 +459,13 @@ static void mgmtProcessDropUserMsg(SQueuedMsg *pMsg) {
SUserObj *pUser = mgmtGetUser(pDrop->user); SUserObj *pUser = mgmtGetUser(pDrop->user);
if (pUser == NULL) { if (pUser == NULL) {
mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_INVALID_USER); mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_INVALID_USER);
return ; return;
} }
if (strcmp(pUser->user, "monitor") == 0 || strcmp(pUser->user, pUser->acct) == 0 || if (strcmp(pUser->user, "monitor") == 0 || strcmp(pUser->user, pUser->acct) == 0 ||
(strcmp(pUser->user + 1, pUser->acct) == 0 && pUser->user[0] == '_')) { (strcmp(pUser->user + 1, pUser->acct) == 0 && pUser->user[0] == '_')) {
mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_NO_RIGHTS); mgmtSendSimpleResp(pMsg->thandle, TSDB_CODE_NO_RIGHTS);
mgmtReleaseUser(pUser); mgmtDecUserRef(pUser);
return ; return ;
} }
...@@ -471,14 +487,14 @@ static void mgmtProcessDropUserMsg(SQueuedMsg *pMsg) { ...@@ -471,14 +487,14 @@ static void mgmtProcessDropUserMsg(SQueuedMsg *pMsg) {
if (hasRight) { if (hasRight) {
code = mgmtDropUser(pUser); code = mgmtDropUser(pUser);
if (code == TSDB_CODE_SUCCESS) { if (code == TSDB_CODE_SUCCESS) {
mLPrint("user:%s is dropped by %s, result:%s", pUser->user, pOperUser->user, tstrerror(code)); mLPrint("user:%s, is dropped by %s, result:%s", pUser->user, pOperUser->user, tstrerror(code));
} }
} else { } else {
code = TSDB_CODE_NO_RIGHTS; code = TSDB_CODE_NO_RIGHTS;
} }
mgmtSendSimpleResp(pMsg->thandle, code); mgmtSendSimpleResp(pMsg->thandle, code);
mgmtReleaseUser(pUser); mgmtDecUserRef(pUser);
} }
void mgmtDropAllUsers(SAcctObj *pAcct) { void mgmtDropAllUsers(SAcctObj *pAcct) {
...@@ -504,7 +520,7 @@ void mgmtDropAllUsers(SAcctObj *pAcct) { ...@@ -504,7 +520,7 @@ void mgmtDropAllUsers(SAcctObj *pAcct) {
numOfUsers++; numOfUsers++;
} }
mgmtReleaseUser(pUser); mgmtDecUserRef(pUser);
} }
mTrace("acct:%s, all users:%d is dropped from sdb", pAcct->user, numOfUsers); mTrace("acct:%s, all users:%d is dropped from sdb", pAcct->user, numOfUsers);
......
src/mnode/src/mgmtVgroup.c
浏览文件 @ 59a77a36
...@@ -44,9 +44,7 @@ static int32_t mgmtRetrieveVgroups(SShowObj *pShow, char *data, int32_t rows, vo ...@@ -44,9 +44,7 @@ static int32_t mgmtRetrieveVgroups(SShowObj *pShow, char *data, int32_t rows, vo
static void mgmtProcessCreateVnodeRsp(SRpcMsg *rpcMsg); static void mgmtProcessCreateVnodeRsp(SRpcMsg *rpcMsg);
static void mgmtProcessDropVnodeRsp(SRpcMsg *rpcMsg); static void mgmtProcessDropVnodeRsp(SRpcMsg *rpcMsg);
static void mgmtProcessVnodeCfgMsg(SRpcMsg *rpcMsg) ; static void mgmtProcessVnodeCfgMsg(SRpcMsg *rpcMsg) ;
static void mgmtSendDropVgroupMsg(SVgObj *pVgroup, void *ahandle); static void mgmtSendDropVgroupMsg(SVgObj *pVgroup, void *ahandle);
static void mgmtSendCreateVgroupMsg(SVgObj *pVgroup, void *ahandle);
static int32_t mgmtVgroupActionDestroy(SSdbOper *pOper) { static int32_t mgmtVgroupActionDestroy(SSdbOper *pOper) {
SVgObj *pVgroup = pOper->pObj; SVgObj *pVgroup = pOper->pObj;
...@@ -68,7 +66,6 @@ static int32_t mgmtVgroupActionInsert(SSdbOper *pOper) { ...@@ -68,7 +66,6 @@ static int32_t mgmtVgroupActionInsert(SSdbOper *pOper) {
if (pDb == NULL) { if (pDb == NULL) {
return TSDB_CODE_INVALID_DB; return TSDB_CODE_INVALID_DB;
} }
mgmtDecDbRef(pDb);
pVgroup->pDb = pDb; pVgroup->pDb = pDb;
pVgroup->prev = NULL; pVgroup->prev = NULL;
...@@ -91,15 +88,13 @@ static int32_t mgmtVgroupActionInsert(SSdbOper *pOper) { ...@@ -91,15 +88,13 @@ static int32_t mgmtVgroupActionInsert(SSdbOper *pOper) {
for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) { for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
SDnodeObj *pDnode = mgmtGetDnode(pVgroup->vnodeGid[i].dnodeId); SDnodeObj *pDnode = mgmtGetDnode(pVgroup->vnodeGid[i].dnodeId);
if (pDnode != NULL) { if (pDnode != NULL) {
pVgroup->vnodeGid[i].privateIp = pDnode->privateIp; pVgroup->vnodeGid[i].pDnode = pDnode;
pVgroup->vnodeGid[i].publicIp = pDnode->publicIp;
atomic_add_fetch_32(&pDnode->openVnodes, 1); atomic_add_fetch_32(&pDnode->openVnodes, 1);
mgmtReleaseDnode(pDnode); mgmtDecDnodeRef(pDnode);
} }
} }
mgmtAddVgroupIntoDb(pVgroup); mgmtAddVgroupIntoDb(pVgroup);
mgmtIncDbRef(pVgroup->pDb);
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
...@@ -115,10 +110,10 @@ static int32_t mgmtVgroupActionDelete(SSdbOper *pOper) { ...@@ -115,10 +110,10 @@ static int32_t mgmtVgroupActionDelete(SSdbOper *pOper) {
for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) { for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
SDnodeObj *pDnode = mgmtGetDnode(pVgroup->vnodeGid[i].dnodeId); SDnodeObj *pDnode = mgmtGetDnode(pVgroup->vnodeGid[i].dnodeId);
if (pDnode) { if (pDnode != NULL) {
atomic_sub_fetch_32(&pDnode->openVnodes, 1); atomic_sub_fetch_32(&pDnode->openVnodes, 1);
} }
mgmtReleaseDnode(pDnode); mgmtDecDnodeRef(pDnode);
} }
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
...@@ -127,9 +122,25 @@ static int32_t mgmtVgroupActionDelete(SSdbOper *pOper) { ...@@ -127,9 +122,25 @@ static int32_t mgmtVgroupActionDelete(SSdbOper *pOper) {
static int32_t mgmtVgroupActionUpdate(SSdbOper *pOper) { static int32_t mgmtVgroupActionUpdate(SSdbOper *pOper) {
SVgObj *pNew = pOper->pObj; SVgObj *pNew = pOper->pObj;
SVgObj *pVgroup = mgmtGetVgroup(pNew->vgId); SVgObj *pVgroup = mgmtGetVgroup(pNew->vgId);
if (pVgroup != pNew) { if (pVgroup != pNew) {
for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
SDnodeObj *pDnode = pVgroup->vnodeGid[i].pDnode;
if (pDnode != NULL) {
atomic_sub_fetch_32(&pDnode->openVnodes, 1);
}
}
memcpy(pVgroup, pNew, pOper->rowSize); memcpy(pVgroup, pNew, pOper->rowSize);
free(pNew); free(pNew);
for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
SDnodeObj *pDnode = mgmtGetDnode(pVgroup->vnodeGid[i].dnodeId);
pVgroup->vnodeGid[i].pDnode = pDnode;
if (pDnode != NULL) {
atomic_add_fetch_32(&pDnode->openVnodes, 1);
}
}
} }
int32_t oldTables = taosIdPoolMaxSize(pVgroup->idPool); int32_t oldTables = taosIdPoolMaxSize(pVgroup->idPool);
...@@ -150,6 +161,12 @@ static int32_t mgmtVgroupActionUpdate(SSdbOper *pOper) { ...@@ -150,6 +161,12 @@ static int32_t mgmtVgroupActionUpdate(SSdbOper *pOper) {
static int32_t mgmtVgroupActionEncode(SSdbOper *pOper) { static int32_t mgmtVgroupActionEncode(SSdbOper *pOper) {
SVgObj *pVgroup = pOper->pObj; SVgObj *pVgroup = pOper->pObj;
memcpy(pOper->rowData, pVgroup, tsVgUpdateSize); memcpy(pOper->rowData, pVgroup, tsVgUpdateSize);
SVgObj *pTmpVgroup = pOper->rowData;
for (int32_t i = 0; i < TSDB_VNODES_SUPPORT; ++i) {
pTmpVgroup->vnodeGid[i].pDnode = NULL;
pTmpVgroup->vnodeGid[i].role = 0;
}
pOper->rowSize = tsVgUpdateSize; pOper->rowSize = tsVgUpdateSize;
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
...@@ -204,7 +221,11 @@ int32_t mgmtInitVgroups() { ...@@ -204,7 +221,11 @@ int32_t mgmtInitVgroups() {
return 0; return 0;
} }
void mgmtReleaseVgroup(SVgObj *pVgroup) { void mgmtIncVgroupRef(SVgObj *pVgroup) {
return sdbIncRef(tsVgroupSdb, pVgroup);
}
void mgmtDecVgroupRef(SVgObj *pVgroup) {
return sdbDecRef(tsVgroupSdb, pVgroup); return sdbDecRef(tsVgroupSdb, pVgroup);
} }
...@@ -224,15 +245,37 @@ void mgmtUpdateVgroup(SVgObj *pVgroup) { ...@@ -224,15 +245,37 @@ void mgmtUpdateVgroup(SVgObj *pVgroup) {
mgmtSendCreateVgroupMsg(pVgroup, NULL); mgmtSendCreateVgroupMsg(pVgroup, NULL);
} }
void mgmtUpdateVgroupStatus(SVgObj *pVgroup, int32_t dnodeId, SVnodeLoad *pVload) { void mgmtUpdateVgroupStatus(SVgObj *pVgroup, SDnodeObj *pDnode, SVnodeLoad *pVload) {
if (pVload->role == TAOS_SYNC_ROLE_MASTER) { bool dnodeExist = false;
for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) { for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
SVnodeGid *pVgid = &pVgroup->vnodeGid[i]; SVnodeGid *pVgid = &pVgroup->vnodeGid[i];
if (pVgid->dnodeId == dnodeId) { if (pVgid->pDnode == pDnode) {
pVgid->role = pVload->role;
if (pVload->role == TAOS_SYNC_ROLE_MASTER) {
pVgroup->inUse = i; pVgroup->inUse = i;
}
dnodeExist = true;
break; break;
} }
} }
if (!dnodeExist) {
SRpcIpSet ipSet = mgmtGetIpSetFromIp(pDnode->privateIp);
mError("vgroup:%d, dnode:%d not exist in mnode, drop it", pVload->vgId, pDnode->dnodeId);
mgmtSendDropVnodeMsg(pVload->vgId, &ipSet, NULL);
return;
}
if (pVload->role == TAOS_SYNC_ROLE_MASTER) {
pVgroup->totalStorage = htobe64(pVload->totalStorage);
pVgroup->compStorage = htobe64(pVload->compStorage);
pVgroup->pointsWritten = htobe64(pVload->pointsWritten);
}
if (pVload->replica != pVgroup->numOfVnodes) {
mError("dnode:%d, vgroup:%d replica:%d not match with mgmt:%d", pDnode->dnodeId, pVload->vgId, pVload->replica,
pVgroup->numOfVnodes);
mgmtSendCreateVgroupMsg(pVgroup, NULL);
} }
} }
...@@ -340,7 +383,7 @@ int32_t mgmtGetVgroupMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) { ...@@ -340,7 +383,7 @@ int32_t mgmtGetVgroupMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) {
mgmtDecTableRef(pTable); mgmtDecTableRef(pTable);
pVgroup = mgmtGetVgroup(((SChildTableObj*)pTable)->vgId); pVgroup = mgmtGetVgroup(((SChildTableObj*)pTable)->vgId);
if (NULL == pVgroup) return TSDB_CODE_INVALID_TABLE_ID; if (NULL == pVgroup) return TSDB_CODE_INVALID_TABLE_ID;
mgmtReleaseVgroup(pVgroup); mgmtDecVgroupRef(pVgroup);
maxReplica = pVgroup->numOfVnodes > maxReplica ? pVgroup->numOfVnodes : maxReplica; maxReplica = pVgroup->numOfVnodes > maxReplica ? pVgroup->numOfVnodes : maxReplica;
} else { } else {
SVgObj *pVgroup = pDb->pHead; SVgObj *pVgroup = pDb->pHead;
...@@ -391,27 +434,6 @@ int32_t mgmtGetVgroupMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) { ...@@ -391,27 +434,6 @@ int32_t mgmtGetVgroupMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn) {
return 0; return 0;
} }
char *mgmtGetVnodeStatus(SVgObj *pVgroup, SVnodeGid *pVnode) {
SDnodeObj *pDnode = mgmtGetDnode(pVnode->dnodeId);
if (pDnode == NULL) {
mError("vgroup:%d, not exist in dnode:%d", pVgroup->vgId, pDnode->dnodeId);
return "null";
}
mgmtReleaseDnode(pDnode);
if (pDnode->status == TAOS_DN_STATUS_OFFLINE) {
return "offline";
}
for (int i = 0; i < pDnode->openVnodes; ++i) {
if (pDnode->vload[i].vgId == pVgroup->vgId) {
return pDnode->vload[i].status ? "ready" : "offline";
}
}
return "null";
}
int32_t mgmtRetrieveVgroups(SShowObj *pShow, char *data, int32_t rows, void *pConn) { int32_t mgmtRetrieveVgroups(SShowObj *pShow, char *data, int32_t rows, void *pConn) {
int32_t numOfRows = 0; int32_t numOfRows = 0;
SVgObj *pVgroup = NULL; SVgObj *pVgroup = NULL;
...@@ -453,20 +475,25 @@ int32_t mgmtRetrieveVgroups(SShowObj *pShow, char *data, int32_t rows, void *pCo ...@@ -453,20 +475,25 @@ int32_t mgmtRetrieveVgroups(SShowObj *pShow, char *data, int32_t rows, void *pCo
*(int16_t *) pWrite = pVgroup->vnodeGid[i].dnodeId; *(int16_t *) pWrite = pVgroup->vnodeGid[i].dnodeId;
cols++; cols++;
tinet_ntoa(ipstr, pVgroup->vnodeGid[i].privateIp); SDnodeObj *pDnode = pVgroup->vnodeGid[i].pDnode;
if (pDnode != NULL) {
tinet_ntoa(ipstr, pDnode->privateIp);
pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
strcpy(pWrite, ipstr); strcpy(pWrite, ipstr);
cols++; cols++;
pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
if (pVgroup->vnodeGid[i].dnodeId != 0) { strcpy(pWrite, mgmtGetMnodeRoleStr(pVgroup->vnodeGid[i].role));
char *vnodeStatus = mgmtGetVnodeStatus(pVgroup, pVgroup->vnodeGid + i); cols++;
strcpy(pWrite, vnodeStatus);
} else { } else {
pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
strcpy(pWrite, "null");
cols++;
pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
strcpy(pWrite, "null"); strcpy(pWrite, "null");
}
cols++; cols++;
} }
}
numOfRows++; numOfRows++;
} }
...@@ -506,27 +533,38 @@ SMDCreateVnodeMsg *mgmtBuildCreateVnodeMsg(SVgObj *pVgroup) { ...@@ -506,27 +533,38 @@ SMDCreateVnodeMsg *mgmtBuildCreateVnodeMsg(SVgObj *pVgroup) {
SMDCreateVnodeMsg *pVnode = rpcMallocCont(sizeof(SMDCreateVnodeMsg)); SMDCreateVnodeMsg *pVnode = rpcMallocCont(sizeof(SMDCreateVnodeMsg));
if (pVnode == NULL) return NULL; if (pVnode == NULL) return NULL;
pVnode->cfg = pDb->cfg; SMDVnodeCfg *pCfg = &pVnode->cfg;
SVnodeCfg *pCfg = &pVnode->cfg;
pCfg->vgId = htonl(pVgroup->vgId); pCfg->vgId = htonl(pVgroup->vgId);
pCfg->maxSessions = htonl(pCfg->maxSessions); pCfg->maxTables = htonl(pDb->cfg.maxSessions);
pCfg->cacheBlockSize = htonl(pCfg->cacheBlockSize); pCfg->maxCacheSize = htobe64((int64_t)pDb->cfg.cacheBlockSize * pDb->cfg.cacheNumOfBlocks.totalBlocks);
pCfg->cacheNumOfBlocks.totalBlocks = htonl(pCfg->cacheNumOfBlocks.totalBlocks); pCfg->maxCacheSize = htobe64(-1);
pCfg->daysPerFile = htonl(pCfg->daysPerFile); pCfg->minRowsPerFileBlock = htonl(-1);
pCfg->daysToKeep1 = htonl(pCfg->daysToKeep1); pCfg->maxRowsPerFileBlock = htonl(-1);
pCfg->daysToKeep2 = htonl(pCfg->daysToKeep2); pCfg->daysPerFile = htonl(pDb->cfg.daysPerFile);
pCfg->daysToKeep = htonl(pCfg->daysToKeep); pCfg->daysToKeep1 = htonl(pDb->cfg.daysToKeep1);
pCfg->commitTime = htonl(pCfg->commitTime); pCfg->daysToKeep2 = htonl(pDb->cfg.daysToKeep2);
pCfg->rowsInFileBlock = htonl(pCfg->rowsInFileBlock); pCfg->daysToKeep = htonl(pDb->cfg.daysToKeep);
pCfg->blocksPerTable = htons(pCfg->blocksPerTable); pCfg->daysToKeep = htonl(-1);
pCfg->commitTime = htonl(pDb->cfg.commitTime);
pCfg->precision = pDb->cfg.precision;
pCfg->compression = pDb->cfg.compression;
pCfg->compression = -1;
pCfg->wals = 3;
pCfg->commitLog = pDb->cfg.commitLog;
pCfg->replications = (int8_t) pVgroup->numOfVnodes; pCfg->replications = (int8_t) pVgroup->numOfVnodes;
pCfg->quorum = 1;
SVnodeDesc *vpeerDesc = pVnode->vpeerDesc; SMDVnodeDesc *pNodes = pVnode->nodes;
for (int32_t j = 0; j < pVgroup->numOfVnodes; ++j) { for (int32_t j = 0; j < pVgroup->numOfVnodes; ++j) {
vpeerDesc[j].vgId = htonl(pVgroup->vgId); SDnodeObj *pDnode = pVgroup->vnodeGid[j].pDnode;
vpeerDesc[j].dnodeId = htonl(pVgroup->vnodeGid[j].dnodeId); if (pDnode != NULL) {
vpeerDesc[j].ip = htonl(pVgroup->vnodeGid[j].privateIp); pNodes[j].nodeId = htonl(pDnode->dnodeId);
pNodes[j].nodeIp = htonl(pDnode->privateIp);
strcpy(pNodes[j].nodeName, pDnode->dnodeName);
if (j == 0) {
pCfg->arbitratorIp = htonl(pDnode->privateIp);
}
}
} }
return pVnode; return pVnode;
...@@ -539,7 +577,7 @@ SRpcIpSet mgmtGetIpSetFromVgroup(SVgObj *pVgroup) { ...@@ -539,7 +577,7 @@ SRpcIpSet mgmtGetIpSetFromVgroup(SVgObj *pVgroup) {
.port = tsDnodeMnodePort .port = tsDnodeMnodePort
}; };
for (int i = 0; i < pVgroup->numOfVnodes; ++i) { for (int i = 0; i < pVgroup->numOfVnodes; ++i) {
ipSet.ip[i] = pVgroup->vnodeGid[i].privateIp; ipSet.ip[i] = pVgroup->vnodeGid[i].pDnode->privateIp;
} }
return ipSet; return ipSet;
} }
...@@ -570,7 +608,7 @@ void mgmtSendCreateVnodeMsg(SVgObj *pVgroup, SRpcIpSet *ipSet, void *ahandle) { ...@@ -570,7 +608,7 @@ void mgmtSendCreateVnodeMsg(SVgObj *pVgroup, SRpcIpSet *ipSet, void *ahandle) {
void mgmtSendCreateVgroupMsg(SVgObj *pVgroup, void *ahandle) { void mgmtSendCreateVgroupMsg(SVgObj *pVgroup, void *ahandle) {
mTrace("vgroup:%d, send create all vnodes msg, ahandle:%p", pVgroup->vgId, ahandle); mTrace("vgroup:%d, send create all vnodes msg, ahandle:%p", pVgroup->vgId, ahandle);
for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) { for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
SRpcIpSet ipSet = mgmtGetIpSetFromIp(pVgroup->vnodeGid[i].privateIp); SRpcIpSet ipSet = mgmtGetIpSetFromIp(pVgroup->vnodeGid[i].pDnode->privateIp);
mgmtSendCreateVnodeMsg(pVgroup, &ipSet, ahandle); mgmtSendCreateVnodeMsg(pVgroup, &ipSet, ahandle);
} }
} }
...@@ -636,7 +674,7 @@ void mgmtSendDropVnodeMsg(int32_t vgId, SRpcIpSet *ipSet, void *ahandle) { ...@@ -636,7 +674,7 @@ void mgmtSendDropVnodeMsg(int32_t vgId, SRpcIpSet *ipSet, void *ahandle) {
static void mgmtSendDropVgroupMsg(SVgObj *pVgroup, void *ahandle) { static void mgmtSendDropVgroupMsg(SVgObj *pVgroup, void *ahandle) {
mTrace("vgroup:%d, send drop all vnodes msg, ahandle:%p", pVgroup->vgId, ahandle); mTrace("vgroup:%d, send drop all vnodes msg, ahandle:%p", pVgroup->vgId, ahandle);
for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) { for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
SRpcIpSet ipSet = mgmtGetIpSetFromIp(pVgroup->vnodeGid[i].privateIp); SRpcIpSet ipSet = mgmtGetIpSetFromIp(pVgroup->vnodeGid[i].pDnode->privateIp);
mgmtSendDropVnodeMsg(pVgroup->vgId, &ipSet, ahandle); mgmtSendDropVnodeMsg(pVgroup->vgId, &ipSet, ahandle);
} }
} }
...@@ -687,7 +725,7 @@ static void mgmtProcessVnodeCfgMsg(SRpcMsg *rpcMsg) { ...@@ -687,7 +725,7 @@ static void mgmtProcessVnodeCfgMsg(SRpcMsg *rpcMsg) {
mgmtSendSimpleResp(rpcMsg->handle, TSDB_CODE_NOT_ACTIVE_VNODE); mgmtSendSimpleResp(rpcMsg->handle, TSDB_CODE_NOT_ACTIVE_VNODE);
return; return;
} }
mgmtReleaseDnode(pDnode); mgmtDecDnodeRef(pDnode);
SVgObj *pVgroup = mgmtGetVgroup(pCfg->vgId); SVgObj *pVgroup = mgmtGetVgroup(pCfg->vgId);
if (pVgroup == NULL) { if (pVgroup == NULL) {
...@@ -695,7 +733,7 @@ static void mgmtProcessVnodeCfgMsg(SRpcMsg *rpcMsg) { ...@@ -695,7 +733,7 @@ static void mgmtProcessVnodeCfgMsg(SRpcMsg *rpcMsg) {
mgmtSendSimpleResp(rpcMsg->handle, TSDB_CODE_NOT_ACTIVE_VNODE); mgmtSendSimpleResp(rpcMsg->handle, TSDB_CODE_NOT_ACTIVE_VNODE);
return; return;
} }
mgmtReleaseVgroup(pVgroup); mgmtDecVgroupRef(pVgroup);
mgmtSendSimpleResp(rpcMsg->handle, TSDB_CODE_SUCCESS); mgmtSendSimpleResp(rpcMsg->handle, TSDB_CODE_SUCCESS);
...@@ -711,7 +749,7 @@ void mgmtDropAllVgroups(SDbObj *pDropDb) { ...@@ -711,7 +749,7 @@ void mgmtDropAllVgroups(SDbObj *pDropDb) {
SVgObj *pVgroup = NULL; SVgObj *pVgroup = NULL;
while (1) { while (1) {
mgmtReleaseVgroup(pVgroup); mgmtDecVgroupRef(pVgroup);
pNode = sdbFetchRow(tsVgroupSdb, pNode, (void **)&pVgroup); pNode = sdbFetchRow(tsVgroupSdb, pNode, (void **)&pVgroup);
if (pVgroup == NULL) break; if (pVgroup == NULL) break;
......
src/plugins/monitor/src/monitorSystem.c
浏览文件 @ 59a77a36
...@@ -397,6 +397,7 @@ void monitorSaveAcctLog(char *acctId, int64_t currentPointsPerSecond, int64_t ma ...@@ -397,6 +397,7 @@ void monitorSaveAcctLog(char *acctId, int64_t currentPointsPerSecond, int64_t ma
int64_t totalOutbound, int64_t maxOutbound, int64_t totalDbs, int64_t maxDbs, int64_t totalOutbound, int64_t maxOutbound, int64_t totalDbs, int64_t maxDbs,
int64_t totalUsers, int64_t maxUsers, int64_t totalStreams, int64_t maxStreams, int64_t totalUsers, int64_t maxUsers, int64_t totalStreams, int64_t maxStreams,
int64_t totalConns, int64_t maxConns, int8_t accessState) { int64_t totalConns, int64_t maxConns, int8_t accessState) {
if (monitor == NULL) return;
if (monitor->state != MONITOR_STATE_INITIALIZED) return; if (monitor->state != MONITOR_STATE_INITIALIZED) return;
char sql[1024] = {0}; char sql[1024] = {0};
......
src/query/tests/astTest.cpp
浏览文件 @ 59a77a36
...@@ -21,21 +21,21 @@ static void initSchema(SSchema *pSchema, int32_t numOfCols); ...@@ -21,21 +21,21 @@ static void initSchema(SSchema *pSchema, int32_t numOfCols);
static void initSchema_binary(SSchema *schema, int32_t numOfCols); static void initSchema_binary(SSchema *schema, int32_t numOfCols);
static tSkipList *createSkipList(SSchema *pSchema, int32_t numOfTags); static SSkipList *createSkipList(SSchema *pSchema, int32_t numOfTags);
static tSkipList *createSkipList_binary(SSchema *pSchema, int32_t numOfTags); static SSkipList *createSkipList_binary(SSchema *pSchema, int32_t numOfTags);
static void testQueryStr(SSchema *schema, int32_t numOfCols, char *sql, tSkipList *pSkipList, ResultObj *expectedVal); static void testQueryStr(SSchema *schema, int32_t numOfCols, char *sql, SSkipList *pSkipList, ResultObj *expectedVal);
static void dropMeter(tSkipList *pSkipList); static void dropMeter(SSkipList *pSkipList);
static void Right2LeftTest(SSchema *schema, int32_t numOfCols, tSkipList *pSkipList); static void Right2LeftTest(SSchema *schema, int32_t numOfCols, SSkipList *pSkipList);
static void Left2RightTest(SSchema *schema, int32_t numOfCols, tSkipList *pSkipList); static void Left2RightTest(SSchema *schema, int32_t numOfCols, SSkipList *pSkipList);
static void IllegalExprTest(SSchema *schema, int32_t numOfCols, tSkipList *pSkipList); static void IllegalExprTest(SSchema *schema, int32_t numOfCols, SSkipList *pSkipList);
static void Left2RightTest_binary(SSchema *schema, int32_t numOfCols, tSkipList *pSkipList); static void Left2RightTest_binary(SSchema *schema, int32_t numOfCols, SSkipList *pSkipList);
static void Right2LeftTest_binary(SSchema *schema, int32_t numOfCols, tSkipList *pSkipList); static void Right2LeftTest_binary(SSchema *schema, int32_t numOfCols, SSkipList *pSkipList);
void setValue(ResultObj *pResult, int32_t num, char **val) { void setValue(ResultObj *pResult, int32_t num, char **val) {
pResult->numOfResult = num; pResult->numOfResult = num;
...@@ -112,7 +112,7 @@ static void initSchema(SSchema *schema, int32_t numOfCols) { ...@@ -112,7 +112,7 @@ static void initSchema(SSchema *schema, int32_t numOfCols) {
strcpy(schema[7].name, "h"); strcpy(schema[7].name, "h");
} }
// static void addOneNode(SSchema *pSchema, int32_t tagsLen, tSkipList *pSkipList, // static void addOneNode(SSchema *pSchema, int32_t tagsLen, SSkipList *pSkipList,
// char *meterId, int32_t a, double b, char *c, int64_t d, int16_t e, int8_t f, float g, // char *meterId, int32_t a, double b, char *c, int64_t d, int16_t e, int8_t f, float g,
// bool h, int32_t numOfTags) { // bool h, int32_t numOfTags) {
// STabObj *pMeter = calloc(1, sizeof(STabObj)); // STabObj *pMeter = calloc(1, sizeof(STabObj));
...@@ -146,11 +146,11 @@ static void initSchema(SSchema *schema, int32_t numOfCols) { ...@@ -146,11 +146,11 @@ static void initSchema(SSchema *schema, int32_t numOfCols) {
// offset += pSchema[6].bytes; // offset += pSchema[6].bytes;
// *(int8_t *) (tags + offset) = h ? 1 : 0; // *(int8_t *) (tags + offset) = h ? 1 : 0;
// //
// tSkipListKey pKey = tSkipListCreateKey(pSchema[0].type, tags, pSchema[0].bytes); // SSkipListKey pKey = SSkipListCreateKey(pSchema[0].type, tags, pSchema[0].bytes);
// tSkipListPut(pSkipList, pMeter, &pKey, 1); // SSkipListPut(pSkipList, pMeter, &pKey, 1);
//} //}
// //
// static void addOneNode_binary(SSchema *pSchema, int32_t tagsLen, tSkipList *pSkipList, // static void addOneNode_binary(SSchema *pSchema, int32_t tagsLen, SSkipList *pSkipList,
// char *meterId, int32_t a, double b, char *c, int64_t d, int16_t e, int8_t f, float g, // char *meterId, int32_t a, double b, char *c, int64_t d, int16_t e, int8_t f, float g,
// bool h, int32_t numOfTags) { // bool h, int32_t numOfTags) {
// STabObj *pMeter = calloc(1, sizeof(STabObj)); // STabObj *pMeter = calloc(1, sizeof(STabObj));
...@@ -183,16 +183,16 @@ static void initSchema(SSchema *schema, int32_t numOfCols) { ...@@ -183,16 +183,16 @@ static void initSchema(SSchema *schema, int32_t numOfCols) {
// offset += pSchema[6].bytes; // offset += pSchema[6].bytes;
// *(int8_t *) (tags + offset) = h ? 1 : 0; // *(int8_t *) (tags + offset) = h ? 1 : 0;
// //
// tSkipListKey pKey = tSkipListCreateKey(pSchema[0].type, tags, pSchema[0].bytes); // SSkipListKey pKey = SSkipListCreateKey(pSchema[0].type, tags, pSchema[0].bytes);
// tSkipListPut(pSkipList, pMeter, &pKey, 1); // SSkipListPut(pSkipList, pMeter, &pKey, 1);
// tSkipListDestroyKey(&pKey); // SSkipListDestroyKey(&pKey);
//} //}
// static void dropMeter(tSkipList *pSkipList) { // static void dropMeter(SSkipList *pSkipList) {
// tSkipListNode **pRes = NULL; // SSkipListNode **pRes = NULL;
// int32_t num = tSkipListIterateList(pSkipList, &pRes, NULL, NULL); // int32_t num = SSkipListIterateList(pSkipList, &pRes, NULL, NULL);
// for (int32_t i = 0; i < num; ++i) { // for (int32_t i = 0; i < num; ++i) {
// tSkipListNode *pNode = pRes[i]; // SSkipListNode *pNode = pRes[i];
// STabObj *pMeter = (STabObj *) pNode->pData; // STabObj *pMeter = (STabObj *) pNode->pData;
// free(pMeter->pTagData); // free(pMeter->pTagData);
// free(pMeter); // free(pMeter);
...@@ -201,13 +201,13 @@ static void initSchema(SSchema *schema, int32_t numOfCols) { ...@@ -201,13 +201,13 @@ static void initSchema(SSchema *schema, int32_t numOfCols) {
// free(pRes); // free(pRes);
//} //}
// static tSkipList *createSkipList(SSchema *pSchema, int32_t numOfTags) { // static SSkipList *createSkipList(SSchema *pSchema, int32_t numOfTags) {
// int32_t tagsLen = 0; // int32_t tagsLen = 0;
// for (int32_t i = 0; i < numOfTags; ++i) { // for (int32_t i = 0; i < numOfTags; ++i) {
// tagsLen += pSchema[i].bytes; // tagsLen += pSchema[i].bytes;
// } // }
// //
// tSkipList *pSkipList = tSkipListCreate(10, pSchema[0].type, 4); // SSkipList *pSkipList = SSkipListCreate(10, pSchema[0].type, 4);
// //
// addOneNode(pSchema, tagsLen, pSkipList, "tm0\0", 0, 10.5, "abc", 1000, -10000, -20, 1.0, true, 8); // addOneNode(pSchema, tagsLen, pSkipList, "tm0\0", 0, 10.5, "abc", 1000, -10000, -20, 1.0, true, 8);
// addOneNode(pSchema, tagsLen, pSkipList, "tm1\0", 1, 20.5, "def", 1100, -10500, -30, 2.0, false, 8); // addOneNode(pSchema, tagsLen, pSkipList, "tm1\0", 1, 20.5, "def", 1100, -10500, -30, 2.0, false, 8);
...@@ -220,13 +220,13 @@ static void initSchema(SSchema *schema, int32_t numOfCols) { ...@@ -220,13 +220,13 @@ static void initSchema(SSchema *schema, int32_t numOfCols) {
// return pSkipList; // return pSkipList;
//} //}
// //
// static tSkipList *createSkipList_binary(SSchema *pSchema, int32_t numOfTags) { // static SSkipList *createSkipList_binary(SSchema *pSchema, int32_t numOfTags) {
// int32_t tagsLen = 0; // int32_t tagsLen = 0;
// for (int32_t i = 0; i < numOfTags; ++i) { // for (int32_t i = 0; i < numOfTags; ++i) {
// tagsLen += pSchema[i].bytes; // tagsLen += pSchema[i].bytes;
// } // }
// //
// tSkipList *pSkipList = tSkipListCreate(10, pSchema[0].type, 4); // SSkipList *pSkipList = SSkipListCreate(10, pSchema[0].type, 4);
// //
// addOneNode_binary(pSchema, tagsLen, pSkipList, "tm0\0", 0, 10.5, "abc", 1000, -10000, -20, 1.0, true, 8); // addOneNode_binary(pSchema, tagsLen, pSkipList, "tm0\0", 0, 10.5, "abc", 1000, -10000, -20, 1.0, true, 8);
// addOneNode_binary(pSchema, tagsLen, pSkipList, "tm1\0", 1, 20.5, "def", 1100, -10500, -30, 2.0, false, 8); // addOneNode_binary(pSchema, tagsLen, pSkipList, "tm1\0", 1, 20.5, "def", 1100, -10500, -30, 2.0, false, 8);
...@@ -239,7 +239,7 @@ static void initSchema(SSchema *schema, int32_t numOfCols) { ...@@ -239,7 +239,7 @@ static void initSchema(SSchema *schema, int32_t numOfCols) {
// return pSkipList; // return pSkipList;
//} //}
static void testQueryStr(SSchema *schema, int32_t numOfCols, char *sql, tSkipList *pSkipList, ResultObj *pResult) { static void testQueryStr(SSchema *schema, int32_t numOfCols, char *sql, SSkipList *pSkipList, ResultObj *pResult) {
tExprNode *pExpr = NULL; tExprNode *pExpr = NULL;
tSQLBinaryExprFromString(&pExpr, schema, numOfCols, sql, strlen(sql)); tSQLBinaryExprFromString(&pExpr, schema, numOfCols, sql, strlen(sql));
...@@ -255,7 +255,7 @@ static void testQueryStr(SSchema *schema, int32_t numOfCols, char *sql, tSkipLis ...@@ -255,7 +255,7 @@ static void testQueryStr(SSchema *schema, int32_t numOfCols, char *sql, tSkipLis
printf("expr is: %s\n", str); printf("expr is: %s\n", str);
SArray *result = NULL; SArray *result = NULL;
// tExprTreeTraverse(pExpr, pSkipList, result, tSkipListNodeFilterCallback, &result); // tExprTreeTraverse(pExpr, pSkipList, result, SSkipListNodeFilterCallback, &result);
// printf("the result is:%lld\n", result.num); // printf("the result is:%lld\n", result.num);
// //
// bool findResult = false; // bool findResult = false;
...@@ -277,7 +277,7 @@ static void testQueryStr(SSchema *schema, int32_t numOfCols, char *sql, tSkipLis ...@@ -277,7 +277,7 @@ static void testQueryStr(SSchema *schema, int32_t numOfCols, char *sql, tSkipLis
tExprTreeDestroy(&pExpr, NULL); tExprTreeDestroy(&pExpr, NULL);
} }
static void Left2RightTest(SSchema *schema, int32_t numOfCols, tSkipList *pSkipList) { static void Left2RightTest(SSchema *schema, int32_t numOfCols, SSkipList *pSkipList) {
char str[256] = {0}; char str[256] = {0};
char *t0[1] = {"tm0"}; char *t0[1] = {"tm0"};
...@@ -342,7 +342,7 @@ static void Left2RightTest(SSchema *schema, int32_t numOfCols, tSkipList *pSkipL ...@@ -342,7 +342,7 @@ static void Left2RightTest(SSchema *schema, int32_t numOfCols, tSkipList *pSkipL
testQueryStr(schema, numOfCols, "f > -65", pSkipList, &res); testQueryStr(schema, numOfCols, "f > -65", pSkipList, &res);
} }
void Right2LeftTest(SSchema *schema, int32_t numOfCols, tSkipList *pSkipList) { void Right2LeftTest(SSchema *schema, int32_t numOfCols, SSkipList *pSkipList) {
ResultObj res = {1, {"tm1"}}; ResultObj res = {1, {"tm1"}};
testQueryStr(schema, numOfCols, "((1=a))", pSkipList, &res); testQueryStr(schema, numOfCols, "((1=a))", pSkipList, &res);
...@@ -359,7 +359,7 @@ void Right2LeftTest(SSchema *schema, int32_t numOfCols, tSkipList *pSkipList) { ...@@ -359,7 +359,7 @@ void Right2LeftTest(SSchema *schema, int32_t numOfCols, tSkipList *pSkipList) {
testQueryStr(schema, numOfCols, "0=h", pSkipList, &res); testQueryStr(schema, numOfCols, "0=h", pSkipList, &res);
} }
static void IllegalExprTest(SSchema *schema, int32_t numOfCols, tSkipList *pSkipList) { static void IllegalExprTest(SSchema *schema, int32_t numOfCols, SSkipList *pSkipList) {
testQueryStr(schema, numOfCols, "h=", pSkipList, NULL); testQueryStr(schema, numOfCols, "h=", pSkipList, NULL);
testQueryStr(schema, numOfCols, "h<", pSkipList, NULL); testQueryStr(schema, numOfCols, "h<", pSkipList, NULL);
testQueryStr(schema, numOfCols, "a=1 and ", pSkipList, NULL); testQueryStr(schema, numOfCols, "a=1 and ", pSkipList, NULL);
...@@ -374,7 +374,7 @@ static void IllegalExprTest(SSchema *schema, int32_t numOfCols, tSkipList *pSkip ...@@ -374,7 +374,7 @@ static void IllegalExprTest(SSchema *schema, int32_t numOfCols, tSkipList *pSkip
testQueryStr(schema, numOfCols, "a=1 and ", pSkipList, NULL); testQueryStr(schema, numOfCols, "a=1 and ", pSkipList, NULL);
} }
static void Left2RightTest_binary(SSchema *schema, int32_t numOfCols, tSkipList *pSkipList) { static void Left2RightTest_binary(SSchema *schema, int32_t numOfCols, SSkipList *pSkipList) {
char str[256] = {0}; char str[256] = {0};
char *sql = NULL; char *sql = NULL;
...@@ -432,7 +432,7 @@ static void Left2RightTest_binary(SSchema *schema, int32_t numOfCols, tSkipList ...@@ -432,7 +432,7 @@ static void Left2RightTest_binary(SSchema *schema, int32_t numOfCols, tSkipList
testQueryStr(schema, numOfCols, sql, pSkipList, &res); testQueryStr(schema, numOfCols, sql, pSkipList, &res);
} }
static void Right2LeftTest_binary(SSchema *schema, int32_t numOfCols, tSkipList *pSkipList) { static void Right2LeftTest_binary(SSchema *schema, int32_t numOfCols, SSkipList *pSkipList) {
char str[256] = {0}; char str[256] = {0};
char *sql = NULL; char *sql = NULL;
......
src/rpc/src/rpcTcp.c
浏览文件 @ 59a77a36
...@@ -466,8 +466,8 @@ static void taosFreeFdObj(SFdObj *pFdObj) { ...@@ -466,8 +466,8 @@ static void taosFreeFdObj(SFdObj *pFdObj) {
} }
pFdObj->signature = NULL; pFdObj->signature = NULL;
close(pFdObj->fd);
epoll_ctl(pThreadObj->pollFd, EPOLL_CTL_DEL, pFdObj->fd, NULL); epoll_ctl(pThreadObj->pollFd, EPOLL_CTL_DEL, pFdObj->fd, NULL);
close(pFdObj->fd);
pThreadObj->numOfFds--; pThreadObj->numOfFds--;
......
src/tsdb/src/tsdbMain.c
浏览文件 @ 59a77a36
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#define IS_VALID_COMPRESSION(compression) (((compression) >= NO_COMPRESSION) && ((compression) <= TWO_STAGE_COMP)) #define IS_VALID_COMPRESSION(compression) (((compression) >= NO_COMPRESSION) && ((compression) <= TWO_STAGE_COMP))
#define TSDB_MIN_ID 0 #define TSDB_MIN_ID 0
#define TSDB_MAX_ID INT_MAX #define TSDB_MAX_ID INT_MAX
#define TSDB_MIN_TABLES 10 #define TSDB_MIN_TABLES 4
#define TSDB_MAX_TABLES 100000 #define TSDB_MAX_TABLES 100000
#define TSDB_DEFAULT_TABLES 1000 #define TSDB_DEFAULT_TABLES 1000
#define TSDB_DEFAULT_DAYS_PER_FILE 10 #define TSDB_DEFAULT_DAYS_PER_FILE 10
...@@ -283,6 +283,8 @@ int32_t tsdbConfigRepo(TsdbRepoT *repo, STsdbCfg *pCfg) { ...@@ -283,6 +283,8 @@ int32_t tsdbConfigRepo(TsdbRepoT *repo, STsdbCfg *pCfg) {
int32_t tsdbTriggerCommit(TsdbRepoT *repo) { int32_t tsdbTriggerCommit(TsdbRepoT *repo) {
STsdbRepo *pRepo = (STsdbRepo *)repo; STsdbRepo *pRepo = (STsdbRepo *)repo;
if (pRepo->appH.walCallBack) pRepo->appH.walCallBack(pRepo->appH.appH);
tsdbLockRepo(repo); tsdbLockRepo(repo);
if (pRepo->commit) { if (pRepo->commit) {
tsdbUnLockRepo(repo); tsdbUnLockRepo(repo);
...@@ -387,7 +389,7 @@ int tsdbInitTableCfg(STableCfg *config, ETableType type, int64_t uid, int32_t ti ...@@ -387,7 +389,7 @@ int tsdbInitTableCfg(STableCfg *config, ETableType type, int64_t uid, int32_t ti
config->superUid = TSDB_INVALID_SUPER_TABLE_ID; config->superUid = TSDB_INVALID_SUPER_TABLE_ID;
config->tableId.uid = uid; config->tableId.uid = uid;
config->tableId.tid = tid; config->tableId.tid = tid;
config->name = strdup("test1"); config->name = NULL;
return 0; return 0;
} }
...@@ -854,8 +856,6 @@ static void *tsdbCommitData(void *arg) { ...@@ -854,8 +856,6 @@ static void *tsdbCommitData(void *arg) {
SRWHelper whelper = {0}; SRWHelper whelper = {0};
if (pCache->imem == NULL) return NULL; if (pCache->imem == NULL) return NULL;
if (pRepo->appH.walCallBack) pRepo->appH.walCallBack(pRepo->appH.appH);
// Create the iterator to read from cache // Create the iterator to read from cache
SSkipListIterator **iters = tsdbCreateTableIters(pMeta, pCfg->maxTables); SSkipListIterator **iters = tsdbCreateTableIters(pMeta, pCfg->maxTables);
if (iters == NULL) { if (iters == NULL) {
...@@ -880,6 +880,7 @@ static void *tsdbCommitData(void *arg) { ...@@ -880,6 +880,7 @@ static void *tsdbCommitData(void *arg) {
_exit: _exit:
tdFreeDataCols(pDataCols); tdFreeDataCols(pDataCols);
tsdbDestroyTableIters(iters, pCfg->maxTables); tsdbDestroyTableIters(iters, pCfg->maxTables);
tsdbDestroyHelper(&whelper);
tsdbLockRepo(arg); tsdbLockRepo(arg);
tdListMove(pCache->imem->list, pCache->pool.memPool); tdListMove(pCache->imem->list, pCache->pool.memPool);
......
src/tsdb/src/tsdbRWHelper.c
浏览文件 @ 59a77a36
...@@ -403,6 +403,7 @@ int tsdbWriteCompInfo(SRWHelper *pHelper) { ...@@ -403,6 +403,7 @@ int tsdbWriteCompInfo(SRWHelper *pHelper) {
} else { } else {
pHelper->pCompInfo->delimiter = TSDB_FILE_DELIMITER; pHelper->pCompInfo->delimiter = TSDB_FILE_DELIMITER;
pHelper->pCompInfo->uid = pHelper->tableInfo.uid; pHelper->pCompInfo->uid = pHelper->tableInfo.uid;
pHelper->pCompInfo->checksum = 0;
ASSERT((pIdx->len - sizeof(SCompInfo) - sizeof(TSCKSUM)) % sizeof(SCompBlock) == 0); ASSERT((pIdx->len - sizeof(SCompInfo) - sizeof(TSCKSUM)) % sizeof(SCompBlock) == 0);
taosCalcChecksumAppend(0, (uint8_t *)pHelper->pCompInfo, pIdx->len); taosCalcChecksumAppend(0, (uint8_t *)pHelper->pCompInfo, pIdx->len);
pIdx->offset = lseek(pHelper->files.nHeadF.fd, 0, SEEK_END); pIdx->offset = lseek(pHelper->files.nHeadF.fd, 0, SEEK_END);
......
src/tsdb/tests/tsdbTests.cpp
浏览文件 @ 59a77a36
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include "tdataformat.h" #include "tdataformat.h"
#include "tsdbMain.h" #include "tsdbMain.h"
#include "tskiplist.h"
static double getCurTime() { static double getCurTime() {
struct timeval tv; struct timeval tv;
...@@ -141,6 +142,7 @@ TEST(TsdbTest, createRepo) { ...@@ -141,6 +142,7 @@ TEST(TsdbTest, createRepo) {
STableCfg tCfg; STableCfg tCfg;
ASSERT_EQ(tsdbInitTableCfg(&tCfg, TSDB_SUPER_TABLE, 987607499877672L, 0), -1); ASSERT_EQ(tsdbInitTableCfg(&tCfg, TSDB_SUPER_TABLE, 987607499877672L, 0), -1);
ASSERT_EQ(tsdbInitTableCfg(&tCfg, TSDB_NORMAL_TABLE, 987607499877672L, 0), 0); ASSERT_EQ(tsdbInitTableCfg(&tCfg, TSDB_NORMAL_TABLE, 987607499877672L, 0), 0);
tsdbTableSetName(&tCfg, "test", false);
int nCols = 5; int nCols = 5;
STSchema *schema = tdNewSchema(nCols); STSchema *schema = tdNewSchema(nCols);
...@@ -167,7 +169,7 @@ TEST(TsdbTest, createRepo) { ...@@ -167,7 +169,7 @@ TEST(TsdbTest, createRepo) {
.sversion = tCfg.sversion, .sversion = tCfg.sversion,
.startTime = 1584081000000, .startTime = 1584081000000,
.interval = 1000, .interval = 1000,
.totalRows = 5000000, .totalRows = 10000000,
.rowsPerSubmit = 1, .rowsPerSubmit = 1,
.pSchema = schema .pSchema = schema
}; };
...@@ -263,3 +265,46 @@ TEST(TsdbTest, DISABLED_createFileGroup) { ...@@ -263,3 +265,46 @@ TEST(TsdbTest, DISABLED_createFileGroup) {
int k = 0; int k = 0;
} }
static char *getTKey(const void *data) {
return (char *)data;
}
static void insertSkipList(bool isAscend) {
TSKEY start_time = 1587393453000;
TSKEY interval = 1000;
SSkipList *pList = tSkipListCreate(5, TSDB_DATA_TYPE_TIMESTAMP, sizeof(TSKEY), 0, 0, 1, getTKey);
ASSERT_NE(pList, nullptr);
for (size_t i = 0; i < 20000000; i++)
{
TSKEY time = isAscend ? (start_time + i * interval) : (start_time - i * interval);
int32_t level = 0;
int32_t headSize = 0;
tSkipListNewNodeInfo(pList, &level, &headSize);
SSkipListNode *pNode = (SSkipListNode *)malloc(headSize + sizeof(TSKEY));
ASSERT_NE(pNode, nullptr);
pNode->level = level;
*(TSKEY *)((char *)pNode + headSize) = time;
tSkipListPut(pList, pNode);
}
tSkipListDestroy(pList);
}
TEST(TsdbTest, DISABLED_testSkipList) {
// TEST(TsdbTest, testSkipList) {
double stime = getCurTime();
insertSkipList(true);
double etime = getCurTime();
printf("Time used to insert 100000000 records takes %f seconds\n", etime-stime);
stime = getCurTime();
insertSkipList(false);
etime = getCurTime();
printf("Time used to insert 100000000 records takes %f seconds\n", etime-stime);
}
\ No newline at end of file
src/util/inc/tutil.h
浏览文件 @ 59a77a36
...@@ -170,6 +170,8 @@ char *taosIpStr(uint32_t ipInt); ...@@ -170,6 +170,8 @@ char *taosIpStr(uint32_t ipInt);
uint32_t ip2uint(const char *const ip_addr); uint32_t ip2uint(const char *const ip_addr);
void taosRemoveDir(char *rootDir);
#define TAOS_ALLOC_MODE_DEFAULT 0 #define TAOS_ALLOC_MODE_DEFAULT 0
#define TAOS_ALLOC_MODE_RANDOM_FAIL 1 #define TAOS_ALLOC_MODE_RANDOM_FAIL 1
#define TAOS_ALLOC_MODE_DETECT_LEAK 2 #define TAOS_ALLOC_MODE_DETECT_LEAK 2
......
src/util/src/tconfig.c
浏览文件 @ 59a77a36
...@@ -184,6 +184,7 @@ static void taosReadLogOption(char *option, char *value) { ...@@ -184,6 +184,7 @@ static void taosReadLogOption(char *option, char *value) {
} }
SGlobalCfg *taosGetConfigOption(const char *option) { SGlobalCfg *taosGetConfigOption(const char *option) {
taosInitGlobalCfg();
for (int i = 0; i < tsGlobalConfigNum; ++i) { for (int i = 0; i < tsGlobalConfigNum; ++i) {
SGlobalCfg *cfg = tsGlobalConfig + i; SGlobalCfg *cfg = tsGlobalConfig + i;
if (strcasecmp(cfg->option, option) != 0) continue; if (strcasecmp(cfg->option, option) != 0) continue;
......
src/util/src/tutil.c
浏览文件 @ 59a77a36
...@@ -663,3 +663,27 @@ void tzfree(void *ptr) { ...@@ -663,3 +663,27 @@ void tzfree(void *ptr) {
free((void *)((char *)ptr - sizeof(size_t))); free((void *)((char *)ptr - sizeof(size_t)));
} }
} }
void taosRemoveDir(char *rootDir) {
DIR *dir = opendir(rootDir);
if (dir == NULL) return;
struct dirent *de = NULL;
while ((de = readdir(dir)) != NULL) {
if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0) continue;
char filename[1024];
snprintf(filename, 1023, "%s/%s", rootDir, de->d_name);
if (de->d_type & DT_DIR) {
taosRemoveDir(filename);
} else {
remove(filename);
uPrint("file:%s is removed", filename);
}
}
closedir(dir);
rmdir(rootDir);
uPrint("dir:%s is removed", rootDir);
}
\ No newline at end of file
src/util/tests/CMakeLists.txt
浏览文件 @ 59a77a36
...@@ -11,5 +11,5 @@ IF (HEADER_GTEST_INCLUDE_DIR AND LIB_GTEST_STATIC_DIR) ...@@ -11,5 +11,5 @@ IF (HEADER_GTEST_INCLUDE_DIR AND LIB_GTEST_STATIC_DIR)
AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST) AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST)
ADD_EXECUTABLE(utilTest ${SOURCE_LIST}) ADD_EXECUTABLE(utilTest ${SOURCE_LIST})
TARGET_LINK_LIBRARIES(utilTest tutil gtest pthread) TARGET_LINK_LIBRARIES(utilTest tutil common gtest pthread)
ENDIF() ENDIF()
\ No newline at end of file
src/vnode/CMakeLists.txt
浏览文件 @ 59a77a36
...@@ -9,6 +9,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM)) ...@@ -9,6 +9,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/tsdb/inc) INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/tsdb/inc)
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/common/inc) INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/common/inc)
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/dnode/inc) INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/dnode/inc)
INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/cJson/inc)
INCLUDE_DIRECTORIES(${TD_ENTERPRISE_DIR}/src/inc) INCLUDE_DIRECTORIES(${TD_ENTERPRISE_DIR}/src/inc)
INCLUDE_DIRECTORIES(inc) INCLUDE_DIRECTORIES(inc)
AUX_SOURCE_DIRECTORY(src SRC) AUX_SOURCE_DIRECTORY(src SRC)
......
src/vnode/src/vnodeMain.c
浏览文件 @ 59a77a36
此差异已折叠。
tests/pytest/insert/basic.py
浏览文件 @ 59a77a36
...@@ -17,6 +17,7 @@ from util.log import * ...@@ -17,6 +17,7 @@ from util.log import *
from util.cases import * from util.cases import *
from util.sql import * from util.sql import *
class TDTestCase: class TDTestCase:
def init(self, conn): def init(self, conn):
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
...@@ -24,25 +25,24 @@ class TDTestCase: ...@@ -24,25 +25,24 @@ class TDTestCase:
def run(self): def run(self):
tdSql.prepare() tdSql.prepare()
tdSql.execute('show databases')
tdSql.execute('drop database if exists db') ret = tdSql.execute('create table tb (ts timestamp, speed int)')
tdSql.execute('create database db')
tdSql.execute('use db')
tdSql.execute('create table tb (ts timestamp, speed int)')
insertRows = 10 insertRows = 10
tdLog.info("insert %d rows" % (insertRows)) tdLog.info("insert %d rows" % (insertRows))
for i in range(0, insertRows): for i in range(0, insertRows):
tdSql.execute('insert into tb values (now + %dm, %d)' % (i, i)) ret = tdSql.execute(
'insert into tb values (now + %dm, %d)' %
(i, i))
# tdLog.info("insert earlier data") tdLog.info("insert earlier data")
# tdSql.execute('insert into tb values (now - 5m , 10)') tdSql.execute('insert into tb values (now - 5m , 10)')
# tdSql.execute('insert into tb values (now - 6m , 10)') tdSql.execute('insert into tb values (now - 6m , 10)')
# tdSql.execute('insert into tb values (now - 7m , 10)') tdSql.execute('insert into tb values (now - 7m , 10)')
# tdSql.execute('insert into tb values (now - 8m , 10)') tdSql.execute('insert into tb values (now - 8m , 10)')
tdSql.query("select * from tb") tdSql.query("select * from tb")
tdSql.checkRows(insertRows) tdSql.checkRows(insertRows + 4)
def stop(self): def stop(self):
tdSql.close() tdSql.close()
......
tests/pytest/simpletest.sh
浏览文件 @ 59a77a36
sudo python ./test.py -f insert/basic.py #!/bin/bash
python3 ./test.py -f insert/basic.py $1
python3 ./test.py -s $1
tests/pytest/test.py
浏览文件 @ 59a77a36
...@@ -15,22 +15,25 @@ ...@@ -15,22 +15,25 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import sys import sys
import getopt import getopt
import subprocess
from distutils.log import warn as printf
from util.log import * from util.log import *
from util.dnodes import * from util.dnodes import *
from util.cases import * from util.cases import *
import taos import taos
# add testcase here:
from insert.basic import *
if __name__ == "__main__": if __name__ == "__main__":
fileName = "all" fileName = "all"
deployPath = "" deployPath = ""
masterIp = "" masterIp = ""
testCluster = False testCluster = False
opts, args = getopt.getopt(sys.argv[1:], 'f:p:m:sch', [ valgrind = 0
'file=', 'path=', 'master', 'stop', 'cluster', 'help']) stop = 0
opts, args = getopt.gnu_getopt(sys.argv[1:], 'f:p:m:scgh', [
'file=', 'path=', 'master', 'stop', 'cluster', 'valgrind', 'help'])
for key, value in opts: for key, value in opts:
if key in ['-h', '--help']: if key in ['-h', '--help']:
tdLog.printNoPrefix( tdLog.printNoPrefix(
...@@ -41,21 +44,50 @@ if __name__ == "__main__": ...@@ -41,21 +44,50 @@ if __name__ == "__main__":
tdLog.printNoPrefix('-c Test Cluster Flag') tdLog.printNoPrefix('-c Test Cluster Flag')
tdLog.printNoPrefix('-s stop All dnodes') tdLog.printNoPrefix('-s stop All dnodes')
sys.exit(0) sys.exit(0)
if key in ['-f', '--file']: if key in ['-f', '--file']:
fileName = value fileName = value
if key in ['-p', '--path']: if key in ['-p', '--path']:
deployPath = value deployPath = value
if key in ['-m', '--master']: if key in ['-m', '--master']:
masterIp = value masterIp = value
if key in ['-c', '--cluster']: if key in ['-c', '--cluster']:
testCluster = True testCluster = True
if key in ['-g', '--valgrind']:
valgrind = 1
if key in ['-s', '--stop']: if key in ['-s', '--stop']:
cmd = "ps -ef|grep -w taosd | grep 'taosd' | grep -v grep | awk '{print $2}' && pkill -9 taosd" stop = 1
os.system(cmd)
if (stop != 0):
if (valgrind == 0):
toBeKilled = "taosd"
else:
toBeKilled = "valgrind.bin"
killCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}' | xargs kill -HUP " % toBeKilled
# os.system(killCmd)
# time.sleep(1)
psCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}'" % toBeKilled
processID = subprocess.check_output(psCmd, shell=True)
while(processID):
os.system(killCmd)
time.sleep(1)
processID = subprocess.check_output(psCmd, shell=True)
tdLog.exit('stop All dnodes') tdLog.exit('stop All dnodes')
if masterIp == "": if masterIp == "":
tdDnodes.init(deployPath) tdDnodes.init(deployPath)
tdDnodes.setTestCluster(testCluster)
tdDnodes.setValgrind(valgrind)
if testCluster: if testCluster:
tdLog.notice("Procedures for testing cluster") tdLog.notice("Procedures for testing cluster")
if fileName == "all": if fileName == "all":
......
tests/pytest/util/cases.py
浏览文件 @ 59a77a36
...@@ -15,6 +15,8 @@ import sys ...@@ -15,6 +15,8 @@ import sys
import os import os
import time import time
import datetime import datetime
import inspect
import importlib
from util.log import * from util.log import *
...@@ -30,6 +32,10 @@ class TDCases: ...@@ -30,6 +32,10 @@ class TDCases:
self.windowsCases = [] self.windowsCases = []
self.clusterCases = [] self.clusterCases = []
def __dynamicLoadModule(self, fileName):
moduleName = fileName.replace(".py", "").replace("/", ".")
return importlib.import_module(moduleName, package='..')
def addWindows(self, name, case): def addWindows(self, name, case):
self.windowsCases.append(TDCase(name, case)) self.windowsCases.append(TDCase(name, case))
...@@ -40,64 +46,93 @@ class TDCases: ...@@ -40,64 +46,93 @@ class TDCases:
self.clusterCases.append(TDCase(name, case)) self.clusterCases.append(TDCase(name, case))
def runAllLinux(self, conn): def runAllLinux(self, conn):
tdLog.notice("run total %d cases" % (len(self.linuxCases))) # TODO: load all Linux cases here
for case in self.linuxCases: runNum = 0
case.case.init(conn) for tmp in self.linuxCases:
case.case.run() if tmp.name.find(fileName) != -1:
case.case.stop() case = testModule.TDTestCase()
tdLog.notice("total %d cases executed" % (len(self.linuxCases))) case.init(conn)
case.run()
case.stop()
runNum += 1
continue
tdLog.notice("total %d Linux test case(s) executed" % (runNum))
def runOneLinux(self, conn, fileName): def runOneLinux(self, conn, fileName):
tdLog.notice("run cases like %s" % (fileName)) testModule = self.__dynamicLoadModule(fileName)
runNum = 0 runNum = 0
for case in self.linuxCases: for tmp in self.linuxCases:
if case.name.find(fileName) != -1: if tmp.name.find(fileName) != -1:
case.case.init(conn) case = testModule.TDTestCase()
case.case.run() case.init(conn)
case.case.stop() case.run()
time.sleep(5) case.stop()
runNum += 1 runNum += 1
tdLog.notice("total %d cases executed" % (runNum)) continue
tdLog.notice("total %d Linux test case(s) executed" % (runNum))
def runAllWindows(self, conn): def runAllWindows(self, conn):
tdLog.notice("run total %d cases" % (len(self.windowsCases))) # TODO: load all Windows cases here
for case in self.windowsCases: runNum = 0
case.case.init(conn) for tmp in self.windowsCases:
case.case.run() if tmp.name.find(fileName) != -1:
case.case.stop() case = testModule.TDTestCase()
tdLog.notice("total %d cases executed" % (len(self.windowsCases))) case.init(conn)
case.run()
case.stop()
runNum += 1
continue
tdLog.notice("total %d Windows test case(s) executed" % (runNum))
def runOneWindows(self, conn, fileName): def runOneWindows(self, conn, fileName):
tdLog.notice("run cases like %s" % (fileName)) testModule = self.__dynamicLoadModule(fileName)
runNum = 0 runNum = 0
for case in self.windowsCases: for tmp in self.windowsCases:
if case.name.find(fileName) != -1: if tmp.name.find(fileName) != -1:
case.case.init(conn) case = testModule.TDTestCase()
case.case.run() case.init(conn)
case.case.stop() case.run()
time.sleep(2) case.stop()
runNum += 1 runNum += 1
tdLog.notice("total %d cases executed" % (runNum)) continue
tdLog.notice("total %d Windows case(s) executed" % (runNum))
def runAllCluster(self): def runAllCluster(self):
tdLog.notice("run total %d cases" % (len(self.clusterCases))) # TODO: load all cluster case module here
for case in self.clusterCases:
case.case.init()
case.case.run()
case.case.stop()
tdLog.notice("total %d cases executed" % (len(self.clusterCases)))
def runOneCluster(self, fileName): runNum = 0
for tmp in self.clusterCases:
if tmp.name.find(fileName) != -1:
tdLog.notice("run cases like %s" % (fileName)) tdLog.notice("run cases like %s" % (fileName))
case = testModule.TDTestCase()
case.init()
case.run()
case.stop()
runNum += 1
continue
tdLog.notice("total %d Cluster test case(s) executed" % (runNum))
def runOneCluster(self, fileName):
testModule = self.__dynamicLoadModule(fileName)
runNum = 0 runNum = 0
for case in self.clusterCases: for tmp in self.clusterCases:
if case.name.find(fileName) != -1: if tmp.name.find(fileName) != -1:
case.case.init() tdLog.notice("run cases like %s" % (fileName))
case.case.run() case = testModule.TDTestCase()
case.case.stop() case.init()
time.sleep(2) case.run()
case.stop()
runNum += 1 runNum += 1
tdLog.notice("total %d cases executed" % (runNum)) continue
tdLog.notice("total %d Cluster test case(s) executed" % (runNum))
tdCases = TDCases() tdCases = TDCases()
tests/pytest/util/dnodes.py
浏览文件 @ 59a77a36
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
import sys import sys
import os import os
import os.path import os.path
import subprocess
from util.log import * from util.log import *
...@@ -78,10 +79,18 @@ class TDDnode: ...@@ -78,10 +79,18 @@ class TDDnode:
self.index = index self.index = index
self.running = 0 self.running = 0
self.deployed = 0 self.deployed = 0
self.testCluster = False
self.valgrind = 0
def init(self, path): def init(self, path):
self.path = path self.path = path
def setTestCluster(self, value):
self.testCluster = value
def setValgrind(self, value):
self.valgrind = value
def deploy(self): def deploy(self):
self.logDir = "%s/sim/dnode%d/log" % (self.path, self.index) self.logDir = "%s/sim/dnode%d/log" % (self.path, self.index)
self.dataDir = "%s/sim/dnode%d/data" % (self.path, self.index) self.dataDir = "%s/sim/dnode%d/data" % (self.path, self.index)
...@@ -116,7 +125,9 @@ class TDDnode: ...@@ -116,7 +125,9 @@ class TDDnode:
if os.system(cmd) != 0: if os.system(cmd) != 0:
tdLog.exit(cmd) tdLog.exit(cmd)
if self.testCluster:
self.startIP() self.startIP()
self.cfg("masterIp", "192.168.0.1") self.cfg("masterIp", "192.168.0.1")
self.cfg("secondIp", "192.168.0.2") self.cfg("secondIp", "192.168.0.2")
self.cfg("publicIp", "192.168.0.%d" % (self.index)) self.cfg("publicIp", "192.168.0.%d" % (self.index))
...@@ -164,9 +175,18 @@ class TDDnode: ...@@ -164,9 +175,18 @@ class TDDnode:
if self.deployed == 0: if self.deployed == 0:
tdLog.exit("dnode:%d is not deployed" % (self.index)) tdLog.exit("dnode:%d is not deployed" % (self.index))
if self.valgrind == 0:
cmd = "nohup %staosd -c %s > /dev/null 2>&1 & " % ( cmd = "nohup %staosd -c %s > /dev/null 2>&1 & " % (
binPath, self.cfgDir) binPath, self.cfgDir)
else:
valgrindCmdline = "valgrind --tool=memcheck --leak-check=full --show-reachable=no --track-origins=yes --show-leak-kinds=all -v --workaround-gcc296-bugs=yes"
cmd = "nohup %s %staosd -c %s 2>&1 & " % (
valgrindCmdline, binPath, self.cfgDir)
print(cmd) print(cmd)
if os.system(cmd) != 0: if os.system(cmd) != 0:
tdLog.exit(cmd) tdLog.exit(cmd)
self.running = 1 self.running = 1
...@@ -275,8 +295,16 @@ class TDDnodes: ...@@ -275,8 +295,16 @@ class TDDnodes:
self.sim.init(self.path) self.sim.init(self.path)
self.sim.deploy() self.sim.deploy()
def setTestCluster(self, value):
self.testCluster = value
def setValgrind(self, value):
self.valgrind = value
def deploy(self, index): def deploy(self, index):
self.check(index) self.check(index)
self.dnodes[index - 1].setTestCluster(self.testCluster)
self.dnodes[index - 1].setValgrind(self.valgrind)
self.dnodes[index - 1].deploy() self.dnodes[index - 1].deploy()
def cfg(self, index, option, value): def cfg(self, index, option, value):
...@@ -297,10 +325,14 @@ class TDDnodes: ...@@ -297,10 +325,14 @@ class TDDnodes:
def startIP(self, index): def startIP(self, index):
self.check(index) self.check(index)
if self.testCluster:
self.dnodes[index - 1].startIP() self.dnodes[index - 1].startIP()
def stopIP(self, index): def stopIP(self, index):
self.check(index) self.check(index)
if self.dnodes[index - 1].testCluster:
self.dnodes[index - 1].stopIP() self.dnodes[index - 1].stopIP()
def check(self, index): def check(self, index):
...@@ -312,11 +344,14 @@ class TDDnodes: ...@@ -312,11 +344,14 @@ class TDDnodes:
for i in range(len(self.dnodes)): for i in range(len(self.dnodes)):
self.dnodes[i].stop() self.dnodes[i].stop()
psCmd = "ps -ef | grep -w taosd | grep 'root' | grep -v grep | awk '{print $2}'"
processID = subprocess.check_output(psCmd, shell=True)
if processID:
cmd = "sudo systemctl stop taosd" cmd = "sudo systemctl stop taosd"
os.system(cmd) os.system(cmd)
# if os.system(cmd) != 0 : # if os.system(cmd) != 0 :
# tdLog.exit(cmd) # tdLog.exit(cmd)
cmd = "ps -ef | grep -w taosd | grep 'dnode' | grep -v grep | awk '{print $2}' && sudo pkill -sigkill taosd" cmd = "ps -ef | grep -w taosd | grep 'dnode' | grep -v grep | awk '{print $2}' && pkill -sigkill taosd"
os.system(cmd) os.system(cmd)
# if os.system(cmd) != 0 : # if os.system(cmd) != 0 :
# tdLog.exit(cmd) # tdLog.exit(cmd)
......
tests/pytest/util/log.py
浏览文件 @ 59a77a36
...@@ -42,7 +42,7 @@ class TDLog: ...@@ -42,7 +42,7 @@ class TDLog:
printf("\033[1;31m%s %s\033[0m" % (datetime.datetime.now(), err)) printf("\033[1;31m%s %s\033[0m" % (datetime.datetime.now(), err))
sys.exit(1) sys.exit(1)
def printfNoPrefix(self, info): def printNoPrefix(self, info):
printf("\033[1;36m%s\033[0m" % (info)) printf("\033[1;36m%s\033[0m" % (info))
......
tests/script/basicSuite.sim
浏览文件 @ 59a77a36
################################# #################################
run general/table/basic1.sim run general/db/testSuite.sim
run general/table/basic2.sim run general/insert/testSuite.sim
run general/table/basic3.sim run general/table/testSuite.sim
run general/user/basicSuite.sim
run general/db/basic1.sim
run general/db/basic2.sim
run general/db/basic3.sim
run general/db/basic4.sim
run general/db/basic5.sim
run general/user/basic1.sim
################################## ##################################
tests/script/general/account/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
run general/account/pass_alter.sim
run general/account/pass_len.sim
run general/account/user_create.sim
run general/account/user_len.sim
run general/account/monitor.sim
\ No newline at end of file
tests/script/general/agg/fill.sim 0 → 100644
浏览文件 @ 59a77a36
system sh/stop_dnodes.sh
system sh/ip.sh -i 1 -s up
system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
system sh/cfg.sh -n dnode1 -c commitLog -v 0
system sh/exec.sh -n dnode1 -s start
sleep 3000
sql connect
print =================== step1
sql create database db
sql use db
sql create table mt (ts timestamp, k int, h binary(20), t bigint, s float, f double, x smallint, y tinyint, z bool) tags (a int, b binary(20), c bigint)
sql create table tb using mt tags (0, '1', 2)
sql insert into tb values(now -200d, 200, '1', 2, 3, 4, 5, 6, true);
sql insert into tb values(now -100d, 100, '1', 2, 3, 4, 5, 6, true);
sql insert into tb values(now -30d, 30, '1', 2, 3, 4, 5, 6, true);
sql insert into tb values(now -20d, 20, '1', 2, 3, 4, 5, 6, true);
sql insert into tb values(now -10d, 10, '1', 2, 3, 4, 5, 6, true);
sql insert into tb values(now -5d, 5, '1', 2, 3, 4, 5, 6, true);
sql insert into tb values(now -1d, 1, '1', 2, 3, 4, 5, 6, true);
sql insert into tb values(now, 0, '1', 2, 3, 4, 5, 6, true);
sql select * from db.mt
if $rows != 8 then
return -1
endi
sql select * from db.tb
if $rows != 8 then
return -1
endi
sql select count(*) from db.mt
if $data00 != 8 then
return -1
endi
sql select count(*), last(ts), min(k), max(k), avg(k) from db.mt where a=0 and ts>="2016-4-29 8:0:0" and ts < "2018-7-18 8:9:0" interval(1d) fill(value, 1)
sql select count(*), last(ts), min(k), max(k), avg(k) from db.mt where a=0 and ts>="2016-4-29 8:0:0" and ts < "2018-7-18 8:9:0" interval(1d) fill(value, 1)
print =================== step2
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 10000
system sh/exec.sh -n dnode1 -s start
sleep 3000
print =================== step3
sql select * from db.mt
if $rows != 8 then
return -1
endi
sql select * from db.tb
if $rows != 8 then
return -1
endi
sql select count(*) from db.mt
if $data00 != 8 then
return -1
endi
tests/script/general/agg/stream.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/agg/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
run general/agg/fill.sim
run general/agg/stream.sim
\ No newline at end of file
tests/script/general/alter/cached_schema_after_alter.sim 0 → 100644
浏览文件 @ 59a77a36
system sh/stop_dnodes.sh
system sh/ip.sh -i 1 -s up
system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
system sh/cfg.sh -n dnode1 -c clog -v 0
system sh/exec.sh -n dnode1 -s start
sleep 3000
sql connect
$db = csaa_db
$stb = csaastb
$tb1 = csaatb1
$tb2 = csaatb2
$ts0 = 1537146000000
$delta = 600000
print ========== cached_schema_after_alter.sim
sql drop database $db -x step1
step1:
sql create database $db
print ====== create tables
sql use $db
sql create table $stb (ts timestamp, c1 int) tags(t1 int)
sql create table $tb1 using $stb tags( 1 )
sql create table $tb2 using $stb tags( 2 )
sql_error alter table $tb1 add column c0 int
sql alter table $stb add column c2 int
sql insert into $tb2 values ( $ts0 , 1, 1)
sql select * from $stb
if $rows != 1 then
return -1
endi
if $data01 != 1 then
return -1
endi
if $data02 != 1 then
return -1
endi
sql select * from $tb2
if $rows != 1 then
return -1
endi
if $data01 != 1 then
return -1
endi
if $data02 != 1 then
return -1
endi
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 2000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
sleep 3000
sql use $db
sql select * from $stb
if $rows != 1 then
return -1
endi
if $data01 != 1 then
return -1
endi
if $data02 != 1 then
return -1
endi
sql select * from $tb2
if $rows != 1 then
return -1
endi
if $data01 != 1 then
return -1
endi
if $data02 != 1 then
return -1
endi
$ts = $ts0 + $delta
sql insert into $tb2 values ( $ts , 2, 2)
sql select * from $stb order by ts asc
if $rows != 2 then
return -1
endi
if $data01 != 1 then
return -1
endi
if $data02 != 1 then
return -1
endi
if $data11 != 2 then
return -1
endi
if $data12 != 2 then
return -1
endi
sql select * from $tb2 order by ts asc
if $rows != 2 then
return -1
endi
if $data01 != 1 then
return -1
endi
if $data02 != 1 then
return -1
endi
if $data11 != 2 then
return -1
endi
if $data12 != 2 then
return -1
endi
tests/script/general/alter/count.sim 0 → 100644
浏览文件 @ 59a77a36
system sh/stop_dnodes.sh
system sh/ip.sh -i 1 -s up
system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
system sh/cfg.sh -n dnode1 -c clog -v 0
system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4
print ========= start dnode1 as master
system sh/exec.sh -n dnode1 -s start
sleep 3000
sql connect
print ======== step1
sql create database d1 replica 1 days 7 keep 50
sql use d1
sql create table tb (ts timestamp, a int)
sql insert into tb values(now-28d, -28)
sql insert into tb values(now-27d, -27)
sql insert into tb values(now-26d, -26)
sql select count(a) from tb
if $data00 != 3 then
return -1
endi
print ======== step2
sql alter table tb add column b smallint
sql insert into tb values(now-25d, -25, 0)
sql insert into tb values(now-24d, -24, 1)
sql insert into tb values(now-23d, -23, 2)
sql select count(b) from tb
if $data00 != 3 then
return -1
endi
print ======== step3
# sql alter table tb(ts timestamp, a int, b smallint, c tinyint)
sql alter table tb add column c tinyint
sql insert into tb values(now-22d, -22, 3, 0)
sql insert into tb values(now-21d, -21, 4, 1)
sql insert into tb values(now-20d, -20, 5, 2)
sql select count(c) from tb
if $data00 != 3 then
return -1
endi
print ======== step4
# sql alter table tb(ts timestamp, a int, b smallint, c tinyint, d int)
sql alter table tb add column d int
sql insert into tb values(now-19d, -19, 6, 0, 0)
sql insert into tb values(now-18d, -18, 7, 1, 1)
sql insert into tb values(now-17d, -17, 8, 2, 2)
sql select count(d) from tb
if $data00 != 3 then
return -1
endi
print ======== step5
# sql alter table tb(ts timestamp, a int, b smallint, c tinyint, d int, e bigint)
sql alter table tb add column e bigint
sql insert into tb values(now-16d, -16, 9, 0, 0, 0)
sql insert into tb values(now-15d, -15, 10, 1, 1, 1)
sql insert into tb values(now-14d, -14, 11, 2, 2, 2)
sql select count(e) from tb
if $data00 != 3 then
return -1
endi
print ======== step6
# sql alter table tb(ts timestamp, a int, b smallint, c tinyint, d int, e bigint, f float)
sql alter table tb add column f float
sql insert into tb values(now-13d, -13, 12, 0, 0, 0, 0)
sql insert into tb values(now-12d, -12, 13, 1, 1, 1, 1)
sql insert into tb values(now-11d, -11, 24, 2, 2, 2, 2)
sql select count(f) from tb
if $data00 != 3 then
return -1
endi
print ======== step7
# sql alter table tb(ts timestamp, a int, b smallint, c tinyint, d int, e bigint, f float, g double)
sql alter table tb add column g double
sql insert into tb values(now-10d, -10, 15, 0, 0, 0, 0, 0)
sql insert into tb values(now-9d, -9, 16, 1, 1, 1, 1, 1)
sql insert into tb values(now-8d, -8, 17, 2, 2, 2, 2, 2)
sql select count(g) from tb
if $data00 != 3 then
return -1
endi
print ======== step8
# sql alter table tb(ts timestamp, a int, b smallint, c tinyint, d int, e bigint, f float, g double, h binary(10) )
sql alter table tb add column h binary(10)
sql insert into tb values(now-7d, -7, 18, 0, 0, 0, 0, 0, '0')
sql insert into tb values(now-6d, -6, 19, 1, 1, 1, 1, 1, '1')
sql insert into tb values(now-5d, -5, 20, 2, 2, 2, 2, 2, '2')
sql select count(h) from tb
if $data00 != 3 then
return -1
endi
print ======== step9
sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
if $data00 != 24 then
return -1
endi
sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
if $data01 != 21 then
return -1
endi
sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
if $data02 != 18 then
return -1
endi
sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
if $data03 != 15 then
return -1
endi
sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
if $data04 != 12 then
return -1
endi
sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
if $data05 != 9 then
return -1
endi
sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
if $data06 != 6 then
return -1
endi
sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
if $data07 != 3 then
return -1
endi
print ============= step10
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 5000
system sh/exec.sh -n dnode1 -s start
sleep 5000
sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
if $data00 != 24 then
return -1
endi
sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
if $data01 != 21 then
return -1
endi
sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
if $data02 != 18 then
return -1
endi
sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
if $data03 != 15 then
return -1
endi
sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
if $data04 != 12 then
return -1
endi
sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
if $data05 != 9 then
return -1
endi
sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
if $data06 != 6 then
return -1
endi
sql select count(a), count(b), count(c), count(d), count(e), count(f), count(g), count(h) from tb
if $data07 != 3 then
return -1
endi
print ======== step11
#sql alter table tb(ts timestamp, b smallint, c tinyint, d int, e bigint, f float, g double, h binary(20))
sql alter table tb drop column a
sql insert into tb values(now-4d, 1, 1, 1, 1, 1, 1, '1')
sql select count(g) from tb
if $data00 != 7 then
return -1
endi
print ======== step12
#sql alter table tb(ts timestamp, c tinyint, d int, e bigint, f float, g double, h binary(20))
sql alter table tb drop column b
sql insert into tb values(now-3d, 1, 1, 1, 1, 1, '1')
sql select count(g) from tb
if $data00 != 8 then
return -1
endi
print ======== step13
#sql alter table tb(ts timestamp, d int, e bigint, f float, g double, h binary(20))
sql alter table tb drop column c
sql insert into tb values(now-2d, 1, 1, 1, 1, '1')
sql select count(g) from tb
if $data00 != 9 then
return -1
endi
print ======== step14
#sql alter table tb(ts timestamp, e bigint, f float, g double, h binary(20))
sql alter table tb drop column d
sql insert into tb values(now-1d, 1, 1, 1, '1')
sql select count(g) from tb
if $data00 != 10 then
return -1
endi
print ======== step15
#sql alter table tb(ts timestamp, f float, g double, h binary(20))
sql alter table tb drop column e
sql insert into tb values(now, 1, 1, '1')
sql select count(g) from tb
if $data00 != 11 then
return -1
endi
print ======== step16
#sql alter table tb(ts timestamp, g double, h binary(20))
sql alter table tb drop column f
sql insert into tb values(now+1d, 1, '1')
sql select count(g) from tb
if $data00 != 12 then
return -1
endi
print ======== step17
#sql alter table tb(ts timestamp, h binary(20))
sql alter table tb drop column g
sql insert into tb values(now+2d, '1')
sql select count(h) from tb
if $data00 != 10 then
return -1
endi
print ============== step18
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 5000
system sh/exec.sh -n dnode1 -s start
sleep 5000
#sql select count(g) from tb
#if $data00 != 12 then
# return -1
#endi
sql select count(*) from tb
if $data00 != 31 then
return -1
endi
tests/script/general/alter/import.sim 0 → 100644
浏览文件 @ 59a77a36
system sh/stop_dnodes.sh
system sh/ip.sh -i 1 -s up
system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
system sh/cfg.sh -n dnode1 -c clog -v 0
system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4
print ========= start dnode1 as master
system sh/exec.sh -n dnode1 -s start
sleep 3000
sql connect
print ======== step1
sql create database d1 replica 1 days 7 keep 50
sql use d1
sql create table tb (ts timestamp, a int)
sql insert into tb values(now-30d, -28)
sql insert into tb values(now-27d, -27)
sql insert into tb values(now-26d, -26)
sql select count(a) from tb
if $data00 != 3 then
return -1
endi
print ======== step2
#sql alter table tb(ts timestamp, a int, b smallint)
sql alter table tb add column b smallint
sql insert into tb values(now-25d, -25, 0)
sql insert into tb values(now-22d, -24, 1)
sql insert into tb values(now-20d, -23, 2)
sql select count(b) from tb
if $data00 != 3 then
return -1
endi
print ========= step3
sql import into tb values(now-23d, -23, 0)
sql import into tb values(now-21d, -21, 0)
sql select count(b) from tb
if $data00 != 5 then
return -1
endi
sql_error import into tb values(now-29d, -29, 0)
sql select count(b) from tb
if $data00 != 5 then
return -1
endi
tests/script/general/alter/insert1.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/alter/insert2.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/alter/metrics.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/alter/table.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/alter/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
run general/alter/count.sim
run general/alter/cached_schema_after_alter.sim
run general/alter/import.sim
run general/alter/insert1.sim
run general/alter/insert2.sim
run general/alter/metrics.sim
run general/alter/table.sim
\ No newline at end of file
tests/script/general/cache/cache_balance.sim 0 → 100644
浏览文件 @ 59a77a36
system sh/stop_dnodes.sh
system sh/ip.sh -i 1 -s up
system sh/ip.sh -i 2 -s up
system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
system sh/cfg.sh -n dnode1 -c commitLog -v 0
system sh/cfg.sh -n dnode2 -c commitLog -v 0
system sh/cfg.sh -n dnode1 -c httpMaxThreads -v 2
system sh/cfg.sh -n dnode2 -c httpMaxThreads -v 2
system sh/cfg.sh -n dnode1 -c monitor -v 1
system sh/cfg.sh -n dnode2 -c http -v 1
system sh/cfg.sh -n dnode1 -c enableHttp -v 1
system sh/cfg.sh -n dnode2 -c monitor -v 1
system sh/cfg.sh -n dnode1 -c monitorInterval -v 1
system sh/cfg.sh -n dnode2 -c monitorInterval -v 1
system sh/cfg.sh -n dnode1 -c maxVnodeConnections -v 30000
system sh/cfg.sh -n dnode2 -c maxVnodeConnections -v 30000
system sh/cfg.sh -n dnode1 -c maxMgmtConnections -v 30000
system sh/cfg.sh -n dnode2 -c maxMgmtConnections -v 30000
system sh/cfg.sh -n dnode1 -c maxMeterConnections -v 30000
system sh/cfg.sh -n dnode2 -c maxMeterConnections -v 30000
system sh/cfg.sh -n dnode1 -c maxShellConns -v 30000
system sh/cfg.sh -n dnode2 -c maxShellConns -v 30000
system sh/exec.sh -n dnode1 -s start
sleep 3000
sql connect
sql create database testdb
sql use testdb
sql create table meter1 (ts timestamp, val int)
$x = 0
$v = -100
while $x < 30
$v = $v + 1
$ms = $v . m
sql insert into meter1 values (now $ms , $x )
$x = $x + 1
endw
sleep 3000
system sh/exec.sh -n dnode2 -s start
sql create dnode 192.168.0.2
sleep 20000
sql select * from log.dn_192_168_0_1
print ===>rows $rows
print $data00 $data01 $data02
print $data10 $data11 $data12
print $data20 $data21 $data22
if $rows < 20 then
return -1
endi
#sql create table sys.st as select avg(taosd), avg(system) from sys.cpu interval(30s)
tests/script/general/cache/new_metrics.sim 0 → 100644
浏览文件 @ 59a77a36
system sh/stop_dnodes.sh
system sh/ip.sh -i 1 -s up
system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
system sh/cfg.sh -n dnode1 -c commitLog -v 0
system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10
system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10
system sh/exec.sh -n dnode1 -s start
sleep 3000
sql connect
$i = 0
$dbPrefix = ca_nm_db
$tbPrefix = ca_nm_tb
$mtPrefix = ca_nm_mt
$db = $dbPrefix . $i
$tb = $tbPrefix . $i
$mt = $mtPrefix . $i
$tbNum = 10
$rowNum = 20
print =============== step1
sql create database $db
sql use $db
sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool)
$i = 0
while $i < 5
$tb = $tbPrefix . $i
sql create table $tb using $mt tags( 0 )
$x = 0
while $x < $rowNum
$val = $x * 60000
$ms = 1519833600000 + $val
sql insert into $tb values ($ms , $x )
$x = $x + 1
endw
$i = $i + 1
endw
print =============== step2
sql select * from $tb order by ts desc
print ===>rows $rows, data $data01
if $rows != 20 then
return -1
endi
if $data01 != 19 then
return -1
endi
sql select * from $mt
print ===>rows $rows, data $data01
if $rows != 100 then
return -1
endi
if $data01 != 0 then
return -1
endi
sql select count(*) from $mt
print ===>rows $rows, data $data00
if $rows != 1 then
return -1
endi
if $data00 != 100 then
return -1
endi
print =============== step3
sql show stables
if $rows != 1 then
return -1
endi
if $data00 != $mt then
return -1
endi
if $data04 != 5 then
return -1
endi
print =============== step4
while $i < 10
$tb = $tbPrefix . $i
sql create table $tb using $mt tags( 1 )
$x = 0
while $x < $rowNum
$val = $x * 60000
$ms = 1519833600000 + $val
sql insert into $tb values ($ms , $x )
$x = $x + 1
endw
$i = $i + 1
endw
print ==> sleep 8 seconds to renew cache
sleep 8000
print =============== step5
sql select * from $tb order by ts desc
print ===>rows $rows, data $data01
if $rows != 20 then
return -1
endi
if $data01 != 19 then
return -1
endi
sql select * from $mt
print ===>rows $rows, data $data01
if $rows != 200 then
return -1
endi
if $data01 != 0 then
return -1
endi
sql select count(*) from $mt
print ===>rows $rows, data $data01
if $rows != 1 then
return -1
endi
if $data00 != 200 then
return -1
endi
print =============== step6
sql show stables
if $rows != 1 then
return -1
endi
if $data00 != $mt then
return -1
endi
if $data04 != 10 then
return -1
endi
tests/script/general/cache/new_stream.sim 0 → 100644
浏览文件 @ 59a77a36
system sh/stop_dnodes.sh
system sh/ip.sh -i 1 -s up
system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
system sh/cfg.sh -n dnode1 -c commitLog -v 0
system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10
system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10
system sh/exec.sh -n dnode1 -s start
sleep 3000
sql connect
print ======================== dnode1 start
$dbPrefix = ns_db
$tbPrefix = ns_tb
$mtPrefix = ns_mt
$stPrefix = ns_st
$tbNum = 5
$rowNum = 200
$totalNum = 200
print =============== step1
$i = 0
$db = $dbPrefix
$mt = $mtPrefix
$st = $stPrefix
sql create database $db
sql use $db
sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
$i = 0
while $i < $tbNum
$tb = $tbPrefix . $i
sql create table $tb using $mt tags( $i )
$x = 0
$y = 0
while $y < $rowNum
$ms = $x . s
sql insert into $tb values (now + $ms , $y , $y )
$x = $x + 1
$y = $y + 1
endw
$i = $i + 1
endw
sleep 100
print =============== step2
sql select count(*), count(tbcol), count(tbcol2) from $mt interval(10s)
print $data00 $data01 $data02 $data03
sql create table $st as select count(*), count(tbcol), count(tbcol2) from $mt interval(10s)
print =============== step3
print sleep 22 seconds
sleep 22000
print =============== step4
sql select * from $st
print $st ==> $rows1 $data00 $data01 $data02 $data03
if $data13 >= 51 then
return -1
endi
print =============== step5
$tbNum = 10
while $i < $tbNum
$tb = $tbPrefix . $i
sql create table $tb using $mt tags( $i )
if $i == 0 then
sleep 2000
endi
$x = 0
$y = 0
while $y < $rowNum
$ms = $x . s
sql insert into $tb values (now + $ms , $y , $y )
$x = $x + 1
$y = $y + 1
endw
$i = $i + 1
endw
print =============== step6
print sleep 22 seconds
sleep 22000
print =============== step7
sql select * from $st order by ts desc
print $st ==> $rows1 $data00 $data01 $data02 $data03
if $data03 <= 51 then
return -1
endi
tests/script/general/cache/restart_metrics.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/cache/restart_stream.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/cache/restart_table.sim 0 → 100644
浏览文件 @ 59a77a36
system sh/stop_dnodes.sh
system sh/ip.sh -i 1 -s up
system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
system sh/cfg.sh -n dnode1 -c commitLog -v 0
system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10
system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10
system sh/exec.sh -n dnode1 -s start
sleep 3000
sql connect
print ======================== dnode1 start
$i = 0
$dbPrefix = ca_rt_db
$tbPrefix = ca_rt_tb
$mtPrefix = ca_rt_mt
$db = $dbPrefix . $i
$tb = $tbPrefix . $i
print =============== step1
sql create database $db
sql use $db
sql create table $tb (ts timestamp, speed bool)
sql insert into $tb values (now, 1)
sql select * from $tb
print ===>rows $rows, data $data01
if $rows != 1 then
return -1
endi
if $data01 != 1 then
return -1
endi
print =============== step2
system sh/exec.sh -n dnode1 -s stop
system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
system sh/cfg.sh -n dnode1 -c commitLog -v 0
system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10
system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10
system sh/exec.sh -n dnode1 -s start
print =============== step3
print ==> sleep 8 seconds to renew cache
sleep 3000
sql reset query cache
sleep 18000
print =============== step4
sql create database $db
sql use $db
sql create table $tb (ts timestamp, speed int)
sql insert into $tb values (now, 1)
sql select * from $tb
print ===>rows $rows, data $data01
if $data01 != 1 then
return -1
endi
tests/script/general/cache/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
run general/cache/restart_table.sim
run general/cache/restart_metrics.sim
run general/cache/restart_stream.sim
run general/cache/new_metrics.sim
run general/cache/new_stream.sim
tests/script/general/column/commit.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/column/metrics.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/column/stream.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/column/table.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/column/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
run lite/column/table.sim
run lite/column/metrics.sim
run lite/column/stream.sim
run lite/column/commit.sim
tests/script/general/compress/commitlog.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/compress/compress.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/compress/compress2.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/compress/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
run general/compress/compress.sim
run general/compress/uncompress.sim
run general/compress/commitlog.sim
run general/compress/compress2.sim
tests/script/general/compress/uncompress.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/compute/avg.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/compute/bottom.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/compute/count.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/compute/diff.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/compute/diff2.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/compute/first.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/compute/interval.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/compute/last.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/compute/leastsquare.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/compute/max.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/compute/min.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/compute/null.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/compute/percentile.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/compute/stddev.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/compute/sum.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/compute/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/compute/top.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/db/back_insert.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/db/backup/keep.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/db/basic.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/db/delete_reuse1.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/db/delete_reuse2.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/db/delete_reusevnode.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/db/delete_reusevnode2.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/db/delete_writing1.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/db/delete_writing2.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/db/len.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/db/repeat.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/db/tables.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/db/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/field/2.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/field/3.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/field/4.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/field/5.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/field/6.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/field/bigint.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/field/binary.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/field/bool.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/field/double.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/field/float.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/field/int.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/field/single.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/field/smallint.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/field/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/field/tinyint.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/http/bug.go 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/http/grafana.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/http/grafana_bug.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/http/http.json 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/http/httpTestNew.go 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/http/httpTest_cloud.go 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/http/httpTest_private.go 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/http/opentsdb.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/http/prepare.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/http/restful.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/http/restful_full.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/http/restful_insert.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/http/restful_limit.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/http/taos.json 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/http/taos_cloud.json 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/http/telegraf.json 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/http/telegraf.req 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/http/telegraf.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/http/telegrafTest.go 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/http/telegraf_help.txt 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/http/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/import/basic.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/import/commit.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/import/large.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/import/replica1.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/import/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/insert/basic.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/insert/insert_drop.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/insert/query_block1_file.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/insert/query_block1_memory.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/insert/query_block2_file.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/insert/query_block2_memory.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/insert/query_file_memory.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/insert/query_multi_file.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/insert/tcp.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/insert/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/metrics/disk.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/metrics/metrics.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/metrics/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/metrics/values.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/metrics/vnode3.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/README.txt 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/alter.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/alter1.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/alter_stable.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/auto_create_tb.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/auto_create_tb_drop_tb.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/binary_escapeCharacter.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/bug.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/columnValue.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/columnValue_bigint.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/columnValue_bool.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/columnValue_double.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/columnValue_float.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/columnValue_int.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/columnValue_smallint.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/columnValue_tinyint.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/commit.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/create_db.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/create_mt.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/create_tb.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/dbtbnameValidate.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/fill.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/fill_stb.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/first_last.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/first_last_query.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/groupby.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/import.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/import_commit1.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/import_commit2.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/import_commit3.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/import_file.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/insert_multiTbl.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/insert_tb.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/interp.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/interp_test.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/join.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/join_multivnode.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/lastrow.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/lastrow_query.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/limit.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/limit1.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/limit1_stb.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/limit1_tb.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/limit1_tblocks100.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/limit2.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/limit2_query.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/limit2_tblocks100.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/limit_stb.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/limit_tb.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/mixed_blocks.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/nchar.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/null_char.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/projection_limit_offset.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/repeatAlter.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/repeatStream.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/selectResNum.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/select_across_vnodes.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/select_from_cache_disk.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/select_with_tags.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/set_tag_vals.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/single_row_in_tb.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/single_row_in_tb_query.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/slimit.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/slimit1.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/slimit1_query.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/slimit_alter_tags.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/slimit_query.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/stream.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/stream_on_sys.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/tags_filter.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/tbnameIn.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/tbnameIn_query.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/timestamp.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/timestamp_query.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/parser/where.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/stream/metrics_1.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/stream/metrics_del.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/stream/metrics_n.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/stream/metrics_replica1_vnoden.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/stream/stream_1.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/stream/stream_2.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/stream/stream_3.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/stream/stream_restart.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/stream/table_1.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/stream/table_del.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/stream/table_n.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/stream/table_replica1_vnoden.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/stream/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/table/back_insert.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/table/bigint.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/table/binary.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/table/bool.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/table/column2.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/table/column_name.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/table/column_num.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/table/column_value.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/table/date.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/table/db.table.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/table/delete_reuse1.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/table/delete_reuse2.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/table/delete_writing.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/table/describe.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/table/double.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/table/float.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/table/int.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/table/limit.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/table/smallint.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/table/table.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/table/table_len.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/table/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/table/tinyint.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/table/vgroup.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/tag/3.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/tag/4.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/tag/5.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/tag/6.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/tag/add.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/tag/bigint.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/tag/binary.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/tag/binary_binary.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/tag/bool.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/tag/bool_binary.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/tag/bool_int.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/tag/change.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/tag/column.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/tag/commit.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/tag/create.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/tag/delete.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/tag/double.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/tag/filter.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/tag/float.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/tag/int.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/tag/int_binary.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/tag/int_float.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/tag/set.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/tag/smallint.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/tag/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/tag/tinyint.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/user/basicSuite.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/user/monitor.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/user/pass_alter.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/user/pass_len.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/user/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/user/user_create.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/user/user_len.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/vector/metrics_field.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/vector/metrics_mix.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/vector/metrics_query.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/vector/metrics_tag.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/vector/metrics_time.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/vector/multi.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/vector/single.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/vector/table_field.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/vector/table_mix.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/vector/table_query.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/vector/table_time.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/general/vector/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/sh/deploy.sh
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/test.sh
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/account/account_create.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/account/account_delete.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/account/account_len.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/account/authority.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/account/monitor.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/account/pass_alter.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/account/pass_len.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/account/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/account/user_create.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/account/user_len.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/big/balance.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/big/maxvnodes.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/big/tcp.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/big/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/cluster/backup/balance4.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/cluster/backup/balance5.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/cluster/backup/balancex.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/cluster/balance1.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/cluster/balance1_bug.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/cluster/balance1_single.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/cluster/balance2.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/cluster/balance3.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/cluster/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/column/replica3.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/column/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/db/back_insert.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/db/commit.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/db/delete.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/db/delete_part.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/db/replica_add12.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/db/replica_add13.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/db/replica_add23.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/db/replica_part.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/db/replica_reduce21.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/db/replica_reduce31.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/db/replica_reduce32.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/db/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/dnode/backup/balance4.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/dnode/backup/balance5.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/dnode/backup/unremove.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/dnode/balance1.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/dnode/balance2.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/dnode/balance3.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/dnode/balancex.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/dnode/monitor_bug.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/dnode/offline1.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/dnode/offline2.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/dnode/remove1.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/dnode/remove2.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/dnode/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/dnode/vnode_clean.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/http/admin.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/http/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/import/replica2.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/import/replica3.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/import/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/metrics/balance_replica1.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/metrics/dnode2.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/metrics/dnode2_stop.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/metrics/dnode3.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/metrics/replica2_dnode4.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/metrics/replica2_vnode3.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/metrics/replica3_dnode6.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/metrics/replica3_vnode3.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/metrics/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/mnode/backup/mgmt44.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/mnode/backup/mgmt45.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/mnode/backup/mgmt55.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/mnode/backup/mgmt56.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/mnode/backup/mgmt57.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/mnode/basic1.sim 已删除 100644 → 0
浏览文件 @ 64545fb9
此差异已折叠。
tests/script/unique/mnode/mgmt22.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/mnode/mgmt23.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/mnode/mgmt24.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/mnode/mgmt25.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/mnode/mgmt26.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/mnode/mgmt33.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/mnode/mgmt34.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/mnode/mgmtr2.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/mnode/secondIp.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/mnode/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/stream/metrics_balance.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/stream/metrics_replica1_dnode2.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/stream/metrics_replica2_dnode2.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/stream/metrics_replica2_dnode3.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/stream/metrics_replica3_dnode4.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/stream/metrics_vnode_stop.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/stream/table_balance.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/stream/table_move.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/stream/table_replica1_dnode2.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/stream/table_replica2_dnode2.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/stream/table_replica2_dnode3.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/stream/table_replica3_dnode4.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/stream/table_vnode_stop.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/stream/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/table/back_insert.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/table/delete_part.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/table/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/testSuite.sim
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/vnode/back_insert.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/vnode/back_insert_many.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/vnode/backup/replica4.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/vnode/backup/replica5.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/vnode/commit.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/vnode/many.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/vnode/replica2_basic.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/vnode/replica2_basic2.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/vnode/replica2_repeat.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/vnode/replica3_basic.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/vnode/replica3_repeat.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/vnode/replica3_vgroup.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/unique/vnode/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/uniqueSuite.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/account/authority.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/account/user_create.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/account/user_len.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/alter/metrics.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/alter/table.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/compute/avg.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/compute/bottom.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/compute/count.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/compute/diff.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/compute/first.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/compute/interval.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/compute/last.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/compute/leastsquare.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/compute/max.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/compute/min.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/compute/percentile.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/compute/stddev.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/compute/sum.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/compute/top.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/db/basic.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/db/len.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/field/2.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/field/3.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/field/4.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/field/5.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/field/6.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/field/bigint.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/field/binary.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/field/bool.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/field/double.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/field/float.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/field/int.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/field/single.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/field/smallint.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/field/tinyint.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/import/basic.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/insert/basic.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/insert/query_block1_file.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/insert/query_block1_memory.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/insert/query_block2_file.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/insert/query_block2_memory.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/insert/query_file_memory.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/insert/query_multi_file.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/table/binary.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/table/bool.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/table/column_name.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/table/column_num.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/table/column_value.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/table/db.table.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/table/double.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/table/float.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/table/table.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/table/table_len.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/tag/3.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/tag/4.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/tag/5.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/tag/6.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/tag/add.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/tag/bigint.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/tag/binary.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/tag/binary_binary.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/tag/bool.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/tag/bool_binary.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/tag/bool_int.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/tag/change.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/tag/column.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/tag/create.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/tag/delete.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/tag/double.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/tag/filter.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/tag/float.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/tag/int.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/tag/int_binary.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/tag/int_float.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/tag/set.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/tag/smallint.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/tag/tinyint.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/testSuite.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/vector/metrics_field.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/vector/metrics_mix.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/vector/metrics_query.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/vector/metrics_tag.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/vector/metrics_time.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/vector/multi.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/vector/single.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/vector/table_field.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/vector/table_mix.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/vector/table_query.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/script/windows/vector/table_time.sim 0 → 100644
浏览文件 @ 59a77a36
此差异已折叠。
tests/test-all.sh
浏览文件 @ 59a77a36
此差异已折叠。
tests/test/c/importOneRow.c
浏览文件 @ 59a77a36
此差异已折叠。
tests/test/c/importPerTabe.c
浏览文件 @ 59a77a36
此差异已折叠。
tests/test/c/insertPerRow.c
浏览文件 @ 59a77a36
此差异已折叠。
tests/test/c/insertPerTable.c
浏览文件 @ 59a77a36
此差异已折叠。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或