From 548cbaec7a84493576faa7fbd4484018ed79131e Mon Sep 17 00:00:00 2001
From: wpan <wpan@taosdata.com>
Date: Wed, 1 Sep 2021 19:20:22 +0800
Subject: [PATCH] add debug assert

---
 src/client/inc/tsclient.h    | 1 +
 src/client/src/tscServer.c   | 1 +
 src/client/src/tscSubquery.c | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/client/inc/tsclient.h b/src/client/inc/tsclient.h
index b9aaea8469..b6d46ecbcd 100644
--- a/src/client/inc/tsclient.h
+++ b/src/client/inc/tsclient.h
@@ -391,6 +391,7 @@ typedef struct SSqlObj {
   int32_t          retryReason;  // previous error code
   struct SSqlObj  *prev, *next;
   int64_t          self;
+  int32_t          rspReceived;
 } SSqlObj;
 
 typedef struct SSqlStream {
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index a6446a49fc..8fa26f56c9 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -2772,6 +2772,7 @@ int tscProcessQueryRsp(SSqlObj *pSql) {
   pRes->data = NULL;
 
   tscResetForNextRetrieve(pRes);
+  pSql->rspReceived = 1;
   tscDebug("0x%"PRIx64" query rsp received, qId:0x%"PRIx64, pSql->self, pRes->qId);
   return 0;
 }
diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index 018a2964b2..4acf173c9b 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -1716,7 +1716,7 @@ void tscFetchDatablockForSubquery(SSqlObj* pSql) {
     STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
     
     if (pRes1->row >= pRes1->numOfRows) {
-      assert(pSql1->cmd.msgType == TSDB_MSG_TYPE_FETCH);
+      assert(pSql1->rspReceived == 1);
       tscDebug("0x%"PRIx64" subquery:0x%"PRIx64" retrieve data from vnode, subquery:%d, vgroupIndex:%d", pSql->self, pSql1->self,
                pSupporter->subqueryIndex, pTableMetaInfo->vgroupIndex);
 
-- 
GitLab