From ed87c39ff1d4df083a91aa5845ebef315aed13ca Mon Sep 17 00:00:00 2001
From: Xiaoyu Wang <xiaoyuwang@taosdata.com>
Date: Fri, 3 Jun 2022 16:45:33 +0800
Subject: [PATCH 1/2] fix: a problem of parser async

---
 source/libs/parser/src/parAstParser.c       | 18 ++++++++++
 source/libs/parser/test/parInitialDTest.cpp | 38 +++++++++++++--------
 2 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/source/libs/parser/src/parAstParser.c b/source/libs/parser/src/parAstParser.c
index 18c1341da8..7abe244261 100644
--- a/source/libs/parser/src/parAstParser.c
+++ b/source/libs/parser/src/parAstParser.c
@@ -199,6 +199,22 @@ static int32_t collectMetaKeyFromCreateMultiTable(SCollectMetaKeyCxt* pCxt, SCre
   return code;
 }
 
+static int32_t collectMetaKeyFromDropTable(SCollectMetaKeyCxt* pCxt, SDropTableStmt* pStmt) {
+  int32_t code = TSDB_CODE_SUCCESS;
+  SNode*  pNode = NULL;
+  FOREACH(pNode, pStmt->pTables) {
+    SDropTableClause* pClause = (SDropTableClause*)pNode;
+    code = reserveTableMetaInCache(pCxt->pParseCxt->acctId, pClause->dbName, pClause->tableName, pCxt->pMetaCache);
+    if (TSDB_CODE_SUCCESS == code) {
+      code = reserveTableVgroupInCache(pCxt->pParseCxt->acctId, pClause->dbName, pClause->tableName, pCxt->pMetaCache);
+    }
+    if (TSDB_CODE_SUCCESS != code) {
+      break;
+    }
+  }
+  return code;
+}
+
 static int32_t collectMetaKeyFromAlterTable(SCollectMetaKeyCxt* pCxt, SAlterTableStmt* pStmt) {
   int32_t code = reserveTableMetaInCache(pCxt->pParseCxt->acctId, pStmt->dbName, pStmt->tableName, pCxt->pMetaCache);
   if (TSDB_CODE_SUCCESS == code) {
@@ -341,6 +357,8 @@ static int32_t collectMetaKeyFromQuery(SCollectMetaKeyCxt* pCxt, SNode* pStmt) {
       return collectMetaKeyFromCreateTable(pCxt, (SCreateTableStmt*)pStmt);
     case QUERY_NODE_CREATE_MULTI_TABLE_STMT:
       return collectMetaKeyFromCreateMultiTable(pCxt, (SCreateMultiTableStmt*)pStmt);
+    case QUERY_NODE_DROP_TABLE_STMT:
+      return collectMetaKeyFromDropTable(pCxt, (SDropTableStmt*)pStmt);
     case QUERY_NODE_ALTER_TABLE_STMT:
       return collectMetaKeyFromAlterTable(pCxt, (SAlterTableStmt*)pStmt);
     case QUERY_NODE_USE_DATABASE_STMT:
diff --git a/source/libs/parser/test/parInitialDTest.cpp b/source/libs/parser/test/parInitialDTest.cpp
index 5ad427d964..1b1b930851 100644
--- a/source/libs/parser/test/parInitialDTest.cpp
+++ b/source/libs/parser/test/parInitialDTest.cpp
@@ -24,7 +24,7 @@ class ParserInitialDTest : public ParserDdlTest {};
 // todo delete
 // todo desc
 // todo describe
-// todo drop account
+// todo DROP account
 
 TEST_F(ParserInitialDTest, dropBnode) {
   useDb("root", "test");
@@ -62,51 +62,61 @@ TEST_F(ParserInitialDTest, dropCGroup) {
   run("DROP CONSUMER GROUP IF EXISTS cg1 ON tp1");
 }
 
-// todo drop database
-// todo drop dnode
-// todo drop function
+// todo DROP database
+// todo DROP dnode
+// todo DROP function
 
 TEST_F(ParserInitialDTest, dropIndex) {
   useDb("root", "test");
 
-  run("drop index index1 on t1");
+  run("DROP index index1 on t1");
 }
 
 TEST_F(ParserInitialDTest, dropMnode) {
   useDb("root", "test");
 
-  run("drop mnode on dnode 1");
+  run("DROP mnode on dnode 1");
 }
 
 TEST_F(ParserInitialDTest, dropQnode) {
   useDb("root", "test");
 
-  run("drop qnode on dnode 1");
+  run("DROP qnode on dnode 1");
 }
 
 TEST_F(ParserInitialDTest, dropSnode) {
   useDb("root", "test");
 
-  run("drop snode on dnode 1");
+  run("DROP snode on dnode 1");
 }
 
-// todo drop stable
-// todo drop stream
-// todo drop table
+TEST_F(ParserInitialDTest, dropSTable) {
+  useDb("root", "test");
+
+  run("DROP STABLE st1");
+}
+
+// todo DROP stream
+
+TEST_F(ParserInitialDTest, dropTable) {
+  useDb("root", "test");
+
+  run("DROP TABLE t1");
+}
 
 TEST_F(ParserInitialDTest, dropTopic) {
   useDb("root", "test");
 
-  run("drop topic tp1");
+  run("DROP topic tp1");
 
-  run("drop topic if exists tp1");
+  run("DROP topic if exists tp1");
 }
 
 TEST_F(ParserInitialDTest, dropUser) {
   login("root");
   useDb("root", "test");
 
-  run("drop user wxy");
+  run("DROP user wxy");
 }
 
 }  // namespace ParserTest

From 0c94c65acb6e81c367f0d9364f803dbb274444e8 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Fri, 3 Jun 2022 23:13:21 +0800
Subject: [PATCH 2/2] fix(query): add ref for job

---
 source/client/src/clientImpl.c     |  2 +-
 source/libs/catalog/src/ctgAsync.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/source/client/src/clientImpl.c b/source/client/src/clientImpl.c
index 774ef5f248..4c68edaff0 100644
--- a/source/client/src/clientImpl.c
+++ b/source/client/src/clientImpl.c
@@ -1087,7 +1087,7 @@ void* doAsyncFetchRow(SRequestObj* pRequest, bool setupOneRowPtr, bool convertUc
     tsem_wait(&pParam->sem);
   }
 
-  if (pRequest->code == TSDB_CODE_SUCCESS && setupOneRowPtr) {
+  if (pRequest->code == TSDB_CODE_SUCCESS && pResultInfo->numOfRows > 0 && setupOneRowPtr) {
     doSetOneRowPtr(pResultInfo);
     pResultInfo->current += 1;
   }
diff --git a/source/libs/catalog/src/ctgAsync.c b/source/libs/catalog/src/ctgAsync.c
index 312f0c9250..a9e808e749 100644
--- a/source/libs/catalog/src/ctgAsync.c
+++ b/source/libs/catalog/src/ctgAsync.c
@@ -328,6 +328,18 @@ int32_t ctgInitJob(CTG_PARAMS, SCtgJob** job, uint64_t reqId, const SCatalogReq*
     CTG_ERR_JRET(ctgInitGetQnodeTask(pJob, taskIdx++));
   }
 
+  pJob->refId = taosAddRef(gCtgMgmt.jobPool, pJob);
+  if (pJob->refId < 0) {
+    ctgError("add job to ref failed, error: %s", tstrerror(terrno));
+    CTG_ERR_JRET(terrno);
+  }
+
+  taosAcquireRef(gCtgMgmt.jobPool, pJob->refId);
+
+  qDebug("QID:%" PRIx64 ", job %" PRIx64 " initialized, task num %d", pJob->queryId, pJob->refId, *taskNum);
+  return TSDB_CODE_SUCCESS;
+
+
 _return:
   taosMemoryFreeClear(*job);
   CTG_RET(code);