From b2610da03c5edd75b78c9fe4593a9b9611ba3a15 Mon Sep 17 00:00:00 2001
From: t_max <1172915550@qq.com>
Date: Thu, 9 Mar 2023 14:29:05 +0800
Subject: [PATCH] fix: TIMETRUNCATE with 1d return unexpected result

---
 source/libs/scalar/src/sclfunc.c | 10 +++++-----
 source/os/src/osRand.c           | 10 +++++++++-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/source/libs/scalar/src/sclfunc.c b/source/libs/scalar/src/sclfunc.c
index f4c3669574..195a08525c 100644
--- a/source/libs/scalar/src/sclfunc.c
+++ b/source/libs/scalar/src/sclfunc.c
@@ -1055,9 +1055,9 @@ int32_t toISO8601Function(SScalarParam *pInput, int32_t inputNum, SScalarParam *
       if (tsDigits == TSDB_TIME_PRECISION_MILLI_DIGITS) {
         timeVal = timeVal / 1000;
       } else if (tsDigits == TSDB_TIME_PRECISION_MICRO_DIGITS) {
-        timeVal = timeVal / (1000 * 1000);
+         timeVal = timeVal / ((int64_t)(1000 * 1000));
       } else if (tsDigits == TSDB_TIME_PRECISION_NANO_DIGITS) {
-        timeVal = timeVal / (1000 * 1000 * 1000);
+         timeVal = timeVal / ((int64_t)(1000 * 1000 * 1000));
       } else {
         colDataSetNULL(pOutput->columnData, i);
         continue;
@@ -1317,19 +1317,19 @@ int32_t timeTruncateFunction(SScalarParam *pInput, int32_t inputNum, SScalarPara
       case 86400000: { /* 1d */
         if (tsDigits == TSDB_TIME_PRECISION_MILLI_DIGITS) {
           if (ignoreTz) {
-            timeVal = timeVal - (timeVal + offsetFromTz(timezone, 1000)) % (86400L * 1000);
+            timeVal = timeVal - (timeVal + offsetFromTz(timezone, 1000)) % (((int64_t)86400) * 1000);
           } else {
             timeVal = timeVal / 1000 / 86400 * 86400 * 1000;
           }
         } else if (tsDigits == TSDB_TIME_PRECISION_MICRO_DIGITS) {
           if (ignoreTz) {
-            timeVal = timeVal - (timeVal + offsetFromTz(timezone, 1000000)) % (86400L * 1000000);
+            timeVal = timeVal - (timeVal + offsetFromTz(timezone, 1000000)) % (((int64_t)86400) * 1000000);
           } else {
             timeVal = timeVal / 1000000 / 86400 * 86400 * 1000000;
           }
         } else if (tsDigits == TSDB_TIME_PRECISION_NANO_DIGITS) {
           if (ignoreTz) {
-            timeVal = timeVal - (timeVal + offsetFromTz(timezone, 1000000000)) % (86400L * 1000000000);
+            timeVal = timeVal - (timeVal + offsetFromTz(timezone, 1000000000)) % (((int64_t)86400) * 1000000000);
           } else {
             timeVal = timeVal / 1000000000 / 86400 * 86400 * 1000000000;
           }
diff --git a/source/os/src/osRand.c b/source/os/src/osRand.c
index 4998eb45a4..83c36a422d 100644
--- a/source/os/src/osRand.c
+++ b/source/os/src/osRand.c
@@ -25,7 +25,15 @@
 
 void taosSeedRand(uint32_t seed) { return srand(seed); }
 
-uint32_t taosRand(void) { return rand(); }
+uint32_t taosRand(void) {
+#ifdef WINDOWS
+    unsigned int pSeed;
+    rand_s(&pSeed);
+    return pSeed;
+#else
+    return rand();
+#endif
+}
 
 uint32_t taosRandR(uint32_t* pSeed) {
 #ifdef WINDOWS
-- 
GitLab