chore: more code

include/common/tgrant.h

@@ -48,16 +48,6 @@ typedef enum {
   TSDB_GRANT_TABLE,
 } EGrantType;
 
-#define GRANT_ACTIVE_ON      ((int8_t)0x01)
-#define GRANT_CONN_ACTIVE_ON ((int8_t)0x02)
-
-#define SET_GRANT_ACTIVE_ON(f)      ((f) |= GRANT_ACTIVE_ON)
-#define SET_GRANT_CONN_ACTIVE_ON(f) ((f) |= GRANT_CONN_ACTIVE_ON)
-
-#define IS_GRANT_ACTIVE_CODES_ON(f) ((f) != 0x0)
-#define IS_GRANT_ACTIVE_ON(f)       (((f)&0x01) == GRANT_ACTIVE_ON)
-#define IS_GRANT_CONN_ACTIVE_ON(f)  (((f)&0x02) == GRANT_CONN_ACTIVE_ON)
-
 int32_t grantCheck(EGrantType grant);
 
 #ifndef GRANTS_CFG

source/dnode/mnode/impl/inc/mndDnode.h

@@ -29,7 +29,7 @@ void       mndReleaseDnode(SMnode *pMnode, SDnodeObj *pDnode);
 SEpSet     mndGetDnodeEpset(SDnodeObj *pDnode);
 int32_t    mndGetDnodeSize(SMnode *pMnode);
 bool       mndIsDnodeOnline(SDnodeObj *pDnode, int64_t curMs);
-void       mndGetDnodeInfo(SMnode *pMnode, SArray *pDnodeInfo);
+void       mndGetDnodeData(SMnode *pMnode, SArray *pDnodeInfo);
 
 #ifdef __cplusplus
 }

source/dnode/mnode/impl/src/mndDnode.c

@@ -138,17 +138,6 @@ static SSdbRaw *mndDnodeActionEncode(SDnodeObj *pDnode) {
   SDB_SET_INT64(pRaw, dataPos, pDnode->updateTime, _OVER)
   SDB_SET_INT16(pRaw, dataPos, pDnode->port, _OVER)
   SDB_SET_BINARY(pRaw, dataPos, pDnode->fqdn, TSDB_FQDN_LEN, _OVER)
-  // debug purpose
-#if 1
-  strncpy(
-      pDnode->active,
-      "4cssi6J+y+GSS7zes2RwBezQc/mabvN9N2maa6ksK6JJWl7OxrPZ2ElaXs7Gs9nYSVpezsaz2di72ZL6EAo0mcYiPlK2dDdmPh3SOVCm1/c=",
-      TSDB_ACTIVE_KEY_LEN);
-  strncpy(
-      pDnode->connActive,
-      "ovTNXauk5suSS7zes2RwBezQc/mabvN9N2maa6ksK6JJWl7OxrPZ2ElaXs7Gs9nYSVpezsaz2di72ZL6EAo0mcYiPlK2dDdmdpKzEXFi4Rs=ovTNXauk5suSS7zes2RwBezQc/mabvN9N2maa6ksK6JJWl7OxrPZ2ElaXs7Gs9nYSVpezsaz2di72ZL6EAo0mcYiPlK2dDdmdpKzEXFi4Rs=",
-      TSDB_CONN_ACTIVE_KEY_LEN);
-#endif
 
   SDB_SET_BINARY(pRaw, dataPos, pDnode->active, TSDB_ACTIVE_KEY_LEN, _OVER)
   SDB_SET_BINARY(pRaw, dataPos, pDnode->connActive, TSDB_CONN_ACTIVE_KEY_LEN, _OVER)
@@ -324,7 +313,7 @@ bool mndIsDnodeOnline(SDnodeObj *pDnode, int64_t curMs) {
   return true;
 }
 
-static void mndGetDnodeData(SMnode *pMnode, SArray *pDnodeEps) {
+static void mndGetDnodeEps(SMnode *pMnode, SArray *pDnodeEps) {
   SSdb *pSdb = pMnode->pSdb;
 
   int32_t numOfEps = 0;
@@ -349,7 +338,7 @@ static void mndGetDnodeData(SMnode *pMnode, SArray *pDnodeEps) {
   }
 }
 
-void mndGetDnodeInfo(SMnode *pMnode, SArray *pDnodeInfo) {
+void mndGetDnodeData(SMnode *pMnode, SArray *pDnodeInfo) {
   SSdb *pSdb = pMnode->pSdb;
 
   int32_t numOfEps = 0;
@@ -578,7 +567,7 @@ static int32_t mndProcessStatusReq(SRpcMsg *pReq) {
       goto _OVER;
     }
 
-    mndGetDnodeData(pMnode, statusRsp.pDnodeEps);
+    mndGetDnodeEps(pMnode, statusRsp.pDnodeEps);
 
     int32_t contLen = tSerializeSStatusRsp(NULL, 0, &statusRsp);
     void   *pHead = rpcMallocCont(contLen);