From fb3bd53ea0b1855a9e536310cba556fe833dcf29 Mon Sep 17 00:00:00 2001 From: Xiaoyu Wang Date: Fri, 11 Feb 2022 20:59:23 -0500 Subject: [PATCH 01/17] TD-13495 planner refactoring --- include/libs/nodes/nodes.h | 2 +- include/libs/nodes/querynodes.h | 25 ++- include/util/taoserror.h | 1 - source/libs/nodes/src/nodesTraverseFuncs.c | 57 +++++ source/libs/nodes/src/nodesUtilFuncs.c | 110 +++++++++- source/libs/parser/src/astCreateFuncs.c | 10 +- source/libs/parser/src/parserImpl.c | 29 +-- source/libs/planner/inc/plannerImpl.h | 1 + source/libs/planner/src/plannerImpl.c | 244 ++++++++++++--------- 9 files changed, 346 insertions(+), 133 deletions(-) diff --git a/include/libs/nodes/nodes.h b/include/libs/nodes/nodes.h index 068b80cf59..1ea1f0316a 100644 --- a/include/libs/nodes/nodes.h +++ b/include/libs/nodes/nodes.h @@ -100,7 +100,7 @@ SNode* nodesMakeNode(ENodeType type); void nodesDestroyNode(SNode* pNode); SNodeList* nodesMakeList(); -SNodeList* nodesListAppend(SNodeList* pList, SNode* pNode); +int32_t nodesListAppend(SNodeList* pList, SNode* pNode); SListCell* nodesListErase(SNodeList* pList, SListCell* pCell); SNode* nodesListGetNode(SNodeList* pList, int32_t index); void nodesDestroyList(SNodeList* pList); diff --git a/include/libs/nodes/querynodes.h b/include/libs/nodes/querynodes.h index ea9653e4a8..6046770ed1 100644 --- a/include/libs/nodes/querynodes.h +++ b/include/libs/nodes/querynodes.h @@ -50,6 +50,7 @@ typedef enum EColumnType { typedef struct SColumnNode { SExprNode node; // QUERY_NODE_COLUMN + uint64_t tableId; int16_t colId; EColumnType colType; // column or tag char dbName[TSDB_DB_NAME_LEN]; @@ -59,10 +60,11 @@ typedef struct SColumnNode { SNode* pProjectRef; } SColumnNode; -typedef struct SColumnRef { +typedef struct SColumnRefNode { ENodeType type; + int32_t tupleId; int32_t slotId; -} SColumnRef; +} SColumnRefNode; typedef struct SValueNode { SExprNode node; // QUERY_NODE_VALUE @@ -269,6 +271,25 @@ typedef struct SSetOperator { SNode* pLimit; } SSetOperator; +typedef enum ESqlClause { + SQL_CLAUSE_FROM = 1, + SQL_CLAUSE_WHERE, + SQL_CLAUSE_PARTITION_BY, + SQL_CLAUSE_WINDOW, + SQL_CLAUSE_GROUP_BY, + SQL_CLAUSE_HAVING, + SQL_CLAUSE_SELECT, + SQL_CLAUSE_ORDER_BY +} ESqlClause; + +void nodesWalkSelectStmt(SSelectStmt* pSelect, ESqlClause clause, FNodeWalker walker, void* pContext); +void nodesRewriteSelectStmt(SSelectStmt* pSelect, ESqlClause clause, FNodeRewriter rewriter, void* pContext); + +int32_t nodesCollectColumns(SSelectStmt* pSelect, ESqlClause clause, uint64_t tableId, bool realCol, SNodeList** pCols); + +typedef bool (*FFuncClassifier)(int32_t funcId); +int32_t nodesCollectFuncs(SSelectStmt* pSelect, FFuncClassifier classifier, SNodeList** pFuncs); + bool nodesIsExprNode(const SNode* pNode); bool nodesIsArithmeticOp(const SOperatorNode* pOp); diff --git a/include/util/taoserror.h b/include/util/taoserror.h index 5c12d29b50..0a822927ad 100644 --- a/include/util/taoserror.h +++ b/include/util/taoserror.h @@ -459,7 +459,6 @@ int32_t* taosGetErrno(); #define TSDB_CODE_PAR_GROUPBY_LACK_EXPRESSION TAOS_DEF_ERROR_CODE(0, 0x260A) //Not a GROUP BY expression #define TSDB_CODE_PAR_NOT_SELECTED_EXPRESSION TAOS_DEF_ERROR_CODE(0, 0x260B) //Not SELECTed expression #define TSDB_CODE_PAR_NOT_SINGLE_GROUP TAOS_DEF_ERROR_CODE(0, 0x260C) //Not a single-group group function -#define TSDB_CODE_PAR_OUT_OF_MEMORY TAOS_DEF_ERROR_CODE(0, 0x260D) //Out of memory #ifdef __cplusplus } diff --git a/source/libs/nodes/src/nodesTraverseFuncs.c b/source/libs/nodes/src/nodesTraverseFuncs.c index b7e7ad6f0b..e61375b202 100644 --- a/source/libs/nodes/src/nodesTraverseFuncs.c +++ b/source/libs/nodes/src/nodesTraverseFuncs.c @@ -264,3 +264,60 @@ void nodesRewriteNodePostOrder(SNode** pNode, FNodeRewriter rewriter, void* pCon void nodesRewriteListPostOrder(SNodeList* pList, FNodeRewriter rewriter, void* pContext) { (void)rewriteList(pList, TRAVERSAL_POSTORDER, rewriter, pContext); } + +void nodesWalkSelectStmt(SSelectStmt* pSelect, ESqlClause clause, FNodeWalker walker, void* pContext) { + if (NULL == pSelect) { + return; + } + + switch (clause) { + case SQL_CLAUSE_FROM: + nodesWalkNode(pSelect->pFromTable, walker, pContext); + nodesWalkNode(pSelect->pWhere, walker, pContext); + case SQL_CLAUSE_WHERE: + nodesWalkList(pSelect->pPartitionByList, walker, pContext); + case SQL_CLAUSE_PARTITION_BY: + nodesWalkNode(pSelect->pWindow, walker, pContext); + case SQL_CLAUSE_WINDOW: + nodesWalkList(pSelect->pGroupByList, walker, pContext); + case SQL_CLAUSE_GROUP_BY: + nodesWalkNode(pSelect->pHaving, walker, pContext); + case SQL_CLAUSE_HAVING: + nodesWalkList(pSelect->pProjectionList, walker, pContext); + case SQL_CLAUSE_SELECT: + nodesWalkList(pSelect->pOrderByList, walker, pContext); + case SQL_CLAUSE_ORDER_BY: + default: + break; + } + + return; +} + +void nodesRewriteSelectStmt(SSelectStmt* pSelect, ESqlClause clause, FNodeRewriter rewriter, void* pContext) { + if (NULL == pSelect) { + return; + } + + switch (clause) { + case SQL_CLAUSE_FROM: + nodesRewriteNode(&(pSelect->pFromTable), rewriter, pContext); + nodesRewriteNode(&(pSelect->pWhere), rewriter, pContext); + case SQL_CLAUSE_WHERE: + nodesRewriteList(pSelect->pPartitionByList, rewriter, pContext); + case SQL_CLAUSE_PARTITION_BY: + nodesRewriteNode(&(pSelect->pWindow), rewriter, pContext); + case SQL_CLAUSE_WINDOW: + nodesRewriteList(pSelect->pGroupByList, rewriter, pContext); + case SQL_CLAUSE_GROUP_BY: + nodesRewriteNode(&(pSelect->pHaving), rewriter, pContext); + case SQL_CLAUSE_HAVING: + nodesRewriteList(pSelect->pProjectionList, rewriter, pContext); + case SQL_CLAUSE_SELECT: + nodesRewriteList(pSelect->pOrderByList, rewriter, pContext); + default: + break; + } + + return; +} diff --git a/source/libs/nodes/src/nodesUtilFuncs.c b/source/libs/nodes/src/nodesUtilFuncs.c index d94ef4d378..50ddd14bf5 100644 --- a/source/libs/nodes/src/nodesUtilFuncs.c +++ b/source/libs/nodes/src/nodesUtilFuncs.c @@ -15,7 +15,9 @@ #include "querynodes.h" #include "nodesShowStmts.h" +#include "taos.h" #include "taoserror.h" +#include "thash.h" static SNode* makeNode(ENodeType type, size_t size) { SNode* p = calloc(1, size); @@ -98,14 +100,14 @@ SNodeList* nodesMakeList() { return p; } -SNodeList* nodesListAppend(SNodeList* pList, SNode* pNode) { +int32_t nodesListAppend(SNodeList* pList, SNode* pNode) { if (NULL == pList || NULL == pNode) { - return NULL; + return TSDB_CODE_SUCCESS; } SListCell* p = calloc(1, sizeof(SListCell)); if (NULL == p) { - terrno = TSDB_CODE_TSC_OUT_OF_MEMORY; - return pList; + terrno = TSDB_CODE_OUT_OF_MEMORY; + return TSDB_CODE_OUT_OF_MEMORY; } p->pNode = pNode; if (NULL == pList->pHead) { @@ -116,7 +118,7 @@ SNodeList* nodesListAppend(SNodeList* pList, SNode* pNode) { } pList->pTail = p; ++(pList->length); - return pList; + return TSDB_CODE_SUCCESS; } SListCell* nodesListErase(SNodeList* pList, SListCell* pCell) { @@ -207,4 +209,100 @@ bool nodesIsTimeorderQuery(const SNode* pQuery) { bool nodesIsTimelineQuery(const SNode* pQuery) { return false; -} \ No newline at end of file +} + +typedef struct SCollectColumnsCxt { + int32_t errCode; + uint64_t tableId; + bool realCol; + SNodeList* pCols; + SHashObj* pColIdHash; +} SCollectColumnsCxt; + +static EDealRes doCollect(SCollectColumnsCxt* pCxt, int32_t id, SNode* pNode) { + if (NULL == taosHashGet(pCxt->pColIdHash, &id, sizeof(id))) { + pCxt->errCode = taosHashPut(pCxt->pColIdHash, &id, sizeof(id), NULL, 0); + if (TSDB_CODE_SUCCESS == pCxt->errCode) { + pCxt->errCode = nodesListAppend(pCxt->pCols, pNode); + } + return (TSDB_CODE_SUCCESS == pCxt->errCode ? DEAL_RES_IGNORE_CHILD : DEAL_RES_ERROR); + } + return DEAL_RES_CONTINUE; +} + +static EDealRes collectColumns(SNode* pNode, void* pContext) { + SCollectColumnsCxt* pCxt = (SCollectColumnsCxt*)pContext; + + if (pCxt->realCol && QUERY_NODE_COLUMN == nodeType(pNode)) { + SColumnNode* pCol = (SColumnNode*)pNode; + int32_t colId = pCol->colId; + if (pCxt->tableId == pCol->tableId && colId > 0) { + return doCollect(pCxt, colId, pNode); + } + } else if (!pCxt->realCol && QUERY_NODE_COLUMN_REF == nodeType(pNode)) { + return doCollect(pCxt, ((SColumnRefNode*)pNode)->slotId, pNode); + } + return DEAL_RES_CONTINUE; +} + +int32_t nodesCollectColumns(SSelectStmt* pSelect, ESqlClause clause, uint64_t tableId, bool realCol, SNodeList** pCols) { + if (NULL == pSelect || NULL == pCols) { + return TSDB_CODE_SUCCESS; + } + + SCollectColumnsCxt cxt = { + .errCode = TSDB_CODE_SUCCESS, + .realCol = realCol, + .pCols = nodesMakeList(), + .pColIdHash = taosHashInit(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), true, HASH_NO_LOCK) + }; + if (NULL == cxt.pCols || NULL == cxt.pColIdHash) { + return TSDB_CODE_OUT_OF_MEMORY; + } + + nodesWalkSelectStmt(pSelect, clause, collectColumns, &cxt); + taosHashCleanup(cxt.pColIdHash); + if (TSDB_CODE_SUCCESS != cxt.errCode) { + nodesDestroyList(cxt.pCols); + return cxt.errCode; + } + *pCols = cxt.pCols; + return TSDB_CODE_SUCCESS; +} + +typedef struct SCollectFuncsCxt { + int32_t errCode; + FFuncClassifier classifier; + SNodeList* pFuncs; +} SCollectFuncsCxt; + +static EDealRes collectFuncs(SNode* pNode, void* pContext) { + SCollectFuncsCxt* pCxt = (SCollectFuncsCxt*)pContext; + if (QUERY_NODE_FUNCTION == nodeType(pNode) && pCxt->classifier(((SFunctionNode*)pNode)->funcId)) { + pCxt->errCode = nodesListAppend(pCxt->pFuncs, pNode); + return (TSDB_CODE_SUCCESS == pCxt->errCode ? DEAL_RES_IGNORE_CHILD : DEAL_RES_ERROR); + } + return DEAL_RES_CONTINUE; +} + +int32_t nodesCollectFuncs(SSelectStmt* pSelect, FFuncClassifier classifier, SNodeList** pFuncs) { + if (NULL == pSelect || NULL == pFuncs) { + return TSDB_CODE_SUCCESS; + } + + SCollectFuncsCxt cxt = { + .errCode = TSDB_CODE_SUCCESS, + .classifier = classifier, + .pFuncs = nodesMakeList() + }; + if (NULL == cxt.pFuncs) { + return TSDB_CODE_OUT_OF_MEMORY; + } + nodesWalkSelectStmt(pSelect, SQL_CLAUSE_GROUP_BY, collectFuncs, &cxt); + if (TSDB_CODE_SUCCESS != cxt.errCode) { + nodesDestroyList(cxt.pFuncs); + return cxt.errCode; + } + *pFuncs = cxt.pFuncs; + return TSDB_CODE_SUCCESS; +} diff --git a/source/libs/parser/src/astCreateFuncs.c b/source/libs/parser/src/astCreateFuncs.c index 2615aca7f3..c129ebeef1 100644 --- a/source/libs/parser/src/astCreateFuncs.c +++ b/source/libs/parser/src/astCreateFuncs.c @@ -96,11 +96,17 @@ SToken getTokenFromRawExprNode(SAstCreateContext* pCxt, SNode* pNode) { SNodeList* createNodeList(SAstCreateContext* pCxt, SNode* pNode) { SNodeList* list = nodesMakeList(); CHECK_OUT_OF_MEM(list); - return nodesListAppend(list, pNode); + if (TSDB_CODE_SUCCESS != nodesListAppend(list, pNode)) { + pCxt->valid = false; + } + return list; } SNodeList* addNodeToList(SAstCreateContext* pCxt, SNodeList* pList, SNode* pNode) { - return nodesListAppend(pList, pNode); + if (TSDB_CODE_SUCCESS != nodesListAppend(pList, pNode)) { + pCxt->valid = false; + } + return pList; } SNode* createColumnNode(SAstCreateContext* pCxt, const SToken* pTableAlias, const SToken* pColumnName) { diff --git a/source/libs/parser/src/parserImpl.c b/source/libs/parser/src/parserImpl.c index a2602c42ee..ec53f266bf 100644 --- a/source/libs/parser/src/parserImpl.c +++ b/source/libs/parser/src/parserImpl.c @@ -241,17 +241,6 @@ abort_parse: return cxt.valid ? TSDB_CODE_SUCCESS : TSDB_CODE_FAILED; } -typedef enum ESqlClause { - SQL_CLAUSE_FROM = 1, - SQL_CLAUSE_WHERE, - SQL_CLAUSE_PARTITION_BY, - SQL_CLAUSE_WINDOW, - SQL_CLAUSE_GROUP_BY, - SQL_CLAUSE_HAVING, - SQL_CLAUSE_SELECT, - SQL_CLAUSE_ORDER_BY -} ESqlClause; - static bool afterGroupBy(ESqlClause clause) { return clause > SQL_CLAUSE_GROUP_BY; } @@ -298,7 +287,7 @@ static char* getSyntaxErrFormat(int32_t errCode) { return "Not SELECTed expression"; case TSDB_CODE_PAR_NOT_SINGLE_GROUP: return "Not a single-group group function"; - case TSDB_CODE_PAR_OUT_OF_MEMORY: + case TSDB_CODE_OUT_OF_MEMORY: return "Out of memory"; default: return "Unknown error"; @@ -376,7 +365,7 @@ static void setColumnInfoBySchema(const STableNode* pTable, const SSchema* pColS static void setColumnInfoByExpr(const STableNode* pTable, SExprNode* pExpr, SColumnNode* pCol) { pCol->pProjectRef = (SNode*)pExpr; - pExpr->pAssociationList = nodesListAppend(pExpr->pAssociationList, (SNode*)pCol); + nodesListAppend(pExpr->pAssociationList, (SNode*)pCol); if (NULL != pTable) { strcpy(pCol->tableAlias, pTable->tableAlias); } @@ -391,7 +380,7 @@ static int32_t createColumnNodeByTable(STranslateContext* pCxt, const STableNode for (int32_t i = 0; i < nums; ++i) { SColumnNode* pCol = (SColumnNode*)nodesMakeNode(QUERY_NODE_COLUMN); if (NULL == pCol) { - return generateSyntaxErrMsg(pCxt, TSDB_CODE_PAR_OUT_OF_MEMORY); + return generateSyntaxErrMsg(pCxt, TSDB_CODE_OUT_OF_MEMORY); } setColumnInfoBySchema(pTable, pMeta->schema + i, pCol); nodesListAppend(pList, (SNode*)pCol); @@ -402,7 +391,7 @@ static int32_t createColumnNodeByTable(STranslateContext* pCxt, const STableNode FOREACH(pNode, pProjectList) { SColumnNode* pCol = (SColumnNode*)nodesMakeNode(QUERY_NODE_COLUMN); if (NULL == pCol) { - return generateSyntaxErrMsg(pCxt, TSDB_CODE_PAR_OUT_OF_MEMORY); + return generateSyntaxErrMsg(pCxt, TSDB_CODE_OUT_OF_MEMORY); } setColumnInfoByExpr(pTable, (SExprNode*)pNode, pCol); nodesListAppend(pList, (SNode*)pCol); @@ -572,7 +561,7 @@ static EDealRes translateValue(STranslateContext* pCxt, SValueNode* pVal) { int32_t n = strlen(pVal->literal); pVal->datum.p = calloc(1, n); if (NULL == pVal->datum.p) { - generateSyntaxErrMsg(pCxt, TSDB_CODE_PAR_OUT_OF_MEMORY); + generateSyntaxErrMsg(pCxt, TSDB_CODE_OUT_OF_MEMORY); return DEAL_RES_ERROR; } trimStringCopy(pVal->literal, n, pVal->datum.p); @@ -582,7 +571,7 @@ static EDealRes translateValue(STranslateContext* pCxt, SValueNode* pVal) { int32_t n = strlen(pVal->literal); char* tmp = calloc(1, n); if (NULL == tmp) { - generateSyntaxErrMsg(pCxt, TSDB_CODE_PAR_OUT_OF_MEMORY); + generateSyntaxErrMsg(pCxt, TSDB_CODE_OUT_OF_MEMORY); return DEAL_RES_ERROR; } int32_t len = trimStringCopy(pVal->literal, n, tmp); @@ -830,7 +819,7 @@ static int32_t translateStar(STranslateContext* pCxt, SSelectStmt* pSelect, bool size_t nums = taosArrayGetSize(pTables); pSelect->pProjectionList = nodesMakeList(); if (NULL == pSelect->pProjectionList) { - return generateSyntaxErrMsg(pCxt, TSDB_CODE_PAR_OUT_OF_MEMORY); + return generateSyntaxErrMsg(pCxt, TSDB_CODE_OUT_OF_MEMORY); } for (size_t i = 0; i < nums; ++i) { STableNode* pTable = taosArrayGetP(pTables, i); @@ -897,7 +886,7 @@ static int32_t translateOrderByPosition(STranslateContext* pCxt, SNodeList* pPro } else { SColumnNode* pCol = (SColumnNode*)nodesMakeNode(QUERY_NODE_COLUMN); if (NULL == pCol) { - return generateSyntaxErrMsg(pCxt, TSDB_CODE_PAR_OUT_OF_MEMORY); + return generateSyntaxErrMsg(pCxt, TSDB_CODE_OUT_OF_MEMORY); } setColumnInfoByExpr(NULL, (SExprNode*)nodesListGetNode(pProjectionList, pos - 1), pCol); ((SOrderByExprNode*)pNode)->pExpr = (SNode*)pCol; @@ -1036,7 +1025,7 @@ int32_t setReslutSchema(STranslateContext* pCxt, SQuery* pQuery) { pQuery->numOfResCols = LIST_LENGTH(pSelect->pProjectionList); pQuery->pResSchema = calloc(pQuery->numOfResCols, sizeof(SSchema)); if (NULL == pQuery->pResSchema) { - return generateSyntaxErrMsg(pCxt, TSDB_CODE_PAR_OUT_OF_MEMORY); + return generateSyntaxErrMsg(pCxt, TSDB_CODE_OUT_OF_MEMORY); } SNode* pNode; int32_t index = 0; diff --git a/source/libs/planner/inc/plannerImpl.h b/source/libs/planner/inc/plannerImpl.h index 1f8df990b1..dbfbeb7efc 100644 --- a/source/libs/planner/inc/plannerImpl.h +++ b/source/libs/planner/inc/plannerImpl.h @@ -25,6 +25,7 @@ extern "C" { typedef struct SLogicNode { ENodeType type; + int32_t id; SNodeList* pTargets; SNode* pConditions; SNodeList* pChildren; diff --git a/source/libs/planner/src/plannerImpl.c b/source/libs/planner/src/plannerImpl.c index ddb3023bb3..9b82b4d58e 100644 --- a/source/libs/planner/src/plannerImpl.c +++ b/source/libs/planner/src/plannerImpl.c @@ -16,71 +16,32 @@ #include "plannerImpl.h" #include "functionMgt.h" -static SLogicNode* createQueryLogicNode(SNode* pStmt); +#define CHECK_ALLOC(p, res) \ + do { \ + if (NULL == p) { \ + pCxt->errCode = TSDB_CODE_OUT_OF_MEMORY; \ + return res; \ + } \ + } while (0) -typedef struct SCollectColumnsCxt { - SNodeList* pCols; - SHashObj* pColIdHash; -} SCollectColumnsCxt; +#define CHECK_CODE(exec, res) \ + do { \ + int32_t code = exec; \ + if (TSDB_CODE_SUCCESS != code) { \ + pCxt->errCode = code; \ + return res; \ + } \ + } while (0) -static EDealRes doCollectColumns(SNode* pNode, void* pContext) { - if (QUERY_NODE_COLUMN == nodeType(pNode)) { - SCollectColumnsCxt* pCxt = (SCollectColumnsCxt*)pContext; - int16_t colId = ((SColumnNode*)pNode)->colId; - if (colId > 0) { - if (NULL == taosHashGet(pCxt->pColIdHash, &colId, sizeof(colId))) { - taosHashPut(pCxt->pColIdHash, &colId, sizeof(colId), NULL, 0); - nodesListAppend(pCxt->pCols, pNode); - } - } - } - return DEAL_RES_CONTINUE; -} - -static SNodeList* collectColumns(SSelectStmt* pSelect) { - SCollectColumnsCxt cxt = { .pCols = nodesMakeList(), .pColIdHash = taosHashInit(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), true, HASH_NO_LOCK) }; - if (NULL == cxt.pCols || NULL == cxt.pColIdHash) { - return NULL; - } - nodesWalkNode(pSelect->pFromTable, doCollectColumns, &cxt); - nodesWalkNode(pSelect->pWhere, doCollectColumns, &cxt); - nodesWalkList(pSelect->pPartitionByList, doCollectColumns, &cxt); - nodesWalkNode(pSelect->pWindow, doCollectColumns, &cxt); - nodesWalkList(pSelect->pGroupByList, doCollectColumns, &cxt); - nodesWalkNode(pSelect->pHaving, doCollectColumns, &cxt); - nodesWalkList(pSelect->pProjectionList, doCollectColumns, &cxt); - nodesWalkList(pSelect->pOrderByList, doCollectColumns, &cxt); - taosHashCleanup(cxt.pColIdHash); - return cxt.pCols; -} - -typedef struct SCollectAggFuncsCxt { - SNodeList* pAggFuncs; -} SCollectAggFuncsCxt; - -static EDealRes doCollectAggFuncs(SNode* pNode, void* pContext) { - if (QUERY_NODE_FUNCTION == nodeType(pNode) && fmIsAggFunc(((SFunctionNode*)pNode)->funcId)) { - SCollectAggFuncsCxt* pCxt = (SCollectAggFuncsCxt*)pContext; - nodesListAppend(pCxt->pAggFuncs, pNode); - return DEAL_RES_IGNORE_CHILD; - } - return DEAL_RES_CONTINUE; -} - -static SNodeList* collectAggFuncs(SSelectStmt* pSelect) { - SCollectAggFuncsCxt cxt = { .pAggFuncs = nodesMakeList() }; - if (NULL == cxt.pAggFuncs) { - return NULL; - } - nodesWalkNode(pSelect->pHaving, doCollectAggFuncs, &cxt); - nodesWalkList(pSelect->pProjectionList, doCollectAggFuncs, &cxt); - if (!pSelect->isDistinct) { - nodesWalkList(pSelect->pOrderByList, doCollectAggFuncs, &cxt); - } - return cxt.pAggFuncs; -} +typedef struct SPlanContext { + int32_t errCode; + int32_t planNodeId; + SNodeList* pResource; +} SPlanContext; typedef struct SRewriteExprCxt { + int32_t errCode; + int32_t planNodeId; SNodeList* pTargets; } SRewriteExprCxt; @@ -90,9 +51,15 @@ static EDealRes doRewriteExpr(SNode** pNode, void* pContext) { int32_t index = 0; FOREACH(pTarget, pCxt->pTargets) { if (nodesEqualNode(pTarget, *pNode)) { + SColumnRefNode* pCol = (SColumnRefNode*)nodesMakeNode(QUERY_NODE_COLUMN_REF); + if (NULL == pCol) { + pCxt->errCode = TSDB_CODE_OUT_OF_MEMORY; + return DEAL_RES_ERROR; + } + pCol->tupleId = pCxt->planNodeId; + pCol->slotId = index; nodesDestroyNode(*pNode); - *pNode = nodesMakeNode(QUERY_NODE_COLUMN_REF); - ((SColumnRef*)*pNode)->slotId = index; + *pNode = (SNode*)pCol; return DEAL_RES_IGNORE_CHILD; } ++index; @@ -100,59 +67,93 @@ static EDealRes doRewriteExpr(SNode** pNode, void* pContext) { return DEAL_RES_CONTINUE; } -static int32_t rewriteExpr(SNodeList* pTargets, SSelectStmt* pSelect) { - SRewriteExprCxt cxt = { .pTargets = pTargets }; - nodesRewriteNode(&(pSelect->pFromTable), doRewriteExpr, &cxt); - nodesRewriteNode(&(pSelect->pWhere), doRewriteExpr, &cxt); - nodesRewriteList(pSelect->pPartitionByList, doRewriteExpr, &cxt); - nodesRewriteNode(&(pSelect->pWindow), doRewriteExpr, &cxt); - nodesRewriteList(pSelect->pGroupByList, doRewriteExpr, &cxt); - nodesRewriteNode(&(pSelect->pHaving), doRewriteExpr, &cxt); - nodesRewriteList(pSelect->pProjectionList, doRewriteExpr, &cxt); - nodesRewriteList(pSelect->pOrderByList, doRewriteExpr, &cxt); - return TSDB_CODE_SUCCESS; +static int32_t rewriteExpr(int32_t planNodeId, SNodeList* pTargets, SSelectStmt* pSelect, ESqlClause clause) { + SRewriteExprCxt cxt = { .errCode = TSDB_CODE_SUCCESS, .planNodeId = planNodeId, .pTargets = pTargets }; + nodesRewriteSelectStmt(pSelect, clause, doRewriteExpr, &cxt); + return cxt.errCode; } -static SLogicNode* pushLogicNode(SLogicNode* pRoot, SLogicNode* pNode) { +static SLogicNode* pushLogicNode(SPlanContext* pCxt, SLogicNode* pRoot, SLogicNode* pNode) { + if (TSDB_CODE_SUCCESS != pCxt->errCode) { + goto error; + } + if (NULL == pRoot) { return pNode; } + if (NULL == pNode) { return pRoot; } - pRoot->pParent = pNode; + if (NULL == pNode->pChildren) { pNode->pChildren = nodesMakeList(); + if (NULL == pNode->pChildren) { + goto error; + } } - nodesListAppend(pNode->pChildren, (SNode*)pRoot); + if (TSDB_CODE_SUCCESS != nodesListAppend(pNode->pChildren, (SNode*)pRoot)) { + goto error; + } + pRoot->pParent = pNode; return pNode; +error: + nodesDestroyNode((SNode*)pNode); + return pRoot; } -static SNodeList* createScanTargets(SNodeList* pCols) { - +static SNodeList* createScanTargets(int32_t planNodeId, int32_t numOfScanCols) { + SNodeList* pTargets = nodesMakeList(); + if (NULL == pTargets) { + return NULL; + } + for (int32_t i = 0; i < numOfScanCols; ++i) { + SColumnRefNode* pCol = (SColumnRefNode*)nodesMakeNode(QUERY_NODE_COLUMN_REF); + if (NULL == pCol || TSDB_CODE_SUCCESS != nodesListAppend(pTargets, (SNode*)pCol)) { + nodesDestroyList(pTargets); + return NULL; + } + pCol->tupleId = planNodeId; + pCol->slotId = i; + } + return pTargets; } -static SLogicNode* createScanLogicNode(SSelectStmt* pSelect, SRealTableNode* pRealTable) { +static SLogicNode* createScanLogicNode(SPlanContext* pCxt, SSelectStmt* pSelect, SRealTableNode* pRealTable) { SScanLogicNode* pScan = (SScanLogicNode*)nodesMakeNode(QUERY_NODE_LOGIC_PLAN_SCAN); - SNodeList* pCols = collectColumns(pSelect); - pScan->pScanCols = nodesCloneList(pCols); - // - rewriteExpr(pScan->pScanCols, pSelect); - pScan->node.pTargets = createScanTargets(pCols); + CHECK_ALLOC(pScan, NULL); + pScan->node.id = pCxt->planNodeId++; + pScan->pMeta = pRealTable->pMeta; + + // set columns to scan + SNodeList* pCols = NULL; + CHECK_CODE(nodesCollectColumns(pSelect, SQL_CLAUSE_FROM, pScan->pMeta->uid, true, &pCols), (SLogicNode*)pScan); + pScan->pScanCols = nodesCloneList(pCols); + CHECK_ALLOC(pScan->pScanCols, (SLogicNode*)pScan); + + // pScanCols of SScanLogicNode is equivalent to pTargets of other logic nodes + CHECK_CODE(rewriteExpr(pScan->node.id, pScan->pScanCols, pSelect, SQL_CLAUSE_FROM), (SLogicNode*)pScan); + + // set output + pScan->node.pTargets = createScanTargets(pScan->node.id, LIST_LENGTH(pScan->pScanCols)); + CHECK_ALLOC(pScan->node.pTargets, (SLogicNode*)pScan); + return (SLogicNode*)pScan; } -static SLogicNode* createSubqueryLogicNode(SSelectStmt* pSelect, STempTableNode* pTable) { - return createQueryLogicNode(pTable->pSubquery); +static SLogicNode* createQueryLogicNode(SPlanContext* pCxt, SNode* pStmt); + +static SLogicNode* createSubqueryLogicNode(SPlanContext* pCxt, SSelectStmt* pSelect, STempTableNode* pTable) { + return createQueryLogicNode(pCxt, pTable->pSubquery); } -static SLogicNode* createLogicNodeByTable(SSelectStmt* pSelect, SNode* pTable) { +static SLogicNode* createLogicNodeByTable(SPlanContext* pCxt, SSelectStmt* pSelect, SNode* pTable) { switch (nodeType(pTable)) { case QUERY_NODE_REAL_TABLE: - return createScanLogicNode(pSelect, (SRealTableNode*)pTable); + return createScanLogicNode(pCxt, pSelect, (SRealTableNode*)pTable); case QUERY_NODE_TEMP_TABLE: - return createSubqueryLogicNode(pSelect, (STempTableNode*)pTable); + return createSubqueryLogicNode(pCxt, pSelect, (STempTableNode*)pTable); case QUERY_NODE_JOIN_TABLE: default: break; @@ -160,45 +161,86 @@ static SLogicNode* createLogicNodeByTable(SSelectStmt* pSelect, SNode* pTable) { return NULL; } -static SLogicNode* createFilterLogicNode(SNode* pWhere) { +static SLogicNode* createFilterLogicNode(SPlanContext* pCxt, SSelectStmt* pSelect, SNode* pWhere) { if (NULL == pWhere) { return NULL; } + SFilterLogicNode* pFilter = (SFilterLogicNode*)nodesMakeNode(QUERY_NODE_LOGIC_PLAN_FILTER); + CHECK_ALLOC(pFilter, NULL); + pFilter->node.id = pCxt->planNodeId++; + + // set filter conditions pFilter->node.pConditions = nodesCloneNode(pWhere); + CHECK_ALLOC(pFilter->node.pConditions, (SLogicNode*)pFilter); + + // set the output and rewrite the expression in subsequent clauses with the output + SNodeList* pCols = NULL; + CHECK_CODE(nodesCollectColumns(pSelect, SQL_CLAUSE_WHERE, 0, false, &pCols), (SLogicNode*)pFilter); + pFilter->node.pTargets = nodesCloneList(pCols); + CHECK_ALLOC(pFilter->node.pTargets, (SLogicNode*)pFilter); + CHECK_CODE(rewriteExpr(pFilter->node.id, pFilter->node.pTargets, pSelect, SQL_CLAUSE_WHERE), (SLogicNode*)pFilter); + return (SLogicNode*)pFilter; } -static SLogicNode* createAggLogicNode(SSelectStmt* pSelect, SNodeList* pGroupByList, SNode* pHaving) { - SNodeList* pAggFuncs = collectAggFuncs(pSelect); +static SLogicNode* createAggLogicNode(SPlanContext* pCxt, SSelectStmt* pSelect, SNodeList* pGroupByList, SNode* pHaving) { + SNodeList* pAggFuncs = NULL; + CHECK_CODE(nodesCollectFuncs(pSelect, fmIsAggFunc, &pAggFuncs), NULL); if (NULL == pAggFuncs && NULL == pGroupByList) { return NULL; } + SAggLogicNode* pAgg = (SAggLogicNode*)nodesMakeNode(QUERY_NODE_LOGIC_PLAN_AGG); + CHECK_ALLOC(pAgg, NULL); + pAgg->node.id = pCxt->planNodeId++; + + // set grouyp keys, agg funcs and having conditions pAgg->pGroupKeys = nodesCloneList(pGroupByList); + CHECK_ALLOC(pAgg->pGroupKeys, (SLogicNode*)pAgg); pAgg->pAggFuncs = nodesCloneList(pAggFuncs); + CHECK_ALLOC(pAgg->pAggFuncs, (SLogicNode*)pAgg); pAgg->node.pConditions = nodesCloneNode(pHaving); + CHECK_ALLOC(pAgg->node.pConditions, (SLogicNode*)pAgg); + + // set the output and rewrite the expression in subsequent clauses with the output + SNodeList* pCols = NULL; + CHECK_CODE(nodesCollectColumns(pSelect, SQL_CLAUSE_HAVING, 0, false, &pCols), (SLogicNode*)pAgg); + pAgg->node.pTargets = nodesCloneList(pCols); + CHECK_ALLOC(pAgg->node.pTargets, (SLogicNode*)pAgg); + CHECK_CODE(rewriteExpr(pAgg->node.id, pAgg->node.pTargets, pSelect, SQL_CLAUSE_HAVING), (SLogicNode*)pAgg); + return (SLogicNode*)pAgg; } -static SLogicNode* createSelectLogicNode(SSelectStmt* pSelect) { - SLogicNode* pRoot = createLogicNodeByTable(pSelect, pSelect->pFromTable); - pRoot = pushLogicNode(pRoot, createFilterLogicNode(pSelect->pWhere)); - pRoot = pushLogicNode(pRoot, createAggLogicNode(pSelect, pSelect->pGroupByList, pSelect->pHaving)); - // pRoot = pushLogicNode(pRoot, createProjectLogicNode(pSelect, pSelect->pProjectionList)); +static SLogicNode* createSelectLogicNode(SPlanContext* pCxt, SSelectStmt* pSelect) { + SLogicNode* pRoot = createLogicNodeByTable(pCxt, pSelect, pSelect->pFromTable); + if (TSDB_CODE_SUCCESS == pCxt->errCode) { + pRoot = pushLogicNode(pCxt, pRoot, createFilterLogicNode(pCxt, pSelect, pSelect->pWhere)); + } + if (TSDB_CODE_SUCCESS == pCxt->errCode) { + pRoot = pushLogicNode(pCxt, pRoot, createAggLogicNode(pCxt, pSelect, pSelect->pGroupByList, pSelect->pHaving)); + } + // pRoot = pushLogicNode(pCxt, pRoot, createProjectLogicNode(pSelect, pSelect->pProjectionList)); return pRoot; } -static SLogicNode* createQueryLogicNode(SNode* pStmt) { +static SLogicNode* createQueryLogicNode(SPlanContext* pCxt, SNode* pStmt) { switch (nodeType(pStmt)) { case QUERY_NODE_SELECT_STMT: - return createSelectLogicNode((SSelectStmt*)pStmt); + return createSelectLogicNode(pCxt, (SSelectStmt*)pStmt); default: break; } } int32_t createLogicPlan(SNode* pNode, SLogicNode** pLogicNode) { - *pLogicNode = createQueryLogicNode(pNode); + SPlanContext cxt = { .errCode = TSDB_CODE_SUCCESS, .planNodeId = 0 }; + SLogicNode* pRoot = createQueryLogicNode(&cxt, pNode); + if (TSDB_CODE_SUCCESS != cxt.errCode) { + nodesDestroyNode((SNode*)pRoot); + return cxt.errCode; + } + *pLogicNode = pRoot; return TSDB_CODE_SUCCESS; } From 2624a81a30f1ad8affdb602b1dbaa568245c6ffb Mon Sep 17 00:00:00 2001 From: Xiaoyu Wang Date: Sat, 12 Feb 2022 18:47:47 -0500 Subject: [PATCH 02/17] TD-13495 planner refactoring --- include/common/tmsg.h | 1 + include/common/ttokendef.h | 161 +- include/libs/nodes/nodes.h | 4 +- source/common/src/tmsg.c | 2 + source/libs/parser/inc/astGenerator.h | 1 + source/libs/parser/inc/sql.y | 2 + source/libs/parser/src/astToMsg.c | 1 + source/libs/parser/src/parserImpl.c | 13 +- source/libs/parser/src/sql.c | 2845 +++++++++++++------------ source/libs/parser/src/ttokenizer.c | 1 + source/libs/planner/inc/plannerImpl.h | 10 + source/libs/planner/src/plannerImpl.c | 79 +- 12 files changed, 1631 insertions(+), 1489 deletions(-) diff --git a/include/common/tmsg.h b/include/common/tmsg.h index 7337f1afb8..55e16a1886 100644 --- a/include/common/tmsg.h +++ b/include/common/tmsg.h @@ -524,6 +524,7 @@ typedef struct { int8_t update; int8_t cacheLastRow; int8_t ignoreExist; + int8_t streamMode; } SCreateDbReq; int32_t tSerializeSCreateDbReq(void* buf, int32_t bufLen, SCreateDbReq* pReq); diff --git a/include/common/ttokendef.h b/include/common/ttokendef.h index 98903f5617..7501f61983 100644 --- a/include/common/ttokendef.h +++ b/include/common/ttokendef.h @@ -126,86 +126,87 @@ #define TK_PRECISION 108 #define TK_UPDATE 109 #define TK_CACHELAST 110 -#define TK_UNSIGNED 111 -#define TK_TAGS 112 -#define TK_USING 113 -#define TK_NULL 114 -#define TK_NOW 115 -#define TK_SELECT 116 -#define TK_UNION 117 -#define TK_ALL 118 -#define TK_DISTINCT 119 -#define TK_FROM 120 -#define TK_VARIABLE 121 -#define TK_INTERVAL 122 -#define TK_EVERY 123 -#define TK_SESSION 124 -#define TK_STATE_WINDOW 125 -#define TK_FILL 126 -#define TK_SLIDING 127 -#define TK_ORDER 128 -#define TK_BY 129 -#define TK_ASC 130 -#define TK_GROUP 131 -#define TK_HAVING 132 -#define TK_LIMIT 133 -#define TK_OFFSET 134 -#define TK_SLIMIT 135 -#define TK_SOFFSET 136 -#define TK_WHERE 137 -#define TK_RESET 138 -#define TK_QUERY 139 -#define TK_SYNCDB 140 -#define TK_ADD 141 -#define TK_COLUMN 142 -#define TK_MODIFY 143 -#define TK_TAG 144 -#define TK_CHANGE 145 -#define TK_SET 146 -#define TK_KILL 147 -#define TK_CONNECTION 148 -#define TK_STREAM 149 -#define TK_COLON 150 -#define TK_ABORT 151 -#define TK_AFTER 152 -#define TK_ATTACH 153 -#define TK_BEFORE 154 -#define TK_BEGIN 155 -#define TK_CASCADE 156 -#define TK_CLUSTER 157 -#define TK_CONFLICT 158 -#define TK_COPY 159 -#define TK_DEFERRED 160 -#define TK_DELIMITERS 161 -#define TK_DETACH 162 -#define TK_EACH 163 -#define TK_END 164 -#define TK_EXPLAIN 165 -#define TK_FAIL 166 -#define TK_FOR 167 -#define TK_IGNORE 168 -#define TK_IMMEDIATE 169 -#define TK_INITIALLY 170 -#define TK_INSTEAD 171 -#define TK_KEY 172 -#define TK_OF 173 -#define TK_RAISE 174 -#define TK_REPLACE 175 -#define TK_RESTRICT 176 -#define TK_ROW 177 -#define TK_STATEMENT 178 -#define TK_TRIGGER 179 -#define TK_VIEW 180 -#define TK_SEMI 181 -#define TK_NONE 182 -#define TK_PREV 183 -#define TK_LINEAR 184 -#define TK_IMPORT 185 -#define TK_TBNAME 186 -#define TK_JOIN 187 -#define TK_INSERT 188 -#define TK_INTO 189 -#define TK_VALUES 190 +#define TK_STREAM 111 +#define TK_MODE 112 +#define TK_UNSIGNED 113 +#define TK_TAGS 114 +#define TK_USING 115 +#define TK_NULL 116 +#define TK_NOW 117 +#define TK_SELECT 118 +#define TK_UNION 119 +#define TK_ALL 120 +#define TK_DISTINCT 121 +#define TK_FROM 122 +#define TK_VARIABLE 123 +#define TK_INTERVAL 124 +#define TK_EVERY 125 +#define TK_SESSION 126 +#define TK_STATE_WINDOW 127 +#define TK_FILL 128 +#define TK_SLIDING 129 +#define TK_ORDER 130 +#define TK_BY 131 +#define TK_ASC 132 +#define TK_GROUP 133 +#define TK_HAVING 134 +#define TK_LIMIT 135 +#define TK_OFFSET 136 +#define TK_SLIMIT 137 +#define TK_SOFFSET 138 +#define TK_WHERE 139 +#define TK_RESET 140 +#define TK_QUERY 141 +#define TK_SYNCDB 142 +#define TK_ADD 143 +#define TK_COLUMN 144 +#define TK_MODIFY 145 +#define TK_TAG 146 +#define TK_CHANGE 147 +#define TK_SET 148 +#define TK_KILL 149 +#define TK_CONNECTION 150 +#define TK_COLON 151 +#define TK_ABORT 152 +#define TK_AFTER 153 +#define TK_ATTACH 154 +#define TK_BEFORE 155 +#define TK_BEGIN 156 +#define TK_CASCADE 157 +#define TK_CLUSTER 158 +#define TK_CONFLICT 159 +#define TK_COPY 160 +#define TK_DEFERRED 161 +#define TK_DELIMITERS 162 +#define TK_DETACH 163 +#define TK_EACH 164 +#define TK_END 165 +#define TK_EXPLAIN 166 +#define TK_FAIL 167 +#define TK_FOR 168 +#define TK_IGNORE 169 +#define TK_IMMEDIATE 170 +#define TK_INITIALLY 171 +#define TK_INSTEAD 172 +#define TK_KEY 173 +#define TK_OF 174 +#define TK_RAISE 175 +#define TK_REPLACE 176 +#define TK_RESTRICT 177 +#define TK_ROW 178 +#define TK_STATEMENT 179 +#define TK_TRIGGER 180 +#define TK_VIEW 181 +#define TK_SEMI 182 +#define TK_NONE 183 +#define TK_PREV 184 +#define TK_LINEAR 185 +#define TK_IMPORT 186 +#define TK_TBNAME 187 +#define TK_JOIN 188 +#define TK_INSERT 189 +#define TK_INTO 190 +#define TK_VALUES 191 #define NEW_TK_OR 1 #define NEW_TK_AND 2 diff --git a/include/libs/nodes/nodes.h b/include/libs/nodes/nodes.h index 1ea1f0316a..302e5b03ac 100644 --- a/include/libs/nodes/nodes.h +++ b/include/libs/nodes/nodes.h @@ -72,8 +72,10 @@ typedef enum ENodeType { QUERY_NODE_SHOW_STMT, QUERY_NODE_LOGIC_PLAN_SCAN, + QUERY_NODE_LOGIC_PLAN_JOIN, QUERY_NODE_LOGIC_PLAN_FILTER, - QUERY_NODE_LOGIC_PLAN_AGG + QUERY_NODE_LOGIC_PLAN_AGG, + QUERY_NODE_LOGIC_PLAN_PROJECT } ENodeType; /** diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c index 3806227803..5e87ea5e55 100644 --- a/source/common/src/tmsg.c +++ b/source/common/src/tmsg.c @@ -1275,6 +1275,7 @@ int32_t tSerializeSCreateDbReq(void *buf, int32_t bufLen, SCreateDbReq *pReq) { if (tEncodeI8(&encoder, pReq->update) < 0) return -1; if (tEncodeI8(&encoder, pReq->cacheLastRow) < 0) return -1; if (tEncodeI8(&encoder, pReq->ignoreExist) < 0) return -1; + if (tEncodeI8(&encoder, pReq->streamMode) < 0) return -1; tEndEncode(&encoder); int32_t tlen = encoder.pos; @@ -1307,6 +1308,7 @@ int32_t tDeserializeSCreateDbReq(void *buf, int32_t bufLen, SCreateDbReq *pReq) if (tDecodeI8(&decoder, &pReq->update) < 0) return -1; if (tDecodeI8(&decoder, &pReq->cacheLastRow) < 0) return -1; if (tDecodeI8(&decoder, &pReq->ignoreExist) < 0) return -1; + if (tDecodeI8(&decoder, &pReq->streamMode) < 0) return -1; tEndDecode(&decoder); tCoderClear(&decoder); diff --git a/source/libs/parser/inc/astGenerator.h b/source/libs/parser/inc/astGenerator.h index c601c4e3e3..1327259a51 100644 --- a/source/libs/parser/inc/astGenerator.h +++ b/source/libs/parser/inc/astGenerator.h @@ -170,6 +170,7 @@ typedef struct SCreateDbInfo { int8_t update; int8_t cachelast; SArray *keep; + int8_t streamMode; } SCreateDbInfo; typedef struct SCreateFuncInfo { diff --git a/source/libs/parser/inc/sql.y b/source/libs/parser/inc/sql.y index 1222138b5e..0eb5f37c44 100644 --- a/source/libs/parser/inc/sql.y +++ b/source/libs/parser/inc/sql.y @@ -282,6 +282,7 @@ update(Y) ::= UPDATE INTEGER(X). { Y = X; } cachelast(Y) ::= CACHELAST INTEGER(X). { Y = X; } vgroups(Y) ::= VGROUPS INTEGER(X). { Y = X; } //partitions(Y) ::= PARTITIONS INTEGER(X). { Y = X; } +stream_mode(Y) ::= STREAM MODE INTEGER(X). { Y = X; } %type db_optr {SCreateDbInfo} db_optr(Y) ::= . {setDefaultCreateDbOption(&Y);} @@ -302,6 +303,7 @@ db_optr(Y) ::= db_optr(Z) keep(X). { Y = Z; Y.keep = X; } db_optr(Y) ::= db_optr(Z) update(X). { Y = Z; Y.update = strtol(X.z, NULL, 10); } db_optr(Y) ::= db_optr(Z) cachelast(X). { Y = Z; Y.cachelast = strtol(X.z, NULL, 10); } db_optr(Y) ::= db_optr(Z) vgroups(X). { Y = Z; Y.numOfVgroups = strtol(X.z, NULL, 10); } +db_optr(Y) ::= db_optr(Z) stream_mode(X). { Y = Z; Y.streamMode = strtol(X.z, NULL, 10); } //%type topic_optr {SCreateDbInfo} // diff --git a/source/libs/parser/src/astToMsg.c b/source/libs/parser/src/astToMsg.c index 0b4867de03..963255527a 100644 --- a/source/libs/parser/src/astToMsg.c +++ b/source/libs/parser/src/astToMsg.c @@ -242,6 +242,7 @@ static void doSetDbOptions(SCreateDbReq* pMsg, const SCreateDbInfo* pCreateDb) { pMsg->update = pCreateDb->update; pMsg->cacheLastRow = pCreateDb->cachelast; pMsg->numOfVgroups = pCreateDb->numOfVgroups; + pMsg->streamMode = pCreateDb->streamMode; } int32_t setDbOptions(SCreateDbReq* pCreateDbMsg, const SCreateDbInfo* pCreateDbSql, SMsgBuf* pMsgBuf) { diff --git a/source/libs/parser/src/parserImpl.c b/source/libs/parser/src/parserImpl.c index ec53f266bf..6f80412bfc 100644 --- a/source/libs/parser/src/parserImpl.c +++ b/source/libs/parser/src/parserImpl.c @@ -349,14 +349,15 @@ static SNodeList* getProjectList(SNode* pNode) { return NULL; } -static void setColumnInfoBySchema(const STableNode* pTable, const SSchema* pColSchema, SColumnNode* pCol) { - strcpy(pCol->dbName, pTable->dbName); - strcpy(pCol->tableAlias, pTable->tableAlias); - strcpy(pCol->tableName, pTable->tableName); +static void setColumnInfoBySchema(const SRealTableNode* pTable, const SSchema* pColSchema, SColumnNode* pCol) { + strcpy(pCol->dbName, pTable->table.dbName); + strcpy(pCol->tableAlias, pTable->table.tableAlias); + strcpy(pCol->tableName, pTable->table.tableName); strcpy(pCol->colName, pColSchema->name); if ('\0' == pCol->node.aliasName[0]) { strcpy(pCol->node.aliasName, pColSchema->name); } + pCol->tableId = pTable->pMeta->uid; pCol->colId = pColSchema->colId; // pCol->colType = pColSchema->type; pCol->node.resType.type = pColSchema->type; @@ -382,7 +383,7 @@ static int32_t createColumnNodeByTable(STranslateContext* pCxt, const STableNode if (NULL == pCol) { return generateSyntaxErrMsg(pCxt, TSDB_CODE_OUT_OF_MEMORY); } - setColumnInfoBySchema(pTable, pMeta->schema + i, pCol); + setColumnInfoBySchema((SRealTableNode*)pTable, pMeta->schema + i, pCol); nodesListAppend(pList, (SNode*)pCol); } } else { @@ -407,7 +408,7 @@ static bool findAndSetColumn(SColumnNode* pCol, const STableNode* pTable) { int32_t nums = pMeta->tableInfo.numOfTags + pMeta->tableInfo.numOfColumns; for (int32_t i = 0; i < nums; ++i) { if (0 == strcmp(pCol->colName, pMeta->schema[i].name)) { - setColumnInfoBySchema(pTable, pMeta->schema + i, pCol); + setColumnInfoBySchema((SRealTableNode*)pTable, pMeta->schema + i, pCol); found = true; break; } diff --git a/source/libs/parser/src/sql.c b/source/libs/parser/src/sql.c index 664f2a3ff2..b13acf1000 100644 --- a/source/libs/parser/src/sql.c +++ b/source/libs/parser/src/sql.c @@ -23,6 +23,7 @@ ** input grammar file: */ #include +#include /************ Begin %include sections from the grammar ************************/ #include @@ -76,8 +77,10 @@ ** zero the stack is dynamically sized using realloc() ** ParseARG_SDECL A static variable declaration for the %extra_argument ** ParseARG_PDECL A parameter declaration for the %extra_argument +** ParseARG_PARAM Code to pass %extra_argument as a subroutine parameter ** ParseARG_STORE Code to store %extra_argument into yypParser ** ParseARG_FETCH Code to extract %extra_argument from yypParser +** ParseCTX_* As ParseARG_ except for %extra_context ** YYERRORSYMBOL is the code number of the error symbol. If not ** defined, then do no error processing. ** YYNSTATE the combined number of states. @@ -103,45 +106,52 @@ typedef union { int yyinit; ParseTOKENTYPE yy0; - SWindowStateVal yy6; - SRelationInfo* yy10; - SCreateDbInfo yy16; - int32_t yy46; - int yy47; - SSessionWindowVal yy97; - SField yy106; - SCreatedTableInfo yy150; - SArray* yy165; - tSqlExpr* yy202; - int64_t yy207; - SCreateAcctInfo yy211; - SSqlNode* yy278; - SCreateTableSql* yy326; - SLimit yy367; - SVariant yy425; - SSubclause* yy503; - SIntervalVal yy532; + SVariant yy1; + SField yy16; + int yy40; + SIntervalVal yy52; + int64_t yy61; + SSubclause* yy93; + SWindowStateVal yy112; + SRelationInfo* yy160; + SCreatedTableInfo yy184; + SSqlNode* yy185; + SArray* yy225; + tSqlExpr* yy226; + SCreateDbInfo yy326; + int32_t yy460; + SSessionWindowVal yy463; + SCreateTableSql* yy482; + SLimit yy495; + SCreateAcctInfo yy523; } YYMINORTYPE; #ifndef YYSTACKDEPTH #define YYSTACKDEPTH 100 #endif #define ParseARG_SDECL SSqlInfo* pInfo; #define ParseARG_PDECL ,SSqlInfo* pInfo -#define ParseARG_FETCH SSqlInfo* pInfo = yypParser->pInfo -#define ParseARG_STORE yypParser->pInfo = pInfo +#define ParseARG_PARAM ,pInfo +#define ParseARG_FETCH SSqlInfo* pInfo=yypParser->pInfo; +#define ParseARG_STORE yypParser->pInfo=pInfo; +#define ParseCTX_SDECL +#define ParseCTX_PDECL +#define ParseCTX_PARAM +#define ParseCTX_FETCH +#define ParseCTX_STORE #define YYFALLBACK 1 -#define YYNSTATE 366 -#define YYNRULE 302 -#define YYNTOKEN 191 -#define YY_MAX_SHIFT 365 -#define YY_MIN_SHIFTREDUCE 586 -#define YY_MAX_SHIFTREDUCE 887 -#define YY_ERROR_ACTION 888 -#define YY_ACCEPT_ACTION 889 -#define YY_NO_ACTION 890 -#define YY_MIN_REDUCE 891 -#define YY_MAX_REDUCE 1192 +#define YYNSTATE 368 +#define YYNRULE 304 +#define YYNTOKEN 192 +#define YY_MAX_SHIFT 367 +#define YY_MIN_SHIFTREDUCE 590 +#define YY_MAX_SHIFTREDUCE 893 +#define YY_ERROR_ACTION 894 +#define YY_ACCEPT_ACTION 895 +#define YY_NO_ACTION 896 +#define YY_MIN_REDUCE 897 +#define YY_MAX_REDUCE 1200 /************* End control #defines *******************************************/ +#define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0]))) /* Define the yytestcase() macro to be a no-op if is not already defined ** otherwise. @@ -206,292 +216,294 @@ typedef union { ** yy_default[] Default action for each state. ** *********** Begin parsing tables **********************************************/ -#define YY_ACTTAB_COUNT (777) +#define YY_ACTTAB_COUNT (781) static const YYACTIONTYPE yy_action[] = { - /* 0 */ 249, 637, 637, 1077, 83, 717, 248, 55, 56, 88, - /* 10 */ 59, 60, 364, 230, 252, 49, 48, 47, 78, 58, - /* 20 */ 323, 63, 61, 64, 62, 236, 1054, 889, 365, 54, - /* 30 */ 53, 343, 342, 52, 51, 50, 253, 55, 56, 242, - /* 40 */ 59, 60, 1027, 1042, 252, 49, 48, 47, 104, 58, - /* 50 */ 323, 63, 61, 64, 62, 1014, 637, 1012, 1013, 54, - /* 60 */ 53, 206, 1015, 52, 51, 50, 1016, 206, 1017, 1018, - /* 70 */ 121, 1074, 1169, 55, 56, 1067, 59, 60, 1169, 27, - /* 80 */ 252, 49, 48, 47, 89, 58, 323, 63, 61, 64, - /* 90 */ 62, 206, 39, 274, 246, 54, 53, 206, 1042, 52, - /* 100 */ 51, 50, 1168, 55, 57, 1030, 59, 60, 1169, 824, - /* 110 */ 252, 49, 48, 47, 80, 58, 323, 63, 61, 64, - /* 120 */ 62, 294, 637, 81, 159, 54, 53, 91, 319, 52, - /* 130 */ 51, 50, 104, 1067, 56, 232, 59, 60, 353, 1039, - /* 140 */ 252, 49, 48, 47, 261, 58, 323, 63, 61, 64, - /* 150 */ 62, 233, 43, 124, 79, 54, 53, 80, 39, 52, - /* 160 */ 51, 50, 587, 588, 589, 590, 591, 592, 593, 594, - /* 170 */ 595, 596, 597, 598, 599, 600, 199, 309, 231, 59, - /* 180 */ 60, 939, 1067, 252, 49, 48, 47, 158, 58, 323, - /* 190 */ 63, 61, 64, 62, 353, 43, 280, 279, 54, 53, - /* 200 */ 234, 240, 52, 51, 50, 1039, 14, 1116, 13, 292, - /* 210 */ 42, 317, 359, 358, 316, 315, 314, 357, 313, 312, - /* 220 */ 311, 356, 310, 355, 354, 1007, 995, 996, 997, 998, - /* 230 */ 999, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 1008, 1009, - /* 240 */ 1010, 266, 12, 22, 63, 61, 64, 62, 84, 21, - /* 250 */ 270, 269, 54, 53, 789, 790, 52, 51, 50, 946, - /* 260 */ 215, 113, 251, 839, 828, 831, 834, 216, 753, 750, - /* 270 */ 751, 752, 672, 175, 174, 172, 217, 119, 261, 282, - /* 280 */ 328, 80, 251, 839, 828, 831, 834, 127, 116, 203, - /* 290 */ 228, 229, 255, 39, 324, 257, 258, 745, 742, 743, - /* 300 */ 744, 204, 39, 1036, 3, 32, 131, 261, 209, 260, - /* 310 */ 228, 229, 129, 85, 123, 133, 1040, 39, 39, 43, - /* 320 */ 1025, 1026, 30, 1029, 244, 245, 189, 186, 183, 52, - /* 330 */ 51, 50, 305, 181, 179, 178, 177, 176, 319, 65, - /* 340 */ 1038, 273, 637, 86, 42, 241, 359, 358, 243, 1039, - /* 350 */ 224, 357, 770, 830, 833, 356, 39, 355, 354, 65, - /* 360 */ 332, 333, 54, 53, 1039, 1039, 52, 51, 50, 256, - /* 370 */ 39, 254, 39, 331, 330, 840, 835, 104, 39, 39, - /* 380 */ 754, 755, 836, 149, 142, 162, 262, 39, 259, 806, - /* 390 */ 338, 337, 167, 170, 160, 840, 835, 829, 832, 334, - /* 400 */ 104, 164, 836, 1039, 826, 363, 362, 190, 767, 746, - /* 410 */ 747, 92, 949, 335, 940, 339, 93, 1039, 158, 1039, - /* 420 */ 158, 340, 341, 71, 321, 1039, 1039, 198, 195, 193, - /* 430 */ 345, 360, 976, 7, 1039, 275, 827, 786, 774, 796, - /* 440 */ 797, 74, 727, 297, 729, 299, 325, 805, 35, 70, - /* 450 */ 210, 40, 1115, 97, 70, 66, 24, 728, 40, 40, - /* 460 */ 67, 117, 740, 741, 72, 738, 739, 862, 841, 250, - /* 470 */ 636, 837, 140, 67, 139, 82, 16, 18, 15, 17, - /* 480 */ 75, 211, 300, 23, 23, 77, 23, 758, 759, 169, - /* 490 */ 168, 4, 756, 757, 147, 20, 146, 19, 1163, 1162, - /* 500 */ 1161, 226, 227, 207, 208, 212, 1053, 1041, 205, 1126, - /* 510 */ 213, 214, 219, 220, 221, 838, 218, 202, 716, 1188, - /* 520 */ 1180, 1125, 1069, 238, 1122, 1121, 239, 44, 1068, 344, - /* 530 */ 277, 114, 322, 1108, 1107, 196, 271, 785, 1037, 276, - /* 540 */ 1065, 87, 1076, 1087, 281, 235, 73, 90, 1084, 1085, - /* 550 */ 76, 843, 283, 1089, 295, 46, 105, 106, 94, 107, - /* 560 */ 293, 95, 101, 108, 285, 291, 288, 286, 109, 1109, - /* 570 */ 289, 110, 287, 111, 284, 112, 29, 45, 225, 115, - /* 580 */ 1035, 306, 150, 247, 118, 952, 346, 120, 301, 953, - /* 590 */ 302, 303, 304, 974, 307, 308, 200, 347, 348, 38, - /* 600 */ 320, 349, 948, 951, 947, 130, 329, 350, 1187, 351, - /* 610 */ 352, 361, 137, 1186, 1183, 887, 141, 222, 336, 1179, - /* 620 */ 152, 144, 1178, 265, 1175, 886, 148, 223, 973, 268, - /* 630 */ 885, 868, 867, 70, 296, 8, 28, 41, 31, 761, - /* 640 */ 278, 96, 153, 201, 937, 151, 154, 156, 157, 155, - /* 650 */ 163, 935, 165, 1, 166, 933, 264, 932, 263, 171, - /* 660 */ 267, 975, 931, 930, 173, 929, 928, 927, 926, 925, - /* 670 */ 924, 272, 923, 787, 180, 184, 98, 182, 922, 798, - /* 680 */ 185, 921, 99, 188, 187, 920, 918, 792, 100, 916, - /* 690 */ 914, 102, 194, 913, 911, 912, 197, 907, 794, 2, - /* 700 */ 237, 103, 290, 9, 33, 34, 10, 11, 25, 298, - /* 710 */ 26, 122, 119, 36, 126, 125, 650, 688, 37, 128, - /* 720 */ 685, 683, 682, 681, 679, 678, 677, 674, 640, 132, - /* 730 */ 5, 134, 135, 842, 318, 844, 6, 326, 327, 68, - /* 740 */ 136, 40, 69, 719, 718, 138, 143, 145, 715, 666, - /* 750 */ 664, 656, 662, 658, 660, 654, 652, 687, 686, 684, - /* 760 */ 680, 676, 675, 161, 604, 638, 891, 890, 890, 890, - /* 770 */ 890, 890, 890, 890, 890, 191, 192, + /* 0 */ 91, 641, 242, 1085, 676, 249, 1050, 55, 56, 641, + /* 10 */ 59, 60, 895, 367, 252, 49, 48, 47, 1075, 58, + /* 20 */ 325, 63, 61, 64, 62, 641, 641, 366, 230, 54, + /* 30 */ 53, 206, 248, 52, 51, 50, 233, 55, 56, 246, + /* 40 */ 59, 60, 1176, 1050, 252, 49, 48, 47, 104, 58, + /* 50 */ 325, 63, 61, 64, 62, 1022, 21, 1020, 1021, 54, + /* 60 */ 53, 1075, 1023, 52, 51, 50, 1024, 206, 1025, 1026, + /* 70 */ 280, 279, 1082, 55, 56, 1044, 59, 60, 1177, 274, + /* 80 */ 252, 49, 48, 47, 89, 58, 325, 63, 61, 64, + /* 90 */ 62, 39, 236, 1062, 206, 54, 53, 362, 982, 52, + /* 100 */ 51, 50, 27, 55, 57, 1177, 59, 60, 323, 830, + /* 110 */ 252, 49, 48, 47, 1075, 58, 325, 63, 61, 64, + /* 120 */ 62, 243, 294, 80, 81, 54, 53, 795, 796, 52, + /* 130 */ 51, 50, 234, 116, 56, 232, 59, 60, 311, 1047, + /* 140 */ 252, 49, 48, 47, 104, 58, 325, 63, 61, 64, + /* 150 */ 62, 42, 776, 361, 360, 54, 53, 952, 359, 52, + /* 160 */ 51, 50, 358, 43, 357, 356, 1033, 1034, 30, 1037, + /* 170 */ 253, 42, 319, 361, 360, 318, 317, 316, 359, 315, + /* 180 */ 314, 313, 358, 312, 357, 356, 310, 1014, 1002, 1003, + /* 190 */ 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, + /* 200 */ 1015, 1016, 1017, 1018, 641, 59, 60, 159, 773, 252, + /* 210 */ 49, 48, 47, 113, 58, 325, 63, 61, 64, 62, + /* 220 */ 1124, 355, 292, 355, 54, 53, 836, 839, 52, 51, + /* 230 */ 50, 282, 206, 54, 53, 7, 321, 52, 51, 50, + /* 240 */ 780, 723, 22, 1177, 591, 592, 593, 594, 595, 596, + /* 250 */ 597, 598, 599, 600, 601, 602, 603, 604, 199, 215, + /* 260 */ 231, 251, 845, 834, 837, 840, 216, 345, 344, 198, + /* 270 */ 195, 193, 175, 174, 172, 217, 80, 321, 83, 330, + /* 280 */ 80, 251, 845, 834, 837, 840, 52, 51, 50, 228, + /* 290 */ 229, 121, 78, 326, 63, 61, 64, 62, 759, 756, + /* 300 */ 757, 758, 54, 53, 835, 838, 52, 51, 50, 228, + /* 310 */ 229, 255, 751, 748, 749, 750, 43, 1061, 79, 203, + /* 320 */ 43, 3, 32, 131, 39, 257, 258, 1038, 104, 129, + /* 330 */ 85, 123, 133, 104, 39, 945, 39, 39, 65, 244, + /* 340 */ 245, 158, 273, 39, 86, 39, 843, 746, 747, 305, + /* 350 */ 260, 224, 189, 186, 183, 149, 142, 162, 65, 181, + /* 360 */ 179, 178, 177, 176, 167, 170, 160, 39, 240, 269, + /* 370 */ 39, 88, 1047, 164, 204, 39, 846, 841, 241, 209, + /* 380 */ 334, 335, 1047, 842, 1047, 1047, 812, 336, 39, 337, + /* 390 */ 256, 1047, 254, 1047, 333, 332, 846, 841, 327, 266, + /* 400 */ 12, 261, 39, 842, 1123, 1035, 84, 261, 270, 82, + /* 410 */ 124, 341, 760, 761, 342, 1047, 127, 92, 1047, 343, + /* 420 */ 365, 364, 190, 1047, 844, 93, 752, 753, 71, 262, + /* 430 */ 35, 259, 347, 340, 339, 275, 1047, 119, 955, 261, + /* 440 */ 792, 946, 802, 803, 158, 74, 811, 158, 1048, 832, + /* 450 */ 1046, 40, 733, 297, 744, 745, 97, 70, 66, 24, + /* 460 */ 735, 299, 734, 868, 847, 70, 300, 250, 40, 40, + /* 470 */ 1049, 72, 640, 14, 77, 13, 67, 117, 67, 23, + /* 480 */ 23, 833, 210, 140, 211, 139, 75, 1171, 23, 4, + /* 490 */ 1170, 16, 18, 15, 17, 764, 765, 762, 763, 147, + /* 500 */ 1134, 146, 20, 1169, 19, 849, 169, 168, 226, 722, + /* 510 */ 227, 207, 208, 212, 205, 1196, 213, 214, 219, 220, + /* 520 */ 1188, 221, 1077, 218, 202, 1133, 238, 44, 1130, 1076, + /* 530 */ 277, 1129, 239, 346, 114, 1116, 1115, 324, 196, 271, + /* 540 */ 791, 76, 281, 1045, 235, 276, 73, 87, 1084, 283, + /* 550 */ 285, 1095, 295, 46, 293, 291, 90, 108, 94, 1092, + /* 560 */ 1093, 1097, 95, 1073, 101, 286, 288, 1117, 105, 106, + /* 570 */ 107, 109, 289, 110, 111, 287, 284, 112, 45, 29, + /* 580 */ 306, 115, 225, 958, 1043, 150, 118, 247, 980, 120, + /* 590 */ 301, 959, 302, 303, 304, 348, 307, 308, 200, 349, + /* 600 */ 151, 38, 322, 350, 954, 957, 130, 953, 331, 1195, + /* 610 */ 137, 351, 1194, 352, 1191, 353, 354, 363, 141, 222, + /* 620 */ 338, 223, 1187, 144, 1186, 1183, 893, 148, 979, 265, + /* 630 */ 264, 892, 268, 891, 874, 873, 41, 31, 8, 70, + /* 640 */ 201, 28, 296, 153, 157, 272, 152, 154, 155, 943, + /* 650 */ 156, 163, 941, 165, 166, 939, 938, 263, 1, 981, + /* 660 */ 937, 171, 936, 173, 935, 934, 933, 932, 931, 930, + /* 670 */ 767, 929, 267, 180, 278, 182, 928, 184, 185, 187, + /* 680 */ 927, 926, 924, 188, 922, 919, 793, 96, 98, 920, + /* 690 */ 194, 917, 804, 197, 918, 913, 99, 100, 2, 798, + /* 700 */ 102, 237, 9, 800, 33, 103, 34, 10, 298, 290, + /* 710 */ 11, 25, 26, 119, 122, 126, 654, 693, 309, 692, + /* 720 */ 36, 125, 689, 37, 687, 128, 686, 685, 683, 682, + /* 730 */ 681, 678, 644, 132, 134, 135, 5, 850, 320, 848, + /* 740 */ 6, 329, 328, 68, 69, 136, 138, 143, 725, 40, + /* 750 */ 145, 724, 721, 670, 668, 660, 666, 662, 664, 658, + /* 760 */ 656, 691, 690, 688, 684, 680, 679, 161, 642, 897, + /* 770 */ 896, 608, 896, 896, 896, 896, 896, 896, 896, 191, + /* 780 */ 192, }; static const YYCODETYPE yy_lookahead[] = { - /* 0 */ 200, 1, 1, 194, 245, 3, 200, 7, 8, 201, - /* 10 */ 10, 11, 194, 195, 14, 15, 16, 17, 259, 19, - /* 20 */ 20, 21, 22, 23, 24, 243, 244, 192, 193, 29, - /* 30 */ 30, 29, 30, 33, 34, 35, 200, 7, 8, 238, - /* 40 */ 10, 11, 234, 242, 14, 15, 16, 17, 194, 19, - /* 50 */ 20, 21, 22, 23, 24, 216, 1, 218, 219, 29, - /* 60 */ 30, 261, 223, 33, 34, 35, 227, 261, 229, 230, - /* 70 */ 201, 262, 272, 7, 8, 240, 10, 11, 272, 78, + /* 0 */ 194, 1, 239, 194, 3, 200, 243, 7, 8, 1, + /* 10 */ 10, 11, 192, 193, 14, 15, 16, 17, 241, 19, + /* 20 */ 20, 21, 22, 23, 24, 1, 1, 194, 195, 29, + /* 30 */ 30, 262, 200, 33, 34, 35, 259, 7, 8, 239, + /* 40 */ 10, 11, 273, 243, 14, 15, 16, 17, 194, 19, + /* 50 */ 20, 21, 22, 23, 24, 216, 262, 218, 219, 29, + /* 60 */ 30, 241, 223, 33, 34, 35, 227, 262, 229, 230, + /* 70 */ 264, 265, 263, 7, 8, 194, 10, 11, 273, 259, /* 80 */ 14, 15, 16, 17, 84, 19, 20, 21, 22, 23, - /* 90 */ 24, 261, 194, 258, 238, 29, 30, 261, 242, 33, - /* 100 */ 34, 35, 272, 7, 8, 236, 10, 11, 272, 79, - /* 110 */ 14, 15, 16, 17, 78, 19, 20, 21, 22, 23, - /* 120 */ 24, 267, 1, 269, 74, 29, 30, 194, 80, 33, - /* 130 */ 34, 35, 194, 240, 8, 237, 10, 11, 88, 241, + /* 90 */ 24, 194, 244, 245, 262, 29, 30, 214, 215, 33, + /* 100 */ 34, 35, 78, 7, 8, 273, 10, 11, 83, 79, + /* 110 */ 14, 15, 16, 17, 241, 19, 20, 21, 22, 23, + /* 120 */ 24, 240, 268, 78, 270, 29, 30, 124, 125, 33, + /* 130 */ 34, 35, 259, 201, 8, 238, 10, 11, 63, 242, /* 140 */ 14, 15, 16, 17, 194, 19, 20, 21, 22, 23, - /* 150 */ 24, 258, 116, 203, 118, 29, 30, 78, 194, 33, - /* 160 */ 34, 35, 41, 42, 43, 44, 45, 46, 47, 48, - /* 170 */ 49, 50, 51, 52, 53, 54, 55, 63, 57, 10, - /* 180 */ 11, 199, 240, 14, 15, 16, 17, 205, 19, 20, - /* 190 */ 21, 22, 23, 24, 88, 116, 263, 264, 29, 30, - /* 200 */ 258, 237, 33, 34, 35, 241, 142, 269, 144, 271, - /* 210 */ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, - /* 220 */ 106, 107, 108, 109, 110, 216, 217, 218, 219, 220, - /* 230 */ 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, - /* 240 */ 231, 139, 78, 40, 21, 22, 23, 24, 84, 261, - /* 250 */ 148, 149, 29, 30, 122, 123, 33, 34, 35, 1, - /* 260 */ 57, 248, 1, 2, 3, 4, 5, 64, 2, 3, - /* 270 */ 4, 5, 3, 70, 71, 72, 73, 113, 194, 266, - /* 280 */ 77, 78, 1, 2, 3, 4, 5, 203, 201, 261, - /* 290 */ 29, 30, 64, 194, 33, 29, 30, 2, 3, 4, - /* 300 */ 5, 261, 194, 194, 58, 59, 60, 194, 261, 64, - /* 310 */ 29, 30, 66, 67, 68, 69, 203, 194, 194, 116, - /* 320 */ 233, 234, 235, 236, 29, 30, 58, 59, 60, 33, - /* 330 */ 34, 35, 86, 65, 66, 67, 68, 69, 80, 78, - /* 340 */ 241, 138, 1, 140, 96, 237, 98, 99, 239, 241, - /* 350 */ 147, 103, 33, 3, 4, 107, 194, 109, 110, 78, - /* 360 */ 237, 237, 29, 30, 241, 241, 33, 34, 35, 141, - /* 370 */ 194, 143, 194, 145, 146, 114, 115, 194, 194, 194, - /* 380 */ 114, 115, 121, 58, 59, 60, 141, 194, 143, 72, - /* 390 */ 145, 146, 67, 68, 69, 114, 115, 3, 4, 237, - /* 400 */ 194, 76, 121, 241, 1, 61, 62, 63, 95, 114, - /* 410 */ 115, 79, 199, 237, 199, 237, 79, 241, 205, 241, - /* 420 */ 205, 237, 237, 95, 83, 241, 241, 58, 59, 60, - /* 430 */ 237, 214, 215, 120, 241, 79, 33, 79, 119, 79, - /* 440 */ 79, 95, 79, 79, 79, 79, 9, 130, 78, 117, - /* 450 */ 261, 95, 269, 95, 117, 95, 95, 79, 95, 95, - /* 460 */ 95, 95, 3, 4, 136, 3, 4, 79, 79, 56, - /* 470 */ 79, 121, 142, 95, 144, 269, 142, 142, 144, 144, - /* 480 */ 134, 261, 112, 95, 95, 78, 95, 3, 4, 74, - /* 490 */ 75, 78, 3, 4, 142, 142, 144, 144, 261, 261, - /* 500 */ 261, 261, 261, 261, 261, 261, 244, 242, 261, 232, - /* 510 */ 261, 261, 261, 261, 261, 121, 261, 261, 111, 244, - /* 520 */ 244, 232, 240, 232, 232, 232, 232, 260, 240, 232, - /* 530 */ 240, 246, 194, 270, 270, 56, 194, 121, 240, 196, - /* 540 */ 257, 194, 194, 194, 265, 265, 135, 196, 194, 194, - /* 550 */ 133, 114, 265, 194, 128, 132, 256, 255, 196, 254, - /* 560 */ 131, 194, 194, 253, 265, 126, 194, 196, 252, 196, - /* 570 */ 125, 251, 124, 250, 127, 249, 247, 137, 196, 194, - /* 580 */ 194, 87, 94, 196, 194, 204, 93, 194, 196, 194, - /* 590 */ 194, 194, 194, 213, 194, 194, 194, 47, 90, 194, - /* 600 */ 194, 92, 194, 204, 194, 201, 194, 51, 194, 91, - /* 610 */ 89, 80, 194, 194, 194, 3, 194, 196, 194, 194, - /* 620 */ 211, 194, 194, 3, 194, 3, 194, 196, 194, 3, - /* 630 */ 3, 98, 97, 117, 112, 78, 78, 194, 194, 79, - /* 640 */ 95, 95, 207, 194, 194, 212, 210, 209, 206, 208, - /* 650 */ 194, 194, 194, 202, 194, 194, 150, 194, 194, 194, - /* 660 */ 150, 215, 196, 196, 194, 194, 194, 194, 194, 194, - /* 670 */ 194, 139, 194, 79, 197, 194, 78, 197, 196, 79, - /* 680 */ 197, 196, 78, 197, 194, 194, 194, 79, 95, 194, - /* 690 */ 194, 78, 194, 196, 194, 196, 194, 194, 79, 198, - /* 700 */ 1, 78, 78, 129, 95, 95, 129, 78, 78, 112, - /* 710 */ 78, 74, 113, 85, 66, 84, 3, 3, 85, 84, - /* 720 */ 5, 3, 3, 3, 3, 3, 3, 3, 81, 74, - /* 730 */ 78, 82, 82, 79, 9, 114, 78, 20, 55, 10, - /* 740 */ 144, 95, 10, 3, 3, 144, 144, 144, 79, 3, - /* 750 */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - /* 760 */ 3, 3, 3, 95, 56, 81, 0, 273, 273, 273, - /* 770 */ 273, 273, 273, 273, 273, 15, 15, 273, 273, 273, - /* 780 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, - /* 790 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, - /* 800 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, - /* 810 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, - /* 820 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, - /* 830 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, - /* 840 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, - /* 850 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, - /* 860 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, - /* 870 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, - /* 880 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, - /* 890 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, - /* 900 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, - /* 910 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, - /* 920 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, - /* 930 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, - /* 940 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, - /* 950 */ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273, - /* 960 */ 273, 273, 273, 273, 273, 273, 273, 273, + /* 150 */ 24, 96, 33, 98, 99, 29, 30, 1, 103, 33, + /* 160 */ 34, 35, 107, 118, 109, 110, 234, 235, 236, 237, + /* 170 */ 200, 96, 97, 98, 99, 100, 101, 102, 103, 104, + /* 180 */ 105, 106, 107, 108, 109, 110, 111, 216, 217, 218, + /* 190 */ 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, + /* 200 */ 229, 230, 231, 232, 1, 10, 11, 74, 95, 14, + /* 210 */ 15, 16, 17, 249, 19, 20, 21, 22, 23, 24, + /* 220 */ 270, 88, 272, 88, 29, 30, 3, 4, 33, 34, + /* 230 */ 35, 267, 262, 29, 30, 122, 80, 33, 34, 35, + /* 240 */ 121, 3, 40, 273, 41, 42, 43, 44, 45, 46, + /* 250 */ 47, 48, 49, 50, 51, 52, 53, 54, 55, 57, + /* 260 */ 57, 1, 2, 3, 4, 5, 64, 29, 30, 58, + /* 270 */ 59, 60, 70, 71, 72, 73, 78, 80, 246, 77, + /* 280 */ 78, 1, 2, 3, 4, 5, 33, 34, 35, 29, + /* 290 */ 30, 201, 260, 33, 21, 22, 23, 24, 2, 3, + /* 300 */ 4, 5, 29, 30, 3, 4, 33, 34, 35, 29, + /* 310 */ 30, 64, 2, 3, 4, 5, 118, 245, 120, 262, + /* 320 */ 118, 58, 59, 60, 194, 29, 30, 237, 194, 66, + /* 330 */ 67, 68, 69, 194, 194, 199, 194, 194, 78, 29, + /* 340 */ 30, 205, 140, 194, 142, 194, 123, 3, 4, 86, + /* 350 */ 64, 149, 58, 59, 60, 58, 59, 60, 78, 65, + /* 360 */ 66, 67, 68, 69, 67, 68, 69, 194, 238, 111, + /* 370 */ 194, 201, 242, 76, 262, 194, 116, 117, 238, 262, + /* 380 */ 238, 238, 242, 123, 242, 242, 72, 238, 194, 238, + /* 390 */ 143, 242, 145, 242, 147, 148, 116, 117, 9, 141, + /* 400 */ 78, 194, 194, 123, 270, 235, 84, 194, 150, 270, + /* 410 */ 203, 238, 116, 117, 238, 242, 203, 79, 242, 238, + /* 420 */ 61, 62, 63, 242, 123, 79, 116, 117, 95, 143, + /* 430 */ 78, 145, 238, 147, 148, 79, 242, 115, 199, 194, + /* 440 */ 79, 199, 79, 79, 205, 95, 132, 205, 203, 1, + /* 450 */ 242, 95, 79, 79, 3, 4, 95, 119, 95, 95, + /* 460 */ 79, 79, 79, 79, 79, 119, 114, 56, 95, 95, + /* 470 */ 243, 138, 79, 144, 78, 146, 95, 95, 95, 95, + /* 480 */ 95, 33, 262, 144, 262, 146, 136, 262, 95, 78, + /* 490 */ 262, 144, 144, 146, 146, 3, 4, 3, 4, 144, + /* 500 */ 233, 146, 144, 262, 146, 116, 74, 75, 262, 113, + /* 510 */ 262, 262, 262, 262, 262, 245, 262, 262, 262, 262, + /* 520 */ 245, 262, 241, 262, 262, 233, 233, 261, 233, 241, + /* 530 */ 241, 233, 233, 233, 247, 271, 271, 194, 56, 194, + /* 540 */ 123, 135, 266, 241, 266, 196, 137, 194, 194, 266, + /* 550 */ 266, 194, 130, 134, 133, 128, 196, 254, 196, 194, + /* 560 */ 194, 194, 194, 258, 194, 196, 194, 196, 257, 256, + /* 570 */ 255, 253, 127, 252, 251, 126, 129, 250, 139, 248, + /* 580 */ 87, 194, 196, 204, 194, 94, 194, 196, 213, 194, + /* 590 */ 196, 194, 194, 194, 194, 93, 194, 194, 194, 47, + /* 600 */ 212, 194, 194, 90, 194, 204, 201, 194, 194, 194, + /* 610 */ 194, 92, 194, 51, 194, 91, 89, 80, 194, 196, + /* 620 */ 194, 196, 194, 194, 194, 194, 3, 194, 194, 3, + /* 630 */ 151, 3, 3, 3, 98, 97, 194, 194, 78, 119, + /* 640 */ 194, 78, 114, 207, 206, 141, 211, 210, 208, 194, + /* 650 */ 209, 194, 194, 194, 194, 194, 194, 194, 202, 215, + /* 660 */ 196, 194, 196, 194, 194, 194, 194, 194, 194, 194, + /* 670 */ 79, 194, 151, 197, 95, 197, 196, 194, 197, 194, + /* 680 */ 196, 194, 194, 197, 194, 196, 79, 95, 78, 194, + /* 690 */ 194, 194, 79, 194, 196, 194, 78, 95, 198, 79, + /* 700 */ 78, 1, 131, 79, 95, 78, 95, 131, 114, 78, + /* 710 */ 78, 78, 78, 115, 74, 66, 3, 3, 112, 3, + /* 720 */ 85, 84, 5, 85, 3, 84, 3, 3, 3, 3, + /* 730 */ 3, 3, 81, 74, 82, 82, 78, 116, 9, 79, + /* 740 */ 78, 55, 20, 10, 10, 146, 146, 146, 3, 95, + /* 750 */ 146, 3, 79, 3, 3, 3, 3, 3, 3, 3, + /* 760 */ 3, 3, 3, 3, 3, 3, 3, 95, 81, 0, + /* 770 */ 274, 56, 274, 274, 274, 274, 274, 274, 274, 15, + /* 780 */ 15, 274, 274, 274, 274, 274, 274, 274, 274, 274, + /* 790 */ 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + /* 800 */ 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + /* 810 */ 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + /* 820 */ 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + /* 830 */ 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + /* 840 */ 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + /* 850 */ 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + /* 860 */ 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + /* 870 */ 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + /* 880 */ 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + /* 890 */ 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + /* 900 */ 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + /* 910 */ 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + /* 920 */ 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + /* 930 */ 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + /* 940 */ 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + /* 950 */ 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + /* 960 */ 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + /* 970 */ 274, 274, 274, }; -#define YY_SHIFT_COUNT (365) +#define YY_SHIFT_COUNT (367) #define YY_SHIFT_MIN (0) -#define YY_SHIFT_MAX (766) +#define YY_SHIFT_MAX (769) static const unsigned short int yy_shift_ofst[] = { - /* 0 */ 203, 114, 248, 48, 261, 281, 281, 1, 55, 55, - /* 10 */ 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - /* 20 */ 55, 0, 121, 281, 266, 295, 295, 79, 79, 132, - /* 30 */ 258, 50, 48, 55, 55, 55, 55, 55, 106, 55, - /* 40 */ 55, 106, 269, 777, 281, 281, 281, 281, 281, 281, - /* 50 */ 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, - /* 60 */ 281, 281, 281, 281, 281, 281, 266, 295, 266, 266, - /* 70 */ 36, 2, 2, 2, 2, 2, 2, 2, 319, 79, - /* 80 */ 79, 317, 317, 313, 79, 341, 55, 479, 55, 55, - /* 90 */ 55, 479, 55, 55, 55, 479, 55, 416, 416, 416, - /* 100 */ 416, 479, 55, 55, 479, 417, 411, 426, 423, 429, - /* 110 */ 439, 445, 448, 447, 440, 479, 55, 55, 479, 55, - /* 120 */ 479, 55, 55, 55, 494, 55, 55, 494, 55, 55, - /* 130 */ 55, 48, 55, 55, 55, 55, 55, 55, 55, 55, - /* 140 */ 55, 479, 55, 55, 55, 55, 55, 55, 479, 55, - /* 150 */ 55, 488, 493, 550, 508, 509, 556, 518, 521, 55, - /* 160 */ 55, 269, 55, 55, 55, 55, 55, 55, 55, 55, - /* 170 */ 55, 479, 55, 479, 55, 55, 55, 55, 55, 55, - /* 180 */ 55, 531, 55, 531, 479, 55, 531, 479, 55, 531, - /* 190 */ 55, 55, 55, 55, 479, 55, 55, 479, 55, 55, - /* 200 */ 777, 777, 30, 66, 66, 96, 66, 126, 169, 223, - /* 210 */ 223, 223, 223, 223, 223, 246, 268, 325, 333, 333, - /* 220 */ 333, 333, 228, 245, 102, 164, 296, 296, 350, 394, - /* 230 */ 344, 369, 356, 332, 337, 358, 360, 361, 328, 346, - /* 240 */ 363, 364, 365, 366, 459, 462, 378, 370, 388, 389, - /* 250 */ 403, 413, 437, 391, 64, 330, 334, 484, 489, 335, - /* 260 */ 352, 407, 353, 415, 612, 506, 620, 622, 510, 626, - /* 270 */ 627, 533, 535, 532, 516, 522, 557, 560, 558, 545, - /* 280 */ 546, 594, 598, 600, 604, 608, 593, 613, 619, 623, - /* 290 */ 699, 624, 609, 574, 610, 577, 629, 522, 630, 597, - /* 300 */ 632, 599, 637, 628, 631, 648, 713, 633, 635, 714, - /* 310 */ 715, 718, 719, 720, 721, 722, 723, 724, 647, 725, - /* 320 */ 655, 649, 650, 652, 654, 621, 658, 717, 683, 729, - /* 330 */ 596, 601, 646, 646, 646, 646, 732, 602, 603, 646, - /* 340 */ 646, 646, 740, 741, 669, 646, 746, 747, 748, 749, - /* 350 */ 750, 751, 752, 753, 754, 755, 756, 757, 758, 759, - /* 360 */ 668, 684, 760, 761, 708, 766, + /* 0 */ 202, 75, 55, 197, 260, 280, 280, 24, 8, 8, + /* 10 */ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + /* 20 */ 8, 0, 203, 280, 296, 310, 310, 45, 45, 3, + /* 30 */ 156, 133, 197, 8, 8, 8, 8, 8, 135, 8, + /* 40 */ 8, 135, 1, 781, 280, 280, 280, 280, 280, 280, + /* 50 */ 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, + /* 60 */ 280, 280, 280, 280, 280, 280, 296, 310, 296, 296, + /* 70 */ 198, 238, 238, 238, 238, 238, 238, 238, 119, 45, + /* 80 */ 45, 314, 314, 113, 45, 25, 8, 482, 8, 8, + /* 90 */ 8, 482, 8, 8, 8, 482, 8, 417, 417, 417, + /* 100 */ 417, 482, 8, 8, 482, 406, 409, 422, 419, 421, + /* 110 */ 427, 445, 449, 447, 439, 482, 8, 8, 482, 8, + /* 120 */ 482, 8, 8, 8, 493, 8, 8, 493, 8, 8, + /* 130 */ 8, 197, 8, 8, 8, 8, 8, 8, 8, 8, + /* 140 */ 8, 482, 8, 8, 8, 8, 8, 8, 482, 8, + /* 150 */ 8, 491, 502, 552, 513, 519, 562, 524, 527, 8, + /* 160 */ 8, 1, 8, 8, 8, 8, 8, 8, 8, 8, + /* 170 */ 8, 482, 8, 482, 8, 8, 8, 8, 8, 8, + /* 180 */ 8, 537, 8, 537, 482, 8, 537, 482, 8, 537, + /* 190 */ 8, 8, 8, 8, 482, 8, 8, 482, 8, 8, + /* 200 */ 781, 781, 30, 66, 66, 96, 66, 126, 195, 273, + /* 210 */ 273, 273, 273, 273, 273, 263, 294, 297, 204, 204, + /* 220 */ 204, 204, 247, 286, 258, 322, 253, 253, 223, 301, + /* 230 */ 359, 211, 356, 338, 346, 361, 363, 364, 333, 350, + /* 240 */ 373, 374, 381, 382, 344, 451, 383, 352, 384, 385, + /* 250 */ 448, 411, 389, 393, 329, 339, 347, 492, 494, 348, + /* 260 */ 355, 396, 358, 432, 623, 479, 626, 628, 521, 629, + /* 270 */ 630, 536, 538, 504, 520, 528, 560, 591, 563, 579, + /* 280 */ 592, 607, 610, 613, 618, 620, 602, 622, 624, 627, + /* 290 */ 700, 631, 609, 571, 611, 576, 632, 528, 633, 594, + /* 300 */ 634, 598, 640, 635, 637, 649, 713, 638, 641, 714, + /* 310 */ 606, 716, 717, 721, 723, 724, 725, 726, 727, 728, + /* 320 */ 651, 729, 659, 652, 653, 658, 660, 621, 662, 722, + /* 330 */ 686, 733, 599, 600, 654, 654, 654, 654, 734, 601, + /* 340 */ 604, 654, 654, 654, 745, 748, 673, 654, 750, 751, + /* 350 */ 752, 753, 754, 755, 756, 757, 758, 759, 760, 761, + /* 360 */ 762, 763, 672, 687, 764, 765, 715, 769, }; #define YY_REDUCE_COUNT (201) -#define YY_REDUCE_MIN (-241) -#define YY_REDUCE_MAX (503) +#define YY_REDUCE_MIN (-237) +#define YY_REDUCE_MAX (501) static const short yy_reduce_ofst[] = { - /* 0 */ -165, 9, -161, 87, -200, -194, -164, -67, -102, -62, - /* 10 */ -146, -36, 108, 123, 124, 162, 176, 178, 184, 185, - /* 20 */ 193, -191, -182, -170, -218, -199, -144, -107, -58, 13, - /* 30 */ -131, -18, -192, 183, 206, 109, -50, 84, 213, 113, - /* 40 */ 99, 215, 217, -241, -12, 28, 40, 47, 189, 220, - /* 50 */ 237, 238, 239, 240, 241, 242, 243, 244, 247, 249, - /* 60 */ 250, 251, 252, 253, 255, 256, 262, 265, 275, 276, - /* 70 */ 282, 277, 289, 291, 292, 293, 294, 297, 267, 288, - /* 80 */ 290, 263, 264, 285, 298, 338, 342, 343, 347, 348, - /* 90 */ 349, 351, 354, 355, 359, 362, 367, 279, 280, 287, - /* 100 */ 299, 371, 368, 372, 373, 283, 300, 302, 305, 310, - /* 110 */ 316, 320, 323, 326, 329, 382, 385, 386, 387, 390, - /* 120 */ 392, 393, 395, 396, 381, 397, 398, 399, 400, 401, - /* 130 */ 402, 404, 405, 406, 408, 410, 412, 414, 418, 419, - /* 140 */ 420, 421, 422, 424, 425, 427, 428, 430, 431, 432, - /* 150 */ 434, 380, 433, 409, 435, 436, 441, 438, 442, 443, - /* 160 */ 444, 446, 449, 450, 456, 457, 458, 460, 461, 463, - /* 170 */ 464, 466, 465, 467, 470, 471, 472, 473, 474, 475, - /* 180 */ 476, 477, 478, 480, 482, 481, 483, 485, 490, 486, - /* 190 */ 491, 492, 495, 496, 497, 498, 500, 499, 502, 503, - /* 200 */ 451, 501, + /* 0 */ -180, -29, -161, -68, -195, -168, -30, -194, -103, -50, + /* 10 */ -146, 130, 140, 142, 143, 149, 151, 173, 176, 181, + /* 20 */ 194, -191, -167, -231, -152, -237, -200, -223, -127, -36, + /* 30 */ 90, 136, 170, 134, 139, -119, 207, 213, 239, 245, + /* 40 */ 208, 242, -117, 32, -206, 57, 112, 117, 220, 222, + /* 50 */ 225, 228, 241, 246, 248, 249, 250, 251, 252, 254, + /* 60 */ 255, 256, 257, 259, 261, 262, 72, 227, 270, 275, + /* 70 */ 281, 267, 292, 293, 295, 298, 299, 300, 266, 288, + /* 80 */ 289, 264, 265, 287, 302, 343, 345, 349, 353, 354, + /* 90 */ 357, 360, 365, 366, 367, 362, 368, 276, 278, 283, + /* 100 */ 284, 369, 370, 372, 371, 305, 311, 313, 315, 303, + /* 110 */ 318, 321, 323, 327, 331, 386, 387, 390, 391, 392, + /* 120 */ 394, 395, 397, 398, 379, 399, 400, 401, 402, 403, + /* 130 */ 404, 405, 407, 408, 410, 413, 414, 415, 416, 418, + /* 140 */ 420, 423, 424, 426, 428, 429, 430, 431, 425, 433, + /* 150 */ 434, 375, 388, 435, 436, 437, 440, 441, 438, 442, + /* 160 */ 443, 444, 446, 455, 457, 458, 459, 460, 461, 462, + /* 170 */ 463, 464, 467, 466, 469, 470, 471, 472, 473, 474, + /* 180 */ 475, 476, 477, 478, 480, 483, 481, 484, 485, 486, + /* 190 */ 487, 488, 490, 495, 489, 496, 497, 498, 499, 501, + /* 200 */ 456, 500, }; static const YYACTIONTYPE yy_default[] = { - /* 0 */ 888, 950, 938, 946, 1171, 1171, 1171, 888, 888, 888, - /* 10 */ 888, 888, 888, 888, 888, 888, 888, 888, 888, 888, - /* 20 */ 888, 1078, 908, 1171, 888, 888, 888, 888, 888, 1093, - /* 30 */ 1028, 956, 946, 888, 888, 888, 888, 888, 956, 888, - /* 40 */ 888, 956, 888, 1073, 888, 888, 888, 888, 888, 888, - /* 50 */ 888, 888, 888, 888, 888, 888, 888, 888, 888, 888, - /* 60 */ 888, 888, 888, 888, 888, 888, 888, 888, 888, 888, - /* 70 */ 888, 888, 888, 888, 888, 888, 888, 888, 1080, 888, - /* 80 */ 888, 1112, 1112, 1071, 888, 888, 888, 910, 888, 888, - /* 90 */ 1086, 910, 1083, 888, 1088, 910, 888, 888, 888, 888, - /* 100 */ 888, 910, 888, 888, 910, 1119, 1123, 1105, 1117, 1113, - /* 110 */ 1100, 1098, 1096, 1104, 1127, 910, 888, 888, 910, 888, - /* 120 */ 910, 888, 888, 888, 954, 888, 888, 954, 888, 888, - /* 130 */ 888, 946, 888, 888, 888, 888, 888, 888, 888, 888, - /* 140 */ 888, 910, 888, 888, 888, 888, 888, 888, 910, 888, - /* 150 */ 888, 972, 970, 968, 960, 966, 962, 964, 958, 888, - /* 160 */ 888, 888, 888, 936, 888, 934, 888, 888, 888, 888, - /* 170 */ 888, 910, 888, 910, 888, 888, 888, 888, 888, 888, - /* 180 */ 888, 944, 888, 944, 910, 888, 944, 910, 888, 944, - /* 190 */ 919, 888, 888, 888, 910, 888, 888, 910, 888, 906, - /* 200 */ 994, 1011, 888, 1128, 1118, 888, 1170, 1158, 1157, 1166, - /* 210 */ 1165, 1164, 1156, 1155, 1154, 888, 888, 888, 1150, 1153, - /* 220 */ 1152, 1151, 888, 888, 888, 888, 1160, 1159, 888, 888, - /* 230 */ 888, 888, 888, 888, 888, 888, 888, 888, 1124, 1120, - /* 240 */ 888, 888, 888, 888, 888, 888, 888, 888, 888, 888, - /* 250 */ 888, 1130, 888, 888, 888, 888, 888, 888, 888, 888, - /* 260 */ 888, 1019, 888, 888, 888, 888, 888, 888, 888, 888, - /* 270 */ 888, 888, 888, 888, 1070, 888, 888, 888, 888, 1082, - /* 280 */ 1081, 888, 888, 888, 888, 888, 888, 888, 888, 888, - /* 290 */ 888, 888, 1114, 888, 1106, 888, 888, 1031, 888, 888, - /* 300 */ 888, 888, 888, 888, 888, 888, 888, 888, 888, 888, - /* 310 */ 888, 888, 888, 888, 888, 888, 888, 888, 888, 888, - /* 320 */ 888, 888, 888, 888, 888, 888, 888, 888, 888, 888, - /* 330 */ 888, 888, 1189, 1184, 1185, 1182, 888, 888, 888, 1181, - /* 340 */ 1176, 1177, 888, 888, 888, 1174, 888, 888, 888, 888, - /* 350 */ 888, 888, 888, 888, 888, 888, 888, 888, 888, 888, - /* 360 */ 978, 888, 917, 915, 888, 888, + /* 0 */ 894, 956, 944, 952, 1179, 1179, 1179, 894, 894, 894, + /* 10 */ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894, + /* 20 */ 894, 1086, 914, 1179, 894, 894, 894, 894, 894, 1101, + /* 30 */ 1036, 962, 952, 894, 894, 894, 894, 894, 962, 894, + /* 40 */ 894, 962, 894, 1081, 894, 894, 894, 894, 894, 894, + /* 50 */ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894, + /* 60 */ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894, + /* 70 */ 894, 894, 894, 894, 894, 894, 894, 894, 1088, 894, + /* 80 */ 894, 1120, 1120, 1079, 894, 894, 894, 916, 894, 894, + /* 90 */ 1094, 916, 1091, 894, 1096, 916, 894, 894, 894, 894, + /* 100 */ 894, 916, 894, 894, 916, 1127, 1131, 1113, 1125, 1121, + /* 110 */ 1108, 1106, 1104, 1112, 1135, 916, 894, 894, 916, 894, + /* 120 */ 916, 894, 894, 894, 960, 894, 894, 960, 894, 894, + /* 130 */ 894, 952, 894, 894, 894, 894, 894, 894, 894, 894, + /* 140 */ 894, 916, 894, 894, 894, 894, 894, 894, 916, 894, + /* 150 */ 894, 978, 976, 974, 966, 972, 968, 970, 964, 894, + /* 160 */ 894, 894, 894, 942, 894, 940, 894, 894, 894, 894, + /* 170 */ 894, 916, 894, 916, 894, 894, 894, 894, 894, 894, + /* 180 */ 894, 950, 894, 950, 916, 894, 950, 916, 894, 950, + /* 190 */ 925, 894, 894, 894, 916, 894, 894, 916, 894, 912, + /* 200 */ 1001, 1019, 894, 1136, 1126, 894, 1178, 1166, 1165, 1174, + /* 210 */ 1173, 1172, 1164, 1163, 1162, 894, 894, 894, 1158, 1161, + /* 220 */ 1160, 1159, 894, 894, 894, 894, 1168, 1167, 894, 894, + /* 230 */ 894, 894, 894, 894, 894, 894, 894, 894, 1132, 1128, + /* 240 */ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894, + /* 250 */ 894, 1138, 894, 894, 894, 894, 894, 894, 894, 894, + /* 260 */ 894, 1027, 894, 894, 894, 894, 894, 894, 894, 894, + /* 270 */ 894, 894, 894, 894, 1078, 894, 894, 894, 894, 1090, + /* 280 */ 1089, 894, 894, 894, 894, 894, 894, 894, 894, 894, + /* 290 */ 894, 894, 1122, 894, 1114, 894, 894, 1039, 894, 894, + /* 300 */ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894, + /* 310 */ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894, + /* 320 */ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894, + /* 330 */ 894, 894, 894, 894, 1197, 1192, 1193, 1190, 894, 894, + /* 340 */ 894, 1189, 1184, 1185, 894, 894, 894, 1182, 894, 894, + /* 350 */ 894, 894, 894, 894, 894, 894, 894, 894, 894, 894, + /* 360 */ 894, 894, 984, 894, 923, 921, 894, 894, }; /********** End of lemon-generated parsing tables *****************************/ @@ -622,6 +634,8 @@ static const YYCODETYPE yyFallback[] = { 0, /* PRECISION => nothing */ 0, /* UPDATE => nothing */ 0, /* CACHELAST => nothing */ + 0, /* STREAM => nothing */ + 0, /* MODE => nothing */ 0, /* UNSIGNED => nothing */ 0, /* TAGS => nothing */ 0, /* USING => nothing */ @@ -660,7 +674,6 @@ static const YYCODETYPE yyFallback[] = { 0, /* SET => nothing */ 0, /* KILL => nothing */ 0, /* CONNECTION => nothing */ - 0, /* STREAM => nothing */ 0, /* COLON => nothing */ 1, /* ABORT => ID */ 1, /* AFTER => ID */ @@ -741,6 +754,7 @@ struct yyParser { int yyerrcnt; /* Shifts left before out of the error */ #endif ParseARG_SDECL /* A place to hold %extra_argument */ + ParseCTX_SDECL /* A place to hold %extra_context */ #if YYSTACKDEPTH<=0 int yystksz; /* Current side of the stack */ yyStackEntry *yystack; /* The parser's stack */ @@ -899,87 +913,87 @@ static const char *const yyTokenName[] = { /* 108 */ "PRECISION", /* 109 */ "UPDATE", /* 110 */ "CACHELAST", - /* 111 */ "UNSIGNED", - /* 112 */ "TAGS", - /* 113 */ "USING", - /* 114 */ "NULL", - /* 115 */ "NOW", - /* 116 */ "SELECT", - /* 117 */ "UNION", - /* 118 */ "ALL", - /* 119 */ "DISTINCT", - /* 120 */ "FROM", - /* 121 */ "VARIABLE", - /* 122 */ "INTERVAL", - /* 123 */ "EVERY", - /* 124 */ "SESSION", - /* 125 */ "STATE_WINDOW", - /* 126 */ "FILL", - /* 127 */ "SLIDING", - /* 128 */ "ORDER", - /* 129 */ "BY", - /* 130 */ "ASC", - /* 131 */ "GROUP", - /* 132 */ "HAVING", - /* 133 */ "LIMIT", - /* 134 */ "OFFSET", - /* 135 */ "SLIMIT", - /* 136 */ "SOFFSET", - /* 137 */ "WHERE", - /* 138 */ "RESET", - /* 139 */ "QUERY", - /* 140 */ "SYNCDB", - /* 141 */ "ADD", - /* 142 */ "COLUMN", - /* 143 */ "MODIFY", - /* 144 */ "TAG", - /* 145 */ "CHANGE", - /* 146 */ "SET", - /* 147 */ "KILL", - /* 148 */ "CONNECTION", - /* 149 */ "STREAM", - /* 150 */ "COLON", - /* 151 */ "ABORT", - /* 152 */ "AFTER", - /* 153 */ "ATTACH", - /* 154 */ "BEFORE", - /* 155 */ "BEGIN", - /* 156 */ "CASCADE", - /* 157 */ "CLUSTER", - /* 158 */ "CONFLICT", - /* 159 */ "COPY", - /* 160 */ "DEFERRED", - /* 161 */ "DELIMITERS", - /* 162 */ "DETACH", - /* 163 */ "EACH", - /* 164 */ "END", - /* 165 */ "EXPLAIN", - /* 166 */ "FAIL", - /* 167 */ "FOR", - /* 168 */ "IGNORE", - /* 169 */ "IMMEDIATE", - /* 170 */ "INITIALLY", - /* 171 */ "INSTEAD", - /* 172 */ "KEY", - /* 173 */ "OF", - /* 174 */ "RAISE", - /* 175 */ "REPLACE", - /* 176 */ "RESTRICT", - /* 177 */ "ROW", - /* 178 */ "STATEMENT", - /* 179 */ "TRIGGER", - /* 180 */ "VIEW", - /* 181 */ "SEMI", - /* 182 */ "NONE", - /* 183 */ "PREV", - /* 184 */ "LINEAR", - /* 185 */ "IMPORT", - /* 186 */ "TBNAME", - /* 187 */ "JOIN", - /* 188 */ "INSERT", - /* 189 */ "INTO", - /* 190 */ "VALUES", - /* 191 */ "error", + /* 111 */ "STREAM", + /* 112 */ "MODE", + /* 113 */ "UNSIGNED", + /* 114 */ "TAGS", + /* 115 */ "USING", + /* 116 */ "NULL", + /* 117 */ "NOW", + /* 118 */ "SELECT", + /* 119 */ "UNION", + /* 120 */ "ALL", + /* 121 */ "DISTINCT", + /* 122 */ "FROM", + /* 123 */ "VARIABLE", + /* 124 */ "INTERVAL", + /* 125 */ "EVERY", + /* 126 */ "SESSION", + /* 127 */ "STATE_WINDOW", + /* 128 */ "FILL", + /* 129 */ "SLIDING", + /* 130 */ "ORDER", + /* 131 */ "BY", + /* 132 */ "ASC", + /* 133 */ "GROUP", + /* 134 */ "HAVING", + /* 135 */ "LIMIT", + /* 136 */ "OFFSET", + /* 137 */ "SLIMIT", + /* 138 */ "SOFFSET", + /* 139 */ "WHERE", + /* 140 */ "RESET", + /* 141 */ "QUERY", + /* 142 */ "SYNCDB", + /* 143 */ "ADD", + /* 144 */ "COLUMN", + /* 145 */ "MODIFY", + /* 146 */ "TAG", + /* 147 */ "CHANGE", + /* 148 */ "SET", + /* 149 */ "KILL", + /* 150 */ "CONNECTION", + /* 151 */ "COLON", + /* 152 */ "ABORT", + /* 153 */ "AFTER", + /* 154 */ "ATTACH", + /* 155 */ "BEFORE", + /* 156 */ "BEGIN", + /* 157 */ "CASCADE", + /* 158 */ "CLUSTER", + /* 159 */ "CONFLICT", + /* 160 */ "COPY", + /* 161 */ "DEFERRED", + /* 162 */ "DELIMITERS", + /* 163 */ "DETACH", + /* 164 */ "EACH", + /* 165 */ "END", + /* 166 */ "EXPLAIN", + /* 167 */ "FAIL", + /* 168 */ "FOR", + /* 169 */ "IGNORE", + /* 170 */ "IMMEDIATE", + /* 171 */ "INITIALLY", + /* 172 */ "INSTEAD", + /* 173 */ "KEY", + /* 174 */ "OF", + /* 175 */ "RAISE", + /* 176 */ "REPLACE", + /* 177 */ "RESTRICT", + /* 178 */ "ROW", + /* 179 */ "STATEMENT", + /* 180 */ "TRIGGER", + /* 181 */ "VIEW", + /* 182 */ "SEMI", + /* 183 */ "NONE", + /* 184 */ "PREV", + /* 185 */ "LINEAR", + /* 186 */ "IMPORT", + /* 187 */ "TBNAME", + /* 188 */ "JOIN", + /* 189 */ "INSERT", + /* 190 */ "INTO", + /* 191 */ "VALUES", /* 192 */ "program", /* 193 */ "cmd", /* 194 */ "ids", @@ -1020,47 +1034,48 @@ static const char *const yyTokenName[] = { /* 229 */ "update", /* 230 */ "cachelast", /* 231 */ "vgroups", - /* 232 */ "signed", - /* 233 */ "create_table_args", - /* 234 */ "create_stable_args", - /* 235 */ "create_table_list", - /* 236 */ "create_from_stable", - /* 237 */ "columnlist", - /* 238 */ "tagitemlist1", - /* 239 */ "tagNamelist", - /* 240 */ "select", - /* 241 */ "column", - /* 242 */ "tagitem1", - /* 243 */ "tagitemlist", - /* 244 */ "tagitem", - /* 245 */ "selcollist", - /* 246 */ "from", - /* 247 */ "where_opt", - /* 248 */ "interval_option", - /* 249 */ "sliding_opt", - /* 250 */ "session_option", - /* 251 */ "windowstate_option", - /* 252 */ "fill_opt", - /* 253 */ "groupby_opt", - /* 254 */ "having_opt", - /* 255 */ "orderby_opt", - /* 256 */ "slimit_opt", - /* 257 */ "limit_opt", - /* 258 */ "union", - /* 259 */ "sclp", - /* 260 */ "distinct", - /* 261 */ "expr", - /* 262 */ "as", - /* 263 */ "tablelist", - /* 264 */ "sub", - /* 265 */ "tmvar", - /* 266 */ "intervalKey", - /* 267 */ "sortlist", - /* 268 */ "sortitem", - /* 269 */ "item", - /* 270 */ "sortorder", - /* 271 */ "grouplist", - /* 272 */ "expritem", + /* 232 */ "stream_mode", + /* 233 */ "signed", + /* 234 */ "create_table_args", + /* 235 */ "create_stable_args", + /* 236 */ "create_table_list", + /* 237 */ "create_from_stable", + /* 238 */ "columnlist", + /* 239 */ "tagitemlist1", + /* 240 */ "tagNamelist", + /* 241 */ "select", + /* 242 */ "column", + /* 243 */ "tagitem1", + /* 244 */ "tagitemlist", + /* 245 */ "tagitem", + /* 246 */ "selcollist", + /* 247 */ "from", + /* 248 */ "where_opt", + /* 249 */ "interval_option", + /* 250 */ "sliding_opt", + /* 251 */ "session_option", + /* 252 */ "windowstate_option", + /* 253 */ "fill_opt", + /* 254 */ "groupby_opt", + /* 255 */ "having_opt", + /* 256 */ "orderby_opt", + /* 257 */ "slimit_opt", + /* 258 */ "limit_opt", + /* 259 */ "union", + /* 260 */ "sclp", + /* 261 */ "distinct", + /* 262 */ "expr", + /* 263 */ "as", + /* 264 */ "tablelist", + /* 265 */ "sub", + /* 266 */ "tmvar", + /* 267 */ "intervalKey", + /* 268 */ "sortlist", + /* 269 */ "sortitem", + /* 270 */ "item", + /* 271 */ "sortorder", + /* 272 */ "grouplist", + /* 273 */ "expritem", }; #endif /* defined(YYCOVERAGE) || !defined(NDEBUG) */ @@ -1171,205 +1186,207 @@ static const char *const yyRuleName[] = { /* 100 */ "update ::= UPDATE INTEGER", /* 101 */ "cachelast ::= CACHELAST INTEGER", /* 102 */ "vgroups ::= VGROUPS INTEGER", - /* 103 */ "db_optr ::=", - /* 104 */ "db_optr ::= db_optr cache", - /* 105 */ "db_optr ::= db_optr replica", - /* 106 */ "db_optr ::= db_optr quorum", - /* 107 */ "db_optr ::= db_optr days", - /* 108 */ "db_optr ::= db_optr minrows", - /* 109 */ "db_optr ::= db_optr maxrows", - /* 110 */ "db_optr ::= db_optr blocks", - /* 111 */ "db_optr ::= db_optr ctime", - /* 112 */ "db_optr ::= db_optr wal", - /* 113 */ "db_optr ::= db_optr fsync", - /* 114 */ "db_optr ::= db_optr comp", - /* 115 */ "db_optr ::= db_optr prec", - /* 116 */ "db_optr ::= db_optr keep", - /* 117 */ "db_optr ::= db_optr update", - /* 118 */ "db_optr ::= db_optr cachelast", - /* 119 */ "db_optr ::= db_optr vgroups", - /* 120 */ "alter_db_optr ::=", - /* 121 */ "alter_db_optr ::= alter_db_optr replica", - /* 122 */ "alter_db_optr ::= alter_db_optr quorum", - /* 123 */ "alter_db_optr ::= alter_db_optr keep", - /* 124 */ "alter_db_optr ::= alter_db_optr blocks", - /* 125 */ "alter_db_optr ::= alter_db_optr comp", - /* 126 */ "alter_db_optr ::= alter_db_optr update", - /* 127 */ "alter_db_optr ::= alter_db_optr cachelast", - /* 128 */ "typename ::= ids", - /* 129 */ "typename ::= ids LP signed RP", - /* 130 */ "typename ::= ids UNSIGNED", - /* 131 */ "signed ::= INTEGER", - /* 132 */ "signed ::= PLUS INTEGER", - /* 133 */ "signed ::= MINUS INTEGER", - /* 134 */ "cmd ::= CREATE TABLE create_table_args", - /* 135 */ "cmd ::= CREATE TABLE create_stable_args", - /* 136 */ "cmd ::= CREATE STABLE create_stable_args", - /* 137 */ "cmd ::= CREATE TABLE create_table_list", - /* 138 */ "create_table_list ::= create_from_stable", - /* 139 */ "create_table_list ::= create_table_list create_from_stable", - /* 140 */ "create_table_args ::= ifnotexists ids cpxName LP columnlist RP", - /* 141 */ "create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP", - /* 142 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist1 RP", - /* 143 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist1 RP", - /* 144 */ "tagNamelist ::= tagNamelist COMMA ids", - /* 145 */ "tagNamelist ::= ids", - /* 146 */ "create_table_args ::= ifnotexists ids cpxName AS select", - /* 147 */ "columnlist ::= columnlist COMMA column", - /* 148 */ "columnlist ::= column", - /* 149 */ "column ::= ids typename", - /* 150 */ "tagitemlist1 ::= tagitemlist1 COMMA tagitem1", - /* 151 */ "tagitemlist1 ::= tagitem1", - /* 152 */ "tagitem1 ::= MINUS INTEGER", - /* 153 */ "tagitem1 ::= MINUS FLOAT", - /* 154 */ "tagitem1 ::= PLUS INTEGER", - /* 155 */ "tagitem1 ::= PLUS FLOAT", - /* 156 */ "tagitem1 ::= INTEGER", - /* 157 */ "tagitem1 ::= FLOAT", - /* 158 */ "tagitem1 ::= STRING", - /* 159 */ "tagitem1 ::= BOOL", - /* 160 */ "tagitem1 ::= NULL", - /* 161 */ "tagitem1 ::= NOW", - /* 162 */ "tagitemlist ::= tagitemlist COMMA tagitem", - /* 163 */ "tagitemlist ::= tagitem", - /* 164 */ "tagitem ::= INTEGER", - /* 165 */ "tagitem ::= FLOAT", - /* 166 */ "tagitem ::= STRING", - /* 167 */ "tagitem ::= BOOL", - /* 168 */ "tagitem ::= NULL", - /* 169 */ "tagitem ::= NOW", - /* 170 */ "tagitem ::= MINUS INTEGER", - /* 171 */ "tagitem ::= MINUS FLOAT", - /* 172 */ "tagitem ::= PLUS INTEGER", - /* 173 */ "tagitem ::= PLUS FLOAT", - /* 174 */ "select ::= SELECT selcollist from where_opt interval_option sliding_opt session_option windowstate_option fill_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt", - /* 175 */ "select ::= LP select RP", - /* 176 */ "union ::= select", - /* 177 */ "union ::= union UNION ALL select", - /* 178 */ "union ::= union UNION select", - /* 179 */ "cmd ::= union", - /* 180 */ "select ::= SELECT selcollist", - /* 181 */ "sclp ::= selcollist COMMA", - /* 182 */ "sclp ::=", - /* 183 */ "selcollist ::= sclp distinct expr as", - /* 184 */ "selcollist ::= sclp STAR", - /* 185 */ "as ::= AS ids", - /* 186 */ "as ::= ids", - /* 187 */ "as ::=", - /* 188 */ "distinct ::= DISTINCT", - /* 189 */ "distinct ::=", - /* 190 */ "from ::= FROM tablelist", - /* 191 */ "from ::= FROM sub", - /* 192 */ "sub ::= LP union RP", - /* 193 */ "sub ::= LP union RP ids", - /* 194 */ "sub ::= sub COMMA LP union RP ids", - /* 195 */ "tablelist ::= ids cpxName", - /* 196 */ "tablelist ::= ids cpxName ids", - /* 197 */ "tablelist ::= tablelist COMMA ids cpxName", - /* 198 */ "tablelist ::= tablelist COMMA ids cpxName ids", - /* 199 */ "tmvar ::= VARIABLE", - /* 200 */ "interval_option ::= intervalKey LP tmvar RP", - /* 201 */ "interval_option ::= intervalKey LP tmvar COMMA tmvar RP", - /* 202 */ "interval_option ::=", - /* 203 */ "intervalKey ::= INTERVAL", - /* 204 */ "intervalKey ::= EVERY", - /* 205 */ "session_option ::=", - /* 206 */ "session_option ::= SESSION LP ids cpxName COMMA tmvar RP", - /* 207 */ "windowstate_option ::=", - /* 208 */ "windowstate_option ::= STATE_WINDOW LP ids RP", - /* 209 */ "fill_opt ::=", - /* 210 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP", - /* 211 */ "fill_opt ::= FILL LP ID RP", - /* 212 */ "sliding_opt ::= SLIDING LP tmvar RP", - /* 213 */ "sliding_opt ::=", - /* 214 */ "orderby_opt ::=", - /* 215 */ "orderby_opt ::= ORDER BY sortlist", - /* 216 */ "sortlist ::= sortlist COMMA item sortorder", - /* 217 */ "sortlist ::= item sortorder", - /* 218 */ "item ::= ids cpxName", - /* 219 */ "sortorder ::= ASC", - /* 220 */ "sortorder ::= DESC", - /* 221 */ "sortorder ::=", - /* 222 */ "groupby_opt ::=", - /* 223 */ "groupby_opt ::= GROUP BY grouplist", - /* 224 */ "grouplist ::= grouplist COMMA item", - /* 225 */ "grouplist ::= item", - /* 226 */ "having_opt ::=", - /* 227 */ "having_opt ::= HAVING expr", - /* 228 */ "limit_opt ::=", - /* 229 */ "limit_opt ::= LIMIT signed", - /* 230 */ "limit_opt ::= LIMIT signed OFFSET signed", - /* 231 */ "limit_opt ::= LIMIT signed COMMA signed", - /* 232 */ "slimit_opt ::=", - /* 233 */ "slimit_opt ::= SLIMIT signed", - /* 234 */ "slimit_opt ::= SLIMIT signed SOFFSET signed", - /* 235 */ "slimit_opt ::= SLIMIT signed COMMA signed", - /* 236 */ "where_opt ::=", - /* 237 */ "where_opt ::= WHERE expr", - /* 238 */ "expr ::= LP expr RP", - /* 239 */ "expr ::= ID", - /* 240 */ "expr ::= ID DOT ID", - /* 241 */ "expr ::= ID DOT STAR", - /* 242 */ "expr ::= INTEGER", - /* 243 */ "expr ::= MINUS INTEGER", - /* 244 */ "expr ::= PLUS INTEGER", - /* 245 */ "expr ::= FLOAT", - /* 246 */ "expr ::= MINUS FLOAT", - /* 247 */ "expr ::= PLUS FLOAT", - /* 248 */ "expr ::= STRING", - /* 249 */ "expr ::= NOW", - /* 250 */ "expr ::= VARIABLE", - /* 251 */ "expr ::= PLUS VARIABLE", - /* 252 */ "expr ::= MINUS VARIABLE", - /* 253 */ "expr ::= BOOL", - /* 254 */ "expr ::= NULL", - /* 255 */ "expr ::= ID LP exprlist RP", - /* 256 */ "expr ::= ID LP STAR RP", - /* 257 */ "expr ::= expr IS NULL", - /* 258 */ "expr ::= expr IS NOT NULL", - /* 259 */ "expr ::= expr LT expr", - /* 260 */ "expr ::= expr GT expr", - /* 261 */ "expr ::= expr LE expr", - /* 262 */ "expr ::= expr GE expr", - /* 263 */ "expr ::= expr NE expr", - /* 264 */ "expr ::= expr EQ expr", - /* 265 */ "expr ::= expr BETWEEN expr AND expr", - /* 266 */ "expr ::= expr AND expr", - /* 267 */ "expr ::= expr OR expr", - /* 268 */ "expr ::= expr PLUS expr", - /* 269 */ "expr ::= expr MINUS expr", - /* 270 */ "expr ::= expr STAR expr", - /* 271 */ "expr ::= expr SLASH expr", - /* 272 */ "expr ::= expr REM expr", - /* 273 */ "expr ::= expr LIKE expr", - /* 274 */ "expr ::= expr MATCH expr", - /* 275 */ "expr ::= expr NMATCH expr", - /* 276 */ "expr ::= expr IN LP exprlist RP", - /* 277 */ "exprlist ::= exprlist COMMA expritem", - /* 278 */ "exprlist ::= expritem", - /* 279 */ "expritem ::= expr", - /* 280 */ "expritem ::=", - /* 281 */ "cmd ::= RESET QUERY CACHE", - /* 282 */ "cmd ::= SYNCDB ids REPLICA", - /* 283 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist", - /* 284 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids", - /* 285 */ "cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist", - /* 286 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist", - /* 287 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids", - /* 288 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids", - /* 289 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem", - /* 290 */ "cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist", - /* 291 */ "cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist", - /* 292 */ "cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids", - /* 293 */ "cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist", - /* 294 */ "cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist", - /* 295 */ "cmd ::= ALTER STABLE ids cpxName DROP TAG ids", - /* 296 */ "cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids", - /* 297 */ "cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem", - /* 298 */ "cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist", - /* 299 */ "cmd ::= KILL CONNECTION INTEGER", - /* 300 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER", - /* 301 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER", + /* 103 */ "stream_mode ::= STREAM MODE INTEGER", + /* 104 */ "db_optr ::=", + /* 105 */ "db_optr ::= db_optr cache", + /* 106 */ "db_optr ::= db_optr replica", + /* 107 */ "db_optr ::= db_optr quorum", + /* 108 */ "db_optr ::= db_optr days", + /* 109 */ "db_optr ::= db_optr minrows", + /* 110 */ "db_optr ::= db_optr maxrows", + /* 111 */ "db_optr ::= db_optr blocks", + /* 112 */ "db_optr ::= db_optr ctime", + /* 113 */ "db_optr ::= db_optr wal", + /* 114 */ "db_optr ::= db_optr fsync", + /* 115 */ "db_optr ::= db_optr comp", + /* 116 */ "db_optr ::= db_optr prec", + /* 117 */ "db_optr ::= db_optr keep", + /* 118 */ "db_optr ::= db_optr update", + /* 119 */ "db_optr ::= db_optr cachelast", + /* 120 */ "db_optr ::= db_optr vgroups", + /* 121 */ "db_optr ::= db_optr stream_mode", + /* 122 */ "alter_db_optr ::=", + /* 123 */ "alter_db_optr ::= alter_db_optr replica", + /* 124 */ "alter_db_optr ::= alter_db_optr quorum", + /* 125 */ "alter_db_optr ::= alter_db_optr keep", + /* 126 */ "alter_db_optr ::= alter_db_optr blocks", + /* 127 */ "alter_db_optr ::= alter_db_optr comp", + /* 128 */ "alter_db_optr ::= alter_db_optr update", + /* 129 */ "alter_db_optr ::= alter_db_optr cachelast", + /* 130 */ "typename ::= ids", + /* 131 */ "typename ::= ids LP signed RP", + /* 132 */ "typename ::= ids UNSIGNED", + /* 133 */ "signed ::= INTEGER", + /* 134 */ "signed ::= PLUS INTEGER", + /* 135 */ "signed ::= MINUS INTEGER", + /* 136 */ "cmd ::= CREATE TABLE create_table_args", + /* 137 */ "cmd ::= CREATE TABLE create_stable_args", + /* 138 */ "cmd ::= CREATE STABLE create_stable_args", + /* 139 */ "cmd ::= CREATE TABLE create_table_list", + /* 140 */ "create_table_list ::= create_from_stable", + /* 141 */ "create_table_list ::= create_table_list create_from_stable", + /* 142 */ "create_table_args ::= ifnotexists ids cpxName LP columnlist RP", + /* 143 */ "create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP", + /* 144 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist1 RP", + /* 145 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist1 RP", + /* 146 */ "tagNamelist ::= tagNamelist COMMA ids", + /* 147 */ "tagNamelist ::= ids", + /* 148 */ "create_table_args ::= ifnotexists ids cpxName AS select", + /* 149 */ "columnlist ::= columnlist COMMA column", + /* 150 */ "columnlist ::= column", + /* 151 */ "column ::= ids typename", + /* 152 */ "tagitemlist1 ::= tagitemlist1 COMMA tagitem1", + /* 153 */ "tagitemlist1 ::= tagitem1", + /* 154 */ "tagitem1 ::= MINUS INTEGER", + /* 155 */ "tagitem1 ::= MINUS FLOAT", + /* 156 */ "tagitem1 ::= PLUS INTEGER", + /* 157 */ "tagitem1 ::= PLUS FLOAT", + /* 158 */ "tagitem1 ::= INTEGER", + /* 159 */ "tagitem1 ::= FLOAT", + /* 160 */ "tagitem1 ::= STRING", + /* 161 */ "tagitem1 ::= BOOL", + /* 162 */ "tagitem1 ::= NULL", + /* 163 */ "tagitem1 ::= NOW", + /* 164 */ "tagitemlist ::= tagitemlist COMMA tagitem", + /* 165 */ "tagitemlist ::= tagitem", + /* 166 */ "tagitem ::= INTEGER", + /* 167 */ "tagitem ::= FLOAT", + /* 168 */ "tagitem ::= STRING", + /* 169 */ "tagitem ::= BOOL", + /* 170 */ "tagitem ::= NULL", + /* 171 */ "tagitem ::= NOW", + /* 172 */ "tagitem ::= MINUS INTEGER", + /* 173 */ "tagitem ::= MINUS FLOAT", + /* 174 */ "tagitem ::= PLUS INTEGER", + /* 175 */ "tagitem ::= PLUS FLOAT", + /* 176 */ "select ::= SELECT selcollist from where_opt interval_option sliding_opt session_option windowstate_option fill_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt", + /* 177 */ "select ::= LP select RP", + /* 178 */ "union ::= select", + /* 179 */ "union ::= union UNION ALL select", + /* 180 */ "union ::= union UNION select", + /* 181 */ "cmd ::= union", + /* 182 */ "select ::= SELECT selcollist", + /* 183 */ "sclp ::= selcollist COMMA", + /* 184 */ "sclp ::=", + /* 185 */ "selcollist ::= sclp distinct expr as", + /* 186 */ "selcollist ::= sclp STAR", + /* 187 */ "as ::= AS ids", + /* 188 */ "as ::= ids", + /* 189 */ "as ::=", + /* 190 */ "distinct ::= DISTINCT", + /* 191 */ "distinct ::=", + /* 192 */ "from ::= FROM tablelist", + /* 193 */ "from ::= FROM sub", + /* 194 */ "sub ::= LP union RP", + /* 195 */ "sub ::= LP union RP ids", + /* 196 */ "sub ::= sub COMMA LP union RP ids", + /* 197 */ "tablelist ::= ids cpxName", + /* 198 */ "tablelist ::= ids cpxName ids", + /* 199 */ "tablelist ::= tablelist COMMA ids cpxName", + /* 200 */ "tablelist ::= tablelist COMMA ids cpxName ids", + /* 201 */ "tmvar ::= VARIABLE", + /* 202 */ "interval_option ::= intervalKey LP tmvar RP", + /* 203 */ "interval_option ::= intervalKey LP tmvar COMMA tmvar RP", + /* 204 */ "interval_option ::=", + /* 205 */ "intervalKey ::= INTERVAL", + /* 206 */ "intervalKey ::= EVERY", + /* 207 */ "session_option ::=", + /* 208 */ "session_option ::= SESSION LP ids cpxName COMMA tmvar RP", + /* 209 */ "windowstate_option ::=", + /* 210 */ "windowstate_option ::= STATE_WINDOW LP ids RP", + /* 211 */ "fill_opt ::=", + /* 212 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP", + /* 213 */ "fill_opt ::= FILL LP ID RP", + /* 214 */ "sliding_opt ::= SLIDING LP tmvar RP", + /* 215 */ "sliding_opt ::=", + /* 216 */ "orderby_opt ::=", + /* 217 */ "orderby_opt ::= ORDER BY sortlist", + /* 218 */ "sortlist ::= sortlist COMMA item sortorder", + /* 219 */ "sortlist ::= item sortorder", + /* 220 */ "item ::= ids cpxName", + /* 221 */ "sortorder ::= ASC", + /* 222 */ "sortorder ::= DESC", + /* 223 */ "sortorder ::=", + /* 224 */ "groupby_opt ::=", + /* 225 */ "groupby_opt ::= GROUP BY grouplist", + /* 226 */ "grouplist ::= grouplist COMMA item", + /* 227 */ "grouplist ::= item", + /* 228 */ "having_opt ::=", + /* 229 */ "having_opt ::= HAVING expr", + /* 230 */ "limit_opt ::=", + /* 231 */ "limit_opt ::= LIMIT signed", + /* 232 */ "limit_opt ::= LIMIT signed OFFSET signed", + /* 233 */ "limit_opt ::= LIMIT signed COMMA signed", + /* 234 */ "slimit_opt ::=", + /* 235 */ "slimit_opt ::= SLIMIT signed", + /* 236 */ "slimit_opt ::= SLIMIT signed SOFFSET signed", + /* 237 */ "slimit_opt ::= SLIMIT signed COMMA signed", + /* 238 */ "where_opt ::=", + /* 239 */ "where_opt ::= WHERE expr", + /* 240 */ "expr ::= LP expr RP", + /* 241 */ "expr ::= ID", + /* 242 */ "expr ::= ID DOT ID", + /* 243 */ "expr ::= ID DOT STAR", + /* 244 */ "expr ::= INTEGER", + /* 245 */ "expr ::= MINUS INTEGER", + /* 246 */ "expr ::= PLUS INTEGER", + /* 247 */ "expr ::= FLOAT", + /* 248 */ "expr ::= MINUS FLOAT", + /* 249 */ "expr ::= PLUS FLOAT", + /* 250 */ "expr ::= STRING", + /* 251 */ "expr ::= NOW", + /* 252 */ "expr ::= VARIABLE", + /* 253 */ "expr ::= PLUS VARIABLE", + /* 254 */ "expr ::= MINUS VARIABLE", + /* 255 */ "expr ::= BOOL", + /* 256 */ "expr ::= NULL", + /* 257 */ "expr ::= ID LP exprlist RP", + /* 258 */ "expr ::= ID LP STAR RP", + /* 259 */ "expr ::= expr IS NULL", + /* 260 */ "expr ::= expr IS NOT NULL", + /* 261 */ "expr ::= expr LT expr", + /* 262 */ "expr ::= expr GT expr", + /* 263 */ "expr ::= expr LE expr", + /* 264 */ "expr ::= expr GE expr", + /* 265 */ "expr ::= expr NE expr", + /* 266 */ "expr ::= expr EQ expr", + /* 267 */ "expr ::= expr BETWEEN expr AND expr", + /* 268 */ "expr ::= expr AND expr", + /* 269 */ "expr ::= expr OR expr", + /* 270 */ "expr ::= expr PLUS expr", + /* 271 */ "expr ::= expr MINUS expr", + /* 272 */ "expr ::= expr STAR expr", + /* 273 */ "expr ::= expr SLASH expr", + /* 274 */ "expr ::= expr REM expr", + /* 275 */ "expr ::= expr LIKE expr", + /* 276 */ "expr ::= expr MATCH expr", + /* 277 */ "expr ::= expr NMATCH expr", + /* 278 */ "expr ::= expr IN LP exprlist RP", + /* 279 */ "exprlist ::= exprlist COMMA expritem", + /* 280 */ "exprlist ::= expritem", + /* 281 */ "expritem ::= expr", + /* 282 */ "expritem ::=", + /* 283 */ "cmd ::= RESET QUERY CACHE", + /* 284 */ "cmd ::= SYNCDB ids REPLICA", + /* 285 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist", + /* 286 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids", + /* 287 */ "cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist", + /* 288 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist", + /* 289 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids", + /* 290 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids", + /* 291 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem", + /* 292 */ "cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist", + /* 293 */ "cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist", + /* 294 */ "cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids", + /* 295 */ "cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist", + /* 296 */ "cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist", + /* 297 */ "cmd ::= ALTER STABLE ids cpxName DROP TAG ids", + /* 298 */ "cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids", + /* 299 */ "cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem", + /* 300 */ "cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist", + /* 301 */ "cmd ::= KILL CONNECTION INTEGER", + /* 302 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER", + /* 303 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER", }; #endif /* NDEBUG */ @@ -1418,28 +1435,29 @@ static int yyGrowStack(yyParser *p){ /* Initialize a new parser that has already been allocated. */ -void ParseInit(void *yypParser){ - yyParser *pParser = (yyParser*)yypParser; +void ParseInit(void *yypRawParser ParseCTX_PDECL){ + yyParser *yypParser = (yyParser*)yypRawParser; + ParseCTX_STORE #ifdef YYTRACKMAXSTACKDEPTH - pParser->yyhwm = 0; + yypParser->yyhwm = 0; #endif #if YYSTACKDEPTH<=0 - pParser->yytos = NULL; - pParser->yystack = NULL; - pParser->yystksz = 0; - if( yyGrowStack(pParser) ){ - pParser->yystack = &pParser->yystk0; - pParser->yystksz = 1; + yypParser->yytos = NULL; + yypParser->yystack = NULL; + yypParser->yystksz = 0; + if( yyGrowStack(yypParser) ){ + yypParser->yystack = &yypParser->yystk0; + yypParser->yystksz = 1; } #endif #ifndef YYNOERRORRECOVERY - pParser->yyerrcnt = -1; + yypParser->yyerrcnt = -1; #endif - pParser->yytos = pParser->yystack; - pParser->yystack[0].stateno = 0; - pParser->yystack[0].major = 0; + yypParser->yytos = yypParser->yystack; + yypParser->yystack[0].stateno = 0; + yypParser->yystack[0].major = 0; #if YYSTACKDEPTH>0 - pParser->yystackEnd = &pParser->yystack[YYSTACKDEPTH-1]; + yypParser->yystackEnd = &yypParser->yystack[YYSTACKDEPTH-1]; #endif } @@ -1456,11 +1474,14 @@ void ParseInit(void *yypParser){ ** A pointer to a parser. This pointer is used in subsequent calls ** to Parse and ParseFree. */ -void *ParseAlloc(void *(*mallocProc)(YYMALLOCARGTYPE)){ - yyParser *pParser; - pParser = (yyParser*)(*mallocProc)( (YYMALLOCARGTYPE)sizeof(yyParser) ); - if( pParser ) ParseInit(pParser); - return pParser; +void *ParseAlloc(void *(*mallocProc)(YYMALLOCARGTYPE) ParseCTX_PDECL){ + yyParser *yypParser; + yypParser = (yyParser*)(*mallocProc)( (YYMALLOCARGTYPE)sizeof(yyParser) ); + if( yypParser ){ + ParseCTX_STORE + ParseInit(yypParser ParseCTX_PARAM); + } + return (void*)yypParser; } #endif /* Parse_ENGINEALWAYSONSTACK */ @@ -1477,7 +1498,8 @@ static void yy_destructor( YYCODETYPE yymajor, /* Type code for object to destroy */ YYMINORTYPE *yypminor /* The object to be destroyed */ ){ - ParseARG_FETCH; + ParseARG_FETCH + ParseCTX_FETCH switch( yymajor ){ /* Here is inserted the actions which take place when a ** terminal or non-terminal is destroyed. This can happen @@ -1491,60 +1513,60 @@ static void yy_destructor( */ /********* Begin destructor definitions ***************************************/ case 200: /* exprlist */ - case 245: /* selcollist */ - case 259: /* sclp */ + case 246: /* selcollist */ + case 260: /* sclp */ { -tSqlExprListDestroy((yypminor->yy165)); +tSqlExprListDestroy((yypminor->yy225)); } break; case 214: /* intitemlist */ case 216: /* keep */ - case 237: /* columnlist */ - case 238: /* tagitemlist1 */ - case 239: /* tagNamelist */ - case 243: /* tagitemlist */ - case 252: /* fill_opt */ - case 253: /* groupby_opt */ - case 255: /* orderby_opt */ - case 267: /* sortlist */ - case 271: /* grouplist */ + case 238: /* columnlist */ + case 239: /* tagitemlist1 */ + case 240: /* tagNamelist */ + case 244: /* tagitemlist */ + case 253: /* fill_opt */ + case 254: /* groupby_opt */ + case 256: /* orderby_opt */ + case 268: /* sortlist */ + case 272: /* grouplist */ { -taosArrayDestroy((yypminor->yy165)); +taosArrayDestroy((yypminor->yy225)); } break; - case 235: /* create_table_list */ + case 236: /* create_table_list */ { -destroyCreateTableSql((yypminor->yy326)); +destroyCreateTableSql((yypminor->yy482)); } break; - case 240: /* select */ + case 241: /* select */ { -destroySqlNode((yypminor->yy278)); +destroySqlNode((yypminor->yy185)); } break; - case 246: /* from */ - case 263: /* tablelist */ - case 264: /* sub */ + case 247: /* from */ + case 264: /* tablelist */ + case 265: /* sub */ { -destroyRelationInfo((yypminor->yy10)); +destroyRelationInfo((yypminor->yy160)); } break; - case 247: /* where_opt */ - case 254: /* having_opt */ - case 261: /* expr */ - case 272: /* expritem */ + case 248: /* where_opt */ + case 255: /* having_opt */ + case 262: /* expr */ + case 273: /* expritem */ { -tSqlExprDestroy((yypminor->yy202)); +tSqlExprDestroy((yypminor->yy226)); } break; - case 258: /* union */ + case 259: /* union */ { -destroyAllSqlNode((yypminor->yy503)); +destroyAllSqlNode((yypminor->yy93)); } break; - case 268: /* sortitem */ + case 269: /* sortitem */ { -taosVariantDestroy(&(yypminor->yy425)); +taosVariantDestroy(&(yypminor->yy1)); } break; /********* End destructor definitions *****************************************/ @@ -1656,13 +1678,12 @@ int ParseCoverage(FILE *out){ ** Find the appropriate action for a parser given the terminal ** look-ahead token iLookAhead. */ -static unsigned int yy_find_shift_action( - yyParser *pParser, /* The parser */ - YYCODETYPE iLookAhead /* The look-ahead token */ +static YYACTIONTYPE yy_find_shift_action( + YYCODETYPE iLookAhead, /* The look-ahead token */ + YYACTIONTYPE stateno /* Current state number */ ){ int i; - int stateno = pParser->yytos->stateno; - + if( stateno>YY_MAX_SHIFT ) return stateno; assert( stateno <= YY_SHIFT_COUNT ); #if defined(YYCOVERAGE) @@ -1670,11 +1691,12 @@ static unsigned int yy_find_shift_action( #endif do{ i = yy_shift_ofst[stateno]; - assert( i>=0 && i+YYNTOKEN<=sizeof(yy_lookahead)/sizeof(yy_lookahead[0]) ); + assert( i>=0 ); + /* assert( i+YYNTOKEN<=(int)YY_NLOOKAHEAD ); */ assert( iLookAhead!=YYNOCODE ); assert( iLookAhead < YYNTOKEN ); i += iLookAhead; - if( yy_lookahead[i]!=iLookAhead ){ + if( i>=YY_NLOOKAHEAD || yy_lookahead[i]!=iLookAhead ){ #ifdef YYFALLBACK YYCODETYPE iFallback; /* Fallback token */ if( iLookAhead=YY_ACTTAB_COUNT j0 ){ #ifndef NDEBUG @@ -1724,8 +1747,8 @@ static unsigned int yy_find_shift_action( ** Find the appropriate action for a parser given the non-terminal ** look-ahead token iLookAhead. */ -static int yy_find_reduce_action( - int stateno, /* Current state number */ +static YYACTIONTYPE yy_find_reduce_action( + YYACTIONTYPE stateno, /* Current state number */ YYCODETYPE iLookAhead /* The look-ahead token */ ){ int i; @@ -1754,7 +1777,8 @@ static int yy_find_reduce_action( ** The following routine is called if the stack overflows. */ static void yyStackOverflow(yyParser *yypParser){ - ParseARG_FETCH; + ParseARG_FETCH + ParseCTX_FETCH #ifndef NDEBUG if( yyTraceFILE ){ fprintf(yyTraceFILE,"%sStack Overflow!\n",yyTracePrompt); @@ -1765,7 +1789,8 @@ static void yyStackOverflow(yyParser *yypParser){ ** stack every overflows */ /******** Begin %stack_overflow code ******************************************/ /******** End %stack_overflow code ********************************************/ - ParseARG_STORE; /* Suppress warning about unused %extra_argument var */ + ParseARG_STORE /* Suppress warning about unused %extra_argument var */ + ParseCTX_STORE } /* @@ -1794,8 +1819,8 @@ static void yyTraceShift(yyParser *yypParser, int yyNewState, const char *zTag){ */ static void yy_shift( yyParser *yypParser, /* The parser to be shifted */ - int yyNewState, /* The new state to shift in */ - int yyMajor, /* The major token to shift in */ + YYACTIONTYPE yyNewState, /* The new state to shift in */ + YYCODETYPE yyMajor, /* The major token to shift in */ ParseTOKENTYPE yyMinor /* The minor token to shift in */ ){ yyStackEntry *yytos; @@ -1825,8 +1850,8 @@ static void yy_shift( yyNewState += YY_MIN_REDUCE - YY_MIN_SHIFTREDUCE; } yytos = yypParser->yytos; - yytos->stateno = (YYACTIONTYPE)yyNewState; - yytos->major = (YYCODETYPE)yyMajor; + yytos->stateno = yyNewState; + yytos->major = yyMajor; yytos->minor.yy0 = yyMinor; yyTraceShift(yypParser, yyNewState, "Shift"); } @@ -1941,205 +1966,207 @@ static const struct { { 229, -2 }, /* (100) update ::= UPDATE INTEGER */ { 230, -2 }, /* (101) cachelast ::= CACHELAST INTEGER */ { 231, -2 }, /* (102) vgroups ::= VGROUPS INTEGER */ - { 202, 0 }, /* (103) db_optr ::= */ - { 202, -2 }, /* (104) db_optr ::= db_optr cache */ - { 202, -2 }, /* (105) db_optr ::= db_optr replica */ - { 202, -2 }, /* (106) db_optr ::= db_optr quorum */ - { 202, -2 }, /* (107) db_optr ::= db_optr days */ - { 202, -2 }, /* (108) db_optr ::= db_optr minrows */ - { 202, -2 }, /* (109) db_optr ::= db_optr maxrows */ - { 202, -2 }, /* (110) db_optr ::= db_optr blocks */ - { 202, -2 }, /* (111) db_optr ::= db_optr ctime */ - { 202, -2 }, /* (112) db_optr ::= db_optr wal */ - { 202, -2 }, /* (113) db_optr ::= db_optr fsync */ - { 202, -2 }, /* (114) db_optr ::= db_optr comp */ - { 202, -2 }, /* (115) db_optr ::= db_optr prec */ - { 202, -2 }, /* (116) db_optr ::= db_optr keep */ - { 202, -2 }, /* (117) db_optr ::= db_optr update */ - { 202, -2 }, /* (118) db_optr ::= db_optr cachelast */ - { 202, -2 }, /* (119) db_optr ::= db_optr vgroups */ - { 198, 0 }, /* (120) alter_db_optr ::= */ - { 198, -2 }, /* (121) alter_db_optr ::= alter_db_optr replica */ - { 198, -2 }, /* (122) alter_db_optr ::= alter_db_optr quorum */ - { 198, -2 }, /* (123) alter_db_optr ::= alter_db_optr keep */ - { 198, -2 }, /* (124) alter_db_optr ::= alter_db_optr blocks */ - { 198, -2 }, /* (125) alter_db_optr ::= alter_db_optr comp */ - { 198, -2 }, /* (126) alter_db_optr ::= alter_db_optr update */ - { 198, -2 }, /* (127) alter_db_optr ::= alter_db_optr cachelast */ - { 203, -1 }, /* (128) typename ::= ids */ - { 203, -4 }, /* (129) typename ::= ids LP signed RP */ - { 203, -2 }, /* (130) typename ::= ids UNSIGNED */ - { 232, -1 }, /* (131) signed ::= INTEGER */ - { 232, -2 }, /* (132) signed ::= PLUS INTEGER */ - { 232, -2 }, /* (133) signed ::= MINUS INTEGER */ - { 193, -3 }, /* (134) cmd ::= CREATE TABLE create_table_args */ - { 193, -3 }, /* (135) cmd ::= CREATE TABLE create_stable_args */ - { 193, -3 }, /* (136) cmd ::= CREATE STABLE create_stable_args */ - { 193, -3 }, /* (137) cmd ::= CREATE TABLE create_table_list */ - { 235, -1 }, /* (138) create_table_list ::= create_from_stable */ - { 235, -2 }, /* (139) create_table_list ::= create_table_list create_from_stable */ - { 233, -6 }, /* (140) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ - { 234, -10 }, /* (141) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ - { 236, -10 }, /* (142) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist1 RP */ - { 236, -13 }, /* (143) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist1 RP */ - { 239, -3 }, /* (144) tagNamelist ::= tagNamelist COMMA ids */ - { 239, -1 }, /* (145) tagNamelist ::= ids */ - { 233, -5 }, /* (146) create_table_args ::= ifnotexists ids cpxName AS select */ - { 237, -3 }, /* (147) columnlist ::= columnlist COMMA column */ - { 237, -1 }, /* (148) columnlist ::= column */ - { 241, -2 }, /* (149) column ::= ids typename */ - { 238, -3 }, /* (150) tagitemlist1 ::= tagitemlist1 COMMA tagitem1 */ - { 238, -1 }, /* (151) tagitemlist1 ::= tagitem1 */ - { 242, -2 }, /* (152) tagitem1 ::= MINUS INTEGER */ - { 242, -2 }, /* (153) tagitem1 ::= MINUS FLOAT */ - { 242, -2 }, /* (154) tagitem1 ::= PLUS INTEGER */ - { 242, -2 }, /* (155) tagitem1 ::= PLUS FLOAT */ - { 242, -1 }, /* (156) tagitem1 ::= INTEGER */ - { 242, -1 }, /* (157) tagitem1 ::= FLOAT */ - { 242, -1 }, /* (158) tagitem1 ::= STRING */ - { 242, -1 }, /* (159) tagitem1 ::= BOOL */ - { 242, -1 }, /* (160) tagitem1 ::= NULL */ - { 242, -1 }, /* (161) tagitem1 ::= NOW */ - { 243, -3 }, /* (162) tagitemlist ::= tagitemlist COMMA tagitem */ - { 243, -1 }, /* (163) tagitemlist ::= tagitem */ - { 244, -1 }, /* (164) tagitem ::= INTEGER */ - { 244, -1 }, /* (165) tagitem ::= FLOAT */ - { 244, -1 }, /* (166) tagitem ::= STRING */ - { 244, -1 }, /* (167) tagitem ::= BOOL */ - { 244, -1 }, /* (168) tagitem ::= NULL */ - { 244, -1 }, /* (169) tagitem ::= NOW */ - { 244, -2 }, /* (170) tagitem ::= MINUS INTEGER */ - { 244, -2 }, /* (171) tagitem ::= MINUS FLOAT */ - { 244, -2 }, /* (172) tagitem ::= PLUS INTEGER */ - { 244, -2 }, /* (173) tagitem ::= PLUS FLOAT */ - { 240, -14 }, /* (174) select ::= SELECT selcollist from where_opt interval_option sliding_opt session_option windowstate_option fill_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt */ - { 240, -3 }, /* (175) select ::= LP select RP */ - { 258, -1 }, /* (176) union ::= select */ - { 258, -4 }, /* (177) union ::= union UNION ALL select */ - { 258, -3 }, /* (178) union ::= union UNION select */ - { 193, -1 }, /* (179) cmd ::= union */ - { 240, -2 }, /* (180) select ::= SELECT selcollist */ - { 259, -2 }, /* (181) sclp ::= selcollist COMMA */ - { 259, 0 }, /* (182) sclp ::= */ - { 245, -4 }, /* (183) selcollist ::= sclp distinct expr as */ - { 245, -2 }, /* (184) selcollist ::= sclp STAR */ - { 262, -2 }, /* (185) as ::= AS ids */ - { 262, -1 }, /* (186) as ::= ids */ - { 262, 0 }, /* (187) as ::= */ - { 260, -1 }, /* (188) distinct ::= DISTINCT */ - { 260, 0 }, /* (189) distinct ::= */ - { 246, -2 }, /* (190) from ::= FROM tablelist */ - { 246, -2 }, /* (191) from ::= FROM sub */ - { 264, -3 }, /* (192) sub ::= LP union RP */ - { 264, -4 }, /* (193) sub ::= LP union RP ids */ - { 264, -6 }, /* (194) sub ::= sub COMMA LP union RP ids */ - { 263, -2 }, /* (195) tablelist ::= ids cpxName */ - { 263, -3 }, /* (196) tablelist ::= ids cpxName ids */ - { 263, -4 }, /* (197) tablelist ::= tablelist COMMA ids cpxName */ - { 263, -5 }, /* (198) tablelist ::= tablelist COMMA ids cpxName ids */ - { 265, -1 }, /* (199) tmvar ::= VARIABLE */ - { 248, -4 }, /* (200) interval_option ::= intervalKey LP tmvar RP */ - { 248, -6 }, /* (201) interval_option ::= intervalKey LP tmvar COMMA tmvar RP */ - { 248, 0 }, /* (202) interval_option ::= */ - { 266, -1 }, /* (203) intervalKey ::= INTERVAL */ - { 266, -1 }, /* (204) intervalKey ::= EVERY */ - { 250, 0 }, /* (205) session_option ::= */ - { 250, -7 }, /* (206) session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ - { 251, 0 }, /* (207) windowstate_option ::= */ - { 251, -4 }, /* (208) windowstate_option ::= STATE_WINDOW LP ids RP */ - { 252, 0 }, /* (209) fill_opt ::= */ - { 252, -6 }, /* (210) fill_opt ::= FILL LP ID COMMA tagitemlist RP */ - { 252, -4 }, /* (211) fill_opt ::= FILL LP ID RP */ - { 249, -4 }, /* (212) sliding_opt ::= SLIDING LP tmvar RP */ - { 249, 0 }, /* (213) sliding_opt ::= */ - { 255, 0 }, /* (214) orderby_opt ::= */ - { 255, -3 }, /* (215) orderby_opt ::= ORDER BY sortlist */ - { 267, -4 }, /* (216) sortlist ::= sortlist COMMA item sortorder */ - { 267, -2 }, /* (217) sortlist ::= item sortorder */ - { 269, -2 }, /* (218) item ::= ids cpxName */ - { 270, -1 }, /* (219) sortorder ::= ASC */ - { 270, -1 }, /* (220) sortorder ::= DESC */ - { 270, 0 }, /* (221) sortorder ::= */ - { 253, 0 }, /* (222) groupby_opt ::= */ - { 253, -3 }, /* (223) groupby_opt ::= GROUP BY grouplist */ - { 271, -3 }, /* (224) grouplist ::= grouplist COMMA item */ - { 271, -1 }, /* (225) grouplist ::= item */ - { 254, 0 }, /* (226) having_opt ::= */ - { 254, -2 }, /* (227) having_opt ::= HAVING expr */ - { 257, 0 }, /* (228) limit_opt ::= */ - { 257, -2 }, /* (229) limit_opt ::= LIMIT signed */ - { 257, -4 }, /* (230) limit_opt ::= LIMIT signed OFFSET signed */ - { 257, -4 }, /* (231) limit_opt ::= LIMIT signed COMMA signed */ - { 256, 0 }, /* (232) slimit_opt ::= */ - { 256, -2 }, /* (233) slimit_opt ::= SLIMIT signed */ - { 256, -4 }, /* (234) slimit_opt ::= SLIMIT signed SOFFSET signed */ - { 256, -4 }, /* (235) slimit_opt ::= SLIMIT signed COMMA signed */ - { 247, 0 }, /* (236) where_opt ::= */ - { 247, -2 }, /* (237) where_opt ::= WHERE expr */ - { 261, -3 }, /* (238) expr ::= LP expr RP */ - { 261, -1 }, /* (239) expr ::= ID */ - { 261, -3 }, /* (240) expr ::= ID DOT ID */ - { 261, -3 }, /* (241) expr ::= ID DOT STAR */ - { 261, -1 }, /* (242) expr ::= INTEGER */ - { 261, -2 }, /* (243) expr ::= MINUS INTEGER */ - { 261, -2 }, /* (244) expr ::= PLUS INTEGER */ - { 261, -1 }, /* (245) expr ::= FLOAT */ - { 261, -2 }, /* (246) expr ::= MINUS FLOAT */ - { 261, -2 }, /* (247) expr ::= PLUS FLOAT */ - { 261, -1 }, /* (248) expr ::= STRING */ - { 261, -1 }, /* (249) expr ::= NOW */ - { 261, -1 }, /* (250) expr ::= VARIABLE */ - { 261, -2 }, /* (251) expr ::= PLUS VARIABLE */ - { 261, -2 }, /* (252) expr ::= MINUS VARIABLE */ - { 261, -1 }, /* (253) expr ::= BOOL */ - { 261, -1 }, /* (254) expr ::= NULL */ - { 261, -4 }, /* (255) expr ::= ID LP exprlist RP */ - { 261, -4 }, /* (256) expr ::= ID LP STAR RP */ - { 261, -3 }, /* (257) expr ::= expr IS NULL */ - { 261, -4 }, /* (258) expr ::= expr IS NOT NULL */ - { 261, -3 }, /* (259) expr ::= expr LT expr */ - { 261, -3 }, /* (260) expr ::= expr GT expr */ - { 261, -3 }, /* (261) expr ::= expr LE expr */ - { 261, -3 }, /* (262) expr ::= expr GE expr */ - { 261, -3 }, /* (263) expr ::= expr NE expr */ - { 261, -3 }, /* (264) expr ::= expr EQ expr */ - { 261, -5 }, /* (265) expr ::= expr BETWEEN expr AND expr */ - { 261, -3 }, /* (266) expr ::= expr AND expr */ - { 261, -3 }, /* (267) expr ::= expr OR expr */ - { 261, -3 }, /* (268) expr ::= expr PLUS expr */ - { 261, -3 }, /* (269) expr ::= expr MINUS expr */ - { 261, -3 }, /* (270) expr ::= expr STAR expr */ - { 261, -3 }, /* (271) expr ::= expr SLASH expr */ - { 261, -3 }, /* (272) expr ::= expr REM expr */ - { 261, -3 }, /* (273) expr ::= expr LIKE expr */ - { 261, -3 }, /* (274) expr ::= expr MATCH expr */ - { 261, -3 }, /* (275) expr ::= expr NMATCH expr */ - { 261, -5 }, /* (276) expr ::= expr IN LP exprlist RP */ - { 200, -3 }, /* (277) exprlist ::= exprlist COMMA expritem */ - { 200, -1 }, /* (278) exprlist ::= expritem */ - { 272, -1 }, /* (279) expritem ::= expr */ - { 272, 0 }, /* (280) expritem ::= */ - { 193, -3 }, /* (281) cmd ::= RESET QUERY CACHE */ - { 193, -3 }, /* (282) cmd ::= SYNCDB ids REPLICA */ - { 193, -7 }, /* (283) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ - { 193, -7 }, /* (284) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ - { 193, -7 }, /* (285) cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */ - { 193, -7 }, /* (286) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ - { 193, -7 }, /* (287) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ - { 193, -8 }, /* (288) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ - { 193, -9 }, /* (289) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ - { 193, -7 }, /* (290) cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */ - { 193, -7 }, /* (291) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ - { 193, -7 }, /* (292) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ - { 193, -7 }, /* (293) cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */ - { 193, -7 }, /* (294) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ - { 193, -7 }, /* (295) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ - { 193, -8 }, /* (296) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ - { 193, -9 }, /* (297) cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */ - { 193, -7 }, /* (298) cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */ - { 193, -3 }, /* (299) cmd ::= KILL CONNECTION INTEGER */ - { 193, -5 }, /* (300) cmd ::= KILL STREAM INTEGER COLON INTEGER */ - { 193, -5 }, /* (301) cmd ::= KILL QUERY INTEGER COLON INTEGER */ + { 232, -3 }, /* (103) stream_mode ::= STREAM MODE INTEGER */ + { 202, 0 }, /* (104) db_optr ::= */ + { 202, -2 }, /* (105) db_optr ::= db_optr cache */ + { 202, -2 }, /* (106) db_optr ::= db_optr replica */ + { 202, -2 }, /* (107) db_optr ::= db_optr quorum */ + { 202, -2 }, /* (108) db_optr ::= db_optr days */ + { 202, -2 }, /* (109) db_optr ::= db_optr minrows */ + { 202, -2 }, /* (110) db_optr ::= db_optr maxrows */ + { 202, -2 }, /* (111) db_optr ::= db_optr blocks */ + { 202, -2 }, /* (112) db_optr ::= db_optr ctime */ + { 202, -2 }, /* (113) db_optr ::= db_optr wal */ + { 202, -2 }, /* (114) db_optr ::= db_optr fsync */ + { 202, -2 }, /* (115) db_optr ::= db_optr comp */ + { 202, -2 }, /* (116) db_optr ::= db_optr prec */ + { 202, -2 }, /* (117) db_optr ::= db_optr keep */ + { 202, -2 }, /* (118) db_optr ::= db_optr update */ + { 202, -2 }, /* (119) db_optr ::= db_optr cachelast */ + { 202, -2 }, /* (120) db_optr ::= db_optr vgroups */ + { 202, -2 }, /* (121) db_optr ::= db_optr stream_mode */ + { 198, 0 }, /* (122) alter_db_optr ::= */ + { 198, -2 }, /* (123) alter_db_optr ::= alter_db_optr replica */ + { 198, -2 }, /* (124) alter_db_optr ::= alter_db_optr quorum */ + { 198, -2 }, /* (125) alter_db_optr ::= alter_db_optr keep */ + { 198, -2 }, /* (126) alter_db_optr ::= alter_db_optr blocks */ + { 198, -2 }, /* (127) alter_db_optr ::= alter_db_optr comp */ + { 198, -2 }, /* (128) alter_db_optr ::= alter_db_optr update */ + { 198, -2 }, /* (129) alter_db_optr ::= alter_db_optr cachelast */ + { 203, -1 }, /* (130) typename ::= ids */ + { 203, -4 }, /* (131) typename ::= ids LP signed RP */ + { 203, -2 }, /* (132) typename ::= ids UNSIGNED */ + { 233, -1 }, /* (133) signed ::= INTEGER */ + { 233, -2 }, /* (134) signed ::= PLUS INTEGER */ + { 233, -2 }, /* (135) signed ::= MINUS INTEGER */ + { 193, -3 }, /* (136) cmd ::= CREATE TABLE create_table_args */ + { 193, -3 }, /* (137) cmd ::= CREATE TABLE create_stable_args */ + { 193, -3 }, /* (138) cmd ::= CREATE STABLE create_stable_args */ + { 193, -3 }, /* (139) cmd ::= CREATE TABLE create_table_list */ + { 236, -1 }, /* (140) create_table_list ::= create_from_stable */ + { 236, -2 }, /* (141) create_table_list ::= create_table_list create_from_stable */ + { 234, -6 }, /* (142) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ + { 235, -10 }, /* (143) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ + { 237, -10 }, /* (144) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist1 RP */ + { 237, -13 }, /* (145) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist1 RP */ + { 240, -3 }, /* (146) tagNamelist ::= tagNamelist COMMA ids */ + { 240, -1 }, /* (147) tagNamelist ::= ids */ + { 234, -5 }, /* (148) create_table_args ::= ifnotexists ids cpxName AS select */ + { 238, -3 }, /* (149) columnlist ::= columnlist COMMA column */ + { 238, -1 }, /* (150) columnlist ::= column */ + { 242, -2 }, /* (151) column ::= ids typename */ + { 239, -3 }, /* (152) tagitemlist1 ::= tagitemlist1 COMMA tagitem1 */ + { 239, -1 }, /* (153) tagitemlist1 ::= tagitem1 */ + { 243, -2 }, /* (154) tagitem1 ::= MINUS INTEGER */ + { 243, -2 }, /* (155) tagitem1 ::= MINUS FLOAT */ + { 243, -2 }, /* (156) tagitem1 ::= PLUS INTEGER */ + { 243, -2 }, /* (157) tagitem1 ::= PLUS FLOAT */ + { 243, -1 }, /* (158) tagitem1 ::= INTEGER */ + { 243, -1 }, /* (159) tagitem1 ::= FLOAT */ + { 243, -1 }, /* (160) tagitem1 ::= STRING */ + { 243, -1 }, /* (161) tagitem1 ::= BOOL */ + { 243, -1 }, /* (162) tagitem1 ::= NULL */ + { 243, -1 }, /* (163) tagitem1 ::= NOW */ + { 244, -3 }, /* (164) tagitemlist ::= tagitemlist COMMA tagitem */ + { 244, -1 }, /* (165) tagitemlist ::= tagitem */ + { 245, -1 }, /* (166) tagitem ::= INTEGER */ + { 245, -1 }, /* (167) tagitem ::= FLOAT */ + { 245, -1 }, /* (168) tagitem ::= STRING */ + { 245, -1 }, /* (169) tagitem ::= BOOL */ + { 245, -1 }, /* (170) tagitem ::= NULL */ + { 245, -1 }, /* (171) tagitem ::= NOW */ + { 245, -2 }, /* (172) tagitem ::= MINUS INTEGER */ + { 245, -2 }, /* (173) tagitem ::= MINUS FLOAT */ + { 245, -2 }, /* (174) tagitem ::= PLUS INTEGER */ + { 245, -2 }, /* (175) tagitem ::= PLUS FLOAT */ + { 241, -14 }, /* (176) select ::= SELECT selcollist from where_opt interval_option sliding_opt session_option windowstate_option fill_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt */ + { 241, -3 }, /* (177) select ::= LP select RP */ + { 259, -1 }, /* (178) union ::= select */ + { 259, -4 }, /* (179) union ::= union UNION ALL select */ + { 259, -3 }, /* (180) union ::= union UNION select */ + { 193, -1 }, /* (181) cmd ::= union */ + { 241, -2 }, /* (182) select ::= SELECT selcollist */ + { 260, -2 }, /* (183) sclp ::= selcollist COMMA */ + { 260, 0 }, /* (184) sclp ::= */ + { 246, -4 }, /* (185) selcollist ::= sclp distinct expr as */ + { 246, -2 }, /* (186) selcollist ::= sclp STAR */ + { 263, -2 }, /* (187) as ::= AS ids */ + { 263, -1 }, /* (188) as ::= ids */ + { 263, 0 }, /* (189) as ::= */ + { 261, -1 }, /* (190) distinct ::= DISTINCT */ + { 261, 0 }, /* (191) distinct ::= */ + { 247, -2 }, /* (192) from ::= FROM tablelist */ + { 247, -2 }, /* (193) from ::= FROM sub */ + { 265, -3 }, /* (194) sub ::= LP union RP */ + { 265, -4 }, /* (195) sub ::= LP union RP ids */ + { 265, -6 }, /* (196) sub ::= sub COMMA LP union RP ids */ + { 264, -2 }, /* (197) tablelist ::= ids cpxName */ + { 264, -3 }, /* (198) tablelist ::= ids cpxName ids */ + { 264, -4 }, /* (199) tablelist ::= tablelist COMMA ids cpxName */ + { 264, -5 }, /* (200) tablelist ::= tablelist COMMA ids cpxName ids */ + { 266, -1 }, /* (201) tmvar ::= VARIABLE */ + { 249, -4 }, /* (202) interval_option ::= intervalKey LP tmvar RP */ + { 249, -6 }, /* (203) interval_option ::= intervalKey LP tmvar COMMA tmvar RP */ + { 249, 0 }, /* (204) interval_option ::= */ + { 267, -1 }, /* (205) intervalKey ::= INTERVAL */ + { 267, -1 }, /* (206) intervalKey ::= EVERY */ + { 251, 0 }, /* (207) session_option ::= */ + { 251, -7 }, /* (208) session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ + { 252, 0 }, /* (209) windowstate_option ::= */ + { 252, -4 }, /* (210) windowstate_option ::= STATE_WINDOW LP ids RP */ + { 253, 0 }, /* (211) fill_opt ::= */ + { 253, -6 }, /* (212) fill_opt ::= FILL LP ID COMMA tagitemlist RP */ + { 253, -4 }, /* (213) fill_opt ::= FILL LP ID RP */ + { 250, -4 }, /* (214) sliding_opt ::= SLIDING LP tmvar RP */ + { 250, 0 }, /* (215) sliding_opt ::= */ + { 256, 0 }, /* (216) orderby_opt ::= */ + { 256, -3 }, /* (217) orderby_opt ::= ORDER BY sortlist */ + { 268, -4 }, /* (218) sortlist ::= sortlist COMMA item sortorder */ + { 268, -2 }, /* (219) sortlist ::= item sortorder */ + { 270, -2 }, /* (220) item ::= ids cpxName */ + { 271, -1 }, /* (221) sortorder ::= ASC */ + { 271, -1 }, /* (222) sortorder ::= DESC */ + { 271, 0 }, /* (223) sortorder ::= */ + { 254, 0 }, /* (224) groupby_opt ::= */ + { 254, -3 }, /* (225) groupby_opt ::= GROUP BY grouplist */ + { 272, -3 }, /* (226) grouplist ::= grouplist COMMA item */ + { 272, -1 }, /* (227) grouplist ::= item */ + { 255, 0 }, /* (228) having_opt ::= */ + { 255, -2 }, /* (229) having_opt ::= HAVING expr */ + { 258, 0 }, /* (230) limit_opt ::= */ + { 258, -2 }, /* (231) limit_opt ::= LIMIT signed */ + { 258, -4 }, /* (232) limit_opt ::= LIMIT signed OFFSET signed */ + { 258, -4 }, /* (233) limit_opt ::= LIMIT signed COMMA signed */ + { 257, 0 }, /* (234) slimit_opt ::= */ + { 257, -2 }, /* (235) slimit_opt ::= SLIMIT signed */ + { 257, -4 }, /* (236) slimit_opt ::= SLIMIT signed SOFFSET signed */ + { 257, -4 }, /* (237) slimit_opt ::= SLIMIT signed COMMA signed */ + { 248, 0 }, /* (238) where_opt ::= */ + { 248, -2 }, /* (239) where_opt ::= WHERE expr */ + { 262, -3 }, /* (240) expr ::= LP expr RP */ + { 262, -1 }, /* (241) expr ::= ID */ + { 262, -3 }, /* (242) expr ::= ID DOT ID */ + { 262, -3 }, /* (243) expr ::= ID DOT STAR */ + { 262, -1 }, /* (244) expr ::= INTEGER */ + { 262, -2 }, /* (245) expr ::= MINUS INTEGER */ + { 262, -2 }, /* (246) expr ::= PLUS INTEGER */ + { 262, -1 }, /* (247) expr ::= FLOAT */ + { 262, -2 }, /* (248) expr ::= MINUS FLOAT */ + { 262, -2 }, /* (249) expr ::= PLUS FLOAT */ + { 262, -1 }, /* (250) expr ::= STRING */ + { 262, -1 }, /* (251) expr ::= NOW */ + { 262, -1 }, /* (252) expr ::= VARIABLE */ + { 262, -2 }, /* (253) expr ::= PLUS VARIABLE */ + { 262, -2 }, /* (254) expr ::= MINUS VARIABLE */ + { 262, -1 }, /* (255) expr ::= BOOL */ + { 262, -1 }, /* (256) expr ::= NULL */ + { 262, -4 }, /* (257) expr ::= ID LP exprlist RP */ + { 262, -4 }, /* (258) expr ::= ID LP STAR RP */ + { 262, -3 }, /* (259) expr ::= expr IS NULL */ + { 262, -4 }, /* (260) expr ::= expr IS NOT NULL */ + { 262, -3 }, /* (261) expr ::= expr LT expr */ + { 262, -3 }, /* (262) expr ::= expr GT expr */ + { 262, -3 }, /* (263) expr ::= expr LE expr */ + { 262, -3 }, /* (264) expr ::= expr GE expr */ + { 262, -3 }, /* (265) expr ::= expr NE expr */ + { 262, -3 }, /* (266) expr ::= expr EQ expr */ + { 262, -5 }, /* (267) expr ::= expr BETWEEN expr AND expr */ + { 262, -3 }, /* (268) expr ::= expr AND expr */ + { 262, -3 }, /* (269) expr ::= expr OR expr */ + { 262, -3 }, /* (270) expr ::= expr PLUS expr */ + { 262, -3 }, /* (271) expr ::= expr MINUS expr */ + { 262, -3 }, /* (272) expr ::= expr STAR expr */ + { 262, -3 }, /* (273) expr ::= expr SLASH expr */ + { 262, -3 }, /* (274) expr ::= expr REM expr */ + { 262, -3 }, /* (275) expr ::= expr LIKE expr */ + { 262, -3 }, /* (276) expr ::= expr MATCH expr */ + { 262, -3 }, /* (277) expr ::= expr NMATCH expr */ + { 262, -5 }, /* (278) expr ::= expr IN LP exprlist RP */ + { 200, -3 }, /* (279) exprlist ::= exprlist COMMA expritem */ + { 200, -1 }, /* (280) exprlist ::= expritem */ + { 273, -1 }, /* (281) expritem ::= expr */ + { 273, 0 }, /* (282) expritem ::= */ + { 193, -3 }, /* (283) cmd ::= RESET QUERY CACHE */ + { 193, -3 }, /* (284) cmd ::= SYNCDB ids REPLICA */ + { 193, -7 }, /* (285) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ + { 193, -7 }, /* (286) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ + { 193, -7 }, /* (287) cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */ + { 193, -7 }, /* (288) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ + { 193, -7 }, /* (289) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ + { 193, -8 }, /* (290) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ + { 193, -9 }, /* (291) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ + { 193, -7 }, /* (292) cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */ + { 193, -7 }, /* (293) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ + { 193, -7 }, /* (294) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ + { 193, -7 }, /* (295) cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */ + { 193, -7 }, /* (296) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ + { 193, -7 }, /* (297) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ + { 193, -8 }, /* (298) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ + { 193, -9 }, /* (299) cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */ + { 193, -7 }, /* (300) cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */ + { 193, -3 }, /* (301) cmd ::= KILL CONNECTION INTEGER */ + { 193, -5 }, /* (302) cmd ::= KILL STREAM INTEGER COLON INTEGER */ + { 193, -5 }, /* (303) cmd ::= KILL QUERY INTEGER COLON INTEGER */ }; static void yy_accept(yyParser*); /* Forward Declaration */ @@ -2154,17 +2181,18 @@ static void yy_accept(yyParser*); /* Forward Declaration */ ** only called from one place, optimizing compilers will in-line it, which ** means that the extra parameters have no performance impact. */ -static void yy_reduce( +static YYACTIONTYPE yy_reduce( yyParser *yypParser, /* The parser */ unsigned int yyruleno, /* Number of the rule by which to reduce */ int yyLookahead, /* Lookahead token, or YYNOCODE if none */ ParseTOKENTYPE yyLookaheadToken /* Value of the lookahead token */ + ParseCTX_PDECL /* %extra_context */ ){ int yygoto; /* The next state */ - int yyact; /* The next action */ + YYACTIONTYPE yyact; /* The next action */ yyStackEntry *yymsp; /* The top of the parser's stack */ int yysize; /* Amount to pop the stack */ - ParseARG_FETCH; + ParseARG_FETCH (void)yyLookahead; (void)yyLookaheadToken; yymsp = yypParser->yytos; @@ -2195,13 +2223,19 @@ static void yy_reduce( #if YYSTACKDEPTH>0 if( yypParser->yytos>=yypParser->yystackEnd ){ yyStackOverflow(yypParser); - return; + /* The call to yyStackOverflow() above pops the stack until it is + ** empty, causing the main parser loop to exit. So the return value + ** is never used and does not matter. */ + return 0; } #else if( yypParser->yytos>=&yypParser->yystack[yypParser->yystksz-1] ){ if( yyGrowStack(yypParser) ){ yyStackOverflow(yypParser); - return; + /* The call to yyStackOverflow() above pops the stack until it is + ** empty, causing the main parser loop to exit. So the return value + ** is never used and does not matter. */ + return 0; } yymsp = yypParser->yytos; } @@ -2220,9 +2254,9 @@ static void yy_reduce( /********** Begin reduce actions **********************************************/ YYMINORTYPE yylhsminor; case 0: /* program ::= cmd */ - case 134: /* cmd ::= CREATE TABLE create_table_args */ yytestcase(yyruleno==134); - case 135: /* cmd ::= CREATE TABLE create_stable_args */ yytestcase(yyruleno==135); - case 136: /* cmd ::= CREATE STABLE create_stable_args */ yytestcase(yyruleno==136); + case 136: /* cmd ::= CREATE TABLE create_table_args */ yytestcase(yyruleno==136); + case 137: /* cmd ::= CREATE TABLE create_stable_args */ yytestcase(yyruleno==137); + case 138: /* cmd ::= CREATE STABLE create_stable_args */ yytestcase(yyruleno==138); {} break; case 1: /* cmd ::= SHOW DATABASES */ @@ -2398,16 +2432,16 @@ static void yy_reduce( { setDCLSqlElems(pInfo, TSDB_SQL_CFG_LOCAL, 2, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); } break; case 47: /* cmd ::= ALTER DATABASE ids alter_db_optr */ -{ SToken t = {0}; setCreateDbInfo(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy16, &t);} +{ SToken t = {0}; setCreateDbInfo(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy326, &t);} break; case 48: /* cmd ::= ALTER ACCOUNT ids acct_optr */ -{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy211);} +{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy523);} break; case 49: /* cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */ -{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy211);} +{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy523);} break; case 50: /* cmd ::= COMPACT VNODES IN LP exprlist RP */ -{ setCompactVnodeSql(pInfo, TSDB_SQL_COMPACT_VNODE, yymsp[-1].minor.yy165);} +{ setCompactVnodeSql(pInfo, TSDB_SQL_COMPACT_VNODE, yymsp[-1].minor.yy225);} break; case 51: /* ids ::= ID */ {yylhsminor.yy0 = yymsp[0].minor.yy0; } @@ -2418,7 +2452,7 @@ static void yy_reduce( break; case 53: /* ifexists ::= */ case 55: /* ifnotexists ::= */ yytestcase(yyruleno==55); - case 189: /* distinct ::= */ yytestcase(yyruleno==189); + case 191: /* distinct ::= */ yytestcase(yyruleno==191); { yymsp[1].minor.yy0.n = 0;} break; case 54: /* ifnotexists ::= IF NOT EXISTS */ @@ -2429,16 +2463,16 @@ static void yy_reduce( { setDCLSqlElems(pInfo, TSDB_SQL_CREATE_DNODE, 2, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);} break; case 58: /* cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */ -{ setCreateAcctSql(pInfo, TSDB_SQL_CREATE_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy211);} +{ setCreateAcctSql(pInfo, TSDB_SQL_CREATE_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy523);} break; case 59: /* cmd ::= CREATE DATABASE ifnotexists ids db_optr */ -{ setCreateDbInfo(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy16, &yymsp[-2].minor.yy0);} +{ setCreateDbInfo(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy326, &yymsp[-2].minor.yy0);} break; case 60: /* cmd ::= CREATE FUNCTION ids AS ids OUTPUTTYPE typename bufsize */ -{ setCreateFuncInfo(pInfo, TSDB_SQL_CREATE_FUNCTION, &yymsp[-5].minor.yy0, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy106, &yymsp[0].minor.yy0, 1);} +{ setCreateFuncInfo(pInfo, TSDB_SQL_CREATE_FUNCTION, &yymsp[-5].minor.yy0, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy16, &yymsp[0].minor.yy0, 1);} break; case 61: /* cmd ::= CREATE AGGREGATE FUNCTION ids AS ids OUTPUTTYPE typename bufsize */ -{ setCreateFuncInfo(pInfo, TSDB_SQL_CREATE_FUNCTION, &yymsp[-5].minor.yy0, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy106, &yymsp[0].minor.yy0, 2);} +{ setCreateFuncInfo(pInfo, TSDB_SQL_CREATE_FUNCTION, &yymsp[-5].minor.yy0, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy16, &yymsp[0].minor.yy0, 2);} break; case 62: /* cmd ::= CREATE USER ids PASS ids */ { setCreateUserSql(pInfo, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);} @@ -2469,38 +2503,38 @@ static void yy_reduce( break; case 83: /* acct_optr ::= pps tseries storage streams qtime dbs users conns state */ { - yylhsminor.yy211.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1; - yylhsminor.yy211.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1; - yylhsminor.yy211.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1; - yylhsminor.yy211.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1; - yylhsminor.yy211.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1; - yylhsminor.yy211.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1; - yylhsminor.yy211.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1; - yylhsminor.yy211.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1; - yylhsminor.yy211.stat = yymsp[0].minor.yy0; + yylhsminor.yy523.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1; + yylhsminor.yy523.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1; + yylhsminor.yy523.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1; + yylhsminor.yy523.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1; + yylhsminor.yy523.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1; + yylhsminor.yy523.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1; + yylhsminor.yy523.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1; + yylhsminor.yy523.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1; + yylhsminor.yy523.stat = yymsp[0].minor.yy0; } - yymsp[-8].minor.yy211 = yylhsminor.yy211; + yymsp[-8].minor.yy523 = yylhsminor.yy523; break; case 84: /* intitemlist ::= intitemlist COMMA intitem */ - case 162: /* tagitemlist ::= tagitemlist COMMA tagitem */ yytestcase(yyruleno==162); -{ yylhsminor.yy165 = tListItemAppend(yymsp[-2].minor.yy165, &yymsp[0].minor.yy425, -1); } - yymsp[-2].minor.yy165 = yylhsminor.yy165; + case 164: /* tagitemlist ::= tagitemlist COMMA tagitem */ yytestcase(yyruleno==164); +{ yylhsminor.yy225 = tListItemAppend(yymsp[-2].minor.yy225, &yymsp[0].minor.yy1, -1); } + yymsp[-2].minor.yy225 = yylhsminor.yy225; break; case 85: /* intitemlist ::= intitem */ - case 163: /* tagitemlist ::= tagitem */ yytestcase(yyruleno==163); -{ yylhsminor.yy165 = tListItemAppend(NULL, &yymsp[0].minor.yy425, -1); } - yymsp[0].minor.yy165 = yylhsminor.yy165; + case 165: /* tagitemlist ::= tagitem */ yytestcase(yyruleno==165); +{ yylhsminor.yy225 = tListItemAppend(NULL, &yymsp[0].minor.yy1, -1); } + yymsp[0].minor.yy225 = yylhsminor.yy225; break; case 86: /* intitem ::= INTEGER */ - case 164: /* tagitem ::= INTEGER */ yytestcase(yyruleno==164); - case 165: /* tagitem ::= FLOAT */ yytestcase(yyruleno==165); - case 166: /* tagitem ::= STRING */ yytestcase(yyruleno==166); - case 167: /* tagitem ::= BOOL */ yytestcase(yyruleno==167); -{ toTSDBType(yymsp[0].minor.yy0.type); taosVariantCreate(&yylhsminor.yy425, yymsp[0].minor.yy0.z, yymsp[0].minor.yy0.n, yymsp[0].minor.yy0.type); } - yymsp[0].minor.yy425 = yylhsminor.yy425; + case 166: /* tagitem ::= INTEGER */ yytestcase(yyruleno==166); + case 167: /* tagitem ::= FLOAT */ yytestcase(yyruleno==167); + case 168: /* tagitem ::= STRING */ yytestcase(yyruleno==168); + case 169: /* tagitem ::= BOOL */ yytestcase(yyruleno==169); +{ toTSDBType(yymsp[0].minor.yy0.type); taosVariantCreate(&yylhsminor.yy1, yymsp[0].minor.yy0.z, yymsp[0].minor.yy0.n, yymsp[0].minor.yy0.type); } + yymsp[0].minor.yy1 = yylhsminor.yy1; break; case 87: /* keep ::= KEEP intitemlist */ -{ yymsp[-1].minor.yy165 = yymsp[0].minor.yy165; } +{ yymsp[-1].minor.yy225 = yymsp[0].minor.yy225; } break; case 88: /* cache ::= CACHE INTEGER */ case 89: /* replica ::= REPLICA INTEGER */ yytestcase(yyruleno==89); @@ -2519,675 +2553,682 @@ static void yy_reduce( case 102: /* vgroups ::= VGROUPS INTEGER */ yytestcase(yyruleno==102); { yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } break; - case 103: /* db_optr ::= */ -{setDefaultCreateDbOption(&yymsp[1].minor.yy16);} + case 103: /* stream_mode ::= STREAM MODE INTEGER */ +{ yymsp[-2].minor.yy0 = yymsp[0].minor.yy0; } break; - case 104: /* db_optr ::= db_optr cache */ -{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy16 = yylhsminor.yy16; + case 104: /* db_optr ::= */ +{setDefaultCreateDbOption(&yymsp[1].minor.yy326);} break; - case 105: /* db_optr ::= db_optr replica */ - case 121: /* alter_db_optr ::= alter_db_optr replica */ yytestcase(yyruleno==121); -{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy16 = yylhsminor.yy16; + case 105: /* db_optr ::= db_optr cache */ +{ yylhsminor.yy326 = yymsp[-1].minor.yy326; yylhsminor.yy326.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy326 = yylhsminor.yy326; break; - case 106: /* db_optr ::= db_optr quorum */ - case 122: /* alter_db_optr ::= alter_db_optr quorum */ yytestcase(yyruleno==122); -{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy16 = yylhsminor.yy16; + case 106: /* db_optr ::= db_optr replica */ + case 123: /* alter_db_optr ::= alter_db_optr replica */ yytestcase(yyruleno==123); +{ yylhsminor.yy326 = yymsp[-1].minor.yy326; yylhsminor.yy326.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy326 = yylhsminor.yy326; break; - case 107: /* db_optr ::= db_optr days */ -{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy16 = yylhsminor.yy16; + case 107: /* db_optr ::= db_optr quorum */ + case 124: /* alter_db_optr ::= alter_db_optr quorum */ yytestcase(yyruleno==124); +{ yylhsminor.yy326 = yymsp[-1].minor.yy326; yylhsminor.yy326.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy326 = yylhsminor.yy326; break; - case 108: /* db_optr ::= db_optr minrows */ -{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } - yymsp[-1].minor.yy16 = yylhsminor.yy16; + case 108: /* db_optr ::= db_optr days */ +{ yylhsminor.yy326 = yymsp[-1].minor.yy326; yylhsminor.yy326.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy326 = yylhsminor.yy326; break; - case 109: /* db_optr ::= db_optr maxrows */ -{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } - yymsp[-1].minor.yy16 = yylhsminor.yy16; + case 109: /* db_optr ::= db_optr minrows */ +{ yylhsminor.yy326 = yymsp[-1].minor.yy326; yylhsminor.yy326.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } + yymsp[-1].minor.yy326 = yylhsminor.yy326; break; - case 110: /* db_optr ::= db_optr blocks */ - case 124: /* alter_db_optr ::= alter_db_optr blocks */ yytestcase(yyruleno==124); -{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy16 = yylhsminor.yy16; + case 110: /* db_optr ::= db_optr maxrows */ +{ yylhsminor.yy326 = yymsp[-1].minor.yy326; yylhsminor.yy326.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } + yymsp[-1].minor.yy326 = yylhsminor.yy326; break; - case 111: /* db_optr ::= db_optr ctime */ -{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy16 = yylhsminor.yy16; + case 111: /* db_optr ::= db_optr blocks */ + case 126: /* alter_db_optr ::= alter_db_optr blocks */ yytestcase(yyruleno==126); +{ yylhsminor.yy326 = yymsp[-1].minor.yy326; yylhsminor.yy326.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy326 = yylhsminor.yy326; break; - case 112: /* db_optr ::= db_optr wal */ -{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy16 = yylhsminor.yy16; + case 112: /* db_optr ::= db_optr ctime */ +{ yylhsminor.yy326 = yymsp[-1].minor.yy326; yylhsminor.yy326.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy326 = yylhsminor.yy326; break; - case 113: /* db_optr ::= db_optr fsync */ -{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy16 = yylhsminor.yy16; + case 113: /* db_optr ::= db_optr wal */ +{ yylhsminor.yy326 = yymsp[-1].minor.yy326; yylhsminor.yy326.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy326 = yylhsminor.yy326; break; - case 114: /* db_optr ::= db_optr comp */ - case 125: /* alter_db_optr ::= alter_db_optr comp */ yytestcase(yyruleno==125); -{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy16 = yylhsminor.yy16; + case 114: /* db_optr ::= db_optr fsync */ +{ yylhsminor.yy326 = yymsp[-1].minor.yy326; yylhsminor.yy326.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy326 = yylhsminor.yy326; break; - case 115: /* db_optr ::= db_optr prec */ -{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.precision = yymsp[0].minor.yy0; } - yymsp[-1].minor.yy16 = yylhsminor.yy16; + case 115: /* db_optr ::= db_optr comp */ + case 127: /* alter_db_optr ::= alter_db_optr comp */ yytestcase(yyruleno==127); +{ yylhsminor.yy326 = yymsp[-1].minor.yy326; yylhsminor.yy326.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy326 = yylhsminor.yy326; break; - case 116: /* db_optr ::= db_optr keep */ - case 123: /* alter_db_optr ::= alter_db_optr keep */ yytestcase(yyruleno==123); -{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.keep = yymsp[0].minor.yy165; } - yymsp[-1].minor.yy16 = yylhsminor.yy16; + case 116: /* db_optr ::= db_optr prec */ +{ yylhsminor.yy326 = yymsp[-1].minor.yy326; yylhsminor.yy326.precision = yymsp[0].minor.yy0; } + yymsp[-1].minor.yy326 = yylhsminor.yy326; break; - case 117: /* db_optr ::= db_optr update */ - case 126: /* alter_db_optr ::= alter_db_optr update */ yytestcase(yyruleno==126); -{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy16 = yylhsminor.yy16; + case 117: /* db_optr ::= db_optr keep */ + case 125: /* alter_db_optr ::= alter_db_optr keep */ yytestcase(yyruleno==125); +{ yylhsminor.yy326 = yymsp[-1].minor.yy326; yylhsminor.yy326.keep = yymsp[0].minor.yy225; } + yymsp[-1].minor.yy326 = yylhsminor.yy326; break; - case 118: /* db_optr ::= db_optr cachelast */ - case 127: /* alter_db_optr ::= alter_db_optr cachelast */ yytestcase(yyruleno==127); -{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy16 = yylhsminor.yy16; + case 118: /* db_optr ::= db_optr update */ + case 128: /* alter_db_optr ::= alter_db_optr update */ yytestcase(yyruleno==128); +{ yylhsminor.yy326 = yymsp[-1].minor.yy326; yylhsminor.yy326.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy326 = yylhsminor.yy326; break; - case 119: /* db_optr ::= db_optr vgroups */ -{ yylhsminor.yy16 = yymsp[-1].minor.yy16; yylhsminor.yy16.numOfVgroups = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy16 = yylhsminor.yy16; + case 119: /* db_optr ::= db_optr cachelast */ + case 129: /* alter_db_optr ::= alter_db_optr cachelast */ yytestcase(yyruleno==129); +{ yylhsminor.yy326 = yymsp[-1].minor.yy326; yylhsminor.yy326.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy326 = yylhsminor.yy326; break; - case 120: /* alter_db_optr ::= */ -{ setDefaultCreateDbOption(&yymsp[1].minor.yy16);} + case 120: /* db_optr ::= db_optr vgroups */ +{ yylhsminor.yy326 = yymsp[-1].minor.yy326; yylhsminor.yy326.numOfVgroups = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy326 = yylhsminor.yy326; break; - case 128: /* typename ::= ids */ + case 121: /* db_optr ::= db_optr stream_mode */ +{ yylhsminor.yy326 = yymsp[-1].minor.yy326; yylhsminor.yy326.streamMode = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy326 = yylhsminor.yy326; + break; + case 122: /* alter_db_optr ::= */ +{ setDefaultCreateDbOption(&yymsp[1].minor.yy326);} + break; + case 130: /* typename ::= ids */ { yymsp[0].minor.yy0.type = 0; - tSetColumnType (&yylhsminor.yy106, &yymsp[0].minor.yy0); + tSetColumnType (&yylhsminor.yy16, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy106 = yylhsminor.yy106; + yymsp[0].minor.yy16 = yylhsminor.yy16; break; - case 129: /* typename ::= ids LP signed RP */ + case 131: /* typename ::= ids LP signed RP */ { - if (yymsp[-1].minor.yy207 <= 0) { + if (yymsp[-1].minor.yy61 <= 0) { yymsp[-3].minor.yy0.type = 0; - tSetColumnType(&yylhsminor.yy106, &yymsp[-3].minor.yy0); + tSetColumnType(&yylhsminor.yy16, &yymsp[-3].minor.yy0); } else { - yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy207; // negative value of name length - tSetColumnType(&yylhsminor.yy106, &yymsp[-3].minor.yy0); + yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy61; // negative value of name length + tSetColumnType(&yylhsminor.yy16, &yymsp[-3].minor.yy0); } } - yymsp[-3].minor.yy106 = yylhsminor.yy106; + yymsp[-3].minor.yy16 = yylhsminor.yy16; break; - case 130: /* typename ::= ids UNSIGNED */ + case 132: /* typename ::= ids UNSIGNED */ { yymsp[-1].minor.yy0.type = 0; yymsp[-1].minor.yy0.n = ((yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n) - yymsp[-1].minor.yy0.z); - tSetColumnType (&yylhsminor.yy106, &yymsp[-1].minor.yy0); + tSetColumnType (&yylhsminor.yy16, &yymsp[-1].minor.yy0); } - yymsp[-1].minor.yy106 = yylhsminor.yy106; + yymsp[-1].minor.yy16 = yylhsminor.yy16; break; - case 131: /* signed ::= INTEGER */ -{ yylhsminor.yy207 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[0].minor.yy207 = yylhsminor.yy207; + case 133: /* signed ::= INTEGER */ +{ yylhsminor.yy61 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[0].minor.yy61 = yylhsminor.yy61; break; - case 132: /* signed ::= PLUS INTEGER */ -{ yymsp[-1].minor.yy207 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + case 134: /* signed ::= PLUS INTEGER */ +{ yymsp[-1].minor.yy61 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } break; - case 133: /* signed ::= MINUS INTEGER */ -{ yymsp[-1].minor.yy207 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);} + case 135: /* signed ::= MINUS INTEGER */ +{ yymsp[-1].minor.yy61 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);} break; - case 137: /* cmd ::= CREATE TABLE create_table_list */ -{ pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy326;} + case 139: /* cmd ::= CREATE TABLE create_table_list */ +{ pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy482;} break; - case 138: /* create_table_list ::= create_from_stable */ + case 140: /* create_table_list ::= create_from_stable */ { SCreateTableSql* pCreateTable = calloc(1, sizeof(SCreateTableSql)); pCreateTable->childTableInfo = taosArrayInit(4, sizeof(SCreatedTableInfo)); - taosArrayPush(pCreateTable->childTableInfo, &yymsp[0].minor.yy150); + taosArrayPush(pCreateTable->childTableInfo, &yymsp[0].minor.yy184); pCreateTable->type = TSDB_SQL_CREATE_TABLE; - yylhsminor.yy326 = pCreateTable; + yylhsminor.yy482 = pCreateTable; } - yymsp[0].minor.yy326 = yylhsminor.yy326; + yymsp[0].minor.yy482 = yylhsminor.yy482; break; - case 139: /* create_table_list ::= create_table_list create_from_stable */ + case 141: /* create_table_list ::= create_table_list create_from_stable */ { - taosArrayPush(yymsp[-1].minor.yy326->childTableInfo, &yymsp[0].minor.yy150); - yylhsminor.yy326 = yymsp[-1].minor.yy326; + taosArrayPush(yymsp[-1].minor.yy482->childTableInfo, &yymsp[0].minor.yy184); + yylhsminor.yy482 = yymsp[-1].minor.yy482; } - yymsp[-1].minor.yy326 = yylhsminor.yy326; + yymsp[-1].minor.yy482 = yylhsminor.yy482; break; - case 140: /* create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ + case 142: /* create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ { - yylhsminor.yy326 = tSetCreateTableInfo(yymsp[-1].minor.yy165, NULL, NULL, TSDB_SQL_CREATE_TABLE); - setSqlInfo(pInfo, yylhsminor.yy326, NULL, TSDB_SQL_CREATE_TABLE); + yylhsminor.yy482 = tSetCreateTableInfo(yymsp[-1].minor.yy225, NULL, NULL, TSDB_SQL_CREATE_TABLE); + setSqlInfo(pInfo, yylhsminor.yy482, NULL, TSDB_SQL_CREATE_TABLE); yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; setCreatedTableName(pInfo, &yymsp[-4].minor.yy0, &yymsp[-5].minor.yy0); } - yymsp[-5].minor.yy326 = yylhsminor.yy326; + yymsp[-5].minor.yy482 = yylhsminor.yy482; break; - case 141: /* create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ + case 143: /* create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ { - yylhsminor.yy326 = tSetCreateTableInfo(yymsp[-5].minor.yy165, yymsp[-1].minor.yy165, NULL, TSDB_SQL_CREATE_STABLE); - setSqlInfo(pInfo, yylhsminor.yy326, NULL, TSDB_SQL_CREATE_STABLE); + yylhsminor.yy482 = tSetCreateTableInfo(yymsp[-5].minor.yy225, yymsp[-1].minor.yy225, NULL, TSDB_SQL_CREATE_STABLE); + setSqlInfo(pInfo, yylhsminor.yy482, NULL, TSDB_SQL_CREATE_STABLE); yymsp[-8].minor.yy0.n += yymsp[-7].minor.yy0.n; setCreatedTableName(pInfo, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0); } - yymsp[-9].minor.yy326 = yylhsminor.yy326; + yymsp[-9].minor.yy482 = yylhsminor.yy482; break; - case 142: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist1 RP */ + case 144: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist1 RP */ { yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n; yymsp[-8].minor.yy0.n += yymsp[-7].minor.yy0.n; - yylhsminor.yy150 = createNewChildTableInfo(&yymsp[-5].minor.yy0, NULL, yymsp[-1].minor.yy165, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0); + yylhsminor.yy184 = createNewChildTableInfo(&yymsp[-5].minor.yy0, NULL, yymsp[-1].minor.yy225, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0); } - yymsp[-9].minor.yy150 = yylhsminor.yy150; + yymsp[-9].minor.yy184 = yylhsminor.yy184; break; - case 143: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist1 RP */ + case 145: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist1 RP */ { yymsp[-8].minor.yy0.n += yymsp[-7].minor.yy0.n; yymsp[-11].minor.yy0.n += yymsp[-10].minor.yy0.n; - yylhsminor.yy150 = createNewChildTableInfo(&yymsp[-8].minor.yy0, yymsp[-5].minor.yy165, yymsp[-1].minor.yy165, &yymsp[-11].minor.yy0, &yymsp[-12].minor.yy0); + yylhsminor.yy184 = createNewChildTableInfo(&yymsp[-8].minor.yy0, yymsp[-5].minor.yy225, yymsp[-1].minor.yy225, &yymsp[-11].minor.yy0, &yymsp[-12].minor.yy0); } - yymsp[-12].minor.yy150 = yylhsminor.yy150; + yymsp[-12].minor.yy184 = yylhsminor.yy184; break; - case 144: /* tagNamelist ::= tagNamelist COMMA ids */ -{taosArrayPush(yymsp[-2].minor.yy165, &yymsp[0].minor.yy0); yylhsminor.yy165 = yymsp[-2].minor.yy165; } - yymsp[-2].minor.yy165 = yylhsminor.yy165; + case 146: /* tagNamelist ::= tagNamelist COMMA ids */ +{taosArrayPush(yymsp[-2].minor.yy225, &yymsp[0].minor.yy0); yylhsminor.yy225 = yymsp[-2].minor.yy225; } + yymsp[-2].minor.yy225 = yylhsminor.yy225; break; - case 145: /* tagNamelist ::= ids */ -{yylhsminor.yy165 = taosArrayInit(4, sizeof(SToken)); taosArrayPush(yylhsminor.yy165, &yymsp[0].minor.yy0);} - yymsp[0].minor.yy165 = yylhsminor.yy165; + case 147: /* tagNamelist ::= ids */ +{yylhsminor.yy225 = taosArrayInit(4, sizeof(SToken)); taosArrayPush(yylhsminor.yy225, &yymsp[0].minor.yy0);} + yymsp[0].minor.yy225 = yylhsminor.yy225; break; - case 146: /* create_table_args ::= ifnotexists ids cpxName AS select */ + case 148: /* create_table_args ::= ifnotexists ids cpxName AS select */ { -// yylhsminor.yy326 = tSetCreateTableInfo(NULL, NULL, yymsp[0].minor.yy278, TSQL_CREATE_STREAM); -// setSqlInfo(pInfo, yylhsminor.yy326, NULL, TSDB_SQL_CREATE_TABLE); +// yylhsminor.yy482 = tSetCreateTableInfo(NULL, NULL, yymsp[0].minor.yy185, TSQL_CREATE_STREAM); +// setSqlInfo(pInfo, yylhsminor.yy482, NULL, TSDB_SQL_CREATE_TABLE); // // yymsp[-3].minor.yy0.n += yymsp[-2].minor.yy0.n; // setCreatedTableName(pInfo, &yymsp[-3].minor.yy0, &yymsp[-4].minor.yy0); } - yymsp[-4].minor.yy326 = yylhsminor.yy326; + yymsp[-4].minor.yy482 = yylhsminor.yy482; break; - case 147: /* columnlist ::= columnlist COMMA column */ -{taosArrayPush(yymsp[-2].minor.yy165, &yymsp[0].minor.yy106); yylhsminor.yy165 = yymsp[-2].minor.yy165; } - yymsp[-2].minor.yy165 = yylhsminor.yy165; + case 149: /* columnlist ::= columnlist COMMA column */ +{taosArrayPush(yymsp[-2].minor.yy225, &yymsp[0].minor.yy16); yylhsminor.yy225 = yymsp[-2].minor.yy225; } + yymsp[-2].minor.yy225 = yylhsminor.yy225; break; - case 148: /* columnlist ::= column */ -{yylhsminor.yy165 = taosArrayInit(4, sizeof(SField)); taosArrayPush(yylhsminor.yy165, &yymsp[0].minor.yy106);} - yymsp[0].minor.yy165 = yylhsminor.yy165; + case 150: /* columnlist ::= column */ +{yylhsminor.yy225 = taosArrayInit(4, sizeof(SField)); taosArrayPush(yylhsminor.yy225, &yymsp[0].minor.yy16);} + yymsp[0].minor.yy225 = yylhsminor.yy225; break; - case 149: /* column ::= ids typename */ + case 151: /* column ::= ids typename */ { - tSetColumnInfo(&yylhsminor.yy106, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy106); + tSetColumnInfo(&yylhsminor.yy16, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy16); } - yymsp[-1].minor.yy106 = yylhsminor.yy106; + yymsp[-1].minor.yy16 = yylhsminor.yy16; break; - case 150: /* tagitemlist1 ::= tagitemlist1 COMMA tagitem1 */ -{ taosArrayPush(yymsp[-2].minor.yy165, &yymsp[0].minor.yy0); yylhsminor.yy165 = yymsp[-2].minor.yy165;} - yymsp[-2].minor.yy165 = yylhsminor.yy165; + case 152: /* tagitemlist1 ::= tagitemlist1 COMMA tagitem1 */ +{ taosArrayPush(yymsp[-2].minor.yy225, &yymsp[0].minor.yy0); yylhsminor.yy225 = yymsp[-2].minor.yy225;} + yymsp[-2].minor.yy225 = yylhsminor.yy225; break; - case 151: /* tagitemlist1 ::= tagitem1 */ -{ yylhsminor.yy165 = taosArrayInit(4, sizeof(SToken)); taosArrayPush(yylhsminor.yy165, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy165 = yylhsminor.yy165; + case 153: /* tagitemlist1 ::= tagitem1 */ +{ yylhsminor.yy225 = taosArrayInit(4, sizeof(SToken)); taosArrayPush(yylhsminor.yy225, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy225 = yylhsminor.yy225; break; - case 152: /* tagitem1 ::= MINUS INTEGER */ - case 153: /* tagitem1 ::= MINUS FLOAT */ yytestcase(yyruleno==153); - case 154: /* tagitem1 ::= PLUS INTEGER */ yytestcase(yyruleno==154); - case 155: /* tagitem1 ::= PLUS FLOAT */ yytestcase(yyruleno==155); + case 154: /* tagitem1 ::= MINUS INTEGER */ + case 155: /* tagitem1 ::= MINUS FLOAT */ yytestcase(yyruleno==155); + case 156: /* tagitem1 ::= PLUS INTEGER */ yytestcase(yyruleno==156); + case 157: /* tagitem1 ::= PLUS FLOAT */ yytestcase(yyruleno==157); { yylhsminor.yy0.n = yymsp[-1].minor.yy0.n + yymsp[0].minor.yy0.n; yylhsminor.yy0.type = yymsp[0].minor.yy0.type; } yymsp[-1].minor.yy0 = yylhsminor.yy0; break; - case 156: /* tagitem1 ::= INTEGER */ - case 157: /* tagitem1 ::= FLOAT */ yytestcase(yyruleno==157); - case 158: /* tagitem1 ::= STRING */ yytestcase(yyruleno==158); - case 159: /* tagitem1 ::= BOOL */ yytestcase(yyruleno==159); - case 160: /* tagitem1 ::= NULL */ yytestcase(yyruleno==160); - case 161: /* tagitem1 ::= NOW */ yytestcase(yyruleno==161); + case 158: /* tagitem1 ::= INTEGER */ + case 159: /* tagitem1 ::= FLOAT */ yytestcase(yyruleno==159); + case 160: /* tagitem1 ::= STRING */ yytestcase(yyruleno==160); + case 161: /* tagitem1 ::= BOOL */ yytestcase(yyruleno==161); + case 162: /* tagitem1 ::= NULL */ yytestcase(yyruleno==162); + case 163: /* tagitem1 ::= NOW */ yytestcase(yyruleno==163); { yylhsminor.yy0 = yymsp[0].minor.yy0; } yymsp[0].minor.yy0 = yylhsminor.yy0; break; - case 168: /* tagitem ::= NULL */ -{ yymsp[0].minor.yy0.type = 0; taosVariantCreate(&yylhsminor.yy425, yymsp[0].minor.yy0.z, yymsp[0].minor.yy0.n, yymsp[0].minor.yy0.type); } - yymsp[0].minor.yy425 = yylhsminor.yy425; + case 170: /* tagitem ::= NULL */ +{ yymsp[0].minor.yy0.type = 0; taosVariantCreate(&yylhsminor.yy1, yymsp[0].minor.yy0.z, yymsp[0].minor.yy0.n, yymsp[0].minor.yy0.type); } + yymsp[0].minor.yy1 = yylhsminor.yy1; break; - case 169: /* tagitem ::= NOW */ -{ yymsp[0].minor.yy0.type = TSDB_DATA_TYPE_TIMESTAMP; taosVariantCreate(&yylhsminor.yy425, yymsp[0].minor.yy0.z, yymsp[0].minor.yy0.n, yymsp[0].minor.yy0.type);} - yymsp[0].minor.yy425 = yylhsminor.yy425; + case 171: /* tagitem ::= NOW */ +{ yymsp[0].minor.yy0.type = TSDB_DATA_TYPE_TIMESTAMP; taosVariantCreate(&yylhsminor.yy1, yymsp[0].minor.yy0.z, yymsp[0].minor.yy0.n, yymsp[0].minor.yy0.type);} + yymsp[0].minor.yy1 = yylhsminor.yy1; break; - case 170: /* tagitem ::= MINUS INTEGER */ - case 171: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==171); - case 172: /* tagitem ::= PLUS INTEGER */ yytestcase(yyruleno==172); - case 173: /* tagitem ::= PLUS FLOAT */ yytestcase(yyruleno==173); + case 172: /* tagitem ::= MINUS INTEGER */ + case 173: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==173); + case 174: /* tagitem ::= PLUS INTEGER */ yytestcase(yyruleno==174); + case 175: /* tagitem ::= PLUS FLOAT */ yytestcase(yyruleno==175); { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = yymsp[0].minor.yy0.type; toTSDBType(yymsp[-1].minor.yy0.type); - taosVariantCreate(&yylhsminor.yy425, yymsp[-1].minor.yy0.z, yymsp[-1].minor.yy0.n, yymsp[-1].minor.yy0.type); + taosVariantCreate(&yylhsminor.yy1, yymsp[-1].minor.yy0.z, yymsp[-1].minor.yy0.n, yymsp[-1].minor.yy0.type); } - yymsp[-1].minor.yy425 = yylhsminor.yy425; + yymsp[-1].minor.yy1 = yylhsminor.yy1; break; - case 174: /* select ::= SELECT selcollist from where_opt interval_option sliding_opt session_option windowstate_option fill_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt */ + case 176: /* select ::= SELECT selcollist from where_opt interval_option sliding_opt session_option windowstate_option fill_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt */ { - yylhsminor.yy278 = tSetQuerySqlNode(&yymsp[-13].minor.yy0, yymsp[-12].minor.yy165, yymsp[-11].minor.yy10, yymsp[-10].minor.yy202, yymsp[-4].minor.yy165, yymsp[-2].minor.yy165, &yymsp[-9].minor.yy532, &yymsp[-7].minor.yy97, &yymsp[-6].minor.yy6, &yymsp[-8].minor.yy0, yymsp[-5].minor.yy165, &yymsp[0].minor.yy367, &yymsp[-1].minor.yy367, yymsp[-3].minor.yy202); + yylhsminor.yy185 = tSetQuerySqlNode(&yymsp[-13].minor.yy0, yymsp[-12].minor.yy225, yymsp[-11].minor.yy160, yymsp[-10].minor.yy226, yymsp[-4].minor.yy225, yymsp[-2].minor.yy225, &yymsp[-9].minor.yy52, &yymsp[-7].minor.yy463, &yymsp[-6].minor.yy112, &yymsp[-8].minor.yy0, yymsp[-5].minor.yy225, &yymsp[0].minor.yy495, &yymsp[-1].minor.yy495, yymsp[-3].minor.yy226); } - yymsp[-13].minor.yy278 = yylhsminor.yy278; + yymsp[-13].minor.yy185 = yylhsminor.yy185; break; - case 175: /* select ::= LP select RP */ -{yymsp[-2].minor.yy278 = yymsp[-1].minor.yy278;} + case 177: /* select ::= LP select RP */ +{yymsp[-2].minor.yy185 = yymsp[-1].minor.yy185;} break; - case 176: /* union ::= select */ -{ yylhsminor.yy503 = setSubclause(NULL, yymsp[0].minor.yy278); } - yymsp[0].minor.yy503 = yylhsminor.yy503; + case 178: /* union ::= select */ +{ yylhsminor.yy93 = setSubclause(NULL, yymsp[0].minor.yy185); } + yymsp[0].minor.yy93 = yylhsminor.yy93; break; - case 177: /* union ::= union UNION ALL select */ -{ yylhsminor.yy503 = appendSelectClause(yymsp[-3].minor.yy503, SQL_TYPE_UNIONALL, yymsp[0].minor.yy278); } - yymsp[-3].minor.yy503 = yylhsminor.yy503; + case 179: /* union ::= union UNION ALL select */ +{ yylhsminor.yy93 = appendSelectClause(yymsp[-3].minor.yy93, SQL_TYPE_UNIONALL, yymsp[0].minor.yy185); } + yymsp[-3].minor.yy93 = yylhsminor.yy93; break; - case 178: /* union ::= union UNION select */ -{ yylhsminor.yy503 = appendSelectClause(yymsp[-2].minor.yy503, SQL_TYPE_UNION, yymsp[0].minor.yy278); } - yymsp[-2].minor.yy503 = yylhsminor.yy503; + case 180: /* union ::= union UNION select */ +{ yylhsminor.yy93 = appendSelectClause(yymsp[-2].minor.yy93, SQL_TYPE_UNION, yymsp[0].minor.yy185); } + yymsp[-2].minor.yy93 = yylhsminor.yy93; break; - case 179: /* cmd ::= union */ -{ setSqlInfo(pInfo, yymsp[0].minor.yy503, NULL, TSDB_SQL_SELECT); } + case 181: /* cmd ::= union */ +{ setSqlInfo(pInfo, yymsp[0].minor.yy93, NULL, TSDB_SQL_SELECT); } break; - case 180: /* select ::= SELECT selcollist */ + case 182: /* select ::= SELECT selcollist */ { - yylhsminor.yy278 = tSetQuerySqlNode(&yymsp[-1].minor.yy0, yymsp[0].minor.yy165, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + yylhsminor.yy185 = tSetQuerySqlNode(&yymsp[-1].minor.yy0, yymsp[0].minor.yy225, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); } - yymsp[-1].minor.yy278 = yylhsminor.yy278; + yymsp[-1].minor.yy185 = yylhsminor.yy185; break; - case 181: /* sclp ::= selcollist COMMA */ -{yylhsminor.yy165 = yymsp[-1].minor.yy165;} - yymsp[-1].minor.yy165 = yylhsminor.yy165; + case 183: /* sclp ::= selcollist COMMA */ +{yylhsminor.yy225 = yymsp[-1].minor.yy225;} + yymsp[-1].minor.yy225 = yylhsminor.yy225; break; - case 182: /* sclp ::= */ - case 214: /* orderby_opt ::= */ yytestcase(yyruleno==214); -{yymsp[1].minor.yy165 = 0;} + case 184: /* sclp ::= */ + case 216: /* orderby_opt ::= */ yytestcase(yyruleno==216); +{yymsp[1].minor.yy225 = 0;} break; - case 183: /* selcollist ::= sclp distinct expr as */ + case 185: /* selcollist ::= sclp distinct expr as */ { - yylhsminor.yy165 = tSqlExprListAppend(yymsp[-3].minor.yy165, yymsp[-1].minor.yy202, yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0); + yylhsminor.yy225 = tSqlExprListAppend(yymsp[-3].minor.yy225, yymsp[-1].minor.yy226, yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0); } - yymsp[-3].minor.yy165 = yylhsminor.yy165; + yymsp[-3].minor.yy225 = yylhsminor.yy225; break; - case 184: /* selcollist ::= sclp STAR */ + case 186: /* selcollist ::= sclp STAR */ { tSqlExpr *pNode = tSqlExprCreateIdValue(NULL, TK_ALL); - yylhsminor.yy165 = tSqlExprListAppend(yymsp[-1].minor.yy165, pNode, 0, 0); + yylhsminor.yy225 = tSqlExprListAppend(yymsp[-1].minor.yy225, pNode, 0, 0); } - yymsp[-1].minor.yy165 = yylhsminor.yy165; + yymsp[-1].minor.yy225 = yylhsminor.yy225; break; - case 185: /* as ::= AS ids */ + case 187: /* as ::= AS ids */ { yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } break; - case 186: /* as ::= ids */ + case 188: /* as ::= ids */ { yylhsminor.yy0 = yymsp[0].minor.yy0; } yymsp[0].minor.yy0 = yylhsminor.yy0; break; - case 187: /* as ::= */ + case 189: /* as ::= */ { yymsp[1].minor.yy0.n = 0; } break; - case 188: /* distinct ::= DISTINCT */ + case 190: /* distinct ::= DISTINCT */ { yylhsminor.yy0 = yymsp[0].minor.yy0; } yymsp[0].minor.yy0 = yylhsminor.yy0; break; - case 190: /* from ::= FROM tablelist */ - case 191: /* from ::= FROM sub */ yytestcase(yyruleno==191); -{yymsp[-1].minor.yy10 = yymsp[0].minor.yy10;} + case 192: /* from ::= FROM tablelist */ + case 193: /* from ::= FROM sub */ yytestcase(yyruleno==193); +{yymsp[-1].minor.yy160 = yymsp[0].minor.yy160;} break; - case 192: /* sub ::= LP union RP */ -{yymsp[-2].minor.yy10 = addSubquery(NULL, yymsp[-1].minor.yy503, NULL);} + case 194: /* sub ::= LP union RP */ +{yymsp[-2].minor.yy160 = addSubquery(NULL, yymsp[-1].minor.yy93, NULL);} break; - case 193: /* sub ::= LP union RP ids */ -{yymsp[-3].minor.yy10 = addSubquery(NULL, yymsp[-2].minor.yy503, &yymsp[0].minor.yy0);} + case 195: /* sub ::= LP union RP ids */ +{yymsp[-3].minor.yy160 = addSubquery(NULL, yymsp[-2].minor.yy93, &yymsp[0].minor.yy0);} break; - case 194: /* sub ::= sub COMMA LP union RP ids */ -{yylhsminor.yy10 = addSubquery(yymsp[-5].minor.yy10, yymsp[-2].minor.yy503, &yymsp[0].minor.yy0);} - yymsp[-5].minor.yy10 = yylhsminor.yy10; + case 196: /* sub ::= sub COMMA LP union RP ids */ +{yylhsminor.yy160 = addSubquery(yymsp[-5].minor.yy160, yymsp[-2].minor.yy93, &yymsp[0].minor.yy0);} + yymsp[-5].minor.yy160 = yylhsminor.yy160; break; - case 195: /* tablelist ::= ids cpxName */ + case 197: /* tablelist ::= ids cpxName */ { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - yylhsminor.yy10 = setTableNameList(NULL, &yymsp[-1].minor.yy0, NULL); + yylhsminor.yy160 = setTableNameList(NULL, &yymsp[-1].minor.yy0, NULL); } - yymsp[-1].minor.yy10 = yylhsminor.yy10; + yymsp[-1].minor.yy160 = yylhsminor.yy160; break; - case 196: /* tablelist ::= ids cpxName ids */ + case 198: /* tablelist ::= ids cpxName ids */ { yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n; - yylhsminor.yy10 = setTableNameList(NULL, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); + yylhsminor.yy160 = setTableNameList(NULL, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy10 = yylhsminor.yy10; + yymsp[-2].minor.yy160 = yylhsminor.yy160; break; - case 197: /* tablelist ::= tablelist COMMA ids cpxName */ + case 199: /* tablelist ::= tablelist COMMA ids cpxName */ { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - yylhsminor.yy10 = setTableNameList(yymsp[-3].minor.yy10, &yymsp[-1].minor.yy0, NULL); + yylhsminor.yy160 = setTableNameList(yymsp[-3].minor.yy160, &yymsp[-1].minor.yy0, NULL); } - yymsp[-3].minor.yy10 = yylhsminor.yy10; + yymsp[-3].minor.yy160 = yylhsminor.yy160; break; - case 198: /* tablelist ::= tablelist COMMA ids cpxName ids */ + case 200: /* tablelist ::= tablelist COMMA ids cpxName ids */ { yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n; - yylhsminor.yy10 = setTableNameList(yymsp[-4].minor.yy10, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); + yylhsminor.yy160 = setTableNameList(yymsp[-4].minor.yy160, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); } - yymsp[-4].minor.yy10 = yylhsminor.yy10; + yymsp[-4].minor.yy160 = yylhsminor.yy160; break; - case 199: /* tmvar ::= VARIABLE */ + case 201: /* tmvar ::= VARIABLE */ {yylhsminor.yy0 = yymsp[0].minor.yy0;} yymsp[0].minor.yy0 = yylhsminor.yy0; break; - case 200: /* interval_option ::= intervalKey LP tmvar RP */ -{yylhsminor.yy532.interval = yymsp[-1].minor.yy0; yylhsminor.yy532.offset.n = 0; yylhsminor.yy532.token = yymsp[-3].minor.yy46;} - yymsp[-3].minor.yy532 = yylhsminor.yy532; + case 202: /* interval_option ::= intervalKey LP tmvar RP */ +{yylhsminor.yy52.interval = yymsp[-1].minor.yy0; yylhsminor.yy52.offset.n = 0; yylhsminor.yy52.token = yymsp[-3].minor.yy460;} + yymsp[-3].minor.yy52 = yylhsminor.yy52; break; - case 201: /* interval_option ::= intervalKey LP tmvar COMMA tmvar RP */ -{yylhsminor.yy532.interval = yymsp[-3].minor.yy0; yylhsminor.yy532.offset = yymsp[-1].minor.yy0; yylhsminor.yy532.token = yymsp[-5].minor.yy46;} - yymsp[-5].minor.yy532 = yylhsminor.yy532; + case 203: /* interval_option ::= intervalKey LP tmvar COMMA tmvar RP */ +{yylhsminor.yy52.interval = yymsp[-3].minor.yy0; yylhsminor.yy52.offset = yymsp[-1].minor.yy0; yylhsminor.yy52.token = yymsp[-5].minor.yy460;} + yymsp[-5].minor.yy52 = yylhsminor.yy52; break; - case 202: /* interval_option ::= */ -{memset(&yymsp[1].minor.yy532, 0, sizeof(yymsp[1].minor.yy532));} + case 204: /* interval_option ::= */ +{memset(&yymsp[1].minor.yy52, 0, sizeof(yymsp[1].minor.yy52));} break; - case 203: /* intervalKey ::= INTERVAL */ -{yymsp[0].minor.yy46 = TK_INTERVAL;} + case 205: /* intervalKey ::= INTERVAL */ +{yymsp[0].minor.yy460 = TK_INTERVAL;} break; - case 204: /* intervalKey ::= EVERY */ -{yymsp[0].minor.yy46 = TK_EVERY; } + case 206: /* intervalKey ::= EVERY */ +{yymsp[0].minor.yy460 = TK_EVERY; } break; - case 205: /* session_option ::= */ -{yymsp[1].minor.yy97.col.n = 0; yymsp[1].minor.yy97.gap.n = 0;} + case 207: /* session_option ::= */ +{yymsp[1].minor.yy463.col.n = 0; yymsp[1].minor.yy463.gap.n = 0;} break; - case 206: /* session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ + case 208: /* session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - yymsp[-6].minor.yy97.col = yymsp[-4].minor.yy0; - yymsp[-6].minor.yy97.gap = yymsp[-1].minor.yy0; + yymsp[-6].minor.yy463.col = yymsp[-4].minor.yy0; + yymsp[-6].minor.yy463.gap = yymsp[-1].minor.yy0; } break; - case 207: /* windowstate_option ::= */ -{ yymsp[1].minor.yy6.col.n = 0; yymsp[1].minor.yy6.col.z = NULL;} + case 209: /* windowstate_option ::= */ +{ yymsp[1].minor.yy112.col.n = 0; yymsp[1].minor.yy112.col.z = NULL;} break; - case 208: /* windowstate_option ::= STATE_WINDOW LP ids RP */ -{ yymsp[-3].minor.yy6.col = yymsp[-1].minor.yy0; } + case 210: /* windowstate_option ::= STATE_WINDOW LP ids RP */ +{ yymsp[-3].minor.yy112.col = yymsp[-1].minor.yy0; } break; - case 209: /* fill_opt ::= */ -{ yymsp[1].minor.yy165 = 0; } + case 211: /* fill_opt ::= */ +{ yymsp[1].minor.yy225 = 0; } break; - case 210: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */ + case 212: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */ { SVariant A = {0}; toTSDBType(yymsp[-3].minor.yy0.type); taosVariantCreate(&A, yymsp[-3].minor.yy0.z, yymsp[-3].minor.yy0.n, yymsp[-3].minor.yy0.type); - tListItemInsert(yymsp[-1].minor.yy165, &A, -1, 0); - yymsp[-5].minor.yy165 = yymsp[-1].minor.yy165; + tListItemInsert(yymsp[-1].minor.yy225, &A, -1, 0); + yymsp[-5].minor.yy225 = yymsp[-1].minor.yy225; } break; - case 211: /* fill_opt ::= FILL LP ID RP */ + case 213: /* fill_opt ::= FILL LP ID RP */ { toTSDBType(yymsp[-1].minor.yy0.type); - yymsp[-3].minor.yy165 = tListItemAppendToken(NULL, &yymsp[-1].minor.yy0, -1); + yymsp[-3].minor.yy225 = tListItemAppendToken(NULL, &yymsp[-1].minor.yy0, -1); } break; - case 212: /* sliding_opt ::= SLIDING LP tmvar RP */ + case 214: /* sliding_opt ::= SLIDING LP tmvar RP */ {yymsp[-3].minor.yy0 = yymsp[-1].minor.yy0; } break; - case 213: /* sliding_opt ::= */ + case 215: /* sliding_opt ::= */ {yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.z = NULL; yymsp[1].minor.yy0.type = 0; } break; - case 215: /* orderby_opt ::= ORDER BY sortlist */ -{yymsp[-2].minor.yy165 = yymsp[0].minor.yy165;} + case 217: /* orderby_opt ::= ORDER BY sortlist */ +{yymsp[-2].minor.yy225 = yymsp[0].minor.yy225;} break; - case 216: /* sortlist ::= sortlist COMMA item sortorder */ + case 218: /* sortlist ::= sortlist COMMA item sortorder */ { - yylhsminor.yy165 = tListItemAppend(yymsp[-3].minor.yy165, &yymsp[-1].minor.yy425, yymsp[0].minor.yy47); + yylhsminor.yy225 = tListItemAppend(yymsp[-3].minor.yy225, &yymsp[-1].minor.yy1, yymsp[0].minor.yy40); } - yymsp[-3].minor.yy165 = yylhsminor.yy165; + yymsp[-3].minor.yy225 = yylhsminor.yy225; break; - case 217: /* sortlist ::= item sortorder */ + case 219: /* sortlist ::= item sortorder */ { - yylhsminor.yy165 = tListItemAppend(NULL, &yymsp[-1].minor.yy425, yymsp[0].minor.yy47); + yylhsminor.yy225 = tListItemAppend(NULL, &yymsp[-1].minor.yy1, yymsp[0].minor.yy40); } - yymsp[-1].minor.yy165 = yylhsminor.yy165; + yymsp[-1].minor.yy225 = yylhsminor.yy225; break; - case 218: /* item ::= ids cpxName */ + case 220: /* item ::= ids cpxName */ { toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - taosVariantCreate(&yylhsminor.yy425, yymsp[-1].minor.yy0.z, yymsp[-1].minor.yy0.n, yymsp[-1].minor.yy0.type); + taosVariantCreate(&yylhsminor.yy1, yymsp[-1].minor.yy0.z, yymsp[-1].minor.yy0.n, yymsp[-1].minor.yy0.type); } - yymsp[-1].minor.yy425 = yylhsminor.yy425; + yymsp[-1].minor.yy1 = yylhsminor.yy1; break; - case 219: /* sortorder ::= ASC */ -{ yymsp[0].minor.yy47 = TSDB_ORDER_ASC; } + case 221: /* sortorder ::= ASC */ +{ yymsp[0].minor.yy40 = TSDB_ORDER_ASC; } break; - case 220: /* sortorder ::= DESC */ -{ yymsp[0].minor.yy47 = TSDB_ORDER_DESC;} + case 222: /* sortorder ::= DESC */ +{ yymsp[0].minor.yy40 = TSDB_ORDER_DESC;} break; - case 221: /* sortorder ::= */ -{ yymsp[1].minor.yy47 = TSDB_ORDER_ASC; } + case 223: /* sortorder ::= */ +{ yymsp[1].minor.yy40 = TSDB_ORDER_ASC; } break; - case 222: /* groupby_opt ::= */ -{ yymsp[1].minor.yy165 = 0;} + case 224: /* groupby_opt ::= */ +{ yymsp[1].minor.yy225 = 0;} break; - case 223: /* groupby_opt ::= GROUP BY grouplist */ -{ yymsp[-2].minor.yy165 = yymsp[0].minor.yy165;} + case 225: /* groupby_opt ::= GROUP BY grouplist */ +{ yymsp[-2].minor.yy225 = yymsp[0].minor.yy225;} break; - case 224: /* grouplist ::= grouplist COMMA item */ + case 226: /* grouplist ::= grouplist COMMA item */ { - yylhsminor.yy165 = tListItemAppend(yymsp[-2].minor.yy165, &yymsp[0].minor.yy425, -1); + yylhsminor.yy225 = tListItemAppend(yymsp[-2].minor.yy225, &yymsp[0].minor.yy1, -1); } - yymsp[-2].minor.yy165 = yylhsminor.yy165; + yymsp[-2].minor.yy225 = yylhsminor.yy225; break; - case 225: /* grouplist ::= item */ + case 227: /* grouplist ::= item */ { - yylhsminor.yy165 = tListItemAppend(NULL, &yymsp[0].minor.yy425, -1); + yylhsminor.yy225 = tListItemAppend(NULL, &yymsp[0].minor.yy1, -1); } - yymsp[0].minor.yy165 = yylhsminor.yy165; + yymsp[0].minor.yy225 = yylhsminor.yy225; break; - case 226: /* having_opt ::= */ - case 236: /* where_opt ::= */ yytestcase(yyruleno==236); - case 280: /* expritem ::= */ yytestcase(yyruleno==280); -{yymsp[1].minor.yy202 = 0;} + case 228: /* having_opt ::= */ + case 238: /* where_opt ::= */ yytestcase(yyruleno==238); + case 282: /* expritem ::= */ yytestcase(yyruleno==282); +{yymsp[1].minor.yy226 = 0;} break; - case 227: /* having_opt ::= HAVING expr */ - case 237: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==237); -{yymsp[-1].minor.yy202 = yymsp[0].minor.yy202;} + case 229: /* having_opt ::= HAVING expr */ + case 239: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==239); +{yymsp[-1].minor.yy226 = yymsp[0].minor.yy226;} break; - case 228: /* limit_opt ::= */ - case 232: /* slimit_opt ::= */ yytestcase(yyruleno==232); -{yymsp[1].minor.yy367.limit = -1; yymsp[1].minor.yy367.offset = 0;} + case 230: /* limit_opt ::= */ + case 234: /* slimit_opt ::= */ yytestcase(yyruleno==234); +{yymsp[1].minor.yy495.limit = -1; yymsp[1].minor.yy495.offset = 0;} break; - case 229: /* limit_opt ::= LIMIT signed */ - case 233: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==233); -{yymsp[-1].minor.yy367.limit = yymsp[0].minor.yy207; yymsp[-1].minor.yy367.offset = 0;} + case 231: /* limit_opt ::= LIMIT signed */ + case 235: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==235); +{yymsp[-1].minor.yy495.limit = yymsp[0].minor.yy61; yymsp[-1].minor.yy495.offset = 0;} break; - case 230: /* limit_opt ::= LIMIT signed OFFSET signed */ -{ yymsp[-3].minor.yy367.limit = yymsp[-2].minor.yy207; yymsp[-3].minor.yy367.offset = yymsp[0].minor.yy207;} + case 232: /* limit_opt ::= LIMIT signed OFFSET signed */ +{ yymsp[-3].minor.yy495.limit = yymsp[-2].minor.yy61; yymsp[-3].minor.yy495.offset = yymsp[0].minor.yy61;} break; - case 231: /* limit_opt ::= LIMIT signed COMMA signed */ -{ yymsp[-3].minor.yy367.limit = yymsp[0].minor.yy207; yymsp[-3].minor.yy367.offset = yymsp[-2].minor.yy207;} + case 233: /* limit_opt ::= LIMIT signed COMMA signed */ +{ yymsp[-3].minor.yy495.limit = yymsp[0].minor.yy61; yymsp[-3].minor.yy495.offset = yymsp[-2].minor.yy61;} break; - case 234: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ -{yymsp[-3].minor.yy367.limit = yymsp[-2].minor.yy207; yymsp[-3].minor.yy367.offset = yymsp[0].minor.yy207;} + case 236: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ +{yymsp[-3].minor.yy495.limit = yymsp[-2].minor.yy61; yymsp[-3].minor.yy495.offset = yymsp[0].minor.yy61;} break; - case 235: /* slimit_opt ::= SLIMIT signed COMMA signed */ -{yymsp[-3].minor.yy367.limit = yymsp[0].minor.yy207; yymsp[-3].minor.yy367.offset = yymsp[-2].minor.yy207;} + case 237: /* slimit_opt ::= SLIMIT signed COMMA signed */ +{yymsp[-3].minor.yy495.limit = yymsp[0].minor.yy61; yymsp[-3].minor.yy495.offset = yymsp[-2].minor.yy61;} break; - case 238: /* expr ::= LP expr RP */ -{yylhsminor.yy202 = yymsp[-1].minor.yy202; yylhsminor.yy202->exprToken.z = yymsp[-2].minor.yy0.z; yylhsminor.yy202->exprToken.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);} - yymsp[-2].minor.yy202 = yylhsminor.yy202; + case 240: /* expr ::= LP expr RP */ +{yylhsminor.yy226 = yymsp[-1].minor.yy226; yylhsminor.yy226->exprToken.z = yymsp[-2].minor.yy0.z; yylhsminor.yy226->exprToken.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);} + yymsp[-2].minor.yy226 = yylhsminor.yy226; break; - case 239: /* expr ::= ID */ -{ yylhsminor.yy202 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_ID);} - yymsp[0].minor.yy202 = yylhsminor.yy202; + case 241: /* expr ::= ID */ +{ yylhsminor.yy226 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_ID);} + yymsp[0].minor.yy226 = yylhsminor.yy226; break; - case 240: /* expr ::= ID DOT ID */ -{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy202 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ID);} - yymsp[-2].minor.yy202 = yylhsminor.yy202; + case 242: /* expr ::= ID DOT ID */ +{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy226 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ID);} + yymsp[-2].minor.yy226 = yylhsminor.yy226; break; - case 241: /* expr ::= ID DOT STAR */ -{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy202 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ALL);} - yymsp[-2].minor.yy202 = yylhsminor.yy202; + case 243: /* expr ::= ID DOT STAR */ +{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy226 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ALL);} + yymsp[-2].minor.yy226 = yylhsminor.yy226; break; - case 242: /* expr ::= INTEGER */ -{ yylhsminor.yy202 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_INTEGER);} - yymsp[0].minor.yy202 = yylhsminor.yy202; + case 244: /* expr ::= INTEGER */ +{ yylhsminor.yy226 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_INTEGER);} + yymsp[0].minor.yy226 = yylhsminor.yy226; break; - case 243: /* expr ::= MINUS INTEGER */ - case 244: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==244); -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy202 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_INTEGER);} - yymsp[-1].minor.yy202 = yylhsminor.yy202; + case 245: /* expr ::= MINUS INTEGER */ + case 246: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==246); +{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy226 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_INTEGER);} + yymsp[-1].minor.yy226 = yylhsminor.yy226; break; - case 245: /* expr ::= FLOAT */ -{ yylhsminor.yy202 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_FLOAT);} - yymsp[0].minor.yy202 = yylhsminor.yy202; + case 247: /* expr ::= FLOAT */ +{ yylhsminor.yy226 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_FLOAT);} + yymsp[0].minor.yy226 = yylhsminor.yy226; break; - case 246: /* expr ::= MINUS FLOAT */ - case 247: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==247); -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy202 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_FLOAT);} - yymsp[-1].minor.yy202 = yylhsminor.yy202; + case 248: /* expr ::= MINUS FLOAT */ + case 249: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==249); +{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy226 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_FLOAT);} + yymsp[-1].minor.yy226 = yylhsminor.yy226; break; - case 248: /* expr ::= STRING */ -{ yylhsminor.yy202 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_STRING);} - yymsp[0].minor.yy202 = yylhsminor.yy202; + case 250: /* expr ::= STRING */ +{ yylhsminor.yy226 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_STRING);} + yymsp[0].minor.yy226 = yylhsminor.yy226; break; - case 249: /* expr ::= NOW */ -{ yylhsminor.yy202 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NOW); } - yymsp[0].minor.yy202 = yylhsminor.yy202; + case 251: /* expr ::= NOW */ +{ yylhsminor.yy226 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NOW); } + yymsp[0].minor.yy226 = yylhsminor.yy226; break; - case 250: /* expr ::= VARIABLE */ -{ yylhsminor.yy202 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_VARIABLE);} - yymsp[0].minor.yy202 = yylhsminor.yy202; + case 252: /* expr ::= VARIABLE */ +{ yylhsminor.yy226 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_VARIABLE);} + yymsp[0].minor.yy226 = yylhsminor.yy226; break; - case 251: /* expr ::= PLUS VARIABLE */ - case 252: /* expr ::= MINUS VARIABLE */ yytestcase(yyruleno==252); -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_VARIABLE; yylhsminor.yy202 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_VARIABLE);} - yymsp[-1].minor.yy202 = yylhsminor.yy202; + case 253: /* expr ::= PLUS VARIABLE */ + case 254: /* expr ::= MINUS VARIABLE */ yytestcase(yyruleno==254); +{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_VARIABLE; yylhsminor.yy226 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_VARIABLE);} + yymsp[-1].minor.yy226 = yylhsminor.yy226; break; - case 253: /* expr ::= BOOL */ -{ yylhsminor.yy202 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_BOOL);} - yymsp[0].minor.yy202 = yylhsminor.yy202; + case 255: /* expr ::= BOOL */ +{ yylhsminor.yy226 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_BOOL);} + yymsp[0].minor.yy226 = yylhsminor.yy226; break; - case 254: /* expr ::= NULL */ -{ yylhsminor.yy202 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NULL);} - yymsp[0].minor.yy202 = yylhsminor.yy202; + case 256: /* expr ::= NULL */ +{ yylhsminor.yy226 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NULL);} + yymsp[0].minor.yy226 = yylhsminor.yy226; break; - case 255: /* expr ::= ID LP exprlist RP */ -{ tRecordFuncName(pInfo->funcs, &yymsp[-3].minor.yy0); yylhsminor.yy202 = tSqlExprCreateFunction(yymsp[-1].minor.yy165, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } - yymsp[-3].minor.yy202 = yylhsminor.yy202; + case 257: /* expr ::= ID LP exprlist RP */ +{ tRecordFuncName(pInfo->funcs, &yymsp[-3].minor.yy0); yylhsminor.yy226 = tSqlExprCreateFunction(yymsp[-1].minor.yy225, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } + yymsp[-3].minor.yy226 = yylhsminor.yy226; break; - case 256: /* expr ::= ID LP STAR RP */ -{ tRecordFuncName(pInfo->funcs, &yymsp[-3].minor.yy0); yylhsminor.yy202 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } - yymsp[-3].minor.yy202 = yylhsminor.yy202; + case 258: /* expr ::= ID LP STAR RP */ +{ tRecordFuncName(pInfo->funcs, &yymsp[-3].minor.yy0); yylhsminor.yy226 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } + yymsp[-3].minor.yy226 = yylhsminor.yy226; break; - case 257: /* expr ::= expr IS NULL */ -{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, NULL, TK_ISNULL);} - yymsp[-2].minor.yy202 = yylhsminor.yy202; + case 259: /* expr ::= expr IS NULL */ +{yylhsminor.yy226 = tSqlExprCreate(yymsp[-2].minor.yy226, NULL, TK_ISNULL);} + yymsp[-2].minor.yy226 = yylhsminor.yy226; break; - case 258: /* expr ::= expr IS NOT NULL */ -{yylhsminor.yy202 = tSqlExprCreate(yymsp[-3].minor.yy202, NULL, TK_NOTNULL);} - yymsp[-3].minor.yy202 = yylhsminor.yy202; + case 260: /* expr ::= expr IS NOT NULL */ +{yylhsminor.yy226 = tSqlExprCreate(yymsp[-3].minor.yy226, NULL, TK_NOTNULL);} + yymsp[-3].minor.yy226 = yylhsminor.yy226; break; - case 259: /* expr ::= expr LT expr */ -{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_LT);} - yymsp[-2].minor.yy202 = yylhsminor.yy202; + case 261: /* expr ::= expr LT expr */ +{yylhsminor.yy226 = tSqlExprCreate(yymsp[-2].minor.yy226, yymsp[0].minor.yy226, TK_LT);} + yymsp[-2].minor.yy226 = yylhsminor.yy226; break; - case 260: /* expr ::= expr GT expr */ -{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_GT);} - yymsp[-2].minor.yy202 = yylhsminor.yy202; + case 262: /* expr ::= expr GT expr */ +{yylhsminor.yy226 = tSqlExprCreate(yymsp[-2].minor.yy226, yymsp[0].minor.yy226, TK_GT);} + yymsp[-2].minor.yy226 = yylhsminor.yy226; break; - case 261: /* expr ::= expr LE expr */ -{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_LE);} - yymsp[-2].minor.yy202 = yylhsminor.yy202; + case 263: /* expr ::= expr LE expr */ +{yylhsminor.yy226 = tSqlExprCreate(yymsp[-2].minor.yy226, yymsp[0].minor.yy226, TK_LE);} + yymsp[-2].minor.yy226 = yylhsminor.yy226; break; - case 262: /* expr ::= expr GE expr */ -{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_GE);} - yymsp[-2].minor.yy202 = yylhsminor.yy202; + case 264: /* expr ::= expr GE expr */ +{yylhsminor.yy226 = tSqlExprCreate(yymsp[-2].minor.yy226, yymsp[0].minor.yy226, TK_GE);} + yymsp[-2].minor.yy226 = yylhsminor.yy226; break; - case 263: /* expr ::= expr NE expr */ -{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_NE);} - yymsp[-2].minor.yy202 = yylhsminor.yy202; + case 265: /* expr ::= expr NE expr */ +{yylhsminor.yy226 = tSqlExprCreate(yymsp[-2].minor.yy226, yymsp[0].minor.yy226, TK_NE);} + yymsp[-2].minor.yy226 = yylhsminor.yy226; break; - case 264: /* expr ::= expr EQ expr */ -{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_EQ);} - yymsp[-2].minor.yy202 = yylhsminor.yy202; + case 266: /* expr ::= expr EQ expr */ +{yylhsminor.yy226 = tSqlExprCreate(yymsp[-2].minor.yy226, yymsp[0].minor.yy226, TK_EQ);} + yymsp[-2].minor.yy226 = yylhsminor.yy226; break; - case 265: /* expr ::= expr BETWEEN expr AND expr */ -{ tSqlExpr* X2 = tSqlExprClone(yymsp[-4].minor.yy202); yylhsminor.yy202 = tSqlExprCreate(tSqlExprCreate(yymsp[-4].minor.yy202, yymsp[-2].minor.yy202, TK_GE), tSqlExprCreate(X2, yymsp[0].minor.yy202, TK_LE), TK_AND);} - yymsp[-4].minor.yy202 = yylhsminor.yy202; + case 267: /* expr ::= expr BETWEEN expr AND expr */ +{ tSqlExpr* X2 = tSqlExprClone(yymsp[-4].minor.yy226); yylhsminor.yy226 = tSqlExprCreate(tSqlExprCreate(yymsp[-4].minor.yy226, yymsp[-2].minor.yy226, TK_GE), tSqlExprCreate(X2, yymsp[0].minor.yy226, TK_LE), TK_AND);} + yymsp[-4].minor.yy226 = yylhsminor.yy226; break; - case 266: /* expr ::= expr AND expr */ -{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_AND);} - yymsp[-2].minor.yy202 = yylhsminor.yy202; + case 268: /* expr ::= expr AND expr */ +{yylhsminor.yy226 = tSqlExprCreate(yymsp[-2].minor.yy226, yymsp[0].minor.yy226, TK_AND);} + yymsp[-2].minor.yy226 = yylhsminor.yy226; break; - case 267: /* expr ::= expr OR expr */ -{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_OR); } - yymsp[-2].minor.yy202 = yylhsminor.yy202; + case 269: /* expr ::= expr OR expr */ +{yylhsminor.yy226 = tSqlExprCreate(yymsp[-2].minor.yy226, yymsp[0].minor.yy226, TK_OR); } + yymsp[-2].minor.yy226 = yylhsminor.yy226; break; - case 268: /* expr ::= expr PLUS expr */ -{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_PLUS); } - yymsp[-2].minor.yy202 = yylhsminor.yy202; + case 270: /* expr ::= expr PLUS expr */ +{yylhsminor.yy226 = tSqlExprCreate(yymsp[-2].minor.yy226, yymsp[0].minor.yy226, TK_PLUS); } + yymsp[-2].minor.yy226 = yylhsminor.yy226; break; - case 269: /* expr ::= expr MINUS expr */ -{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_MINUS); } - yymsp[-2].minor.yy202 = yylhsminor.yy202; + case 271: /* expr ::= expr MINUS expr */ +{yylhsminor.yy226 = tSqlExprCreate(yymsp[-2].minor.yy226, yymsp[0].minor.yy226, TK_MINUS); } + yymsp[-2].minor.yy226 = yylhsminor.yy226; break; - case 270: /* expr ::= expr STAR expr */ -{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_STAR); } - yymsp[-2].minor.yy202 = yylhsminor.yy202; + case 272: /* expr ::= expr STAR expr */ +{yylhsminor.yy226 = tSqlExprCreate(yymsp[-2].minor.yy226, yymsp[0].minor.yy226, TK_STAR); } + yymsp[-2].minor.yy226 = yylhsminor.yy226; break; - case 271: /* expr ::= expr SLASH expr */ -{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_DIVIDE);} - yymsp[-2].minor.yy202 = yylhsminor.yy202; + case 273: /* expr ::= expr SLASH expr */ +{yylhsminor.yy226 = tSqlExprCreate(yymsp[-2].minor.yy226, yymsp[0].minor.yy226, TK_DIVIDE);} + yymsp[-2].minor.yy226 = yylhsminor.yy226; break; - case 272: /* expr ::= expr REM expr */ -{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_REM); } - yymsp[-2].minor.yy202 = yylhsminor.yy202; + case 274: /* expr ::= expr REM expr */ +{yylhsminor.yy226 = tSqlExprCreate(yymsp[-2].minor.yy226, yymsp[0].minor.yy226, TK_REM); } + yymsp[-2].minor.yy226 = yylhsminor.yy226; break; - case 273: /* expr ::= expr LIKE expr */ -{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_LIKE); } - yymsp[-2].minor.yy202 = yylhsminor.yy202; + case 275: /* expr ::= expr LIKE expr */ +{yylhsminor.yy226 = tSqlExprCreate(yymsp[-2].minor.yy226, yymsp[0].minor.yy226, TK_LIKE); } + yymsp[-2].minor.yy226 = yylhsminor.yy226; break; - case 274: /* expr ::= expr MATCH expr */ -{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_MATCH); } - yymsp[-2].minor.yy202 = yylhsminor.yy202; + case 276: /* expr ::= expr MATCH expr */ +{yylhsminor.yy226 = tSqlExprCreate(yymsp[-2].minor.yy226, yymsp[0].minor.yy226, TK_MATCH); } + yymsp[-2].minor.yy226 = yylhsminor.yy226; break; - case 275: /* expr ::= expr NMATCH expr */ -{yylhsminor.yy202 = tSqlExprCreate(yymsp[-2].minor.yy202, yymsp[0].minor.yy202, TK_NMATCH); } - yymsp[-2].minor.yy202 = yylhsminor.yy202; + case 277: /* expr ::= expr NMATCH expr */ +{yylhsminor.yy226 = tSqlExprCreate(yymsp[-2].minor.yy226, yymsp[0].minor.yy226, TK_NMATCH); } + yymsp[-2].minor.yy226 = yylhsminor.yy226; break; - case 276: /* expr ::= expr IN LP exprlist RP */ -{yylhsminor.yy202 = tSqlExprCreate(yymsp[-4].minor.yy202, (tSqlExpr*)yymsp[-1].minor.yy165, TK_IN); } - yymsp[-4].minor.yy202 = yylhsminor.yy202; + case 278: /* expr ::= expr IN LP exprlist RP */ +{yylhsminor.yy226 = tSqlExprCreate(yymsp[-4].minor.yy226, (tSqlExpr*)yymsp[-1].minor.yy225, TK_IN); } + yymsp[-4].minor.yy226 = yylhsminor.yy226; break; - case 277: /* exprlist ::= exprlist COMMA expritem */ -{yylhsminor.yy165 = tSqlExprListAppend(yymsp[-2].minor.yy165,yymsp[0].minor.yy202,0, 0);} - yymsp[-2].minor.yy165 = yylhsminor.yy165; + case 279: /* exprlist ::= exprlist COMMA expritem */ +{yylhsminor.yy225 = tSqlExprListAppend(yymsp[-2].minor.yy225,yymsp[0].minor.yy226,0, 0);} + yymsp[-2].minor.yy225 = yylhsminor.yy225; break; - case 278: /* exprlist ::= expritem */ -{yylhsminor.yy165 = tSqlExprListAppend(0,yymsp[0].minor.yy202,0, 0);} - yymsp[0].minor.yy165 = yylhsminor.yy165; + case 280: /* exprlist ::= expritem */ +{yylhsminor.yy225 = tSqlExprListAppend(0,yymsp[0].minor.yy226,0, 0);} + yymsp[0].minor.yy225 = yylhsminor.yy225; break; - case 279: /* expritem ::= expr */ -{yylhsminor.yy202 = yymsp[0].minor.yy202;} - yymsp[0].minor.yy202 = yylhsminor.yy202; + case 281: /* expritem ::= expr */ +{yylhsminor.yy226 = yymsp[0].minor.yy226;} + yymsp[0].minor.yy226 = yylhsminor.yy226; break; - case 281: /* cmd ::= RESET QUERY CACHE */ + case 283: /* cmd ::= RESET QUERY CACHE */ { setDCLSqlElems(pInfo, TSDB_SQL_RESET_CACHE, 0);} break; - case 282: /* cmd ::= SYNCDB ids REPLICA */ + case 284: /* cmd ::= SYNCDB ids REPLICA */ { setDCLSqlElems(pInfo, TSDB_SQL_SYNC_DB_REPLICA, 1, &yymsp[-1].minor.yy0);} break; - case 283: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ + case 285: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy165, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, -1); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy225, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 284: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ + case 286: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; toTSDBType(yymsp[0].minor.yy0.type); @@ -3196,21 +3237,21 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 285: /* cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */ + case 287: /* cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy165, NULL, TSDB_ALTER_TABLE_UPDATE_COLUMN_BYTES, -1); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy225, NULL, TSDB_ALTER_TABLE_UPDATE_COLUMN_BYTES, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 286: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ + case 288: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy165, NULL, TSDB_ALTER_TABLE_ADD_TAG, -1); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy225, NULL, TSDB_ALTER_TABLE_ADD_TAG, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 287: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ + case 289: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -3221,7 +3262,7 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 288: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ + case 290: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ { yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n; @@ -3235,33 +3276,33 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 289: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ + case 291: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ { yymsp[-6].minor.yy0.n += yymsp[-5].minor.yy0.n; toTSDBType(yymsp[-2].minor.yy0.type); SArray* A = tListItemAppendToken(NULL, &yymsp[-2].minor.yy0, -1); - A = tListItemAppend(A, &yymsp[0].minor.yy425, -1); + A = tListItemAppend(A, &yymsp[0].minor.yy1, -1); SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-6].minor.yy0, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 290: /* cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */ + case 292: /* cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy165, NULL, TSDB_ALTER_TABLE_UPDATE_TAG_BYTES, -1); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy225, NULL, TSDB_ALTER_TABLE_UPDATE_TAG_BYTES, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 291: /* cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ + case 293: /* cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy165, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, TSDB_SUPER_TABLE); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy225, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 292: /* cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ + case 294: /* cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -3272,21 +3313,21 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 293: /* cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */ + case 295: /* cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy165, NULL, TSDB_ALTER_TABLE_UPDATE_COLUMN_BYTES, TSDB_SUPER_TABLE); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy225, NULL, TSDB_ALTER_TABLE_UPDATE_COLUMN_BYTES, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 294: /* cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ + case 296: /* cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy165, NULL, TSDB_ALTER_TABLE_ADD_TAG, TSDB_SUPER_TABLE); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy225, NULL, TSDB_ALTER_TABLE_ADD_TAG, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 295: /* cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ + case 297: /* cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -3297,7 +3338,7 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 296: /* cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ + case 298: /* cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ { yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n; @@ -3311,32 +3352,32 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 297: /* cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */ + case 299: /* cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */ { yymsp[-6].minor.yy0.n += yymsp[-5].minor.yy0.n; toTSDBType(yymsp[-2].minor.yy0.type); SArray* A = tListItemAppendToken(NULL, &yymsp[-2].minor.yy0, -1); - A = tListItemAppend(A, &yymsp[0].minor.yy425, -1); + A = tListItemAppend(A, &yymsp[0].minor.yy1, -1); SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-6].minor.yy0, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 298: /* cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */ + case 300: /* cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy165, NULL, TSDB_ALTER_TABLE_UPDATE_TAG_BYTES, TSDB_SUPER_TABLE); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy225, NULL, TSDB_ALTER_TABLE_UPDATE_TAG_BYTES, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 299: /* cmd ::= KILL CONNECTION INTEGER */ + case 301: /* cmd ::= KILL CONNECTION INTEGER */ {setKillSql(pInfo, TSDB_SQL_KILL_CONNECTION, &yymsp[0].minor.yy0);} break; - case 300: /* cmd ::= KILL STREAM INTEGER COLON INTEGER */ + case 302: /* cmd ::= KILL STREAM INTEGER COLON INTEGER */ {yymsp[-2].minor.yy0.n += (yymsp[-1].minor.yy0.n + yymsp[0].minor.yy0.n); setKillSql(pInfo, TSDB_SQL_KILL_STREAM, &yymsp[-2].minor.yy0);} break; - case 301: /* cmd ::= KILL QUERY INTEGER COLON INTEGER */ + case 303: /* cmd ::= KILL QUERY INTEGER COLON INTEGER */ {yymsp[-2].minor.yy0.n += (yymsp[-1].minor.yy0.n + yymsp[0].minor.yy0.n); setKillSql(pInfo, TSDB_SQL_KILL_QUERY, &yymsp[-2].minor.yy0);} break; default: @@ -3360,6 +3401,7 @@ static void yy_reduce( yymsp->stateno = (YYACTIONTYPE)yyact; yymsp->major = (YYCODETYPE)yygoto; yyTraceShift(yypParser, yyact, "... then shift"); + return yyact; } /* @@ -3369,7 +3411,8 @@ static void yy_reduce( static void yy_parse_failed( yyParser *yypParser /* The parser */ ){ - ParseARG_FETCH; + ParseARG_FETCH + ParseCTX_FETCH #ifndef NDEBUG if( yyTraceFILE ){ fprintf(yyTraceFILE,"%sFail!\n",yyTracePrompt); @@ -3380,7 +3423,8 @@ static void yy_parse_failed( ** parser fails */ /************ Begin %parse_failure code ***************************************/ /************ End %parse_failure code *****************************************/ - ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */ + ParseARG_STORE /* Suppress warning about unused %extra_argument variable */ + ParseCTX_STORE } #endif /* YYNOERRORRECOVERY */ @@ -3392,7 +3436,8 @@ static void yy_syntax_error( int yymajor, /* The major type of the error token */ ParseTOKENTYPE yyminor /* The minor type of the error token */ ){ - ParseARG_FETCH; + ParseARG_FETCH + ParseCTX_FETCH #define TOKEN yyminor /************ Begin %syntax_error code ****************************************/ @@ -3418,7 +3463,8 @@ static void yy_syntax_error( assert(len <= outputBufLen); /************ End %syntax_error code ******************************************/ - ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */ + ParseARG_STORE /* Suppress warning about unused %extra_argument variable */ + ParseCTX_STORE } /* @@ -3427,7 +3473,8 @@ static void yy_syntax_error( static void yy_accept( yyParser *yypParser /* The parser */ ){ - ParseARG_FETCH; + ParseARG_FETCH + ParseCTX_FETCH #ifndef NDEBUG if( yyTraceFILE ){ fprintf(yyTraceFILE,"%sAccept!\n",yyTracePrompt); @@ -3442,7 +3489,8 @@ static void yy_accept( /*********** Begin %parse_accept code *****************************************/ /*********** End %parse_accept code *******************************************/ - ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */ + ParseARG_STORE /* Suppress warning about unused %extra_argument variable */ + ParseCTX_STORE } /* The main parser program. @@ -3471,45 +3519,47 @@ void Parse( ParseARG_PDECL /* Optional %extra_argument parameter */ ){ YYMINORTYPE yyminorunion; - unsigned int yyact; /* The parser action. */ + YYACTIONTYPE yyact; /* The parser action. */ #if !defined(YYERRORSYMBOL) && !defined(YYNOERRORRECOVERY) int yyendofinput; /* True if we are at the end of input */ #endif #ifdef YYERRORSYMBOL int yyerrorhit = 0; /* True if yymajor has invoked an error */ #endif - yyParser *yypParser; /* The parser */ + yyParser *yypParser = (yyParser*)yyp; /* The parser */ + ParseCTX_FETCH + ParseARG_STORE - yypParser = (yyParser*)yyp; assert( yypParser->yytos!=0 ); #if !defined(YYERRORSYMBOL) && !defined(YYNOERRORRECOVERY) yyendofinput = (yymajor==0); #endif - ParseARG_STORE; + yyact = yypParser->yytos->stateno; #ifndef NDEBUG if( yyTraceFILE ){ - int stateno = yypParser->yytos->stateno; - if( stateno < YY_MIN_REDUCE ){ + if( yyact < YY_MIN_REDUCE ){ fprintf(yyTraceFILE,"%sInput '%s' in state %d\n", - yyTracePrompt,yyTokenName[yymajor],stateno); + yyTracePrompt,yyTokenName[yymajor],yyact); }else{ fprintf(yyTraceFILE,"%sInput '%s' with pending reduce %d\n", - yyTracePrompt,yyTokenName[yymajor],stateno-YY_MIN_REDUCE); + yyTracePrompt,yyTokenName[yymajor],yyact-YY_MIN_REDUCE); } } #endif do{ - yyact = yy_find_shift_action(yypParser,(YYCODETYPE)yymajor); + assert( yyact==yypParser->yytos->stateno ); + yyact = yy_find_shift_action((YYCODETYPE)yymajor,yyact); if( yyact >= YY_MIN_REDUCE ){ - yy_reduce(yypParser,yyact-YY_MIN_REDUCE,yymajor,yyminor); + yyact = yy_reduce(yypParser,yyact-YY_MIN_REDUCE,yymajor, + yyminor ParseCTX_PARAM); }else if( yyact <= YY_MAX_SHIFTREDUCE ){ - yy_shift(yypParser,yyact,yymajor,yyminor); + yy_shift(yypParser,yyact,(YYCODETYPE)yymajor,yyminor); #ifndef YYNOERRORRECOVERY yypParser->yyerrcnt--; #endif - yymajor = YYNOCODE; + break; }else if( yyact==YY_ACCEPT_ACTION ){ yypParser->yytos--; yy_accept(yypParser); @@ -3560,10 +3610,9 @@ void Parse( yymajor = YYNOCODE; }else{ while( yypParser->yytos >= yypParser->yystack - && yymx != YYERRORSYMBOL && (yyact = yy_find_reduce_action( yypParser->yytos->stateno, - YYERRORSYMBOL)) >= YY_MIN_REDUCE + YYERRORSYMBOL)) > YY_MAX_SHIFTREDUCE ){ yy_pop_parser_stack(yypParser); } @@ -3580,6 +3629,8 @@ void Parse( } yypParser->yyerrcnt = 3; yyerrorhit = 1; + if( yymajor==YYNOCODE ) break; + yyact = yypParser->yytos->stateno; #elif defined(YYNOERRORRECOVERY) /* If the YYNOERRORRECOVERY macro is defined, then do not attempt to ** do any kind of error recovery. Instead, simply invoke the syntax @@ -3590,8 +3641,7 @@ void Parse( */ yy_syntax_error(yypParser,yymajor, yyminor); yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion); - yymajor = YYNOCODE; - + break; #else /* YYERRORSYMBOL is not defined */ /* This is what we do if the grammar does not define ERROR: ** @@ -3613,10 +3663,10 @@ void Parse( yypParser->yyerrcnt = -1; #endif } - yymajor = YYNOCODE; + break; #endif } - }while( yymajor!=YYNOCODE && yypParser->yytos>yypParser->yystack ); + }while( yypParser->yytos>yypParser->yystack ); #ifndef NDEBUG if( yyTraceFILE ){ yyStackEntry *i; @@ -3631,3 +3681,18 @@ void Parse( #endif return; } + +/* +** Return the fallback token corresponding to canonical token iToken, or +** 0 if iToken has no fallback. +*/ +int ParseFallback(int iToken){ +#ifdef YYFALLBACK + if( iToken<(int)(sizeof(yyFallback)/sizeof(yyFallback[0])) ){ + return yyFallback[iToken]; + } +#else + (void)iToken; +#endif + return 0; +} diff --git a/source/libs/parser/src/ttokenizer.c b/source/libs/parser/src/ttokenizer.c index d5d6b11833..d54da5aa26 100644 --- a/source/libs/parser/src/ttokenizer.c +++ b/source/libs/parser/src/ttokenizer.c @@ -230,6 +230,7 @@ static SKeyword keywordTable[] = { {"PORT", TK_PORT}, {"INNER", NEW_TK_INNER}, {"ON", NEW_TK_ON}, + {"MODE", TK_MODE}, }; static const char isIdChar[] = { diff --git a/source/libs/planner/inc/plannerImpl.h b/source/libs/planner/inc/plannerImpl.h index dbfbeb7efc..1960eb52fb 100644 --- a/source/libs/planner/inc/plannerImpl.h +++ b/source/libs/planner/inc/plannerImpl.h @@ -38,6 +38,12 @@ typedef struct SScanLogicNode { struct STableMeta* pMeta; } SScanLogicNode; +typedef struct SJoinLogicNode { + SLogicNode node; + EJoinType joinType; + SNode* pOnConditions; +} SJoinLogicNode; + typedef struct SFilterLogicNode { SLogicNode node; } SFilterLogicNode; @@ -48,6 +54,10 @@ typedef struct SAggLogicNode { SNodeList* pAggFuncs; } SAggLogicNode; +typedef struct SProjectLogicNode { + SLogicNode node; +} SProjectLogicNode; + #ifdef __cplusplus } #endif diff --git a/source/libs/planner/src/plannerImpl.c b/source/libs/planner/src/plannerImpl.c index 9b82b4d58e..11f721bda5 100644 --- a/source/libs/planner/src/plannerImpl.c +++ b/source/libs/planner/src/plannerImpl.c @@ -39,6 +39,9 @@ typedef struct SPlanContext { SNodeList* pResource; } SPlanContext; +static SLogicNode* createQueryLogicNode(SPlanContext* pCxt, SNode* pStmt); +static SLogicNode* createLogicNodeByTable(SPlanContext* pCxt, SSelectStmt* pSelect, SNode* pTable); + typedef struct SRewriteExprCxt { int32_t errCode; int32_t planNodeId; @@ -46,6 +49,15 @@ typedef struct SRewriteExprCxt { } SRewriteExprCxt; static EDealRes doRewriteExpr(SNode** pNode, void* pContext) { + switch (nodeType(*pNode)) { + case QUERY_NODE_OPERATOR: + case QUERY_NODE_LOGIC_CONDITION: + case QUERY_NODE_FUNCTION: { + break; + } + default: + break; + } SRewriteExprCxt* pCxt = (SRewriteExprCxt*)pContext; SNode* pTarget; int32_t index = 0; @@ -142,12 +154,41 @@ static SLogicNode* createScanLogicNode(SPlanContext* pCxt, SSelectStmt* pSelect, return (SLogicNode*)pScan; } -static SLogicNode* createQueryLogicNode(SPlanContext* pCxt, SNode* pStmt); - static SLogicNode* createSubqueryLogicNode(SPlanContext* pCxt, SSelectStmt* pSelect, STempTableNode* pTable) { return createQueryLogicNode(pCxt, pTable->pSubquery); } +static SLogicNode* createJoinLogicNode(SPlanContext* pCxt, SSelectStmt* pSelect, SJoinTableNode* pJoinTable) { + SJoinLogicNode* pJoin = (SJoinLogicNode*)nodesMakeNode(QUERY_NODE_LOGIC_PLAN_JOIN); + CHECK_ALLOC(pJoin, NULL); + pJoin->node.id = pCxt->planNodeId++; + + pJoin->joinType = pJoinTable->joinType; + + // set left and right node + pJoin->node.pChildren = nodesMakeList(); + CHECK_ALLOC(pJoin->node.pChildren, (SLogicNode*)pJoin); + SLogicNode* pLeft = createLogicNodeByTable(pCxt, pSelect, pJoinTable->pLeft); + CHECK_ALLOC(pLeft, (SLogicNode*)pJoin); + CHECK_CODE(nodesListAppend(pJoin->node.pChildren, (SNode*)pLeft), (SLogicNode*)pJoin); + SLogicNode* pRight = createLogicNodeByTable(pCxt, pSelect, pJoinTable->pRight); + CHECK_ALLOC(pRight, (SLogicNode*)pJoin); + CHECK_CODE(nodesListAppend(pJoin->node.pChildren, (SNode*)pRight), (SLogicNode*)pJoin); + + // set on conditions + pJoin->pOnConditions = nodesCloneNode(pJoinTable->pOnCond); + CHECK_ALLOC(pJoin->pOnConditions, (SLogicNode*)pJoin); + + // set the output and rewrite the expression in subsequent clauses with the output + SNodeList* pCols = NULL; + CHECK_CODE(nodesCollectColumns(pSelect, SQL_CLAUSE_FROM, 0, false, &pCols), (SLogicNode*)pJoin); + pJoin->node.pTargets = nodesCloneList(pCols); + CHECK_ALLOC(pJoin->node.pTargets, (SLogicNode*)pJoin); + CHECK_CODE(rewriteExpr(pJoin->node.id, pJoin->node.pTargets, pSelect, SQL_CLAUSE_FROM), (SLogicNode*)pJoin); + + return (SLogicNode*)pJoin; +} + static SLogicNode* createLogicNodeByTable(SPlanContext* pCxt, SSelectStmt* pSelect, SNode* pTable) { switch (nodeType(pTable)) { case QUERY_NODE_REAL_TABLE: @@ -155,14 +196,15 @@ static SLogicNode* createLogicNodeByTable(SPlanContext* pCxt, SSelectStmt* pSele case QUERY_NODE_TEMP_TABLE: return createSubqueryLogicNode(pCxt, pSelect, (STempTableNode*)pTable); case QUERY_NODE_JOIN_TABLE: + return createJoinLogicNode(pCxt, pSelect, (SJoinTableNode*)pTable); default: break; } return NULL; } -static SLogicNode* createFilterLogicNode(SPlanContext* pCxt, SSelectStmt* pSelect, SNode* pWhere) { - if (NULL == pWhere) { +static SLogicNode* createWhereFilterLogicNode(SPlanContext* pCxt, SSelectStmt* pSelect) { + if (NULL == pSelect->pWhere) { return NULL; } @@ -171,7 +213,7 @@ static SLogicNode* createFilterLogicNode(SPlanContext* pCxt, SSelectStmt* pSelec pFilter->node.id = pCxt->planNodeId++; // set filter conditions - pFilter->node.pConditions = nodesCloneNode(pWhere); + pFilter->node.pConditions = nodesCloneNode(pSelect->pWhere); CHECK_ALLOC(pFilter->node.pConditions, (SLogicNode*)pFilter); // set the output and rewrite the expression in subsequent clauses with the output @@ -184,10 +226,10 @@ static SLogicNode* createFilterLogicNode(SPlanContext* pCxt, SSelectStmt* pSelec return (SLogicNode*)pFilter; } -static SLogicNode* createAggLogicNode(SPlanContext* pCxt, SSelectStmt* pSelect, SNodeList* pGroupByList, SNode* pHaving) { +static SLogicNode* createAggLogicNode(SPlanContext* pCxt, SSelectStmt* pSelect) { SNodeList* pAggFuncs = NULL; CHECK_CODE(nodesCollectFuncs(pSelect, fmIsAggFunc, &pAggFuncs), NULL); - if (NULL == pAggFuncs && NULL == pGroupByList) { + if (NULL == pAggFuncs && NULL == pSelect->pGroupByList) { return NULL; } @@ -196,11 +238,11 @@ static SLogicNode* createAggLogicNode(SPlanContext* pCxt, SSelectStmt* pSelect, pAgg->node.id = pCxt->planNodeId++; // set grouyp keys, agg funcs and having conditions - pAgg->pGroupKeys = nodesCloneList(pGroupByList); + pAgg->pGroupKeys = nodesCloneList(pSelect->pGroupByList); CHECK_ALLOC(pAgg->pGroupKeys, (SLogicNode*)pAgg); pAgg->pAggFuncs = nodesCloneList(pAggFuncs); CHECK_ALLOC(pAgg->pAggFuncs, (SLogicNode*)pAgg); - pAgg->node.pConditions = nodesCloneNode(pHaving); + pAgg->node.pConditions = nodesCloneNode(pSelect->pHaving); CHECK_ALLOC(pAgg->node.pConditions, (SLogicNode*)pAgg); // set the output and rewrite the expression in subsequent clauses with the output @@ -213,15 +255,28 @@ static SLogicNode* createAggLogicNode(SPlanContext* pCxt, SSelectStmt* pSelect, return (SLogicNode*)pAgg; } +static SLogicNode* createProjectLogicNode(SPlanContext* pCxt, SSelectStmt* pSelect) { + SProjectLogicNode* pProject = (SProjectLogicNode*)nodesMakeNode(QUERY_NODE_LOGIC_PLAN_PROJECT); + CHECK_ALLOC(pProject, NULL); + pProject->node.id = pCxt->planNodeId++; + + pProject->node.pTargets = nodesCloneList(pSelect->pProjectionList); + CHECK_ALLOC(pProject->node.pTargets, (SLogicNode*)pProject); + + return (SLogicNode*)pProject; +} + static SLogicNode* createSelectLogicNode(SPlanContext* pCxt, SSelectStmt* pSelect) { SLogicNode* pRoot = createLogicNodeByTable(pCxt, pSelect, pSelect->pFromTable); if (TSDB_CODE_SUCCESS == pCxt->errCode) { - pRoot = pushLogicNode(pCxt, pRoot, createFilterLogicNode(pCxt, pSelect, pSelect->pWhere)); + pRoot = pushLogicNode(pCxt, pRoot, createWhereFilterLogicNode(pCxt, pSelect)); } if (TSDB_CODE_SUCCESS == pCxt->errCode) { - pRoot = pushLogicNode(pCxt, pRoot, createAggLogicNode(pCxt, pSelect, pSelect->pGroupByList, pSelect->pHaving)); + pRoot = pushLogicNode(pCxt, pRoot, createAggLogicNode(pCxt, pSelect)); + } + if (TSDB_CODE_SUCCESS == pCxt->errCode) { + pRoot = pushLogicNode(pCxt, pRoot, createProjectLogicNode(pCxt, pSelect)); } - // pRoot = pushLogicNode(pCxt, pRoot, createProjectLogicNode(pSelect, pSelect->pProjectionList)); return pRoot; } From 67e04c66323c54ec8cd5f9b1ec7c971feb7ad35d Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Thu, 17 Feb 2022 10:37:13 +0800 Subject: [PATCH 03/17] minor changes --- source/dnode/mnode/impl/src/mndTrans.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/dnode/mnode/impl/src/mndTrans.c b/source/dnode/mnode/impl/src/mndTrans.c index 3230074add..5f624357e7 100644 --- a/source/dnode/mnode/impl/src/mndTrans.c +++ b/source/dnode/mnode/impl/src/mndTrans.c @@ -51,7 +51,7 @@ static bool mndTransPerfromFinishedStage(SMnode *pMnode, STrans *pTrans); static void mndTransExecute(SMnode *pMnode, STrans *pTrans); static void mndTransSendRpcRsp(STrans *pTrans); -static int32_t mndProcessTransMsg(SMnodeMsg *pMsg); +static int32_t mndProcessTransReq(SMnodeMsg *pMsg); int32_t mndInitTrans(SMnode *pMnode) { SSdbTable table = {.sdbType = SDB_TRANS, @@ -62,7 +62,7 @@ int32_t mndInitTrans(SMnode *pMnode) { .updateFp = (SdbUpdateFp)mndTransActionUpdate, .deleteFp = (SdbDeleteFp)mndTransActionDelete}; - mndSetMsgHandle(pMnode, TDMT_MND_TRANS, mndProcessTransMsg); + mndSetMsgHandle(pMnode, TDMT_MND_TRANS, mndProcessTransReq); return sdbSetTable(pMnode->pSdb, table); } @@ -941,8 +941,8 @@ static void mndTransExecute(SMnode *pMnode, STrans *pTrans) { mndTransSendRpcRsp(pTrans); } -static int32_t mndProcessTransMsg(SMnodeMsg *pMsg) { - mndTransPullup(pMsg->pMnode); +static int32_t mndProcessTransReq(SMnodeMsg *pReq) { + mndTransPullup(pReq->pMnode); return 0; } From 37c84761186ca31deb10a9e4044120622547ae0e Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Thu, 17 Feb 2022 11:56:50 +0800 Subject: [PATCH 04/17] add trans stage type --- source/dnode/mnode/impl/src/mndTrans.c | 60 +++++++++++++++++++------- 1 file changed, 44 insertions(+), 16 deletions(-) diff --git a/source/dnode/mnode/impl/src/mndTrans.c b/source/dnode/mnode/impl/src/mndTrans.c index 5f624357e7..03ac7ec075 100644 --- a/source/dnode/mnode/impl/src/mndTrans.c +++ b/source/dnode/mnode/impl/src/mndTrans.c @@ -80,17 +80,17 @@ static SSdbRaw *mndTransActionEncode(STrans *pTrans) { for (int32_t i = 0; i < redoLogNum; ++i) { SSdbRaw *pTmp = taosArrayGetP(pTrans->redoLogs, i); - rawDataLen += (sdbGetRawTotalSize(pTmp) + 4); + rawDataLen += (sdbGetRawTotalSize(pTmp) + sizeof(int32_t)); } for (int32_t i = 0; i < undoLogNum; ++i) { SSdbRaw *pTmp = taosArrayGetP(pTrans->undoLogs, i); - rawDataLen += (sdbGetRawTotalSize(pTmp) + 4); + rawDataLen += (sdbGetRawTotalSize(pTmp) + sizeof(int32_t)); } for (int32_t i = 0; i < commitLogNum; ++i) { SSdbRaw *pTmp = taosArrayGetP(pTrans->commitLogs, i); - rawDataLen += (sdbGetRawTotalSize(pTmp) + 4); + rawDataLen += (sdbGetRawTotalSize(pTmp) + sizeof(int32_t)); } for (int32_t i = 0; i < redoActionNum; ++i) { @@ -296,9 +296,34 @@ TRANS_DECODE_OVER: return pRow; } +static const char *mndTransStr(ETrnStage stage) { + switch (stage) { + case TRN_STAGE_PREPARE: + return "prepare"; + case TRN_STAGE_REDO_LOG: + return "redoLog"; + case TRN_STAGE_REDO_ACTION: + return "redoAction"; + case TRN_STAGE_COMMIT: + return "commit"; + case TRN_STAGE_COMMIT_LOG: + return "commitLog"; + case TRN_STAGE_UNDO_ACTION: + return "undoAction"; + case TRN_STAGE_UNDO_LOG: + return "undoLog"; + case TRN_STAGE_ROLLBACK: + return "rollback"; + case TRN_STAGE_FINISHED: + return "finished"; + default: + return "invalid"; + } +} + static int32_t mndTransActionInsert(SSdb *pSdb, STrans *pTrans) { - pTrans->stage = TRN_STAGE_PREPARE; - mTrace("trans:%d, perform insert action, row:%p", pTrans->id, pTrans); + // pTrans->stage = TRN_STAGE_PREPARE; + mTrace("trans:%d, perform insert action, row:%p stage:%s", pTrans->id, pTrans, mndTransStr(pTrans->stage)); return 0; } @@ -316,21 +341,24 @@ static void mndTransDropData(STrans *pTrans) { } static int32_t mndTransActionDelete(SSdb *pSdb, STrans *pTrans) { - mTrace("trans:%d, perform delete action, row:%p", pTrans->id, pTrans); + mTrace("trans:%d, perform delete action, row:%p stage:%s", pTrans->id, pTrans, mndTransStr(pTrans->stage)); mndTransDropData(pTrans); return 0; } static int32_t mndTransActionUpdate(SSdb *pSdb, STrans *pOld, STrans *pNew) { - if (pNew->stage == TRN_STAGE_COMMIT) pNew->stage = TRN_STAGE_COMMIT_LOG; + if (pNew->stage == TRN_STAGE_COMMIT) { + pNew->stage = TRN_STAGE_COMMIT_LOG; + mTrace("trans:%d, stage from %s to %s", pNew->id, mndTransStr(TRN_STAGE_COMMIT), mndTransStr(TRN_STAGE_COMMIT_LOG)); + } - mTrace("trans:%d, perform update action, old row:%p stage:%d, new row:%p stage:%d", pOld->id, pOld, pOld->stage, pNew, - pNew->stage); + mTrace("trans:%d, perform update action, old row:%p stage:%s, new row:%p stage:%s", pOld->id, pOld, + mndTransStr(pOld->stage), pNew, mndTransStr(pNew->stage)); pOld->stage = pNew->stage; return 0; } -STrans *mndAcquireTrans(SMnode *pMnode, int32_t transId) { +static STrans *mndAcquireTrans(SMnode *pMnode, int32_t transId) { SSdb *pSdb = pMnode->pSdb; STrans *pTrans = sdbAcquire(pSdb, SDB_TRANS, &transId); if (pTrans == NULL) { @@ -339,7 +367,7 @@ STrans *mndAcquireTrans(SMnode *pMnode, int32_t transId) { return pTrans; } -void mndReleaseTrans(SMnode *pMnode, STrans *pTrans) { +static void mndReleaseTrans(SMnode *pMnode, STrans *pTrans) { SSdb *pSdb = pMnode->pSdb; sdbRelease(pSdb, pTrans); } @@ -375,8 +403,8 @@ STrans *mndTransCreate(SMnode *pMnode, ETrnPolicy policy, const SRpcMsg *pReq) { } static void mndTransDropLogs(SArray *pArray) { - if (pArray == NULL) return; - for (int32_t i = 0; i < pArray->size; ++i) { + int32_t size = taosArrayGetSize(pArray); + for (int32_t i = 0; i < size; ++i) { SSdbRaw *pRaw = taosArrayGetP(pArray, i); sdbFreeRaw(pRaw); } @@ -385,10 +413,10 @@ static void mndTransDropLogs(SArray *pArray) { } static void mndTransDropActions(SArray *pArray) { - if (pArray == NULL) return; - for (int32_t i = 0; i < pArray->size; ++i) { + int32_t size = taosArrayGetSize(pArray); + for (int32_t i = 0; i < size; ++i) { STransAction *pAction = taosArrayGet(pArray, i); - free(pAction->pCont); + tfree(pAction->pCont); } taosArrayDestroy(pArray); From 0b8b1e7950a180279e39a9626c5c11e90e71ee27 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Thu, 17 Feb 2022 12:20:48 +0800 Subject: [PATCH 05/17] Test/sangshuduo/td 13408 move example back for 3.0 (#10296) * [TD-13408]: move examples back to TDegnine for 3.0 * update tests for 3.0 * [TD-13408]: move rust example back for 3.0 --- .gitmodules | 3 +++ examples/rust | 1 + 2 files changed, 4 insertions(+) create mode 160000 examples/rust diff --git a/.gitmodules b/.gitmodules index 5298fd26a6..616e252a93 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,3 +14,6 @@ path = tests url = https://github.com/taosdata/tests branch = 3.0 +[submodule "examples/rust"] + path = examples/rust + url = https://github.com/songtianyi/tdengine-rust-bindings.git diff --git a/examples/rust b/examples/rust new file mode 160000 index 0000000000..1c8924dc66 --- /dev/null +++ b/examples/rust @@ -0,0 +1 @@ +Subproject commit 1c8924dc668e6aa848214c2fc54e3ace3f5bf8df From 6d582b2a293f4f7e33b5130ecd2f3ee2823c915c Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Thu, 17 Feb 2022 15:40:27 +0800 Subject: [PATCH 06/17] add show trans --- include/common/tmsg.h | 2 +- include/util/tdef.h | 4 + source/dnode/mnode/impl/inc/mndDef.h | 10 ++ source/dnode/mnode/impl/src/mndShow.c | 4 +- source/dnode/mnode/impl/src/mndTrans.c | 143 ++++++++++++++++++++++++- source/libs/parser/inc/sql.y | 2 +- source/libs/parser/src/sql.c | 2 +- 7 files changed, 160 insertions(+), 7 deletions(-) diff --git a/include/common/tmsg.h b/include/common/tmsg.h index 7337f1afb8..eda5ba7a03 100644 --- a/include/common/tmsg.h +++ b/include/common/tmsg.h @@ -100,7 +100,7 @@ typedef enum _mgmt_table { TSDB_MGMT_TABLE_STREAMS, TSDB_MGMT_TABLE_VARIABLES, TSDB_MGMT_TABLE_CONNS, - TSDB_MGMT_TABLE_SCORES, + TSDB_MGMT_TABLE_TRANS, TSDB_MGMT_TABLE_GRANTS, TSDB_MGMT_TABLE_VNODES, TSDB_MGMT_TABLE_CLUSTER, diff --git a/include/util/tdef.h b/include/util/tdef.h index 747020a4f9..9b18c2dfb8 100644 --- a/include/util/tdef.h +++ b/include/util/tdef.h @@ -214,6 +214,10 @@ do { \ #define TSDB_SHOW_SUBQUERY_LEN 1000 #define TSDB_SLOW_QUERY_SQL_LEN 512 +#define TSDB_TRANS_STAGE_LEN 12 +#define TSDB_TRANS_DESC_LEN 16 +#define TSDB_TRANS_ERROR_LEN 128 + #define TSDB_STEP_NAME_LEN 32 #define TSDB_STEP_DESC_LEN 128 diff --git a/source/dnode/mnode/impl/inc/mndDef.h b/source/dnode/mnode/impl/inc/mndDef.h index 73c0446e3f..abc802c588 100644 --- a/source/dnode/mnode/impl/inc/mndDef.h +++ b/source/dnode/mnode/impl/inc/mndDef.h @@ -104,6 +104,10 @@ typedef enum { TRN_STAGE_FINISHED = 8 } ETrnStage; +typedef enum { + TRN_TYPE_CREATE_DB = 0, +} ETrnType; + typedef enum { TRN_POLICY_ROLLBACK = 0, TRN_POLICY_RETRY = 1 } ETrnPolicy; typedef enum { @@ -135,6 +139,12 @@ typedef struct { SArray* commitLogs; SArray* redoActions; SArray* undoActions; + int64_t createdTime; + int64_t lastExecTime; + int32_t transType; + uint64_t dbUid; + char dbname[TSDB_DB_NAME_LEN]; + char lastError[TSDB_TRANS_DESC_LEN]; } STrans; typedef struct { diff --git a/source/dnode/mnode/impl/src/mndShow.c b/source/dnode/mnode/impl/src/mndShow.c index 3198ded37e..afb338e97d 100644 --- a/source/dnode/mnode/impl/src/mndShow.c +++ b/source/dnode/mnode/impl/src/mndShow.c @@ -295,8 +295,8 @@ char *mndShowStr(int32_t showType) { return "show configs"; case TSDB_MGMT_TABLE_CONNS: return "show connections"; - case TSDB_MGMT_TABLE_SCORES: - return "show scores"; + case TSDB_MGMT_TABLE_TRANS: + return "show trans"; case TSDB_MGMT_TABLE_GRANTS: return "show grants"; case TSDB_MGMT_TABLE_VNODES: diff --git a/source/dnode/mnode/impl/src/mndTrans.c b/source/dnode/mnode/impl/src/mndTrans.c index 03ac7ec075..5158f40c8f 100644 --- a/source/dnode/mnode/impl/src/mndTrans.c +++ b/source/dnode/mnode/impl/src/mndTrans.c @@ -15,10 +15,13 @@ #define _DEFAULT_SOURCE #include "mndTrans.h" +#include "mndAuth.h" +#include "mndShow.h" #include "mndSync.h" +#include "mndUser.h" -#define MND_TRANS_VER_NUMBER 1 -#define MND_TRANS_ARRAY_SIZE 8 +#define MND_TRANS_VER_NUMBER 1 +#define MND_TRANS_ARRAY_SIZE 8 #define MND_TRANS_RESERVE_SIZE 64 static SSdbRaw *mndTransActionEncode(STrans *pTrans); @@ -53,6 +56,10 @@ static void mndTransExecute(SMnode *pMnode, STrans *pTrans); static void mndTransSendRpcRsp(STrans *pTrans); static int32_t mndProcessTransReq(SMnodeMsg *pMsg); +static int32_t mndGetTransMeta(SMnodeMsg *pReq, SShowObj *pShow, STableMetaRsp *pMeta); +static int32_t mndRetrieveTrans(SMnodeMsg *pReq, SShowObj *pShow, char *data, int32_t rows); +static void mndCancelGetNextTrans(SMnode *pMnode, void *pIter); + int32_t mndInitTrans(SMnode *pMnode) { SSdbTable table = {.sdbType = SDB_TRANS, .keyType = SDB_KEY_INT32, @@ -63,6 +70,10 @@ int32_t mndInitTrans(SMnode *pMnode) { .deleteFp = (SdbDeleteFp)mndTransActionDelete}; mndSetMsgHandle(pMnode, TDMT_MND_TRANS, mndProcessTransReq); + + mndAddShowMetaHandle(pMnode, TSDB_MGMT_TABLE_TRANS, mndGetTransMeta); + mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_TRANS, mndRetrieveTrans); + mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_TRANS, mndCancelGetNextTrans); return sdbSetTable(pMnode->pSdb, table); } @@ -321,6 +332,15 @@ static const char *mndTransStr(ETrnStage stage) { } } +static const char *mndTransType(ETrnType type) { + switch (type) { + case TRN_TYPE_CREATE_DB: + return "create-db"; + default: + return "invalid"; + } +} + static int32_t mndTransActionInsert(SSdb *pSdb, STrans *pTrans) { // pTrans->stage = TRN_STAGE_PREPARE; mTrace("trans:%d, perform insert action, row:%p stage:%s", pTrans->id, pTrans, mndTransStr(pTrans->stage)); @@ -988,3 +1008,122 @@ void mndTransPullup(SMnode *pMnode) { sdbWriteFile(pMnode->pSdb); } + +static int32_t mndGetTransMeta(SMnodeMsg *pReq, SShowObj *pShow, STableMetaRsp *pMeta) { + SMnode *pMnode = pReq->pMnode; + SSdb *pSdb = pMnode->pSdb; + + int32_t cols = 0; + SSchema *pSchema = pMeta->pSchemas; + + pShow->bytes[cols] = 4; + pSchema[cols].type = TSDB_DATA_TYPE_INT; + strcpy(pSchema[cols].name, "id"); + pSchema[cols].bytes = pShow->bytes[cols]; + cols++; + + pShow->bytes[cols] = 8; + pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP; + strcpy(pSchema[cols].name, "create_time"); + pSchema[cols].bytes = pShow->bytes[cols]; + cols++; + + pShow->bytes[cols] = TSDB_TRANS_STAGE_LEN + VARSTR_HEADER_SIZE; + pSchema[cols].type = TSDB_DATA_TYPE_BINARY; + strcpy(pSchema[cols].name, "stage"); + pSchema[cols].bytes = pShow->bytes[cols]; + cols++; + + pShow->bytes[cols] = (TSDB_DB_NAME_LEN - 1) + VARSTR_HEADER_SIZE; + pSchema[cols].type = TSDB_DATA_TYPE_BINARY; + strcpy(pSchema[cols].name, "db"); + pSchema[cols].bytes = pShow->bytes[cols]; + cols++; + + pShow->bytes[cols] = (TSDB_TRANS_DESC_LEN - 1) + VARSTR_HEADER_SIZE; + pSchema[cols].type = TSDB_DATA_TYPE_BINARY; + strcpy(pSchema[cols].name, "type"); + pSchema[cols].bytes = pShow->bytes[cols]; + cols++; + + pShow->bytes[cols] = 8; + pSchema[cols].type = TSDB_DATA_TYPE_TIMESTAMP; + strcpy(pSchema[cols].name, "last_exec_time"); + pSchema[cols].bytes = pShow->bytes[cols]; + cols++; + + pShow->bytes[cols] = (TSDB_TRANS_ERROR_LEN - 1) + VARSTR_HEADER_SIZE; + pSchema[cols].type = TSDB_DATA_TYPE_BINARY; + strcpy(pSchema[cols].name, "last_error"); + pSchema[cols].bytes = pShow->bytes[cols]; + cols++; + + pMeta->numOfColumns = cols; + pShow->numOfColumns = cols; + + pShow->offset[0] = 0; + for (int32_t i = 1; i < cols; ++i) { + pShow->offset[i] = pShow->offset[i - 1] + pShow->bytes[i - 1]; + } + + pShow->numOfRows = sdbGetSize(pSdb, SDB_TRANS); + pShow->rowSize = pShow->offset[cols - 1] + pShow->bytes[cols - 1]; + strcpy(pMeta->tbName, mndShowStr(pShow->type)); + return 0; +} + +static int32_t mndRetrieveTrans(SMnodeMsg *pReq, SShowObj *pShow, char *data, int32_t rows) { + SMnode *pMnode = pReq->pMnode; + SSdb *pSdb = pMnode->pSdb; + int32_t numOfRows = 0; + STrans *pTrans = NULL; + int32_t cols = 0; + char *pWrite; + + while (numOfRows < rows) { + pShow->pIter = sdbFetch(pSdb, SDB_TRANS, pShow->pIter, (void **)&pTrans); + if (pShow->pIter == NULL) break; + + cols = 0; + + pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; + *(int32_t *)pWrite = pTrans->id; + cols++; + + pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; + *(int64_t *)pWrite = pTrans->createdTime; + cols++; + + pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; + STR_TO_VARSTR(pWrite, mndTransStr(pTrans->stage)); + cols++; + + pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; + STR_TO_VARSTR(pWrite, pTrans->dbname); + cols++; + + pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; + STR_TO_VARSTR(pWrite, mndTransType(pTrans->transType)); + cols++; + + pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; + *(int64_t *)pWrite = pTrans->lastExecTime; + cols++; + + pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; + STR_TO_VARSTR(pWrite, pTrans->lastError); + cols++; + + numOfRows++; + sdbRelease(pSdb, pTrans); + } + + mndVacuumResult(data, pShow->numOfColumns, numOfRows, rows, pShow); + pShow->numOfReads += numOfRows; + return numOfRows; +} + +static void mndCancelGetNextTrans(SMnode *pMnode, void *pIter) { + SSdb *pSdb = pMnode->pSdb; + sdbCancelFetch(pSdb, pIter); +} diff --git a/source/libs/parser/inc/sql.y b/source/libs/parser/inc/sql.y index 1222138b5e..06154ca192 100644 --- a/source/libs/parser/inc/sql.y +++ b/source/libs/parser/inc/sql.y @@ -76,7 +76,7 @@ cmd ::= SHOW QUERIES. { setShowOptions(pInfo, TSDB_MGMT_TABLE_QUERIES, 0, 0); cmd ::= SHOW CONNECTIONS.{ setShowOptions(pInfo, TSDB_MGMT_TABLE_CONNS, 0, 0);} cmd ::= SHOW STREAMS. { setShowOptions(pInfo, TSDB_MGMT_TABLE_STREAMS, 0, 0); } cmd ::= SHOW VARIABLES. { setShowOptions(pInfo, TSDB_MGMT_TABLE_VARIABLES, 0, 0); } -cmd ::= SHOW SCORES. { setShowOptions(pInfo, TSDB_MGMT_TABLE_SCORES, 0, 0); } +cmd ::= SHOW SCORES. { setShowOptions(pInfo, TSDB_MGMT_TABLE_TRANS, 0, 0); } cmd ::= SHOW GRANTS. { setShowOptions(pInfo, TSDB_MGMT_TABLE_GRANTS, 0, 0); } cmd ::= SHOW VNODES. { setShowOptions(pInfo, TSDB_MGMT_TABLE_VNODES, 0, 0); } diff --git a/source/libs/parser/src/sql.c b/source/libs/parser/src/sql.c index 664f2a3ff2..f6585e41ff 100644 --- a/source/libs/parser/src/sql.c +++ b/source/libs/parser/src/sql.c @@ -2262,7 +2262,7 @@ static void yy_reduce( { setShowOptions(pInfo, TSDB_MGMT_TABLE_VARIABLES, 0, 0); } break; case 13: /* cmd ::= SHOW SCORES */ -{ setShowOptions(pInfo, TSDB_MGMT_TABLE_SCORES, 0, 0); } +{ setShowOptions(pInfo, TSDB_MGMT_TABLE_TRANS, 0, 0); } break; case 14: /* cmd ::= SHOW GRANTS */ { setShowOptions(pInfo, TSDB_MGMT_TABLE_GRANTS, 0, 0); } From e786c61a98fbf968955f140e2e6abe1c41eff0ff Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Thu, 17 Feb 2022 15:49:15 +0800 Subject: [PATCH 07/17] fix vgroup refcount --- source/dnode/mnode/impl/src/mndStb.c | 20 ++++++++++++++++---- source/dnode/mnode/impl/src/mndSubscribe.c | 19 ++++++++++++------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/source/dnode/mnode/impl/src/mndStb.c b/source/dnode/mnode/impl/src/mndStb.c index 53ffd8698f..c5b18bcde0 100644 --- a/source/dnode/mnode/impl/src/mndStb.c +++ b/source/dnode/mnode/impl/src/mndStb.c @@ -420,7 +420,10 @@ static int32_t mndSetCreateStbRedoActions(SMnode *pMnode, STrans *pTrans, SDbObj while (1) { pIter = sdbFetch(pSdb, SDB_VGROUP, pIter, (void **)&pVgroup); if (pIter == NULL) break; - if (pVgroup->dbUid != pDb->uid) continue; + if (pVgroup->dbUid != pDb->uid) { + sdbRelease(pSdb, pVgroup); + continue; + } void *pReq = mndBuildVCreateStbReq(pMnode, pVgroup, pStb, &contLen); if (pReq == NULL) { @@ -455,7 +458,10 @@ static int32_t mndSetCreateStbUndoActions(SMnode *pMnode, STrans *pTrans, SDbObj while (1) { pIter = sdbFetch(pSdb, SDB_VGROUP, pIter, (void **)&pVgroup); if (pIter == NULL) break; - if (pVgroup->dbUid != pDb->uid) continue; + if (pVgroup->dbUid != pDb->uid) { + sdbRelease(pSdb, pVgroup); + continue; + } int32_t contLen = 0; void *pReq = mndBuildVDropStbReq(pMnode, pVgroup, pStb, &contLen); @@ -942,7 +948,10 @@ static int32_t mndSetAlterStbRedoActions(SMnode *pMnode, STrans *pTrans, SDbObj while (1) { pIter = sdbFetch(pSdb, SDB_VGROUP, pIter, (void **)&pVgroup); if (pIter == NULL) break; - if (pVgroup->dbUid != pDb->uid) continue; + if (pVgroup->dbUid != pDb->uid) { + sdbRelease(pSdb, pVgroup); + continue; + } void *pReq = mndBuildVCreateStbReq(pMnode, pVgroup, pStb, &contLen); if (pReq == NULL) { @@ -1116,7 +1125,10 @@ static int32_t mndSetDropStbRedoActions(SMnode *pMnode, STrans *pTrans, SDbObj * while (1) { pIter = sdbFetch(pSdb, SDB_VGROUP, pIter, (void **)&pVgroup); if (pIter == NULL) break; - if (pVgroup->dbUid != pDb->uid) continue; + if (pVgroup->dbUid != pDb->uid) { + sdbRelease(pSdb, pVgroup); + continue; + } int32_t contLen = 0; void *pReq = mndBuildVDropStbReq(pMnode, pVgroup, pStb, &contLen); diff --git a/source/dnode/mnode/impl/src/mndSubscribe.c b/source/dnode/mnode/impl/src/mndSubscribe.c index 840326d318..ff64a3cdd5 100644 --- a/source/dnode/mnode/impl/src/mndSubscribe.c +++ b/source/dnode/mnode/impl/src/mndSubscribe.c @@ -134,8 +134,6 @@ static int32_t mndBuildRebalanceMsg(void **pBuf, int32_t *pLen, const SMqConsume static int32_t mndPersistRebalanceMsg(SMnode *pMnode, STrans *pTrans, const SMqConsumerEp *pConsumerEp) { ASSERT(pConsumerEp->oldConsumerId != -1); - int32_t vgId = pConsumerEp->vgId; - SVgObj *pVgObj = mndAcquireVgroup(pMnode, vgId); void *buf; int32_t tlen; @@ -143,6 +141,9 @@ static int32_t mndPersistRebalanceMsg(SMnode *pMnode, STrans *pTrans, const SMqC return -1; } + int32_t vgId = pConsumerEp->vgId; + SVgObj *pVgObj = mndAcquireVgroup(pMnode, vgId); + STransAction action = {0}; action.epSet = mndGetVgroupEpset(pMnode, pVgObj); action.pCont = buf; @@ -180,15 +181,15 @@ static int32_t mndBuildCancelConnReq(void **pBuf, int32_t *pLen, const SMqConsum } static int32_t mndPersistCancelConnReq(SMnode *pMnode, STrans *pTrans, const SMqConsumerEp *pConsumerEp) { - int32_t vgId = pConsumerEp->vgId; - SVgObj *pVgObj = mndAcquireVgroup(pMnode, vgId); - void *buf; int32_t tlen; if (mndBuildCancelConnReq(&buf, &tlen, pConsumerEp) < 0) { return -1; } + int32_t vgId = pConsumerEp->vgId; + SVgObj *pVgObj = mndAcquireVgroup(pMnode, vgId); + STransAction action = {0}; action.epSet = mndGetVgroupEpset(pMnode, pVgObj); action.pCont = buf; @@ -714,7 +715,10 @@ static int32_t mndInitUnassignedVg(SMnode *pMnode, const SMqTopicObj *pTopic, SM while (1) { pIter = sdbFetch(pSdb, SDB_VGROUP, pIter, (void **)&pVgroup); if (pIter == NULL) break; - if (pVgroup->dbUid != pTopic->dbUid) continue; + if (pVgroup->dbUid != pTopic->dbUid) { + sdbRelease(pSdb, pVgroup); + continue; + } pSub->vgNum++; plan->execNode.nodeId = pVgroup->vgId; @@ -748,7 +752,6 @@ static int32_t mndPersistMqSetConnReq(SMnode *pMnode, STrans *pTrans, const SMqT const SMqConsumerEp *pConsumerEp) { ASSERT(pConsumerEp->oldConsumerId == -1); int32_t vgId = pConsumerEp->vgId; - SVgObj *pVgObj = mndAcquireVgroup(pMnode, vgId); SMqSetCVgReq req = { .vgId = vgId, @@ -776,6 +779,8 @@ static int32_t mndPersistMqSetConnReq(SMnode *pMnode, STrans *pTrans, const SMqT void *abuf = POINTER_SHIFT(buf, sizeof(SMsgHead)); tEncodeSMqSetCVgReq(&abuf, &req); + SVgObj *pVgObj = mndAcquireVgroup(pMnode, vgId); + STransAction action = {0}; action.epSet = mndGetVgroupEpset(pMnode, pVgObj); action.pCont = buf; From 820a87b6544be0e58f68fa5a3d371fc581039492 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Thu, 17 Feb 2022 17:42:00 +0800 Subject: [PATCH 08/17] fix definite lost while restore wal --- source/dnode/mnode/impl/src/mndTrans.c | 2 +- source/dnode/mnode/sdb/src/sdbHash.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/source/dnode/mnode/impl/src/mndTrans.c b/source/dnode/mnode/impl/src/mndTrans.c index 5158f40c8f..99a5a3a475 100644 --- a/source/dnode/mnode/impl/src/mndTrans.c +++ b/source/dnode/mnode/impl/src/mndTrans.c @@ -354,7 +354,7 @@ static void mndTransDropData(STrans *pTrans) { mndTransDropActions(pTrans->redoActions); mndTransDropActions(pTrans->undoActions); if (pTrans->rpcRsp != NULL) { - rpcFreeCont(pTrans->rpcRsp); + free(pTrans->rpcRsp); pTrans->rpcRsp = NULL; pTrans->rpcRspLen = 0; } diff --git a/source/dnode/mnode/sdb/src/sdbHash.c b/source/dnode/mnode/sdb/src/sdbHash.c index 315268a9e3..204cd870f4 100644 --- a/source/dnode/mnode/sdb/src/sdbHash.c +++ b/source/dnode/mnode/sdb/src/sdbHash.c @@ -16,6 +16,8 @@ #define _DEFAULT_SOURCE #include "sdbInt.h" +static void sdbCheck(SSdb *pSdb, SSdbRow *pRow); + const char *sdbTableName(ESdbType type) { switch (type) { case SDB_TRANS: @@ -221,6 +223,8 @@ static int32_t sdbDeleteRow(SSdb *pSdb, SHashObj *hash, SSdbRaw *pRaw, SSdbRow * pSdb->tableVer[pOldRow->type]++; sdbFreeRow(pSdb, pRow); + + sdbCheck(pSdb, pOldRow); // sdbRelease(pSdb, pOldRow->pObj); return 0; } @@ -305,6 +309,19 @@ void *sdbAcquire(SSdb *pSdb, ESdbType type, const void *pKey) { return pRet; } +static void sdbCheck(SSdb *pSdb, SSdbRow *pRow) { + SRWLatch *pLock = &pSdb->locks[pRow->type]; + taosRLockLatch(pLock); + + int32_t ref = atomic_load_32(&pRow->refCount); + sdbPrintOper(pSdb, pRow, "checkRow"); + if (ref <= 0 && pRow->status == SDB_STATUS_DROPPED) { + sdbFreeRow(pSdb, pRow); + } + + taosRUnLockLatch(pLock); +} + void sdbRelease(SSdb *pSdb, void *pObj) { if (pObj == NULL) return; @@ -332,6 +349,7 @@ void *sdbFetch(SSdb *pSdb, ESdbType type, void *pIter, void **ppObj) { SRWLatch *pLock = &pSdb->locks[type]; taosRLockLatch(pLock); +#if 0 if (pIter != NULL) { SSdbRow *pLastRow = *(SSdbRow **)pIter; int32_t ref = atomic_load_32(&pLastRow->refCount); @@ -339,6 +357,7 @@ void *sdbFetch(SSdb *pSdb, ESdbType type, void *pIter, void **ppObj) { sdbFreeRow(pSdb, pLastRow); } } +#endif SSdbRow **ppRow = taosHashIterate(hash, pIter); while (ppRow != NULL) { From 10fc9d7a28b798112ef8f1fddbf633ce23d87c48 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Thu, 17 Feb 2022 18:37:37 +0800 Subject: [PATCH 09/17] minor changes --- source/dnode/mnode/impl/src/mndDb.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/dnode/mnode/impl/src/mndDb.c b/source/dnode/mnode/impl/src/mndDb.c index e772ff326c..eb5f39e983 100644 --- a/source/dnode/mnode/impl/src/mndDb.c +++ b/source/dnode/mnode/impl/src/mndDb.c @@ -914,6 +914,8 @@ static void mndBuildDBVgroupInfo(SDbObj *pDb, SMnode *pMnode, SArray *pVgList) { sdbRelease(pSdb, pVgroup); } + + sdbCancelFetch(pSdb, pIter); } static int32_t mndProcessUseDbReq(SMnodeMsg *pReq) { From 878401c19a31a20c32aa8a0e21c32dba6b2e1d84 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Thu, 17 Feb 2022 19:38:37 +0800 Subject: [PATCH 10/17] fix query crash on super table --- include/libs/qcom/query.h | 1 + source/client/src/clientHb.c | 2 +- source/client/src/clientImpl.c | 188 +++++++++++------------ source/client/src/clientMsgHandler.c | 2 + source/client/src/tmq.c | 6 +- source/libs/qcom/src/queryUtil.c | 2 +- source/libs/scheduler/inc/schedulerInt.h | 1 + source/libs/scheduler/src/scheduler.c | 15 +- source/libs/transport/src/transCli.c | 19 ++- 9 files changed, 127 insertions(+), 109 deletions(-) diff --git a/include/libs/qcom/query.h b/include/libs/qcom/query.h index 2e4093590d..c6218002b9 100644 --- a/include/libs/qcom/query.h +++ b/include/libs/qcom/query.h @@ -112,6 +112,7 @@ typedef struct STableMetaOutput { typedef struct SDataBuf { void *pData; uint32_t len; + void *handle; } SDataBuf; typedef int32_t (*__async_send_cb_fn_t)(void* param, const SDataBuf* pMsg, int32_t code); diff --git a/source/client/src/clientHb.c b/source/client/src/clientHb.c index d265ffaa94..e200712b87 100644 --- a/source/client/src/clientHb.c +++ b/source/client/src/clientHb.c @@ -444,7 +444,7 @@ static void* hbThreadFunc(void* param) { } void *abuf = buf; tSerializeSClientHbBatchReq(&abuf, pReq); - SMsgSendInfo *pInfo = malloc(sizeof(SMsgSendInfo)); + SMsgSendInfo *pInfo = calloc(1, sizeof(SMsgSendInfo)); if (pInfo == NULL) { terrno = TSDB_CODE_TSC_OUT_OF_MEMORY; tFreeClientHbBatchReq(pReq, false); diff --git a/source/client/src/clientImpl.c b/source/client/src/clientImpl.c index dfe7b12ce4..5f084fd5a7 100644 --- a/source/client/src/clientImpl.c +++ b/source/client/src/clientImpl.c @@ -12,10 +12,10 @@ #include "tpagedfile.h" #include "tref.h" -static int32_t initEpSetFromCfg(const char *firstEp, const char *secondEp, SCorEpSet *pEpSet); -static SMsgSendInfo* buildConnectMsg(SRequestObj *pRequest); -static void destroySendMsgInfo(SMsgSendInfo* pMsgBody); -static void setQueryResultFromRsp(SReqResultInfo* pResultInfo, const SRetrieveTableRsp* pRsp); +static int32_t initEpSetFromCfg(const char* firstEp, const char* secondEp, SCorEpSet* pEpSet); +static SMsgSendInfo* buildConnectMsg(SRequestObj* pRequest); +static void destroySendMsgInfo(SMsgSendInfo* pMsgBody); +static void setQueryResultFromRsp(SReqResultInfo* pResultInfo, const SRetrieveTableRsp* pRsp); static bool stringLengthCheck(const char* str, size_t maxsize) { if (str == NULL) { @@ -30,17 +30,11 @@ static bool stringLengthCheck(const char* str, size_t maxsize) { return true; } -static bool validateUserName(const char* user) { - return stringLengthCheck(user, TSDB_USER_LEN - 1); -} +static bool validateUserName(const char* user) { return stringLengthCheck(user, TSDB_USER_LEN - 1); } -static bool validatePassword(const char* passwd) { - return stringLengthCheck(passwd, TSDB_PASSWORD_LEN - 1); -} +static bool validatePassword(const char* passwd) { return stringLengthCheck(passwd, TSDB_PASSWORD_LEN - 1); } -static bool validateDbName(const char* db) { - return stringLengthCheck(db, TSDB_DB_NAME_LEN - 1); -} +static bool validateDbName(const char* db) { return stringLengthCheck(db, TSDB_DB_NAME_LEN - 1); } static char* getClusterKey(const char* user, const char* auth, const char* ip, int32_t port) { char key[512] = {0}; @@ -48,10 +42,12 @@ static char* getClusterKey(const char* user, const char* auth, const char* ip, i return strdup(key); } -static STscObj* taosConnectImpl(const char *user, const char *auth, const char *db, __taos_async_fn_t fp, void *param, SAppInstInfo* pAppInfo); -static void setResSchemaInfo(SReqResultInfo* pResInfo, const SSchema* pSchema, int32_t numOfCols); +static STscObj* taosConnectImpl(const char* user, const char* auth, const char* db, __taos_async_fn_t fp, void* param, + SAppInstInfo* pAppInfo); +static void setResSchemaInfo(SReqResultInfo* pResInfo, const SSchema* pSchema, int32_t numOfCols); -TAOS *taos_connect_internal(const char *ip, const char *user, const char *pass, const char *auth, const char *db, uint16_t port) { +TAOS* taos_connect_internal(const char* ip, const char* user, const char* pass, const char* auth, const char* db, + uint16_t port) { if (taos_init() != TSDB_CODE_SUCCESS) { return NULL; } @@ -63,7 +59,7 @@ TAOS *taos_connect_internal(const char *ip, const char *user, const char *pass, char localDb[TSDB_DB_NAME_LEN] = {0}; if (db != NULL) { - if(!validateDbName(db)) { + if (!validateDbName(db)) { terrno = TSDB_CODE_TSC_INVALID_DB_LENGTH; return NULL; } @@ -79,7 +75,7 @@ TAOS *taos_connect_internal(const char *ip, const char *user, const char *pass, return NULL; } - taosEncryptPass_c((uint8_t *)pass, strlen(pass), secretEncrypt); + taosEncryptPass_c((uint8_t*)pass, strlen(pass), secretEncrypt); } else { tstrncpy(secretEncrypt, auth, tListLen(secretEncrypt)); } @@ -99,7 +95,7 @@ TAOS *taos_connect_internal(const char *ip, const char *user, const char *pass, } } - char* key = getClusterKey(user, secretEncrypt, ip, port); + char* key = getClusterKey(user, secretEncrypt, ip, port); SAppInstInfo** pInst = NULL; pthread_mutex_lock(&appInfo.mutex); @@ -108,7 +104,7 @@ TAOS *taos_connect_internal(const char *ip, const char *user, const char *pass, SAppInstInfo* p = NULL; if (pInst == NULL) { p = calloc(1, sizeof(struct SAppInstInfo)); - p->mgmtEp = epSet; + p->mgmtEp = epSet; p->pTransporter = openTransporter(user, secretEncrypt, tsNumOfCores); p->pAppHbMgr = appHbMgrInit(p, key); taosHashPut(appInfo.pInstMap, key, strlen(key), &p, POINTER_BYTES); @@ -122,7 +118,7 @@ TAOS *taos_connect_internal(const char *ip, const char *user, const char *pass, return taosConnectImpl(user, &secretEncrypt[0], localDb, NULL, NULL, *pInst); } -int32_t buildRequest(STscObj *pTscObj, const char *sql, int sqlLen, SRequestObj** pRequest) { +int32_t buildRequest(STscObj* pTscObj, const char* sql, int sqlLen, SRequestObj** pRequest) { *pRequest = createRequest(pTscObj, NULL, NULL, TSDB_SQL_SELECT); if (*pRequest == NULL) { tscError("failed to malloc sqlObj"); @@ -131,7 +127,7 @@ int32_t buildRequest(STscObj *pTscObj, const char *sql, int sqlLen, SRequestObj* (*pRequest)->sqlstr = malloc(sqlLen + 1); if ((*pRequest)->sqlstr == NULL) { - tscError("0x%"PRIx64" failed to prepare sql string buffer", (*pRequest)->self); + tscError("0x%" PRIx64 " failed to prepare sql string buffer", (*pRequest)->self); (*pRequest)->msgBuf = strdup("failed to prepare sql string buffer"); return TSDB_CODE_TSC_OUT_OF_MEMORY; } @@ -140,7 +136,7 @@ int32_t buildRequest(STscObj *pTscObj, const char *sql, int sqlLen, SRequestObj* (*pRequest)->sqlstr[sqlLen] = 0; (*pRequest)->sqlLen = sqlLen; - tscDebugL("0x%"PRIx64" SQL: %s, reqId:0x%"PRIx64, (*pRequest)->self, (*pRequest)->sqlstr, (*pRequest)->requestId); + tscDebugL("0x%" PRIx64 " SQL: %s, reqId:0x%" PRIx64, (*pRequest)->self, (*pRequest)->sqlstr, (*pRequest)->requestId); return TSDB_CODE_SUCCESS; } @@ -148,14 +144,14 @@ int32_t parseSql(SRequestObj* pRequest, SQueryNode** pQuery) { STscObj* pTscObj = pRequest->pTscObj; SParseContext cxt = { - .requestId = pRequest->requestId, - .acctId = pTscObj->acctId, - .db = getDbOfConnection(pTscObj), - .pSql = pRequest->sqlstr, - .sqlLen = pRequest->sqlLen, - .pMsg = pRequest->msgBuf, - .msgLen = ERROR_MSG_BUF_DEFAULT_SIZE, - .pTransporter = pTscObj->pAppInfo->pTransporter, + .requestId = pRequest->requestId, + .acctId = pTscObj->acctId, + .db = getDbOfConnection(pTscObj), + .pSql = pRequest->sqlstr, + .sqlLen = pRequest->sqlLen, + .pMsg = pRequest->msgBuf, + .msgLen = ERROR_MSG_BUF_DEFAULT_SIZE, + .pTransporter = pTscObj->pAppInfo->pTransporter, }; cxt.mgmtEpSet = getEpSet_s(&pTscObj->pAppInfo->mgmtEp); @@ -174,9 +170,9 @@ int32_t parseSql(SRequestObj* pRequest, SQueryNode** pQuery) { int32_t execDdlQuery(SRequestObj* pRequest, SQueryNode* pQuery) { SDclStmtInfo* pDcl = (SDclStmtInfo*)pQuery; pRequest->type = pDcl->msgType; - pRequest->body.requestMsg = (SDataBuf){.pData = pDcl->pMsg, .len = pDcl->msgLen}; + pRequest->body.requestMsg = (SDataBuf){.pData = pDcl->pMsg, .len = pDcl->msgLen, .handle = NULL}; - STscObj* pTscObj = pRequest->pTscObj; + STscObj* pTscObj = pRequest->pTscObj; SMsgSendInfo* pSendMsg = buildMsgInfoImpl(pRequest); int64_t transporterId = 0; @@ -202,7 +198,7 @@ int32_t getPlan(SRequestObj* pRequest, SQueryNode* pQueryNode, SQueryDag** pDag, SSchema* pSchema = NULL; int32_t numOfCols = 0; - int32_t code = qCreateQueryDag(pQueryNode, pDag, &pSchema, &numOfCols, pNodeList, pRequest->requestId); + int32_t code = qCreateQueryDag(pQueryNode, pDag, &pSchema, &numOfCols, pNodeList, pRequest->requestId); if (code != 0) { return code; } @@ -224,7 +220,7 @@ void setResSchemaInfo(SReqResultInfo* pResInfo, const SSchema* pSchema, int32_t for (int32_t i = 0; i < pResInfo->numOfCols; ++i) { pResInfo->fields[i].bytes = pSchema[i].bytes; - pResInfo->fields[i].type = pSchema[i].type; + pResInfo->fields[i].type = pSchema[i].type; tstrncpy(pResInfo->fields[i].name, pSchema[i].name, tListLen(pResInfo->fields[i].name)); } } @@ -233,7 +229,7 @@ int32_t scheduleQuery(SRequestObj* pRequest, SQueryDag* pDag, SArray* pNodeList) void* pTransporter = pRequest->pTscObj->pAppInfo->pTransporter; if (TSDB_SQL_INSERT == pRequest->type || TSDB_SQL_CREATE_TABLE == pRequest->type) { SQueryResult res = {.code = 0, .numOfRows = 0, .msgSize = ERROR_MSG_BUF_DEFAULT_SIZE, .msg = pRequest->msgBuf}; - int32_t code = schedulerExecJob(pTransporter, NULL, pDag, &pRequest->body.pQueryJob, pRequest->sqlstr, &res); + int32_t code = schedulerExecJob(pTransporter, NULL, pDag, &pRequest->body.pQueryJob, pRequest->sqlstr, &res); if (code != TSDB_CODE_SUCCESS) { // handle error and retry } else { @@ -250,9 +246,9 @@ int32_t scheduleQuery(SRequestObj* pRequest, SQueryDag* pDag, SArray* pNodeList) return schedulerAsyncExecJob(pTransporter, pNodeList, pDag, pRequest->sqlstr, &pRequest->body.pQueryJob); } -TAOS_RES *taos_query_l(TAOS *taos, const char *sql, int sqlLen) { - STscObj *pTscObj = (STscObj *)taos; - if (sqlLen > (size_t) TSDB_MAX_ALLOWED_SQL_LEN) { +TAOS_RES* taos_query_l(TAOS* taos, const char* sql, int sqlLen) { + STscObj* pTscObj = (STscObj*)taos; + if (sqlLen > (size_t)TSDB_MAX_ALLOWED_SQL_LEN) { tscError("sql string exceeds max length:%d", TSDB_MAX_ALLOWED_SQL_LEN); terrno = TSDB_CODE_TSC_EXCEED_SQL_LIMIT; return NULL; @@ -260,9 +256,9 @@ TAOS_RES *taos_query_l(TAOS *taos, const char *sql, int sqlLen) { nPrintTsc("%s", sql) - SRequestObj *pRequest = NULL; - SQueryNode *pQueryNode = NULL; - SArray *pNodeList = taosArrayInit(4, sizeof(struct SQueryNodeAddr)); + SRequestObj* pRequest = NULL; + SQueryNode* pQueryNode = NULL; + SArray* pNodeList = taosArrayInit(4, sizeof(struct SQueryNodeAddr)); terrno = TSDB_CODE_SUCCESS; CHECK_CODE_GOTO(buildRequest(pTscObj, sql, sqlLen, &pRequest), _return); @@ -286,13 +282,13 @@ _return: return pRequest; } -int initEpSetFromCfg(const char *firstEp, const char *secondEp, SCorEpSet *pEpSet) { +int initEpSetFromCfg(const char* firstEp, const char* secondEp, SCorEpSet* pEpSet) { pEpSet->version = 0; // init mnode ip set - SEpSet *mgmtEpSet = &(pEpSet->epSet); + SEpSet* mgmtEpSet = &(pEpSet->epSet); mgmtEpSet->numOfEps = 0; - mgmtEpSet->inUse = 0; + mgmtEpSet->inUse = 0; if (firstEp && firstEp[0] != 0) { if (strlen(firstEp) >= TSDB_EP_LEN) { @@ -322,14 +318,15 @@ int initEpSetFromCfg(const char *firstEp, const char *secondEp, SCorEpSet *pEpSe return 0; } -STscObj* taosConnectImpl(const char *user, const char *auth, const char *db, __taos_async_fn_t fp, void *param, SAppInstInfo* pAppInfo) { - STscObj *pTscObj = createTscObj(user, auth, db, pAppInfo); +STscObj* taosConnectImpl(const char* user, const char* auth, const char* db, __taos_async_fn_t fp, void* param, + SAppInstInfo* pAppInfo) { + STscObj* pTscObj = createTscObj(user, auth, db, pAppInfo); if (NULL == pTscObj) { terrno = TSDB_CODE_TSC_OUT_OF_MEMORY; return pTscObj; } - SRequestObj *pRequest = createRequest(pTscObj, fp, param, TDMT_MND_CONNECT); + SRequestObj* pRequest = createRequest(pTscObj, fp, param, TDMT_MND_CONNECT); if (pRequest == NULL) { destroyTscObj(pTscObj); terrno = TSDB_CODE_TSC_OUT_OF_MEMORY; @@ -343,42 +340,44 @@ STscObj* taosConnectImpl(const char *user, const char *auth, const char *db, __t tsem_wait(&pRequest->body.rspSem); if (pRequest->code != TSDB_CODE_SUCCESS) { - const char *errorMsg = (pRequest->code == TSDB_CODE_RPC_FQDN_ERROR) ? taos_errstr(pRequest) : tstrerror(pRequest->code); + const char* errorMsg = + (pRequest->code == TSDB_CODE_RPC_FQDN_ERROR) ? taos_errstr(pRequest) : tstrerror(pRequest->code); printf("failed to connect to server, reason: %s\n\n", errorMsg); destroyRequest(pRequest); taos_close(pTscObj); pTscObj = NULL; } else { - tscDebug("0x%"PRIx64" connection is opening, connId:%d, dnodeConn:%p, reqId:0x%"PRIx64, pTscObj->id, pTscObj->connId, pTscObj->pAppInfo->pTransporter, pRequest->requestId); + tscDebug("0x%" PRIx64 " connection is opening, connId:%d, dnodeConn:%p, reqId:0x%" PRIx64, pTscObj->id, + pTscObj->connId, pTscObj->pAppInfo->pTransporter, pRequest->requestId); destroyRequest(pRequest); } return pTscObj; } -static SMsgSendInfo* buildConnectMsg(SRequestObj *pRequest) { - SMsgSendInfo *pMsgSendInfo = calloc(1, sizeof(SMsgSendInfo)); +static SMsgSendInfo* buildConnectMsg(SRequestObj* pRequest) { + SMsgSendInfo* pMsgSendInfo = calloc(1, sizeof(SMsgSendInfo)); if (pMsgSendInfo == NULL) { terrno = TSDB_CODE_TSC_OUT_OF_MEMORY; return NULL; } - pMsgSendInfo->msgType = TDMT_MND_CONNECT; - pMsgSendInfo->msgInfo.len = sizeof(SConnectReq); + pMsgSendInfo->msgType = TDMT_MND_CONNECT; + pMsgSendInfo->msgInfo.len = sizeof(SConnectReq); pMsgSendInfo->requestObjRefId = pRequest->self; - pMsgSendInfo->requestId = pRequest->requestId; - pMsgSendInfo->fp = handleRequestRspFp[TMSG_INDEX(pMsgSendInfo->msgType)]; - pMsgSendInfo->param = pRequest; + pMsgSendInfo->requestId = pRequest->requestId; + pMsgSendInfo->fp = handleRequestRspFp[TMSG_INDEX(pMsgSendInfo->msgType)]; + pMsgSendInfo->param = pRequest; - SConnectReq *pConnect = calloc(1, sizeof(SConnectReq)); + SConnectReq* pConnect = calloc(1, sizeof(SConnectReq)); if (pConnect == NULL) { tfree(pMsgSendInfo); terrno = TSDB_CODE_TSC_OUT_OF_MEMORY; return NULL; } - STscObj *pObj = pRequest->pTscObj; + STscObj* pObj = pRequest->pTscObj; char* db = getDbOfConnection(pObj); if (db != NULL) { @@ -401,17 +400,17 @@ static void destroySendMsgInfo(SMsgSendInfo* pMsgBody) { } void processMsgFromServer(void* parent, SRpcMsg* pMsg, SEpSet* pEpSet) { - SMsgSendInfo *pSendInfo = (SMsgSendInfo *) pMsg->ahandle; + SMsgSendInfo* pSendInfo = (SMsgSendInfo*)pMsg->ahandle; assert(pMsg->ahandle != NULL); if (pSendInfo->requestObjRefId != 0) { - SRequestObj *pRequest = (SRequestObj *)taosAcquireRef(clientReqRefPool, pSendInfo->requestObjRefId); + SRequestObj* pRequest = (SRequestObj*)taosAcquireRef(clientReqRefPool, pSendInfo->requestObjRefId); assert(pRequest->self == pSendInfo->requestObjRefId); pRequest->metric.rsp = taosGetTimestampMs(); pRequest->code = pMsg->code; - STscObj *pTscObj = pRequest->pTscObj; + STscObj* pTscObj = pRequest->pTscObj; if (pEpSet) { if (!isEpsetEqual(&pTscObj->pAppInfo->mgmtEp.epSet, pEpSet)) { updateEpSet_s(&pTscObj->pAppInfo->mgmtEp, pEpSet); @@ -419,22 +418,22 @@ void processMsgFromServer(void* parent, SRpcMsg* pMsg, SEpSet* pEpSet) { } /* - * There is not response callback function for submit response. - * The actual inserted number of points is the first number. + * There is not response callback function for submit response. + * The actual inserted number of points is the first number. */ int32_t elapsed = pRequest->metric.rsp - pRequest->metric.start; if (pMsg->code == TSDB_CODE_SUCCESS) { - tscDebug("0x%" PRIx64 " message:%s, code:%s rspLen:%d, elapsed:%d ms, reqId:0x%"PRIx64, pRequest->self, - TMSG_INFO(pMsg->msgType), tstrerror(pMsg->code), pMsg->contLen, elapsed, pRequest->requestId); + tscDebug("0x%" PRIx64 " message:%s, code:%s rspLen:%d, elapsed:%d ms, reqId:0x%" PRIx64, pRequest->self, + TMSG_INFO(pMsg->msgType), tstrerror(pMsg->code), pMsg->contLen, elapsed, pRequest->requestId); } else { - tscError("0x%" PRIx64 " SQL cmd:%s, code:%s rspLen:%d, elapsed time:%d ms, reqId:0x%"PRIx64, pRequest->self, - TMSG_INFO(pMsg->msgType), tstrerror(pMsg->code), pMsg->contLen, elapsed, pRequest->requestId); + tscError("0x%" PRIx64 " SQL cmd:%s, code:%s rspLen:%d, elapsed time:%d ms, reqId:0x%" PRIx64, pRequest->self, + TMSG_INFO(pMsg->msgType), tstrerror(pMsg->code), pMsg->contLen, elapsed, pRequest->requestId); } taosReleaseRef(clientReqRefPool, pSendInfo->requestObjRefId); } - SDataBuf buf = {.len = pMsg->contLen, .pData = NULL}; + SDataBuf buf = {.len = pMsg->contLen, .pData = NULL, .handle = pMsg->handle}; if (pMsg->contLen > 0) { buf.pData = calloc(1, pMsg->contLen); @@ -451,7 +450,7 @@ void processMsgFromServer(void* parent, SRpcMsg* pMsg, SEpSet* pEpSet) { destroySendMsgInfo(pSendInfo); } -TAOS *taos_connect_auth(const char *ip, const char *user, const char *auth, const char *db, uint16_t port) { +TAOS* taos_connect_auth(const char* ip, const char* user, const char* auth, const char* db, uint16_t port) { tscDebug("try to connect to %s:%u by auth, user:%s db:%s", ip, port, user, db); if (user == NULL) { user = TSDB_DEFAULT_USER; @@ -465,16 +464,17 @@ TAOS *taos_connect_auth(const char *ip, const char *user, const char *auth, cons return taos_connect_internal(ip, user, NULL, auth, db, port); } -TAOS *taos_connect_l(const char *ip, int ipLen, const char *user, int userLen, const char *pass, int passLen, const char *db, int dbLen, uint16_t port) { - char ipStr[TSDB_EP_LEN] = {0}; +TAOS* taos_connect_l(const char* ip, int ipLen, const char* user, int userLen, const char* pass, int passLen, + const char* db, int dbLen, uint16_t port) { + char ipStr[TSDB_EP_LEN] = {0}; char dbStr[TSDB_DB_NAME_LEN] = {0}; - char userStr[TSDB_USER_LEN] = {0}; - char passStr[TSDB_PASSWORD_LEN] = {0}; + char userStr[TSDB_USER_LEN] = {0}; + char passStr[TSDB_PASSWORD_LEN] = {0}; - strncpy(ipStr, ip, TMIN(TSDB_EP_LEN - 1, ipLen)); + strncpy(ipStr, ip, TMIN(TSDB_EP_LEN - 1, ipLen)); strncpy(userStr, user, TMIN(TSDB_USER_LEN - 1, userLen)); strncpy(passStr, pass, TMIN(TSDB_PASSWORD_LEN - 1, passLen)); - strncpy(dbStr, db, TMIN(TSDB_DB_NAME_LEN - 1, dbLen)); + strncpy(dbStr, db, TMIN(TSDB_DB_NAME_LEN - 1, dbLen)); return taos_connect(ipStr, userStr, passStr, dbStr, port); } @@ -492,15 +492,15 @@ void* doFetchRow(SRequestObj* pRequest) { } SReqResultInfo* pResInfo = &pRequest->body.resInfo; - int32_t code = schedulerFetchRows(pRequest->body.pQueryJob, (void **)&pResInfo->pData); + int32_t code = schedulerFetchRows(pRequest->body.pQueryJob, (void**)&pResInfo->pData); if (code != TSDB_CODE_SUCCESS) { pRequest->code = code; return NULL; } setQueryResultFromRsp(&pRequest->body.resInfo, (SRetrieveTableRsp*)pResInfo->pData); - tscDebug("0x%"PRIx64 " fetch results, numOfRows:%d total Rows:%"PRId64", complete:%d, reqId:0x%"PRIx64, pRequest->self, pResInfo->numOfRows, - pResInfo->totalRows, pResInfo->completed, pRequest->requestId); + tscDebug("0x%" PRIx64 " fetch results, numOfRows:%d total Rows:%" PRId64 ", complete:%d, reqId:0x%" PRIx64, + pRequest->self, pResInfo->numOfRows, pResInfo->totalRows, pResInfo->completed, pRequest->requestId); if (pResultInfo->numOfRows == 0) { return NULL; @@ -513,7 +513,7 @@ void* doFetchRow(SRequestObj* pRequest) { } else if (pRequest->type == TDMT_VND_SHOW_TABLES) { pRequest->type = TDMT_VND_SHOW_TABLES_FETCH; SShowReqInfo* pShowReqInfo = &pRequest->body.showInfo; - SVgroupInfo* pVgroupInfo = taosArrayGet(pShowReqInfo->pArray, pShowReqInfo->currentIndex); + SVgroupInfo* pVgroupInfo = taosArrayGet(pShowReqInfo->pArray, pShowReqInfo->currentIndex); epSet = pVgroupInfo->epset; } else if (pRequest->type == TDMT_VND_SHOW_TABLES_FETCH) { @@ -524,7 +524,7 @@ void* doFetchRow(SRequestObj* pRequest) { return NULL; } - SVgroupInfo* pVgroupInfo = taosArrayGet(pShowReqInfo->pArray, pShowReqInfo->currentIndex); + SVgroupInfo* pVgroupInfo = taosArrayGet(pShowReqInfo->pArray, pShowReqInfo->currentIndex); SVShowTablesReq* pShowReq = calloc(1, sizeof(SVShowTablesReq)); pShowReq->head.vgId = htonl(pVgroupInfo->vgId); @@ -535,14 +535,14 @@ void* doFetchRow(SRequestObj* pRequest) { epSet = pVgroupInfo->epset; int64_t transporterId = 0; - STscObj *pTscObj = pRequest->pTscObj; + STscObj* pTscObj = pRequest->pTscObj; asyncSendMsgToServer(pTscObj->pAppInfo->pTransporter, &epSet, &transporterId, body); tsem_wait(&pRequest->body.rspSem); pRequest->type = TDMT_VND_SHOW_TABLES_FETCH; - } else if (pRequest->type == TDMT_MND_SHOW_RETRIEVE) { + } else if (pRequest->type == TDMT_MND_SHOW_RETRIEVE) { epSet = getEpSet_s(&pRequest->pTscObj->pAppInfo->mgmtEp); - + if (pResultInfo->completed) { return NULL; } @@ -551,7 +551,7 @@ void* doFetchRow(SRequestObj* pRequest) { SMsgSendInfo* body = buildMsgInfoImpl(pRequest); int64_t transporterId = 0; - STscObj *pTscObj = pRequest->pTscObj; + STscObj* pTscObj = pRequest->pTscObj; asyncSendMsgToServer(pTscObj->pAppInfo->pTransporter, &epSet, &transporterId, body); tsem_wait(&pRequest->body.rspSem); @@ -564,7 +564,7 @@ void* doFetchRow(SRequestObj* pRequest) { _return: - for(int32_t i = 0; i < pResultInfo->numOfCols; ++i) { + for (int32_t i = 0; i < pResultInfo->numOfCols; ++i) { pResultInfo->row[i] = pResultInfo->pCol[i] + pResultInfo->fields[i].bytes * pResultInfo->current; if (IS_VAR_DATA_TYPE(pResultInfo->fields[i].type)) { pResultInfo->length[i] = varDataLen(pResultInfo->row[i]); @@ -578,8 +578,8 @@ _return: static void doPrepareResPtr(SReqResultInfo* pResInfo) { if (pResInfo->row == NULL) { - pResInfo->row = calloc(pResInfo->numOfCols, POINTER_BYTES); - pResInfo->pCol = calloc(pResInfo->numOfCols, POINTER_BYTES); + pResInfo->row = calloc(pResInfo->numOfCols, POINTER_BYTES); + pResInfo->pCol = calloc(pResInfo->numOfCols, POINTER_BYTES); pResInfo->length = calloc(pResInfo->numOfCols, sizeof(int32_t)); } } @@ -596,14 +596,14 @@ void setResultDataPtr(SReqResultInfo* pResultInfo, TAOS_FIELD* pFields, int32_t int32_t offset = 0; for (int32_t i = 0; i < numOfCols; ++i) { pResultInfo->length[i] = pResultInfo->fields[i].bytes; - pResultInfo->row[i] = (char*) (pResultInfo->pData + offset * pResultInfo->numOfRows); - pResultInfo->pCol[i] = pResultInfo->row[i]; + pResultInfo->row[i] = (char*)(pResultInfo->pData + offset * pResultInfo->numOfRows); + pResultInfo->pCol[i] = pResultInfo->row[i]; offset += pResultInfo->fields[i].bytes; } } char* getDbOfConnection(STscObj* pObj) { - char *p = NULL; + char* p = NULL; pthread_mutex_lock(&pObj->mutex); size_t len = strlen(pObj->db); if (len > 0) { @@ -624,10 +624,10 @@ void setConnectionDB(STscObj* pTscObj, const char* db) { void setQueryResultFromRsp(SReqResultInfo* pResultInfo, const SRetrieveTableRsp* pRsp) { assert(pResultInfo != NULL && pRsp != NULL); - pResultInfo->pRspMsg = (const char*) pRsp; - pResultInfo->pData = (void*) pRsp->data; + pResultInfo->pRspMsg = (const char*)pRsp; + pResultInfo->pData = (void*)pRsp->data; pResultInfo->numOfRows = htonl(pRsp->numOfRows); - pResultInfo->current = 0; + pResultInfo->current = 0; pResultInfo->completed = (pRsp->completed == 1); pResultInfo->totalRows += pResultInfo->numOfRows; diff --git a/source/client/src/clientMsgHandler.c b/source/client/src/clientMsgHandler.c index 8ab1880069..67224e6aa2 100644 --- a/source/client/src/clientMsgHandler.c +++ b/source/client/src/clientMsgHandler.c @@ -105,6 +105,7 @@ SMsgSendInfo* buildMsgInfoImpl(SRequestObj *pRequest) { pRetrieveMsg->showId = htobe64(pRequest->body.showInfo.execId); pMsgSendInfo->msgInfo.pData = pRetrieveMsg; pMsgSendInfo->msgInfo.len = sizeof(SRetrieveTableReq); + pMsgSendInfo->msgInfo.handle = NULL; } else { SVShowTablesFetchReq* pFetchMsg = calloc(1, sizeof(SVShowTablesFetchReq)); if (pFetchMsg == NULL) { @@ -116,6 +117,7 @@ SMsgSendInfo* buildMsgInfoImpl(SRequestObj *pRequest) { pMsgSendInfo->msgInfo.pData = pFetchMsg; pMsgSendInfo->msgInfo.len = sizeof(SVShowTablesFetchReq); + pMsgSendInfo->msgInfo.handle = NULL; } } else { assert(pRequest != NULL); diff --git a/source/client/src/tmq.c b/source/client/src/tmq.c index e57901ed2e..ce8ba4e665 100644 --- a/source/client/src/tmq.c +++ b/source/client/src/tmq.c @@ -252,7 +252,7 @@ tmq_resp_err_t tmq_subscribe(tmq_t* tmq, tmq_list_t* topic_list) { SMqSubscribeCbParam param = {.rspErr = TMQ_RESP_ERR__SUCCESS, .tmq = tmq}; tsem_init(¶m.rspSem, 0, 0); - pRequest->body.requestMsg = (SDataBuf){.pData = buf, .len = tlen}; + pRequest->body.requestMsg = (SDataBuf){.pData = buf, .len = tlen, .handle = NULL}; SMsgSendInfo* sendInfo = buildMsgInfoImpl(pRequest); sendInfo->param = ¶m; @@ -381,7 +381,7 @@ TAOS_RES* tmq_create_topic(TAOS* taos, const char* topicName, const char* sql, i tSerializeSCMCreateTopicReq(&abuf, &req); /*printf("formatted: %s\n", dagStr);*/ - pRequest->body.requestMsg = (SDataBuf){.pData = buf, .len = tlen}; + pRequest->body.requestMsg = (SDataBuf){.pData = buf, .len = tlen, .handle = NULL}; pRequest->type = TDMT_MND_CREATE_TOPIC; SMsgSendInfo* sendInfo = buildMsgInfoImpl(pRequest); @@ -686,7 +686,7 @@ tmq_message_t* tmq_consumer_poll(tmq_t* tmq, int64_t blocking_time) { tsem_init(¶m->rspSem, 0, 0); SRequestObj* pRequest = createRequest(tmq->pTscObj, NULL, NULL, TDMT_VND_CONSUME); - pRequest->body.requestMsg = (SDataBuf){.pData = pReq, .len = sizeof(SMqConsumeReq)}; + pRequest->body.requestMsg = (SDataBuf){.pData = pReq, .len = sizeof(SMqConsumeReq), .handle = NULL}; SMsgSendInfo* sendInfo = buildMsgInfoImpl(pRequest); sendInfo->requestObjRefId = 0; diff --git a/source/libs/qcom/src/queryUtil.c b/source/libs/qcom/src/queryUtil.c index 9f678b4528..4cd040c238 100644 --- a/source/libs/qcom/src/queryUtil.c +++ b/source/libs/qcom/src/queryUtil.c @@ -137,7 +137,7 @@ int32_t asyncSendMsgToServer(void *pTransporter, SEpSet* epSet, int64_t* pTransp .pCont = pMsg, .contLen = pInfo->msgInfo.len, .ahandle = (void*) pInfo, - .handle = NULL, + .handle = pInfo->msgInfo.handle, .code = 0 }; diff --git a/source/libs/scheduler/inc/schedulerInt.h b/source/libs/scheduler/inc/schedulerInt.h index 94c833307f..42270cd645 100644 --- a/source/libs/scheduler/inc/schedulerInt.h +++ b/source/libs/scheduler/inc/schedulerInt.h @@ -95,6 +95,7 @@ typedef struct SSchTask { int32_t childReady; // child task ready number SArray *children; // the datasource tasks,from which to fetch the result, element is SQueryTask* SArray *parents; // the data destination tasks, get data from current task, element is SQueryTask* + void* handle; // task send handle } SSchTask; typedef struct SSchJobAttr { diff --git a/source/libs/scheduler/src/scheduler.c b/source/libs/scheduler/src/scheduler.c index 1b6d871274..ab6873ef9c 100644 --- a/source/libs/scheduler/src/scheduler.c +++ b/source/libs/scheduler/src/scheduler.c @@ -18,6 +18,10 @@ #include "query.h" #include "catalog.h" +typedef struct SSchTrans { + void *transInst; + void *transHandle; +}SSchTrans; static SSchedulerMgmt schMgmt = {0}; uint64_t schGenTaskId(void) { @@ -932,6 +936,7 @@ int32_t schHandleCallback(void* param, const SDataBuf* pMsg, int32_t msgType, in pTask = *task; SCH_TASK_DLOG("rsp msg received, type:%s, code:%s", TMSG_INFO(msgType), tstrerror(rspCode)); + pTask->handle = pMsg->handle; SCH_ERR_JRET(schHandleResponseMsg(pJob, pTask, msgType, pMsg->pData, pMsg->len, rspCode)); _return: @@ -1000,6 +1005,9 @@ int32_t schGetCallbackFp(int32_t msgType, __async_send_cb_fn_t *fp) { int32_t schAsyncSendMsg(void *transport, SEpSet* epSet, uint64_t qId, uint64_t tId, int32_t msgType, void *msg, uint32_t msgSize) { int32_t code = 0; + + SSchTrans *trans = (SSchTrans *)transport; + SMsgSendInfo* pMsgSendInfo = calloc(1, sizeof(SMsgSendInfo)); if (NULL == pMsgSendInfo) { qError("QID:%"PRIx64 ",TID:%"PRIx64 " calloc %d failed", qId, tId, (int32_t)sizeof(SMsgSendInfo)); @@ -1018,14 +1026,16 @@ int32_t schAsyncSendMsg(void *transport, SEpSet* epSet, uint64_t qId, uint64_t t param->queryId = qId; param->taskId = tId; + pMsgSendInfo->param = param; pMsgSendInfo->msgInfo.pData = msg; pMsgSendInfo->msgInfo.len = msgSize; + pMsgSendInfo->msgInfo.handle = trans->transHandle; pMsgSendInfo->msgType = msgType; pMsgSendInfo->fp = fp; int64_t transporterId = 0; - code = asyncSendMsgToServer(transport, epSet, &transporterId, pMsgSendInfo); + code = asyncSendMsgToServer(trans->transInst, epSet, &transporterId, pMsgSendInfo); if (code) { SCH_ERR_JRET(code); } @@ -1149,7 +1159,8 @@ int32_t schBuildAndSendMsg(SSchJob *pJob, SSchTask *pTask, SQueryNodeAddr *addr, atomic_store_32(&pTask->lastMsgType, msgType); - SCH_ERR_JRET(schAsyncSendMsg(pJob->transport, &epSet, pJob->queryId, pTask->taskId, msgType, msg, msgSize)); + SSchTrans trans = {.transInst = pJob->transport, .transHandle = pTask->handle}; + SCH_ERR_JRET(schAsyncSendMsg(&trans, &epSet, pJob->queryId, pTask->taskId, msgType, msg, msgSize)); if (isCandidateAddr) { SCH_ERR_RET(schRecordTaskExecNode(pJob, pTask, addr)); diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c index 9cab863ed7..f1bd1ba980 100644 --- a/source/libs/transport/src/transCli.c +++ b/source/libs/transport/src/transCli.c @@ -133,15 +133,18 @@ static void clientHandleResp(SCliConn* conn) { rpcMsg.msgType = pHead->msgType; rpcMsg.ahandle = pCtx->ahandle; - if (rpcMsg.msgType == TDMT_VND_QUERY_RSP || rpcMsg.msgType == TDMT_VND_FETCH_RSP) { + if (rpcMsg.msgType == TDMT_VND_QUERY_RSP || rpcMsg.msgType == TDMT_VND_FETCH_RSP || + rpcMsg.msgType == TDMT_VND_RES_READY) { rpcMsg.handle = conn; conn->persist = 1; + tDebug("client conn %p persist by app", conn); } tDebug("client conn %p %s received from %s:%d, local info: %s:%d", conn, TMSG_INFO(pHead->msgType), inet_ntoa(conn->addr.sin_addr), ntohs(conn->addr.sin_port), inet_ntoa(conn->locaddr.sin_addr), ntohs(conn->locaddr.sin_port)); + conn->secured = pHead->secured; if (conn->push != NULL && conn->ctnRdCnt != 0) { (*conn->push->callback)(conn->push->arg, &rpcMsg); conn->push = NULL; @@ -156,7 +159,6 @@ static void clientHandleResp(SCliConn* conn) { } } conn->ctnRdCnt += 1; - conn->secured = pHead->secured; // buf's mem alread translated to rpcMsg.pCont transClearBuffer(&conn->readBuf); @@ -166,16 +168,14 @@ static void clientHandleResp(SCliConn* conn) { SCliThrdObj* pThrd = conn->hostThrd; // user owns conn->persist = 1 - if (conn->push == NULL || conn->persist == 0) { + if (conn->push == NULL && conn->persist == 0) { addConnToPool(pThrd->pool, pCtx->ip, pCtx->port, conn); - - destroyCmsg(conn->data); - conn->data = NULL; } - + destroyCmsg(conn->data); + conn->data = NULL; // start thread's timer of conn pool if not active if (!uv_is_active((uv_handle_t*)pThrd->timer) && pRpc->idleTime > 0) { - uv_timer_start((uv_timer_t*)pThrd->timer, clientTimeoutCb, CONN_PERSIST_TIME(pRpc->idleTime) / 2, 0); + // uv_timer_start((uv_timer_t*)pThrd->timer, clientTimeoutCb, CONN_PERSIST_TIME(pRpc->idleTime) / 2, 0); } } static void clientHandleExcept(SCliConn* pConn) { @@ -330,6 +330,9 @@ static void clientAllocBufferCb(uv_handle_t* handle, size_t suggested_size, uv_b } static void clientReadCb(uv_stream_t* handle, ssize_t nread, const uv_buf_t* buf) { // impl later + if (handle->data == NULL) { + return; + } SCliConn* conn = handle->data; SConnBuffer* pBuf = &conn->readBuf; if (nread > 0) { From 4ab720c7df0c7d2d55d115570e02f8da8f9abe23 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Thu, 17 Feb 2022 22:46:48 +0800 Subject: [PATCH 11/17] show trans --- source/dnode/mnode/impl/inc/mndDef.h | 2 +- source/dnode/mnode/impl/src/mndTrans.c | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/source/dnode/mnode/impl/inc/mndDef.h b/source/dnode/mnode/impl/inc/mndDef.h index abc802c588..c26b027a88 100644 --- a/source/dnode/mnode/impl/inc/mndDef.h +++ b/source/dnode/mnode/impl/inc/mndDef.h @@ -143,7 +143,7 @@ typedef struct { int64_t lastExecTime; int32_t transType; uint64_t dbUid; - char dbname[TSDB_DB_NAME_LEN]; + char dbname[TSDB_DB_FNAME_LEN]; char lastError[TSDB_TRANS_DESC_LEN]; } STrans; diff --git a/source/dnode/mnode/impl/src/mndTrans.c b/source/dnode/mnode/impl/src/mndTrans.c index 99a5a3a475..ffde29e6a7 100644 --- a/source/dnode/mnode/impl/src/mndTrans.c +++ b/source/dnode/mnode/impl/src/mndTrans.c @@ -124,6 +124,10 @@ static SSdbRaw *mndTransActionEncode(STrans *pTrans) { SDB_SET_INT32(pRaw, dataPos, pTrans->id, TRANS_ENCODE_OVER) SDB_SET_INT8(pRaw, dataPos, pTrans->policy, TRANS_ENCODE_OVER) SDB_SET_INT8(pRaw, dataPos, pTrans->stage, TRANS_ENCODE_OVER) + SDB_SET_INT64(pRaw, dataPos, pTrans->createdTime, TRANS_ENCODE_OVER) + SDB_SET_INT32(pRaw, dataPos, pTrans->transType, TRANS_ENCODE_OVER) + SDB_SET_INT64(pRaw, dataPos, pTrans->dbUid, TRANS_ENCODE_OVER) + SDB_SET_BINARY(pRaw, dataPos, pTrans->dbname, TSDB_DB_FNAME_LEN, TRANS_ENCODE_OVER) SDB_SET_INT32(pRaw, dataPos, redoLogNum, TRANS_ENCODE_OVER) SDB_SET_INT32(pRaw, dataPos, undoLogNum, TRANS_ENCODE_OVER) SDB_SET_INT32(pRaw, dataPos, commitLogNum, TRANS_ENCODE_OVER) @@ -229,6 +233,10 @@ static SSdbRow *mndTransActionDecode(SSdbRaw *pRaw) { SDB_GET_INT32(pRaw, dataPos, &pTrans->id, TRANS_DECODE_OVER) SDB_GET_INT8(pRaw, dataPos, (int8_t *)&pTrans->policy, TRANS_DECODE_OVER) SDB_GET_INT8(pRaw, dataPos, (int8_t *)&pTrans->stage, TRANS_DECODE_OVER) + SDB_GET_INT64(pRaw, dataPos, &pTrans->createdTime, TRANS_DECODE_OVER) + SDB_GET_INT32(pRaw, dataPos, &pTrans->transType, TRANS_DECODE_OVER) + SDB_GET_INT64(pRaw, dataPos, &pTrans->dbUid, TRANS_DECODE_OVER) + SDB_GET_BINARY(pRaw, dataPos, pTrans->dbname, TSDB_DB_FNAME_LEN, TRANS_DECODE_OVER) SDB_GET_INT32(pRaw, dataPos, &redoLogNum, TRANS_DECODE_OVER) SDB_GET_INT32(pRaw, dataPos, &undoLogNum, TRANS_DECODE_OVER) SDB_GET_INT32(pRaw, dataPos, &commitLogNum, TRANS_DECODE_OVER) @@ -1034,13 +1042,13 @@ static int32_t mndGetTransMeta(SMnodeMsg *pReq, SShowObj *pShow, STableMetaRsp * pSchema[cols].bytes = pShow->bytes[cols]; cols++; - pShow->bytes[cols] = (TSDB_DB_NAME_LEN - 1) + VARSTR_HEADER_SIZE; + pShow->bytes[cols] = TSDB_DB_NAME_LEN + VARSTR_HEADER_SIZE; pSchema[cols].type = TSDB_DATA_TYPE_BINARY; strcpy(pSchema[cols].name, "db"); pSchema[cols].bytes = pShow->bytes[cols]; cols++; - pShow->bytes[cols] = (TSDB_TRANS_DESC_LEN - 1) + VARSTR_HEADER_SIZE; + pShow->bytes[cols] = TSDB_TRANS_DESC_LEN + VARSTR_HEADER_SIZE; pSchema[cols].type = TSDB_DATA_TYPE_BINARY; strcpy(pSchema[cols].name, "type"); pSchema[cols].bytes = pShow->bytes[cols]; @@ -1052,7 +1060,7 @@ static int32_t mndGetTransMeta(SMnodeMsg *pReq, SShowObj *pShow, STableMetaRsp * pSchema[cols].bytes = pShow->bytes[cols]; cols++; - pShow->bytes[cols] = (TSDB_TRANS_ERROR_LEN - 1) + VARSTR_HEADER_SIZE; + pShow->bytes[cols] = TSDB_TRANS_ERROR_LEN + VARSTR_HEADER_SIZE; pSchema[cols].type = TSDB_DATA_TYPE_BINARY; strcpy(pSchema[cols].name, "last_error"); pSchema[cols].bytes = pShow->bytes[cols]; From 4a27d2cc75c10d796938b4689702f7aa132c1b8c Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Fri, 18 Feb 2022 00:26:43 +0800 Subject: [PATCH 12/17] kill trans --- include/common/tmsg.h | 7 +++++ include/common/tmsgdef.h | 1 + source/common/src/tmsg.c | 25 +++++++++++++++ source/dnode/mnode/impl/src/mndTrans.c | 42 +++++++++++++++++++++++++- 4 files changed, 74 insertions(+), 1 deletion(-) diff --git a/include/common/tmsg.h b/include/common/tmsg.h index b8ed29b2a5..48e352bb48 100644 --- a/include/common/tmsg.h +++ b/include/common/tmsg.h @@ -977,6 +977,13 @@ typedef struct { int32_t tSerializeSKillConnReq(void* buf, int32_t bufLen, SKillConnReq* pReq); int32_t tDeserializeSKillConnReq(void* buf, int32_t bufLen, SKillConnReq* pReq); +typedef struct { + int32_t transId; +} SKillTransReq; + +int32_t tSerializeSKillTransReq(void* buf, int32_t bufLen, SKillTransReq* pReq); +int32_t tDeserializeSKillTransReq(void* buf, int32_t bufLen, SKillTransReq* pReq); + typedef struct { char user[TSDB_USER_LEN]; char spi; diff --git a/include/common/tmsgdef.h b/include/common/tmsgdef.h index 9e5613ef03..1a63ea73a5 100644 --- a/include/common/tmsgdef.h +++ b/include/common/tmsgdef.h @@ -136,6 +136,7 @@ enum { TD_DEF_MSG_TYPE(TDMT_MND_SHOW_RETRIEVE, "mnode-retrieve", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_MND_STATUS, "mnode-status", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_MND_TRANS, "mnode-trans", NULL, NULL) + TD_DEF_MSG_TYPE(TDMT_MND_KILL_TRANS, "mnode-kill-trans", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_MND_GRANT, "mnode-grant", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_MND_AUTH, "mnode-auth", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_MND_CREATE_TOPIC, "mnode-create-topic", SMCreateTopicReq, SMCreateTopicRsp) diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c index 4b6171362e..ba7ce14466 100644 --- a/source/common/src/tmsg.c +++ b/source/common/src/tmsg.c @@ -2239,6 +2239,31 @@ int32_t tDeserializeSKillConnReq(void *buf, int32_t bufLen, SKillConnReq *pReq) return 0; } +int32_t tSerializeSKillTransReq(void *buf, int32_t bufLen, SKillTransReq *pReq) { + SCoder encoder = {0}; + tCoderInit(&encoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_ENCODER); + + if (tStartEncode(&encoder) < 0) return -1; + if (tEncodeI32(&encoder, pReq->transId) < 0) return -1; + tEndEncode(&encoder); + + int32_t tlen = encoder.pos; + tCoderClear(&encoder); + return tlen; +} + +int32_t tDeserializeSKillTransReq(void *buf, int32_t bufLen, SKillTransReq *pReq) { + SCoder decoder = {0}; + tCoderInit(&decoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_DECODER); + + if (tStartDecode(&decoder) < 0) return -1; + if (tDecodeI32(&decoder, &pReq->transId) < 0) return -1; + tEndDecode(&decoder); + + tCoderClear(&decoder); + return 0; +} + int32_t tSerializeSDCreateMnodeReq(void *buf, int32_t bufLen, SDCreateMnodeReq *pReq) { SCoder encoder = {0}; tCoderInit(&encoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_ENCODER); diff --git a/source/dnode/mnode/impl/src/mndTrans.c b/source/dnode/mnode/impl/src/mndTrans.c index ffde29e6a7..1670fffb8c 100644 --- a/source/dnode/mnode/impl/src/mndTrans.c +++ b/source/dnode/mnode/impl/src/mndTrans.c @@ -54,7 +54,8 @@ static bool mndTransPerfromFinishedStage(SMnode *pMnode, STrans *pTrans); static void mndTransExecute(SMnode *pMnode, STrans *pTrans); static void mndTransSendRpcRsp(STrans *pTrans); -static int32_t mndProcessTransReq(SMnodeMsg *pMsg); +static int32_t mndProcessTransReq(SMnodeMsg *pReq); +static int32_t mndProcessKillTransReq(SMnodeMsg *pReq); static int32_t mndGetTransMeta(SMnodeMsg *pReq, SShowObj *pShow, STableMetaRsp *pMeta); static int32_t mndRetrieveTrans(SMnodeMsg *pReq, SShowObj *pShow, char *data, int32_t rows); @@ -70,6 +71,7 @@ int32_t mndInitTrans(SMnode *pMnode) { .deleteFp = (SdbDeleteFp)mndTransActionDelete}; mndSetMsgHandle(pMnode, TDMT_MND_TRANS, mndProcessTransReq); + mndSetMsgHandle(pMnode, TDMT_MND_TRANS, mndProcessKillTransReq); mndAddShowMetaHandle(pMnode, TSDB_MGMT_TABLE_TRANS, mndGetTransMeta); mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_TRANS, mndRetrieveTrans); @@ -1002,6 +1004,44 @@ static int32_t mndProcessTransReq(SMnodeMsg *pReq) { return 0; } +static int32_t mndProcessKillTransReq(SMnodeMsg *pReq) { + SMnode *pMnode = pReq->pMnode; + + SKillTransReq killReq = {0}; + if (tDeserializeSKillTransReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &killReq) != 0) { + terrno = TSDB_CODE_INVALID_MSG; + mError("trans:%d, failed to kill since %s", killReq.transId, terrstr()); + return -1; + } + + mInfo("trans:%d, start to kill", killReq.transId); + + SUserObj *pUser = mndAcquireUser(pMnode, pReq->user); + if (pUser == NULL) { + mError("trans:%d, failed to kill since %s", killReq.transId, terrstr()); + return -1; + } + + if (!pUser->superUser) { + mndReleaseUser(pMnode, pUser); + terrno = TSDB_CODE_MND_NO_RIGHTS; + mError("trans:%d, failed to kill since %s", killReq.transId, terrstr()); + return -1; + } + mndReleaseUser(pMnode, pUser); + + STrans *pTrans = mndAcquireTrans(pMnode, killReq.transId); + if (pTrans == NULL) { + terrno = TSDB_CODE_MND_TRANS_NOT_EXIST; + mError("trans:%d, failed to kill since %s", killReq.transId, terrstr()); + return -1; + } + + // mndTransDrop(pTrans); + mndReleaseTrans(pMnode, pTrans); + return 0; +} + void mndTransPullup(SMnode *pMnode) { STrans *pTrans = NULL; void *pIter = NULL; From 0f04c426d158c405d8a6335079d9a29b8f478f20 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Fri, 18 Feb 2022 10:47:58 +0800 Subject: [PATCH 13/17] kill trans --- include/util/taoserror.h | 1 + source/dnode/mnode/impl/inc/mndDef.h | 2 +- source/dnode/mnode/impl/src/mndTrans.c | 79 ++++++++++++++++++++------ source/util/src/terror.c | 1 + 4 files changed, 64 insertions(+), 19 deletions(-) diff --git a/include/util/taoserror.h b/include/util/taoserror.h index 0a822927ad..6f9bc35f2a 100644 --- a/include/util/taoserror.h +++ b/include/util/taoserror.h @@ -246,6 +246,7 @@ int32_t* taosGetErrno(); // mnode-trans #define TSDB_CODE_MND_TRANS_ALREADY_EXIST TAOS_DEF_ERROR_CODE(0, 0x03D0) #define TSDB_CODE_MND_TRANS_NOT_EXIST TAOS_DEF_ERROR_CODE(0, 0x03D1) +#define TSDB_CODE_MND_TRANS_INVALID_STAGE TAOS_DEF_ERROR_CODE(0, 0x03D2) // mnode-mq #define TSDB_CODE_MND_TOPIC_ALREADY_EXIST TAOS_DEF_ERROR_CODE(0, 0x03E0) diff --git a/source/dnode/mnode/impl/inc/mndDef.h b/source/dnode/mnode/impl/inc/mndDef.h index c26b027a88..dc475fb2e2 100644 --- a/source/dnode/mnode/impl/inc/mndDef.h +++ b/source/dnode/mnode/impl/inc/mndDef.h @@ -144,7 +144,7 @@ typedef struct { int32_t transType; uint64_t dbUid; char dbname[TSDB_DB_FNAME_LEN]; - char lastError[TSDB_TRANS_DESC_LEN]; + char lastError[TSDB_TRANS_ERROR_LEN]; } STrans; typedef struct { diff --git a/source/dnode/mnode/impl/src/mndTrans.c b/source/dnode/mnode/impl/src/mndTrans.c index 1670fffb8c..8c358c2e97 100644 --- a/source/dnode/mnode/impl/src/mndTrans.c +++ b/source/dnode/mnode/impl/src/mndTrans.c @@ -71,7 +71,7 @@ int32_t mndInitTrans(SMnode *pMnode) { .deleteFp = (SdbDeleteFp)mndTransActionDelete}; mndSetMsgHandle(pMnode, TDMT_MND_TRANS, mndProcessTransReq); - mndSetMsgHandle(pMnode, TDMT_MND_TRANS, mndProcessKillTransReq); + mndSetMsgHandle(pMnode, TDMT_MND_KILL_TRANS, mndProcessKillTransReq); mndAddShowMetaHandle(pMnode, TSDB_MGMT_TABLE_TRANS, mndGetTransMeta); mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_TRANS, mndRetrieveTrans); @@ -1004,42 +1004,85 @@ static int32_t mndProcessTransReq(SMnodeMsg *pReq) { return 0; } -static int32_t mndProcessKillTransReq(SMnodeMsg *pReq) { - SMnode *pMnode = pReq->pMnode; +static int32_t mndKillTrans(SMnode *pMnode, STrans *pTrans) { + SArray *pArray = NULL; + if (pTrans->stage == TRN_STAGE_REDO_ACTION) { + pArray = pTrans->redoActions; + } else if (pTrans->stage == TRN_STAGE_UNDO_ACTION) { + pArray = pTrans->undoActions; + } else { + terrno = TSDB_CODE_MND_TRANS_INVALID_STAGE; + return -1; + } + int32_t size = taosArrayGetSize(pArray); + + for (int32_t i = 0; i < size; ++i) { + STransAction *pAction = taosArrayGet(pArray, i); + if (pAction == NULL) continue; + + if (pAction->msgReceived == 0) { + mInfo("trans:%d, action:%d set processed", pTrans->id, i); + pAction->msgSent = 1; + pAction->msgReceived = 1; + pAction->errCode = 0; + } + + if (pAction->errCode != 0) { + mInfo("trans:%d, action:%d set processed, errCode from %s to success", pTrans->id, i, + tstrerror(pAction->errCode)); + pAction->msgSent = 1; + pAction->msgReceived = 1; + pAction->errCode = 0; + } + } + + mndTransExecute(pMnode, pTrans); + return 0; +} + +static int32_t mndProcessKillTransReq(SMnodeMsg *pReq) { + SMnode *pMnode = pReq->pMnode; SKillTransReq killReq = {0}; + int32_t code = -1; + SUserObj *pUser = NULL; + STrans *pTrans = NULL; + if (tDeserializeSKillTransReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &killReq) != 0) { terrno = TSDB_CODE_INVALID_MSG; - mError("trans:%d, failed to kill since %s", killReq.transId, terrstr()); - return -1; + goto KILL_OVER; } mInfo("trans:%d, start to kill", killReq.transId); - SUserObj *pUser = mndAcquireUser(pMnode, pReq->user); + pUser = mndAcquireUser(pMnode, pReq->user); if (pUser == NULL) { - mError("trans:%d, failed to kill since %s", killReq.transId, terrstr()); - return -1; + goto KILL_OVER; } if (!pUser->superUser) { - mndReleaseUser(pMnode, pUser); terrno = TSDB_CODE_MND_NO_RIGHTS; - mError("trans:%d, failed to kill since %s", killReq.transId, terrstr()); - return -1; + goto KILL_OVER; } - mndReleaseUser(pMnode, pUser); - STrans *pTrans = mndAcquireTrans(pMnode, killReq.transId); + pTrans = mndAcquireTrans(pMnode, killReq.transId); if (pTrans == NULL) { terrno = TSDB_CODE_MND_TRANS_NOT_EXIST; mError("trans:%d, failed to kill since %s", killReq.transId, terrstr()); return -1; } - // mndTransDrop(pTrans); + code = mndKillTrans(pMnode, pTrans); + if (code == 0) code = TSDB_CODE_MND_ACTION_IN_PROGRESS; + +KILL_OVER: + if (code != 0 && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) { + mError("trans:%d, failed to kill since %s", killReq.transId, terrstr()); + return -1; + } + mndReleaseTrans(pMnode, pTrans); - return 0; + return code; } void mndTransPullup(SMnode *pMnode) { @@ -1082,13 +1125,13 @@ static int32_t mndGetTransMeta(SMnodeMsg *pReq, SShowObj *pShow, STableMetaRsp * pSchema[cols].bytes = pShow->bytes[cols]; cols++; - pShow->bytes[cols] = TSDB_DB_NAME_LEN + VARSTR_HEADER_SIZE; + pShow->bytes[cols] = (TSDB_DB_NAME_LEN - 1) + VARSTR_HEADER_SIZE; pSchema[cols].type = TSDB_DATA_TYPE_BINARY; strcpy(pSchema[cols].name, "db"); pSchema[cols].bytes = pShow->bytes[cols]; cols++; - pShow->bytes[cols] = TSDB_TRANS_DESC_LEN + VARSTR_HEADER_SIZE; + pShow->bytes[cols] = (TSDB_TRANS_DESC_LEN - 1) + VARSTR_HEADER_SIZE; pSchema[cols].type = TSDB_DATA_TYPE_BINARY; strcpy(pSchema[cols].name, "type"); pSchema[cols].bytes = pShow->bytes[cols]; @@ -1100,7 +1143,7 @@ static int32_t mndGetTransMeta(SMnodeMsg *pReq, SShowObj *pShow, STableMetaRsp * pSchema[cols].bytes = pShow->bytes[cols]; cols++; - pShow->bytes[cols] = TSDB_TRANS_ERROR_LEN + VARSTR_HEADER_SIZE; + pShow->bytes[cols] = (TSDB_TRANS_ERROR_LEN - 1) + VARSTR_HEADER_SIZE; pSchema[cols].type = TSDB_DATA_TYPE_BINARY; strcpy(pSchema[cols].name, "last_error"); pSchema[cols].bytes = pShow->bytes[cols]; diff --git a/source/util/src/terror.c b/source/util/src/terror.c index 70608e117e..f4ee13c067 100644 --- a/source/util/src/terror.c +++ b/source/util/src/terror.c @@ -256,6 +256,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_FUNC_RETRIEVE, "Invalid func retriev // mnode-trans TAOS_DEFINE_ERROR(TSDB_CODE_MND_TRANS_ALREADY_EXIST, "Transaction already exists") TAOS_DEFINE_ERROR(TSDB_CODE_MND_TRANS_NOT_EXIST, "Transaction not exists") +TAOS_DEFINE_ERROR(TSDB_CODE_MND_TRANS_INVALID_STAGE, "Invalid stage to kill") // mnode-topic TAOS_DEFINE_ERROR(TSDB_CODE_MND_UNSUPPORTED_TOPIC, "Topic with STable not supported yet") From 314116ae1161930702d2a4cf2d1e97806a4f4189 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Fri, 18 Feb 2022 11:47:38 +0800 Subject: [PATCH 14/17] minor changes --- source/dnode/mnode/impl/inc/mndDef.h | 2 +- source/dnode/mnode/impl/inc/mndTrans.h | 3 +- source/dnode/mnode/impl/src/mndTrans.c | 45 +++++++++++++++----------- 3 files changed, 30 insertions(+), 20 deletions(-) diff --git a/source/dnode/mnode/impl/inc/mndDef.h b/source/dnode/mnode/impl/inc/mndDef.h index dc475fb2e2..c3c9536f50 100644 --- a/source/dnode/mnode/impl/inc/mndDef.h +++ b/source/dnode/mnode/impl/inc/mndDef.h @@ -128,6 +128,7 @@ typedef struct { int32_t id; ETrnStage stage; ETrnPolicy policy; + ETrnType transType; int32_t code; int32_t failedTimes; void* rpcHandle; @@ -141,7 +142,6 @@ typedef struct { SArray* undoActions; int64_t createdTime; int64_t lastExecTime; - int32_t transType; uint64_t dbUid; char dbname[TSDB_DB_FNAME_LEN]; char lastError[TSDB_TRANS_ERROR_LEN]; diff --git a/source/dnode/mnode/impl/inc/mndTrans.h b/source/dnode/mnode/impl/inc/mndTrans.h index f1a213790c..a0218eaf65 100644 --- a/source/dnode/mnode/impl/inc/mndTrans.h +++ b/source/dnode/mnode/impl/inc/mndTrans.h @@ -36,7 +36,7 @@ typedef struct { int32_t mndInitTrans(SMnode *pMnode); void mndCleanupTrans(SMnode *pMnode); -STrans *mndTransCreate(SMnode *pMnode, ETrnPolicy policy, const SRpcMsg *pReq); +STrans *mndTransCreate(SMnode *pMnode, ETrnPolicy policy, ETrnType type, const SRpcMsg *pReq); void mndTransDrop(STrans *pTrans); int32_t mndTransAppendRedolog(STrans *pTrans, SSdbRaw *pRaw); int32_t mndTransAppendUndolog(STrans *pTrans, SSdbRaw *pRaw); @@ -44,6 +44,7 @@ int32_t mndTransAppendCommitlog(STrans *pTrans, SSdbRaw *pRaw); int32_t mndTransAppendRedoAction(STrans *pTrans, STransAction *pAction); int32_t mndTransAppendUndoAction(STrans *pTrans, STransAction *pAction); void mndTransSetRpcRsp(STrans *pTrans, void *pCont, int32_t contLen); +void mndTransSetDbInfo(STrans *pTrans, SDbObj *pDb); int32_t mndTransPrepare(SMnode *pMnode, STrans *pTrans); void mndTransProcessRsp(SMnodeMsg *pRsp); diff --git a/source/dnode/mnode/impl/src/mndTrans.c b/source/dnode/mnode/impl/src/mndTrans.c index 8c358c2e97..b5d61ca553 100644 --- a/source/dnode/mnode/impl/src/mndTrans.c +++ b/source/dnode/mnode/impl/src/mndTrans.c @@ -124,10 +124,10 @@ static SSdbRaw *mndTransActionEncode(STrans *pTrans) { int32_t dataPos = 0; SDB_SET_INT32(pRaw, dataPos, pTrans->id, TRANS_ENCODE_OVER) - SDB_SET_INT8(pRaw, dataPos, pTrans->policy, TRANS_ENCODE_OVER) - SDB_SET_INT8(pRaw, dataPos, pTrans->stage, TRANS_ENCODE_OVER) + SDB_SET_INT16(pRaw, dataPos, pTrans->policy, TRANS_ENCODE_OVER) + SDB_SET_INT16(pRaw, dataPos, pTrans->stage, TRANS_ENCODE_OVER) + SDB_SET_INT16(pRaw, dataPos, pTrans->transType, TRANS_ENCODE_OVER) SDB_SET_INT64(pRaw, dataPos, pTrans->createdTime, TRANS_ENCODE_OVER) - SDB_SET_INT32(pRaw, dataPos, pTrans->transType, TRANS_ENCODE_OVER) SDB_SET_INT64(pRaw, dataPos, pTrans->dbUid, TRANS_ENCODE_OVER) SDB_SET_BINARY(pRaw, dataPos, pTrans->dbname, TSDB_DB_FNAME_LEN, TRANS_ENCODE_OVER) SDB_SET_INT32(pRaw, dataPos, redoLogNum, TRANS_ENCODE_OVER) @@ -220,23 +220,19 @@ static SSdbRow *mndTransActionDecode(SSdbRaw *pRaw) { pTrans = sdbGetRowObj(pRow); if (pTrans == NULL) goto TRANS_DECODE_OVER; - pTrans->redoLogs = taosArrayInit(MND_TRANS_ARRAY_SIZE, sizeof(void *)); - pTrans->undoLogs = taosArrayInit(MND_TRANS_ARRAY_SIZE, sizeof(void *)); - pTrans->commitLogs = taosArrayInit(MND_TRANS_ARRAY_SIZE, sizeof(void *)); - pTrans->redoActions = taosArrayInit(MND_TRANS_ARRAY_SIZE, sizeof(STransAction)); - pTrans->undoActions = taosArrayInit(MND_TRANS_ARRAY_SIZE, sizeof(STransAction)); - - if (pTrans->redoLogs == NULL) goto TRANS_DECODE_OVER; - if (pTrans->undoLogs == NULL) goto TRANS_DECODE_OVER; - if (pTrans->commitLogs == NULL) goto TRANS_DECODE_OVER; - if (pTrans->redoActions == NULL) goto TRANS_DECODE_OVER; - if (pTrans->undoActions == NULL) goto TRANS_DECODE_OVER; SDB_GET_INT32(pRaw, dataPos, &pTrans->id, TRANS_DECODE_OVER) - SDB_GET_INT8(pRaw, dataPos, (int8_t *)&pTrans->policy, TRANS_DECODE_OVER) - SDB_GET_INT8(pRaw, dataPos, (int8_t *)&pTrans->stage, TRANS_DECODE_OVER) + + int16_t type = 0; + int16_t policy = 0; + int16_t stage = 0; + SDB_GET_INT16(pRaw, dataPos, &policy, TRANS_DECODE_OVER) + SDB_GET_INT16(pRaw, dataPos, &stage, TRANS_DECODE_OVER) + SDB_GET_INT16(pRaw, dataPos, &type, TRANS_DECODE_OVER) + pTrans->policy = policy; + pTrans->stage = stage; + pTrans->transType = type; SDB_GET_INT64(pRaw, dataPos, &pTrans->createdTime, TRANS_DECODE_OVER) - SDB_GET_INT32(pRaw, dataPos, &pTrans->transType, TRANS_DECODE_OVER) SDB_GET_INT64(pRaw, dataPos, &pTrans->dbUid, TRANS_DECODE_OVER) SDB_GET_BINARY(pRaw, dataPos, pTrans->dbname, TSDB_DB_FNAME_LEN, TRANS_DECODE_OVER) SDB_GET_INT32(pRaw, dataPos, &redoLogNum, TRANS_DECODE_OVER) @@ -245,6 +241,18 @@ static SSdbRow *mndTransActionDecode(SSdbRaw *pRaw) { SDB_GET_INT32(pRaw, dataPos, &redoActionNum, TRANS_DECODE_OVER) SDB_GET_INT32(pRaw, dataPos, &undoActionNum, TRANS_DECODE_OVER) + pTrans->redoLogs = taosArrayInit(redoLogNum, sizeof(void *)); + pTrans->undoLogs = taosArrayInit(undoLogNum, sizeof(void *)); + pTrans->commitLogs = taosArrayInit(commitLogNum, sizeof(void *)); + pTrans->redoActions = taosArrayInit(redoActionNum, sizeof(STransAction)); + pTrans->undoActions = taosArrayInit(undoActionNum, sizeof(STransAction)); + + if (pTrans->redoLogs == NULL) goto TRANS_DECODE_OVER; + if (pTrans->undoLogs == NULL) goto TRANS_DECODE_OVER; + if (pTrans->commitLogs == NULL) goto TRANS_DECODE_OVER; + if (pTrans->redoActions == NULL) goto TRANS_DECODE_OVER; + if (pTrans->undoActions == NULL) goto TRANS_DECODE_OVER; + for (int32_t i = 0; i < redoLogNum; ++i) { SDB_GET_INT32(pRaw, dataPos, &dataLen, TRANS_DECODE_OVER) pData = malloc(dataLen); @@ -402,7 +410,7 @@ static void mndReleaseTrans(SMnode *pMnode, STrans *pTrans) { sdbRelease(pSdb, pTrans); } -STrans *mndTransCreate(SMnode *pMnode, ETrnPolicy policy, const SRpcMsg *pReq) { +STrans *mndTransCreate(SMnode *pMnode, ETrnPolicy policy, ETrnType type, const SRpcMsg *pReq) { STrans *pTrans = calloc(1, sizeof(STrans)); if (pTrans == NULL) { terrno = TSDB_CODE_OUT_OF_MEMORY; @@ -413,6 +421,7 @@ STrans *mndTransCreate(SMnode *pMnode, ETrnPolicy policy, const SRpcMsg *pReq) { pTrans->id = sdbGetMaxId(pMnode->pSdb, SDB_TRANS); pTrans->stage = TRN_STAGE_PREPARE; pTrans->policy = policy; + pTrans->transType = type; pTrans->rpcHandle = pReq->handle; pTrans->rpcAHandle = pReq->ahandle; pTrans->redoLogs = taosArrayInit(MND_TRANS_ARRAY_SIZE, sizeof(void *)); From 11c79d1b88f2ae97a3ff7c28b3d2eaf950d9b0cf Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Fri, 18 Feb 2022 11:49:15 +0800 Subject: [PATCH 15/17] set trans type --- source/dnode/mnode/impl/inc/mndDef.h | 29 +++++++++++++++++++++- source/dnode/mnode/impl/src/mndBnode.c | 6 ++--- source/dnode/mnode/impl/src/mndDb.c | 8 +++--- source/dnode/mnode/impl/src/mndDnode.c | 4 +-- source/dnode/mnode/impl/src/mndFunc.c | 6 ++--- source/dnode/mnode/impl/src/mndMnode.c | 6 ++--- source/dnode/mnode/impl/src/mndQnode.c | 4 +-- source/dnode/mnode/impl/src/mndSnode.c | 6 ++--- source/dnode/mnode/impl/src/mndStb.c | 6 ++--- source/dnode/mnode/impl/src/mndSubscribe.c | 6 ++--- source/dnode/mnode/impl/src/mndTopic.c | 4 +-- source/dnode/mnode/impl/src/mndUser.c | 6 ++--- 12 files changed, 59 insertions(+), 32 deletions(-) diff --git a/source/dnode/mnode/impl/inc/mndDef.h b/source/dnode/mnode/impl/inc/mndDef.h index c3c9536f50..53b5846ddc 100644 --- a/source/dnode/mnode/impl/inc/mndDef.h +++ b/source/dnode/mnode/impl/inc/mndDef.h @@ -105,7 +105,34 @@ typedef enum { } ETrnStage; typedef enum { - TRN_TYPE_CREATE_DB = 0, + TRN_TYPE_START = 0, + TRN_TYPE_CREATE_MNODE = 1, + TRN_TYPE_DROP_MNODE = 2, + TRN_TYPE_CREATE_DNODE = 3, + TRN_TYPE_DROP_DNODE = 4, + TRN_TYPE_CREATE_SNODE = 5, + TRN_TYPE_DROP_SNODE = 6, + TRN_TYPE_CREATE_QNODE = 7, + TRN_TYPE_DROP_QNODE = 8, + TRN_TYPE_CREATE_BNODE = 9, + TRN_TYPE_DROP_BNODE = 10, + TRN_TYPE_DB_START = 1000, + TRN_TYPE_CREATE_DB = 1001, + TRN_TYPE_ALTER_DB = 1002, + TRN_TYPE_DROP_DB = 1003, + TRN_TYPE_CREATE_FUNC = 1004, + TRN_TYPE_DROP_FUNC = 1005, + TRN_TYPE_CREATE_STB = 1006, + TRN_TYPE_ALTER_STB = 1007, + TRN_TYPE_DROP_STB = 1008, + TRN_TYPE_CREATE_TOPIC = 1009, + TRN_TYPE_DROP_TOPIC = 1010, + TRN_TYPE_CREATE_USER = 1011, + TRN_TYPE_ALTER_USER = 1012, + TRN_TYPE_DROP_USER = 1013, + TRN_TYPE_SUBSCRIBE = 1014, + TRN_TYPE_REBALANCE = 1015, + TRN_TYPE_MAX, } ETrnType; typedef enum { TRN_POLICY_ROLLBACK = 0, TRN_POLICY_RETRY = 1 } ETrnPolicy; diff --git a/source/dnode/mnode/impl/src/mndBnode.c b/source/dnode/mnode/impl/src/mndBnode.c index fd029212f5..a992135464 100644 --- a/source/dnode/mnode/impl/src/mndBnode.c +++ b/source/dnode/mnode/impl/src/mndBnode.c @@ -21,7 +21,7 @@ #include "mndTrans.h" #include "mndUser.h" -#define TSDB_BNODE_VER_NUMBER 1 +#define TSDB_BNODE_VER_NUMBER 1 #define TSDB_BNODE_RESERVE_SIZE 64 static SSdbRaw *mndBnodeActionEncode(SBnodeObj *pObj); @@ -248,7 +248,7 @@ static int32_t mndCreateBnode(SMnode *pMnode, SMnodeMsg *pReq, SDnodeObj *pDnode bnodeObj.createdTime = taosGetTimestampMs(); bnodeObj.updateTime = bnodeObj.createdTime; - STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, &pReq->rpcMsg); + STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, TRN_TYPE_CREATE_BNODE, &pReq->rpcMsg); if (pTrans == NULL) goto CREATE_BNODE_OVER; mDebug("trans:%d, used to create bnode:%d", pTrans->id, pCreate->dnodeId); @@ -366,7 +366,7 @@ static int32_t mndSetDropBnodeRedoActions(STrans *pTrans, SDnodeObj *pDnode, SBn static int32_t mndDropBnode(SMnode *pMnode, SMnodeMsg *pReq, SBnodeObj *pObj) { int32_t code = -1; - STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, &pReq->rpcMsg); + STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_TYPE_DROP_BNODE, &pReq->rpcMsg); if (pTrans == NULL) goto DROP_BNODE_OVER; mDebug("trans:%d, used to drop bnode:%d", pTrans->id, pObj->id); diff --git a/source/dnode/mnode/impl/src/mndDb.c b/source/dnode/mnode/impl/src/mndDb.c index eb5f39e983..5b70312305 100644 --- a/source/dnode/mnode/impl/src/mndDb.c +++ b/source/dnode/mnode/impl/src/mndDb.c @@ -23,7 +23,7 @@ #include "mndUser.h" #include "mndVgroup.h" -#define TSDB_DB_VER_NUMBER 1 +#define TSDB_DB_VER_NUMBER 1 #define TSDB_DB_RESERVE_SIZE 64 static SSdbRaw *mndDbActionEncode(SDbObj *pDb); @@ -434,7 +434,7 @@ static int32_t mndCreateDb(SMnode *pMnode, SMnodeMsg *pReq, SCreateDbReq *pCreat } int32_t code = -1; - STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, &pReq->rpcMsg); + STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, TRN_TYPE_CREATE_DB, &pReq->rpcMsg); if (pTrans == NULL) goto CREATE_DB_OVER; mDebug("trans:%d, used to create db:%s", pTrans->id, pCreate->db); @@ -620,7 +620,7 @@ static int32_t mndSetUpdateDbRedoActions(SMnode *pMnode, STrans *pTrans, SDbObj static int32_t mndUpdateDb(SMnode *pMnode, SMnodeMsg *pReq, SDbObj *pOld, SDbObj *pNew) { int32_t code = -1; - STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, &pReq->rpcMsg); + STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_TYPE_ALTER_DB, &pReq->rpcMsg); if (pTrans == NULL) goto UPDATE_DB_OVER; mDebug("trans:%d, used to update db:%s", pTrans->id, pOld->name); @@ -799,7 +799,7 @@ static int32_t mndSetDropDbRedoActions(SMnode *pMnode, STrans *pTrans, SDbObj *p static int32_t mndDropDb(SMnode *pMnode, SMnodeMsg *pReq, SDbObj *pDb) { int32_t code = -1; - STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, &pReq->rpcMsg); + STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_TYPE_DROP_DB, &pReq->rpcMsg); if (pTrans == NULL) goto DROP_DB_OVER; mDebug("trans:%d, used to drop db:%s", pTrans->id, pDb->name); diff --git a/source/dnode/mnode/impl/src/mndDnode.c b/source/dnode/mnode/impl/src/mndDnode.c index 6d0b8e7c8d..39ea4b482c 100644 --- a/source/dnode/mnode/impl/src/mndDnode.c +++ b/source/dnode/mnode/impl/src/mndDnode.c @@ -440,7 +440,7 @@ static int32_t mndCreateDnode(SMnode *pMnode, SMnodeMsg *pReq, SCreateDnodeReq * memcpy(dnodeObj.fqdn, pCreate->fqdn, TSDB_FQDN_LEN); snprintf(dnodeObj.ep, TSDB_EP_LEN, "%s:%u", dnodeObj.fqdn, dnodeObj.port); - STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, &pReq->rpcMsg); + STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, TRN_TYPE_CREATE_DNODE, &pReq->rpcMsg); if (pTrans == NULL) { mError("dnode:%s, failed to create since %s", dnodeObj.ep, terrstr()); return -1; @@ -516,7 +516,7 @@ CREATE_DNODE_OVER: } static int32_t mndDropDnode(SMnode *pMnode, SMnodeMsg *pReq, SDnodeObj *pDnode) { - STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, &pReq->rpcMsg); + STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, TRN_TYPE_DROP_DNODE, &pReq->rpcMsg); if (pTrans == NULL) { mError("dnode:%d, failed to drop since %s", pDnode->id, terrstr()); return -1; diff --git a/source/dnode/mnode/impl/src/mndFunc.c b/source/dnode/mnode/impl/src/mndFunc.c index 9dbb0fc2d0..b2daf848c5 100644 --- a/source/dnode/mnode/impl/src/mndFunc.c +++ b/source/dnode/mnode/impl/src/mndFunc.c @@ -21,7 +21,7 @@ #include "mndTrans.h" #include "mndUser.h" -#define SDB_FUNC_VER 1 +#define SDB_FUNC_VER 1 #define SDB_FUNC_RESERVE_SIZE 64 static SSdbRaw *mndFuncActionEncode(SFuncObj *pFunc); @@ -206,7 +206,7 @@ static int32_t mndCreateFunc(SMnode *pMnode, SMnodeMsg *pReq, SCreateFuncReq *pC memcpy(func.pComment, pCreate->pComment, pCreate->commentSize); memcpy(func.pCode, pCreate->pCode, func.codeSize); - pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, &pReq->rpcMsg); + pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, TRN_TYPE_CREATE_FUNC, &pReq->rpcMsg); if (pTrans == NULL) goto CREATE_FUNC_OVER; mDebug("trans:%d, used to create func:%s", pTrans->id, pCreate->name); @@ -236,7 +236,7 @@ CREATE_FUNC_OVER: static int32_t mndDropFunc(SMnode *pMnode, SMnodeMsg *pReq, SFuncObj *pFunc) { int32_t code = -1; - STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, &pReq->rpcMsg); + STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, TRN_TYPE_DROP_FUNC, &pReq->rpcMsg); if (pTrans == NULL) goto DROP_FUNC_OVER; mDebug("trans:%d, used to drop user:%s", pTrans->id, pFunc->name); diff --git a/source/dnode/mnode/impl/src/mndMnode.c b/source/dnode/mnode/impl/src/mndMnode.c index 720dc1b535..cbb31bc504 100644 --- a/source/dnode/mnode/impl/src/mndMnode.c +++ b/source/dnode/mnode/impl/src/mndMnode.c @@ -21,7 +21,7 @@ #include "mndTrans.h" #include "mndUser.h" -#define TSDB_MNODE_VER_NUMBER 1 +#define TSDB_MNODE_VER_NUMBER 1 #define TSDB_MNODE_RESERVE_SIZE 64 static int32_t mndCreateDefaultMnode(SMnode *pMnode); @@ -359,7 +359,7 @@ static int32_t mndCreateMnode(SMnode *pMnode, SMnodeMsg *pReq, SDnodeObj *pDnode mnodeObj.createdTime = taosGetTimestampMs(); mnodeObj.updateTime = mnodeObj.createdTime; - STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, &pReq->rpcMsg); + STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_TYPE_CREATE_MNODE, &pReq->rpcMsg); if (pTrans == NULL) goto CREATE_MNODE_OVER; mDebug("trans:%d, used to create mnode:%d", pTrans->id, pCreate->dnodeId); @@ -526,7 +526,7 @@ static int32_t mndSetDropMnodeRedoActions(SMnode *pMnode, STrans *pTrans, SDnode static int32_t mndDropMnode(SMnode *pMnode, SMnodeMsg *pReq, SMnodeObj *pObj) { int32_t code = -1; - STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, &pReq->rpcMsg); + STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_TYPE_DROP_MNODE, &pReq->rpcMsg); if (pTrans == NULL) goto DROP_MNODE_OVER; mDebug("trans:%d, used to drop mnode:%d", pTrans->id, pObj->id); diff --git a/source/dnode/mnode/impl/src/mndQnode.c b/source/dnode/mnode/impl/src/mndQnode.c index f1335ad7e4..0c227b0db9 100644 --- a/source/dnode/mnode/impl/src/mndQnode.c +++ b/source/dnode/mnode/impl/src/mndQnode.c @@ -248,7 +248,7 @@ static int32_t mndCreateQnode(SMnode *pMnode, SMnodeMsg *pReq, SDnodeObj *pDnode qnodeObj.createdTime = taosGetTimestampMs(); qnodeObj.updateTime = qnodeObj.createdTime; - STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, &pReq->rpcMsg); + STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, TRN_TYPE_CREATE_QNODE, &pReq->rpcMsg); if (pTrans == NULL) goto CREATE_QNODE_OVER; mDebug("trans:%d, used to create qnode:%d", pTrans->id, pCreate->dnodeId); @@ -366,7 +366,7 @@ static int32_t mndSetDropQnodeRedoActions(STrans *pTrans, SDnodeObj *pDnode, SQn static int32_t mndDropQnode(SMnode *pMnode, SMnodeMsg *pReq, SQnodeObj *pObj) { int32_t code = -1; - STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, &pReq->rpcMsg); + STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_TYPE_DROP_QNODE, &pReq->rpcMsg); if (pTrans == NULL) goto DROP_QNODE_OVER; mDebug("trans:%d, used to drop qnode:%d", pTrans->id, pObj->id); diff --git a/source/dnode/mnode/impl/src/mndSnode.c b/source/dnode/mnode/impl/src/mndSnode.c index 5904ca0502..6040aa088c 100644 --- a/source/dnode/mnode/impl/src/mndSnode.c +++ b/source/dnode/mnode/impl/src/mndSnode.c @@ -21,7 +21,7 @@ #include "mndTrans.h" #include "mndUser.h" -#define TSDB_SNODE_VER_NUMBER 1 +#define TSDB_SNODE_VER_NUMBER 1 #define TSDB_SNODE_RESERVE_SIZE 64 static SSdbRaw *mndSnodeActionEncode(SSnodeObj *pObj); @@ -248,7 +248,7 @@ static int32_t mndCreateSnode(SMnode *pMnode, SMnodeMsg *pReq, SDnodeObj *pDnode snodeObj.createdTime = taosGetTimestampMs(); snodeObj.updateTime = snodeObj.createdTime; - STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, &pReq->rpcMsg); + STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, TRN_TYPE_CREATE_SNODE, &pReq->rpcMsg); if (pTrans == NULL) goto CREATE_SNODE_OVER; mDebug("trans:%d, used to create snode:%d", pTrans->id, pCreate->dnodeId); @@ -368,7 +368,7 @@ static int32_t mndSetDropSnodeRedoActions(STrans *pTrans, SDnodeObj *pDnode, SSn static int32_t mndDropSnode(SMnode *pMnode, SMnodeMsg *pReq, SSnodeObj *pObj) { int32_t code = -1; - STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, &pReq->rpcMsg); + STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_TYPE_DROP_SNODE, &pReq->rpcMsg); if (pTrans == NULL) goto DROP_SNODE_OVER; mDebug("trans:%d, used to drop snode:%d", pTrans->id, pObj->id); diff --git a/source/dnode/mnode/impl/src/mndStb.c b/source/dnode/mnode/impl/src/mndStb.c index c5b18bcde0..477719d8be 100644 --- a/source/dnode/mnode/impl/src/mndStb.c +++ b/source/dnode/mnode/impl/src/mndStb.c @@ -530,7 +530,7 @@ static int32_t mndCreateStb(SMnode *pMnode, SMnodeMsg *pReq, SMCreateStbReq *pCr } int32_t code = -1; - STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, &pReq->rpcMsg); + STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, TRN_TYPE_CREATE_STB, &pReq->rpcMsg); if (pTrans == NULL) goto CREATE_STB_OVER; mDebug("trans:%d, used to create stb:%s", pTrans->id, pCreate->name); @@ -1021,7 +1021,7 @@ static int32_t mndAlterStb(SMnode *pMnode, SMnodeMsg *pReq, const SMAltertbReq * if (code != 0) goto ALTER_STB_OVER; code = -1; - pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, &pReq->rpcMsg); + pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_TYPE_ALTER_STB, &pReq->rpcMsg); if (pTrans == NULL) goto ALTER_STB_OVER; mDebug("trans:%d, used to alter stb:%s", pTrans->id, pAlter->name); @@ -1159,7 +1159,7 @@ static int32_t mndSetDropStbRedoActions(SMnode *pMnode, STrans *pTrans, SDbObj * static int32_t mndDropStb(SMnode *pMnode, SMnodeMsg *pReq, SDbObj *pDb, SStbObj *pStb) { int32_t code = -1; - STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, &pReq->rpcMsg); + STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK,TRN_TYPE_DROP_STB, &pReq->rpcMsg); if (pTrans == NULL) goto DROP_STB_OVER; mDebug("trans:%d, used to drop stb:%s", pTrans->id, pStb->name); diff --git a/source/dnode/mnode/impl/src/mndSubscribe.c b/source/dnode/mnode/impl/src/mndSubscribe.c index ceb31149ca..6169aaa78a 100644 --- a/source/dnode/mnode/impl/src/mndSubscribe.c +++ b/source/dnode/mnode/impl/src/mndSubscribe.c @@ -369,8 +369,8 @@ static int32_t mndProcessMqTimerMsg(SMnodeMsg *pMsg) { static int32_t mndProcessDoRebalanceMsg(SMnodeMsg *pMsg) { SMnode *pMnode = pMsg->pMnode; - SMqDoRebalanceMsg *pReq = (SMqDoRebalanceMsg *)pMsg->rpcMsg.pCont; - STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, &pMsg->rpcMsg); + SMqDoRebalanceMsg *pReq = pMsg->rpcMsg.pCont; + STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_TYPE_REBALANCE, &pMsg->rpcMsg); void *pIter = NULL; mInfo("mq rebalance start"); @@ -969,7 +969,7 @@ static int32_t mndProcessSubscribeReq(SMnodeMsg *pMsg) { oldTopicNum = taosArrayGetSize(oldSub); } - STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, &pMsg->rpcMsg); + STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_TYPE_SUBSCRIBE, &pMsg->rpcMsg); if (pTrans == NULL) { // TODO: free memory return -1; diff --git a/source/dnode/mnode/impl/src/mndTopic.c b/source/dnode/mnode/impl/src/mndTopic.c index deac89d68a..d2318009d5 100644 --- a/source/dnode/mnode/impl/src/mndTopic.c +++ b/source/dnode/mnode/impl/src/mndTopic.c @@ -252,7 +252,7 @@ static int32_t mndCreateTopic(SMnode *pMnode, SMnodeMsg *pReq, SMCreateTopicReq topicObj.logicalPlan = pCreate->logicalPlan; topicObj.sqlLen = strlen(pCreate->sql); - STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, &pReq->rpcMsg); + STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, TRN_TYPE_CREATE_TOPIC, &pReq->rpcMsg); if (pTrans == NULL) { mError("topic:%s, failed to create since %s", pCreate->name, terrstr()); return -1; @@ -343,7 +343,7 @@ CREATE_TOPIC_OVER: } static int32_t mndDropTopic(SMnode *pMnode, SMnodeMsg *pReq, SMqTopicObj *pTopic) { - STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, &pReq->rpcMsg); + STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, TRN_TYPE_DROP_TOPIC, &pReq->rpcMsg); if (pTrans == NULL) { mError("topic:%s, failed to drop since %s", pTopic->name, terrstr()); return -1; diff --git a/source/dnode/mnode/impl/src/mndUser.c b/source/dnode/mnode/impl/src/mndUser.c index e40f76daa1..7cdae79c0d 100644 --- a/source/dnode/mnode/impl/src/mndUser.c +++ b/source/dnode/mnode/impl/src/mndUser.c @@ -270,7 +270,7 @@ static int32_t mndCreateUser(SMnode *pMnode, char *acct, SCreateUserReq *pCreate userObj.updateTime = userObj.createdTime; userObj.superUser = pCreate->superUser; - STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, &pReq->rpcMsg); + STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK,TRN_TYPE_CREATE_USER, &pReq->rpcMsg); if (pTrans == NULL) { mError("user:%s, failed to create since %s", pCreate->user, terrstr()); return -1; @@ -350,7 +350,7 @@ CREATE_USER_OVER: } static int32_t mndUpdateUser(SMnode *pMnode, SUserObj *pOld, SUserObj *pNew, SMnodeMsg *pReq) { - STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, &pReq->rpcMsg); + STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, TRN_TYPE_ALTER_USER,&pReq->rpcMsg); if (pTrans == NULL) { mError("user:%s, failed to update since %s", pOld->user, terrstr()); return -1; @@ -511,7 +511,7 @@ ALTER_USER_OVER: } static int32_t mndDropUser(SMnode *pMnode, SMnodeMsg *pReq, SUserObj *pUser) { - STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, &pReq->rpcMsg); + STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK,TRN_TYPE_DROP_USER, &pReq->rpcMsg); if (pTrans == NULL) { mError("user:%s, failed to drop since %s", pUser->user, terrstr()); return -1; From ebd862ded4b05a840f4520208379a47bb5939f61 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Fri, 18 Feb 2022 13:34:55 +0800 Subject: [PATCH 16/17] trans type --- source/dnode/mnode/impl/inc/mndDb.h | 1 + source/dnode/mnode/impl/inc/mndDef.h | 57 ++++++++++++++------------ source/dnode/mnode/impl/src/mndDb.c | 3 ++ source/dnode/mnode/impl/src/mndStb.c | 3 ++ source/dnode/mnode/impl/src/mndTrans.c | 13 +++++- 5 files changed, 50 insertions(+), 27 deletions(-) diff --git a/source/dnode/mnode/impl/inc/mndDb.h b/source/dnode/mnode/impl/inc/mndDb.h index b6264e6db9..125b0d3191 100644 --- a/source/dnode/mnode/impl/inc/mndDb.h +++ b/source/dnode/mnode/impl/inc/mndDb.h @@ -27,6 +27,7 @@ void mndCleanupDb(SMnode *pMnode); SDbObj *mndAcquireDb(SMnode *pMnode, const char *db); void mndReleaseDb(SMnode *pMnode, SDbObj *pDb); int32_t mndValidateDbInfo(SMnode *pMnode, SDbVgVersion *pDbs, int32_t numOfDbs, void **ppRsp, int32_t *pRspLen); +char *mnGetDbStr(char *src); #ifdef __cplusplus } diff --git a/source/dnode/mnode/impl/inc/mndDef.h b/source/dnode/mnode/impl/inc/mndDef.h index 53b5846ddc..a092882e1f 100644 --- a/source/dnode/mnode/impl/inc/mndDef.h +++ b/source/dnode/mnode/impl/inc/mndDef.h @@ -105,34 +105,39 @@ typedef enum { } ETrnStage; typedef enum { - TRN_TYPE_START = 0, - TRN_TYPE_CREATE_MNODE = 1, - TRN_TYPE_DROP_MNODE = 2, - TRN_TYPE_CREATE_DNODE = 3, - TRN_TYPE_DROP_DNODE = 4, - TRN_TYPE_CREATE_SNODE = 5, - TRN_TYPE_DROP_SNODE = 6, - TRN_TYPE_CREATE_QNODE = 7, - TRN_TYPE_DROP_QNODE = 8, - TRN_TYPE_CREATE_BNODE = 9, - TRN_TYPE_DROP_BNODE = 10, - TRN_TYPE_DB_START = 1000, - TRN_TYPE_CREATE_DB = 1001, - TRN_TYPE_ALTER_DB = 1002, - TRN_TYPE_DROP_DB = 1003, + TRN_TYPE_BASIC_SCOPE = 1000, + TRN_TYPE_CREATE_USER = 1001, + TRN_TYPE_ALTER_USER = 1002, + TRN_TYPE_DROP_USER = 1003, TRN_TYPE_CREATE_FUNC = 1004, TRN_TYPE_DROP_FUNC = 1005, - TRN_TYPE_CREATE_STB = 1006, - TRN_TYPE_ALTER_STB = 1007, - TRN_TYPE_DROP_STB = 1008, - TRN_TYPE_CREATE_TOPIC = 1009, - TRN_TYPE_DROP_TOPIC = 1010, - TRN_TYPE_CREATE_USER = 1011, - TRN_TYPE_ALTER_USER = 1012, - TRN_TYPE_DROP_USER = 1013, - TRN_TYPE_SUBSCRIBE = 1014, - TRN_TYPE_REBALANCE = 1015, - TRN_TYPE_MAX, + TRN_TYPE_CREATE_SNODE = 1006, + TRN_TYPE_DROP_SNODE = 1007, + TRN_TYPE_CREATE_QNODE = 1008, + TRN_TYPE_DROP_QNODE = 1009, + TRN_TYPE_CREATE_BNODE = 1010, + TRN_TYPE_DROP_BNODE = 1011, + TRN_TYPE_CREATE_MNODE = 1012, + TRN_TYPE_DROP_MNODE = 1013, + TRN_TYPE_CREATE_TOPIC = 1014, + TRN_TYPE_DROP_TOPIC = 1015, + TRN_TYPE_SUBSCRIBE = 1016, + TRN_TYPE_REBALANCE = 1017, + TRN_TYPE_BASIC_SCOPE_END, + TRN_TYPE_GLOBAL_SCOPE = 2000, + TRN_TYPE_CREATE_DNODE = 2001, + TRN_TYPE_DROP_DNODE = 2002, + TRN_TYPE_GLOBAL_SCOPE_END, + TRN_TYPE_DB_SCOPE = 3000, + TRN_TYPE_CREATE_DB = 3001, + TRN_TYPE_ALTER_DB = 3002, + TRN_TYPE_DROP_DB = 3003, + TRN_TYPE_CREATE_STB = 3004, + TRN_TYPE_ALTER_STB = 3005, + TRN_TYPE_DROP_STB = 3006, + TRN_TYPE_SPLIT_VGROUP = 3007, + TRN_TYPE_MERGE_VGROUP = 3018, + TRN_TYPE_DB_SCOPE_END, } ETrnType; typedef enum { TRN_POLICY_ROLLBACK = 0, TRN_POLICY_RETRY = 1 } ETrnPolicy; diff --git a/source/dnode/mnode/impl/src/mndDb.c b/source/dnode/mnode/impl/src/mndDb.c index 5b70312305..122982b7f2 100644 --- a/source/dnode/mnode/impl/src/mndDb.c +++ b/source/dnode/mnode/impl/src/mndDb.c @@ -439,6 +439,7 @@ static int32_t mndCreateDb(SMnode *pMnode, SMnodeMsg *pReq, SCreateDbReq *pCreat mDebug("trans:%d, used to create db:%s", pTrans->id, pCreate->db); + mndTransSetDbInfo(pTrans, &dbObj); if (mndSetCreateDbRedoLogs(pMnode, pTrans, &dbObj, pVgroups) != 0) goto CREATE_DB_OVER; if (mndSetCreateDbUndoLogs(pMnode, pTrans, &dbObj, pVgroups) != 0) goto CREATE_DB_OVER; if (mndSetCreateDbCommitLogs(pMnode, pTrans, &dbObj, pVgroups) != 0) goto CREATE_DB_OVER; @@ -625,6 +626,7 @@ static int32_t mndUpdateDb(SMnode *pMnode, SMnodeMsg *pReq, SDbObj *pOld, SDbObj mDebug("trans:%d, used to update db:%s", pTrans->id, pOld->name); + mndTransSetDbInfo(pTrans, pOld); if (mndSetUpdateDbRedoLogs(pMnode, pTrans, pOld, pNew) != 0) goto UPDATE_DB_OVER; if (mndSetUpdateDbCommitLogs(pMnode, pTrans, pOld, pNew) != 0) goto UPDATE_DB_OVER; if (mndSetUpdateDbRedoActions(pMnode, pTrans, pOld, pNew) != 0) goto UPDATE_DB_OVER; @@ -803,6 +805,7 @@ static int32_t mndDropDb(SMnode *pMnode, SMnodeMsg *pReq, SDbObj *pDb) { if (pTrans == NULL) goto DROP_DB_OVER; mDebug("trans:%d, used to drop db:%s", pTrans->id, pDb->name); + mndTransSetDbInfo(pTrans, pDb); if (mndSetDropDbRedoLogs(pMnode, pTrans, pDb) != 0) goto DROP_DB_OVER; if (mndSetDropDbCommitLogs(pMnode, pTrans, pDb) != 0) goto DROP_DB_OVER; diff --git a/source/dnode/mnode/impl/src/mndStb.c b/source/dnode/mnode/impl/src/mndStb.c index 477719d8be..274ae10045 100644 --- a/source/dnode/mnode/impl/src/mndStb.c +++ b/source/dnode/mnode/impl/src/mndStb.c @@ -534,6 +534,7 @@ static int32_t mndCreateStb(SMnode *pMnode, SMnodeMsg *pReq, SMCreateStbReq *pCr if (pTrans == NULL) goto CREATE_STB_OVER; mDebug("trans:%d, used to create stb:%s", pTrans->id, pCreate->name); + mndTransSetDbInfo(pTrans, pDb); if (mndSetCreateStbRedoLogs(pMnode, pTrans, pDb, &stbObj) != 0) goto CREATE_STB_OVER; if (mndSetCreateStbUndoLogs(pMnode, pTrans, pDb, &stbObj) != 0) goto CREATE_STB_OVER; @@ -1025,6 +1026,7 @@ static int32_t mndAlterStb(SMnode *pMnode, SMnodeMsg *pReq, const SMAltertbReq * if (pTrans == NULL) goto ALTER_STB_OVER; mDebug("trans:%d, used to alter stb:%s", pTrans->id, pAlter->name); + mndTransSetDbInfo(pTrans, pDb); if (mndSetAlterStbRedoLogs(pMnode, pTrans, pDb, &stbObj) != 0) goto ALTER_STB_OVER; if (mndSetAlterStbCommitLogs(pMnode, pTrans, pDb, &stbObj) != 0) goto ALTER_STB_OVER; @@ -1163,6 +1165,7 @@ static int32_t mndDropStb(SMnode *pMnode, SMnodeMsg *pReq, SDbObj *pDb, SStbObj if (pTrans == NULL) goto DROP_STB_OVER; mDebug("trans:%d, used to drop stb:%s", pTrans->id, pStb->name); + mndTransSetDbInfo(pTrans, pDb); if (mndSetDropStbRedoLogs(pMnode, pTrans, pStb) != 0) goto DROP_STB_OVER; if (mndSetDropStbCommitLogs(pMnode, pTrans, pStb) != 0) goto DROP_STB_OVER; diff --git a/source/dnode/mnode/impl/src/mndTrans.c b/source/dnode/mnode/impl/src/mndTrans.c index b5d61ca553..5fcdc6d8f2 100644 --- a/source/dnode/mnode/impl/src/mndTrans.c +++ b/source/dnode/mnode/impl/src/mndTrans.c @@ -16,6 +16,7 @@ #define _DEFAULT_SOURCE #include "mndTrans.h" #include "mndAuth.h" +#include "mndDb.h" #include "mndShow.h" #include "mndSync.h" #include "mndUser.h" @@ -513,6 +514,11 @@ void mndTransSetRpcRsp(STrans *pTrans, void *pCont, int32_t contLen) { pTrans->rpcRspLen = contLen; } +void mndTransSetDbInfo(STrans *pTrans, SDbObj *pDb) { + pTrans->dbUid = pDb->uid; + memcpy(pTrans->dbname, pDb->name, TSDB_DB_FNAME_LEN); +} + static int32_t mndTransSync(SMnode *pMnode, STrans *pTrans) { SSdbRaw *pRaw = mndTransActionEncode(pTrans); if (pRaw == NULL) { @@ -1199,7 +1205,12 @@ static int32_t mndRetrieveTrans(SMnodeMsg *pReq, SShowObj *pShow, char *data, in cols++; pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; - STR_TO_VARSTR(pWrite, pTrans->dbname); + char *name = mnGetDbStr(pTrans->dbname); + if (name != NULL) { + STR_WITH_MAXSIZE_TO_VARSTR(pWrite, name, pShow->bytes[cols]); + } else { + STR_TO_VARSTR(pWrite, "-"); + } cols++; pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; From 536627edbf590b359b73d0aa81ea98104bf28e9d Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Fri, 18 Feb 2022 14:12:29 +0800 Subject: [PATCH 17/17] parallel exec trans --- include/util/taoserror.h | 1 + source/dnode/mnode/impl/inc/mndDef.h | 12 ++-- source/dnode/mnode/impl/src/mndTrans.c | 82 ++++++++++++++++++++++++++ source/util/src/terror.c | 1 + 4 files changed, 91 insertions(+), 5 deletions(-) diff --git a/include/util/taoserror.h b/include/util/taoserror.h index 6f9bc35f2a..92028b0837 100644 --- a/include/util/taoserror.h +++ b/include/util/taoserror.h @@ -247,6 +247,7 @@ int32_t* taosGetErrno(); #define TSDB_CODE_MND_TRANS_ALREADY_EXIST TAOS_DEF_ERROR_CODE(0, 0x03D0) #define TSDB_CODE_MND_TRANS_NOT_EXIST TAOS_DEF_ERROR_CODE(0, 0x03D1) #define TSDB_CODE_MND_TRANS_INVALID_STAGE TAOS_DEF_ERROR_CODE(0, 0x03D2) +#define TSDB_CODE_MND_TRANS_CANT_PARALLEL TAOS_DEF_ERROR_CODE(0, 0x03D4) // mnode-mq #define TSDB_CODE_MND_TOPIC_ALREADY_EXIST TAOS_DEF_ERROR_CODE(0, 0x03E0) diff --git a/source/dnode/mnode/impl/inc/mndDef.h b/source/dnode/mnode/impl/inc/mndDef.h index a092882e1f..f30301c72e 100644 --- a/source/dnode/mnode/impl/inc/mndDef.h +++ b/source/dnode/mnode/impl/inc/mndDef.h @@ -132,12 +132,14 @@ typedef enum { TRN_TYPE_CREATE_DB = 3001, TRN_TYPE_ALTER_DB = 3002, TRN_TYPE_DROP_DB = 3003, - TRN_TYPE_CREATE_STB = 3004, - TRN_TYPE_ALTER_STB = 3005, - TRN_TYPE_DROP_STB = 3006, - TRN_TYPE_SPLIT_VGROUP = 3007, - TRN_TYPE_MERGE_VGROUP = 3018, + TRN_TYPE_SPLIT_VGROUP = 3004, + TRN_TYPE_MERGE_VGROUP = 3015, TRN_TYPE_DB_SCOPE_END, + TRN_TYPE_STB_SCOPE = 4000, + TRN_TYPE_CREATE_STB = 4001, + TRN_TYPE_ALTER_STB = 4002, + TRN_TYPE_DROP_STB = 4003, + TRN_TYPE_STB_SCOPE_END, } ETrnType; typedef enum { TRN_POLICY_ROLLBACK = 0, TRN_POLICY_RETRY = 1 } ETrnPolicy; diff --git a/source/dnode/mnode/impl/src/mndTrans.c b/source/dnode/mnode/impl/src/mndTrans.c index 5fcdc6d8f2..f7226d9df7 100644 --- a/source/dnode/mnode/impl/src/mndTrans.c +++ b/source/dnode/mnode/impl/src/mndTrans.c @@ -546,7 +546,89 @@ static int32_t mndTransSync(SMnode *pMnode, STrans *pTrans) { return 0; } +static bool mndIsBasicTrans(STrans *pTrans) { + return pTrans->stage > TRN_TYPE_BASIC_SCOPE && pTrans->stage < TRN_TYPE_BASIC_SCOPE_END; +} + +static bool mndIsGlobalTrans(STrans *pTrans) { + return pTrans->stage > TRN_TYPE_GLOBAL_SCOPE && pTrans->stage < TRN_TYPE_GLOBAL_SCOPE_END; +} + +static bool mndIsDbTrans(STrans *pTrans) { + return pTrans->stage > TRN_TYPE_DB_SCOPE && pTrans->stage < TRN_TYPE_DB_SCOPE_END; +} + +static bool mndIsStbTrans(STrans *pTrans) { + return pTrans->stage > TRN_TYPE_STB_SCOPE && pTrans->stage < TRN_TYPE_STB_SCOPE_END; +} + +static int32_t mndCheckTransCanBeStartedInParallel(SMnode *pMnode, STrans *pNewTrans) { + if (mndIsBasicTrans(pNewTrans)) return 0; + + STrans *pTrans = NULL; + void *pIter = NULL; + int32_t code = 0; + + while (1) { + pIter = sdbFetch(pMnode->pSdb, SDB_TRANS, pIter, (void **)&pTrans); + if (pIter == NULL) break; + + if (mndIsGlobalTrans(pNewTrans)) { + if (mndIsDbTrans(pTrans) || mndIsStbTrans(pTrans)) { + mError("trans:%d, can't execute since trans:%d in progress db:%s", pNewTrans->id, pTrans->id, pTrans->dbname); + code = -1; + break; + } + } + + if (mndIsDbTrans(pNewTrans)) { + if (mndIsBasicTrans(pTrans)) continue; + if (mndIsGlobalTrans(pTrans)) { + mError("trans:%d, can't execute since trans:%d in progress", pNewTrans->id, pTrans->id); + code = -1; + break; + } + if (mndIsDbTrans(pTrans) || mndIsStbTrans(pTrans)) { + if (pNewTrans->dbUid == pTrans->dbUid) { + mError("trans:%d, can't execute since trans:%d in progress db:%s", pNewTrans->id, pTrans->id, pTrans->dbname); + code = -1; + break; + } + } + } + + if (mndIsStbTrans(pNewTrans)) { + if (mndIsBasicTrans(pTrans)) continue; + if (mndIsGlobalTrans(pTrans)) { + mError("trans:%d, can't execute since trans:%d in progress", pNewTrans->id, pTrans->id); + code = -1; + break; + } + if (mndIsDbTrans(pTrans)) { + if (pNewTrans->dbUid == pTrans->dbUid) { + mError("trans:%d, can't execute since trans:%d in progress db:%s", pNewTrans->id, pTrans->id, pTrans->dbname); + code = -1; + break; + } + } + if (mndIsStbTrans(pTrans)) continue; + } + + sdbRelease(pMnode->pSdb, pTrans); + } + + sdbCancelFetch(pMnode->pSdb, pIter); + sdbRelease(pMnode->pSdb, pTrans); + return code; +} + int32_t mndTransPrepare(SMnode *pMnode, STrans *pTrans) { + if (mndCheckTransCanBeStartedInParallel(pMnode, pTrans) != 0) { + terrno = TSDB_CODE_MND_TRANS_CANT_PARALLEL; + mError("trans:%d, failed to prepare since %s", pTrans->id, terrstr()); + return -1; + } + mDebug("trans:%d, prepare transaction", pTrans->id); if (mndTransSync(pMnode, pTrans) != 0) { mError("trans:%d, failed to prepare since %s", pTrans->id, terrstr()); diff --git a/source/util/src/terror.c b/source/util/src/terror.c index f4ee13c067..2b53a769ff 100644 --- a/source/util/src/terror.c +++ b/source/util/src/terror.c @@ -257,6 +257,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_FUNC_RETRIEVE, "Invalid func retriev TAOS_DEFINE_ERROR(TSDB_CODE_MND_TRANS_ALREADY_EXIST, "Transaction already exists") TAOS_DEFINE_ERROR(TSDB_CODE_MND_TRANS_NOT_EXIST, "Transaction not exists") TAOS_DEFINE_ERROR(TSDB_CODE_MND_TRANS_INVALID_STAGE, "Invalid stage to kill") +TAOS_DEFINE_ERROR(TSDB_CODE_MND_TRANS_CANT_PARALLEL, "Invalid stage to kill") // mnode-topic TAOS_DEFINE_ERROR(TSDB_CODE_MND_UNSUPPORTED_TOPIC, "Topic with STable not supported yet")