Merge pull request #17309 from taosdata/fix/3.0_bugfix_wxy

fix: some problems of parser

include/common/ttokendef.h

@@ -152,166 +152,166 @@
 #define TK_TABLES               134
 #define TK_STABLES              135
 #define TK_MNODES               136
-#define TK_MODULES              137
-#define TK_QNODES               138
-#define TK_FUNCTIONS            139
-#define TK_INDEXES              140
-#define TK_ACCOUNTS             141
-#define TK_APPS                 142
-#define TK_CONNECTIONS          143
-#define TK_LICENCES             144
-#define TK_GRANTS               145
-#define TK_QUERIES              146
-#define TK_SCORES               147
-#define TK_TOPICS               148
-#define TK_VARIABLES            149
-#define TK_BNODES               150
-#define TK_SNODES               151
-#define TK_CLUSTER              152
-#define TK_TRANSACTIONS         153
-#define TK_DISTRIBUTED          154
-#define TK_CONSUMERS            155
-#define TK_SUBSCRIPTIONS        156
-#define TK_VNODES               157
-#define TK_LIKE                 158
-#define TK_INDEX                159
-#define TK_FUNCTION             160
-#define TK_INTERVAL             161
-#define TK_TOPIC                162
-#define TK_AS                   163
-#define TK_WITH                 164
-#define TK_META                 165
-#define TK_CONSUMER             166
-#define TK_GROUP                167
-#define TK_DESC                 168
-#define TK_DESCRIBE             169
-#define TK_RESET                170
-#define TK_QUERY                171
-#define TK_CACHE                172
-#define TK_EXPLAIN              173
-#define TK_ANALYZE              174
-#define TK_VERBOSE              175
-#define TK_NK_BOOL              176
-#define TK_RATIO                177
-#define TK_NK_FLOAT             178
-#define TK_OUTPUTTYPE           179
-#define TK_AGGREGATE            180
-#define TK_BUFSIZE              181
-#define TK_STREAM               182
-#define TK_INTO                 183
-#define TK_TRIGGER              184
-#define TK_AT_ONCE              185
-#define TK_WINDOW_CLOSE         186
-#define TK_IGNORE               187
-#define TK_EXPIRED              188
-#define TK_SUBTABLE             189
-#define TK_KILL                 190
-#define TK_CONNECTION           191
-#define TK_TRANSACTION          192
-#define TK_BALANCE              193
-#define TK_VGROUP               194
-#define TK_MERGE                195
-#define TK_REDISTRIBUTE         196
-#define TK_SPLIT                197
-#define TK_DELETE               198
-#define TK_INSERT               199
-#define TK_NULL                 200
-#define TK_NK_QUESTION          201
-#define TK_NK_ARROW             202
-#define TK_ROWTS                203
-#define TK_TBNAME               204
-#define TK_QSTART               205
-#define TK_QEND                 206
-#define TK_QDURATION            207
-#define TK_WSTART               208
-#define TK_WEND                 209
-#define TK_WDURATION            210
-#define TK_IROWTS               211
-#define TK_QTAGS                212
-#define TK_CAST                 213
-#define TK_NOW                  214
-#define TK_TODAY                215
-#define TK_TIMEZONE             216
-#define TK_CLIENT_VERSION       217
-#define TK_SERVER_VERSION       218
-#define TK_SERVER_STATUS        219
-#define TK_CURRENT_USER         220
-#define TK_COUNT                221
-#define TK_LAST_ROW             222
-#define TK_CASE                 223
-#define TK_END                  224
-#define TK_WHEN                 225
-#define TK_THEN                 226
-#define TK_ELSE                 227
-#define TK_BETWEEN              228
-#define TK_IS                   229
-#define TK_NK_LT                230
-#define TK_NK_GT                231
-#define TK_NK_LE                232
-#define TK_NK_GE                233
-#define TK_NK_NE                234
-#define TK_MATCH                235
-#define TK_NMATCH               236
-#define TK_CONTAINS             237
-#define TK_IN                   238
-#define TK_JOIN                 239
-#define TK_INNER                240
-#define TK_SELECT               241
-#define TK_DISTINCT             242
-#define TK_WHERE                243
-#define TK_PARTITION            244
-#define TK_BY                   245
-#define TK_SESSION              246
-#define TK_STATE_WINDOW         247
-#define TK_SLIDING              248
-#define TK_FILL                 249
-#define TK_VALUE                250
-#define TK_NONE                 251
-#define TK_PREV                 252
-#define TK_LINEAR               253
-#define TK_NEXT                 254
-#define TK_HAVING               255
-#define TK_RANGE                256
-#define TK_EVERY                257
-#define TK_ORDER                258
-#define TK_SLIMIT               259
-#define TK_SOFFSET              260
-#define TK_LIMIT                261
-#define TK_OFFSET               262
-#define TK_ASC                  263
-#define TK_NULLS                264
-#define TK_ABORT                265
-#define TK_AFTER                266
-#define TK_ATTACH               267
-#define TK_BEFORE               268
-#define TK_BEGIN                269
-#define TK_BITAND               270
-#define TK_BITNOT               271
-#define TK_BITOR                272
-#define TK_BLOCKS               273
-#define TK_CHANGE               274
-#define TK_COMMA                275
-#define TK_COMPACT              276
-#define TK_CONCAT               277
-#define TK_CONFLICT             278
-#define TK_COPY                 279
-#define TK_DEFERRED             280
-#define TK_DELIMITERS           281
-#define TK_DETACH               282
-#define TK_DIVIDE               283
-#define TK_DOT                  284
-#define TK_EACH                 285
-#define TK_FAIL                 286
-#define TK_FILE                 287
-#define TK_FOR                  288
-#define TK_GLOB                 289
-#define TK_ID                   290
-#define TK_IMMEDIATE            291
-#define TK_IMPORT               292
-#define TK_INITIALLY            293
-#define TK_INSTEAD              294
-#define TK_ISNULL               295
-#define TK_KEY                  296
+#define TK_QNODES               137
+#define TK_FUNCTIONS            138
+#define TK_INDEXES              139
+#define TK_ACCOUNTS             140
+#define TK_APPS                 141
+#define TK_CONNECTIONS          142
+#define TK_LICENCES             143
+#define TK_GRANTS               144
+#define TK_QUERIES              145
+#define TK_SCORES               146
+#define TK_TOPICS               147
+#define TK_VARIABLES            148
+#define TK_BNODES               149
+#define TK_SNODES               150
+#define TK_CLUSTER              151
+#define TK_TRANSACTIONS         152
+#define TK_DISTRIBUTED          153
+#define TK_CONSUMERS            154
+#define TK_SUBSCRIPTIONS        155
+#define TK_VNODES               156
+#define TK_LIKE                 157
+#define TK_INDEX                158
+#define TK_FUNCTION             159
+#define TK_INTERVAL             160
+#define TK_TOPIC                161
+#define TK_AS                   162
+#define TK_WITH                 163
+#define TK_META                 164
+#define TK_CONSUMER             165
+#define TK_GROUP                166
+#define TK_DESC                 167
+#define TK_DESCRIBE             168
+#define TK_RESET                169
+#define TK_QUERY                170
+#define TK_CACHE                171
+#define TK_EXPLAIN              172
+#define TK_ANALYZE              173
+#define TK_VERBOSE              174
+#define TK_NK_BOOL              175
+#define TK_RATIO                176
+#define TK_NK_FLOAT             177
+#define TK_OUTPUTTYPE           178
+#define TK_AGGREGATE            179
+#define TK_BUFSIZE              180
+#define TK_STREAM               181
+#define TK_INTO                 182
+#define TK_TRIGGER              183
+#define TK_AT_ONCE              184
+#define TK_WINDOW_CLOSE         185
+#define TK_IGNORE               186
+#define TK_EXPIRED              187
+#define TK_SUBTABLE             188
+#define TK_KILL                 189
+#define TK_CONNECTION           190
+#define TK_TRANSACTION          191
+#define TK_BALANCE              192
+#define TK_VGROUP               193
+#define TK_MERGE                194
+#define TK_REDISTRIBUTE         195
+#define TK_SPLIT                196
+#define TK_DELETE               197
+#define TK_INSERT               198
+#define TK_NULL                 199
+#define TK_NK_QUESTION          200
+#define TK_NK_ARROW             201
+#define TK_ROWTS                202
+#define TK_TBNAME               203
+#define TK_QSTART               204
+#define TK_QEND                 205
+#define TK_QDURATION            206
+#define TK_WSTART               207
+#define TK_WEND                 208
+#define TK_WDURATION            209
+#define TK_IROWTS               210
+#define TK_QTAGS                211
+#define TK_CAST                 212
+#define TK_NOW                  213
+#define TK_TODAY                214
+#define TK_TIMEZONE             215
+#define TK_CLIENT_VERSION       216
+#define TK_SERVER_VERSION       217
+#define TK_SERVER_STATUS        218
+#define TK_CURRENT_USER         219
+#define TK_COUNT                220
+#define TK_LAST_ROW             221
+#define TK_CASE                 222
+#define TK_END                  223
+#define TK_WHEN                 224
+#define TK_THEN                 225
+#define TK_ELSE                 226
+#define TK_BETWEEN              227
+#define TK_IS                   228
+#define TK_NK_LT                229
+#define TK_NK_GT                230
+#define TK_NK_LE                231
+#define TK_NK_GE                232
+#define TK_NK_NE                233
+#define TK_MATCH                234
+#define TK_NMATCH               235
+#define TK_CONTAINS             236
+#define TK_IN                   237
+#define TK_JOIN                 238
+#define TK_INNER                239
+#define TK_SELECT               240
+#define TK_DISTINCT             241
+#define TK_WHERE                242
+#define TK_PARTITION            243
+#define TK_BY                   244
+#define TK_SESSION              245
+#define TK_STATE_WINDOW         246
+#define TK_SLIDING              247
+#define TK_FILL                 248
+#define TK_VALUE                249
+#define TK_NONE                 250
+#define TK_PREV                 251
+#define TK_LINEAR               252
+#define TK_NEXT                 253
+#define TK_HAVING               254
+#define TK_RANGE                255
+#define TK_EVERY                256
+#define TK_ORDER                257
+#define TK_SLIMIT               258
+#define TK_SOFFSET              259
+#define TK_LIMIT                260
+#define TK_OFFSET               261
+#define TK_ASC                  262
+#define TK_NULLS                263
+#define TK_ABORT                264
+#define TK_AFTER                265
+#define TK_ATTACH               266
+#define TK_BEFORE               267
+#define TK_BEGIN                268
+#define TK_BITAND               269
+#define TK_BITNOT               270
+#define TK_BITOR                271
+#define TK_BLOCKS               272
+#define TK_CHANGE               273
+#define TK_COMMA                274
+#define TK_COMPACT              275
+#define TK_CONCAT               276
+#define TK_CONFLICT             277
+#define TK_COPY                 278
+#define TK_DEFERRED             279
+#define TK_DELIMITERS           280
+#define TK_DETACH               281
+#define TK_DIVIDE               282
+#define TK_DOT                  283
+#define TK_EACH                 284
+#define TK_FAIL                 285
+#define TK_FILE                 286
+#define TK_FOR                  287
+#define TK_GLOB                 288
+#define TK_ID                   289
+#define TK_IMMEDIATE            290
+#define TK_IMPORT               291
+#define TK_INITIALLY            292
+#define TK_INSTEAD              293
+#define TK_ISNULL               294
+#define TK_KEY                  295
+#define TK_MODULES              296
 #define TK_NK_BITNOT            297
 #define TK_NK_SEMI              298
 #define TK_NOTNULL              299

