Merge pull request #11469 from taosdata/feature/TD-14243

refactor(query): add TK_TODAY in keyword hashtable

include/common/ttokendef.h

@@ -182,47 +182,48 @@
 #define TK_FIRST                          164
 #define TK_LAST                           165
 #define TK_NOW                            166
-#define TK_ROWTS                          167
-#define TK_TBNAME                         168
-#define TK_QSTARTTS                       169
-#define TK_QENDTS                         170
-#define TK_WSTARTTS                       171
-#define TK_WENDTS                         172
-#define TK_WDURATION                      173
-#define TK_BETWEEN                        174
-#define TK_IS                             175
-#define TK_NK_LT                          176
-#define TK_NK_GT                          177
-#define TK_NK_LE                          178
-#define TK_NK_GE                          179
-#define TK_NK_NE                          180
-#define TK_MATCH                          181
-#define TK_NMATCH                         182
-#define TK_JOIN                           183
-#define TK_INNER                          184
-#define TK_SELECT                         185
-#define TK_DISTINCT                       186
-#define TK_WHERE                          187
-#define TK_PARTITION                      188
-#define TK_BY                             189
-#define TK_SESSION                        190
-#define TK_STATE_WINDOW                   191
-#define TK_SLIDING                        192
-#define TK_FILL                           193
-#define TK_VALUE                          194
-#define TK_NONE                           195
-#define TK_PREV                           196
-#define TK_LINEAR                         197
-#define TK_NEXT                           198
-#define TK_GROUP                          199
-#define TK_HAVING                         200
-#define TK_ORDER                          201
-#define TK_SLIMIT                         202
-#define TK_SOFFSET                        203
-#define TK_LIMIT                          204
-#define TK_OFFSET                         205
-#define TK_ASC                            206
-#define TK_NULLS                          207
+#define TK_TODAY                          167
+#define TK_ROWTS                          168
+#define TK_TBNAME                         169
+#define TK_QSTARTTS                       170
+#define TK_QENDTS                         171
+#define TK_WSTARTTS                       172
+#define TK_WENDTS                         173
+#define TK_WDURATION                      174
+#define TK_BETWEEN                        175
+#define TK_IS                             176
+#define TK_NK_LT                          177
+#define TK_NK_GT                          178
+#define TK_NK_LE                          179
+#define TK_NK_GE                          180
+#define TK_NK_NE                          181
+#define TK_MATCH                          182
+#define TK_NMATCH                         183
+#define TK_JOIN                           184
+#define TK_INNER                          185
+#define TK_SELECT                         186
+#define TK_DISTINCT                       187
+#define TK_WHERE                          188
+#define TK_PARTITION                      189
+#define TK_BY                             190
+#define TK_SESSION                        191
+#define TK_STATE_WINDOW                   192
+#define TK_SLIDING                        193
+#define TK_FILL                           194
+#define TK_VALUE                          195
+#define TK_NONE                           196
+#define TK_PREV                           197
+#define TK_LINEAR                         198
+#define TK_NEXT                           199
+#define TK_GROUP                          200
+#define TK_HAVING                         201
+#define TK_ORDER                          202
+#define TK_SLIMIT                         203
+#define TK_SOFFSET                        204
+#define TK_LIMIT                          205
+#define TK_OFFSET                         206
+#define TK_ASC                            207
+#define TK_NULLS                          208
 
 #define TK_NK_SPACE                       300
 #define TK_NK_COMMENT                     301

source/libs/parser/inc/sql.y

@@ -588,6 +588,7 @@ column_reference(A) ::= column_name(B).
 column_reference(A) ::= table_name(B) NK_DOT column_name(C).                      { A = createRawExprNodeExt(pCxt, &B, &C, createColumnNode(pCxt, &B, &C)); }
 
 pseudo_column(A) ::=  NOW(B).                                                     { A = createRawExprNode(pCxt, &B, createFunctionNode(pCxt, &B, NULL)); }
+pseudo_column(A) ::=  TODAY(B).                                                   { A = createRawExprNode(pCxt, &B, createFunctionNode(pCxt, &B, NULL)); }
 pseudo_column(A) ::=  ROWTS(B).                                                   { A = createRawExprNode(pCxt, &B, createFunctionNode(pCxt, &B, NULL)); }
 pseudo_column(A) ::=  TBNAME(B).                                                  { A = createRawExprNode(pCxt, &B, createFunctionNode(pCxt, &B, NULL)); }
 pseudo_column(A) ::=  QSTARTTS(B).                                                { A = createRawExprNode(pCxt, &B, createFunctionNode(pCxt, &B, NULL)); }

source/libs/parser/src/parTokenizer.c

@@ -175,6 +175,7 @@ static SKeyword keywordTable[] = {
     {"TBNAME",        TK_TBNAME},
     {"TIMESTAMP",     TK_TIMESTAMP},
     {"TINYINT",       TK_TINYINT},
+    {"TODAY",         TK_TODAY},
     {"TOPIC",         TK_TOPIC},
     {"TOPICS",        TK_TOPICS},
     {"TSERIES",       TK_TSERIES},