From 9ba8d4f935204480a562cd736649089d20f48e05 Mon Sep 17 00:00:00 2001
From: Xiaoyu Wang <xiaoyuwang@taosdata.com>
Date: Mon, 16 Jan 2023 09:53:43 +0800
Subject: [PATCH] fix: rollback

---
 include/libs/parser/parser.h           |  1 -
 source/client/src/clientStmt.c         |  7 ++++++-
 source/libs/parser/src/parInsertStmt.c | 13 -------------
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/include/libs/parser/parser.h b/include/libs/parser/parser.h
index e6240f64b5..52edd9708c 100644
--- a/include/libs/parser/parser.h
+++ b/include/libs/parser/parser.h
@@ -90,7 +90,6 @@ int32_t     qCloneStmtDataBlock(void** pDst, void* pSrc);
 void        qFreeStmtDataBlock(void* pDataBlock);
 int32_t     qRebuildStmtDataBlock(void** pDst, void* pSrc, uint64_t uid, int32_t vgId);
 void        qDestroyStmtDataBlock(void* pBlock);
-void        qDestroyStmtDataBlockExt(void* pBlock);
 STableMeta* qGetTableMetaInDataBlock(void* pDataBlock);
 
 int32_t qStmtBindParams(SQuery* pQuery, TAOS_MULTI_BIND* pParams, int32_t colIdx);
diff --git a/source/client/src/clientStmt.c b/source/client/src/clientStmt.c
index 8a677d7a5e..3be1b58bad 100644
--- a/source/client/src/clientStmt.c
+++ b/source/client/src/clientStmt.c
@@ -301,7 +301,12 @@ int32_t stmtCleanExecInfo(STscStmt* pStmt, bool keepTable, bool deepClean) {
       continue;
     }
 
-    qDestroyStmtDataBlockExt(pBlocks);
+    if (STMT_TYPE_MULTI_INSERT == pStmt->sql.type) {
+      qFreeStmtDataBlock(pBlocks);
+    } else {
+      qDestroyStmtDataBlock(pBlocks);
+    }
+
     taosHashRemove(pStmt->exec.pBlockHash, key, keyLen);
 
     pIter = taosHashIterate(pStmt->exec.pBlockHash, pIter);
diff --git a/source/libs/parser/src/parInsertStmt.c b/source/libs/parser/src/parInsertStmt.c
index 8a23cd32b4..2466e784c1 100644
--- a/source/libs/parser/src/parInsertStmt.c
+++ b/source/libs/parser/src/parInsertStmt.c
@@ -476,16 +476,3 @@ void qDestroyStmtDataBlock(void* pBlock) {
   pDataBlock->cloned = false;
   insDestroyDataBlock(pDataBlock);
 }
-
-void qDestroyStmtDataBlockExt(void* pBlock) {
-  if (pBlock == NULL) {
-    return;
-  }
-
-  STableDataBlocks* pDataBlock = (STableDataBlocks*)pBlock;
-  if (pDataBlock->cloned) {
-    qFreeStmtDataBlock(pBlock);
-  } else {
-    qDestroyStmtDataBlock(pBlock);
-  }
-}