include/libs/nodes/plannodes.h

@@ -99,6 +99,7 @@ typedef struct SScanLogicNode {
   int8_t        cacheLastMode;
   bool          hasNormalCols;  // neither tag column nor primary key tag column
   bool          sortPrimaryKey;
+  bool          igLastNull;
 } SScanLogicNode;
 
 typedef struct SJoinLogicNode {
@@ -115,6 +116,7 @@ typedef struct SAggLogicNode {
   SNodeList* pGroupKeys;
   SNodeList* pAggFuncs;
   bool       hasLastRow;
+  bool       hasLast;
   bool       hasTimeLineFunc;
   bool       onlyHasKeepOrderFunc;
 } SAggLogicNode;
@@ -317,6 +319,7 @@ typedef struct SLastRowScanPhysiNode {
   SScanPhysiNode scan;
   SNodeList*     pGroupTags;
   bool           groupSort;
+  bool           ignoreNull;
 } SLastRowScanPhysiNode;
 
 typedef struct SSystemTableScanPhysiNode {

include/libs/nodes/querynodes.h

@@ -291,6 +291,7 @@ typedef struct SSelectStmt {
   bool        hasTailFunc;
   bool        hasInterpFunc;
   bool        hasLastRowFunc;
+  bool        hasLastFunc;
   bool        hasTimeLineFunc;
   bool        hasUdaf;
   bool        hasStateKey;

include/util/taoserror.h

@@ -566,6 +566,7 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_PAR_NOT_UNIQUE_TABLE_ALIAS    TAOS_DEF_ERROR_CODE(0, 0x2663)
 #define TSDB_CODE_PAR_NOT_SUPPORT_JOIN          TAOS_DEF_ERROR_CODE(0, 0x2664)
 #define TSDB_CODE_PAR_INVALID_TAGS_PC           TAOS_DEF_ERROR_CODE(0, 0x2665)
+#define TSDB_CODE_PAR_INVALID_TIMELINE_QUERY    TAOS_DEF_ERROR_CODE(0, 0x2666)
 #define TSDB_CODE_PAR_INTERNAL_ERROR            TAOS_DEF_ERROR_CODE(0, 0x26FF)
 
 //planner

source/libs/nodes/src/nodesCloneFuncs.c

@@ -383,6 +383,7 @@ static int32_t logicScanCopy(const SScanLogicNode* pSrc, SScanLogicNode* pDst) {
   COPY_SCALAR_FIELD(groupSort);
   CLONE_NODE_LIST_FIELD(pTags);
   CLONE_NODE_FIELD(pSubtable);
+  COPY_SCALAR_FIELD(igLastNull);
   return TSDB_CODE_SUCCESS;
 }
 

source/libs/parser/inc/parAst.h

@@ -95,6 +95,7 @@ SNodeList* addNodeToList(SAstCreateContext* pCxt, SNodeList* pList, SNode* pNode
 
 SNode* createColumnNode(SAstCreateContext* pCxt, SToken* pTableAlias, SToken* pColumnName);
 SNode* createValueNode(SAstCreateContext* pCxt, int32_t dataType, const SToken* pLiteral);
+SNode* createIdentifierValueNode(SAstCreateContext* pCxt, SToken* pLiteral);
 SNode* createDurationValueNode(SAstCreateContext* pCxt, const SToken* pLiteral);
 SNode* createDefaultDatabaseCondValue(SAstCreateContext* pCxt);
 SNode* createPlaceholderValueNode(SAstCreateContext* pCxt, const SToken* pLiteral);

source/libs/parser/inc/sql.y

@@ -393,7 +393,7 @@ cmd ::= SHOW db_name_cond_opt(A) TABLES like_pattern_opt(B).
 cmd ::= SHOW db_name_cond_opt(A) STABLES like_pattern_opt(B).                     { pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_STABLES_STMT, A, B, OP_TYPE_LIKE); }
 cmd ::= SHOW db_name_cond_opt(A) VGROUPS.                                         { pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_VGROUPS_STMT, A, NULL, OP_TYPE_LIKE); }
 cmd ::= SHOW MNODES.                                                              { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_MNODES_STMT); }
-cmd ::= SHOW MODULES.                                                             { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_MODULES_STMT); }
+//cmd ::= SHOW MODULES.                                                             { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_MODULES_STMT); }
 cmd ::= SHOW QNODES.                                                              { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_QNODES_STMT); }
 cmd ::= SHOW FUNCTIONS.                                                           { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_FUNCTIONS_STMT); }
 cmd ::= SHOW INDEXES FROM table_name_cond(A) from_db_opt(B).                      { pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_INDEXES_STMT, B, A, OP_TYPE_EQUAL); }
