Merge branch '3.0' into test/jcy

source/libs/function/src/builtinsimpl.c

@@ -1964,6 +1964,9 @@ bool histogramFunctionSetup(SqlFunctionCtx *pCtx, SResultRowEntryInfo *pResultIn
   }
   char* binDesc = varDataVal(pCtx->param[2].param.pz);
   int64_t normalized = pCtx->param[3].param.i;
+  if (normalized != 0 && normalized != 1) {
+    return false;
+  }
   if (!getHistogramBinDesc(pInfo, binDesc, binType, (bool)normalized)) {
     return false;
   }
@@ -1972,7 +1975,6 @@ bool histogramFunctionSetup(SqlFunctionCtx *pCtx, SResultRowEntryInfo *pResultIn
 }
 
 int32_t histogramFunction(SqlFunctionCtx *pCtx) {
-  int32_t numOfElems = 0;
   SHistoFuncInfo* pInfo = GET_ROWCELL_INTERBUF(GET_RES_INFO(pCtx));
 
   SInputColumnInfoData* pInput = &pCtx->input;
@@ -1983,6 +1985,8 @@ int32_t histogramFunction(SqlFunctionCtx *pCtx) {
   int32_t start = pInput->startRowIndex;
   int32_t numOfRows = pInput->numOfRows;
 
+  int32_t numOfElems = 0;
+  int32_t totalElems = 0;
   for (int32_t i = start; i < numOfRows + start; ++i) {
     if (pCol->hasNull && colDataIsNull_f(pCol->nullbitmap, i)) {
       continue;
@@ -1997,9 +2001,21 @@ int32_t histogramFunction(SqlFunctionCtx *pCtx) {
     for (int32_t k = 0; k < pInfo->numOfBins; ++k) {
       if (v > pInfo->bins[k].lower && v <= pInfo->bins[k].upper) {
         pInfo->bins[k].count++;
+        totalElems++;
         break;
       }
     }
+
+  }
+
+  if (pInfo->normalized) {
+    for (int32_t k = 0; k < pInfo->numOfBins; ++k) {
+      if(totalElems != 0) {
+        pInfo->bins[k].percentage = pInfo->bins[k].count / (double)totalElems;
+      } else {
+        pInfo->bins[k].percentage = 0;
+      }
+    }
   }
 
   SET_VAL(GET_RES_INFO(pCtx), numOfElems, pInfo->numOfBins);

source/libs/parser/src/parTranslater.c

@@ -481,6 +481,7 @@ static EDealRes translateValue(STranslateContext* pCxt, SValueNode* pVal) {
         TSDB_CODE_SUCCESS) {
       return generateDealNodeErrMsg(pCxt, TSDB_CODE_PAR_WRONG_VALUE_TYPE, pVal->literal);
     }
+    *(int64_t*)&pVal->typeData = pVal->datum.i;
   } else {
     switch (pVal->node.resType.type) {
       case TSDB_DATA_TYPE_NULL:

tests/system-test/fulltest.sh

@@ -5,6 +5,7 @@ set -x
 python3 ./test.py -f 0-others/taosShell.py
 python3 ./test.py -f 0-others/taosShellError.py
 python3 ./test.py -f 0-others/taosShellNetChk.py
+python3 ./test.py -f 0-others/telemetry.py
 
 
 #python3 ./test.py -f 2-query/between.py
@@ -33,3 +34,9 @@ python3 ./test.py -f 2-query/round.py
 python3 ./test.py -f 2-query/log.py
 python3 ./test.py -f 2-query/pow.py
 python3 ./test.py -f 2-query/sqrt.py
+python3 ./test.py -f 2-query/sin.py
+python3 ./test.py -f 2-query/cos.py
+python3 ./test.py -f 2-query/tan.py
+python3 ./test.py -f 2-query/arcsin.py
+python3 ./test.py -f 2-query/arccos.py
+python3 ./test.py -f 2-query/arctan.py
\ No newline at end of file