diff --git a/src/query/src/qAggMain.c b/src/query/src/qAggMain.c
index a3dbb328682cd926cbd2d503af8c50c7f29cc8d3..7c227a65a0af87f5e11baac6969b9a2aab26e193 100644
--- a/src/query/src/qAggMain.c
+++ b/src/query/src/qAggMain.c
@@ -5662,14 +5662,6 @@ static void wduration_function(SQLFunctionCtx *pCtx) {
   *(int64_t *)(pCtx->pOutput) = duration;
 }
 
-static void tswin_function_finalizer(SQLFunctionCtx *pCtx) {
-  SET_VAL(pCtx, pCtx->size, 1);
-  if (pCtx->stableQuery) {
-    *(int64_t *)(pCtx->pOutput) = *(int64_t *)pCtx->pInput;
-  }
-  doFinalizer(pCtx);
-}
-
 /////////////////////////////////////////////////////////////////////////////////////////////
 /*
  * function compatible list.
@@ -6209,8 +6201,8 @@ SAggFunctionInfo aAggs[TSDB_FUNC_MAX_NUM] = {{
                               TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_SELECTIVITY,
                               function_setup,
                               wstart_function,
-                              tswin_function_finalizer,
-                              noop1,
+                              doFinalizer,
+                              copy_function,
                               dataBlockRequired,
                           },
                           {
@@ -6221,8 +6213,8 @@ SAggFunctionInfo aAggs[TSDB_FUNC_MAX_NUM] = {{
                               TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_SELECTIVITY,
                               function_setup,
                               wstop_function,
-                              tswin_function_finalizer,
-                              noop1,
+                              doFinalizer,
+                              copy_function,
                               dataBlockRequired,
                           },
                           {
@@ -6233,8 +6225,8 @@ SAggFunctionInfo aAggs[TSDB_FUNC_MAX_NUM] = {{
                               TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_SELECTIVITY,
                               function_setup,
                               wduration_function,
-                              tswin_function_finalizer,
-                              noop1,
+                              doFinalizer,
+                              copy_function,
                               dataBlockRequired,
                           }
 };