From 21e3c0ce78e9a8408bdb6ec416d0f5bdb2bcb6ae Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Tue, 24 May 2022 10:41:11 +0800
Subject: [PATCH] fix: fix windows compilation error

---
 source/libs/function/src/builtinsimpl.c |  2 +-
 source/util/src/tdigest.c               | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c
index e904ac62de..fd8b2c68f1 100644
--- a/source/libs/function/src/builtinsimpl.c
+++ b/source/libs/function/src/builtinsimpl.c
@@ -1808,7 +1808,7 @@ int32_t percentileFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
 bool getApercentileFuncEnv(SFunctionNode* pFunc, SFuncExecEnv* pEnv) {
   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));
-  pEnv->calcMemSize = MAX(bytesHist, bytesDigest);
+  pEnv->calcMemSize = TMAX(bytesHist, bytesDigest);
   return true;
 }
 
diff --git a/source/util/src/tdigest.c b/source/util/src/tdigest.c
index 0e1dcbe29f..56b113fd8f 100644
--- a/source/util/src/tdigest.c
+++ b/source/util/src/tdigest.c
@@ -97,8 +97,8 @@ static void mergeCentroid(SMergeArgs *args, SCentroid *merge) {
         c->mean += (merge->mean - c->mean) * merge->weight / c->weight;
 
         if (merge->weight > 0) {
-            args->min = MIN(merge->mean, args->min);
-            args->max = MAX(merge->mean, args->max);
+            args->min = TMIN(merge->mean, args->min);
+            args->max = TMAX(merge->mean, args->max);
         }
     }
 }
@@ -162,12 +162,12 @@ void tdigestCompress(TDigest *t) {
     }
 
     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) {
             args.idx--;
         }
         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);
@@ -234,7 +234,7 @@ double tdigestCDF(TDigest *t, double x) {
                     + a->weight
                     * INTERPOLATE(x, a->mean - left, a->mean + right))
                     / t->total_weight;
-            return MAX(cdf, 0.0);
+            return TMAX(cdf, 0.0);
         }
 
         weight_so_far += a->weight;
-- 
GitLab