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

fix(query): fixed avg function sum over range

This commit is contained in:
Alex Duan 2022-12-14 20:29:58 +08:00
parent 473338cf86
commit a4e0bbd34f
2 changed files with 93 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/libs/function/inc/builtinsimpl.h
View File

@ -32,6 +32,7 @@ typedef struct SSumRes {
int16_t type; int16_t type;
int64_t prevTs; int64_t prevTs;
bool isPrevTsSet; bool isPrevTsSet;
bool overflow; // if overflow is true, dsum to be used for any type;
} SSumRes; } SSumRes;
typedef struct SMinmaxResInfo { typedef struct SMinmaxResInfo {

90
source/libs/function/src/detail/tavgfunction.c
View File

@ -373,8 +373,17 @@ static int32_t doAddNumericVector(SColumnInfoData* pCol, int32_t type, SInputCol
numOfElems += 1; numOfElems += 1;
pRes->count += 1; pRes->count += 1;
// check overflow for int
if(pRes->sum.isum > 0 && plist[i] > 0 && INT64_MAX - pRes->sum.isum <= plist[i] ||
pRes->sum.isum < 0 && plist[i] < 0 && INT64_MIN - pRes->sum.isum >= plist[i] ) {
double dsum = (double) pAvgRes->sum.isum;
pRes->sum.overflow = true;
pRes->sum.dsum = dsum + plist[i];
} else {
pRes->sum.isum += plist[i]; pRes->sum.isum += plist[i];
} }
}
break; break;
} }
@ -388,8 +397,17 @@ static int32_t doAddNumericVector(SColumnInfoData* pCol, int32_t type, SInputCol
numOfElems += 1; numOfElems += 1;
pRes->count += 1; pRes->count += 1;
// check overflow
if(pRes->sum.isum > 0 && plist[i] > 0 && INT64_MAX - pRes->sum.isum <= plist[i] ||
pRes->sum.isum < 0 && plist[i] < 0 && INT64_MIN - pRes->sum.isum >= plist[i] ) {
double dsum = (double) pAvgRes->sum.isum;
pRes->sum.overflow = true;
pRes->sum.dsum = dsum + plist[i];
} else {
pRes->sum.isum += plist[i]; pRes->sum.isum += plist[i];
} }
}
break; break;
} }
@ -431,7 +449,16 @@ static int32_t doAddNumericVector(SColumnInfoData* pCol, int32_t type, SInputCol
numOfElems += 1; numOfElems += 1;
pRes->count += 1; pRes->count += 1;
pRes->sum.usum += plist[i];
// check overflow
if(UINT64_MAX - pRes->sum.usum <= plist[i] ) {
double dsum = (double) pRes->sum.isum;
pRes->sum.overflow = true;
pRes->sum.dsum = dsum + plist[i];
} else {
pRes->sum.usum += (uint32_t)plist[i];
}
} }
break; break;
@ -446,7 +473,15 @@ static int32_t doAddNumericVector(SColumnInfoData* pCol, int32_t type, SInputCol
numOfElems += 1; numOfElems += 1;
pRes->count += 1; pRes->count += 1;
pRes->sum.usum += plist[i];
// check overflow
if(UINT64_MAX - pRes->sum.usum <= plist[i] ) {
double dsum = (double) pRes->sum.isum;
pRes->sum.overflow = true;
pRes->sum.dsum = dsum + plist[i];
} else {
pRes->sum.usum += (uint64_t)plist[i];
}
} }
break; break;
} }
@ -565,12 +600,27 @@ int32_t avgFunction(SqlFunctionCtx* pCtx) {
} else { } else {
for (int32_t i = pInput->startRowIndex; i < pInput->numOfRows + pInput->startRowIndex; ++i) { for (int32_t i = pInput->startRowIndex; i < pInput->numOfRows + pInput->startRowIndex; ++i) {
if (type == TSDB_DATA_TYPE_INT) { if (type == TSDB_DATA_TYPE_INT) {
// check overflow for int
if(pAvgRes->sum.isum > 0 && plist[i] > 0 && INT64_MAX - pAvgRes->sum.isum <= plist[i] ||
pAvgRes->sum.isum < 0 && plist[i] < 0 && INT64_MIN - pAvgRes->sum.isum >= plist[i] ) {
double dsum = (double) pAvgRes->sum.isum;
pAvgRes->sum.overflow = true;
pAvgRes->sum.dsum = dsum + plist[i];
} else {
pAvgRes->sum.isum += plist[i]; pAvgRes->sum.isum += plist[i];
}
} else {
// check overflow for uint
if(UINT64_MAX - pAvgRes->sum.usum <= plist[i] ) {
double dsum = (double) pAvgRes->sum.isum;
pAvgRes->sum.overflow = true;
pAvgRes->sum.dsum = dsum + plist[i];
} else { } else {
pAvgRes->sum.usum += (uint32_t)plist[i]; pAvgRes->sum.usum += (uint32_t)plist[i];
} }
} }
} }
}
break; break;
} }
@ -584,12 +634,27 @@ int32_t avgFunction(SqlFunctionCtx* pCtx) {
} else { } else {
for (int32_t i = pInput->startRowIndex; i < pInput->numOfRows + pInput->startRowIndex; ++i) { for (int32_t i = pInput->startRowIndex; i < pInput->numOfRows + pInput->startRowIndex; ++i) {
if (type == TSDB_DATA_TYPE_BIGINT) { if (type == TSDB_DATA_TYPE_BIGINT) {
// check overflow for int
if(pAvgRes->sum.isum > 0 && plist[i] > 0 && INT64_MAX - pAvgRes->sum.isum <= plist[i] ||
pAvgRes->sum.isum < 0 && plist[i] < 0 && INT64_MIN - pAvgRes->sum.isum >= plist[i] ) {
double dsum = (double) pAvgRes->sum.isum;
pAvgRes->sum.overflow = true;
pAvgRes->sum.dsum = dsum + plist[i];
} else {
pAvgRes->sum.isum += plist[i]; pAvgRes->sum.isum += plist[i];
}
} else {
// check overflow for uint
if(UINT64_MAX - pAvgRes->sum.usum <= plist[i] ) {
double dsum = (double) pAvgRes->sum.isum;
pAvgRes->sum.overflow = true;
pAvgRes->sum.dsum = dsum + plist[i];
} else { } else {
pAvgRes->sum.usum += (uint64_t)plist[i]; pAvgRes->sum.usum += (uint64_t)plist[i];
} }
} }
} }
}
break; break;
} }
@ -639,9 +704,26 @@ static void avgTransferInfo(SAvgRes* pInput, SAvgRes* pOutput) {
pOutput->type = pInput->type; pOutput->type = pInput->type;
if (IS_SIGNED_NUMERIC_TYPE(pOutput->type)) { if (IS_SIGNED_NUMERIC_TYPE(pOutput->type)) {
pOutput->sum.isum += pInput->sum.isum; int64_t val = pInput->sum.isum;
// check overflow
if(pOutput->sum.isum > 0 && val > 0 && INT64_MAX - pOutput->sum.isum <= val ||
pOutput->sum.isum < 0 && val < 0 && INT64_MIN - pOutput->sum.isum >= val ) {
double dsum = (double) pOutput->sum.isum;
pOutput->sum.overflow = true;
pOutput->sum.dsum = dsum + val;
} else {
pOutput->sum.isum += val;
}
} else if (IS_UNSIGNED_NUMERIC_TYPE(pOutput->type)) { } else if (IS_UNSIGNED_NUMERIC_TYPE(pOutput->type)) {
pOutput->sum.usum += pInput->sum.usum; // check overflow
uint64_t val = pInput->sum.usum;
if(UINT64_MAX - pOutput->sum.usum <= val ) {
double dsum = (double) pOutput->sum.isum;
pOutput->sum.overflow = true;
pOutput->sum.dsum = dsum + val;
} else {
pOutput->sum.usum += val;
}
} else { } else {
pOutput->sum.dsum += pInput->sum.dsum; pOutput->sum.dsum += pInput->sum.dsum;
} }