From e362a045c06595fab6e21835f72de8e536fb38ce Mon Sep 17 00:00:00 2001
From: "pengrongkun94@qq.com" <pengrongkun94@qq.com>
Date: Tue, 14 Jan 2025 17:32:10 +0800
Subject: [PATCH 01/35] test code

---
 include/libs/parser/parser.h           |  3 ++-
 source/client/src/clientStmt2.c        |  3 ++-
 source/libs/parser/src/parInsertStmt.c | 35 +++++++++++++++++++-------
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/include/libs/parser/parser.h b/include/libs/parser/parser.h
index 95f522f504..afda738b38 100644
--- a/include/libs/parser/parser.h
+++ b/include/libs/parser/parser.h
@@ -158,7 +158,8 @@ int32_t qBindStmtTagsValue(void* pBlock, void* boundTags, int64_t suid, const ch
 int32_t qStmtBindParams2(SQuery* pQuery, TAOS_STMT2_BIND* pParams, int32_t colIdx, void* charsetCxt);
 int32_t qBindStmtStbColsValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bind, char* msgBuf, int32_t msgBufLen,
                                STSchema** pTSchema, SBindInfo2* pBindInfos, void *charsetCxt);
-int32_t qBindStmtColsValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bind, char* msgBuf, int32_t msgBufLen, void *charsetCxt);
+int32_t qBindStmtColsValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bind, char* msgBuf, int32_t msgBufLen,
+                            STSchema** pTSchema, SBindInfo2* pBindInfos, void* charsetCxt);
 int32_t qBindStmtSingleColValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bind, char* msgBuf, int32_t msgBufLen,
                                  int32_t colIdx, int32_t rowNum, void *charsetCxt);
 int32_t qBindStmtTagsValue2(void* pBlock, void* boundTags, int64_t suid, const char* sTableName, char* tName,
diff --git a/source/client/src/clientStmt2.c b/source/client/src/clientStmt2.c
index 8edd60e4b5..c558935281 100644
--- a/source/client/src/clientStmt2.c
+++ b/source/client/src/clientStmt2.c
@@ -1414,7 +1414,8 @@ int stmtBindBatch2(TAOS_STMT2* stmt, TAOS_STMT2_BIND* bind, int32_t colIdx) {
                                     pStmt->exec.pRequest->msgBufLen, &pStmt->sql.siInfo.pTSchema, pStmt->sql.pBindInfo, pStmt->taos->optionInfo.charsetCxt);
     } else {
       code =
-          qBindStmtColsValue2(*pDataBlock, pCols, bind, pStmt->exec.pRequest->msgBuf, pStmt->exec.pRequest->msgBufLen, pStmt->taos->optionInfo.charsetCxt);
+          qBindStmtColsValue2(*pDataBlock, pCols, bind, pStmt->exec.pRequest->msgBuf, pStmt->exec.pRequest->msgBufLen,
+                              &pStmt->sql.siInfo.pTSchema, pStmt->sql.pBindInfo, pStmt->taos->optionInfo.charsetCxt);
     }
 
     if (code) {
diff --git a/source/libs/parser/src/parInsertStmt.c b/source/libs/parser/src/parInsertStmt.c
index 74fac463f1..9766776ee8 100644
--- a/source/libs/parser/src/parInsertStmt.c
+++ b/source/libs/parser/src/parInsertStmt.c
@@ -816,7 +816,8 @@ static int32_t convertStmtNcharCol2(SMsgBuf* pMsgBuf, SSchema* pSchema, TAOS_STM
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t qBindStmtColsValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bind, char* msgBuf, int32_t msgBufLen, void *charsetCxt) {
+int32_t qBindStmtColsValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bind, char* msgBuf, int32_t msgBufLen,
+                            STSchema** pTSchema, SBindInfo2* pBindInfos, void* charsetCxt) {
   STableDataCxt*   pDataBlock = (STableDataCxt*)pBlock;
   SSchema*         pSchema = getTableColumnSchema(pDataBlock->pMeta);
   SBoundColInfo*   boundInfo = &pDataBlock->boundColsInfo;
@@ -825,9 +826,21 @@ int32_t qBindStmtColsValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bind,
   TAOS_STMT2_BIND  ncharBind = {0};
   TAOS_STMT2_BIND* pBind = NULL;
   int32_t          code = 0;
+  int16_t          lastColId = -1;
+  bool             colInOrder = true;
+
+  if (NULL == *pTSchema) {
+    *pTSchema = tBuildTSchema(pSchema, pDataBlock->pMeta->tableInfo.numOfColumns, pDataBlock->pMeta->sversion);
+  }
 
   for (int c = 0; c < boundInfo->numOfBound; ++c) {
     SSchema*  pColSchema = &pSchema[boundInfo->pColIndex[c]];
+    if (pColSchema->colId <= lastColId) {
+      colInOrder = false;
+    } else {
+      lastColId = pColSchema->colId;
+    }
+
     SColData* pCol = taosArrayGet(pCols, c);
     if (pCol == NULL || pColSchema == NULL) {
       code = buildInvalidOperationMsg(&pBuf, "get column schema or column data failed");
@@ -852,17 +865,21 @@ int32_t qBindStmtColsValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bind,
       }
       pBind = &ncharBind;
     } else {
-      pBind = bind + c;
+      pBindInfos[c].bind = bind + c;
     }
 
-    code = tColDataAddValueByBind2(pCol, pBind,
-                                   IS_VAR_DATA_TYPE(pColSchema->type) ? pColSchema->bytes - VARSTR_HEADER_SIZE : -1,
-                                   initCtxAsText, checkWKB);
-    if (code) {
-      goto _return;
-    }
+    pBindInfos[c].columnId = pColSchema->colId;
+    pBindInfos[c].type = pColSchema->type;
+    pBindInfos[c].bytes = pColSchema->bytes;
+
+  // code = tColDataAddValueByBind2(pCol, pBind,
+  //                                IS_VAR_DATA_TYPE(pColSchema->type) ? pColSchema->bytes - VARSTR_HEADER_SIZE : -1,
+  //                                initCtxAsText, checkWKB);
+  if (code) {
+    goto _return;
   }
-
+}
+  code = tRowBuildFromBind2(pBindInfos, boundInfo->numOfBound, colInOrder, *pTSchema, pCols, &pDataBlock->ordered, &pDataBlock->duplicateTs);
   qDebug("stmt all %d columns bind %d rows data", boundInfo->numOfBound, rowNum);
 
 _return:

From 3b741a26fa818a4e30d5061ba74ed96afea0e8f1 Mon Sep 17 00:00:00 2001
From: "pengrongkun94@qq.com" <pengrongkun94@qq.com>
Date: Thu, 16 Jan 2025 21:29:43 +0800
Subject: [PATCH 02/35] fix col clone and release problem

---
 include/common/tdataformat.h           |  1 +
 source/client/src/clientStmt2.c        |  7 +++-
 source/common/src/tdataformat.c        |  9 +++++
 source/libs/parser/src/parInsertStmt.c | 56 +++++++++++++++-----------
 4 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/include/common/tdataformat.h b/include/common/tdataformat.h
index 313d1963fd..537f559e90 100644
--- a/include/common/tdataformat.h
+++ b/include/common/tdataformat.h
@@ -131,6 +131,7 @@ int32_t tValueCompare(const SValue *tv1, const SValue *tv2);
 int32_t tRowBuild(SArray *aColVal, const STSchema *pTSchema, SRow **ppRow);
 int32_t tRowGet(SRow *pRow, STSchema *pTSchema, int32_t iCol, SColVal *pColVal);
 void    tRowDestroy(SRow *pRow);
+void    tRowDataClear(SRow *pColData);
 int32_t tRowSort(SArray *aRowP);
 int32_t tRowMerge(SArray *aRowP, STSchema *pTSchema, int8_t flag);
 int32_t tRowUpsertColData(SRow *pRow, STSchema *pTSchema, SColData *aColData, int32_t nColData, int32_t flag);
diff --git a/source/client/src/clientStmt2.c b/source/client/src/clientStmt2.c
index c558935281..d9b2b4b2c5 100644
--- a/source/client/src/clientStmt2.c
+++ b/source/client/src/clientStmt2.c
@@ -1411,10 +1411,13 @@ int stmtBindBatch2(TAOS_STMT2* stmt, TAOS_STMT2_BIND* bind, int32_t colIdx) {
     if (pStmt->sql.stbInterlaceMode) {
       (*pDataBlock)->pData->flags = 0;
       code = qBindStmtStbColsValue2(*pDataBlock, pCols, bind, pStmt->exec.pRequest->msgBuf,
-                                    pStmt->exec.pRequest->msgBufLen, &pStmt->sql.siInfo.pTSchema, pStmt->sql.pBindInfo, pStmt->taos->optionInfo.charsetCxt);
+                                    pStmt->exec.pRequest->msgBufLen, &pStmt->sql.siInfo.pTSchema, pStmt->sql.pBindInfo,
+                                    pStmt->taos->optionInfo.charsetCxt);
     } else {
+      taosArrayDestroy(pCols);
+      (*pDataBlock)->pData->aCol = taosArrayInit(bind->num, POINTER_BYTES);
       code =
-          qBindStmtColsValue2(*pDataBlock, pCols, bind, pStmt->exec.pRequest->msgBuf, pStmt->exec.pRequest->msgBufLen,
+          qBindStmtColsValue2(*pDataBlock, (*pDataBlock)->pData->aRowP, bind, pStmt->exec.pRequest->msgBuf, pStmt->exec.pRequest->msgBufLen,
                               &pStmt->sql.siInfo.pTSchema, pStmt->sql.pBindInfo, pStmt->taos->optionInfo.charsetCxt);
     }
 
diff --git a/source/common/src/tdataformat.c b/source/common/src/tdataformat.c
index f8f3c0f770..1d60218825 100644
--- a/source/common/src/tdataformat.c
+++ b/source/common/src/tdataformat.c
@@ -669,6 +669,15 @@ void tRowDestroy(SRow *pRow) {
   if (pRow) taosMemoryFree(pRow);
 }
 
+void tRowDataClear(SRow *pColData) {
+  pColData->ts = 0;
+  pColData->len = 0;
+  pColData->sver = 0;
+  pColData->flag = 0;
+  pColData->numOfPKs = 0;
+}
+
+
 static int32_t tRowPCmprFn(const void *p1, const void *p2) {
   SRowKey key1, key2;
   tRowGetKey(*(SRow **)p1, &key1);
diff --git a/source/libs/parser/src/parInsertStmt.c b/source/libs/parser/src/parInsertStmt.c
index 9766776ee8..a4af0e0dd9 100644
--- a/source/libs/parser/src/parInsertStmt.c
+++ b/source/libs/parser/src/parInsertStmt.c
@@ -54,8 +54,13 @@ int32_t qCloneCurrentTbData(STableDataCxt* pDataBlock, SSubmitTbData** pData) {
 
   int32_t colNum = taosArrayGetSize(pNew->aCol);
   for (int32_t i = 0; i < colNum; ++i) {
-    SColData* pCol = (SColData*)taosArrayGet(pNew->aCol, i);
-    tColDataDeepClear(pCol);
+    if (pDataBlock->pData->flags & SUBMIT_REQ_COLUMN_DATA_FORMAT) {
+      SColData* pCol = (SColData*)taosArrayGet(pNew->aCol, i);
+      tColDataDeepClear(pCol);
+    } else {
+      SRow* pRowp = (SRow*)taosArrayGet(pNew->aCol, i);
+      tRowDataClear(pRowp);
+    }
   }
 
   return TSDB_CODE_SUCCESS;
@@ -841,12 +846,6 @@ int32_t qBindStmtColsValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bind,
       lastColId = pColSchema->colId;
     }
 
-    SColData* pCol = taosArrayGet(pCols, c);
-    if (pCol == NULL || pColSchema == NULL) {
-      code = buildInvalidOperationMsg(&pBuf, "get column schema or column data failed");
-      goto _return;
-    }
-
     if (bind[c].num != rowNum) {
       code = buildInvalidOperationMsg(&pBuf, "row number in each bind param should be the same");
       goto _return;
@@ -863,7 +862,7 @@ int32_t qBindStmtColsValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bind,
       if (code) {
         goto _return;
       }
-      pBind = &ncharBind;
+      pBindInfos[c].bind = &ncharBind;
     } else {
       pBindInfos[c].bind = bind + c;
     }
@@ -872,14 +871,14 @@ int32_t qBindStmtColsValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bind,
     pBindInfos[c].type = pColSchema->type;
     pBindInfos[c].bytes = pColSchema->bytes;
 
-  // code = tColDataAddValueByBind2(pCol, pBind,
-  //                                IS_VAR_DATA_TYPE(pColSchema->type) ? pColSchema->bytes - VARSTR_HEADER_SIZE : -1,
-  //                                initCtxAsText, checkWKB);
-  if (code) {
-    goto _return;
+    if (code) {
+      goto _return;
+    }
   }
-}
-  code = tRowBuildFromBind2(pBindInfos, boundInfo->numOfBound, colInOrder, *pTSchema, pCols, &pDataBlock->ordered, &pDataBlock->duplicateTs);
+
+  pDataBlock->pData->flags &= ~SUBMIT_REQ_COLUMN_DATA_FORMAT;
+  code = tRowBuildFromBind2(pBindInfos, boundInfo->numOfBound, colInOrder, *pTSchema, pCols, &pDataBlock->ordered,
+                            &pDataBlock->duplicateTs);
   qDebug("stmt all %d columns bind %d rows data", boundInfo->numOfBound, rowNum);
 
 _return:
@@ -1127,15 +1126,24 @@ int32_t qResetStmtDataBlock(STableDataCxt* block, bool deepClear) {
   int32_t        colNum = taosArrayGetSize(pBlock->pData->aCol);
 
   for (int32_t i = 0; i < colNum; ++i) {
-    SColData* pCol = (SColData*)taosArrayGet(pBlock->pData->aCol, i);
-    if (pCol == NULL) {
-      qError("qResetStmtDataBlock column is NULL");
-      return terrno;
-    }
-    if (deepClear) {
-      tColDataDeepClear(pCol);
+    if (pBlock->pData->flags & SUBMIT_REQ_COLUMN_DATA_FORMAT) {
+      SColData* pCol = (SColData*)taosArrayGet(pBlock->pData->aCol, i);
+      if (pCol == NULL) {
+        qError("qResetStmtDataBlock column is NULL");
+        return terrno;
+      }
+      if (deepClear) {
+        tColDataDeepClear(pCol);
+      } else {
+        tColDataClear(pCol);
+      }
     } else {
-      tColDataClear(pCol);
+      SRow* aRowP = (SRow*)taosArrayGet(pBlock->pData->aRowP, i);
+      if (aRowP == NULL) {
+        qError("qResetStmtDataBlock row pointer is NULL");
+        return terrno;
+      }
+      tRowDataClear(aRowP);
     }
   }
 

From 19e4d80835096cbe1a9668a0bc4058121c1e603a Mon Sep 17 00:00:00 2001
From: "pengrongkun94@qq.com" <pengrongkun94@qq.com>
Date: Fri, 17 Jan 2025 15:50:24 +0800
Subject: [PATCH 03/35] fix insert into ? values(?,?)

---
 source/libs/parser/src/parInsertStmt.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/libs/parser/src/parInsertStmt.c b/source/libs/parser/src/parInsertStmt.c
index a4af0e0dd9..03e071bb9e 100644
--- a/source/libs/parser/src/parInsertStmt.c
+++ b/source/libs/parser/src/parInsertStmt.c
@@ -877,6 +877,10 @@ int32_t qBindStmtColsValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bind,
   }
 
   pDataBlock->pData->flags &= ~SUBMIT_REQ_COLUMN_DATA_FORMAT;
+  if (pDataBlock->pData->pCreateTbReq != NULL) {
+    pDataBlock->pData->flags |= SUBMIT_REQ_AUTO_CREATE_TABLE;
+  }
+
   code = tRowBuildFromBind2(pBindInfos, boundInfo->numOfBound, colInOrder, *pTSchema, pCols, &pDataBlock->ordered,
                             &pDataBlock->duplicateTs);
   qDebug("stmt all %d columns bind %d rows data", boundInfo->numOfBound, rowNum);

From 0992136ef5e115f9b8178daa3599b7fa6a09871e Mon Sep 17 00:00:00 2001
From: "pengrongkun94@qq.com" <pengrongkun94@qq.com>
Date: Mon, 27 Jan 2025 12:58:07 +0800
Subject: [PATCH 04/35] fix disorder row build problem

---
 source/client/test/stmt2Test.cpp       | 72 +++++++++++++++++++++-----
 source/common/src/tdataformat.c        |  2 +-
 source/libs/parser/src/parInsertStmt.c | 32 ++++++++++++
 3 files changed, 91 insertions(+), 15 deletions(-)

diff --git a/source/client/test/stmt2Test.cpp b/source/client/test/stmt2Test.cpp
index 91f884941f..cb57ca0349 100644
--- a/source/client/test/stmt2Test.cpp
+++ b/source/client/test/stmt2Test.cpp
@@ -889,8 +889,49 @@ TEST(stmt2Case, stmt2_insert_non_statndard) {
            "double,bool_col bool,binary_col binary(20),nchar_col nchar(20),varbinary_col varbinary(20),geometry_col "
            "geometry(200)) tags(int_tag int,long_tag bigint,double_tag double,bool_tag bool,binary_tag "
            "binary(20),nchar_tag nchar(20),varbinary_tag varbinary(20),geometry_tag geometry(200));");
+  do_query(taos, "use stmt2_testdb_6");
 
-  TAOS_STMT2_OPTION option = {0, false, false, NULL, NULL};
+  TAOS_STMT2_OPTION option = {0, true, true, NULL, NULL};
+
+  // less cols and tags using stb
+  {
+    TAOS_STMT2* stmt = taos_stmt2_init(taos, &option);
+    ASSERT_NE(stmt, nullptr);
+    const char* sql = "INSERT INTO stmt2_testdb_6.? using stmt2_testdb_6.stb1 (int_tag)tags(1) (ts)  VALUES (?)";
+    int         code = taos_stmt2_prepare(stmt, sql, 0);
+    checkError(stmt, code);
+    int total_affect_rows = 0;
+
+    int     t64_len[2] = {sizeof(int64_t), sizeof(int64_t)};
+    int     tag_i = 0;
+    int     tag_l = sizeof(int);
+    int64_t ts[2] = {1591060628000, 1591060628100};
+    for (int i = 0; i < 3; i++) {
+      ts[0] += 1000;
+      ts[1] += 1000;
+
+      TAOS_STMT2_BIND tags1 = {TSDB_DATA_TYPE_INT, &tag_i, &tag_l, NULL, 1};
+      TAOS_STMT2_BIND tags2 = {TSDB_DATA_TYPE_INT, &tag_i, &tag_l, NULL, 1};
+      TAOS_STMT2_BIND params1 = {TSDB_DATA_TYPE_TIMESTAMP, &ts, &t64_len[0], NULL, 2};
+      TAOS_STMT2_BIND params2 = {TSDB_DATA_TYPE_TIMESTAMP, &ts, &t64_len[0], NULL, 2};
+
+      TAOS_STMT2_BIND* tagv[2] = {&tags1, &tags2};
+      TAOS_STMT2_BIND* paramv[2] = {&params1, &params2};
+      char*            tbname[2] = {"tb1", "tb2"};
+      TAOS_STMT2_BINDV bindv = {2, &tbname[0], NULL, &paramv[0]};
+      code = taos_stmt2_bind_param(stmt, &bindv, -1);
+      checkError(stmt, code);
+
+      int affected_rows;
+      taos_stmt2_exec(stmt, &affected_rows);
+      total_affect_rows += affected_rows;
+
+      checkError(stmt, code);
+    }
+
+    ASSERT_EQ(total_affect_rows, 12);
+    taos_stmt2_close(stmt);
+  }
 
   // less cols and tags
   {
@@ -916,7 +957,7 @@ TEST(stmt2Case, stmt2_insert_non_statndard) {
 
       TAOS_STMT2_BIND* tagv[2] = {&tags1, &tags2};
       TAOS_STMT2_BIND* paramv[2] = {&params1, &params2};
-      char*            tbname[2] = {"tb1", "tb2"};
+      char*            tbname[2] = {"tb3", "tb4"};
       TAOS_STMT2_BINDV bindv = {2, &tbname[0], &tagv[0], &paramv[0]};
       code = taos_stmt2_bind_param(stmt, &bindv, -1);
       checkError(stmt, code);
@@ -944,26 +985,29 @@ TEST(stmt2Case, stmt2_insert_non_statndard) {
     int     tag_l = sizeof(int);
     int     tag_bl = 3;
     int64_t ts[2] = {1591060628000, 1591060628100};
+    int64_t ts_2[2] = {1591060628800, 1591060628900};
     int     t64_len[2] = {sizeof(int64_t), sizeof(int64_t)};
     int     coli[2] = {1, 2};
+    int     coli_2[2] = {3, 4};
     int     ilen[2] = {sizeof(int), sizeof(int)};
     int     total_affect_rows = 0;
     for (int i = 0; i < 3; i++) {
       ts[0] += 1000;
       ts[1] += 1000;
+      ts_2[0] += 1000;
+      ts_2[1] += 1000;
 
-      TAOS_STMT2_BIND tags1[2] = {{TSDB_DATA_TYPE_BINARY, (void*)"abc", &tag_bl, NULL, 1},
-                                  {TSDB_DATA_TYPE_INT, &tag_i, &tag_l, NULL, 1}};
-      TAOS_STMT2_BIND tags2[2] = {{TSDB_DATA_TYPE_BINARY, (void*)"abc", &tag_bl, NULL, 1},
-                                  {TSDB_DATA_TYPE_INT, &tag_i, &tag_l, NULL, 1}};
-      TAOS_STMT2_BIND params1[2] = {{TSDB_DATA_TYPE_INT, &coli, &ilen[0], NULL, 2},
-                                    {TSDB_DATA_TYPE_TIMESTAMP, &ts, &t64_len[0], NULL, 2}};
-      TAOS_STMT2_BIND params2[2] = {{TSDB_DATA_TYPE_INT, &coli, &ilen[0], NULL, 2},
-                                    {TSDB_DATA_TYPE_TIMESTAMP, &ts, &t64_len[0], NULL, 2}};
+      TAOS_STMT2_BIND tags[2][2] = {
+          {{TSDB_DATA_TYPE_BINARY, (void*)"abc", &tag_bl, NULL, 1}, {TSDB_DATA_TYPE_INT, &tag_i, &tag_l, NULL, 1}},
+          {{TSDB_DATA_TYPE_BINARY, (void*)"def", &tag_bl, NULL, 1}, {TSDB_DATA_TYPE_INT, &tag_i, &tag_l, NULL, 1}}};
+      TAOS_STMT2_BIND params[2][2] = {
+          {{TSDB_DATA_TYPE_INT, &coli[0], &ilen[0], NULL, 2}, {TSDB_DATA_TYPE_TIMESTAMP, &ts[0], &t64_len[0], NULL, 2}},
+          {{TSDB_DATA_TYPE_INT, &coli_2[0], &ilen[0], NULL, 2},
+           {TSDB_DATA_TYPE_TIMESTAMP, &ts_2[0], &t64_len[0], NULL, 2}}};
 
-      TAOS_STMT2_BIND* tagv[2] = {&tags1[0], &tags2[0]};
-      TAOS_STMT2_BIND* paramv[2] = {&params1[0], &params2[0]};
-      char*            tbname[2] = {"tb3", "tb4"};
+      TAOS_STMT2_BIND* tagv[2] = {&tags[0][0], &tags[1][0]};
+      TAOS_STMT2_BIND* paramv[2] = {&params[0][0], &params[1][0]};
+      char*            tbname[2] = {"tb5", "tb6"};
       TAOS_STMT2_BINDV bindv = {2, &tbname[0], &tagv[0], &paramv[0]};
       code = taos_stmt2_bind_param(stmt, &bindv, -1);
       checkError(stmt, code);
@@ -977,7 +1021,7 @@ TEST(stmt2Case, stmt2_insert_non_statndard) {
     taos_stmt2_close(stmt);
   }
 
-  do_query(taos, "drop database if exists stmt2_testdb_6");
+  // do_query(taos, "drop database if exists stmt2_testdb_6");
   taos_close(taos);
 }
 
diff --git a/source/common/src/tdataformat.c b/source/common/src/tdataformat.c
index 1d60218825..730f861bcf 100644
--- a/source/common/src/tdataformat.c
+++ b/source/common/src/tdataformat.c
@@ -3278,7 +3278,7 @@ int32_t tRowBuildFromBind2(SBindInfo2 *infos, int32_t numOfInfos, bool infoSorte
   }
 
   if (!infoSorted) {
-    taosqsort_r(infos, numOfInfos, sizeof(SBindInfo), NULL, tBindInfoCompare);
+    taosqsort_r(infos, numOfInfos, sizeof(SBindInfo2), NULL, tBindInfoCompare);
   }
 
   int32_t code = 0;
diff --git a/source/libs/parser/src/parInsertStmt.c b/source/libs/parser/src/parInsertStmt.c
index 03e071bb9e..91dea5742a 100644
--- a/source/libs/parser/src/parInsertStmt.c
+++ b/source/libs/parser/src/parInsertStmt.c
@@ -744,6 +744,22 @@ int32_t qBindStmtStbColsValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bin
         goto _return;
       }
       pBindInfos[c].bind = taosArrayGetLast(ncharBinds);
+    } else if (TSDB_DATA_TYPE_GEOMETRY == pColSchema->type) {
+      code = initCtxAsText();
+      if (code) {
+        qError("geometry init failed");
+        goto _return;
+      }
+      uint8_t* buf = bind[c].buffer;
+      for (int j = 0; j < bind[c].num; j++) {
+        code = checkWKB(buf, bind[c].length[j]);
+        if (code) {
+          qError("geometry data must be in WKB format");
+          goto _return;
+        }
+        buf += bind[c].length[j];
+      }
+      pBindInfos[c].bind = bind + c;
     } else {
       pBindInfos[c].bind = bind + c;
     }
@@ -863,6 +879,22 @@ int32_t qBindStmtColsValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bind,
         goto _return;
       }
       pBindInfos[c].bind = &ncharBind;
+    } else if (TSDB_DATA_TYPE_GEOMETRY == pColSchema->type) {
+      code = initCtxAsText();
+      if (code) {
+        qError("geometry init failed");
+        goto _return;
+      }
+      uint8_t *buf = bind[c].buffer;
+      for (int j = 0; j < bind[c].num; j++) {
+        code = checkWKB(buf, bind[c].length[j]);
+        if (code) {
+          qError("geometry data must be in WKB format");
+          goto _return;
+        }
+        buf += bind[c].length[j];
+      }
+      pBindInfos[c].bind = bind + c;
     } else {
       pBindInfos[c].bind = bind + c;
     }

From 2279e931b83c3e16b20f1bcb27c129766e8e3712 Mon Sep 17 00:00:00 2001
From: "pengrongkun94@qq.com" <pengrongkun94@qq.com>
Date: Wed, 5 Feb 2025 18:30:30 +0800
Subject: [PATCH 05/35] fix row clear problem

---
 include/common/tdataformat.h           |  1 -
 source/client/src/clientStmt2.c        |  2 +-
 source/common/src/tdataformat.c        |  9 ---------
 source/libs/parser/src/parInsertStmt.c | 10 ++--------
 4 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/include/common/tdataformat.h b/include/common/tdataformat.h
index 537f559e90..313d1963fd 100644
--- a/include/common/tdataformat.h
+++ b/include/common/tdataformat.h
@@ -131,7 +131,6 @@ int32_t tValueCompare(const SValue *tv1, const SValue *tv2);
 int32_t tRowBuild(SArray *aColVal, const STSchema *pTSchema, SRow **ppRow);
 int32_t tRowGet(SRow *pRow, STSchema *pTSchema, int32_t iCol, SColVal *pColVal);
 void    tRowDestroy(SRow *pRow);
-void    tRowDataClear(SRow *pColData);
 int32_t tRowSort(SArray *aRowP);
 int32_t tRowMerge(SArray *aRowP, STSchema *pTSchema, int8_t flag);
 int32_t tRowUpsertColData(SRow *pRow, STSchema *pTSchema, SColData *aColData, int32_t nColData, int32_t flag);
diff --git a/source/client/src/clientStmt2.c b/source/client/src/clientStmt2.c
index df92ea6dfd..6c50dbba81 100644
--- a/source/client/src/clientStmt2.c
+++ b/source/client/src/clientStmt2.c
@@ -1430,7 +1430,7 @@ int stmtBindBatch2(TAOS_STMT2* stmt, TAOS_STMT2_BIND* bind, int32_t colIdx) {
                                     pStmt->taos->optionInfo.charsetCxt);
     } else {
       taosArrayDestroy(pCols);
-      (*pDataBlock)->pData->aCol = taosArrayInit(bind->num, POINTER_BYTES);
+      (*pDataBlock)->pData->aCol = taosArrayInit(20, POINTER_BYTES);
       code =
           qBindStmtColsValue2(*pDataBlock, (*pDataBlock)->pData->aRowP, bind, pStmt->exec.pRequest->msgBuf, pStmt->exec.pRequest->msgBufLen,
                               &pStmt->sql.siInfo.pTSchema, pStmt->sql.pBindInfo, pStmt->taos->optionInfo.charsetCxt);
diff --git a/source/common/src/tdataformat.c b/source/common/src/tdataformat.c
index 730f861bcf..f9deb2fcbf 100644
--- a/source/common/src/tdataformat.c
+++ b/source/common/src/tdataformat.c
@@ -669,15 +669,6 @@ void tRowDestroy(SRow *pRow) {
   if (pRow) taosMemoryFree(pRow);
 }
 
-void tRowDataClear(SRow *pColData) {
-  pColData->ts = 0;
-  pColData->len = 0;
-  pColData->sver = 0;
-  pColData->flag = 0;
-  pColData->numOfPKs = 0;
-}
-
-
 static int32_t tRowPCmprFn(const void *p1, const void *p2) {
   SRowKey key1, key2;
   tRowGetKey(*(SRow **)p1, &key1);
diff --git a/source/libs/parser/src/parInsertStmt.c b/source/libs/parser/src/parInsertStmt.c
index 91dea5742a..0a4025ccac 100644
--- a/source/libs/parser/src/parInsertStmt.c
+++ b/source/libs/parser/src/parInsertStmt.c
@@ -58,8 +58,7 @@ int32_t qCloneCurrentTbData(STableDataCxt* pDataBlock, SSubmitTbData** pData) {
       SColData* pCol = (SColData*)taosArrayGet(pNew->aCol, i);
       tColDataDeepClear(pCol);
     } else {
-      SRow* pRowp = (SRow*)taosArrayGet(pNew->aCol, i);
-      tRowDataClear(pRowp);
+      pNew->aCol = taosArrayInit(20, POINTER_BYTES);
     }
   }
 
@@ -1174,12 +1173,7 @@ int32_t qResetStmtDataBlock(STableDataCxt* block, bool deepClear) {
         tColDataClear(pCol);
       }
     } else {
-      SRow* aRowP = (SRow*)taosArrayGet(pBlock->pData->aRowP, i);
-      if (aRowP == NULL) {
-        qError("qResetStmtDataBlock row pointer is NULL");
-        return terrno;
-      }
-      tRowDataClear(aRowP);
+      pBlock->pData->aRowP = taosArrayInit(20, POINTER_BYTES);
     }
   }
 