@@ -425,15 +425,15 @@ cmd ::= SHOW VNODES NK_INTEGER(A).
 cmd ::= SHOW VNODES NK_STRING(A).                                                 { pCxt->pRootNode = createShowVnodesStmt(pCxt, NULL, createValueNode(pCxt, TSDB_DATA_TYPE_VARCHAR, &A)); }
 
 db_name_cond_opt(A) ::= .                                                         { A = createDefaultDatabaseCondValue(pCxt); }
-db_name_cond_opt(A) ::= db_name(B) NK_DOT.                                        { A = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &B); }
+db_name_cond_opt(A) ::= db_name(B) NK_DOT.                                        { A = createIdentifierValueNode(pCxt, &B); }
 
 like_pattern_opt(A) ::= .                                                         { A = NULL; }
 like_pattern_opt(A) ::= LIKE NK_STRING(B).                                        { A = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &B); }
 
-table_name_cond(A) ::= table_name(B).                                             { A = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &B); }
+table_name_cond(A) ::= table_name(B).                                             { A = createIdentifierValueNode(pCxt, &B); }
 
 from_db_opt(A) ::= .                                                              { A = createDefaultDatabaseCondValue(pCxt); }
-from_db_opt(A) ::= FROM db_name(B).                                               { A = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &B); }
+from_db_opt(A) ::= FROM db_name(B).                                               { A = createIdentifierValueNode(pCxt, &B); }
 
 /************************************************ create index ********************************************************/
 cmd ::= CREATE SMA INDEX not_exists_opt(D) 
