From f297f676984998e1472b8a067e38f8a31a627902 Mon Sep 17 00:00:00 2001
From: kailixu <klxu@taosdata.com>
Date: Fri, 17 Mar 2023 16:40:29 +0800
Subject: [PATCH] fix: show obj

---
 source/dnode/mnode/impl/inc/mndDef.h  | 1 +
 source/dnode/mnode/impl/src/mndShow.c | 4 +++-
 source/dnode/mnode/impl/src/mndStb.c  | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/source/dnode/mnode/impl/inc/mndDef.h b/source/dnode/mnode/impl/inc/mndDef.h
index dfc3b3fde8..63b394a0ca 100644
--- a/source/dnode/mnode/impl/inc/mndDef.h
+++ b/source/dnode/mnode/impl/inc/mndDef.h
@@ -457,6 +457,7 @@ typedef struct {
   void*          pIter;
   SMnode*        pMnode;
   STableMetaRsp* pMeta;
+  bool           resume;
   bool           sysDbRsp;
   char           db[TSDB_DB_FNAME_LEN];
   char           filterTb[TSDB_TABLE_NAME_LEN];
diff --git a/source/dnode/mnode/impl/src/mndShow.c b/source/dnode/mnode/impl/src/mndShow.c
index 188137311b..3e58ba1e28 100644
--- a/source/dnode/mnode/impl/src/mndShow.c
+++ b/source/dnode/mnode/impl/src/mndShow.c
@@ -133,6 +133,7 @@ static SShowObj *mndCreateShowObj(SMnode *pMnode, SRetrieveTableReq *pReq) {
   showObj.id = showId;
   showObj.pMnode = pMnode;
   showObj.type = convertToRetrieveType(pReq->tb, tListLen(pReq->tb));
+  showObj.resume = false;
   memcpy(showObj.db, pReq->db, TSDB_DB_FNAME_LEN);
   strncpy(showObj.filterTb, pReq->filterTb, TSDB_TABLE_NAME_LEN);
 
@@ -324,7 +325,8 @@ static int32_t mndProcessRetrieveSysTableReq(SRpcMsg *pReq) {
   pReq->info.rsp = pRsp;
   pReq->info.rspLen = size;
 
-  if (rowsRead == 0 || ((rowsRead < rowsToRead) && !pShow->pIter)) {
+  // if (rowsRead == 0 || ((rowsRead < rowsToRead) && !pShow->resume)) {
+  if (rowsRead == 0 || rowsRead < rowsToRead) {
     pRsp->completed = 1;
     mDebug("show:0x%" PRIx64 ", retrieve completed", pShow->id);
     mndReleaseShowObj(pShow, true);
diff --git a/source/dnode/mnode/impl/src/mndStb.c b/source/dnode/mnode/impl/src/mndStb.c
index e6e4a15198..f0e3361112 100644
--- a/source/dnode/mnode/impl/src/mndStb.c
+++ b/source/dnode/mnode/impl/src/mndStb.c
@@ -3113,7 +3113,8 @@ static int32_t mndRetrieveStbCol(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pB
 
   char typeName[TSDB_TABLE_FNAME_LEN + VARSTR_HEADER_SIZE] = {0};
   STR_TO_VARSTR(typeName, "SUPER_TABLE");
-  bool fetch = pShow->pIter ? false : true;
+  bool fetch = pShow->resume ? false : true;
+  pShow->resume = false;
   while (numOfRows < rows) {
     if (fetch) {
       pShow->pIter = sdbFetch(pSdb, SDB_STB, pShow->pIter, (void **)&pStb);
@@ -3138,6 +3139,7 @@ static int32_t mndRetrieveStbCol(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pB
     }
 
     if ((numOfRows + pStb->numOfColumns) > rows) {
+      pShow->resume = true;
       if (numOfRows == 0) {
         mError("mndRetrieveStbCol failed to get stable cols since buf:%d less than result:%d, stable name:%s, db:%s",
                rows, pStb->numOfColumns, pStb->name, pStb->db);