From b980bb35bc3dc9f3a726e1919a6f668d7a95b63d Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Thu, 20 Feb 2025 18:08:20 +0800
Subject: [PATCH 06/35] more code

---
 source/dnode/vnode/CMakeLists.txt           |  1 +
 source/dnode/vnode/src/inc/vnodeInt.h       |  6 +-
 source/dnode/vnode/src/meta/metaOpen.c      |  2 +-
 tests/test_new/storage/test_compact_meta.py | 85 +++++++++++++++++++++
 4 files changed, 92 insertions(+), 2 deletions(-)
 create mode 100644 tests/test_new/storage/test_compact_meta.py

diff --git a/source/dnode/vnode/CMakeLists.txt b/source/dnode/vnode/CMakeLists.txt
index b90e1844ae..1df28336b5 100644
--- a/source/dnode/vnode/CMakeLists.txt
+++ b/source/dnode/vnode/CMakeLists.txt
@@ -96,6 +96,7 @@ if(TD_VNODE_PLUGINS)
         vnode
         PRIVATE
         ${TD_ENTERPRISE_DIR}/src/plugins/vnode/src/tsdbCompact.c
+        ${TD_ENTERPRISE_DIR}/src/plugins/vnode/src/metaCompact.c
         ${TD_ENTERPRISE_DIR}/src/plugins/vnode/src/tsdbCompactMonitor.c
         ${TD_ENTERPRISE_DIR}/src/plugins/vnode/src/vnodeCompact.c
     )
diff --git a/source/dnode/vnode/src/inc/vnodeInt.h b/source/dnode/vnode/src/inc/vnodeInt.h
index 5a61c1c124..27ee54ec70 100644
--- a/source/dnode/vnode/src/inc/vnodeInt.h
+++ b/source/dnode/vnode/src/inc/vnodeInt.h
@@ -486,7 +486,11 @@ struct SVnode {
   // commit variables
   SVATaskID commitTask;
 
-  SMeta*        pMeta;
+  struct {
+    SMeta* pMeta;
+    SMeta* pNewMeta;
+  };
+
   SSma*         pSma;
   STsdb*        pTsdb;
   SWal*         pWal;
diff --git a/source/dnode/vnode/src/meta/metaOpen.c b/source/dnode/vnode/src/meta/metaOpen.c
index 35e761e51e..5e185e3bb2 100644
--- a/source/dnode/vnode/src/meta/metaOpen.c
+++ b/source/dnode/vnode/src/meta/metaOpen.c
@@ -133,7 +133,7 @@ static void doScan(SMeta *pMeta) {
   }
 }
 
