From 215e358ce3a2939277c11287bc05462e6df32613 Mon Sep 17 00:00:00 2001
From: slzhou <shenglian_zhou@163.com>
Date: Mon, 31 Jul 2023 19:20:54 +0800
Subject: [PATCH] fix: restore user privilege processing if the rows generated
 by the user exceeds max block rows

---
 source/dnode/mnode/impl/src/mndUser.c | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/source/dnode/mnode/impl/src/mndUser.c b/source/dnode/mnode/impl/src/mndUser.c
index 07637586cc..6f59973052 100644
--- a/source/dnode/mnode/impl/src/mndUser.c
+++ b/source/dnode/mnode/impl/src/mndUser.c
@@ -1213,16 +1213,32 @@ static int32_t mndRetrievePrivileges(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock
   int32_t   cols = 0;
   char     *pWrite;
 
+  bool     fetchNextUser = pShow->restore ? false : true;
+  pShow->restore = false;
+
   while (numOfRows < rows) {
-    pShow->pIter = sdbFetch(pSdb, SDB_USER, pShow->pIter, (void **)&pUser);
-    if (pShow->pIter == NULL) break;
+    if (fetchNextUser) {
+      pShow->pIter = sdbFetch(pSdb, SDB_USER, pShow->pIter, (void **)&pUser);
+      if (pShow->pIter == NULL) break;
+    } else {
+      fetchNextUser = true;
+      void *pKey = taosHashGetKey(pShow->pIter, NULL);
+      pUser = sdbAcquire(pSdb, SDB_USER, pKey);
+      if (!pUser) {
+        continue;
+      }
+    }
 
     int32_t numOfReadDbs = taosHashGetSize(pUser->readDbs);
     int32_t numOfWriteDbs = taosHashGetSize(pUser->writeDbs);
     int32_t numOfTopics = taosHashGetSize(pUser->topics);
     int32_t numOfReadTbs = taosHashGetSize(pUser->readTbs);
     int32_t numOfWriteTbs = taosHashGetSize(pUser->writeTbs);
-    if (numOfRows + numOfReadDbs + numOfWriteDbs + numOfTopics + numOfReadTbs + numOfWriteTbs >= rows) break;
+    if (numOfRows + numOfReadDbs + numOfWriteDbs + numOfTopics + numOfReadTbs + numOfWriteTbs >= rows) {
+      pShow->restore = true;
+      sdbRelease(pSdb, pUser);
+      break;
+    }
 
     if (pUser->superUser) {
       cols = 0;