From 027131231c98c0603b2ea69c00a8252ebc8e4184 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Thu, 31 Dec 2020 03:18:42 +0000
Subject: [PATCH] make min diff with develop

---
 src/client/src/tscSystem.c  | 6 +++---
 src/dnode/inc/dnodeStep.h   | 2 +-
 src/dnode/inc/dnodeVMgmt.h  | 2 +-
 src/dnode/inc/dnodeVnodes.h | 2 +-
 src/dnode/src/dnodeMInfos.c | 4 ++--
 src/dnode/src/dnodeShell.c  | 2 +-
 src/dnode/src/dnodeStep.c   | 2 +-
 src/dnode/src/dnodeVnodes.c | 4 ++--
 src/inc/vnode.h             | 2 +-
 src/vnode/inc/vnodeMain.h   | 2 +-
 src/vnode/inc/vnodeStatus.h | 2 +-
 src/vnode/inc/vnodeSync.h   | 2 +-
 src/vnode/inc/vnodeWorker.h | 2 +-
 src/vnode/inc/vnodeWrite.h  | 2 +-
 src/vnode/src/vnodeMgmt.c   | 2 +-
 15 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/client/src/tscSystem.c b/src/client/src/tscSystem.c
index 9dee3ee347..d4072f43d6 100644
--- a/src/client/src/tscSystem.c
+++ b/src/client/src/tscSystem.c
@@ -124,11 +124,11 @@ void taos_init_imp(void) {
   }
 
   tscTmr = taosTmrInit(tsMaxConnections * 2, 200, 60000, "TSC");
-  if (0 == tscEmbedded) {
-    taosTmrReset(tscCheckDiskUsage, 10, NULL, tscTmr, &tscCheckDiskUsageTmr);
+  if(0 == tscEmbedded){
+    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) {
     tscMetaCache = taosCacheInit(TSDB_DATA_TYPE_BINARY, refreshTime, false, tscFreeTableMetaHelper, "tableMeta");
     tscObjRef  = taosOpenRef(40960, tscFreeRegisteredSqlObj);
diff --git a/src/dnode/inc/dnodeStep.h b/src/dnode/inc/dnodeStep.h
index 8b1065dfd8..e181e19c46 100644
--- a/src/dnode/inc/dnodeStep.h
+++ b/src/dnode/inc/dnodeStep.h
@@ -30,4 +30,4 @@ void    dnodeSendStartupStep(SRpcMsg *pMsg);
 }
 #endif
 
-#endif
+#endif
\ No newline at end of file
diff --git a/src/dnode/inc/dnodeVMgmt.h b/src/dnode/inc/dnodeVMgmt.h
index 9421a78924..821196defc 100644
--- a/src/dnode/inc/dnodeVMgmt.h
+++ b/src/dnode/inc/dnodeVMgmt.h
@@ -29,4 +29,4 @@ void    dnodeDispatchToVMgmtQueue(SRpcMsg *rpcMsg);
 }
 #endif
 
-#endif
+#endif
\ No newline at end of file
diff --git a/src/dnode/inc/dnodeVnodes.h b/src/dnode/inc/dnodeVnodes.h
index 9ecbd5f052..e60dd290ce 100644
--- a/src/dnode/inc/dnodeVnodes.h
+++ b/src/dnode/inc/dnodeVnodes.h
@@ -31,4 +31,4 @@ void    dnodeSendStatusMsgToMnode();
 }
 #endif
 
-#endif
+#endif
\ No newline at end of file
diff --git a/src/dnode/src/dnodeMInfos.c b/src/dnode/src/dnodeMInfos.c
index e4f5d33bf4..dc89487f8b 100644
--- a/src/dnode/src/dnodeMInfos.c
+++ b/src/dnode/src/dnodeMInfos.c
@@ -305,7 +305,7 @@ void dnodeSendRedirectMsg(SRpcMsg *rpcMsg, bool forShell) {
   } else {
     dnodeGetEpSetForPeer(&epSet);
   }
-  
+
   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);
 
@@ -323,4 +323,4 @@ void dnodeSendRedirectMsg(SRpcMsg *rpcMsg, bool forShell) {
   }
 
   rpcSendRedirectRsp(rpcMsg->handle, &epSet);
-}
+}
\ No newline at end of file
diff --git a/src/dnode/src/dnodeShell.c b/src/dnode/src/dnodeShell.c
index 9419068587..79cc70005b 100644
--- a/src/dnode/src/dnodeShell.c
+++ b/src/dnode/src/dnodeShell.c
@@ -231,4 +231,4 @@ SStatisInfo dnodeGetStatisInfo() {
   }
 
   return info;
