TD-13197 SELECT statement syntax definition

source/libs/parser/inc/astCreateContext.h

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _TD_AST_CREATER_H_
+#define _TD_AST_CREATER_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "nodes.h"
+#include "parser.h"
+
+typedef struct SAstCreateContext {
+  SParseContext* pQueryCxt;
+  bool notSupport;
+  bool valid;
+  SNode* pRootNode;
+} SAstCreateContext;
+
+int32_t createAstCreateContext(const SParseContext* pQueryCxt, SAstCreateContext* pCxt);
+int32_t destroyAstCreateContext(SAstCreateContext* pCxt);
+
+void* acquireRaii(SAstCreateContext* pCxt, void* p);
+void* releaseRaii(SAstCreateContext* pCxt, void* p);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*_TD_AST_CREATER_H_*/

source/libs/parser/inc/astCreateFuncs.h

@@ -15,7 +15,8 @@
 
 #include "nodes.h"
 #include "nodesShowStmts.h"
-#include "parser.h"
+#include "astCreateContext.h"
+#include "ttoken.h"
 
 #ifndef _TD_AST_CREATE_FUNCS_H_
 #define _TD_AST_CREATE_FUNCS_H_
@@ -24,20 +25,13 @@
 extern "C" {
 #endif
 
-typedef struct SAstCreateContext {
-  SParseContext* pQueryCxt;
-  bool notSupport;
-  bool valid;
-  SNode* pRootNode;
-} SAstCreateContext;
-
-int32_t createAstCreater(const SParseContext* pQueryCxt, SAstCreateContext* pCxt);
-int32_t destroyAstCreater(SAstCreateContext* pCxt);
-
 bool checkTableName(const SToken* pTableName);
-
 SNodeList* addNodeToList(SAstCreateContext* pCxt, SNodeList* pList, SNode* pNode);
+SNode* addOrderByList(SAstCreateContext* pCxt, SNode* pStmt, SNodeList* pOrderByList);
+SNode* addSlimit(SAstCreateContext* pCxt, SNode* pStmt, SNode* pSlimit);
+SNode* addLimit(SAstCreateContext* pCxt, SNode* pStmt, SNode* pLimit);
 SNode* createColumnNode(SAstCreateContext* pCxt, const SToken* pTableName, const SToken* pColumnName);
+SNode* createLimitNode(SAstCreateContext* pCxt, const SToken* pLimit, const SToken* pOffset);
 SNodeList* createNodeList(SAstCreateContext* pCxt, SNode* pNode);
 SNode* createOrderByExprNode(SAstCreateContext* pCxt, SNode* pExpr, EOrder order, ENullOrder nullOrder);
 SNode* createRealTableNode(SAstCreateContext* pCxt, const SToken* pDbName, const SToken* pTableName);

source/libs/parser/inc/new_sql.y

@@ -147,35 +147,36 @@ subquery ::= NK_LR query_expression NK_RP.
 
 table_subquery ::= subquery.
 
+// query_expression
+query_expression(A) ::= with_clause_opt query_expression_body(B) order_by_clause_opt(C) slimit_clause_opt(D) limit_clause_opt(E). { 
+                                                                                                                                    PARSER_TRACE;
+                                                                                                                                    addOrderByList(pCxt, B, C);
+                                                                                                                                    addSlimit(pCxt, B, D);
+                                                                                                                                    addLimit(pCxt, B, E);
+                                                                                                                                    A = B;  
+                                                                                                                                  }
 
-//////////////////////// query_expression /////////////////////////////////
-query_expression(A) ::= with_clause_opt query_expression_body(B) order_by_clause_opt limit_clause_opt slimit_clause_opt. { PARSER_TRACE; A = B; }
+// WITH AS 
+with_clause_opt ::= .                                                                                                             {}
 
-with_clause_opt ::= .                         {}
-with_clause_opt ::= WITH with_list.           { PARSER_TRACE; pCxt->notSupport = true; pCxt->valid = false; }
-with_clause_opt ::= WITH RECURSIVE with_list. { PARSER_TRACE; pCxt->notSupport = true; pCxt->valid = false; }
+query_expression_body(A) ::= query_primary(B).                                                                                    { PARSER_TRACE; A = B; }
+query_expression_body(A) ::= query_expression_body(B) UNION ALL query_expression_body(D).                                         { PARSER_TRACE; A = createSetOperator(pCxt, SET_OP_TYPE_UNION_ALL, B, D); }
 
-with_list ::= with_list_element.                    {}
-with_list ::= with_list NK_COMMA with_list_element. {}
-
-with_list_element ::= NK_ID AS table_subquery. {}
-
-table_subquery ::= . {}
-
-query_expression_body(A) ::= query_primary(B).                                            { PARSER_TRACE; A = B; }
-query_expression_body(A) ::= query_expression_body(B) UNION ALL query_expression_body(C). { PARSER_TRACE; A = createSetOperator(pCxt, SET_OP_TYPE_UNION_ALL, B, C); }
-
-query_primary(A) ::= query_specification(B).                                                                   { PARSER_TRACE; A = B; }
-query_primary(A) ::= NK_LP query_expression_body(B) order_by_clause_opt limit_clause_opt slimit_clause_opt NK_RP. { PARSER_TRACE; A = B;}
+query_primary(A) ::= query_specification(B).                                                                                      { PARSER_TRACE; A = B; }
+query_primary(A) ::= NK_LP query_expression_body(B) order_by_clause_opt limit_clause_opt slimit_clause_opt NK_RP.                 { PARSER_TRACE; A = B;}
 
 %type order_by_clause_opt { SNodeList* }
 %destructor order_by_clause_opt { nodesDestroyNodeList($$); }
-order_by_clause_opt(A) ::= .                                    { PARSER_TRACE; A = NULL; }
-order_by_clause_opt(A) ::= ORDER BY sort_specification_list(B). { PARSER_TRACE; A = B; }
+order_by_clause_opt(A) ::= .                                                                                                      { PARSER_TRACE; A = NULL; }
+order_by_clause_opt(A) ::= ORDER BY sort_specification_list(B).                                                                   { PARSER_TRACE; A = B; }
 
-limit_clause_opt ::= .
+slimit_clause_opt(A) ::= .                                                                                                        { A = NULL; }
+slimit_clause_opt(A) ::= SLIMIT NK_INTEGER(B) SOFFSET NK_INTEGER(C).                                                              { A = createLimitNode(pCxt, &B, &C); }
+slimit_clause_opt(A) ::= SLIMIT NK_INTEGER(C) NK_COMMA NK_INTEGER(B).                                                             { A = createLimitNode(pCxt, &B, &C); }
 
-slimit_clause_opt ::= .
+limit_clause_opt(A) ::= .                                                                                                         { A = NULL; }
+limit_clause_opt(A) ::= LIMIT NK_INTEGER(B) OFFSET NK_INTEGER(C).                                                                 { A = createLimitNode(pCxt, &B, &C); }
+limit_clause_opt(A) ::= LIMIT NK_INTEGER(C) NK_COMMA NK_INTEGER(B).                                                               { A = createLimitNode(pCxt, &B, &C); }
 
 //////////////////////// sort_specification_list /////////////////////////////////
 %type sort_specification_list { SNodeList* }

source/libs/parser/inc/astCreater.h → source/libs/parser/inc/parserImpl.h

@@ -13,16 +13,16 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TD_AST_CREATER_H_
-#define _TD_AST_CREATER_H_
+#include "nodes.h"
+#include "parser.h"
+
+#ifndef _TD_AST_CREATE_FUNCS_H_
+#define _TD_AST_CREATE_FUNCS_H_
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "nodes.h"
-#include "parser.h"
-
 typedef struct SQuery {
   SNode* pRoot;
 } SQuery;
@@ -33,4 +33,4 @@ int32_t doParse(SParseContext* pParseCxt, SQuery* pQuery);
 }
 #endif
 
