fix TD-33219

include/libs/parser/parser.h

@@ -137,6 +137,8 @@ int32_t     qResetStmtDataBlock(STableDataCxt* block, bool keepBuf);
 int32_t     qCloneStmtDataBlock(STableDataCxt** pDst, STableDataCxt* pSrc, bool reset);
 int32_t     qRebuildStmtDataBlock(STableDataCxt** pDst, STableDataCxt* pSrc, uint64_t uid, uint64_t suid, int32_t vgId,
                                   bool rebuildCreateTb);
+int32_t     qRebuildStmt2DataBlock(STableDataCxt** pDst, STableDataCxt* pSrc, uint64_t uid, uint64_t suid, int32_t vgId,
+                                   bool rebuildCreateTb, const char* tName, const char* sTableName);
 void        qDestroyStmtDataBlock(STableDataCxt* pBlock);
 STableMeta* qGetTableMetaInDataBlock(STableDataCxt* pDataBlock);
 int32_t     qCloneCurrentTbData(STableDataCxt* pDataBlock, SSubmitTbData** pData);

source/client/src/clientStmt2.c

@@ -488,7 +488,8 @@ static int32_t stmtTryAddTableVgroupInfo(STscStmt2* pStmt, int32_t* vgId) {
 static int32_t stmtRebuildDataBlock(STscStmt2* pStmt, STableDataCxt* pDataBlock, STableDataCxt** newBlock, uint64_t uid,
                                     uint64_t suid, int32_t vgId) {
   STMT_ERR_RET(stmtTryAddTableVgroupInfo(pStmt, &vgId));
-  STMT_ERR_RET(qRebuildStmtDataBlock(newBlock, pDataBlock, uid, suid, vgId, pStmt->sql.autoCreateTbl));
+  STMT_ERR_RET(qRebuildStmt2DataBlock(newBlock, pDataBlock, uid, suid, vgId, pStmt->sql.autoCreateTbl, pStmt->bInfo.sname.tname,
+                                      pStmt->bInfo.stbFName));
 
   STMT_DLOG("tableDataCxt rebuilt, uid:%" PRId64 ", vgId:%d", uid, vgId);
 

source/libs/parser/src/parInsertStmt.c

@@ -1212,6 +1212,48 @@ int32_t qRebuildStmtDataBlock(STableDataCxt** pDst, STableDataCxt* pSrc, uint64_
   return TSDB_CODE_SUCCESS;
 }
 
+int32_t qRebuildStmt2DataBlock(STableDataCxt** pDst, STableDataCxt* pSrc, uint64_t uid, uint64_t suid, int32_t vgId,
+                               bool rebuildCreateTb, const char* tName, const char* sTableName) {
+  int32_t code = qCloneStmtDataBlock(pDst, pSrc, false);
+  if (code) {
+    return code;
+  }
+
+  STableDataCxt* pBlock = (STableDataCxt*)*pDst;
+  if (pBlock->pMeta) {
+    pBlock->pMeta->uid = uid;
+    pBlock->pMeta->vgId = vgId;
+    pBlock->pMeta->suid = suid;
+  }
+
+  pBlock->pData->suid = suid;
+  pBlock->pData->uid = uid;
+
+  if (rebuildCreateTb && NULL == pBlock->pData->pCreateTbReq) {
+    pBlock->pData->pCreateTbReq = taosMemoryCalloc(1, sizeof(SVCreateTbReq));
+    if (NULL == pBlock->pData->pCreateTbReq) {
+      return terrno;
+    }
+    SArray* pTagArray = taosArrayInit(0, sizeof(STagVal));
+    SArray* tagName = taosArrayInit(0, TSDB_COL_NAME_LEN);
+
+    STag* tag = NULL;
+    code = tTagNew(pTagArray, 1, false, &tag);
+
+    code = insBuildCreateTbReq(pBlock->pData->pCreateTbReq, tName, tag, suid, sTableName, tagName, 0,
+                               TSDB_DEFAULT_TABLE_TTL);
+
+    taosArrayDestroy(pTagArray);
+    taosArrayDestroy(tagName);
+    taosMemoryFree(tag);
+    if (code) {
+      return code;
+    }
+  }
+
+  return TSDB_CODE_SUCCESS;
+}
+
 STableMeta* qGetTableMetaInDataBlock(STableDataCxt* pDataBlock) { return ((STableDataCxt*)pDataBlock)->pMeta; }
 
 void qDestroyStmtDataBlock(STableDataCxt* pBlock) {

tests/script/api/stmt2-performance.c

@@ -5,9 +5,9 @@
 #include <unistd.h>
 #include "taos.h"
 
-int CTB_NUMS = 1000;
+int CTB_NUMS = 2;
-int ROW_NUMS = 10;
+int ROW_NUMS = 2;
-int CYC_NUMS = 5;
+int CYC_NUMS = 2;
 
 void do_query(TAOS* taos, const char* sql) {
   TAOS_RES* result = taos_query(taos, sql);
@@ -57,7 +57,7 @@ void do_stmt(TAOS* taos, const char* sql) {
     return;
   }
   int             fieldNum = 0;
-  TAOS_FIELD_STB* pFields = NULL;
+  TAOS_FIELD_ALL* pFields = NULL;
   //   code = taos_stmt2_get_stb_fields(stmt, &fieldNum, &pFields);
   //   if (code != 0) {
   //     printf("failed get col,ErrCode: 0x%x, ErrMessage: %s.\n", code, taos_stmt2_error(stmt));
@@ -74,7 +74,7 @@ void do_stmt(TAOS* taos, const char* sql) {
   for (int i = 0; i < CTB_NUMS; i++) {
     tbs[i] = (char*)malloc(sizeof(char) * 20);
     sprintf(tbs[i], "ctb_%d", i);
-    createCtb(taos, tbs[i]);
+    // createCtb(taos, tbs[i]);
   }
   for (int r = 0; r < CYC_NUMS; r++) {
     // col params
@@ -138,7 +138,24 @@ void do_stmt(TAOS* taos, const char* sql) {
     end = clock();
     cpu_time_used = ((double)(end - start)) / CLOCKS_PER_SEC;
     printf("stmt2-exec [%s] insert Time used: %f seconds\n", sql, cpu_time_used);
+
+    for (int i = 0; i < CTB_NUMS; i++) {
+      free(tags[i]);
+      free(paramv[i]);
+      free(ts[i]);
+      free(b[i]);
     }
+    free(ts);
+    free(b);
+    free(ts_len);
+    free(b_len);
+    free(paramv);
+    free(tags);
+  }
+  for (int i = 0; i < CTB_NUMS; i++) {
+    free(tbs[i]);
+  }
+  free(tbs);
 
   //   taos_stmt2_free_fields(stmt, pFields);
   taos_stmt2_close(stmt);
@@ -200,10 +217,9 @@ int main() {
     exit(1);
   }
 
-  sleep(3);
   do_stmt(taos, "insert into db.stb(tbname,ts,b,t1,t2) values(?,?,?,?,?)");
   // do_stmt(taos, "insert into db.? using db.stb tags(?,?)values(?,?)");
-  do_taosc(taos);
+  // do_taosc(taos);
   taos_close(taos);
   taos_cleanup();
 }