Merge branch '3.0' into enh/TD-17659
This commit is contained in:
parent
63d8057ade
commit
c0091afb01
|
@ -662,7 +662,7 @@ int32_t sumFunction(SqlFunctionCtx* pCtx) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// check for overflow
|
// check for overflow
|
||||||
if (numOfElem == 0 || (IS_FLOAT_TYPE(type) && (isinf(pSumRes->dsum) || isnan(pSumRes->dsum)))) {
|
if (IS_FLOAT_TYPE(type) && (isinf(pSumRes->dsum) || isnan(pSumRes->dsum))) {
|
||||||
GET_RES_INFO(pCtx)->isNullRes = 1;
|
GET_RES_INFO(pCtx)->isNullRes = 1;
|
||||||
numOfElem = 1;
|
numOfElem = 1;
|
||||||
}
|
}
|
||||||
|
@ -1577,11 +1577,6 @@ int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (numOfElems == 0) {
|
|
||||||
GET_RES_INFO(pCtx)->isNullRes = 1;
|
|
||||||
numOfElems = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
_min_max_over:
|
_min_max_over:
|
||||||
return numOfElems;
|
return numOfElems;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue