diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index 6afcdd22f2..2304ad54aa 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -74,7 +74,6 @@ endif()
 # jemalloc
 if(${JEMALLOC_ENABLED})
     cat("${TD_SUPPORT_DIR}/jemalloc_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
-    MESSAGE("JEMALLOC_ENABLED is on")
 endif()
 
 # msvc regex
diff --git a/include/libs/qcom/query.h b/include/libs/qcom/query.h
index 02cb96e4c7..5b28eadc4f 100644
--- a/include/libs/qcom/query.h
+++ b/include/libs/qcom/query.h
@@ -222,10 +222,7 @@ typedef struct STableDataCxt {
   STSchema*      pSchema;
   SBoundColInfo  boundColsInfo;
   SArray*        pValues;
-  union {
-    SSubmitTbData* pData;
-    void*          raw;
-  };
+  SSubmitTbData* pData;
   SRowKey        lastKey;
   bool           ordered;
   bool           duplicateTs;
diff --git a/source/client/src/clientMain.c b/source/client/src/clientMain.c
index 9f0706bdaf..7aabe573af 100644
--- a/source/client/src/clientMain.c
+++ b/source/client/src/clientMain.c
@@ -253,7 +253,7 @@ void taos_cleanup(void) {
   taosCloseRef(id);
 
   nodesDestroyAllocatorSet();
-  cleanupAppInfo();
+  //  cleanupAppInfo();
   rpcCleanup();
   tscDebug("rpc cleanup");
 
diff --git a/source/client/src/clientRawBlockWrite.c b/source/client/src/clientRawBlockWrite.c
index f7515cc359..68a99d2697 100644
--- a/source/client/src/clientRawBlockWrite.c
+++ b/source/client/src/clientRawBlockWrite.c
@@ -1020,7 +1020,7 @@ static int32_t taosCreateStb(TAOS* taos, void* meta, uint32_t metaLen) {
     return TSDB_CODE_INVALID_PARA;
   }
   SVCreateStbReq req = {0};
-  SDecoder       coder;
+  SDecoder       coder = {0};
   SMCreateStbReq pReq = {0};
   int32_t        code = TSDB_CODE_SUCCESS;
   SRequestObj*   pRequest = NULL;
diff --git a/source/client/src/clientTmq.c b/source/client/src/clientTmq.c
index e87ef4c00d..c038dc0dfc 100644
--- a/source/client/src/clientTmq.c
+++ b/source/client/src/clientTmq.c
@@ -286,7 +286,7 @@ typedef struct {
 } SVgroupSaveInfo;
 
 static   TdThreadOnce   tmqInit = PTHREAD_ONCE_INIT;  // initialize only once
-volatile int32_t        tmqInitRes = -1;               // initialize rsp code
+volatile int32_t        tmqInitRes = 0;               // initialize rsp code
 static   SMqMgmt        tmqMgmt = {0};
 
 tmq_conf_t* tmq_conf_new() {
@@ -2364,10 +2364,6 @@ static SMqRspObj* buildRsp(SMqPollRspWrapper* pollRspWrapper){
     SMqDataRsp      dataRsp;
     SMqMetaRsp      metaRsp;
     SMqBatchMetaRsp batchMetaRsp;
-    struct{
-      int32_t len;
-      void*   rawData;
-    };
   } MEMSIZE;
 
   SMqRspObj* pRspObj = taosMemoryCalloc(1, sizeof(SMqRspObj));
diff --git a/source/common/src/msg/tmsg.c b/source/common/src/msg/tmsg.c
index 3f8e686559..2abfc1213c 100644
--- a/source/common/src/msg/tmsg.c
+++ b/source/common/src/msg/tmsg.c
@@ -11416,9 +11416,6 @@ int32_t tDecodeMqDataRspCommon(SDecoder *pDecoder, SMqDataRsp *pRsp) {
       if (taosArrayPush(pRsp->blockData, &data) == NULL) {
         TAOS_CHECK_EXIT(terrno);
       }
-//      for (int m= 0; m < 56; m++){
-//        printf("decode data[%d] = %d\n", m, *((int8_t *)data+18+m));
-//      }
       int32_t len = bLen;
       if (taosArrayPush(pRsp->blockDataLen, &len) == NULL) {
         TAOS_CHECK_EXIT(terrno);
diff --git a/source/dnode/vnode/src/tq/tqScan.c b/source/dnode/vnode/src/tq/tqScan.c
index 5e30f07e2b..a33d050460 100644
--- a/source/dnode/vnode/src/tq/tqScan.c
+++ b/source/dnode/vnode/src/tq/tqScan.c
@@ -352,7 +352,7 @@ static void tqProcessSubData(STQ* pTq, STqHandle* pHandle, SMqDataRsp* pRsp, int
   }
 
   // this submit data is metadata and previous data is data
-  if (rawList != NULL && *totalRows > 0 && pSubmitTbData->pCreateTbReq != NULL && taosArrayGetSize(pBlocks) > 0){
+  if (rawList != NULL && *totalRows > 0 && pSubmitTbData->pCreateTbReq != NULL && taosArrayGetSize(pBlocks) > 0 && pRsp->createTableNum <= 1){
     tqDebug("poll rawdata split,vgId:%d, uid:%" PRId64 ", this submit data is metadata and previous data is data", pTq->pVnode->config.vgId, pExec->pTqReader->lastBlkUid);
     terrno = TSDB_CODE_TMQ_DUPLICATE_UID;
     pRsp->createTableNum = 0;
diff --git a/tests/system-test/7-tmq/tmq_taosx.py b/tests/system-test/7-tmq/tmq_taosx.py
index 3f72dfc95f..845e7229a8 100644
--- a/tests/system-test/7-tmq/tmq_taosx.py
+++ b/tests/system-test/7-tmq/tmq_taosx.py
@@ -67,7 +67,7 @@ class TDTestCase:
         tdSql.checkData(1, 5, "sttb4")
 
         tdSql.query("select * from stt order by ts")
-        tdSql.checkRows(3)
+        tdSql.checkRows(5)
         tdSql.checkData(0, 1, 1)
         tdSql.checkData(2, 1, 21)
         tdSql.checkData(0, 2, 2)
@@ -98,7 +98,7 @@ class TDTestCase:
         tdSql.checkData(1, 5, "sttb4")
 
         tdSql.query("select * from stt order by ts")
-        tdSql.checkRows(3)
+        tdSql.checkRows(5)
         tdSql.checkData(0, 1, 1)
         tdSql.checkData(2, 1, 21)
         tdSql.checkData(0, 2, 2)
diff --git a/utils/test/c/tmq_taosx_ci.c b/utils/test/c/tmq_taosx_ci.c
index 7b2a90570a..bc4a79bf12 100644
--- a/utils/test/c/tmq_taosx_ci.c
+++ b/utils/test/c/tmq_taosx_ci.c
@@ -427,7 +427,7 @@ int buildDatabase(TAOS* pConn, TAOS_RES* pRes) {
 
   pRes =
       taos_query(pConn,
-                 "insert into stt1 values(now - 2s, 3, 2, 'stt1')");
+                 "insert into stt1 values(now + 322s, 3, 2, 'stt1')");
   if (taos_errno(pRes) != 0) {
     printf("failed to create child table stt1, reason:%s\n", taos_errstr(pRes));
     return -1;