xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

create/drop/show bnode/snode/mnode frontend implement

This commit is contained in:
Xiaoyu Wang 2022-04-09 15:57:39 +08:00
parent a6b5dd8ef0
commit 3544c8789b
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/libs/parser/inc/sql.y
View File

@ -728,10 +728,7 @@ select_list(A) ::= select_sublist(B).
select_sublist(A) ::= select_item(B). { A = createNodeList(pCxt, B); }
select_sublist(A) ::= select_sublist(B) NK_COMMA select_item(C). { A = addNodeToList(pCxt, B, C); }
select_item(A) ::= common_expression(B). {
SToken t = getTokenFromRawExprNode(pCxt, B);
A = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, B), &t);
}
select_item(A) ::= common_expression(B). { A = releaseRawExprNode(pCxt, B); }
select_item(A) ::= common_expression(B) column_alias(C). { A = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, B), &C); }
select_item(A) ::= common_expression(B) AS column_alias(C). { A = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, B), &C); }
select_item(A) ::= table_name(B) NK_DOT NK_STAR(C). { A = createColumnNode(pCxt, &B, &C); }

6
source/libs/parser/src/parAstCreater.c
View File

@ -205,9 +205,11 @@ SNode* createRawExprNodeExt(SAstCreateContext* pCxt, const SToken* pStart, const
SNode* releaseRawExprNode(SAstCreateContext* pCxt, SNode* pNode) {
CHECK_RAW_EXPR_NODE(pNode);
SNode* tmp = ((SRawExprNode*)pNode)->pNode;
SRawExprNode* pRawExpr = (SRawExprNode*)pNode;
SNode* pExpr = pRawExpr->pNode;
strncpy(((SExprNode*)pExpr)->aliasName, pRawExpr->p, pRawExpr->n);
taosMemoryFreeClear(pNode);
return tmp;
return pExpr;
}
SToken getTokenFromRawExprNode(SAstCreateContext* pCxt, SNode* pNode) {

8
source/libs/parser/src/sql.c
View File

@ -3415,6 +3415,7 @@ static YYACTIONTYPE yy_reduce(
{ yymsp[-1].minor.yy564 = createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0); }
break;
case 260: /* signed_literal ::= duration_literal */
case 354: /* select_item ::= common_expression */ yytestcase(yyruleno==354);
case 398: /* search_condition ::= common_expression */ yytestcase(yyruleno==398);
{ yylhsminor.yy564 = releaseRawExprNode(pCxt, yymsp[0].minor.yy564); }
yymsp[0].minor.yy564 = yylhsminor.yy564;
@ -3679,13 +3680,6 @@ static YYACTIONTYPE yy_reduce(
case 350: /* select_list ::= NK_STAR */
{ yymsp[0].minor.yy476 = NULL; }
break;
case 354: /* select_item ::= common_expression */
{
SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy564);
yylhsminor.yy564 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy564), &t);
}
yymsp[0].minor.yy564 = yylhsminor.yy564;
break;
case 355: /* select_item ::= common_expression column_alias */
{ yylhsminor.yy564 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy564), &yymsp[0].minor.yy21); }
yymsp[-1].minor.yy564 = yylhsminor.yy564;

4
source/libs/planner/src/planLogicCreater.c
View File

@ -72,7 +72,9 @@ static EDealRes doNameExpr(SNode* pNode, void* pContext) {
case QUERY_NODE_OPERATOR:
case QUERY_NODE_LOGIC_CONDITION:
case QUERY_NODE_FUNCTION: {
sprintf(((SExprNode*)pNode)->aliasName, "#expr_%p", pNode);
if ('\0' == ((SExprNode*)pNode)->aliasName[0]) {
sprintf(((SExprNode*)pNode)->aliasName, "#expr_%p", pNode);
}
return DEAL_RES_IGNORE_CHILD;
}
default: