From dc8e2e9e0df794fb64629f3d6b8467a4dce95e5a Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sun, 28 Jul 2024 18:03:13 +0800
Subject: [PATCH] fix(query):fix error.

---
 include/util/tutil.h                          | 12 ++++----
 .../dnode/mnode/impl/test/stream/stream.cpp   |  2 +-
 source/libs/executor/src/tsort.c              | 28 ++++---------------
 3 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/include/util/tutil.h b/include/util/tutil.h
index 1eaff53cac..8c6c10c6be 100644
--- a/include/util/tutil.h
+++ b/include/util/tutil.h
@@ -160,12 +160,12 @@ static FORCE_INLINE int32_t taosGetTbHashVal(const char *tbname, int32_t tblen,
     return (terrno = (CODE)); \
   } while (0)
 
-#define TAOS_CHECK_RETURN(CMD)       \
-  do {                               \
-    int32_t code = (CMD);            \
-    if (code != TSDB_CODE_SUCCESS) { \
-      TAOS_RETURN(code);             \
-    }                                \
+#define TAOS_CHECK_RETURN(CMD)      \
+  do {                              \
+    int32_t __c = (CMD);            \
+    if (__c != TSDB_CODE_SUCCESS) { \
+      TAOS_RETURN(__c);             \
+    }                               \
   } while (0)
 
 #define TAOS_CHECK_GOTO(CMD, LINO, LABEL) \
diff --git a/source/dnode/mnode/impl/test/stream/stream.cpp b/source/dnode/mnode/impl/test/stream/stream.cpp
index 407163ae91..1ec319381d 100644
--- a/source/dnode/mnode/impl/test/stream/stream.cpp
+++ b/source/dnode/mnode/impl/test/stream/stream.cpp
@@ -246,7 +246,7 @@ TEST_F(StreamTest, kill_checkpoint_trans) {
   ASSERT(px != NULL);
 
   code = mndCreateStreamResetStatusTrans(pMnode, pStream);
-  ASSERT(code == 0);
+  ASSERT(code != 0);
 
   tFreeStreamObj(pStream);
   sdbCleanup(pMnode->pSdb);
diff --git a/source/libs/executor/src/tsort.c b/source/libs/executor/src/tsort.c
index bac5120ff9..1e345e9700 100644
--- a/source/libs/executor/src/tsort.c
+++ b/source/libs/executor/src/tsort.c
@@ -1960,7 +1960,7 @@ static int32_t sortBlocksToExtSource(SSortHandle* pHandle, SArray* aBlk, SArray*
   if (pHandle->bSortPk) {
     pOrigBlockPkOrder =
         (!pHandle->bSortByRowId) ? taosArrayGet(pHandle->pSortInfo, 1) : taosArrayGet(pHandle->aExtRowsOrders, 1);
-    if (pOrigBlockPkOrder) {
+    if (pOrigBlockPkOrder == NULL) {
       return terrno;
     }
   }
@@ -2234,11 +2234,7 @@ static int32_t createBlocksMergeSortInitialSources(SSortHandle* pHandle) {
       void* ppBlk = tSimpleHashGet(mUidBlk, &pBlk->info.id.uid, sizeof(pBlk->info.id.uid));
       if (ppBlk != NULL) {
         SSDataBlock* tBlk = *(SSDataBlock**)(ppBlk);
-
-        code = blockDataMerge(tBlk, pBlk);
-        if (code) {
-          return code;
-        }
+        TAOS_CHECK_RETURN(blockDataMerge(tBlk, pBlk));
 
         if (bExtractedBlock) {
           blockDataDestroy(pBlk);
@@ -2248,10 +2244,7 @@ static int32_t createBlocksMergeSortInitialSources(SSortHandle* pHandle) {
         if (bExtractedBlock) {
           tBlk = pBlk;
         } else {
-          code = createOneDataBlock(pBlk, true, &tBlk);
-          if (code) {
-            return code;
-          }
+          TAOS_CHECK_RETURN(createOneDataBlock(pBlk, true, &tBlk));
         }
 
         code = tSimpleHashPut(mUidBlk, &pBlk->info.id.uid, sizeof(pBlk->info.id.uid), &tBlk, POINTER_BYTES);
@@ -2271,10 +2264,7 @@ static int32_t createBlocksMergeSortInitialSources(SSortHandle* pHandle) {
 
       int64_t p = taosGetTimestampUs();
       if (pHandle->bSortByRowId) {
-        code = tsortOpenRegion(pHandle);
-        if (code) {
-          return code;
-        }
+        TAOS_CHECK_RETURN(tsortOpenRegion(pHandle));
       }
 
       code = sortBlocksToExtSource(pHandle, aBlkSort, aExtSrc);
@@ -2759,18 +2749,12 @@ static int32_t tsortPQSortNextTuple(SSortHandle* pHandle, STupleHandle **pTupleH
       void* pData = tupleGetField(pTuple, i, colNum);
 
       SColumnInfoData* p = NULL;
-      code = bdGetColumnInfoData(pHandle->pDataBlock, i, &p);
-      if (code) {
-        return code;
-      }
+      TAOS_CHECK_RETURN(bdGetColumnInfoData(pHandle->pDataBlock, i, &p));
 
       if (!pData) {
         colDataSetNULL(p, 0);
       } else {
-        code = colDataSetVal(p, 0, pData, false);
-        if (code) {
-          return code;
-        }
+        TAOS_CHECK_RETURN(colDataSetVal(p, 0, pData, false));
       }
     }
     pHandle->pDataBlock->info.rows++;