From cb4cc327d95acd24044189ca133bd6ba2479e46e Mon Sep 17 00:00:00 2001
From: sima <simondominic9997@outlook.com>
Date: Thu, 8 Aug 2024 14:19:17 +0800
Subject: [PATCH] fix:[TD-31326] Return correct error code in _return.

---
 source/client/src/clientEnv.c    |  2 +-
 source/client/src/clientHb.c     |  2 +-
 source/libs/scalar/src/filter.c  | 10 +++++-----
 source/libs/scalar/src/sclfunc.c |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/source/client/src/clientEnv.c b/source/client/src/clientEnv.c
index 44abf71bd2..26e13688a7 100644
--- a/source/client/src/clientEnv.c
+++ b/source/client/src/clientEnv.c
@@ -871,7 +871,7 @@ _return:
     TSC_ERR_RET(terrno);
   }
 
-  return TSDB_CODE_SUCCESS;
+  return code;
 }
 
 void tscStopCrashReport() {
diff --git a/source/client/src/clientHb.c b/source/client/src/clientHb.c
index a174ae4b13..415c2d6685 100644
--- a/source/client/src/clientHb.c
+++ b/source/client/src/clientHb.c
@@ -1405,7 +1405,7 @@ _return:
     TSC_ERR_RET(terrno);
   }
 
-  return TSDB_CODE_SUCCESS;
+  return code;
 }
 
 static void hbStopThread() {
diff --git a/source/libs/scalar/src/filter.c b/source/libs/scalar/src/filter.c
index 9f79432398..e5d0fe594a 100644
--- a/source/libs/scalar/src/filter.c
+++ b/source/libs/scalar/src/filter.c
@@ -2343,7 +2343,7 @@ _return:
 
   (void)filterFreeRangeCtx(ctx);  // No need to handle the return value.
 
-  return TSDB_CODE_SUCCESS;
+  return code;
 }
 
 int32_t filterMergeGroupUnits(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t *gResNum) {
@@ -2671,7 +2671,7 @@ _return:
 
   (void)filterFreeRangeCtx(ctx);  // No need to handle the return value.
 
-  return TSDB_CODE_SUCCESS;
+  return code;
 }
 
 int32_t filterMergeGroups(SFilterInfo *info, SFilterGroupCtx **gRes, int32_t *gResNum) {
@@ -2758,7 +2758,7 @@ _return:
 
   FILTER_SET_FLAG(info->status, FI_STATUS_ALL);
 
-  return TSDB_CODE_SUCCESS;
+  return code;
 }
 
 int32_t filterConvertGroupFromArray(SFilterInfo *info, SArray *group) {
@@ -2958,7 +2958,7 @@ _return:
   taosMemoryFreeClear(idxNum);
   taosMemoryFreeClear(idxs);
 
-  return TSDB_CODE_SUCCESS;
+  return code;
 }
 
 int32_t filterPostProcessRange(SFilterInfo *info) {
@@ -5003,7 +5003,7 @@ int32_t fltOptimizeNodes(SFilterInfo *pInfo, SNode **pNode, SFltTreeStat *pStat)
   }
 _return:
   taosArrayDestroy(sclOpList);
-  return TSDB_CODE_SUCCESS;
+  return code;
 }
 
 int32_t fltGetDataFromColId(void *param, int32_t id, void **data) {
diff --git a/source/libs/scalar/src/sclfunc.c b/source/libs/scalar/src/sclfunc.c
index cd67b89208..5db7aebeee 100644
--- a/source/libs/scalar/src/sclfunc.c
+++ b/source/libs/scalar/src/sclfunc.c
@@ -2913,7 +2913,7 @@ int32_t histogramScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarP
 
 _return:
   taosMemoryFree(bins);
-  return TSDB_CODE_SUCCESS;
+  return code;
 }
 
 int32_t selectScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) {