diff --git a/source/dnode/vnode/src/tsdb/tsdbUtil.c b/source/dnode/vnode/src/tsdb/tsdbUtil.c
index 60f0b18a62121697ad0081e13941dadde655f4b3..76af751196d3877873eee7265321f34c39f7026f 100644
--- a/source/dnode/vnode/src/tsdb/tsdbUtil.c
+++ b/source/dnode/vnode/src/tsdb/tsdbUtil.c
@@ -1467,6 +1467,10 @@ void tsdbCalcColDataSMA(SColData *pColData, SColumnDataAgg *pColAgg) {
   SColVal  colVal;
   SColVal *pColVal = &colVal;
 
+  memset(pColAgg, 0, sizeof(*pColAgg));
+  bool minAssigned = false;
+  bool maxAssigned = false;
+
   *pColAgg = (SColumnDataAgg){.colId = pColData->cid};
   for (int32_t iVal = 0; iVal < pColData->nVal; iVal++) {
     tColDataGetValue(pColData, iVal, pColVal);
@@ -1481,72 +1485,86 @@ void tsdbCalcColDataSMA(SColData *pColData, SColumnDataAgg *pColAgg) {
           break;
         case TSDB_DATA_TYPE_TINYINT: {
           pColAgg->sum += colVal.value.i8;
-          if (pColAgg->min > colVal.value.i8) {
+          if (!minAssigned || pColAgg->min > colVal.value.i8) {
             pColAgg->min = colVal.value.i8;
+            minAssigned = true;
           }
-          if (pColAgg->max < colVal.value.i8) {
+          if (!maxAssigned || pColAgg->max < colVal.value.i8) {
             pColAgg->max = colVal.value.i8;
+            maxAssigned = true;
           }
           break;
         }
         case TSDB_DATA_TYPE_SMALLINT: {
           pColAgg->sum += colVal.value.i16;
-          if (pColAgg->min > colVal.value.i16) {
+          if (!minAssigned || pColAgg->min > colVal.value.i16) {
             pColAgg->min = colVal.value.i16;
+            minAssigned = true;
           }
-          if (pColAgg->max < colVal.value.i16) {
+          if (!maxAssigned || pColAgg->max < colVal.value.i16) {
             pColAgg->max = colVal.value.i16;
+            maxAssigned = true;
           }
           break;
         }
         case TSDB_DATA_TYPE_INT: {
           pColAgg->sum += colVal.value.i32;
-          if (pColAgg->min > colVal.value.i32) {
+          if (!minAssigned || pColAgg->min > colVal.value.i32) {
             pColAgg->min = colVal.value.i32;
+            minAssigned = true;
           }
-          if (pColAgg->max < colVal.value.i32) {
+          if (!maxAssigned || pColAgg->max < colVal.value.i32) {
             pColAgg->max = colVal.value.i32;
+            maxAssigned = true;
           }
           break;
         }
         case TSDB_DATA_TYPE_BIGINT: {
           pColAgg->sum += colVal.value.i64;
-          if (pColAgg->min > colVal.value.i64) {
+          if (!minAssigned || pColAgg->min > colVal.value.i64) {
             pColAgg->min = colVal.value.i64;
+            minAssigned = true;
           }
-          if (pColAgg->max < colVal.value.i64) {
+          if (!maxAssigned || pColAgg->max < colVal.value.i64) {
             pColAgg->max = colVal.value.i64;
+            maxAssigned = true;
           }
           break;
         }
         case TSDB_DATA_TYPE_FLOAT: {
           *(double*)(&pColAgg->sum) += colVal.value.f;
-          if (*(double*)(&pColAgg->min) > colVal.value.f) {
+          if (!minAssigned || *(double*)(&pColAgg->min) > colVal.value.f) {
             *(double*)(&pColAgg->min) = colVal.value.f;
+            minAssigned = true;
           }
-          if (*(double*)(&pColAgg->max) < colVal.value.f) {
+          if (!maxAssigned || *(double*)(&pColAgg->max) < colVal.value.f) {
             *(double*)(&pColAgg->max) = colVal.value.f;
+            maxAssigned = true;
           }
           break;
         }
         case TSDB_DATA_TYPE_DOUBLE: {
           *(double*)(&pColAgg->sum) += colVal.value.d;
-          if (*(double*)(&pColAgg->min) > colVal.value.d) {
+          if (!minAssigned || *(double*)(&pColAgg->min) > colVal.value.d) {
             *(double*)(&pColAgg->min) = colVal.value.d;
+            minAssigned = true;
           }
-          if (*(double*)(&pColAgg->max) < colVal.value.d) {
+          if (!maxAssigned || *(double*)(&pColAgg->max) < colVal.value.d) {
             *(double*)(&pColAgg->max) = colVal.value.d;
+            maxAssigned = true;
           }
           break;
         }
         case TSDB_DATA_TYPE_VARCHAR:
           break;
         case TSDB_DATA_TYPE_TIMESTAMP: {
-          if (pColAgg->min > colVal.value.i64) {
+          if (!minAssigned || pColAgg->min > colVal.value.i64) {
             pColAgg->min = colVal.value.i64;
+            minAssigned = true;
           }
-          if (pColAgg->max < colVal.value.i64) {
+          if (!maxAssigned || pColAgg->max < colVal.value.i64) {
             pColAgg->max = colVal.value.i64;
+            maxAssigned = true;
           }
           break;
         }
@@ -1554,41 +1572,49 @@ void tsdbCalcColDataSMA(SColData *pColData, SColumnDataAgg *pColAgg) {
           break;
         case TSDB_DATA_TYPE_UTINYINT: {
           pColAgg->sum += colVal.value.u8;
-          if (pColAgg->min > colVal.value.u8) {
+          if (!minAssigned || pColAgg->min > colVal.value.u8) {
             pColAgg->min = colVal.value.u8;
+            minAssigned = true;
           }
-          if (pColAgg->max < colVal.value.u8) {
+          if (!maxAssigned || pColAgg->max < colVal.value.u8) {
             pColAgg->max = colVal.value.u8;
+            maxAssigned = true;
           }
           break;
         }
         case TSDB_DATA_TYPE_USMALLINT: {
           pColAgg->sum += colVal.value.u16;
-          if (pColAgg->min > colVal.value.u16) {
+          if (!minAssigned || pColAgg->min > colVal.value.u16) {
             pColAgg->min = colVal.value.u16;
+            minAssigned = true;
           }
-          if (pColAgg->max < colVal.value.u16) {
+          if (!maxAssigned || pColAgg->max < colVal.value.u16) {
             pColAgg->max = colVal.value.u16;
+            maxAssigned = true;
           }
           break;
         }
         case TSDB_DATA_TYPE_UINT: {
           pColAgg->sum += colVal.value.u32;
-          if (pColAgg->min > colVal.value.u32) {
+          if (!minAssigned || pColAgg->min > colVal.value.u32) {
             pColAgg->min = colVal.value.u32;
+            minAssigned = true;
           }
-          if (pColAgg->max < colVal.value.u32) {
+          if (!minAssigned || pColAgg->max < colVal.value.u32) {
             pColAgg->max = colVal.value.u32;
+            maxAssigned = true;
           }
           break;
         }
         case TSDB_DATA_TYPE_UBIGINT: {
           pColAgg->sum += colVal.value.u64;
-          if (pColAgg->min > colVal.value.u64) {
+          if (!minAssigned || pColAgg->min > colVal.value.u64) {
             pColAgg->min = colVal.value.u64;
+            minAssigned = true;
           }
-          if (pColAgg->max < colVal.value.u64) {
+          if (!maxAssigned || pColAgg->max < colVal.value.u64) {
             pColAgg->max = colVal.value.u64;
+            maxAssigned = true;
           }
           break;
         }
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index 86b90364548a3a82599c99ee2a34c29593373ba4..d15dc99122bb98267f39e3ae124f4617b9ded4d3 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -3315,7 +3315,7 @@ static SSDataBlock* doFillImpl(SOperatorInfo* pOperator) {
 
       taosFillSetStartInfo(pInfo->pFillInfo, 0, pInfo->win.ekey);
     } else {
-      blockDataUpdateTsWindow(pBlock, pInfo->primaryTsCol);
+      blockDataUpdateTsWindow(pBlock, pInfo->primarySrcSlotId);
       doApplyScalarCalculation(pOperator, pBlock, order, scanFlag);
 
       if (pInfo->curGroupId == 0 || pInfo->curGroupId == pInfo->pRes->info.groupId) {
diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c
index cbf81f1d0d16235128b94aad3600b17e73d34ed8..5aeaecd59867fba87439fb6951e1ed548323856e 100644
--- a/source/libs/function/src/builtinsimpl.c
+++ b/source/libs/function/src/builtinsimpl.c
@@ -1210,7 +1210,7 @@ int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc) {
 
         int64_t val = GET_INT64_VAL(tval);
         if ((prev < val) ^ isMinFunc) {
-          pBuf->v = val;
+          *(int64_t*)&pBuf->v = val;
           if (pCtx->subsidiaries.num > 0) {
             index = findRowIndex(pInput->startRowIndex, pInput->numOfRows, pCol, tval);
             doSaveTupleData(pCtx, index, pCtx->pSrcBlock, &pBuf->tuplePos);
@@ -1223,7 +1223,7 @@ int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc) {
 
         uint64_t val = GET_UINT64_VAL(tval);
         if ((prev < val) ^ isMinFunc) {
-          pBuf->v = val;
+          *(uint64_t*)&pBuf->v = val;
           if (pCtx->subsidiaries.num > 0) {
             index = findRowIndex(pInput->startRowIndex, pInput->numOfRows, pCol, tval);
             doSaveTupleData(pCtx, index, pCtx->pSrcBlock, &pBuf->tuplePos);
@@ -1231,11 +1231,11 @@ int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc) {
         }
       } else if (type == TSDB_DATA_TYPE_DOUBLE) {
         double prev = 0;
-        GET_TYPED_DATA(prev, int64_t, type, &pBuf->v);
+        GET_TYPED_DATA(prev, double, type, &pBuf->v);
 
         double val = GET_DOUBLE_VAL(tval);
         if ((prev < val) ^ isMinFunc) {
-          pBuf->v = val;
+          *(double*)&pBuf->v = val;
           if (pCtx->subsidiaries.num > 0) {
             index = findRowIndex(pInput->startRowIndex, pInput->numOfRows, pCol, tval);
             doSaveTupleData(pCtx, index, pCtx->pSrcBlock, &pBuf->tuplePos);
@@ -1243,11 +1243,11 @@ int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc) {
         }
       } else if (type == TSDB_DATA_TYPE_FLOAT) {
         double prev = 0;
-        GET_TYPED_DATA(prev, int64_t, type, &pBuf->v);
+        GET_TYPED_DATA(prev, double, type, &pBuf->v);
 
         double val = GET_DOUBLE_VAL(tval);
         if ((prev < val) ^ isMinFunc) {
-          pBuf->v = val;
+          *(double*)&pBuf->v = val;
         }
 
         if (pCtx->subsidiaries.num > 0) {