From 22a26d3d43470685d5e464cd3c279541c6038eda Mon Sep 17 00:00:00 2001
From: Xiaoyu Wang <xiaoyuwang@taosdata.com>
Date: Mon, 21 Mar 2022 03:14:00 -0400
Subject: [PATCH] merge 3.0

---
 source/dnode/mgmt/mnode/src/mmMsg.c     |  1 +
 source/libs/executor/src/executorimpl.c | 15 +++++++++------
 tests/script/tsim/user/basic1.sim       | 10 ++++++++++
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/source/dnode/mgmt/mnode/src/mmMsg.c b/source/dnode/mgmt/mnode/src/mmMsg.c
index 41fd23e3c7..932e78c88c 100644
--- a/source/dnode/mgmt/mnode/src/mmMsg.c
+++ b/source/dnode/mgmt/mnode/src/mmMsg.c
@@ -130,6 +130,7 @@ void mmInitMsgHandles(SMgmtWrapper *pWrapper) {
   dndSetMsgHandle(pWrapper, TDMT_MND_HEARTBEAT, (NodeMsgFp)mmProcessWriteMsg);
   dndSetMsgHandle(pWrapper, TDMT_MND_SHOW, (NodeMsgFp)mmProcessReadMsg);
   dndSetMsgHandle(pWrapper, TDMT_MND_SHOW_RETRIEVE, (NodeMsgFp)mmProcessReadMsg);
+  dndSetMsgHandle(pWrapper, TDMT_MND_SYSTABLE_RETRIEVE, (NodeMsgFp)mmProcessReadMsg);
   dndSetMsgHandle(pWrapper, TDMT_MND_STATUS, (NodeMsgFp)mmProcessReadMsg);
   dndSetMsgHandle(pWrapper, TDMT_MND_KILL_TRANS, (NodeMsgFp)mmProcessWriteMsg);
   dndSetMsgHandle(pWrapper, TDMT_MND_GRANT, (NodeMsgFp)mmProcessWriteMsg);
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index d4e9f47f85..64c912521a 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -5519,13 +5519,16 @@ SOperatorInfo* createStreamScanOperatorInfo(void *streamReadHandle, SSDataBlock*
 
 static int32_t loadSysTableContentCb(void* param, const SDataBuf* pMsg, int32_t code) {
   SSysTableScanInfo* pScanResInfo = (SSysTableScanInfo*) param;
-  pScanResInfo->pRsp = pMsg->pData;
+  if (TSDB_CODE_SUCCESS == code) {
+    pScanResInfo->pRsp = pMsg->pData;
+
+    SRetrieveMetaTableRsp* pRsp = pScanResInfo->pRsp;
+    pRsp->numOfRows = htonl(pRsp->numOfRows);
+    pRsp->useconds  = htobe64(pRsp->useconds);
+    pRsp->handle    = htobe64(pRsp->handle);
+    pRsp->compLen   = htonl(pRsp->compLen);
+  }
 
-  SRetrieveMetaTableRsp* pRsp = pScanResInfo->pRsp;
-  pRsp->numOfRows = htonl(pRsp->numOfRows);
-  pRsp->useconds  = htobe64(pRsp->useconds);
-  pRsp->handle    = htobe64(pRsp->handle);
-  pRsp->compLen   = htonl(pRsp->compLen);
   tsem_post(&pScanResInfo->ready);
 }
 
diff --git a/tests/script/tsim/user/basic1.sim b/tests/script/tsim/user/basic1.sim
index 33c4dc96d4..42912898a4 100644
--- a/tests/script/tsim/user/basic1.sim
+++ b/tests/script/tsim/user/basic1.sim
@@ -3,6 +3,16 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
+# todo remove
+print =============== create database
+sleep 3000
+sql create database useless_db
+sleep 1000
+sql show databases
+if $rows != 1 then 
+  return -1
+endi
+
 print =============== show users
 sql show users
 if $rows != 1 then 
-- 
GitLab