diff --git a/src/query/src/qAggMain.c b/src/query/src/qAggMain.c
index 1e9772907954a7a403fb757c3e76578285273cb5..feea4707bc3c2997824dd7819b4ff4669736c0e8 100644
--- a/src/query/src/qAggMain.c
+++ b/src/query/src/qAggMain.c
@@ -92,8 +92,9 @@ typedef struct SSpreadInfo {
 
 typedef struct SSumInfo {
   union {
-    int64_t isum;
-    double  dsum;
+    int64_t  isum;
+    uint64_t usum;
+    double   dsum;
   };
   int8_t hasResult;
 } SSumInfo;
@@ -595,6 +596,18 @@ static void do_sum_f(SQLFunctionCtx *pCtx, int32_t index) {
     *res += GET_INT32_VAL(pData);
   } else if (pCtx->inputType == TSDB_DATA_TYPE_BIGINT) {
     *res += GET_INT64_VAL(pData);
+  } else if (pCtx->inputType == TSDB_DATA_TYPE_UTINYINT) {
+    uint64_t *r = (uint64_t *)pCtx->pOutput;
+    *r += GET_UINT8_VAL(pData);
+  } else if (pCtx->inputType == TSDB_DATA_TYPE_USMALLINT) {
+    uint64_t *r = (uint64_t *)pCtx->pOutput;
+    *r += GET_UINT16_VAL(pData);
+  } else if (pCtx->inputType == TSDB_DATA_TYPE_UINT) {
+    uint64_t *r = (uint64_t *)pCtx->pOutput;
+    *r += GET_UINT32_VAL(pData);
+  } else if (pCtx->inputType == TSDB_DATA_TYPE_UBIGINT) {
+    uint64_t *r = (uint64_t *)pCtx->pOutput;
+    *r += GET_UINT64_VAL(pData);
   } else if (pCtx->inputType == TSDB_DATA_TYPE_DOUBLE) {
     double *retVal = (double*) pCtx->pOutput;
     *retVal += GET_DOUBLE_VAL(pData);
@@ -644,18 +657,12 @@ static void sum_func_merge(SQLFunctionCtx *pCtx) {
 
     notNullElems++;
 
-    switch (type) {
-      case TSDB_DATA_TYPE_TINYINT:
-      case TSDB_DATA_TYPE_SMALLINT:
-      case TSDB_DATA_TYPE_INT:
-      case TSDB_DATA_TYPE_BIGINT: {
-        *(int64_t *)pCtx->pOutput += pInput->isum;
-        break;
-      };
-      case TSDB_DATA_TYPE_FLOAT:
-      case TSDB_DATA_TYPE_DOUBLE: {
-        *(double *)pCtx->pOutput += pInput->dsum;
-      }
+    if (IS_SIGNED_NUMERIC_TYPE(type)) {
+      *(int64_t *)pCtx->pOutput += pInput->isum;
+    } else if (IS_UNSIGNED_NUMERIC_TYPE(type)) {
+      *(uint64_t *) pCtx->pOutput += pInput->usum;
+    } else {
+      *(double *)pCtx->pOutput += pInput->dsum;
     }
   }