From e0f77e2db2a036f8959366bc7ca7b45a08a6a690 Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Tue, 8 Feb 2022 14:29:41 +0800
Subject: [PATCH] [TD-11220]<feature>(query): time related functions

---
 src/common/src/texpr.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/common/src/texpr.c b/src/common/src/texpr.c
index 512451affe..3d47fbeb94 100644
--- a/src/common/src/texpr.c
+++ b/src/common/src/texpr.c
@@ -1191,8 +1191,13 @@ int32_t exprValidateTimeNode(tExprNode *pExpr) {
         return TSDB_CODE_TSC_OUT_OF_MEMORY;
       }
       child->pVal->nType = TSDB_DATA_TYPE_TIMESTAMP;
-      int64_t timeValSec = taosGetTimestampToday() * 1000;
-      child->pVal->i64 = convertTimePrecision(timeValSec, TSDB_TIME_PRECISION_MILLI, pExpr->_func.precision);
+      int64_t timeValMs;
+      if (pExpr->_func.functionId == TSDB_FUNC_SCALAR_NOW) {
+        timeValMs = taosGetTimestampMs();
+      } else {
+        timeValMs = taosGetTimestampToday() * 1000;
+      }
+      child->pVal->i64 = convertTimePrecision(timeValMs, TSDB_TIME_PRECISION_MILLI, pExpr->_func.precision);
       pExpr->resultType  = TSDB_DATA_TYPE_TIMESTAMP;
       pExpr->resultBytes = (int16_t)tDataTypes[pExpr->resultType].bytes;
       break;
-- 
GitLab