@@ -1043,5 +1043,5 @@ null_ordering_opt(A) ::= NULLS FIRST.
 null_ordering_opt(A) ::= NULLS LAST.                                              { A = NULL_ORDER_LAST; }
 
 %fallback ABORT AFTER ATTACH BEFORE BEGIN BITAND BITNOT BITOR BLOCKS CHANGE COMMA COMPACT CONCAT CONFLICT COPY DEFERRED DELIMITERS DETACH DIVIDE DOT EACH END FAIL 
-  FILE FOR GLOB ID IMMEDIATE IMPORT INITIALLY INSTEAD ISNULL KEY NK_BITNOT NK_SEMI NOTNULL OF PLUS PRIVILEGE RAISE REPLACE RESTRICT ROW SEMI STAR STATEMENT STRING 
+  FILE FOR GLOB ID IMMEDIATE IMPORT INITIALLY INSTEAD ISNULL KEY MODULES NK_BITNOT NK_SEMI NOTNULL OF PLUS PRIVILEGE RAISE REPLACE RESTRICT ROW SEMI STAR STATEMENT STRING 
   TIMES UPDATE VALUES VARIABLE VIEW WAL.

source/libs/parser/src/parAstCreater.c

@@ -310,6 +310,11 @@ SNode* createValueNode(SAstCreateContext* pCxt, int32_t dataType, const SToken*
   return (SNode*)val;
 }
 
