xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[TBASE-816]

This commit is contained in:
lihui 2019-12-31 16:39:08 +08:00
parent bcc3261776
commit ceb92c8cbe
1 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/client/src/tscFunctionImpl.c
View File

@ -3819,9 +3819,9 @@ static void getStatics_f(int64_t *primaryKey, float *data, int32_t numOfRow, dou
int16_t *minIndex, int16_t *maxIndex, int32_t *numOfNull) { int16_t *minIndex, int16_t *maxIndex, int32_t *numOfNull) {
float fmin = DBL_MAX; float fmin = DBL_MAX;
float fmax = -DBL_MAX; float fmax = -DBL_MAX;
float fminIndex = 0;
float fmaxIndex = 0;
double dsum = 0; double dsum = 0;
*minIndex = 0;
*maxIndex = 0;
assert(numOfRow <= INT16_MAX); assert(numOfRow <= INT16_MAX);
@ -3832,18 +3832,16 @@ static void getStatics_f(int64_t *primaryKey, float *data, int32_t numOfRow, dou
} }
float fv = 0; float fv = 0;
*(int32_t*)(&fv) = *(int32_t*)(&(data[i])); fv = GET_FLOAT_VAL(&(data[i]));
//*sum += data[i];
dsum += fv; dsum += fv;
if (fmin > fv) { if (fmin > fv) {
fmin = fv; fmin = fv;
fminIndex = i; minIndex = i;
} }
if (fmax < fv) { if (fmax < fv) {
fmax = fv; fmax = fv;
fmaxIndex = i; maxIndex = i;
} }
// if (isNull(&lastVal, TSDB_DATA_TYPE_FLOAT)) { // if (isNull(&lastVal, TSDB_DATA_TYPE_FLOAT)) {
@ -3857,24 +3855,26 @@ static void getStatics_f(int64_t *primaryKey, float *data, int32_t numOfRow, dou
} }
double csum = 0; double csum = 0;
*(int64_t*)(&csum) = *(int64_t*)sum; csum = GET_DOUBLE_VAL(sum);
csum += dsum; csum += dsum;
*(int64_t*)(sum) = *(int64_t*)(&csum); #ifdef _TD_ARM_32_
SET_DOUBLE_VAL_ALIGN(sum, &csum);
*(int32_t*)max = *(int32_t*)(&fmax); SET_DOUBLE_VAL_ALIGN(max, &fmax);
*(int32_t*)min = *(int32_t*)(&fmin); SET_DOUBLE_VAL_ALIGN(min, &fmin);
*(int32_t*)minIndex = *(int32_t*)(&fminIndex); #else
*(int32_t*)maxIndex = *(int32_t*)(&fmaxIndex); *sum = csum;
*max = fmax;
*min = fmin;
#endif
} }
static void getStatics_d(int64_t *primaryKey, double *data, int32_t numOfRow, double *min, double *max, double *sum, static void getStatics_d(int64_t *primaryKey, double *data, int32_t numOfRow, double *min, double *max, double *sum,
int16_t *minIndex, int16_t *maxIndex, int32_t *numOfNull) { int16_t *minIndex, int16_t *maxIndex, int32_t *numOfNull) {
double dmin = DBL_MAX; double dmin = DBL_MAX;
double dmax = -DBL_MAX; double dmax = -DBL_MAX;
double dminIndex = 0;
double dmaxIndex = 0;
double dsum = 0; double dsum = 0;
*minIndex = 0;
*maxIndex = 0;
assert(numOfRow <= INT16_MAX); assert(numOfRow <= INT16_MAX);
@ -3885,18 +3885,16 @@ static void getStatics_d(int64_t *primaryKey, double *data, int32_t numOfRow, do
} }
double dv = 0; double dv = 0;
*(int64_t*)(&dv) = *(int64_t*)(&(data[i])); dv = GET_DOUBLE_VAL(&(data[i]));
//*sum += data[i];
dsum += dv; dsum += dv;
if (dmin > dv) { if (dmin > dv) {
dmin = dv; dmin = dv;
dminIndex = i; minIndex = i;
} }
if (dmax < dv) { if (dmax < dv) {
dmax = dv; dmax = dv;
dmaxIndex = i; maxIndex = i;
} }
// if (isNull(&lastVal, TSDB_DATA_TYPE_DOUBLE)) { // if (isNull(&lastVal, TSDB_DATA_TYPE_DOUBLE)) {
@ -3910,14 +3908,19 @@ static void getStatics_d(int64_t *primaryKey, double *data, int32_t numOfRow, do
} }
double csum = 0; double csum = 0;
*(int64_t*)(&csum) = *(int64_t*)sum; csum = GET_DOUBLE_VAL(sum);
csum += dsum; csum += dsum;
*(int64_t*)(sum) = *(int64_t*)(&csum);
*(int64_t*)max = *(int64_t*)(&dmax);
*(int64_t*)min = *(int64_t*)(&dmin); #ifdef _TD_ARM_32_
*(int64_t*)minIndex = *(int64_t*)(&dminIndex); SET_DOUBLE_VAL_ALIGN(sum, &csum);
*(int64_t*)maxIndex = *(int64_t*)(&dmaxIndex); SET_DOUBLE_VAL_ALIGN(max, &dmax);
SET_DOUBLE_VAL_ALIGN(min, &dmin);
#else
*sum = csum;
*max = dmax;
*min = dmin;
#endif
} }
void getStatistics(char *priData, char *data, int32_t size, int32_t numOfRow, int32_t type, int64_t *min, int64_t *max, void getStatistics(char *priData, char *data, int32_t size, int32_t numOfRow, int32_t type, int64_t *min, int64_t *max,