-#endif /*_TD_AST_CREATER_H_*/
+#endif /*_TD_AST_CREATE_FUNCS_H_*/

source/libs/parser/src/astCreateContext.c

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ttoken.h"
+#include "astCreateContext.h"
+
+void* acquireRaii(SAstCreateContext* pCxt, void* p) {
+  if (NULL == p) {
+    return NULL;
+  }
+  return p;
+}
+
+void* releaseRaii(SAstCreateContext* pCxt, void* p) {
+  if (NULL == p) {
+    return NULL;
+  }
+  return p;
+}
+
+int32_t createAstCreater(const SParseContext* pQueryCxt, SAstCreateContext* pCxt) {
+
+}
+
+int32_t destroyAstCreater(SAstCreateContext* pCxt) {
+
+}
+

source/libs/parser/src/astCreateFuncs.c

+
+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "astCreateFuncs.h"
+
+#include "astCreateContext.h"
+
+bool checkTableName(const SToken* pTableName) {
+  printf("%p : %d, %d, %s\n", pTableName, pTableName->type, pTableName->n, pTableName->z);
+  return pTableName->n < TSDB_TABLE_NAME_LEN ? true : false;
+}
+
+SNodeList* addNodeToList(SAstCreateContext* pCxt, SNodeList* pList, SNode* pNode) {
+
+}
+
+SNode* addOrderByList(SAstCreateContext* pCxt, SNode* pStmt, SNodeList* pOrderByList) {
+
+}
+
+SNode* addSlimit(SAstCreateContext* pCxt, SNode* pStmt, SNode* pSlimit) {
+
+}
+
+SNode* addLimit(SAstCreateContext* pCxt, SNode* pStmt, SNode* pLimit) {
+
+}
+
+SNode* createColumnNode(SAstCreateContext* pCxt, const SToken* pTableName, const SToken* pColumnName) {
+
+}
+
+SNode* createLimitNode(SAstCreateContext* pCxt, const SToken* pLimit, const SToken* pOffset) {
+
+}
+
+SNodeList* createNodeList(SAstCreateContext* pCxt, SNode* pNode) {
+
+}
+
+SNode* createOrderByExprNode(SAstCreateContext* pCxt, SNode* pExpr, EOrder order, ENullOrder nullOrder) {
+
+}
+
+SNode* createRealTableNode(SAstCreateContext* pCxt, const SToken* pDbName, const SToken* pTableName) {
+  SRealTableNode* realTable = (SRealTableNode*)nodesMakeNode(QUERY_NODE_REAL_TABLE);
+  if (NULL != pDbName) {
+    printf("DbName %p : %d, %d, %s\n", pDbName, pDbName->type, pDbName->n, pDbName->z);
+    strncpy(realTable->dbName, pDbName->z, pDbName->n);
+  }
+  printf("TableName %p : %d, %d, %s\n", pTableName, pTableName->type, pTableName->n, pTableName->z);
+  strncpy(realTable->table.tableName, pTableName->z, pTableName->n);
+  return acquireRaii(pCxt, realTable);
+}
+
+SNode* createSelectStmt(SAstCreateContext* pCxt, bool isDistinct, SNodeList* pProjectionList, SNode* pTable) {
+  SSelectStmt* select = (SSelectStmt*)nodesMakeNode(QUERY_NODE_SELECT_STMT);
+  select->isDistinct = isDistinct;
+  if (NULL == pProjectionList) {
+    select->isStar = true;
+  }
+  select->pProjectionList = releaseRaii(pCxt, pProjectionList);
+  printf("pTable = %p, name = %s\n", pTable, ((SRealTableNode*)pTable)->table.tableName);
+  select->pFromTable = releaseRaii(pCxt, pTable);
+  return acquireRaii(pCxt, select);
+}
+
+SNode* createSetOperator(SAstCreateContext* pCxt, ESetOperatorType type, SNode* pLeft, SNode* pRight) {
+
+}
+
+SNode* createShowStmt(SAstCreateContext* pCxt, EShowStmtType type) {
+
+}
+
+SNode* setProjectionAlias(SAstCreateContext* pCxt, SNode* pNode, const SToken* pAlias) {
+
+}

