Merge pull request #19338 from taosdata/fix/TD-21697

fix: td-21697

source/libs/executor/src/tsort.c

@@ -108,7 +108,7 @@ static int32_t sortComparCleanup(SMsortComparParam* cmpParam) {
   return TSDB_CODE_SUCCESS;
 }
 
-void tsortClearOrderdSource(SArray *pOrderedSource) {
+void tsortClearOrderdSource(SArray* pOrderedSource) {
   for (size_t i = 0; i < taosArrayGetSize(pOrderedSource); i++) {
     SSortSource** pSource = taosArrayGet(pOrderedSource, i);
     if (NULL == *pSource) {
@@ -121,6 +121,12 @@ void tsortClearOrderdSource(SArray *pOrderedSource) {
     if ((*pSource)->param && !(*pSource)->onlyRef) {
       taosMemoryFree((*pSource)->param);
     }
+
+    if (!(*pSource)->onlyRef && (*pSource)->src.pBlock) {
+      blockDataDestroy((*pSource)->src.pBlock);
+      (*pSource)->src.pBlock = NULL;
+    }
+
     taosMemoryFreeClear(*pSource);
   }
 
@@ -659,6 +665,10 @@ static int32_t createInitialSources(SSortHandle* pHandle) {
         if (source->param && !source->onlyRef) {
           taosMemoryFree(source->param);
         }
+        if (!source->onlyRef && source->src.pBlock) {
+          blockDataDestroy(source->src.pBlock);
+          source->src.pBlock = NULL;
+        }
         taosMemoryFree(source);
         return code;
       }
@@ -672,6 +682,10 @@ static int32_t createInitialSources(SSortHandle* pHandle) {
           if (source->param && !source->onlyRef) {
             taosMemoryFree(source->param);
           }
+          if (!source->onlyRef && source->src.pBlock) {
+            blockDataDestroy(source->src.pBlock);
+            source->src.pBlock = NULL;
+          }
           taosMemoryFree(source);
           return code;
         }

source/libs/transport/inc/transComm.h

@@ -101,13 +101,6 @@ typedef void* queue[2];
 #define TRANS_PACKET_LIMIT 1024 * 1024 * 512
 
 #define TRANS_MAGIC_NUM           0x5f375a86
-
-#define TRANS_NOVALID_PACKET(src) ((src) != TRANS_MAGIC_NUM ? 1 : 0)
-
-#define TRANS_PACKET_LIMIT 1024 * 1024 * 512
-
-#define TRANS_MAGIC_NUM 0x5f375a86
-
 #define TRANS_NOVALID_PACKET(src) ((src) != TRANS_MAGIC_NUM ? 1 : 0)
 
 typedef SRpcMsg      STransMsg;