From 9ff439408b507c2462e4842b43c48ed663fa88be Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Tue, 1 Sep 2020 13:25:53 +0800 Subject: [PATCH] compile in windows --- src/client/src/tscStream.c | 2 +- src/common/src/tname.c | 6 +++--- src/query/src/qExecutor.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/client/src/tscStream.c b/src/client/src/tscStream.c index ea979bfae3..79e0011093 100644 --- a/src/client/src/tscStream.c +++ b/src/client/src/tscStream.c @@ -325,7 +325,7 @@ static int64_t getLaunchTimeDelay(const SSqlStream* pStream) { int64_t delayDelta = maxDelay; if (pStream->intervalTimeUnit != 'n' && pStream->intervalTimeUnit != 'y') { - delayDelta = pStream->slidingTime * tsStreamComputDelayRatio; + delayDelta = (int64_t)(pStream->slidingTime * tsStreamComputDelayRatio); if (delayDelta > maxDelay) { delayDelta = maxDelay; } diff --git a/src/common/src/tname.c b/src/common/src/tname.c index 248c996999..0b3978a282 100644 --- a/src/common/src/tname.c +++ b/src/common/src/tname.c @@ -114,7 +114,7 @@ int64_t taosAddNatualInterval(int64_t key, int64_t intervalTime, char timeUnit, intervalTime *= 12; } - int mon = tm.tm_year * 12 + tm.tm_mon + intervalTime; + int mon = (int)(tm.tm_year * 12 + tm.tm_mon + intervalTime); tm.tm_year = mon / 12; tm.tm_mon = mon % 12; @@ -176,10 +176,10 @@ int64_t taosGetIntervalStartTimestamp(int64_t startTime, int64_t slidingTime, in if (timeUnit == 'y') { tm.tm_mon = 0; - tm.tm_year = tm.tm_year / slidingTime * slidingTime; + tm.tm_year = (int)(tm.tm_year / slidingTime * slidingTime); } else { int mon = tm.tm_year * 12 + tm.tm_mon; - mon = mon / slidingTime * slidingTime; + mon = (int)(mon / slidingTime * slidingTime); tm.tm_year = mon / 12; tm.tm_mon = mon % 12; } diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c index f213486b24..ee4cd33896 100644 --- a/src/query/src/qExecutor.c +++ b/src/query/src/qExecutor.c @@ -155,12 +155,12 @@ static void getNextTimeWindow(SQuery* pQuery, STimeWindow* tw) { time_t t = (time_t)key; localtime_r(&t, &tm); - int mon = tm.tm_year * 12 + tm.tm_mon + interval * factor; + int mon = (int)(tm.tm_year * 12 + tm.tm_mon + interval * factor); tm.tm_year = mon / 12; tm.tm_mon = mon % 12; tw->skey = mktime(&tm) * 1000L; - mon += interval; + mon = (int)(mon + interval); tm.tm_year = mon / 12; tm.tm_mon = mon % 12; tw->ekey = mktime(&tm) * 1000L; -- GitLab