Merge pull request #3726 from paopaol/fix/compile-arm

fix cross compile failed in arm32

src/client/src/tscFunctionImpl.c

@@ -525,7 +525,7 @@ static void do_sum(SQLFunctionCtx *pCtx) {
       *retVal += pCtx->preAggVals.statis.sum;
     } else if (pCtx->inputType == TSDB_DATA_TYPE_DOUBLE || pCtx->inputType == TSDB_DATA_TYPE_FLOAT) {
       double *retVal = (double*) pCtx->aOutputBuf;
-      *retVal += GET_DOUBLE_VAL(&(pCtx->preAggVals.statis.sum));
+      *retVal += GET_DOUBLE_VAL((const char*)&(pCtx->preAggVals.statis.sum));
     }
   } else {  // computing based on the true data block
     void *pData = GET_INPUT_CHAR(pCtx);
@@ -768,7 +768,7 @@ static void avg_function(SQLFunctionCtx *pCtx) {
     if (pCtx->inputType >= TSDB_DATA_TYPE_TINYINT && pCtx->inputType <= TSDB_DATA_TYPE_BIGINT) {
       *pVal += pCtx->preAggVals.statis.sum;
     } else if (pCtx->inputType == TSDB_DATA_TYPE_DOUBLE || pCtx->inputType == TSDB_DATA_TYPE_FLOAT) {
-      *pVal += GET_DOUBLE_VAL(&(pCtx->preAggVals.statis.sum));
+      *pVal += GET_DOUBLE_VAL((const char *)&(pCtx->preAggVals.statis.sum));
     }
   } else {
     void *pData = GET_INPUT_CHAR(pCtx);
@@ -3516,12 +3516,12 @@ static void spread_function(SQLFunctionCtx *pCtx) {
         pInfo->max = (double)pCtx->preAggVals.statis.max;
       }
     } else if (pCtx->inputType == TSDB_DATA_TYPE_DOUBLE || pCtx->inputType == TSDB_DATA_TYPE_FLOAT) {
-      if (pInfo->min > GET_DOUBLE_VAL(&(pCtx->preAggVals.statis.min))) {
-        pInfo->min = GET_DOUBLE_VAL(&(pCtx->preAggVals.statis.min));
+      if (pInfo->min > GET_DOUBLE_VAL((const char *)&(pCtx->preAggVals.statis.min))) {
+        pInfo->min = GET_DOUBLE_VAL((const char *)&(pCtx->preAggVals.statis.min));
       }
       
-      if (pInfo->max < GET_DOUBLE_VAL(&(pCtx->preAggVals.statis.max))) {
-        pInfo->max = GET_DOUBLE_VAL(&(pCtx->preAggVals.statis.max));
+      if (pInfo->max < GET_DOUBLE_VAL((const char *)&(pCtx->preAggVals.statis.max))) {
+        pInfo->max = GET_DOUBLE_VAL((const char *)&(pCtx->preAggVals.statis.max));
       }
     }
     

src/common/src/ttypes.c

@@ -219,7 +219,7 @@ static void getStatics_f(const TSKEY *primaryKey, const void *pData, int32_t num
     }
     
     float fv = 0;
-    fv = GET_FLOAT_VAL(&(data[i]));
+    fv = GET_FLOAT_VAL((const char*)&(data[i]));
     dsum += fv;
     if (fmin > fv) {
       fmin = fv;
@@ -233,7 +233,7 @@ static void getStatics_f(const TSKEY *primaryKey, const void *pData, int32_t num
   }
   
   double csum = 0;
-  csum = GET_DOUBLE_VAL(sum);
+  csum = GET_DOUBLE_VAL((const char *)sum);
   csum += dsum;
 
   SET_DOUBLE_VAL(sum, csum);
@@ -259,7 +259,7 @@ static void getStatics_d(const TSKEY *primaryKey, const void *pData, int32_t num
     }
     
     double dv = 0;
-    dv = GET_DOUBLE_VAL(&(data[i]));
+    dv = GET_DOUBLE_VAL((const char*)&(data[i]));
     dsum += dv;
     if (dmin > dv) {
       dmin = dv;
@@ -273,7 +273,7 @@ static void getStatics_d(const TSKEY *primaryKey, const void *pData, int32_t num
   }
   
   double csum = 0;
-  csum = GET_DOUBLE_VAL(sum);
+  csum = GET_DOUBLE_VAL((const char *)sum);
   csum += dsum;
 
   SET_DOUBLE_PTR(sum, &csum);

src/os/inc/osDir.h

@@ -20,6 +20,8 @@
 extern "C" {
 #endif
 
+#include <sys/types.h>
+
 // TAOS_OS_FUNC_DIR
 void taosRemoveDir(char *rootDir);
 int  taosMkDir(const char *pathname, mode_t mode);