+SNode* createIdentifierValueNode(SAstCreateContext* pCxt, SToken* pLiteral) {
+  trimEscape(pLiteral);
+  return createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, pLiteral);
+}
+
 SNode* createDurationValueNode(SAstCreateContext* pCxt, const SToken* pLiteral) {
   CHECK_PARSER_STATUS(pCxt);
   SValueNode* val = (SValueNode*)nodesMakeNode(QUERY_NODE_VALUE);

source/libs/parser/src/parAstParser.c

@@ -97,7 +97,7 @@ typedef struct SCollectMetaKeyCxt {
 
 typedef struct SCollectMetaKeyFromExprCxt {
   SCollectMetaKeyCxt* pComCxt;
-  bool                hasLastRow;
+  bool                hasLastRowOrLast;
   int32_t             errCode;
 } SCollectMetaKeyFromExprCxt;
 
@@ -106,7 +106,8 @@ static int32_t collectMetaKeyFromQuery(SCollectMetaKeyCxt* pCxt, SNode* pStmt);
 static EDealRes collectMetaKeyFromFunction(SCollectMetaKeyFromExprCxt* pCxt, SFunctionNode* pFunc) {
   switch (fmGetFuncType(pFunc->functionName)) {
     case FUNCTION_TYPE_LAST_ROW:
-      pCxt->hasLastRow = true;
+    case FUNCTION_TYPE_LAST:
+      pCxt->hasLastRowOrLast = true;
       break;
     case FUNCTION_TYPE_UDF:
       pCxt->errCode = reserveUdfInCache(pFunc->functionName, pCxt->pComCxt->pMetaCache);
@@ -126,6 +127,9 @@ static bool needGetTableIndex(SNode* pStmt) {
 }
 
 static int32_t collectMetaKeyFromInsTagsImpl(SCollectMetaKeyCxt* pCxt, SName* pName) {
+  if (0 == pName->type) {
+    return TSDB_CODE_SUCCESS;
+  }
   if (TSDB_DB_NAME_T == pName->type) {
     return reserveDbVgInfoInCache(pName->acctId, pName->dbname, pCxt->pMetaCache);
   }
@@ -218,9 +222,9 @@ static int32_t reserveDbCfgForLastRow(SCollectMetaKeyCxt* pCxt, SNode* pTable) {
 }
 
 static int32_t collectMetaKeyFromSelect(SCollectMetaKeyCxt* pCxt, SSelectStmt* pStmt) {
-  SCollectMetaKeyFromExprCxt cxt = {.pComCxt = pCxt, .hasLastRow = false, .errCode = TSDB_CODE_SUCCESS};
+  SCollectMetaKeyFromExprCxt cxt = {.pComCxt = pCxt, .hasLastRowOrLast = false, .errCode = TSDB_CODE_SUCCESS};
   nodesWalkSelectStmt(pStmt, SQL_CLAUSE_FROM, collectMetaKeyFromExprImpl, &cxt);
-  if (TSDB_CODE_SUCCESS == cxt.errCode && cxt.hasLastRow) {
+  if (TSDB_CODE_SUCCESS == cxt.errCode && cxt.hasLastRowOrLast) {
     cxt.errCode = reserveDbCfgForLastRow(pCxt, pStmt->pFromTable);
   }
   return cxt.errCode;

source/libs/parser/src/parTranslater.c

@@ -721,6 +721,14 @@ static bool isTimeLineQuery(SNode* pStmt) {
   }
 }
 
+static bool isGlobalTimeLineQuery(SNode* pStmt) {
+  if (!isTimeLineQuery(pStmt)) {
+    return false;
+  }
+  SSelectStmt* pSelect = (SSelectStmt*)pStmt;
+  return NULL == pSelect->pPartitionByList || NULL != pSelect->pOrderByList;
+}
+
 static bool isPrimaryKeyImpl(SNode* pExpr) {
   if (QUERY_NODE_COLUMN == nodeType(pExpr)) {
     return (PRIMARYKEY_TIMESTAMP_COL_ID == ((SColumnNode*)pExpr)->colId);
@@ -1601,6 +1609,7 @@ static void setFuncClassification(SNode* pCurrStmt, SFunctionNode* pFunc) {
     pSelect->hasTailFunc = pSelect->hasTailFunc ? true : (FUNCTION_TYPE_TAIL == pFunc->funcType);
     pSelect->hasInterpFunc = pSelect->hasInterpFunc ? true : (FUNCTION_TYPE_INTERP == pFunc->funcType);
     pSelect->hasLastRowFunc = pSelect->hasLastRowFunc ? true : (FUNCTION_TYPE_LAST_ROW == pFunc->funcType);
+    pSelect->hasLastFunc = pSelect->hasLastFunc ? true : (FUNCTION_TYPE_LAST == pFunc->funcType);
     pSelect->hasTimeLineFunc = pSelect->hasTimeLineFunc ? true : fmIsTimelineFunc(pFunc->funcId);
     pSelect->hasUdaf = pSelect->hasUdaf ? true : fmIsUserDefinedFunc(pFunc->funcId) && fmIsAggFunc(pFunc->funcId);
     pSelect->onlyHasKeepOrderFunc = pSelect->onlyHasKeepOrderFunc ? fmIsKeepOrderFunc(pFunc->funcId) : false;
@@ -2341,7 +2350,7 @@ static int32_t setTableIndex(STranslateContext* pCxt, SName* pName, SRealTableNo
 }
 
 static int32_t setTableCacheLastMode(STranslateContext* pCxt, SSelectStmt* pSelect) {
-  if (!pSelect->hasLastRowFunc || QUERY_NODE_REAL_TABLE != nodeType(pSelect->pFromTable)) {
+  if ((!pSelect->hasLastRowFunc && !pSelect->hasLastFunc) || QUERY_NODE_REAL_TABLE != nodeType(pSelect->pFromTable)) {
     return TSDB_CODE_SUCCESS;
   }
 
@@ -3012,8 +3021,9 @@ static int32_t checkIntervalWindow(STranslateContext* pCxt, SIntervalWindowNode*
   return TSDB_CODE_SUCCESS;
 }
 
-static int32_t translateIntervalWindow(STranslateContext* pCxt, SSelectStmt* pSelect, SIntervalWindowNode* pInterval) {
-  int32_t code = checkIntervalWindow(pCxt, pInterval);
+static int32_t translateIntervalWindow(STranslateContext* pCxt, SSelectStmt* pSelect) {
+  SIntervalWindowNode* pInterval = (SIntervalWindowNode*)pSelect->pWindow;
+  int32_t              code = checkIntervalWindow(pCxt, pInterval);
   if (TSDB_CODE_SUCCESS == code) {
     code = translateFill(pCxt, pSelect, pInterval);
   }
@@ -3056,6 +3066,12 @@ static int32_t checkStateWindowForStream(STranslateContext* pCxt, SSelectStmt* p
 }
 
 static int32_t translateStateWindow(STranslateContext* pCxt, SSelectStmt* pSelect) {
+  if (QUERY_NODE_TEMP_TABLE == nodeType(pSelect->pFromTable) &&
+      !isGlobalTimeLineQuery(((STempTableNode*)pSelect->pFromTable)->pSubquery)) {
+    return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_TIMELINE_QUERY,
+                                   "STATE_WINDOW requires valid time series input");
+  }
+
   SStateWindowNode* pState = (SStateWindowNode*)pSelect->pWindow;
   nodesWalkExprPostOrder(pState->pExpr, checkStateExpr, pCxt);
   if (TSDB_CODE_SUCCESS == pCxt->errCode) {
@@ -3064,7 +3080,14 @@ static int32_t translateStateWindow(STranslateContext* pCxt, SSelectStmt* pSelec
   return pCxt->errCode;
 }
 
-static int32_t translateSessionWindow(STranslateContext* pCxt, SSessionWindowNode* pSession) {
+static int32_t translateSessionWindow(STranslateContext* pCxt, SSelectStmt* pSelect) {
+  if (QUERY_NODE_TEMP_TABLE == nodeType(pSelect->pFromTable) &&
+      !isGlobalTimeLineQuery(((STempTableNode*)pSelect->pFromTable)->pSubquery)) {
+    return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_TIMELINE_QUERY,
+                                   "SESSION requires valid time series input");
+  }
+
+  SSessionWindowNode* pSession = (SSessionWindowNode*)pSelect->pWindow;
   if ('y' == pSession->pGap->unit || 'n' == pSession->pGap->unit || 0 == pSession->pGap->datum.i) {
     return generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_INTER_SESSION_GAP);
   }
@@ -3079,9 +3102,9 @@ static int32_t translateSpecificWindow(STranslateContext* pCxt, SSelectStmt* pSe
     case QUERY_NODE_STATE_WINDOW:
       return translateStateWindow(pCxt, pSelect);
     case QUERY_NODE_SESSION_WINDOW:
-      return translateSessionWindow(pCxt, (SSessionWindowNode*)pSelect->pWindow);
+      return translateSessionWindow(pCxt, pSelect);
     case QUERY_NODE_INTERVAL_WINDOW:
-      return translateIntervalWindow(pCxt, pSelect, (SIntervalWindowNode*)pSelect->pWindow);
+      return translateIntervalWindow(pCxt, pSelect);
     default:
       break;
   }
@@ -5156,6 +5179,13 @@ static int32_t translateDropComponentNode(STranslateContext* pCxt, SDropComponen
                      (FSerializeFunc)tSerializeSCreateDropMQSBNodeReq, &dropReq);
 }
 
+static int32_t checkTopicQuery(STranslateContext* pCxt, SSelectStmt* pSelect) {
+  if (pSelect->hasAggFuncs || pSelect->hasInterpFunc || pSelect->hasIndefiniteRowsFunc) {
+    return generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_TOPIC_QUERY);
+  }
+  return TSDB_CODE_SUCCESS;
+}
+
 static int32_t buildCreateTopicReq(STranslateContext* pCxt, SCreateTopicStmt* pStmt, SCMCreateTopicReq* pReq) {
   SName name;
   tNameSetDbName(&name, pCxt->pParseCxt->acctId, pStmt->topicName, strlen(pStmt->topicName));
@@ -5186,6 +5216,9 @@ static int32_t buildCreateTopicReq(STranslateContext* pCxt, SCreateTopicStmt* pS
     tNameGetFullDbName(&name, pReq->subDbName);
     pCxt->pParseCxt->topicQuery = true;
     code = translateQuery(pCxt, pStmt->pQuery);
+    if (TSDB_CODE_SUCCESS == code) {
+      code = checkTopicQuery(pCxt, (SSelectStmt*)pStmt->pQuery);
+    }
     if (TSDB_CODE_SUCCESS == code) {
       code = nodesNodeToString(pStmt->pQuery, false, &pReq->ast, NULL);
     }

source/libs/parser/test/parShowToUse.cpp

@@ -130,12 +130,6 @@ TEST_F(ParserShowToUseTest, showMnodes) {
   run("SHOW mnodes");
 }
 
-TEST_F(ParserShowToUseTest, showModules) {
-  useDb("root", "test");
-
-  run("SHOW modules");
-}
-
 TEST_F(ParserShowToUseTest, showQnodes) {
   useDb("root", "test");
 

source/libs/planner/src/planLogicCreater.c

@@ -514,6 +514,7 @@ static int32_t createAggLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect,
   }
 
   pAgg->hasLastRow = pSelect->hasLastRowFunc;
+  pAgg->hasLast = pSelect->hasLastFunc;
   pAgg->hasTimeLineFunc = pSelect->hasTimeLineFunc;
   pAgg->onlyHasKeepOrderFunc = pSelect->onlyHasKeepOrderFunc;
   pAgg->node.groupAction = getGroupAction(pCxt, pSelect);

source/libs/planner/src/planOptimizer.c

@@ -124,7 +124,8 @@ static void optSetParentOrder(SLogicNode* pNode, EOrder order) {
 
 EDealRes scanPathOptHaveNormalColImpl(SNode* pNode, void* pContext) {
   if (QUERY_NODE_COLUMN == nodeType(pNode)) {
-    // *((bool*)pContext) = (COLUMN_TYPE_TAG != ((SColumnNode*)pNode)->colType);
+    // *((bool*)pContext) =
+    //     (COLUMN_TYPE_TAG != ((SColumnNode*)pNode)->colType && COLUMN_TYPE_TBNAME != ((SColumnNode*)pNode)->colType);
     *((bool*)pContext) = true;
     return *((bool*)pContext) ? DEAL_RES_END : DEAL_RES_IGNORE_CHILD;
   }
@@ -2195,14 +2196,16 @@ static bool lastRowScanOptMayBeOptimized(SLogicNode* pNode) {
 
   SAggLogicNode*  pAgg = (SAggLogicNode*)pNode;
   SScanLogicNode* pScan = (SScanLogicNode*)nodesListGetNode(pNode->pChildren, 0);
-  if (!pAgg->hasLastRow || NULL != pAgg->pGroupKeys || NULL != pScan->node.pConditions || 0 == pScan->cacheLastMode ||
-      IS_TSWINDOW_SPECIFIED(pScan->scanRange)) {
+  // Only one of LAST and LASTROW can appear
+  if (pAgg->hasLastRow == pAgg->hasLast || NULL != pAgg->pGroupKeys || NULL != pScan->node.pConditions ||
+      0 == pScan->cacheLastMode || IS_TSWINDOW_SPECIFIED(pScan->scanRange)) {
     return false;
   }
 
   SNode* pFunc = NULL;
   FOREACH(pFunc, ((SAggLogicNode*)pNode)->pAggFuncs) {
     if (FUNCTION_TYPE_LAST_ROW != ((SFunctionNode*)pFunc)->funcType &&
+        // FUNCTION_TYPE_LAST != ((SFunctionNode*)pFunc)->funcType &&
         FUNCTION_TYPE_SELECT_VALUE != ((SFunctionNode*)pFunc)->funcType &&
         FUNCTION_TYPE_GROUP_KEY != ((SFunctionNode*)pFunc)->funcType) {
       return false;
@@ -2222,7 +2225,7 @@ static int32_t lastRowScanOptimize(SOptimizeContext* pCxt, SLogicSubplan* pLogic
   SNode* pNode = NULL;
   FOREACH(pNode, pAgg->pAggFuncs) {
     SFunctionNode* pFunc = (SFunctionNode*)pNode;
-    if (FUNCTION_TYPE_LAST_ROW == pFunc->funcType) {
+    if (FUNCTION_TYPE_LAST_ROW == pFunc->funcType || FUNCTION_TYPE_LAST == pFunc->funcType) {
       int32_t len = snprintf(pFunc->functionName, sizeof(pFunc->functionName), "_cache_last_row");
       pFunc->functionName[len] = '\0';
       int32_t code = fmGetFuncInfo(pFunc, NULL, 0);
@@ -2231,9 +2234,12 @@ static int32_t lastRowScanOptimize(SOptimizeContext* pCxt, SLogicSubplan* pLogic
       }
     }
   }
-  pAgg->hasLastRow = false;
 
-  ((SScanLogicNode*)nodesListGetNode(pAgg->node.pChildren, 0))->scanType = SCAN_TYPE_LAST_ROW;
+  SScanLogicNode* pScan = (SScanLogicNode*)nodesListGetNode(pAgg->node.pChildren, 0);
+  pScan->scanType = SCAN_TYPE_LAST_ROW;
+  pScan->igLastNull = pAgg->hasLast ? true : false;
+  pAgg->hasLastRow = false;
+  pAgg->hasLast = false;
 
   pCxt->optimized = true;
   return TSDB_CODE_SUCCESS;
@@ -2405,8 +2411,8 @@ static const SOptimizeRule optimizeRuleSet[] = {
   {.pName = "EliminateSetOperator",       .optimizeFunc = eliminateSetOpOptimize},
   {.pName = "RewriteTail",                .optimizeFunc = rewriteTailOptimize},
   {.pName = "RewriteUnique",              .optimizeFunc = rewriteUniqueOptimize},
-  {.pName = "LastRowScan",               .optimizeFunc = lastRowScanOptimize},
-  {.pName = "TagScan",                   .optimizeFunc = tagScanOptimize}
+  {.pName = "LastRowScan",                .optimizeFunc = lastRowScanOptimize},
+  {.pName = "TagScan",                    .optimizeFunc = tagScanOptimize}
 };
 // clang-format on
 

source/libs/planner/src/planPhysiCreater.c

@@ -521,6 +521,7 @@ static int32_t createLastRowScanPhysiNode(SPhysiPlanContext* pCxt, SSubplan* pSu
   }
 
   pScan->groupSort = pScanLogicNode->groupSort;
+  pScan->ignoreNull = pScanLogicNode->igLastNull;
   vgroupInfoToNodeAddr(pScanLogicNode->pVgroupList->vgroups, &pSubplan->execNode);
 
   vgroupInfoToNodeAddr(pScanLogicNode->pVgroupList->vgroups, &pSubplan->execNode);