-static int32_t metaOpenImpl(SVnode *pVnode, SMeta **ppMeta, const char *metaDir, int8_t rollback) {
+int32_t metaOpenImpl(SVnode *pVnode, SMeta **ppMeta, const char *metaDir, int8_t rollback) {
   SMeta  *pMeta = NULL;
   int32_t code = 0;
   int32_t lino;
diff --git a/tests/test_new/storage/test_compact_meta.py b/tests/test_new/storage/test_compact_meta.py
new file mode 100644
index 0000000000..e1ee134c6a
--- /dev/null
+++ b/tests/test_new/storage/test_compact_meta.py
@@ -0,0 +1,85 @@
+# tests/test_new/xxx/xxx/test_xxx.py
+# import ...
+
+import random
+import taos
+
+
+class TestXxxx:
+    def init(self):
+        tdLog.debug("start to execute %s" % __file__)
+
+    def test_template(self):
+        """用例目标，必填，用一行简短总结
+        <空行>
+        用例详细描述，必填，允许多行
+        <空行>
+        Since: 用例开始支持的TDengine版本，新增用例必填
+        <空行>
+        Labels: 筛选标签，选填，多个标签用英文逗号分隔
+        <空行>
+        Jira: 相关jira任务id，选填
+        <空行>
+        History: 用例变更历史，选填，每行一次变更信息
+            - 日期1 变更人1 变更原因1
+            - 日期2 变更人2 变更原因2
+        """
+
+    def test_demo(self):
+        """测试超级表插入各种数据类型
+
+        使用多种数据类型创建超级表，向超级表插入数据，
+        包括：常规数据，空数据，边界值等，插入均执行成功
+
+        Since: v3.3.0.0
+
+        Labels: stable, data_type
+
+        Jira: TD-12345, TS-1234
+
+        History:
+            - 2024-2-6 Feng Chao Created
+            - 2024-2-7 Huo Hong updated for feature TD-23456
+        """
+
+    def test_case1(self):
+        dbname = 'db'
+        super_table = "stb"
+        child_table_prefix = "ctb"
+        num_of_child_tables = 10000
+        max_alter_times = 100
+
+        # Create database
+        tdSql.query(f'create database {dbname} vgroups 1')
+
+        # Create super table
+        sql = f'create {dbname}.{super_table} (ts timestamp, c1 int) tags (tag1 int)'
+        tdSql.query(sql)
+
+        # Create child tables
+        for i in range(num_of_child_tables):
+            sql = f'create {dbname}.{child_table_prefix}{i} using {dbname}.{super_table} tags ({i})'
+            tdSql.query(sql)
+
+        # Alter child tables
+        for i in range(num_of_child_tables):
+            for j in range(random.randint(1, max_alter_times)):
+                sql = f'alter table {dbname}.{child_table_prefix}{i} set tag1 = {i + j}'
+                tdSql.query(sql)
+
+        # Alter super tables
+        for i in range(random.randint(1, max_alter_times)):
+            sql = f'alter table {dbname}.{super_table} add column c{i+1} int'
+            tdSql.query(sql)
+
+        # Compact meta
+        sql = f'compact database {dbname}'
+        tdSql.query(sql)
+
+    def run(self):
+        self.test_template()
+        self.test_demo()
+        self.test_case1()
+
+    def stop(self):
+        tdLog.success("%s successfully executed" % __file__)

From b048c597dcca55da4e0344b9f8b66b55c64e1a41 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Mon, 24 Feb 2025 14:41:56 +0800
Subject: [PATCH 07/35] more code

---
 source/dnode/vnode/src/inc/meta.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/source/dnode/vnode/src/inc/meta.h b/source/dnode/vnode/src/inc/meta.h
index c05953c67d..53e1e0b6c7 100644
--- a/source/dnode/vnode/src/inc/meta.h
+++ b/source/dnode/vnode/src/inc/meta.h
@@ -24,7 +24,6 @@
 extern "C" {
 #endif
 
-typedef struct SMetaIdx   SMetaIdx;
 typedef struct SMetaDB    SMetaDB;
 typedef struct SMetaCache SMetaCache;
 
@@ -103,8 +102,6 @@ struct SMeta {
   // stream
   TTB* pStreamDb;
 
-  SMetaIdx* pIdx;
-
   SMetaCache* pCache;
 };
 

From b01ed3bb80f17273bbed01a0f20b8ac354ce2991 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Mon, 24 Feb 2025 15:32:46 +0800
Subject: [PATCH 08/35] more code

---
 source/dnode/mgmt/exe/dmMain.c         |   4 -
 source/dnode/vnode/src/meta/metaOpen.c | 191 +++----------------------
 2 files changed, 22 insertions(+), 173 deletions(-)

diff --git a/source/dnode/mgmt/exe/dmMain.c b/source/dnode/mgmt/exe/dmMain.c
index bd7da3f4d6..51476757e5 100644
--- a/source/dnode/mgmt/exe/dmMain.c
+++ b/source/dnode/mgmt/exe/dmMain.c
@@ -170,8 +170,6 @@ static void dmSetSignalHandle() {
 #endif
 }
 
-extern bool generateNewMeta;
-
 static int32_t dmParseArgs(int32_t argc, char const *argv[]) {
   global.startTime = taosGetTimestampMs();
 
@@ -210,8 +208,6 @@ static int32_t dmParseArgs(int32_t argc, char const *argv[]) {
       global.dumpSdb = true;
     } else if (strcmp(argv[i], "-dTxn") == 0) {
       global.deleteTrans = true;
-    } else if (strcmp(argv[i], "-r") == 0) {
-      generateNewMeta = true;
     } else if (strcmp(argv[i], "-E") == 0) {
       if (i < argc - 1) {
         if (strlen(argv[++i]) >= PATH_MAX) {
diff --git a/source/dnode/vnode/src/meta/metaOpen.c b/source/dnode/vnode/src/meta/metaOpen.c
index 5e185e3bb2..b80351d144 100644
--- a/source/dnode/vnode/src/meta/metaOpen.c
+++ b/source/dnode/vnode/src/meta/metaOpen.c
@@ -251,187 +251,40 @@ _exit:
   return code;
 }
 
-bool generateNewMeta = false;
-
-static int32_t metaGenerateNewMeta(SMeta **ppMeta) {
-  SMeta  *pNewMeta = NULL;
-  SMeta  *pMeta = *ppMeta;
-  SVnode *pVnode = pMeta->pVnode;
-
-  metaInfo("vgId:%d start to generate new meta", TD_VID(pMeta->pVnode));
-
-  // Open a new meta for orgainzation
-  int32_t code = metaOpenImpl(pMeta->pVnode, &pNewMeta, VNODE_META_TMP_DIR, false);
-  if (code) {
-    return code;
-  }
-
-  code = metaBegin(pNewMeta, META_BEGIN_HEAP_NIL);
-  if (code) {
-    return code;
-  }
-
-  // i == 0, scan super table
-  // i == 1, scan normal table and child table
-  for (int i = 0; i < 2; i++) {
-    TBC    *uidCursor = NULL;
-    int32_t counter = 0;
-
-    code = tdbTbcOpen(pMeta->pUidIdx, &uidCursor, NULL);
-    if (code) {
-      metaError("vgId:%d failed to open uid index cursor, reason:%s", TD_VID(pVnode), tstrerror(code));
-      return code;
-    }
-
-    code = tdbTbcMoveToFirst(uidCursor);
-    if (code) {
-      metaError("vgId:%d failed to move to first, reason:%s", TD_VID(pVnode), tstrerror(code));
-      tdbTbcClose(uidCursor);
-      return code;
-    }
-
-    for (;;) {
-      const void *pKey;
-      int         kLen;
-      const void *pVal;
-      int         vLen;
-
-      if (tdbTbcGet(uidCursor, &pKey, &kLen, &pVal, &vLen) < 0) {
-        break;
-      }
-
-      tb_uid_t    uid = *(tb_uid_t *)pKey;
-      SUidIdxVal *pUidIdxVal = (SUidIdxVal *)pVal;
-      if ((i == 0 && (pUidIdxVal->suid && pUidIdxVal->suid == uid))          // super table
-          || (i == 1 && (pUidIdxVal->suid == 0 || pUidIdxVal->suid != uid))  // normal table and child table
-      ) {
-        counter++;
-        if (i == 0) {
-          metaInfo("vgId:%d counter:%d new meta handle %s table uid:%" PRId64, TD_VID(pVnode), counter, "super", uid);
-        } else {
-          metaInfo("vgId:%d counter:%d new meta handle %s table uid:%" PRId64, TD_VID(pVnode), counter,
-                   pUidIdxVal->suid == 0 ? "normal" : "child", uid);
-        }
-
-        // fetch table entry
-        void *value = NULL;
-        int   valueSize = 0;
-        if (tdbTbGet(pMeta->pTbDb,
-                     &(STbDbKey){
-                         .version = pUidIdxVal->version,
-                         .uid = uid,
-                     },
-                     sizeof(uid), &value, &valueSize) == 0) {
-          SDecoder   dc = {0};
-          SMetaEntry me = {0};
-          tDecoderInit(&dc, value, valueSize);
-          if (metaDecodeEntry(&dc, &me) == 0) {
-            if (me.type == TSDB_CHILD_TABLE &&
-                tdbTbGet(pMeta->pUidIdx, &me.ctbEntry.suid, sizeof(me.ctbEntry.suid), NULL, NULL) != 0) {
-              metaError("vgId:%d failed to get super table uid:%" PRId64 " for child table uid:%" PRId64,
-                        TD_VID(pVnode), me.ctbEntry.suid, uid);
-            } else if (metaHandleEntry2(pNewMeta, &me) != 0) {
-              metaError("vgId:%d failed to handle entry, uid:%" PRId64, TD_VID(pVnode), uid);
-            }
-          }
-          tDecoderClear(&dc);
-        }
-        tdbFree(value);
-      }
-
-      code = tdbTbcMoveToNext(uidCursor);
-      if (code) {
-        metaError("vgId:%d failed to move to next, reason:%s", TD_VID(pVnode), tstrerror(code));
-        return code;
-      }
-    }
-
-    tdbTbcClose(uidCursor);
-  }
-
-  code = metaCommit(pNewMeta, pNewMeta->txn);
-  if (code) {
-    metaError("vgId:%d failed to commit, reason:%s", TD_VID(pVnode), tstrerror(code));
-    return code;
-  }
-
-  code = metaFinishCommit(pNewMeta, pNewMeta->txn);
-  if (code) {
-    metaError("vgId:%d failed to finish commit, reason:%s", TD_VID(pVnode), tstrerror(code));
-    return code;
-  }
-
-  if ((code = metaBegin(pNewMeta, META_BEGIN_HEAP_NIL)) != 0) {
-    metaError("vgId:%d failed to begin new meta, reason:%s", TD_VID(pVnode), tstrerror(code));
-  }
-  metaClose(&pNewMeta);
-  metaInfo("vgId:%d finish to generate new meta", TD_VID(pVnode));
-  return 0;
+void vnodeGetMetaPath(SVnode *pVnode, const char *metaDir, char *fname) {
+  vnodeGetPrimaryDir(pVnode->path, pVnode->diskPrimary, pVnode->pTfs, fname, TSDB_FILENAME_LEN);
+  int32_t offset = strlen(fname);
+  snprintf(fname + offset, TSDB_FILENAME_LEN - offset - 1, "%s%s", TD_DIRSEP, metaDir);
 }
 
 int32_t metaOpen(SVnode *pVnode, SMeta **ppMeta, int8_t rollback) {
-  if (generateNewMeta) {
-    char path[TSDB_FILENAME_LEN] = {0};
-    char oldMetaPath[TSDB_FILENAME_LEN] = {0};
-    char newMetaPath[TSDB_FILENAME_LEN] = {0};
-    char backupMetaPath[TSDB_FILENAME_LEN] = {0};
+  int32_t code = TSDB_CODE_SUCCESS;
+  char    metaDir[TSDB_FILENAME_LEN] = {0};
+  char    metaTempDir[TSDB_FILENAME_LEN] = {0};
 
-    vnodeGetPrimaryDir(pVnode->path, pVnode->diskPrimary, pVnode->pTfs, path, TSDB_FILENAME_LEN);
-    snprintf(oldMetaPath, sizeof(oldMetaPath) - 1, "%s%s%s", path, TD_DIRSEP, VNODE_META_DIR);
-    snprintf(newMetaPath, sizeof(newMetaPath) - 1, "%s%s%s", path, TD_DIRSEP, VNODE_META_TMP_DIR);
-    snprintf(backupMetaPath, sizeof(backupMetaPath) - 1, "%s%s%s", path, TD_DIRSEP, VNODE_META_BACKUP_DIR);
+  vnodeGetMetaPath(pVnode, VNODE_META_DIR, metaDir);
+  vnodeGetMetaPath(pVnode, VNODE_META_TMP_DIR, metaTempDir);
 
-    bool oldMetaExist = taosCheckExistFile(oldMetaPath);
-    bool newMetaExist = taosCheckExistFile(newMetaPath);
-    bool backupMetaExist = taosCheckExistFile(backupMetaPath);
-
-    if ((!backupMetaExist && !oldMetaExist && newMetaExist)     // case 2
-        || (backupMetaExist && !oldMetaExist && !newMetaExist)  // case 4
-        || (backupMetaExist && oldMetaExist && newMetaExist)    // case 8
-    ) {
-      metaError("vgId:%d invalid meta state, please check", TD_VID(pVnode));
+  // Check file states
+  if (!taosCheckExistFile(metaDir)) {
+    if (!taosCheckExistFile(metaTempDir)) {
+      metaError("vgId:%d, cannot find meta dir:%s and meta temp dir:%s", TD_VID(pVnode), metaDir, metaTempDir);
       return TSDB_CODE_FAILED;
-    } else if ((backupMetaExist && oldMetaExist && !newMetaExist)       // case 7
-               || (!backupMetaExist && !oldMetaExist && !newMetaExist)  // case 1
-    ) {
-      return metaOpenImpl(pVnode, ppMeta, VNODE_META_DIR, rollback);
-    } else if (backupMetaExist && !oldMetaExist && newMetaExist) {
-      if (taosRenameFile(newMetaPath, oldMetaPath) != 0) {
-        metaError("vgId:%d failed to rename new meta to old meta, reason:%s", TD_VID(pVnode), tstrerror(terrno));
-        return terrno;
-      }
-      return metaOpenImpl(pVnode, ppMeta, VNODE_META_DIR, rollback);
     } else {
-      int32_t code = metaOpenImpl(pVnode, ppMeta, VNODE_META_DIR, rollback);
+      code = taosRenameFile(metaTempDir, metaDir);
       if (code) {
-        return code;
-      }
-
-      code = metaGenerateNewMeta(ppMeta);
-      if (code) {
-        metaError("vgId:%d failed to generate new meta, reason:%s", TD_VID(pVnode), tstrerror(code));
-      }
-
-      metaClose(ppMeta);
-      if (taosRenameFile(oldMetaPath, backupMetaPath) != 0) {
-        metaError("vgId:%d failed to rename old meta to backup, reason:%s", TD_VID(pVnode), tstrerror(terrno));
-        return terrno;
-      }
-
-      // rename the new meta to old meta
-      if (taosRenameFile(newMetaPath, oldMetaPath) != 0) {
-        metaError("vgId:%d failed to rename new meta to old meta, reason:%s", TD_VID(pVnode), tstrerror(terrno));
-        return terrno;
-      }
-      code = metaOpenImpl(pVnode, ppMeta, VNODE_META_DIR, false);
-      if (code) {
-        metaError("vgId:%d failed to open new meta, reason:%s", TD_VID(pVnode), tstrerror(code));
+        metaError("vgId:%d, %s failed at %s:%d since %s: rename %s to %s failed", TD_VID(pVnode), __func__, __FILE__,
+                  __LINE__, tstrerror(code), metaTempDir, metaDir);
         return code;
       }
     }
+  }
 
-  } else {
-    return metaOpenImpl(pVnode, ppMeta, VNODE_META_DIR, rollback);
+  // Do open meta
+  code = metaOpenImpl(pVnode, ppMeta, metaDir, rollback);
+  if (code) {
+    metaError("vgId:%d, %s failed at %s:%d since %s", TD_VID(pVnode), __func__, __FILE__, __LINE__, tstrerror(code));
+    return code;
   }
 
   return TSDB_CODE_SUCCESS;

From 9a95abd26d2ec104febad4b771e0e909de6ab134 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Mon, 24 Feb 2025 16:32:09 +0800
Subject: [PATCH 09/35] more code

---
 source/dnode/vnode/src/meta/metaEntry.c    |  9 +++-
 source/dnode/vnode/src/meta/metaOpen.c     | 19 +++----
 source/dnode/vnode/src/meta/metaSnapshot.c | 59 +++++++++++++++++++---
 3 files changed, 67 insertions(+), 20 deletions(-)

diff --git a/source/dnode/vnode/src/meta/metaEntry.c b/source/dnode/vnode/src/meta/metaEntry.c
index 302a1eb04a..a234ea257c 100644
--- a/source/dnode/vnode/src/meta/metaEntry.c
+++ b/source/dnode/vnode/src/meta/metaEntry.c
@@ -135,12 +135,17 @@ int metaEncodeEntry(SEncoder *pCoder, const SMetaEntry *pME) {
   return 0;
 }
 
-int metaDecodeEntry(SDecoder *pCoder, SMetaEntry *pME) {
+int metaDecodeEntryImpl(SDecoder *pCoder, SMetaEntry *pME, bool headerOnly) {
   TAOS_CHECK_RETURN(tStartDecode(pCoder));
   TAOS_CHECK_RETURN(tDecodeI64(pCoder, &pME->version));
   TAOS_CHECK_RETURN(tDecodeI8(pCoder, &pME->type));
   TAOS_CHECK_RETURN(tDecodeI64(pCoder, &pME->uid));
 
+  if (headerOnly) {
+    tEndDecode(pCoder);
+    return 0;
+  }
+
   if (pME->type > 0) {
     TAOS_CHECK_RETURN(tDecodeCStr(pCoder, &pME->name));
 
@@ -209,6 +214,8 @@ int metaDecodeEntry(SDecoder *pCoder, SMetaEntry *pME) {
   return 0;
 }
 
+int metaDecodeEntry(SDecoder *pCoder, SMetaEntry *pME) { return metaDecodeEntryImpl(pCoder, pME, false); }
+
 static int32_t metaCloneSchema(const SSchemaWrapper *pSrc, SSchemaWrapper *pDst) {
   if (pSrc == NULL || pDst == NULL) {
     return TSDB_CODE_INVALID_PARA;
diff --git a/source/dnode/vnode/src/meta/metaOpen.c b/source/dnode/vnode/src/meta/metaOpen.c
index b80351d144..15debf07f8 100644
--- a/source/dnode/vnode/src/meta/metaOpen.c
+++ b/source/dnode/vnode/src/meta/metaOpen.c
@@ -266,22 +266,17 @@ int32_t metaOpen(SVnode *pVnode, SMeta **ppMeta, int8_t rollback) {
   vnodeGetMetaPath(pVnode, VNODE_META_TMP_DIR, metaTempDir);
 
   // Check file states
-  if (!taosCheckExistFile(metaDir)) {
-    if (!taosCheckExistFile(metaTempDir)) {
-      metaError("vgId:%d, cannot find meta dir:%s and meta temp dir:%s", TD_VID(pVnode), metaDir, metaTempDir);
-      return TSDB_CODE_FAILED;
-    } else {
-      code = taosRenameFile(metaTempDir, metaDir);
-      if (code) {
-        metaError("vgId:%d, %s failed at %s:%d since %s: rename %s to %s failed", TD_VID(pVnode), __func__, __FILE__,
-                  __LINE__, tstrerror(code), metaTempDir, metaDir);
-        return code;
-      }
+  if (!taosCheckExistFile(metaDir) && taosCheckExistFile(metaTempDir)) {
+    code = taosRenameFile(metaTempDir, metaDir);
+    if (code) {
+      metaError("vgId:%d, %s failed at %s:%d since %s: rename %s to %s failed", TD_VID(pVnode), __func__, __FILE__,
+                __LINE__, tstrerror(code), metaTempDir, metaDir);
+      return code;
     }
   }
 
   // Do open meta
-  code = metaOpenImpl(pVnode, ppMeta, metaDir, rollback);
+  code = metaOpenImpl(pVnode, ppMeta, VNODE_META_DIR, rollback);
   if (code) {
     metaError("vgId:%d, %s failed at %s:%d since %s", TD_VID(pVnode), __func__, __FILE__, __LINE__, tstrerror(code));
     return code;
diff --git a/source/dnode/vnode/src/meta/metaSnapshot.c b/source/dnode/vnode/src/meta/metaSnapshot.c
index b227653e5e..64693274f4 100644
--- a/source/dnode/vnode/src/meta/metaSnapshot.c
+++ b/source/dnode/vnode/src/meta/metaSnapshot.c
@@ -21,6 +21,7 @@ struct SMetaSnapReader {
   int64_t sver;
   int64_t ever;
   TBC*    pTbc;
+  int32_t iLoop;
 };
 
 int32_t metaSnapReaderOpen(SMeta* pMeta, int64_t sver, int64_t ever, SMetaSnapReader** ppReader) {
@@ -65,6 +66,22 @@ void metaSnapReaderClose(SMetaSnapReader** ppReader) {
   }
 }
 
+extern int metaDecodeEntryImpl(SDecoder* pCoder, SMetaEntry* pME, bool headerOnly);
+
+static int32_t metaDecodeEntryHeader(void* data, int32_t size, SMetaEntry* entry) {
+  SDecoder decoder = {0};
+  tDecoderInit(&decoder, (uint8_t*)data, size);
+
+  int32_t code = metaDecodeEntryImpl(&decoder, entry, true);
+  if (code) {
+    tDecoderClear(&decoder);
+    return code;
+  }
+
+  tDecoderClear(&decoder);
+  return 0;
+}
+
 int32_t metaSnapRead(SMetaSnapReader* pReader, uint8_t** ppData) {
   int32_t     code = 0;
   const void* pKey = NULL;
@@ -72,19 +89,47 @@ int32_t metaSnapRead(SMetaSnapReader* pReader, uint8_t** ppData) {
   int32_t     nKey = 0;
   int32_t     nData = 0;
   STbDbKey    key;
+  int32_t     c;
 
   *ppData = NULL;
-  for (;;) {
-    if (tdbTbcGet(pReader->pTbc, &pKey, &nKey, &pData, &nData)) {
+  while (pReader->iLoop < 2) {
+    if (tdbTbcGet(pReader->pTbc, &pKey, &nKey, &pData, &nData) != 0 || ((STbDbKey*)pKey)->version > pReader->ever) {
+      pReader->iLoop++;
+
+      // Reopen the cursor to read from the beginning
+      tdbTbcClose(pReader->pTbc);
+      pReader->pTbc = NULL;
+      code = tdbTbcOpen(pReader->pMeta->pTbDb, &pReader->pTbc, NULL);
+      if (code) {
+        metaError("vgId:%d, %s failed at %s:%d since %s", TD_VID(pReader->pMeta->pVnode), __func__, __FILE__, __LINE__,
+                  tstrerror(code));
+        goto _exit;
+      }
+
+      code = tdbTbcMoveTo(pReader->pTbc, &(STbDbKey){.version = pReader->sver, .uid = INT64_MIN}, sizeof(STbDbKey), &c);
+      if (code) {
+        metaError("vgId:%d, %s failed at %s:%d since %s", TD_VID(pReader->pMeta->pVnode), __func__, __FILE__, __LINE__,
+                  tstrerror(code));
+        goto _exit;
+      }
+
+      continue;
+    }
+
+    // Decode meta entry
+    SMetaEntry entry = {0};
+    code = metaDecodeEntryHeader((void*)pData, nData, &entry);
+    if (code) {
+      metaError("vgId:%d, %s failed at %s:%d since %s", TD_VID(pReader->pMeta->pVnode), __func__, __FILE__, __LINE__,
+                tstrerror(code));
       goto _exit;
     }
 
     key = ((STbDbKey*)pKey)[0];
-    if (key.version > pReader->ever) {
-      goto _exit;
-    }
-
-    if (key.version < pReader->sver) {
+    if (key.version < pReader->sver                                       //
+        || (pReader->iLoop == 0 && TABS(entry.type) != TSDB_SUPER_TABLE)  // First loop send super table entry
+        || (pReader->iLoop == 1 && TABS(entry.type) == TSDB_SUPER_TABLE)  // Second loop send non-super table entry
+    ) {
       if (tdbTbcMoveToNext(pReader->pTbc) != 0) {
         metaTrace("vgId:%d, vnode snapshot meta read data done", TD_VID(pReader->pMeta->pVnode));
       }

From d48547ed6443e700d03740f96cde0487d5cdde07 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Tue, 25 Feb 2025 16:48:43 +0800
Subject: [PATCH 10/35] more code

---
 include/common/tmsg.h                    |  2 ++
 include/libs/nodes/cmdnodes.h            |  2 ++
 source/common/src/msg/tmsg.c             | 15 +++++++++++++++
 source/dnode/mnode/impl/src/mndCompact.c |  5 +++--
 source/libs/parser/inc/parAst.h          |  4 ++--
 source/libs/parser/inc/sql.y             |  9 +++++++--
 source/libs/parser/src/parAstCreater.c   |  6 ++++--
 source/libs/parser/src/parTokenizer.c    |  3 ++-
 source/libs/parser/src/parTranslater.c   | 12 ++++++++----
 9 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/include/common/tmsg.h b/include/common/tmsg.h
index 6d58748a3b..1ce8da415c 100644
--- a/include/common/tmsg.h
+++ b/include/common/tmsg.h
@@ -1639,6 +1639,7 @@ typedef struct {
   int32_t     sqlLen;
   char*       sql;
   SArray*     vgroupIds;
+  int8_t      metaOnly;
 } SCompactDbReq;
 
 int32_t tSerializeSCompactDbReq(void* buf, int32_t bufLen, SCompactDbReq* pReq);
@@ -2083,6 +2084,7 @@ typedef struct {
   int64_t     compactStartTime;
   STimeWindow tw;
   int32_t     compactId;
+  int8_t      metaOnly;
 } SCompactVnodeReq;
 
 int32_t tSerializeSCompactVnodeReq(void* buf, int32_t bufLen, SCompactVnodeReq* pReq);
diff --git a/include/libs/nodes/cmdnodes.h b/include/libs/nodes/cmdnodes.h
index 2cd743b37e..92fa9bf0ee 100644
--- a/include/libs/nodes/cmdnodes.h
+++ b/include/libs/nodes/cmdnodes.h
@@ -169,6 +169,7 @@ typedef struct SCompactDatabaseStmt {
   char      dbName[TSDB_DB_NAME_LEN];
   SNode*    pStart;
   SNode*    pEnd;
+  bool      metaOnly;
 } SCompactDatabaseStmt;
 
 typedef struct SCompactVgroupsStmt {
@@ -177,6 +178,7 @@ typedef struct SCompactVgroupsStmt {
   SNodeList* vgidList;
   SNode*     pStart;
   SNode*     pEnd;
+  bool       metaOnly;
 } SCompactVgroupsStmt;
 
 typedef struct STableOptions {
diff --git a/source/common/src/msg/tmsg.c b/source/common/src/msg/tmsg.c
index 6a3e1948c8..ed0a50e880 100644
--- a/source/common/src/msg/tmsg.c
+++ b/source/common/src/msg/tmsg.c
@@ -4686,6 +4686,8 @@ int32_t tSerializeSCompactDbReq(void *buf, int32_t bufLen, SCompactDbReq *pReq)
     }
   }
 
+  TAOS_CHECK_EXIT(tEncodeI8(&encoder, pReq->metaOnly));
+
   tEndEncode(&encoder);
 
 _exit:
@@ -4729,6 +4731,12 @@ int32_t tDeserializeSCompactDbReq(void *buf, int32_t bufLen, SCompactDbReq *pReq
       }
     }
   }
+
+  if (!tDecodeIsEnd(&decoder)) {
+    TAOS_CHECK_EXIT(tDecodeI8(&decoder, &pReq->metaOnly));
+  } else {
+    pReq->metaOnly = false;
+  }
   tEndDecode(&decoder);
 
 _exit:
@@ -7156,6 +7164,7 @@ int32_t tSerializeSCompactVnodeReq(void *buf, int32_t bufLen, SCompactVnodeReq *
   TAOS_CHECK_EXIT(tEncodeI64(&encoder, pReq->tw.ekey));
 
   TAOS_CHECK_EXIT(tEncodeI32(&encoder, pReq->compactId));
+  TAOS_CHECK_EXIT(tEncodeI8(&encoder, pReq->metaOnly));
 
   tEndEncode(&encoder);
 
@@ -7193,6 +7202,12 @@ int32_t tDeserializeSCompactVnodeReq(void *buf, int32_t bufLen, SCompactVnodeReq
     TAOS_CHECK_EXIT(tDecodeI32(&decoder, &pReq->compactId));
   }
 
+  if (!tDecodeIsEnd(&decoder)) {
+    TAOS_CHECK_EXIT(tDecodeI8(&decoder, &pReq->metaOnly));
+  } else {
+    pReq->metaOnly = false;
+  }
+
   tEndDecode(&decoder);
 _exit:
   tDecoderClear(&decoder);
diff --git a/source/dnode/mnode/impl/src/mndCompact.c b/source/dnode/mnode/impl/src/mndCompact.c
index 33a6ddcc5d..f9f50f235f 100644
--- a/source/dnode/mnode/impl/src/mndCompact.c
+++ b/source/dnode/mnode/impl/src/mndCompact.c
@@ -927,7 +927,8 @@ static int32_t mndCompactDispatchAudit(SMnode *pMnode, SRpcMsg *pReq, SDbObj *pD
   return 0;
 }
 
-extern int32_t mndCompactDb(SMnode *pMnode, SRpcMsg *pReq, SDbObj *pDb, STimeWindow tw, SArray *vgroupIds);
+extern int32_t mndCompactDb(SMnode *pMnode, SRpcMsg *pReq, SDbObj *pDb, STimeWindow tw, SArray *vgroupIds,
+                            bool metaOnly);
 static int32_t mndCompactDispatch(SRpcMsg *pReq) {
   int32_t code = 0;
   SMnode *pMnode = pReq->info.node;
@@ -982,7 +983,7 @@ static int32_t mndCompactDispatch(SRpcMsg *pReq) {
         .skey = convertTimePrecision(curMs + compactStartTime * 60000LL, TSDB_TIME_PRECISION_MILLI, pDb->cfg.precision),
         .ekey = convertTimePrecision(curMs + compactEndTime * 60000LL, TSDB_TIME_PRECISION_MILLI, pDb->cfg.precision)};
 
-    if ((code = mndCompactDb(pMnode, NULL, pDb, tw, NULL)) == 0) {
+    if ((code = mndCompactDb(pMnode, NULL, pDb, tw, NULL, false)) == 0) {
       mInfo("db:%p,%s, succeed to dispatch compact with range:[%" PRIi64 ",%" PRIi64 "], interval:%dm, start:%" PRIi64
             "m, end:%" PRIi64 "m, offset:%" PRIi8 "h",
             pDb, pDb->name, tw.skey, tw.ekey, pDb->cfg.compactInterval, compactStartTime, compactEndTime,
diff --git a/source/libs/parser/inc/parAst.h b/source/libs/parser/inc/parAst.h
index 65274f85e1..41162c46f6 100644
--- a/source/libs/parser/inc/parAst.h
+++ b/source/libs/parser/inc/parAst.h
@@ -202,9 +202,9 @@ SNode* createAlterDatabaseStmt(SAstCreateContext* pCxt, SToken* pDbName, SNode*
 SNode* createFlushDatabaseStmt(SAstCreateContext* pCxt, SToken* pDbName);
 SNode* createTrimDatabaseStmt(SAstCreateContext* pCxt, SToken* pDbName, int32_t maxSpeed);
 SNode* createS3MigrateDatabaseStmt(SAstCreateContext* pCxt, SToken* pDbName);
-SNode* createCompactStmt(SAstCreateContext* pCxt, SToken* pDbName, SNode* pStart, SNode* pEnd);
+SNode* createCompactStmt(SAstCreateContext* pCxt, SToken* pDbName, SNode* pStart, SNode* pEnd, bool metaOnly);
 SNode* createCompactVgroupsStmt(SAstCreateContext* pCxt, SNode* pDbName, SNodeList* vgidList, SNode* pStart,
-                                SNode* pEnd);
+                                SNode* pEnd, bool metaOnly);
 SNode* createDefaultTableOptions(SAstCreateContext* pCxt);
 SNode* createAlterTableOptions(SAstCreateContext* pCxt);
 SNode* setTableOption(SAstCreateContext* pCxt, SNode* pOptions, ETableOptionType type, void* pVal);
diff --git a/source/libs/parser/inc/sql.y b/source/libs/parser/inc/sql.y
index 42d2e95d24..0b1cafac32 100755
--- a/source/libs/parser/inc/sql.y
+++ b/source/libs/parser/inc/sql.y
@@ -238,8 +238,13 @@ cmd ::= ALTER DATABASE db_name(A) alter_db_options(B).
 cmd ::= FLUSH DATABASE db_name(A).                                                { pCxt->pRootNode = createFlushDatabaseStmt(pCxt, &A); }
 cmd ::= TRIM DATABASE db_name(A) speed_opt(B).                                    { pCxt->pRootNode = createTrimDatabaseStmt(pCxt, &A, B); }
 cmd ::= S3MIGRATE DATABASE db_name(A).                                            { pCxt->pRootNode = createS3MigrateDatabaseStmt(pCxt, &A); }
-cmd ::= COMPACT DATABASE db_name(A) start_opt(B) end_opt(C).                      { pCxt->pRootNode = createCompactStmt(pCxt, &A, B, C); }
-cmd ::= COMPACT db_name_cond_opt(A) VGROUPS IN NK_LP integer_list(B) NK_RP start_opt(C) end_opt(D).   { pCxt->pRootNode = createCompactVgroupsStmt(pCxt, A, B, C, D); }
+cmd ::= COMPACT DATABASE db_name(A) start_opt(B) end_opt(C) meta_only(D).                      { pCxt->pRootNode = createCompactStmt(pCxt, &A, B, C, D); }
+cmd ::= COMPACT db_name_cond_opt(A) VGROUPS IN NK_LP integer_list(B) NK_RP start_opt(C) end_opt(D) meta_only(E).   { pCxt->pRootNode = createCompactVgroupsStmt(pCxt, A, B, C, D, E); }
+
+%type meta_only                                                                  { bool }
+%destructor meta_only                                                            { }
+meta_only(A) ::= .                                                                { A = false; }
+exists_opt(A) ::= META_ONLY.                                                      { A = true; }
 
 %type not_exists_opt                                                              { bool }
 %destructor not_exists_opt                                                        { }
diff --git a/source/libs/parser/src/parAstCreater.c b/source/libs/parser/src/parAstCreater.c
index 341fc7e603..55e9ca2431 100644
--- a/source/libs/parser/src/parAstCreater.c
+++ b/source/libs/parser/src/parAstCreater.c
@@ -2212,7 +2212,7 @@ _err:
   return NULL;
 }
 
-SNode* createCompactStmt(SAstCreateContext* pCxt, SToken* pDbName, SNode* pStart, SNode* pEnd) {
+SNode* createCompactStmt(SAstCreateContext* pCxt, SToken* pDbName, SNode* pStart, SNode* pEnd, bool metaOnly) {
   CHECK_PARSER_STATUS(pCxt);
   CHECK_NAME(checkDbName(pCxt, pDbName, false));
   SCompactDatabaseStmt* pStmt = NULL;
@@ -2221,6 +2221,7 @@ SNode* createCompactStmt(SAstCreateContext* pCxt, SToken* pDbName, SNode* pStart
   COPY_STRING_FORM_ID_TOKEN(pStmt->dbName, pDbName);
   pStmt->pStart = pStart;
   pStmt->pEnd = pEnd;
+  pStmt->metaOnly = metaOnly;
   return (SNode*)pStmt;
 _err:
   nodesDestroyNode(pStart);
@@ -2229,7 +2230,7 @@ _err:
 }
 
 SNode* createCompactVgroupsStmt(SAstCreateContext* pCxt, SNode* pDbName, SNodeList* vgidList, SNode* pStart,
-                                SNode* pEnd) {
+                                SNode* pEnd, bool metaOnly) {
   CHECK_PARSER_STATUS(pCxt);
   if (NULL == pDbName) {
     snprintf(pCxt->pQueryCxt->pMsg, pCxt->pQueryCxt->msgLen, "database not specified");
@@ -2243,6 +2244,7 @@ SNode* createCompactVgroupsStmt(SAstCreateContext* pCxt, SNode* pDbName, SNodeLi
   pStmt->vgidList = vgidList;
   pStmt->pStart = pStart;
   pStmt->pEnd = pEnd;
+  pStmt->metaOnly = metaOnly;
   return (SNode*)pStmt;
 _err:
   nodesDestroyNode(pDbName);
diff --git a/source/libs/parser/src/parTokenizer.c b/source/libs/parser/src/parTokenizer.c
index eb949d5206..641d3877d8 100644
--- a/source/libs/parser/src/parTokenizer.c
+++ b/source/libs/parser/src/parTokenizer.c
@@ -360,7 +360,8 @@ static SKeyword keywordTable[] = {
     {"ON_FAILURE",           TK_ON_FAILURE},
     {"NOTIFY_HISTORY",       TK_NOTIFY_HISTORY},
     {"REGEXP",               TK_REGEXP},
-    {"TRUE_FOR",             TK_TRUE_FOR}
+    {"TRUE_FOR",             TK_TRUE_FOR},
+    {"META_ONLY",            TK_META_ONLY}
 };
 // clang-format on
 
diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index 2fdba9bad9..568e9d70b7 100755
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -11315,9 +11315,11 @@ static int32_t translateCompactRange(STranslateContext* pCxt, const char* dbName
 }
 
 static int32_t translateCompactDb(STranslateContext* pCxt, SCompactDatabaseStmt* pStmt) {
-  SCompactDbReq compactReq = {0};
-  SName         name;
-  int32_t       code = TSDB_CODE_SUCCESS;
+  SCompactDbReq compactReq = {
+      .metaOnly = pStmt->metaOnly,
+  };
+  SName   name;
+  int32_t code = TSDB_CODE_SUCCESS;
   code = tNameSetDbName(&name, pCxt->pParseCxt->acctId, pStmt->dbName, strlen(pStmt->dbName));
   if (TSDB_CODE_SUCCESS != code) return code;
 
@@ -11384,7 +11386,9 @@ static int32_t translateVgroupList(STranslateContext* pCxt, SNodeList* vgroupLis
 static int32_t translateCompactVgroups(STranslateContext* pCxt, SCompactVgroupsStmt* pStmt) {
   int32_t       code = TSDB_CODE_SUCCESS;
   SName         name;
-  SCompactDbReq req = {0};
+  SCompactDbReq req = {
+      .metaOnly = pStmt->metaOnly,
+  };
 
   code = tNameSetDbName(&name, pCxt->pParseCxt->acctId, ((SValueNode*)pStmt->pDbName)->literal,
                         strlen(((SValueNode*)pStmt->pDbName)->literal));

From 9290c09566d0bca025e85ab73ebb59d4fb91abce Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Tue, 25 Feb 2025 17:19:46 +0800
Subject: [PATCH 11/35] more code

---
 contrib/test/CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/test/CMakeLists.txt b/contrib/test/CMakeLists.txt
index 318d00b92c..d88af23a6d 100644
--- a/contrib/test/CMakeLists.txt
+++ b/contrib/test/CMakeLists.txt
@@ -20,9 +20,9 @@ if(${BUILD_WITH_SQLITE})
     add_subdirectory(sqlite)
 endif(${BUILD_WITH_SQLITE})
 
-if(${BUILD_S3})
-  add_subdirectory(azure)
-endif()
+# if(${BUILD_S3})
+#   add_subdirectory(azure)
+# endif()
 
 add_subdirectory(tdev)
 add_subdirectory(lz4)

From 275c7f55ce1fc5bafd5203c965f4279830a8049f Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Tue, 25 Feb 2025 17:24:30 +0800
Subject: [PATCH 12/35] update document

---
 docs/en/08-operation/04-maintenance.md | 5 +++--
 docs/zh/08-operation/04-maintenance.md | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs/en/08-operation/04-maintenance.md b/docs/en/08-operation/04-maintenance.md
index 5712a710a1..a0aa473918 100644
--- a/docs/en/08-operation/04-maintenance.md
+++ b/docs/en/08-operation/04-maintenance.md
@@ -16,8 +16,8 @@ TDengine is designed for various writing scenarios, and many of these scenarios
 ### Syntax
 
 ```sql
-COMPACT DATABASE db_name [start with 'XXXX'] [end with 'YYYY'];
-COMPACT [db_name.]VGROUPS IN (vgroup_id1, vgroup_id2, ...) [start with 'XXXX'] [end with 'YYYY'];
+COMPACT DATABASE db_name [start with 'XXXX'] [end with 'YYYY'] [META_ONLY];
+COMPACT [db_name.]VGROUPS IN (vgroup_id1, vgroup_id2, ...) [start with 'XXXX'] [end with 'YYYY'] [META_ONLY];
 SHOW COMPACTS;
 SHOW COMPACT compact_id;
 KILL COMPACT compact_id;
@@ -30,6 +30,7 @@ KILL COMPACT compact_id;
 - COMPACT will merge multiple STT files
 - You can specify the start time of the COMPACT data with the start with keyword
 - You can specify the end time of the COMPACT data with the end with keyword
+- You can specify the META_ONLY keyword to only compact the meta data which are not compacted by default
 - The COMPACT command will return the ID of the COMPACT task
 - COMPACT tasks are executed asynchronously in the background, and you can view the progress of COMPACT tasks using the SHOW COMPACTS command
 - The SHOW command will return the ID of the COMPACT task, and you can terminate the COMPACT task using the KILL COMPACT command
diff --git a/docs/zh/08-operation/04-maintenance.md b/docs/zh/08-operation/04-maintenance.md
index bb9ea20fbf..c0ca5ee00f 100644
--- a/docs/zh/08-operation/04-maintenance.md
+++ b/docs/zh/08-operation/04-maintenance.md
@@ -17,8 +17,8 @@ TDengine 面向多种写入场景，而很多写入场景下，TDengine 的存
 ### 语法
 
 ```SQL
-COMPACT DATABASE db_name [start with 'XXXX'] [end with 'YYYY'];
-COMPACT [db_name.]VGROUPS IN (vgroup_id1, vgroup_id2, ...) [start with 'XXXX'] [end with 'YYYY'];
+COMPACT DATABASE db_name [start with 'XXXX'] [end with 'YYYY'] [META_ONLY];
+COMPACT [db_name.]VGROUPS IN (vgroup_id1, vgroup_id2, ...) [start with 'XXXX'] [end with 'YYYY'] [META_ONLY];
 SHOW COMPACTS;
 SHOW COMPACT compact_id;
 KILL COMPACT compact_id;
@@ -32,6 +32,7 @@ KILL COMPACT compact_id;
 -   COMPACT 会合并多个 STT 文件
 -   可通过 start with 关键字指定 COMPACT 数据的起始时间
 -   可通过 end with 关键字指定 COMPACT 数据的终止时间
+-   可通过 `META_ONLY` 关键字指定只 compact 元数据。元数据默认情况下不会 compact。
 -   COMPACT 命令会返回 COMPACT 任务的 ID
 -   COMPACT 任务会在后台异步执行，可以通过 SHOW COMPACTS 命令查看 COMPACT 任务的进度
 -   SHOW 命令会返回 COMPACT 任务的 ID，可以通过 KILL COMPACT 命令终止 COMPACT 任务

From b26166b48d1cea29ff16ab8955cbe28802279a5c Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Tue, 25 Feb 2025 17:57:25 +0800
Subject: [PATCH 13/35] support meta_only option

---
 source/dnode/mnode/impl/inc/mndVgroup.h |  2 +-
 source/dnode/mnode/impl/src/mndVgroup.c | 11 ++++++-----
 source/libs/parser/inc/sql.y            |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/source/dnode/mnode/impl/inc/mndVgroup.h b/source/dnode/mnode/impl/inc/mndVgroup.h
index a8a806e497..cff3064ed9 100644
--- a/source/dnode/mnode/impl/inc/mndVgroup.h
+++ b/source/dnode/mnode/impl/inc/mndVgroup.h
@@ -47,7 +47,7 @@ int32_t mndSetMoveVgroupsInfoToTrans(SMnode *, STrans *pTrans, int32_t dropDnode
 int32_t mndBuildAlterVgroupAction(SMnode *pMnode, STrans *pTrans, SDbObj *pOldDb, SDbObj *pNewDb, SVgObj *pVgroup,
                                   SArray *pArray, SVgObj* pNewVgroup);
 int32_t mndBuildCompactVgroupAction(SMnode *pMnode, STrans *pTrans, SDbObj *pDb, SVgObj *pVgroup, int64_t compactTs,
-                                    STimeWindow tw);
+                                    STimeWindow tw, bool metaOnly);
 int32_t mndBuildRaftAlterVgroupAction(SMnode *pMnode, STrans *pTrans, SDbObj *pOldDb, SDbObj *pNewDb, SVgObj *pVgroup,
                                   SArray *pArray);
 
diff --git a/source/dnode/mnode/impl/src/mndVgroup.c b/source/dnode/mnode/impl/src/mndVgroup.c
index 311beb0daa..c1d75a1a4d 100644
--- a/source/dnode/mnode/impl/src/mndVgroup.c
+++ b/source/dnode/mnode/impl/src/mndVgroup.c
@@ -3632,11 +3632,12 @@ bool mndVgroupInDnode(SVgObj *pVgroup, int32_t dnodeId) {
 }
 
 static void *mndBuildCompactVnodeReq(SMnode *pMnode, SDbObj *pDb, SVgObj *pVgroup, int32_t *pContLen, int64_t compactTs,
-                                     STimeWindow tw) {
+                                     STimeWindow tw, bool metaOnly) {
   SCompactVnodeReq compactReq = {0};
   compactReq.dbUid = pDb->uid;
   compactReq.compactStartTime = compactTs;
   compactReq.tw = tw;
+  compactReq.metaOnly = metaOnly;
   tstrncpy(compactReq.db, pDb->name, TSDB_DB_FNAME_LEN);
 
   mInfo("vgId:%d, build compact vnode config req", pVgroup->vgId);
@@ -3667,13 +3668,13 @@ static void *mndBuildCompactVnodeReq(SMnode *pMnode, SDbObj *pDb, SVgObj *pVgrou
 }
 
 static int32_t mndAddCompactVnodeAction(SMnode *pMnode, STrans *pTrans, SDbObj *pDb, SVgObj *pVgroup, int64_t compactTs,
-                                        STimeWindow tw) {
+                                        STimeWindow tw, bool metaOnly) {
   int32_t      code = 0;
   STransAction action = {0};
   action.epSet = mndGetVgroupEpset(pMnode, pVgroup);
 
   int32_t contLen = 0;
-  void   *pReq = mndBuildCompactVnodeReq(pMnode, pDb, pVgroup, &contLen, compactTs, tw);
+  void   *pReq = mndBuildCompactVnodeReq(pMnode, pDb, pVgroup, &contLen, compactTs, tw, metaOnly);
   if (pReq == NULL) {
     code = TSDB_CODE_MND_RETURN_VALUE_NULL;
     if (terrno != 0) code = terrno;
@@ -3693,7 +3694,7 @@ static int32_t mndAddCompactVnodeAction(SMnode *pMnode, STrans *pTrans, SDbObj *
 }
 
 int32_t mndBuildCompactVgroupAction(SMnode *pMnode, STrans *pTrans, SDbObj *pDb, SVgObj *pVgroup, int64_t compactTs,
-                                    STimeWindow tw) {
-  TAOS_CHECK_RETURN(mndAddCompactVnodeAction(pMnode, pTrans, pDb, pVgroup, compactTs, tw));
+                                    STimeWindow tw, bool metaOnly) {
+  TAOS_CHECK_RETURN(mndAddCompactVnodeAction(pMnode, pTrans, pDb, pVgroup, compactTs, tw, metaOnly));
   return 0;
 }
diff --git a/source/libs/parser/inc/sql.y b/source/libs/parser/inc/sql.y
index 0b1cafac32..d30b247af9 100755
--- a/source/libs/parser/inc/sql.y
+++ b/source/libs/parser/inc/sql.y
@@ -244,7 +244,7 @@ cmd ::= COMPACT db_name_cond_opt(A) VGROUPS IN NK_LP integer_list(B) NK_RP start
 %type meta_only                                                                  { bool }
 %destructor meta_only                                                            { }
 meta_only(A) ::= .                                                                { A = false; }
-exists_opt(A) ::= META_ONLY.                                                      { A = true; }
+meta_only(A) ::= META_ONLY.                                                      { A = true; }
 
 %type not_exists_opt                                                              { bool }
 %destructor not_exists_opt                                                        { }

From 0cba2fe2e420248458b48f4bec1475fa052a9454 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Wed, 26 Feb 2025 16:09:07 +0800
Subject: [PATCH 14/35] more

---
 .../{ => compact}/test_compact_meta.py        | 65 +++++++++++++------
 1 file changed, 44 insertions(+), 21 deletions(-)
 rename tests/test_new/storage/{ => compact}/test_compact_meta.py (52%)

diff --git a/tests/test_new/storage/test_compact_meta.py b/tests/test_new/storage/compact/test_compact_meta.py
similarity index 52%
rename from tests/test_new/storage/test_compact_meta.py
rename to tests/test_new/storage/compact/test_compact_meta.py
index e1ee134c6a..0088ba3252 100644
--- a/tests/test_new/storage/test_compact_meta.py
+++ b/tests/test_new/storage/compact/test_compact_meta.py
@@ -1,11 +1,23 @@
 # tests/test_new/xxx/xxx/test_xxx.py
 # import ...
+# ./pytest.sh python3 ./test.py -f storage/compact/test_compact_meta.py
 
 import random
 import taos
+import taos
+import frame
+import frame.etool
 
 
-class TestXxxx:
+from frame.log import *
+from frame.cases import *
+from frame.sql import *
+from frame.caseBase import *
+from frame import *
+from frame.autogen import *
+
+
+class TestCompactMeta:
     def init(self):
         tdLog.debug("start to execute %s" % __file__)
 
@@ -49,32 +61,39 @@ class TestXxxx:
         num_of_child_tables = 10000
         max_alter_times = 100
 
+        # Drop database
+        sql = f'drop database if exists {dbname}'
+        print(sql)
+        tdSql.execute(sql)
+
         # Create database
-        tdSql.query(f'create database {dbname} vgroups 1')
-
-        # Create super table
-        sql = f'create {dbname}.{super_table} (ts timestamp, c1 int) tags (tag1 int)'
+        sql = f'create database {dbname}'
+        print(sql)
         tdSql.query(sql)
 
-        # Create child tables
-        for i in range(num_of_child_tables):
-            sql = f'create {dbname}.{child_table_prefix}{i} using {dbname}.{super_table} tags ({i})'
-            tdSql.query(sql)
+        # # Create super table
+        # sql = f'create {dbname}.{super_table} (ts timestamp, c1 int) tags (tag1 int)'
+        # tdSql.query(sql)
 
-        # Alter child tables
-        for i in range(num_of_child_tables):
-            for j in range(random.randint(1, max_alter_times)):
-                sql = f'alter table {dbname}.{child_table_prefix}{i} set tag1 = {i + j}'
-                tdSql.query(sql)
+        # # Create child tables
+        # for i in range(num_of_child_tables):
+        #     sql = f'create {dbname}.{child_table_prefix}{i} using {dbname}.{super_table} tags ({i})'
+        #     tdSql.query(sql)
 
-        # Alter super tables
-        for i in range(random.randint(1, max_alter_times)):
-            sql = f'alter table {dbname}.{super_table} add column c{i+1} int'
-            tdSql.query(sql)
+        # # Alter child tables
+        # for i in range(num_of_child_tables):
+        #     for j in range(random.randint(1, max_alter_times)):
+        #         sql = f'alter table {dbname}.{child_table_prefix}{i} set tag1 = {i + j}'
+        #         tdSql.query(sql)
 
-        # Compact meta
-        sql = f'compact database {dbname}'
-        tdSql.query(sql)
+        # # Alter super tables
+        # for i in range(random.randint(1, max_alter_times)):
+        #     sql = f'alter table {dbname}.{super_table} add column c{i+1} int'
+        #     tdSql.query(sql)
+
+        # # Compact meta
+        # sql = f'compact database {dbname}'
+        # tdSql.query(sql)
 
     def run(self):
         self.test_template()
@@ -83,3 +102,7 @@ class TestXxxx:
 
     def stop(self):
         tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addLinux(__file__, TDTestCase())
+tdCases.addWindows(__file__, TDTestCase())

From 791c9de7297ea33893c05483a104f7ab2dcb3f91 Mon Sep 17 00:00:00 2001
From: chenhaoran <haoran920c@163.com>
Date: Wed, 26 Feb 2025 16:21:21 +0800
Subject: [PATCH 15/35] refactor: simplify module loading by introducing
 dynamicLoadModule function

---
 tests/pytest/util/cases.py | 32 ++++++++++++++++++++++++++------
 tests/test_new/test.py     | 30 +++++++++++++++++++++---------
 2 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/tests/pytest/util/cases.py b/tests/pytest/util/cases.py
index eee8809ad0..9774e91a9c 100644
--- a/tests/pytest/util/cases.py
+++ b/tests/pytest/util/cases.py
@@ -51,12 +51,21 @@ class TDCases:
     def addCluster(self, name, case):
         self.clusterCases.append(TDCase(name, case))
 
+    def get_local_classes(self, module):
+        classes = []
+        for name, obj in inspect.getmembers(module, inspect.isclass):
+            if inspect.getmodule(obj) == module:
+                classes.append(name)
+        return classes
+    
     def runAllLinux(self, conn):
         # TODO: load all Linux cases here
         runNum = 0
         for tmp in self.linuxCases:
             if tmp.name.find(fileName) != -1:
-                case = testModule.TDTestCase()
+                # get the last class name as the test case class name
+                case_class = getattr(testModule, self.get_local_classes(testModule)[0])
+                case = case_class()
                 case.init(conn)
                 case.run()
                 case.stop()
@@ -71,7 +80,9 @@ class TDCases:
         runNum = 0
         for tmp in self.linuxCases:
             if tmp.name.find(fileName) != -1:
-                case = testModule.TDTestCase()
+                # get the last class name as the test case class name
+                case_class = getattr(testModule, self.get_local_classes(testModule)[-1])
+                case = case_class()
                 case.init(conn, self._logSql, replicaVar)
                 try:
                     case.run()
@@ -88,7 +99,9 @@ class TDCases:
         runNum = 0
         for tmp in self.windowsCases:
             if tmp.name.find(fileName) != -1:
-                case = testModule.TDTestCase()
+                # get the last class name as the test case class name
+                case_class = getattr(testModule, self.get_local_classes(testModule)[-1])
+                case = case_class()
                 case.init(conn)
                 case.run()
                 case.stop()
@@ -102,7 +115,9 @@ class TDCases:
 
         runNum = 0
         for tmp in self.windowsCases:
-            if tmp.name.find(fileName) != -1:
+                # get the last class name as the test case class name
+                case_class = getattr(testModule, self.get_local_classes(testModule)[-1])
+                case = case_class()
                 case = testModule.TDTestCase()
                 case.init(conn, self._logSql,replicaVar)
                 try:
@@ -117,12 +132,15 @@ class TDCases:
 
     def runAllCluster(self):
         # TODO: load all cluster case module here
+        testModule = self.__dynamicLoadModule(fileName)
 
         runNum = 0
         for tmp in self.clusterCases:
             if tmp.name.find(fileName) != -1:
                 tdLog.notice("run cases like %s" % (fileName))
-                case = testModule.TDTestCase()
+                # get the last class name as the test case class name
+                case_class = getattr(testModule, self.get_local_classes(testModule)[-1])
+                case = case_class()
                 case.init()
                 case.run()
                 case.stop()
@@ -137,7 +155,9 @@ class TDCases:
         runNum = 0
         for tmp in self.clusterCases:
             if tmp.name.find(fileName) != -1:
-                tdLog.notice("run cases like %s" % (fileName))
+                # get the last class name as the test case class name
+                case_class = getattr(testModule, self.get_local_classes(testModule)[-1])
+                case = case_class()
                 case = testModule.TDTestCase()
                 case.init()
                 case.run()
diff --git a/tests/test_new/test.py b/tests/test_new/test.py
index ab1bdc21d3..e9e6f12236 100644
--- a/tests/test_new/test.py
+++ b/tests/test_new/test.py
@@ -24,6 +24,7 @@ import platform
 import socket
 import threading
 import importlib
+import inspect
 print(f"Python version: {sys.version}")
 print(f"Version info: {sys.version_info}")
 
@@ -58,6 +59,17 @@ def checkRunTimeError():
         if hwnd:
             os.system("TASKKILL /F /IM taosd.exe")
 
+def get_local_classes(module):
+    classes = []
+    for name, obj in inspect.getmembers(module, inspect.isclass):
+        if inspect.getmodule(obj) == module:
+            classes.append(name)
+    return classes
+
+def dynamicLoadModule(fileName):
+    moduleName = fileName.replace(".py", "").replace(os.sep, ".")
+    return importlib.import_module(moduleName, package='..')
+
 #
 # run case on previous cluster
 #
@@ -68,9 +80,9 @@ def runOnPreviousCluster(host, config, fileName):
     sep = "/"
     if platform.system().lower() == 'windows':
         sep = os.sep
-    moduleName = fileName.replace(".py", "").replace(sep, ".")
-    uModule = importlib.import_module(moduleName)
-    case = uModule.TDTestCase()
+    uModule = dynamicLoadModule(fileName)
+    case_class = getattr(uModule, get_local_classes(uModule)[-1])
+    case = case_class()    
 
     # create conn
     conn = taos.connect(host, config)
@@ -350,10 +362,10 @@ if __name__ == "__main__":
         updateCfgDictStr = ''
         # adapter_cfg_dict_str = ''
         if is_test_framework:
-            moduleName = fileName.replace(".py", "").replace(os.sep, ".")
-            uModule = importlib.import_module(moduleName)
+            uModule = dynamicLoadModule(fileName)
             try:
-                ucase = uModule.TDTestCase()
+                case_class = getattr(uModule, get_local_classes(uModule)[-1])
+                ucase = case_class()
                 if ((json.dumps(updateCfgDict) == '{}') and hasattr(ucase, 'updatecfgDict')):
                     updateCfgDict = ucase.updatecfgDict
                     updateCfgDictStr = "-d %s"%base64.b64encode(json.dumps(updateCfgDict).encode()).decode()
@@ -522,10 +534,10 @@ if __name__ == "__main__":
         except:
             pass
         if is_test_framework:
-            moduleName = fileName.replace(".py", "").replace("/", ".")
-            uModule = importlib.import_module(moduleName)
+            uModule = dynamicLoadModule(fileName)
             try:
-                ucase = uModule.TDTestCase()
+                case_class = getattr(uModule, get_local_classes(uModule)[-1])
+                ucase = case_class()    
                 if (json.dumps(updateCfgDict) == '{}'):
                     updateCfgDict = ucase.updatecfgDict
                 if (json.dumps(adapter_cfg_dict) == '{}'):

From bd492f790efc0c8278c7bebb0f21c606d823bb72 Mon Sep 17 00:00:00 2001
From: dmchen <cademfly@hotmail.com>
Date: Wed, 26 Feb 2025 16:55:06 +0800
Subject: [PATCH 16/35] fix/remove-sync-heartbeat-lock

---
 source/libs/sync/inc/syncPipeline.h |  1 +
 source/libs/sync/src/syncPipeline.c | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/source/libs/sync/inc/syncPipeline.h b/source/libs/sync/inc/syncPipeline.h
index eeb24d2f16..147f8a67ae 100644
--- a/source/libs/sync/inc/syncPipeline.h
+++ b/source/libs/sync/inc/syncPipeline.h
@@ -40,6 +40,7 @@ typedef struct SSyncLogReplMgr {
   int32_t       retryBackoff;
   int32_t       peerId;
   int32_t       sendCount;
+  TdThreadMutex mutex;
 } SSyncLogReplMgr;
 
 typedef struct SSyncLogBufEntry {
diff --git a/source/libs/sync/src/syncPipeline.c b/source/libs/sync/src/syncPipeline.c
index 18252db9ee..ceaba1e643 100644
--- a/source/libs/sync/src/syncPipeline.c
+++ b/source/libs/sync/src/syncPipeline.c
@@ -1140,26 +1140,29 @@ int32_t syncLogReplRecover(SSyncLogReplMgr* pMgr, SSyncNode* pNode, SyncAppendEn
 
 int32_t syncLogReplProcessHeartbeatReply(SSyncLogReplMgr* pMgr, SSyncNode* pNode, SyncHeartbeatReply* pMsg) {
   SSyncLogBuffer* pBuf = pNode->pLogBuf;
-  (void)taosThreadMutexLock(&pBuf->mutex);
+  (void)taosThreadMutexLock(&pMgr->mutex);
   if (pMsg->startTime != 0 && pMsg->startTime != pMgr->peerStartTime) {
     sInfo("vgId:%d, reset sync log repl in heartbeat. peer:%" PRIx64 ", start time:%" PRId64 ", old:%" PRId64 "",
           pNode->vgId, pMsg->srcId.addr, pMsg->startTime, pMgr->peerStartTime);
     syncLogReplReset(pMgr);
     pMgr->peerStartTime = pMsg->startTime;
   }
-  (void)taosThreadMutexUnlock(&pBuf->mutex);
+  (void)taosThreadMutexUnlock(&pMgr->mutex);
   return 0;
 }
 
 int32_t syncLogReplProcessReply(SSyncLogReplMgr* pMgr, SSyncNode* pNode, SyncAppendEntriesReply* pMsg) {
   SSyncLogBuffer* pBuf = pNode->pLogBuf;
-  (void)taosThreadMutexLock(&pBuf->mutex);
+  (void)taosThreadMutexLock(&pMgr->mutex);
   if (pMsg->startTime != pMgr->peerStartTime) {
     sInfo("vgId:%d, reset sync log repl in appendlog reply. peer:%" PRIx64 ", start time:%" PRId64 ", old:%" PRId64,
           pNode->vgId, pMsg->srcId.addr, pMsg->startTime, pMgr->peerStartTime);
     syncLogReplReset(pMgr);
     pMgr->peerStartTime = pMsg->startTime;
   }
+  (void)taosThreadMutexUnlock(&pMgr->mutex);
+
+  (void)taosThreadMutexLock(&pBuf->mutex);
 
   int32_t code = 0;
   if (pMgr->restored) {
@@ -1324,6 +1327,12 @@ SSyncLogReplMgr* syncLogReplCreate() {
     return NULL;
   }
 
+  int32_t code = taosThreadMutexInit(&pMgr->mutex, NULL);
+  if (code) {
+    terrno = code;
+    return NULL;
+  }
+
   return pMgr;
 }
 
@@ -1331,6 +1340,7 @@ void syncLogReplDestroy(SSyncLogReplMgr* pMgr) {
   if (pMgr == NULL) {
     return;
   }
+  taosThreadMutexDestroy(&pMgr->mutex);
   taosMemoryFree(pMgr);
   return;
 }

From f1470cd79c3fa8cbb4091201d8b606324c187b3c Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Wed, 26 Feb 2025 18:19:45 +0800
Subject: [PATCH 17/35] more code

---
 .../storage/compact/test_compact_meta.py      | 156 ++++++++----------
 1 file changed, 66 insertions(+), 90 deletions(-)

diff --git a/tests/test_new/storage/compact/test_compact_meta.py b/tests/test_new/storage/compact/test_compact_meta.py
index 0088ba3252..c806567aa2 100644
--- a/tests/test_new/storage/compact/test_compact_meta.py
+++ b/tests/test_new/storage/compact/test_compact_meta.py
@@ -1,108 +1,84 @@
 # tests/test_new/xxx/xxx/test_xxx.py
 # import ...
-# ./pytest.sh python3 ./test.py -f storage/compact/test_compact_meta.py
+'''
+./pytest.sh python3 ./test.py -f storage/compact/test_compact_meta.py
+'''
 
-import random
 import taos
-import taos
-import frame
-import frame.etool
+import sys
+from math import inf
 
+from util.dnodes import tdDnodes
+from util.sql import *
+from util.cases import *
+from util.log import *
 
-from frame.log import *
-from frame.cases import *
-from frame.sql import *
-from frame.caseBase import *
-from frame import *
-from frame.autogen import *
+sys.path.append("../tests/pytest")
 
 
 class TestCompactMeta:
-    def init(self):
+    def caseDescription(self):
+        '''
+        case1<Hongze Cheng>: [TS-5445] Compact Meta Data
+        '''
+        return
+
+    def init(self, conn, logSql, replicaVer=1):
         tdLog.debug("start to execute %s" % __file__)
-
-    def test_template(self):
-        """用例目标，必填，用一行简短总结
-        <空行>
-        用例详细描述，必填，允许多行
-        <空行>
-        Since: 用例开始支持的TDengine版本，新增用例必填
-        <空行>
-        Labels: 筛选标签，选填，多个标签用英文逗号分隔
-        <空行>
-        Jira: 相关jira任务id，选填
-        <空行>
-        History: 用例变更历史，选填，每行一次变更信息
-            - 日期1 变更人1 变更原因1
-            - 日期2 变更人2 变更原因2
-        """
-
-    def test_demo(self):
-        """测试超级表插入各种数据类型
-
-        使用多种数据类型创建超级表，向超级表插入数据，
-        包括：常规数据，空数据，边界值等，插入均执行成功
-
-        Since: v3.3.0.0
-
-        Labels: stable, data_type
-
-        Jira: TD-12345, TS-1234
-
-        History:
-            - 2024-2-6 Feng Chao Created
-            - 2024-2-7 Huo Hong updated for feature TD-23456
-        """
-
-    def test_case1(self):
-        dbname = 'db'
-        super_table = "stb"
-        child_table_prefix = "ctb"
-        num_of_child_tables = 10000
-        max_alter_times = 100
-
-        # Drop database
-        sql = f'drop database if exists {dbname}'
-        print(sql)
-        tdSql.execute(sql)
-
-        # Create database
-        sql = f'create database {dbname}'
-        print(sql)
-        tdSql.query(sql)
-
-        # # Create super table
-        # sql = f'create {dbname}.{super_table} (ts timestamp, c1 int) tags (tag1 int)'
-        # tdSql.query(sql)
-
-        # # Create child tables
-        # for i in range(num_of_child_tables):
-        #     sql = f'create {dbname}.{child_table_prefix}{i} using {dbname}.{super_table} tags ({i})'
-        #     tdSql.query(sql)
-
-        # # Alter child tables
-        # for i in range(num_of_child_tables):
-        #     for j in range(random.randint(1, max_alter_times)):
-        #         sql = f'alter table {dbname}.{child_table_prefix}{i} set tag1 = {i + j}'
-        #         tdSql.query(sql)
-
-        # # Alter super tables
-        # for i in range(random.randint(1, max_alter_times)):
-        #     sql = f'alter table {dbname}.{super_table} add column c{i+1} int'
-        #     tdSql.query(sql)
-
-        # # Compact meta
-        # sql = f'compact database {dbname}'
-        # tdSql.query(sql)
+        tdSql.init(conn.cursor(), True)
+        self.conn = conn
 
     def run(self):
-        self.test_template()
-        self.test_demo()
         self.test_case1()
 
     def stop(self):
+        tdSql.close()
         tdLog.success("%s successfully executed" % __file__)
 
+    def test_case1(self):
+        """
+        Description:
+            1. Alter child table tags
+            2. Make sure compact meta works
+        """
+        db_name = 'db1'
+        stb_name = 'stb1'
+        ctb_name_prefix = 'ctb'
+        num_child_tables = 10000
 
-tdCases.addLinux(__file__, TDTestCase())
-tdCases.addWindows(__file__, TDTestCase())
+        # Drop database
+        sql = f'drop database if exists {db_name}'
+        tdSql.execute(sql)
+
+        # Create database
+        sql = f'create database {db_name} vgroups 1'
+        tdSql.execute(sql)
+
+        # Create super table
+        sql = f'create table {db_name}.{stb_name} (ts timestamp, c1 int, c2 int) tags(t1 int)'
+        tdSql.execute(sql)
+
+        # Create child tables
+        for i in range(1, num_child_tables+1):
+            sql = f'create table {db_name}.{ctb_name_prefix}{i} using {db_name}.{stb_name} tags({i})'
+            tdSql.execute(sql)
+
+        # Alter child table tags
+        for i in range(1, num_child_tables+1):
+            sql = f'alter table {db_name}.{ctb_name_prefix}{i} set tag t1 = {i+1}'
+            tdSql.execute(sql)
+
+        # Compact meta
+        sql = f'compact database {db_name} meta_only'
+        tdSql.execute(sql)
+
+    def test_case2(self):
+        """
+        Description:
+            After compact, the snapshot still works
+        """
+        pass
+
+
+tdCases.addWindows(__file__, TestCompactMeta())
+tdCases.addLinux(__file__, TestCompactMeta())

From 2d93259f1a6549b1c5fed2b9469b6b0b0b1b7ed2 Mon Sep 17 00:00:00 2001
From: dmchen <cademfly@hotmail.com>
Date: Wed, 26 Feb 2025 18:41:17 +0800
Subject: [PATCH 18/35] fix/remove-sync-heartbeat-lock-fix-check

---
 source/libs/sync/src/syncPipeline.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/libs/sync/src/syncPipeline.c b/source/libs/sync/src/syncPipeline.c
index ceaba1e643..8d81a03344 100644
--- a/source/libs/sync/src/syncPipeline.c
+++ b/source/libs/sync/src/syncPipeline.c
@@ -1340,7 +1340,7 @@ void syncLogReplDestroy(SSyncLogReplMgr* pMgr) {
   if (pMgr == NULL) {
     return;
   }
-  taosThreadMutexDestroy(&pMgr->mutex);
+  (void)taosThreadMutexDestroy(&pMgr->mutex);
   taosMemoryFree(pMgr);
   return;
 }

From 10f3a388f23a8ee8801f6fa82ca6a1c00550021c Mon Sep 17 00:00:00 2001
From: "pengrongkun94@qq.com" <pengrongkun94@qq.com>
Date: Wed, 26 Feb 2025 20:04:33 +0800
Subject: [PATCH 19/35] add row format bind control argument

---
 include/libs/parser/parser.h           |   8 +-
 source/client/inc/clientStmt2.h        |   1 +
 source/client/src/clientStmt2.c        |  29 ++++-
 source/client/test/stmt2Test.cpp       | 154 +++++++++++++++++++++++
 source/libs/parser/src/parInsertStmt.c | 166 +++++++++++++++++--------
 5 files changed, 295 insertions(+), 63 deletions(-)

diff --git a/include/libs/parser/parser.h b/include/libs/parser/parser.h
index 9446044ded..4bdc2c4740 100644
--- a/include/libs/parser/parser.h
+++ b/include/libs/parser/parser.h
@@ -159,11 +159,13 @@ int32_t qStmtBindParams2(SQuery* pQuery, TAOS_STMT2_BIND* pParams, int32_t colId
 int32_t qBindStmtStbColsValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bind, char* msgBuf, int32_t msgBufLen,
                                STSchema** pTSchema, SBindInfo2* pBindInfos, void *charsetCxt);
 int32_t qBindStmtColsValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bind, char* msgBuf, int32_t msgBufLen,
-                            STSchema** pTSchema, SBindInfo2* pBindInfos, void* charsetCxt);
+                            void* charsetCxt);
 int32_t qBindStmtSingleColValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bind, char* msgBuf, int32_t msgBufLen,
-                                 int32_t colIdx, int32_t rowNum, void *charsetCxt);
+                                 int32_t colIdx, int32_t rowNum, void* charsetCxt);
+int32_t qBindStmt2RowValue(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bind, char* msgBuf, int32_t msgBufLen,
+                           STSchema** pTSchema, SBindInfo2* pBindInfos, void* charsetCxt);
 int32_t qBindStmtTagsValue2(void* pBlock, void* boundTags, int64_t suid, const char* sTableName, char* tName,
-                            TAOS_STMT2_BIND* bind, char* msgBuf, int32_t msgBufLen, void *charsetCxt);
+                            TAOS_STMT2_BIND* bind, char* msgBuf, int32_t msgBufLen, void* charsetCxt);
 
 void    destroyBoundColumnInfo(void* pBoundInfo);
 int32_t qCreateSName(SName* pName, const char* pTableName, int32_t acctId, char* dbName, char* msgBuf,
diff --git a/source/client/inc/clientStmt2.h b/source/client/inc/clientStmt2.h
index 283573803e..eb96eadbd4 100644
--- a/source/client/inc/clientStmt2.h
+++ b/source/client/inc/clientStmt2.h
@@ -101,6 +101,7 @@ typedef struct {
   bool              autoCreateTbl;
   SHashObj         *pVgHash;
   SBindInfo2       *pBindInfo;
+  bool              bindRowFormat;
 
   SStbInterlaceInfo siInfo;
 } SStmtSQLInfo2;
diff --git a/source/client/src/clientStmt2.c b/source/client/src/clientStmt2.c
index d195a514c2..4462df740f 100644
--- a/source/client/src/clientStmt2.c
+++ b/source/client/src/clientStmt2.c
@@ -1416,7 +1416,12 @@ int stmtBindBatch2(TAOS_STMT2* stmt, TAOS_STMT2_BIND* bind, int32_t colIdx) {
     pStmt->exec.pCurrBlock = *pDataBlock;
     if (pStmt->sql.stbInterlaceMode) {
       taosArrayDestroy(pStmt->exec.pCurrBlock->pData->aCol);
-      pStmt->exec.pCurrBlock->pData->aCol = NULL;
+      (*pDataBlock)->pData->aCol = NULL;
+    }
+    if (colIdx < -1) {
+      pStmt->sql.bindRowFormat = true;
+      taosArrayDestroy((*pDataBlock)->pData->aCol);
+      (*pDataBlock)->pData->aCol = taosArrayInit(20, POINTER_BYTES);
     }
   }
 
@@ -1447,11 +1452,18 @@ int stmtBindBatch2(TAOS_STMT2* stmt, TAOS_STMT2_BIND* bind, int32_t colIdx) {
                                     pStmt->exec.pRequest->msgBufLen, &pStmt->sql.siInfo.pTSchema, pStmt->sql.pBindInfo,
                                     pStmt->taos->optionInfo.charsetCxt);
     } else {
-      taosArrayDestroy(pCols);
-      (*pDataBlock)->pData->aCol = taosArrayInit(20, POINTER_BYTES);
-      code =
-          qBindStmtColsValue2(*pDataBlock, (*pDataBlock)->pData->aRowP, bind, pStmt->exec.pRequest->msgBuf, pStmt->exec.pRequest->msgBufLen,
-                              &pStmt->sql.siInfo.pTSchema, pStmt->sql.pBindInfo, pStmt->taos->optionInfo.charsetCxt);
+      if (colIdx == -1) {
+        if (pStmt->sql.bindRowFormat) {
+          tscError("can't mix bind row format and bind column format");
+          STMT_ERR_RET(TSDB_CODE_TSC_STMT_API_ERROR);
+        }
+        code = qBindStmtColsValue2(*pDataBlock, pCols, bind, pStmt->exec.pRequest->msgBuf,
+                                   pStmt->exec.pRequest->msgBufLen, pStmt->taos->optionInfo.charsetCxt);
+      } else {
+        code = qBindStmt2RowValue(*pDataBlock, (*pDataBlock)->pData->aRowP, bind, pStmt->exec.pRequest->msgBuf,
+                                  pStmt->exec.pRequest->msgBufLen, &pStmt->sql.siInfo.pTSchema, pStmt->sql.pBindInfo,
+                                  pStmt->taos->optionInfo.charsetCxt);
+      }
     }
 
     if (code) {
@@ -1464,6 +1476,11 @@ int stmtBindBatch2(TAOS_STMT2* stmt, TAOS_STMT2_BIND* bind, int32_t colIdx) {
       STMT_ERR_RET(TSDB_CODE_TSC_STMT_API_ERROR);
     }
 
+    if (pStmt->sql.bindRowFormat) {
+      tscError("can't mix bind row format and bind column format");
+      STMT_ERR_RET(TSDB_CODE_TSC_STMT_API_ERROR);
+    }
+
     if (colIdx != (pStmt->bInfo.sBindLastIdx + 1) && colIdx != 0) {
       tscError("bind column index not in sequence");
       STMT_ERR_RET(TSDB_CODE_APP_ERROR);
diff --git a/source/client/test/stmt2Test.cpp b/source/client/test/stmt2Test.cpp
index c599d8cb6d..eaed84ed49 100644
--- a/source/client/test/stmt2Test.cpp
+++ b/source/client/test/stmt2Test.cpp
@@ -1913,4 +1913,158 @@ TEST(stmt2Case, async_order) {
   }
   taosMemoryFree(tbs);
 }
+
+TEST(stmt2Case, rowformat_bind) {
+  TAOS* taos = taos_connect("localhost", "root", "taosdata", "", 0);
+  ASSERT_NE(taos, nullptr);
+
+  do_query(taos, "drop database if exists stmt2_testdb_16");
+  do_query(taos, "create database IF NOT EXISTS stmt2_testdb_16");
+  do_query(
+      taos,
+      "create stable stmt2_testdb_16.stb(ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 binary(8), c6 "
+      "smallint, c7 "
+      "tinyint, c8 bool, c9 nchar(8), c10 geometry(256))TAGS(tts timestamp, t1 int, t2 bigint, t3 float, t4 double, t5 "
+      "binary(8), t6 smallint, t7 tinyint, t8 bool, t9 nchar(8), t10 geometry(256))");
+
+  TAOS_STMT2_OPTION option = {0};
+  TAOS_STMT2*       stmt = taos_stmt2_init(taos, &option);
+  ASSERT_NE(stmt, nullptr);
+  int       code = 0;
+  uintptr_t c10len = 0;
+  struct {
+    int64_t       c1;
+    int32_t       c2;
+    int64_t       c3;
+    float         c4;
+    double        c5;
+    unsigned char c6[8];
+    int16_t       c7;
+    int8_t        c8;
+    int8_t        c9;
+    char          c10[32];
+  } v = {1591060628000, 1, 2, 3.0, 4.0, "abcdef", 5, 6, 7, "ijnop"};
+
+  struct {
+    int32_t c1;
+    int32_t c2;
+    int32_t c3;
+    int32_t c4;
+    int32_t c5;
+    int32_t c6;
+    int32_t c7;
+    int32_t c8;
+    int32_t c9;
+    int32_t c10;
+  } v_len = {sizeof(int64_t), sizeof(int32_t),
+             sizeof(int64_t), sizeof(float),
+             sizeof(double),  8,
+             sizeof(int16_t), sizeof(int8_t),
+             sizeof(int8_t),  8};
+  TAOS_STMT2_BIND params[11];
+  params[0].buffer_type = TSDB_DATA_TYPE_TIMESTAMP;
+  params[0].length = (int32_t*)&v_len.c1;
+  params[0].buffer = &v.c1;
+  params[0].is_null = NULL;
+  params[0].num = 1;
+
+  params[1].buffer_type = TSDB_DATA_TYPE_INT;
+  params[1].buffer = &v.c2;
+  params[1].length = (int32_t*)&v_len.c2;
+  params[1].is_null = NULL;
+  params[1].num = 1;
+
+  params[2].buffer_type = TSDB_DATA_TYPE_BIGINT;
+  params[2].buffer = &v.c3;
+  params[2].length = (int32_t*)&v_len.c3;
+  params[2].is_null = NULL;
+  params[2].num = 1;
+
+  params[3].buffer_type = TSDB_DATA_TYPE_FLOAT;
+  params[3].buffer = &v.c4;
+  params[3].length = (int32_t*)&v_len.c4;
+  params[3].is_null = NULL;
+  params[3].num = 1;
+
+  params[4].buffer_type = TSDB_DATA_TYPE_DOUBLE;
+  params[4].buffer = &v.c5;
+  params[4].length = (int32_t*)&v_len.c5;
+  params[4].is_null = NULL;
+  params[4].num = 1;
+
+  params[5].buffer_type = TSDB_DATA_TYPE_BINARY;
+  params[5].buffer = &v.c6;
+  params[5].length = (int32_t*)&v_len.c6;
+  params[5].is_null = NULL;
+  params[5].num = 1;
+
+  params[6].buffer_type = TSDB_DATA_TYPE_SMALLINT;
+  params[6].buffer = &v.c7;
+  params[6].length = (int32_t*)&v_len.c7;
+  params[6].is_null = NULL;
+  params[6].num = 1;
+
+  params[7].buffer_type = TSDB_DATA_TYPE_TINYINT;
+  params[7].buffer = &v.c8;
+  params[7].length = (int32_t*)&v_len.c8;
+  params[7].is_null = NULL;
+  params[7].num = 1;
+
+  params[8].buffer_type = TSDB_DATA_TYPE_BOOL;
+  params[8].buffer = &v.c9;
+  params[8].length = (int32_t*)&v_len.c9;
+  params[8].is_null = NULL;
+  params[8].num = 1;
+
+  params[9].buffer_type = TSDB_DATA_TYPE_NCHAR;
+  params[9].buffer = &v.c10;
+  params[9].length = (int32_t*)&v_len.c10;
+  params[9].is_null = NULL;
+  params[9].num = 1;
+
+  unsigned char* outputGeom1;
+  size_t         size1;
+  initCtxMakePoint();
+  code = doMakePoint(1.000, 2.000, &outputGeom1, &size1);
+  checkError(stmt, code);
+  params[10].buffer_type = TSDB_DATA_TYPE_GEOMETRY;
+  params[10].buffer = outputGeom1;
+  params[10].length = (int32_t*)&size1;
+  params[10].is_null = NULL;
+  params[10].num = 1;
+
+  char* stmt_sql = "insert into stmt2_testdb_16.? using stb tags(?,?,?,?,?,?,?,?,?,?,?)values (?,?,?,?,?,?,?,?,?,?,?)";
+  code = taos_stmt2_prepare(stmt, stmt_sql, 0);
+  checkError(stmt, code);
+
+  char*            tbname[1] = {"tb1"};
+  TAOS_STMT2_BIND* tags = &params[0];
+  TAOS_STMT2_BIND* cols = &params[0];
+  TAOS_STMT2_BINDV bindv = {1, &tbname[0], &tags, &cols};
+  code = taos_stmt2_bind_param(stmt, &bindv, -2);
+  checkError(stmt, code);
+
+  int affected_rows;
+  code = taos_stmt2_exec(stmt, &affected_rows);
+  checkError(stmt, code);
+  ASSERT_EQ(affected_rows, 1);
+
+  int64_t ts2 = 1591060628000;
+  params[0].buffer = &ts2;
+  code = taos_stmt2_bind_param(stmt, &bindv, -2);
+  checkError(stmt, code);
+
+  code = taos_stmt2_exec(stmt, &affected_rows);
+  checkError(stmt, code);
+  ASSERT_EQ(affected_rows, 1);
+
+  params[0].buffer = &ts2;
+  code = taos_stmt2_bind_param(stmt, &bindv, -1);
+  ASSERT_EQ(code, TSDB_CODE_TSC_STMT_API_ERROR);
+
+  geosFreeBuffer(outputGeom1);
+  taos_stmt2_close(stmt);
+  do_query(taos, "drop database if exists stmt2_testdb_16");
+  taos_close(taos);
+}
 #pragma GCC diagnostic pop
diff --git a/source/libs/parser/src/parInsertStmt.c b/source/libs/parser/src/parInsertStmt.c
index 6339dfee7e..3228106516 100644
--- a/source/libs/parser/src/parInsertStmt.c
+++ b/source/libs/parser/src/parInsertStmt.c
@@ -837,6 +837,117 @@ static int32_t convertStmtNcharCol2(SMsgBuf* pMsgBuf, SSchema* pSchema, TAOS_STM
 }
 
 int32_t qBindStmtColsValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bind, char* msgBuf, int32_t msgBufLen,
+                            void* charsetCxt) {
+  STableDataCxt*   pDataBlock = (STableDataCxt*)pBlock;
+  SSchema*         pSchema = getTableColumnSchema(pDataBlock->pMeta);
+  SBoundColInfo*   boundInfo = &pDataBlock->boundColsInfo;
+  SMsgBuf          pBuf = {.buf = msgBuf, .len = msgBufLen};
+  int32_t          rowNum = bind->num;
+  TAOS_STMT2_BIND  ncharBind = {0};
+  TAOS_STMT2_BIND* pBind = NULL;
+  int32_t          code = 0;
+
+  for (int c = 0; c < boundInfo->numOfBound; ++c) {
+    SSchema*  pColSchema = &pSchema[boundInfo->pColIndex[c]];
+    SColData* pCol = taosArrayGet(pCols, c);
+    if (pCol == NULL || pColSchema == NULL) {
+      code = buildInvalidOperationMsg(&pBuf, "get column schema or column data failed");
+      goto _return;
+    }
+
+    if (boundInfo->pColIndex[c] == 0) {
+      pCol->cflag |= COL_IS_KEY;
+    }
+
+    if (bind[c].num != rowNum) {
+      code = buildInvalidOperationMsg(&pBuf, "row number in each bind param should be the same");
+      goto _return;
+    }
+
+    if ((!(rowNum == 1 && bind[c].is_null && *bind[c].is_null)) &&
+        bind[c].buffer_type != pColSchema->type) {  // for rowNum ==1 , connector may not set buffer_type
+      code = buildInvalidOperationMsg(&pBuf, "column type mis-match with buffer type");
+      goto _return;
+    }
+
+    if (TSDB_DATA_TYPE_NCHAR == pColSchema->type) {
+      code = convertStmtNcharCol2(&pBuf, pColSchema, bind + c, &ncharBind, charsetCxt);
+      if (code) {
+        goto _return;
+      }
+      pBind = &ncharBind;
+    } else {
+      pBind = bind + c;
+    }
+
+    code = tColDataAddValueByBind2(pCol, pBind,
+                                   IS_VAR_DATA_TYPE(pColSchema->type) ? pColSchema->bytes - VARSTR_HEADER_SIZE : -1,
+                                   initCtxAsText, checkWKB);
+    if (code) {
+      goto _return;
+    }
+  }
+
+  qDebug("stmt2 all %d columns bind %d rows data as col format", boundInfo->numOfBound, rowNum);
+
+_return:
+
+  taosMemoryFree(ncharBind.buffer);
+  taosMemoryFree(ncharBind.length);
+
+  return code;
+}
+
+int32_t qBindStmtSingleColValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bind, char* msgBuf, int32_t msgBufLen,
+                                 int32_t colIdx, int32_t rowNum, void *charsetCxt) {
+  STableDataCxt*   pDataBlock = (STableDataCxt*)pBlock;
+  SSchema*         pSchema = getTableColumnSchema(pDataBlock->pMeta);
+  SBoundColInfo*   boundInfo = &pDataBlock->boundColsInfo;
+  SMsgBuf          pBuf = {.buf = msgBuf, .len = msgBufLen};
+  SSchema*         pColSchema = &pSchema[boundInfo->pColIndex[colIdx]];
+  SColData*        pCol = taosArrayGet(pCols, colIdx);
+  TAOS_STMT2_BIND  ncharBind = {0};
+  TAOS_STMT2_BIND* pBind = NULL;
+  int32_t          code = 0;
+
+  if (bind->num != rowNum) {
+    return buildInvalidOperationMsg(&pBuf, "row number in each bind param should be the same");
+  }
+
+  // Column index exceeds the number of columns
+  if (colIdx >= pCols->size && pCol == NULL) {
+    return buildInvalidOperationMsg(&pBuf, "column index exceeds the number of columns");
+  }
+
+  if (bind->buffer_type != pColSchema->type) {
+    return buildInvalidOperationMsg(&pBuf, "column type mis-match with buffer type");
+  }
+
+  if (TSDB_DATA_TYPE_NCHAR == pColSchema->type) {
+    code = convertStmtNcharCol2(&pBuf, pColSchema, bind, &ncharBind, charsetCxt);
+    if (code) {
+      goto _return;
+    }
+    pBind = &ncharBind;
+  } else {
+    pBind = bind;
+  }
+
+  code = tColDataAddValueByBind2(pCol, pBind,
+                                 IS_VAR_DATA_TYPE(pColSchema->type) ? pColSchema->bytes - VARSTR_HEADER_SIZE : -1,
+                                 initCtxAsText, checkWKB);
+
+  qDebug("stmt col %d bind %d rows data", colIdx, rowNum);
+
+_return:
+
+  taosMemoryFree(ncharBind.buffer);
+  taosMemoryFree(ncharBind.length);
+
+  return code;
+}
+
+int32_t qBindStmt2RowValue(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bind, char* msgBuf, int32_t msgBufLen,
                             STSchema** pTSchema, SBindInfo2* pBindInfos, void* charsetCxt) {
   STableDataCxt*   pDataBlock = (STableDataCxt*)pBlock;
   SSchema*         pSchema = getTableColumnSchema(pDataBlock->pMeta);
@@ -861,10 +972,6 @@ int32_t qBindStmtColsValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bind,
       lastColId = pColSchema->colId;
     }
 
-    if(boundInfo->pColIndex[c]==0){
-      pCol->cflag |= COL_IS_KEY;
-    }
-
     if (bind[c].num != rowNum) {
       code = buildInvalidOperationMsg(&pBuf, "row number in each bind param should be the same");
       goto _return;
@@ -918,56 +1025,7 @@ int32_t qBindStmtColsValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bind,
 
   code = tRowBuildFromBind2(pBindInfos, boundInfo->numOfBound, colInOrder, *pTSchema, pCols, &pDataBlock->ordered,
                             &pDataBlock->duplicateTs);
-  qDebug("stmt2 all %d columns bind %d rows data as col format", boundInfo->numOfBound, rowNum);
-
-_return:
-
-  taosMemoryFree(ncharBind.buffer);
-  taosMemoryFree(ncharBind.length);
-
-  return code;
-}
-
-int32_t qBindStmtSingleColValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bind, char* msgBuf, int32_t msgBufLen,
-                                 int32_t colIdx, int32_t rowNum, void *charsetCxt) {
-  STableDataCxt*   pDataBlock = (STableDataCxt*)pBlock;
-  SSchema*         pSchema = getTableColumnSchema(pDataBlock->pMeta);
-  SBoundColInfo*   boundInfo = &pDataBlock->boundColsInfo;
-  SMsgBuf          pBuf = {.buf = msgBuf, .len = msgBufLen};
-  SSchema*         pColSchema = &pSchema[boundInfo->pColIndex[colIdx]];
-  SColData*        pCol = taosArrayGet(pCols, colIdx);
-  TAOS_STMT2_BIND  ncharBind = {0};
-  TAOS_STMT2_BIND* pBind = NULL;
-  int32_t          code = 0;
-
-  if (bind->num != rowNum) {
-    return buildInvalidOperationMsg(&pBuf, "row number in each bind param should be the same");
-  }
-
-  // Column index exceeds the number of columns
-  if (colIdx >= pCols->size && pCol == NULL) {
-    return buildInvalidOperationMsg(&pBuf, "column index exceeds the number of columns");
-  }
-
-  if (bind->buffer_type != pColSchema->type) {
-    return buildInvalidOperationMsg(&pBuf, "column type mis-match with buffer type");
-  }
-
-  if (TSDB_DATA_TYPE_NCHAR == pColSchema->type) {
-    code = convertStmtNcharCol2(&pBuf, pColSchema, bind, &ncharBind, charsetCxt);
-    if (code) {
-      goto _return;
-    }
-    pBind = &ncharBind;
-  } else {
-    pBind = bind;
-  }
-
-  code = tColDataAddValueByBind2(pCol, pBind,
-                                 IS_VAR_DATA_TYPE(pColSchema->type) ? pColSchema->bytes - VARSTR_HEADER_SIZE : -1,
-                                 initCtxAsText, checkWKB);
-
-  qDebug("stmt col %d bind %d rows data", colIdx, rowNum);
+  qDebug("stmt2 all %d columns bind %d rows data as row format", boundInfo->numOfBound, rowNum);
 
 _return:
 

From d4656efcb1bc479791ac061e18656b285c775010 Mon Sep 17 00:00:00 2001
From: "pengrongkun94@qq.com" <pengrongkun94@qq.com>
Date: Thu, 27 Feb 2025 10:54:43 +0800
Subject: [PATCH 20/35] fix CI format

---
 source/client/src/clientStmt2.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/client/src/clientStmt2.c b/source/client/src/clientStmt2.c
index fc056a5648..4c92cd4317 100644
--- a/source/client/src/clientStmt2.c
+++ b/source/client/src/clientStmt2.c
@@ -1711,11 +1711,11 @@ int stmtExec2(TAOS_STMT2* stmt, int* affected_rows) {
     return pStmt->errCode;
   }
 
-  (void)taosThreadMutexLock(&pStmt->asyncBindParam.mutex);
+  TSC_ERR_RET(taosThreadMutexLock(&pStmt->asyncBindParam.mutex));
   while (atomic_load_8((int8_t*)&pStmt->asyncBindParam.asyncBindNum) > 0) {
     (void)taosThreadCondWait(&pStmt->asyncBindParam.waitCond, &pStmt->asyncBindParam.mutex);
   }
-  (void)taosThreadMutexUnlock(&pStmt->asyncBindParam.mutex);
+  TSC_ERR_RET(taosThreadMutexUnlock(&pStmt->asyncBindParam.mutex));
 
   if (pStmt->sql.stbInterlaceMode) {
     STMT_ERR_RET(stmtAddBatch2(pStmt));
@@ -1817,11 +1817,11 @@ int stmtClose2(TAOS_STMT2* stmt) {
     pStmt->bindThreadInUse = false;
   }
 
-  (void)taosThreadMutexLock(&pStmt->asyncBindParam.mutex);
+  TSC_ERR_RET(taosThreadMutexLock(&pStmt->asyncBindParam.mutex));
   while (atomic_load_8((int8_t*)&pStmt->asyncBindParam.asyncBindNum) > 0) {
     (void)taosThreadCondWait(&pStmt->asyncBindParam.waitCond, &pStmt->asyncBindParam.mutex);
   }
-  (void)taosThreadMutexUnlock(&pStmt->asyncBindParam.mutex);
+  TSC_ERR_RET(taosThreadMutexUnlock(&pStmt->asyncBindParam.mutex));
 
   (void)taosThreadCondDestroy(&pStmt->queue.waitCond);
   (void)taosThreadMutexDestroy(&pStmt->queue.mutex);

From 031f176aa1a84f2aac792b1b5bf36950a7f5a49d Mon Sep 17 00:00:00 2001
From: dmchen <cademfly@hotmail.com>
Date: Thu, 27 Feb 2025 11:02:18 +0800
Subject: [PATCH 21/35] fix/move-status-to-new-queue

---
 include/common/tmsgcb.h                       |  1 +
 source/dnode/mgmt/mgmt_dnode/src/dmHandle.c   |  7 ++++---
 source/dnode/mgmt/mgmt_mnode/inc/mmInt.h      |  2 ++
 source/dnode/mgmt/mgmt_mnode/src/mmHandle.c   |  2 +-
 source/dnode/mgmt/mgmt_mnode/src/mmWorker.c   | 20 +++++++++++++++++++
 source/dnode/mgmt/mgmt_qnode/src/qmWorker.c   |  1 +
 source/dnode/mnode/impl/test/trans/trans2.cpp |  3 ++-
 source/libs/sync/inc/syncUtil.h               |  4 ++--
 8 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/include/common/tmsgcb.h b/include/common/tmsgcb.h
index c934cb6961..56f1219b1b 100644
--- a/include/common/tmsgcb.h
+++ b/include/common/tmsgcb.h
@@ -31,6 +31,7 @@ typedef enum {
   QUERY_QUEUE,
   FETCH_QUEUE,
   READ_QUEUE,
+  STATUS_QUEUE,
   WRITE_QUEUE,
   APPLY_QUEUE,
   SYNC_QUEUE,
diff --git a/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c b/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c
index 0a3543ac07..2fc3ec36a4 100644
--- a/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c
+++ b/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c
@@ -267,7 +267,7 @@ void dmSendStatusReq(SDnodeMgmt *pMgmt) {
   code =
       rpcSendRecvWithTimeout(pMgmt->msgCb.statusRpc, &epSet, &rpcMsg, &rpcRsp, &epUpdated, tsStatusInterval * 5 * 1000);
   if (code != 0) {
-    dError("failed to send status req since %s", tstrerror(code));
+    dError("failed to SendRecv with timeout %d status req since %s", tsStatusInterval * 5 * 1000, tstrerror(code));
     return;
   }
 
@@ -275,7 +275,8 @@ void dmSendStatusReq(SDnodeMgmt *pMgmt) {
     dmRotateMnodeEpSet(pMgmt->pData);
     char tbuf[512];
     dmEpSetToStr(tbuf, sizeof(tbuf), &epSet);
-    dError("failed to send status req since %s, epSet:%s, inUse:%d", tstrerror(rpcRsp.code), tbuf, epSet.inUse);
+    dInfo("Rotate mnode ep set since failed to SendRecv status req %s, epSet:%s, inUse:%d", tstrerror(rpcRsp.code),
+          tbuf, epSet.inUse);
   } else {
     if (epUpdated == 1) {
       dmSetMnodeEpSet(pMgmt->pData, &epSet);
@@ -403,7 +404,7 @@ void dmSendConfigReq(SDnodeMgmt *pMgmt) {
   code =
       rpcSendRecvWithTimeout(pMgmt->msgCb.statusRpc, &epSet, &rpcMsg, &rpcRsp, &epUpdated, tsStatusInterval * 5 * 1000);
   if (code != 0) {
-    dError("failed to send status req since %s", tstrerror(code));
+    dError("failed to SendRecv config req with timeout %d since %s", tsStatusInterval * 5 * 1000, tstrerror(code));
     return;
   }
   if (rpcRsp.code != 0) {
diff --git a/source/dnode/mgmt/mgmt_mnode/inc/mmInt.h b/source/dnode/mgmt/mgmt_mnode/inc/mmInt.h
index bc2977fe31..2d7aa35c13 100644
--- a/source/dnode/mgmt/mgmt_mnode/inc/mmInt.h
+++ b/source/dnode/mgmt/mgmt_mnode/inc/mmInt.h
@@ -32,6 +32,7 @@ typedef struct SMnodeMgmt {
   SSingleWorker  queryWorker;
   SSingleWorker  fetchWorker;
   SSingleWorker  readWorker;
+  SSingleWorker  statusWorker;
   SSingleWorker  writeWorker;
   SSingleWorker  arbWorker;
   SSingleWorker  syncWorker;
@@ -58,6 +59,7 @@ int32_t mmPutMsgToArbQueue(SMnodeMgmt *pMgmt, SRpcMsg *pMsg);
 int32_t mmPutMsgToSyncQueue(SMnodeMgmt *pMgmt, SRpcMsg *pMsg);
 int32_t mmPutMsgToSyncRdQueue(SMnodeMgmt *pMgmt, SRpcMsg *pMsg);
 int32_t mmPutMsgToReadQueue(SMnodeMgmt *pMgmt, SRpcMsg *pMsg);
+int32_t mmPutMsgToStatusQueue(SMnodeMgmt *pMgmt, SRpcMsg *pMsg);
 int32_t mmPutMsgToQueryQueue(SMnodeMgmt *pMgmt, SRpcMsg *pMsg);
 int32_t mmPutMsgToFetchQueue(SMnodeMgmt *pMgmt, SRpcMsg *pMsg);
 int32_t mmPutMsgToQueue(SMnodeMgmt *pMgmt, EQueueType qtype, SRpcMsg *pRpc);
diff --git a/source/dnode/mgmt/mgmt_mnode/src/mmHandle.c b/source/dnode/mgmt/mgmt_mnode/src/mmHandle.c
index 8f110dbcf3..605e4f94a1 100644
--- a/source/dnode/mgmt/mgmt_mnode/src/mmHandle.c
+++ b/source/dnode/mgmt/mgmt_mnode/src/mmHandle.c
@@ -203,7 +203,7 @@ SArray *mmGetMsgHandles() {
   if (dmSetMgmtHandle(pArray, TDMT_MND_KILL_QUERY, mmPutMsgToWriteQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_MND_KILL_CONN, mmPutMsgToWriteQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_MND_HEARTBEAT, mmPutMsgToReadQueue, 0) == NULL) goto _OVER;
-  if (dmSetMgmtHandle(pArray, TDMT_MND_STATUS, mmPutMsgToReadQueue, 0) == NULL) goto _OVER;
+  if (dmSetMgmtHandle(pArray, TDMT_MND_STATUS, mmPutMsgToStatusQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_MND_CONFIG, mmPutMsgToWriteQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_MND_NOTIFY, mmPutMsgToReadQueue, 0) == NULL) goto _OVER;
   if (dmSetMgmtHandle(pArray, TDMT_MND_SYSTABLE_RETRIEVE, mmPutMsgToReadQueue, 0) == NULL) goto _OVER;
diff --git a/source/dnode/mgmt/mgmt_mnode/src/mmWorker.c b/source/dnode/mgmt/mgmt_mnode/src/mmWorker.c
index cfdc09f29e..cb82ddae2e 100644
--- a/source/dnode/mgmt/mgmt_mnode/src/mmWorker.c
+++ b/source/dnode/mgmt/mgmt_mnode/src/mmWorker.c
@@ -133,6 +133,10 @@ int32_t mmPutMsgToReadQueue(SMnodeMgmt *pMgmt, SRpcMsg *pMsg) {
   return mmPutMsgToWorker(pMgmt, &pMgmt->readWorker, pMsg);
 }
 
+int32_t mmPutMsgToStatusQueue(SMnodeMgmt *pMgmt, SRpcMsg *pMsg) {
+  return mmPutMsgToWorker(pMgmt, &pMgmt->statusWorker, pMsg);
+}
+
 int32_t mmPutMsgToQueryQueue(SMnodeMgmt *pMgmt, SRpcMsg *pMsg) {
   int32_t code = 0;
   if (NULL == pMgmt->pMnode) {
@@ -172,6 +176,9 @@ int32_t mmPutMsgToQueue(SMnodeMgmt *pMgmt, EQueueType qtype, SRpcMsg *pRpc) {
     case READ_QUEUE:
       pWorker = &pMgmt->readWorker;
       break;
+    case STATUS_QUEUE:
+      pWorker = &pMgmt->statusWorker;
+      break;
     case ARB_QUEUE:
       pWorker = &pMgmt->arbWorker;
       break;
@@ -246,6 +253,18 @@ int32_t mmStartWorker(SMnodeMgmt *pMgmt) {
     return code;
   }
 
+  SSingleWorkerCfg stautsCfg = {
+      .min = 1,
+      .max = 1,
+      .name = "mnode-status",
+      .fp = (FItem)mmProcessRpcMsg,
+      .param = pMgmt,
+  };
+  if ((code = tSingleWorkerInit(&pMgmt->statusWorker, &stautsCfg)) != 0) {
+    dError("failed to start mnode-status worker since %s", tstrerror(code));
+    return code;
+  }
+
   SSingleWorkerCfg wCfg = {
       .min = 1,
       .max = 1,
@@ -304,6 +323,7 @@ void mmStopWorker(SMnodeMgmt *pMgmt) {
   tSingleWorkerCleanup(&pMgmt->queryWorker);
   tSingleWorkerCleanup(&pMgmt->fetchWorker);
   tSingleWorkerCleanup(&pMgmt->readWorker);
+  tSingleWorkerCleanup(&pMgmt->statusWorker);
   tSingleWorkerCleanup(&pMgmt->writeWorker);
   tSingleWorkerCleanup(&pMgmt->arbWorker);
   tSingleWorkerCleanup(&pMgmt->syncWorker);
diff --git a/source/dnode/mgmt/mgmt_qnode/src/qmWorker.c b/source/dnode/mgmt/mgmt_qnode/src/qmWorker.c
index ab5b70079a..950da46a40 100644
--- a/source/dnode/mgmt/mgmt_qnode/src/qmWorker.c
+++ b/source/dnode/mgmt/mgmt_qnode/src/qmWorker.c
@@ -71,6 +71,7 @@ int32_t qmPutRpcMsgToQueue(SQnodeMgmt *pMgmt, EQueueType qtype, SRpcMsg *pRpc) {
       code = taosWriteQitem(pMgmt->queryWorker.queue, pMsg);
       return code;
     case READ_QUEUE:
+    case STATUS_QUEUE:
     case FETCH_QUEUE:
       dTrace("msg:%p, is created and will put into qnode-fetch queue, len:%d", pMsg, pRpc->contLen);
       code = taosWriteQitem(pMgmt->fetchWorker.queue, pMsg);
diff --git a/source/dnode/mnode/impl/test/trans/trans2.cpp b/source/dnode/mnode/impl/test/trans/trans2.cpp
index b73f07c778..e520fce111 100644
--- a/source/dnode/mnode/impl/test/trans/trans2.cpp
+++ b/source/dnode/mnode/impl/test/trans/trans2.cpp
@@ -65,7 +65,8 @@ class MndTestTrans2 : public ::testing::Test {
     msgCb.sendRspFp = sendRsp;
     msgCb.queueFps[SYNC_QUEUE] = putToQueue;
     msgCb.queueFps[WRITE_QUEUE] = putToQueue;
-     msgCb.queueFps[READ_QUEUE] = putToQueue;
+    msgCb.queueFps[READ_QUEUE] = putToQueue;
+    msgCb.queueFps[STATUS_QUEUE] = putToQueue;
     msgCb.mgmt = (SMgmtWrapper *)(&msgCb);  // hack
     tmsgSetDefault(&msgCb);
 
diff --git a/source/libs/sync/inc/syncUtil.h b/source/libs/sync/inc/syncUtil.h
index 7b71491f47..e7110c0964 100644
--- a/source/libs/sync/inc/syncUtil.h
+++ b/source/libs/sync/inc/syncUtil.h
@@ -50,8 +50,8 @@ extern "C" {
 #define sNError(pNode, ...)  if (sDebugFlag & DEBUG_ERROR) { syncPrintNodeLog("SYN ERROR ", DEBUG_ERROR, 255, true,       pNode,  __VA_ARGS__); }
 #define sNWarn(pNode, ...)   if (sDebugFlag & DEBUG_WARN)  { syncPrintNodeLog("SYN WARN ",  DEBUG_WARN,  255, true,        pNode,  __VA_ARGS__); }
 #define sNInfo(pNode, ...)   if (sDebugFlag & DEBUG_INFO)  { syncPrintNodeLog("SYN ",       DEBUG_INFO,  255, true,        pNode, __VA_ARGS__); }
-#define sNDebug(pNode, ...)  if (sDebugFlag & DEBUG_DEBUG) { syncPrintNodeLog("SYN ",       DEBUG_DEBUG, sDebugFlag, false, pNode,  __VA_ARGS__); }
-#define sNTrace(pNode, ...)  if (sDebugFlag & DEBUG_TRACE) { syncPrintNodeLog("SYN ",       DEBUG_TRACE, sDebugFlag, false, pNode,  __VA_ARGS__); }
+#define sNDebug(pNode, ...)  if (sDebugFlag & DEBUG_DEBUG) { syncPrintNodeLog("SYN ",       DEBUG_DEBUG, sDebugFlag, true, pNode,  __VA_ARGS__); }
+#define sNTrace(pNode, ...)  if (sDebugFlag & DEBUG_TRACE) { syncPrintNodeLog("SYN ",       DEBUG_TRACE, sDebugFlag, true, pNode,  __VA_ARGS__); }
 
 #define sSFatal(pSender, ...)  if (sDebugFlag & DEBUG_FATAL) { syncPrintSnapshotSenderLog("SYN FATAL ", DEBUG_FATAL, 255,        pSender, __VA_ARGS__); }
 #define sSError(pSender, ...)  if (sDebugFlag & DEBUG_ERROR) { syncPrintSnapshotSenderLog("SYN ERROR ", DEBUG_ERROR, 255,        pSender, __VA_ARGS__); }

From b3ae5df8ac003676fda4d5d46841ead42d1de527 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Thu, 27 Feb 2025 14:06:30 +0800
Subject: [PATCH 22/35] enh: more code

---
 source/dnode/vnode/src/inc/vnodeInt.h             |  7 ++++---
 .../test_new/storage/compact/test_compact_meta.py | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/source/dnode/vnode/src/inc/vnodeInt.h b/source/dnode/vnode/src/inc/vnodeInt.h
index 0feb2e8e4f..68eb4c3ce7 100644
--- a/source/dnode/vnode/src/inc/vnodeInt.h
+++ b/source/dnode/vnode/src/inc/vnodeInt.h
@@ -168,7 +168,7 @@ int             metaTtlFindExpired(SMeta* pMeta, int64_t timePointMs, SArray* tb
 int             metaAlterTable(SMeta* pMeta, int64_t version, SVAlterTbReq* pReq, STableMetaRsp* pMetaRsp);
 int             metaUpdateChangeTimeWithLock(SMeta* pMeta, tb_uid_t uid, int64_t changeTimeMs);
 SSchemaWrapper* metaGetTableSchema(SMeta* pMeta, tb_uid_t uid, int32_t sver, int lock);
-int64_t         metaGetTableCreateTime(SMeta *pMeta, tb_uid_t uid, int lock);
+int64_t         metaGetTableCreateTime(SMeta* pMeta, tb_uid_t uid, int lock);
 int32_t         metaGetTbTSchemaNotNull(SMeta* pMeta, tb_uid_t uid, int32_t sver, int lock, STSchema** ppTSchema);
 int32_t         metaGetTbTSchemaMaybeNull(SMeta* pMeta, tb_uid_t uid, int32_t sver, int lock, STSchema** ppTSchema);
 STSchema*       metaGetTbTSchema(SMeta* pMeta, tb_uid_t uid, int32_t sver, int lock);
@@ -488,8 +488,9 @@ struct SVnode {
   SVATaskID commitTask;
 
   struct {
-    SMeta* pMeta;
-    SMeta* pNewMeta;
+    SMeta*    pMeta;
+    SMeta*    pNewMeta;
+    SVATaskID metaCompactTask;
   };
 
   SSma*         pSma;
diff --git a/tests/test_new/storage/compact/test_compact_meta.py b/tests/test_new/storage/compact/test_compact_meta.py
index c806567aa2..19aca5ff54 100644
--- a/tests/test_new/storage/compact/test_compact_meta.py
+++ b/tests/test_new/storage/compact/test_compact_meta.py
@@ -12,6 +12,7 @@ from util.dnodes import tdDnodes
 from util.sql import *
 from util.cases import *
 from util.log import *
+import inspect
 
 sys.path.append("../tests/pytest")
 
@@ -41,6 +42,8 @@ class TestCompactMeta:
             1. Alter child table tags
             2. Make sure compact meta works
         """
+        tdLog.info(f'case {inspect.currentframe().f_code.co_name} start')
+
         db_name = 'db1'
         stb_name = 'stb1'
         ctb_name_prefix = 'ctb'
@@ -59,16 +62,28 @@ class TestCompactMeta:
         tdSql.execute(sql)
 
         # Create child tables
+        tdLog.info(
+            f'case {inspect.currentframe().f_code.co_name}: create {num_child_tables} child tables')
         for i in range(1, num_child_tables+1):
+            if i % 100 == 0:
+                tdLog.info(
+                    f'case {inspect.currentframe().f_code.co_name}: create {i} child tables')
             sql = f'create table {db_name}.{ctb_name_prefix}{i} using {db_name}.{stb_name} tags({i})'
             tdSql.execute(sql)
 
         # Alter child table tags
+        tdLog.info(
+            f'case {inspect.currentframe().f_code.co_name}: alter child table tags')
         for i in range(1, num_child_tables+1):
+            if i % 100 == 0:
+                tdLog.info(
+                    f'case {inspect.currentframe().f_code.co_name}: altered {i} child tables')
             sql = f'alter table {db_name}.{ctb_name_prefix}{i} set tag t1 = {i+1}'
             tdSql.execute(sql)
 
         # Compact meta
+        tdLog.info(
+            f'case {inspect.currentframe().f_code.co_name}: start to compact meta')
         sql = f'compact database {db_name} meta_only'
         tdSql.execute(sql)
 

From e2b48e43979a4513f9d5c7957ad6abb1f990bc1c Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Thu, 27 Feb 2025 15:06:49 +0800
Subject: [PATCH 23/35] enh: add more code

---
 source/dnode/vnode/src/inc/vnodeInt.h   |  7 ++++---
 source/dnode/vnode/src/vnd/vnodeOpen.c  |  2 ++
 source/dnode/vnode/src/vnd/vnodeQuery.c | 20 +++++++++++++-------
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/source/dnode/vnode/src/inc/vnodeInt.h b/source/dnode/vnode/src/inc/vnodeInt.h
index 68eb4c3ce7..b13a66da99 100644
--- a/source/dnode/vnode/src/inc/vnodeInt.h
+++ b/source/dnode/vnode/src/inc/vnodeInt.h
@@ -488,9 +488,10 @@ struct SVnode {
   SVATaskID commitTask;
 
   struct {
-    SMeta*    pMeta;
-    SMeta*    pNewMeta;
-    SVATaskID metaCompactTask;
+    TdThreadRwlock metaRWLock;
+    SMeta*         pMeta;
+    SMeta*         pNewMeta;
+    SVATaskID      metaCompactTask;
   };
 
   SSma*         pSma;
diff --git a/source/dnode/vnode/src/vnd/vnodeOpen.c b/source/dnode/vnode/src/vnd/vnodeOpen.c
index 280ee527f7..26b8d310e8 100644
--- a/source/dnode/vnode/src/vnd/vnodeOpen.c
+++ b/source/dnode/vnode/src/vnd/vnodeOpen.c
@@ -449,6 +449,7 @@ SVnode *vnodeOpen(const char *path, int32_t diskPrimary, STfs *pTfs, SMsgCb msgC
   }
 
   // open meta
+  (void)taosThreadRwlockInit(&pVnode->metaRWLock, NULL);
   vInfo("vgId:%d, start to open vnode meta", TD_VID(pVnode));
   if (metaOpen(pVnode, &pVnode->pMeta, rollback) < 0) {
     vError("vgId:%d, failed to open vnode meta since %s", TD_VID(pVnode), tstrerror(terrno));
@@ -548,6 +549,7 @@ _err:
   if (pVnode->pMeta) metaClose(&pVnode->pMeta);
   if (pVnode->freeList) vnodeCloseBufPool(pVnode);
 
+  (void)taosThreadRwlockDestroy(&pVnode->metaRWLock);
   taosMemoryFree(pVnode);
   return NULL;
 }
diff --git a/source/dnode/vnode/src/vnd/vnodeQuery.c b/source/dnode/vnode/src/vnd/vnodeQuery.c
index d765861381..49dfb99499 100644
--- a/source/dnode/vnode/src/vnd/vnodeQuery.c
+++ b/source/dnode/vnode/src/vnd/vnodeQuery.c
@@ -49,7 +49,7 @@ int32_t fillTableColCmpr(SMetaReader *reader, SSchemaExt *pExt, int32_t numOfCol
   return 0;
 }
 
-void vnodePrintTableMeta(STableMetaRsp* pMeta) {
+void vnodePrintTableMeta(STableMetaRsp *pMeta) {
   if (!(qDebugFlag & DEBUG_DEBUG)) {
     return;
   }
@@ -70,14 +70,13 @@ void vnodePrintTableMeta(STableMetaRsp* pMeta) {
   qDebug("sysInfo:%d", pMeta->sysInfo);
   if (pMeta->pSchemas) {
     for (int32_t i = 0; i < (pMeta->numOfColumns + pMeta->numOfTags); ++i) {
-      SSchema* pSchema = pMeta->pSchemas + i;
-      qDebug("%d col/tag: type:%d, flags:%d, colId:%d, bytes:%d, name:%s", i, pSchema->type, pSchema->flags, pSchema->colId, pSchema->bytes, pSchema->name);
+      SSchema *pSchema = pMeta->pSchemas + i;
+      qDebug("%d col/tag: type:%d, flags:%d, colId:%d, bytes:%d, name:%s", i, pSchema->type, pSchema->flags,
+             pSchema->colId, pSchema->bytes, pSchema->name);
     }
   }
-
 }
 
-
 int32_t vnodeGetTableMeta(SVnode *pVnode, SRpcMsg *pMsg, bool direct) {
   STableInfoReq  infoReq = {0};
   STableMetaRsp  metaRsp = {0};
@@ -528,6 +527,13 @@ _exit:
   return code;
 }
 
+#define VNODE_DO_META_QUERY(pVnode, cmd)                 \
+  do {                                                   \
+    (void)taosThreadRwlockRdlock(&(pVnode)->metaRWLock); \
+    cmd;                                                 \
+    (void)taosThreadRwlockUnlock(&(pVnode)->metaRWLock); \
+  } while (0)
+
 int32_t vnodeGetLoad(SVnode *pVnode, SVnodeLoad *pLoad) {
   SSyncState state = syncGetState(pVnode->sync);
   pLoad->syncAppliedIndex = pVnode->state.applied;
@@ -543,8 +549,8 @@ int32_t vnodeGetLoad(SVnode *pVnode, SVnodeLoad *pLoad) {
   pLoad->learnerProgress = state.progress;
   pLoad->cacheUsage = tsdbCacheGetUsage(pVnode);
   pLoad->numOfCachedTables = tsdbCacheGetElems(pVnode);
-  pLoad->numOfTables = metaGetTbNum(pVnode->pMeta);
-  pLoad->numOfTimeSeries = metaGetTimeSeriesNum(pVnode->pMeta, 1);
+  VNODE_DO_META_QUERY(pVnode, pLoad->numOfTables = metaGetTbNum(pVnode->pMeta));
+  VNODE_DO_META_QUERY(pVnode, pLoad->numOfTimeSeries = metaGetTimeSeriesNum(pVnode->pMeta, 1));
   pLoad->totalStorage = (int64_t)3 * 1073741824;
   pLoad->compStorage = (int64_t)2 * 1073741824;
   pLoad->pointsWritten = 100;

From 93992f3d6e7cf46ede28471fdcebc98a3df13e46 Mon Sep 17 00:00:00 2001
From: dmchen <cademfly@hotmail.com>
Date: Thu, 27 Feb 2025 15:22:33 +0800
Subject: [PATCH 24/35] fix:add-status-timestamp

---
 include/common/tmsg.h                       |  1 +
 include/common/ttime.h                      |  2 +-
 source/common/src/msg/tmsg.c                |  6 +++++
 source/common/src/ttime.c                   | 28 +++++++++++++++++++++
 source/dnode/mgmt/mgmt_dnode/src/dmHandle.c |  1 +
 source/dnode/mnode/impl/src/mndDnode.c      |  8 ++++--
 source/libs/sync/src/syncUtil.c             |  2 +-
 7 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/include/common/tmsg.h b/include/common/tmsg.h
index 6d58748a3b..797632af18 100644
--- a/include/common/tmsg.h
+++ b/include/common/tmsg.h
@@ -1845,6 +1845,7 @@ typedef struct {
   int32_t     statusSeq;
   int64_t     ipWhiteVer;
   int64_t     analVer;
+  int64_t     timestamp;
 } SStatusReq;
 
 int32_t tSerializeSStatusReq(void* buf, int32_t bufLen, SStatusReq* pReq);
diff --git a/include/common/ttime.h b/include/common/ttime.h
index 47875752d5..77a3041b2b 100644
--- a/include/common/ttime.h
+++ b/include/common/ttime.h
@@ -82,7 +82,7 @@ int32_t convertStringToTimestamp(int16_t type, char* inputData, int64_t timePrec
 int32_t getDuration(int64_t val, char unit, int64_t* result, int32_t timePrecision);
 
 int32_t taosFormatUtcTime(char* buf, int32_t bufLen, int64_t ts, int32_t precision);
-
+char*   formatTimestampLocal(char* buf, int64_t val, int precision);
 struct STm {
   struct tm tm;
   int64_t   fsec;  // in NANOSECOND
diff --git a/source/common/src/msg/tmsg.c b/source/common/src/msg/tmsg.c
index 6a3e1948c8..bb9e13b5f1 100644
--- a/source/common/src/msg/tmsg.c
+++ b/source/common/src/msg/tmsg.c
@@ -1477,6 +1477,8 @@ int32_t tSerializeSStatusReq(void *buf, int32_t bufLen, SStatusReq *pReq) {
     TAOS_CHECK_EXIT(tEncodeI64(&encoder, pload->syncCommitIndex));
   }
 
+  TAOS_CHECK_EXIT(tEncodeI64(&encoder, pReq->timestamp));
+
   tEndEncode(&encoder);
 
 _exit:
@@ -1614,6 +1616,10 @@ int32_t tDeserializeSStatusReq(void *buf, int32_t bufLen, SStatusReq *pReq) {
     }
   }
 
+  if (!tDecodeIsEnd(&decoder)) {
+    TAOS_CHECK_EXIT(tDecodeI64(&decoder, &pReq->timestamp));
+  }
+
   tEndDecode(&decoder);
 
 _exit:
diff --git a/source/common/src/ttime.c b/source/common/src/ttime.c
index 9746fea034..22ab106bb3 100644
--- a/source/common/src/ttime.c
+++ b/source/common/src/ttime.c
@@ -1000,6 +1000,34 @@ int32_t taosFormatUtcTime(char* buf, int32_t bufLen, int64_t t, int32_t precisio
   TAOS_RETURN(TSDB_CODE_SUCCESS);
 }
 
+char* formatTimestampLocal(char* buf, int64_t val, int precision) {
+  time_t tt;
+  if (precision == TSDB_TIME_PRECISION_MICRO) {
+    tt = (time_t)(val / 1000000);
+  }
+  if (precision == TSDB_TIME_PRECISION_NANO) {
+    tt = (time_t)(val / 1000000000);
+  } else {
+    tt = (time_t)(val / 1000);
+  }
+
+  struct tm tm;
+  if (taosLocalTime(&tt, &tm, NULL, 0, NULL) == NULL) {
+    return NULL;
+  }
+  size_t pos = taosStrfTime(buf, 32, "%Y-%m-%d %H:%M:%S", &tm);
+
+  if (precision == TSDB_TIME_PRECISION_MICRO) {
+    sprintf(buf + pos, ".%06d", (int)(val % 1000000));
+  } else if (precision == TSDB_TIME_PRECISION_NANO) {
+    sprintf(buf + pos, ".%09d", (int)(val % 1000000000));
+  } else {
+    sprintf(buf + pos, ".%03d", (int)(val % 1000));
+  }
+
+  return buf;
+}
+
 int32_t taosTs2Tm(int64_t ts, int32_t precision, struct STm* tm, timezone_t tz) {
   tm->fsec = ts % TICK_PER_SECOND[precision] * (TICK_PER_SECOND[TSDB_TIME_PRECISION_NANO] / TICK_PER_SECOND[precision]);
   time_t t = ts / TICK_PER_SECOND[precision];
diff --git a/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c b/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c
index 2fc3ec36a4..ba575a23ac 100644
--- a/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c
+++ b/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c
@@ -167,6 +167,7 @@ static void dmProcessStatusRsp(SDnodeMgmt *pMgmt, SRpcMsg *pRsp) {
 void dmSendStatusReq(SDnodeMgmt *pMgmt) {
   int32_t    code = 0;
   SStatusReq req = {0};
+  req.timestamp = taosGetTimestampMs();
 
   dDebug("send status req to mnode, statusSeq:%d, begin to mgnt lock", pMgmt->statusSeq);
   (void)taosThreadRwlockRdlock(&pMgmt->pData->lock);
diff --git a/source/dnode/mnode/impl/src/mndDnode.c b/source/dnode/mnode/impl/src/mndDnode.c
index 1a74573490..6a3b6e1cd8 100644
--- a/source/dnode/mnode/impl/src/mndDnode.c
+++ b/source/dnode/mnode/impl/src/mndDnode.c
@@ -782,8 +782,12 @@ static int32_t mndProcessStatusReq(SRpcMsg *pReq) {
   bool    needCheck = !online || dnodeChanged || reboot || supportVnodesChanged || analVerChanged ||
                    pMnode->ipWhiteVer != statusReq.ipWhiteVer || encryptKeyChanged || enableWhiteListChanged;
   const STraceId *trace = &pReq->info.traceId;
-  mGTrace("dnode:%d, status received, accessTimes:%d check:%d online:%d reboot:%d changed:%d statusSeq:%d", pDnode->id,
-          pDnode->accessTimes, needCheck, online, reboot, dnodeChanged, statusReq.statusSeq);
+  char            timestamp[TD_TIME_STR_LEN] = {0};
+  if (mDebugFlag & DEBUG_TRACE) (void)formatTimestampLocal(timestamp, statusReq.timestamp, TSDB_TIME_PRECISION_MILLI);
+  mGTrace(
+      "dnode:%d, status received, accessTimes:%d check:%d online:%d reboot:%d changed:%d statusSeq:%d "
+      "timestamp:%s",
+      pDnode->id, pDnode->accessTimes, needCheck, online, reboot, dnodeChanged, statusReq.statusSeq, timestamp);
 
   if (reboot) {
     tsGrantHBInterval = GRANT_HEART_BEAT_MIN;
diff --git a/source/libs/sync/src/syncUtil.c b/source/libs/sync/src/syncUtil.c
index 38fd660cfd..5a2571a291 100644
--- a/source/libs/sync/src/syncUtil.c
+++ b/source/libs/sync/src/syncUtil.c
@@ -116,7 +116,7 @@ static void syncPrintTime(bool formatTime, int32_t* len, int64_t tsMs, int32_t i
   if (formatTime) {
     char pBuf[TD_TIME_STR_LEN] = {0};
     if (tsMs > 0) {
-      if (taosFormatUtcTime(pBuf, TD_TIME_STR_LEN, tsMs, TSDB_TIME_PRECISION_MILLI) != 0) {
+      if (formatTimestampLocal(pBuf, tsMs, TSDB_TIME_PRECISION_MILLI) == NULL) {
         pBuf[0] = '\0';
       }
     }

From cb517d75871776c0160758a8497afd2b83b25f6b Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Thu, 27 Feb 2025 16:01:22 +0800
Subject: [PATCH 25/35] more test

---
 .../storage/compact/test_compact_meta.py      | 153 +++++++++++++++++-
 1 file changed, 151 insertions(+), 2 deletions(-)

diff --git a/tests/test_new/storage/compact/test_compact_meta.py b/tests/test_new/storage/compact/test_compact_meta.py
index 19aca5ff54..b209cbf4e9 100644
--- a/tests/test_new/storage/compact/test_compact_meta.py
+++ b/tests/test_new/storage/compact/test_compact_meta.py
@@ -13,6 +13,7 @@ from util.sql import *
 from util.cases import *
 from util.log import *
 import inspect
+import random
 
 sys.path.append("../tests/pytest")
 
@@ -31,6 +32,7 @@ class TestCompactMeta:
 
     def run(self):
         self.test_case1()
+        self.test_case2()
 
     def stop(self):
         tdSql.close()
@@ -71,6 +73,16 @@ class TestCompactMeta:
             sql = f'create table {db_name}.{ctb_name_prefix}{i} using {db_name}.{stb_name} tags({i})'
             tdSql.execute(sql)
 
+        # Insert some data
+        tdLog.info(
+            f'case {inspect.currentframe().f_code.co_name}: insert data to child tables')
+        for i in range(1, num_child_tables+1):
+            if i % 100 == 0:
+                tdLog.info(
+                    f'case {inspect.currentframe().f_code.co_name}: insert data to {i} child tables')
+            sql = f'insert into {db_name}.{ctb_name_prefix}{i} values(now, 1, 2)'
+            tdSql.execute(sql)
+
         # Alter child table tags
         tdLog.info(
             f'case {inspect.currentframe().f_code.co_name}: alter child table tags')
@@ -81,18 +93,155 @@ class TestCompactMeta:
             sql = f'alter table {db_name}.{ctb_name_prefix}{i} set tag t1 = {i+1}'
             tdSql.execute(sql)
 
+        # Randomly select 100 child tables to do query
+        tdLog.info(
+            f'case {inspect.currentframe().f_code.co_name}: randomly select 100 child tables to query')
+        selected_tables = random.sample(range(1, num_child_tables + 1), 100)
+        for i, table_idx in enumerate(selected_tables):
+            # Query data from the child table
+            sql = f'select count(*) from {db_name}.{stb_name} where t1 = {table_idx + 1}'
+            tdSql.query(sql)
+            tdSql.checkData(0, 0, 1)  # Check c2 column value
+
         # Compact meta
         tdLog.info(
             f'case {inspect.currentframe().f_code.co_name}: start to compact meta')
         sql = f'compact database {db_name} meta_only'
         tdSql.execute(sql)
 
+        # Wait for the compact is done
+        tdLog.info(
+            f'case {inspect.currentframe().f_code.co_name}: wait compact is done')
+        while True:
+            sql = 'show compacts'
+            rows = tdSql.query(sql)
+            if rows == 0:
+                break
+            time.sleep(1)
+
+        # Write more data
+        tdLog.info(
+            f'case {inspect.currentframe().f_code.co_name}: insert more data to child tables')
+        for i in range(1, num_child_tables+1):
+            if i % 100 == 0:
+                tdLog.info(
+                    f'case {inspect.currentframe().f_code.co_name}: insert data to {i} child tables')
+            sql = f'insert into {db_name}.{ctb_name_prefix}{i} values(now, 1, 2)'
+            tdSql.execute(sql)
+
+        # Randomly select 100 child tables to do query
+        tdLog.info(
+            f'case {inspect.currentframe().f_code.co_name}: query data again to verify')
+        for i, table_idx in enumerate(selected_tables):
+            # Query data from the child table
+            sql = f'select count(*) from {db_name}.{stb_name} where t1 = {table_idx + 1}'
+            tdSql.query(sql)
+            tdSql.checkData(0, 0, 2)  # Check c2 column value
+
     def test_case2(self):
         """
         Description:
-            After compact, the snapshot still works
+            1. Alter super table schema
+            2. Make sure compact meta works
         """
-        pass
+        tdLog.info(f'case {inspect.currentframe().f_code.co_name} start')
+
+        db_name = 'db2'
+        stb_name = 'stb2'
+        ctb_name_prefix = 'ctb'
+        num_child_tables = 1000
+
+        # Drop database
+        sql = f'drop database if exists {db_name}'
+        tdSql.execute(sql)
+
+        # Create database
+        sql = f'create database {db_name} vgroups 1'
+        tdSql.execute(sql)
+
+        # Create super table
+        sql = f'create table {db_name}.{stb_name} (ts timestamp, c1 int, c2 int) tags(t1 int)'
+        tdSql.execute(sql)
+
+        # Create child tables
+        tdLog.info(
+            f'case {inspect.currentframe().f_code.co_name}: create {num_child_tables} child tables')
+        for i in range(1, num_child_tables+1):
+            if i % 100 == 0:
+                tdLog.info(
+                    f'case {inspect.currentframe().f_code.co_name}: create {i} child tables')
+            sql = f'create table {db_name}.{ctb_name_prefix}{i} using {db_name}.{stb_name} tags({i})'
+            tdSql.execute(sql)
+
+        # Insert some data
+        tdLog.info(
+            f'case {inspect.currentframe().f_code.co_name}: insert data to child tables')
+        for i in range(1, num_child_tables+1):
+            if i % 100 == 0:
+                tdLog.info(
+                    f'case {inspect.currentframe().f_code.co_name}: insert data to {i} child tables')
+            sql = f'insert into {db_name}.{ctb_name_prefix}{i} (ts, c1) values (now, 1)'
+            tdSql.execute(sql)
+
+        # Alter super table schema
+        tdLog.info(
+            f'case {inspect.currentframe().f_code.co_name}: alter super table schema')
+        for i in range(3, 2000):
+            if i % 100 == 0:
+                tdLog.info(
+                    f'case {inspect.currentframe().f_code.co_name}: altered {i} times of super table schema')
+            # Add a column
+            sql = f'alter table {db_name}.{stb_name} add column c{i} int'
+            tdSql.execute(sql)
+
+            # Drop a column
+            sql = f'alter table {db_name}.{stb_name} drop column c{i}'
+            tdSql.execute(sql)
+
+        # Randomly select 100 child tables to do query
+        tdLog.info(
+            f'case {inspect.currentframe().f_code.co_name}: randomly select 100 child tables to query')
+        selected_tables = random.sample(range(1, num_child_tables + 1), 100)
+        for i, table_idx in enumerate(selected_tables):
+            # Query data from the child table
+            sql = f'select count(*) from {db_name}.{stb_name} where t1 = {table_idx + 1}'
+            tdSql.query(sql)
+            tdSql.checkData(0, 0, 1)  # Check c2 column value
+
+        # Compact meta
+        tdLog.info(
+            f'case {inspect.currentframe().f_code.co_name}: start to compact meta')
+        sql = f'compact database {db_name} meta_only'
+        tdSql.execute(sql)
+
+        # Wait for the compact is done
+        tdLog.info(
+            f'case {inspect.currentframe().f_code.co_name}: wait compact is done')
+        while True:
+            sql = 'show compacts'
+            rows = tdSql.query(sql)
+            if rows == 0:
+                break
+            time.sleep(1)
+
+        # Write more data
+        tdLog.info(
+            f'case {inspect.currentframe().f_code.co_name}: insert more data to child tables')
+        for i in range(1, num_child_tables+1):
+            if i % 100 == 0:
+                tdLog.info(
+                    f'case {inspect.currentframe().f_code.co_name}: insert data to {i} child tables')
+            sql = f'insert into {db_name}.{ctb_name_prefix}{i} values(now, 1, 2)'
+            tdSql.execute(sql)
+
+        # Randomly select 100 child tables to do query
+        tdLog.info(
+            f'case {inspect.currentframe().f_code.co_name}: query data again to verify')
+        for i, table_idx in enumerate(selected_tables):
+            # Query data from the child table
+            sql = f'select count(*) from {db_name}.{stb_name} where t1 = {table_idx + 1}'
+            tdSql.query(sql)
+            tdSql.checkData(0, 0, 2)  # Check c2 column value
 
 
 tdCases.addWindows(__file__, TestCompactMeta())

From de730ad9c68a4d3f05615f6786b82e173dab2201 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Thu, 27 Feb 2025 17:20:02 +0800
Subject: [PATCH 26/35] more

---
 tests/parallel_test/cases.task | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index a12ebafc60..8f986ad445 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -1813,3 +1813,6 @@
 ,,n,develop-test,python3 ./test.py -f 2-query/ts-range.py
 ,,n,develop-test,python3 ./test.py -f 2-query/tag_scan.py
 ,,n,develop-test,python3 ./test.py -f 2-query/show_create_db.py
+
+# new test
+,,y,test_new,./pytest.sh python3 ./test.py -f storage/compact/test_compact_meta.py

From f6a472ae685e244b09f89c87919f730d7067740a Mon Sep 17 00:00:00 2001
From: dmchen <cademfly@hotmail.com>
Date: Thu, 27 Feb 2025 19:05:06 +0800
Subject: [PATCH 27/35] fix:decouple get mload

---
 source/dnode/mgmt/mgmt_dnode/src/dmHandle.c | 23 ++++++++++++++-------
 source/dnode/mnode/impl/src/mndMain.c       |  1 +
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c b/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c
index ba575a23ac..81c416dd72 100644
--- a/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c
+++ b/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c
@@ -25,6 +25,7 @@
 extern SConfig *tsCfg;
 
 SMonVloadInfo tsVinfo = {0};
+SMnodeLoad    tsMLoad = {0};
 
 static void dmUpdateDnodeCfg(SDnodeMgmt *pMgmt, SDnodeCfg *pCfg) {
   int32_t code = 0;
@@ -208,23 +209,22 @@ void dmSendStatusReq(SDnodeMgmt *pMgmt) {
   memcpy(req.clusterCfg.charset, tsCharset, TD_LOCALE_LEN);
   (void)taosThreadRwlockUnlock(&pMgmt->pData->lock);
 
-  dDebug("send status req to mnode, statusSeq:%d, begin to get vnode loads", pMgmt->statusSeq);
+  dDebug("send status req to mnode, statusSeq:%d, begin to get vnode and loads", pMgmt->statusSeq);
   if (taosThreadMutexLock(&pMgmt->pData->statusInfolock) != 0) {
     dError("failed to lock status info lock");
     return;
   }
+
   req.pVloads = tsVinfo.pVloads;
   tsVinfo.pVloads = NULL;
+
+  req.mload = tsMLoad;
+
   if (taosThreadMutexUnlock(&pMgmt->pData->statusInfolock) != 0) {
     dError("failed to unlock status info lock");
     return;
   }
 
-  dDebug("send status req to mnode, statusSeq:%d, begin to get mnode loads", pMgmt->statusSeq);
-  SMonMloadInfo minfo = {0};
-  (*pMgmt->getMnodeLoadsFp)(&minfo);
-  req.mload = minfo.load;
-
   dDebug("send status req to mnode, statusSeq:%d, begin to get qnode loads", pMgmt->statusSeq);
   (*pMgmt->getQnodeLoadsFp)(&req.qload);
 
@@ -418,12 +418,18 @@ void dmSendConfigReq(SDnodeMgmt *pMgmt) {
 void dmUpdateStatusInfo(SDnodeMgmt *pMgmt) {
   SMonVloadInfo vinfo = {0};
   dDebug("begin to get vnode loads");
-  (*pMgmt->getVnodeLoadsFp)(&vinfo);
+  (*pMgmt->getVnodeLoadsFp)(&vinfo);  // dmGetVnodeLoads
+
+  dDebug("begin to get mnode loads");
+  SMonMloadInfo minfo = {0};
+  (*pMgmt->getMnodeLoadsFp)(&minfo);  // dmGetMnodeLoads
+
   dDebug("begin to lock status info");
   if (taosThreadMutexLock(&pMgmt->pData->statusInfolock) != 0) {
     dError("failed to lock status info lock");
     return;
   }
+
   if (tsVinfo.pVloads == NULL) {
     tsVinfo.pVloads = vinfo.pVloads;
     vinfo.pVloads = NULL;
@@ -431,6 +437,9 @@ void dmUpdateStatusInfo(SDnodeMgmt *pMgmt) {
     taosArrayDestroy(vinfo.pVloads);
     vinfo.pVloads = NULL;
   }
+
+  tsMLoad = minfo.load;
+
   if (taosThreadMutexUnlock(&pMgmt->pData->statusInfolock) != 0) {
     dError("failed to unlock status info lock");
     return;
diff --git a/source/dnode/mnode/impl/src/mndMain.c b/source/dnode/mnode/impl/src/mndMain.c
index b241af5adb..09314c9e63 100644
--- a/source/dnode/mnode/impl/src/mndMain.c
+++ b/source/dnode/mnode/impl/src/mndMain.c
@@ -1174,6 +1174,7 @@ int32_t mndGetMonitorInfo(SMnode *pMnode, SMonClusterInfo *pClusterInfo, SMonVgr
 }
 
 int32_t mndGetLoad(SMnode *pMnode, SMnodeLoad *pLoad) {
+  mTrace("mnode get load");
   SSyncState state = syncGetState(pMnode->syncMgmt.sync);
   pLoad->syncState = state.state;
   pLoad->syncRestore = state.restored;

From 1237e762c1c7c94ce7dc23d3d07dbed3265d8d9d Mon Sep 17 00:00:00 2001
From: dmchen <cademfly@hotmail.com>
Date: Fri, 28 Feb 2025 11:52:27 +0800
Subject: [PATCH 28/35] fix/remove-get-queue-size-when-print-heartbeat-log

---
 source/dnode/mgmt/mgmt_vnode/inc/vmInt.h    |  2 +-
 source/dnode/mgmt/mgmt_vnode/src/vmFile.c   | 18 +++++------
 source/dnode/mgmt/mgmt_vnode/src/vmHandle.c | 12 ++++----
 source/dnode/mgmt/mgmt_vnode/src/vmInt.c    | 34 ++++++++++-----------
 source/libs/sync/src/syncUtil.c             | 30 +++++++++++-------
 source/libs/transport/src/tmsgcb.c          |  2 +-
 6 files changed, 53 insertions(+), 45 deletions(-)

diff --git a/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h b/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h
index 84f5149624..3d415e63c6 100644
--- a/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h
+++ b/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h
@@ -39,7 +39,7 @@ typedef struct SVnodeMgmt {
   SHashObj             *runngingHash;
   SHashObj             *closedHash;
   SHashObj             *creatingHash;
-  TdThreadRwlock        lock;
+  TdThreadRwlock        hashLock;
   TdThreadMutex         mutex;
   SVnodesStat           state;
   STfs                 *pTfs;
diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmFile.c b/source/dnode/mgmt/mgmt_vnode/src/vmFile.c
index dbef048c23..cb14155b1c 100644
--- a/source/dnode/mgmt/mgmt_vnode/src/vmFile.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmFile.c
@@ -20,7 +20,7 @@
 #define MAX_CONTENT_LEN 2 * 1024 * 1024
 
 int32_t vmGetAllVnodeListFromHash(SVnodeMgmt *pMgmt, int32_t *numOfVnodes, SVnodeObj ***ppVnodes) {
-  (void)taosThreadRwlockRdlock(&pMgmt->lock);
+  (void)taosThreadRwlockRdlock(&pMgmt->hashLock);
 
   int32_t num = 0;
   int32_t size = taosHashGetSize(pMgmt->runngingHash);
@@ -28,7 +28,7 @@ int32_t vmGetAllVnodeListFromHash(SVnodeMgmt *pMgmt, int32_t *numOfVnodes, SVnod
   size += closedSize;
   SVnodeObj **pVnodes = taosMemoryCalloc(size, sizeof(SVnodeObj *));
   if (pVnodes == NULL) {
-    (void)taosThreadRwlockUnlock(&pMgmt->lock);
+    (void)taosThreadRwlockUnlock(&pMgmt->hashLock);
     return terrno;
   }
 
@@ -60,7 +60,7 @@ int32_t vmGetAllVnodeListFromHash(SVnodeMgmt *pMgmt, int32_t *numOfVnodes, SVnod
     }
   }
 
-  (void)taosThreadRwlockUnlock(&pMgmt->lock);
+  (void)taosThreadRwlockUnlock(&pMgmt->hashLock);
   *numOfVnodes = num;
   *ppVnodes = pVnodes;
 
@@ -68,7 +68,7 @@ int32_t vmGetAllVnodeListFromHash(SVnodeMgmt *pMgmt, int32_t *numOfVnodes, SVnod
 }
 
 int32_t vmGetAllVnodeListFromHashWithCreating(SVnodeMgmt *pMgmt, int32_t *numOfVnodes, SVnodeObj ***ppVnodes) {
-  (void)taosThreadRwlockRdlock(&pMgmt->lock);
+  (void)taosThreadRwlockRdlock(&pMgmt->hashLock);
 
   int32_t num = 0;
   int32_t size = taosHashGetSize(pMgmt->runngingHash);
@@ -76,7 +76,7 @@ int32_t vmGetAllVnodeListFromHashWithCreating(SVnodeMgmt *pMgmt, int32_t *numOfV
   size += creatingSize;
   SVnodeObj **pVnodes = taosMemoryCalloc(size, sizeof(SVnodeObj *));
   if (pVnodes == NULL) {
-    (void)taosThreadRwlockUnlock(&pMgmt->lock);
+    (void)taosThreadRwlockUnlock(&pMgmt->hashLock);
     return terrno;
   }
 
@@ -107,7 +107,7 @@ int32_t vmGetAllVnodeListFromHashWithCreating(SVnodeMgmt *pMgmt, int32_t *numOfV
       taosHashCancelIterate(pMgmt->creatingHash, pIter);
     }
   }
-  (void)taosThreadRwlockUnlock(&pMgmt->lock);
+  (void)taosThreadRwlockUnlock(&pMgmt->hashLock);
 
   *numOfVnodes = num;
   *ppVnodes = pVnodes;
@@ -116,13 +116,13 @@ int32_t vmGetAllVnodeListFromHashWithCreating(SVnodeMgmt *pMgmt, int32_t *numOfV
 }
 
 int32_t vmGetVnodeListFromHash(SVnodeMgmt *pMgmt, int32_t *numOfVnodes, SVnodeObj ***ppVnodes) {
-  (void)taosThreadRwlockRdlock(&pMgmt->lock);
+  (void)taosThreadRwlockRdlock(&pMgmt->hashLock);
 
   int32_t     num = 0;
   int32_t     size = taosHashGetSize(pMgmt->runngingHash);
   SVnodeObj **pVnodes = taosMemoryCalloc(size, sizeof(SVnodeObj *));
   if (pVnodes == NULL) {
-    (void)taosThreadRwlockUnlock(&pMgmt->lock);
+    (void)taosThreadRwlockUnlock(&pMgmt->hashLock);
     return terrno;
   }
 
@@ -140,7 +140,7 @@ int32_t vmGetVnodeListFromHash(SVnodeMgmt *pMgmt, int32_t *numOfVnodes, SVnodeOb
     }
   }
 
-  (void)taosThreadRwlockUnlock(&pMgmt->lock);
+  (void)taosThreadRwlockUnlock(&pMgmt->hashLock);
   *numOfVnodes = num;
   *ppVnodes = pVnodes;
 
diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
index 234d4f41e1..846b76d3ce 100644
--- a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
@@ -25,7 +25,7 @@ void vmGetVnodeLoads(SVnodeMgmt *pMgmt, SMonVloadInfo *pInfo, bool isReset) {
 
   tfsUpdateSize(pMgmt->pTfs);
 
-  (void)taosThreadRwlockRdlock(&pMgmt->lock);
+  (void)taosThreadRwlockRdlock(&pMgmt->hashLock);
 
   void *pIter = taosHashIterate(pMgmt->runngingHash, NULL);
   while (pIter) {
@@ -46,14 +46,14 @@ void vmGetVnodeLoads(SVnodeMgmt *pMgmt, SMonVloadInfo *pInfo, bool isReset) {
     pIter = taosHashIterate(pMgmt->runngingHash, pIter);
   }
 
-  (void)taosThreadRwlockUnlock(&pMgmt->lock);
+  (void)taosThreadRwlockUnlock(&pMgmt->hashLock);
 }
 
 void vmGetVnodeLoadsLite(SVnodeMgmt *pMgmt, SMonVloadInfo *pInfo) {
   pInfo->pVloads = taosArrayInit(pMgmt->state.totalVnodes, sizeof(SVnodeLoadLite));
   if (!pInfo->pVloads) return;
 
-  (void)taosThreadRwlockRdlock(&pMgmt->lock);
+  (void)taosThreadRwlockRdlock(&pMgmt->hashLock);
 
   void *pIter = taosHashIterate(pMgmt->runngingHash, NULL);
   while (pIter) {
@@ -74,7 +74,7 @@ void vmGetVnodeLoadsLite(SVnodeMgmt *pMgmt, SMonVloadInfo *pInfo) {
     pIter = taosHashIterate(pMgmt->runngingHash, pIter);
   }
 
-  (void)taosThreadRwlockUnlock(&pMgmt->lock);
+  (void)taosThreadRwlockUnlock(&pMgmt->hashLock);
 }
 
 void vmGetMonitorInfo(SVnodeMgmt *pMgmt, SMonVmInfo *pInfo) {
@@ -137,7 +137,7 @@ void vmCleanExpriedSamples(SVnodeMgmt *pMgmt) {
     dError("failed to get vgroup ids");
     return;
   }
-  (void)taosThreadRwlockRdlock(&pMgmt->lock);
+  (void)taosThreadRwlockRdlock(&pMgmt->hashLock);
   for (int i = 0; i < list_size; i++) {
     int32_t vgroup_id = vgroup_ids[i];
     void   *vnode = taosHashGet(pMgmt->runngingHash, &vgroup_id, sizeof(int32_t));
@@ -148,7 +148,7 @@ void vmCleanExpriedSamples(SVnodeMgmt *pMgmt) {
       }
     }
   }
-  (void)taosThreadRwlockUnlock(&pMgmt->lock);
+  (void)taosThreadRwlockUnlock(&pMgmt->hashLock);
   if (vgroup_ids) taosMemoryFree(vgroup_ids);
   if (keys) taosMemoryFree(keys);
   return;
diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c
index d71e0b02c4..f4925c348c 100644
--- a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c
@@ -24,12 +24,12 @@ int32_t vmGetPrimaryDisk(SVnodeMgmt *pMgmt, int32_t vgId) {
   int32_t    diskId = -1;
   SVnodeObj *pVnode = NULL;
 
-  (void)taosThreadRwlockRdlock(&pMgmt->lock);
+  (void)taosThreadRwlockRdlock(&pMgmt->hashLock);
   int32_t r = taosHashGetDup(pMgmt->runngingHash, &vgId, sizeof(int32_t), (void *)&pVnode);
   if (pVnode != NULL) {
     diskId = pVnode->diskPrimary;
   }
-  (void)taosThreadRwlockUnlock(&pMgmt->lock);
+  (void)taosThreadRwlockUnlock(&pMgmt->hashLock);
   return diskId;
 }
 
@@ -62,7 +62,7 @@ static int32_t vmRegisterCreatingState(SVnodeMgmt *pMgmt, int32_t vgId, int32_t
   pCreatingVnode->vgId = vgId;
   pCreatingVnode->diskPrimary = diskId;
 
-  code = taosThreadRwlockWrlock(&pMgmt->lock);
+  code = taosThreadRwlockWrlock(&pMgmt->hashLock);
   if (code != 0) {
     taosMemoryFree(pCreatingVnode);
     return code;
@@ -75,7 +75,7 @@ static int32_t vmRegisterCreatingState(SVnodeMgmt *pMgmt, int32_t vgId, int32_t
     taosMemoryFree(pCreatingVnode);
   }
 
-  int32_t r = taosThreadRwlockUnlock(&pMgmt->lock);
+  int32_t r = taosThreadRwlockUnlock(&pMgmt->hashLock);
   if (r != 0) {
     dError("vgId:%d, failed to unlock since %s", vgId, tstrerror(r));
   }
@@ -86,7 +86,7 @@ static int32_t vmRegisterCreatingState(SVnodeMgmt *pMgmt, int32_t vgId, int32_t
 static void vmUnRegisterCreatingState(SVnodeMgmt *pMgmt, int32_t vgId) {
   SVnodeObj *pOld = NULL;
 
-  (void)taosThreadRwlockWrlock(&pMgmt->lock);
+  (void)taosThreadRwlockWrlock(&pMgmt->hashLock);
   int32_t r = taosHashGetDup(pMgmt->creatingHash, &vgId, sizeof(int32_t), (void *)&pOld);
   if (r != 0) {
     dError("vgId:%d, failed to get vnode from creating Hash", vgId);
@@ -96,7 +96,7 @@ static void vmUnRegisterCreatingState(SVnodeMgmt *pMgmt, int32_t vgId) {
   if (r != 0) {
     dError("vgId:%d, failed to remove vnode from creatingHash", vgId);
   }
-  (void)taosThreadRwlockUnlock(&pMgmt->lock);
+  (void)taosThreadRwlockUnlock(&pMgmt->hashLock);
 
   if (pOld) {
     dTrace("vgId:%d, free vnode pOld:%p", vgId, &pOld);
@@ -205,7 +205,7 @@ void vmCleanPrimaryDisk(SVnodeMgmt *pMgmt, int32_t vgId) { vmUnRegisterCreatingS
 SVnodeObj *vmAcquireVnodeImpl(SVnodeMgmt *pMgmt, int32_t vgId, bool strict) {
   SVnodeObj *pVnode = NULL;
 
-  (void)taosThreadRwlockRdlock(&pMgmt->lock);
+  (void)taosThreadRwlockRdlock(&pMgmt->hashLock);
   int32_t r = taosHashGetDup(pMgmt->runngingHash, &vgId, sizeof(int32_t), (void *)&pVnode);
   if (pVnode == NULL || strict && (pVnode->dropped || pVnode->failed)) {
     terrno = TSDB_CODE_VND_INVALID_VGROUP_ID;
@@ -214,7 +214,7 @@ SVnodeObj *vmAcquireVnodeImpl(SVnodeMgmt *pMgmt, int32_t vgId, bool strict) {
     int32_t refCount = atomic_add_fetch_32(&pVnode->refCount, 1);
     dTrace("vgId:%d, acquire vnode, vnode:%p, ref:%d", pVnode->vgId, pVnode, refCount);
   }
-  (void)taosThreadRwlockUnlock(&pMgmt->lock);
+  (void)taosThreadRwlockUnlock(&pMgmt->hashLock);
 
   return pVnode;
 }
@@ -334,10 +334,10 @@ int32_t vmOpenVnode(SVnodeMgmt *pMgmt, SWrapperCfg *pCfg, SVnode *pImpl) {
     pVnode->failed = 1;
   }
 
-  (void)taosThreadRwlockWrlock(&pMgmt->lock);
+  (void)taosThreadRwlockWrlock(&pMgmt->hashLock);
   int32_t code = vmRegisterRunningState(pMgmt, pVnode);
   vmUnRegisterClosedState(pMgmt, pVnode);
-  (void)taosThreadRwlockUnlock(&pMgmt->lock);
+  (void)taosThreadRwlockUnlock(&pMgmt->hashLock);
 
   return code;
 }
@@ -350,15 +350,15 @@ void vmCloseVnode(SVnodeMgmt *pMgmt, SVnodeObj *pVnode, bool commitAndRemoveWal,
     vnodeProposeCommitOnNeed(pVnode->pImpl, atExit);
   }
 
-  (void)taosThreadRwlockWrlock(&pMgmt->lock);
+  (void)taosThreadRwlockWrlock(&pMgmt->hashLock);
   vmUnRegisterRunningState(pMgmt, pVnode->vgId);
   if (keepClosed) {
     if (vmRegisterClosedState(pMgmt, pVnode) != 0) {
-      (void)taosThreadRwlockUnlock(&pMgmt->lock);
+      (void)taosThreadRwlockUnlock(&pMgmt->hashLock);
       return;
     };
   }
-  (void)taosThreadRwlockUnlock(&pMgmt->lock);
+  (void)taosThreadRwlockUnlock(&pMgmt->hashLock);
 
   vmReleaseVnode(pMgmt, pVnode);
 
@@ -450,14 +450,14 @@ _closed:
 
 void vmCloseFailedVnode(SVnodeMgmt *pMgmt, int32_t vgId) {
   int32_t r = 0;
-  r = taosThreadRwlockWrlock(&pMgmt->lock);
+  r = taosThreadRwlockWrlock(&pMgmt->hashLock);
   if (r != 0) {
     dError("vgId:%d, failed to lock since %s", vgId, tstrerror(r));
   }
   if (r == 0) {
     vmUnRegisterRunningState(pMgmt, vgId);
   }
-  r = taosThreadRwlockUnlock(&pMgmt->lock);
+  r = taosThreadRwlockUnlock(&pMgmt->hashLock);
   if (r != 0) {
     dError("vgId:%d, failed to unlock since %s", vgId, tstrerror(r));
   }
@@ -792,7 +792,7 @@ static void vmCleanup(SVnodeMgmt *pMgmt) {
   vmCloseVnodes(pMgmt);
   vmStopWorker(pMgmt);
   vnodeCleanup();
-  (void)taosThreadRwlockDestroy(&pMgmt->lock);
+  (void)taosThreadRwlockDestroy(&pMgmt->hashLock);
   (void)taosThreadMutexDestroy(&pMgmt->mutex);
   (void)taosThreadMutexDestroy(&pMgmt->fileLock);
   taosMemoryFree(pMgmt);
@@ -880,7 +880,7 @@ static int32_t vmInit(SMgmtInputOpt *pInput, SMgmtOutputOpt *pOutput) {
   pMgmt->msgCb.qsizeFp = (GetQueueSizeFp)vmGetQueueSize;
   pMgmt->msgCb.mgmt = pMgmt;
 
-  code = taosThreadRwlockInit(&pMgmt->lock, NULL);
+  code = taosThreadRwlockInit(&pMgmt->hashLock, NULL);
   if (code != 0) {
     code = TAOS_SYSTEM_ERROR(errno);
     goto _OVER;
diff --git a/source/libs/sync/src/syncUtil.c b/source/libs/sync/src/syncUtil.c
index 5a2571a291..44e8d97aca 100644
--- a/source/libs/sync/src/syncUtil.c
+++ b/source/libs/sync/src/syncUtil.c
@@ -215,7 +215,7 @@ void syncPrintNodeLog(const char* flags, ELogLevel level, int32_t dflag, bool fo
 
   SSnapshot snapshot = {.data = NULL, .lastApplyIndex = -1, .lastApplyTerm = 0};
   if (pNode->pFsm != NULL && pNode->pFsm->FpGetSnapshotInfo != NULL) {
-    (void)pNode->pFsm->FpGetSnapshotInfo(pNode->pFsm, &snapshot);
+    (void)pNode->pFsm->FpGetSnapshotInfo(pNode->pFsm, &snapshot);  // vnodeSyncGetSnapshotInfo
   }
 
   SyncIndex logLastIndex = SYNC_INDEX_INVALID;
@@ -253,13 +253,15 @@ void syncPrintNodeLog(const char* flags, ELogLevel level, int32_t dflag, bool fo
   va_end(argpointer);
 
   int32_t aqItems = 0;
+  /*
   if (pNode != NULL && pNode->pFsm != NULL && pNode->pFsm->FpApplyQueueItems != NULL) {
-    aqItems = pNode->pFsm->FpApplyQueueItems(pNode->pFsm);
+    aqItems = pNode->pFsm->FpApplyQueueItems(pNode->pFsm);  // vnodeApplyQueueItems
   }
+  */
 
   // restore error code
   terrno = errCode;
-  SyncIndex appliedIndex = pNode->pFsm->FpAppliedIndexCb(pNode->pFsm);
+  SyncIndex appliedIndex = pNode->pFsm->FpAppliedIndexCb(pNode->pFsm);  // vnodeSyncAppliedIndex
 
   if (pNode != NULL) {
     taosPrintLog(
@@ -426,19 +428,25 @@ void syncLogSendHeartbeat(SSyncNode* pSyncNode, const SyncHeartbeat* pMsg, bool
 }
 
 void syncLogRecvHeartbeat(SSyncNode* pSyncNode, const SyncHeartbeat* pMsg, int64_t timeDiff, const char* s) {
+  char pBuf[TD_TIME_STR_LEN] = {0};
+  if (pMsg->timeStamp > 0) {
+    if (formatTimestampLocal(pBuf, pMsg->timeStamp, TSDB_TIME_PRECISION_MILLI) == NULL) {
+      pBuf[0] = '\0';
+    }
+  }
   if (timeDiff > SYNC_HEARTBEAT_SLOW_MS) {
     pSyncNode->hbSlowNum++;
 
     sNTrace(pSyncNode,
-            "recv sync-heartbeat from dnode:%d slow {term:%" PRId64 ", commit-index:%" PRId64 ", min-match:%" PRId64
-            ", ts:%" PRId64 "}, QID:%s, net elapsed:%" PRId64,
-            DID(&pMsg->srcId), pMsg->term, pMsg->commitIndex, pMsg->minMatchIndex, pMsg->timeStamp, s, timeDiff);
+            "recv sync-heartbeat from dnode:%d slow(%d ms) {term:%" PRId64 ", commit-index:%" PRId64
+            ", min-match:%" PRId64 ", ts:%s}, QID:%s, net elapsed:%" PRId64 "ms",
+            DID(&pMsg->srcId), SYNC_HEARTBEAT_SLOW_MS, pMsg->term, pMsg->commitIndex, pMsg->minMatchIndex, pBuf, s, timeDiff);
+  } else {
+    sNTrace(pSyncNode,
+            "recv sync-heartbeat from dnode:%d {term:%" PRId64 ", commit-index:%" PRId64 ", min-match:%" PRId64
+            ", ts:%s}, QID:%s, net elapsed:%" PRId64 "ms",
+            DID(&pMsg->srcId), pMsg->term, pMsg->commitIndex, pMsg->minMatchIndex, pBuf, s, timeDiff);
   }
-
-  sNTrace(pSyncNode,
-          "recv sync-heartbeat from dnode:%d {term:%" PRId64 ", commit-index:%" PRId64 ", min-match:%" PRId64
-          ", ts:%" PRId64 "}, QID:%s, net elapsed:%" PRId64,
-          DID(&pMsg->srcId), pMsg->term, pMsg->commitIndex, pMsg->minMatchIndex, pMsg->timeStamp, s, timeDiff);
 }
 
 void syncLogSendHeartbeatReply(SSyncNode* pSyncNode, const SyncHeartbeatReply* pMsg, const char* s) {
diff --git a/source/libs/transport/src/tmsgcb.c b/source/libs/transport/src/tmsgcb.c
index e87011f097..0632e21d20 100644
--- a/source/libs/transport/src/tmsgcb.c
+++ b/source/libs/transport/src/tmsgcb.c
@@ -37,7 +37,7 @@ int32_t tmsgPutToQueue(const SMsgCb* msgcb, EQueueType qtype, SRpcMsg* pMsg) {
 }
 
 int32_t tmsgGetQueueSize(const SMsgCb* msgcb, int32_t vgId, EQueueType qtype) {
-  return (*msgcb->qsizeFp)(msgcb->mgmt, vgId, qtype);
+  return (*msgcb->qsizeFp)(msgcb->mgmt, vgId, qtype);  // vmGetQueueSize
 }
 
 int32_t tmsgSendReq(const SEpSet* epSet, SRpcMsg* pMsg) {

From 57b9ca3b6ac2ab3860b26236ec18a374356e8142 Mon Sep 17 00:00:00 2001
From: chenhaoran <haoran920c@163.com>
Date: Fri, 28 Feb 2025 15:57:29 +0800
Subject: [PATCH 29/35] refactor: reorganize import statements in test.py for
 clarity

---
 tests/test_new/test.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/test_new/test.py b/tests/test_new/test.py
index 5a77551045..52b466c130 100644
--- a/tests/test_new/test.py
+++ b/tests/test_new/test.py
@@ -13,15 +13,6 @@
 # pip install src/connector/python/
 
 # -*- coding: utf-8 -*-
-import taosws
-import taosrest
-import taos
-from util.taosadapter import *
-from util.cluster import *
-from util.cases import *
-from util.dnodes import *
-from util.log import *
-import toml
 import os
 import sys
 import getopt
@@ -33,11 +24,20 @@ import platform
 import socket
 import threading
 import importlib
-import ast
 print(f"Python version: {sys.version}")
 print(f"Version info: {sys.version_info}")
 
+import toml
 sys.path.append("../pytest")
+from util.log import *
+from util.dnodes import *
+from util.cases import *
+from util.cluster import *
+from util.taosadapter import *
+
+import taos
+import taosrest
+import taosws
 
 
 def checkRunTimeError():

From 61a4c413326cedf786970d966d960fd3c0b60c36 Mon Sep 17 00:00:00 2001
From: dmchen <cademfly@hotmail.com>
Date: Fri, 28 Feb 2025 16:02:18 +0800
Subject: [PATCH 30/35] fix:remove-lock-from-heartbeat-log

---
 source/libs/sync/inc/syncUtil.h |   9 +++
 source/libs/sync/src/syncUtil.c | 133 +++++++++++++++++++++++++-------
 2 files changed, 115 insertions(+), 27 deletions(-)

diff --git a/source/libs/sync/inc/syncUtil.h b/source/libs/sync/inc/syncUtil.h
index e7110c0964..95ea75731c 100644
--- a/source/libs/sync/inc/syncUtil.h
+++ b/source/libs/sync/inc/syncUtil.h
@@ -53,6 +53,13 @@ extern "C" {
 #define sNDebug(pNode, ...)  if (sDebugFlag & DEBUG_DEBUG) { syncPrintNodeLog("SYN ",       DEBUG_DEBUG, sDebugFlag, true, pNode,  __VA_ARGS__); }
 #define sNTrace(pNode, ...)  if (sDebugFlag & DEBUG_TRACE) { syncPrintNodeLog("SYN ",       DEBUG_TRACE, sDebugFlag, true, pNode,  __VA_ARGS__); }
 
+#define sHFatal(pNode, ...)  if (sDebugFlag & DEBUG_FATAL) { syncPrintHbLog("SYN FATAL ", DEBUG_FATAL, 255, true,        pNode,  __VA_ARGS__); }
+#define sHError(pNode, ...)  if (sDebugFlag & DEBUG_ERROR) { syncPrintHbLog("SYN ERROR ", DEBUG_ERROR, 255, true,       pNode,  __VA_ARGS__); }
+#define sHWarn(pNode, ...)   if (sDebugFlag & DEBUG_WARN)  { syncPrintHbLog("SYN WARN ",  DEBUG_WARN,  255, true,        pNode,  __VA_ARGS__); }
+#define sHInfo(pNode, ...)   if (sDebugFlag & DEBUG_INFO)  { syncPrintHbLog("SYN ",       DEBUG_INFO,  255, true,        pNode, __VA_ARGS__); }
+#define sHDebug(pNode, ...)  if (sDebugFlag & DEBUG_DEBUG) { syncPrintHbLog("SYN ",       DEBUG_DEBUG, sDebugFlag, true, pNode,  __VA_ARGS__); }
+#define sHTrace(pNode, ...)  if (sDebugFlag & DEBUG_TRACE) { syncPrintHbLog("SYN ",       DEBUG_TRACE, sDebugFlag, true, pNode,  __VA_ARGS__); }
+
 #define sSFatal(pSender, ...)  if (sDebugFlag & DEBUG_FATAL) { syncPrintSnapshotSenderLog("SYN FATAL ", DEBUG_FATAL, 255,        pSender, __VA_ARGS__); }
 #define sSError(pSender, ...)  if (sDebugFlag & DEBUG_ERROR) { syncPrintSnapshotSenderLog("SYN ERROR ", DEBUG_ERROR, 255,        pSender, __VA_ARGS__); }
 #define sSWarn(pSender, ...)   if (sDebugFlag & DEBUG_WARN)  { syncPrintSnapshotSenderLog("SYN WARN ",  DEBUG_WARN,  255,        pSender, __VA_ARGS__); }
@@ -87,6 +94,8 @@ void syncUtilGenerateArbToken(int32_t nodeId, int32_t groupId, char* buf);
 
 void syncPrintNodeLog(const char* flags, ELogLevel level, int32_t dflag, bool formatTime, SSyncNode* pNode,
                       const char* format, ...);
+void syncPrintHbLog(const char* flags, ELogLevel level, int32_t dflag, bool formatTime, SSyncNode* pNode,
+                    const char* format, ...);
 void syncPrintSnapshotSenderLog(const char* flags, ELogLevel level, int32_t dflag, SSyncSnapshotSender* pSender,
                                 const char* format, ...);
 void syncPrintSnapshotReceiverLog(const char* flags, ELogLevel level, int32_t dflag, SSyncSnapshotReceiver* pReceiver,
diff --git a/source/libs/sync/src/syncUtil.c b/source/libs/sync/src/syncUtil.c
index 44e8d97aca..435586041a 100644
--- a/source/libs/sync/src/syncUtil.c
+++ b/source/libs/sync/src/syncUtil.c
@@ -253,11 +253,9 @@ void syncPrintNodeLog(const char* flags, ELogLevel level, int32_t dflag, bool fo
   va_end(argpointer);
 
   int32_t aqItems = 0;
-  /*
   if (pNode != NULL && pNode->pFsm != NULL && pNode->pFsm->FpApplyQueueItems != NULL) {
     aqItems = pNode->pFsm->FpApplyQueueItems(pNode->pFsm);  // vnodeApplyQueueItems
   }
-  */
 
   // restore error code
   terrno = errCode;
@@ -272,15 +270,71 @@ void syncPrintNodeLog(const char* flags, ELogLevel level, int32_t dflag, bool fo
         ", elect-times:%d, as-leader-times:%d, as-assigned-leader-times:%d, cfg-ch-times:%d, hb-slow:%d, hbr-slow:%d, "
         "aq-items:%d, snaping:%" PRId64 ", replicas:%d, last-cfg:%" PRId64
         ", chging:%d, restore:%d, quorum:%d, elect-lc-timer:%" PRId64 ", hb:%" PRId64
-        ", buffer:%s, repl-mgrs:%s, members:%s, send hb:%s, recv hb:%s, recv hb-reply:%s, arb-token:%s, msg[sent:%d, recv:%d, slow-recev:%d]",
+        ", buffer:%s, repl-mgrs:%s, members:%s, send hb:%s, recv hb:%s, recv hb-reply:%s, arb-token:%s, msg[sent:%d, "
+        "recv:%d, slow-recv:%d]",
         pNode->vgId, eventLog, syncStr(pNode->state), currentTerm, pNode->commitIndex, pNode->assignedCommitIndex,
         appliedIndex, logBeginIndex, logLastIndex, pNode->minMatchIndex, snapshot.lastApplyIndex,
         snapshot.lastApplyTerm, pNode->electNum, pNode->becomeLeaderNum, pNode->becomeAssignedLeaderNum,
         pNode->configChangeNum, pNode->hbSlowNum, pNode->hbrSlowNum, aqItems, pNode->snapshottingIndex,
         pNode->replicaNum, pNode->raftCfg.lastConfigIndex, pNode->changing, pNode->restoreFinish,
         syncNodeDynamicQuorum(pNode), pNode->electTimerLogicClock, pNode->heartbeatTimerLogicClockUser, bufferStatesStr,
-        replMgrStatesStr, cfgStr, sentHbTimeStr, hbTimeStr, hbrTimeStr, pNode->arbToken, pNode->sendCount, pNode->recvCount,
-        pNode->slowCount);
+        replMgrStatesStr, cfgStr, sentHbTimeStr, hbTimeStr, hbrTimeStr, pNode->arbToken, pNode->sendCount,
+        pNode->recvCount, pNode->slowCount);
+  }
+}
+
+void syncPrintHbLog(const char* flags, ELogLevel level, int32_t dflag, bool formatTime, SSyncNode* pNode,
+                    const char* format, ...) {
+  if (pNode == NULL || pNode->pLogStore == NULL) return;
+  int64_t currentTerm = raftStoreGetTerm(pNode);
+
+  // save error code, otherwise it will be overwritten
+  int32_t errCode = terrno;
+
+  int32_t cacheHit = pNode->pLogStore->cacheHit;
+  int32_t cacheMiss = pNode->pLogStore->cacheMiss;
+
+  char cfgStr[1024] = "";
+  syncCfg2SimpleStr(&pNode->raftCfg.cfg, cfgStr, sizeof(cfgStr));
+
+  char replMgrStatesStr[1024] = "";
+  syncLogReplStates2Str(pNode, replMgrStatesStr, sizeof(replMgrStatesStr));
+
+  char bufferStatesStr[256] = "";
+  syncLogBufferStates2Str(pNode, bufferStatesStr, sizeof(bufferStatesStr));
+
+  char hbrTimeStr[256] = "";
+  syncHearbeatReplyTime2Str(pNode, hbrTimeStr, sizeof(hbrTimeStr), formatTime);
+
+  char hbTimeStr[256] = "";
+  syncHearbeatTime2Str(pNode, hbTimeStr, sizeof(hbTimeStr), formatTime);
+
+  char sentHbTimeStr[512] = "";
+  syncSentHearbeatTime2Str(pNode, sentHbTimeStr, sizeof(sentHbTimeStr), formatTime);
+
+  char    eventLog[512];  // {0};
+  va_list argpointer;
+  va_start(argpointer, format);
+  int32_t writeLen = vsnprintf(eventLog, sizeof(eventLog), format, argpointer);
+  va_end(argpointer);
+
+  terrno = errCode;
+
+  if (pNode != NULL) {
+    taosPrintLog(
+        flags, level, dflag,
+        "vgId:%d, %s, sync:%s, term:%" PRIu64 ", commit-index:%" PRId64 ", assigned-index:%" PRId64 ", min:%" PRId64
+        ", elect-times:%d, as-leader-times:%d, as-assigned-leader-times:%d, cfg-ch-times:%d, hb-slow:%d, hbr-slow:%d, "
+        ", snaping:%" PRId64 ", replicas:%d, last-cfg:%" PRId64
+        ", chging:%d, restore:%d, quorum:%d, elect-lc-timer:%" PRId64 ", hb:%" PRId64
+        ", buffer:%s, repl-mgrs:%s, members:%s, send hb:%s, recv hb:%s, recv hb-reply:%s, arb-token:%s, msg[sent:%d, "
+        "recv:%d, slow-recv:%d]",
+        pNode->vgId, eventLog, syncStr(pNode->state), currentTerm, pNode->commitIndex, pNode->assignedCommitIndex,
+        pNode->minMatchIndex, pNode->electNum, pNode->becomeLeaderNum, pNode->becomeAssignedLeaderNum,
+        pNode->configChangeNum, pNode->hbSlowNum, pNode->hbrSlowNum, pNode->snapshottingIndex, pNode->replicaNum,
+        pNode->raftCfg.lastConfigIndex, pNode->changing, pNode->restoreFinish, syncNodeDynamicQuorum(pNode),
+        pNode->electTimerLogicClock, pNode->heartbeatTimerLogicClockUser, bufferStatesStr, replMgrStatesStr, cfgStr,
+        sentHbTimeStr, hbTimeStr, hbrTimeStr, pNode->arbToken, pNode->sendCount, pNode->recvCount, pNode->slowCount);
   }
 }
 
@@ -414,12 +468,12 @@ void syncLogRecvAppendEntriesReply(SSyncNode* pSyncNode, const SyncAppendEntries
 void syncLogSendHeartbeat(SSyncNode* pSyncNode, const SyncHeartbeat* pMsg, bool printX, int64_t timerElapsed,
                           int64_t execTime) {
   if (printX) {
-    sNTrace(pSyncNode,
+    sHTrace(pSyncNode,
             "send sync-heartbeat to dnode:%d {term:%" PRId64 ", commit-index:%" PRId64 ", min-match:%" PRId64
             ", ts:%" PRId64 "}, x",
             DID(&pMsg->destId), pMsg->term, pMsg->commitIndex, pMsg->minMatchIndex, pMsg->timeStamp);
   } else {
-    sNTrace(pSyncNode,
+    sHTrace(pSyncNode,
             "send sync-heartbeat to dnode:%d {term:%" PRId64 ", commit-index:%" PRId64 ", min-match:%" PRId64
             ", ts:%" PRId64 "}, timer-elapsed:%" PRId64 ", next-exec:%" PRId64,
             DID(&pMsg->destId), pMsg->term, pMsg->commitIndex, pMsg->minMatchIndex, pMsg->timeStamp, timerElapsed,
@@ -428,29 +482,39 @@ void syncLogSendHeartbeat(SSyncNode* pSyncNode, const SyncHeartbeat* pMsg, bool
 }
 
 void syncLogRecvHeartbeat(SSyncNode* pSyncNode, const SyncHeartbeat* pMsg, int64_t timeDiff, const char* s) {
-  char pBuf[TD_TIME_STR_LEN] = {0};
-  if (pMsg->timeStamp > 0) {
-    if (formatTimestampLocal(pBuf, pMsg->timeStamp, TSDB_TIME_PRECISION_MILLI) == NULL) {
-      pBuf[0] = '\0';
-    }
-  }
   if (timeDiff > SYNC_HEARTBEAT_SLOW_MS) {
     pSyncNode->hbSlowNum++;
 
-    sNTrace(pSyncNode,
+    char pBuf[TD_TIME_STR_LEN] = {0};
+    if (pMsg->timeStamp > 0) {
+      if (formatTimestampLocal(pBuf, pMsg->timeStamp, TSDB_TIME_PRECISION_MILLI) == NULL) {
+        pBuf[0] = '\0';
+      }
+    }
+
+    sHError(pSyncNode,
             "recv sync-heartbeat from dnode:%d slow(%d ms) {term:%" PRId64 ", commit-index:%" PRId64
             ", min-match:%" PRId64 ", ts:%s}, QID:%s, net elapsed:%" PRId64 "ms",
-            DID(&pMsg->srcId), SYNC_HEARTBEAT_SLOW_MS, pMsg->term, pMsg->commitIndex, pMsg->minMatchIndex, pBuf, s, timeDiff);
+            DID(&pMsg->srcId), SYNC_HEARTBEAT_SLOW_MS, pMsg->term, pMsg->commitIndex, pMsg->minMatchIndex, pBuf, s,
+            timeDiff);
   } else {
-    sNTrace(pSyncNode,
-            "recv sync-heartbeat from dnode:%d {term:%" PRId64 ", commit-index:%" PRId64 ", min-match:%" PRId64
-            ", ts:%s}, QID:%s, net elapsed:%" PRId64 "ms",
-            DID(&pMsg->srcId), pMsg->term, pMsg->commitIndex, pMsg->minMatchIndex, pBuf, s, timeDiff);
+    if (sDebugFlag & DEBUG_TRACE) {
+      char pBuf[TD_TIME_STR_LEN] = {0};
+      if (pMsg->timeStamp > 0) {
+        if (formatTimestampLocal(pBuf, pMsg->timeStamp, TSDB_TIME_PRECISION_MILLI) == NULL) {
+          pBuf[0] = '\0';
+        }
+      }
+      sHTrace(pSyncNode,
+              "recv sync-heartbeat from dnode:%d {term:%" PRId64 ", commit-index:%" PRId64 ", min-match:%" PRId64
+              ", ts:%s}, QID:%s, net elapsed:%" PRId64 "ms",
+              DID(&pMsg->srcId), pMsg->term, pMsg->commitIndex, pMsg->minMatchIndex, pBuf, s, timeDiff);
+    }
   }
 }
 
 void syncLogSendHeartbeatReply(SSyncNode* pSyncNode, const SyncHeartbeatReply* pMsg, const char* s) {
-  sNTrace(pSyncNode, "send sync-heartbeat-reply from dnode:%d {term:%" PRId64 ", ts:%" PRId64 "}, %s",
+  sHTrace(pSyncNode, "send sync-heartbeat-reply from dnode:%d {term:%" PRId64 ", ts:%" PRId64 "}, %s",
           DID(&pMsg->destId), pMsg->term, pMsg->timeStamp, s);
 }
 
@@ -458,14 +522,29 @@ void syncLogRecvHeartbeatReply(SSyncNode* pSyncNode, const SyncHeartbeatReply* p
   if (timeDiff > SYNC_HEARTBEAT_REPLY_SLOW_MS) {
     pSyncNode->hbrSlowNum++;
 
-    sNTrace(pSyncNode,
-            "recv sync-heartbeat-reply from dnode:%d slow {term:%" PRId64 ", ts:%" PRId64 "}, %s, net elapsed:%" PRId64,
-            DID(&pMsg->srcId), pMsg->term, pMsg->timeStamp, s, timeDiff);
-  }
+    char pBuf[TD_TIME_STR_LEN] = {0};
+    if (pMsg->timeStamp > 0) {
+      if (formatTimestampLocal(pBuf, pMsg->timeStamp, TSDB_TIME_PRECISION_MILLI) == NULL) {
+        pBuf[0] = '\0';
+      }
+    }
 
-  sNTrace(pSyncNode,
-          "recv sync-heartbeat-reply from dnode:%d {term:%" PRId64 ", ts:%" PRId64 "}, %s, net elapsed:%" PRId64,
-          DID(&pMsg->srcId), pMsg->term, pMsg->timeStamp, s, timeDiff);
+    sHError(pSyncNode,
+            "recv sync-heartbeat-reply from dnode:%d slow(%d ms) {term:%" PRId64 ", ts:%s}, %s, net elapsed:%" PRId64,
+            DID(&pMsg->srcId), SYNC_HEARTBEAT_REPLY_SLOW_MS, pMsg->term, pBuf, s, timeDiff);
+  } else {
+    if (sDebugFlag & DEBUG_TRACE) {
+      char pBuf[TD_TIME_STR_LEN] = {0};
+      if (pMsg->timeStamp > 0) {
+        if (formatTimestampLocal(pBuf, pMsg->timeStamp, TSDB_TIME_PRECISION_MILLI) == NULL) {
+          pBuf[0] = '\0';
+        }
+      }
+      sHTrace(pSyncNode,
+              "recv sync-heartbeat-reply from dnode:%d {term:%" PRId64 ", ts:%" PRId64 "}, %s, net elapsed:%" PRId64,
+              DID(&pMsg->srcId), pMsg->term, pMsg->timeStamp, s, timeDiff);
+    }
+  }
 }
 
 void syncLogSendSyncSnapshotSend(SSyncNode* pSyncNode, const SyncSnapshotSend* pMsg, const char* s) {

From 703a9924a437a42106bd9585d2e5624083df7f1e Mon Sep 17 00:00:00 2001
From: "pengrongkun94@qq.com" <pengrongkun94@qq.com>
Date: Fri, 28 Feb 2025 16:16:15 +0800
Subject: [PATCH 31/35] fix:review

---
 source/libs/parser/src/parInsertStmt.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/libs/parser/src/parInsertStmt.c b/source/libs/parser/src/parInsertStmt.c
index 3228106516..29bb165de9 100644
--- a/source/libs/parser/src/parInsertStmt.c
+++ b/source/libs/parser/src/parInsertStmt.c
@@ -328,7 +328,7 @@ int32_t qBindStmtStbColsValue(void* pBlock, SArray* pCols, TAOS_MULTI_BIND* bind
   int16_t          lastColId = -1;
   bool             colInOrder = true;
 
-  if (NULL == *pTSchema) {
+  if (NULL == pTSchema || NULL == *pTSchema) {
     *pTSchema = tBuildTSchema(pSchema, pDataBlock->pMeta->tableInfo.numOfColumns, pDataBlock->pMeta->sversion);
   }
 
@@ -697,7 +697,7 @@ int32_t qBindStmtStbColsValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bin
   bool            colInOrder = true;
   int             ncharColNums = 0;
 
-  if (NULL == *pTSchema) {
+  if (NULL == pTSchema || NULL == *pTSchema) {
     *pTSchema = tBuildTSchema(pSchema, pDataBlock->pMeta->tableInfo.numOfColumns, pDataBlock->pMeta->sversion);
   }
 
@@ -746,7 +746,7 @@ int32_t qBindStmtStbColsValue2(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bin
     } else if (TSDB_DATA_TYPE_GEOMETRY == pColSchema->type) {
       code = initCtxAsText();
       if (code) {
-        qError("geometry init failed");
+        qError("geometry init failed:%s", tstrerror(code));
         goto _return;
       }
       uint8_t* buf = bind[c].buffer;
@@ -960,7 +960,7 @@ int32_t qBindStmt2RowValue(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bind, c
   int16_t          lastColId = -1;
   bool             colInOrder = true;
 
-  if (NULL == *pTSchema) {
+  if (NULL == pTSchema || NULL == *pTSchema) {
     *pTSchema = tBuildTSchema(pSchema, pDataBlock->pMeta->tableInfo.numOfColumns, pDataBlock->pMeta->sversion);
   }
 
@@ -992,7 +992,7 @@ int32_t qBindStmt2RowValue(void* pBlock, SArray* pCols, TAOS_STMT2_BIND* bind, c
     } else if (TSDB_DATA_TYPE_GEOMETRY == pColSchema->type) {
       code = initCtxAsText();
       if (code) {
-        qError("geometry init failed");
+        qError("geometry init failed:%s", tstrerror(code));
         goto _return;
       }
       uint8_t *buf = bind[c].buffer;

From fde07fff88ddd46d8bca878f4e246acb79a6831b Mon Sep 17 00:00:00 2001
From: dmchen <cademfly@hotmail.com>
Date: Fri, 28 Feb 2025 17:32:54 +0800
Subject: [PATCH 32/35] fix:remove-lock-from-log-sync-heartbeat

---
 source/libs/sync/inc/syncRaftStore.h          |  1 +
 source/libs/sync/src/syncRaftStore.c          | 10 ++++++
 source/libs/sync/src/syncUtil.c               | 31 ++++++++++++-------
 tests/system-test/6-cluster/5dnode2mnode.py   |  1 +
 .../4dnode1mnode_basic_createDb_replica1.py   |  1 +
 5 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/source/libs/sync/inc/syncRaftStore.h b/source/libs/sync/inc/syncRaftStore.h
index 38a8ed234b..f45dccffd8 100644
--- a/source/libs/sync/inc/syncRaftStore.h
+++ b/source/libs/sync/inc/syncRaftStore.h
@@ -35,6 +35,7 @@ void raftStoreClearVote(SSyncNode *pNode);
 void raftStoreNextTerm(SSyncNode *pNode);
 void raftStoreSetTerm(SSyncNode *pNode, SyncTerm term);
 SyncTerm raftStoreGetTerm(SSyncNode *pNode);
+SyncTerm raftStoreTryGetTerm(SSyncNode *pNode);
 
 #ifdef __cplusplus
 }
diff --git a/source/libs/sync/src/syncRaftStore.c b/source/libs/sync/src/syncRaftStore.c
index c61be4356c..f2f0bf35c2 100644
--- a/source/libs/sync/src/syncRaftStore.c
+++ b/source/libs/sync/src/syncRaftStore.c
@@ -213,3 +213,13 @@ SyncTerm raftStoreGetTerm(SSyncNode *pNode) {
   (void)taosThreadMutexUnlock(&pNode->raftStore.mutex);
   return term;
 }
+
+SyncTerm raftStoreTryGetTerm(SSyncNode *pNode) {
+  SyncTerm term = 0;
+  if (taosThreadMutexTryLock(&pNode->raftStore.mutex) == 0) {
+    term = pNode->raftStore.currentTerm;
+    (void)taosThreadMutexUnlock(&pNode->raftStore.mutex);
+  }
+
+  return term;
+}
diff --git a/source/libs/sync/src/syncUtil.c b/source/libs/sync/src/syncUtil.c
index 435586041a..b20f0d8aeb 100644
--- a/source/libs/sync/src/syncUtil.c
+++ b/source/libs/sync/src/syncUtil.c
@@ -286,7 +286,7 @@ void syncPrintNodeLog(const char* flags, ELogLevel level, int32_t dflag, bool fo
 void syncPrintHbLog(const char* flags, ELogLevel level, int32_t dflag, bool formatTime, SSyncNode* pNode,
                     const char* format, ...) {
   if (pNode == NULL || pNode->pLogStore == NULL) return;
-  int64_t currentTerm = raftStoreGetTerm(pNode);
+  int64_t currentTerm = raftStoreTryGetTerm(pNode);
 
   // save error code, otherwise it will be overwritten
   int32_t errCode = terrno;
@@ -467,17 +467,24 @@ void syncLogRecvAppendEntriesReply(SSyncNode* pSyncNode, const SyncAppendEntries
 
 void syncLogSendHeartbeat(SSyncNode* pSyncNode, const SyncHeartbeat* pMsg, bool printX, int64_t timerElapsed,
                           int64_t execTime) {
-  if (printX) {
-    sHTrace(pSyncNode,
-            "send sync-heartbeat to dnode:%d {term:%" PRId64 ", commit-index:%" PRId64 ", min-match:%" PRId64
-            ", ts:%" PRId64 "}, x",
-            DID(&pMsg->destId), pMsg->term, pMsg->commitIndex, pMsg->minMatchIndex, pMsg->timeStamp);
-  } else {
-    sHTrace(pSyncNode,
-            "send sync-heartbeat to dnode:%d {term:%" PRId64 ", commit-index:%" PRId64 ", min-match:%" PRId64
-            ", ts:%" PRId64 "}, timer-elapsed:%" PRId64 ", next-exec:%" PRId64,
-            DID(&pMsg->destId), pMsg->term, pMsg->commitIndex, pMsg->minMatchIndex, pMsg->timeStamp, timerElapsed,
-            execTime);
+  if (sDebugFlag & DEBUG_TRACE) {
+    char pBuf[TD_TIME_STR_LEN] = {0};
+    if (pMsg->timeStamp > 0) {
+      if (formatTimestampLocal(pBuf, pMsg->timeStamp, TSDB_TIME_PRECISION_MILLI) == NULL) {
+        pBuf[0] = '\0';
+      }
+    }
+    if (printX) {
+      sHTrace(pSyncNode,
+              "send sync-heartbeat to dnode:%d {term:%" PRId64 ", commit-index:%" PRId64 ", min-match:%" PRId64
+              ", ts:%s}, x",
+              DID(&pMsg->destId), pMsg->term, pMsg->commitIndex, pMsg->minMatchIndex, pBuf);
+    } else {
+      sHTrace(pSyncNode,
+              "send sync-heartbeat to dnode:%d {term:%" PRId64 ", commit-index:%" PRId64 ", min-match:%" PRId64
+              ", ts:%s}, timer-elapsed:%" PRId64 ", next-exec:%" PRId64,
+              DID(&pMsg->destId), pMsg->term, pMsg->commitIndex, pMsg->minMatchIndex, pBuf, timerElapsed, execTime);
+    }
   }
 }
 
diff --git a/tests/system-test/6-cluster/5dnode2mnode.py b/tests/system-test/6-cluster/5dnode2mnode.py
index aa9c3fc053..82e27e6dc4 100644
--- a/tests/system-test/6-cluster/5dnode2mnode.py
+++ b/tests/system-test/6-cluster/5dnode2mnode.py
@@ -48,6 +48,7 @@ class TDTestCase:
         tdSql.checkData(4,1,'%s:6430'%self.host)
         tdSql.checkData(0,4,'ready')
         tdSql.checkData(4,4,'ready')
+        time.sleep(1)
         tdSql.query("select * from information_schema.ins_mnodes;")
         tdSql.checkData(0,1,'%s:6030'%self.host)
         tdSql.checkData(0,2,'leader')
diff --git a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_createDb_replica1.py b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_createDb_replica1.py
index fb00fc0846..ab4d2ef990 100644
--- a/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_createDb_replica1.py
+++ b/tests/system-test/6-cluster/vnode/4dnode1mnode_basic_createDb_replica1.py
@@ -42,6 +42,7 @@ class TDTestCase:
         return buildPath
 
     def check_setup_cluster_status(self):
+        time.sleep(1)
         tdSql.query("select * from information_schema.ins_mnodes")
         for mnode in tdSql.queryResult:
             name = mnode[1]

From 40a6e245eada368e4e7aa940e0ec6c4fef2eaedb Mon Sep 17 00:00:00 2001
From: Simon Guan <slguan@taosdata.com>
Date: Fri, 28 Feb 2025 23:49:58 +0800
Subject: [PATCH 33/35] docs: update keywords

---
 .../14-reference/03-taos-sql/20-keywords.md   | 34 ++++++++++-----
 .../14-reference/03-taos-sql/20-keywords.md   | 43 ++++++++++---------
 2 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/docs/en/14-reference/03-taos-sql/20-keywords.md b/docs/en/14-reference/03-taos-sql/20-keywords.md
index 682dcd3f84..98fec29e9b 100644
--- a/docs/en/14-reference/03-taos-sql/20-keywords.md
+++ b/docs/en/14-reference/03-taos-sql/20-keywords.md
@@ -23,11 +23,11 @@ The list of keywords is as follows:
 | ALIVE                | |
 | ALL                  | |
 | ALTER                | |
-| ANALYZE              | Version 3.3.4.3 and later |
+| ANALYZE              | 3.3.4.3+ |
 | AND                  | |
-| ANODE                | Version 3.3.4.3 and later |
-| ANODES               | Version 3.3.4.3 and later |
-| ANOMALY_WINDOW       | Version 3.3.4.3 and later |
+| ANODE                | 3.3.4.3+ |
+| ANODES               | 3.3.4.3+ |
+| ANOMALY_WINDOW       | 3.3.4.3+ |
 | ANTI                 | |
 | APPS                 | |
 | ARBGROUPS            | |
@@ -37,7 +37,8 @@ The list of keywords is as follows:
 | ASOF                 | |
 | AT_ONCE              | |
 | ATTACH               | |
-| ASSIGN               | Version 3.3.6.0 and later |
+| AUTO                 | 3.3.5.0+ |
+| ASSIGN               | 3.3.6.0+ |
 
 ### B
 
@@ -79,12 +80,16 @@ The list of keywords is as follows:
 | CLIENT_VERSION       | |
 | CLUSTER              | |
 | COLON                | |
+| COLS                 | 3.3.6.0+ |
 | COLUMN               | |
 | COMMA                | |
 | COMMENT              | |
 | COMP                 | |
 | COMPACT              | |
 | COMPACTS             | |
+| COMPACT_INTERVAL     | 3.3.5.0+ |
+| COMPACT_TIME_OFFSET  | 3.3.5.0+ |
+| COMPACT_TIME_RANGE   | 3.3.5.0+ |
 | CONCAT               | |
 | CONFLICT             | |
 | CONNECTION           | |
@@ -115,6 +120,7 @@ The list of keywords is as follows:
 | DESC                 | |
 | DESCRIBE             | |
 | DETACH               | |
+| DISK_INFO            | 3.3.5.0+ |
 | DISTINCT             | |
 | DISTRIBUTED          | |
 | DIVIDE               | |
@@ -149,19 +155,19 @@ The list of keywords is as follows:
 |Keyword|Description|
 |----------------------|-|
 | FAIL                 | |
-| FHIGH                | Version 3.3.4.3 and later |
+| FHIGH                | 3.3.4.3+ |
 | FILE                 | |
 | FILL                 | |
 | FILL_HISTORY         | |
 | FIRST                | |
 | FLOAT                | |
-| FLOW                 | Version 3.3.4.3 and later |
+| FLOW                 | 3.3.4.3+ |
 | FLUSH                | |
 | FOR                  | |
 | FORCE                | |
-| FORCE_WINDOW_CLOSE   | Version 3.3.4.3 and later |
+| FORCE_WINDOW_CLOSE   | 3.3.4.3+ |
 | FROM                 | |
-| FROWTS               | Version 3.3.4.3 and later |
+| FROWTS               | 3.3.4.3+ |
 | FULL                 | |
 | FUNCTION             | |
 | FUNCTIONS            | |
@@ -210,6 +216,7 @@ The list of keywords is as follows:
 | INTO                 | |
 | IPTOKEN              | |
 | IROWTS               | |
+| IROWTS_ORIGIN        | 3.3.5.0+ |
 | IS                   | |
 | IS_IMPORT            | |
 | ISFILLED             | |
@@ -243,6 +250,7 @@ The list of keywords is as follows:
 | LEADER               | |
 | LEADING              | |
 | LEFT                 | |
+| LEVEL                | 3.3.0.0 - 3.3.2.11 |
 | LICENCES             | |
 | LIKE                 | |
 | LIMIT                | |
@@ -264,6 +272,7 @@ The list of keywords is as follows:
 | MEDIUMBLOB           | |
 | MERGE                | |
 | META                 | |
+| META_ONLY            | 3.3.6.0+ |
 | MINROWS              | |
 | MINUS                | |
 | MNODE                | |
@@ -282,6 +291,8 @@ The list of keywords is as follows:
 | NONE                 | |
 | NORMAL               | |
 | NOT                  | |
+| NOTIFY               | 3.3.6.0+ |
+| NOTIFY_HISTORY       | 3.3.6.0+ |
 | NOTNULL              | |
 | NOW                  | |
 | NULL                 | |
@@ -296,6 +307,7 @@ The list of keywords is as follows:
 | OFFSET               | |
 | ON                   | |
 | ONLY                 | |
+| ON_FAILURE           | 3.3.6.0+ |
 | OR                   | |
 | ORDER                | |
 | OUTER                | |
@@ -346,6 +358,7 @@ The list of keywords is as follows:
 | RATIO                | |
 | READ                 | |
 | RECURSIVE            | |
+| REGEXP               | 3.3.6.0+ |
 | REDISTRIBUTE         | |
 | REM                  | |
 | REPLACE              | |
@@ -419,7 +432,7 @@ The list of keywords is as follows:
 | TABLE_PREFIX         | |
 | TABLE_SUFFIX         | |
 | TABLES               | |
-| tag                  | |
+| TAG                  | |
 | TAGS                 | |
 | TBNAME               | |
 | THEN                 | |
@@ -436,6 +449,7 @@ The list of keywords is as follows:
 | TRANSACTIONS         | |
 | TRIGGER              | |
 | TRIM                 | |
+| TRUE_FOR             | 3.3.6.0+ |
 | TSDB_PAGESIZE        | |
 | TSERIES              | |
 | TSMA                 | |
diff --git a/docs/zh/14-reference/03-taos-sql/20-keywords.md b/docs/zh/14-reference/03-taos-sql/20-keywords.md
index 33eea11618..a2427c99c5 100644
--- a/docs/zh/14-reference/03-taos-sql/20-keywords.md
+++ b/docs/zh/14-reference/03-taos-sql/20-keywords.md
@@ -23,11 +23,11 @@ description: TDengine 保留关键字的详细列表
 | ALIVE                | |
 | ALL                  | |
 | ALTER                | |
-| ANALYZE              | 3.3.4.3 及后续版本 |
+| ANALYZE              | 3.3.4.3+ |
 | AND                  | |
-| ANODE                | 3.3.4.3 及后续版本 |
-| ANODES               | 3.3.4.3 及后续版本 |
-| ANOMALY_WINDOW       | 3.3.4.3 及后续版本 |
+| ANODE                | 3.3.4.3+ |
+| ANODES               | 3.3.4.3+ |
+| ANOMALY_WINDOW       | 3.3.4.3+ |
 | ANTI                 | |
 | APPS                 | |
 | ARBGROUPS            | |
@@ -37,8 +37,8 @@ description: TDengine 保留关键字的详细列表
 | ASOF                 | |
 | AT_ONCE              | |
 | ATTACH               | |
-| AUTO                 | 3.3.5.0 及后续版本 |
-| ASSIGN               | 3.3.6.0 及后续版本 |
+| AUTO                 | 3.3.5.0+ |
+| ASSIGN               | 3.3.6.0+ |
 
 ### B
 |关键字|说明|
@@ -78,16 +78,16 @@ description: TDengine 保留关键字的详细列表
 | CLIENT_VERSION       | |
 | CLUSTER              | |
 | COLON                | |
-| COLS                 | 3.3.6.0 及后续版本 |
+| COLS                 | 3.3.6.0+ |
 | COLUMN               | |
 | COMMA                | |
 | COMMENT              | |
 | COMP                 | |
 | COMPACT              | |
 | COMPACTS             | |
-| COMPACT_INTERVAL     | 3.3.5.0 及后续版本 |
-| COMPACT_TIME_OFFSET  | 3.3.5.0 及后续版本 |
-| COMPACT_TIME_RANGE   | 3.3.5.0 及后续版本 |
+| COMPACT_INTERVAL     | 3.3.5.0+ |
+| COMPACT_TIME_OFFSET  | 3.3.5.0+ |
+| COMPACT_TIME_RANGE   | 3.3.5.0+ |
 | CONCAT               | |
 | CONFLICT             | |
 | CONNECTION           | |
@@ -117,7 +117,7 @@ description: TDengine 保留关键字的详细列表
 | DESC                 | |
 | DESCRIBE             | |
 | DETACH               | |
-| DISK_INFO            | 3.3.5.0 及后续版本 |
+| DISK_INFO            | 3.3.5.0+ |
 | DISTINCT             | |
 | DISTRIBUTED          | |
 | DIVIDE               | |
@@ -150,19 +150,19 @@ description: TDengine 保留关键字的详细列表
 |关键字|说明|
 |----------------------|-|
 | FAIL                 | |
-| FHIGH                | 3.3.4.3 及后续版本 |
+| FHIGH                | 3.3.4.3+ |
 | FILE                 | |
 | FILL                 | |
 | FILL_HISTORY         | |
 | FIRST                | |
 | FLOAT                | |
-| FLOW                 | 3.3.4.3 及后续版本 |
+| FLOW                 | 3.3.4.3+ |
 | FLUSH                | |
 | FOR                  | |
 | FORCE                | |
-| FORCE_WINDOW_CLOSE   | 3.3.4.3 及后续版本 |
+| FORCE_WINDOW_CLOSE   | 3.3.4.3+ |
 | FROM                 | |
-| FROWTS               | 3.3.4.3 及后续版本 |
+| FROWTS               | 3.3.4.3+ |
 | FULL                 | |
 | FUNCTION             | |
 | FUNCTIONS            | |
@@ -208,7 +208,7 @@ description: TDengine 保留关键字的详细列表
 | INTO                 | |
 | IPTOKEN              | |
 | IROWTS               | |
-| IROWTS_ORIGIN        | 3.3.5.0 及后续版本 |
+| IROWTS_ORIGIN        | 3.3.5.0+ |
 | IS                   | |
 | IS_IMPORT            | |
 | ISFILLED             | |
@@ -260,6 +260,7 @@ description: TDengine 保留关键字的详细列表
 | MEDIUMBLOB           | |
 | MERGE                | |
 | META                 | |
+| META_ONLY            | 3.3.6.0+ |
 | MINROWS              | |
 | MINUS                | |
 | MNODE                | |
@@ -277,8 +278,8 @@ description: TDengine 保留关键字的详细列表
 | NONE                 | |
 | NORMAL               | |
 | NOT                  | |
-| NOTIFY               | 3.3.6.0 及后续版本 |
-| NOTIFY_HISTORY       | 3.3.6.0 及后续版本 |
+| NOTIFY               | 3.3.6.0+ |
+| NOTIFY_HISTORY       | 3.3.6.0+ |
 | NOTNULL              | |
 | NOW                  | |
 | NULL                 | |
@@ -292,7 +293,7 @@ description: TDengine 保留关键字的详细列表
 | OFFSET               | |
 | ON                   | |
 | ONLY                 | |
-| ON_FAILURE           | 3.3.6.0 及后续版本 |
+| ON_FAILURE           | 3.3.6.0+ |
 | OR                   | |
 | ORDER                | |
 | OUTER                | |
@@ -340,7 +341,7 @@ description: TDengine 保留关键字的详细列表
 | RATIO                | |
 | READ                 | |
 | RECURSIVE            | |
-| REGEXP               | 3.3.6.0 及后续版本 |
+| REGEXP               | 3.3.6.0+ |
 | REDISTRIBUTE         | |
 | REM                  | |
 | REPLACE              | |
@@ -429,7 +430,7 @@ description: TDengine 保留关键字的详细列表
 | TRANSACTIONS         | |
 | TRIGGER              | |
 | TRIM                 | |
-| TRUE_FOR             | |
+| TRUE_FOR             | 3.3.6.0+ |
 | TSDB_PAGESIZE        | |
 | TSERIES              | |
 | TSMA                 | |

From 092e8e44889cf70fd4450bbfda2f65f2433c24f7 Mon Sep 17 00:00:00 2001
From: dmchen <cademfly@hotmail.com>
Date: Sat, 1 Mar 2025 00:52:11 +0800
Subject: [PATCH 34/35] fix:remove-send-status-lock

---
 source/dnode/mgmt/mgmt_dnode/src/dmHandle.c | 49 ++++++++++++++-------
 1 file changed, 34 insertions(+), 15 deletions(-)

diff --git a/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c b/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c
index 81c416dd72..4659414311 100644
--- a/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c
+++ b/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c
@@ -26,6 +26,7 @@ extern SConfig *tsCfg;
 
 SMonVloadInfo tsVinfo = {0};
 SMnodeLoad    tsMLoad = {0};
+SDnodeData    tsDnodeData = {0};
 
 static void dmUpdateDnodeCfg(SDnodeMgmt *pMgmt, SDnodeCfg *pCfg) {
   int32_t code = 0;
@@ -170,22 +171,27 @@ void dmSendStatusReq(SDnodeMgmt *pMgmt) {
   SStatusReq req = {0};
   req.timestamp = taosGetTimestampMs();
 
-  dDebug("send status req to mnode, statusSeq:%d, begin to mgnt lock", pMgmt->statusSeq);
-  (void)taosThreadRwlockRdlock(&pMgmt->pData->lock);
+  dDebug("send status req to mnode, statusSeq:%d, begin to mgnt statusInfolock", pMgmt->statusSeq);
+  if (taosThreadMutexLock(&pMgmt->pData->statusInfolock) != 0) {
+    dError("failed to lock status info lock");
+    return;
+  }
+
+  dDebug("send status req to mnode, statusSeq:%d, begin to get dnode info", pMgmt->statusSeq);
   req.sver = tsVersion;
-  req.dnodeVer = pMgmt->pData->dnodeVer;
-  req.dnodeId = pMgmt->pData->dnodeId;
-  req.clusterId = pMgmt->pData->clusterId;
+  req.dnodeVer = tsDnodeData.dnodeVer;
+  req.dnodeId = tsDnodeData.dnodeId;
+  req.clusterId = tsDnodeData.clusterId;
   if (req.clusterId == 0) req.dnodeId = 0;
-  req.rebootTime = pMgmt->pData->rebootTime;
-  req.updateTime = pMgmt->pData->updateTime;
+  req.rebootTime = tsDnodeData.rebootTime;
+  req.updateTime = tsDnodeData.updateTime;
   req.numOfCores = tsNumOfCores;
   req.numOfSupportVnodes = tsNumOfSupportVnodes;
   req.numOfDiskCfg = tsDiskCfgNum;
   req.memTotal = tsTotalMemoryKB * 1024;
   req.memAvail = req.memTotal - tsQueueMemoryAllowed - tsApplyMemoryAllowed - 16 * 1024 * 1024;
   tstrncpy(req.dnodeEp, tsLocalEp, TSDB_EP_LEN);
-  tstrncpy(req.machineId, pMgmt->pData->machineId, TSDB_MACHINE_ID_LEN + 1);
+  tstrncpy(req.machineId, tsDnodeData.machineId, TSDB_MACHINE_ID_LEN + 1);
 
   req.clusterCfg.statusInterval = tsStatusInterval;
   req.clusterCfg.checkTime = 0;
@@ -207,17 +213,13 @@ void dmSendStatusReq(SDnodeMgmt *pMgmt) {
   memcpy(req.clusterCfg.timezone, tsTimezoneStr, TD_TIMEZONE_LEN);
   memcpy(req.clusterCfg.locale, tsLocale, TD_LOCALE_LEN);
   memcpy(req.clusterCfg.charset, tsCharset, TD_LOCALE_LEN);
-  (void)taosThreadRwlockUnlock(&pMgmt->pData->lock);
 
-  dDebug("send status req to mnode, statusSeq:%d, begin to get vnode and loads", pMgmt->statusSeq);
-  if (taosThreadMutexLock(&pMgmt->pData->statusInfolock) != 0) {
-    dError("failed to lock status info lock");
-    return;
-  }
+  dDebug("send status req to mnode, statusSeq:%d, begin to get vnode loads", pMgmt->statusSeq);
 
   req.pVloads = tsVinfo.pVloads;
   tsVinfo.pVloads = NULL;
 
+  dDebug("send status req to mnode, statusSeq:%d, begin to get mnode loads", pMgmt->statusSeq);
   req.mload = tsMLoad;
 
   if (taosThreadMutexUnlock(&pMgmt->pData->statusInfolock) != 0) {
@@ -416,8 +418,19 @@ void dmSendConfigReq(SDnodeMgmt *pMgmt) {
 }
 
 void dmUpdateStatusInfo(SDnodeMgmt *pMgmt) {
-  SMonVloadInfo vinfo = {0};
+  dDebug("begin to get dnode info");
+  SDnodeData dnodeData = {0};
+  (void)taosThreadRwlockRdlock(&pMgmt->pData->lock);
+  dnodeData.dnodeVer = pMgmt->pData->dnodeVer;
+  dnodeData.dnodeId = pMgmt->pData->dnodeId;
+  dnodeData.clusterId = pMgmt->pData->clusterId;
+  dnodeData.rebootTime = pMgmt->pData->rebootTime;
+  dnodeData.updateTime = pMgmt->pData->updateTime;
+  tstrncpy(dnodeData.machineId, pMgmt->pData->machineId, TSDB_MACHINE_ID_LEN + 1);
+  (void)taosThreadRwlockUnlock(&pMgmt->pData->lock);
+
   dDebug("begin to get vnode loads");
+  SMonVloadInfo vinfo = {0};
   (*pMgmt->getVnodeLoadsFp)(&vinfo);  // dmGetVnodeLoads
 
   dDebug("begin to get mnode loads");
@@ -429,6 +442,12 @@ void dmUpdateStatusInfo(SDnodeMgmt *pMgmt) {
     dError("failed to lock status info lock");
     return;
   }
+  tsDnodeData.dnodeVer = dnodeData.dnodeVer;
+  tsDnodeData.dnodeId = dnodeData.dnodeId;
+  tsDnodeData.clusterId = dnodeData.clusterId;
+  tsDnodeData.rebootTime = dnodeData.rebootTime;
+  tsDnodeData.updateTime = dnodeData.updateTime;
+  tstrncpy(tsDnodeData.machineId, dnodeData.machineId, TSDB_MACHINE_ID_LEN + 1);
 
   if (tsVinfo.pVloads == NULL) {
     tsVinfo.pVloads = vinfo.pVloads;

From 3fb2476b814a2844d577bd70fb7cf0d145b43bd6 Mon Sep 17 00:00:00 2001
From: dmchen <cademfly@hotmail.com>
Date: Sat, 1 Mar 2025 12:50:28 +0800
Subject: [PATCH 35/35] fix:statusseq

---
 source/dnode/mgmt/mgmt_dnode/src/dmHandle.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c b/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c
index 4659414311..d9ca4006c3 100644
--- a/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c
+++ b/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c
@@ -170,6 +170,7 @@ void dmSendStatusReq(SDnodeMgmt *pMgmt) {
   int32_t    code = 0;
   SStatusReq req = {0};
   req.timestamp = taosGetTimestampMs();
+  pMgmt->statusSeq++;
 
   dDebug("send status req to mnode, statusSeq:%d, begin to mgnt statusInfolock", pMgmt->statusSeq);
   if (taosThreadMutexLock(&pMgmt->pData->statusInfolock) != 0) {
@@ -230,7 +231,6 @@ void dmSendStatusReq(SDnodeMgmt *pMgmt) {
   dDebug("send status req to mnode, statusSeq:%d, begin to get qnode loads", pMgmt->statusSeq);
   (*pMgmt->getQnodeLoadsFp)(&req.qload);
 
-  pMgmt->statusSeq++;
   req.statusSeq = pMgmt->statusSeq;
   req.ipWhiteVer = pMgmt->pData->ipWhiteVer;
   req.analVer = taosAnalGetVersion();