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

fix: fix windows compilation error

This commit is contained in:
Ganlin Zhao 2022-05-24 10:41:11 +08:00
parent 011bd32330
commit 21e3c0ce78
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/libs/function/src/builtinsimpl.c
View File

@ -1808,7 +1808,7 @@ int32_t percentileFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
bool getApercentileFuncEnv(SFunctionNode* pFunc, SFuncExecEnv* pEnv) { bool getApercentileFuncEnv(SFunctionNode* pFunc, SFuncExecEnv* pEnv) {
int32_t bytesHist = (int32_t)(sizeof(SAPercentileInfo) + sizeof(SHistogramInfo) + sizeof(SHistBin) * (MAX_HISTOGRAM_BIN + 1)); int32_t bytesHist = (int32_t)(sizeof(SAPercentileInfo) + sizeof(SHistogramInfo) + sizeof(SHistBin) * (MAX_HISTOGRAM_BIN + 1));
int32_t bytesDigest = (int32_t)(sizeof(SAPercentileInfo) + TDIGEST_SIZE(COMPRESSION)); int32_t bytesDigest = (int32_t)(sizeof(SAPercentileInfo) + TDIGEST_SIZE(COMPRESSION));
pEnv->calcMemSize = MAX(bytesHist, bytesDigest); pEnv->calcMemSize = TMAX(bytesHist, bytesDigest);
return true; return true;
} }

10
source/util/src/tdigest.c
View File

@ -97,8 +97,8 @@ static void mergeCentroid(SMergeArgs *args, SCentroid *merge) {
c->mean += (merge->mean - c->mean) * merge->weight / c->weight; c->mean += (merge->mean - c->mean) * merge->weight / c->weight;
if (merge->weight > 0) { if (merge->weight > 0) {
args->min = MIN(merge->mean, args->min); args->min = TMIN(merge->mean, args->min);
args->max = MAX(merge->mean, args->max); args->max = TMAX(merge->mean, args->max);
} }
} }
} }
@ -162,12 +162,12 @@ void tdigestCompress(TDigest *t) {
} }
if (t->total_weight > 0) { if (t->total_weight > 0) {
t->min = MIN(t->min, args.min); t->min = TMIN(t->min, args.min);
if (args.centroids[args.idx].weight <= 0) { if (args.centroids[args.idx].weight <= 0) {
args.idx--; args.idx--;
} }
t->num_centroids = args.idx + 1; t->num_centroids = args.idx + 1;
t->max = MAX(t->max, args.max); t->max = TMAX(t->max, args.max);
} }
memcpy(t->centroids, args.centroids, sizeof(SCentroid) * t->num_centroids); memcpy(t->centroids, args.centroids, sizeof(SCentroid) * t->num_centroids);
@ -234,7 +234,7 @@ double tdigestCDF(TDigest *t, double x) {
+ a->weight + a->weight
* INTERPOLATE(x, a->mean - left, a->mean + right)) * INTERPOLATE(x, a->mean - left, a->mean + right))
/ t->total_weight; / t->total_weight;
return MAX(cdf, 0.0); return TMAX(cdf, 0.0);
} }
weight_so_far += a->weight; weight_so_far += a->weight;