fix some warnings and format code

CMakeLists.txt

@@ -3,6 +3,8 @@ PROJECT(TDengine)
 
 SET(TD_CLUSTER FALSE)
 SET(TD_ACCOUNT FALSE)
+SET(TD_VPEER FALSE)
+SET(TD_MPEER FALSE)
 SET(TD_GRANT FALSE)
 SET(TD_COVER FALSE)
 SET(TD_PAGMODE_LITE FALSE)

src/dnode/src/dnodeMain.c

@@ -31,6 +31,7 @@
 
 static int32_t dnodeInitSystem();
 static int32_t dnodeInitStorage();
+extern void grantParseParameter();
 static void dnodeCleanupStorage();
 static void dnodeCleanUpSystem();
 static void dnodeSetRunStatus(SDnodeRunStatus status);

src/dnode/src/dnodeMgmt.c

@@ -64,7 +64,7 @@ int32_t dnodeInitMgmt() {
     dError("failed to init dnode timer");
     return -1;
   }
-  
+
   int32_t code = dnodeOpenVnodes();
   if (code != TSDB_CODE_SUCCESS) {
     return -1;
@@ -104,7 +104,7 @@ void dnodeMgmt(SRpcMsg *pMsg) {
   rpcFreeCont(pMsg->pCont);
 }
 
-static int dnodeGetVnodeList(int32_t vnodeList[]) {
+static int32_t dnodeGetVnodeList(int32_t vnodeList[]) {
   DIR *dir = opendir(tsVnodeDir);
   if (dir == NULL) {
     return TSDB_CODE_NO_WRITE_ACCESS;
@@ -129,36 +129,36 @@ static int dnodeGetVnodeList(int32_t vnodeList[]) {
 }
 
 static int32_t dnodeOpenVnodes() {
-   char vnodeDir[TSDB_FILENAME_LEN * 3];
-   int  failed = 0;
+  char vnodeDir[TSDB_FILENAME_LEN * 3];
+  int32_t failed = 0;
 
-   int32_t *vnodeList = (int32_t *) malloc(sizeof(int32_t) * 10000);
-   int numOfVnodes = dnodeGetVnodeList(vnodeList);
-  
-   for (int i=0; i<numOfVnodes; ++i) {
-      snprintf(vnodeDir, TSDB_FILENAME_LEN * 3, "%s/vnode%d", tsVnodeDir, vnodeList[i]);
-      if (vnodeOpen(vnodeList[i], vnodeDir) <0) failed++;
-   }
+  int32_t *vnodeList = (int32_t *)malloc(sizeof(int32_t) * 10000);
+  int32_t  numOfVnodes = dnodeGetVnodeList(vnodeList);
 
-   free(vnodeList);
+  for (int32_t i = 0; i < numOfVnodes; ++i) {
+    snprintf(vnodeDir, TSDB_FILENAME_LEN * 3, "%s/vnode%d", tsVnodeDir, vnodeList[i]);
+    if (vnodeOpen(vnodeList[i], vnodeDir) < 0) failed++;
+  }
+
+  free(vnodeList);
 
-   dPrint("there are total vnodes:%d, failed to open:%d", numOfVnodes, failed);
-   return TSDB_CODE_SUCCESS;
+  dPrint("there are total vnodes:%d, failed to open:%d", numOfVnodes, failed);
+  return TSDB_CODE_SUCCESS;
 }
 
 static void dnodeCloseVnodes() {
-   int32_t *vnodeList = (int32_t *) malloc(sizeof(int32_t) * 10000);
-   int numOfVnodes = dnodeGetVnodeList(vnodeList);
-  
-   for (int i=0; i<numOfVnodes; ++i) 
-     vnodeClose(vnodeList[i]); 
+  int32_t *vnodeList = (int32_t *)malloc(sizeof(int32_t) * 10000);
+  int32_t  numOfVnodes = dnodeGetVnodeList(vnodeList);
+
+  for (int32_t i = 0; i < numOfVnodes; ++i) {
+    vnodeClose(vnodeList[i]);
+  }
 
-   free(vnodeList);
-   dPrint("total vnodes:%d are all closed", numOfVnodes);
+  free(vnodeList);
+  dPrint("total vnodes:%d are all closed", numOfVnodes);
 }
 
 static int32_t dnodeProcessCreateVnodeMsg(SRpcMsg *rpcMsg) {
-
   SMDCreateVnodeMsg *pCreate = rpcMsg->pCont;
   pCreate->cfg.vgId        = htonl(pCreate->cfg.vgId);
   pCreate->cfg.maxSessions = htonl(pCreate->cfg.maxSessions);
@@ -169,7 +169,6 @@ static int32_t dnodeProcessCreateVnodeMsg(SRpcMsg *rpcMsg) {
 }
 
 static int32_t dnodeProcessDropVnodeMsg(SRpcMsg *rpcMsg) {
-
   SMDDropVnodeMsg *pDrop = rpcMsg->pCont;
   pDrop->vgId = htonl(pDrop->vgId);
 
@@ -177,7 +176,6 @@ static int32_t dnodeProcessDropVnodeMsg(SRpcMsg *rpcMsg) {
 }
 
 static int32_t dnodeProcessAlterVnodeMsg(SRpcMsg *rpcMsg) {
-
   SMDCreateVnodeMsg *pCreate = rpcMsg->pCont;
   pCreate->cfg.vgId        = htonl(pCreate->cfg.vgId);
   pCreate->cfg.maxSessions = htonl(pCreate->cfg.maxSessions);
@@ -206,7 +204,7 @@ static int32_t dnodeProcessConfigDnodeMsg(SRpcMsg *pMsg) {
 
 static void dnodeSendStatusMsg(void *handle, void *tmrId) {
   if (tsDnodeTmr == NULL) {
-     dError("dnode timer is already released");
+    dError("dnode timer is already released");
     return;
   }
 

src/dnode/src/dnodeRead.c

@@ -192,6 +192,7 @@ static void dnodeHandleIdleReadWorker() {
   }
 }
 
+UNUSED_FUNC
 static void dnodeProcessReadResult(void *pVnode, SReadMsg *pRead) {
   SRpcContext *pRpcContext = pRead->pRpcContext;
   int32_t      code = 0;

src/dnode/src/dnodeShell.c

@@ -37,7 +37,7 @@ int32_t dnodeInitShell() {
   dnodeProcessShellMsgFp[TSDB_MSG_TYPE_QUERY]    = dnodeRead;
   dnodeProcessShellMsgFp[TSDB_MSG_TYPE_RETRIEVE] = dnodeRead;
 
-  int numOfThreads = tsNumOfCores * tsNumOfThreadsPerCore;
+  int32_t numOfThreads = tsNumOfCores * tsNumOfThreadsPerCore;
   numOfThreads = (int32_t) ((1.0 - tsRatioOfQueryThreads) * numOfThreads / 2.0);
   if (numOfThreads < 1) {
     numOfThreads = 1;

src/dnode/src/dnodeWrite.c

@@ -52,7 +52,6 @@ static void  dnodeHandleIdleWorker(SWriteWorker *pWorker);
 SWriteWorkerPool wWorkerPool;
 
 int32_t dnodeInitWrite() {
-
   wWorkerPool.max = tsNumOfCores;
   wWorkerPool.writeWorker = (SWriteWorker *)calloc(sizeof(SWriteWorker), wWorkerPool.max);
   if (wWorkerPool.writeWorker == NULL) return -1;
@@ -71,7 +70,7 @@ void dnodeCleanupWrite() {
 }
 
 void dnodeWrite(SRpcMsg *pMsg) {
-  char        *pCont       = (char *) pMsg->pCont;
+  char *pCont = (char *)pMsg->pCont;
 
   if (pMsg->msgType == TSDB_MSG_TYPE_SUBMIT || pMsg->msgType == TSDB_MSG_TYPE_MD_DROP_STABLE) {
     SMsgDesc *pDesc = (SMsgDesc *)pCont;
@@ -80,16 +79,16 @@ void dnodeWrite(SRpcMsg *pMsg) {
   }
 
   SMsgHead *pHead = (SMsgHead *) pCont;
-  pHead->vgId    = htonl(pHead->vgId);
-  pHead->contLen = htonl(pHead->contLen);
+  pHead->vgId     = htonl(pHead->vgId);
+  pHead->contLen  = htonl(pHead->contLen);
 
   taos_queue queue = vnodeGetWqueue(pHead->vgId);
   if (queue) {
     // put message into queue
     SWriteMsg *pWrite = (SWriteMsg *)taosAllocateQitem(sizeof(SWriteMsg));
-    pWrite->rpcMsg      = *pMsg;
-    pWrite->pCont       = pCont;
-    pWrite->contLen     = pHead->contLen;
+    pWrite->rpcMsg    = *pMsg;
+    pWrite->pCont     = pCont;
+    pWrite->contLen   = pHead->contLen;
 
     taosWriteQitem(queue, TAOS_QTYPE_RPC, pWrite);
   } else {
@@ -227,4 +226,3 @@ static void dnodeHandleIdleWorker(SWriteWorker *pWorker) {
      pthread_exit(NULL);
   }
 }
-