From e7602415aa84c027b7874845847c1aadfa65953a 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/inc/texpr.h | 3 ++- src/common/src/texpr.c | 14 +++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/common/inc/texpr.h b/src/common/inc/texpr.h index 7756aa7b11..fe7b1c1bd5 100644 --- a/src/common/inc/texpr.h +++ b/src/common/inc/texpr.h @@ -69,7 +69,8 @@ struct SSchema; #define TSDB_FUNC_SCALAR_TODAY (TSDB_FUNC_FLAG_SCALAR | 0x0013) #define TSDB_FUNC_SCALAR_TIMEZONE (TSDB_FUNC_FLAG_SCALAR | 0x0014) #define TSDB_FUNC_SCALAR_TO_ISO8601 (TSDB_FUNC_FLAG_SCALAR | 0x0015) -#define TSDB_FUNC_SCALAR_MAX_NUM 22 +#define TSDB_FUNC_SCALAR_TO_UNIXTIMESTAMP (TSDB_FUNC_FLAG_SCALAR | 0x0016) +#define TSDB_FUNC_SCALAR_MAX_NUM 23 #define TSDB_FUNC_SCALAR_NAME_MAX_LEN 16 diff --git a/src/common/src/texpr.c b/src/common/src/texpr.c index 188e734ca6..297841afed 100644 --- a/src/common/src/texpr.c +++ b/src/common/src/texpr.c @@ -82,7 +82,8 @@ int32_t exprTreeValidateFunctionNode(char* msgbuf, tExprNode *pExpr) { case TSDB_FUNC_SCALAR_NOW: case TSDB_FUNC_SCALAR_TODAY: case TSDB_FUNC_SCALAR_TIMEZONE: - case TSDB_FUNC_SCALAR_TO_ISO8601: { + case TSDB_FUNC_SCALAR_TO_ISO8601: + case TSDB_FUNC_SCALAR_TO_UNIXTIMESTAMP: { return exprValidateTimeNode(msgbuf, pExpr); } @@ -1308,6 +1309,9 @@ int32_t exprValidateTimeNode(char *msgbuf, tExprNode *pExpr) { break; } + case TSDB_FUNC_SCALAR_TO_UNIXTIMESTAMP: { + break; + } default: { assert(false); break; @@ -1880,6 +1884,9 @@ void vectorTimeFunc(int16_t functionId, tExprOperandInfo *pInputs, int32_t numIn break; } + case TSDB_FUNC_SCALAR_TO_UNIXTIMESTAMP: { + break; + } default: { assert(false); break; @@ -2008,4 +2015,9 @@ tScalarFunctionInfo aScalarFunctions[] = { "to_iso8601", vectorTimeFunc }, + { + TSDB_FUNC_SCALAR_TO_UNIXTIMESTAMP, + "to_unixtimestamp", + vectorTimeFunc + }, }; -- GitLab