From 4ff107812f59268bca979cc582b6175fa28a7ff7 Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Fri, 15 Jul 2022 10:00:35 +0800
Subject: [PATCH] feat(query): add avg function scalar version

TD-17344
---
 source/libs/scalar/src/sclfunc.c | 46 ++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/source/libs/scalar/src/sclfunc.c b/source/libs/scalar/src/sclfunc.c
index 2de893380c..c64b1d79ba 100644
--- a/source/libs/scalar/src/sclfunc.c
+++ b/source/libs/scalar/src/sclfunc.c
@@ -1924,7 +1924,7 @@ int32_t avgScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
   SColumnInfoData *pOutputData = pOutput->columnData;
 
   int32_t type = GET_PARAM_TYPE(pInput);
-  int64_t count = 0, sum = 0;
+  int64_t count = 0;
   bool hasNull = false;
 
   for (int32_t i = 0; i < pInput->numOfRows; ++i) {
@@ -1935,78 +1935,90 @@ int32_t avgScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *
 
     switch(type) {
       case TSDB_DATA_TYPE_TINYINT: {
-        int8_t *in  = (int8_t *)pInputData->pData;
-        sum += in[i];
+        int8_t *in   = (int8_t *)pInputData->pData;
+        int64_t *out = (int64_t *)pOutputData->pData;
+        *out += in[i];
         count++;
         break;
       }
       case TSDB_DATA_TYPE_SMALLINT: {
         int16_t *in  = (int16_t *)pInputData->pData;
-        sum += in[i];
+        int64_t *out = (int64_t *)pOutputData->pData;
+        *out += in[i];
         count++;
         break;
       }
       case TSDB_DATA_TYPE_INT: {
         int32_t *in  = (int32_t *)pInputData->pData;
-        sum += in[i];
+        int64_t *out = (int64_t *)pOutputData->pData;
+        *out += in[i];
         count++;
         break;
       }
       case TSDB_DATA_TYPE_BIGINT: {
         int64_t *in  = (int64_t *)pInputData->pData;
-        sum += in[i];
+        int64_t *out = (int64_t *)pOutputData->pData;
+        *out += in[i];
         count++;
         break;
       }
       case TSDB_DATA_TYPE_UTINYINT: {
-        uint8_t *in  = (uint8_t *)pInputData->pData;
-        sum += in[i];
+        uint8_t *in   = (uint8_t *)pInputData->pData;
+        uint64_t *out = (uint64_t *)pOutputData->pData;
+        *out += in[i];
         count++;
         break;
       }
       case TSDB_DATA_TYPE_USMALLINT: {
         uint16_t *in  = (uint16_t *)pInputData->pData;
-        sum += in[i];
+        uint64_t *out = (uint64_t *)pOutputData->pData;
+        *out += in[i];
         count++;
         break;
       }
       case TSDB_DATA_TYPE_UINT: {
         uint32_t *in  = (uint32_t *)pInputData->pData;
-        sum += in[i];
+        uint64_t *out = (uint64_t *)pOutputData->pData;
+        *out += in[i];
         count++;
         break;
       }
       case TSDB_DATA_TYPE_UBIGINT: {
         uint64_t *in  = (uint64_t *)pInputData->pData;
-        sum += in[i];
+        uint64_t *out = (uint64_t *)pOutputData->pData;
+        *out += in[i];
         count++;
         break;
       }
       case TSDB_DATA_TYPE_FLOAT: {
         float *in  = (float *)pInputData->pData;
-        sum += in[i];
+        float *out = (float *)pOutputData->pData;
+        *out += in[i];
         count++;
         break;
       }
       case TSDB_DATA_TYPE_DOUBLE: {
         double *in  = (double *)pInputData->pData;
-        sum += in[i];
+        double *out = (double *)pOutputData->pData;
+        *out += in[i];
         count++;
         break;
       }
     }
   }
 
-  double *out  = (double *)pOutputData->pData;
   if (hasNull) {
     colDataAppendNULL(pOutputData, 0);
   } else {
     if (IS_SIGNED_NUMERIC_TYPE(type)) {
-      *out = (int64_t)sum / (double)count;
+      int64_t *out   = (int64_t *)pOutputData->pData;
+      *(double *)out = *out / (double)count;
     } else if (IS_UNSIGNED_NUMERIC_TYPE(type)) {
-      *out = (uint64_t)sum / (double)count;
+      uint64_t *out  = (uint64_t *)pOutputData->pData;
+      *(double *)out = *out / (double)count;
     } else if (IS_FLOAT_TYPE(type)) {
-      *out = (double)sum / (double)count;
+      double *out    = (double *)pOutputData->pData;
+      *(double *)out = *out / (double)count;
     }
   }
 
-- 
GitLab