From fffcab686072eb3e8a7b16d31b140ad25209695a Mon Sep 17 00:00:00 2001 From: Ganlin Zhao Date: Tue, 8 Feb 2022 14:29:41 +0800 Subject: [PATCH] [TD-11220](query): time related functions --- src/common/src/texpr.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/common/src/texpr.c b/src/common/src/texpr.c index b5ed3e0bf9..03e2b8d368 100644 --- a/src/common/src/texpr.c +++ b/src/common/src/texpr.c @@ -1443,6 +1443,7 @@ int32_t exprValidateTimeNode(char *msgbuf, tExprNode *pExpr) { child[i]->resultType != TSDB_DATA_TYPE_NCHAR) { return TSDB_CODE_TSC_INVALID_OPERATION; } + if (child[i]->nodeType == TSQL_NODE_VALUE) { /* datetime format or epoch */ if (child[i]->pVal->nType != TSDB_DATA_TYPE_BIGINT && child[i]->pVal->nType != TSDB_DATA_TYPE_BINARY && @@ -1467,12 +1468,8 @@ int32_t exprValidateTimeNode(char *msgbuf, tExprNode *pExpr) { } else { return TSDB_CODE_TSC_INVALID_OPERATION; } - - if (child[i]->nodeType != TSQL_NODE_VALUE && - child[i]->pVal->nType != TSDB_DATA_TYPE_TIMESTAMP) { - return TSDB_CODE_TSC_INVALID_OPERATION; - } } + //time unit if (pExpr->_func.numChildren == 3) { if (child[2]->nodeType != TSQL_NODE_VALUE && -- GitLab