-}
+}
\ No newline at end of file
diff --git a/src/dnode/src/dnodeStep.c b/src/dnode/src/dnodeStep.c
index 367f9223b5..2354b1d5a3 100644
--- a/src/dnode/src/dnodeStep.c
+++ b/src/dnode/src/dnodeStep.c
@@ -71,4 +71,4 @@ int32_t dnodeStepInit(SStep *pSteps, int32_t stepSize) {
 
 void dnodeStepCleanup(SStep *pSteps, int32_t stepSize) { 
   return taosStepCleanupImp(pSteps, stepSize - 1);
-}
+}
\ No newline at end of file
diff --git a/src/dnode/src/dnodeVnodes.c b/src/dnode/src/dnodeVnodes.c
index 6c6c6aef52..03b51feb9c 100644
--- a/src/dnode/src/dnodeVnodes.c
+++ b/src/dnode/src/dnodeVnodes.c
@@ -271,7 +271,7 @@ static void dnodeSendStatusMsg(void *handle, void *tmrId) {
   vnodeBuildStatusMsg(pStatus);
   contLen = sizeof(SStatusMsg) + pStatus->openVnodes * sizeof(SVnodeLoad);
   pStatus->openVnodes = htons(pStatus->openVnodes);
-  
+
   SRpcMsg rpcMsg = {
     .pCont   = pStatus,
     .contLen = contLen,
@@ -288,4 +288,4 @@ void dnodeSendStatusMsgToMnode() {
     dInfo("force send status msg to mnode");
     taosTmrReset(dnodeSendStatusMsg, 3, NULL, tsDnodeTmr, &tsStatusTimer);
   }
-}
+}
\ No newline at end of file
diff --git a/src/inc/vnode.h b/src/inc/vnode.h
index a4f7c00b66..cbe64484b1 100644
--- a/src/inc/vnode.h
+++ b/src/inc/vnode.h
@@ -89,4 +89,4 @@ int32_t vnodeProcessRead(void *pVnode, SVReadMsg *pRead);
 }
 #endif
 
-#endif
+#endif
\ No newline at end of file
diff --git a/src/vnode/inc/vnodeMain.h b/src/vnode/inc/vnodeMain.h
index ecfdb15d62..e1ddcdc36a 100644
--- a/src/vnode/inc/vnodeMain.h
+++ b/src/vnode/inc/vnodeMain.h
@@ -35,4 +35,4 @@ void    vnodeDestroy(SVnodeObj *pVnode);
 }
 #endif
 
-#endif
+#endif
\ No newline at end of file
diff --git a/src/vnode/inc/vnodeStatus.h b/src/vnode/inc/vnodeStatus.h
index 791af29c5f..00ac47df65 100644
--- a/src/vnode/inc/vnodeStatus.h
+++ b/src/vnode/inc/vnodeStatus.h
@@ -44,4 +44,4 @@ bool vnodeInResetStatus(SVnodeObj* pVnode);
 }
 #endif
 
-#endif
+#endif
\ No newline at end of file
diff --git a/src/vnode/inc/vnodeSync.h b/src/vnode/inc/vnodeSync.h
index 65e96a6131..ae02ca17cb 100644
--- a/src/vnode/inc/vnodeSync.h
+++ b/src/vnode/inc/vnodeSync.h
@@ -36,4 +36,4 @@ void     vnodeConfirmForward(void *pVnode, uint64_t version, int32_t code);
 }
 #endif
 
-#endif
+#endif
\ No newline at end of file
diff --git a/src/vnode/inc/vnodeWorker.h b/src/vnode/inc/vnodeWorker.h
index 7530baf7d9..01d9d42900 100644
--- a/src/vnode/inc/vnodeWorker.h
+++ b/src/vnode/inc/vnodeWorker.h
@@ -30,4 +30,4 @@ int32_t vnodeDestroyInMWorker(SVnodeObj *pVnode);
 }
 #endif
 
-#endif
+#endif
\ No newline at end of file
diff --git a/src/vnode/inc/vnodeWrite.h b/src/vnode/inc/vnodeWrite.h
index c69da3567a..8b3f0fdb58 100644
--- a/src/vnode/inc/vnodeWrite.h
+++ b/src/vnode/inc/vnodeWrite.h
@@ -32,4 +32,4 @@ int32_t vnodeProcessWrite(void *pVnode, void *pHead, int32_t qtype, void *pRspRe
 }
 #endif
 
-#endif
+#endif
\ No newline at end of file
diff --git a/src/vnode/src/vnodeMgmt.c b/src/vnode/src/vnodeMgmt.c
index 45909723c2..8469ab12c1 100644
--- a/src/vnode/src/vnodeMgmt.c
+++ b/src/vnode/src/vnodeMgmt.c
@@ -194,4 +194,4 @@ void vnodeSetAccess(SVgroupAccess *pAccess, int32_t numOfVnodes) {
       vnodeRelease(pVnode);
     }
   }
-}
+}
\ No newline at end of file
-- 
GitLab