diff --git a/include/common/tgrant.h b/include/common/tgrant.h
index 66408e9fa4..03c68ef59b 100644
--- a/include/common/tgrant.h
+++ b/include/common/tgrant.h
@@ -30,10 +30,10 @@ extern "C" {
 
 #define GRANT_HEART_BEAT_MIN 2
 #define GRANT_ACTIVE_CODE    "activeCode"
-#define GRANT_ALL_FLAG       (0x01)
-#define GRANT_AUDIT_FLAG     (0x02)
-#define GRANT_CSV_FLAG       (0x04)
-#define GRANT_VIEW_FLAG      (0x08)
+#define GRANT_FLAG_ALL       (0x01)
+#define GRANT_FLAG_AUDIT     (0x02)
+#define GRANT_FLAG_CSV       (0x04)
+#define GRANT_FLAG_VIEW      (0x08)
 
 typedef enum {
   TSDB_GRANT_ALL,
diff --git a/include/libs/catalog/catalog.h b/include/libs/catalog/catalog.h
index 96a05ccbf9..1957bcbb24 100644
--- a/include/libs/catalog/catalog.h
+++ b/include/libs/catalog/catalog.h
@@ -25,7 +25,6 @@ extern "C" {
 #include "taosdef.h"
 #include "tarray.h"
 #include "tcommon.h"
-#include "tgrant.h"
 #include "thash.h"
 #include "tmsg.h"
 #include "tname.h"
@@ -146,10 +145,6 @@ typedef struct SSTableVersion {
   int32_t  smaVer;
 } SSTableVersion;
 
-typedef struct SGrantVersion {
-  int32_t version;
-} SGrantVersion;
-
 typedef struct SDbCacheInfo {
   char    dbFName[TSDB_DB_FNAME_LEN];
   int64_t dbId;
@@ -363,7 +358,7 @@ int32_t catalogGetUdfInfo(SCatalog* pCtg, SRequestConnInfo* pConn, const char* f
 
 int32_t catalogChkAuth(SCatalog* pCtg, SRequestConnInfo* pConn, SUserAuthInfo *pAuth, SUserAuthRes* pRes);
 
-int32_t catalogChkAuthFromCache(SCatalog* pCtg, SUserAuthInfo* pAuth, SUserAuthRes* pRes, bool* exists);
+int32_t catalogChkAuthFromCache(SCatalog* pCtg, SUserAuthInfo *pAuth, SUserAuthRes* pRes, bool* exists);
 
 int32_t catalogUpdateUserAuthInfo(SCatalog* pCtg, SGetUserAuthRsp* pAuth);
 
diff --git a/source/client/src/clientHb.c b/source/client/src/clientHb.c
index 53a64cec86..a146712cab 100644
--- a/source/client/src/clientHb.c
+++ b/source/client/src/clientHb.c
@@ -327,6 +327,7 @@ static int32_t hbProcessViewInfoRsp(void *value, int32_t valueLen, struct SCatal
   return TSDB_CODE_SUCCESS;
 }
 
+
 static void hbProcessQueryRspKvs(int32_t kvNum, SArray* pKvs, struct SCatalog *pCatalog, SAppHbMgr *pAppHbMgr) {
   for (int32_t i = 0; i < kvNum; ++i) {
     SKv *kv = taosArrayGet(pKvs, i);
@@ -865,6 +866,7 @@ int32_t hbGetExpiredViewInfo(SClientHbKey *connKey, struct SCatalog *pCatalog, S
   return TSDB_CODE_SUCCESS;
 }
 
+
 int32_t hbGetAppInfo(int64_t clusterId, SClientHbReq *req) {
   SAppHbReq *pApp = taosHashGet(clientHbMgr.appSummary, &clusterId, sizeof(clusterId));
   if (NULL != pApp) {
diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c
index d46b91276b..444a4c0ccc 100644
--- a/source/common/src/tglobal.c
+++ b/source/common/src/tglobal.c
@@ -1804,11 +1804,11 @@ void taosSetAllDebugFlag(int32_t flag) {
 int8_t taosGranted(int8_t type) {
   switch (type) {
     case TSDB_GRANT_ALL:
-      return atomic_load_8(&tsGrant) & GRANT_ALL_FLAG;
+      return atomic_load_8(&tsGrant) & GRANT_FLAG_ALL;
     case TSDB_GRANT_AUDIT:
-      return atomic_load_8(&tsGrant) & GRANT_AUDIT_FLAG;
+      return atomic_load_8(&tsGrant) & GRANT_FLAG_AUDIT;
     case TSDB_GRANT_VIEW:
-      return atomic_load_8(&tsGrant) & GRANT_VIEW_FLAG;
+      return atomic_load_8(&tsGrant) & GRANT_FLAG_VIEW;
     default:
       ASSERTS(0, "undefined grant type:%" PRIi8, type);
       break;
diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c
index 785cb1878e..af1c1c4923 100644
--- a/source/common/src/tmsg.c
+++ b/source/common/src/tmsg.c
@@ -9333,4 +9333,4 @@ void tFreeSViewHbRsp(SViewHbRsp *pRsp) {
   }
 
   taosArrayDestroy(pRsp->pViewRsp);
-}
\ No newline at end of file
+}
diff --git a/source/dnode/mnode/impl/inc/mndGrant.h b/source/dnode/mnode/impl/inc/mndGrant.h
index bda5cebf01..82b3260860 100644
--- a/source/dnode/mnode/impl/inc/mndGrant.h
+++ b/source/dnode/mnode/impl/inc/mndGrant.h
@@ -41,8 +41,9 @@
                                char **mergeActive);
 #endif
 
-  int32_t       mndProcessConfigGrantReq(SMnode * pMnode, SRpcMsg * pReq, SMCfgClusterReq * pCfg);
-  int32_t       mndProcessUpdGrantLog(SMnode * pMnode, SRpcMsg * pReq, SArray * pMachines, SGrantState * pState);
+  int32_t mndProcessConfigGrantReq(SMnode * pMnode, SRpcMsg * pReq, SMCfgClusterReq * pCfg);
+  int32_t mndProcessUpdGrantLog(SMnode * pMnode, SRpcMsg * pReq, SArray * pMachines, SGrantState * pState);
+
   int32_t       mndGrantGetLastState(SMnode * pMnode, SGrantState * pState);
   SGrantLogObj *mndAcquireGrant(SMnode * pMnode, void **ppIter);
   void          mndReleaseGrant(SMnode * pMnode, SGrantLogObj * pGrant, void *pIter);
diff --git a/source/dnode/mnode/impl/src/mndProfile.c b/source/dnode/mnode/impl/src/mndProfile.c
index f42cdfa4f3..e0559b4c48 100644
--- a/source/dnode/mnode/impl/src/mndProfile.c
+++ b/source/dnode/mnode/impl/src/mndProfile.c
@@ -18,7 +18,6 @@
 #include "audit.h"
 #include "mndDb.h"
 #include "mndDnode.h"
-#include "mndGrant.h"
 #include "mndMnode.h"
 #include "mndPrivilege.h"
 #include "mndQnode.h"
diff --git a/source/libs/catalog/inc/catalogInt.h b/source/libs/catalog/inc/catalogInt.h
index a35eec0ec5..7474b3bf91 100644
--- a/source/libs/catalog/inc/catalogInt.h
+++ b/source/libs/catalog/inc/catalogInt.h
@@ -548,6 +548,7 @@ typedef struct SCtgDropViewMetaMsg {
   uint64_t  viewId;
 } SCtgDropViewMetaMsg;
 
+
 typedef struct SCtgCacheOperation {
   int32_t opId;
   void*   data;
@@ -943,8 +944,8 @@ void    ctgRemoveStbRent(SCatalog *pCtg, SCtgDBCache *dbCache);
 void    ctgRemoveViewRent(SCatalog *pCtg, SCtgDBCache *dbCache);
 int32_t ctgUpdateRentStbVersion(SCatalog *pCtg, char *dbFName, char *tbName, uint64_t dbId, uint64_t suid,
                                 SCtgTbCache *pCache);
-int32_t ctgUpdateRentViewVersion(SCatalog *pCtg, char *dbFName, char *viewName, uint64_t dbId, uint64_t viewId,
-                                SCtgViewCache *pCache);
+int32_t ctgUpdateRentViewVersion(SCatalog* pCtg, char* dbFName, char* viewName, uint64_t dbId, uint64_t viewId,
+                                 SCtgViewCache* pCache);
 int32_t ctgUpdateTbMetaToCache(SCatalog* pCtg, STableMetaOutput* pOut, bool syncReq);
 int32_t ctgUpdateViewMetaToCache(SCatalog *pCtg, SViewMetaRsp *pRsp, bool syncReq);
 int32_t ctgStartUpdateThread();
diff --git a/source/libs/catalog/src/catalog.c b/source/libs/catalog/src/catalog.c
index 5a53f167c4..c2d88e5ce3 100644
--- a/source/libs/catalog/src/catalog.c
+++ b/source/libs/catalog/src/catalog.c
@@ -1513,6 +1513,7 @@ int32_t catalogGetExpiredViews(SCatalog* pCtg, SViewVersion** views, uint32_t* n
   CTG_API_LEAVE(ctgMetaRentGet(&pCtg->viewRent, (void**)views, num, sizeof(SViewVersion)));
 }
 
+
 int32_t catalogGetExpiredDBs(SCatalog* pCtg, SDbCacheInfo** dbs, uint32_t* num) {
   CTG_API_ENTER();
 
@@ -1675,6 +1676,7 @@ _return:
   CTG_API_LEAVE(code);
 }
 
+
 int32_t catalogGetServerVersion(SCatalog* pCtg, SRequestConnInfo* pConn, char** pVersion) {
   CTG_API_ENTER();
 
@@ -1745,6 +1747,7 @@ _return:
   CTG_API_LEAVE(code);
 }
 
+
 int32_t catalogAsyncUpdateViewMeta(SCatalog* pCtg, SViewMetaRsp* pMsg) {
   CTG_API_ENTER();
 
diff --git a/source/libs/catalog/src/ctgCache.c b/source/libs/catalog/src/ctgCache.c
index 08a8f348e9..1b693b4e07 100644
--- a/source/libs/catalog/src/ctgCache.c
+++ b/source/libs/catalog/src/ctgCache.c
@@ -2450,6 +2450,7 @@ _return:
   CTG_RET(code);
 }
 
+
 void ctgClearFreeCache(SCtgCacheOperation *operation) {
   SCtgClearCacheMsg *msg = operation->data;
   SCatalog          *pCtg = msg->pCtg;
diff --git a/source/libs/catalog/src/ctgRent.c b/source/libs/catalog/src/ctgRent.c
index 0ac133b8e7..f5016e9fef 100755
--- a/source/libs/catalog/src/ctgRent.c
+++ b/source/libs/catalog/src/ctgRent.c
@@ -301,3 +301,4 @@ int32_t ctgUpdateRentViewVersion(SCatalog *pCtg, char *dbFName, char *viewName,
   return TSDB_CODE_SUCCESS;
 }
 
+
diff --git a/source/libs/nodes/src/nodesCodeFuncs.c b/source/libs/nodes/src/nodesCodeFuncs.c
index b05c9b019e..7533d00704 100644
--- a/source/libs/nodes/src/nodesCodeFuncs.c
+++ b/source/libs/nodes/src/nodesCodeFuncs.c
@@ -3294,6 +3294,8 @@ static const char* jkSubplanTagIndexCond = "TagIndexCond";
 static const char* jkSubplanShowRewrite = "ShowRewrite";
 static const char* jkSubplanRowsThreshold = "RowThreshold";
 static const char* jkSubplanDynamicRowsThreshold = "DyRowThreshold";
+static const char* jkSubplanIsView = "IsView";
+static const char* jkSubplanIsAudit = "IsAudit";
 
 static int32_t subplanToJson(const void* pObj, SJson* pJson) {
   const SSubplan* pNode = (const SSubplan*)pObj;
@@ -3333,10 +3335,10 @@ static int32_t subplanToJson(const void* pObj, SJson* pJson) {
     code = tjsonAddBoolToObject(pJson, jkSubplanShowRewrite, pNode->showRewrite);
   }
   if (TSDB_CODE_SUCCESS == code) {
-    code = tjsonAddBoolToObject(pJson, jkSubplanShowRewrite, pNode->isView);
+    code = tjsonAddBoolToObject(pJson, jkSubplanIsView, pNode->isView);
   }
   if (TSDB_CODE_SUCCESS == code) {
-    code = tjsonAddBoolToObject(pJson, jkSubplanShowRewrite, pNode->isAudit);
+    code = tjsonAddBoolToObject(pJson, jkSubplanIsAudit, pNode->isAudit);
   }
   if (TSDB_CODE_SUCCESS == code) {
     code = tjsonAddIntegerToObject(pJson, jkSubplanRowsThreshold, pNode->rowsThreshold);
@@ -3386,10 +3388,10 @@ static int32_t jsonToSubplan(const SJson* pJson, void* pObj) {
     code = tjsonGetBoolValue(pJson, jkSubplanShowRewrite, &pNode->showRewrite);
   }
   if (TSDB_CODE_SUCCESS == code) {
-    code = tjsonGetBoolValue(pJson, jkSubplanShowRewrite, &pNode->isView);
+    code = tjsonGetBoolValue(pJson, jkSubplanIsView, &pNode->isView);
   }
   if (TSDB_CODE_SUCCESS == code) {
-    code = tjsonGetBoolValue(pJson, jkSubplanShowRewrite, &pNode->isAudit);
+    code = tjsonGetBoolValue(pJson, jkSubplanIsAudit, &pNode->isAudit);
   }
   if (TSDB_CODE_SUCCESS == code) {
     code = tjsonGetIntValue(pJson, jkSubplanRowsThreshold, &pNode->rowsThreshold);
diff --git a/source/libs/parser/inc/parTranslater.h b/source/libs/parser/inc/parTranslater.h
index 00f37cb002..55ea71a368 100644
--- a/source/libs/parser/inc/parTranslater.h
+++ b/source/libs/parser/inc/parTranslater.h
@@ -43,8 +43,6 @@ typedef struct STranslateContext {
   bool             createStream;
   bool             stableQuery;
   bool             showRewrite;
-  // bool             isView;
-  // bool             isAudit;
   SNode*           pPrevRoot;
   SNode*           pPostRoot;
 } STranslateContext;
diff --git a/source/libs/parser/src/parInsertSql.c b/source/libs/parser/src/parInsertSql.c
index 4ac8e0e541..7d10d1f2df 100644
--- a/source/libs/parser/src/parInsertSql.c
+++ b/source/libs/parser/src/parInsertSql.c
@@ -2139,16 +2139,13 @@ static int32_t parseCsvFile(SInsertParseContext* pCxt, SVnodeModifyOpStmt* pStmt
 }
 
 static int32_t parseDataFromFileImpl(SInsertParseContext* pCxt, SVnodeModifyOpStmt* pStmt, SRowsDataContext rowsDataCxt) {
-  int32_t code = 0;
-  int32_t numOfRows = 0;
-
   // init only for file
   if (NULL == pStmt->pTableCxtHashObj) {
     pStmt->pTableCxtHashObj =
         taosHashInit(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_NO_LOCK);
   }
-
-  code = parseCsvFile(pCxt, pStmt, rowsDataCxt, &numOfRows);
+  int32_t numOfRows = 0;
+  int32_t code = parseCsvFile(pCxt, pStmt, rowsDataCxt, &numOfRows);
   if (TSDB_CODE_SUCCESS == code) {
     pStmt->totalRowsNum += numOfRows;
     pStmt->totalTbNum += 1;
@@ -2759,11 +2756,11 @@ static int32_t parseInsertSqlFromStart(SInsertParseContext* pCxt, SVnodeModifyOp
 }
 
 static int32_t parseInsertSqlFromCsv(SInsertParseContext* pCxt, SVnodeModifyOpStmt* pStmt) {
-  int32_t          code = TSDB_CODE_SUCCESS;
+  int32_t code = TSDB_CODE_SUCCESS;
   SRowsDataContext rowsDataCxt;
 
   if (!pStmt->stbSyntax) {
-    STableDataCxt* pTableCxt = NULL;
+    STableDataCxt*   pTableCxt = NULL;
     code = getTableDataCxt(pCxt, pStmt, &pTableCxt);
     rowsDataCxt.pTableDataCxt = pTableCxt;
   } else {
diff --git a/source/libs/parser/src/parUtil.c b/source/libs/parser/src/parUtil.c
index 8aa37f5784..dfe33ce55e 100644
--- a/source/libs/parser/src/parUtil.c
+++ b/source/libs/parser/src/parUtil.c
@@ -192,8 +192,6 @@ static char* getSyntaxErrFormat(int32_t errCode) {
       return "Out of memory";
     case TSDB_CODE_PAR_ORDERBY_AMBIGUOUS:
       return "ORDER BY \"%s\" is ambiguous";
-    case TSDB_CODE_GRANT_EXPIRED:
-      return "License expired";
     default:
       return "Unknown error";
   }
diff --git a/source/libs/qworker/src/qwMsg.c b/source/libs/qworker/src/qwMsg.c
index c9d3cb51e3..66ec460861 100644
--- a/source/libs/qworker/src/qwMsg.c
+++ b/source/libs/qworker/src/qwMsg.c
@@ -361,22 +361,22 @@ int32_t qWorkerPreprocessQueryMsg(void *qWorkerMgmt, SRpcMsg *pMsg, bool chkGran
   }
 
   if (chkGrant) {
-    if ((!TEST_SHOW_REWRITE_MASK(msg.msgMask)) && !taosGranted(TSDB_GRANT_ALL)) {
-      QW_ELOG("query failed cause of grant expired, msgMask:%d", msg.msgMask);
-      tFreeSSubQueryMsg(&msg);
-      QW_ERR_RET(TSDB_CODE_GRANT_EXPIRED);
-    }
-
-    if ((TEST_VIEW_MASK(msg.msgMask)) && !taosGranted(TSDB_GRANT_VIEW)) {
-      QW_ELOG("query failed cause of view grant expired, msgMask:%d", msg.msgMask);
-      tFreeSSubQueryMsg(&msg);
-      QW_ERR_RET(TSDB_CODE_GRANT_EXPIRED);
-    }
-
-    if ((TEST_AUDIT_MASK(msg.msgMask)) && !taosGranted(TSDB_GRANT_AUDIT)) {
-      QW_ELOG("query failed cause of audit grant expired, msgMask:%d", msg.msgMask);
-      tFreeSSubQueryMsg(&msg);
-      QW_ERR_RET(TSDB_CODE_GRANT_EXPIRED);
+    if ((!TEST_SHOW_REWRITE_MASK(msg.msgMask))) {
+      if (!taosGranted(TSDB_GRANT_ALL)) {
+        QW_ELOG("query failed cause of grant expired, msgMask:%d", msg.msgMask);
+        tFreeSSubQueryMsg(&msg);
+        QW_ERR_RET(TSDB_CODE_GRANT_EXPIRED);
+      }
+      if ((TEST_VIEW_MASK(msg.msgMask)) && !taosGranted(TSDB_GRANT_VIEW)) {
+        QW_ELOG("query failed cause of view grant expired, msgMask:%d", msg.msgMask);
+        tFreeSSubQueryMsg(&msg);
+        QW_ERR_RET(TSDB_CODE_GRANT_EXPIRED);
+      }
+      if ((TEST_AUDIT_MASK(msg.msgMask)) && !taosGranted(TSDB_GRANT_AUDIT)) {
+        QW_ELOG("query failed cause of audit grant expired, msgMask:%d", msg.msgMask);
+        tFreeSSubQueryMsg(&msg);
+        QW_ERR_RET(TSDB_CODE_GRANT_EXPIRED);
+      }
     }
   }