From 8f1eda88ada6f9d601692c4c19387819bba29091 Mon Sep 17 00:00:00 2001
From: factosea <285808407@qq.com>
Date: Fri, 22 Nov 2024 17:18:42 +0800
Subject: [PATCH 1/2] enh: error code

---
 source/libs/executor/src/executorInt.c        | 2 ++
 source/libs/executor/src/timewindowoperator.c | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/source/libs/executor/src/executorInt.c b/source/libs/executor/src/executorInt.c
index 1b823bf69d..1e6647c01a 100644
--- a/source/libs/executor/src/executorInt.c
+++ b/source/libs/executor/src/executorInt.c
@@ -552,8 +552,10 @@ int32_t setResultRowInitCtx(SResultRow* pResult, SqlFunctionCtx* pCtx, int32_t n
         int32_t code = pCtx[i].fpSet.init(&pCtx[i], pResInfo);
         if (code != TSDB_CODE_SUCCESS && fmIsUserDefinedFunc(pCtx[i].functionId)) {
           pResInfo->initialized = false;
+          qError("failed to initialize udf, funcId:%d error:%s", pCtx[i].functionId, tstrerror(code));
           return TSDB_CODE_UDF_FUNC_EXEC_FAILURE;
         } else if (code != TSDB_CODE_SUCCESS) {
+          qError("failed to initialize function context, funcId:%d error:%s", pCtx[i].functionId, tstrerror(code));
           return code;
         }
       } else {
diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c
index 667deee4c6..56d6d2c13a 100644
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
@@ -81,6 +81,7 @@ static int32_t setTimeWindowOutputBuf(SResultRowInfo* pResultRowInfo, STimeWindo
 
   if (pResultRow == NULL || pTaskInfo->code != 0) {
     *pResult = NULL;
+    qError("failed to set result output buffer, error:%s", tstrerror(pTaskInfo->code));
     return pTaskInfo->code;
   }
 
@@ -1042,7 +1043,7 @@ static void doStateWindowAggImpl(SOperatorInfo* pOperator, SStateWindowOperatorI
       int32_t ret = setTimeWindowOutputBuf(&pInfo->binfo.resultRowInfo, &window, masterScan, &pResult, gid, pSup->pCtx,
                                            numOfOutput, pSup->rowEntryInfoOffset, &pInfo->aggSup, pTaskInfo);
       if (ret != TSDB_CODE_SUCCESS) {  // null data, too many state code
-        T_LONG_JMP(pTaskInfo->env, TSDB_CODE_APP_ERROR);
+        T_LONG_JMP(pTaskInfo->env, ret);
       }
 
       updateTimeWindowInfo(&pInfo->twAggSup.timeWindowData, &window, 0);

From 266958b29ead9d7539075be2f74f58e3f763a7d9 Mon Sep 17 00:00:00 2001
From: factosea <285808407@qq.com>
Date: Fri, 22 Nov 2024 17:53:50 +0800
Subject: [PATCH 2/2] enh: error code

---
 source/libs/executor/src/timewindowoperator.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c
index 56d6d2c13a..e4e1ef9eaa 100644
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
@@ -1071,7 +1071,7 @@ static void doStateWindowAggImpl(SOperatorInfo* pOperator, SStateWindowOperatorI
   int32_t ret = setTimeWindowOutputBuf(&pInfo->binfo.resultRowInfo, &pRowSup->win, masterScan, &pResult, gid,
                                        pSup->pCtx, numOfOutput, pSup->rowEntryInfoOffset, &pInfo->aggSup, pTaskInfo);
   if (ret != TSDB_CODE_SUCCESS) {  // null data, too many state code
-    T_LONG_JMP(pTaskInfo->env, TSDB_CODE_APP_ERROR);
+    T_LONG_JMP(pTaskInfo->env, ret);
   }
 
   updateTimeWindowInfo(&pInfo->twAggSup.timeWindowData, &pRowSup->win, 0);
@@ -1533,7 +1533,7 @@ static void doSessionWindowAggImpl(SOperatorInfo* pOperator, SSessionAggOperator
             setTimeWindowOutputBuf(&pInfo->binfo.resultRowInfo, &window, masterScan, &pResult, gid, pSup->pCtx,
                                    numOfOutput, pSup->rowEntryInfoOffset, &pInfo->aggSup, pTaskInfo);
         if (ret != TSDB_CODE_SUCCESS) {  // null data, too many state code
-          T_LONG_JMP(pTaskInfo->env, TSDB_CODE_APP_ERROR);
+          T_LONG_JMP(pTaskInfo->env, ret);
         }
 
         // pInfo->numOfRows data belong to the current session window
@@ -1556,7 +1556,7 @@ static void doSessionWindowAggImpl(SOperatorInfo* pOperator, SSessionAggOperator
   int32_t ret = setTimeWindowOutputBuf(&pInfo->binfo.resultRowInfo, &pRowSup->win, masterScan, &pResult, gid,
                                        pSup->pCtx, numOfOutput, pSup->rowEntryInfoOffset, &pInfo->aggSup, pTaskInfo);
   if (ret != TSDB_CODE_SUCCESS) {  // null data, too many state code
-    T_LONG_JMP(pTaskInfo->env, TSDB_CODE_APP_ERROR);
+    T_LONG_JMP(pTaskInfo->env, ret);
   }
 
   updateTimeWindowInfo(&pInfo->twAggSup.timeWindowData, &pRowSup->win, 0);