提交 02713123 编写于 作者: H Hongze Cheng

make min diff with develop

上级 2b44c08f
...@@ -124,11 +124,11 @@ void taos_init_imp(void) { ...@@ -124,11 +124,11 @@ void taos_init_imp(void) {
} }
tscTmr = taosTmrInit(tsMaxConnections * 2, 200, 60000, "TSC"); tscTmr = taosTmrInit(tsMaxConnections * 2, 200, 60000, "TSC");
if (0 == tscEmbedded) { if(0 == tscEmbedded){
taosTmrReset(tscCheckDiskUsage, 10, NULL, tscTmr, &tscCheckDiskUsageTmr); taosTmrReset(tscCheckDiskUsage, 10, NULL, tscTmr, &tscCheckDiskUsageTmr);
} }
int64_t refreshTime = 10; // 10 seconds by default int64_t refreshTime = 10; // 10 seconds by default
if (tscMetaCache == NULL) { if (tscMetaCache == NULL) {
tscMetaCache = taosCacheInit(TSDB_DATA_TYPE_BINARY, refreshTime, false, tscFreeTableMetaHelper, "tableMeta"); tscMetaCache = taosCacheInit(TSDB_DATA_TYPE_BINARY, refreshTime, false, tscFreeTableMetaHelper, "tableMeta");
tscObjRef = taosOpenRef(40960, tscFreeRegisteredSqlObj); tscObjRef = taosOpenRef(40960, tscFreeRegisteredSqlObj);
......
...@@ -30,4 +30,4 @@ void dnodeSendStartupStep(SRpcMsg *pMsg); ...@@ -30,4 +30,4 @@ void dnodeSendStartupStep(SRpcMsg *pMsg);
} }
#endif #endif
#endif #endif
\ No newline at end of file
...@@ -29,4 +29,4 @@ void dnodeDispatchToVMgmtQueue(SRpcMsg *rpcMsg); ...@@ -29,4 +29,4 @@ void dnodeDispatchToVMgmtQueue(SRpcMsg *rpcMsg);
} }
#endif #endif
#endif #endif
\ No newline at end of file
...@@ -31,4 +31,4 @@ void dnodeSendStatusMsgToMnode(); ...@@ -31,4 +31,4 @@ void dnodeSendStatusMsgToMnode();
} }
#endif #endif
#endif #endif
\ No newline at end of file
...@@ -305,7 +305,7 @@ void dnodeSendRedirectMsg(SRpcMsg *rpcMsg, bool forShell) { ...@@ -305,7 +305,7 @@ void dnodeSendRedirectMsg(SRpcMsg *rpcMsg, bool forShell) {
} else { } else {
dnodeGetEpSetForPeer(&epSet); dnodeGetEpSetForPeer(&epSet);
} }
dDebug("msg:%s will be redirected, dnodeIp:%s user:%s, numOfEps:%d inUse:%d", taosMsg[rpcMsg->msgType], dDebug("msg:%s will be redirected, dnodeIp:%s user:%s, numOfEps:%d inUse:%d", taosMsg[rpcMsg->msgType],
taosIpStr(connInfo.clientIp), connInfo.user, epSet.numOfEps, epSet.inUse); taosIpStr(connInfo.clientIp), connInfo.user, epSet.numOfEps, epSet.inUse);
...@@ -323,4 +323,4 @@ void dnodeSendRedirectMsg(SRpcMsg *rpcMsg, bool forShell) { ...@@ -323,4 +323,4 @@ void dnodeSendRedirectMsg(SRpcMsg *rpcMsg, bool forShell) {
} }
rpcSendRedirectRsp(rpcMsg->handle, &epSet); rpcSendRedirectRsp(rpcMsg->handle, &epSet);
} }
\ No newline at end of file
...@@ -231,4 +231,4 @@ SStatisInfo dnodeGetStatisInfo() { ...@@ -231,4 +231,4 @@ SStatisInfo dnodeGetStatisInfo() {
} }
return info; return info;
} }
\ No newline at end of file
...@@ -71,4 +71,4 @@ int32_t dnodeStepInit(SStep *pSteps, int32_t stepSize) { ...@@ -71,4 +71,4 @@ int32_t dnodeStepInit(SStep *pSteps, int32_t stepSize) {
void dnodeStepCleanup(SStep *pSteps, int32_t stepSize) { void dnodeStepCleanup(SStep *pSteps, int32_t stepSize) {
return taosStepCleanupImp(pSteps, stepSize - 1); return taosStepCleanupImp(pSteps, stepSize - 1);
} }
\ No newline at end of file
...@@ -271,7 +271,7 @@ static void dnodeSendStatusMsg(void *handle, void *tmrId) { ...@@ -271,7 +271,7 @@ static void dnodeSendStatusMsg(void *handle, void *tmrId) {
vnodeBuildStatusMsg(pStatus); vnodeBuildStatusMsg(pStatus);
contLen = sizeof(SStatusMsg) + pStatus->openVnodes * sizeof(SVnodeLoad); contLen = sizeof(SStatusMsg) + pStatus->openVnodes * sizeof(SVnodeLoad);
pStatus->openVnodes = htons(pStatus->openVnodes); pStatus->openVnodes = htons(pStatus->openVnodes);
SRpcMsg rpcMsg = { SRpcMsg rpcMsg = {
.pCont = pStatus, .pCont = pStatus,
.contLen = contLen, .contLen = contLen,
...@@ -288,4 +288,4 @@ void dnodeSendStatusMsgToMnode() { ...@@ -288,4 +288,4 @@ void dnodeSendStatusMsgToMnode() {
dInfo("force send status msg to mnode"); dInfo("force send status msg to mnode");
taosTmrReset(dnodeSendStatusMsg, 3, NULL, tsDnodeTmr, &tsStatusTimer); taosTmrReset(dnodeSendStatusMsg, 3, NULL, tsDnodeTmr, &tsStatusTimer);
} }
} }
\ No newline at end of file
...@@ -89,4 +89,4 @@ int32_t vnodeProcessRead(void *pVnode, SVReadMsg *pRead); ...@@ -89,4 +89,4 @@ int32_t vnodeProcessRead(void *pVnode, SVReadMsg *pRead);
} }
#endif #endif
#endif #endif
\ No newline at end of file
...@@ -35,4 +35,4 @@ void vnodeDestroy(SVnodeObj *pVnode); ...@@ -35,4 +35,4 @@ void vnodeDestroy(SVnodeObj *pVnode);
} }
#endif #endif
#endif #endif
\ No newline at end of file
...@@ -44,4 +44,4 @@ bool vnodeInResetStatus(SVnodeObj* pVnode); ...@@ -44,4 +44,4 @@ bool vnodeInResetStatus(SVnodeObj* pVnode);
} }
#endif #endif
#endif #endif
\ No newline at end of file
...@@ -36,4 +36,4 @@ void vnodeConfirmForward(void *pVnode, uint64_t version, int32_t code); ...@@ -36,4 +36,4 @@ void vnodeConfirmForward(void *pVnode, uint64_t version, int32_t code);
} }
#endif #endif
#endif #endif
\ No newline at end of file
...@@ -30,4 +30,4 @@ int32_t vnodeDestroyInMWorker(SVnodeObj *pVnode); ...@@ -30,4 +30,4 @@ int32_t vnodeDestroyInMWorker(SVnodeObj *pVnode);
} }
#endif #endif
#endif #endif
\ No newline at end of file
...@@ -32,4 +32,4 @@ int32_t vnodeProcessWrite(void *pVnode, void *pHead, int32_t qtype, void *pRspRe ...@@ -32,4 +32,4 @@ int32_t vnodeProcessWrite(void *pVnode, void *pHead, int32_t qtype, void *pRspRe
} }
#endif #endif
#endif #endif
\ No newline at end of file
...@@ -194,4 +194,4 @@ void vnodeSetAccess(SVgroupAccess *pAccess, int32_t numOfVnodes) { ...@@ -194,4 +194,4 @@ void vnodeSetAccess(SVgroupAccess *pAccess, int32_t numOfVnodes) {
vnodeRelease(pVnode); vnodeRelease(pVnode);
} }
} }
} }
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册