Skip to content

T
TDengine

慢慢CG / TDengine
与 Fork 源项目一致

Fork自 taosdata / TDengine

通知 1
Star 0
Fork 0
T
TDengine
未验证 提交 84c3955a 编写于 作者: S slguan 提交者： GitHub
浏览文件
操作

Merge pull request #1670 from taosdata/feature/mpeer 

Feature/mpeer
上级 7043cfb6 be8ea454
显示空白变更内容
内联 并排
Showing with 552 addition and 482 deletion
src/common/inc/tglobal.h
浏览文件 @ 84c3955a
......@@ -59,6 +59,7 @@ extern uint16_t tsMnodeDnodePort;
extern uint16_t tsMnodeShellPort;
extern uint16_t tsDnodeShellPort;
extern uint16_t tsDnodeMnodePort;
extern uint16_t tsSyncPort;
extern int tsStatusInterval;
extern int tsShellActivityTimer;
......
src/common/inc/tulog.h
浏览文件 @ 84c3955a
......@@ -44,6 +44,11 @@ extern int32_t tscEmbedded;
#define uPrint(...) \
{ taosPrintLog("UTL ", tscEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }
#define pError(...) \
{ taosPrintLog("ERROR APP ", 255, __VA_ARGS__); }
#define pPrint(...) \
{ taosPrintLog("APP ", 255, __VA_ARGS__); }
#ifdef __cplusplus
}
#endif
......
src/common/src/tglobal.c
浏览文件 @ 84c3955a
......@@ -65,7 +65,8 @@ char tsSecondIp[TSDB_IPv4ADDR_LEN] = {0};
uint16_t tsMnodeShellPort = 6030; // udp[6030-6034] tcp[6030]
uint16_t tsDnodeShellPort = 6035; // udp[6035-6039] tcp[6035]
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 tsShellActivityTimer = 3; // second
......
src/dnode/src/dnodeMClient.c
浏览文件 @ 84c3955a
......@@ -34,26 +34,28 @@
#define MPEER_CONTENT_LEN 2000
static bool dnodeReadMnodeIpList();
static void dnodeSaveMnodeIpList();
static void dnodeReadDnodeInfo();
static void dnodeUpdateDnodeInfo(int32_t dnodeId);
static void dnodeUpdateMnodeInfos(SDMMnodeInfos *pMnodes);
static bool dnodeReadMnodeInfos();
static void dnodeSaveMnodeInfos();
static void dnodeUpdateDnodeCfg(SDMDnodeCfg *pCfg);
static bool dnodeReadDnodeCfg();
static void dnodeSaveDnodeCfg();
static void dnodeProcessRspFromMnode(SRpcMsg *pMsg);
static void dnodeProcessStatusRsp(SRpcMsg *pMsg);
static void dnodeSendStatusMsg(void *handle, void *tmrId);
static void (*tsDnodeProcessMgmtRspFp[TSDB_MSG_TYPE_MAX])(SRpcMsg *);
static void *tsDnodeMClientRpc = NULL;
static SRpcIpSet tsMnodeIpList = {0};
static SDMNodeInfos tsMnodeInfos = {0};
static void *tsDnodeTmr = NULL;
static void *tsStatusTimer = NULL;
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};
int32_t dnodeInitMClient() {
dnodeReadDnodeInfo();
dnodeReadDnodeCfg();
tsRebootTime = taosGetTimestampSec();
tsDnodeTmr = taosTmrInit(100, 200, 60000, "DND-DM");
......@@ -62,22 +64,22 @@ int32_t dnodeInitMClient() {
return -1;
}
if (!dnodeReadMnodeIpList()) {
memset(&tsMnodeIpList, 0, sizeof(SRpcIpSet));
memset(&tsMnodeInfos, 0, sizeof(SDMNodeInfos));
tsMnodeIpList.port = tsMnodeDnodePort;
tsMnodeIpList.numOfIps = 1;
tsMnodeIpList.ip[0] = inet_addr(tsMasterIp);
if (!dnodeReadMnodeInfos()) {
memset(&tsMnodeIpSet, 0, sizeof(SRpcIpSet));
memset(&tsMnodeInfos, 0, sizeof(SDMMnodeInfos));
tsMnodeIpSet.port = tsMnodeDnodePort;
tsMnodeIpSet.numOfIps = 1;
tsMnodeIpSet.ip[0] = inet_addr(tsMasterIp);
if (strcmp(tsSecondIp, tsMasterIp) != 0) {
tsMnodeIpList.numOfIps = 2;
tsMnodeIpList.ip[1] = inet_addr(tsSecondIp);
tsMnodeIpSet.numOfIps = 2;
tsMnodeIpSet.ip[1] = inet_addr(tsSecondIp);
}
} else {
tsMnodeIpList.inUse = tsMnodeInfos.inUse;
tsMnodeIpList.numOfIps = tsMnodeInfos.nodeNum;
tsMnodeIpList.port = tsMnodeInfos.nodeInfos[0].nodePort;
tsMnodeIpSet.inUse = tsMnodeInfos.inUse;
tsMnodeIpSet.numOfIps = tsMnodeInfos.nodeNum;
tsMnodeIpSet.port = tsMnodeInfos.nodeInfos[0].nodePort;
for (int32_t i = 0; i < tsMnodeInfos.nodeNum; i++) {
tsMnodeIpList.ip[i] = tsMnodeInfos.nodeInfos[i].nodeIp;
tsMnodeIpSet.ip[i] = tsMnodeInfos.nodeInfos[i].nodeIp;
}
}
......@@ -144,58 +146,68 @@ static void dnodeProcessStatusRsp(SRpcMsg *pMsg) {
}
SDMStatusRsp *pStatusRsp = pMsg->pCont;
SDMNodeInfos *mnodes = &pStatusRsp->mnodes;
if (mnodes->nodeNum <= 0) {
dError("status msg is invalid, num of ips is %d", mnodes->nodeNum);
SDMMnodeInfos *pMnodes = &pStatusRsp->mnodes;
if (pMnodes->nodeNum <= 0) {
dError("status msg is invalid, num of ips is %d", pMnodes->nodeNum);
taosTmrReset(dnodeSendStatusMsg, tsStatusInterval * 1000, NULL, tsDnodeTmr, &tsStatusTimer);
return;
}
SDnodeState *pState = &pStatusRsp->dnodeState;
pState->numOfVnodes = htonl(pState->numOfVnodes);
pState->moduleStatus = htonl(pState->moduleStatus);
pState->createdTime = htonl(pState->createdTime);
pState->dnodeId = htonl(pState->dnodeId);
dnodeProcessModuleStatus(pState->moduleStatus);
dnodeUpdateDnodeInfo(pState->dnodeId);
SRpcIpSet mgmtIpSet = {0};
mgmtIpSet.inUse = mnodes->inUse;
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);
SDMDnodeCfg *pCfg = &pStatusRsp->dnodeCfg;
pCfg->numOfVnodes = htonl(pCfg->numOfVnodes);
pCfg->moduleStatus = htonl(pCfg->moduleStatus);
pCfg->dnodeId = htonl(pCfg->dnodeId);
for (int32_t i = 0; i < pMnodes->nodeNum; ++i) {
SDMMnodeInfo *pMnodeInfo = &pMnodes->nodeInfos[i];
pMnodeInfo->nodeId = htonl(pMnodeInfo->nodeId);
pMnodeInfo->nodeIp = htonl(pMnodeInfo->nodeIp);
pMnodeInfo->nodePort = htons(pMnodeInfo->nodePort);
pMnodeInfo->syncPort = htons(pMnodeInfo->syncPort);
}
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);
}
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) {
if (tsDnodeMClientRpc) {
rpcSendRequest(tsDnodeMClientRpc, &tsMnodeIpList, rpcMsg);
rpcSendRequest(tsDnodeMClientRpc, &tsMnodeIpSet, rpcMsg);
}
}
static bool dnodeReadMnodeIpList() {
static bool dnodeReadMnodeInfos() {
char ipFile[TSDB_FILENAME_LEN] = {0};
sprintf(ipFile, "%s/mgmtIpList.json", tsDnodeDir);
FILE *fp = fopen(ipFile, "r");
......@@ -272,6 +284,13 @@ static bool dnodeReadMnodeIpList() {
}
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");
if (!nodeIp || nodeName->type != cJSON_String || nodeName->valuestring == NULL) {
dError("failed to read mnode mgmtIpList.json, nodeName not found");
......@@ -296,7 +315,7 @@ PARSE_OVER:
return ret;
}
static void dnodeSaveMnodeIpList() {
static void dnodeSaveMnodeInfos() {
char ipFile[TSDB_FILENAME_LEN] = {0};
sprintf(ipFile, "%s/mgmtIpList.json", tsDnodeDir);
FILE *fp = fopen(ipFile, "w");
......@@ -314,6 +333,7 @@ static void dnodeSaveMnodeIpList() {
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, " \"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);
if (i < tsMnodeInfos.nodeNum -1) {
len += snprintf(content + len, maxLen - len, " },{\n");
......@@ -331,10 +351,10 @@ static void dnodeSaveMnodeIpList() {
}
uint32_t dnodeGetMnodeMasteIp() {
return tsMnodeIpList.ip[tsMnodeIpList.inUse];
return tsMnodeIpSet.ip[tsMnodeIpSet.inUse];
}
void* dnodeGetMnodeList() {
void* dnodeGetMnodeInfos() {
return &tsMnodeInfos;
}
......@@ -358,9 +378,9 @@ static void dnodeSendStatusMsg(void *handle, void *tmrId) {
return;
}
strcpy(pStatus->dnodeName, tsDnodeName);
//strcpy(pStatus->dnodeName, tsDnodeName);
pStatus->version = htonl(tsVersion);
pStatus->dnodeId = htonl(tsDnodeId);
pStatus->dnodeId = htonl(tsDnodeCfg.dnodeId);
pStatus->privateIp = htonl(inet_addr(tsPrivateIp));
pStatus->publicIp = htonl(inet_addr(tsPublicIp));
pStatus->lastReboot = htonl(tsRebootTime);
......@@ -382,47 +402,81 @@ static void dnodeSendStatusMsg(void *handle, void *tmrId) {
dnodeSendMsgToMnode(&rpcMsg);
}
static void dnodeReadDnodeInfo() {
char dnodeIdFile[TSDB_FILENAME_LEN] = {0};
sprintf(dnodeIdFile, "%s/dnodeId", tsDnodeDir);
static bool dnodeReadDnodeCfg() {
char dnodeCfgFile[TSDB_FILENAME_LEN] = {0};
sprintf(dnodeCfgFile, "%s/dnodeCfg.json", tsDnodeDir);
FILE *fp = fopen(dnodeIdFile, "r");
if (!fp) return;
FILE *fp = fopen(dnodeCfgFile, "r");
if (!fp) {
dTrace("failed to read dnodeCfg.json, file not exist");
return false;
}
char option[32] = {0};
int32_t value = 0;
int32_t num = 0;
bool ret = false;
int maxLen = 100;
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);
if (num != 2) return;
if (strcmp(option, "dnodeId") != 0) return;
tsDnodeId = value;;
cJSON* root = cJSON_Parse(content);
if (root == NULL) {
dError("failed to read dnodeCfg.json, invalid json format");
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);
dPrint("read dnodeId:%d successed", tsDnodeId);
return ret;
}
static void dnodeSaveDnodeInfo() {
char dnodeIdFile[TSDB_FILENAME_LEN] = {0};
sprintf(dnodeIdFile, "%s/dnodeId", tsDnodeDir);
static void dnodeSaveDnodeCfg() {
char dnodeCfgFile[TSDB_FILENAME_LEN] = {0};
sprintf(dnodeCfgFile, "%s/dnodeCfg.json", tsDnodeDir);
FILE *fp = fopen(dnodeIdFile, "w");
FILE *fp = fopen(dnodeCfgFile, "w");
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);
free(content);
dPrint("save dnodeId successed");
}
void dnodeUpdateDnodeInfo(int32_t dnodeId) {
if (tsDnodeId == 0) {
dPrint("dnodeId is set to %d", dnodeId);
tsDnodeId = dnodeId;
dnodeSaveDnodeInfo();
void dnodeUpdateDnodeCfg(SDMDnodeCfg *pCfg) {
if (tsDnodeCfg.dnodeId == 0) {
dPrint("dnodeId is set to %d", pCfg->dnodeId);
tsDnodeCfg.dnodeId = pCfg->dnodeId;
dnodeSaveDnodeCfg();
}
}
int32_t dnodeGetDnodeId() {
return tsDnodeId;
return tsDnodeCfg.dnodeId;
}
\ No newline at end of file
src/inc/dnode.h
浏览文件 @ 84c3955a
......@@ -43,7 +43,7 @@ void dnodeSendRpcWriteRsp(void *pVnode, void *param, int32_t code);
bool dnodeIsFirstDeploy();
uint32_t dnodeGetMnodeMasteIp();
void * dnodeGetMnodeList();
void * dnodeGetMnodeInfos();
int32_t dnodeGetDnodeId();
#ifdef __cplusplus
......
src/inc/taosmsg.h
浏览文件 @ 84c3955a
......@@ -521,12 +521,6 @@ typedef struct {
uint8_t reserved[5];
} SVnodeLoad;
typedef struct {
uint32_t vnode;
uint8_t accessState;
uint8_t reserved[3];
} SVnodeAccess;
/*
* NOTE: sizeof(SVnodeCfg) < TSDB_FILE_HEADER_LEN / 4
*/
......@@ -571,12 +565,30 @@ typedef struct {
char reserved[64];
} SVnodeStatisticInfo;
typedef struct {
int32_t vgId;
int8_t accessState;
} SDMVgroupAccess;
typedef struct {
int32_t dnodeId;
uint32_t moduleStatus;
uint32_t createdTime;
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 {
uint32_t version;
......@@ -596,22 +608,9 @@ typedef struct {
} SDMStatusMsg;
typedef struct {
int32_t nodeId;
uint32_t nodeIp;
uint16_t nodePort;
char nodeName[TSDB_NODE_NAME_LEN + 1];
} SDMNodeInfo;
typedef struct {
int8_t inUse;
int8_t nodeNum;
SDMNodeInfo nodeInfos[TSDB_MAX_MPEERS];
} SDMNodeInfos;
typedef struct {
SDMNodeInfos mnodes;
SDnodeState dnodeState;
SVnodeAccess vnodeAccess[];
SDMMnodeInfos mnodes;
SDMDnodeCfg dnodeCfg;
SDMVgroupAccess vgAccess[];
} SDMStatusRsp;
typedef struct {
......
src/inc/tsync.h
浏览文件 @ 84c3955a
......@@ -104,10 +104,10 @@ extern char *syncRole[];
extern int tsMaxSyncNum;
extern int tsSyncTcpThreads;
extern int tsMaxWatchFiles;
extern short tsSyncPort;
extern int tsSyncTimer;
extern int tsMaxFwdInfo;
extern int sDebugFlag;
extern uint16_t tsSyncPort;
#ifdef __cplusplus
}
......
src/mnode/inc/mgmtMnode.h
浏览文件 @ 84c3955a
......@@ -41,7 +41,7 @@ void mgmtReleaseMnode(struct SMnodeObj *pMnode);
char * mgmtGetMnodeRoleStr();
void mgmtGetMnodeIpList(SRpcIpSet *ipSet, bool usePublicIp);
void mgmtGetMnodeList(void *mnodes);
void mgmtGetMnodeInfos(void *mnodes);
#ifdef __cplusplus
}
......
src/mnode/src/mgmtDnode.c
浏览文件 @ 84c3955a
......@@ -68,7 +68,7 @@ static int32_t mgmtDnodeActionInsert(SSdbOper *pOper) {
pDnode->mnodeDnodePort = tsMnodeDnodePort;
pDnode->dnodeShellPort = tsDnodeShellPort;
pDnode->dnodeMnodePort = tsDnodeMnodePort;
pDnode->syncPort = 0;
pDnode->syncPort = tsSyncPort;
return TSDB_CODE_SUCCESS;
}
......@@ -346,19 +346,18 @@ void mgmtProcessDnodeStatusMsg(SRpcMsg *rpcMsg) {
mgmtReleaseDnode(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);
if (pRsp == NULL) {
mgmtSendSimpleResp(rpcMsg->handle, TSDB_CODE_SERV_OUT_OF_MEMORY);
return;
}
mgmtGetMnodeList(&pRsp->mnodes);
mgmtGetMnodeInfos(&pRsp->mnodes);
pRsp->dnodeState.dnodeId = htonl(pDnode->dnodeId);
pRsp->dnodeState.moduleStatus = htonl((int32_t)pDnode->isMgmt);
pRsp->dnodeState.createdTime = htonl(pDnode->createdTime / 1000);
pRsp->dnodeState.numOfVnodes = 0;
pRsp->dnodeCfg.dnodeId = htonl(pDnode->dnodeId);
pRsp->dnodeCfg.moduleStatus = htonl((int32_t)pDnode->isMgmt);
pRsp->dnodeCfg.numOfVnodes = 0;
contLen = sizeof(SDMStatusRsp);
......
src/mnode/src/mgmtMnode.c
浏览文件 @ 84c3955a
......@@ -195,8 +195,8 @@ void mgmtGetMnodeIpList(SRpcIpSet *ipSet, bool usePublicIp) {
}
}
void mgmtGetMnodeList(void *param) {
SDMNodeInfos *mnodes = param;
void mgmtGetMnodeInfos(void *param) {
SDMMnodeInfos *mnodes = param;
mnodes->inUse = 0;
int32_t index = 0;
......@@ -209,6 +209,7 @@ void mgmtGetMnodeList(void *param) {
mnodes->nodeInfos[index].nodeId = htonl(pMnode->mnodeId);
mnodes->nodeInfos[index].nodeIp = htonl(pMnode->pDnode->privateIp);
mnodes->nodeInfos[index].nodePort = htons(pMnode->pDnode->mnodeDnodePort);
mnodes->nodeInfos[index].syncPort = htons(pMnode->pDnode->syncPort);
strcpy(mnodes->nodeInfos[index].nodeName, pMnode->pDnode->dnodeName);
if (pMnode->role == TAOS_SYNC_ROLE_MASTER) {
mnodes->inUse = index;
......@@ -290,18 +291,18 @@ static int32_t mgmtGetMnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pCo
pSchema[cols].bytes = htons(pShow->bytes[cols]);
cols++;
pShow->bytes[cols] = 8;
pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
strcpy(pSchema[cols].name, "create time");
pSchema[cols].bytes = htons(pShow->bytes[cols]);
cols++;
pShow->bytes[cols] = 10;
pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
strcpy(pSchema[cols].name, "role");
pSchema[cols].bytes = htons(pShow->bytes[cols]);
cols++;
pShow->bytes[cols] = 8;
pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP;
strcpy(pSchema[cols].name, "create time");
pSchema[cols].bytes = htons(pShow->bytes[cols]);
cols++;
pMeta->numOfColumns = htons(cols);
pShow->numOfColumns = cols;
......@@ -346,11 +347,11 @@ static int32_t mgmtRetrieveMnodes(SShowObj *pShow, char *data, int32_t rows, voi
cols++;
pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
*(int64_t *)pWrite = pMnode->createdTime;
strcpy(pWrite, mgmtGetMnodeRoleStr(pMnode->role));
cols++;
pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
strcpy(pWrite, mgmtGetMnodeRoleStr(pMnode->role));
*(int64_t *)pWrite = pMnode->createdTime;
cols++;
numOfRows++;
......
src/mnode/src/mgmtSdb.c
浏览文件 @ 84c3955a
......@@ -146,7 +146,7 @@ static int32_t sdbInitWal() {
}
sdbTrace("open sdb wal for restore");
walRestore(tsSdbObj.wal, &tsSdbObj, sdbWrite);
walRestore(tsSdbObj.wal, NULL, sdbWrite);
return 0;
}
......@@ -174,12 +174,12 @@ void sdbUpdateMnodeRoles() {
SNodesRole roles = {0};
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) {
SMnodeObj *pMnode = mgmtGetMnode(roles.nodeId[i]);
if (pMnode != NULL) {
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);
}
}
......@@ -196,7 +196,7 @@ static int sdbGetWalInfo(void *ahandle, char *name, uint32_t *index) {
}
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) {
balanceReset();
......@@ -208,8 +208,8 @@ static void sdbNotifyRole(void *ahandle, int8_t role) {
static void sdbConfirmForward(void *ahandle, void *param, int32_t code) {
tsSdbObj.code = code;
sdbTrace("sdb forward request confirmed, result:%s", tstrerror(code));
sem_post(&tsSdbObj.sem);
mPrint("sdb forward request confirmed, result:%s", tstrerror(code));
}
static int32_t sdbForwardToPeer(void *pHead) {
......@@ -227,9 +227,9 @@ void sdbUpdateSync() {
SSyncCfg syncCfg = {0};
int32_t index = 0;
SDMNodeInfos *mnodes = dnodeGetMnodeList();
SDMMnodeInfos *mnodes = dnodeGetMnodeInfos();
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].nodeIp = node->nodeIp;
strcpy(syncCfg.nodeInfo[i].name, node->nodeName);
......@@ -271,9 +271,9 @@ void sdbUpdateSync() {
if (!hasThisDnode) 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) {
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);
}
......@@ -476,9 +476,13 @@ static int sdbWrite(void *param, void *data, int type) {
pthread_mutex_unlock(&tsSdbObj.mutex);
// 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) {
SSdbOper oper = {.rowSize = pHead->len, .rowData = pHead->cont, .table = pTable};
code = (*pTable->decodeFp)(&oper);
......@@ -529,7 +533,7 @@ int32_t sdbInsertRow(SSdbOper *pOper) {
(*pTable->encodeFp)(pOper);
pHead->len = pOper->rowSize;
int32_t code = sdbWrite(NULL, pHead, pHead->msgType);
int32_t code = sdbWrite(pOper, pHead, pHead->msgType);
taosFreeQitem(pHead);
if (code < 0) return code;
}
......@@ -571,7 +575,7 @@ int32_t sdbDeleteRow(SSdbOper *pOper) {
pHead->msgType = pTable->tableId * 10 + SDB_ACTION_DELETE;
memcpy(pHead->cont, pOper->pObj, rowSize);
int32_t code = sdbWrite(NULL, pHead, pHead->msgType);
int32_t code = sdbWrite(pOper, pHead, pHead->msgType);
taosFreeQitem(pHead);
if (code < 0) return code;
}
......@@ -602,7 +606,7 @@ int32_t sdbUpdateRow(SSdbOper *pOper) {
(*pTable->encodeFp)(pOper);
pHead->len = pOper->rowSize;
int32_t code = sdbWrite(NULL, pHead, pHead->msgType);
int32_t code = sdbWrite(pOper, pHead, pHead->msgType);
taosFreeQitem(pHead);
if (code < 0) return code;
}
......
src/vnode/src/vnodeMain.c
浏览文件 @ 84c3955a
......@@ -49,6 +49,7 @@ int syncForwardToPeer(tsync_h shandle, void *pHead, void *mhandle) { return
void syncStop(tsync_h shandle) {}
int syncReconfig(tsync_h shandle, const SSyncCfg * cfg) { return 0; }
int syncGetNodesRole(tsync_h shandle, SNodesRole * cfg) { return 0; }
void syncConfirmForward(tsync_h shandle, uint64_t version, int32_t code) {}
#endif
static void vnodeInit() {
......
tests/script/general/account/testSuite.sim
浏览文件 @ 84c3955a
run lite/account/pass_alter.sim
run lite/account/pass_len.sim
run lite/account/user_create.sim
run lite/account/user_len.sim
run lite/account/monitor.sim
\ No newline at end of file
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/testSuite.sim
浏览文件 @ 84c3955a
run lite/agg/fill.sim
run lite/agg/stream.sim
\ No newline at end of file
run general/agg/fill.sim
run general/agg/stream.sim
\ No newline at end of file
tests/script/general/alter/testSuite.sim
浏览文件 @ 84c3955a
run lite/alter/count.sim
run lite/alter/cached_schema_after_alter.sim
run lite/alter/import.sim
run lite/alter/insert1.sim
run lite/alter/insert2.sim
run lite/alter/metrics.sim
run lite/alter/table.sim
\ No newline at end of file
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/testSuite.sim
浏览文件 @ 84c3955a
run lite/cache/restart_table.sim
run lite/cache/restart_metrics.sim
run lite/cache/restart_stream.sim
run lite/cache/new_metrics.sim
run lite/cache/new_stream.sim
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/compress/testSuite.sim
浏览文件 @ 84c3955a
run lite/compress/compress.sim
run lite/compress/uncompress.sim
run lite/compress/commitlog.sim
run lite/compress/compress2.sim
run general/compress/compress.sim
run general/compress/uncompress.sim
run general/compress/commitlog.sim
run general/compress/compress2.sim
tests/script/general/compute/testSuite.sim
浏览文件 @ 84c3955a
run lite/compute/count.sim
run lite/compute/avg.sim
run lite/compute/sum.sim
run lite/compute/min.sim
run lite/compute/max.sim
run lite/compute/first.sim
run lite/compute/last.sim
run lite/compute/stddev.sim
run lite/compute/leastsquare.sim
run lite/compute/top.sim
run lite/compute/bottom.sim
run lite/compute/percentile.sim
run lite/compute/diff.sim
run lite/compute/interval.sim
run lite/compute/null.sim
run lite/compute/diff2.sim
run general/compute/count.sim
run general/compute/avg.sim
run general/compute/sum.sim
run general/compute/min.sim
run general/compute/max.sim
run general/compute/first.sim
run general/compute/last.sim
run general/compute/stddev.sim
run general/compute/leastsquare.sim
run general/compute/top.sim
run general/compute/bottom.sim
run general/compute/percentile.sim
run general/compute/diff.sim
run general/compute/interval.sim
run general/compute/null.sim
run general/compute/diff2.sim
tests/script/general/field/testSuite.sim
浏览文件 @ 84c3955a
run lite/field/single.sim
run lite/field/bool.sim
run lite/field/smallint.sim
run lite/field/tinyint.sim
run lite/field/int.sim
run lite/field/bigint.sim
run lite/field/float.sim
run lite/field/double.sim
run lite/field/binary.sim
run lite/field/2.sim
run lite/field/3.sim
run lite/field/4.sim
run lite/field/5.sim
run lite/field/6.sim
\ No newline at end of file
run general/field/single.sim
run general/field/bool.sim
run general/field/smallint.sim
run general/field/tinyint.sim
run general/field/int.sim
run general/field/bigint.sim
run general/field/float.sim
run general/field/double.sim
run general/field/binary.sim
run general/field/2.sim
run general/field/3.sim
run general/field/4.sim
run general/field/5.sim
run general/field/6.sim
\ No newline at end of file
tests/script/general/http/testSuite.sim
浏览文件 @ 84c3955a
run lite/http/grafana.sim
run lite/http/restful.sim
run lite/http/restful_full.sim
run lite/http/telegraf.sim
run lite/http/prepare.sim
run lite/http/grafana_bug.sim
#run lite/http/opentsdb.sim
run general/http/grafana.sim
run general/http/restful.sim
run general/http/restful_full.sim
run general/http/telegraf.sim
run general/http/prepare.sim
run general/http/grafana_bug.sim
#run general/http/opentsdb.sim
tests/script/general/import/testSuite.sim
浏览文件 @ 84c3955a
run lite/import/basic.sim
#run lite/import/commit.sim
run lite/import/large.sim
run lite/import/replica1.sim
run general/import/basic.sim
#run general/import/commit.sim
run general/import/large.sim
run general/import/replica1.sim
tests/script/general/metrics/testSuite.sim
浏览文件 @ 84c3955a
run lite/metrics/disk.sim
run lite/metrics/metrics.sim
run lite/metrics/values.sim
run lite/metrics/vnode3.sim
run general/metrics/disk.sim
run general/metrics/metrics.sim
run general/metrics/values.sim
run general/metrics/vnode3.sim
tests/script/general/parser/testSuite.sim
浏览文件 @ 84c3955a
run lite/parser/alter.sim
run general/parser/alter.sim
sleep 2000
run lite/parser/alter1.sim
run general/parser/alter1.sim
sleep 2000
run lite/parser/alter_stable.sim
run general/parser/alter_stable.sim
sleep 2000
run lite/parser/auto_create_tb.sim
run general/parser/auto_create_tb.sim
sleep 2000
run lite/parser/auto_create_tb_drop_tb.sim
run general/parser/auto_create_tb_drop_tb.sim
sleep 2000
run lite/parser/col_arithmetic_operation.sim
run general/parser/col_arithmetic_operation.sim
sleep 2000
run lite/parser/columnValue.sim
run general/parser/columnValue.sim
sleep 2000
run lite/parser/commit.sim
run lite/parser/create_db.sim
run general/parser/commit.sim
run general/parser/create_db.sim
sleep 2000
run lite/parser/create_mt.sim
run general/parser/create_mt.sim
sleep 2000
run lite/parser/create_tb.sim
run general/parser/create_tb.sim
sleep 2000
run lite/parser/dbtbnameValidate.sim
run general/parser/dbtbnameValidate.sim
sleep 2000
run lite/parser/fill.sim
run general/parser/fill.sim
sleep 2000
run lite/parser/fill_stb.sim
run general/parser/fill_stb.sim
sleep 2000
run lite/parser/first_last.sim
run general/parser/first_last.sim
sleep 2000
run lite/parser/import_commit1.sim
run general/parser/import_commit1.sim
sleep 2000
run lite/parser/import_commit2.sim
run general/parser/import_commit2.sim
sleep 2000
run lite/parser/import_commit3.sim
run general/parser/import_commit3.sim
sleep 2000
run lite/parser/import_file.sim
run general/parser/import_file.sim
sleep 2000
run lite/parser/insert_tb.sim
run general/parser/insert_tb.sim
sleep 2000
run lite/parser/tags_dynamically_specifiy.sim
run general/parser/tags_dynamically_specifiy.sim
sleep 2000
run lite/parser/interp.sim
run lite/parser/lastrow.sim
run general/parser/interp.sim
run general/parser/lastrow.sim
sleep 2000
run lite/parser/limit.sim
run general/parser/limit.sim
sleep 2000
run lite/parser/limit1.sim
run general/parser/limit1.sim
sleep 2000
run lite/parser/limit1_tblocks100.sim
run general/parser/limit1_tblocks100.sim
sleep 2000
run lite/parser/limit2.sim
run general/parser/limit2.sim
sleep 2000
run lite/parser/mixed_blocks.sim
run general/parser/mixed_blocks.sim
sleep 2000
run lite/parser/nchar.sim
run general/parser/nchar.sim
sleep 2000
run lite/parser/null_char.sim
run general/parser/null_char.sim
sleep 2000
run lite/parser/selectResNum.sim
run general/parser/selectResNum.sim
sleep 2000
run lite/parser/select_across_vnodes.sim
run general/parser/select_across_vnodes.sim
sleep 2000
run lite/parser/select_from_cache_disk.sim
run general/parser/select_from_cache_disk.sim
sleep 2000
run lite/parser/set_tag_vals.sim
run general/parser/set_tag_vals.sim
sleep 2000
run lite/parser/single_row_in_tb.sim
run general/parser/single_row_in_tb.sim
sleep 2000
run lite/parser/slimit.sim
run general/parser/slimit.sim
sleep 2000
run lite/parser/slimit1.sim
run general/parser/slimit1.sim
sleep 2000
run lite/parser/slimit_alter_tags.sim
run general/parser/slimit_alter_tags.sim
sleep 2000
run lite/parser/stream_on_sys.sim
run general/parser/stream_on_sys.sim
sleep 2000
run lite/parser/stream.sim
run general/parser/stream.sim
sleep 2000
run lite/parser/tbnameIn.sim
run general/parser/tbnameIn.sim
sleep 2000
run lite/parser/where.sim
run general/parser/where.sim
sleep 2000
#run lite/parser/repeatAlter.sim
#run general/parser/repeatAlter.sim
sleep 2000
#run lite/parser/repeatStream.sim
#run general/parser/repeatStream.sim
sleep 2000
run lite/parser/join.sim
run lite/parser/join_multivnode.sim
run lite/parser/projection_limit_offset.sim
run general/parser/join.sim
run general/parser/join_multivnode.sim
run general/parser/projection_limit_offset.sim
sleep 2000
run lite/parser/select_with_tags.sim
run lite/parser/groupby.sim
run general/parser/select_with_tags.sim
run general/parser/groupby.sim
tests/script/general/stream/testSuite.sim
浏览文件 @ 84c3955a
run lite/stream/stream_1.sim
run lite/stream/stream_2.sim
run lite/stream/stream_3.sim
run lite/stream/stream_restart.sim
run lite/stream/table_1.sim
run lite/stream/metrics_1.sim
run lite/stream/table_n.sim
run lite/stream/metrics_n.sim
run lite/stream/table_del.sim
run lite/stream/metrics_del.sim
run lite/stream/table_replica1_vnoden.sim
run lite/stream/metrics_replica1_vnoden.sim
\ No newline at end of file
run general/stream/stream_1.sim
run general/stream/stream_2.sim
run general/stream/stream_3.sim
run general/stream/stream_restart.sim
run general/stream/table_1.sim
run general/stream/metrics_1.sim
run general/stream/table_n.sim
run general/stream/metrics_n.sim
run general/stream/table_del.sim
run general/stream/metrics_del.sim
run general/stream/table_replica1_vnoden.sim
run general/stream/metrics_replica1_vnoden.sim
\ No newline at end of file
tests/script/general/tag/testSuite.sim
浏览文件 @ 84c3955a
run lite/tag/filter.sim
run lite/tag/column.sim
run lite/tag/bool.sim
run lite/tag/smallint.sim
run lite/tag/tinyint.sim
run lite/tag/int.sim
run lite/tag/bigint.sim
run lite/tag/float.sim
run lite/tag/double.sim
run lite/tag/binary.sim
run lite/tag/bool_int.sim
run lite/tag/bool_binary.sim
run lite/tag/int_float.sim
run lite/tag/int_binary.sim
run lite/tag/binary_binary.sim
run lite/tag/3.sim
run lite/tag/4.sim
run lite/tag/5.sim
run lite/tag/6.sim
run lite/tag/create.sim
run lite/tag/delete.sim
run lite/tag/change.sim
run lite/tag/set.sim
run lite/tag/add.sim
run lite/tag/commit.sim
\ No newline at end of file
run general/tag/filter.sim
run general/tag/column.sim
run general/tag/bool.sim
run general/tag/smallint.sim
run general/tag/tinyint.sim
run general/tag/int.sim
run general/tag/bigint.sim
run general/tag/float.sim
run general/tag/double.sim
run general/tag/binary.sim
run general/tag/bool_int.sim
run general/tag/bool_binary.sim
run general/tag/int_float.sim
run general/tag/int_binary.sim
run general/tag/binary_binary.sim
run general/tag/3.sim
run general/tag/4.sim
run general/tag/5.sim
run general/tag/6.sim
run general/tag/create.sim
run general/tag/delete.sim
run general/tag/change.sim
run general/tag/set.sim
run general/tag/add.sim
run general/tag/commit.sim
\ No newline at end of file
tests/script/general/vector/testSuite.sim
浏览文件 @ 84c3955a
run lite/vector/single.sim
run lite/vector/multi.sim
run lite/vector/table_query.sim
run lite/vector/table_time.sim
run lite/vector/table_field.sim
run lite/vector/table_mix.sim
run lite/vector/metrics_query.sim
run lite/vector/metrics_tag.sim
run lite/vector/metrics_time.sim
run lite/vector/metrics_field.sim
run lite/vector/metrics_mix.sim
run general/vector/single.sim
run general/vector/multi.sim
run general/vector/table_query.sim
run general/vector/table_time.sim
run general/vector/table_field.sim
run general/vector/table_mix.sim
run general/vector/metrics_query.sim
run general/vector/metrics_tag.sim
run general/vector/metrics_time.sim
run general/vector/metrics_field.sim
run general/vector/metrics_mix.sim
tests/script/sh/deploy.sh
浏览文件 @ 84c3955a
......@@ -93,7 +93,7 @@ echo "privateIp $NODE_IP" >> $TAOS_CFG
echo "dDebugFlag 199" >> $TAOS_CFG
echo "mDebugFlag 199" >> $TAOS_CFG
echo "sdbDebugFlag 199" >> $TAOS_CFG
echo "rpcDebugFlag 135" >> $TAOS_CFG
echo "rpcDebugFlag 131" >> $TAOS_CFG
echo "tmrDebugFlag 131" >> $TAOS_CFG
echo "cDebugFlag 135" >> $TAOS_CFG
echo "httpDebugFlag 131" >> $TAOS_CFG
......
tests/script/unique/account/testSuite.sim
浏览文件 @ 84c3955a
run cluster/account/account_create.sim
run cluster/account/account_len.sim
run cluster/account/pass_alter.sim
run cluster/account/pass_len.sim
run cluster/account/authority.sim
run cluster/account/account_delete.sim
run cluster/account/user_create.sim
run cluster/account/user_len.sim
run cluster/account/monitor.sim
run unique/account/account_create.sim
run unique/account/account_len.sim
run unique/account/pass_alter.sim
run unique/account/pass_len.sim
run unique/account/authority.sim
run unique/account/account_delete.sim
run unique/account/user_create.sim
run unique/account/user_len.sim
run unique/account/monitor.sim
tests/script/unique/big/testSuite.sim
浏览文件 @ 84c3955a
#run cluster/big/balance.sim
#run cluster/big/maxvnodes.sim
run cluster/big/tcp.sim
#run unique/big/balance.sim
#run unique/big/maxvnodes.sim
run unique/big/tcp.sim
tests/script/unique/cluster/testSuite.sim
浏览文件 @ 84c3955a
run cluster/cluster/balance1.sim
run cluster/cluster/balance2.sim
run cluster/cluster/balance3.sim
run cluster/cluster/balance1_bug.sim
run cluster/cluster/balance1_single.sim
\ No newline at end of file
run unique/unique/balance1.sim
run unique/unique/balance2.sim
run unique/unique/balance3.sim
run unique/unique/balance1_bug.sim
run unique/unique/balance1_single.sim
\ No newline at end of file
tests/script/unique/column/testSuite.sim
浏览文件 @ 84c3955a
run cluster/column/replica3.sim
run unique/column/replica3.sim
tests/script/unique/db/testSuite.sim
浏览文件 @ 84c3955a
#run cluster/db/commit.sim
run cluster/db/delete.sim
run cluster/db/replica_add12.sim
run cluster/db/replica_add13.sim
run cluster/db/replica_add23.sim
run cluster/db/replica_reduce21.sim
run cluster/db/replica_reduce32.sim
run cluster/db/replica_reduce31.sim
run cluster/db/replica_part.sim
run cluster/db/delete_part.sim
#run unique/db/commit.sim
run unique/db/delete.sim
run unique/db/replica_add12.sim
run unique/db/replica_add13.sim
run unique/db/replica_add23.sim
run unique/db/replica_reduce21.sim
run unique/db/replica_reduce32.sim
run unique/db/replica_reduce31.sim
run unique/db/replica_part.sim
run unique/db/delete_part.sim
tests/script/unique/dnode/testSuite.sim
浏览文件 @ 84c3955a
run cluster/dnode/balance1.sim
run cluster/dnode/balance2.sim
run cluster/dnode/balance3.sim
run cluster/dnode/balancex.sim
run cluster/dnode/offline1.sim
run cluster/dnode/offline2.sim
run cluster/dnode/remove1.sim
run cluster/dnode/remove2.sim
run cluster/dnode/vnode_clean.sim
run unique/dnode/balance1.sim
run unique/dnode/balance2.sim
run unique/dnode/balance3.sim
run unique/dnode/balancex.sim
run unique/dnode/offline1.sim
run unique/dnode/offline2.sim
run unique/dnode/remove1.sim
run unique/dnode/remove2.sim
run unique/dnode/vnode_clean.sim
......
tests/script/unique/http/testSuite.sim
浏览文件 @ 84c3955a
run cluster/http/admin.sim
\ No newline at end of file
run unique/http/admin.sim
\ No newline at end of file
tests/script/unique/import/testSuite.sim
浏览文件 @ 84c3955a
run cluster/import/replica2.sim
run cluster/import/replica3.sim
\ No newline at end of file
run unique/import/replica2.sim
run unique/import/replica3.sim
\ No newline at end of file
tests/script/unique/metrics/testSuite.sim
浏览文件 @ 84c3955a
run cluster/metrics/disk.sim
run cluster/metrics/metrics.sim
run cluster/metrics/values.sim
run cluster/metrics/vnode3.sim
\ No newline at end of file
run unique/metrics/disk.sim
run unique/metrics/metrics.sim
run unique/metrics/values.sim
run unique/metrics/vnode3.sim
\ No newline at end of file
tests/script/unique/mnode/mgmt22.sim
浏览文件 @ 84c3955a
......@@ -17,7 +17,7 @@ system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2
system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2
print ============== step1
system sh/exec.sh -n dnode1 -s start
system sh/exec_up.sh -n dnode1 -s start
sleep 3000
sql connect
......@@ -29,7 +29,7 @@ if $data3_192.168.0.1 != master then
endi
print ============== step2
system sh/exec.sh -n dnode2 -s start
system sh/exec_up.sh -n dnode2 -s start
sql create dnode 192.168.0.2
$x = 0
......@@ -57,7 +57,7 @@ sql drop dnode 192.168.0.1 -x error1
error1:
print ============== step4
system sh/exec.sh -n dnode1 -s stop
system sh/exec_up.sh -n dnode1 -s stop
sleep 8000
$x = 0
......@@ -105,7 +105,7 @@ system sh/deploy.sh -n dnode1 -m 192.168.0.2 -i 192.168.0.1
system sh/cfg.sh -n dnode1 -c numOfMPeers -v 2
system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.1
system sh/exec.sh -n dnode1 -s start
system sh/exec_up.sh -n dnode1 -s start
sql create dnode 192.168.0.1
sleep 5000
......@@ -128,7 +128,7 @@ if $data3_192.168.0.2 != master then
endi
print ============== step7
system sh/exec.sh -n dnode3 -s start
system sh/exec_up.sh -n dnode3 -s start
sql create dnode 192.168.0.3
sleep 5000
......
tests/script/unique/mnode/testSuite.sim
浏览文件 @ 84c3955a
run cluster/mnode/mgmt22.sim
run cluster/mnode/mgmt23.sim
run cluster/mnode/mgmt24.sim
run cluster/mnode/mgmt25.sim
run cluster/mnode/mgmt26.sim
run cluster/mnode/mgmt33.sim
run cluster/mnode/mgmt34.sim
run cluster/mnode/mgmtr1.sim
run cluster/mnode/mgmtr2.sim
run cluster/mnode/drop.sim
run cluster/mnode/reuse.sim
run cluster/mnode/secondIp.sim
run unique/mnode/mgmt22.sim
run unique/mnode/mgmt23.sim
run unique/mnode/mgmt24.sim
run unique/mnode/mgmt25.sim
run unique/mnode/mgmt26.sim
run unique/mnode/mgmt33.sim
run unique/mnode/mgmt34.sim
run unique/mnode/mgmtr1.sim
run unique/mnode/mgmtr2.sim
run unique/mnode/drop.sim
run unique/mnode/reuse.sim
run unique/mnode/secondIp.sim
tests/script/unique/stream/testSuite.sim
浏览文件 @ 84c3955a
run cluster/stream/table_replica1_dnode2.sim
run cluster/stream/metrics_replica1_dnode2.sim
run cluster/stream/table_replica2_dnode2.sim
run cluster/stream/metrics_replica2_dnode2.sim
run cluster/stream/table_replica2_dnode2_vnoden.sim
run cluster/stream/metrics_replica2_dnode2_vnoden.sim
run cluster/stream/table_replica2_dnode3.sim
run cluster/stream/metrics_replica2_dnode3.sim
run cluster/stream/table_replica3_dnode4.sim
run cluster/stream/metrics_replica3_dnode4.sim
run cluster/stream/table_vnode_stop.sim
run cluster/stream/metrics_vnode_stop.sim
#run cluster/stream/table_balance.sim
#run cluster/stream/metrics_balance.sim
#run cluster/stream/table_move.sim
\ No newline at end of file
run unique/stream/table_replica1_dnode2.sim
run unique/stream/metrics_replica1_dnode2.sim
run unique/stream/table_replica2_dnode2.sim
run unique/stream/metrics_replica2_dnode2.sim
run unique/stream/table_replica2_dnode2_vnoden.sim
run unique/stream/metrics_replica2_dnode2_vnoden.sim
run unique/stream/table_replica2_dnode3.sim
run unique/stream/metrics_replica2_dnode3.sim
run unique/stream/table_replica3_dnode4.sim
run unique/stream/metrics_replica3_dnode4.sim
run unique/stream/table_vnode_stop.sim
run unique/stream/metrics_vnode_stop.sim
#run unique/stream/table_balance.sim
#run unique/stream/metrics_balance.sim
#run unique/stream/table_move.sim
\ No newline at end of file
tests/script/unique/table/testSuite.sim
浏览文件 @ 84c3955a
run cluster/table/delete_part.sim
run unique/table/delete_part.sim
tests/script/unique/vnode/testSuite.sim
浏览文件 @ 84c3955a
run cluster/vnode/replica2_basic2.sim
run cluster/vnode/replica2_basic.sim
run cluster/vnode/replica2_repeat.sim
run cluster/vnode/replica3_basic.sim
run cluster/vnode/replica3_repeat.sim
run cluster/vnode/commit.sim
run cluster/vnode/many.sim
run unique/vnode/replica2_basic2.sim
run unique/vnode/replica2_basic.sim
run unique/vnode/replica2_repeat.sim
run unique/vnode/replica3_basic.sim
run unique/vnode/replica3_repeat.sim
run unique/vnode/commit.sim
run unique/vnode/many.sim
tests/script/uniqueSuite.sim 0 → 100644
浏览文件 @ 84c3955a
#################################
run unique/mnode/testSuite.sim
##################################
tests/test/c/importOneRow.c
浏览文件 @ 84c3955a
......@@ -66,9 +66,9 @@ void shellParseArgument(int argc, char *argv[]) {
}
}
uPrint("%s rowNum:%d %s", GREEN, rowNum, NC);
uPrint("%s threadNum:%d %s", GREEN, threadNum, NC);
uPrint("%s replica:%d %s", GREEN, replica, NC);
pPrint("%s rowNum:%d %s", GREEN, rowNum, NC);
pPrint("%s threadNum:%d %s", GREEN, threadNum, NC);
pPrint("%s replica:%d %s", GREEN, replica, NC);
}
int main(int argc, char *argv[]) {
......
tests/test/c/importPerTabe.c
浏览文件 @ 84c3955a
......@@ -61,7 +61,7 @@ int main(int argc, char *argv[]) {
}
void createDbAndTable() {
uPrint("start to create table");
pPrint("start to create table");
TAOS * con;
struct timeval systemTime;
......@@ -70,19 +70,19 @@ void createDbAndTable() {
con = taos_connect(tsMasterIp, tsDefaultUser, tsDefaultPass, NULL, 0);
if (con == NULL) {
uError("failed to connect to DB, reason:%s", taos_errstr(con));
pError("failed to connect to DB, reason:%s", taos_errstr(con));
exit(1);
}
sprintf(qstr, "create database if not exists %s cache %d tables %d", dbName, cache, tables);
if (taos_query(con, qstr)) {
uError("failed to create database:%s, code:%d reason:%s", dbName, taos_errno(con), taos_errstr(con));
pError("failed to create database:%s, code:%d reason:%s", dbName, taos_errno(con), taos_errstr(con));
exit(0);
}
sprintf(qstr, "use %s", dbName);
if (taos_query(con, qstr)) {
uError("failed to use db, code:%d reason:%s", taos_errno(con), taos_errstr(con));
pError("failed to use db, code:%d reason:%s", taos_errno(con), taos_errstr(con));
exit(0);
}
......@@ -98,14 +98,14 @@ void createDbAndTable() {
sprintf(qstr + len, ") tags(t int)");
if (taos_query(con, qstr)) {
uError("failed to create stable, code:%d reason:%s", taos_errno(con), taos_errstr(con));
pError("failed to create stable, code:%d reason:%s", taos_errno(con), taos_errstr(con));
exit(0);
}
for (int64_t t = 0; t < totalTables; ++t) {
sprintf(qstr, "create table if not exists %s%ld using %s tags(%ld)", stableName, t, stableName, t);
if (taos_query(con, qstr)) {
uError("failed to create table %s%d, reason:%s", stableName, t, taos_errstr(con));
pError("failed to create table %s%d, reason:%s", stableName, t, taos_errstr(con));
exit(0);
}
}
......@@ -118,7 +118,7 @@ void createDbAndTable() {
sprintf(qstr + len, ")");
if (taos_query(con, qstr)) {
uError("failed to create table %s%ld, reason:%s", stableName, t, taos_errstr(con));
pError("failed to create table %s%ld, reason:%s", stableName, t, taos_errstr(con));
exit(0);
}
}
......@@ -126,7 +126,7 @@ void createDbAndTable() {
gettimeofday(&systemTime, NULL);
et = systemTime.tv_sec * 1000000 + systemTime.tv_usec;
uPrint("%.1f seconds to create %ld tables", (et - st) / 1000.0 / 1000.0, totalTables);
pPrint("%.1f seconds to create %ld tables", (et - st) / 1000.0 / 1000.0, totalTables);
}
void insertData() {
......@@ -136,7 +136,7 @@ void insertData() {
gettimeofday(&systemTime, NULL);
st = systemTime.tv_sec * 1000000 + systemTime.tv_usec;
uPrint("%d threads are spawned to import data", numOfThreads);
pPrint("%d threads are spawned to import data", numOfThreads);
pthread_attr_t thattr;
pthread_attr_init(&thattr);
......@@ -170,12 +170,12 @@ void insertData() {
double speedOfRows = totalRows / seconds;
double speedOfPoints = totalPoints / seconds;
uPrint(
pPrint(
"%sall threads:%ld finished, use %.1lf seconds, tables:%.ld rows:%ld points:%ld, speed RowsPerSecond:%.1lf "
"PointsPerSecond:%.1lf%s",
GREEN, numOfThreads, seconds, totalTables, totalRows, totalPoints, speedOfRows, speedOfPoints, NC);
uPrint("threads exit");
pPrint("threads exit");
pthread_attr_destroy(&thattr);
free(pInfo);
......@@ -189,11 +189,11 @@ void *syncTest(void *param) {
char qstr[65000];
int maxBytes = 60000;
uPrint("thread:%d, start to run", pInfo->threadIndex);
pPrint("thread:%d, start to run", pInfo->threadIndex);
con = taos_connect(tsMasterIp, tsDefaultUser, tsDefaultPass, NULL, 0);
if (con == NULL) {
uError("index:%d, failed to connect to DB, reason:%s", pInfo->threadIndex, taos_errstr(con));
pError("index:%d, failed to connect to DB, reason:%s", pInfo->threadIndex, taos_errstr(con));
exit(1);
}
......@@ -221,7 +221,7 @@ void *syncTest(void *param) {
len += sprintf(sql + len, ")");
if (len > maxBytes) {
if (taos_query(con, qstr)) {
uError("thread:%d, failed to import table:%s%ld row:%ld, reason:%s", pInfo->threadIndex, pInfo->stableName,
pError("thread:%d, failed to import table:%s%ld row:%ld, reason:%s", pInfo->threadIndex, pInfo->stableName,
table, row, taos_errstr(con));
}
......@@ -245,7 +245,7 @@ void *syncTest(void *param) {
int64_t totalTables = pInfo->tableEndIndex - pInfo->tableBeginIndex;
int64_t totalRows = totalTables * pInfo->rowsPerTable;
int64_t totalPoints = totalRows * pInfo->pointsPerTable;
uPrint("thread:%d, import finished, use %.2f seconds, tables:%ld rows:%ld points:%ld", pInfo->threadIndex,
pPrint("thread:%d, import finished, use %.2f seconds, tables:%ld rows:%ld points:%ld", pInfo->threadIndex,
(et - st) / 1000.0 / 1000.0, totalTables, totalRows, totalPoints);
return NULL;
......@@ -310,13 +310,13 @@ void shellParseArgument(int argc, char *argv[]) {
}
}
uPrint("%srowsPerTable:%" PRId64 "%s", GREEN, rowsPerTable, NC);
uPrint("%spointsPerTable:%" PRId64 "%s", GREEN, pointsPerTable, NC);
uPrint("%snumOfThreads:%" PRId64 "%s", GREEN, numOfThreads, NC);
uPrint("%snumOfTablesPerThread:%" PRId64 "%s", GREEN, numOfTablesPerThread, NC);
uPrint("%scache:%" PRId64 "%s", GREEN, cache, NC);
uPrint("%stables:%" PRId64 "%s", GREEN, tables, NC);
uPrint("%sdbName:%s%s", GREEN, dbName, NC);
uPrint("%stableName:%s%s", GREEN, stableName, NC);
uPrint("%sstart to run%s", GREEN, NC);
pPrint("%srowsPerTable:%" PRId64 "%s", GREEN, rowsPerTable, NC);
pPrint("%spointsPerTable:%" PRId64 "%s", GREEN, pointsPerTable, NC);
pPrint("%snumOfThreads:%" PRId64 "%s", GREEN, numOfThreads, NC);
pPrint("%snumOfTablesPerThread:%" PRId64 "%s", GREEN, numOfTablesPerThread, NC);
pPrint("%scache:%" PRId64 "%s", GREEN, cache, NC);
pPrint("%stables:%" PRId64 "%s", GREEN, tables, NC);
pPrint("%sdbName:%s%s", GREEN, dbName, NC);
pPrint("%stableName:%s%s", GREEN, stableName, NC);
pPrint("%sstart to run%s", GREEN, NC);
}
tests/test/c/insertPerRow.c
浏览文件 @ 84c3955a
......@@ -61,7 +61,7 @@ int main(int argc, char *argv[]) {
}
void createDbAndTable() {
uPrint("start to create table");
pPrint("start to create table");
TAOS * con;
struct timeval systemTime;
......@@ -70,19 +70,19 @@ void createDbAndTable() {
con = taos_connect(tsMasterIp, tsDefaultUser, tsDefaultPass, NULL, 0);
if (con == NULL) {
uError("failed to connect to DB, reason:%s", taos_errstr(con));
pError("failed to connect to DB, reason:%s", taos_errstr(con));
exit(1);
}
sprintf(qstr, "create database if not exists %s cache %d tables %d", dbName, cache, tables);
if (taos_query(con, qstr)) {
uError("failed to create database:%s, code:%d reason:%s", dbName, taos_errno(con), taos_errstr(con));
pError("failed to create database:%s, code:%d reason:%s", dbName, taos_errno(con), taos_errstr(con));
exit(0);
}
sprintf(qstr, "use %s", dbName);
if (taos_query(con, qstr)) {
uError("failed to use db, code:%d reason:%s", taos_errno(con), taos_errstr(con));
pError("failed to use db, code:%d reason:%s", taos_errno(con), taos_errstr(con));
exit(0);
}
......@@ -98,14 +98,14 @@ void createDbAndTable() {
sprintf(qstr + len, ") tags(t int)");
if (taos_query(con, qstr)) {
uError("failed to create stable, code:%d reason:%s", taos_errno(con), taos_errstr(con));
pError("failed to create stable, code:%d reason:%s", taos_errno(con), taos_errstr(con));
exit(0);
}
for (int64_t t = 0; t < totalTables; ++t) {
sprintf(qstr, "create table if not exists %s%ld using %s tags(%ld)", stableName, t, stableName, t);
if (taos_query(con, qstr)) {
uError("failed to create table %s%d, reason:%s", stableName, t, taos_errstr(con));
pError("failed to create table %s%d, reason:%s", stableName, t, taos_errstr(con));
exit(0);
}
}
......@@ -118,7 +118,7 @@ void createDbAndTable() {
sprintf(qstr + len, ")");
if (taos_query(con, qstr)) {
uError("failed to create table %s%ld, reason:%s", stableName, t, taos_errstr(con));
pError("failed to create table %s%ld, reason:%s", stableName, t, taos_errstr(con));
exit(0);
}
}
......@@ -126,7 +126,7 @@ void createDbAndTable() {
gettimeofday(&systemTime, NULL);
et = systemTime.tv_sec * 1000000 + systemTime.tv_usec;
uPrint("%.1f seconds to create %ld tables", (et - st) / 1000.0 / 1000.0, totalTables);
pPrint("%.1f seconds to create %ld tables", (et - st) / 1000.0 / 1000.0, totalTables);
}
void insertData() {
......@@ -136,7 +136,7 @@ void insertData() {
gettimeofday(&systemTime, NULL);
st = systemTime.tv_sec * 1000000 + systemTime.tv_usec;
uPrint("%d threads are spawned to insert data", numOfThreads);
pPrint("%d threads are spawned to insert data", numOfThreads);
pthread_attr_t thattr;
pthread_attr_init(&thattr);
......@@ -170,12 +170,12 @@ void insertData() {
double speedOfRows = totalRows / seconds;
double speedOfPoints = totalPoints / seconds;
uPrint(
pPrint(
"%sall threads:%ld finished, use %.1lf seconds, tables:%.ld rows:%ld points:%ld, speed RowsPerSecond:%.1lf "
"PointsPerSecond:%.1lf%s",
GREEN, numOfThreads, seconds, totalTables, totalRows, totalPoints, speedOfRows, speedOfPoints, NC);
uPrint("threads exit");
pPrint("threads exit");
pthread_attr_destroy(&thattr);
free(pInfo);
......@@ -189,11 +189,11 @@ void *syncTest(void *param) {
char qstr[65000];
int maxBytes = 60000;
uPrint("thread:%d, start to run", pInfo->threadIndex);
pPrint("thread:%d, start to run", pInfo->threadIndex);
con = taos_connect(tsMasterIp, tsDefaultUser, tsDefaultPass, NULL, 0);
if (con == NULL) {
uError("index:%d, failed to connect to DB, reason:%s", pInfo->threadIndex, taos_errstr(con));
pError("index:%d, failed to connect to DB, reason:%s", pInfo->threadIndex, taos_errstr(con));
exit(1);
}
......@@ -221,7 +221,7 @@ void *syncTest(void *param) {
len += sprintf(sql + len, ")");
if (len > maxBytes) {
if (taos_query(con, qstr)) {
uError("thread:%d, failed to insert table:%s%ld row:%ld, reason:%s", pInfo->threadIndex, pInfo->stableName,
pError("thread:%d, failed to insert table:%s%ld row:%ld, reason:%s", pInfo->threadIndex, pInfo->stableName,
table, row, taos_errstr(con));
}
......@@ -240,7 +240,7 @@ void *syncTest(void *param) {
int64_t totalTables = pInfo->tableEndIndex - pInfo->tableBeginIndex;
int64_t totalRows = totalTables * pInfo->rowsPerTable;
int64_t totalPoints = totalRows * pInfo->pointsPerTable;
uPrint("thread:%d, insert finished, use %.2f seconds, tables:%ld rows:%ld points:%ld", pInfo->threadIndex,
pPrint("thread:%d, insert finished, use %.2f seconds, tables:%ld rows:%ld points:%ld", pInfo->threadIndex,
(et - st) / 1000.0 / 1000.0, totalTables, totalRows, totalPoints);
return NULL;
......@@ -305,13 +305,13 @@ void shellParseArgument(int argc, char *argv[]) {
}
}
uPrint("%srowsPerTable:%" PRId64 "%s", GREEN, rowsPerTable, NC);
uPrint("%spointsPerTable:%" PRId64 "%s", GREEN, pointsPerTable, NC);
uPrint("%snumOfThreads:%" PRId64 "%s", GREEN, numOfThreads, NC);
uPrint("%snumOfTablesPerThread:%" PRId64 "%s", GREEN, numOfTablesPerThread, NC);
uPrint("%scache:%" PRId64 "%s", GREEN, cache, NC);
uPrint("%stables:%" PRId64 "%s", GREEN, tables, NC);
uPrint("%sdbName:%s%s", GREEN, dbName, NC);
uPrint("%stableName:%s%s", GREEN, stableName, NC);
uPrint("%sstart to run%s", GREEN, NC);
pPrint("%srowsPerTable:%" PRId64 "%s", GREEN, rowsPerTable, NC);
pPrint("%spointsPerTable:%" PRId64 "%s", GREEN, pointsPerTable, NC);
pPrint("%snumOfThreads:%" PRId64 "%s", GREEN, numOfThreads, NC);
pPrint("%snumOfTablesPerThread:%" PRId64 "%s", GREEN, numOfTablesPerThread, NC);
pPrint("%scache:%" PRId64 "%s", GREEN, cache, NC);
pPrint("%stables:%" PRId64 "%s", GREEN, tables, NC);
pPrint("%sdbName:%s%s", GREEN, dbName, NC);
pPrint("%stableName:%s%s", GREEN, stableName, NC);
pPrint("%sstart to run%s", GREEN, NC);
}
tests/test/c/insertPerTable.c
浏览文件 @ 84c3955a
......@@ -61,7 +61,7 @@ int main(int argc, char *argv[]) {
}
void createDbAndTable() {
uPrint("start to create table");
pPrint("start to create table");
TAOS * con;
struct timeval systemTime;
......@@ -70,19 +70,19 @@ void createDbAndTable() {
con = taos_connect(tsMasterIp, tsDefaultUser, tsDefaultPass, NULL, 0);
if (con == NULL) {
uError("failed to connect to DB, reason:%s", taos_errstr(con));
pError("failed to connect to DB, reason:%s", taos_errstr(con));
exit(1);
}
sprintf(qstr, "create database if not exists %s cache %d tables %d", dbName, cache, tables);
if (taos_query(con, qstr)) {
uError("failed to create database:%s, code:%d reason:%s", dbName, taos_errno(con), taos_errstr(con));
pError("failed to create database:%s, code:%d reason:%s", dbName, taos_errno(con), taos_errstr(con));
exit(0);
}
sprintf(qstr, "use %s", dbName);
if (taos_query(con, qstr)) {
uError("failed to use db, code:%d reason:%s", taos_errno(con), taos_errstr(con));
pError("failed to use db, code:%d reason:%s", taos_errno(con), taos_errstr(con));
exit(0);
}
......@@ -98,14 +98,14 @@ void createDbAndTable() {
sprintf(qstr + len, ") tags(t int)");
if (taos_query(con, qstr)) {
uError("failed to create stable, code:%d reason:%s", taos_errno(con), taos_errstr(con));
pError("failed to create stable, code:%d reason:%s", taos_errno(con), taos_errstr(con));
exit(0);
}
for (int64_t t = 0; t < totalTables; ++t) {
sprintf(qstr, "create table if not exists %s%ld using %s tags(%ld)", stableName, t, stableName, t);
if (taos_query(con, qstr)) {
uError("failed to create table %s%d, reason:%s", stableName, t, taos_errstr(con));
pError("failed to create table %s%d, reason:%s", stableName, t, taos_errstr(con));
exit(0);
}
}
......@@ -118,7 +118,7 @@ void createDbAndTable() {
sprintf(qstr + len, ")");
if (taos_query(con, qstr)) {
uError("failed to create table %s%ld, reason:%s", stableName, t, taos_errstr(con));
pError("failed to create table %s%ld, reason:%s", stableName, t, taos_errstr(con));
exit(0);
}
}
......@@ -126,7 +126,7 @@ void createDbAndTable() {
gettimeofday(&systemTime, NULL);
et = systemTime.tv_sec * 1000000 + systemTime.tv_usec;
uPrint("%.1f seconds to create %ld tables", (et - st) / 1000.0 / 1000.0, totalTables);
pPrint("%.1f seconds to create %ld tables", (et - st) / 1000.0 / 1000.0, totalTables);
}
void insertData() {
......@@ -136,7 +136,7 @@ void insertData() {
gettimeofday(&systemTime, NULL);
st = systemTime.tv_sec * 1000000 + systemTime.tv_usec;
uPrint("%d threads are spawned to insert data", numOfThreads);
pPrint("%d threads are spawned to insert data", numOfThreads);
pthread_attr_t thattr;
pthread_attr_init(&thattr);
......@@ -170,12 +170,12 @@ void insertData() {
double speedOfRows = totalRows / seconds;
double speedOfPoints = totalPoints / seconds;
uPrint(
pPrint(
"%sall threads:%ld finished, use %.1lf seconds, tables:%.ld rows:%ld points:%ld, speed RowsPerSecond:%.1lf "
"PointsPerSecond:%.1lf%s",
GREEN, numOfThreads, seconds, totalTables, totalRows, totalPoints, speedOfRows, speedOfPoints, NC);
uPrint("threads exit");
pPrint("threads exit");
pthread_attr_destroy(&thattr);
free(pInfo);
......@@ -189,11 +189,11 @@ void *syncTest(void *param) {
char qstr[65000];
int maxBytes = 60000;
uPrint("thread:%d, start to run", pInfo->threadIndex);
pPrint("thread:%d, start to run", pInfo->threadIndex);
con = taos_connect(tsMasterIp, tsDefaultUser, tsDefaultPass, NULL, 0);
if (con == NULL) {
uError("index:%d, failed to connect to DB, reason:%s", pInfo->threadIndex, taos_errstr(con));
pError("index:%d, failed to connect to DB, reason:%s", pInfo->threadIndex, taos_errstr(con));
exit(1);
}
......@@ -221,7 +221,7 @@ void *syncTest(void *param) {
len += sprintf(sql + len, ")");
if (len > maxBytes) {
if (taos_query(con, qstr)) {
uError("thread:%d, failed to insert table:%s%ld row:%ld, reason:%s", pInfo->threadIndex, pInfo->stableName,
pError("thread:%d, failed to insert table:%s%ld row:%ld, reason:%s", pInfo->threadIndex, pInfo->stableName,
table, row, taos_errstr(con));
}
......@@ -245,7 +245,7 @@ void *syncTest(void *param) {
int64_t totalTables = pInfo->tableEndIndex - pInfo->tableBeginIndex;
int64_t totalRows = totalTables * pInfo->rowsPerTable;
int64_t totalPoints = totalRows * pInfo->pointsPerTable;
uPrint("thread:%d, insert finished, use %.2f seconds, tables:%ld rows:%ld points:%ld", pInfo->threadIndex,
pPrint("thread:%d, insert finished, use %.2f seconds, tables:%ld rows:%ld points:%ld", pInfo->threadIndex,
(et - st) / 1000.0 / 1000.0, totalTables, totalRows, totalPoints);
return NULL;
......@@ -310,13 +310,13 @@ void shellParseArgument(int argc, char *argv[]) {
}
}
uPrint("%srowsPerTable:%" PRId64 "%s", GREEN, rowsPerTable, NC);
uPrint("%spointsPerTable:%" PRId64 "%s", GREEN, pointsPerTable, NC);
uPrint("%snumOfThreads:%" PRId64 "%s", GREEN, numOfThreads, NC);
uPrint("%snumOfTablesPerThread:%" PRId64 "%s", GREEN, numOfTablesPerThread, NC);
uPrint("%scache:%" PRId64 "%s", GREEN, cache, NC);
uPrint("%stables:%" PRId64 "%s", GREEN, tables, NC);
uPrint("%sdbName:%s%s", GREEN, dbName, NC);
uPrint("%stableName:%s%s", GREEN, stableName, NC);
uPrint("%sstart to run%s", GREEN, NC);
pPrint("%srowsPerTable:%" PRId64 "%s", GREEN, rowsPerTable, NC);
pPrint("%spointsPerTable:%" PRId64 "%s", GREEN, pointsPerTable, NC);
pPrint("%snumOfThreads:%" PRId64 "%s", GREEN, numOfThreads, NC);
pPrint("%snumOfTablesPerThread:%" PRId64 "%s", GREEN, numOfTablesPerThread, NC);
pPrint("%scache:%" PRId64 "%s", GREEN, cache, NC);
pPrint("%stables:%" PRId64 "%s", GREEN, tables, NC);
pPrint("%sdbName:%s%s", GREEN, dbName, NC);
pPrint("%stableName:%s%s", GREEN, stableName, NC);
pPrint("%sstart to run%s", GREEN, NC);
}
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或