source/libs/parser/src/astCreater.c → source/libs/parser/src/parserImpl.c

@@ -13,9 +13,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "parserImpl.h"
+
 #include "ttoken.h"
-#include "astCreateFuncs.h"
-#include "astCreater.h"
+#include "astCreateContext.h"
 
 typedef void* (*FMalloc)(size_t);
 typedef void (*FFree)(void*);
@@ -24,84 +25,6 @@ extern void* NewParseAlloc(FMalloc);
 extern void NewParse(void*, int, SToken, void*);
 extern void NewParseFree(void*, FFree);
 
-static void* acquireRaii(SAstCreateContext* pCxt, void* p) {
-  if (NULL == p) {
-    return NULL;
-  }
-  return p;
-}
-
-static void* releaseRaii(SAstCreateContext* pCxt, void* p) {
-  if (NULL == p) {
-    return NULL;
-  }
-  return p;
-}
-
-int32_t createAstCreater(const SParseContext* pQueryCxt, SAstCreateContext* pCxt) {
-
-}
-
-int32_t destroyAstCreater(SAstCreateContext* pCxt) {
-
-}
-
-bool checkTableName(const SToken* pTableName) {
-  printf("%p : %d, %d, %s\n", pTableName, pTableName->type, pTableName->n, pTableName->z);
-  return pTableName->n < TSDB_TABLE_NAME_LEN ? true : false;
-}
-
-SNodeList* addNodeToList(SAstCreateContext* pCxt, SNodeList* pList, SNode* pNode) {
-
-}
-
-SNode* createColumnNode(SAstCreateContext* pCxt, const SToken* pTableName, const SToken* pColumnName) {
-
-}
-
-SNodeList* createNodeList(SAstCreateContext* pCxt, SNode* pNode) {
-
-}
-
-SNode* createOrderByExprNode(SAstCreateContext* pCxt, SNode* pExpr, EOrder order, ENullOrder nullOrder) {
-
-}
-
-SNode* createRealTableNode(SAstCreateContext* pCxt, const SToken* pDbName, const SToken* pTableName) {
-  SRealTableNode* realTable = (SRealTableNode*)nodesMakeNode(QUERY_NODE_REAL_TABLE);
-  if (NULL != pDbName) {
-    printf("DbName %p : %d, %d, %s\n", pDbName, pDbName->type, pDbName->n, pDbName->z);
-    strncpy(realTable->dbName, pDbName->z, pDbName->n);
-  }
-  printf("TableName %p : %d, %d, %s\n", pTableName, pTableName->type, pTableName->n, pTableName->z);
-  strncpy(realTable->table.tableName, pTableName->z, pTableName->n);
-  return acquireRaii(pCxt, realTable);
-}
-
-SNode* createSelectStmt(SAstCreateContext* pCxt, bool isDistinct, SNodeList* pProjectionList, SNode* pTable) {
-  SSelectStmt* select = (SSelectStmt*)nodesMakeNode(QUERY_NODE_SELECT_STMT);
-  select->isDistinct = isDistinct;
-  if (NULL == pProjectionList) {
-    select->isStar = true;
-  }
-  select->pProjectionList = releaseRaii(pCxt, pProjectionList);
-  printf("pTable = %p, name = %s\n", pTable, ((SRealTableNode*)pTable)->table.tableName);
-  select->pFromTable = releaseRaii(pCxt, pTable);
-  return acquireRaii(pCxt, select);
-}
-
-SNode* createSetOperator(SAstCreateContext* pCxt, ESetOperatorType type, SNode* pLeft, SNode* pRight) {
-
-}
-
-SNode* createShowStmt(SAstCreateContext* pCxt, EShowStmtType type) {
-
-}
-
-SNode* setProjectionAlias(SAstCreateContext* pCxt, SNode* pNode, const SToken* pAlias) {
-
-}
-
 uint32_t toNewTokenId(uint32_t tokenId) {
   switch (tokenId) {
     case TK_UNION:

source/libs/parser/test/newParserTest.cpp

@@ -15,7 +15,7 @@
 
 #include <gtest/gtest.h>
 
-#include "astCreater.h"
+#include "parserImpl.h"
 
 using namespace std;
 using namespace testing;