From e1b1ae575bf2a8ff454633695a1d27af37e0a186 Mon Sep 17 00:00:00 2001 From: slzhou Date: Mon, 26 Dec 2022 14:39:00 +0800 Subject: [PATCH 01/40] fix: select tbname from system tables --- source/libs/executor/src/sysscanoperator.c | 183 ++++++++++++++------- source/libs/planner/src/planOptimizer.c | 3 + source/libs/planner/src/planSpliter.c | 16 +- source/libs/planner/src/planner.c | 4 +- 4 files changed, 137 insertions(+), 69 deletions(-) diff --git a/source/libs/executor/src/sysscanoperator.c b/source/libs/executor/src/sysscanoperator.c index a88f673e0b..2ec6a7b0ce 100644 --- a/source/libs/executor/src/sysscanoperator.c +++ b/source/libs/executor/src/sysscanoperator.c @@ -65,6 +65,8 @@ typedef struct SSysTableScanInfo { SSDataBlock* pRes; int64_t numOfBlocks; // extract basic running information. SLoadRemoteDataInfo loadInfo; + + int32_t tbnameSlotId; } SSysTableScanInfo; typedef struct { @@ -346,6 +348,11 @@ static int32_t optSysTabFilteImpl(void* arg, SNode* cond, SArray* result); static int32_t optSysCheckOper(SNode* pOpear); static int32_t optSysMergeRslt(SArray* mRslt, SArray* rslt); +static SSDataBlock* sysTableScanFromMNode(SOperatorInfo* pOperator, SSysTableScanInfo* pInfo, const char* name, + SExecTaskInfo* pTaskInfo); +void extractTbnameSlotId(SSysTableScanInfo* pInfo, const SScanPhysiNode* pScanNode); +static SSDataBlock* sysTableScanHandleFillTbName(SOperatorInfo* pOperator, const SSysTableScanInfo* pInfo, + const char* name, SSDataBlock* pBlock); __optSysFilter optSysGetFilterFunc(int32_t ctype, bool* reverse) { if (ctype == OP_TYPE_LOWER_EQUAL || ctype == OP_TYPE_LOWER_THAN) { *reverse = true; @@ -1309,83 +1316,111 @@ static SSDataBlock* doSysTableScan(SOperatorInfo* pOperator) { getDBNameFromCondition(pInfo->pCondition, dbName); sprintf(pInfo->req.db, "%d.%s", pInfo->accountId, dbName); } - + SSDataBlock* pBlock = NULL; if (strncasecmp(name, TSDB_INS_TABLE_TABLES, TSDB_TABLE_FNAME_LEN) == 0) { - return sysTableScanUserTables(pOperator); + pBlock = sysTableScanUserTables(pOperator); } else if (strncasecmp(name, TSDB_INS_TABLE_TAGS, TSDB_TABLE_FNAME_LEN) == 0) { - return sysTableScanUserTags(pOperator); + pBlock = sysTableScanUserTags(pOperator); } else if (strncasecmp(name, TSDB_INS_TABLE_STABLES, TSDB_TABLE_FNAME_LEN) == 0 && pInfo->showRewrite && IS_SYS_DBNAME(dbName)) { - return sysTableScanUserSTables(pOperator); + pBlock = sysTableScanUserSTables(pOperator); } else { // load the meta from mnode of the given epset - if (pOperator->status == OP_EXEC_DONE) { + pBlock = sysTableScanFromMNode(pOperator, pInfo, name, pTaskInfo); + } + + return sysTableScanHandleFillTbName(pOperator, pInfo, name, pBlock); +} + +static SSDataBlock* sysTableScanHandleFillTbName(SOperatorInfo* pOperator, const SSysTableScanInfo* pInfo, + const char* name, SSDataBlock* pBlock) { + if (pBlock != NULL) { + if (pInfo->tbnameSlotId != -1) { + SColumnInfoData* pColumnInfoData = (SColumnInfoData*)taosArrayGet(pBlock->pDataBlock, pInfo->tbnameSlotId); + char varTbName[TSDB_TABLE_FNAME_LEN - 1 + VARSTR_HEADER_SIZE] = {0}; + memcpy(varDataVal(varTbName), name, strlen(name)); + varDataSetLen(varTbName, strlen(name)); + for (int i = 0; i < pBlock->info.rows; ++i) { + colDataAppend(pColumnInfoData, i, varTbName, NULL); + } + doFilterResult(pBlock, pOperator->exprSupp.pFilterInfo); + } + } + if (pBlock && pBlock->info.rows != 0) { + return pBlock; + } else { + return NULL; + } +} + +static SSDataBlock* sysTableScanFromMNode(SOperatorInfo* pOperator, SSysTableScanInfo* pInfo, const char* name, + SExecTaskInfo* pTaskInfo) { + if (pOperator->status == OP_EXEC_DONE) { + return NULL; + } + + while (1) { + int64_t startTs = taosGetTimestampUs(); + tstrncpy(pInfo->req.tb, tNameGetTableName(&pInfo->name), tListLen(pInfo->req.tb)); + tstrncpy(pInfo->req.user, pInfo->pUser, tListLen(pInfo->req.user)); + + int32_t contLen = tSerializeSRetrieveTableReq(NULL, 0, &pInfo->req); + char* buf1 = taosMemoryCalloc(1, contLen); + tSerializeSRetrieveTableReq(buf1, contLen, &pInfo->req); + + // send the fetch remote task result reques + SMsgSendInfo* pMsgSendInfo = taosMemoryCalloc(1, sizeof(SMsgSendInfo)); + if (NULL == pMsgSendInfo) { + qError("%s prepare message %d failed", GET_TASKID(pTaskInfo), (int32_t)sizeof(SMsgSendInfo)); + pTaskInfo->code = TSDB_CODE_OUT_OF_MEMORY; return NULL; } - while (1) { - int64_t startTs = taosGetTimestampUs(); - tstrncpy(pInfo->req.tb, tNameGetTableName(&pInfo->name), tListLen(pInfo->req.tb)); - tstrncpy(pInfo->req.user, pInfo->pUser, tListLen(pInfo->req.user)); + int32_t msgType = (strcasecmp(name, TSDB_INS_TABLE_DNODE_VARIABLES) == 0) ? TDMT_DND_SYSTABLE_RETRIEVE + : TDMT_MND_SYSTABLE_RETRIEVE; - int32_t contLen = tSerializeSRetrieveTableReq(NULL, 0, &pInfo->req); - char* buf1 = taosMemoryCalloc(1, contLen); - tSerializeSRetrieveTableReq(buf1, contLen, &pInfo->req); + pMsgSendInfo->param = pOperator; + pMsgSendInfo->msgInfo.pData = buf1; + pMsgSendInfo->msgInfo.len = contLen; + pMsgSendInfo->msgType = msgType; + pMsgSendInfo->fp = loadSysTableCallback; + pMsgSendInfo->requestId = pTaskInfo->id.queryId; - // send the fetch remote task result reques - SMsgSendInfo* pMsgSendInfo = taosMemoryCalloc(1, sizeof(SMsgSendInfo)); - if (NULL == pMsgSendInfo) { - qError("%s prepare message %d failed", GET_TASKID(pTaskInfo), (int32_t)sizeof(SMsgSendInfo)); - pTaskInfo->code = TSDB_CODE_OUT_OF_MEMORY; + int64_t transporterId = 0; + int32_t code = + asyncSendMsgToServer(pInfo->readHandle.pMsgCb->clientRpc, &pInfo->epSet, &transporterId, pMsgSendInfo); + tsem_wait(&pInfo->ready); + + if (pTaskInfo->code) { + qDebug("%s load meta data from mnode failed, totalRows:%" PRIu64 ", code:%s", GET_TASKID(pTaskInfo), + pInfo->loadInfo.totalRows, tstrerror(pTaskInfo->code)); + return NULL; + } + + SRetrieveMetaTableRsp* pRsp = pInfo->pRsp; + pInfo->req.showId = pRsp->handle; + + if (pRsp->numOfRows == 0 || pRsp->completed) { + pOperator->status = OP_EXEC_DONE; + qDebug("%s load meta data from mnode completed, rowsOfSource:%d, totalRows:%" PRIu64, GET_TASKID(pTaskInfo), + pRsp->numOfRows, pInfo->loadInfo.totalRows); + + if (pRsp->numOfRows == 0) { + taosMemoryFree(pRsp); return NULL; } + } - int32_t msgType = (strcasecmp(name, TSDB_INS_TABLE_DNODE_VARIABLES) == 0) ? TDMT_DND_SYSTABLE_RETRIEVE - : TDMT_MND_SYSTABLE_RETRIEVE; + char* pStart = pRsp->data; + extractDataBlockFromFetchRsp(pInfo->pRes, pRsp->data, pInfo->matchInfo.pList, &pStart); + updateLoadRemoteInfo(&pInfo->loadInfo, pRsp->numOfRows, pRsp->compLen, startTs, pOperator); - pMsgSendInfo->param = pOperator; - pMsgSendInfo->msgInfo.pData = buf1; - pMsgSendInfo->msgInfo.len = contLen; - pMsgSendInfo->msgType = msgType; - pMsgSendInfo->fp = loadSysTableCallback; - pMsgSendInfo->requestId = pTaskInfo->id.queryId; - - int64_t transporterId = 0; - int32_t code = - asyncSendMsgToServer(pInfo->readHandle.pMsgCb->clientRpc, &pInfo->epSet, &transporterId, pMsgSendInfo); - tsem_wait(&pInfo->ready); - - if (pTaskInfo->code) { - qDebug("%s load meta data from mnode failed, totalRows:%" PRIu64 ", code:%s", GET_TASKID(pTaskInfo), - pInfo->loadInfo.totalRows, tstrerror(pTaskInfo->code)); - return NULL; - } - - SRetrieveMetaTableRsp* pRsp = pInfo->pRsp; - pInfo->req.showId = pRsp->handle; - - if (pRsp->numOfRows == 0 || pRsp->completed) { - pOperator->status = OP_EXEC_DONE; - qDebug("%s load meta data from mnode completed, rowsOfSource:%d, totalRows:%" PRIu64, GET_TASKID(pTaskInfo), - pRsp->numOfRows, pInfo->loadInfo.totalRows); - - if (pRsp->numOfRows == 0) { - taosMemoryFree(pRsp); - return NULL; - } - } - - char* pStart = pRsp->data; - extractDataBlockFromFetchRsp(pInfo->pRes, pRsp->data, pInfo->matchInfo.pList, &pStart); - updateLoadRemoteInfo(&pInfo->loadInfo, pRsp->numOfRows, pRsp->compLen, startTs, pOperator); - - // todo log the filter info - doFilterResult(pInfo->pRes, pOperator->exprSupp.pFilterInfo); - taosMemoryFree(pRsp); - if (pInfo->pRes->info.rows > 0) { - return pInfo->pRes; - } else if (pOperator->status == OP_EXEC_DONE) { - return NULL; - } + // todo log the filter info + doFilterResult(pInfo->pRes, pOperator->exprSupp.pFilterInfo); + taosMemoryFree(pRsp); + if (pInfo->pRes->info.rows > 0) { + return pInfo->pRes; + } else if (pOperator->status == OP_EXEC_DONE) { + return NULL; } } } @@ -1407,6 +1442,8 @@ SOperatorInfo* createSysTableScanOperatorInfo(void* readHandle, SSystemTableScan goto _error; } + extractTbnameSlotId(pInfo, pScanNode); + pInfo->accountId = pScanPhyNode->accountId; pInfo->pUser = taosMemoryStrDup((void*)pUser); pInfo->sysInfo = pScanPhyNode->sysInfo; @@ -1449,6 +1486,26 @@ SOperatorInfo* createSysTableScanOperatorInfo(void* readHandle, SSystemTableScan return NULL; } +void extractTbnameSlotId(SSysTableScanInfo* pInfo, const SScanPhysiNode* pScanNode) { + pInfo->tbnameSlotId = -1; + if (pScanNode->pScanPseudoCols != NULL) { + SNode* pNode = NULL; + FOREACH(pNode, pScanNode->pScanPseudoCols) { + STargetNode* pTargetNode = NULL; + if (nodeType(pNode) == QUERY_NODE_TARGET) { + pTargetNode = (STargetNode*)pNode; + SNode* expr = pTargetNode->pExpr; + if (nodeType(expr) == QUERY_NODE_FUNCTION) { + SFunctionNode* pFuncNode = (SFunctionNode*)expr; + if (pFuncNode->funcType == FUNCTION_TYPE_TBNAME) { + pInfo->tbnameSlotId = pTargetNode->slotId; + } + } + } + } + } +} + void destroySysScanOperator(void* param) { SSysTableScanInfo* pInfo = (SSysTableScanInfo*)param; tsem_destroy(&pInfo->ready); diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c index e1687fc3a5..30dc092f53 100644 --- a/source/libs/planner/src/planOptimizer.c +++ b/source/libs/planner/src/planOptimizer.c @@ -2380,6 +2380,9 @@ static bool tagScanOptShouldBeOptimized(SLogicNode* pNode) { if (pScan->hasNormalCols) { return false; } + if (pScan->tableType == TSDB_SYSTEM_TABLE) { + return false; + } if (NULL == pNode->pParent || QUERY_NODE_LOGIC_PLAN_AGG != nodeType(pNode->pParent) || 1 != LIST_LENGTH(pNode->pParent->pChildren)) { return false; diff --git a/source/libs/planner/src/planSpliter.c b/source/libs/planner/src/planSpliter.c index f5782dc937..a7eac2c853 100644 --- a/source/libs/planner/src/planSpliter.c +++ b/source/libs/planner/src/planSpliter.c @@ -333,13 +333,23 @@ static bool stbSplHasPartTbname(SNodeList* pPartKeys) { return false; } -static bool stbSplIsPartTableAgg(SAggLogicNode* pAgg) { - if (NULL != pAgg->pGroupKeys) { - return stbSplHasPartTbname(pAgg->pGroupKeys); +static bool stbSplNotSystemScan(SLogicNode* pNode) { + if (QUERY_NODE_LOGIC_PLAN_SCAN == nodeType(pNode)) { + return SCAN_TYPE_SYSTEM_TABLE != ((SScanLogicNode*)pNode)->scanType; + } else if (QUERY_NODE_LOGIC_PLAN_PARTITION == nodeType(pNode)) { + return stbSplNotSystemScan((SLogicNode*)nodesListGetNode(pNode->pChildren, 0)); + } else { + return true; } +} + +static bool stbSplIsPartTableAgg(SAggLogicNode* pAgg) { if (1 != LIST_LENGTH(pAgg->node.pChildren)) { return false; } + if (NULL != pAgg->pGroupKeys) { + return stbSplHasPartTbname(pAgg->pGroupKeys) && stbSplNotSystemScan((SLogicNode*)nodesListGetNode(pAgg->node.pChildren, 0)); + } return stbSplHasPartTbname(stbSplGetPartKeys((SLogicNode*)nodesListGetNode(pAgg->node.pChildren, 0))); } diff --git a/source/libs/planner/src/planner.c b/source/libs/planner/src/planner.c index c6a4a97f6e..dacc696705 100644 --- a/source/libs/planner/src/planner.c +++ b/source/libs/planner/src/planner.c @@ -20,12 +20,10 @@ #include "tglobal.h" static void dumpQueryPlan(SQueryPlan* pPlan) { - if (!tsQueryPlannerTrace) { - return; - } char* pStr = NULL; nodesNodeToString((SNode*)pPlan, false, &pStr, NULL); planDebugL("QID:0x%" PRIx64 " Query Plan: %s", pPlan->queryId, pStr); + printf("QueryPlan\n%s\n\n", pStr); taosMemoryFree(pStr); } From 0bef5fdc380a21e8596ab4fb9e2e266dca824c5f Mon Sep 17 00:00:00 2001 From: slzhou Date: Mon, 26 Dec 2022 14:42:36 +0800 Subject: [PATCH 02/40] fix: rename symbol --- source/libs/executor/src/sysscanoperator.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/libs/executor/src/sysscanoperator.c b/source/libs/executor/src/sysscanoperator.c index 2ec6a7b0ce..ac32b54f56 100644 --- a/source/libs/executor/src/sysscanoperator.c +++ b/source/libs/executor/src/sysscanoperator.c @@ -351,7 +351,7 @@ static int32_t optSysMergeRslt(SArray* mRslt, SArray* rslt); static SSDataBlock* sysTableScanFromMNode(SOperatorInfo* pOperator, SSysTableScanInfo* pInfo, const char* name, SExecTaskInfo* pTaskInfo); void extractTbnameSlotId(SSysTableScanInfo* pInfo, const SScanPhysiNode* pScanNode); -static SSDataBlock* sysTableScanHandleFillTbName(SOperatorInfo* pOperator, const SSysTableScanInfo* pInfo, +static SSDataBlock* sysTableScanFillTbName(SOperatorInfo* pOperator, const SSysTableScanInfo* pInfo, const char* name, SSDataBlock* pBlock); __optSysFilter optSysGetFilterFunc(int32_t ctype, bool* reverse) { if (ctype == OP_TYPE_LOWER_EQUAL || ctype == OP_TYPE_LOWER_THAN) { @@ -1328,10 +1328,10 @@ static SSDataBlock* doSysTableScan(SOperatorInfo* pOperator) { pBlock = sysTableScanFromMNode(pOperator, pInfo, name, pTaskInfo); } - return sysTableScanHandleFillTbName(pOperator, pInfo, name, pBlock); + return sysTableScanFillTbName(pOperator, pInfo, name, pBlock); } -static SSDataBlock* sysTableScanHandleFillTbName(SOperatorInfo* pOperator, const SSysTableScanInfo* pInfo, +static SSDataBlock* sysTableScanFillTbName(SOperatorInfo* pOperator, const SSysTableScanInfo* pInfo, const char* name, SSDataBlock* pBlock) { if (pBlock != NULL) { if (pInfo->tbnameSlotId != -1) { From fb4a6f508ca574818cfef4f8676ee42554c6da75 Mon Sep 17 00:00:00 2001 From: slzhou Date: Tue, 27 Dec 2022 09:54:57 +0800 Subject: [PATCH 03/40] fix: revert planner.c --- source/libs/planner/src/planner.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/libs/planner/src/planner.c b/source/libs/planner/src/planner.c index dacc696705..c6a4a97f6e 100644 --- a/source/libs/planner/src/planner.c +++ b/source/libs/planner/src/planner.c @@ -20,10 +20,12 @@ #include "tglobal.h" static void dumpQueryPlan(SQueryPlan* pPlan) { + if (!tsQueryPlannerTrace) { + return; + } char* pStr = NULL; nodesNodeToString((SNode*)pPlan, false, &pStr, NULL); planDebugL("QID:0x%" PRIx64 " Query Plan: %s", pPlan->queryId, pStr); - printf("QueryPlan\n%s\n\n", pStr); taosMemoryFree(pStr); } From ceea74ee7aab0de0ad8af25a63935cf5297bb0e1 Mon Sep 17 00:00:00 2001 From: slzhou Date: Tue, 27 Dec 2022 09:58:22 +0800 Subject: [PATCH 04/40] enhance: remove assert --- source/libs/function/src/tudf.c | 1 - source/libs/function/src/udfd.c | 1 - 2 files changed, 2 deletions(-) diff --git a/source/libs/function/src/tudf.c b/source/libs/function/src/tudf.c index 0b309bc8f5..abc75655cb 100644 --- a/source/libs/function/src/tudf.c +++ b/source/libs/function/src/tudf.c @@ -1224,7 +1224,6 @@ int32_t udfcGetUdfTaskResultFromUvTask(SClientUdfTask *task, SClientUvTaskNode * if (uvTask->rspBuf.base != NULL) { SUdfResponse rsp = {0}; void *buf = decodeUdfResponse(uvTask->rspBuf.base, &rsp); - assert(uvTask->rspBuf.len == POINTER_DISTANCE(buf, uvTask->rspBuf.base)); task->errCode = rsp.code; switch (task->type) { diff --git a/source/libs/function/src/udfd.c b/source/libs/function/src/udfd.c index 40c75ce6ba..451f7bd0e8 100644 --- a/source/libs/function/src/udfd.c +++ b/source/libs/function/src/udfd.c @@ -400,7 +400,6 @@ void udfdProcessTeardownRequest(SUvUdfWork *uvUdf, SUdfRequest *request) { void udfdProcessRpcRsp(void *parent, SRpcMsg *pMsg, SEpSet *pEpSet) { SUdfdRpcSendRecvInfo *msgInfo = (SUdfdRpcSendRecvInfo *)pMsg->info.ahandle; - ASSERT(pMsg->info.ahandle != NULL); if (pEpSet) { if (!isEpsetEqual(&global.mgmtEp.epSet, pEpSet)) { From 1e69538c379a88c5222471ca6ceb81e61caad3a5 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Tue, 27 Dec 2022 16:55:38 +0800 Subject: [PATCH 05/40] fix(query): opt filter perf. --- source/libs/scalar/inc/sclInt.h | 3 -- source/libs/scalar/src/filter.c | 2 +- source/libs/scalar/src/sclvector.c | 67 ++++++++++++++++++++++-------- source/util/src/tcompare.c | 10 ++--- 4 files changed, 56 insertions(+), 26 deletions(-) diff --git a/source/libs/scalar/inc/sclInt.h b/source/libs/scalar/inc/sclInt.h index d3f29c0e49..d3da73abef 100644 --- a/source/libs/scalar/inc/sclInt.h +++ b/source/libs/scalar/inc/sclInt.h @@ -50,9 +50,6 @@ typedef struct SScalarCtx { #define SCL_IS_COMPARISON_OPERATOR(_opType) ((_opType) >= OP_TYPE_GREATER_THAN && (_opType) < OP_TYPE_IS_NOT_UNKNOWN) #define SCL_DOWNGRADE_DATETYPE(_type) \ ((_type) == TSDB_DATA_TYPE_BIGINT || TSDB_DATA_TYPE_DOUBLE == (_type) || (_type) == TSDB_DATA_TYPE_UBIGINT) -#define SCL_NO_NEED_CONVERT_COMPARISION(_ltype, _rtype, _optr) \ - (IS_NUMERIC_TYPE(_ltype) && IS_NUMERIC_TYPE(_rtype) && \ - ((_optr) >= OP_TYPE_GREATER_THAN && (_optr) <= OP_TYPE_NOT_EQUAL)) #define sclFatal(...) qFatal(__VA_ARGS__) #define sclError(...) qError(__VA_ARGS__) diff --git a/source/libs/scalar/src/filter.c b/source/libs/scalar/src/filter.c index 59e39e3f6f..8fad010524 100644 --- a/source/libs/scalar/src/filter.c +++ b/source/libs/scalar/src/filter.c @@ -4082,7 +4082,7 @@ bool filterExecute(SFilterInfo *info, SSDataBlock *pSrc, SColumnInfoData **p, SC SArray *pList = taosArrayInit(1, POINTER_BYTES); taosArrayPush(pList, &pSrc); - int32_t code = scalarCalculate(info->sclCtx.node, pList, &output); + code = scalarCalculate(info->sclCtx.node, pList, &output); taosArrayDestroy(pList); FLT_ERR_RET(code); diff --git a/source/libs/scalar/src/sclvector.c b/source/libs/scalar/src/sclvector.c index a1995bdf50..2eb12c8269 100644 --- a/source/libs/scalar/src/sclvector.c +++ b/source/libs/scalar/src/sclvector.c @@ -37,6 +37,11 @@ #define IS_HELPER_NULL(col, i) colDataIsNull_s(col, i) || IS_JSON_NULL(col->info.type, colDataGetVarData(col, i)) +bool noConvertBeforeCompare(int32_t leftType, int32_t rightType, int32_t optr) { + return IS_NUMERIC_TYPE(leftType) && IS_NUMERIC_TYPE(rightType) && + (optr >= OP_TYPE_GREATER_THAN && optr <= OP_TYPE_NOT_EQUAL); +} + void convertNumberToNumber(const void *inData, void *outData, int8_t inType, int8_t outType) { switch (outType) { case TSDB_DATA_TYPE_BOOL: { @@ -338,6 +343,7 @@ static FORCE_INLINE void varToBool(char *buf, SScalarParam *pOut, int32_t rowInd colDataAppendInt8(pOut->columnData, rowIndex, (int8_t *)&v); } +// todo remove this malloc static FORCE_INLINE void varToNchar(char *buf, SScalarParam *pOut, int32_t rowIndex, int32_t *overflow) { int32_t len = 0; int32_t inputLen = varDataLen(buf); @@ -399,6 +405,8 @@ int32_t vectorConvertFromVarData(SSclVectorConvCtx *pCtx, int32_t *overflow) { } pCtx->pOut->numOfRows = pCtx->pIn->numOfRows; + char* tmp = NULL; + for (int32_t i = pCtx->startIndex; i <= pCtx->endIndex; ++i) { if (IS_HELPER_NULL(pCtx->pIn->columnData, i)) { colDataAppendNULL(pCtx->pOut->columnData, i); @@ -421,12 +429,16 @@ int32_t vectorConvertFromVarData(SSclVectorConvCtx *pCtx, int32_t *overflow) { continue; } } + int32_t bufSize = pCtx->pIn->columnData->info.bytes; - char *tmp = taosMemoryMalloc(varDataTLen(data)); - if (!tmp) { - sclError("out of memory in vectorConvertFromVarData"); - return TSDB_CODE_OUT_OF_MEMORY; + if (tmp == NULL) { + tmp = taosMemoryMalloc(bufSize); + if (tmp == NULL) { + sclError("out of memory in vectorConvertFromVarData"); + return TSDB_CODE_OUT_OF_MEMORY; + } } + if (vton) { memcpy(tmp, data, varDataTLen(data)); } else { @@ -434,6 +446,7 @@ int32_t vectorConvertFromVarData(SSclVectorConvCtx *pCtx, int32_t *overflow) { memcpy(tmp, varDataVal(data), varDataLen(data)); tmp[varDataLen(data)] = 0; } else if (TSDB_DATA_TYPE_NCHAR == convertType) { + // we need to convert it to native char string, and then perform the string to numeric data ASSERT(varDataLen(data) <= bufSize); int len = taosUcs4ToMbs((TdUcs4 *)varDataVal(data), varDataLen(data), tmp); @@ -448,9 +461,11 @@ int32_t vectorConvertFromVarData(SSclVectorConvCtx *pCtx, int32_t *overflow) { } (*func)(tmp, pCtx->pOut, i, overflow); - taosMemoryFreeClear(tmp); } + if (tmp != NULL) { + taosMemoryFreeClear(tmp); + } return TSDB_CODE_SUCCESS; } @@ -925,25 +940,43 @@ int32_t vectorConvertCols(SScalarParam *pLeft, SScalarParam *pRight, SScalarPara return TSDB_CODE_SUCCESS; } + int8_t type = 0; + int32_t code = 0; + SScalarParam *param1 = NULL, *paramOut1 = NULL; SScalarParam *param2 = NULL, *paramOut2 = NULL; - int32_t code = 0; - if (leftType < rightType) { + // always convert least data + if (IS_VAR_DATA_TYPE(leftType) && IS_VAR_DATA_TYPE(rightType) && (pLeft->numOfRows != pRight->numOfRows) && + leftType != TSDB_DATA_TYPE_JSON && rightType != TSDB_DATA_TYPE_JSON) { param1 = pLeft; param2 = pRight; paramOut1 = pLeftOut; paramOut2 = pRightOut; - } else { - param1 = pRight; - param2 = pLeft; - paramOut1 = pRightOut; - paramOut2 = pLeftOut; - } - int8_t type = vectorGetConvertType(GET_PARAM_TYPE(param1), GET_PARAM_TYPE(param2)); - if (0 == type) { - return TSDB_CODE_SUCCESS; + if (pLeft->numOfRows > pRight->numOfRows) { + type = leftType; + } else { + type = rightType; + } + } else { + // we only define half value in the convert-matrix, so make sure param1 always less equal than param2 + if (leftType < rightType) { + param1 = pLeft; + param2 = pRight; + paramOut1 = pLeftOut; + paramOut2 = pRightOut; + } else { + param1 = pRight; + param2 = pLeft; + paramOut1 = pRightOut; + paramOut2 = pLeftOut; + } + + type = vectorGetConvertType(GET_PARAM_TYPE(param1), GET_PARAM_TYPE(param2)); + if (0 == type) { + return TSDB_CODE_SUCCESS; + } } if (type != GET_PARAM_TYPE(param1)) { @@ -1683,7 +1716,7 @@ void vectorCompareImpl(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam * SScalarParam *param1 = NULL; SScalarParam *param2 = NULL; - if (SCL_NO_NEED_CONVERT_COMPARISION(GET_PARAM_TYPE(pLeft), GET_PARAM_TYPE(pRight), optr)) { + if (noConvertBeforeCompare(GET_PARAM_TYPE(pLeft), GET_PARAM_TYPE(pRight), optr)) { param1 = pLeft; param2 = pRight; } else { diff --git a/source/util/src/tcompare.c b/source/util/src/tcompare.c index d84a3d25c6..32e27f886b 100644 --- a/source/util/src/tcompare.c +++ b/source/util/src/tcompare.c @@ -1071,7 +1071,7 @@ int32_t patternMatch(const char *patterStr, const char *str, size_t size, const return (str[j] == 0 || j >= size) ? TSDB_PATTERN_MATCH : TSDB_PATTERN_NOMATCH; } -int32_t WCSPatternMatch(const TdUcs4 *patterStr, const TdUcs4 *str, size_t size, const SPatternCompareInfo *pInfo) { +int32_t WCSPatternMatch(const TdUcs4 *pattern, const TdUcs4 *str, size_t size, const SPatternCompareInfo *pInfo) { TdUcs4 c, c1; TdUcs4 matchOne = L'_'; // "_" TdUcs4 matchAll = L'%'; // "%" @@ -1079,10 +1079,10 @@ int32_t WCSPatternMatch(const TdUcs4 *patterStr, const TdUcs4 *str, size_t size, int32_t i = 0; int32_t j = 0; - while ((c = patterStr[i++]) != 0) { + while ((c = pattern[i++]) != 0) { if (c == matchAll) { /* Match "%" */ - while ((c = patterStr[i++]) == matchAll || c == matchOne) { + while ((c = pattern[i++]) == matchAll || c == matchOne) { if (c == matchOne && (j >= size || str[j++] == 0)) { return TSDB_PATTERN_NOWILDCARDMATCH; } @@ -1100,7 +1100,7 @@ int32_t WCSPatternMatch(const TdUcs4 *patterStr, const TdUcs4 *str, size_t size, break; } - int32_t ret = WCSPatternMatch(&patterStr[i], ++str, size - n - 1, pInfo); + int32_t ret = WCSPatternMatch(&pattern[i], ++str, size - n - 1, pInfo); if (ret != TSDB_PATTERN_NOMATCH) { return ret; } @@ -1198,7 +1198,7 @@ int32_t compareStrPatternNotMatch(const void *pLeft, const void *pRight) { int32_t compareWStrPatternMatch(const void *pLeft, const void *pRight) { SPatternCompareInfo pInfo = {'%', '_'}; - assert(varDataLen(pRight) <= TSDB_MAX_FIELD_LEN * TSDB_NCHAR_SIZE); + ASSERT(varDataLen(pRight) <= TSDB_MAX_FIELD_LEN * TSDB_NCHAR_SIZE); char *pattern = taosMemoryCalloc(varDataLen(pRight) + TSDB_NCHAR_SIZE, 1); memcpy(pattern, varDataVal(pRight), varDataLen(pRight)); From 024a7a58a1ce5c099f23c83f554df8924ecdd9e2 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Tue, 27 Dec 2022 18:46:32 +0800 Subject: [PATCH 06/40] fix: add some logs to detect vnodes.json emptyed --- source/dnode/mgmt/mgmt_vnode/src/vmFile.c | 18 +++++++++++++----- source/dnode/mgmt/mgmt_vnode/src/vmHandle.c | 7 ++++--- source/dnode/mgmt/mgmt_vnode/src/vmInt.c | 10 +++++----- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmFile.c b/source/dnode/mgmt/mgmt_vnode/src/vmFile.c index a49e855e39..215185c555 100644 --- a/source/dnode/mgmt/mgmt_vnode/src/vmFile.c +++ b/source/dnode/mgmt/mgmt_vnode/src/vmFile.c @@ -16,7 +16,7 @@ #define _DEFAULT_SOURCE #include "vmInt.h" -#define MAX_CONTENT_LEN 1024 * 1024 +#define MAX_CONTENT_LEN 2 * 1024 * 1024 SVnodeObj **vmGetVnodeListFromHash(SVnodeMgmt *pMgmt, int32_t *numOfVnodes) { taosThreadRwlockRdlock(&pMgmt->lock); @@ -60,7 +60,7 @@ int32_t vmGetVnodeListFromFile(SVnodeMgmt *pMgmt, SWrapperCfg **ppCfgs, int32_t pFile = taosOpenFile(file, TD_FILE_READ); if (pFile == NULL) { - dDebug("file %s not exist", file); + dInfo("file %s not exist", file); code = 0; goto _OVER; } @@ -133,7 +133,7 @@ int32_t vmGetVnodeListFromFile(SVnodeMgmt *pMgmt, SWrapperCfg **ppCfgs, int32_t *numOfVnodes = vnodesNum; code = 0; - dDebug("succcessed to read file %s, numOfVnodes:%d", file, vnodesNum); + dInfo("succcessed to read file %s, numOfVnodes:%d", file, vnodesNum); _OVER: if (content != NULL) taosMemoryFree(content); @@ -163,6 +163,7 @@ int32_t vmWriteVnodeListToFile(SVnodeMgmt *pMgmt) { if (ppVnodes == NULL) { terrno = TSDB_CODE_OUT_OF_MEMORY; code = -1; + dError("failed to write %s while get vnodelist", file); goto _OVER; } @@ -172,6 +173,7 @@ int32_t vmWriteVnodeListToFile(SVnodeMgmt *pMgmt) { if (content == NULL) { terrno = TSDB_CODE_OUT_OF_MEMORY; code = -1; + dError("failed to write %s while malloc content", file); goto _OVER; } @@ -213,6 +215,12 @@ _OVER: if (code != 0) return -1; - dDebug("successed to write %s, numOfVnodes:%d", realfile, numOfVnodes); - return taosRenameFile(file, realfile); + dInfo("successed to write %s, numOfVnodes:%d", realfile, numOfVnodes); + code = taosRenameFile(file, realfile); + + if (code != 0) { + dError("failed to rename %s to %s", file, realfile); + } + + return code; } \ No newline at end of file diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c index bc46772858..082fe7341b 100644 --- a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c +++ b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c @@ -213,7 +213,7 @@ int32_t vmProcessCreateVnodeReq(SVnodeMgmt *pMgmt, SRpcMsg *pMsg) { SVnodeObj *pVnode = vmAcquireVnode(pMgmt, req.vgId); if (pVnode != NULL) { - dDebug("vgId:%d, already exist", req.vgId); + dInfo("vgId:%d, already exist", req.vgId); tFreeSCreateVnodeReq(&req); vmReleaseVnode(pMgmt, pVnode); terrno = TSDB_CODE_VND_ALREADY_EXIST; @@ -358,7 +358,7 @@ int32_t vmProcessDropVnodeReq(SVnodeMgmt *pMgmt, SRpcMsg *pMsg) { } int32_t vgId = dropReq.vgId; - dDebug("vgId:%d, start to drop vnode", vgId); + dInfo("vgId:%d, start to drop vnode", vgId); if (dropReq.dnodeId != pMgmt->pData->dnodeId) { terrno = TSDB_CODE_INVALID_MSG; @@ -368,7 +368,7 @@ int32_t vmProcessDropVnodeReq(SVnodeMgmt *pMgmt, SRpcMsg *pMsg) { SVnodeObj *pVnode = vmAcquireVnode(pMgmt, vgId); if (pVnode == NULL) { - dDebug("vgId:%d, failed to drop since %s", vgId, terrstr()); + dInfo("vgId:%d, failed to drop since %s", vgId, terrstr()); terrno = TSDB_CODE_VND_NOT_EXIST; return -1; } @@ -383,6 +383,7 @@ int32_t vmProcessDropVnodeReq(SVnodeMgmt *pMgmt, SRpcMsg *pMsg) { vmCloseVnode(pMgmt, pVnode); vmWriteVnodeListToFile(pMgmt); + dInfo("vgId:%d, is dropped", vgId); return 0; } diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c index 313a88fc5c..f808c67ef6 100644 --- a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c +++ b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c @@ -138,7 +138,7 @@ static void *vmOpenVnodeInThread(void *param) { SVnodeMgmt *pMgmt = pThread->pMgmt; char path[TSDB_FILENAME_LEN]; - dDebug("thread:%d, start to open %d vnodes", pThread->threadIndex, pThread->vnodeNum); + dInfo("thread:%d, start to open %d vnodes", pThread->threadIndex, pThread->vnodeNum); setThreadName("open-vnodes"); for (int32_t v = 0; v < pThread->vnodeNum; ++v) { @@ -156,14 +156,14 @@ static void *vmOpenVnodeInThread(void *param) { pThread->failed++; } else { vmOpenVnode(pMgmt, pCfg, pImpl); - dDebug("vgId:%d, is opened by thread:%d", pCfg->vgId, pThread->threadIndex); + dInfo("vgId:%d, is opened by thread:%d", pCfg->vgId, pThread->threadIndex); pThread->opened++; atomic_add_fetch_32(&pMgmt->state.openVnodes, 1); } } - dDebug("thread:%d, numOfVnodes:%d, opened:%d failed:%d", pThread->threadIndex, pThread->vnodeNum, pThread->opened, - pThread->failed); + dInfo("thread:%d, numOfVnodes:%d, opened:%d failed:%d", pThread->threadIndex, pThread->vnodeNum, pThread->opened, + pThread->failed); return NULL; } @@ -496,7 +496,7 @@ static void *vmRestoreVnodeInThread(void *param) { dError("vgId:%d, failed to restore vnode by thread:%d", pVnode->vgId, pThread->threadIndex); pThread->failed++; } else { - dDebug("vgId:%d, is restored by thread:%d", pVnode->vgId, pThread->threadIndex); + dInfo("vgId:%d, is restored by thread:%d", pVnode->vgId, pThread->threadIndex); pThread->opened++; atomic_add_fetch_32(&pMgmt->state.openVnodes, 1); } From c90a632f42316ba29f442cb145b60de59a4e19fa Mon Sep 17 00:00:00 2001 From: 54liuyao <54liuyao@163.com> Date: Wed, 28 Dec 2022 15:00:57 +0800 Subject: [PATCH 07/40] fix:fill operator fill next issue --- source/libs/executor/src/tfill.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/source/libs/executor/src/tfill.c b/source/libs/executor/src/tfill.c index ab1feabf60..2d921d43d3 100644 --- a/source/libs/executor/src/tfill.c +++ b/source/libs/executor/src/tfill.c @@ -39,14 +39,10 @@ static void doSetVal(SColumnInfoData* pDstColInfoData, int32_t rowIndex, const S static void setNotFillColumn(SFillInfo* pFillInfo, SColumnInfoData* pDstColInfo, int32_t rowIndex, int32_t colIdx) { SRowVal* p = NULL; - if (FILL_IS_ASC_FILL(pFillInfo)) { - if (pFillInfo->prev.key != 0) { - p = &pFillInfo->prev; // prev has been set value - } else { // otherwise, use the value in the next row - p = &pFillInfo->next; - } + if (pFillInfo->type == TSDB_FILL_NEXT) { + p = FILL_IS_ASC_FILL(pFillInfo) ? &pFillInfo->next : &pFillInfo->prev; } else { - p = &pFillInfo->next; + p = FILL_IS_ASC_FILL(pFillInfo) ? &pFillInfo->prev : &pFillInfo->next; } SGroupKeys* pKey = taosArrayGet(p->pRowVal, colIdx); @@ -257,9 +253,16 @@ static void copyCurrentRowIntoBuf(SFillInfo* pFillInfo, int32_t rowIndex, SRowVa for (int32_t i = 0; i < pFillInfo->numOfCols; ++i) { int32_t type = pFillInfo->pFillCol[i].pExpr->pExpr->nodeType; - if (type == QUERY_NODE_COLUMN || type == QUERY_NODE_OPERATOR || type == QUERY_NODE_FUNCTION) { + if ( type == QUERY_NODE_COLUMN || type == QUERY_NODE_OPERATOR || type == QUERY_NODE_FUNCTION) { + if (!pFillInfo->pFillCol[i].notFillCol && pFillInfo->type != TSDB_FILL_NEXT) { + continue; + } int32_t srcSlotId = GET_DEST_SLOT_ID(&pFillInfo->pFillCol[i]); + if (srcSlotId == pFillInfo->srcTsSlotId && pFillInfo->type == TSDB_FILL_LINEAR) { + continue; + } + SColumnInfoData* pSrcCol = taosArrayGet(pFillInfo->pSrcBlock->pDataBlock, srcSlotId); bool isNull = colDataIsNull_s(pSrcCol, rowIndex); @@ -288,8 +291,12 @@ static int32_t fillResultImpl(SFillInfo* pFillInfo, SSDataBlock* pBlock, int32_t int64_t ts = ((int64_t*)pTsCol->pData)[pFillInfo->index]; // set the next value for interpolation - if ((pFillInfo->currentKey < ts && ascFill) || (pFillInfo->currentKey > ts && !ascFill)) { - copyCurrentRowIntoBuf(pFillInfo, pFillInfo->index, &pFillInfo->next); + if (pFillInfo->currentKey < ts && ascFill) { + SRowVal* pRVal = pFillInfo->type == TSDB_FILL_NEXT ? &pFillInfo->next : &pFillInfo->prev; + copyCurrentRowIntoBuf(pFillInfo, pFillInfo->index, pRVal); + } else if (pFillInfo->currentKey > ts && !ascFill) { + SRowVal* pRVal = pFillInfo->type == TSDB_FILL_NEXT ? &pFillInfo->prev : &pFillInfo->next; + copyCurrentRowIntoBuf(pFillInfo, pFillInfo->index, pRVal); } if (((pFillInfo->currentKey < ts && ascFill) || (pFillInfo->currentKey > ts && !ascFill)) && From ec75ddec833e995da143076c839e9acfa29177cc Mon Sep 17 00:00:00 2001 From: Ganlin Zhao Date: Wed, 28 Dec 2022 17:27:23 +0800 Subject: [PATCH 08/40] fix(query): fix count/hyperloglog return additional row in group by when queryPolicy is set to 3. --- include/libs/nodes/plannodes.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/libs/nodes/plannodes.h b/include/libs/nodes/plannodes.h index d62bdb93cf..d885665117 100644 --- a/include/libs/nodes/plannodes.h +++ b/include/libs/nodes/plannodes.h @@ -121,6 +121,7 @@ typedef struct SAggLogicNode { bool hasLast; bool hasTimeLineFunc; bool onlyHasKeepOrderFunc; + bool hasGroupKeyOptimized; } SAggLogicNode; typedef struct SProjectLogicNode { @@ -402,6 +403,7 @@ typedef struct SAggPhysiNode { SNodeList* pGroupKeys; SNodeList* pAggFuncs; bool mergeDataBlock; + bool groupKeyOptimized; } SAggPhysiNode; typedef struct SDownstreamSourceNode { From b55af6372cecf70b6b0e5377e0766d9dbb9abffb Mon Sep 17 00:00:00 2001 From: Ganlin Zhao Date: Wed, 28 Dec 2022 17:27:23 +0800 Subject: [PATCH 09/40] fix(query): fix count/hyperloglog return additional row in group by when queryPolicy is set to 3. --- source/libs/nodes/src/nodesCloneFuncs.c | 1 + source/libs/nodes/src/nodesCodeFuncs.c | 7 +++++++ source/libs/nodes/src/nodesMsgFuncs.c | 9 ++++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/source/libs/nodes/src/nodesCloneFuncs.c b/source/libs/nodes/src/nodesCloneFuncs.c index 7b1cb514a6..7b9c54ab2c 100644 --- a/source/libs/nodes/src/nodesCloneFuncs.c +++ b/source/libs/nodes/src/nodesCloneFuncs.c @@ -402,6 +402,7 @@ static int32_t logicAggCopy(const SAggLogicNode* pSrc, SAggLogicNode* pDst) { COPY_BASE_OBJECT_FIELD(node, logicNodeCopy); CLONE_NODE_LIST_FIELD(pGroupKeys); CLONE_NODE_LIST_FIELD(pAggFuncs); + COPY_SCALAR_FIELD(hasGroupKeyOptimized); return TSDB_CODE_SUCCESS; } diff --git a/source/libs/nodes/src/nodesCodeFuncs.c b/source/libs/nodes/src/nodesCodeFuncs.c index 1dab60876a..1a4ba8e43e 100644 --- a/source/libs/nodes/src/nodesCodeFuncs.c +++ b/source/libs/nodes/src/nodesCodeFuncs.c @@ -1829,6 +1829,7 @@ static const char* jkAggPhysiPlanExprs = "Exprs"; static const char* jkAggPhysiPlanGroupKeys = "GroupKeys"; static const char* jkAggPhysiPlanAggFuncs = "AggFuncs"; static const char* jkAggPhysiPlanMergeDataBlock = "MergeDataBlock"; +static const char* jkAggPhysiPlanGroupKeyOptimized = "GroupKeyOptimized"; static int32_t physiAggNodeToJson(const void* pObj, SJson* pJson) { const SAggPhysiNode* pNode = (const SAggPhysiNode*)pObj; @@ -1846,6 +1847,9 @@ static int32_t physiAggNodeToJson(const void* pObj, SJson* pJson) { if (TSDB_CODE_SUCCESS == code) { code = tjsonAddBoolToObject(pJson, jkAggPhysiPlanMergeDataBlock, pNode->mergeDataBlock); } + if (TSDB_CODE_SUCCESS == code) { + code = tjsonAddBoolToObject(pJson, jkAggPhysiPlanGroupKeyOptimized, pNode->groupKeyOptimized); + } return code; } @@ -1866,6 +1870,9 @@ static int32_t jsonToPhysiAggNode(const SJson* pJson, void* pObj) { if (TSDB_CODE_SUCCESS == code) { code = tjsonGetBoolValue(pJson, jkAggPhysiPlanMergeDataBlock, &pNode->mergeDataBlock); } + if (TSDB_CODE_SUCCESS == code) { + code = tjsonGetBoolValue(pJson, jkAggPhysiPlanGroupKeyOptimized, &pNode->groupKeyOptimized); + } return code; } diff --git a/source/libs/nodes/src/nodesMsgFuncs.c b/source/libs/nodes/src/nodesMsgFuncs.c index 0ac2581689..dfe2f6c8b9 100644 --- a/source/libs/nodes/src/nodesMsgFuncs.c +++ b/source/libs/nodes/src/nodesMsgFuncs.c @@ -2370,7 +2370,8 @@ enum { PHY_AGG_CODE_EXPR, PHY_AGG_CODE_GROUP_KEYS, PHY_AGG_CODE_AGG_FUNCS, - PHY_AGG_CODE_MERGE_DATA_BLOCK + PHY_AGG_CODE_MERGE_DATA_BLOCK, + PHY_AGG_CODE_GROUP_KEY_OPTIMIZE }; static int32_t physiAggNodeToMsg(const void* pObj, STlvEncoder* pEncoder) { @@ -2389,6 +2390,9 @@ static int32_t physiAggNodeToMsg(const void* pObj, STlvEncoder* pEncoder) { if (TSDB_CODE_SUCCESS == code) { code = tlvEncodeBool(pEncoder, PHY_AGG_CODE_MERGE_DATA_BLOCK, pNode->mergeDataBlock); } + if (TSDB_CODE_SUCCESS == code) { + code = tlvEncodeBool(pEncoder, PHY_AGG_CODE_GROUP_KEY_OPTIMIZE, pNode->groupKeyOptimized); + } return code; } @@ -2415,6 +2419,9 @@ static int32_t msgToPhysiAggNode(STlvDecoder* pDecoder, void* pObj) { case PHY_AGG_CODE_MERGE_DATA_BLOCK: code = tlvDecodeBool(pTlv, &pNode->mergeDataBlock); break; + case PHY_AGG_CODE_GROUP_KEY_OPTIMIZE: + code = tlvDecodeBool(pTlv, &pNode->groupKeyOptimized); + break; default: break; } From 7bd98ec700f48eac97fcafd03addf14b07dc6688 Mon Sep 17 00:00:00 2001 From: Ganlin Zhao Date: Wed, 28 Dec 2022 17:27:23 +0800 Subject: [PATCH 10/40] fix(query): fix count/hyperloglog return additional row in group by when queryPolicy is set to 3. --- source/libs/planner/src/planLogicCreater.c | 1 + source/libs/planner/src/planOptimizer.c | 1 + source/libs/planner/src/planPhysiCreater.c | 1 + 3 files changed, 3 insertions(+) diff --git a/source/libs/planner/src/planLogicCreater.c b/source/libs/planner/src/planLogicCreater.c index daefa60af3..55e8dc7b49 100644 --- a/source/libs/planner/src/planLogicCreater.c +++ b/source/libs/planner/src/planLogicCreater.c @@ -545,6 +545,7 @@ static int32_t createAggLogicNode(SLogicPlanContext* pCxt, SSelectStmt* pSelect, pAgg->hasLastRow = pSelect->hasLastRowFunc; pAgg->hasLast = pSelect->hasLastFunc; pAgg->hasTimeLineFunc = pSelect->hasTimeLineFunc; + pAgg->hasGroupKeyOptimized = false; pAgg->onlyHasKeepOrderFunc = pSelect->onlyHasKeepOrderFunc; pAgg->node.groupAction = getGroupAction(pCxt, pSelect); pAgg->node.requireDataOrder = getRequireDataOrder(pAgg->hasTimeLineFunc, pSelect); diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c index e1687fc3a5..b6f70b5f82 100644 --- a/source/libs/planner/src/planOptimizer.c +++ b/source/libs/planner/src/planOptimizer.c @@ -1570,6 +1570,7 @@ static int32_t partTagsOptimize(SOptimizeContext* pCxt, SLogicSubplan* pLogicSub } } NODES_DESTORY_LIST(pAgg->pGroupKeys); + pAgg->hasGroupKeyOptimized = true; if (TSDB_CODE_SUCCESS == code && start >= 0) { code = partTagsRewriteGroupTagsToFuncs(pScan->pGroupTags, start, pAgg); } diff --git a/source/libs/planner/src/planPhysiCreater.c b/source/libs/planner/src/planPhysiCreater.c index e5675310b5..df10fe8ee3 100644 --- a/source/libs/planner/src/planPhysiCreater.c +++ b/source/libs/planner/src/planPhysiCreater.c @@ -872,6 +872,7 @@ static int32_t createAggPhysiNode(SPhysiPlanContext* pCxt, SNodeList* pChildren, } pAgg->mergeDataBlock = (GROUP_ACTION_KEEP == pAggLogicNode->node.groupAction ? false : true); + pAgg->groupKeyOptimized = pAggLogicNode->hasGroupKeyOptimized; SNodeList* pPrecalcExprs = NULL; SNodeList* pGroupKeys = NULL; From 24b2ee0ffffc063ff4298e6eef9af23fb387c442 Mon Sep 17 00:00:00 2001 From: Ganlin Zhao Date: Wed, 28 Dec 2022 17:27:23 +0800 Subject: [PATCH 11/40] fix(query): fix count/hyperloglog return additional row in group by when queryPolicy is set to 3. --- source/libs/executor/src/executorimpl.c | 7 +++++++ source/libs/function/src/builtinsimpl.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c index 96425e0c14..c064bb5ef6 100644 --- a/source/libs/executor/src/executorimpl.c +++ b/source/libs/executor/src/executorimpl.c @@ -83,6 +83,7 @@ typedef struct SAggOperatorInfo { uint64_t groupId; SGroupResInfo groupResInfo; SExprSupp scalarExprSup; + bool groupKeyOptimized; } SAggOperatorInfo; static void setBlockSMAInfo(SqlFunctionCtx* pCtx, SExprInfo* pExpr, SSDataBlock* pBlock); @@ -1360,6 +1361,11 @@ static int32_t createDataBlockForEmptyInput(SOperatorInfo* pOperator, SSDataBloc return TSDB_CODE_SUCCESS; } + SAggOperatorInfo* pAggInfo = pOperator->info; + if (pAggInfo->groupKeyOptimized) { + return TSDB_CODE_SUCCESS; + } + SOperatorInfo* downstream = pOperator->pDownstream[0]; if (downstream->operatorType == QUERY_NODE_PHYSICAL_PLAN_PARTITION || (downstream->operatorType == QUERY_NODE_PHYSICAL_PLAN_TABLE_SCAN && @@ -1762,6 +1768,7 @@ SOperatorInfo* createAggregateOperatorInfo(SOperatorInfo* downstream, SAggPhysiN } pInfo->binfo.mergeResultBlock = pAggNode->mergeDataBlock; + pInfo->groupKeyOptimized = pAggNode->groupKeyOptimized; pInfo->groupId = UINT64_MAX; setOperatorInfo(pOperator, "TableAggregate", QUERY_NODE_PHYSICAL_PLAN_HASH_AGG, true, OP_NOT_OPENED, pInfo, diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c index cfc8ae1a40..3f2c5ae345 100644 --- a/source/libs/function/src/builtinsimpl.c +++ b/source/libs/function/src/builtinsimpl.c @@ -540,7 +540,7 @@ int32_t countFunction(SqlFunctionCtx* pCtx) { if (IS_NULL_TYPE(type)) { // select count(NULL) returns 0 numOfElem = 1; - *((int64_t*)buf) = 0; + *((int64_t*)buf) += 0; } else { numOfElem = getNumOfElems(pCtx); *((int64_t*)buf) += numOfElem; From 8460171cb6e11310a2793d745c08e3348f1e1e4f Mon Sep 17 00:00:00 2001 From: Ganlin Zhao Date: Wed, 28 Dec 2022 17:27:23 +0800 Subject: [PATCH 12/40] fix(query): fix count/hyperloglog return additional row in group by when queryPolicy is set to 3. --- source/libs/planner/src/planOptimizer.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c index b6f70b5f82..4c0d90846f 100644 --- a/source/libs/planner/src/planOptimizer.c +++ b/source/libs/planner/src/planOptimizer.c @@ -1546,6 +1546,10 @@ static int32_t partTagsOptimize(SOptimizeContext* pCxt, SLogicSubplan* pLogicSub if (TSDB_CODE_SUCCESS == code) { NODES_CLEAR_LIST(pNode->pChildren); nodesDestroyNode((SNode*)pNode); + if (QUERY_NODE_LOGIC_PLAN_AGG == pNode->pParent->type) { + SAggLogicNode* pParent = (SAggLogicNode*)(pNode->pParent); + pParent->hasGroupKeyOptimized = true; + } } } else { SAggLogicNode* pAgg = (SAggLogicNode*)pNode; @@ -1578,6 +1582,7 @@ static int32_t partTagsOptimize(SOptimizeContext* pCxt, SLogicSubplan* pLogicSub if (TSDB_CODE_SUCCESS == code) { code = partTagsOptRebuildTbanme(pScan->pGroupTags); } + pCxt->optimized = true; return code; } From 011c83956b5ffb6f0f1fd29d81ebb56cfdee6a55 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Wed, 28 Dec 2022 19:12:36 +0800 Subject: [PATCH 13/40] refactor: do some internal refactor. --- include/util/tcompare.h | 29 ++-- source/libs/scalar/src/filter.c | 18 +- source/libs/scalar/src/sclvector.c | 4 +- source/util/src/tcompare.c | 267 +++++++++++++++++------------ source/util/test/utilTests.cpp | 235 +++++++++++++++++++++++++ 5 files changed, 425 insertions(+), 128 deletions(-) diff --git a/include/util/tcompare.h b/include/util/tcompare.h index c7a3ca20f2..f92e1c3970 100644 --- a/include/util/tcompare.h +++ b/include/util/tcompare.h @@ -36,17 +36,18 @@ extern "C" { #define FLT_GREATEREQUAL(_x, _y) (FLT_EQUAL((_x), (_y)) || ((_x) > (_y))) #define FLT_LESSEQUAL(_x, _y) (FLT_EQUAL((_x), (_y)) || ((_x) < (_y))) -#define PATTERN_COMPARE_INFO_INITIALIZER \ - { '%', '_' } +#define PATTERN_COMPARE_INFO_INITIALIZER { '%', '_', L'%', L'_' } typedef struct SPatternCompareInfo { - char matchAll; // symbol for match all wildcard, default: '%' - char matchOne; // symbol for match one wildcard, default: '_' + char matchAll; // symbol for match all wildcard, default: '%' + char matchOne; // symbol for match one wildcard, default: '_' + TdUcs4 umatchAll; // unicode version matchAll + TdUcs4 umatchOne; // unicode version matchOne } SPatternCompareInfo; -int32_t patternMatch(const char *pattern, const char *str, size_t size, const SPatternCompareInfo *pInfo); +int32_t patternMatch(const char *pattern, size_t psize, const char *str, size_t ssize, const SPatternCompareInfo *pInfo); -int32_t WCSPatternMatch(const TdUcs4 *pattern, const TdUcs4 *str, size_t size, const SPatternCompareInfo *pInfo); +int32_t wcsPatternMatch(const TdUcs4 *pattern, size_t psize, const TdUcs4 *str, size_t ssize, const SPatternCompareInfo *pInfo); int32_t taosArrayCompareString(const void *a, const void *b); @@ -79,9 +80,11 @@ int32_t compareDoubleVal(const void *pLeft, const void *pRight); int32_t compareLenPrefixedStr(const void *pLeft, const void *pRight); int32_t compareLenPrefixedWStr(const void *pLeft, const void *pRight); -int32_t compareStrRegexComp(const void *pLeft, const void *pRight); -int32_t compareStrRegexCompMatch(const void *pLeft, const void *pRight); -int32_t compareStrRegexCompNMatch(const void *pLeft, const void *pRight); +int32_t comparestrRegexMatch(const void *pLeft, const void *pRight); +int32_t comparestrRegexNMatch(const void *pLeft, const void *pRight); + +int32_t comparewcsRegexMatch(const void *pLeft, const void *pRight); +int32_t comparewcsRegexNMatch(const void *pLeft, const void *pRight); int32_t compareInt8ValDesc(const void *pLeft, const void *pRight); int32_t compareInt16ValDesc(const void *pLeft, const void *pRight); @@ -99,11 +102,11 @@ int32_t compareUint64ValDesc(const void *pLeft, const void *pRight); int32_t compareLenPrefixedStrDesc(const void *pLeft, const void *pRight); int32_t compareLenPrefixedWStrDesc(const void *pLeft, const void *pRight); -int32_t compareStrPatternMatch(const void *pLeft, const void *pRight); -int32_t compareStrPatternNotMatch(const void *pLeft, const void *pRight); +int32_t comparestrPatternMatch(const void *pLeft, const void *pRight); +int32_t comparestrPatternNMatch(const void *pLeft, const void *pRight); -int32_t compareWStrPatternMatch(const void *pLeft, const void *pRight); -int32_t compareWStrPatternNotMatch(const void *pLeft, const void *pRight); +int32_t comparewcsPatternMatch(const void *pLeft, const void *pRight); +int32_t comparewcsPatternNMatch(const void *pLeft, const void *pRight); int32_t compareInt8Int16(const void *pLeft, const void *pRight); int32_t compareInt8Int32(const void *pLeft, const void *pRight); diff --git a/source/libs/scalar/src/filter.c b/source/libs/scalar/src/filter.c index 063699e8e4..8b7651765b 100644 --- a/source/libs/scalar/src/filter.c +++ b/source/libs/scalar/src/filter.c @@ -130,9 +130,9 @@ __compar_fn_t gDataCompare[] = {compareInt32Val, compareFloatVal, compareDoubleVal, compareLenPrefixedStr, - compareStrPatternMatch, + comparestrPatternMatch, compareChkInString, - compareWStrPatternMatch, + comparewcsPatternMatch, compareLenPrefixedWStr, compareUint8Val, compareUint16Val, @@ -142,15 +142,17 @@ __compar_fn_t gDataCompare[] = {compareInt32Val, setChkInBytes2, setChkInBytes4, setChkInBytes8, - compareStrRegexCompMatch, - compareStrRegexCompNMatch, + comparestrRegexMatch, + comparestrRegexNMatch, setChkNotInBytes1, setChkNotInBytes2, setChkNotInBytes4, setChkNotInBytes8, compareChkNotInString, - compareStrPatternNotMatch, - compareWStrPatternNotMatch}; + comparestrPatternNMatch, + comparewcsPatternNMatch, + comparewcsRegexMatch, + comparewcsRegexNMatch,}; __compar_fn_t gInt8SignCompare[] = {compareInt8Val, compareInt8Int16, compareInt8Int32, compareInt8Int64, compareInt8Float, compareInt8Double}; @@ -295,9 +297,9 @@ int8_t filterGetCompFuncIdx(int32_t type, int32_t optr) { case TSDB_DATA_TYPE_NCHAR: { if (optr == OP_TYPE_MATCH) { - comparFn = 19; + comparFn = 28; } else if (optr == OP_TYPE_NMATCH) { - comparFn = 20; + comparFn = 29; } else if (optr == OP_TYPE_LIKE) { comparFn = 9; } else if (optr == OP_TYPE_NOT_LIKE) { diff --git a/source/libs/scalar/src/sclvector.c b/source/libs/scalar/src/sclvector.c index 2eb12c8269..24ac5be845 100644 --- a/source/libs/scalar/src/sclvector.c +++ b/source/libs/scalar/src/sclvector.c @@ -916,9 +916,11 @@ int32_t vectorGetConvertType(int32_t type1, int32_t type2) { int32_t vectorConvertSingleCol(SScalarParam *input, SScalarParam *output, int32_t type, int32_t startIndex, int32_t numOfRows) { - SDataType t = {.type = type, .bytes = tDataTypes[type].bytes}; output->numOfRows = input->numOfRows; + SDataType t = {.type = type}; + t.bytes = IS_VAR_DATA_TYPE(t.type)? input->columnData->info.bytes:tDataTypes[type].bytes; + int32_t code = sclCreateColumnInfoData(&t, input->numOfRows, output); if (code != TSDB_CODE_SUCCESS) { return TSDB_CODE_OUT_OF_MEMORY; diff --git a/source/util/src/tcompare.c b/source/util/src/tcompare.c index 32e27f886b..21e7d9e0cd 100644 --- a/source/util/src/tcompare.c +++ b/source/util/src/tcompare.c @@ -1007,59 +1007,66 @@ int32_t compareJsonValDesc(const void *pLeft, const void *pRight) { return compa * '_': Matches one character * */ -int32_t patternMatch(const char *patterStr, const char *str, size_t size, const SPatternCompareInfo *pInfo) { +int32_t patternMatch(const char *pattern, size_t psize, const char *str, size_t ssize, const SPatternCompareInfo *pInfo) { char c, c1; int32_t i = 0; int32_t j = 0; - int32_t o = 0; - int32_t m = 0; + int32_t nMatchChar = 0; - while ((c = patterStr[i++]) != 0) { + while ((c = pattern[i++]) != 0 && (i <= psize)) { if (c == pInfo->matchAll) { /* Match "*" */ - while ((c = patterStr[i++]) == pInfo->matchAll || c == pInfo->matchOne) { + while ((c = pattern[i++]) == pInfo->matchAll || c == pInfo->matchOne) { + if (i > psize) { // overflow check + break; + } + if (c == pInfo->matchOne) { - if (j > size || str[j++] == 0) { - // empty string, return not match + if (j > ssize || str[j++] == 0) { // empty string, return not match return TSDB_PATTERN_NOWILDCARDMATCH; } else { - ++o; + ++nMatchChar; } } } - if (c == 0) { + if (c == 0 || i > psize) { return TSDB_PATTERN_MATCH; /* "*" at the end of the pattern matches */ } - char next[3] = {toupper(c), tolower(c), 0}; - m = o; - while (1) { - size_t n = strcspn(str + m, next); - str += m + n; + char acceptArray[3] = {toupper(c), tolower(c), 0}; - if (str[0] == 0 || (n >= size)) { + str += nMatchChar; + int32_t remain = ssize - nMatchChar; + while (1) { + size_t n = strcspn(str, acceptArray); + + str += n; + remain -= n; + + if (str[0] == 0 || (remain <= 0)) { break; } - int32_t ret = patternMatch(&patterStr[i], ++str, size - n - 1, pInfo); + int32_t ret = patternMatch(&pattern[i], psize - i, ++str, --remain, pInfo); if (ret != TSDB_PATTERN_NOMATCH) { return ret; } - m = 0; } + return TSDB_PATTERN_NOWILDCARDMATCH; } c1 = str[j++]; - ++o; + ++nMatchChar; - if (j <= size) { - if (c == '\\' && patterStr[i] == '_' && c1 == '_') { + if (j <= ssize) { + if (c == '\\' && pattern[i] == '_' && c1 == '_') { i++; continue; } + if (c == c1 || tolower(c) == tolower(c1) || (c == pInfo->matchOne && c1 != 0)) { continue; } @@ -1068,39 +1075,52 @@ int32_t patternMatch(const char *patterStr, const char *str, size_t size, const return TSDB_PATTERN_NOMATCH; } - return (str[j] == 0 || j >= size) ? TSDB_PATTERN_MATCH : TSDB_PATTERN_NOMATCH; + return (str[j] == 0 || j >= ssize) ? TSDB_PATTERN_MATCH : TSDB_PATTERN_NOMATCH; } -int32_t WCSPatternMatch(const TdUcs4 *pattern, const TdUcs4 *str, size_t size, const SPatternCompareInfo *pInfo) { +int32_t wcsPatternMatch(const TdUcs4 *pattern, size_t psize, const TdUcs4 *str, size_t ssize, const SPatternCompareInfo *pInfo) { TdUcs4 c, c1; - TdUcs4 matchOne = L'_'; // "_" - TdUcs4 matchAll = L'%'; // "%" int32_t i = 0; int32_t j = 0; + int32_t nMatchChar = 0; - while ((c = pattern[i++]) != 0) { - if (c == matchAll) { /* Match "%" */ - - while ((c = pattern[i++]) == matchAll || c == matchOne) { - if (c == matchOne && (j >= size || str[j++] == 0)) { - return TSDB_PATTERN_NOWILDCARDMATCH; - } - } - if (c == 0) { - return TSDB_PATTERN_MATCH; - } - - TdUcs4 accept[3] = {towupper(c), towlower(c), 0}; - while (1) { - size_t n = wcscspn(str, accept); - - str += n; - if (str[0] == 0 || (n >= size)) { + while ((c = pattern[i++]) != 0 && (i <= psize)) { + /* Match "%" */ + if (c == pInfo->umatchAll) { + while ((c = pattern[i++]) == pInfo->umatchAll || c == pInfo->umatchOne) { + if (i > psize) { break; } - int32_t ret = WCSPatternMatch(&pattern[i], ++str, size - n - 1, pInfo); + if (c == pInfo->umatchOne) { + if (j >= ssize || str[j++] == 0) { + return TSDB_PATTERN_NOWILDCARDMATCH; + } else { + ++nMatchChar; + } + } + } + + if (c == 0 || i > psize) { + return TSDB_PATTERN_MATCH; + } + + TdUcs4 acceptArray[3] = {towupper(c), towlower(c), 0}; + + str += nMatchChar; + int32_t remain = ssize - nMatchChar; + while (1) { + size_t n = wcscspn(str, acceptArray); + + str += n; + remain -= n; + + if (str[0] == 0 || (remain <= 0)) { + break; + } + + int32_t ret = wcsPatternMatch(&pattern[i], psize-i, ++str, --remain, pInfo); if (ret != TSDB_PATTERN_NOMATCH) { return ret; } @@ -1110,9 +1130,15 @@ int32_t WCSPatternMatch(const TdUcs4 *pattern, const TdUcs4 *str, size_t size, c } c1 = str[j++]; + nMatchChar++; - if (j <= size) { - if (c == c1 || towlower(c) == towlower(c1) || (c == matchOne && c1 != 0)) { + if (j <= ssize) { + if (c == L'\\' && pattern[i] == L'_' && c1 == L'_') { + i++; + continue; + } + + if (c == c1 || towlower(c) == towlower(c1) || (c == pInfo->umatchOne && c1 != 0)) { continue; } } @@ -1120,16 +1146,38 @@ int32_t WCSPatternMatch(const TdUcs4 *pattern, const TdUcs4 *str, size_t size, c return TSDB_PATTERN_NOMATCH; } - return (str[j] == 0 || j >= size) ? TSDB_PATTERN_MATCH : TSDB_PATTERN_NOMATCH; + return (str[j] == 0 || j >= ssize) ? TSDB_PATTERN_MATCH : TSDB_PATTERN_NOMATCH; } -int32_t compareStrRegexCompMatch(const void *pLeft, const void *pRight) { return compareStrRegexComp(pLeft, pRight); } - -int32_t compareStrRegexCompNMatch(const void *pLeft, const void *pRight) { - return compareStrRegexComp(pLeft, pRight) ? 0 : 1; +int32_t comparestrRegexNMatch(const void *pLeft, const void *pRight) { + return comparestrRegexMatch(pLeft, pRight) ? 0 : 1; } -int32_t compareStrRegexComp(const void *pLeft, const void *pRight) { +static int32_t doExecRegexMatch(const char *pString, const char *pPattern) { + int32_t ret = 0; + regex_t regex; + char msgbuf[256] = {0}; + + int32_t cflags = REG_EXTENDED; + if ((ret = regcomp(®ex, pPattern, cflags)) != 0) { + regerror(ret, ®ex, msgbuf, tListLen(msgbuf)); + + uError("Failed to compile regex pattern %s. reason %s", pPattern, msgbuf); + regfree(®ex); + return 1; + } + + ret = regexec(®ex, pString, 0, NULL, 0); + if (ret != 0 && ret != REG_NOMATCH) { + regerror(ret, ®ex, msgbuf, sizeof(msgbuf)); + uDebug("Failed to match %s with pattern %s, reason %s", pString, pPattern, msgbuf) + } + + regfree(®ex); + return (ret == 0) ? 0 : 1; +} + +int32_t comparestrRegexMatch(const void *pLeft, const void *pRight) { size_t sz = varDataLen(pRight); char *pattern = taosMemoryMalloc(sz + 1); memcpy(pattern, varDataVal(pRight), varDataLen(pRight)); @@ -1140,30 +1188,48 @@ int32_t compareStrRegexComp(const void *pLeft, const void *pRight) { memcpy(str, varDataVal(pLeft), sz); str[sz] = 0; - int32_t errCode = 0; - regex_t regex; - char msgbuf[256] = {0}; + int32_t ret = doExecRegexMatch(str, pattern); - int32_t cflags = REG_EXTENDED; - if ((errCode = regcomp(®ex, pattern, cflags)) != 0) { - regerror(errCode, ®ex, msgbuf, sizeof(msgbuf)); - uError("Failed to compile regex pattern %s. reason %s", pattern, msgbuf); - regfree(®ex); - taosMemoryFree(str); - taosMemoryFree(pattern); - return 1; - } - - errCode = regexec(®ex, str, 0, NULL, 0); - if (errCode != 0 && errCode != REG_NOMATCH) { - regerror(errCode, ®ex, msgbuf, sizeof(msgbuf)); - uDebug("Failed to match %s with pattern %s, reason %s", str, pattern, msgbuf) - } - int32_t result = (errCode == 0) ? 0 : 1; - regfree(®ex); taosMemoryFree(str); taosMemoryFree(pattern); - return result; + + return (ret == 0) ? 0 : 1;; +} + +int32_t comparewcsRegexMatch(const void* pString, const void* pPattern) { + size_t len = varDataLen(pPattern); + char *pattern = taosMemoryMalloc(len + 1); + + int convertLen = taosUcs4ToMbs((TdUcs4 *)varDataVal(pPattern), len, pattern); + if (convertLen < 0) { + taosMemoryFree(pattern); + return TSDB_CODE_APP_ERROR; + } + + pattern[len] = 0; + + len = varDataLen(pString); + char *str = taosMemoryMalloc(len + 1); + convertLen = taosUcs4ToMbs((TdUcs4 *)varDataVal(pString), len, str); + if (convertLen < 0) { + taosMemoryFree(str); + taosMemoryFree(pattern); + + return TSDB_CODE_APP_ERROR; + } + + str[len] = 0; + + int32_t ret = doExecRegexMatch(str, pattern); + + taosMemoryFree(str); + taosMemoryFree(pattern); + + return (ret == 0) ? 0 : 1; +} + +int32_t comparewcsRegexNMatch(const void *pLeft, const void *pRight) { + return comparewcsRegexMatch(pLeft, pRight) ? 0 : 1; } int32_t taosArrayCompareString(const void *a, const void *b) { @@ -1173,46 +1239,35 @@ int32_t taosArrayCompareString(const void *a, const void *b) { return compareLenPrefixedStr(x, y); } -int32_t compareStrPatternMatch(const void *pLeft, const void *pRight) { - SPatternCompareInfo pInfo = {'%', '_'}; - - assert(varDataLen(pRight) <= TSDB_MAX_FIELD_LEN); - char *pattern = taosMemoryCalloc(varDataLen(pRight) + 1, sizeof(char)); - memcpy(pattern, varDataVal(pRight), varDataLen(pRight)); +int32_t comparestrPatternMatch(const void *pLeft, const void *pRight) { + SPatternCompareInfo pInfo = PATTERN_COMPARE_INFO_INITIALIZER; + ASSERT(varDataLen(pRight) <= TSDB_MAX_FIELD_LEN); + size_t pLen = varDataLen(pRight); size_t sz = varDataLen(pLeft); - char *buf = taosMemoryMalloc(sz + 1); - memcpy(buf, varDataVal(pLeft), sz); - buf[sz] = 0; - int32_t ret = patternMatch(pattern, buf, sz, &pInfo); - taosMemoryFree(buf); - taosMemoryFree(pattern); + int32_t ret = patternMatch(varDataVal(pRight), pLen, varDataVal(pLeft), sz, &pInfo); return (ret == TSDB_PATTERN_MATCH) ? 0 : 1; } -int32_t compareStrPatternNotMatch(const void *pLeft, const void *pRight) { - return compareStrPatternMatch(pLeft, pRight) ? 0 : 1; +int32_t comparestrPatternNMatch(const void *pLeft, const void *pRight) { + return comparestrPatternMatch(pLeft, pRight) ? 0 : 1; } -int32_t compareWStrPatternMatch(const void *pLeft, const void *pRight) { - SPatternCompareInfo pInfo = {'%', '_'}; +int32_t comparewcsPatternMatch(const void *pLeft, const void *pRight) { + SPatternCompareInfo pInfo = PATTERN_COMPARE_INFO_INITIALIZER; - ASSERT(varDataLen(pRight) <= TSDB_MAX_FIELD_LEN * TSDB_NCHAR_SIZE); - - char *pattern = taosMemoryCalloc(varDataLen(pRight) + TSDB_NCHAR_SIZE, 1); - memcpy(pattern, varDataVal(pRight), varDataLen(pRight)); - - int32_t ret = - WCSPatternMatch((TdUcs4 *)pattern, (TdUcs4 *)varDataVal(pLeft), varDataLen(pLeft) / TSDB_NCHAR_SIZE, &pInfo); - taosMemoryFree(pattern); + size_t psize = varDataLen(pRight); + int32_t ret = wcsPatternMatch((TdUcs4 *)varDataVal(pRight), psize / TSDB_NCHAR_SIZE, (TdUcs4 *)varDataVal(pLeft), + varDataLen(pLeft) / TSDB_NCHAR_SIZE, &pInfo); return (ret == TSDB_PATTERN_MATCH) ? 0 : 1; } -int32_t compareWStrPatternNotMatch(const void *pLeft, const void *pRight) { - return compareWStrPatternMatch(pLeft, pRight) ? 0 : 1; +int32_t comparewcsPatternNMatch(const void *pLeft, const void *pRight) { + return comparewcsPatternMatch(pLeft, pRight) ? 0 : 1; } + __compar_fn_t getComparFunc(int32_t type, int32_t optr) { __compar_fn_t comparFn = NULL; @@ -1285,13 +1340,13 @@ __compar_fn_t getComparFunc(int32_t type, int32_t optr) { break; case TSDB_DATA_TYPE_BINARY: { if (optr == OP_TYPE_MATCH) { - comparFn = compareStrRegexCompMatch; + comparFn = comparestrRegexMatch; } else if (optr == OP_TYPE_NMATCH) { - comparFn = compareStrRegexCompNMatch; + comparFn = comparestrRegexNMatch; } else if (optr == OP_TYPE_LIKE) { /* wildcard query using like operator */ - comparFn = compareStrPatternMatch; + comparFn = comparestrPatternMatch; } else if (optr == OP_TYPE_NOT_LIKE) { /* wildcard query using like operator */ - comparFn = compareStrPatternNotMatch; + comparFn = comparestrPatternNMatch; } else if (optr == OP_TYPE_IN) { comparFn = compareChkInString; } else if (optr == OP_TYPE_NOT_IN) { @@ -1305,13 +1360,13 @@ __compar_fn_t getComparFunc(int32_t type, int32_t optr) { case TSDB_DATA_TYPE_NCHAR: { if (optr == OP_TYPE_MATCH) { - comparFn = compareStrRegexCompMatch; + comparFn = comparewcsRegexMatch; } else if (optr == OP_TYPE_NMATCH) { - comparFn = compareStrRegexCompNMatch; + comparFn = comparewcsRegexNMatch; } else if (optr == OP_TYPE_LIKE) { - comparFn = compareWStrPatternMatch; + comparFn = comparewcsPatternMatch; } else if (optr == OP_TYPE_NOT_LIKE) { - comparFn = compareWStrPatternNotMatch; + comparFn = comparewcsPatternNMatch; } else if (optr == OP_TYPE_IN) { comparFn = compareChkInString; } else if (optr == OP_TYPE_NOT_IN) { diff --git a/source/util/test/utilTests.cpp b/source/util/test/utilTests.cpp index e69de29bb2..27496ff9b9 100644 --- a/source/util/test/utilTests.cpp +++ b/source/util/test/utilTests.cpp @@ -0,0 +1,235 @@ +#include +#include +#include + +#include "tarray.h" +#include "tcompare.h" + +namespace { +} // namespace + +TEST(utilTest, wchar_pattern_match_test) { + const TdWchar* pattern = L"%1"; + + int32_t ret = 0; + SPatternCompareInfo pInfo = PATTERN_COMPARE_INFO_INITIALIZER; + + const TdWchar* str0 = L"14"; + ret = wcsPatternMatch(reinterpret_cast(pattern), 2, reinterpret_cast(str0), wcslen(str0), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_NOWILDCARDMATCH); + + const TdWchar* str1 = L"11"; + ret = wcsPatternMatch(reinterpret_cast(pattern), 2, reinterpret_cast(str1), wcslen(str1), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_MATCH); + + const TdWchar* str2 = L"41"; + ret = wcsPatternMatch(reinterpret_cast(pattern), 2, reinterpret_cast(str2), wcslen(str2), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_MATCH); + + const TdWchar* pattern3 = L"%_"; + const TdWchar* str3 = L"88"; + ret = wcsPatternMatch(reinterpret_cast(pattern3), 2, reinterpret_cast(str3), wcslen(str3), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_MATCH); + + const TdWchar* pattern4 = L"%___"; + const TdWchar* str4 = L"88"; + ret = wcsPatternMatch(reinterpret_cast(pattern4), 4, reinterpret_cast(str4), wcslen(str4), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_NOWILDCARDMATCH); + + const TdWchar* pattern5 = L"%___"; + const TdWchar* str5 = L"883391"; + ret = wcsPatternMatch(reinterpret_cast(pattern5), 4, reinterpret_cast(str5), wcslen(str5), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_MATCH); + + const TdWchar* pattern6 = L"%___66"; + const TdWchar* str6 = L"88339166"; + ret = wcsPatternMatch(reinterpret_cast(pattern6), 6, reinterpret_cast(str6), wcslen(str6), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_MATCH); + + const TdWchar* pattern7 = L"%____66"; + const TdWchar* str7 = L"66166"; + ret = wcsPatternMatch(reinterpret_cast(pattern7), 7, reinterpret_cast(str7), wcslen(str7), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_NOWILDCARDMATCH); + + const TdWchar* pattern8 = L"6%____66"; + const TdWchar* str8 = L"666166"; + ret = wcsPatternMatch(reinterpret_cast(pattern8), 8, reinterpret_cast(str8), wcslen(str8), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_NOWILDCARDMATCH); + + const TdWchar* pattern9 = L"6\\__6"; + const TdWchar* str9 = L"6_66"; + ret = wcsPatternMatch(reinterpret_cast(pattern9), 6, reinterpret_cast(str9), wcslen(str9), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_MATCH); +} + +TEST(utilTest, wchar_pattern_match_no_terminated) { + const TdWchar* pattern = L"%1 "; + + int32_t ret = 0; + SPatternCompareInfo pInfo = PATTERN_COMPARE_INFO_INITIALIZER; + + const TdWchar* str0 = L"14 "; + ret = wcsPatternMatch(reinterpret_cast(pattern), 2, reinterpret_cast(str0), 2, &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_NOWILDCARDMATCH); + + const TdWchar* str1 = L"11 "; + ret = wcsPatternMatch(reinterpret_cast(pattern), 2, reinterpret_cast(str1), 2, &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_MATCH); + + const TdWchar* str2 = L"41 "; + ret = wcsPatternMatch(reinterpret_cast(pattern), 2, reinterpret_cast(str2), 2, &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_MATCH); + + const TdWchar* pattern3 = L"%_ "; + const TdWchar* str3 = L"88 "; + ret = wcsPatternMatch(reinterpret_cast(pattern3), 2, reinterpret_cast(str3), 2, &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_MATCH); + + const TdWchar* pattern4 = L"%___ "; + const TdWchar* str4 = L"88 "; + ret = wcsPatternMatch(reinterpret_cast(pattern4), 4, reinterpret_cast(str4), 2, &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_NOWILDCARDMATCH); + + const TdWchar* pattern5 = L"%___ "; + const TdWchar* str5 = L"883391 "; + ret = wcsPatternMatch(reinterpret_cast(pattern5), 4, reinterpret_cast(str5), 6, &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_MATCH); + + const TdWchar* pattern6 = L"%___66 "; + const TdWchar* str6 = L"88339166 "; + ret = wcsPatternMatch(reinterpret_cast(pattern6), 6, reinterpret_cast(str6), 8, &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_MATCH); + + const TdWchar* pattern7 = L"%____66 "; + const TdWchar* str7 = L"66166 "; + ret = wcsPatternMatch(reinterpret_cast(pattern7), 7, reinterpret_cast(str7), 5, &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_NOWILDCARDMATCH); + + const TdWchar* pattern8 = L"6%____66 "; + const TdWchar* str8 = L"666166 "; + ret = wcsPatternMatch(reinterpret_cast(pattern8), 8, reinterpret_cast(str8), 6, &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_NOWILDCARDMATCH); + + const TdWchar* pattern9 = L"6\\_6 "; + const TdWchar* str9 = L"6_6 "; + ret = wcsPatternMatch(reinterpret_cast(pattern9), 4, reinterpret_cast(str9), 3, &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_MATCH); + + const TdWchar* pattern10 = L"% "; + const TdWchar* str10 = L"6_6 "; + ret = wcsPatternMatch(reinterpret_cast(pattern10), 1, reinterpret_cast(str10), 3, &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_MATCH); +} + +TEST(utilTest, char_pattern_match_test) { + const char* pattern = "%1"; + + int32_t ret = 0; + SPatternCompareInfo pInfo = PATTERN_COMPARE_INFO_INITIALIZER; + + const char* str0 = "14"; + ret = patternMatch(pattern, 2, str0, strlen(str0), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_NOWILDCARDMATCH); + + const char* str1 = "11"; + ret = patternMatch(pattern, 2, str1, strlen(str1), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_MATCH); + + const char* str2 = "41"; + ret = patternMatch(pattern, 2, str2, strlen(str2), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_MATCH); + + const char* pattern3 = "%_"; + const char* str3 = "88"; + ret = patternMatch(pattern3, 2, str3, strlen(str3), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_MATCH); + + const char* pattern4 = "%___"; + const char* str4 = "88"; + ret = patternMatch(pattern4, 4, str4, strlen(str4), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_NOWILDCARDMATCH); + + const char* pattern5 = "%___"; + const char* str5 = "883391"; + ret = patternMatch(pattern5, 4, str5, strlen(str5), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_MATCH); + + const char* pattern6 = "%___66"; + const char* str6 = "88339166"; + ret = patternMatch(pattern6, 6, str6, strlen(str6), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_MATCH); + + const char* pattern7 = "%____66"; + const char* str7 = "66166"; + ret = patternMatch(pattern7, 7, str7, strlen(str7), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_NOWILDCARDMATCH); + + const char* pattern8 = "6%____66"; + const char* str8 = "666166"; + ret = patternMatch(pattern8, 8, str8, strlen(str8), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_NOWILDCARDMATCH); + + const char* pattern9 = "6\\_6"; + const char* str9 = "6_6"; + ret = patternMatch(pattern9, 5, str9, strlen(str9), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_MATCH); +} + +TEST(utilTest, char_pattern_match_no_terminated) { + const char* pattern = "%1 "; + + int32_t ret = 0; + SPatternCompareInfo pInfo = PATTERN_COMPARE_INFO_INITIALIZER; + + const char* str0 = "14"; + ret = patternMatch(pattern, 2, str0, strlen(str0), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_NOWILDCARDMATCH); + + const char* str1 = "11"; + ret = patternMatch(pattern, 2, str1, strlen(str1), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_MATCH); + + const char* str2 = "41"; + ret = patternMatch(pattern, 2, str2, strlen(str2), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_MATCH); + + const char* pattern3 = "%_ "; + const char* str3 = "88"; + ret = patternMatch(pattern3, 2, str3, strlen(str3), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_MATCH); + + const char* pattern4 = "%___ "; + const char* str4 = "88"; + ret = patternMatch(pattern4, 4, str4, strlen(str4), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_NOWILDCARDMATCH); + + const char* pattern5 = "%___ "; + const char* str5 = "883391"; + ret = patternMatch(pattern5, 4, str5, strlen(str5), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_MATCH); + + const char* pattern6 = "%___66 "; + const char* str6 = "88339166"; + ret = patternMatch(pattern6, 6, str6, strlen(str6), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_MATCH); + + const char* pattern7 = "%____66 "; + const char* str7 = "66166"; + ret = patternMatch(pattern7, 7, str7, strlen(str7), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_NOWILDCARDMATCH); + + const char* pattern8 = "6%____66 "; + const char* str8 = "666166"; + ret = patternMatch(pattern8, 8, str8, strlen(str8), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_NOWILDCARDMATCH); + + const char* pattern9 = "6\\_6 "; + const char* str9 = "6_6"; + ret = patternMatch(pattern9, 4, str9, strlen(str9), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_MATCH); + + const char* pattern10 = "% "; + const char* str10 = "6_6"; + ret = patternMatch(pattern10, 1, str10, strlen(str10), &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_MATCH); +} \ No newline at end of file From da54705609444449c4baa508173b9dc88c391b7a Mon Sep 17 00:00:00 2001 From: Ganlin Zhao Date: Wed, 28 Dec 2022 19:12:38 +0800 Subject: [PATCH 14/40] add test cases --- tests/system-test/99-TDcase/TD-21561.py | 148 ++++++++++++++++++++++++ 1 file changed, 148 insertions(+) create mode 100644 tests/system-test/99-TDcase/TD-21561.py diff --git a/tests/system-test/99-TDcase/TD-21561.py b/tests/system-test/99-TDcase/TD-21561.py new file mode 100644 index 0000000000..5b852c7766 --- /dev/null +++ b/tests/system-test/99-TDcase/TD-21561.py @@ -0,0 +1,148 @@ +################################################################### +# Copyright (c) 2016 by TAOS Technologies, Inc. +# All rights reserved. +# +# This file is proprietary and confidential to TAOS Technologies. +# No part of this file may be reproduced, stored, transmitted, +# disclosed or used in any form or by any means other than as +# expressly provided by the written permission from Jianhui Tao +# +################################################################### + +# -*- coding: utf-8 -*- + +import random +import os +import time +import taos +import subprocess +from faker import Faker +from util.log import tdLog +from util.cases import tdCases +from util.sql import tdSql +from util.dnodes import tdDnodes +from util.dnodes import * + +class TDTestCase: + updatecfgDict = {'maxSQLLength':1048576,'debugFlag': 143 ,"querySmaOptimize":1} + + def init(self, conn, logSql, replicaVar): + tdLog.debug("start to execute %s" % __file__) + tdSql.init(conn.cursor(), logSql) + + self.testcasePath = os.path.split(__file__)[0] + self.testcaseFilename = os.path.split(__file__)[-1] + os.system("rm -rf %s/%s.sql" % (self.testcasePath,self.testcaseFilename)) + + self.db = "hyp" + + def dropandcreateDB_random(self,database,n): + ts = 1630000000000 + num_random = 10 + fake = Faker('zh_CN') + tdSql.execute('''drop database if exists %s ;''' %database) + tdSql.execute('''create database %s keep 36500 ;'''%(database)) + tdSql.execute('''use %s;'''%database) + + tdSql.execute('''create stable %s.stable_1 (ts timestamp , q_int int , q_bigint bigint , q_smallint smallint , q_tinyint tinyint , q_float float , q_double double , q_bool bool , q_binary binary(100) , q_nchar nchar(100) , q_ts timestamp , \ + q_int_null int , q_bigint_null bigint , q_smallint_null smallint , q_tinyint_null tinyint, q_float_null float , q_double_null double , q_bool_null bool , q_binary_null binary(20) , q_nchar_null nchar(20) , q_ts_null timestamp) \ + tags(loc nchar(100) , t_int int , t_bigint bigint , t_smallint smallint , t_tinyint tinyint, t_bool bool , t_binary binary(100) , t_nchar nchar(100) ,t_float float , t_double double , t_ts timestamp);'''%database) + tdSql.execute('''create stable %s.stable_2 (ts timestamp , q_int int , q_bigint bigint , q_smallint smallint , q_tinyint tinyint , q_float float , q_double double , q_bool bool , q_binary binary(100) , q_nchar nchar(100) , q_ts timestamp , \ + q_int_null int , q_bigint_null bigint , q_smallint_null smallint , q_tinyint_null tinyint, q_float_null float , q_double_null double , q_bool_null bool , q_binary_null binary(20) , q_nchar_null nchar(20) , q_ts_null timestamp) \ + tags(loc nchar(100) , t_int int , t_bigint bigint , t_smallint smallint , t_tinyint tinyint, t_bool bool , t_binary binary(100) , t_nchar nchar(100) ,t_float float , t_double double , t_ts timestamp);'''%database) + + for i in range(num_random): + tdSql.execute('''create table %s.table_%d \ + (ts timestamp , q_int int , q_bigint bigint , q_smallint smallint , q_tinyint tinyint , q_float float , q_double double , q_bool bool , q_binary binary(100) , q_nchar nchar(100) , q_ts timestamp ) ;'''%(database,i)) + tdSql.execute('''create table %s.stable_1_%d using %s.stable_1 tags('stable_1_%d', '%d' , '%d', '%d' , '%d' , 1 , 'binary1.%s' , 'nchar1.%s' , '%f', '%f' ,'%d') ;''' + %(database,i,database,i,fake.random_int(min=-2147483647, max=2147483647, step=1), fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1), + fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) , + fake.pystr() ,fake.pystr() ,fake.pyfloat(),fake.pyfloat(),fake.random_int(min=-2147483647, max=2147483647, step=1))) + + # insert data + for i in range(num_random): + for j in range(n): + tdSql.execute('''insert into %s.stable_1_%d (ts , q_int , q_bigint , q_smallint , q_tinyint , q_float , q_double, q_bool , q_binary , q_nchar, q_ts)\ + values(%d, %d, %d, %d, %d, %f, %f, 0, 'binary.%s', 'nchar.%s', %d) ;''' + % (database,i,ts + i*1000 + j, fake.random_int(min=-2147483647, max=2147483647, step=1), + fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1), + fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) , + fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i)) + + tdSql.execute('''insert into %s.table_%d (ts , q_int , q_bigint , q_smallint , q_tinyint , q_float , q_double , q_bool , q_binary , q_nchar, q_ts) \ + values(%d, %d, %d, %d, %d, %f, %f, 0, 'binary.%s', 'nchar.%s', %d) ;''' + % (database,i,ts + i*1000 + j, fake.random_int(min=-2147483647, max=2147483647, step=1), + fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1), + fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) , + fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i )) + + tdSql.query("select count(*) from %s.stable_1;" %database) + tdSql.checkData(0,0,num_random*n) + tdSql.query("select count(*) from %s.table_0;"%database) + tdSql.checkData(0,0,n) + + + + def sqls(self,database,function): + sql0 = f"select {function}(q_tinyint) from {database}.stable_1 where tbname in ('stable_1_1') group by tbname ;" + + sql1 = f"select {function}(q_tinyint) from {database}.stable_1 where tbname in ('stable_1_1') group by tbname;" + + sql2 = f"select {function}(q_tinyint) from {database}.stable_1 where tbname in ('stable_1_1') and _C0 is not null and _C0 between 1600000000000 and now +1h and (q_nchar like 'nchar%' or q_binary = '0' or q_nchar = 'nchar_' ) and q_bool in (0 , 1) group by tbname ;" + + sql3 = f"select * from (select {function}(q_tinyint) from {database}.stable_1 where tbname in ('stable_1_1') and _C0 is not null and _C0 between 1600000000000 and now +1h and (q_nchar like 'nchar%' or q_binary = '0' or q_nchar = 'nchar_' ) and q_bool in (0 , 1) group by tbname) ;" + + self.constant_check(sql1,sql0) + self.constant_check(sql1,sql2) + self.constant_check(sql2,sql3) + + def check_flushdb(self,database): + functions = ['COUNT', 'HYPERLOGLOG'] + for f in functions: + for i in range(20): + self.sqls(database, f); + + tdSql.execute(" flush database %s;" %database) + tdLog.info("flush database success") + + for i in range(20): + self.sqls(database, f); + + + def constant_check(self,sql1,sql2): + tdLog.info("\n=============sql1:(%s)___sql2:(%s) ====================\n" %(sql1,sql2)) + tdSql.query(sql1) + sql1_value = tdSql.getData(0,0) + tdSql.query("reset query cache") + tdSql.query(sql2) + sql2_value = tdSql.getData(0,0) + self.value_check(sql1_value,sql2_value) + + def value_check(self,base_value,check_value): + if base_value==check_value: + tdLog.info(f"checkEqual success, base_value={base_value},check_value={check_value}") + else : + tdLog.exit(f"checkEqual error, base_value=={base_value},check_value={check_value}") + + def run(self): + + startTime = time.time() + + os.system("rm -rf %s/%s.sql" % (self.testcasePath,self.testcaseFilename)) + + self.dropandcreateDB_random("%s" %self.db, 100) + + self.check_flushdb("%s" %self.db) + + endTime = time.time() + print("total time %ds" % (endTime - startTime)) + + + + def stop(self): + tdSql.close() + tdLog.success("%s successfully executed" % __file__) + + +tdCases.addWindows(__file__, TDTestCase()) +tdCases.addLinux(__file__, TDTestCase()) From 26596325b19e0e10c096dfd76a8c7cb7228e8f73 Mon Sep 17 00:00:00 2001 From: Ganlin Zhao Date: Wed, 28 Dec 2022 19:15:54 +0800 Subject: [PATCH 15/40] add test cases --- tests/parallel_test/cases.task | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task index 4f806275d1..c65d4f7da9 100644 --- a/tests/parallel_test/cases.task +++ b/tests/parallel_test/cases.task @@ -730,6 +730,7 @@ ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmq_taosx.py ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/stbTagFilter-multiCtb.py ,,y,system-test,./pytest.sh python3 ./test.py -f 99-TDcase/TD-19201.py +,,y,system-test,./pytest.sh python3 ./test.py -f 99-TDcase/TD-21561.py ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmqSubscribeStb-r3.py -N 5 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmq3mnodeSwitch.py -N 6 -M 3 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmq3mnodeSwitch.py -N 6 -M 3 -n 3 @@ -827,6 +828,7 @@ ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/tsbsQuery.py -Q 2 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/sml.py -Q 2 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/case_when.py -Q 2 +,,y,system-test,./pytest.sh python3 ./test.py -f 99-TDcase/TD-21561.py -Q 2 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/between.py -Q 3 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/distinct.py -Q 3 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/varchar.py -Q 3 @@ -921,6 +923,7 @@ ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/sml.py -Q 3 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/interp.py -Q 3 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/case_when.py -Q 3 +,,y,system-test,./pytest.sh python3 ./test.py -f 99-TDcase/TD-21561.py -Q 3 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/between.py -Q 4 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/distinct.py -Q 4 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/varchar.py -Q 4 @@ -1025,6 +1028,7 @@ ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/insert_null_none.py -Q 2 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/insert_null_none.py -Q 3 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/insert_null_none.py -Q 4 +,,y,system-test,./pytest.sh python3 ./test.py -f 99-TDcase/TD-21561.py -Q 4 ,,y,system-test,./pytest.sh python3 ./test.py -f 99-TDcase/TD-20582.py #develop test From 8c35b856c6b4d7b60d786f9e6f79e003d0bb4f03 Mon Sep 17 00:00:00 2001 From: xinsheng Ren <285808407@qq.com> Date: Mon, 26 Dec 2022 18:38:01 +0800 Subject: [PATCH 16/40] fix/TS-2297/windows sort use stdlib (#19152) Co-authored-by: facetosea <25808407@qq.com> --- source/os/src/osMath.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/source/os/src/osMath.c b/source/os/src/osMath.c index cd2acac261..dddadd5ff6 100644 --- a/source/os/src/osMath.c +++ b/source/os/src/osMath.c @@ -16,6 +16,7 @@ #define ALLOW_FORBID_FUNC #define _DEFAULT_SOURCE #include "os.h" +#include #ifdef WINDOWS void swapStr(char* j, char* J, int width) { @@ -33,16 +34,5 @@ void swapStr(char* j, char* J, int width) { // todo refactor: 1) move away; 2) use merge sort instead; 3) qsort is not a stable sort actually. void taosSort(void* arr, int64_t sz, int64_t width, __compar_fn_t compar) { -#ifdef WINDOWS - int64_t i, j; - for (i = 0; i < sz - 1; i++) { - for (j = 0; j < sz - 1 - i; j++) { - if (compar((char*)arr + j * width, (char*)arr + (j + 1) * width) > 0.00) { - swapStr((char*)arr + j * width, (char*)arr + (j + 1) * width, width); - } - } - } -#else qsort(arr, sz, width, compar); -#endif } From 1876d6d74844a9552466b0d0df6776c64874fe33 Mon Sep 17 00:00:00 2001 From: xinsheng Ren <285808407@qq.com> Date: Thu, 29 Dec 2022 09:21:20 +0800 Subject: [PATCH 17/40] Fix/xsren/td 20817 mac fqdn (#19078) * fix/TD-20817-mac-fqdn use localhostname * fix/TD-20817-mac-fqdn redundant codes * fix/TD-20817-mac-fqdn,replace command with api Co-authored-by: facetosea <25808407@qq.com> Co-authored-by: Shuduo Sang --- include/os/osSysinfo.h | 1 + source/os/CMakeLists.txt | 4 +++ source/os/src/osSocket.c | 20 +++++++-------- source/os/src/osSysinfo.c | 51 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 65 insertions(+), 11 deletions(-) diff --git a/include/os/osSysinfo.h b/include/os/osSysinfo.h index 7765a60f88..dbe4d6801e 100644 --- a/include/os/osSysinfo.h +++ b/include/os/osSysinfo.h @@ -70,6 +70,7 @@ typedef struct { SysNameInfo taosGetSysNameInfo(); bool taosCheckCurrentInDll(); +int taosGetlocalhostname(char *hostname, size_t maxLen); #ifdef __cplusplus } diff --git a/source/os/CMakeLists.txt b/source/os/CMakeLists.txt index b7cb20896b..0d85a8bec4 100644 --- a/source/os/CMakeLists.txt +++ b/source/os/CMakeLists.txt @@ -44,6 +44,10 @@ if(TD_WINDOWS) os PUBLIC ws2_32 iconv msvcregex wcwidth winmm crashdump ) elseif(TD_DARWIN_64) + find_library(CORE_FOUNDATION_FRAMEWORK CoreFoundation) + target_link_libraries(os PUBLIC ${CORE_FOUNDATION_FRAMEWORK}) + find_library(SYSTEM_CONFIGURATION_FRAMEWORK SystemConfiguration) + target_link_libraries(os PUBLIC ${SYSTEM_CONFIGURATION_FRAMEWORK}) target_link_libraries( os PUBLIC dl m iconv ) diff --git a/source/os/src/osSocket.c b/source/os/src/osSocket.c index db2a9937b5..6611a937f2 100644 --- a/source/os/src/osSocket.c +++ b/source/os/src/osSocket.c @@ -988,7 +988,7 @@ int32_t taosGetFqdn(char *fqdn) { #endif char hostname[1024]; hostname[1023] = '\0'; - if (gethostname(hostname, 1023) == -1) { + if (taosGetlocalhostname(hostname, 1023) == -1) { #ifdef WINDOWS printf("failed to get hostname, reason:%s\n", strerror(WSAGetLastError())); #else @@ -998,30 +998,28 @@ int32_t taosGetFqdn(char *fqdn) { return -1; } - struct addrinfo hints = {0}; - struct addrinfo *result = NULL; #ifdef __APPLE__ // on macosx, hostname -f has the form of xxx.local // which will block getaddrinfo for a few seconds if AI_CANONNAME is set // thus, we choose AF_INET (ipv4 for the moment) to make getaddrinfo return // immediately - hints.ai_family = AF_INET; + // hints.ai_family = AF_INET; + strcpy(fqdn, hostname); + strcpy(fqdn+strlen(hostname), ".local"); #else // __APPLE__ + struct addrinfo hints = {0}; + struct addrinfo *result = NULL; hints.ai_flags = AI_CANONNAME; -#endif // __APPLE__ + int32_t ret = getaddrinfo(hostname, NULL, &hints, &result); if (!result) { fprintf(stderr, "failed to get fqdn, code:%d, reason:%s\n", ret, gai_strerror(ret)); return -1; } - -#ifdef __APPLE__ - // refer to comments above - strcpy(fqdn, hostname); -#else // __APPLE__ strcpy(fqdn, result->ai_canonname); -#endif // __APPLE__ freeaddrinfo(result); +#endif // __APPLE__ + return 0; } diff --git a/source/os/src/osSysinfo.c b/source/os/src/osSysinfo.c index 704b1b9738..7521ae4e0f 100644 --- a/source/os/src/osSysinfo.c +++ b/source/os/src/osSysinfo.c @@ -98,6 +98,9 @@ LONG WINAPI exceptionHandler(LPEXCEPTION_POINTERS exception); #include #include #include +#include +#include +#include #else @@ -1003,6 +1006,11 @@ SysNameInfo taosGetSysNameInfo() { tstrncpy(info.machine, uts.machine, sizeof(info.machine)); } + char localHostName[512]; + taosGetlocalhostname(localHostName, 512); + TdCmdPtr pCmd = taosOpenCmd("scutil --get LocalHostName"); + tstrncpy(info.nodename, localHostName, sizeof(info.nodename)); + return info; #else SysNameInfo info = {0}; @@ -1038,3 +1046,46 @@ bool taosCheckCurrentInDll() { return false; #endif } + +#ifdef _TD_DARWIN_64 +int taosGetMaclocalhostnameByCommand(char *hostname, size_t maxLen) { + TdCmdPtr pCmd = taosOpenCmd("scutil --get LocalHostName"); + if (pCmd != NULL) { + if (taosGetsCmd(pCmd, maxLen - 1, hostname) > 0) { + int len = strlen(hostname); + if (hostname[len - 1] == '\n') { + hostname[len - 1] = '\0'; + } + return 0; + } + taosCloseCmd(&pCmd); + } + return -1; +} + +int getMacLocalHostNameBySCD(char *hostname, size_t maxLen) { + SCDynamicStoreRef store = SCDynamicStoreCreate(NULL, CFSTR(""), NULL, NULL); + CFStringRef hostname_cfstr = SCDynamicStoreCopyLocalHostName(store); + if (hostname_cfstr != NULL) { + CFStringGetCString(hostname_cfstr, hostname, maxLen - 1, kCFStringEncodingMacRoman); + CFRelease(hostname_cfstr); + } else { + return -1; + } + CFRelease(store); + return 0; +} +#endif + +int taosGetlocalhostname(char *hostname, size_t maxLen) { +#ifdef _TD_DARWIN_64 + int res = getMacLocalHostNameBySCD(hostname, maxLen); + if (res != 0) { + return taosGetMaclocalhostnameByCommand(hostname, maxLen); + } else { + return 0; + } +#else + return gethostname(hostname, maxLen); +#endif +} From 8f7ed5a2676222f49fd2a493ef8c21e67b7b6075 Mon Sep 17 00:00:00 2001 From: Ganlin Zhao Date: Thu, 29 Dec 2022 09:54:06 +0800 Subject: [PATCH 18/40] fix bug --- source/libs/planner/src/planOptimizer.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c index 4c0d90846f..612ab63758 100644 --- a/source/libs/planner/src/planOptimizer.c +++ b/source/libs/planner/src/planOptimizer.c @@ -1544,12 +1544,13 @@ static int32_t partTagsOptimize(SOptimizeContext* pCxt, SLogicSubplan* pLogicSub code = adjustLogicNodeDataRequirement((SLogicNode*)pScan, pNode->resultDataOrder); } if (TSDB_CODE_SUCCESS == code) { - NODES_CLEAR_LIST(pNode->pChildren); - nodesDestroyNode((SNode*)pNode); if (QUERY_NODE_LOGIC_PLAN_AGG == pNode->pParent->type) { SAggLogicNode* pParent = (SAggLogicNode*)(pNode->pParent); pParent->hasGroupKeyOptimized = true; } + + NODES_CLEAR_LIST(pNode->pChildren); + nodesDestroyNode((SNode*)pNode); } } else { SAggLogicNode* pAgg = (SAggLogicNode*)pNode; @@ -1573,8 +1574,9 @@ static int32_t partTagsOptimize(SOptimizeContext* pCxt, SLogicSubplan* pLogicSub break; } } - NODES_DESTORY_LIST(pAgg->pGroupKeys); pAgg->hasGroupKeyOptimized = true; + + NODES_DESTORY_LIST(pAgg->pGroupKeys); if (TSDB_CODE_SUCCESS == code && start >= 0) { code = partTagsRewriteGroupTagsToFuncs(pScan->pGroupTags, start, pAgg); } From b537bf318b028eb708e63d2ee25f11c67d7c61a6 Mon Sep 17 00:00:00 2001 From: freemine Date: Thu, 29 Dec 2022 10:36:34 +0800 Subject: [PATCH 19/40] new API taos_stmt_reclaim_fields to reclaim TAOS_FIELD_E in a uniform way --- include/client/taos.h | 2 ++ source/client/src/clientMain.c | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/include/client/taos.h b/include/client/taos.h index 647f906d4f..e54300e33e 100644 --- a/include/client/taos.h +++ b/include/client/taos.h @@ -161,6 +161,8 @@ DLL_EXPORT int taos_stmt_set_tags(TAOS_STMT *stmt, TAOS_MULTI_BIND *tags) DLL_EXPORT int taos_stmt_set_sub_tbname(TAOS_STMT *stmt, const char *name); DLL_EXPORT int taos_stmt_get_tag_fields(TAOS_STMT *stmt, int *fieldNum, TAOS_FIELD_E **fields); DLL_EXPORT int taos_stmt_get_col_fields(TAOS_STMT *stmt, int *fieldNum, TAOS_FIELD_E **fields); +// let stmt to reclaim TAOS_FIELD_E that was allocated by `taos_stmt_get_tag_fields`/`taos_stmt_get_col_fields` +DLL_EXPORT void taos_stmt_reclaim_fields(TAOS_STMT *stmt, TAOS_FIELD_E *fields); DLL_EXPORT int taos_stmt_is_insert(TAOS_STMT *stmt, int *insert); DLL_EXPORT int taos_stmt_num_params(TAOS_STMT *stmt, int *nums); diff --git a/source/client/src/clientMain.c b/source/client/src/clientMain.c index 87f5e5fa40..e37ed4c1bc 100644 --- a/source/client/src/clientMain.c +++ b/source/client/src/clientMain.c @@ -1331,6 +1331,14 @@ int taos_stmt_get_col_fields(TAOS_STMT *stmt, int *fieldNum, TAOS_FIELD_E **fiel return stmtGetColFields(stmt, fieldNum, fields); } +// let stmt to reclaim TAOS_FIELD_E that was allocated by `taos_stmt_get_tag_fields`/`taos_stmt_get_col_fields` +void taos_stmt_reclaim_fields(TAOS_STMT *stmt, TAOS_FIELD_E *fields) +{ + (void)stmt; + if (!fields) return; + taosMemoryFree(fields); +} + int taos_stmt_bind_param(TAOS_STMT *stmt, TAOS_MULTI_BIND *bind) { if (stmt == NULL || bind == NULL) { tscError("NULL parameter for %s", __FUNCTION__); From 9facfe83d1c97865388ff8412659a420676d7827 Mon Sep 17 00:00:00 2001 From: dapan1121 Date: Thu, 29 Dec 2022 10:50:16 +0800 Subject: [PATCH 20/40] fix: some query tasks not end when vnode stopped --- source/libs/qworker/inc/qwInt.h | 17 +++++++++++++---- source/libs/qworker/src/qwDbg.c | 6 +++--- source/libs/qworker/src/qworker.c | 26 ++++++++++++-------------- 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/source/libs/qworker/inc/qwInt.h b/source/libs/qworker/inc/qwInt.h index eb6091d605..35b2479a51 100644 --- a/source/libs/qworker/inc/qwInt.h +++ b/source/libs/qworker/inc/qwInt.h @@ -114,14 +114,14 @@ typedef struct SQWTaskStatus { typedef struct SQWTaskCtx { SRWLatch lock; int8_t phase; + int8_t inFetch; int8_t taskType; int8_t explain; int8_t needFetch; int8_t localExec; int32_t msgType; - int32_t fetchType; - int32_t execId; int32_t level; + uint64_t sId; bool queryGotData; bool queryRsped; @@ -221,8 +221,16 @@ typedef struct SQWorkerMgmt { #define QW_GET_PHASE(ctx) atomic_load_8(&(ctx)->phase) #define QW_SET_PHASE(ctx, _value) \ do { \ - if ((_value) != QW_PHASE_PRE_FETCH && (_value) != QW_PHASE_POST_FETCH) { \ - atomic_store_8(&(ctx)->phase, _value); \ + switch (_value) { \ + case QW_PHASE_PRE_FETCH: \ + ctx->inFetch = 1; \ + break; \ + case QW_PHASE_POST_FETCH: \ + ctx->inFetch = 0; \ + break; \ + default: \ + atomic_store_8(&(ctx)->phase, _value); \ + break; \ } \ } while (0) @@ -230,6 +238,7 @@ typedef struct SQWorkerMgmt { #define QW_UPDATE_RSP_CODE(ctx, code) atomic_val_compare_exchange_32(&(ctx)->rspCode, 0, code) #define QW_QUERY_RUNNING(ctx) (QW_GET_PHASE(ctx) == QW_PHASE_PRE_QUERY || QW_GET_PHASE(ctx) == QW_PHASE_PRE_CQUERY) +#define QW_FETCH_RUNNING(ctx) ((ctx)->inFetch) #define QW_SET_QTID(id, qId, tId, eId) \ do { \ diff --git a/source/libs/qworker/src/qwDbg.c b/source/libs/qworker/src/qwDbg.c index db6e5b19fb..fd0bfc279d 100644 --- a/source/libs/qworker/src/qwDbg.c +++ b/source/libs/qworker/src/qwDbg.c @@ -124,11 +124,11 @@ void qwDbgDumpTasksInfo(SQWorker *mgmt) { void *key = taosHashGetKey(pIter, NULL); QW_GET_QTID(key, qId, tId, eId); - QW_TASK_DLOG("%p lock:%x, phase:%d, type:%d, explain:%d, needFetch:%d, localExec:%d, msgType:%d, fetchType:%d, " - "execId:%x, level:%d, queryGotData:%d, queryRsped:%d, queryEnd:%d, queryContinue:%d, queryInQueue:%d, " + QW_TASK_DLOG("%p lock:%x, phase:%d, type:%d, explain:%d, needFetch:%d, localExec:%d, msgType:%d, " + "sId:%x, level:%d, queryGotData:%d, queryRsped:%d, queryEnd:%d, queryContinue:%d, queryInQueue:%d, " "rspCode:%x, affectedRows:%" PRId64 ", taskHandle:%p, sinkHandle:%p, tbFName:%s, sver:%d, tver:%d, events:%d,%d,%d,%d,%d", ctx, ctx->lock, ctx->phase, ctx->taskType, ctx->explain, ctx->needFetch, ctx->localExec, ctx->msgType, - ctx->fetchType, ctx->execId, ctx->level, ctx->queryGotData, ctx->queryRsped, ctx->queryEnd, ctx->queryContinue, + ctx->sId, ctx->level, ctx->queryGotData, ctx->queryRsped, ctx->queryEnd, ctx->queryContinue, ctx->queryInQueue, ctx->rspCode, ctx->affectedRows, ctx->taskHandle, ctx->sinkHandle, ctx->tbInfo.tbFName, ctx->tbInfo.sversion, ctx->tbInfo.tversion, ctx->events[QW_EVENT_CANCEL], ctx->events[QW_EVENT_READY], ctx->events[QW_EVENT_FETCH], ctx->events[QW_EVENT_DROP], ctx->events[QW_EVENT_CQUERY]); diff --git a/source/libs/qworker/src/qworker.c b/source/libs/qworker/src/qworker.c index 81f73b1226..6513845035 100644 --- a/source/libs/qworker/src/qworker.c +++ b/source/libs/qworker/src/qworker.c @@ -508,14 +508,6 @@ int32_t qwHandlePostPhaseEvents(QW_FPARAMS_DEF, int8_t phase, SQWPhaseInput *inp } if (QW_EVENT_RECEIVED(ctx, QW_EVENT_DROP)) { - if (QW_PHASE_POST_FETCH == phase) { - QW_TASK_WLOG("drop received at wrong phase %s", qwPhaseStr(phase)); - QW_ERR_JRET(TSDB_CODE_APP_ERROR); - } - - // qwBuildAndSendDropRsp(&ctx->ctrlConnInfo, code); - // QW_TASK_DLOG("drop rsp send, handle:%p, code:%x - %s", ctx->ctrlConnInfo.handle, code, tstrerror(code)); - QW_ERR_JRET(qwDropTask(QW_FPARAMS())); QW_ERR_JRET(ctx->rspCode); } @@ -580,6 +572,7 @@ int32_t qwPreprocessQuery(QW_FPARAMS_DEF, SQWMsg *qwMsg) { QW_ERR_JRET(qwAcquireTaskCtx(QW_FPARAMS(), &ctx)); ctx->ctrlConnInfo = qwMsg->connInfo; + ctx->sId = sId; ctx->phase = -1; QW_ERR_JRET(qwAddTaskStatus(QW_FPARAMS(), JOB_TASK_STATUS_INIT)); @@ -670,7 +663,7 @@ _return: qwMsg->connInfo = ctx->dataConnInfo; QW_SET_EVENT_PROCESSED(ctx, QW_EVENT_FETCH); - qwBuildAndSendFetchRsp(ctx->fetchType, &qwMsg->connInfo, rsp, dataLen, code); + qwBuildAndSendFetchRsp(ctx->msgType + 1, &qwMsg->connInfo, rsp, dataLen, code); rsp = NULL; QW_TASK_DLOG("fetch rsp send, handle:%p, code:%x - %s, dataLen:%d", qwMsg->connInfo.handle, code, tstrerror(code), @@ -722,7 +715,7 @@ int32_t qwProcessCQuery(QW_FPARAMS_DEF, SQWMsg *qwMsg) { qwMsg->connInfo = ctx->dataConnInfo; QW_SET_EVENT_PROCESSED(ctx, QW_EVENT_FETCH); - qwBuildAndSendFetchRsp(ctx->fetchType, &qwMsg->connInfo, rsp, dataLen, code); + qwBuildAndSendFetchRsp(ctx->msgType + 1, &qwMsg->connInfo, rsp, dataLen, code); rsp = NULL; QW_TASK_DLOG("fetch rsp send, handle:%p, code:%x - %s, dataLen:%d", qwMsg->connInfo.handle, code, @@ -744,7 +737,7 @@ int32_t qwProcessCQuery(QW_FPARAMS_DEF, SQWMsg *qwMsg) { rsp = NULL; qwMsg->connInfo = ctx->dataConnInfo; - qwBuildAndSendFetchRsp(ctx->fetchType, &qwMsg->connInfo, NULL, 0, code); + qwBuildAndSendFetchRsp(ctx->msgType + 1, &qwMsg->connInfo, NULL, 0, code); QW_TASK_DLOG("fetch rsp send, handle:%p, code:%x - %s, dataLen:%d", qwMsg->connInfo.handle, code, tstrerror(code), 0); } @@ -1178,8 +1171,9 @@ void qWorkerStopAllTasks(void *qWorkerMgmt) { QW_DLOG("start to stop all tasks, taskNum:%d", taosHashGetSize(mgmt->ctxHash)); - uint64_t qId, tId; + uint64_t qId, tId, sId; int32_t eId; + int64_t rId = 0; void *pIter = taosHashIterate(mgmt->ctxHash, NULL); while (pIter) { SQWTaskCtx *ctx = (SQWTaskCtx *)pIter; @@ -1188,6 +1182,8 @@ void qWorkerStopAllTasks(void *qWorkerMgmt) { QW_LOCK(QW_WRITE, &ctx->lock); + sId = ctx->sId; + QW_TASK_DLOG_E("start to force stop task"); if (QW_EVENT_RECEIVED(ctx, QW_EVENT_DROP) || QW_EVENT_PROCESSED(ctx, QW_EVENT_DROP)) { @@ -1200,9 +1196,11 @@ void qWorkerStopAllTasks(void *qWorkerMgmt) { if (QW_QUERY_RUNNING(ctx)) { qwKillTaskHandle(ctx, TSDB_CODE_VND_STOPPED); - } else if (!QW_EVENT_PROCESSED(ctx, QW_EVENT_DROP)) { + } else if (QW_FETCH_RUNNING(ctx)) { QW_UPDATE_RSP_CODE(ctx, TSDB_CODE_VND_STOPPED); - QW_SET_EVENT_RECEIVED(ctx, QW_EVENT_DROP); + QW_SET_EVENT_RECEIVED(ctx, QW_EVENT_DROP); + } else { + qwDropTask(QW_FPARAMS()); } QW_UNLOCK(QW_WRITE, &ctx->lock); From d5e5697cef857cb892471033d95e2c576daba340 Mon Sep 17 00:00:00 2001 From: dapan1121 Date: Thu, 29 Dec 2022 12:30:38 +0800 Subject: [PATCH 21/40] fix: int64 print issue --- source/libs/qworker/src/qwDbg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libs/qworker/src/qwDbg.c b/source/libs/qworker/src/qwDbg.c index fd0bfc279d..7a755cd36f 100644 --- a/source/libs/qworker/src/qwDbg.c +++ b/source/libs/qworker/src/qwDbg.c @@ -125,7 +125,7 @@ void qwDbgDumpTasksInfo(SQWorker *mgmt) { QW_GET_QTID(key, qId, tId, eId); QW_TASK_DLOG("%p lock:%x, phase:%d, type:%d, explain:%d, needFetch:%d, localExec:%d, msgType:%d, " - "sId:%x, level:%d, queryGotData:%d, queryRsped:%d, queryEnd:%d, queryContinue:%d, queryInQueue:%d, " + "sId:%" PRId64 ", level:%d, queryGotData:%d, queryRsped:%d, queryEnd:%d, queryContinue:%d, queryInQueue:%d, " "rspCode:%x, affectedRows:%" PRId64 ", taskHandle:%p, sinkHandle:%p, tbFName:%s, sver:%d, tver:%d, events:%d,%d,%d,%d,%d", ctx, ctx->lock, ctx->phase, ctx->taskType, ctx->explain, ctx->needFetch, ctx->localExec, ctx->msgType, ctx->sId, ctx->level, ctx->queryGotData, ctx->queryRsped, ctx->queryEnd, ctx->queryContinue, From 7721353b6b750dd2490ee660c72cb09476df95f4 Mon Sep 17 00:00:00 2001 From: Liu Jicong Date: Thu, 29 Dec 2022 11:35:46 +0800 Subject: [PATCH 22/40] enh: put func state into tdb --- include/libs/function/function.h | 9 +- source/libs/executor/inc/executorimpl.h | 124 +++++++++--------- source/libs/executor/src/executorimpl.c | 33 +++-- source/libs/executor/src/groupoperator.c | 3 +- source/libs/executor/src/projectoperator.c | 8 +- source/libs/executor/src/timewindowoperator.c | 118 +++++++++-------- source/libs/function/inc/builtinsimpl.h | 4 +- source/libs/function/src/builtinsimpl.c | 89 +++++++------ source/libs/function/src/detail/tminmax.c | 37 +++--- source/libs/stream/src/streamState.c | 2 +- 10 files changed, 228 insertions(+), 199 deletions(-) diff --git a/include/libs/function/function.h b/include/libs/function/function.h index 32b8cc7389..a58aed7e50 100644 --- a/include/libs/function/function.h +++ b/include/libs/function/function.h @@ -138,7 +138,7 @@ typedef struct SqlFunctionCtx { char *pOutput; // final result output buffer, point to sdata->data int32_t numOfParams; // input parameter, e.g., top(k, 20), the number of results of top query is kept in param - SFunctParam *param; + SFunctParam *param; // corresponding output buffer for timestamp of each result, e.g., diff/csum SColumnInfoData *pTsOutput; int32_t offset; @@ -152,6 +152,7 @@ typedef struct SqlFunctionCtx { struct SSDataBlock *pSrcBlock; struct SSDataBlock *pDstBlock; // used by indefinite rows function to set selectivity SSerializeDataHandle saveHandle; + int32_t exprIdx; char udfName[TSDB_FUNC_NAME_LEN]; } SqlFunctionCtx; @@ -182,9 +183,9 @@ struct SScalarParam { int32_t numOfQualified; // number of qualified elements in the final results }; -void cleanupResultRowEntry(struct SResultRowEntryInfo *pCell); -bool isRowEntryCompleted(struct SResultRowEntryInfo *pEntry); -bool isRowEntryInitialized(struct SResultRowEntryInfo *pEntry); +void cleanupResultRowEntry(struct SResultRowEntryInfo *pCell); +bool isRowEntryCompleted(struct SResultRowEntryInfo *pEntry); +bool isRowEntryInitialized(struct SResultRowEntryInfo *pEntry); typedef struct SPoint { int64_t key; diff --git a/source/libs/executor/inc/executorimpl.h b/source/libs/executor/inc/executorimpl.h index 647da78a78..f77427fd04 100644 --- a/source/libs/executor/inc/executorimpl.h +++ b/source/libs/executor/inc/executorimpl.h @@ -182,7 +182,7 @@ struct SExecTaskInfo { SSubplan* pSubplan; struct SOperatorInfo* pRoot; SLocalFetch localFetch; - SArray* pResultBlockList;// result block list + SArray* pResultBlockList; // result block list STaskStopInfo stopInfo; }; @@ -199,7 +199,7 @@ typedef struct SOperatorFpSet { __optr_fn_t getNextFn; __optr_fn_t cleanupFn; // call this function to release the allocated resources ASAP __optr_close_fn_t closeFn; - __optr_reqBuf_fn_t reqBufFn; // total used buffer for blocking operator + __optr_reqBuf_fn_t reqBufFn; // total used buffer for blocking operator __optr_encode_fn_t encodeResultRow; __optr_decode_fn_t decodeResultRow; __optr_explain_fn_t getExplainFn; @@ -255,22 +255,22 @@ typedef struct SLimitInfo { } SLimitInfo; typedef struct SExchangeInfo { - SArray* pSources; - SArray* pSourceDataInfo; - tsem_t ready; - void* pTransporter; + SArray* pSources; + SArray* pSourceDataInfo; + tsem_t ready; + void* pTransporter; // SArray, result block list, used to keep the multi-block that // passed by downstream operator - SArray* pResultBlockList; - SArray* pRecycledBlocks;// build a pool for small data block to avoid to repeatly create and then destroy. - SSDataBlock* pDummyBlock; // dummy block, not keep data - bool seqLoadData; // sequential load data or not, false by default - int32_t current; + SArray* pResultBlockList; + SArray* pRecycledBlocks; // build a pool for small data block to avoid to repeatly create and then destroy. + SSDataBlock* pDummyBlock; // dummy block, not keep data + bool seqLoadData; // sequential load data or not, false by default + int32_t current; SLoadRemoteDataInfo loadInfo; uint64_t self; SLimitInfo limitInfo; - int64_t openedTs; // start exec time stamp, todo: move to SLoadRemoteDataInfo + int64_t openedTs; // start exec time stamp, todo: move to SLoadRemoteDataInfo } SExchangeInfo; typedef struct SScanInfo { @@ -305,9 +305,9 @@ typedef struct { } SAggOptrPushDownInfo; typedef struct STableMetaCacheInfo { - SLRUCache* pTableMetaEntryCache; // 100 by default - uint64_t metaFetch; - uint64_t cacheHit; + SLRUCache* pTableMetaEntryCache; // 100 by default + uint64_t metaFetch; + uint64_t cacheHit; } STableMetaCacheInfo; typedef struct STableScanBase { @@ -325,46 +325,46 @@ typedef struct STableScanBase { } STableScanBase; typedef struct STableScanInfo { - STableScanBase base; - SScanInfo scanInfo; - int32_t scanTimes; - SSDataBlock* pResBlock; - SSampleExecInfo sample; // sample execution info - int32_t currentGroupId; - int32_t currentTable; - int8_t scanMode; - int8_t assignBlockUid; - bool hasGroupByTag; + STableScanBase base; + SScanInfo scanInfo; + int32_t scanTimes; + SSDataBlock* pResBlock; + SSampleExecInfo sample; // sample execution info + int32_t currentGroupId; + int32_t currentTable; + int8_t scanMode; + int8_t assignBlockUid; + bool hasGroupByTag; } STableScanInfo; typedef struct STableMergeScanInfo { - int32_t tableStartIndex; - int32_t tableEndIndex; - bool hasGroupId; - uint64_t groupId; - SArray* queryConds; // array of queryTableDataCond - STableScanBase base; - int32_t bufPageSize; - uint32_t sortBufSize; // max buffer size for in-memory sort - SArray* pSortInfo; - SSortHandle* pSortHandle; - SSDataBlock* pSortInputBlock; - int64_t startTs; // sort start time - SArray* sortSourceParams; - SLimitInfo limitInfo; - int64_t numOfRows; - SScanInfo scanInfo; - SSDataBlock* pResBlock; - SSampleExecInfo sample; // sample execution info - SSortExecInfo sortExecInfo; + int32_t tableStartIndex; + int32_t tableEndIndex; + bool hasGroupId; + uint64_t groupId; + SArray* queryConds; // array of queryTableDataCond + STableScanBase base; + int32_t bufPageSize; + uint32_t sortBufSize; // max buffer size for in-memory sort + SArray* pSortInfo; + SSortHandle* pSortHandle; + SSDataBlock* pSortInputBlock; + int64_t startTs; // sort start time + SArray* sortSourceParams; + SLimitInfo limitInfo; + int64_t numOfRows; + SScanInfo scanInfo; + SSDataBlock* pResBlock; + SSampleExecInfo sample; // sample execution info + SSortExecInfo sortExecInfo; } STableMergeScanInfo; typedef struct STagScanInfo { - SColumnInfo* pCols; - SSDataBlock* pRes; - SColMatchInfo matchInfo; - int32_t curPos; - SReadHandle readHandle; + SColumnInfo* pCols; + SSDataBlock* pRes; + SColMatchInfo matchInfo; + int32_t curPos; + SReadHandle readHandle; } STagScanInfo; typedef enum EStreamScanMode { @@ -499,8 +499,8 @@ typedef struct STableCountScanOperatorInfo { STableCountScanSupp supp; - int32_t currGrpIdx; - SArray* stbUidList; // when group by db_name and/or stable_name + int32_t currGrpIdx; + SArray* stbUidList; // when group by db_name and/or stable_name } STableCountScanOperatorInfo; typedef struct SOptrBasicInfo { @@ -678,19 +678,19 @@ void setOperatorInfo(SOperatorInfo* pOperator, const char* name, int32 void destroyOperatorInfo(SOperatorInfo* pOperator); int32_t optrDefaultBufFn(SOperatorInfo* pOperator); -void initBasicInfo(SOptrBasicInfo* pInfo, SSDataBlock* pBlock); -void cleanupBasicInfo(SOptrBasicInfo* pInfo); +void initBasicInfo(SOptrBasicInfo* pInfo, SSDataBlock* pBlock); +void cleanupBasicInfo(SOptrBasicInfo* pInfo); int32_t initExprSupp(SExprSupp* pSup, SExprInfo* pExprInfo, int32_t numOfExpr); void cleanupExprSupp(SExprSupp* pSup); -void destroyExprInfo(SExprInfo* pExpr, int32_t numOfExprs); +void destroyExprInfo(SExprInfo* pExpr, int32_t numOfExprs); int32_t initAggSup(SExprSupp* pSup, SAggSupporter* pAggSup, SExprInfo* pExprInfo, int32_t numOfCols, size_t keyBufSize, - const char* pkey); + const char* pkey, void* pState); void cleanupAggSup(SAggSupporter* pAggSup); -void initResultSizeInfo(SResultInfo* pResultInfo, int32_t numOfRows); +void initResultSizeInfo(SResultInfo* pResultInfo, int32_t numOfRows); void doBuildStreamResBlock(SOperatorInfo* pOperator, SOptrBasicInfo* pbInfo, SGroupResInfo* pGroupResInfo, SDiskbasedBuf* pBuf); @@ -803,10 +803,10 @@ void setInputDataBlock(SExprSupp* pExprSupp, SSDataBlock* pBlock, int32_t order, int32_t checkForQueryBuf(size_t numOfTables); -bool isTaskKilled(SExecTaskInfo* pTaskInfo); -void setTaskKilled(SExecTaskInfo* pTaskInfo, int32_t rspCode); -void doDestroyTask(SExecTaskInfo* pTaskInfo); -void setTaskStatus(SExecTaskInfo* pTaskInfo, int8_t status); +bool isTaskKilled(SExecTaskInfo* pTaskInfo); +void setTaskKilled(SExecTaskInfo* pTaskInfo, int32_t rspCode); +void doDestroyTask(SExecTaskInfo* pTaskInfo); +void setTaskStatus(SExecTaskInfo* pTaskInfo, int8_t status); int32_t createExecTaskInfoImpl(SSubplan* pPlan, SExecTaskInfo** pTaskInfo, SReadHandle* pHandle, uint64_t taskId, char* sql, EOPTR_EXEC_MODEL model); @@ -828,8 +828,8 @@ bool isDeletedWindow(STimeWindow* pWin, uint64_t groupId, SAggSupporter* pSup); bool isDeletedStreamWindow(STimeWindow* pWin, uint64_t groupId, SStreamState* pState, STimeWindowAggSupp* pTwSup); void appendOneRowToStreamSpecialBlock(SSDataBlock* pBlock, TSKEY* pStartTs, TSKEY* pEndTs, uint64_t* pUid, uint64_t* pGp, void* pTbName); -uint64_t calGroupIdByData(SPartitionBySupporter* pParSup, SExprSupp* pExprSup, SSDataBlock* pBlock, int32_t rowId); -void calBlockTbName(SStreamScanInfo* pInfo, SSDataBlock* pBlock); +uint64_t calGroupIdByData(SPartitionBySupporter* pParSup, SExprSupp* pExprSup, SSDataBlock* pBlock, int32_t rowId); +void calBlockTbName(SStreamScanInfo* pInfo, SSDataBlock* pBlock); int32_t finalizeResultRows(SDiskbasedBuf* pBuf, SResultRowPosition* resultRowPosition, SExprSupp* pSup, SSDataBlock* pBlock, SExecTaskInfo* pTaskInfo); diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c index fecdcd8fa3..eb5fe4253e 100644 --- a/source/libs/executor/src/executorimpl.c +++ b/source/libs/executor/src/executorimpl.c @@ -608,9 +608,7 @@ void setBlockSMAInfo(SqlFunctionCtx* pCtx, SExprInfo* pExprInfo, SSDataBlock* pB } } -bool isTaskKilled(SExecTaskInfo* pTaskInfo) { - return (0 != pTaskInfo->code) ? true : false; -} +bool isTaskKilled(SExecTaskInfo* pTaskInfo) { return (0 != pTaskInfo->code) ? true : false; } void setTaskKilled(SExecTaskInfo* pTaskInfo, int32_t rspCode) { pTaskInfo->code = rspCode; } @@ -1353,7 +1351,7 @@ int32_t getTableScanInfo(SOperatorInfo* pOperator, int32_t* order, int32_t* scan } } -static int32_t createDataBlockForEmptyInput(SOperatorInfo* pOperator, SSDataBlock **ppBlock) { +static int32_t createDataBlockForEmptyInput(SOperatorInfo* pOperator, SSDataBlock** ppBlock) { if (!tsCountAlwaysReturnValue) { return TSDB_CODE_SUCCESS; } @@ -1361,12 +1359,12 @@ static int32_t createDataBlockForEmptyInput(SOperatorInfo* pOperator, SSDataBloc SOperatorInfo* downstream = pOperator->pDownstream[0]; if (downstream->operatorType == QUERY_NODE_PHYSICAL_PLAN_PARTITION || (downstream->operatorType == QUERY_NODE_PHYSICAL_PLAN_TABLE_SCAN && - ((STableScanInfo *)downstream->info)->hasGroupByTag == true)) { + ((STableScanInfo*)downstream->info)->hasGroupByTag == true)) { return TSDB_CODE_SUCCESS; } SqlFunctionCtx* pCtx = pOperator->exprSupp.pCtx; - bool hasCountFunc = false; + bool hasCountFunc = false; for (int32_t i = 0; i < pOperator->exprSupp.numOfExprs; ++i) { const char* pName = pCtx[i].pExpr->pExpr->_function.functionName; @@ -1415,7 +1413,7 @@ static int32_t createDataBlockForEmptyInput(SOperatorInfo* pOperator, SSDataBloc return TSDB_CODE_SUCCESS; } -static void destroyDataBlockForEmptyInput(bool blockAllocated, SSDataBlock **ppBlock) { +static void destroyDataBlockForEmptyInput(bool blockAllocated, SSDataBlock** ppBlock) { if (!blockAllocated) { return; } @@ -1441,8 +1439,8 @@ static int32_t doOpenAggregateOptr(SOperatorInfo* pOperator) { int32_t order = TSDB_ORDER_ASC; int32_t scanFlag = MAIN_SCAN; - bool hasValidBlock = false; - bool blockAllocated = false; + bool hasValidBlock = false; + bool blockAllocated = false; while (1) { SSDataBlock* pBlock = downstream->fpSet.getNextFn(downstream); @@ -1485,7 +1483,6 @@ static int32_t doOpenAggregateOptr(SOperatorInfo* pOperator) { } destroyDataBlockForEmptyInput(blockAllocated, &pBlock); - } // the downstream operator may return with error code, so let's check the code before generating results. @@ -1641,7 +1638,7 @@ void cleanupAggSup(SAggSupporter* pAggSup) { } int32_t initAggSup(SExprSupp* pSup, SAggSupporter* pAggSup, SExprInfo* pExprInfo, int32_t numOfCols, size_t keyBufSize, - const char* pkey) { + const char* pkey, void* pState) { int32_t code = initExprSupp(pSup, pExprInfo, numOfCols); if (code != TSDB_CODE_SUCCESS) { return code; @@ -1653,7 +1650,13 @@ int32_t initAggSup(SExprSupp* pSup, SAggSupporter* pAggSup, SExprInfo* pExprInfo } for (int32_t i = 0; i < numOfCols; ++i) { - pSup->pCtx[i].saveHandle.pBuf = pAggSup->pResultBuf; + if (pState) { + pSup->pCtx[i].saveHandle.pBuf = NULL; + pSup->pCtx[i].saveHandle.pState = pState; + pSup->pCtx[i].exprIdx = i; + } else { + pSup->pCtx[i].saveHandle.pBuf = pAggSup->pResultBuf; + } } return TSDB_CODE_SUCCESS; @@ -1738,7 +1741,8 @@ SOperatorInfo* createAggregateOperatorInfo(SOperatorInfo* downstream, SAggPhysiN int32_t num = 0; SExprInfo* pExprInfo = createExprInfo(pAggNode->pAggFuncs, pAggNode->pGroupKeys, &num); - int32_t code = initAggSup(&pOperator->exprSupp, &pInfo->aggSup, pExprInfo, num, keyBufSize, pTaskInfo->id.str); + int32_t code = initAggSup(&pOperator->exprSupp, &pInfo->aggSup, pExprInfo, num, keyBufSize, pTaskInfo->id.str, + pTaskInfo->streamInfo.pState); if (code != TSDB_CODE_SUCCESS) { goto _error; } @@ -1764,7 +1768,8 @@ SOperatorInfo* createAggregateOperatorInfo(SOperatorInfo* downstream, SAggPhysiN setOperatorInfo(pOperator, "TableAggregate", QUERY_NODE_PHYSICAL_PLAN_HASH_AGG, true, OP_NOT_OPENED, pInfo, pTaskInfo); - pOperator->fpSet = createOperatorFpSet(doOpenAggregateOptr, getAggregateResult, NULL, destroyAggOperatorInfo, optrDefaultBufFn, NULL); + pOperator->fpSet = createOperatorFpSet(doOpenAggregateOptr, getAggregateResult, NULL, destroyAggOperatorInfo, + optrDefaultBufFn, NULL); if (downstream->operatorType == QUERY_NODE_PHYSICAL_PLAN_TABLE_SCAN) { STableScanInfo* pTableScanInfo = downstream->info; diff --git a/source/libs/executor/src/groupoperator.c b/source/libs/executor/src/groupoperator.c index 59266dad7e..21ec5afdd6 100644 --- a/source/libs/executor/src/groupoperator.c +++ b/source/libs/executor/src/groupoperator.c @@ -458,7 +458,8 @@ SOperatorInfo* createGroupOperatorInfo(SOperatorInfo* downstream, SAggPhysiNode* int32_t num = 0; SExprInfo* pExprInfo = createExprInfo(pAggNode->pAggFuncs, pAggNode->pGroupKeys, &num); - code = initAggSup(&pOperator->exprSupp, &pInfo->aggSup, pExprInfo, num, pInfo->groupKeyLen, pTaskInfo->id.str); + code = initAggSup(&pOperator->exprSupp, &pInfo->aggSup, pExprInfo, num, pInfo->groupKeyLen, pTaskInfo->id.str, + pTaskInfo->streamInfo.pState); if (code != TSDB_CODE_SUCCESS) { goto _error; } diff --git a/source/libs/executor/src/projectoperator.c b/source/libs/executor/src/projectoperator.c index de353b4bac..926720fc65 100644 --- a/source/libs/executor/src/projectoperator.c +++ b/source/libs/executor/src/projectoperator.c @@ -102,7 +102,8 @@ SOperatorInfo* createProjectOperatorInfo(SOperatorInfo* downstream, SProjectPhys } initResultSizeInfo(&pOperator->resultInfo, numOfRows); - code = initAggSup(&pOperator->exprSupp, &pInfo->aggSup, pExprInfo, numOfCols, keyBufSize, pTaskInfo->id.str); + code = initAggSup(&pOperator->exprSupp, &pInfo->aggSup, pExprInfo, numOfCols, keyBufSize, pTaskInfo->id.str, + pTaskInfo->streamInfo.pState); if (code != TSDB_CODE_SUCCESS) { goto _error; } @@ -317,7 +318,7 @@ SSDataBlock* doProjectOperation(SOperatorInfo* pOperator) { if (pProjectInfo->mergeDataBlocks) { if (pRes->info.rows > 0) { - pFinalRes->info.id.groupId = 0; //clear groupId + pFinalRes->info.id.groupId = 0; // clear groupId pFinalRes->info.version = pRes->info.version; // continue merge data, ignore the group id @@ -402,7 +403,8 @@ SOperatorInfo* createIndefinitOutputOperatorInfo(SOperatorInfo* downstream, SPhy initResultSizeInfo(&pOperator->resultInfo, numOfRows); blockDataEnsureCapacity(pResBlock, numOfRows); - int32_t code = initAggSup(pSup, &pInfo->aggSup, pExprInfo, numOfExpr, keyBufSize, pTaskInfo->id.str); + int32_t code = initAggSup(pSup, &pInfo->aggSup, pExprInfo, numOfExpr, keyBufSize, pTaskInfo->id.str, + pTaskInfo->streamInfo.pState); if (code != TSDB_CODE_SUCCESS) { goto _error; } diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c index e5dcc43797..d089bccd54 100644 --- a/source/libs/executor/src/timewindowoperator.c +++ b/source/libs/executor/src/timewindowoperator.c @@ -22,7 +22,7 @@ #include "tfill.h" #include "ttime.h" -#define IS_FINAL_OP(op) ((op)->isFinal) +#define IS_FINAL_OP(op) ((op)->isFinal) #define DEAULT_DELETE_MARK (1000LL * 60LL * 60LL * 24LL * 365LL * 10LL); typedef struct SSessionAggOperatorInfo { @@ -666,8 +666,8 @@ static void doInterpUnclosedTimeWindow(SOperatorInfo* pOperatorInfo, int32_t num setNotInterpoWindowKey(pSup->pCtx, numOfExprs, RESULT_ROW_START_INTERP); updateTimeWindowInfo(&pInfo->twAggSup.timeWindowData, &w, true); - applyAggFunctionOnPartialTuples(pTaskInfo, pSup->pCtx, &pInfo->twAggSup.timeWindowData, startPos, 0, pBlock->info.rows, - numOfExprs); + applyAggFunctionOnPartialTuples(pTaskInfo, pSup->pCtx, &pInfo->twAggSup.timeWindowData, startPos, 0, + pBlock->info.rows, numOfExprs); if (isResultRowInterpolated(pResult, RESULT_ROW_END_INTERP)) { closeResultRow(pr); @@ -817,13 +817,13 @@ static int32_t savePullWindow(SPullWindowInfo* pPullInfo, SArray* pPullWins) { } else { int32_t code = comparePullWinKey(pPullInfo, pPullWins, index); if (code == 0) { - SPullWindowInfo* pos = taosArrayGet(pPullWins ,index); + SPullWindowInfo* pos = taosArrayGet(pPullWins, index); pos->window.skey = TMIN(pos->window.skey, pPullInfo->window.skey); pos->window.ekey = TMAX(pos->window.ekey, pPullInfo->window.ekey); pos->calWin.skey = TMIN(pos->calWin.skey, pPullInfo->calWin.skey); pos->calWin.ekey = TMAX(pos->calWin.ekey, pPullInfo->calWin.ekey); return TSDB_CODE_SUCCESS; - } else if (code > 0 ){ + } else if (code > 0) { index++; } } @@ -879,10 +879,10 @@ int32_t compareWinRes(void* pKey, void* data, int32_t index) { } else if (pRKey->groupId < pDataPos->groupId) { return -1; } - + if (*(int64_t*)pRKey->key > pDataPos->ts) { return 1; - } else if (*(int64_t*)pRKey->key < pDataPos->ts){ + } else if (*(int64_t*)pRKey->key < pDataPos->ts) { return -1; } return 0; @@ -961,8 +961,8 @@ static void hashIntervalAgg(SOperatorInfo* pOperatorInfo, SResultRowInfo* pResul } updateTimeWindowInfo(&pInfo->twAggSup.timeWindowData, &win, true); - applyAggFunctionOnPartialTuples(pTaskInfo, pSup->pCtx, &pInfo->twAggSup.timeWindowData, startPos, forwardRows, pBlock->info.rows, - numOfOutput); + applyAggFunctionOnPartialTuples(pTaskInfo, pSup->pCtx, &pInfo->twAggSup.timeWindowData, startPos, forwardRows, + pBlock->info.rows, numOfOutput); doCloseWindow(pResultRowInfo, pInfo, pResult); @@ -996,8 +996,8 @@ static void hashIntervalAgg(SOperatorInfo* pOperatorInfo, SResultRowInfo* pResul } #endif updateTimeWindowInfo(&pInfo->twAggSup.timeWindowData, &nextWin, true); - applyAggFunctionOnPartialTuples(pTaskInfo, pSup->pCtx, &pInfo->twAggSup.timeWindowData, startPos, forwardRows, pBlock->info.rows, - numOfOutput); + applyAggFunctionOnPartialTuples(pTaskInfo, pSup->pCtx, &pInfo->twAggSup.timeWindowData, startPos, forwardRows, + pBlock->info.rows, numOfOutput); doCloseWindow(pResultRowInfo, pInfo, pResult); } @@ -1164,7 +1164,7 @@ static void doStateWindowAggImpl(SOperatorInfo* pOperator, SStateWindowOperatorI updateTimeWindowInfo(&pInfo->twAggSup.timeWindowData, &window, false); applyAggFunctionOnPartialTuples(pTaskInfo, pSup->pCtx, &pInfo->twAggSup.timeWindowData, pRowSup->startRowIndex, - pRowSup->numOfRows, pBlock->info.rows, numOfOutput); + pRowSup->numOfRows, pBlock->info.rows, numOfOutput); // here we start a new session window doKeepNewWindowStartInfo(pRowSup, tsList, j, gid); @@ -1188,8 +1188,8 @@ static void doStateWindowAggImpl(SOperatorInfo* pOperator, SStateWindowOperatorI } updateTimeWindowInfo(&pInfo->twAggSup.timeWindowData, &pRowSup->win, false); - applyAggFunctionOnPartialTuples(pTaskInfo, pSup->pCtx, &pInfo->twAggSup.timeWindowData, pRowSup->startRowIndex, pRowSup->numOfRows, - pBlock->info.rows, numOfOutput); + applyAggFunctionOnPartialTuples(pTaskInfo, pSup->pCtx, &pInfo->twAggSup.timeWindowData, pRowSup->startRowIndex, + pRowSup->numOfRows, pBlock->info.rows, numOfOutput); } static int32_t openStateWindowAggOptr(SOperatorInfo* pOperator) { @@ -1394,8 +1394,8 @@ static int32_t getAllIntervalWindow(SSHashObj* pHashMap, SHashObj* resWins) { size_t keyLen = 0; int32_t iter = 0; while ((pIte = tSimpleHashIterate(pHashMap, pIte, &iter)) != NULL) { - void* key = tSimpleHashGetKey(pIte, &keyLen); - uint64_t groupId = *(uint64_t*)key; + void* key = tSimpleHashGetKey(pIte, &keyLen); + uint64_t groupId = *(uint64_t*)key; TSKEY ts = *(int64_t*)((char*)key + sizeof(uint64_t)); SResultRowPosition* pPos = (SResultRowPosition*)pIte; int32_t code = saveWinResult(ts, pPos->pageId, pPos->offset, groupId, resWins); @@ -1656,7 +1656,7 @@ static bool timeWindowinterpNeeded(SqlFunctionCtx* pCtx, int32_t numOfCols, SInt // the primary timestamp column bool needed = false; - for(int32_t i = 0; i < numOfCols; ++i) { + for (int32_t i = 0; i < numOfCols; ++i) { SExprInfo* pExpr = pCtx[i].pExpr; if (fmIsIntervalInterpoFunc(pCtx[i].functionId)) { needed = true; @@ -1724,7 +1724,7 @@ void initIntervalDownStream(SOperatorInfo* downstream, uint16_t type, SAggSuppor void initStreamFunciton(SqlFunctionCtx* pCtx, int32_t numOfExpr) { for (int32_t i = 0; i < numOfExpr; i++) { -// pCtx[i].isStream = true; + // pCtx[i].isStream = true; } } @@ -1748,7 +1748,8 @@ SOperatorInfo* createIntervalOperatorInfo(SOperatorInfo* downstream, SIntervalPh int32_t num = 0; SExprInfo* pExprInfo = createExprInfo(pPhyNode->window.pFuncs, NULL, &num); - int32_t code = initAggSup(pSup, &pInfo->aggSup, pExprInfo, num, keyBufSize, pTaskInfo->id.str); + int32_t code = + initAggSup(pSup, &pInfo->aggSup, pExprInfo, num, keyBufSize, pTaskInfo->id.str, pTaskInfo->streamInfo.pState); if (code != TSDB_CODE_SUCCESS) { goto _error; } @@ -1800,8 +1801,8 @@ SOperatorInfo* createIntervalOperatorInfo(SOperatorInfo* downstream, SIntervalPh setOperatorInfo(pOperator, "TimeIntervalAggOperator", QUERY_NODE_PHYSICAL_PLAN_HASH_INTERVAL, true, OP_NOT_OPENED, pInfo, pTaskInfo); - pOperator->fpSet = - createOperatorFpSet(doOpenIntervalAgg, doBuildIntervalResult, NULL, destroyIntervalOperatorInfo, optrDefaultBufFn, NULL); + pOperator->fpSet = createOperatorFpSet(doOpenIntervalAgg, doBuildIntervalResult, NULL, destroyIntervalOperatorInfo, + optrDefaultBufFn, NULL); code = appendDownstream(pOperator, &downstream, 1); if (code != TSDB_CODE_SUCCESS) { @@ -1869,7 +1870,7 @@ static void doSessionWindowAggImpl(SOperatorInfo* pOperator, SSessionAggOperator // pInfo->numOfRows data belong to the current session window updateTimeWindowInfo(&pInfo->twAggSup.timeWindowData, &window, false); applyAggFunctionOnPartialTuples(pTaskInfo, pSup->pCtx, &pInfo->twAggSup.timeWindowData, pRowSup->startRowIndex, - pRowSup->numOfRows, pBlock->info.rows, numOfOutput); + pRowSup->numOfRows, pBlock->info.rows, numOfOutput); // here we start a new session window doKeepNewWindowStartInfo(pRowSup, tsList, j, gid); @@ -1886,8 +1887,8 @@ static void doSessionWindowAggImpl(SOperatorInfo* pOperator, SSessionAggOperator } updateTimeWindowInfo(&pInfo->twAggSup.timeWindowData, &pRowSup->win, false); - applyAggFunctionOnPartialTuples(pTaskInfo, pSup->pCtx, &pInfo->twAggSup.timeWindowData, pRowSup->startRowIndex, pRowSup->numOfRows, - pBlock->info.rows, numOfOutput); + applyAggFunctionOnPartialTuples(pTaskInfo, pSup->pCtx, &pInfo->twAggSup.timeWindowData, pRowSup->startRowIndex, + pRowSup->numOfRows, pBlock->info.rows, numOfOutput); } static SSDataBlock* doSessionWindowAgg(SOperatorInfo* pOperator) { @@ -2000,7 +2001,8 @@ SOperatorInfo* createStatewindowOperatorInfo(SOperatorInfo* downstream, SStateWi SExprInfo* pExprInfo = createExprInfo(pStateNode->window.pFuncs, NULL, &num); initResultSizeInfo(&pOperator->resultInfo, 4096); - code = initAggSup(&pOperator->exprSupp, &pInfo->aggSup, pExprInfo, num, keyBufSize, pTaskInfo->id.str); + code = initAggSup(&pOperator->exprSupp, &pInfo->aggSup, pExprInfo, num, keyBufSize, pTaskInfo->id.str, + pTaskInfo->streamInfo.pState); if (code != TSDB_CODE_SUCCESS) { goto _error; } @@ -2018,8 +2020,8 @@ SOperatorInfo* createStatewindowOperatorInfo(SOperatorInfo* downstream, SStateWi setOperatorInfo(pOperator, "StateWindowOperator", QUERY_NODE_PHYSICAL_PLAN_MERGE_STATE, true, OP_NOT_OPENED, pInfo, pTaskInfo); - pOperator->fpSet = - createOperatorFpSet(openStateWindowAggOptr, doStateWindowAgg, NULL, destroyStateWindowOperatorInfo, optrDefaultBufFn, NULL); + pOperator->fpSet = createOperatorFpSet(openStateWindowAggOptr, doStateWindowAgg, NULL, destroyStateWindowOperatorInfo, + optrDefaultBufFn, NULL); code = appendDownstream(pOperator, &downstream, 1); if (code != TSDB_CODE_SUCCESS) { @@ -2068,7 +2070,8 @@ SOperatorInfo* createSessionAggOperatorInfo(SOperatorInfo* downstream, SSessionW SSDataBlock* pResBlock = createDataBlockFromDescNode(pSessionNode->window.node.pOutputDataBlockDesc); initBasicInfo(&pInfo->binfo, pResBlock); - int32_t code = initAggSup(&pOperator->exprSupp, &pInfo->aggSup, pExprInfo, numOfCols, keyBufSize, pTaskInfo->id.str); + int32_t code = initAggSup(&pOperator->exprSupp, &pInfo->aggSup, pExprInfo, numOfCols, keyBufSize, pTaskInfo->id.str, + pTaskInfo->streamInfo.pState); if (code != TSDB_CODE_SUCCESS) { goto _error; } @@ -2091,8 +2094,8 @@ SOperatorInfo* createSessionAggOperatorInfo(SOperatorInfo* downstream, SSessionW setOperatorInfo(pOperator, "SessionWindowAggOperator", QUERY_NODE_PHYSICAL_PLAN_MERGE_SESSION, true, OP_NOT_OPENED, pInfo, pTaskInfo); - pOperator->fpSet = - createOperatorFpSet(optrDummyOpenFn, doSessionWindowAgg, NULL, destroySWindowOperatorInfo, optrDefaultBufFn, NULL); + pOperator->fpSet = createOperatorFpSet(optrDummyOpenFn, doSessionWindowAgg, NULL, destroySWindowOperatorInfo, + optrDefaultBufFn, NULL); pOperator->pTaskInfo = pTaskInfo; code = appendDownstream(pOperator, &downstream, 1); if (code != TSDB_CODE_SUCCESS) { @@ -2309,7 +2312,8 @@ static void addRetriveWindow(SArray* wins, SStreamIntervalOperatorInfo* pInfo) { if (needDeleteWindowBuf(&nextWin, &pInfo->twAggSup) && !pInfo->ignoreExpiredData) { void* chIds = taosHashGet(pInfo->pPullDataMap, winKey, sizeof(SWinKey)); if (!chIds) { - SPullWindowInfo pull = {.window = nextWin, .groupId = winKey->groupId, .calWin.skey = nextWin.skey, .calWin.ekey = nextWin.skey}; + SPullWindowInfo pull = { + .window = nextWin, .groupId = winKey->groupId, .calWin.skey = nextWin.skey, .calWin.ekey = nextWin.skey}; // add pull data request if (savePullWindow(&pull, pInfo->pPullWins) == TSDB_CODE_SUCCESS) { int32_t size1 = taosArrayGetSize(pInfo->pChildren); @@ -2384,7 +2388,8 @@ static void doStreamIntervalAggImpl(SOperatorInfo* pOperatorInfo, SSDataBlock* p }; void* chIds = taosHashGet(pInfo->pPullDataMap, &winRes, sizeof(SWinKey)); if (isDeletedStreamWindow(&nextWin, groupId, pInfo->pState, &pInfo->twAggSup) && !chIds) { - SPullWindowInfo pull = {.window = nextWin, .groupId = groupId, .calWin.skey = nextWin.skey, .calWin.ekey = nextWin.skey}; + SPullWindowInfo pull = { + .window = nextWin, .groupId = groupId, .calWin.skey = nextWin.skey, .calWin.ekey = nextWin.skey}; // add pull data request if (savePullWindow(&pull, pInfo->pPullWins) == TSDB_CODE_SUCCESS) { int32_t size = taosArrayGetSize(pInfo->pChildren); @@ -2439,7 +2444,7 @@ static void doStreamIntervalAggImpl(SOperatorInfo* pOperatorInfo, SSDataBlock* p } updateTimeWindowInfo(&pInfo->twAggSup.timeWindowData, &nextWin, true); applyAggFunctionOnPartialTuples(pTaskInfo, pSup->pCtx, &pInfo->twAggSup.timeWindowData, startPos, forwardRows, - pSDataBlock->info.rows, numOfOutput); + pSDataBlock->info.rows, numOfOutput); SWinKey key = { .ts = nextWin.skey, .groupId = groupId, @@ -2530,7 +2535,8 @@ static SSDataBlock* doStreamFinalIntervalAgg(SOperatorInfo* pOperator) { SSDataBlock* pBlock = downstream->fpSet.getNextFn(downstream); if (pBlock == NULL) { pOperator->status = OP_RES_TO_RETURN; - qDebug("===stream===return data:%s. recv datablock num:%" PRIu64 , IS_FINAL_OP(pInfo) ? "interval final" : "interval semi", pInfo->numOfDatapack); + qDebug("===stream===return data:%s. recv datablock num:%" PRIu64, + IS_FINAL_OP(pInfo) ? "interval final" : "interval semi", pInfo->numOfDatapack); pInfo->numOfDatapack = 0; break; } @@ -2650,7 +2656,7 @@ int64_t getDeleteMark(SIntervalPhysiNode* pIntervalPhyNode) { if (pIntervalPhyNode->window.deleteMark <= 0) { return DEAULT_DELETE_MARK; } - int64_t deleteMark = TMAX(pIntervalPhyNode->window.deleteMark,pIntervalPhyNode->window.watermark); + int64_t deleteMark = TMAX(pIntervalPhyNode->window.deleteMark, pIntervalPhyNode->window.watermark); deleteMark = TMAX(deleteMark, pIntervalPhyNode->interval); return deleteMark; } @@ -2698,7 +2704,8 @@ SOperatorInfo* createStreamFinalIntervalOperatorInfo(SOperatorInfo* downstream, SSDataBlock* pResBlock = createDataBlockFromDescNode(pPhyNode->pOutputDataBlockDesc); initBasicInfo(&pInfo->binfo, pResBlock); - int32_t code = initAggSup(&pOperator->exprSupp, &pInfo->aggSup, pExprInfo, numOfCols, keyBufSize, pTaskInfo->id.str); + int32_t code = initAggSup(&pOperator->exprSupp, &pInfo->aggSup, pExprInfo, numOfCols, keyBufSize, pTaskInfo->id.str, + pTaskInfo->streamInfo.pState); if (code != TSDB_CODE_SUCCESS) { goto _error; } @@ -2763,8 +2770,8 @@ SOperatorInfo* createStreamFinalIntervalOperatorInfo(SOperatorInfo* downstream, pOperator->status = OP_NOT_OPENED; pOperator->info = pInfo; - pOperator->fpSet = - createOperatorFpSet(NULL, doStreamFinalIntervalAgg, NULL, destroyStreamFinalIntervalOperatorInfo, optrDefaultBufFn, NULL); + pOperator->fpSet = createOperatorFpSet(NULL, doStreamFinalIntervalAgg, NULL, destroyStreamFinalIntervalOperatorInfo, + optrDefaultBufFn, NULL); if (pPhyNode->type == QUERY_NODE_PHYSICAL_PLAN_STREAM_SEMI_INTERVAL) { initIntervalDownStream(downstream, pPhyNode->type, &pInfo->aggSup, &pInfo->interval, &pInfo->twAggSup); } @@ -3563,8 +3570,8 @@ SOperatorInfo* createStreamSessionAggOperatorInfo(SOperatorInfo* downstream, SPh setOperatorInfo(pOperator, "StreamSessionWindowAggOperator", QUERY_NODE_PHYSICAL_PLAN_STREAM_SESSION, true, OP_NOT_OPENED, pInfo, pTaskInfo); - pOperator->fpSet = - createOperatorFpSet(optrDummyOpenFn, doStreamSessionAgg, NULL, destroyStreamSessionAggOperatorInfo, optrDefaultBufFn, NULL); + pOperator->fpSet = createOperatorFpSet(optrDummyOpenFn, doStreamSessionAgg, NULL, destroyStreamSessionAggOperatorInfo, + optrDefaultBufFn, NULL); if (downstream) { initDownStream(downstream, &pInfo->streamAggSup, pOperator->operatorType, pInfo->primaryTsIndex, &pInfo->twAggSup); @@ -4068,8 +4075,8 @@ SOperatorInfo* createStreamStateAggOperatorInfo(SOperatorInfo* downstream, SPhys setOperatorInfo(pOperator, "StreamStateAggOperator", QUERY_NODE_PHYSICAL_PLAN_STREAM_STATE, true, OP_NOT_OPENED, pInfo, pTaskInfo); - pOperator->fpSet = - createOperatorFpSet(optrDummyOpenFn, doStreamStateAgg, NULL, destroyStreamStateOperatorInfo, optrDefaultBufFn, NULL); + pOperator->fpSet = createOperatorFpSet(optrDummyOpenFn, doStreamStateAgg, NULL, destroyStreamStateOperatorInfo, + optrDefaultBufFn, NULL); initDownStream(downstream, &pInfo->streamAggSup, pOperator->operatorType, pInfo->primaryTsIndex, &pInfo->twAggSup); code = appendDownstream(pOperator, &downstream, 1); if (code != TSDB_CODE_SUCCESS) { @@ -4154,8 +4161,8 @@ static void doMergeAlignedIntervalAggImpl(SOperatorInfo* pOperatorInfo, SResultR } updateTimeWindowInfo(&iaInfo->twAggSup.timeWindowData, &currWin, true); - applyAggFunctionOnPartialTuples(pTaskInfo, pSup->pCtx, &iaInfo->twAggSup.timeWindowData, startPos, currPos - startPos, - pBlock->info.rows, pSup->numOfExprs); + applyAggFunctionOnPartialTuples(pTaskInfo, pSup->pCtx, &iaInfo->twAggSup.timeWindowData, startPos, + currPos - startPos, pBlock->info.rows, pSup->numOfExprs); finalizeResultRows(iaInfo->aggSup.pResultBuf, &pResultRowInfo->cur, pSup, pResultBlock, pTaskInfo); resetResultRow(miaInfo->pResultRow, iaInfo->aggSup.resultRowSize - sizeof(SResultRow)); @@ -4175,7 +4182,7 @@ static void doMergeAlignedIntervalAggImpl(SOperatorInfo* pOperatorInfo, SResultR updateTimeWindowInfo(&iaInfo->twAggSup.timeWindowData, &currWin, true); applyAggFunctionOnPartialTuples(pTaskInfo, pSup->pCtx, &iaInfo->twAggSup.timeWindowData, startPos, currPos - startPos, - pBlock->info.rows, pSup->numOfExprs); + pBlock->info.rows, pSup->numOfExprs); } static void cleanupAfterGroupResultGen(SMergeAlignedIntervalAggOperatorInfo* pMiaInfo, SSDataBlock* pRes) { @@ -4326,7 +4333,8 @@ SOperatorInfo* createMergeAlignedIntervalOperatorInfo(SOperatorInfo* downstream, int32_t num = 0; SExprInfo* pExprInfo = createExprInfo(pNode->window.pFuncs, NULL, &num); - code = initAggSup(&pOperator->exprSupp, &iaInfo->aggSup, pExprInfo, num, keyBufSize, pTaskInfo->id.str); + code = initAggSup(&pOperator->exprSupp, &iaInfo->aggSup, pExprInfo, num, keyBufSize, pTaskInfo->id.str, + pTaskInfo->streamInfo.pState); if (code != TSDB_CODE_SUCCESS) { goto _error; } @@ -4345,8 +4353,8 @@ SOperatorInfo* createMergeAlignedIntervalOperatorInfo(SOperatorInfo* downstream, setOperatorInfo(pOperator, "TimeMergeAlignedIntervalAggOperator", QUERY_NODE_PHYSICAL_PLAN_MERGE_ALIGNED_INTERVAL, false, OP_NOT_OPENED, miaInfo, pTaskInfo); - pOperator->fpSet = - createOperatorFpSet(optrDummyOpenFn, mergeAlignedIntervalAgg, NULL, destroyMAIOperatorInfo, optrDefaultBufFn, NULL); + pOperator->fpSet = createOperatorFpSet(optrDummyOpenFn, mergeAlignedIntervalAgg, NULL, destroyMAIOperatorInfo, + optrDefaultBufFn, NULL); code = appendDownstream(pOperator, &downstream, 1); if (code != TSDB_CODE_SUCCESS) { @@ -4481,7 +4489,7 @@ static void doMergeIntervalAggImpl(SOperatorInfo* pOperatorInfo, SResultRowInfo* updateTimeWindowInfo(&iaInfo->twAggSup.timeWindowData, &win, true); applyAggFunctionOnPartialTuples(pTaskInfo, pExprSup->pCtx, &iaInfo->twAggSup.timeWindowData, startPos, forwardRows, - pBlock->info.rows, numOfOutput); + pBlock->info.rows, numOfOutput); doCloseWindow(pResultRowInfo, iaInfo, pResult); // output previous interval results after this interval (&win) is closed @@ -4513,7 +4521,7 @@ static void doMergeIntervalAggImpl(SOperatorInfo* pOperatorInfo, SResultRowInfo* updateTimeWindowInfo(&iaInfo->twAggSup.timeWindowData, &nextWin, true); applyAggFunctionOnPartialTuples(pTaskInfo, pExprSup->pCtx, &iaInfo->twAggSup.timeWindowData, startPos, forwardRows, - pBlock->info.rows, numOfOutput); + pBlock->info.rows, numOfOutput); doCloseWindow(pResultRowInfo, iaInfo, pResult); // output previous interval results after this interval (&nextWin) is closed @@ -4630,7 +4638,8 @@ SOperatorInfo* createMergeIntervalOperatorInfo(SOperatorInfo* downstream, SMerge size_t keyBufSize = sizeof(int64_t) + sizeof(int64_t) + POINTER_BYTES; initResultSizeInfo(&pOperator->resultInfo, 4096); - int32_t code = initAggSup(pExprSupp, &pIntervalInfo->aggSup, pExprInfo, num, keyBufSize, pTaskInfo->id.str); + int32_t code = initAggSup(pExprSupp, &pIntervalInfo->aggSup, pExprInfo, num, keyBufSize, pTaskInfo->id.str, + pTaskInfo->streamInfo.pState); if (code != TSDB_CODE_SUCCESS) { goto _error; } @@ -4650,8 +4659,8 @@ SOperatorInfo* createMergeIntervalOperatorInfo(SOperatorInfo* downstream, SMerge initResultRowInfo(&pIntervalInfo->binfo.resultRowInfo); setOperatorInfo(pOperator, "TimeMergeIntervalAggOperator", QUERY_NODE_PHYSICAL_PLAN_MERGE_INTERVAL, false, OP_NOT_OPENED, pMergeIntervalInfo, pTaskInfo); - pOperator->fpSet = - createOperatorFpSet(optrDummyOpenFn, doMergeIntervalAgg, NULL, destroyMergeIntervalOperatorInfo, optrDefaultBufFn, NULL); + pOperator->fpSet = createOperatorFpSet(optrDummyOpenFn, doMergeIntervalAgg, NULL, destroyMergeIntervalOperatorInfo, + optrDefaultBufFn, NULL); code = appendDownstream(pOperator, &downstream, 1); if (code != TSDB_CODE_SUCCESS) { @@ -4828,7 +4837,8 @@ SOperatorInfo* createStreamIntervalOperatorInfo(SOperatorInfo* downstream, SPhys initResultSizeInfo(&pOperator->resultInfo, 4096); size_t keyBufSize = sizeof(int64_t) + sizeof(int64_t) + POINTER_BYTES; - code = initAggSup(pSup, &pInfo->aggSup, pExprInfo, numOfCols, keyBufSize, pTaskInfo->id.str); + code = initAggSup(pSup, &pInfo->aggSup, pExprInfo, numOfCols, keyBufSize, pTaskInfo->id.str, + pTaskInfo->streamInfo.pState); if (code != TSDB_CODE_SUCCESS) { goto _error; } diff --git a/source/libs/function/inc/builtinsimpl.h b/source/libs/function/inc/builtinsimpl.h index a7ac53fab6..cbda8dc472 100644 --- a/source/libs/function/inc/builtinsimpl.h +++ b/source/libs/function/inc/builtinsimpl.h @@ -32,7 +32,7 @@ typedef struct SSumRes { int16_t type; int64_t prevTs; bool isPrevTsSet; - bool overflow; // if overflow is true, dsum to be used for any type; + bool overflow; // if overflow is true, dsum to be used for any type; } SSumRes; typedef struct SMinmaxResInfo { @@ -46,7 +46,7 @@ typedef struct SMinmaxResInfo { } SMinmaxResInfo; int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc); -STuplePos saveTupleData(SqlFunctionCtx* pCtx, int32_t rowIndex, const SSDataBlock* pSrcBlock, const STupleKey* pKey); +STuplePos saveTupleData(SqlFunctionCtx* pCtx, int32_t rowIndex, const SSDataBlock* pSrcBlock); int32_t updateTupleData(SqlFunctionCtx* pCtx, int32_t rowIndex, const SSDataBlock* pSrcBlock, STuplePos* pPos); const char* loadTupleData(SqlFunctionCtx* pCtx, const STuplePos* pPos); diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c index d03a7fce75..0d1a661de9 100644 --- a/source/libs/function/src/builtinsimpl.c +++ b/source/libs/function/src/builtinsimpl.c @@ -41,15 +41,15 @@ #define HLL_BUCKET_MASK (HLL_BUCKETS - 1) #define HLL_ALPHA_INF 0.721347520444481703680 // constant for 0.5/ln(2) -//typedef struct SMinmaxResInfo { -// bool assign; // assign the first value or not -// int64_t v; -// STuplePos tuplePos; +// typedef struct SMinmaxResInfo { +// bool assign; // assign the first value or not +// int64_t v; +// STuplePos tuplePos; // -// STuplePos nullTuplePos; -// bool nullTupleSaved; -// int16_t type; -//} SMinmaxResInfo; +// STuplePos nullTuplePos; +// bool nullTupleSaved; +// int16_t type; +// } SMinmaxResInfo; typedef struct STopBotResItem { SVariant v; @@ -2018,7 +2018,7 @@ static void firstlastSaveTupleData(const SSDataBlock* pSrcBlock, int32_t rowInde } if (!pInfo->hasResult) { - pInfo->pos = saveTupleData(pCtx, rowIndex, pSrcBlock, NULL); + pInfo->pos = saveTupleData(pCtx, rowIndex, pSrcBlock); } else { updateTupleData(pCtx, rowIndex, pSrcBlock, &pInfo->pos); } @@ -2236,9 +2236,9 @@ int32_t lastFunction(SqlFunctionCtx* pCtx) { int32_t round = pInput->numOfRows >> 2; int32_t reminder = pInput->numOfRows & 0x03; - for (int32_t i = pInput->startRowIndex, tick = 0; tick < round; i += 4, tick += 1) { - int64_t cts = pts[i]; - int32_t chosen = i; + for (int32_t i = pInput->startRowIndex, tick = 0; tick < round; i += 4, tick += 1) { + int64_t cts = pts[i]; + int32_t chosen = i; if (cts < pts[i + 1]) { cts = pts[i + 1]; @@ -2262,18 +2262,18 @@ int32_t lastFunction(SqlFunctionCtx* pCtx) { } } - for (int32_t i = pInput->startRowIndex + round * 4; i < pInput->startRowIndex + pInput->numOfRows; ++i) { - if (pResInfo->numOfRes == 0 || pInfo->ts < pts[i]) { - char* data = colDataGetData(pInputCol, i); - doSaveCurrentVal(pCtx, i, pts[i], type, data); - pResInfo->numOfRes = 1; - } + for (int32_t i = pInput->startRowIndex + round * 4; i < pInput->startRowIndex + pInput->numOfRows; ++i) { + if (pResInfo->numOfRes == 0 || pInfo->ts < pts[i]) { + char* data = colDataGetData(pInputCol, i); + doSaveCurrentVal(pCtx, i, pts[i], type, data); + pResInfo->numOfRes = 1; + } + } + } else { + for (int32_t i = pInput->startRowIndex; i < pInput->startRowIndex + pInput->numOfRows; ++i) { + if (colDataIsNull(pInputCol, pInput->totalRows, i, pColAgg)) { + continue; } - } else { - for (int32_t i = pInput->startRowIndex; i < pInput->startRowIndex + pInput->numOfRows; ++i) { - if (colDataIsNull(pInputCol, pInput->totalRows, i, pColAgg)) { - continue; - } numOfElems++; @@ -2439,7 +2439,7 @@ int32_t lastRowFunction(SqlFunctionCtx* pCtx) { SInputColumnInfoData* pInput = &pCtx->input; SColumnInfoData* pInputCol = pInput->pData[0]; - int32_t type = pInputCol->info.type; + int32_t type = pInputCol->info.type; int32_t bytes = pInputCol->info.bytes; pInfo->bytes = bytes; @@ -2777,7 +2777,7 @@ int32_t topFunction(SqlFunctionCtx* pCtx) { } if (numOfElems == 0 && pCtx->subsidiaries.num > 0 && !pRes->nullTupleSaved) { - pRes->nullTuplePos = saveTupleData(pCtx, pInput->startRowIndex, pCtx->pSrcBlock, NULL); + pRes->nullTuplePos = saveTupleData(pCtx, pInput->startRowIndex, pCtx->pSrcBlock); pRes->nullTupleSaved = true; } return TSDB_CODE_SUCCESS; @@ -2805,7 +2805,7 @@ int32_t bottomFunction(SqlFunctionCtx* pCtx) { } if (numOfElems == 0 && pCtx->subsidiaries.num > 0 && !pRes->nullTupleSaved) { - pRes->nullTuplePos = saveTupleData(pCtx, pInput->startRowIndex, pCtx->pSrcBlock, NULL); + pRes->nullTuplePos = saveTupleData(pCtx, pInput->startRowIndex, pCtx->pSrcBlock); pRes->nullTupleSaved = true; } @@ -2863,7 +2863,7 @@ void doAddIntoResult(SqlFunctionCtx* pCtx, void* pData, int32_t rowIndex, SSData // save the data of this tuple if (pCtx->subsidiaries.num > 0) { - pItem->tuplePos = saveTupleData(pCtx, rowIndex, pSrcBlock, NULL); + pItem->tuplePos = saveTupleData(pCtx, rowIndex, pSrcBlock); } #ifdef BUF_PAGE_DEBUG qDebug("page_saveTuple i:%d, item:%p,pageId:%d, offset:%d\n", pEntryInfo->numOfRes, pItem, pItem->tuplePos.pageId, @@ -2937,8 +2937,7 @@ void* serializeTupleData(const SSDataBlock* pSrcBlock, int32_t rowIndex, SSubsid return buf; } -static STuplePos doSaveTupleData(SSerializeDataHandle* pHandle, const void* pBuf, size_t length, - const STupleKey* pKey) { +static STuplePos doSaveTupleData(SSerializeDataHandle* pHandle, const void* pBuf, size_t length, STupleKey key) { STuplePos p = {0}; if (pHandle->pBuf != NULL) { SFilePage* pPage = NULL; @@ -2964,20 +2963,31 @@ static STuplePos doSaveTupleData(SSerializeDataHandle* pHandle, const void* pBuf releaseBufPage(pHandle->pBuf, pPage); } else { // other tuple save policy - if (streamStateFuncPut(pHandle->pState, pKey, pBuf, length) < 0) { + if (streamStateFuncPut(pHandle->pState, &key, pBuf, length) < 0) { ASSERT(0); } - p.streamTupleKey = *pKey; + p.streamTupleKey = key; } return p; } -STuplePos saveTupleData(SqlFunctionCtx* pCtx, int32_t rowIndex, const SSDataBlock* pSrcBlock, const STupleKey* pKey) { +STuplePos saveTupleData(SqlFunctionCtx* pCtx, int32_t rowIndex, const SSDataBlock* pSrcBlock) { prepareBuf(pCtx); + STupleKey key; + if (pCtx->saveHandle.pBuf == NULL) { + SColumnInfoData* pColInfo = taosArrayGet(pSrcBlock->pDataBlock, 0); + ASSERT(pColInfo->info.type == TSDB_DATA_TYPE_TIMESTAMP); + int64_t skey = *(int64_t*)colDataGetData(pColInfo, rowIndex); + + key.groupId = pSrcBlock->info.id.groupId; + key.ts = skey; + key.exprIdx = pCtx->exprIdx; + } + char* buf = serializeTupleData(pSrcBlock, rowIndex, &pCtx->subsidiaries, pCtx->subsidiaries.buf); - return doSaveTupleData(&pCtx->saveHandle, buf, pCtx->subsidiaries.rowLen, pKey); + return doSaveTupleData(&pCtx->saveHandle, buf, pCtx->subsidiaries.rowLen, key); } static int32_t doUpdateTupleData(SSerializeDataHandle* pHandle, const void* pBuf, size_t length, STuplePos* pPos) { @@ -3623,7 +3633,7 @@ bool histogramFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultIn pInfo->totalCount = 0; pInfo->normalized = 0; - char *binTypeStr = strndup(varDataVal(pCtx->param[1].param.pz), varDataLen(pCtx->param[1].param.pz)); + char* binTypeStr = strndup(varDataVal(pCtx->param[1].param.pz), varDataLen(pCtx->param[1].param.pz)); int8_t binType = getHistogramBinType(binTypeStr); taosMemoryFree(binTypeStr); @@ -3947,7 +3957,6 @@ int32_t hllFunctionMerge(SqlFunctionCtx* pCtx) { int32_t start = pInput->startRowIndex; - for (int32_t i = start; i < start + pInput->numOfRows; ++i) { char* data = colDataGetData(pCol, i); SHLLInfo* pInputInfo = (SHLLInfo*)varDataVal(data); @@ -4423,7 +4432,7 @@ static void doReservoirSample(SqlFunctionCtx* pCtx, SSampleInfo* pInfo, char* da if (pInfo->numSampled < pInfo->samples) { sampleAssignResult(pInfo, data, pInfo->numSampled); if (pCtx->subsidiaries.num > 0) { - pInfo->tuplePos[pInfo->numSampled] = saveTupleData(pCtx, index, pCtx->pSrcBlock, NULL); + pInfo->tuplePos[pInfo->numSampled] = saveTupleData(pCtx, index, pCtx->pSrcBlock); } pInfo->numSampled++; } else { @@ -4454,7 +4463,7 @@ int32_t sampleFunction(SqlFunctionCtx* pCtx) { } if (pInfo->numSampled == 0 && pCtx->subsidiaries.num > 0 && !pInfo->nullTupleSaved) { - pInfo->nullTuplePos = saveTupleData(pCtx, pInput->startRowIndex, pCtx->pSrcBlock, NULL); + pInfo->nullTuplePos = saveTupleData(pCtx, pInput->startRowIndex, pCtx->pSrcBlock); pInfo->nullTupleSaved = true; } @@ -4758,7 +4767,7 @@ static void doModeAdd(SModeInfo* pInfo, int32_t rowIndex, SqlFunctionCtx* pCtx, pItem->count += 1; if (pCtx->subsidiaries.num > 0) { - pItem->tuplePos = saveTupleData(pCtx, rowIndex, pCtx->pSrcBlock, NULL); + pItem->tuplePos = saveTupleData(pCtx, rowIndex, pCtx->pSrcBlock); } taosHashPut(pInfo->pHash, data, hashKeyBytes, &pItem, sizeof(SModeItem*)); @@ -4798,7 +4807,7 @@ int32_t modeFunction(SqlFunctionCtx* pCtx) { } if (numOfElems == 0 && pCtx->subsidiaries.num > 0 && !pInfo->nullTupleSaved) { - pInfo->nullTuplePos = saveTupleData(pCtx, pInput->startRowIndex, pCtx->pSrcBlock, NULL); + pInfo->nullTuplePos = saveTupleData(pCtx, pInput->startRowIndex, pCtx->pSrcBlock); pInfo->nullTupleSaved = true; } @@ -5299,7 +5308,7 @@ int32_t blockDistFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) { int32_t len = sprintf(st + VARSTR_HEADER_SIZE, "Total_Blocks=[%d] Total_Size=[%.2f Kb] Average_size=[%.2f Kb] Compression_Ratio=[%.2f %c]", - pData->numOfBlocks, pData->totalSize / 1024.0, averageSize/1024.0, compRatio, '%'); + pData->numOfBlocks, pData->totalSize / 1024.0, averageSize / 1024.0, compRatio, '%'); varDataSetLen(st, len); colDataAppend(pColInfo, row++, st, false); diff --git a/source/libs/function/src/detail/tminmax.c b/source/libs/function/src/detail/tminmax.c index cb5cea3cc8..05cebfeca7 100644 --- a/source/libs/function/src/detail/tminmax.c +++ b/source/libs/function/src/detail/tminmax.c @@ -64,7 +64,7 @@ static void calculateRounds(int32_t numOfRows, int32_t bytes, int32_t* remainder, int32_t* rounds, int32_t* width) { const int32_t bitWidth = 256; - *width = (bitWidth>>3u) / bytes; + *width = (bitWidth >> 3u) / bytes; *remainder = numOfRows % (*width); *rounds = numOfRows / (*width); } @@ -92,8 +92,7 @@ static void calculateRounds(int32_t numOfRows, int32_t bytes, int32_t* remainder (_v) = (_sec)[j]; \ } \ } - - + static int8_t i8VectorCmpAVX2(const void* pData, int32_t numOfRows, bool isMinFunc, bool signVal) { int8_t v = 0; const int8_t* p = pData; @@ -116,7 +115,7 @@ static int8_t i8VectorCmpAVX2(const void* pData, int32_t numOfRows, bool isMinFu const int8_t* q = (const int8_t*)&initVal; EXTRACT_MAX_VAL(q, p, width, remain, v) - } else { // unsigned value + } else { // unsigned value for (int32_t i = 0; i < rounds; ++i) { next = _mm256_lddqu_si256((__m256i*)p); initVal = _mm256_max_epu8(initVal, next); @@ -126,7 +125,7 @@ static int8_t i8VectorCmpAVX2(const void* pData, int32_t numOfRows, bool isMinFu const uint8_t* q = (const uint8_t*)&initVal; EXTRACT_MAX_VAL(q, p, width, remain, v) } - + } else { // min function if (signVal) { for (int32_t i = 0; i < rounds; ++i) { @@ -241,7 +240,7 @@ static int32_t i32VectorCmpAVX2(const int32_t* pData, int32_t numOfRows, bool is // let compare the final results const int32_t* q = (const int32_t*)&initVal; EXTRACT_MAX_VAL(q, p, width, remain, v) - } else { // unsigned value + } else { // unsigned value for (int32_t i = 0; i < rounds; ++i) { next = _mm256_lddqu_si256((__m256i*)p); initVal = _mm256_max_epi32(initVal, next); @@ -281,7 +280,7 @@ static int32_t i32VectorCmpAVX2(const int32_t* pData, int32_t numOfRows, bool is } static float floatVectorCmpAVX(const float* pData, int32_t numOfRows, bool isMinFunc) { - float v = 0; + float v = 0; const float* p = pData; int32_t width, remain, rounds; @@ -358,7 +357,7 @@ static double doubleVectorCmpAVX(const double* pData, int32_t numOfRows, bool is static int32_t findFirstValPosition(const SColumnInfoData* pCol, int32_t start, int32_t numOfRows) { int32_t i = start; - + while (i < (start + numOfRows) && (colDataIsNull_f(pCol->nullbitmap, i) == true)) { i += 1; } @@ -495,7 +494,8 @@ static void handleInt64Col(const void* data, int32_t start, int32_t numOfRows, S } } -static void handleFloatCol(SColumnInfoData* pCol, int32_t start, int32_t numOfRows, SMinmaxResInfo* pBuf, bool isMinFunc) { +static void handleFloatCol(SColumnInfoData* pCol, int32_t start, int32_t numOfRows, SMinmaxResInfo* pBuf, + bool isMinFunc) { float* pData = (float*)pCol->pData; float* val = (float*)&pBuf->v; @@ -525,7 +525,8 @@ static void handleFloatCol(SColumnInfoData* pCol, int32_t start, int32_t numOfRo pBuf->assign = true; } -static void handleDoubleCol(SColumnInfoData* pCol, int32_t start, int32_t numOfRows, SMinmaxResInfo* pBuf, bool isMinFunc) { +static void handleDoubleCol(SColumnInfoData* pCol, int32_t start, int32_t numOfRows, SMinmaxResInfo* pBuf, + bool isMinFunc) { double* pData = (double*)pCol->pData; double* val = (double*)&pBuf->v; @@ -740,7 +741,7 @@ int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc) { if (pCtx->subsidiaries.num > 0) { index = findRowIndex(pInput->startRowIndex, pInput->numOfRows, pCol, tval); if (index >= 0) { - pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock, NULL); + pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock); } } } else { @@ -754,7 +755,7 @@ int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc) { if (pCtx->subsidiaries.num > 0) { index = findRowIndex(pInput->startRowIndex, pInput->numOfRows, pCol, tval); if (index >= 0) { - pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock, NULL); + pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock); } } } @@ -768,7 +769,7 @@ int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc) { if (pCtx->subsidiaries.num > 0) { index = findRowIndex(pInput->startRowIndex, pInput->numOfRows, pCol, tval); if (index >= 0) { - pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock, NULL); + pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock); } } } @@ -782,7 +783,7 @@ int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc) { if (pCtx->subsidiaries.num > 0) { index = findRowIndex(pInput->startRowIndex, pInput->numOfRows, pCol, tval); if (index >= 0) { - pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock, NULL); + pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock); } } } @@ -798,7 +799,7 @@ int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc) { if (pCtx->subsidiaries.num > 0) { index = findRowIndex(pInput->startRowIndex, pInput->numOfRows, pCol, tval); if (index >= 0) { - pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock, NULL); + pBuf->tuplePos = saveTupleData(pCtx, index, pCtx->pSrcBlock); } } } @@ -819,7 +820,7 @@ int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc) { memcpy(&pBuf->v, pCol->pData + (pCol->info.bytes * i), pCol->info.bytes); if (pCtx->subsidiaries.num > 0) { - pBuf->tuplePos = saveTupleData(pCtx, i, pCtx->pSrcBlock, NULL); + pBuf->tuplePos = saveTupleData(pCtx, i, pCtx->pSrcBlock); } pBuf->assign = true; numOfElems = 1; @@ -883,9 +884,9 @@ int32_t doMinMaxHelper(SqlFunctionCtx* pCtx, int32_t isMinFunc) { _over: if (numOfElems == 0 && pCtx->subsidiaries.num > 0 && !pBuf->nullTupleSaved) { - pBuf->nullTuplePos = saveTupleData(pCtx, pInput->startRowIndex, pCtx->pSrcBlock, NULL); + pBuf->nullTuplePos = saveTupleData(pCtx, pInput->startRowIndex, pCtx->pSrcBlock); pBuf->nullTupleSaved = true; } return numOfElems; -} \ No newline at end of file +} diff --git a/source/libs/stream/src/streamState.c b/source/libs/stream/src/streamState.c index 6670bf463e..96c86be94d 100644 --- a/source/libs/stream/src/streamState.c +++ b/source/libs/stream/src/streamState.c @@ -107,7 +107,7 @@ static inline int stateKeyCmpr(const void* pKey1, int kLen1, const void* pKey2, } SStreamState* streamStateOpen(char* path, SStreamTask* pTask, bool specPath, int32_t szPage, int32_t pages) { - szPage = szPage < 0 ? 4096 : szPage; + szPage = szPage < 0 ? (16 * 1024) : szPage; pages = pages < 0 ? 256 : pages; SStreamState* pState = taosMemoryCalloc(1, sizeof(SStreamState)); if (pState == NULL) { From b2f306e09d94d102740da63d6575420590944831 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Thu, 29 Dec 2022 14:12:09 +0800 Subject: [PATCH 23/40] avoid invalid free --- source/dnode/mgmt/exe/dmMain.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/dnode/mgmt/exe/dmMain.c b/source/dnode/mgmt/exe/dmMain.c index a432201413..d308d3e618 100644 --- a/source/dnode/mgmt/exe/dmMain.c +++ b/source/dnode/mgmt/exe/dmMain.c @@ -178,7 +178,7 @@ static int32_t dmInitLog() { } static void taosCleanupArgs() { - if (global.envCmd != NULL) taosMemoryFree(global.envCmd); + if (global.envCmd != NULL) taosMemoryFreeClear(global.envCmd); } int main(int argc, char const *argv[]) { @@ -271,7 +271,6 @@ int mainWindows(int argc, char **argv) { taosCleanupCfg(); taosCloseLog(); - taosCleanupArgs(); taosConvDestroy(); return -1; } From f12df819aee7041ad68b1225977c7a9dd47a3dcf Mon Sep 17 00:00:00 2001 From: Minglei Jin Date: Thu, 29 Dec 2022 14:23:21 +0800 Subject: [PATCH 24/40] fix(tdb): free stack celldecoder's pVal --- source/libs/tdb/src/db/tdbBtree.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/libs/tdb/src/db/tdbBtree.c b/source/libs/tdb/src/db/tdbBtree.c index 5c1f264460..79d37b7674 100644 --- a/source/libs/tdb/src/db/tdbBtree.c +++ b/source/libs/tdb/src/db/tdbBtree.c @@ -1742,6 +1742,10 @@ int tdbBtreeNext(SBTC *pBtc, void **ppKey, int *kLen, void **ppVal, int *vLen) { } memcpy(pVal, cd.pVal, cd.vLen); + if (TDB_CELLDECODER_FREE_VAL(&cd)) { + tdbTrace("tdb/btree-next decoder: %p pVal free: %p", &cd, cd.pVal); + tdbFree(cd.pVal); + } } else { pVal = NULL; } From e0ca1affdf3bd5018ced64c05355935b0c29f622 Mon Sep 17 00:00:00 2001 From: Xiaoyu Wang Date: Thu, 29 Dec 2022 14:39:02 +0800 Subject: [PATCH 25/40] fix: escape error in create topic/stream --- include/util/tdef.h | 19 +- source/libs/parser/inc/parAst.h | 21 +- source/libs/parser/inc/sql.y | 11 +- source/libs/parser/src/parAstCreater.c | 64 +- source/libs/parser/src/sql.c | 4467 ++++++++++++------------ 5 files changed, 2328 insertions(+), 2254 deletions(-) diff --git a/include/util/tdef.h b/include/util/tdef.h index d585912259..9626180b99 100644 --- a/include/util/tdef.h +++ b/include/util/tdef.h @@ -189,12 +189,13 @@ typedef enum ELogicConditionType { #define TSDB_MAX_COLUMNS 4096 #define TSDB_MIN_COLUMNS 2 // PRIMARY COLUMN(timestamp) + other columns -#define TSDB_NODE_NAME_LEN 64 -#define TSDB_TABLE_NAME_LEN 193 // it is a null-terminated string -#define TSDB_TOPIC_NAME_LEN 193 // it is a null-terminated string -#define TSDB_CGROUP_LEN 193 // it is a null-terminated string -#define TSDB_DB_NAME_LEN 65 -#define TSDB_DB_FNAME_LEN (TSDB_ACCT_ID_LEN + TSDB_DB_NAME_LEN + TSDB_NAME_DELIMITER_LEN) +#define TSDB_NODE_NAME_LEN 64 +#define TSDB_TABLE_NAME_LEN 193 // it is a null-terminated string +#define TSDB_TOPIC_NAME_LEN 193 // it is a null-terminated string +#define TSDB_CGROUP_LEN 193 // it is a null-terminated string +#define TSDB_STREAM_NAME_LEN 193 // it is a null-terminated string +#define TSDB_DB_NAME_LEN 65 +#define TSDB_DB_FNAME_LEN (TSDB_ACCT_ID_LEN + TSDB_DB_NAME_LEN + TSDB_NAME_DELIMITER_LEN) #define TSDB_FUNC_NAME_LEN 65 #define TSDB_FUNC_COMMENT_LEN 1024 * 1024 @@ -212,8 +213,8 @@ typedef enum ELogicConditionType { #define TSDB_INDEX_FNAME_LEN (TSDB_DB_FNAME_LEN + TSDB_INDEX_NAME_LEN + TSDB_NAME_DELIMITER_LEN) #define TSDB_TYPE_STR_MAX_LEN 32 #define TSDB_TABLE_FNAME_LEN (TSDB_DB_FNAME_LEN + TSDB_TABLE_NAME_LEN + TSDB_NAME_DELIMITER_LEN) -#define TSDB_TOPIC_FNAME_LEN (TSDB_ACCT_ID_LEN + TSDB_TABLE_NAME_LEN + TSDB_NAME_DELIMITER_LEN) -#define TSDB_STREAM_FNAME_LEN (TSDB_ACCT_ID_LEN + TSDB_TABLE_NAME_LEN + TSDB_NAME_DELIMITER_LEN) +#define TSDB_TOPIC_FNAME_LEN (TSDB_ACCT_ID_LEN + TSDB_TOPIC_NAME_LEN + TSDB_NAME_DELIMITER_LEN) +#define TSDB_STREAM_FNAME_LEN (TSDB_ACCT_ID_LEN + TSDB_STREAM_NAME_LEN + TSDB_NAME_DELIMITER_LEN) #define TSDB_SUBSCRIBE_KEY_LEN (TSDB_CGROUP_LEN + TSDB_TOPIC_FNAME_LEN + 2) #define TSDB_PARTITION_KEY_LEN (TSDB_SUBSCRIBE_KEY_LEN + 20) #define TSDB_COL_NAME_LEN 65 @@ -310,7 +311,7 @@ typedef enum ELogicConditionType { #define TSDB_MIN_KEEP (1 * 1440) // data in db to be reserved. unit minute #define TSDB_MAX_KEEP (365000 * 1440) // data in db to be reserved. #define TSDB_MAX_KEEP_NS (365 * 292 * 1440) // data in db to be reserved. -#define TSDB_DEFAULT_KEEP (3650 * 1440) // ten years +#define TSDB_DEFAULT_KEEP (3650 * 1440) // ten years #define TSDB_MIN_MINROWS_FBLOCK 10 #define TSDB_MAX_MINROWS_FBLOCK 1000 #define TSDB_DEFAULT_MINROWS_FBLOCK 100 diff --git a/source/libs/parser/inc/parAst.h b/source/libs/parser/inc/parAst.h index 20a2520a79..5fecc95f1b 100644 --- a/source/libs/parser/inc/parAst.h +++ b/source/libs/parser/inc/parAst.h @@ -186,6 +186,7 @@ SNode* createDropUserStmt(SAstCreateContext* pCxt, SToken* pUserName); SNode* createCreateDnodeStmt(SAstCreateContext* pCxt, const SToken* pFqdn, const SToken* pPort); SNode* createDropDnodeStmt(SAstCreateContext* pCxt, const SToken* pDnode, bool force); SNode* createAlterDnodeStmt(SAstCreateContext* pCxt, const SToken* pDnode, const SToken* pConfig, const SToken* pValue); +SNode* createRealTableNodeForIndexName(SAstCreateContext* pCxt, SToken* pDbName, SToken* pIndexName); SNode* createCreateIndexStmt(SAstCreateContext* pCxt, EIndexType type, bool ignoreExists, SNode* pIndexName, SNode* pRealTable, SNodeList* pCols, SNode* pOptions); SNode* createIndexOption(SAstCreateContext* pCxt, SNodeList* pFuncs, SNode* pInterval, SNode* pOffset, SNode* pSliding, @@ -193,15 +194,13 @@ SNode* createIndexOption(SAstCreateContext* pCxt, SNodeList* pFuncs, SNode* pInt SNode* createDropIndexStmt(SAstCreateContext* pCxt, bool ignoreNotExists, SNode* pIndexName); SNode* createCreateComponentNodeStmt(SAstCreateContext* pCxt, ENodeType type, const SToken* pDnodeId); SNode* createDropComponentNodeStmt(SAstCreateContext* pCxt, ENodeType type, const SToken* pDnodeId); -SNode* createCreateTopicStmtUseQuery(SAstCreateContext* pCxt, bool ignoreExists, const SToken* pTopicName, - SNode* pQuery); -SNode* createCreateTopicStmtUseDb(SAstCreateContext* pCxt, bool ignoreExists, const SToken* pTopicName, - SToken* pSubDbName, bool withMeta); -SNode* createCreateTopicStmtUseTable(SAstCreateContext* pCxt, bool ignoreExists, const SToken* pTopicName, - SNode* pRealTable, bool withMeta); -SNode* createDropTopicStmt(SAstCreateContext* pCxt, bool ignoreNotExists, const SToken* pTopicName); -SNode* createDropCGroupStmt(SAstCreateContext* pCxt, bool ignoreNotExists, const SToken* pCGroupId, - const SToken* pTopicName); +SNode* createCreateTopicStmtUseQuery(SAstCreateContext* pCxt, bool ignoreExists, SToken* pTopicName, SNode* pQuery); +SNode* createCreateTopicStmtUseDb(SAstCreateContext* pCxt, bool ignoreExists, SToken* pTopicName, SToken* pSubDbName, + bool withMeta); +SNode* createCreateTopicStmtUseTable(SAstCreateContext* pCxt, bool ignoreExists, SToken* pTopicName, SNode* pRealTable, + bool withMeta); +SNode* createDropTopicStmt(SAstCreateContext* pCxt, bool ignoreNotExists, SToken* pTopicName); +SNode* createDropCGroupStmt(SAstCreateContext* pCxt, bool ignoreNotExists, const SToken* pCGroupId, SToken* pTopicName); SNode* createAlterLocalStmt(SAstCreateContext* pCxt, const SToken* pConfig, const SToken* pValue); SNode* createDefaultExplainOptions(SAstCreateContext* pCxt); SNode* setExplainVerbose(SAstCreateContext* pCxt, SNode* pOptions, const SToken* pVal); @@ -214,9 +213,9 @@ SNode* createCreateFunctionStmt(SAstCreateContext* pCxt, bool ignoreExists, bool const SToken* pLibPath, SDataType dataType, int32_t bufSize); SNode* createDropFunctionStmt(SAstCreateContext* pCxt, bool ignoreNotExists, const SToken* pFuncName); SNode* createStreamOptions(SAstCreateContext* pCxt); -SNode* createCreateStreamStmt(SAstCreateContext* pCxt, bool ignoreExists, const SToken* pStreamName, SNode* pRealTable, +SNode* createCreateStreamStmt(SAstCreateContext* pCxt, bool ignoreExists, SToken* pStreamName, SNode* pRealTable, SNode* pOptions, SNodeList* pTags, SNode* pSubtable, SNode* pQuery); -SNode* createDropStreamStmt(SAstCreateContext* pCxt, bool ignoreNotExists, const SToken* pStreamName); +SNode* createDropStreamStmt(SAstCreateContext* pCxt, bool ignoreNotExists, SToken* pStreamName); SNode* createKillStmt(SAstCreateContext* pCxt, ENodeType type, const SToken* pId); SNode* createKillQueryStmt(SAstCreateContext* pCxt, const SToken* pQueryId); SNode* createBalanceVgroupStmt(SAstCreateContext* pCxt); diff --git a/source/libs/parser/inc/sql.y b/source/libs/parser/inc/sql.y index 212a1c92b5..7136a555cd 100644 --- a/source/libs/parser/inc/sql.y +++ b/source/libs/parser/inc/sql.y @@ -459,8 +459,11 @@ tag_item(A) ::= column_name(B) AS column_alias(C). /************************************************ create index ********************************************************/ cmd ::= CREATE SMA INDEX not_exists_opt(D) - full_table_name(A) ON full_table_name(B) index_options(C). { pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_SMA, D, A, B, NULL, C); } -cmd ::= DROP INDEX exists_opt(B) full_table_name(A). { pCxt->pRootNode = createDropIndexStmt(pCxt, B, A); } + full_index_name(A) ON full_table_name(B) index_options(C). { pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_SMA, D, A, B, NULL, C); } +cmd ::= DROP INDEX exists_opt(B) full_index_name(A). { pCxt->pRootNode = createDropIndexStmt(pCxt, B, A); } + +full_index_name(A) ::= index_name(B). { A = createRealTableNodeForIndexName(pCxt, NULL, &B); } +full_index_name(A) ::= db_name(B) NK_DOT index_name(C). { A = createRealTableNodeForIndexName(pCxt, &B, &C); } index_options(A) ::= FUNCTION NK_LP func_list(B) NK_RP INTERVAL NK_LP duration_literal(C) NK_RP sliding_opt(D) sma_stream_opt(E). { A = createIndexOption(pCxt, B, releaseRawExprNode(pCxt, C), NULL, D, E); } @@ -657,6 +660,10 @@ stream_name(A) ::= NK_ID(B). %destructor cgroup_name { } cgroup_name(A) ::= NK_ID(B). { A = B; } +%type index_name { SToken } +%destructor index_name { } +index_name(A) ::= NK_ID(B). { A = B; } + /************************************************ expression **********************************************************/ expr_or_subquery(A) ::= expression(B). { A = B; } //expr_or_subquery(A) ::= subquery(B). { A = createTempTableNode(pCxt, releaseRawExprNode(pCxt, B), NULL); } diff --git a/source/libs/parser/src/parAstCreater.c b/source/libs/parser/src/parAstCreater.c index 17d8297cf0..eaa72b1377 100644 --- a/source/libs/parser/src/parAstCreater.c +++ b/source/libs/parser/src/parAstCreater.c @@ -201,6 +201,24 @@ static bool checkIndexName(SAstCreateContext* pCxt, SToken* pIndexName) { return true; } +static bool checkTopicName(SAstCreateContext* pCxt, SToken* pTopicName) { + trimEscape(pTopicName); + if (pTopicName->n >= TSDB_TOPIC_NAME_LEN) { + pCxt->errCode = generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_IDENTIFIER_NAME, pTopicName->z); + return false; + } + return true; +} + +static bool checkStreamName(SAstCreateContext* pCxt, SToken* pStreamName) { + trimEscape(pStreamName); + if (pStreamName->n >= TSDB_STREAM_NAME_LEN) { + pCxt->errCode = generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_IDENTIFIER_NAME, pStreamName->z); + return false; + } + return true; +} + static bool checkComment(SAstCreateContext* pCxt, const SToken* pCommentToken, bool demand) { if (NULL == pCommentToken) { pCxt->errCode = demand ? TSDB_CODE_PAR_SYNTAX_ERROR : TSDB_CODE_SUCCESS; @@ -1509,6 +1527,13 @@ SNode* createAlterDnodeStmt(SAstCreateContext* pCxt, const SToken* pDnode, const return (SNode*)pStmt; } +SNode* createRealTableNodeForIndexName(SAstCreateContext* pCxt, SToken* pDbName, SToken* pIndexName) { + if (!checkIndexName(pCxt, pIndexName)) { + return NULL; + } + return createRealTableNode(pCxt, pDbName, pIndexName, NULL); +} + SNode* createCreateIndexStmt(SAstCreateContext* pCxt, EIndexType type, bool ignoreExists, SNode* pIndexName, SNode* pRealTable, SNodeList* pCols, SNode* pOptions) { CHECK_PARSER_STATUS(pCxt); @@ -1567,9 +1592,11 @@ SNode* createDropComponentNodeStmt(SAstCreateContext* pCxt, ENodeType type, cons return (SNode*)pStmt; } -SNode* createCreateTopicStmtUseQuery(SAstCreateContext* pCxt, bool ignoreExists, const SToken* pTopicName, - SNode* pQuery) { +SNode* createCreateTopicStmtUseQuery(SAstCreateContext* pCxt, bool ignoreExists, SToken* pTopicName, SNode* pQuery) { CHECK_PARSER_STATUS(pCxt); + if (!checkTopicName(pCxt, pTopicName)) { + return NULL; + } SCreateTopicStmt* pStmt = (SCreateTopicStmt*)nodesMakeNode(QUERY_NODE_CREATE_TOPIC_STMT); CHECK_OUT_OF_MEM(pStmt); COPY_STRING_FORM_ID_TOKEN(pStmt->topicName, pTopicName); @@ -1578,10 +1605,10 @@ SNode* createCreateTopicStmtUseQuery(SAstCreateContext* pCxt, bool ignoreExists, return (SNode*)pStmt; } -SNode* createCreateTopicStmtUseDb(SAstCreateContext* pCxt, bool ignoreExists, const SToken* pTopicName, - SToken* pSubDbName, bool withMeta) { +SNode* createCreateTopicStmtUseDb(SAstCreateContext* pCxt, bool ignoreExists, SToken* pTopicName, SToken* pSubDbName, + bool withMeta) { CHECK_PARSER_STATUS(pCxt); - if (!checkDbName(pCxt, pSubDbName, true)) { + if (!checkTopicName(pCxt, pTopicName) || !checkDbName(pCxt, pSubDbName, true)) { return NULL; } SCreateTopicStmt* pStmt = (SCreateTopicStmt*)nodesMakeNode(QUERY_NODE_CREATE_TOPIC_STMT); @@ -1593,9 +1620,12 @@ SNode* createCreateTopicStmtUseDb(SAstCreateContext* pCxt, bool ignoreExists, co return (SNode*)pStmt; } -SNode* createCreateTopicStmtUseTable(SAstCreateContext* pCxt, bool ignoreExists, const SToken* pTopicName, - SNode* pRealTable, bool withMeta) { +SNode* createCreateTopicStmtUseTable(SAstCreateContext* pCxt, bool ignoreExists, SToken* pTopicName, SNode* pRealTable, + bool withMeta) { CHECK_PARSER_STATUS(pCxt); + if (!checkTopicName(pCxt, pTopicName)) { + return NULL; + } SCreateTopicStmt* pStmt = (SCreateTopicStmt*)nodesMakeNode(QUERY_NODE_CREATE_TOPIC_STMT); CHECK_OUT_OF_MEM(pStmt); COPY_STRING_FORM_ID_TOKEN(pStmt->topicName, pTopicName); @@ -1607,8 +1637,11 @@ SNode* createCreateTopicStmtUseTable(SAstCreateContext* pCxt, bool ignoreExists, return (SNode*)pStmt; } -SNode* createDropTopicStmt(SAstCreateContext* pCxt, bool ignoreNotExists, const SToken* pTopicName) { +SNode* createDropTopicStmt(SAstCreateContext* pCxt, bool ignoreNotExists, SToken* pTopicName) { CHECK_PARSER_STATUS(pCxt); + if (!checkTopicName(pCxt, pTopicName)) { + return NULL; + } SDropTopicStmt* pStmt = (SDropTopicStmt*)nodesMakeNode(QUERY_NODE_DROP_TOPIC_STMT); CHECK_OUT_OF_MEM(pStmt); COPY_STRING_FORM_ID_TOKEN(pStmt->topicName, pTopicName); @@ -1617,8 +1650,11 @@ SNode* createDropTopicStmt(SAstCreateContext* pCxt, bool ignoreNotExists, const } SNode* createDropCGroupStmt(SAstCreateContext* pCxt, bool ignoreNotExists, const SToken* pCGroupId, - const SToken* pTopicName) { + SToken* pTopicName) { CHECK_PARSER_STATUS(pCxt); + if (!checkTopicName(pCxt, pTopicName)) { + return NULL; + } SDropCGroupStmt* pStmt = (SDropCGroupStmt*)nodesMakeNode(QUERY_NODE_DROP_CGROUP_STMT); CHECK_OUT_OF_MEM(pStmt); pStmt->ignoreNotExists = ignoreNotExists; @@ -1730,9 +1766,12 @@ SNode* createStreamOptions(SAstCreateContext* pCxt) { return (SNode*)pOptions; } -SNode* createCreateStreamStmt(SAstCreateContext* pCxt, bool ignoreExists, const SToken* pStreamName, SNode* pRealTable, +SNode* createCreateStreamStmt(SAstCreateContext* pCxt, bool ignoreExists, SToken* pStreamName, SNode* pRealTable, SNode* pOptions, SNodeList* pTags, SNode* pSubtable, SNode* pQuery) { CHECK_PARSER_STATUS(pCxt); + if (!checkStreamName(pCxt, pStreamName)) { + return NULL; + } SCreateStreamStmt* pStmt = (SCreateStreamStmt*)nodesMakeNode(QUERY_NODE_CREATE_STREAM_STMT); CHECK_OUT_OF_MEM(pStmt); COPY_STRING_FORM_ID_TOKEN(pStmt->streamName, pStreamName); @@ -1749,8 +1788,11 @@ SNode* createCreateStreamStmt(SAstCreateContext* pCxt, bool ignoreExists, const return (SNode*)pStmt; } -SNode* createDropStreamStmt(SAstCreateContext* pCxt, bool ignoreNotExists, const SToken* pStreamName) { +SNode* createDropStreamStmt(SAstCreateContext* pCxt, bool ignoreNotExists, SToken* pStreamName) { CHECK_PARSER_STATUS(pCxt); + if (!checkStreamName(pCxt, pStreamName)) { + return NULL; + } SDropStreamStmt* pStmt = (SDropStreamStmt*)nodesMakeNode(QUERY_NODE_DROP_STREAM_STMT); CHECK_OUT_OF_MEM(pStmt); COPY_STRING_FORM_ID_TOKEN(pStmt->streamName, pStreamName); diff --git a/source/libs/parser/src/sql.c b/source/libs/parser/src/sql.c index a1ebe0ac32..d3b9bf069b 100644 --- a/source/libs/parser/src/sql.c +++ b/source/libs/parser/src/sql.c @@ -104,26 +104,26 @@ #endif /************* Begin control #defines *****************************************/ #define YYCODETYPE unsigned short int -#define YYNOCODE 457 +#define YYNOCODE 459 #define YYACTIONTYPE unsigned short int #define ParseTOKENTYPE SToken typedef union { int yyinit; ParseTOKENTYPE yy0; EOperatorType yy20; - int8_t yy33; - SAlterOption yy123; - SNode* yy148; - SToken yy199; - EFillMode yy334; - bool yy397; - SNodeList* yy404; - EJoinType yy470; - ENullOrder yy499; - int64_t yy525; - SDataType yy530; - int32_t yy706; - EOrder yy898; + SNode* yy74; + ENullOrder yy109; + SToken yy317; + EOrder yy326; + bool yy335; + int8_t yy449; + int64_t yy531; + EJoinType yy630; + SAlterOption yy767; + EFillMode yy828; + int32_t yy856; + SNodeList* yy874; + SDataType yy898; } YYMINORTYPE; #ifndef YYSTACKDEPTH #define YYSTACKDEPTH 100 @@ -139,17 +139,17 @@ typedef union { #define ParseCTX_FETCH #define ParseCTX_STORE #define YYFALLBACK 1 -#define YYNSTATE 708 -#define YYNRULE 538 +#define YYNSTATE 711 +#define YYNRULE 541 #define YYNTOKEN 322 -#define YY_MAX_SHIFT 707 -#define YY_MIN_SHIFTREDUCE 1048 -#define YY_MAX_SHIFTREDUCE 1585 -#define YY_ERROR_ACTION 1586 -#define YY_ACCEPT_ACTION 1587 -#define YY_NO_ACTION 1588 -#define YY_MIN_REDUCE 1589 -#define YY_MAX_REDUCE 2126 +#define YY_MAX_SHIFT 710 +#define YY_MIN_SHIFTREDUCE 1054 +#define YY_MAX_SHIFTREDUCE 1594 +#define YY_ERROR_ACTION 1595 +#define YY_ACCEPT_ACTION 1596 +#define YY_NO_ACTION 1597 +#define YY_MIN_REDUCE 1598 +#define YY_MAX_REDUCE 2138 /************* End control #defines *******************************************/ #define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0]))) @@ -216,736 +216,742 @@ typedef union { ** yy_default[] Default action for each state. ** *********** Begin parsing tables **********************************************/ -#define YY_ACTTAB_COUNT (2706) +#define YY_ACTTAB_COUNT (2723) static const YYACTIONTYPE yy_action[] = { - /* 0 */ 458, 1795, 459, 1625, 1838, 1733, 1587, 467, 353, 459, - /* 10 */ 1625, 1632, 43, 41, 1516, 181, 1925, 1793, 1731, 399, - /* 20 */ 360, 62, 1367, 36, 35, 1081, 1960, 42, 40, 39, - /* 30 */ 38, 37, 167, 1446, 559, 1365, 1658, 42, 40, 39, - /* 40 */ 38, 37, 36, 35, 1921, 1927, 42, 40, 39, 38, - /* 50 */ 37, 33, 274, 332, 1842, 607, 464, 577, 1441, 25, - /* 60 */ 699, 545, 460, 16, 1083, 2097, 1086, 1087, 597, 375, - /* 70 */ 1373, 365, 596, 558, 1788, 1790, 597, 1942, 97, 1373, - /* 80 */ 2103, 173, 123, 43, 41, 2098, 566, 1929, 131, 497, - /* 90 */ 52, 360, 132, 1367, 596, 12, 560, 325, 1925, 1742, - /* 100 */ 1734, 512, 511, 510, 1446, 352, 1365, 1742, 1960, 128, - /* 110 */ 506, 545, 58, 155, 505, 2097, 580, 704, 1392, 504, - /* 120 */ 509, 1911, 1744, 613, 405, 503, 1921, 1927, 343, 1441, - /* 130 */ 2103, 173, 1448, 1449, 16, 2098, 566, 607, 1475, 457, - /* 140 */ 158, 1373, 462, 1631, 577, 1696, 1941, 172, 2037, 2038, - /* 150 */ 1976, 129, 2042, 100, 1943, 617, 1945, 1946, 612, 565, - /* 160 */ 607, 1422, 1431, 2097, 318, 170, 12, 2029, 476, 46, - /* 170 */ 466, 354, 2025, 462, 1631, 131, 265, 266, 564, 173, - /* 180 */ 1368, 264, 1366, 2098, 566, 175, 337, 526, 704, 1393, - /* 190 */ 1929, 36, 35, 2055, 1476, 42, 40, 39, 38, 37, - /* 200 */ 524, 1925, 522, 1448, 1449, 1371, 1372, 1513, 1421, 1424, - /* 210 */ 1425, 1426, 1427, 1428, 1429, 1430, 609, 605, 1439, 1440, - /* 220 */ 1442, 1443, 1444, 1445, 1447, 1450, 2, 58, 58, 1921, - /* 230 */ 1927, 355, 1422, 1431, 255, 2037, 576, 2101, 124, 575, - /* 240 */ 607, 80, 2097, 1789, 1790, 596, 47, 338, 1392, 336, - /* 250 */ 335, 1368, 499, 1366, 1542, 127, 501, 564, 173, 1303, - /* 260 */ 1304, 176, 2098, 566, 1737, 32, 358, 1470, 1471, 1472, - /* 270 */ 1473, 1474, 1478, 1479, 1480, 1481, 1371, 1372, 500, 1421, - /* 280 */ 1424, 1425, 1426, 1427, 1428, 1429, 1430, 609, 605, 1439, - /* 290 */ 1440, 1442, 1443, 1444, 1445, 1447, 1450, 2, 1612, 9, - /* 300 */ 43, 41, 552, 1540, 1541, 1543, 1544, 1838, 360, 584, - /* 310 */ 1367, 398, 1393, 397, 1100, 157, 1099, 1601, 183, 351, - /* 320 */ 46, 1446, 1853, 1365, 1207, 639, 638, 637, 1211, 636, - /* 330 */ 1213, 1214, 635, 1216, 632, 1590, 1222, 629, 1224, 1225, - /* 340 */ 626, 623, 1911, 1520, 169, 1101, 1441, 1086, 1087, 1392, - /* 350 */ 2102, 16, 2044, 555, 2097, 597, 113, 1782, 1373, 112, - /* 360 */ 111, 110, 109, 108, 107, 106, 105, 104, 394, 178, - /* 370 */ 2101, 43, 41, 1451, 2098, 2100, 176, 176, 2041, 360, - /* 380 */ 185, 1367, 1589, 12, 1942, 9, 1742, 7, 226, 396, - /* 390 */ 392, 577, 1446, 113, 1365, 176, 112, 111, 110, 109, - /* 400 */ 108, 107, 106, 105, 104, 704, 122, 121, 120, 119, - /* 410 */ 118, 117, 116, 115, 114, 1960, 77, 1441, 363, 76, - /* 420 */ 1448, 1449, 131, 614, 1250, 1251, 155, 1611, 1911, 1373, - /* 430 */ 613, 39, 38, 37, 1391, 1744, 561, 556, 227, 36, - /* 440 */ 35, 1772, 597, 42, 40, 39, 38, 37, 1512, 1422, - /* 450 */ 1431, 1344, 1345, 1941, 44, 167, 403, 1976, 225, 1795, - /* 460 */ 100, 1943, 617, 1945, 1946, 612, 329, 607, 1368, 176, - /* 470 */ 1366, 1911, 2117, 1742, 2029, 1793, 704, 1843, 354, 2025, - /* 480 */ 1167, 174, 2037, 2038, 441, 129, 2042, 233, 1610, 2063, - /* 490 */ 1423, 1448, 1449, 1371, 1372, 568, 1421, 1424, 1425, 1426, - /* 500 */ 1427, 1428, 1429, 1430, 609, 605, 1439, 1440, 1442, 1443, - /* 510 */ 1444, 1445, 1447, 1450, 2, 1169, 651, 597, 82, 320, - /* 520 */ 1422, 1431, 530, 707, 528, 91, 83, 512, 511, 510, - /* 530 */ 565, 123, 1911, 642, 2097, 128, 506, 281, 502, 1368, - /* 540 */ 505, 1366, 189, 188, 9, 504, 509, 1735, 1742, 564, - /* 550 */ 173, 503, 166, 1720, 2098, 566, 11, 10, 697, 693, - /* 560 */ 689, 685, 279, 663, 1371, 1372, 80, 1421, 1424, 1425, - /* 570 */ 1426, 1427, 1428, 1429, 1430, 609, 605, 1439, 1440, 1442, - /* 580 */ 1443, 1444, 1445, 1447, 1450, 2, 43, 41, 2102, 1738, - /* 590 */ 133, 1930, 2097, 2000, 360, 211, 1367, 1392, 98, 1609, - /* 600 */ 1718, 272, 1925, 1582, 649, 1727, 1942, 1446, 2101, 1365, - /* 610 */ 162, 1608, 2098, 2099, 572, 476, 493, 489, 485, 481, - /* 620 */ 208, 2044, 577, 146, 145, 646, 645, 644, 143, 258, - /* 630 */ 1921, 1927, 1441, 1795, 593, 508, 507, 1960, 675, 673, - /* 640 */ 364, 607, 1729, 1911, 1373, 614, 1100, 2040, 1099, 1793, - /* 650 */ 1911, 1489, 613, 131, 155, 1911, 81, 43, 41, 206, - /* 660 */ 1367, 210, 651, 1745, 2102, 360, 58, 1367, 85, 44, - /* 670 */ 1725, 260, 58, 1365, 230, 1941, 583, 1101, 1446, 1976, - /* 680 */ 1365, 1394, 100, 1943, 617, 1945, 1946, 612, 1338, 607, - /* 690 */ 229, 704, 134, 608, 141, 2000, 2029, 1581, 1456, 2044, - /* 700 */ 354, 2025, 569, 1441, 1392, 1394, 1448, 1449, 1373, 1838, - /* 710 */ 597, 579, 171, 2037, 2038, 1373, 129, 2042, 545, 540, - /* 720 */ 187, 1607, 2097, 641, 404, 2039, 205, 199, 1606, 204, - /* 730 */ 597, 1392, 472, 1477, 584, 1422, 1431, 2103, 173, 29, - /* 740 */ 12, 1742, 2098, 566, 413, 36, 35, 1854, 197, 42, - /* 750 */ 40, 39, 38, 37, 1368, 704, 1366, 1575, 1605, 2069, - /* 760 */ 144, 1742, 704, 36, 35, 1911, 1602, 42, 40, 39, - /* 770 */ 38, 37, 1911, 1604, 599, 1395, 2001, 1448, 1449, 1371, - /* 780 */ 1372, 1898, 1421, 1424, 1425, 1426, 1427, 1428, 1429, 1430, - /* 790 */ 609, 605, 1439, 1440, 1442, 1443, 1444, 1445, 1447, 1450, - /* 800 */ 2, 317, 1911, 1390, 30, 1603, 1422, 1431, 597, 597, - /* 810 */ 435, 366, 51, 448, 1482, 176, 447, 1911, 1368, 155, - /* 820 */ 1366, 176, 427, 428, 257, 1368, 1655, 1366, 1744, 382, - /* 830 */ 1600, 419, 1599, 449, 1598, 573, 421, 1597, 1596, 1742, - /* 840 */ 1742, 2049, 1509, 1371, 1372, 1423, 1595, 1395, 257, 1911, - /* 850 */ 1371, 1372, 553, 1421, 1424, 1425, 1426, 1427, 1428, 1429, - /* 860 */ 1430, 609, 605, 1439, 1440, 1442, 1443, 1444, 1445, 1447, - /* 870 */ 1450, 2, 1423, 601, 1911, 2001, 1911, 333, 1911, 36, - /* 880 */ 35, 1911, 1911, 42, 40, 39, 38, 37, 1719, 409, - /* 890 */ 1911, 681, 680, 679, 678, 370, 1697, 677, 676, 135, - /* 900 */ 671, 670, 669, 668, 667, 666, 665, 148, 661, 660, - /* 910 */ 659, 369, 368, 656, 655, 654, 653, 652, 235, 445, - /* 920 */ 1594, 570, 440, 439, 438, 437, 434, 433, 432, 431, - /* 930 */ 430, 426, 425, 424, 423, 334, 416, 415, 414, 517, - /* 940 */ 411, 410, 331, 156, 643, 36, 35, 1786, 294, 42, - /* 950 */ 40, 39, 38, 37, 527, 1717, 597, 1593, 1942, 6, - /* 960 */ 597, 252, 292, 66, 1911, 31, 65, 1552, 224, 209, - /* 970 */ 474, 36, 35, 1395, 475, 42, 40, 39, 38, 37, - /* 980 */ 597, 1592, 597, 520, 193, 454, 452, 1742, 514, 1960, - /* 990 */ 182, 1742, 597, 223, 1739, 649, 139, 580, 664, 501, - /* 1000 */ 1712, 1911, 1911, 373, 613, 246, 541, 647, 1795, 1825, - /* 1010 */ 1786, 1742, 597, 1742, 146, 145, 646, 645, 644, 143, - /* 1020 */ 58, 500, 67, 1742, 1794, 1911, 581, 1941, 48, 64, - /* 1030 */ 3, 1976, 63, 1532, 100, 1943, 617, 1945, 1946, 612, - /* 1040 */ 137, 607, 125, 1742, 648, 545, 170, 1786, 2029, 2097, - /* 1050 */ 36, 35, 354, 2025, 42, 40, 39, 38, 37, 99, - /* 1060 */ 406, 1942, 649, 597, 2103, 173, 357, 356, 288, 2098, - /* 1070 */ 566, 1772, 75, 407, 2056, 216, 1381, 269, 214, 597, - /* 1080 */ 1376, 146, 145, 646, 645, 644, 143, 1446, 218, 1374, - /* 1090 */ 1375, 217, 1960, 592, 1742, 1645, 1638, 74, 73, 402, - /* 1100 */ 614, 597, 180, 220, 1942, 1911, 219, 613, 1961, 60, - /* 1110 */ 1742, 222, 1441, 239, 221, 594, 234, 513, 515, 1932, - /* 1120 */ 316, 604, 597, 390, 1373, 388, 384, 380, 377, 374, - /* 1130 */ 1941, 371, 1742, 597, 1976, 1960, 595, 100, 1943, 617, - /* 1140 */ 1945, 1946, 612, 614, 607, 597, 1636, 275, 1911, 2117, - /* 1150 */ 613, 2029, 45, 1742, 372, 354, 2025, 1584, 1585, 367, - /* 1160 */ 422, 1539, 1942, 1509, 1742, 241, 2091, 1934, 518, 176, - /* 1170 */ 50, 603, 262, 1941, 140, 544, 1742, 1976, 142, 1626, - /* 1180 */ 100, 1943, 617, 1945, 1946, 612, 1847, 607, 657, 11, - /* 1190 */ 10, 658, 2117, 1960, 2029, 144, 545, 60, 354, 2025, - /* 1200 */ 2097, 614, 2059, 45, 1314, 154, 1911, 96, 613, 2048, - /* 1210 */ 1148, 1783, 45, 1146, 621, 2103, 173, 93, 142, 533, - /* 1220 */ 2098, 566, 578, 1942, 267, 254, 589, 1379, 4, 251, - /* 1230 */ 271, 1941, 376, 1129, 1382, 1976, 1377, 1378, 100, 1943, - /* 1240 */ 617, 1945, 1946, 612, 381, 607, 144, 1200, 1, 1483, - /* 1250 */ 2004, 1942, 2029, 126, 1960, 1432, 354, 2025, 330, 1385, - /* 1260 */ 1387, 545, 614, 1467, 287, 2097, 1228, 1911, 1130, 613, - /* 1270 */ 1232, 605, 1439, 1440, 1442, 1443, 1444, 1445, 1331, 186, - /* 1280 */ 2103, 173, 1960, 142, 282, 2098, 566, 408, 1395, 1848, - /* 1290 */ 614, 412, 1941, 443, 1390, 1911, 1976, 613, 1239, 100, - /* 1300 */ 1943, 617, 1945, 1946, 612, 1237, 607, 417, 429, 450, - /* 1310 */ 1840, 2002, 1942, 2029, 436, 442, 444, 354, 2025, 451, - /* 1320 */ 1941, 190, 1396, 453, 1976, 455, 456, 100, 1943, 617, - /* 1330 */ 1945, 1946, 612, 465, 607, 147, 1398, 468, 469, 600, - /* 1340 */ 196, 2029, 198, 1960, 1397, 354, 2025, 470, 1399, 201, - /* 1350 */ 471, 614, 473, 203, 78, 79, 1911, 477, 613, 207, - /* 1360 */ 1103, 496, 494, 495, 498, 1942, 103, 1732, 535, 1888, - /* 1370 */ 319, 1887, 534, 213, 532, 1728, 283, 215, 149, 150, - /* 1380 */ 542, 1941, 2075, 228, 1730, 1976, 1726, 151, 101, 1943, - /* 1390 */ 617, 1945, 1946, 612, 231, 607, 1960, 152, 2074, 554, - /* 1400 */ 587, 5, 2029, 539, 614, 2051, 2028, 2025, 549, 1911, - /* 1410 */ 245, 613, 563, 548, 2060, 2070, 550, 551, 1942, 536, - /* 1420 */ 344, 557, 345, 547, 2120, 574, 237, 571, 163, 247, - /* 1430 */ 248, 240, 253, 250, 1941, 1509, 1394, 130, 1976, 249, - /* 1440 */ 582, 101, 1943, 617, 1945, 1946, 612, 2096, 607, 1960, - /* 1450 */ 2045, 348, 259, 284, 585, 2029, 586, 614, 1859, 602, - /* 1460 */ 2025, 1942, 1911, 1858, 613, 285, 1857, 350, 590, 88, - /* 1470 */ 591, 286, 90, 1743, 57, 92, 619, 2010, 289, 1787, - /* 1480 */ 700, 278, 321, 1713, 313, 701, 322, 615, 298, 703, - /* 1490 */ 49, 1976, 1960, 1905, 101, 1943, 617, 1945, 1946, 612, - /* 1500 */ 611, 607, 312, 1904, 291, 1911, 71, 613, 2029, 293, - /* 1510 */ 302, 1903, 324, 2025, 1902, 72, 1899, 378, 1942, 379, - /* 1520 */ 1359, 1360, 179, 1897, 383, 385, 386, 1896, 387, 389, - /* 1530 */ 1941, 1895, 1894, 391, 1976, 1942, 1893, 310, 1943, 617, - /* 1540 */ 1945, 1946, 612, 610, 607, 598, 1994, 393, 1334, 1960, - /* 1550 */ 395, 1333, 1870, 1869, 400, 1868, 401, 614, 1867, 1294, - /* 1560 */ 1833, 1942, 1911, 1832, 613, 1830, 1960, 191, 136, 1829, - /* 1570 */ 1828, 1831, 1827, 1826, 614, 1824, 1823, 1822, 184, 1911, - /* 1580 */ 418, 613, 1821, 420, 1820, 1819, 1818, 1941, 138, 1805, - /* 1590 */ 1804, 1976, 1960, 1817, 159, 1943, 617, 1945, 1946, 612, - /* 1600 */ 614, 607, 1816, 1815, 1941, 1911, 1814, 613, 1976, 1813, - /* 1610 */ 1812, 160, 1943, 617, 1945, 1946, 612, 1811, 607, 1810, - /* 1620 */ 1809, 1942, 1808, 1807, 1806, 1803, 1802, 1801, 1800, 1296, - /* 1630 */ 1941, 446, 1797, 1796, 1976, 546, 2066, 101, 1943, 617, - /* 1640 */ 1945, 1946, 612, 1942, 607, 1799, 1798, 1175, 1660, 1659, - /* 1650 */ 192, 2029, 1960, 1657, 1621, 194, 2026, 69, 168, 1620, - /* 1660 */ 614, 1089, 1931, 567, 2118, 1911, 1883, 613, 461, 1088, - /* 1670 */ 195, 1877, 1866, 70, 1960, 200, 463, 202, 1865, 1850, - /* 1680 */ 1721, 1656, 614, 1654, 1652, 478, 479, 1911, 483, 613, - /* 1690 */ 1941, 1650, 482, 486, 1976, 480, 1648, 159, 1943, 617, - /* 1700 */ 1945, 1946, 612, 1122, 607, 1635, 484, 1942, 487, 488, - /* 1710 */ 490, 491, 1941, 492, 1634, 1617, 1976, 1723, 212, 304, - /* 1720 */ 1943, 617, 1945, 1946, 612, 1244, 607, 1722, 1942, 1243, - /* 1730 */ 672, 674, 1166, 1165, 1164, 1163, 1160, 1159, 1960, 2067, - /* 1740 */ 1158, 59, 1646, 1157, 339, 1639, 614, 340, 1637, 1616, - /* 1750 */ 341, 1911, 1615, 613, 516, 519, 521, 1614, 523, 1960, - /* 1760 */ 525, 102, 1882, 562, 349, 1349, 1348, 614, 53, 1351, - /* 1770 */ 529, 1942, 1911, 1876, 613, 1340, 1941, 24, 153, 1864, - /* 1780 */ 1976, 537, 1862, 160, 1943, 617, 1945, 1946, 612, 2102, - /* 1790 */ 607, 17, 14, 244, 56, 243, 18, 1941, 538, 1554, - /* 1800 */ 1932, 1976, 1960, 61, 311, 1943, 617, 1945, 1946, 612, - /* 1810 */ 611, 607, 543, 28, 26, 1911, 232, 613, 19, 236, - /* 1820 */ 1569, 161, 1942, 1568, 342, 238, 346, 15, 1538, 242, - /* 1830 */ 27, 1573, 1531, 1574, 84, 1863, 2119, 1572, 1942, 1575, - /* 1840 */ 1941, 347, 256, 54, 1976, 55, 164, 310, 1943, 617, - /* 1850 */ 1945, 1946, 612, 1960, 607, 1861, 1995, 1506, 359, 1505, - /* 1860 */ 1860, 614, 20, 1849, 261, 263, 1911, 1536, 613, 1960, - /* 1870 */ 268, 86, 588, 87, 361, 270, 89, 614, 273, 10, - /* 1880 */ 21, 1468, 1911, 93, 613, 1979, 1383, 165, 1436, 1458, - /* 1890 */ 1434, 1941, 1942, 8, 177, 1976, 1457, 1414, 311, 1943, - /* 1900 */ 617, 1945, 1946, 612, 606, 607, 34, 1941, 1433, 13, - /* 1910 */ 22, 1976, 1406, 1942, 311, 1943, 617, 1945, 1946, 612, - /* 1920 */ 23, 607, 1229, 1960, 618, 620, 362, 622, 624, 1226, - /* 1930 */ 627, 614, 625, 630, 1223, 1217, 1911, 628, 613, 631, - /* 1940 */ 616, 1215, 633, 634, 1960, 1206, 1221, 1220, 1219, 1218, - /* 1950 */ 640, 94, 614, 276, 1238, 1234, 1942, 1911, 1120, 613, - /* 1960 */ 95, 531, 68, 650, 1154, 1976, 1153, 1152, 306, 1943, - /* 1970 */ 617, 1945, 1946, 612, 1151, 607, 1150, 1942, 1149, 1147, - /* 1980 */ 1173, 1145, 1941, 1144, 1143, 1141, 1976, 1960, 662, 295, - /* 1990 */ 1943, 617, 1945, 1946, 612, 614, 607, 277, 1140, 1139, - /* 2000 */ 1911, 1138, 613, 1137, 1136, 1135, 1170, 1168, 1960, 1132, - /* 2010 */ 1131, 1128, 1127, 1126, 1653, 1125, 614, 682, 1651, 683, - /* 2020 */ 1942, 1911, 684, 613, 686, 1941, 687, 1649, 690, 1976, - /* 2030 */ 1647, 688, 296, 1943, 617, 1945, 1946, 612, 1942, 607, - /* 2040 */ 692, 694, 691, 695, 696, 1633, 1941, 698, 1078, 1613, - /* 2050 */ 1976, 1960, 702, 297, 1943, 617, 1945, 1946, 612, 614, - /* 2060 */ 607, 280, 1369, 290, 1911, 705, 613, 1588, 706, 1960, - /* 2070 */ 1588, 1588, 1588, 1588, 1588, 1588, 1588, 614, 1588, 1588, - /* 2080 */ 1588, 1588, 1911, 1588, 613, 1588, 1588, 1588, 1588, 1941, - /* 2090 */ 1588, 1588, 1588, 1976, 1588, 1588, 303, 1943, 617, 1945, - /* 2100 */ 1946, 612, 1942, 607, 1588, 1588, 1588, 1941, 1588, 1588, - /* 2110 */ 1588, 1976, 1588, 1588, 307, 1943, 617, 1945, 1946, 612, - /* 2120 */ 1588, 607, 1588, 1942, 1588, 1588, 1588, 1588, 1588, 1588, - /* 2130 */ 1588, 1588, 1588, 1960, 1588, 1588, 1588, 1588, 1588, 1588, - /* 2140 */ 1588, 614, 1588, 1588, 1588, 1588, 1911, 1588, 613, 1588, - /* 2150 */ 1588, 1588, 1588, 1588, 1960, 1588, 1588, 1588, 1588, 1588, - /* 2160 */ 1588, 1588, 614, 1588, 1588, 1588, 1942, 1911, 1588, 613, - /* 2170 */ 1588, 1941, 1588, 1588, 1588, 1976, 1588, 1588, 299, 1943, - /* 2180 */ 617, 1945, 1946, 612, 1942, 607, 1588, 1588, 1588, 1588, - /* 2190 */ 1588, 1588, 1941, 1588, 1588, 1588, 1976, 1960, 1588, 308, - /* 2200 */ 1943, 617, 1945, 1946, 612, 614, 607, 1588, 1588, 1588, - /* 2210 */ 1911, 1588, 613, 1588, 1588, 1960, 1588, 1588, 1588, 1588, - /* 2220 */ 1588, 1588, 1588, 614, 1588, 1588, 1588, 1942, 1911, 1588, - /* 2230 */ 613, 1588, 1588, 1588, 1588, 1941, 1588, 1588, 1588, 1976, - /* 2240 */ 1588, 1588, 300, 1943, 617, 1945, 1946, 612, 1588, 607, - /* 2250 */ 1588, 1588, 1588, 1941, 1588, 1588, 1588, 1976, 1960, 1588, - /* 2260 */ 309, 1943, 617, 1945, 1946, 612, 614, 607, 1588, 1588, - /* 2270 */ 1942, 1911, 1588, 613, 1588, 1588, 1588, 1588, 1588, 1588, - /* 2280 */ 1588, 1588, 1588, 1588, 1588, 1588, 1588, 1942, 1588, 1588, - /* 2290 */ 1588, 1588, 1588, 1588, 1588, 1588, 1941, 1588, 1588, 1588, - /* 2300 */ 1976, 1960, 1588, 301, 1943, 617, 1945, 1946, 612, 614, - /* 2310 */ 607, 1588, 1588, 1942, 1911, 1588, 613, 1588, 1960, 1588, - /* 2320 */ 1588, 1588, 1588, 1588, 1588, 1588, 614, 1588, 1588, 1588, - /* 2330 */ 1588, 1911, 1588, 613, 1588, 1588, 1588, 1588, 1588, 1941, - /* 2340 */ 1588, 1588, 1588, 1976, 1960, 1588, 314, 1943, 617, 1945, - /* 2350 */ 1946, 612, 614, 607, 1588, 1588, 1941, 1911, 1588, 613, - /* 2360 */ 1976, 1588, 1588, 315, 1943, 617, 1945, 1946, 612, 1588, - /* 2370 */ 607, 1588, 1942, 1588, 1588, 1588, 1588, 1588, 1588, 1588, - /* 2380 */ 1588, 1588, 1941, 1588, 1588, 1588, 1976, 1588, 1588, 1954, - /* 2390 */ 1943, 617, 1945, 1946, 612, 1588, 607, 1588, 1588, 1588, - /* 2400 */ 1588, 1588, 1588, 1960, 1588, 1588, 1588, 1588, 1588, 1588, - /* 2410 */ 1588, 614, 1588, 1588, 1588, 1942, 1911, 1588, 613, 1588, - /* 2420 */ 1588, 1588, 1588, 1588, 1588, 1588, 1588, 1588, 1588, 1588, - /* 2430 */ 1588, 1588, 1588, 1942, 1588, 1588, 1588, 1588, 1588, 1588, - /* 2440 */ 1588, 1941, 1588, 1588, 1588, 1976, 1960, 1588, 1953, 1943, - /* 2450 */ 617, 1945, 1946, 612, 614, 607, 1588, 1588, 1588, 1911, - /* 2460 */ 1588, 613, 1588, 1588, 1960, 1588, 1588, 1588, 1588, 1588, - /* 2470 */ 1588, 1588, 614, 1588, 1588, 1588, 1588, 1911, 1588, 613, - /* 2480 */ 1588, 1588, 1588, 1588, 1941, 1588, 1588, 1588, 1976, 1588, - /* 2490 */ 1588, 1952, 1943, 617, 1945, 1946, 612, 1942, 607, 1588, - /* 2500 */ 1588, 1588, 1941, 1588, 1588, 1588, 1976, 1588, 1588, 326, - /* 2510 */ 1943, 617, 1945, 1946, 612, 1588, 607, 1588, 1942, 1588, - /* 2520 */ 1588, 1588, 1588, 1588, 1588, 1588, 1588, 1588, 1960, 1588, - /* 2530 */ 1588, 1588, 1588, 1588, 1588, 1588, 614, 1588, 1588, 1588, - /* 2540 */ 1588, 1911, 1588, 613, 1588, 1588, 1588, 1588, 1588, 1960, - /* 2550 */ 1588, 1588, 1588, 1588, 1588, 1588, 1588, 614, 1588, 1588, - /* 2560 */ 1588, 1942, 1911, 1588, 613, 1588, 1941, 1588, 1588, 1588, - /* 2570 */ 1976, 1588, 1588, 327, 1943, 617, 1945, 1946, 612, 1942, - /* 2580 */ 607, 1588, 1588, 1588, 1588, 1588, 1588, 1941, 1588, 1588, - /* 2590 */ 1588, 1976, 1960, 1588, 323, 1943, 617, 1945, 1946, 612, - /* 2600 */ 614, 607, 1588, 1588, 1588, 1911, 1588, 613, 1588, 1588, - /* 2610 */ 1960, 1588, 1588, 1588, 1588, 1588, 1588, 1588, 614, 1588, - /* 2620 */ 1588, 1588, 1942, 1911, 1588, 613, 1588, 1588, 1588, 1588, - /* 2630 */ 1941, 1588, 1588, 1588, 1976, 1588, 1588, 328, 1943, 617, - /* 2640 */ 1945, 1946, 612, 1588, 607, 1588, 1588, 1588, 615, 1588, - /* 2650 */ 1588, 1588, 1976, 1960, 1588, 306, 1943, 617, 1945, 1946, - /* 2660 */ 612, 614, 607, 1588, 1588, 1588, 1911, 1588, 613, 1588, - /* 2670 */ 1588, 1588, 1588, 1588, 1588, 1588, 1588, 1588, 1588, 1588, - /* 2680 */ 1588, 1588, 1588, 1588, 1588, 1588, 1588, 1588, 1588, 1588, - /* 2690 */ 1588, 1941, 1588, 1588, 1588, 1976, 1588, 1588, 305, 1943, - /* 2700 */ 617, 1945, 1946, 612, 1588, 607, + /* 0 */ 459, 353, 460, 1634, 566, 600, 578, 2114, 2109, 155, + /* 10 */ 1940, 2109, 43, 41, 1525, 39, 38, 37, 1753, 123, + /* 20 */ 361, 1936, 1375, 565, 173, 599, 498, 2113, 2110, 567, + /* 30 */ 1954, 2110, 2112, 1455, 1400, 1373, 1751, 131, 468, 406, + /* 40 */ 460, 1634, 36, 35, 1940, 586, 42, 40, 39, 38, + /* 50 */ 37, 1932, 1938, 344, 541, 1936, 167, 578, 1450, 465, + /* 60 */ 585, 1972, 610, 16, 366, 461, 1804, 1797, 1799, 581, + /* 70 */ 1381, 599, 1401, 330, 1922, 158, 616, 333, 1851, 319, + /* 80 */ 1705, 1972, 1802, 43, 41, 1932, 1938, 356, 131, 560, + /* 90 */ 477, 361, 475, 1375, 1860, 12, 610, 326, 172, 2049, + /* 100 */ 2050, 1953, 129, 2054, 1455, 1988, 1373, 2113, 100, 1955, + /* 110 */ 620, 1957, 1958, 615, 600, 610, 1106, 707, 1105, 654, + /* 120 */ 170, 458, 2041, 599, 463, 1640, 355, 2037, 123, 1450, + /* 130 */ 559, 210, 1457, 1458, 16, 503, 33, 275, 1484, 566, + /* 140 */ 175, 1381, 157, 2109, 1610, 1751, 46, 1107, 2067, 255, + /* 150 */ 2049, 577, 578, 124, 576, 1621, 1954, 2109, 565, 173, + /* 160 */ 600, 1431, 1440, 2110, 567, 578, 12, 42, 40, 39, + /* 170 */ 38, 37, 565, 173, 52, 1309, 1310, 2110, 567, 97, + /* 180 */ 1376, 586, 1374, 131, 1256, 1257, 467, 1972, 707, 463, + /* 190 */ 1640, 1751, 1402, 132, 1485, 614, 131, 561, 46, 1922, + /* 200 */ 1922, 1743, 616, 1457, 1458, 1379, 1380, 62, 1430, 1433, + /* 210 */ 1434, 1435, 1436, 1437, 1438, 1439, 612, 608, 1448, 1449, + /* 220 */ 1451, 1452, 1453, 1454, 1456, 1459, 2, 1953, 595, 58, + /* 230 */ 1860, 1988, 1431, 1440, 311, 1955, 620, 1957, 1958, 615, + /* 240 */ 613, 610, 601, 2006, 174, 2049, 2050, 1400, 129, 2054, + /* 250 */ 338, 1376, 2056, 1374, 1798, 1799, 580, 171, 2049, 2050, + /* 260 */ 556, 129, 2054, 1620, 58, 32, 359, 1479, 1480, 1481, + /* 270 */ 1482, 1483, 1487, 1488, 1489, 1490, 1379, 1380, 2053, 1430, + /* 280 */ 1433, 1434, 1435, 1436, 1437, 1438, 1439, 612, 608, 1448, + /* 290 */ 1449, 1451, 1452, 1453, 1454, 1456, 1459, 2, 58, 9, + /* 300 */ 43, 41, 1667, 47, 1551, 1596, 1847, 1922, 361, 1529, + /* 310 */ 1375, 339, 1729, 337, 336, 1400, 500, 181, 1954, 1619, + /* 320 */ 502, 1455, 58, 1373, 1213, 642, 641, 640, 1217, 639, + /* 330 */ 1219, 1220, 638, 1222, 635, 257, 1228, 632, 1230, 1231, + /* 340 */ 629, 626, 501, 562, 557, 258, 1450, 176, 399, 1972, + /* 350 */ 398, 16, 553, 1549, 1550, 1552, 1553, 617, 1381, 1106, + /* 360 */ 1173, 1105, 1922, 1922, 616, 569, 395, 513, 512, 511, + /* 370 */ 376, 43, 41, 1460, 477, 128, 507, 400, 176, 361, + /* 380 */ 506, 1375, 58, 12, 85, 505, 510, 397, 393, 1953, + /* 390 */ 1107, 504, 1455, 1988, 1373, 1175, 100, 1955, 620, 1957, + /* 400 */ 1958, 615, 1954, 610, 80, 707, 134, 1618, 141, 2012, + /* 410 */ 2041, 600, 546, 176, 355, 2037, 2109, 1450, 127, 546, + /* 420 */ 1457, 1458, 169, 2109, 1401, 178, 226, 1746, 573, 1381, + /* 430 */ 1617, 2115, 173, 1972, 1599, 1791, 2110, 567, 2115, 173, + /* 440 */ 1375, 617, 1751, 2110, 567, 167, 1922, 176, 616, 1431, + /* 450 */ 1440, 1922, 176, 1373, 44, 113, 1432, 587, 112, 111, + /* 460 */ 110, 109, 108, 107, 106, 105, 104, 1852, 1376, 352, + /* 470 */ 1374, 176, 1864, 1953, 1922, 227, 707, 1988, 1781, 1804, + /* 480 */ 160, 1955, 620, 1957, 1958, 615, 354, 610, 1381, 1352, + /* 490 */ 1353, 1457, 1458, 1379, 1380, 1802, 1430, 1433, 1434, 1435, + /* 500 */ 1436, 1437, 1438, 1439, 612, 608, 1448, 1449, 1451, 1452, + /* 510 */ 1453, 1454, 1456, 1459, 2, 509, 508, 678, 676, 113, + /* 520 */ 1431, 1440, 112, 111, 110, 109, 108, 107, 106, 105, + /* 530 */ 104, 176, 568, 2130, 364, 707, 513, 512, 511, 1376, + /* 540 */ 367, 1374, 155, 1804, 128, 507, 1465, 1909, 155, 506, + /* 550 */ 365, 1753, 1400, 1403, 505, 510, 1728, 1753, 1954, 1802, + /* 560 */ 504, 266, 267, 1400, 1379, 1380, 265, 1430, 1433, 1434, + /* 570 */ 1435, 1436, 1437, 1438, 1439, 612, 608, 1448, 1449, 1451, + /* 580 */ 1452, 1453, 1454, 1456, 1459, 2, 43, 41, 1598, 1972, + /* 590 */ 1616, 600, 185, 527, 361, 383, 1375, 581, 1376, 1727, + /* 600 */ 1374, 1615, 1922, 1399, 616, 404, 525, 1455, 523, 1373, + /* 610 */ 1742, 600, 122, 121, 120, 119, 118, 117, 116, 115, + /* 620 */ 114, 1936, 1751, 1379, 1380, 405, 11, 10, 77, 1953, + /* 630 */ 1614, 76, 1450, 1988, 1922, 1613, 100, 1955, 620, 1957, + /* 640 */ 1958, 615, 1751, 610, 1381, 1922, 91, 80, 170, 574, + /* 650 */ 2041, 1932, 1938, 133, 355, 2037, 2012, 43, 41, 600, + /* 660 */ 518, 654, 610, 652, 2114, 361, 1954, 1375, 1744, 44, + /* 670 */ 1747, 442, 1612, 414, 1922, 528, 2068, 587, 1455, 1922, + /* 680 */ 1373, 1402, 146, 145, 649, 648, 647, 143, 29, 224, + /* 690 */ 1751, 707, 1865, 1432, 36, 35, 182, 1972, 42, 40, + /* 700 */ 39, 38, 37, 1450, 521, 617, 1457, 1458, 1609, 515, + /* 710 */ 1922, 1608, 616, 2056, 223, 1381, 1922, 1607, 2114, 36, + /* 720 */ 35, 1498, 2109, 42, 40, 39, 38, 37, 1522, 189, + /* 730 */ 188, 1403, 1641, 1486, 2056, 1431, 1440, 1953, 2113, 2052, + /* 740 */ 12, 1988, 2110, 2111, 101, 1955, 620, 1957, 1958, 615, + /* 750 */ 64, 610, 1922, 63, 1376, 1922, 1374, 1584, 2041, 31, + /* 760 */ 2051, 1922, 707, 2038, 1606, 36, 35, 1605, 225, 42, + /* 770 */ 40, 39, 38, 37, 9, 1604, 1087, 1457, 1458, 1379, + /* 780 */ 1380, 702, 1430, 1433, 1434, 1435, 1436, 1437, 1438, 1439, + /* 790 */ 612, 608, 1448, 1449, 1451, 1452, 1453, 1454, 1456, 1459, + /* 800 */ 2, 318, 1384, 1398, 30, 1603, 1431, 1440, 1922, 710, + /* 810 */ 436, 1922, 155, 449, 1491, 1089, 448, 1092, 1093, 1922, + /* 820 */ 602, 1754, 2013, 282, 257, 1376, 1664, 1374, 82, 321, + /* 830 */ 1847, 420, 531, 450, 529, 9, 422, 7, 166, 1834, + /* 840 */ 604, 183, 2013, 6, 700, 696, 692, 688, 280, 1922, + /* 850 */ 1379, 1380, 1726, 1430, 1433, 1434, 1435, 1436, 1437, 1438, + /* 860 */ 1439, 612, 608, 1448, 1449, 1451, 1452, 1453, 1454, 1456, + /* 870 */ 1459, 2, 1804, 1403, 235, 36, 35, 334, 1400, 42, + /* 880 */ 40, 39, 38, 37, 98, 1847, 607, 273, 1803, 410, + /* 890 */ 645, 684, 683, 682, 681, 371, 187, 680, 679, 135, + /* 900 */ 674, 673, 672, 671, 670, 669, 668, 148, 664, 663, + /* 910 */ 662, 370, 369, 659, 658, 657, 656, 655, 646, 446, + /* 920 */ 596, 1795, 441, 440, 439, 438, 435, 434, 433, 432, + /* 930 */ 431, 427, 426, 425, 424, 335, 417, 416, 415, 1381, + /* 940 */ 412, 411, 332, 156, 1092, 1093, 36, 35, 295, 1387, + /* 950 */ 42, 40, 39, 38, 37, 1602, 1601, 260, 1954, 652, + /* 960 */ 666, 650, 293, 66, 1795, 289, 65, 651, 1781, 1521, + /* 970 */ 1795, 667, 1740, 1721, 1346, 48, 229, 3, 146, 145, + /* 980 */ 649, 648, 647, 143, 193, 455, 453, 36, 35, 1972, + /* 990 */ 423, 42, 40, 39, 38, 37, 502, 617, 1943, 1922, + /* 1000 */ 1922, 600, 1922, 652, 616, 1736, 36, 35, 2061, 1518, + /* 1010 */ 42, 40, 39, 38, 37, 428, 234, 233, 501, 1432, + /* 1020 */ 58, 600, 146, 145, 649, 648, 647, 143, 1476, 1953, + /* 1030 */ 154, 600, 1751, 1988, 1561, 429, 100, 1955, 620, 1957, + /* 1040 */ 1958, 615, 25, 610, 144, 476, 1945, 1518, 2129, 137, + /* 1050 */ 2041, 125, 1751, 407, 355, 2037, 83, 1738, 67, 99, + /* 1060 */ 600, 1954, 1751, 36, 35, 2075, 408, 42, 40, 39, + /* 1070 */ 38, 37, 36, 35, 1748, 1734, 42, 40, 39, 38, + /* 1080 */ 37, 600, 216, 218, 570, 214, 217, 600, 1654, 1383, + /* 1090 */ 220, 1751, 1972, 219, 1647, 139, 51, 74, 73, 403, + /* 1100 */ 617, 542, 180, 600, 60, 1922, 1954, 616, 75, 1645, + /* 1110 */ 514, 222, 1751, 1941, 221, 239, 516, 582, 1751, 45, + /* 1120 */ 317, 1593, 1594, 391, 1936, 389, 385, 381, 378, 375, + /* 1130 */ 263, 519, 1953, 600, 1751, 600, 1988, 1972, 1611, 100, + /* 1140 */ 1955, 620, 1957, 1958, 615, 617, 610, 270, 140, 597, + /* 1150 */ 1922, 2129, 616, 2041, 1932, 1938, 1548, 355, 2037, 1706, + /* 1160 */ 1541, 600, 600, 230, 1751, 610, 1751, 241, 2103, 176, + /* 1170 */ 142, 1322, 611, 50, 144, 598, 276, 1953, 545, 1954, + /* 1180 */ 60, 1988, 268, 252, 100, 1955, 620, 1957, 1958, 615, + /* 1190 */ 660, 610, 1751, 1751, 358, 357, 2129, 600, 2041, 45, + /* 1200 */ 592, 45, 355, 2037, 1389, 11, 10, 661, 644, 96, + /* 1210 */ 1972, 368, 1154, 2060, 2081, 1455, 624, 1382, 617, 93, + /* 1220 */ 211, 584, 272, 1922, 374, 616, 1206, 1591, 1751, 1152, + /* 1230 */ 209, 554, 1492, 246, 1954, 162, 1386, 142, 1973, 372, + /* 1240 */ 1450, 494, 490, 486, 482, 208, 144, 1856, 1635, 126, + /* 1250 */ 1953, 1441, 1381, 288, 1988, 1792, 142, 100, 1955, 620, + /* 1260 */ 1957, 1958, 615, 546, 610, 1972, 546, 2109, 1234, 2016, + /* 1270 */ 2109, 2041, 1135, 617, 579, 355, 2037, 2071, 1922, 251, + /* 1280 */ 616, 81, 2115, 173, 206, 2115, 173, 2110, 567, 1238, + /* 1290 */ 2110, 567, 254, 1, 373, 4, 382, 331, 1245, 606, + /* 1300 */ 377, 1243, 1339, 571, 283, 1953, 186, 1136, 147, 1988, + /* 1310 */ 409, 1403, 100, 1955, 620, 1957, 1958, 615, 1857, 610, + /* 1320 */ 413, 1590, 444, 418, 2014, 1398, 2041, 430, 1849, 437, + /* 1330 */ 355, 2037, 443, 451, 452, 445, 546, 190, 454, 456, + /* 1340 */ 2109, 1404, 457, 466, 1406, 470, 1954, 534, 469, 1405, + /* 1350 */ 196, 205, 199, 198, 204, 2115, 173, 473, 471, 1407, + /* 1360 */ 2110, 567, 1390, 472, 1385, 201, 474, 203, 78, 79, + /* 1370 */ 478, 1109, 207, 197, 495, 496, 1954, 1972, 499, 497, + /* 1380 */ 103, 1741, 1899, 213, 320, 617, 1898, 1393, 1395, 546, + /* 1390 */ 1922, 1737, 616, 2109, 533, 284, 535, 215, 149, 608, + /* 1400 */ 1448, 1449, 1451, 1452, 1453, 1454, 150, 1972, 2115, 173, + /* 1410 */ 228, 536, 1739, 2110, 567, 617, 540, 1953, 1735, 151, + /* 1420 */ 1922, 1988, 616, 152, 100, 1955, 620, 1957, 1958, 615, + /* 1430 */ 231, 610, 1954, 543, 550, 537, 603, 2072, 2041, 590, + /* 1440 */ 2082, 555, 355, 2037, 5, 552, 345, 1953, 2087, 558, + /* 1450 */ 237, 1988, 1954, 240, 101, 1955, 620, 1957, 1958, 615, + /* 1460 */ 2063, 610, 2086, 1972, 564, 548, 551, 549, 2041, 572, + /* 1470 */ 250, 617, 2040, 2037, 247, 245, 1922, 346, 616, 575, + /* 1480 */ 130, 248, 1518, 1972, 249, 163, 1402, 2057, 349, 583, + /* 1490 */ 259, 617, 1408, 1861, 285, 593, 1922, 588, 616, 286, + /* 1500 */ 589, 1870, 1869, 1953, 1868, 2108, 351, 1988, 88, 1752, + /* 1510 */ 101, 1955, 620, 1957, 1958, 615, 287, 610, 90, 594, + /* 1520 */ 1954, 253, 57, 618, 2041, 2022, 2132, 1988, 605, 2037, + /* 1530 */ 101, 1955, 620, 1957, 1958, 615, 1954, 610, 92, 622, + /* 1540 */ 279, 703, 1796, 1722, 2041, 704, 290, 706, 325, 2037, + /* 1550 */ 49, 1972, 314, 322, 323, 294, 1916, 1915, 71, 617, + /* 1560 */ 72, 292, 1914, 1913, 1922, 1910, 616, 1972, 379, 299, + /* 1570 */ 1367, 313, 303, 380, 1368, 617, 179, 1908, 384, 386, + /* 1580 */ 1922, 387, 616, 388, 1907, 390, 1906, 392, 1905, 394, + /* 1590 */ 1904, 1953, 1342, 396, 1341, 1988, 1881, 1954, 159, 1955, + /* 1600 */ 620, 1957, 1958, 615, 1880, 610, 401, 1953, 402, 1879, + /* 1610 */ 1878, 1988, 1842, 1300, 159, 1955, 620, 1957, 1958, 615, + /* 1620 */ 1841, 610, 1839, 136, 1838, 1837, 1840, 1836, 1972, 184, + /* 1630 */ 419, 1830, 421, 1829, 1828, 1827, 617, 1835, 1833, 547, + /* 1640 */ 2078, 1922, 1954, 616, 1832, 1831, 1826, 1825, 1824, 1823, + /* 1650 */ 1822, 1821, 1820, 1819, 1818, 1817, 2079, 1816, 1815, 138, + /* 1660 */ 1814, 1813, 1812, 1811, 1810, 1302, 1809, 1808, 1953, 1807, + /* 1670 */ 1806, 447, 1988, 1972, 1181, 305, 1955, 620, 1957, 1958, + /* 1680 */ 615, 617, 610, 1805, 1669, 1668, 1922, 1666, 616, 1630, + /* 1690 */ 191, 1095, 1094, 1629, 192, 1894, 1888, 1877, 194, 202, + /* 1700 */ 1876, 1859, 1730, 1954, 69, 1128, 1942, 1665, 1663, 1661, + /* 1710 */ 1659, 70, 168, 1953, 479, 195, 1657, 1988, 462, 563, + /* 1720 */ 160, 1955, 620, 1957, 1958, 615, 1954, 610, 464, 200, + /* 1730 */ 480, 481, 1644, 483, 1972, 1643, 484, 1626, 485, 350, + /* 1740 */ 487, 491, 617, 489, 1732, 1249, 59, 1922, 1731, 616, + /* 1750 */ 1250, 488, 493, 1172, 1171, 1170, 1169, 1972, 675, 492, + /* 1760 */ 1166, 677, 1164, 1165, 1163, 614, 1655, 340, 1648, 341, + /* 1770 */ 1922, 1646, 616, 2131, 1953, 212, 517, 342, 1988, 1625, + /* 1780 */ 1624, 312, 1955, 620, 1957, 1958, 615, 1954, 610, 520, + /* 1790 */ 1623, 522, 524, 102, 526, 1357, 1356, 1953, 530, 1893, + /* 1800 */ 1348, 1988, 1887, 53, 311, 1955, 620, 1957, 1958, 615, + /* 1810 */ 1875, 610, 1873, 2007, 538, 1874, 2114, 1954, 1972, 17, + /* 1820 */ 1359, 14, 56, 360, 244, 24, 617, 1563, 26, 236, + /* 1830 */ 243, 1922, 238, 616, 1547, 1540, 161, 242, 1943, 28, + /* 1840 */ 1954, 27, 18, 539, 84, 61, 1583, 1584, 1972, 19, + /* 1850 */ 15, 232, 1578, 362, 343, 1577, 617, 347, 1953, 153, + /* 1860 */ 1582, 1922, 1988, 616, 1581, 312, 1955, 620, 1957, 1958, + /* 1870 */ 615, 1972, 610, 348, 256, 55, 1872, 1515, 1514, 617, + /* 1880 */ 164, 544, 1871, 261, 1922, 1954, 616, 1858, 1953, 20, + /* 1890 */ 87, 264, 1988, 262, 1545, 312, 1955, 620, 1957, 1958, + /* 1900 */ 615, 1954, 610, 269, 86, 93, 89, 274, 21, 10, + /* 1910 */ 1391, 532, 1445, 1991, 609, 1988, 1972, 271, 307, 1955, + /* 1920 */ 620, 1957, 1958, 615, 617, 610, 1443, 34, 591, 1922, + /* 1930 */ 1442, 616, 1972, 165, 13, 22, 54, 177, 1423, 1415, + /* 1940 */ 617, 23, 625, 621, 1235, 1922, 623, 616, 363, 1467, + /* 1950 */ 1232, 628, 627, 630, 1954, 1229, 1953, 1477, 631, 633, + /* 1960 */ 1988, 1223, 634, 296, 1955, 620, 1957, 1958, 615, 1221, + /* 1970 */ 610, 619, 1953, 636, 637, 1212, 1988, 1227, 643, 297, + /* 1980 */ 1955, 620, 1957, 1958, 615, 1972, 610, 8, 1226, 1225, + /* 1990 */ 1466, 1224, 94, 617, 277, 95, 1244, 1240, 1922, 1954, + /* 2000 */ 616, 68, 1160, 1126, 653, 1159, 1158, 1157, 1156, 1155, + /* 2010 */ 1179, 1153, 1151, 1150, 1149, 665, 1147, 1146, 1145, 1144, + /* 2020 */ 1143, 1142, 1141, 1174, 278, 1953, 1176, 1138, 1137, 1988, + /* 2030 */ 1972, 1134, 298, 1955, 620, 1957, 1958, 615, 617, 610, + /* 2040 */ 1133, 1132, 1131, 1922, 1662, 616, 685, 686, 687, 1660, + /* 2050 */ 689, 690, 1954, 691, 1658, 693, 694, 695, 1656, 697, + /* 2060 */ 698, 699, 1642, 701, 1084, 1622, 709, 281, 1954, 705, + /* 2070 */ 1953, 1597, 1377, 291, 1988, 1597, 708, 304, 1955, 620, + /* 2080 */ 1957, 1958, 615, 1972, 610, 1597, 1597, 1597, 1597, 1597, + /* 2090 */ 1597, 617, 1597, 1597, 1597, 1597, 1922, 1597, 616, 1972, + /* 2100 */ 1597, 1597, 1597, 1597, 1597, 1597, 1597, 617, 1597, 1597, + /* 2110 */ 1597, 1597, 1922, 1954, 616, 1597, 1597, 1597, 1597, 1597, + /* 2120 */ 1597, 1597, 1597, 1953, 1597, 1597, 1597, 1988, 1597, 1597, + /* 2130 */ 308, 1955, 620, 1957, 1958, 615, 1597, 610, 1597, 1953, + /* 2140 */ 1597, 1597, 1597, 1988, 1972, 1597, 300, 1955, 620, 1957, + /* 2150 */ 1958, 615, 617, 610, 1597, 1597, 1597, 1922, 1597, 616, + /* 2160 */ 1597, 1597, 1597, 1597, 1597, 1597, 1954, 1597, 1597, 1597, + /* 2170 */ 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, + /* 2180 */ 1597, 1597, 1954, 1597, 1953, 1597, 1597, 1597, 1988, 1597, + /* 2190 */ 1597, 309, 1955, 620, 1957, 1958, 615, 1972, 610, 1597, + /* 2200 */ 1597, 1597, 1597, 1597, 1597, 617, 1597, 1597, 1597, 1597, + /* 2210 */ 1922, 1597, 616, 1972, 1597, 1597, 1597, 1597, 1597, 1597, + /* 2220 */ 1597, 617, 1597, 1597, 1597, 1597, 1922, 1954, 616, 1597, + /* 2230 */ 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1953, 1597, 1597, + /* 2240 */ 1597, 1988, 1597, 1597, 301, 1955, 620, 1957, 1958, 615, + /* 2250 */ 1954, 610, 1597, 1953, 1597, 1597, 1597, 1988, 1972, 1597, + /* 2260 */ 310, 1955, 620, 1957, 1958, 615, 617, 610, 1597, 1597, + /* 2270 */ 1597, 1922, 1597, 616, 1597, 1597, 1597, 1597, 1597, 1597, + /* 2280 */ 1954, 1972, 1597, 1597, 1597, 1597, 1597, 1597, 1597, 617, + /* 2290 */ 1597, 1597, 1597, 1597, 1922, 1597, 616, 1597, 1953, 1597, + /* 2300 */ 1597, 1597, 1988, 1597, 1597, 302, 1955, 620, 1957, 1958, + /* 2310 */ 615, 1972, 610, 1597, 1597, 1597, 1597, 1597, 1597, 617, + /* 2320 */ 1597, 1953, 1597, 1597, 1922, 1988, 616, 1597, 315, 1955, + /* 2330 */ 620, 1957, 1958, 615, 1597, 610, 1597, 1597, 1597, 1597, + /* 2340 */ 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, + /* 2350 */ 1597, 1953, 1597, 1597, 1597, 1988, 1954, 1597, 316, 1955, + /* 2360 */ 620, 1957, 1958, 615, 1597, 610, 1597, 1597, 1597, 1597, + /* 2370 */ 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1954, 1597, + /* 2380 */ 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1972, 1597, 1597, + /* 2390 */ 1597, 1597, 1597, 1597, 1597, 617, 1597, 1597, 1597, 1597, + /* 2400 */ 1922, 1597, 616, 1597, 1597, 1597, 1597, 1597, 1597, 1972, + /* 2410 */ 1597, 1597, 1597, 1597, 1597, 1597, 1597, 617, 1597, 1597, + /* 2420 */ 1597, 1597, 1922, 1597, 616, 1597, 1597, 1953, 1597, 1597, + /* 2430 */ 1597, 1988, 1597, 1954, 1966, 1955, 620, 1957, 1958, 615, + /* 2440 */ 1597, 610, 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1953, + /* 2450 */ 1597, 1597, 1597, 1988, 1597, 1597, 1965, 1955, 620, 1957, + /* 2460 */ 1958, 615, 1597, 610, 1972, 1597, 1597, 1597, 1597, 1597, + /* 2470 */ 1597, 1597, 617, 1597, 1597, 1597, 1597, 1922, 1954, 616, + /* 2480 */ 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, + /* 2490 */ 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, + /* 2500 */ 1597, 1597, 1597, 1597, 1953, 1597, 1597, 1597, 1988, 1972, + /* 2510 */ 1597, 1964, 1955, 620, 1957, 1958, 615, 617, 610, 1597, + /* 2520 */ 1597, 1597, 1922, 1954, 616, 1597, 1597, 1597, 1597, 1597, + /* 2530 */ 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1954, + /* 2540 */ 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1953, + /* 2550 */ 1597, 1597, 1597, 1988, 1972, 1597, 327, 1955, 620, 1957, + /* 2560 */ 1958, 615, 617, 610, 1597, 1597, 1597, 1922, 1597, 616, + /* 2570 */ 1972, 1597, 1597, 1597, 1597, 1597, 1597, 1597, 617, 1597, + /* 2580 */ 1597, 1597, 1597, 1922, 1954, 616, 1597, 1597, 1597, 1597, + /* 2590 */ 1597, 1597, 1597, 1597, 1953, 1597, 1597, 1597, 1988, 1597, + /* 2600 */ 1597, 328, 1955, 620, 1957, 1958, 615, 1954, 610, 1597, + /* 2610 */ 1953, 1597, 1597, 1597, 1988, 1972, 1597, 324, 1955, 620, + /* 2620 */ 1957, 1958, 615, 617, 610, 1597, 1597, 1597, 1922, 1597, + /* 2630 */ 616, 1597, 1597, 1597, 1597, 1597, 1597, 1954, 1972, 1597, + /* 2640 */ 1597, 1597, 1597, 1597, 1597, 1597, 617, 1597, 1597, 1597, + /* 2650 */ 1597, 1922, 1597, 616, 1597, 1953, 1597, 1597, 1597, 1988, + /* 2660 */ 1597, 1597, 329, 1955, 620, 1957, 1958, 615, 1972, 610, + /* 2670 */ 1597, 1597, 1597, 1597, 1597, 1597, 617, 1597, 618, 1597, + /* 2680 */ 1597, 1922, 1988, 616, 1597, 307, 1955, 620, 1957, 1958, + /* 2690 */ 615, 1597, 610, 1597, 1597, 1597, 1597, 1597, 1597, 1597, + /* 2700 */ 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1953, 1597, + /* 2710 */ 1597, 1597, 1988, 1597, 1597, 306, 1955, 620, 1957, 1958, + /* 2720 */ 615, 1597, 610, }; static const YYCODETYPE yy_lookahead[] = { - /* 0 */ 329, 356, 331, 332, 364, 358, 322, 329, 363, 331, - /* 10 */ 332, 0, 12, 13, 14, 375, 369, 372, 357, 385, - /* 20 */ 20, 4, 22, 8, 9, 4, 356, 12, 13, 14, - /* 30 */ 15, 16, 356, 33, 364, 35, 0, 12, 13, 14, - /* 40 */ 15, 16, 8, 9, 397, 398, 12, 13, 14, 15, - /* 50 */ 16, 416, 417, 377, 378, 408, 14, 333, 58, 44, - /* 60 */ 49, 427, 20, 63, 43, 431, 45, 46, 333, 385, - /* 70 */ 70, 367, 20, 403, 370, 371, 333, 325, 337, 70, - /* 80 */ 446, 447, 347, 12, 13, 451, 452, 358, 364, 354, - /* 90 */ 347, 20, 351, 22, 20, 95, 20, 63, 369, 364, - /* 100 */ 359, 65, 66, 67, 33, 348, 35, 364, 356, 73, - /* 110 */ 74, 427, 95, 356, 78, 431, 364, 117, 20, 83, - /* 120 */ 84, 369, 365, 371, 333, 89, 397, 398, 399, 58, - /* 130 */ 446, 447, 132, 133, 63, 451, 452, 408, 104, 330, - /* 140 */ 340, 70, 333, 334, 333, 345, 394, 423, 424, 425, - /* 150 */ 398, 427, 428, 401, 402, 403, 404, 405, 406, 427, - /* 160 */ 408, 161, 162, 431, 373, 413, 95, 415, 62, 95, - /* 170 */ 330, 419, 420, 333, 334, 364, 126, 127, 446, 447, - /* 180 */ 180, 131, 182, 451, 452, 433, 37, 21, 117, 20, - /* 190 */ 358, 8, 9, 441, 160, 12, 13, 14, 15, 16, - /* 200 */ 34, 369, 36, 132, 133, 205, 206, 4, 208, 209, + /* 0 */ 329, 348, 331, 332, 429, 333, 333, 429, 433, 356, + /* 10 */ 358, 433, 12, 13, 14, 14, 15, 16, 365, 347, + /* 20 */ 20, 369, 22, 448, 449, 20, 354, 449, 453, 454, + /* 30 */ 325, 453, 454, 33, 20, 35, 364, 364, 329, 333, + /* 40 */ 331, 332, 8, 9, 358, 333, 12, 13, 14, 15, + /* 50 */ 16, 399, 400, 401, 391, 369, 356, 333, 58, 14, + /* 60 */ 20, 356, 410, 63, 367, 20, 356, 370, 371, 364, + /* 70 */ 70, 20, 20, 363, 369, 340, 371, 377, 378, 373, + /* 80 */ 345, 356, 372, 12, 13, 399, 400, 401, 364, 364, + /* 90 */ 62, 20, 380, 22, 382, 95, 410, 63, 425, 426, + /* 100 */ 427, 396, 429, 430, 33, 400, 35, 3, 403, 404, + /* 110 */ 405, 406, 407, 408, 333, 410, 20, 117, 22, 62, + /* 120 */ 415, 330, 417, 20, 333, 334, 421, 422, 347, 58, + /* 130 */ 405, 35, 132, 133, 63, 354, 418, 419, 104, 429, + /* 140 */ 435, 70, 324, 433, 326, 364, 95, 51, 443, 425, + /* 150 */ 426, 427, 333, 429, 430, 325, 325, 433, 448, 449, + /* 160 */ 333, 161, 162, 453, 454, 333, 95, 12, 13, 14, + /* 170 */ 15, 16, 448, 449, 347, 161, 162, 453, 454, 337, + /* 180 */ 180, 333, 182, 364, 132, 133, 330, 356, 117, 333, + /* 190 */ 334, 364, 20, 351, 160, 364, 364, 20, 95, 369, + /* 200 */ 369, 359, 371, 132, 133, 205, 206, 4, 208, 209, /* 210 */ 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, - /* 220 */ 220, 221, 222, 223, 224, 225, 226, 95, 95, 397, - /* 230 */ 398, 399, 161, 162, 423, 424, 425, 3, 427, 428, - /* 240 */ 408, 339, 431, 370, 371, 20, 95, 98, 20, 100, - /* 250 */ 101, 180, 103, 182, 205, 353, 107, 446, 447, 161, - /* 260 */ 162, 244, 451, 452, 362, 231, 232, 233, 234, 235, - /* 270 */ 236, 237, 238, 239, 240, 241, 205, 206, 129, 208, + /* 220 */ 220, 221, 222, 223, 224, 225, 226, 396, 380, 95, + /* 230 */ 382, 400, 161, 162, 403, 404, 405, 406, 407, 408, + /* 240 */ 409, 410, 411, 412, 425, 426, 427, 20, 429, 430, + /* 250 */ 37, 180, 402, 182, 370, 371, 424, 425, 426, 427, + /* 260 */ 166, 429, 430, 325, 95, 231, 232, 233, 234, 235, + /* 270 */ 236, 237, 238, 239, 240, 241, 205, 206, 428, 208, /* 280 */ 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, - /* 290 */ 219, 220, 221, 222, 223, 224, 225, 226, 325, 228, - /* 300 */ 12, 13, 253, 254, 255, 256, 257, 364, 20, 371, - /* 310 */ 22, 179, 20, 181, 20, 324, 22, 326, 375, 381, - /* 320 */ 95, 33, 384, 35, 108, 109, 110, 111, 112, 113, - /* 330 */ 114, 115, 116, 117, 118, 0, 120, 121, 122, 123, - /* 340 */ 124, 125, 369, 14, 355, 51, 58, 45, 46, 20, - /* 350 */ 427, 63, 400, 166, 431, 333, 21, 368, 70, 24, - /* 360 */ 25, 26, 27, 28, 29, 30, 31, 32, 175, 347, - /* 370 */ 447, 12, 13, 14, 451, 452, 244, 244, 426, 20, - /* 380 */ 58, 22, 0, 95, 325, 228, 364, 230, 126, 196, - /* 390 */ 197, 333, 33, 21, 35, 244, 24, 25, 26, 27, - /* 400 */ 28, 29, 30, 31, 32, 117, 24, 25, 26, 27, - /* 410 */ 28, 29, 30, 31, 32, 356, 94, 58, 348, 97, - /* 420 */ 132, 133, 364, 364, 132, 133, 356, 325, 369, 70, - /* 430 */ 371, 14, 15, 16, 20, 365, 249, 250, 349, 8, - /* 440 */ 9, 352, 333, 12, 13, 14, 15, 16, 245, 161, - /* 450 */ 162, 189, 190, 394, 95, 356, 347, 398, 127, 356, - /* 460 */ 401, 402, 403, 404, 405, 406, 363, 408, 180, 244, - /* 470 */ 182, 369, 413, 364, 415, 372, 117, 378, 419, 420, - /* 480 */ 35, 423, 424, 425, 79, 427, 428, 58, 325, 430, - /* 490 */ 161, 132, 133, 205, 206, 261, 208, 209, 210, 211, + /* 290 */ 219, 220, 221, 222, 223, 224, 225, 226, 95, 228, + /* 300 */ 12, 13, 0, 95, 205, 322, 364, 369, 20, 14, + /* 310 */ 22, 98, 0, 100, 101, 20, 103, 375, 325, 325, + /* 320 */ 107, 33, 95, 35, 108, 109, 110, 111, 112, 113, + /* 330 */ 114, 115, 116, 117, 118, 163, 120, 121, 122, 123, + /* 340 */ 124, 125, 129, 249, 250, 58, 58, 244, 179, 356, + /* 350 */ 181, 63, 253, 254, 255, 256, 257, 364, 70, 20, + /* 360 */ 35, 22, 369, 369, 371, 261, 175, 65, 66, 67, + /* 370 */ 387, 12, 13, 14, 62, 73, 74, 387, 244, 20, + /* 380 */ 78, 22, 95, 95, 97, 83, 84, 196, 197, 396, + /* 390 */ 51, 89, 33, 400, 35, 70, 403, 404, 405, 406, + /* 400 */ 407, 408, 325, 410, 339, 117, 413, 325, 415, 416, + /* 410 */ 417, 333, 429, 244, 421, 422, 433, 58, 353, 429, + /* 420 */ 132, 133, 355, 433, 20, 347, 126, 362, 44, 70, + /* 430 */ 325, 448, 449, 356, 0, 368, 453, 454, 448, 449, + /* 440 */ 22, 364, 364, 453, 454, 356, 369, 244, 371, 161, + /* 450 */ 162, 369, 244, 35, 95, 21, 161, 371, 24, 25, + /* 460 */ 26, 27, 28, 29, 30, 31, 32, 378, 180, 383, + /* 470 */ 182, 244, 386, 396, 369, 349, 117, 400, 352, 356, + /* 480 */ 403, 404, 405, 406, 407, 408, 363, 410, 70, 189, + /* 490 */ 190, 132, 133, 205, 206, 372, 208, 209, 210, 211, /* 500 */ 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, - /* 510 */ 222, 223, 224, 225, 226, 70, 62, 333, 187, 188, - /* 520 */ 161, 162, 191, 19, 193, 337, 97, 65, 66, 67, - /* 530 */ 427, 347, 369, 106, 431, 73, 74, 33, 354, 180, - /* 540 */ 78, 182, 137, 138, 228, 83, 84, 359, 364, 446, - /* 550 */ 447, 89, 48, 0, 451, 452, 1, 2, 54, 55, - /* 560 */ 56, 57, 58, 70, 205, 206, 339, 208, 209, 210, + /* 510 */ 222, 223, 224, 225, 226, 342, 343, 342, 343, 21, + /* 520 */ 161, 162, 24, 25, 26, 27, 28, 29, 30, 31, + /* 530 */ 32, 244, 455, 456, 348, 117, 65, 66, 67, 180, + /* 540 */ 348, 182, 356, 356, 73, 74, 14, 0, 356, 78, + /* 550 */ 363, 365, 20, 20, 83, 84, 0, 365, 325, 372, + /* 560 */ 89, 126, 127, 20, 205, 206, 131, 208, 209, 210, /* 570 */ 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, - /* 580 */ 221, 222, 223, 224, 225, 226, 12, 13, 427, 362, - /* 590 */ 411, 358, 431, 414, 20, 33, 22, 20, 94, 325, - /* 600 */ 0, 97, 369, 172, 107, 357, 325, 33, 447, 35, - /* 610 */ 48, 325, 451, 452, 44, 62, 54, 55, 56, 57, - /* 620 */ 58, 400, 333, 126, 127, 128, 129, 130, 131, 58, - /* 630 */ 397, 398, 58, 356, 130, 342, 343, 356, 342, 343, - /* 640 */ 363, 408, 357, 369, 70, 364, 20, 426, 22, 372, - /* 650 */ 369, 96, 371, 364, 356, 369, 94, 12, 13, 97, - /* 660 */ 22, 35, 62, 365, 3, 20, 95, 22, 97, 95, - /* 670 */ 357, 167, 95, 35, 357, 394, 385, 51, 33, 398, - /* 680 */ 35, 20, 401, 402, 403, 404, 405, 406, 184, 408, - /* 690 */ 186, 117, 411, 357, 413, 414, 415, 266, 14, 400, - /* 700 */ 419, 420, 44, 58, 20, 20, 132, 133, 70, 364, - /* 710 */ 333, 422, 423, 424, 425, 70, 427, 428, 427, 389, - /* 720 */ 375, 325, 431, 357, 347, 426, 164, 165, 325, 167, - /* 730 */ 333, 20, 170, 160, 371, 161, 162, 446, 447, 2, - /* 740 */ 95, 364, 451, 452, 347, 8, 9, 384, 186, 12, - /* 750 */ 13, 14, 15, 16, 180, 117, 182, 96, 325, 379, - /* 760 */ 44, 364, 117, 8, 9, 369, 326, 12, 13, 14, - /* 770 */ 15, 16, 369, 325, 412, 20, 414, 132, 133, 205, - /* 780 */ 206, 0, 208, 209, 210, 211, 212, 213, 214, 215, + /* 580 */ 221, 222, 223, 224, 225, 226, 12, 13, 0, 356, + /* 590 */ 325, 333, 58, 21, 20, 48, 22, 364, 180, 0, + /* 600 */ 182, 325, 369, 20, 371, 347, 34, 33, 36, 35, + /* 610 */ 358, 333, 24, 25, 26, 27, 28, 29, 30, 31, + /* 620 */ 32, 369, 364, 205, 206, 347, 1, 2, 94, 396, + /* 630 */ 325, 97, 58, 400, 369, 325, 403, 404, 405, 406, + /* 640 */ 407, 408, 364, 410, 70, 369, 337, 339, 415, 265, + /* 650 */ 417, 399, 400, 413, 421, 422, 416, 12, 13, 333, + /* 660 */ 4, 62, 410, 107, 3, 20, 325, 22, 359, 95, + /* 670 */ 362, 79, 325, 347, 369, 19, 443, 371, 33, 369, + /* 680 */ 35, 20, 126, 127, 128, 129, 130, 131, 2, 33, + /* 690 */ 364, 117, 386, 161, 8, 9, 163, 356, 12, 13, + /* 700 */ 14, 15, 16, 58, 48, 364, 132, 133, 325, 53, + /* 710 */ 369, 325, 371, 402, 58, 70, 369, 325, 429, 8, + /* 720 */ 9, 96, 433, 12, 13, 14, 15, 16, 4, 137, + /* 730 */ 138, 20, 0, 160, 402, 161, 162, 396, 449, 428, + /* 740 */ 95, 400, 453, 454, 403, 404, 405, 406, 407, 408, + /* 750 */ 94, 410, 369, 97, 180, 369, 182, 96, 417, 2, + /* 760 */ 428, 369, 117, 422, 325, 8, 9, 325, 127, 12, + /* 770 */ 13, 14, 15, 16, 228, 325, 4, 132, 133, 205, + /* 780 */ 206, 49, 208, 209, 210, 211, 212, 213, 214, 215, /* 790 */ 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, - /* 800 */ 226, 18, 369, 20, 231, 325, 161, 162, 333, 333, - /* 810 */ 27, 348, 96, 30, 241, 244, 33, 369, 180, 356, - /* 820 */ 182, 244, 347, 347, 163, 180, 0, 182, 365, 48, - /* 830 */ 325, 48, 325, 50, 325, 265, 53, 325, 325, 364, - /* 840 */ 364, 242, 243, 205, 206, 161, 325, 20, 163, 369, - /* 850 */ 205, 206, 444, 208, 209, 210, 211, 212, 213, 214, + /* 800 */ 226, 18, 35, 20, 231, 325, 161, 162, 369, 19, + /* 810 */ 27, 369, 356, 30, 241, 43, 33, 45, 46, 369, + /* 820 */ 414, 365, 416, 33, 163, 180, 0, 182, 187, 188, + /* 830 */ 364, 48, 191, 50, 193, 228, 53, 230, 48, 0, + /* 840 */ 414, 375, 416, 39, 54, 55, 56, 57, 58, 369, + /* 850 */ 205, 206, 0, 208, 209, 210, 211, 212, 213, 214, /* 860 */ 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, - /* 870 */ 225, 226, 161, 412, 369, 414, 369, 94, 369, 8, - /* 880 */ 9, 369, 369, 12, 13, 14, 15, 16, 0, 106, - /* 890 */ 369, 65, 66, 67, 68, 69, 345, 71, 72, 73, + /* 870 */ 225, 226, 356, 20, 163, 8, 9, 94, 20, 12, + /* 880 */ 13, 14, 15, 16, 94, 364, 63, 97, 372, 106, + /* 890 */ 106, 65, 66, 67, 68, 69, 375, 71, 72, 73, /* 900 */ 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, - /* 910 */ 84, 85, 86, 87, 88, 89, 90, 91, 163, 136, - /* 920 */ 325, 263, 139, 140, 141, 142, 143, 144, 145, 146, - /* 930 */ 147, 148, 149, 150, 151, 152, 153, 154, 155, 4, - /* 940 */ 157, 158, 159, 18, 366, 8, 9, 369, 23, 12, - /* 950 */ 13, 14, 15, 16, 19, 0, 333, 325, 325, 39, - /* 960 */ 333, 455, 37, 38, 369, 2, 41, 96, 33, 335, - /* 970 */ 347, 8, 9, 20, 347, 12, 13, 14, 15, 16, - /* 980 */ 333, 325, 333, 48, 59, 60, 61, 364, 53, 356, - /* 990 */ 163, 364, 333, 58, 347, 107, 347, 364, 344, 107, - /* 1000 */ 346, 369, 369, 385, 371, 438, 347, 366, 356, 0, - /* 1010 */ 369, 364, 333, 364, 126, 127, 128, 129, 130, 131, - /* 1020 */ 95, 129, 106, 364, 372, 369, 347, 394, 42, 94, - /* 1030 */ 44, 398, 97, 96, 401, 402, 403, 404, 405, 406, - /* 1040 */ 42, 408, 44, 364, 366, 427, 413, 369, 415, 431, - /* 1050 */ 8, 9, 419, 420, 12, 13, 14, 15, 16, 134, - /* 1060 */ 22, 325, 107, 333, 446, 447, 12, 13, 349, 451, - /* 1070 */ 452, 352, 156, 35, 441, 99, 22, 347, 102, 333, - /* 1080 */ 35, 126, 127, 128, 129, 130, 131, 33, 99, 35, - /* 1090 */ 35, 102, 356, 347, 364, 0, 0, 172, 173, 174, - /* 1100 */ 364, 333, 177, 99, 325, 369, 102, 371, 356, 44, - /* 1110 */ 364, 99, 58, 44, 102, 347, 163, 22, 22, 47, - /* 1120 */ 195, 63, 333, 198, 70, 200, 201, 202, 203, 204, - /* 1130 */ 394, 335, 364, 333, 398, 356, 347, 401, 402, 403, - /* 1140 */ 404, 405, 406, 364, 408, 333, 0, 347, 369, 413, - /* 1150 */ 371, 415, 44, 364, 385, 419, 420, 132, 133, 347, - /* 1160 */ 151, 96, 325, 243, 364, 96, 430, 95, 22, 244, - /* 1170 */ 163, 117, 44, 394, 44, 168, 364, 398, 44, 332, - /* 1180 */ 401, 402, 403, 404, 405, 406, 379, 408, 13, 1, - /* 1190 */ 2, 13, 413, 356, 415, 44, 427, 44, 419, 420, - /* 1200 */ 431, 364, 379, 44, 96, 163, 369, 95, 371, 430, - /* 1210 */ 35, 368, 44, 35, 44, 446, 447, 105, 44, 385, - /* 1220 */ 451, 452, 429, 325, 96, 448, 96, 182, 246, 421, - /* 1230 */ 96, 394, 396, 35, 180, 398, 182, 182, 401, 402, - /* 1240 */ 403, 404, 405, 406, 48, 408, 44, 96, 432, 96, - /* 1250 */ 413, 325, 415, 44, 356, 96, 419, 420, 395, 205, - /* 1260 */ 206, 427, 364, 205, 96, 431, 96, 369, 70, 371, - /* 1270 */ 96, 217, 218, 219, 220, 221, 222, 223, 178, 42, - /* 1280 */ 446, 447, 356, 44, 387, 451, 452, 376, 20, 379, - /* 1290 */ 364, 376, 394, 160, 20, 369, 398, 371, 96, 401, - /* 1300 */ 402, 403, 404, 405, 406, 96, 408, 374, 333, 93, - /* 1310 */ 333, 413, 325, 415, 376, 374, 374, 419, 420, 341, - /* 1320 */ 394, 333, 20, 333, 398, 333, 327, 401, 402, 403, - /* 1330 */ 404, 405, 406, 327, 408, 96, 20, 391, 371, 413, - /* 1340 */ 339, 415, 339, 356, 20, 419, 420, 334, 20, 339, - /* 1350 */ 386, 364, 334, 339, 339, 339, 369, 333, 371, 339, - /* 1360 */ 52, 327, 336, 336, 356, 325, 333, 356, 185, 369, - /* 1370 */ 327, 369, 393, 356, 194, 356, 391, 356, 356, 356, - /* 1380 */ 333, 394, 437, 337, 356, 398, 356, 356, 401, 402, - /* 1390 */ 403, 404, 405, 406, 337, 408, 356, 356, 437, 252, - /* 1400 */ 251, 258, 415, 371, 364, 440, 419, 420, 369, 369, - /* 1410 */ 439, 371, 171, 259, 379, 379, 260, 369, 325, 390, - /* 1420 */ 369, 369, 267, 247, 456, 264, 382, 262, 437, 436, - /* 1430 */ 435, 382, 449, 396, 394, 243, 20, 364, 398, 434, - /* 1440 */ 333, 401, 402, 403, 404, 405, 406, 450, 408, 356, - /* 1450 */ 400, 334, 337, 382, 369, 415, 369, 364, 369, 419, - /* 1460 */ 420, 325, 369, 369, 371, 382, 369, 369, 165, 337, - /* 1470 */ 380, 352, 337, 364, 95, 95, 360, 418, 333, 369, - /* 1480 */ 36, 337, 383, 346, 392, 328, 383, 394, 350, 327, - /* 1490 */ 388, 398, 356, 0, 401, 402, 403, 404, 405, 406, - /* 1500 */ 364, 408, 350, 0, 338, 369, 187, 371, 415, 323, - /* 1510 */ 350, 0, 419, 420, 0, 42, 0, 35, 325, 199, - /* 1520 */ 35, 35, 35, 0, 199, 35, 35, 0, 199, 199, - /* 1530 */ 394, 0, 0, 35, 398, 325, 0, 401, 402, 403, - /* 1540 */ 404, 405, 406, 407, 408, 409, 410, 22, 182, 356, - /* 1550 */ 35, 180, 0, 0, 176, 0, 175, 364, 0, 47, - /* 1560 */ 0, 325, 369, 0, 371, 0, 356, 58, 42, 0, - /* 1570 */ 0, 0, 0, 0, 364, 0, 0, 0, 151, 369, - /* 1580 */ 35, 371, 0, 151, 0, 0, 0, 394, 42, 0, - /* 1590 */ 0, 398, 356, 0, 401, 402, 403, 404, 405, 406, - /* 1600 */ 364, 408, 0, 0, 394, 369, 0, 371, 398, 0, - /* 1610 */ 0, 401, 402, 403, 404, 405, 406, 0, 408, 0, - /* 1620 */ 0, 325, 0, 0, 0, 0, 0, 0, 0, 22, - /* 1630 */ 394, 135, 0, 0, 398, 442, 443, 401, 402, 403, - /* 1640 */ 404, 405, 406, 325, 408, 0, 0, 35, 0, 0, - /* 1650 */ 58, 415, 356, 0, 0, 42, 420, 39, 44, 0, - /* 1660 */ 364, 14, 47, 453, 454, 369, 0, 371, 47, 14, - /* 1670 */ 40, 0, 0, 39, 356, 39, 47, 171, 0, 0, - /* 1680 */ 0, 0, 364, 0, 0, 35, 48, 369, 48, 371, - /* 1690 */ 394, 0, 35, 35, 398, 39, 0, 401, 402, 403, - /* 1700 */ 404, 405, 406, 64, 408, 0, 39, 325, 48, 39, - /* 1710 */ 35, 48, 394, 39, 0, 0, 398, 0, 102, 401, - /* 1720 */ 402, 403, 404, 405, 406, 35, 408, 0, 325, 22, - /* 1730 */ 44, 44, 35, 35, 35, 35, 35, 35, 356, 443, - /* 1740 */ 22, 104, 0, 35, 22, 0, 364, 22, 0, 0, - /* 1750 */ 22, 369, 0, 371, 50, 35, 35, 0, 35, 356, - /* 1760 */ 22, 20, 0, 445, 361, 35, 35, 364, 163, 96, - /* 1770 */ 192, 325, 369, 0, 371, 35, 394, 95, 183, 0, - /* 1780 */ 398, 22, 0, 401, 402, 403, 404, 405, 406, 3, - /* 1790 */ 408, 44, 248, 47, 44, 44, 248, 394, 163, 96, - /* 1800 */ 47, 398, 356, 3, 401, 402, 403, 404, 405, 406, - /* 1810 */ 364, 408, 169, 44, 95, 369, 165, 371, 44, 95, - /* 1820 */ 35, 95, 325, 35, 163, 96, 35, 248, 96, 95, - /* 1830 */ 95, 35, 96, 96, 95, 0, 454, 35, 325, 96, - /* 1840 */ 394, 35, 47, 242, 398, 44, 47, 401, 402, 403, - /* 1850 */ 404, 405, 406, 356, 408, 0, 410, 96, 361, 96, - /* 1860 */ 0, 364, 95, 0, 96, 95, 369, 96, 371, 356, - /* 1870 */ 95, 95, 166, 39, 361, 164, 95, 364, 47, 2, - /* 1880 */ 44, 205, 369, 105, 371, 95, 22, 47, 96, 227, - /* 1890 */ 96, 394, 325, 229, 47, 398, 227, 22, 401, 402, - /* 1900 */ 403, 404, 405, 406, 95, 408, 95, 394, 96, 95, - /* 1910 */ 95, 398, 96, 325, 401, 402, 403, 404, 405, 406, - /* 1920 */ 95, 408, 96, 356, 106, 35, 35, 95, 35, 96, - /* 1930 */ 35, 364, 95, 35, 96, 96, 369, 95, 371, 95, - /* 1940 */ 207, 96, 35, 95, 356, 22, 119, 119, 119, 119, - /* 1950 */ 107, 95, 364, 44, 35, 22, 325, 369, 64, 371, - /* 1960 */ 95, 394, 95, 63, 35, 398, 35, 35, 401, 402, - /* 1970 */ 403, 404, 405, 406, 35, 408, 35, 325, 35, 35, - /* 1980 */ 70, 35, 394, 35, 35, 35, 398, 356, 92, 401, - /* 1990 */ 402, 403, 404, 405, 406, 364, 408, 44, 35, 35, - /* 2000 */ 369, 22, 371, 35, 35, 35, 70, 35, 356, 35, - /* 2010 */ 35, 35, 35, 22, 0, 35, 364, 35, 0, 48, - /* 2020 */ 325, 369, 39, 371, 35, 394, 48, 0, 35, 398, - /* 2030 */ 0, 39, 401, 402, 403, 404, 405, 406, 325, 408, - /* 2040 */ 39, 35, 48, 48, 39, 0, 394, 35, 35, 0, - /* 2050 */ 398, 356, 21, 401, 402, 403, 404, 405, 406, 364, - /* 2060 */ 408, 22, 22, 22, 369, 21, 371, 457, 20, 356, - /* 2070 */ 457, 457, 457, 457, 457, 457, 457, 364, 457, 457, - /* 2080 */ 457, 457, 369, 457, 371, 457, 457, 457, 457, 394, - /* 2090 */ 457, 457, 457, 398, 457, 457, 401, 402, 403, 404, - /* 2100 */ 405, 406, 325, 408, 457, 457, 457, 394, 457, 457, - /* 2110 */ 457, 398, 457, 457, 401, 402, 403, 404, 405, 406, - /* 2120 */ 457, 408, 457, 325, 457, 457, 457, 457, 457, 457, - /* 2130 */ 457, 457, 457, 356, 457, 457, 457, 457, 457, 457, - /* 2140 */ 457, 364, 457, 457, 457, 457, 369, 457, 371, 457, - /* 2150 */ 457, 457, 457, 457, 356, 457, 457, 457, 457, 457, - /* 2160 */ 457, 457, 364, 457, 457, 457, 325, 369, 457, 371, - /* 2170 */ 457, 394, 457, 457, 457, 398, 457, 457, 401, 402, - /* 2180 */ 403, 404, 405, 406, 325, 408, 457, 457, 457, 457, - /* 2190 */ 457, 457, 394, 457, 457, 457, 398, 356, 457, 401, - /* 2200 */ 402, 403, 404, 405, 406, 364, 408, 457, 457, 457, - /* 2210 */ 369, 457, 371, 457, 457, 356, 457, 457, 457, 457, - /* 2220 */ 457, 457, 457, 364, 457, 457, 457, 325, 369, 457, - /* 2230 */ 371, 457, 457, 457, 457, 394, 457, 457, 457, 398, - /* 2240 */ 457, 457, 401, 402, 403, 404, 405, 406, 457, 408, - /* 2250 */ 457, 457, 457, 394, 457, 457, 457, 398, 356, 457, - /* 2260 */ 401, 402, 403, 404, 405, 406, 364, 408, 457, 457, - /* 2270 */ 325, 369, 457, 371, 457, 457, 457, 457, 457, 457, - /* 2280 */ 457, 457, 457, 457, 457, 457, 457, 325, 457, 457, - /* 2290 */ 457, 457, 457, 457, 457, 457, 394, 457, 457, 457, - /* 2300 */ 398, 356, 457, 401, 402, 403, 404, 405, 406, 364, - /* 2310 */ 408, 457, 457, 325, 369, 457, 371, 457, 356, 457, - /* 2320 */ 457, 457, 457, 457, 457, 457, 364, 457, 457, 457, - /* 2330 */ 457, 369, 457, 371, 457, 457, 457, 457, 457, 394, - /* 2340 */ 457, 457, 457, 398, 356, 457, 401, 402, 403, 404, - /* 2350 */ 405, 406, 364, 408, 457, 457, 394, 369, 457, 371, - /* 2360 */ 398, 457, 457, 401, 402, 403, 404, 405, 406, 457, - /* 2370 */ 408, 457, 325, 457, 457, 457, 457, 457, 457, 457, - /* 2380 */ 457, 457, 394, 457, 457, 457, 398, 457, 457, 401, - /* 2390 */ 402, 403, 404, 405, 406, 457, 408, 457, 457, 457, - /* 2400 */ 457, 457, 457, 356, 457, 457, 457, 457, 457, 457, - /* 2410 */ 457, 364, 457, 457, 457, 325, 369, 457, 371, 457, - /* 2420 */ 457, 457, 457, 457, 457, 457, 457, 457, 457, 457, - /* 2430 */ 457, 457, 457, 325, 457, 457, 457, 457, 457, 457, - /* 2440 */ 457, 394, 457, 457, 457, 398, 356, 457, 401, 402, - /* 2450 */ 403, 404, 405, 406, 364, 408, 457, 457, 457, 369, - /* 2460 */ 457, 371, 457, 457, 356, 457, 457, 457, 457, 457, - /* 2470 */ 457, 457, 364, 457, 457, 457, 457, 369, 457, 371, - /* 2480 */ 457, 457, 457, 457, 394, 457, 457, 457, 398, 457, - /* 2490 */ 457, 401, 402, 403, 404, 405, 406, 325, 408, 457, - /* 2500 */ 457, 457, 394, 457, 457, 457, 398, 457, 457, 401, - /* 2510 */ 402, 403, 404, 405, 406, 457, 408, 457, 325, 457, - /* 2520 */ 457, 457, 457, 457, 457, 457, 457, 457, 356, 457, - /* 2530 */ 457, 457, 457, 457, 457, 457, 364, 457, 457, 457, - /* 2540 */ 457, 369, 457, 371, 457, 457, 457, 457, 457, 356, - /* 2550 */ 457, 457, 457, 457, 457, 457, 457, 364, 457, 457, - /* 2560 */ 457, 325, 369, 457, 371, 457, 394, 457, 457, 457, - /* 2570 */ 398, 457, 457, 401, 402, 403, 404, 405, 406, 325, - /* 2580 */ 408, 457, 457, 457, 457, 457, 457, 394, 457, 457, - /* 2590 */ 457, 398, 356, 457, 401, 402, 403, 404, 405, 406, - /* 2600 */ 364, 408, 457, 457, 457, 369, 457, 371, 457, 457, - /* 2610 */ 356, 457, 457, 457, 457, 457, 457, 457, 364, 457, - /* 2620 */ 457, 457, 325, 369, 457, 371, 457, 457, 457, 457, - /* 2630 */ 394, 457, 457, 457, 398, 457, 457, 401, 402, 403, - /* 2640 */ 404, 405, 406, 457, 408, 457, 457, 457, 394, 457, - /* 2650 */ 457, 457, 398, 356, 457, 401, 402, 403, 404, 405, - /* 2660 */ 406, 364, 408, 457, 457, 457, 369, 457, 371, 457, - /* 2670 */ 457, 457, 457, 457, 457, 457, 457, 457, 457, 457, - /* 2680 */ 457, 457, 457, 457, 457, 457, 457, 457, 457, 457, - /* 2690 */ 457, 394, 457, 457, 457, 398, 457, 457, 401, 402, - /* 2700 */ 403, 404, 405, 406, 457, 408, + /* 910 */ 84, 85, 86, 87, 88, 89, 90, 91, 366, 136, + /* 920 */ 130, 369, 139, 140, 141, 142, 143, 144, 145, 146, + /* 930 */ 147, 148, 149, 150, 151, 152, 153, 154, 155, 70, + /* 940 */ 157, 158, 159, 18, 45, 46, 8, 9, 23, 182, + /* 950 */ 12, 13, 14, 15, 16, 325, 325, 167, 325, 107, + /* 960 */ 70, 366, 37, 38, 369, 349, 41, 366, 352, 245, + /* 970 */ 369, 344, 357, 346, 184, 42, 186, 44, 126, 127, + /* 980 */ 128, 129, 130, 131, 59, 60, 61, 8, 9, 356, + /* 990 */ 151, 12, 13, 14, 15, 16, 107, 364, 47, 369, + /* 1000 */ 369, 333, 369, 107, 371, 357, 8, 9, 242, 243, + /* 1010 */ 12, 13, 14, 15, 16, 347, 163, 58, 129, 161, + /* 1020 */ 95, 333, 126, 127, 128, 129, 130, 131, 205, 396, + /* 1030 */ 163, 333, 364, 400, 96, 347, 403, 404, 405, 406, + /* 1040 */ 407, 408, 44, 410, 44, 347, 95, 243, 415, 42, + /* 1050 */ 417, 44, 364, 22, 421, 422, 97, 357, 106, 134, + /* 1060 */ 333, 325, 364, 8, 9, 432, 35, 12, 13, 14, + /* 1070 */ 15, 16, 8, 9, 347, 357, 12, 13, 14, 15, + /* 1080 */ 16, 333, 99, 99, 44, 102, 102, 333, 0, 35, + /* 1090 */ 99, 364, 356, 102, 0, 347, 96, 172, 173, 174, + /* 1100 */ 364, 347, 177, 333, 44, 369, 325, 371, 156, 0, + /* 1110 */ 22, 99, 364, 358, 102, 44, 22, 347, 364, 44, + /* 1120 */ 195, 132, 133, 198, 369, 200, 201, 202, 203, 204, + /* 1130 */ 44, 22, 396, 333, 364, 333, 400, 356, 326, 403, + /* 1140 */ 404, 405, 406, 407, 408, 364, 410, 347, 44, 347, + /* 1150 */ 369, 415, 371, 417, 399, 400, 96, 421, 422, 345, + /* 1160 */ 96, 333, 333, 357, 364, 410, 364, 96, 432, 244, + /* 1170 */ 44, 96, 357, 163, 44, 347, 347, 396, 168, 325, + /* 1180 */ 44, 400, 96, 457, 403, 404, 405, 406, 407, 408, + /* 1190 */ 13, 410, 364, 364, 12, 13, 415, 333, 417, 44, + /* 1200 */ 96, 44, 421, 422, 22, 1, 2, 13, 357, 95, + /* 1210 */ 356, 347, 35, 432, 379, 33, 44, 35, 364, 105, + /* 1220 */ 33, 387, 96, 369, 387, 371, 96, 172, 364, 35, + /* 1230 */ 335, 446, 96, 440, 325, 48, 182, 44, 356, 335, + /* 1240 */ 58, 54, 55, 56, 57, 58, 44, 379, 332, 44, + /* 1250 */ 396, 96, 70, 96, 400, 368, 44, 403, 404, 405, + /* 1260 */ 406, 407, 408, 429, 410, 356, 429, 433, 96, 415, + /* 1270 */ 433, 417, 35, 364, 431, 421, 422, 379, 369, 423, + /* 1280 */ 371, 94, 448, 449, 97, 448, 449, 453, 454, 96, + /* 1290 */ 453, 454, 450, 434, 387, 246, 48, 397, 96, 117, + /* 1300 */ 398, 96, 178, 263, 389, 396, 42, 70, 96, 400, + /* 1310 */ 376, 20, 403, 404, 405, 406, 407, 408, 379, 410, + /* 1320 */ 376, 266, 160, 374, 415, 20, 417, 333, 333, 376, + /* 1330 */ 421, 422, 374, 93, 341, 374, 429, 333, 333, 333, + /* 1340 */ 433, 20, 327, 327, 20, 371, 325, 387, 393, 20, + /* 1350 */ 339, 164, 165, 339, 167, 448, 449, 170, 334, 20, + /* 1360 */ 453, 454, 180, 388, 182, 339, 334, 339, 339, 339, + /* 1370 */ 333, 52, 339, 186, 336, 336, 325, 356, 356, 327, + /* 1380 */ 333, 356, 369, 356, 327, 364, 369, 205, 206, 429, + /* 1390 */ 369, 356, 371, 433, 194, 393, 395, 356, 356, 217, + /* 1400 */ 218, 219, 220, 221, 222, 223, 356, 356, 448, 449, + /* 1410 */ 337, 185, 356, 453, 454, 364, 371, 396, 356, 356, + /* 1420 */ 369, 400, 371, 356, 403, 404, 405, 406, 407, 408, + /* 1430 */ 337, 410, 325, 333, 369, 392, 415, 379, 417, 251, + /* 1440 */ 379, 252, 421, 422, 258, 369, 369, 396, 439, 369, + /* 1450 */ 384, 400, 325, 384, 403, 404, 405, 406, 407, 408, + /* 1460 */ 442, 410, 439, 356, 171, 247, 260, 259, 417, 262, + /* 1470 */ 398, 364, 421, 422, 438, 441, 369, 267, 371, 264, + /* 1480 */ 364, 437, 243, 356, 436, 439, 20, 402, 334, 333, + /* 1490 */ 337, 364, 20, 382, 384, 165, 369, 369, 371, 384, + /* 1500 */ 369, 369, 369, 396, 369, 452, 369, 400, 337, 364, + /* 1510 */ 403, 404, 405, 406, 407, 408, 352, 410, 337, 381, + /* 1520 */ 325, 451, 95, 396, 417, 420, 458, 400, 421, 422, + /* 1530 */ 403, 404, 405, 406, 407, 408, 325, 410, 95, 360, + /* 1540 */ 337, 36, 369, 346, 417, 328, 333, 327, 421, 422, + /* 1550 */ 390, 356, 394, 385, 385, 323, 0, 0, 187, 364, + /* 1560 */ 42, 338, 0, 0, 369, 0, 371, 356, 35, 350, + /* 1570 */ 35, 350, 350, 199, 35, 364, 35, 0, 199, 35, + /* 1580 */ 369, 35, 371, 199, 0, 199, 0, 35, 0, 22, + /* 1590 */ 0, 396, 182, 35, 180, 400, 0, 325, 403, 404, + /* 1600 */ 405, 406, 407, 408, 0, 410, 176, 396, 175, 0, + /* 1610 */ 0, 400, 0, 47, 403, 404, 405, 406, 407, 408, + /* 1620 */ 0, 410, 0, 42, 0, 0, 0, 0, 356, 151, + /* 1630 */ 35, 0, 151, 0, 0, 0, 364, 0, 0, 444, + /* 1640 */ 445, 369, 325, 371, 0, 0, 0, 0, 0, 0, + /* 1650 */ 0, 0, 0, 0, 0, 0, 445, 0, 0, 42, + /* 1660 */ 0, 0, 0, 0, 0, 22, 0, 0, 396, 0, + /* 1670 */ 0, 135, 400, 356, 35, 403, 404, 405, 406, 407, + /* 1680 */ 408, 364, 410, 0, 0, 0, 369, 0, 371, 0, + /* 1690 */ 58, 14, 14, 0, 58, 0, 0, 0, 42, 171, + /* 1700 */ 0, 0, 0, 325, 39, 64, 47, 0, 0, 0, + /* 1710 */ 0, 39, 44, 396, 35, 40, 0, 400, 47, 447, + /* 1720 */ 403, 404, 405, 406, 407, 408, 325, 410, 47, 39, + /* 1730 */ 48, 39, 0, 35, 356, 0, 48, 0, 39, 361, + /* 1740 */ 35, 35, 364, 39, 0, 22, 104, 369, 0, 371, + /* 1750 */ 35, 48, 39, 35, 35, 35, 35, 356, 44, 48, + /* 1760 */ 35, 44, 22, 35, 35, 364, 0, 22, 0, 22, + /* 1770 */ 369, 0, 371, 456, 396, 102, 50, 22, 400, 0, + /* 1780 */ 0, 403, 404, 405, 406, 407, 408, 325, 410, 35, + /* 1790 */ 0, 35, 35, 20, 22, 35, 35, 396, 192, 0, + /* 1800 */ 35, 400, 0, 163, 403, 404, 405, 406, 407, 408, + /* 1810 */ 0, 410, 0, 412, 22, 0, 3, 325, 356, 44, + /* 1820 */ 96, 248, 44, 361, 47, 95, 364, 96, 95, 95, + /* 1830 */ 44, 369, 96, 371, 96, 96, 95, 95, 47, 44, + /* 1840 */ 325, 95, 248, 163, 95, 3, 96, 96, 356, 44, + /* 1850 */ 248, 165, 35, 361, 163, 35, 364, 35, 396, 183, + /* 1860 */ 35, 369, 400, 371, 35, 403, 404, 405, 406, 407, + /* 1870 */ 408, 356, 410, 35, 47, 44, 0, 96, 96, 364, + /* 1880 */ 47, 169, 0, 47, 369, 325, 371, 0, 396, 95, + /* 1890 */ 39, 95, 400, 96, 96, 403, 404, 405, 406, 407, + /* 1900 */ 408, 325, 410, 95, 95, 105, 95, 47, 44, 2, + /* 1910 */ 22, 396, 96, 95, 95, 400, 356, 164, 403, 404, + /* 1920 */ 405, 406, 407, 408, 364, 410, 96, 95, 166, 369, + /* 1930 */ 96, 371, 356, 47, 95, 95, 242, 47, 22, 96, + /* 1940 */ 364, 95, 95, 106, 96, 369, 35, 371, 35, 227, + /* 1950 */ 96, 95, 35, 35, 325, 96, 396, 205, 95, 35, + /* 1960 */ 400, 96, 95, 403, 404, 405, 406, 407, 408, 96, + /* 1970 */ 410, 207, 396, 35, 95, 22, 400, 119, 107, 403, + /* 1980 */ 404, 405, 406, 407, 408, 356, 410, 229, 119, 119, + /* 1990 */ 227, 119, 95, 364, 44, 95, 35, 22, 369, 325, + /* 2000 */ 371, 95, 35, 64, 63, 35, 35, 35, 35, 35, + /* 2010 */ 70, 35, 35, 35, 35, 92, 35, 35, 35, 22, + /* 2020 */ 35, 35, 35, 35, 44, 396, 70, 35, 35, 400, + /* 2030 */ 356, 35, 403, 404, 405, 406, 407, 408, 364, 410, + /* 2040 */ 35, 22, 35, 369, 0, 371, 35, 48, 39, 0, + /* 2050 */ 35, 48, 325, 39, 0, 35, 48, 39, 0, 35, + /* 2060 */ 48, 39, 0, 35, 35, 0, 20, 22, 325, 21, + /* 2070 */ 396, 459, 22, 22, 400, 459, 21, 403, 404, 405, + /* 2080 */ 406, 407, 408, 356, 410, 459, 459, 459, 459, 459, + /* 2090 */ 459, 364, 459, 459, 459, 459, 369, 459, 371, 356, + /* 2100 */ 459, 459, 459, 459, 459, 459, 459, 364, 459, 459, + /* 2110 */ 459, 459, 369, 325, 371, 459, 459, 459, 459, 459, + /* 2120 */ 459, 459, 459, 396, 459, 459, 459, 400, 459, 459, + /* 2130 */ 403, 404, 405, 406, 407, 408, 459, 410, 459, 396, + /* 2140 */ 459, 459, 459, 400, 356, 459, 403, 404, 405, 406, + /* 2150 */ 407, 408, 364, 410, 459, 459, 459, 369, 459, 371, + /* 2160 */ 459, 459, 459, 459, 459, 459, 325, 459, 459, 459, + /* 2170 */ 459, 459, 459, 459, 459, 459, 459, 459, 459, 459, + /* 2180 */ 459, 459, 325, 459, 396, 459, 459, 459, 400, 459, + /* 2190 */ 459, 403, 404, 405, 406, 407, 408, 356, 410, 459, + /* 2200 */ 459, 459, 459, 459, 459, 364, 459, 459, 459, 459, + /* 2210 */ 369, 459, 371, 356, 459, 459, 459, 459, 459, 459, + /* 2220 */ 459, 364, 459, 459, 459, 459, 369, 325, 371, 459, + /* 2230 */ 459, 459, 459, 459, 459, 459, 459, 396, 459, 459, + /* 2240 */ 459, 400, 459, 459, 403, 404, 405, 406, 407, 408, + /* 2250 */ 325, 410, 459, 396, 459, 459, 459, 400, 356, 459, + /* 2260 */ 403, 404, 405, 406, 407, 408, 364, 410, 459, 459, + /* 2270 */ 459, 369, 459, 371, 459, 459, 459, 459, 459, 459, + /* 2280 */ 325, 356, 459, 459, 459, 459, 459, 459, 459, 364, + /* 2290 */ 459, 459, 459, 459, 369, 459, 371, 459, 396, 459, + /* 2300 */ 459, 459, 400, 459, 459, 403, 404, 405, 406, 407, + /* 2310 */ 408, 356, 410, 459, 459, 459, 459, 459, 459, 364, + /* 2320 */ 459, 396, 459, 459, 369, 400, 371, 459, 403, 404, + /* 2330 */ 405, 406, 407, 408, 459, 410, 459, 459, 459, 459, + /* 2340 */ 459, 459, 459, 459, 459, 459, 459, 459, 459, 459, + /* 2350 */ 459, 396, 459, 459, 459, 400, 325, 459, 403, 404, + /* 2360 */ 405, 406, 407, 408, 459, 410, 459, 459, 459, 459, + /* 2370 */ 459, 459, 459, 459, 459, 459, 459, 459, 325, 459, + /* 2380 */ 459, 459, 459, 459, 459, 459, 459, 356, 459, 459, + /* 2390 */ 459, 459, 459, 459, 459, 364, 459, 459, 459, 459, + /* 2400 */ 369, 459, 371, 459, 459, 459, 459, 459, 459, 356, + /* 2410 */ 459, 459, 459, 459, 459, 459, 459, 364, 459, 459, + /* 2420 */ 459, 459, 369, 459, 371, 459, 459, 396, 459, 459, + /* 2430 */ 459, 400, 459, 325, 403, 404, 405, 406, 407, 408, + /* 2440 */ 459, 410, 459, 459, 459, 459, 459, 459, 459, 396, + /* 2450 */ 459, 459, 459, 400, 459, 459, 403, 404, 405, 406, + /* 2460 */ 407, 408, 459, 410, 356, 459, 459, 459, 459, 459, + /* 2470 */ 459, 459, 364, 459, 459, 459, 459, 369, 325, 371, + /* 2480 */ 459, 459, 459, 459, 459, 459, 459, 459, 459, 459, + /* 2490 */ 459, 459, 459, 459, 459, 459, 459, 459, 459, 459, + /* 2500 */ 459, 459, 459, 459, 396, 459, 459, 459, 400, 356, + /* 2510 */ 459, 403, 404, 405, 406, 407, 408, 364, 410, 459, + /* 2520 */ 459, 459, 369, 325, 371, 459, 459, 459, 459, 459, + /* 2530 */ 459, 459, 459, 459, 459, 459, 459, 459, 459, 325, + /* 2540 */ 459, 459, 459, 459, 459, 459, 459, 459, 459, 396, + /* 2550 */ 459, 459, 459, 400, 356, 459, 403, 404, 405, 406, + /* 2560 */ 407, 408, 364, 410, 459, 459, 459, 369, 459, 371, + /* 2570 */ 356, 459, 459, 459, 459, 459, 459, 459, 364, 459, + /* 2580 */ 459, 459, 459, 369, 325, 371, 459, 459, 459, 459, + /* 2590 */ 459, 459, 459, 459, 396, 459, 459, 459, 400, 459, + /* 2600 */ 459, 403, 404, 405, 406, 407, 408, 325, 410, 459, + /* 2610 */ 396, 459, 459, 459, 400, 356, 459, 403, 404, 405, + /* 2620 */ 406, 407, 408, 364, 410, 459, 459, 459, 369, 459, + /* 2630 */ 371, 459, 459, 459, 459, 459, 459, 325, 356, 459, + /* 2640 */ 459, 459, 459, 459, 459, 459, 364, 459, 459, 459, + /* 2650 */ 459, 369, 459, 371, 459, 396, 459, 459, 459, 400, + /* 2660 */ 459, 459, 403, 404, 405, 406, 407, 408, 356, 410, + /* 2670 */ 459, 459, 459, 459, 459, 459, 364, 459, 396, 459, + /* 2680 */ 459, 369, 400, 371, 459, 403, 404, 405, 406, 407, + /* 2690 */ 408, 459, 410, 459, 459, 459, 459, 459, 459, 459, + /* 2700 */ 459, 459, 459, 459, 459, 459, 459, 459, 396, 459, + /* 2710 */ 459, 459, 400, 459, 459, 403, 404, 405, 406, 407, + /* 2720 */ 408, 459, 410, }; -#define YY_SHIFT_COUNT (707) +#define YY_SHIFT_COUNT (710) #define YY_SHIFT_MIN (0) -#define YY_SHIFT_MAX (2049) +#define YY_SHIFT_MAX (2065) static const unsigned short int yy_shift_ofst[] = { /* 0 */ 925, 0, 71, 0, 288, 288, 288, 288, 288, 288, /* 10 */ 288, 288, 288, 359, 574, 574, 645, 574, 574, 574, /* 20 */ 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, /* 30 */ 574, 574, 574, 574, 574, 574, 574, 574, 574, 574, - /* 40 */ 574, 574, 574, 574, 574, 574, 225, 577, 74, 132, - /* 50 */ 571, 133, 151, 133, 74, 74, 1054, 1054, 133, 1054, - /* 60 */ 1054, 17, 133, 52, 52, 21, 21, 98, 292, 42, - /* 70 */ 42, 52, 52, 52, 52, 52, 52, 52, 52, 52, - /* 80 */ 52, 106, 52, 52, 76, 52, 169, 52, 52, 228, - /* 90 */ 52, 52, 228, 52, 228, 228, 228, 52, 454, 783, - /* 100 */ 34, 34, 372, 462, 638, 638, 638, 638, 638, 638, - /* 110 */ 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - /* 120 */ 638, 638, 638, 149, 661, 98, 292, 553, 445, 685, - /* 130 */ 685, 685, 600, 157, 157, 445, 414, 414, 414, 427, - /* 140 */ 169, 316, 228, 9, 228, 9, 9, 427, 493, 216, - /* 150 */ 216, 216, 216, 216, 216, 216, 504, 335, 36, 755, - /* 160 */ 431, 49, 626, 187, 329, 684, 294, 827, 302, 892, - /* 170 */ 953, 599, 920, 234, 599, 986, 203, 711, 982, 1196, - /* 180 */ 1100, 1237, 1268, 1237, 1133, 1274, 1274, 1237, 1133, 1133, - /* 190 */ 1216, 1274, 1274, 1274, 1302, 1302, 1316, 106, 169, 106, - /* 200 */ 1324, 1328, 106, 1324, 106, 106, 106, 1274, 106, 1308, - /* 210 */ 1308, 1302, 228, 228, 228, 228, 228, 228, 228, 228, - /* 220 */ 228, 228, 228, 1274, 1302, 9, 9, 1180, 1316, 454, - /* 230 */ 1183, 169, 454, 1274, 1268, 1268, 9, 1147, 1149, 9, - /* 240 */ 1147, 1149, 9, 9, 228, 1143, 1241, 1147, 1156, 1154, - /* 250 */ 1176, 982, 1155, 1161, 1165, 1192, 414, 1416, 1274, 1324, - /* 260 */ 454, 1149, 9, 9, 9, 9, 9, 1149, 9, 1303, - /* 270 */ 454, 427, 454, 414, 1379, 1380, 9, 493, 1274, 454, - /* 280 */ 1444, 1302, 2706, 2706, 2706, 2706, 2706, 2706, 2706, 2706, - /* 290 */ 2706, 826, 562, 382, 935, 871, 15, 937, 888, 737, - /* 300 */ 963, 1042, 955, 183, 183, 183, 183, 183, 183, 183, - /* 310 */ 183, 183, 497, 331, 25, 25, 193, 322, 405, 166, - /* 320 */ 262, 50, 50, 417, 555, 573, 417, 417, 417, 716, - /* 330 */ 781, 1038, 998, 916, 1009, 976, 989, 1004, 1012, 1095, - /* 340 */ 1096, 1146, 429, 1065, 1069, 1025, 658, 570, 1007, 1108, - /* 350 */ 1128, 1130, 1134, 1151, 1188, 1153, 1045, 1055, 1058, 1159, - /* 360 */ 1072, 1168, 1170, 1174, 1202, 1209, 1239, 1112, 1175, 1178, - /* 370 */ 1198, 11, 1493, 1503, 1319, 1511, 1514, 1473, 1516, 1482, - /* 380 */ 1320, 1485, 1486, 1487, 1325, 1523, 1490, 1491, 1329, 1527, - /* 390 */ 1330, 1531, 1498, 1532, 1525, 1536, 1515, 1366, 1371, 1552, - /* 400 */ 1553, 1378, 1381, 1555, 1558, 1512, 1560, 1563, 1565, 1526, - /* 410 */ 1569, 1570, 1571, 1572, 1573, 1575, 1576, 1577, 1427, 1545, - /* 420 */ 1582, 1432, 1584, 1585, 1586, 1593, 1602, 1603, 1606, 1609, - /* 430 */ 1610, 1617, 1619, 1620, 1622, 1623, 1624, 1546, 1589, 1590, - /* 440 */ 1625, 1626, 1627, 1607, 1628, 1645, 1646, 1496, 1632, 1633, - /* 450 */ 1612, 1648, 1509, 1649, 1592, 1653, 1654, 1613, 1618, 1614, - /* 460 */ 1615, 1647, 1621, 1655, 1629, 1659, 1630, 1634, 1666, 1671, - /* 470 */ 1672, 1636, 1506, 1678, 1679, 1680, 1639, 1681, 1683, 1650, - /* 480 */ 1638, 1656, 1684, 1657, 1640, 1667, 1691, 1658, 1660, 1670, - /* 490 */ 1696, 1675, 1663, 1674, 1705, 1714, 1715, 1717, 1637, 1616, - /* 500 */ 1690, 1707, 1727, 1697, 1698, 1699, 1700, 1686, 1687, 1701, - /* 510 */ 1702, 1718, 1708, 1742, 1722, 1745, 1725, 1704, 1748, 1728, - /* 520 */ 1720, 1749, 1721, 1752, 1723, 1757, 1738, 1741, 1730, 1731, - /* 530 */ 1578, 1673, 1682, 1762, 1605, 1740, 1773, 1595, 1759, 1635, - /* 540 */ 1651, 1779, 1782, 1661, 1643, 1786, 1747, 1544, 1719, 1703, - /* 550 */ 1724, 1729, 1750, 1732, 1726, 1734, 1735, 1736, 1751, 1746, - /* 560 */ 1753, 1739, 1769, 1548, 1737, 1743, 1800, 1774, 1579, 1785, - /* 570 */ 1788, 1791, 1796, 1802, 1806, 1761, 1763, 1795, 1601, 1801, - /* 580 */ 1799, 1835, 1855, 1860, 1767, 1768, 1771, 1770, 1775, 1706, - /* 590 */ 1776, 1863, 1834, 1711, 1781, 1778, 1615, 1831, 1836, 1662, - /* 600 */ 1664, 1669, 1877, 1864, 1676, 1790, 1792, 1809, 1794, 1811, - /* 610 */ 1812, 1840, 1814, 1815, 1847, 1816, 1875, 1733, 1825, 1818, - /* 620 */ 1826, 1890, 1891, 1832, 1833, 1893, 1837, 1838, 1895, 1842, - /* 630 */ 1839, 1898, 1844, 1845, 1907, 1848, 1827, 1828, 1829, 1830, - /* 640 */ 1923, 1843, 1856, 1909, 1865, 1919, 1867, 1909, 1909, 1933, - /* 650 */ 1894, 1900, 1929, 1931, 1932, 1939, 1941, 1943, 1944, 1946, - /* 660 */ 1948, 1949, 1910, 1896, 1953, 1950, 1963, 1964, 1979, 1968, - /* 670 */ 1969, 1970, 1936, 1686, 1972, 1687, 1974, 1975, 1976, 1977, - /* 680 */ 1991, 1980, 2014, 1982, 1971, 1983, 2018, 1989, 1978, 1992, - /* 690 */ 2027, 1993, 1994, 2001, 2030, 2006, 1995, 2005, 2045, 2012, - /* 700 */ 2013, 2049, 2039, 2031, 2040, 2041, 2044, 2048, + /* 40 */ 574, 574, 574, 574, 574, 574, 103, 227, 51, 169, + /* 50 */ 287, 134, 208, 134, 51, 51, 1182, 1182, 134, 1182, + /* 60 */ 1182, 203, 134, 5, 5, 772, 772, 14, 52, 45, + /* 70 */ 45, 5, 5, 5, 5, 5, 5, 5, 40, 5, + /* 80 */ 5, 28, 5, 5, 177, 5, 404, 5, 40, 543, + /* 90 */ 5, 5, 543, 5, 543, 543, 543, 5, 57, 783, + /* 100 */ 34, 34, 498, 471, 418, 418, 418, 418, 418, 418, + /* 110 */ 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, + /* 120 */ 418, 418, 418, 213, 661, 14, 52, 312, 325, 172, + /* 130 */ 172, 172, 599, 607, 607, 325, 583, 583, 583, 784, + /* 140 */ 404, 546, 543, 869, 543, 869, 869, 784, 890, 216, + /* 150 */ 216, 216, 216, 216, 216, 216, 790, 434, 302, 711, + /* 160 */ 1055, 99, 96, 94, 295, 532, 339, 533, 899, 889, + /* 170 */ 853, 766, 804, 104, 766, 933, 724, 858, 1049, 1248, + /* 180 */ 1124, 1264, 1291, 1264, 1162, 1305, 1305, 1264, 1162, 1162, + /* 190 */ 1240, 1305, 1305, 1305, 1321, 1321, 1324, 28, 404, 28, + /* 200 */ 1329, 1339, 28, 1329, 28, 28, 28, 1305, 28, 1319, + /* 210 */ 1319, 1321, 543, 543, 543, 543, 543, 543, 543, 543, + /* 220 */ 543, 543, 543, 1305, 1321, 869, 869, 1200, 1324, 57, + /* 230 */ 1226, 404, 57, 1305, 1291, 1291, 869, 1189, 1188, 869, + /* 240 */ 1189, 1188, 869, 869, 543, 1186, 1293, 1189, 1206, 1208, + /* 250 */ 1218, 1049, 1210, 1215, 1207, 1239, 583, 1466, 1305, 1329, + /* 260 */ 57, 1472, 1188, 869, 869, 869, 869, 869, 1188, 869, + /* 270 */ 1330, 57, 784, 57, 583, 1427, 1443, 869, 890, 1305, + /* 280 */ 57, 1505, 1321, 2723, 2723, 2723, 2723, 2723, 2723, 2723, + /* 290 */ 2723, 2723, 826, 1187, 588, 656, 938, 998, 1064, 556, + /* 300 */ 686, 757, 867, 852, 979, 979, 979, 979, 979, 979, + /* 310 */ 979, 979, 979, 896, 641, 155, 155, 191, 534, 592, + /* 320 */ 572, 300, 435, 435, 1, 625, 573, 1, 1, 1, + /* 330 */ 1000, 547, 1031, 1007, 952, 839, 983, 984, 991, 1012, + /* 340 */ 1088, 1094, 1109, 959, 1060, 1071, 989, 1040, 384, 1010, + /* 350 */ 1075, 1086, 1104, 1126, 1130, 1204, 1136, 767, 1054, 823, + /* 360 */ 1155, 951, 1157, 1172, 1193, 1202, 1205, 1212, 1114, 1177, + /* 370 */ 1194, 1237, 732, 1556, 1557, 1371, 1562, 1563, 1518, 1565, + /* 380 */ 1533, 1374, 1535, 1539, 1541, 1379, 1577, 1544, 1546, 1384, + /* 390 */ 1584, 1386, 1586, 1552, 1588, 1567, 1590, 1558, 1410, 1414, + /* 400 */ 1596, 1604, 1430, 1433, 1609, 1610, 1566, 1612, 1620, 1622, + /* 410 */ 1581, 1624, 1625, 1626, 1627, 1637, 1638, 1644, 1645, 1478, + /* 420 */ 1595, 1631, 1481, 1633, 1634, 1635, 1646, 1647, 1648, 1649, + /* 430 */ 1650, 1651, 1652, 1653, 1654, 1655, 1657, 1658, 1617, 1660, + /* 440 */ 1661, 1662, 1663, 1664, 1643, 1666, 1667, 1669, 1536, 1670, + /* 450 */ 1683, 1639, 1684, 1632, 1685, 1636, 1687, 1689, 1656, 1665, + /* 460 */ 1668, 1659, 1677, 1671, 1678, 1681, 1693, 1675, 1672, 1695, + /* 470 */ 1696, 1697, 1690, 1528, 1700, 1701, 1702, 1641, 1707, 1708, + /* 480 */ 1679, 1682, 1692, 1709, 1698, 1688, 1699, 1710, 1705, 1703, + /* 490 */ 1704, 1716, 1706, 1711, 1713, 1732, 1735, 1737, 1744, 1642, + /* 500 */ 1673, 1715, 1723, 1748, 1718, 1719, 1720, 1721, 1714, 1717, + /* 510 */ 1725, 1728, 1740, 1729, 1766, 1745, 1768, 1747, 1726, 1771, + /* 520 */ 1755, 1754, 1779, 1756, 1780, 1757, 1790, 1772, 1773, 1760, + /* 530 */ 1761, 1606, 1724, 1730, 1799, 1640, 1765, 1802, 1676, 1792, + /* 540 */ 1680, 1686, 1810, 1812, 1691, 1712, 1813, 1775, 1573, 1733, + /* 550 */ 1731, 1734, 1736, 1778, 1738, 1741, 1742, 1746, 1739, 1786, + /* 560 */ 1777, 1791, 1749, 1795, 1594, 1750, 1751, 1842, 1805, 1602, + /* 570 */ 1817, 1820, 1822, 1825, 1829, 1838, 1781, 1782, 1827, 1694, + /* 580 */ 1831, 1833, 1815, 1876, 1882, 1659, 1836, 1794, 1797, 1798, + /* 590 */ 1796, 1808, 1762, 1809, 1887, 1851, 1753, 1811, 1800, 1659, + /* 600 */ 1860, 1864, 1722, 1758, 1763, 1907, 1888, 1752, 1818, 1816, + /* 610 */ 1819, 1830, 1832, 1834, 1886, 1839, 1840, 1890, 1843, 1916, + /* 620 */ 1764, 1846, 1837, 1848, 1911, 1913, 1847, 1854, 1917, 1856, + /* 630 */ 1859, 1918, 1863, 1865, 1924, 1867, 1873, 1938, 1879, 1858, + /* 640 */ 1869, 1870, 1872, 1953, 1871, 1897, 1950, 1900, 1961, 1906, + /* 650 */ 1950, 1950, 1975, 1939, 1941, 1967, 1970, 1971, 1972, 1973, + /* 660 */ 1974, 1976, 1977, 1978, 1979, 1940, 1923, 1980, 1981, 1982, + /* 670 */ 1983, 1997, 1985, 1986, 1987, 1956, 1714, 1988, 1717, 1992, + /* 680 */ 1993, 1996, 2005, 2019, 2007, 2044, 2011, 1999, 2009, 2049, + /* 690 */ 2015, 2003, 2014, 2054, 2020, 2008, 2018, 2058, 2024, 2012, + /* 700 */ 2022, 2062, 2028, 2029, 2065, 2045, 2048, 2050, 2051, 2055, + /* 710 */ 2046, }; -#define YY_REDUCE_COUNT (290) -#define YY_REDUCE_MIN (-366) -#define YY_REDUCE_MAX (2297) +#define YY_REDUCE_COUNT (291) +#define YY_REDUCE_MIN (-425) +#define YY_REDUCE_MAX (2312) static const short yy_reduce_ofst[] = { - /* 0 */ -316, -248, 281, 633, 59, 736, 779, 837, 898, 926, - /* 10 */ 987, 1040, 1093, 1136, 1193, 1210, 1236, 1296, 1318, 1382, - /* 20 */ 1403, 1446, 1497, 1513, 1567, 1588, 1631, 1652, 1695, 1713, - /* 30 */ 1777, 1798, 1841, 1859, 1902, 1945, 1962, 1988, 2047, 2090, - /* 40 */ 2108, 2172, 2193, 2236, 2254, 2297, -189, 103, 289, -366, - /* 50 */ 291, 618, 769, 834, -276, 58, -271, -168, -268, -353, - /* 60 */ 233, -77, 161, -265, 184, -329, -322, -324, -296, -191, - /* 70 */ -160, -257, 22, 109, 377, 397, 475, 476, 623, 627, - /* 80 */ 647, -98, 649, 659, -330, 679, -62, 730, 746, -243, - /* 90 */ 768, 789, -355, 800, 70, 277, 463, 812, -259, -209, - /* 100 */ -365, -365, -9, -200, -27, 102, 163, 274, 286, 396, - /* 110 */ 403, 433, 448, 480, 505, 507, 509, 512, 513, 521, - /* 120 */ 595, 632, 656, -11, -48, 99, -127, 227, 293, -48, - /* 130 */ 221, 299, 188, 362, 461, 296, -360, -57, 345, 89, - /* 140 */ 363, 179, 298, 578, 652, 641, 678, 719, 654, -339, - /* 150 */ 248, 285, 313, 317, 336, 366, 330, 440, 551, 380, - /* 160 */ 506, 408, 634, 567, 752, 752, 796, 807, 847, 843, - /* 170 */ 823, 793, 793, 777, 793, 808, 816, 752, 836, 863, - /* 180 */ 897, 911, 910, 915, 933, 975, 977, 938, 941, 942, - /* 190 */ 978, 988, 990, 992, 999, 1006, 946, 1001, 967, 1003, - /* 200 */ 1013, 964, 1010, 1018, 1014, 1015, 1016, 1024, 1020, 1026, - /* 210 */ 1027, 1034, 1008, 1011, 1017, 1019, 1021, 1022, 1023, 1028, - /* 220 */ 1030, 1031, 1041, 1033, 1043, 1000, 1002, 979, 985, 1046, - /* 230 */ 1029, 1032, 1057, 1047, 1035, 1036, 1039, 945, 1044, 1048, - /* 240 */ 961, 1049, 1051, 1052, 752, 965, 971, 991, 993, 995, - /* 250 */ 1005, 1037, 968, 997, 983, 793, 1073, 1050, 1107, 1117, - /* 260 */ 1115, 1071, 1085, 1087, 1089, 1094, 1097, 1083, 1098, 1090, - /* 270 */ 1132, 1119, 1135, 1109, 1059, 1116, 1110, 1137, 1145, 1144, - /* 280 */ 1157, 1162, 1102, 1092, 1099, 1103, 1138, 1152, 1160, 1166, - /* 290 */ 1186, + /* 0 */ -17, -295, -7, 233, 633, 736, 781, 854, 909, 1021, + /* 10 */ 1051, 1107, 1127, -169, 1195, 77, 341, 1211, 1272, 1317, + /* 20 */ 1378, 1401, 1462, 1492, 1515, 1560, 1576, 1629, 1674, 1727, + /* 30 */ 1743, 1788, 1841, 1857, 1902, 1925, 1955, 2031, 2053, 2108, + /* 40 */ 2153, 2198, 2214, 2259, 2282, 2312, -276, -290, -168, -10, + /* 50 */ 834, 837, 907, 960, -327, -181, -348, -314, -425, 252, + /* 60 */ 755, -422, 289, -328, -219, -329, -291, -300, -303, -209, + /* 70 */ -144, -173, 78, 258, 278, 326, 668, 688, -288, 698, + /* 80 */ 727, 65, 748, 754, -275, 770, 86, 800, -152, -347, + /* 90 */ 802, 828, 123, 829, 186, 187, 192, 864, -158, -294, + /* 100 */ -282, -282, -182, -265, -170, -62, -6, 82, 105, 265, + /* 110 */ 276, 305, 310, 347, 383, 386, 392, 439, 442, 450, + /* 120 */ 480, 630, 631, 67, -150, 89, -116, 308, 173, -150, + /* 130 */ 311, 332, 309, 406, 426, 175, -58, 466, 521, 126, + /* 140 */ 306, 240, 456, 552, 516, 595, 601, 616, 627, 615, + /* 150 */ 648, 700, 718, 806, 815, 851, -337, 812, 814, 835, + /* 160 */ 726, 785, 895, 793, 882, 882, 904, 868, 916, 887, + /* 170 */ 898, 843, 843, 842, 843, 856, 859, 882, 902, 900, + /* 180 */ 915, 934, 939, 944, 949, 994, 995, 953, 958, 961, + /* 190 */ 993, 1004, 1005, 1006, 1015, 1016, 955, 1011, 974, 1014, + /* 200 */ 1024, 975, 1026, 1032, 1028, 1029, 1030, 1037, 1033, 1038, + /* 210 */ 1039, 1052, 1022, 1025, 1027, 1035, 1041, 1042, 1050, 1056, + /* 220 */ 1062, 1063, 1067, 1047, 1057, 1013, 1017, 1001, 1002, 1073, + /* 230 */ 1043, 1045, 1093, 1100, 1058, 1061, 1065, 1009, 1066, 1076, + /* 240 */ 1023, 1069, 1077, 1080, 882, 1018, 1034, 1046, 1036, 1044, + /* 250 */ 1048, 1072, 1068, 1053, 1070, 843, 1116, 1085, 1156, 1154, + /* 260 */ 1153, 1111, 1110, 1128, 1131, 1132, 1133, 1135, 1115, 1137, + /* 270 */ 1138, 1171, 1164, 1181, 1145, 1105, 1179, 1173, 1197, 1213, + /* 280 */ 1203, 1217, 1220, 1160, 1158, 1168, 1169, 1219, 1221, 1222, + /* 290 */ 1223, 1232, }; static const YYACTIONTYPE yy_default[] = { - /* 0 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 10 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 20 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 30 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 40 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 50 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 60 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1841, 1586, 1586, - /* 70 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 80 */ 1586, 1664, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 90 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1662, 1834, - /* 100 */ 2031, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 110 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 120 */ 1586, 1586, 1586, 1586, 2043, 1586, 1586, 1664, 1586, 2043, - /* 130 */ 2043, 2043, 1662, 2003, 2003, 1586, 1586, 1586, 1586, 1771, - /* 140 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1771, 1586, 1586, - /* 150 */ 1586, 1586, 1586, 1586, 1586, 1586, 1878, 1586, 1586, 2068, - /* 160 */ 2121, 1586, 1586, 2071, 1586, 1586, 1586, 1846, 1586, 1724, - /* 170 */ 2058, 2035, 2049, 2105, 2036, 2033, 2052, 1586, 2062, 1586, - /* 180 */ 1871, 1839, 1586, 1839, 1836, 1586, 1586, 1839, 1836, 1836, - /* 190 */ 1715, 1586, 1586, 1586, 1586, 1586, 1586, 1664, 1586, 1664, - /* 200 */ 1586, 1586, 1664, 1586, 1664, 1664, 1664, 1586, 1664, 1643, - /* 210 */ 1643, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 220 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1891, 1586, 1662, - /* 230 */ 1880, 1586, 1662, 1586, 1586, 1586, 1586, 2078, 2076, 1586, - /* 240 */ 2078, 2076, 1586, 1586, 1586, 2090, 2086, 2078, 2094, 2092, - /* 250 */ 2064, 2062, 2124, 2111, 2107, 2049, 1586, 1586, 1586, 1586, - /* 260 */ 1662, 2076, 1586, 1586, 1586, 1586, 1586, 2076, 1586, 1586, - /* 270 */ 1662, 1586, 1662, 1586, 1586, 1740, 1586, 1586, 1586, 1662, - /* 280 */ 1618, 1586, 1873, 1884, 1856, 1856, 1774, 1774, 1774, 1665, - /* 290 */ 1591, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 300 */ 1586, 1586, 1586, 2089, 2088, 1959, 1586, 2007, 2006, 2005, - /* 310 */ 1996, 1958, 1736, 1586, 1957, 1956, 1586, 1586, 1586, 1586, - /* 320 */ 1586, 1852, 1851, 1950, 1586, 1586, 1951, 1949, 1948, 1586, - /* 330 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 340 */ 1586, 1586, 1586, 1586, 1586, 1586, 2108, 2112, 1586, 1586, - /* 350 */ 1586, 1586, 1586, 1586, 2032, 1586, 1586, 1586, 1586, 1586, - /* 360 */ 1933, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 370 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 380 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 390 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 400 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 410 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 420 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 430 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 440 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 450 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1623, - /* 460 */ 1938, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 470 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 480 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 490 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 500 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1703, 1702, 1586, - /* 510 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 520 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 530 */ 1586, 1941, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 540 */ 1586, 1586, 1586, 1586, 1586, 2104, 2065, 1586, 1586, 1586, - /* 550 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 560 */ 1933, 1586, 2087, 1586, 1586, 2102, 1586, 2106, 1586, 1586, - /* 570 */ 1586, 1586, 1586, 1586, 1586, 2042, 2038, 1586, 1586, 2034, - /* 580 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 590 */ 1586, 1586, 1586, 1586, 1586, 1586, 1932, 1586, 1993, 1586, - /* 600 */ 1586, 1586, 2027, 1586, 1586, 1978, 1586, 1586, 1586, 1586, - /* 610 */ 1586, 1586, 1586, 1586, 1586, 1941, 1586, 1944, 1586, 1586, - /* 620 */ 1586, 1586, 1586, 1768, 1586, 1586, 1586, 1586, 1586, 1586, - /* 630 */ 1586, 1586, 1586, 1586, 1586, 1586, 1753, 1751, 1750, 1749, - /* 640 */ 1586, 1746, 1586, 1781, 1586, 1586, 1586, 1777, 1776, 1586, - /* 650 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 660 */ 1586, 1586, 1586, 1586, 1683, 1586, 1586, 1586, 1586, 1586, - /* 670 */ 1586, 1586, 1586, 1675, 1586, 1674, 1586, 1586, 1586, 1586, - /* 680 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 690 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, - /* 700 */ 1586, 1586, 1586, 1586, 1586, 1586, 1586, 1586, + /* 0 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 10 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 20 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 30 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 40 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 50 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 60 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1850, 1595, 1595, + /* 70 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 80 */ 1595, 1673, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 90 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1671, 1843, + /* 100 */ 2043, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 110 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 120 */ 1595, 1595, 1595, 1595, 2055, 1595, 1595, 1673, 1595, 2055, + /* 130 */ 2055, 2055, 1671, 2015, 2015, 1595, 1595, 1595, 1595, 1780, + /* 140 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1780, 1595, 1595, + /* 150 */ 1595, 1595, 1595, 1595, 1595, 1595, 1889, 1595, 1595, 2080, + /* 160 */ 2133, 1595, 1595, 2083, 1595, 1595, 1595, 1855, 1595, 1733, + /* 170 */ 2070, 2047, 2061, 2117, 2048, 2045, 2064, 1595, 2074, 1595, + /* 180 */ 1882, 1848, 1595, 1848, 1845, 1595, 1595, 1848, 1845, 1845, + /* 190 */ 1724, 1595, 1595, 1595, 1595, 1595, 1595, 1673, 1595, 1673, + /* 200 */ 1595, 1595, 1673, 1595, 1673, 1673, 1673, 1595, 1673, 1652, + /* 210 */ 1652, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 220 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1902, 1595, 1671, + /* 230 */ 1891, 1595, 1671, 1595, 1595, 1595, 1595, 2090, 2088, 1595, + /* 240 */ 2090, 2088, 1595, 1595, 1595, 2102, 2098, 2090, 2106, 2104, + /* 250 */ 2076, 2074, 2136, 2123, 2119, 2061, 1595, 1595, 1595, 1595, + /* 260 */ 1671, 1595, 2088, 1595, 1595, 1595, 1595, 1595, 2088, 1595, + /* 270 */ 1595, 1671, 1595, 1671, 1595, 1595, 1749, 1595, 1595, 1595, + /* 280 */ 1671, 1627, 1595, 1884, 1895, 1867, 1867, 1783, 1783, 1783, + /* 290 */ 1674, 1600, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 300 */ 1595, 1595, 1595, 1595, 2101, 2100, 1971, 1595, 2019, 2018, + /* 310 */ 2017, 2008, 1970, 1745, 1595, 1969, 1968, 1595, 1595, 1595, + /* 320 */ 1595, 1595, 1863, 1862, 1962, 1595, 1595, 1963, 1961, 1960, + /* 330 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 340 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 2120, 2124, 1595, + /* 350 */ 1595, 1595, 1595, 1595, 1595, 2044, 1595, 1595, 1595, 1595, + /* 360 */ 1595, 1944, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 370 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 380 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 390 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 400 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 410 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 420 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 430 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 440 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 450 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 460 */ 1632, 1949, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 470 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 480 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 490 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 500 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1712, 1711, + /* 510 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 520 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 530 */ 1595, 1595, 1953, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 540 */ 1595, 1595, 1595, 1595, 1595, 1595, 2116, 2077, 1595, 1595, + /* 550 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 560 */ 1595, 1944, 1595, 2099, 1595, 1595, 2114, 1595, 2118, 1595, + /* 570 */ 1595, 1595, 1595, 1595, 1595, 1595, 2054, 2050, 1595, 1595, + /* 580 */ 2046, 1595, 1595, 1595, 1595, 1952, 1595, 1595, 1595, 1595, + /* 590 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1943, + /* 600 */ 1595, 2005, 1595, 1595, 1595, 2039, 1595, 1595, 1990, 1595, + /* 610 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1953, 1595, + /* 620 */ 1956, 1595, 1595, 1595, 1595, 1595, 1777, 1595, 1595, 1595, + /* 630 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1762, + /* 640 */ 1760, 1759, 1758, 1595, 1755, 1595, 1790, 1595, 1595, 1595, + /* 650 */ 1786, 1785, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 660 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1692, 1595, 1595, + /* 670 */ 1595, 1595, 1595, 1595, 1595, 1595, 1684, 1595, 1683, 1595, + /* 680 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 690 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 700 */ 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, 1595, + /* 710 */ 1595, }; /********** End of lemon-generated parsing tables *****************************/ @@ -1754,83 +1760,85 @@ static const char *const yyTokenName[] = { /* 377 */ "tag_list_opt", /* 378 */ "tag_item", /* 379 */ "column_alias", - /* 380 */ "index_options", - /* 381 */ "func_list", - /* 382 */ "sliding_opt", - /* 383 */ "sma_stream_opt", - /* 384 */ "func", - /* 385 */ "query_or_subquery", - /* 386 */ "cgroup_name", - /* 387 */ "analyze_opt", - /* 388 */ "explain_options", - /* 389 */ "agg_func_opt", - /* 390 */ "bufsize_opt", - /* 391 */ "stream_name", - /* 392 */ "stream_options", - /* 393 */ "subtable_opt", - /* 394 */ "expression", - /* 395 */ "dnode_list", - /* 396 */ "where_clause_opt", - /* 397 */ "signed", - /* 398 */ "literal_func", - /* 399 */ "literal_list", - /* 400 */ "table_alias", - /* 401 */ "expr_or_subquery", - /* 402 */ "pseudo_column", - /* 403 */ "column_reference", - /* 404 */ "function_expression", - /* 405 */ "case_when_expression", - /* 406 */ "star_func", - /* 407 */ "star_func_para_list", - /* 408 */ "noarg_func", - /* 409 */ "other_para_list", - /* 410 */ "star_func_para", - /* 411 */ "when_then_list", - /* 412 */ "case_when_else_opt", - /* 413 */ "common_expression", - /* 414 */ "when_then_expr", - /* 415 */ "predicate", - /* 416 */ "compare_op", - /* 417 */ "in_op", - /* 418 */ "in_predicate_value", - /* 419 */ "boolean_value_expression", - /* 420 */ "boolean_primary", - /* 421 */ "from_clause_opt", - /* 422 */ "table_reference_list", - /* 423 */ "table_reference", - /* 424 */ "table_primary", - /* 425 */ "joined_table", - /* 426 */ "alias_opt", - /* 427 */ "subquery", - /* 428 */ "parenthesized_joined_table", - /* 429 */ "join_type", - /* 430 */ "search_condition", - /* 431 */ "query_specification", - /* 432 */ "set_quantifier_opt", - /* 433 */ "select_list", - /* 434 */ "partition_by_clause_opt", - /* 435 */ "range_opt", - /* 436 */ "every_opt", - /* 437 */ "fill_opt", - /* 438 */ "twindow_clause_opt", - /* 439 */ "group_by_clause_opt", - /* 440 */ "having_clause_opt", - /* 441 */ "select_item", - /* 442 */ "partition_list", - /* 443 */ "partition_item", - /* 444 */ "fill_mode", - /* 445 */ "group_by_list", - /* 446 */ "query_expression", - /* 447 */ "query_simple", - /* 448 */ "order_by_clause_opt", - /* 449 */ "slimit_clause_opt", - /* 450 */ "limit_clause_opt", - /* 451 */ "union_query_expression", - /* 452 */ "query_simple_or_subquery", - /* 453 */ "sort_specification_list", - /* 454 */ "sort_specification", - /* 455 */ "ordering_specification_opt", - /* 456 */ "null_ordering_opt", + /* 380 */ "full_index_name", + /* 381 */ "index_options", + /* 382 */ "index_name", + /* 383 */ "func_list", + /* 384 */ "sliding_opt", + /* 385 */ "sma_stream_opt", + /* 386 */ "func", + /* 387 */ "query_or_subquery", + /* 388 */ "cgroup_name", + /* 389 */ "analyze_opt", + /* 390 */ "explain_options", + /* 391 */ "agg_func_opt", + /* 392 */ "bufsize_opt", + /* 393 */ "stream_name", + /* 394 */ "stream_options", + /* 395 */ "subtable_opt", + /* 396 */ "expression", + /* 397 */ "dnode_list", + /* 398 */ "where_clause_opt", + /* 399 */ "signed", + /* 400 */ "literal_func", + /* 401 */ "literal_list", + /* 402 */ "table_alias", + /* 403 */ "expr_or_subquery", + /* 404 */ "pseudo_column", + /* 405 */ "column_reference", + /* 406 */ "function_expression", + /* 407 */ "case_when_expression", + /* 408 */ "star_func", + /* 409 */ "star_func_para_list", + /* 410 */ "noarg_func", + /* 411 */ "other_para_list", + /* 412 */ "star_func_para", + /* 413 */ "when_then_list", + /* 414 */ "case_when_else_opt", + /* 415 */ "common_expression", + /* 416 */ "when_then_expr", + /* 417 */ "predicate", + /* 418 */ "compare_op", + /* 419 */ "in_op", + /* 420 */ "in_predicate_value", + /* 421 */ "boolean_value_expression", + /* 422 */ "boolean_primary", + /* 423 */ "from_clause_opt", + /* 424 */ "table_reference_list", + /* 425 */ "table_reference", + /* 426 */ "table_primary", + /* 427 */ "joined_table", + /* 428 */ "alias_opt", + /* 429 */ "subquery", + /* 430 */ "parenthesized_joined_table", + /* 431 */ "join_type", + /* 432 */ "search_condition", + /* 433 */ "query_specification", + /* 434 */ "set_quantifier_opt", + /* 435 */ "select_list", + /* 436 */ "partition_by_clause_opt", + /* 437 */ "range_opt", + /* 438 */ "every_opt", + /* 439 */ "fill_opt", + /* 440 */ "twindow_clause_opt", + /* 441 */ "group_by_clause_opt", + /* 442 */ "having_clause_opt", + /* 443 */ "select_item", + /* 444 */ "partition_list", + /* 445 */ "partition_item", + /* 446 */ "fill_mode", + /* 447 */ "group_by_list", + /* 448 */ "query_expression", + /* 449 */ "query_simple", + /* 450 */ "order_by_clause_opt", + /* 451 */ "slimit_clause_opt", + /* 452 */ "limit_clause_opt", + /* 453 */ "union_query_expression", + /* 454 */ "query_simple_or_subquery", + /* 455 */ "sort_specification_list", + /* 456 */ "sort_specification", + /* 457 */ "ordering_specification_opt", + /* 458 */ "null_ordering_opt", }; #endif /* defined(YYCOVERAGE) || !defined(NDEBUG) */ @@ -2098,284 +2106,287 @@ static const char *const yyRuleName[] = { /* 257 */ "tag_item ::= column_name", /* 258 */ "tag_item ::= column_name column_alias", /* 259 */ "tag_item ::= column_name AS column_alias", - /* 260 */ "cmd ::= CREATE SMA INDEX not_exists_opt full_table_name ON full_table_name index_options", - /* 261 */ "cmd ::= DROP INDEX exists_opt full_table_name", - /* 262 */ "index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt sma_stream_opt", - /* 263 */ "index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt sma_stream_opt", - /* 264 */ "func_list ::= func", - /* 265 */ "func_list ::= func_list NK_COMMA func", - /* 266 */ "func ::= function_name NK_LP expression_list NK_RP", - /* 267 */ "sma_stream_opt ::=", - /* 268 */ "sma_stream_opt ::= sma_stream_opt WATERMARK duration_literal", - /* 269 */ "sma_stream_opt ::= sma_stream_opt MAX_DELAY duration_literal", - /* 270 */ "sma_stream_opt ::= sma_stream_opt DELETE_MARK duration_literal", - /* 271 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_or_subquery", - /* 272 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name AS DATABASE db_name", - /* 273 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS DATABASE db_name", - /* 274 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name AS STABLE full_table_name", - /* 275 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS STABLE full_table_name", - /* 276 */ "cmd ::= DROP TOPIC exists_opt topic_name", - /* 277 */ "cmd ::= DROP CONSUMER GROUP exists_opt cgroup_name ON topic_name", - /* 278 */ "cmd ::= DESC full_table_name", - /* 279 */ "cmd ::= DESCRIBE full_table_name", - /* 280 */ "cmd ::= RESET QUERY CACHE", - /* 281 */ "cmd ::= EXPLAIN analyze_opt explain_options query_or_subquery", - /* 282 */ "analyze_opt ::=", - /* 283 */ "analyze_opt ::= ANALYZE", - /* 284 */ "explain_options ::=", - /* 285 */ "explain_options ::= explain_options VERBOSE NK_BOOL", - /* 286 */ "explain_options ::= explain_options RATIO NK_FLOAT", - /* 287 */ "cmd ::= CREATE agg_func_opt FUNCTION not_exists_opt function_name AS NK_STRING OUTPUTTYPE type_name bufsize_opt", - /* 288 */ "cmd ::= DROP FUNCTION exists_opt function_name", - /* 289 */ "agg_func_opt ::=", - /* 290 */ "agg_func_opt ::= AGGREGATE", - /* 291 */ "bufsize_opt ::=", - /* 292 */ "bufsize_opt ::= BUFSIZE NK_INTEGER", - /* 293 */ "cmd ::= CREATE STREAM not_exists_opt stream_name stream_options INTO full_table_name tags_def_opt subtable_opt AS query_or_subquery", - /* 294 */ "cmd ::= DROP STREAM exists_opt stream_name", - /* 295 */ "stream_options ::=", - /* 296 */ "stream_options ::= stream_options TRIGGER AT_ONCE", - /* 297 */ "stream_options ::= stream_options TRIGGER WINDOW_CLOSE", - /* 298 */ "stream_options ::= stream_options TRIGGER MAX_DELAY duration_literal", - /* 299 */ "stream_options ::= stream_options WATERMARK duration_literal", - /* 300 */ "stream_options ::= stream_options IGNORE EXPIRED NK_INTEGER", - /* 301 */ "stream_options ::= stream_options FILL_HISTORY NK_INTEGER", - /* 302 */ "subtable_opt ::=", - /* 303 */ "subtable_opt ::= SUBTABLE NK_LP expression NK_RP", - /* 304 */ "cmd ::= KILL CONNECTION NK_INTEGER", - /* 305 */ "cmd ::= KILL QUERY NK_STRING", - /* 306 */ "cmd ::= KILL TRANSACTION NK_INTEGER", - /* 307 */ "cmd ::= BALANCE VGROUP", - /* 308 */ "cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER", - /* 309 */ "cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list", - /* 310 */ "cmd ::= SPLIT VGROUP NK_INTEGER", - /* 311 */ "dnode_list ::= DNODE NK_INTEGER", - /* 312 */ "dnode_list ::= dnode_list DNODE NK_INTEGER", - /* 313 */ "cmd ::= DELETE FROM full_table_name where_clause_opt", - /* 314 */ "cmd ::= query_or_subquery", - /* 315 */ "cmd ::= INSERT INTO full_table_name NK_LP col_name_list NK_RP query_or_subquery", - /* 316 */ "cmd ::= INSERT INTO full_table_name query_or_subquery", - /* 317 */ "literal ::= NK_INTEGER", - /* 318 */ "literal ::= NK_FLOAT", - /* 319 */ "literal ::= NK_STRING", - /* 320 */ "literal ::= NK_BOOL", - /* 321 */ "literal ::= TIMESTAMP NK_STRING", - /* 322 */ "literal ::= duration_literal", - /* 323 */ "literal ::= NULL", - /* 324 */ "literal ::= NK_QUESTION", - /* 325 */ "duration_literal ::= NK_VARIABLE", - /* 326 */ "signed ::= NK_INTEGER", - /* 327 */ "signed ::= NK_PLUS NK_INTEGER", - /* 328 */ "signed ::= NK_MINUS NK_INTEGER", - /* 329 */ "signed ::= NK_FLOAT", - /* 330 */ "signed ::= NK_PLUS NK_FLOAT", - /* 331 */ "signed ::= NK_MINUS NK_FLOAT", - /* 332 */ "signed_literal ::= signed", - /* 333 */ "signed_literal ::= NK_STRING", - /* 334 */ "signed_literal ::= NK_BOOL", - /* 335 */ "signed_literal ::= TIMESTAMP NK_STRING", - /* 336 */ "signed_literal ::= duration_literal", - /* 337 */ "signed_literal ::= NULL", - /* 338 */ "signed_literal ::= literal_func", - /* 339 */ "signed_literal ::= NK_QUESTION", - /* 340 */ "literal_list ::= signed_literal", - /* 341 */ "literal_list ::= literal_list NK_COMMA signed_literal", - /* 342 */ "db_name ::= NK_ID", - /* 343 */ "table_name ::= NK_ID", - /* 344 */ "column_name ::= NK_ID", - /* 345 */ "function_name ::= NK_ID", - /* 346 */ "table_alias ::= NK_ID", - /* 347 */ "column_alias ::= NK_ID", - /* 348 */ "user_name ::= NK_ID", - /* 349 */ "topic_name ::= NK_ID", - /* 350 */ "stream_name ::= NK_ID", - /* 351 */ "cgroup_name ::= NK_ID", - /* 352 */ "expr_or_subquery ::= expression", - /* 353 */ "expression ::= literal", - /* 354 */ "expression ::= pseudo_column", - /* 355 */ "expression ::= column_reference", - /* 356 */ "expression ::= function_expression", - /* 357 */ "expression ::= case_when_expression", - /* 358 */ "expression ::= NK_LP expression NK_RP", - /* 359 */ "expression ::= NK_PLUS expr_or_subquery", - /* 360 */ "expression ::= NK_MINUS expr_or_subquery", - /* 361 */ "expression ::= expr_or_subquery NK_PLUS expr_or_subquery", - /* 362 */ "expression ::= expr_or_subquery NK_MINUS expr_or_subquery", - /* 363 */ "expression ::= expr_or_subquery NK_STAR expr_or_subquery", - /* 364 */ "expression ::= expr_or_subquery NK_SLASH expr_or_subquery", - /* 365 */ "expression ::= expr_or_subquery NK_REM expr_or_subquery", - /* 366 */ "expression ::= column_reference NK_ARROW NK_STRING", - /* 367 */ "expression ::= expr_or_subquery NK_BITAND expr_or_subquery", - /* 368 */ "expression ::= expr_or_subquery NK_BITOR expr_or_subquery", - /* 369 */ "expression_list ::= expr_or_subquery", - /* 370 */ "expression_list ::= expression_list NK_COMMA expr_or_subquery", - /* 371 */ "column_reference ::= column_name", - /* 372 */ "column_reference ::= table_name NK_DOT column_name", - /* 373 */ "pseudo_column ::= ROWTS", - /* 374 */ "pseudo_column ::= TBNAME", - /* 375 */ "pseudo_column ::= table_name NK_DOT TBNAME", - /* 376 */ "pseudo_column ::= QSTART", - /* 377 */ "pseudo_column ::= QEND", - /* 378 */ "pseudo_column ::= QDURATION", - /* 379 */ "pseudo_column ::= WSTART", - /* 380 */ "pseudo_column ::= WEND", - /* 381 */ "pseudo_column ::= WDURATION", - /* 382 */ "pseudo_column ::= IROWTS", - /* 383 */ "pseudo_column ::= QTAGS", - /* 384 */ "function_expression ::= function_name NK_LP expression_list NK_RP", - /* 385 */ "function_expression ::= star_func NK_LP star_func_para_list NK_RP", - /* 386 */ "function_expression ::= CAST NK_LP expr_or_subquery AS type_name NK_RP", - /* 387 */ "function_expression ::= literal_func", - /* 388 */ "literal_func ::= noarg_func NK_LP NK_RP", - /* 389 */ "literal_func ::= NOW", - /* 390 */ "noarg_func ::= NOW", - /* 391 */ "noarg_func ::= TODAY", - /* 392 */ "noarg_func ::= TIMEZONE", - /* 393 */ "noarg_func ::= DATABASE", - /* 394 */ "noarg_func ::= CLIENT_VERSION", - /* 395 */ "noarg_func ::= SERVER_VERSION", - /* 396 */ "noarg_func ::= SERVER_STATUS", - /* 397 */ "noarg_func ::= CURRENT_USER", - /* 398 */ "noarg_func ::= USER", - /* 399 */ "star_func ::= COUNT", - /* 400 */ "star_func ::= FIRST", - /* 401 */ "star_func ::= LAST", - /* 402 */ "star_func ::= LAST_ROW", - /* 403 */ "star_func_para_list ::= NK_STAR", - /* 404 */ "star_func_para_list ::= other_para_list", - /* 405 */ "other_para_list ::= star_func_para", - /* 406 */ "other_para_list ::= other_para_list NK_COMMA star_func_para", - /* 407 */ "star_func_para ::= expr_or_subquery", - /* 408 */ "star_func_para ::= table_name NK_DOT NK_STAR", - /* 409 */ "case_when_expression ::= CASE when_then_list case_when_else_opt END", - /* 410 */ "case_when_expression ::= CASE common_expression when_then_list case_when_else_opt END", - /* 411 */ "when_then_list ::= when_then_expr", - /* 412 */ "when_then_list ::= when_then_list when_then_expr", - /* 413 */ "when_then_expr ::= WHEN common_expression THEN common_expression", - /* 414 */ "case_when_else_opt ::=", - /* 415 */ "case_when_else_opt ::= ELSE common_expression", - /* 416 */ "predicate ::= expr_or_subquery compare_op expr_or_subquery", - /* 417 */ "predicate ::= expr_or_subquery BETWEEN expr_or_subquery AND expr_or_subquery", - /* 418 */ "predicate ::= expr_or_subquery NOT BETWEEN expr_or_subquery AND expr_or_subquery", - /* 419 */ "predicate ::= expr_or_subquery IS NULL", - /* 420 */ "predicate ::= expr_or_subquery IS NOT NULL", - /* 421 */ "predicate ::= expr_or_subquery in_op in_predicate_value", - /* 422 */ "compare_op ::= NK_LT", - /* 423 */ "compare_op ::= NK_GT", - /* 424 */ "compare_op ::= NK_LE", - /* 425 */ "compare_op ::= NK_GE", - /* 426 */ "compare_op ::= NK_NE", - /* 427 */ "compare_op ::= NK_EQ", - /* 428 */ "compare_op ::= LIKE", - /* 429 */ "compare_op ::= NOT LIKE", - /* 430 */ "compare_op ::= MATCH", - /* 431 */ "compare_op ::= NMATCH", - /* 432 */ "compare_op ::= CONTAINS", - /* 433 */ "in_op ::= IN", - /* 434 */ "in_op ::= NOT IN", - /* 435 */ "in_predicate_value ::= NK_LP literal_list NK_RP", - /* 436 */ "boolean_value_expression ::= boolean_primary", - /* 437 */ "boolean_value_expression ::= NOT boolean_primary", - /* 438 */ "boolean_value_expression ::= boolean_value_expression OR boolean_value_expression", - /* 439 */ "boolean_value_expression ::= boolean_value_expression AND boolean_value_expression", - /* 440 */ "boolean_primary ::= predicate", - /* 441 */ "boolean_primary ::= NK_LP boolean_value_expression NK_RP", - /* 442 */ "common_expression ::= expr_or_subquery", - /* 443 */ "common_expression ::= boolean_value_expression", - /* 444 */ "from_clause_opt ::=", - /* 445 */ "from_clause_opt ::= FROM table_reference_list", - /* 446 */ "table_reference_list ::= table_reference", - /* 447 */ "table_reference_list ::= table_reference_list NK_COMMA table_reference", - /* 448 */ "table_reference ::= table_primary", - /* 449 */ "table_reference ::= joined_table", - /* 450 */ "table_primary ::= table_name alias_opt", - /* 451 */ "table_primary ::= db_name NK_DOT table_name alias_opt", - /* 452 */ "table_primary ::= subquery alias_opt", - /* 453 */ "table_primary ::= parenthesized_joined_table", - /* 454 */ "alias_opt ::=", - /* 455 */ "alias_opt ::= table_alias", - /* 456 */ "alias_opt ::= AS table_alias", - /* 457 */ "parenthesized_joined_table ::= NK_LP joined_table NK_RP", - /* 458 */ "parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP", - /* 459 */ "joined_table ::= table_reference join_type JOIN table_reference ON search_condition", - /* 460 */ "join_type ::=", - /* 461 */ "join_type ::= INNER", - /* 462 */ "query_specification ::= SELECT set_quantifier_opt select_list from_clause_opt where_clause_opt partition_by_clause_opt range_opt every_opt fill_opt twindow_clause_opt group_by_clause_opt having_clause_opt", - /* 463 */ "set_quantifier_opt ::=", - /* 464 */ "set_quantifier_opt ::= DISTINCT", - /* 465 */ "set_quantifier_opt ::= ALL", - /* 466 */ "select_list ::= select_item", - /* 467 */ "select_list ::= select_list NK_COMMA select_item", - /* 468 */ "select_item ::= NK_STAR", - /* 469 */ "select_item ::= common_expression", - /* 470 */ "select_item ::= common_expression column_alias", - /* 471 */ "select_item ::= common_expression AS column_alias", - /* 472 */ "select_item ::= table_name NK_DOT NK_STAR", - /* 473 */ "where_clause_opt ::=", - /* 474 */ "where_clause_opt ::= WHERE search_condition", - /* 475 */ "partition_by_clause_opt ::=", - /* 476 */ "partition_by_clause_opt ::= PARTITION BY partition_list", - /* 477 */ "partition_list ::= partition_item", - /* 478 */ "partition_list ::= partition_list NK_COMMA partition_item", - /* 479 */ "partition_item ::= expr_or_subquery", - /* 480 */ "partition_item ::= expr_or_subquery column_alias", - /* 481 */ "partition_item ::= expr_or_subquery AS column_alias", - /* 482 */ "twindow_clause_opt ::=", - /* 483 */ "twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP", - /* 484 */ "twindow_clause_opt ::= STATE_WINDOW NK_LP expr_or_subquery NK_RP", - /* 485 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt", - /* 486 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt", - /* 487 */ "sliding_opt ::=", - /* 488 */ "sliding_opt ::= SLIDING NK_LP duration_literal NK_RP", - /* 489 */ "fill_opt ::=", - /* 490 */ "fill_opt ::= FILL NK_LP fill_mode NK_RP", - /* 491 */ "fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP", - /* 492 */ "fill_mode ::= NONE", - /* 493 */ "fill_mode ::= PREV", - /* 494 */ "fill_mode ::= NULL", - /* 495 */ "fill_mode ::= LINEAR", - /* 496 */ "fill_mode ::= NEXT", - /* 497 */ "group_by_clause_opt ::=", - /* 498 */ "group_by_clause_opt ::= GROUP BY group_by_list", - /* 499 */ "group_by_list ::= expr_or_subquery", - /* 500 */ "group_by_list ::= group_by_list NK_COMMA expr_or_subquery", - /* 501 */ "having_clause_opt ::=", - /* 502 */ "having_clause_opt ::= HAVING search_condition", - /* 503 */ "range_opt ::=", - /* 504 */ "range_opt ::= RANGE NK_LP expr_or_subquery NK_COMMA expr_or_subquery NK_RP", - /* 505 */ "every_opt ::=", - /* 506 */ "every_opt ::= EVERY NK_LP duration_literal NK_RP", - /* 507 */ "query_expression ::= query_simple order_by_clause_opt slimit_clause_opt limit_clause_opt", - /* 508 */ "query_simple ::= query_specification", - /* 509 */ "query_simple ::= union_query_expression", - /* 510 */ "union_query_expression ::= query_simple_or_subquery UNION ALL query_simple_or_subquery", - /* 511 */ "union_query_expression ::= query_simple_or_subquery UNION query_simple_or_subquery", - /* 512 */ "query_simple_or_subquery ::= query_simple", - /* 513 */ "query_simple_or_subquery ::= subquery", - /* 514 */ "query_or_subquery ::= query_expression", - /* 515 */ "query_or_subquery ::= subquery", - /* 516 */ "order_by_clause_opt ::=", - /* 517 */ "order_by_clause_opt ::= ORDER BY sort_specification_list", - /* 518 */ "slimit_clause_opt ::=", - /* 519 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER", - /* 520 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER", - /* 521 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER", - /* 522 */ "limit_clause_opt ::=", - /* 523 */ "limit_clause_opt ::= LIMIT NK_INTEGER", - /* 524 */ "limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER", - /* 525 */ "limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER", - /* 526 */ "subquery ::= NK_LP query_expression NK_RP", - /* 527 */ "subquery ::= NK_LP subquery NK_RP", - /* 528 */ "search_condition ::= common_expression", - /* 529 */ "sort_specification_list ::= sort_specification", - /* 530 */ "sort_specification_list ::= sort_specification_list NK_COMMA sort_specification", - /* 531 */ "sort_specification ::= expr_or_subquery ordering_specification_opt null_ordering_opt", - /* 532 */ "ordering_specification_opt ::=", - /* 533 */ "ordering_specification_opt ::= ASC", - /* 534 */ "ordering_specification_opt ::= DESC", - /* 535 */ "null_ordering_opt ::=", - /* 536 */ "null_ordering_opt ::= NULLS FIRST", - /* 537 */ "null_ordering_opt ::= NULLS LAST", + /* 260 */ "cmd ::= CREATE SMA INDEX not_exists_opt full_index_name ON full_table_name index_options", + /* 261 */ "cmd ::= DROP INDEX exists_opt full_index_name", + /* 262 */ "full_index_name ::= index_name", + /* 263 */ "full_index_name ::= db_name NK_DOT index_name", + /* 264 */ "index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt sma_stream_opt", + /* 265 */ "index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt sma_stream_opt", + /* 266 */ "func_list ::= func", + /* 267 */ "func_list ::= func_list NK_COMMA func", + /* 268 */ "func ::= function_name NK_LP expression_list NK_RP", + /* 269 */ "sma_stream_opt ::=", + /* 270 */ "sma_stream_opt ::= sma_stream_opt WATERMARK duration_literal", + /* 271 */ "sma_stream_opt ::= sma_stream_opt MAX_DELAY duration_literal", + /* 272 */ "sma_stream_opt ::= sma_stream_opt DELETE_MARK duration_literal", + /* 273 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_or_subquery", + /* 274 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name AS DATABASE db_name", + /* 275 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS DATABASE db_name", + /* 276 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name AS STABLE full_table_name", + /* 277 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS STABLE full_table_name", + /* 278 */ "cmd ::= DROP TOPIC exists_opt topic_name", + /* 279 */ "cmd ::= DROP CONSUMER GROUP exists_opt cgroup_name ON topic_name", + /* 280 */ "cmd ::= DESC full_table_name", + /* 281 */ "cmd ::= DESCRIBE full_table_name", + /* 282 */ "cmd ::= RESET QUERY CACHE", + /* 283 */ "cmd ::= EXPLAIN analyze_opt explain_options query_or_subquery", + /* 284 */ "analyze_opt ::=", + /* 285 */ "analyze_opt ::= ANALYZE", + /* 286 */ "explain_options ::=", + /* 287 */ "explain_options ::= explain_options VERBOSE NK_BOOL", + /* 288 */ "explain_options ::= explain_options RATIO NK_FLOAT", + /* 289 */ "cmd ::= CREATE agg_func_opt FUNCTION not_exists_opt function_name AS NK_STRING OUTPUTTYPE type_name bufsize_opt", + /* 290 */ "cmd ::= DROP FUNCTION exists_opt function_name", + /* 291 */ "agg_func_opt ::=", + /* 292 */ "agg_func_opt ::= AGGREGATE", + /* 293 */ "bufsize_opt ::=", + /* 294 */ "bufsize_opt ::= BUFSIZE NK_INTEGER", + /* 295 */ "cmd ::= CREATE STREAM not_exists_opt stream_name stream_options INTO full_table_name tags_def_opt subtable_opt AS query_or_subquery", + /* 296 */ "cmd ::= DROP STREAM exists_opt stream_name", + /* 297 */ "stream_options ::=", + /* 298 */ "stream_options ::= stream_options TRIGGER AT_ONCE", + /* 299 */ "stream_options ::= stream_options TRIGGER WINDOW_CLOSE", + /* 300 */ "stream_options ::= stream_options TRIGGER MAX_DELAY duration_literal", + /* 301 */ "stream_options ::= stream_options WATERMARK duration_literal", + /* 302 */ "stream_options ::= stream_options IGNORE EXPIRED NK_INTEGER", + /* 303 */ "stream_options ::= stream_options FILL_HISTORY NK_INTEGER", + /* 304 */ "subtable_opt ::=", + /* 305 */ "subtable_opt ::= SUBTABLE NK_LP expression NK_RP", + /* 306 */ "cmd ::= KILL CONNECTION NK_INTEGER", + /* 307 */ "cmd ::= KILL QUERY NK_STRING", + /* 308 */ "cmd ::= KILL TRANSACTION NK_INTEGER", + /* 309 */ "cmd ::= BALANCE VGROUP", + /* 310 */ "cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER", + /* 311 */ "cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list", + /* 312 */ "cmd ::= SPLIT VGROUP NK_INTEGER", + /* 313 */ "dnode_list ::= DNODE NK_INTEGER", + /* 314 */ "dnode_list ::= dnode_list DNODE NK_INTEGER", + /* 315 */ "cmd ::= DELETE FROM full_table_name where_clause_opt", + /* 316 */ "cmd ::= query_or_subquery", + /* 317 */ "cmd ::= INSERT INTO full_table_name NK_LP col_name_list NK_RP query_or_subquery", + /* 318 */ "cmd ::= INSERT INTO full_table_name query_or_subquery", + /* 319 */ "literal ::= NK_INTEGER", + /* 320 */ "literal ::= NK_FLOAT", + /* 321 */ "literal ::= NK_STRING", + /* 322 */ "literal ::= NK_BOOL", + /* 323 */ "literal ::= TIMESTAMP NK_STRING", + /* 324 */ "literal ::= duration_literal", + /* 325 */ "literal ::= NULL", + /* 326 */ "literal ::= NK_QUESTION", + /* 327 */ "duration_literal ::= NK_VARIABLE", + /* 328 */ "signed ::= NK_INTEGER", + /* 329 */ "signed ::= NK_PLUS NK_INTEGER", + /* 330 */ "signed ::= NK_MINUS NK_INTEGER", + /* 331 */ "signed ::= NK_FLOAT", + /* 332 */ "signed ::= NK_PLUS NK_FLOAT", + /* 333 */ "signed ::= NK_MINUS NK_FLOAT", + /* 334 */ "signed_literal ::= signed", + /* 335 */ "signed_literal ::= NK_STRING", + /* 336 */ "signed_literal ::= NK_BOOL", + /* 337 */ "signed_literal ::= TIMESTAMP NK_STRING", + /* 338 */ "signed_literal ::= duration_literal", + /* 339 */ "signed_literal ::= NULL", + /* 340 */ "signed_literal ::= literal_func", + /* 341 */ "signed_literal ::= NK_QUESTION", + /* 342 */ "literal_list ::= signed_literal", + /* 343 */ "literal_list ::= literal_list NK_COMMA signed_literal", + /* 344 */ "db_name ::= NK_ID", + /* 345 */ "table_name ::= NK_ID", + /* 346 */ "column_name ::= NK_ID", + /* 347 */ "function_name ::= NK_ID", + /* 348 */ "table_alias ::= NK_ID", + /* 349 */ "column_alias ::= NK_ID", + /* 350 */ "user_name ::= NK_ID", + /* 351 */ "topic_name ::= NK_ID", + /* 352 */ "stream_name ::= NK_ID", + /* 353 */ "cgroup_name ::= NK_ID", + /* 354 */ "index_name ::= NK_ID", + /* 355 */ "expr_or_subquery ::= expression", + /* 356 */ "expression ::= literal", + /* 357 */ "expression ::= pseudo_column", + /* 358 */ "expression ::= column_reference", + /* 359 */ "expression ::= function_expression", + /* 360 */ "expression ::= case_when_expression", + /* 361 */ "expression ::= NK_LP expression NK_RP", + /* 362 */ "expression ::= NK_PLUS expr_or_subquery", + /* 363 */ "expression ::= NK_MINUS expr_or_subquery", + /* 364 */ "expression ::= expr_or_subquery NK_PLUS expr_or_subquery", + /* 365 */ "expression ::= expr_or_subquery NK_MINUS expr_or_subquery", + /* 366 */ "expression ::= expr_or_subquery NK_STAR expr_or_subquery", + /* 367 */ "expression ::= expr_or_subquery NK_SLASH expr_or_subquery", + /* 368 */ "expression ::= expr_or_subquery NK_REM expr_or_subquery", + /* 369 */ "expression ::= column_reference NK_ARROW NK_STRING", + /* 370 */ "expression ::= expr_or_subquery NK_BITAND expr_or_subquery", + /* 371 */ "expression ::= expr_or_subquery NK_BITOR expr_or_subquery", + /* 372 */ "expression_list ::= expr_or_subquery", + /* 373 */ "expression_list ::= expression_list NK_COMMA expr_or_subquery", + /* 374 */ "column_reference ::= column_name", + /* 375 */ "column_reference ::= table_name NK_DOT column_name", + /* 376 */ "pseudo_column ::= ROWTS", + /* 377 */ "pseudo_column ::= TBNAME", + /* 378 */ "pseudo_column ::= table_name NK_DOT TBNAME", + /* 379 */ "pseudo_column ::= QSTART", + /* 380 */ "pseudo_column ::= QEND", + /* 381 */ "pseudo_column ::= QDURATION", + /* 382 */ "pseudo_column ::= WSTART", + /* 383 */ "pseudo_column ::= WEND", + /* 384 */ "pseudo_column ::= WDURATION", + /* 385 */ "pseudo_column ::= IROWTS", + /* 386 */ "pseudo_column ::= QTAGS", + /* 387 */ "function_expression ::= function_name NK_LP expression_list NK_RP", + /* 388 */ "function_expression ::= star_func NK_LP star_func_para_list NK_RP", + /* 389 */ "function_expression ::= CAST NK_LP expr_or_subquery AS type_name NK_RP", + /* 390 */ "function_expression ::= literal_func", + /* 391 */ "literal_func ::= noarg_func NK_LP NK_RP", + /* 392 */ "literal_func ::= NOW", + /* 393 */ "noarg_func ::= NOW", + /* 394 */ "noarg_func ::= TODAY", + /* 395 */ "noarg_func ::= TIMEZONE", + /* 396 */ "noarg_func ::= DATABASE", + /* 397 */ "noarg_func ::= CLIENT_VERSION", + /* 398 */ "noarg_func ::= SERVER_VERSION", + /* 399 */ "noarg_func ::= SERVER_STATUS", + /* 400 */ "noarg_func ::= CURRENT_USER", + /* 401 */ "noarg_func ::= USER", + /* 402 */ "star_func ::= COUNT", + /* 403 */ "star_func ::= FIRST", + /* 404 */ "star_func ::= LAST", + /* 405 */ "star_func ::= LAST_ROW", + /* 406 */ "star_func_para_list ::= NK_STAR", + /* 407 */ "star_func_para_list ::= other_para_list", + /* 408 */ "other_para_list ::= star_func_para", + /* 409 */ "other_para_list ::= other_para_list NK_COMMA star_func_para", + /* 410 */ "star_func_para ::= expr_or_subquery", + /* 411 */ "star_func_para ::= table_name NK_DOT NK_STAR", + /* 412 */ "case_when_expression ::= CASE when_then_list case_when_else_opt END", + /* 413 */ "case_when_expression ::= CASE common_expression when_then_list case_when_else_opt END", + /* 414 */ "when_then_list ::= when_then_expr", + /* 415 */ "when_then_list ::= when_then_list when_then_expr", + /* 416 */ "when_then_expr ::= WHEN common_expression THEN common_expression", + /* 417 */ "case_when_else_opt ::=", + /* 418 */ "case_when_else_opt ::= ELSE common_expression", + /* 419 */ "predicate ::= expr_or_subquery compare_op expr_or_subquery", + /* 420 */ "predicate ::= expr_or_subquery BETWEEN expr_or_subquery AND expr_or_subquery", + /* 421 */ "predicate ::= expr_or_subquery NOT BETWEEN expr_or_subquery AND expr_or_subquery", + /* 422 */ "predicate ::= expr_or_subquery IS NULL", + /* 423 */ "predicate ::= expr_or_subquery IS NOT NULL", + /* 424 */ "predicate ::= expr_or_subquery in_op in_predicate_value", + /* 425 */ "compare_op ::= NK_LT", + /* 426 */ "compare_op ::= NK_GT", + /* 427 */ "compare_op ::= NK_LE", + /* 428 */ "compare_op ::= NK_GE", + /* 429 */ "compare_op ::= NK_NE", + /* 430 */ "compare_op ::= NK_EQ", + /* 431 */ "compare_op ::= LIKE", + /* 432 */ "compare_op ::= NOT LIKE", + /* 433 */ "compare_op ::= MATCH", + /* 434 */ "compare_op ::= NMATCH", + /* 435 */ "compare_op ::= CONTAINS", + /* 436 */ "in_op ::= IN", + /* 437 */ "in_op ::= NOT IN", + /* 438 */ "in_predicate_value ::= NK_LP literal_list NK_RP", + /* 439 */ "boolean_value_expression ::= boolean_primary", + /* 440 */ "boolean_value_expression ::= NOT boolean_primary", + /* 441 */ "boolean_value_expression ::= boolean_value_expression OR boolean_value_expression", + /* 442 */ "boolean_value_expression ::= boolean_value_expression AND boolean_value_expression", + /* 443 */ "boolean_primary ::= predicate", + /* 444 */ "boolean_primary ::= NK_LP boolean_value_expression NK_RP", + /* 445 */ "common_expression ::= expr_or_subquery", + /* 446 */ "common_expression ::= boolean_value_expression", + /* 447 */ "from_clause_opt ::=", + /* 448 */ "from_clause_opt ::= FROM table_reference_list", + /* 449 */ "table_reference_list ::= table_reference", + /* 450 */ "table_reference_list ::= table_reference_list NK_COMMA table_reference", + /* 451 */ "table_reference ::= table_primary", + /* 452 */ "table_reference ::= joined_table", + /* 453 */ "table_primary ::= table_name alias_opt", + /* 454 */ "table_primary ::= db_name NK_DOT table_name alias_opt", + /* 455 */ "table_primary ::= subquery alias_opt", + /* 456 */ "table_primary ::= parenthesized_joined_table", + /* 457 */ "alias_opt ::=", + /* 458 */ "alias_opt ::= table_alias", + /* 459 */ "alias_opt ::= AS table_alias", + /* 460 */ "parenthesized_joined_table ::= NK_LP joined_table NK_RP", + /* 461 */ "parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP", + /* 462 */ "joined_table ::= table_reference join_type JOIN table_reference ON search_condition", + /* 463 */ "join_type ::=", + /* 464 */ "join_type ::= INNER", + /* 465 */ "query_specification ::= SELECT set_quantifier_opt select_list from_clause_opt where_clause_opt partition_by_clause_opt range_opt every_opt fill_opt twindow_clause_opt group_by_clause_opt having_clause_opt", + /* 466 */ "set_quantifier_opt ::=", + /* 467 */ "set_quantifier_opt ::= DISTINCT", + /* 468 */ "set_quantifier_opt ::= ALL", + /* 469 */ "select_list ::= select_item", + /* 470 */ "select_list ::= select_list NK_COMMA select_item", + /* 471 */ "select_item ::= NK_STAR", + /* 472 */ "select_item ::= common_expression", + /* 473 */ "select_item ::= common_expression column_alias", + /* 474 */ "select_item ::= common_expression AS column_alias", + /* 475 */ "select_item ::= table_name NK_DOT NK_STAR", + /* 476 */ "where_clause_opt ::=", + /* 477 */ "where_clause_opt ::= WHERE search_condition", + /* 478 */ "partition_by_clause_opt ::=", + /* 479 */ "partition_by_clause_opt ::= PARTITION BY partition_list", + /* 480 */ "partition_list ::= partition_item", + /* 481 */ "partition_list ::= partition_list NK_COMMA partition_item", + /* 482 */ "partition_item ::= expr_or_subquery", + /* 483 */ "partition_item ::= expr_or_subquery column_alias", + /* 484 */ "partition_item ::= expr_or_subquery AS column_alias", + /* 485 */ "twindow_clause_opt ::=", + /* 486 */ "twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP", + /* 487 */ "twindow_clause_opt ::= STATE_WINDOW NK_LP expr_or_subquery NK_RP", + /* 488 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt", + /* 489 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt", + /* 490 */ "sliding_opt ::=", + /* 491 */ "sliding_opt ::= SLIDING NK_LP duration_literal NK_RP", + /* 492 */ "fill_opt ::=", + /* 493 */ "fill_opt ::= FILL NK_LP fill_mode NK_RP", + /* 494 */ "fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP", + /* 495 */ "fill_mode ::= NONE", + /* 496 */ "fill_mode ::= PREV", + /* 497 */ "fill_mode ::= NULL", + /* 498 */ "fill_mode ::= LINEAR", + /* 499 */ "fill_mode ::= NEXT", + /* 500 */ "group_by_clause_opt ::=", + /* 501 */ "group_by_clause_opt ::= GROUP BY group_by_list", + /* 502 */ "group_by_list ::= expr_or_subquery", + /* 503 */ "group_by_list ::= group_by_list NK_COMMA expr_or_subquery", + /* 504 */ "having_clause_opt ::=", + /* 505 */ "having_clause_opt ::= HAVING search_condition", + /* 506 */ "range_opt ::=", + /* 507 */ "range_opt ::= RANGE NK_LP expr_or_subquery NK_COMMA expr_or_subquery NK_RP", + /* 508 */ "every_opt ::=", + /* 509 */ "every_opt ::= EVERY NK_LP duration_literal NK_RP", + /* 510 */ "query_expression ::= query_simple order_by_clause_opt slimit_clause_opt limit_clause_opt", + /* 511 */ "query_simple ::= query_specification", + /* 512 */ "query_simple ::= union_query_expression", + /* 513 */ "union_query_expression ::= query_simple_or_subquery UNION ALL query_simple_or_subquery", + /* 514 */ "union_query_expression ::= query_simple_or_subquery UNION query_simple_or_subquery", + /* 515 */ "query_simple_or_subquery ::= query_simple", + /* 516 */ "query_simple_or_subquery ::= subquery", + /* 517 */ "query_or_subquery ::= query_expression", + /* 518 */ "query_or_subquery ::= subquery", + /* 519 */ "order_by_clause_opt ::=", + /* 520 */ "order_by_clause_opt ::= ORDER BY sort_specification_list", + /* 521 */ "slimit_clause_opt ::=", + /* 522 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER", + /* 523 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER", + /* 524 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER", + /* 525 */ "limit_clause_opt ::=", + /* 526 */ "limit_clause_opt ::= LIMIT NK_INTEGER", + /* 527 */ "limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER", + /* 528 */ "limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER", + /* 529 */ "subquery ::= NK_LP query_expression NK_RP", + /* 530 */ "subquery ::= NK_LP subquery NK_RP", + /* 531 */ "search_condition ::= common_expression", + /* 532 */ "sort_specification_list ::= sort_specification", + /* 533 */ "sort_specification_list ::= sort_specification_list NK_COMMA sort_specification", + /* 534 */ "sort_specification ::= expr_or_subquery ordering_specification_opt null_ordering_opt", + /* 535 */ "ordering_specification_opt ::=", + /* 536 */ "ordering_specification_opt ::= ASC", + /* 537 */ "ordering_specification_opt ::= DESC", + /* 538 */ "null_ordering_opt ::=", + /* 539 */ "null_ordering_opt ::= NULLS FIRST", + /* 540 */ "null_ordering_opt ::= NULLS LAST", }; #endif /* NDEBUG */ @@ -2523,63 +2534,64 @@ static void yy_destructor( case 375: /* table_name_cond */ case 376: /* from_db_opt */ case 378: /* tag_item */ - case 380: /* index_options */ - case 382: /* sliding_opt */ - case 383: /* sma_stream_opt */ - case 384: /* func */ - case 385: /* query_or_subquery */ - case 388: /* explain_options */ - case 392: /* stream_options */ - case 393: /* subtable_opt */ - case 394: /* expression */ - case 396: /* where_clause_opt */ - case 397: /* signed */ - case 398: /* literal_func */ - case 401: /* expr_or_subquery */ - case 402: /* pseudo_column */ - case 403: /* column_reference */ - case 404: /* function_expression */ - case 405: /* case_when_expression */ - case 410: /* star_func_para */ - case 412: /* case_when_else_opt */ - case 413: /* common_expression */ - case 414: /* when_then_expr */ - case 415: /* predicate */ - case 418: /* in_predicate_value */ - case 419: /* boolean_value_expression */ - case 420: /* boolean_primary */ - case 421: /* from_clause_opt */ - case 422: /* table_reference_list */ - case 423: /* table_reference */ - case 424: /* table_primary */ - case 425: /* joined_table */ - case 427: /* subquery */ - case 428: /* parenthesized_joined_table */ - case 430: /* search_condition */ - case 431: /* query_specification */ - case 435: /* range_opt */ - case 436: /* every_opt */ - case 437: /* fill_opt */ - case 438: /* twindow_clause_opt */ - case 440: /* having_clause_opt */ - case 441: /* select_item */ - case 443: /* partition_item */ - case 446: /* query_expression */ - case 447: /* query_simple */ - case 449: /* slimit_clause_opt */ - case 450: /* limit_clause_opt */ - case 451: /* union_query_expression */ - case 452: /* query_simple_or_subquery */ - case 454: /* sort_specification */ + case 380: /* full_index_name */ + case 381: /* index_options */ + case 384: /* sliding_opt */ + case 385: /* sma_stream_opt */ + case 386: /* func */ + case 387: /* query_or_subquery */ + case 390: /* explain_options */ + case 394: /* stream_options */ + case 395: /* subtable_opt */ + case 396: /* expression */ + case 398: /* where_clause_opt */ + case 399: /* signed */ + case 400: /* literal_func */ + case 403: /* expr_or_subquery */ + case 404: /* pseudo_column */ + case 405: /* column_reference */ + case 406: /* function_expression */ + case 407: /* case_when_expression */ + case 412: /* star_func_para */ + case 414: /* case_when_else_opt */ + case 415: /* common_expression */ + case 416: /* when_then_expr */ + case 417: /* predicate */ + case 420: /* in_predicate_value */ + case 421: /* boolean_value_expression */ + case 422: /* boolean_primary */ + case 423: /* from_clause_opt */ + case 424: /* table_reference_list */ + case 425: /* table_reference */ + case 426: /* table_primary */ + case 427: /* joined_table */ + case 429: /* subquery */ + case 430: /* parenthesized_joined_table */ + case 432: /* search_condition */ + case 433: /* query_specification */ + case 437: /* range_opt */ + case 438: /* every_opt */ + case 439: /* fill_opt */ + case 440: /* twindow_clause_opt */ + case 442: /* having_clause_opt */ + case 443: /* select_item */ + case 445: /* partition_item */ + case 448: /* query_expression */ + case 449: /* query_simple */ + case 451: /* slimit_clause_opt */ + case 452: /* limit_clause_opt */ + case 453: /* union_query_expression */ + case 454: /* query_simple_or_subquery */ + case 456: /* sort_specification */ { - nodesDestroyNode((yypminor->yy148)); + nodesDestroyNode((yypminor->yy74)); } break; case 323: /* account_options */ case 324: /* alter_account_options */ case 326: /* alter_account_option */ case 341: /* speed_opt */ - case 390: /* bufsize_opt */ + case 392: /* bufsize_opt */ { } @@ -2593,12 +2605,13 @@ static void yy_destructor( case 364: /* table_name */ case 371: /* function_name */ case 379: /* column_alias */ - case 386: /* cgroup_name */ - case 391: /* stream_name */ - case 400: /* table_alias */ - case 406: /* star_func */ - case 408: /* noarg_func */ - case 426: /* alias_opt */ + case 382: /* index_name */ + case 388: /* cgroup_name */ + case 393: /* stream_name */ + case 402: /* table_alias */ + case 408: /* star_func */ + case 410: /* noarg_func */ + case 428: /* alias_opt */ { } @@ -2618,9 +2631,9 @@ static void yy_destructor( case 336: /* force_opt */ case 337: /* not_exists_opt */ case 339: /* exists_opt */ - case 387: /* analyze_opt */ - case 389: /* agg_func_opt */ - case 432: /* set_quantifier_opt */ + case 389: /* analyze_opt */ + case 391: /* agg_func_opt */ + case 434: /* set_quantifier_opt */ { } @@ -2639,21 +2652,21 @@ static void yy_destructor( case 366: /* duration_list */ case 367: /* rollup_func_list */ case 377: /* tag_list_opt */ - case 381: /* func_list */ - case 395: /* dnode_list */ - case 399: /* literal_list */ - case 407: /* star_func_para_list */ - case 409: /* other_para_list */ - case 411: /* when_then_list */ - case 433: /* select_list */ - case 434: /* partition_by_clause_opt */ - case 439: /* group_by_clause_opt */ - case 442: /* partition_list */ - case 445: /* group_by_list */ - case 448: /* order_by_clause_opt */ - case 453: /* sort_specification_list */ + case 383: /* func_list */ + case 397: /* dnode_list */ + case 401: /* literal_list */ + case 409: /* star_func_para_list */ + case 411: /* other_para_list */ + case 413: /* when_then_list */ + case 435: /* select_list */ + case 436: /* partition_by_clause_opt */ + case 441: /* group_by_clause_opt */ + case 444: /* partition_list */ + case 447: /* group_by_list */ + case 450: /* order_by_clause_opt */ + case 455: /* sort_specification_list */ { - nodesDestroyList((yypminor->yy404)); + nodesDestroyList((yypminor->yy874)); } break; case 345: /* alter_db_option */ @@ -2667,28 +2680,28 @@ static void yy_destructor( } break; - case 416: /* compare_op */ - case 417: /* in_op */ + case 418: /* compare_op */ + case 419: /* in_op */ { } break; - case 429: /* join_type */ + case 431: /* join_type */ { } break; - case 444: /* fill_mode */ + case 446: /* fill_mode */ { } break; - case 455: /* ordering_specification_opt */ + case 457: /* ordering_specification_opt */ { } break; - case 456: /* null_ordering_opt */ + case 458: /* null_ordering_opt */ { } @@ -3247,284 +3260,287 @@ static const struct { { 378, -1 }, /* (257) tag_item ::= column_name */ { 378, -2 }, /* (258) tag_item ::= column_name column_alias */ { 378, -3 }, /* (259) tag_item ::= column_name AS column_alias */ - { 322, -8 }, /* (260) cmd ::= CREATE SMA INDEX not_exists_opt full_table_name ON full_table_name index_options */ - { 322, -4 }, /* (261) cmd ::= DROP INDEX exists_opt full_table_name */ - { 380, -10 }, /* (262) index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt sma_stream_opt */ - { 380, -12 }, /* (263) index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt sma_stream_opt */ - { 381, -1 }, /* (264) func_list ::= func */ - { 381, -3 }, /* (265) func_list ::= func_list NK_COMMA func */ - { 384, -4 }, /* (266) func ::= function_name NK_LP expression_list NK_RP */ - { 383, 0 }, /* (267) sma_stream_opt ::= */ - { 383, -3 }, /* (268) sma_stream_opt ::= sma_stream_opt WATERMARK duration_literal */ - { 383, -3 }, /* (269) sma_stream_opt ::= sma_stream_opt MAX_DELAY duration_literal */ - { 383, -3 }, /* (270) sma_stream_opt ::= sma_stream_opt DELETE_MARK duration_literal */ - { 322, -6 }, /* (271) cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_or_subquery */ - { 322, -7 }, /* (272) cmd ::= CREATE TOPIC not_exists_opt topic_name AS DATABASE db_name */ - { 322, -9 }, /* (273) cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS DATABASE db_name */ - { 322, -7 }, /* (274) cmd ::= CREATE TOPIC not_exists_opt topic_name AS STABLE full_table_name */ - { 322, -9 }, /* (275) cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS STABLE full_table_name */ - { 322, -4 }, /* (276) cmd ::= DROP TOPIC exists_opt topic_name */ - { 322, -7 }, /* (277) cmd ::= DROP CONSUMER GROUP exists_opt cgroup_name ON topic_name */ - { 322, -2 }, /* (278) cmd ::= DESC full_table_name */ - { 322, -2 }, /* (279) cmd ::= DESCRIBE full_table_name */ - { 322, -3 }, /* (280) cmd ::= RESET QUERY CACHE */ - { 322, -4 }, /* (281) cmd ::= EXPLAIN analyze_opt explain_options query_or_subquery */ - { 387, 0 }, /* (282) analyze_opt ::= */ - { 387, -1 }, /* (283) analyze_opt ::= ANALYZE */ - { 388, 0 }, /* (284) explain_options ::= */ - { 388, -3 }, /* (285) explain_options ::= explain_options VERBOSE NK_BOOL */ - { 388, -3 }, /* (286) explain_options ::= explain_options RATIO NK_FLOAT */ - { 322, -10 }, /* (287) cmd ::= CREATE agg_func_opt FUNCTION not_exists_opt function_name AS NK_STRING OUTPUTTYPE type_name bufsize_opt */ - { 322, -4 }, /* (288) cmd ::= DROP FUNCTION exists_opt function_name */ - { 389, 0 }, /* (289) agg_func_opt ::= */ - { 389, -1 }, /* (290) agg_func_opt ::= AGGREGATE */ - { 390, 0 }, /* (291) bufsize_opt ::= */ - { 390, -2 }, /* (292) bufsize_opt ::= BUFSIZE NK_INTEGER */ - { 322, -11 }, /* (293) cmd ::= CREATE STREAM not_exists_opt stream_name stream_options INTO full_table_name tags_def_opt subtable_opt AS query_or_subquery */ - { 322, -4 }, /* (294) cmd ::= DROP STREAM exists_opt stream_name */ - { 392, 0 }, /* (295) stream_options ::= */ - { 392, -3 }, /* (296) stream_options ::= stream_options TRIGGER AT_ONCE */ - { 392, -3 }, /* (297) stream_options ::= stream_options TRIGGER WINDOW_CLOSE */ - { 392, -4 }, /* (298) stream_options ::= stream_options TRIGGER MAX_DELAY duration_literal */ - { 392, -3 }, /* (299) stream_options ::= stream_options WATERMARK duration_literal */ - { 392, -4 }, /* (300) stream_options ::= stream_options IGNORE EXPIRED NK_INTEGER */ - { 392, -3 }, /* (301) stream_options ::= stream_options FILL_HISTORY NK_INTEGER */ - { 393, 0 }, /* (302) subtable_opt ::= */ - { 393, -4 }, /* (303) subtable_opt ::= SUBTABLE NK_LP expression NK_RP */ - { 322, -3 }, /* (304) cmd ::= KILL CONNECTION NK_INTEGER */ - { 322, -3 }, /* (305) cmd ::= KILL QUERY NK_STRING */ - { 322, -3 }, /* (306) cmd ::= KILL TRANSACTION NK_INTEGER */ - { 322, -2 }, /* (307) cmd ::= BALANCE VGROUP */ - { 322, -4 }, /* (308) cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER */ - { 322, -4 }, /* (309) cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list */ - { 322, -3 }, /* (310) cmd ::= SPLIT VGROUP NK_INTEGER */ - { 395, -2 }, /* (311) dnode_list ::= DNODE NK_INTEGER */ - { 395, -3 }, /* (312) dnode_list ::= dnode_list DNODE NK_INTEGER */ - { 322, -4 }, /* (313) cmd ::= DELETE FROM full_table_name where_clause_opt */ - { 322, -1 }, /* (314) cmd ::= query_or_subquery */ - { 322, -7 }, /* (315) cmd ::= INSERT INTO full_table_name NK_LP col_name_list NK_RP query_or_subquery */ - { 322, -4 }, /* (316) cmd ::= INSERT INTO full_table_name query_or_subquery */ - { 325, -1 }, /* (317) literal ::= NK_INTEGER */ - { 325, -1 }, /* (318) literal ::= NK_FLOAT */ - { 325, -1 }, /* (319) literal ::= NK_STRING */ - { 325, -1 }, /* (320) literal ::= NK_BOOL */ - { 325, -2 }, /* (321) literal ::= TIMESTAMP NK_STRING */ - { 325, -1 }, /* (322) literal ::= duration_literal */ - { 325, -1 }, /* (323) literal ::= NULL */ - { 325, -1 }, /* (324) literal ::= NK_QUESTION */ - { 369, -1 }, /* (325) duration_literal ::= NK_VARIABLE */ - { 397, -1 }, /* (326) signed ::= NK_INTEGER */ - { 397, -2 }, /* (327) signed ::= NK_PLUS NK_INTEGER */ - { 397, -2 }, /* (328) signed ::= NK_MINUS NK_INTEGER */ - { 397, -1 }, /* (329) signed ::= NK_FLOAT */ - { 397, -2 }, /* (330) signed ::= NK_PLUS NK_FLOAT */ - { 397, -2 }, /* (331) signed ::= NK_MINUS NK_FLOAT */ - { 358, -1 }, /* (332) signed_literal ::= signed */ - { 358, -1 }, /* (333) signed_literal ::= NK_STRING */ - { 358, -1 }, /* (334) signed_literal ::= NK_BOOL */ - { 358, -2 }, /* (335) signed_literal ::= TIMESTAMP NK_STRING */ - { 358, -1 }, /* (336) signed_literal ::= duration_literal */ - { 358, -1 }, /* (337) signed_literal ::= NULL */ - { 358, -1 }, /* (338) signed_literal ::= literal_func */ - { 358, -1 }, /* (339) signed_literal ::= NK_QUESTION */ - { 399, -1 }, /* (340) literal_list ::= signed_literal */ - { 399, -3 }, /* (341) literal_list ::= literal_list NK_COMMA signed_literal */ - { 333, -1 }, /* (342) db_name ::= NK_ID */ - { 364, -1 }, /* (343) table_name ::= NK_ID */ - { 356, -1 }, /* (344) column_name ::= NK_ID */ - { 371, -1 }, /* (345) function_name ::= NK_ID */ - { 400, -1 }, /* (346) table_alias ::= NK_ID */ - { 379, -1 }, /* (347) column_alias ::= NK_ID */ - { 327, -1 }, /* (348) user_name ::= NK_ID */ - { 334, -1 }, /* (349) topic_name ::= NK_ID */ - { 391, -1 }, /* (350) stream_name ::= NK_ID */ - { 386, -1 }, /* (351) cgroup_name ::= NK_ID */ - { 401, -1 }, /* (352) expr_or_subquery ::= expression */ - { 394, -1 }, /* (353) expression ::= literal */ - { 394, -1 }, /* (354) expression ::= pseudo_column */ - { 394, -1 }, /* (355) expression ::= column_reference */ - { 394, -1 }, /* (356) expression ::= function_expression */ - { 394, -1 }, /* (357) expression ::= case_when_expression */ - { 394, -3 }, /* (358) expression ::= NK_LP expression NK_RP */ - { 394, -2 }, /* (359) expression ::= NK_PLUS expr_or_subquery */ - { 394, -2 }, /* (360) expression ::= NK_MINUS expr_or_subquery */ - { 394, -3 }, /* (361) expression ::= expr_or_subquery NK_PLUS expr_or_subquery */ - { 394, -3 }, /* (362) expression ::= expr_or_subquery NK_MINUS expr_or_subquery */ - { 394, -3 }, /* (363) expression ::= expr_or_subquery NK_STAR expr_or_subquery */ - { 394, -3 }, /* (364) expression ::= expr_or_subquery NK_SLASH expr_or_subquery */ - { 394, -3 }, /* (365) expression ::= expr_or_subquery NK_REM expr_or_subquery */ - { 394, -3 }, /* (366) expression ::= column_reference NK_ARROW NK_STRING */ - { 394, -3 }, /* (367) expression ::= expr_or_subquery NK_BITAND expr_or_subquery */ - { 394, -3 }, /* (368) expression ::= expr_or_subquery NK_BITOR expr_or_subquery */ - { 361, -1 }, /* (369) expression_list ::= expr_or_subquery */ - { 361, -3 }, /* (370) expression_list ::= expression_list NK_COMMA expr_or_subquery */ - { 403, -1 }, /* (371) column_reference ::= column_name */ - { 403, -3 }, /* (372) column_reference ::= table_name NK_DOT column_name */ - { 402, -1 }, /* (373) pseudo_column ::= ROWTS */ - { 402, -1 }, /* (374) pseudo_column ::= TBNAME */ - { 402, -3 }, /* (375) pseudo_column ::= table_name NK_DOT TBNAME */ - { 402, -1 }, /* (376) pseudo_column ::= QSTART */ - { 402, -1 }, /* (377) pseudo_column ::= QEND */ - { 402, -1 }, /* (378) pseudo_column ::= QDURATION */ - { 402, -1 }, /* (379) pseudo_column ::= WSTART */ - { 402, -1 }, /* (380) pseudo_column ::= WEND */ - { 402, -1 }, /* (381) pseudo_column ::= WDURATION */ - { 402, -1 }, /* (382) pseudo_column ::= IROWTS */ - { 402, -1 }, /* (383) pseudo_column ::= QTAGS */ - { 404, -4 }, /* (384) function_expression ::= function_name NK_LP expression_list NK_RP */ - { 404, -4 }, /* (385) function_expression ::= star_func NK_LP star_func_para_list NK_RP */ - { 404, -6 }, /* (386) function_expression ::= CAST NK_LP expr_or_subquery AS type_name NK_RP */ - { 404, -1 }, /* (387) function_expression ::= literal_func */ - { 398, -3 }, /* (388) literal_func ::= noarg_func NK_LP NK_RP */ - { 398, -1 }, /* (389) literal_func ::= NOW */ - { 408, -1 }, /* (390) noarg_func ::= NOW */ - { 408, -1 }, /* (391) noarg_func ::= TODAY */ - { 408, -1 }, /* (392) noarg_func ::= TIMEZONE */ - { 408, -1 }, /* (393) noarg_func ::= DATABASE */ - { 408, -1 }, /* (394) noarg_func ::= CLIENT_VERSION */ - { 408, -1 }, /* (395) noarg_func ::= SERVER_VERSION */ - { 408, -1 }, /* (396) noarg_func ::= SERVER_STATUS */ - { 408, -1 }, /* (397) noarg_func ::= CURRENT_USER */ - { 408, -1 }, /* (398) noarg_func ::= USER */ - { 406, -1 }, /* (399) star_func ::= COUNT */ - { 406, -1 }, /* (400) star_func ::= FIRST */ - { 406, -1 }, /* (401) star_func ::= LAST */ - { 406, -1 }, /* (402) star_func ::= LAST_ROW */ - { 407, -1 }, /* (403) star_func_para_list ::= NK_STAR */ - { 407, -1 }, /* (404) star_func_para_list ::= other_para_list */ - { 409, -1 }, /* (405) other_para_list ::= star_func_para */ - { 409, -3 }, /* (406) other_para_list ::= other_para_list NK_COMMA star_func_para */ - { 410, -1 }, /* (407) star_func_para ::= expr_or_subquery */ - { 410, -3 }, /* (408) star_func_para ::= table_name NK_DOT NK_STAR */ - { 405, -4 }, /* (409) case_when_expression ::= CASE when_then_list case_when_else_opt END */ - { 405, -5 }, /* (410) case_when_expression ::= CASE common_expression when_then_list case_when_else_opt END */ - { 411, -1 }, /* (411) when_then_list ::= when_then_expr */ - { 411, -2 }, /* (412) when_then_list ::= when_then_list when_then_expr */ - { 414, -4 }, /* (413) when_then_expr ::= WHEN common_expression THEN common_expression */ - { 412, 0 }, /* (414) case_when_else_opt ::= */ - { 412, -2 }, /* (415) case_when_else_opt ::= ELSE common_expression */ - { 415, -3 }, /* (416) predicate ::= expr_or_subquery compare_op expr_or_subquery */ - { 415, -5 }, /* (417) predicate ::= expr_or_subquery BETWEEN expr_or_subquery AND expr_or_subquery */ - { 415, -6 }, /* (418) predicate ::= expr_or_subquery NOT BETWEEN expr_or_subquery AND expr_or_subquery */ - { 415, -3 }, /* (419) predicate ::= expr_or_subquery IS NULL */ - { 415, -4 }, /* (420) predicate ::= expr_or_subquery IS NOT NULL */ - { 415, -3 }, /* (421) predicate ::= expr_or_subquery in_op in_predicate_value */ - { 416, -1 }, /* (422) compare_op ::= NK_LT */ - { 416, -1 }, /* (423) compare_op ::= NK_GT */ - { 416, -1 }, /* (424) compare_op ::= NK_LE */ - { 416, -1 }, /* (425) compare_op ::= NK_GE */ - { 416, -1 }, /* (426) compare_op ::= NK_NE */ - { 416, -1 }, /* (427) compare_op ::= NK_EQ */ - { 416, -1 }, /* (428) compare_op ::= LIKE */ - { 416, -2 }, /* (429) compare_op ::= NOT LIKE */ - { 416, -1 }, /* (430) compare_op ::= MATCH */ - { 416, -1 }, /* (431) compare_op ::= NMATCH */ - { 416, -1 }, /* (432) compare_op ::= CONTAINS */ - { 417, -1 }, /* (433) in_op ::= IN */ - { 417, -2 }, /* (434) in_op ::= NOT IN */ - { 418, -3 }, /* (435) in_predicate_value ::= NK_LP literal_list NK_RP */ - { 419, -1 }, /* (436) boolean_value_expression ::= boolean_primary */ - { 419, -2 }, /* (437) boolean_value_expression ::= NOT boolean_primary */ - { 419, -3 }, /* (438) boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */ - { 419, -3 }, /* (439) boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */ - { 420, -1 }, /* (440) boolean_primary ::= predicate */ - { 420, -3 }, /* (441) boolean_primary ::= NK_LP boolean_value_expression NK_RP */ - { 413, -1 }, /* (442) common_expression ::= expr_or_subquery */ - { 413, -1 }, /* (443) common_expression ::= boolean_value_expression */ - { 421, 0 }, /* (444) from_clause_opt ::= */ - { 421, -2 }, /* (445) from_clause_opt ::= FROM table_reference_list */ - { 422, -1 }, /* (446) table_reference_list ::= table_reference */ - { 422, -3 }, /* (447) table_reference_list ::= table_reference_list NK_COMMA table_reference */ - { 423, -1 }, /* (448) table_reference ::= table_primary */ - { 423, -1 }, /* (449) table_reference ::= joined_table */ - { 424, -2 }, /* (450) table_primary ::= table_name alias_opt */ - { 424, -4 }, /* (451) table_primary ::= db_name NK_DOT table_name alias_opt */ - { 424, -2 }, /* (452) table_primary ::= subquery alias_opt */ - { 424, -1 }, /* (453) table_primary ::= parenthesized_joined_table */ - { 426, 0 }, /* (454) alias_opt ::= */ - { 426, -1 }, /* (455) alias_opt ::= table_alias */ - { 426, -2 }, /* (456) alias_opt ::= AS table_alias */ - { 428, -3 }, /* (457) parenthesized_joined_table ::= NK_LP joined_table NK_RP */ - { 428, -3 }, /* (458) parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */ - { 425, -6 }, /* (459) joined_table ::= table_reference join_type JOIN table_reference ON search_condition */ - { 429, 0 }, /* (460) join_type ::= */ - { 429, -1 }, /* (461) join_type ::= INNER */ - { 431, -12 }, /* (462) query_specification ::= SELECT set_quantifier_opt select_list from_clause_opt where_clause_opt partition_by_clause_opt range_opt every_opt fill_opt twindow_clause_opt group_by_clause_opt having_clause_opt */ - { 432, 0 }, /* (463) set_quantifier_opt ::= */ - { 432, -1 }, /* (464) set_quantifier_opt ::= DISTINCT */ - { 432, -1 }, /* (465) set_quantifier_opt ::= ALL */ - { 433, -1 }, /* (466) select_list ::= select_item */ - { 433, -3 }, /* (467) select_list ::= select_list NK_COMMA select_item */ - { 441, -1 }, /* (468) select_item ::= NK_STAR */ - { 441, -1 }, /* (469) select_item ::= common_expression */ - { 441, -2 }, /* (470) select_item ::= common_expression column_alias */ - { 441, -3 }, /* (471) select_item ::= common_expression AS column_alias */ - { 441, -3 }, /* (472) select_item ::= table_name NK_DOT NK_STAR */ - { 396, 0 }, /* (473) where_clause_opt ::= */ - { 396, -2 }, /* (474) where_clause_opt ::= WHERE search_condition */ - { 434, 0 }, /* (475) partition_by_clause_opt ::= */ - { 434, -3 }, /* (476) partition_by_clause_opt ::= PARTITION BY partition_list */ - { 442, -1 }, /* (477) partition_list ::= partition_item */ - { 442, -3 }, /* (478) partition_list ::= partition_list NK_COMMA partition_item */ - { 443, -1 }, /* (479) partition_item ::= expr_or_subquery */ - { 443, -2 }, /* (480) partition_item ::= expr_or_subquery column_alias */ - { 443, -3 }, /* (481) partition_item ::= expr_or_subquery AS column_alias */ - { 438, 0 }, /* (482) twindow_clause_opt ::= */ - { 438, -6 }, /* (483) twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP */ - { 438, -4 }, /* (484) twindow_clause_opt ::= STATE_WINDOW NK_LP expr_or_subquery NK_RP */ - { 438, -6 }, /* (485) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */ - { 438, -8 }, /* (486) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */ - { 382, 0 }, /* (487) sliding_opt ::= */ - { 382, -4 }, /* (488) sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */ - { 437, 0 }, /* (489) fill_opt ::= */ - { 437, -4 }, /* (490) fill_opt ::= FILL NK_LP fill_mode NK_RP */ - { 437, -6 }, /* (491) fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */ - { 444, -1 }, /* (492) fill_mode ::= NONE */ - { 444, -1 }, /* (493) fill_mode ::= PREV */ - { 444, -1 }, /* (494) fill_mode ::= NULL */ - { 444, -1 }, /* (495) fill_mode ::= LINEAR */ - { 444, -1 }, /* (496) fill_mode ::= NEXT */ - { 439, 0 }, /* (497) group_by_clause_opt ::= */ - { 439, -3 }, /* (498) group_by_clause_opt ::= GROUP BY group_by_list */ - { 445, -1 }, /* (499) group_by_list ::= expr_or_subquery */ - { 445, -3 }, /* (500) group_by_list ::= group_by_list NK_COMMA expr_or_subquery */ - { 440, 0 }, /* (501) having_clause_opt ::= */ - { 440, -2 }, /* (502) having_clause_opt ::= HAVING search_condition */ - { 435, 0 }, /* (503) range_opt ::= */ - { 435, -6 }, /* (504) range_opt ::= RANGE NK_LP expr_or_subquery NK_COMMA expr_or_subquery NK_RP */ - { 436, 0 }, /* (505) every_opt ::= */ - { 436, -4 }, /* (506) every_opt ::= EVERY NK_LP duration_literal NK_RP */ - { 446, -4 }, /* (507) query_expression ::= query_simple order_by_clause_opt slimit_clause_opt limit_clause_opt */ - { 447, -1 }, /* (508) query_simple ::= query_specification */ - { 447, -1 }, /* (509) query_simple ::= union_query_expression */ - { 451, -4 }, /* (510) union_query_expression ::= query_simple_or_subquery UNION ALL query_simple_or_subquery */ - { 451, -3 }, /* (511) union_query_expression ::= query_simple_or_subquery UNION query_simple_or_subquery */ - { 452, -1 }, /* (512) query_simple_or_subquery ::= query_simple */ - { 452, -1 }, /* (513) query_simple_or_subquery ::= subquery */ - { 385, -1 }, /* (514) query_or_subquery ::= query_expression */ - { 385, -1 }, /* (515) query_or_subquery ::= subquery */ - { 448, 0 }, /* (516) order_by_clause_opt ::= */ - { 448, -3 }, /* (517) order_by_clause_opt ::= ORDER BY sort_specification_list */ - { 449, 0 }, /* (518) slimit_clause_opt ::= */ - { 449, -2 }, /* (519) slimit_clause_opt ::= SLIMIT NK_INTEGER */ - { 449, -4 }, /* (520) slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */ - { 449, -4 }, /* (521) slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */ - { 450, 0 }, /* (522) limit_clause_opt ::= */ - { 450, -2 }, /* (523) limit_clause_opt ::= LIMIT NK_INTEGER */ - { 450, -4 }, /* (524) limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */ - { 450, -4 }, /* (525) limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */ - { 427, -3 }, /* (526) subquery ::= NK_LP query_expression NK_RP */ - { 427, -3 }, /* (527) subquery ::= NK_LP subquery NK_RP */ - { 430, -1 }, /* (528) search_condition ::= common_expression */ - { 453, -1 }, /* (529) sort_specification_list ::= sort_specification */ - { 453, -3 }, /* (530) sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */ - { 454, -3 }, /* (531) sort_specification ::= expr_or_subquery ordering_specification_opt null_ordering_opt */ - { 455, 0 }, /* (532) ordering_specification_opt ::= */ - { 455, -1 }, /* (533) ordering_specification_opt ::= ASC */ - { 455, -1 }, /* (534) ordering_specification_opt ::= DESC */ - { 456, 0 }, /* (535) null_ordering_opt ::= */ - { 456, -2 }, /* (536) null_ordering_opt ::= NULLS FIRST */ - { 456, -2 }, /* (537) null_ordering_opt ::= NULLS LAST */ + { 322, -8 }, /* (260) cmd ::= CREATE SMA INDEX not_exists_opt full_index_name ON full_table_name index_options */ + { 322, -4 }, /* (261) cmd ::= DROP INDEX exists_opt full_index_name */ + { 380, -1 }, /* (262) full_index_name ::= index_name */ + { 380, -3 }, /* (263) full_index_name ::= db_name NK_DOT index_name */ + { 381, -10 }, /* (264) index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt sma_stream_opt */ + { 381, -12 }, /* (265) index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt sma_stream_opt */ + { 383, -1 }, /* (266) func_list ::= func */ + { 383, -3 }, /* (267) func_list ::= func_list NK_COMMA func */ + { 386, -4 }, /* (268) func ::= function_name NK_LP expression_list NK_RP */ + { 385, 0 }, /* (269) sma_stream_opt ::= */ + { 385, -3 }, /* (270) sma_stream_opt ::= sma_stream_opt WATERMARK duration_literal */ + { 385, -3 }, /* (271) sma_stream_opt ::= sma_stream_opt MAX_DELAY duration_literal */ + { 385, -3 }, /* (272) sma_stream_opt ::= sma_stream_opt DELETE_MARK duration_literal */ + { 322, -6 }, /* (273) cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_or_subquery */ + { 322, -7 }, /* (274) cmd ::= CREATE TOPIC not_exists_opt topic_name AS DATABASE db_name */ + { 322, -9 }, /* (275) cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS DATABASE db_name */ + { 322, -7 }, /* (276) cmd ::= CREATE TOPIC not_exists_opt topic_name AS STABLE full_table_name */ + { 322, -9 }, /* (277) cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS STABLE full_table_name */ + { 322, -4 }, /* (278) cmd ::= DROP TOPIC exists_opt topic_name */ + { 322, -7 }, /* (279) cmd ::= DROP CONSUMER GROUP exists_opt cgroup_name ON topic_name */ + { 322, -2 }, /* (280) cmd ::= DESC full_table_name */ + { 322, -2 }, /* (281) cmd ::= DESCRIBE full_table_name */ + { 322, -3 }, /* (282) cmd ::= RESET QUERY CACHE */ + { 322, -4 }, /* (283) cmd ::= EXPLAIN analyze_opt explain_options query_or_subquery */ + { 389, 0 }, /* (284) analyze_opt ::= */ + { 389, -1 }, /* (285) analyze_opt ::= ANALYZE */ + { 390, 0 }, /* (286) explain_options ::= */ + { 390, -3 }, /* (287) explain_options ::= explain_options VERBOSE NK_BOOL */ + { 390, -3 }, /* (288) explain_options ::= explain_options RATIO NK_FLOAT */ + { 322, -10 }, /* (289) cmd ::= CREATE agg_func_opt FUNCTION not_exists_opt function_name AS NK_STRING OUTPUTTYPE type_name bufsize_opt */ + { 322, -4 }, /* (290) cmd ::= DROP FUNCTION exists_opt function_name */ + { 391, 0 }, /* (291) agg_func_opt ::= */ + { 391, -1 }, /* (292) agg_func_opt ::= AGGREGATE */ + { 392, 0 }, /* (293) bufsize_opt ::= */ + { 392, -2 }, /* (294) bufsize_opt ::= BUFSIZE NK_INTEGER */ + { 322, -11 }, /* (295) cmd ::= CREATE STREAM not_exists_opt stream_name stream_options INTO full_table_name tags_def_opt subtable_opt AS query_or_subquery */ + { 322, -4 }, /* (296) cmd ::= DROP STREAM exists_opt stream_name */ + { 394, 0 }, /* (297) stream_options ::= */ + { 394, -3 }, /* (298) stream_options ::= stream_options TRIGGER AT_ONCE */ + { 394, -3 }, /* (299) stream_options ::= stream_options TRIGGER WINDOW_CLOSE */ + { 394, -4 }, /* (300) stream_options ::= stream_options TRIGGER MAX_DELAY duration_literal */ + { 394, -3 }, /* (301) stream_options ::= stream_options WATERMARK duration_literal */ + { 394, -4 }, /* (302) stream_options ::= stream_options IGNORE EXPIRED NK_INTEGER */ + { 394, -3 }, /* (303) stream_options ::= stream_options FILL_HISTORY NK_INTEGER */ + { 395, 0 }, /* (304) subtable_opt ::= */ + { 395, -4 }, /* (305) subtable_opt ::= SUBTABLE NK_LP expression NK_RP */ + { 322, -3 }, /* (306) cmd ::= KILL CONNECTION NK_INTEGER */ + { 322, -3 }, /* (307) cmd ::= KILL QUERY NK_STRING */ + { 322, -3 }, /* (308) cmd ::= KILL TRANSACTION NK_INTEGER */ + { 322, -2 }, /* (309) cmd ::= BALANCE VGROUP */ + { 322, -4 }, /* (310) cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER */ + { 322, -4 }, /* (311) cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list */ + { 322, -3 }, /* (312) cmd ::= SPLIT VGROUP NK_INTEGER */ + { 397, -2 }, /* (313) dnode_list ::= DNODE NK_INTEGER */ + { 397, -3 }, /* (314) dnode_list ::= dnode_list DNODE NK_INTEGER */ + { 322, -4 }, /* (315) cmd ::= DELETE FROM full_table_name where_clause_opt */ + { 322, -1 }, /* (316) cmd ::= query_or_subquery */ + { 322, -7 }, /* (317) cmd ::= INSERT INTO full_table_name NK_LP col_name_list NK_RP query_or_subquery */ + { 322, -4 }, /* (318) cmd ::= INSERT INTO full_table_name query_or_subquery */ + { 325, -1 }, /* (319) literal ::= NK_INTEGER */ + { 325, -1 }, /* (320) literal ::= NK_FLOAT */ + { 325, -1 }, /* (321) literal ::= NK_STRING */ + { 325, -1 }, /* (322) literal ::= NK_BOOL */ + { 325, -2 }, /* (323) literal ::= TIMESTAMP NK_STRING */ + { 325, -1 }, /* (324) literal ::= duration_literal */ + { 325, -1 }, /* (325) literal ::= NULL */ + { 325, -1 }, /* (326) literal ::= NK_QUESTION */ + { 369, -1 }, /* (327) duration_literal ::= NK_VARIABLE */ + { 399, -1 }, /* (328) signed ::= NK_INTEGER */ + { 399, -2 }, /* (329) signed ::= NK_PLUS NK_INTEGER */ + { 399, -2 }, /* (330) signed ::= NK_MINUS NK_INTEGER */ + { 399, -1 }, /* (331) signed ::= NK_FLOAT */ + { 399, -2 }, /* (332) signed ::= NK_PLUS NK_FLOAT */ + { 399, -2 }, /* (333) signed ::= NK_MINUS NK_FLOAT */ + { 358, -1 }, /* (334) signed_literal ::= signed */ + { 358, -1 }, /* (335) signed_literal ::= NK_STRING */ + { 358, -1 }, /* (336) signed_literal ::= NK_BOOL */ + { 358, -2 }, /* (337) signed_literal ::= TIMESTAMP NK_STRING */ + { 358, -1 }, /* (338) signed_literal ::= duration_literal */ + { 358, -1 }, /* (339) signed_literal ::= NULL */ + { 358, -1 }, /* (340) signed_literal ::= literal_func */ + { 358, -1 }, /* (341) signed_literal ::= NK_QUESTION */ + { 401, -1 }, /* (342) literal_list ::= signed_literal */ + { 401, -3 }, /* (343) literal_list ::= literal_list NK_COMMA signed_literal */ + { 333, -1 }, /* (344) db_name ::= NK_ID */ + { 364, -1 }, /* (345) table_name ::= NK_ID */ + { 356, -1 }, /* (346) column_name ::= NK_ID */ + { 371, -1 }, /* (347) function_name ::= NK_ID */ + { 402, -1 }, /* (348) table_alias ::= NK_ID */ + { 379, -1 }, /* (349) column_alias ::= NK_ID */ + { 327, -1 }, /* (350) user_name ::= NK_ID */ + { 334, -1 }, /* (351) topic_name ::= NK_ID */ + { 393, -1 }, /* (352) stream_name ::= NK_ID */ + { 388, -1 }, /* (353) cgroup_name ::= NK_ID */ + { 382, -1 }, /* (354) index_name ::= NK_ID */ + { 403, -1 }, /* (355) expr_or_subquery ::= expression */ + { 396, -1 }, /* (356) expression ::= literal */ + { 396, -1 }, /* (357) expression ::= pseudo_column */ + { 396, -1 }, /* (358) expression ::= column_reference */ + { 396, -1 }, /* (359) expression ::= function_expression */ + { 396, -1 }, /* (360) expression ::= case_when_expression */ + { 396, -3 }, /* (361) expression ::= NK_LP expression NK_RP */ + { 396, -2 }, /* (362) expression ::= NK_PLUS expr_or_subquery */ + { 396, -2 }, /* (363) expression ::= NK_MINUS expr_or_subquery */ + { 396, -3 }, /* (364) expression ::= expr_or_subquery NK_PLUS expr_or_subquery */ + { 396, -3 }, /* (365) expression ::= expr_or_subquery NK_MINUS expr_or_subquery */ + { 396, -3 }, /* (366) expression ::= expr_or_subquery NK_STAR expr_or_subquery */ + { 396, -3 }, /* (367) expression ::= expr_or_subquery NK_SLASH expr_or_subquery */ + { 396, -3 }, /* (368) expression ::= expr_or_subquery NK_REM expr_or_subquery */ + { 396, -3 }, /* (369) expression ::= column_reference NK_ARROW NK_STRING */ + { 396, -3 }, /* (370) expression ::= expr_or_subquery NK_BITAND expr_or_subquery */ + { 396, -3 }, /* (371) expression ::= expr_or_subquery NK_BITOR expr_or_subquery */ + { 361, -1 }, /* (372) expression_list ::= expr_or_subquery */ + { 361, -3 }, /* (373) expression_list ::= expression_list NK_COMMA expr_or_subquery */ + { 405, -1 }, /* (374) column_reference ::= column_name */ + { 405, -3 }, /* (375) column_reference ::= table_name NK_DOT column_name */ + { 404, -1 }, /* (376) pseudo_column ::= ROWTS */ + { 404, -1 }, /* (377) pseudo_column ::= TBNAME */ + { 404, -3 }, /* (378) pseudo_column ::= table_name NK_DOT TBNAME */ + { 404, -1 }, /* (379) pseudo_column ::= QSTART */ + { 404, -1 }, /* (380) pseudo_column ::= QEND */ + { 404, -1 }, /* (381) pseudo_column ::= QDURATION */ + { 404, -1 }, /* (382) pseudo_column ::= WSTART */ + { 404, -1 }, /* (383) pseudo_column ::= WEND */ + { 404, -1 }, /* (384) pseudo_column ::= WDURATION */ + { 404, -1 }, /* (385) pseudo_column ::= IROWTS */ + { 404, -1 }, /* (386) pseudo_column ::= QTAGS */ + { 406, -4 }, /* (387) function_expression ::= function_name NK_LP expression_list NK_RP */ + { 406, -4 }, /* (388) function_expression ::= star_func NK_LP star_func_para_list NK_RP */ + { 406, -6 }, /* (389) function_expression ::= CAST NK_LP expr_or_subquery AS type_name NK_RP */ + { 406, -1 }, /* (390) function_expression ::= literal_func */ + { 400, -3 }, /* (391) literal_func ::= noarg_func NK_LP NK_RP */ + { 400, -1 }, /* (392) literal_func ::= NOW */ + { 410, -1 }, /* (393) noarg_func ::= NOW */ + { 410, -1 }, /* (394) noarg_func ::= TODAY */ + { 410, -1 }, /* (395) noarg_func ::= TIMEZONE */ + { 410, -1 }, /* (396) noarg_func ::= DATABASE */ + { 410, -1 }, /* (397) noarg_func ::= CLIENT_VERSION */ + { 410, -1 }, /* (398) noarg_func ::= SERVER_VERSION */ + { 410, -1 }, /* (399) noarg_func ::= SERVER_STATUS */ + { 410, -1 }, /* (400) noarg_func ::= CURRENT_USER */ + { 410, -1 }, /* (401) noarg_func ::= USER */ + { 408, -1 }, /* (402) star_func ::= COUNT */ + { 408, -1 }, /* (403) star_func ::= FIRST */ + { 408, -1 }, /* (404) star_func ::= LAST */ + { 408, -1 }, /* (405) star_func ::= LAST_ROW */ + { 409, -1 }, /* (406) star_func_para_list ::= NK_STAR */ + { 409, -1 }, /* (407) star_func_para_list ::= other_para_list */ + { 411, -1 }, /* (408) other_para_list ::= star_func_para */ + { 411, -3 }, /* (409) other_para_list ::= other_para_list NK_COMMA star_func_para */ + { 412, -1 }, /* (410) star_func_para ::= expr_or_subquery */ + { 412, -3 }, /* (411) star_func_para ::= table_name NK_DOT NK_STAR */ + { 407, -4 }, /* (412) case_when_expression ::= CASE when_then_list case_when_else_opt END */ + { 407, -5 }, /* (413) case_when_expression ::= CASE common_expression when_then_list case_when_else_opt END */ + { 413, -1 }, /* (414) when_then_list ::= when_then_expr */ + { 413, -2 }, /* (415) when_then_list ::= when_then_list when_then_expr */ + { 416, -4 }, /* (416) when_then_expr ::= WHEN common_expression THEN common_expression */ + { 414, 0 }, /* (417) case_when_else_opt ::= */ + { 414, -2 }, /* (418) case_when_else_opt ::= ELSE common_expression */ + { 417, -3 }, /* (419) predicate ::= expr_or_subquery compare_op expr_or_subquery */ + { 417, -5 }, /* (420) predicate ::= expr_or_subquery BETWEEN expr_or_subquery AND expr_or_subquery */ + { 417, -6 }, /* (421) predicate ::= expr_or_subquery NOT BETWEEN expr_or_subquery AND expr_or_subquery */ + { 417, -3 }, /* (422) predicate ::= expr_or_subquery IS NULL */ + { 417, -4 }, /* (423) predicate ::= expr_or_subquery IS NOT NULL */ + { 417, -3 }, /* (424) predicate ::= expr_or_subquery in_op in_predicate_value */ + { 418, -1 }, /* (425) compare_op ::= NK_LT */ + { 418, -1 }, /* (426) compare_op ::= NK_GT */ + { 418, -1 }, /* (427) compare_op ::= NK_LE */ + { 418, -1 }, /* (428) compare_op ::= NK_GE */ + { 418, -1 }, /* (429) compare_op ::= NK_NE */ + { 418, -1 }, /* (430) compare_op ::= NK_EQ */ + { 418, -1 }, /* (431) compare_op ::= LIKE */ + { 418, -2 }, /* (432) compare_op ::= NOT LIKE */ + { 418, -1 }, /* (433) compare_op ::= MATCH */ + { 418, -1 }, /* (434) compare_op ::= NMATCH */ + { 418, -1 }, /* (435) compare_op ::= CONTAINS */ + { 419, -1 }, /* (436) in_op ::= IN */ + { 419, -2 }, /* (437) in_op ::= NOT IN */ + { 420, -3 }, /* (438) in_predicate_value ::= NK_LP literal_list NK_RP */ + { 421, -1 }, /* (439) boolean_value_expression ::= boolean_primary */ + { 421, -2 }, /* (440) boolean_value_expression ::= NOT boolean_primary */ + { 421, -3 }, /* (441) boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */ + { 421, -3 }, /* (442) boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */ + { 422, -1 }, /* (443) boolean_primary ::= predicate */ + { 422, -3 }, /* (444) boolean_primary ::= NK_LP boolean_value_expression NK_RP */ + { 415, -1 }, /* (445) common_expression ::= expr_or_subquery */ + { 415, -1 }, /* (446) common_expression ::= boolean_value_expression */ + { 423, 0 }, /* (447) from_clause_opt ::= */ + { 423, -2 }, /* (448) from_clause_opt ::= FROM table_reference_list */ + { 424, -1 }, /* (449) table_reference_list ::= table_reference */ + { 424, -3 }, /* (450) table_reference_list ::= table_reference_list NK_COMMA table_reference */ + { 425, -1 }, /* (451) table_reference ::= table_primary */ + { 425, -1 }, /* (452) table_reference ::= joined_table */ + { 426, -2 }, /* (453) table_primary ::= table_name alias_opt */ + { 426, -4 }, /* (454) table_primary ::= db_name NK_DOT table_name alias_opt */ + { 426, -2 }, /* (455) table_primary ::= subquery alias_opt */ + { 426, -1 }, /* (456) table_primary ::= parenthesized_joined_table */ + { 428, 0 }, /* (457) alias_opt ::= */ + { 428, -1 }, /* (458) alias_opt ::= table_alias */ + { 428, -2 }, /* (459) alias_opt ::= AS table_alias */ + { 430, -3 }, /* (460) parenthesized_joined_table ::= NK_LP joined_table NK_RP */ + { 430, -3 }, /* (461) parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */ + { 427, -6 }, /* (462) joined_table ::= table_reference join_type JOIN table_reference ON search_condition */ + { 431, 0 }, /* (463) join_type ::= */ + { 431, -1 }, /* (464) join_type ::= INNER */ + { 433, -12 }, /* (465) query_specification ::= SELECT set_quantifier_opt select_list from_clause_opt where_clause_opt partition_by_clause_opt range_opt every_opt fill_opt twindow_clause_opt group_by_clause_opt having_clause_opt */ + { 434, 0 }, /* (466) set_quantifier_opt ::= */ + { 434, -1 }, /* (467) set_quantifier_opt ::= DISTINCT */ + { 434, -1 }, /* (468) set_quantifier_opt ::= ALL */ + { 435, -1 }, /* (469) select_list ::= select_item */ + { 435, -3 }, /* (470) select_list ::= select_list NK_COMMA select_item */ + { 443, -1 }, /* (471) select_item ::= NK_STAR */ + { 443, -1 }, /* (472) select_item ::= common_expression */ + { 443, -2 }, /* (473) select_item ::= common_expression column_alias */ + { 443, -3 }, /* (474) select_item ::= common_expression AS column_alias */ + { 443, -3 }, /* (475) select_item ::= table_name NK_DOT NK_STAR */ + { 398, 0 }, /* (476) where_clause_opt ::= */ + { 398, -2 }, /* (477) where_clause_opt ::= WHERE search_condition */ + { 436, 0 }, /* (478) partition_by_clause_opt ::= */ + { 436, -3 }, /* (479) partition_by_clause_opt ::= PARTITION BY partition_list */ + { 444, -1 }, /* (480) partition_list ::= partition_item */ + { 444, -3 }, /* (481) partition_list ::= partition_list NK_COMMA partition_item */ + { 445, -1 }, /* (482) partition_item ::= expr_or_subquery */ + { 445, -2 }, /* (483) partition_item ::= expr_or_subquery column_alias */ + { 445, -3 }, /* (484) partition_item ::= expr_or_subquery AS column_alias */ + { 440, 0 }, /* (485) twindow_clause_opt ::= */ + { 440, -6 }, /* (486) twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP */ + { 440, -4 }, /* (487) twindow_clause_opt ::= STATE_WINDOW NK_LP expr_or_subquery NK_RP */ + { 440, -6 }, /* (488) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */ + { 440, -8 }, /* (489) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */ + { 384, 0 }, /* (490) sliding_opt ::= */ + { 384, -4 }, /* (491) sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */ + { 439, 0 }, /* (492) fill_opt ::= */ + { 439, -4 }, /* (493) fill_opt ::= FILL NK_LP fill_mode NK_RP */ + { 439, -6 }, /* (494) fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */ + { 446, -1 }, /* (495) fill_mode ::= NONE */ + { 446, -1 }, /* (496) fill_mode ::= PREV */ + { 446, -1 }, /* (497) fill_mode ::= NULL */ + { 446, -1 }, /* (498) fill_mode ::= LINEAR */ + { 446, -1 }, /* (499) fill_mode ::= NEXT */ + { 441, 0 }, /* (500) group_by_clause_opt ::= */ + { 441, -3 }, /* (501) group_by_clause_opt ::= GROUP BY group_by_list */ + { 447, -1 }, /* (502) group_by_list ::= expr_or_subquery */ + { 447, -3 }, /* (503) group_by_list ::= group_by_list NK_COMMA expr_or_subquery */ + { 442, 0 }, /* (504) having_clause_opt ::= */ + { 442, -2 }, /* (505) having_clause_opt ::= HAVING search_condition */ + { 437, 0 }, /* (506) range_opt ::= */ + { 437, -6 }, /* (507) range_opt ::= RANGE NK_LP expr_or_subquery NK_COMMA expr_or_subquery NK_RP */ + { 438, 0 }, /* (508) every_opt ::= */ + { 438, -4 }, /* (509) every_opt ::= EVERY NK_LP duration_literal NK_RP */ + { 448, -4 }, /* (510) query_expression ::= query_simple order_by_clause_opt slimit_clause_opt limit_clause_opt */ + { 449, -1 }, /* (511) query_simple ::= query_specification */ + { 449, -1 }, /* (512) query_simple ::= union_query_expression */ + { 453, -4 }, /* (513) union_query_expression ::= query_simple_or_subquery UNION ALL query_simple_or_subquery */ + { 453, -3 }, /* (514) union_query_expression ::= query_simple_or_subquery UNION query_simple_or_subquery */ + { 454, -1 }, /* (515) query_simple_or_subquery ::= query_simple */ + { 454, -1 }, /* (516) query_simple_or_subquery ::= subquery */ + { 387, -1 }, /* (517) query_or_subquery ::= query_expression */ + { 387, -1 }, /* (518) query_or_subquery ::= subquery */ + { 450, 0 }, /* (519) order_by_clause_opt ::= */ + { 450, -3 }, /* (520) order_by_clause_opt ::= ORDER BY sort_specification_list */ + { 451, 0 }, /* (521) slimit_clause_opt ::= */ + { 451, -2 }, /* (522) slimit_clause_opt ::= SLIMIT NK_INTEGER */ + { 451, -4 }, /* (523) slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */ + { 451, -4 }, /* (524) slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */ + { 452, 0 }, /* (525) limit_clause_opt ::= */ + { 452, -2 }, /* (526) limit_clause_opt ::= LIMIT NK_INTEGER */ + { 452, -4 }, /* (527) limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */ + { 452, -4 }, /* (528) limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */ + { 429, -3 }, /* (529) subquery ::= NK_LP query_expression NK_RP */ + { 429, -3 }, /* (530) subquery ::= NK_LP subquery NK_RP */ + { 432, -1 }, /* (531) search_condition ::= common_expression */ + { 455, -1 }, /* (532) sort_specification_list ::= sort_specification */ + { 455, -3 }, /* (533) sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */ + { 456, -3 }, /* (534) sort_specification ::= expr_or_subquery ordering_specification_opt null_ordering_opt */ + { 457, 0 }, /* (535) ordering_specification_opt ::= */ + { 457, -1 }, /* (536) ordering_specification_opt ::= ASC */ + { 457, -1 }, /* (537) ordering_specification_opt ::= DESC */ + { 458, 0 }, /* (538) null_ordering_opt ::= */ + { 458, -2 }, /* (539) null_ordering_opt ::= NULLS FIRST */ + { 458, -2 }, /* (540) null_ordering_opt ::= NULLS LAST */ }; static void yy_accept(yyParser*); /* Forward Declaration */ @@ -3661,77 +3677,77 @@ static YYACTIONTYPE yy_reduce( yy_destructor(yypParser,325,&yymsp[0].minor); break; case 24: /* cmd ::= CREATE USER user_name PASS NK_STRING sysinfo_opt */ -{ pCxt->pRootNode = createCreateUserStmt(pCxt, &yymsp[-3].minor.yy199, &yymsp[-1].minor.yy0, yymsp[0].minor.yy33); } +{ pCxt->pRootNode = createCreateUserStmt(pCxt, &yymsp[-3].minor.yy317, &yymsp[-1].minor.yy0, yymsp[0].minor.yy449); } break; case 25: /* cmd ::= ALTER USER user_name PASS NK_STRING */ -{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy199, TSDB_ALTER_USER_PASSWD, &yymsp[0].minor.yy0); } +{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy317, TSDB_ALTER_USER_PASSWD, &yymsp[0].minor.yy0); } break; case 26: /* cmd ::= ALTER USER user_name ENABLE NK_INTEGER */ -{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy199, TSDB_ALTER_USER_ENABLE, &yymsp[0].minor.yy0); } +{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy317, TSDB_ALTER_USER_ENABLE, &yymsp[0].minor.yy0); } break; case 27: /* cmd ::= ALTER USER user_name SYSINFO NK_INTEGER */ -{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy199, TSDB_ALTER_USER_SYSINFO, &yymsp[0].minor.yy0); } +{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy317, TSDB_ALTER_USER_SYSINFO, &yymsp[0].minor.yy0); } break; case 28: /* cmd ::= DROP USER user_name */ -{ pCxt->pRootNode = createDropUserStmt(pCxt, &yymsp[0].minor.yy199); } +{ pCxt->pRootNode = createDropUserStmt(pCxt, &yymsp[0].minor.yy317); } break; case 29: /* sysinfo_opt ::= */ -{ yymsp[1].minor.yy33 = 1; } +{ yymsp[1].minor.yy449 = 1; } break; case 30: /* sysinfo_opt ::= SYSINFO NK_INTEGER */ -{ yymsp[-1].minor.yy33 = taosStr2Int8(yymsp[0].minor.yy0.z, NULL, 10); } +{ yymsp[-1].minor.yy449 = taosStr2Int8(yymsp[0].minor.yy0.z, NULL, 10); } break; case 31: /* cmd ::= GRANT privileges ON priv_level TO user_name */ -{ pCxt->pRootNode = createGrantStmt(pCxt, yymsp[-4].minor.yy525, &yymsp[-2].minor.yy199, &yymsp[0].minor.yy199); } +{ pCxt->pRootNode = createGrantStmt(pCxt, yymsp[-4].minor.yy531, &yymsp[-2].minor.yy317, &yymsp[0].minor.yy317); } break; case 32: /* cmd ::= REVOKE privileges ON priv_level FROM user_name */ -{ pCxt->pRootNode = createRevokeStmt(pCxt, yymsp[-4].minor.yy525, &yymsp[-2].minor.yy199, &yymsp[0].minor.yy199); } +{ pCxt->pRootNode = createRevokeStmt(pCxt, yymsp[-4].minor.yy531, &yymsp[-2].minor.yy317, &yymsp[0].minor.yy317); } break; case 33: /* privileges ::= ALL */ -{ yymsp[0].minor.yy525 = PRIVILEGE_TYPE_ALL; } +{ yymsp[0].minor.yy531 = PRIVILEGE_TYPE_ALL; } break; case 34: /* privileges ::= priv_type_list */ case 36: /* priv_type_list ::= priv_type */ yytestcase(yyruleno==36); -{ yylhsminor.yy525 = yymsp[0].minor.yy525; } - yymsp[0].minor.yy525 = yylhsminor.yy525; +{ yylhsminor.yy531 = yymsp[0].minor.yy531; } + yymsp[0].minor.yy531 = yylhsminor.yy531; break; case 35: /* privileges ::= SUBSCRIBE */ -{ yymsp[0].minor.yy525 = PRIVILEGE_TYPE_SUBSCRIBE; } +{ yymsp[0].minor.yy531 = PRIVILEGE_TYPE_SUBSCRIBE; } break; case 37: /* priv_type_list ::= priv_type_list NK_COMMA priv_type */ -{ yylhsminor.yy525 = yymsp[-2].minor.yy525 | yymsp[0].minor.yy525; } - yymsp[-2].minor.yy525 = yylhsminor.yy525; +{ yylhsminor.yy531 = yymsp[-2].minor.yy531 | yymsp[0].minor.yy531; } + yymsp[-2].minor.yy531 = yylhsminor.yy531; break; case 38: /* priv_type ::= READ */ -{ yymsp[0].minor.yy525 = PRIVILEGE_TYPE_READ; } +{ yymsp[0].minor.yy531 = PRIVILEGE_TYPE_READ; } break; case 39: /* priv_type ::= WRITE */ -{ yymsp[0].minor.yy525 = PRIVILEGE_TYPE_WRITE; } +{ yymsp[0].minor.yy531 = PRIVILEGE_TYPE_WRITE; } break; case 40: /* priv_level ::= NK_STAR NK_DOT NK_STAR */ -{ yylhsminor.yy199 = yymsp[-2].minor.yy0; } - yymsp[-2].minor.yy199 = yylhsminor.yy199; +{ yylhsminor.yy317 = yymsp[-2].minor.yy0; } + yymsp[-2].minor.yy317 = yylhsminor.yy317; break; case 41: /* priv_level ::= db_name NK_DOT NK_STAR */ -{ yylhsminor.yy199 = yymsp[-2].minor.yy199; } - yymsp[-2].minor.yy199 = yylhsminor.yy199; +{ yylhsminor.yy317 = yymsp[-2].minor.yy317; } + yymsp[-2].minor.yy317 = yylhsminor.yy317; break; case 42: /* priv_level ::= topic_name */ - case 455: /* alias_opt ::= table_alias */ yytestcase(yyruleno==455); -{ yylhsminor.yy199 = yymsp[0].minor.yy199; } - yymsp[0].minor.yy199 = yylhsminor.yy199; + case 458: /* alias_opt ::= table_alias */ yytestcase(yyruleno==458); +{ yylhsminor.yy317 = yymsp[0].minor.yy317; } + yymsp[0].minor.yy317 = yylhsminor.yy317; break; case 43: /* cmd ::= CREATE DNODE dnode_endpoint */ -{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[0].minor.yy199, NULL); } +{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[0].minor.yy317, NULL); } break; case 44: /* cmd ::= CREATE DNODE dnode_endpoint PORT NK_INTEGER */ -{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[-2].minor.yy199, &yymsp[0].minor.yy0); } +{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[-2].minor.yy317, &yymsp[0].minor.yy0); } break; case 45: /* cmd ::= DROP DNODE NK_INTEGER force_opt */ -{ pCxt->pRootNode = createDropDnodeStmt(pCxt, &yymsp[-1].minor.yy0, yymsp[0].minor.yy397); } +{ pCxt->pRootNode = createDropDnodeStmt(pCxt, &yymsp[-1].minor.yy0, yymsp[0].minor.yy335); } break; case 46: /* cmd ::= DROP DNODE dnode_endpoint force_opt */ -{ pCxt->pRootNode = createDropDnodeStmt(pCxt, &yymsp[-1].minor.yy199, yymsp[0].minor.yy397); } +{ pCxt->pRootNode = createDropDnodeStmt(pCxt, &yymsp[-1].minor.yy317, yymsp[0].minor.yy335); } break; case 47: /* cmd ::= ALTER DNODE NK_INTEGER NK_STRING */ { pCxt->pRootNode = createAlterDnodeStmt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0, NULL); } @@ -3748,45 +3764,46 @@ static YYACTIONTYPE yy_reduce( case 51: /* dnode_endpoint ::= NK_STRING */ case 52: /* dnode_endpoint ::= NK_ID */ yytestcase(yyruleno==52); case 53: /* dnode_endpoint ::= NK_IPTOKEN */ yytestcase(yyruleno==53); - case 342: /* db_name ::= NK_ID */ yytestcase(yyruleno==342); - case 343: /* table_name ::= NK_ID */ yytestcase(yyruleno==343); - case 344: /* column_name ::= NK_ID */ yytestcase(yyruleno==344); - case 345: /* function_name ::= NK_ID */ yytestcase(yyruleno==345); - case 346: /* table_alias ::= NK_ID */ yytestcase(yyruleno==346); - case 347: /* column_alias ::= NK_ID */ yytestcase(yyruleno==347); - case 348: /* user_name ::= NK_ID */ yytestcase(yyruleno==348); - case 349: /* topic_name ::= NK_ID */ yytestcase(yyruleno==349); - case 350: /* stream_name ::= NK_ID */ yytestcase(yyruleno==350); - case 351: /* cgroup_name ::= NK_ID */ yytestcase(yyruleno==351); - case 390: /* noarg_func ::= NOW */ yytestcase(yyruleno==390); - case 391: /* noarg_func ::= TODAY */ yytestcase(yyruleno==391); - case 392: /* noarg_func ::= TIMEZONE */ yytestcase(yyruleno==392); - case 393: /* noarg_func ::= DATABASE */ yytestcase(yyruleno==393); - case 394: /* noarg_func ::= CLIENT_VERSION */ yytestcase(yyruleno==394); - case 395: /* noarg_func ::= SERVER_VERSION */ yytestcase(yyruleno==395); - case 396: /* noarg_func ::= SERVER_STATUS */ yytestcase(yyruleno==396); - case 397: /* noarg_func ::= CURRENT_USER */ yytestcase(yyruleno==397); - case 398: /* noarg_func ::= USER */ yytestcase(yyruleno==398); - case 399: /* star_func ::= COUNT */ yytestcase(yyruleno==399); - case 400: /* star_func ::= FIRST */ yytestcase(yyruleno==400); - case 401: /* star_func ::= LAST */ yytestcase(yyruleno==401); - case 402: /* star_func ::= LAST_ROW */ yytestcase(yyruleno==402); -{ yylhsminor.yy199 = yymsp[0].minor.yy0; } - yymsp[0].minor.yy199 = yylhsminor.yy199; + case 344: /* db_name ::= NK_ID */ yytestcase(yyruleno==344); + case 345: /* table_name ::= NK_ID */ yytestcase(yyruleno==345); + case 346: /* column_name ::= NK_ID */ yytestcase(yyruleno==346); + case 347: /* function_name ::= NK_ID */ yytestcase(yyruleno==347); + case 348: /* table_alias ::= NK_ID */ yytestcase(yyruleno==348); + case 349: /* column_alias ::= NK_ID */ yytestcase(yyruleno==349); + case 350: /* user_name ::= NK_ID */ yytestcase(yyruleno==350); + case 351: /* topic_name ::= NK_ID */ yytestcase(yyruleno==351); + case 352: /* stream_name ::= NK_ID */ yytestcase(yyruleno==352); + case 353: /* cgroup_name ::= NK_ID */ yytestcase(yyruleno==353); + case 354: /* index_name ::= NK_ID */ yytestcase(yyruleno==354); + case 393: /* noarg_func ::= NOW */ yytestcase(yyruleno==393); + case 394: /* noarg_func ::= TODAY */ yytestcase(yyruleno==394); + case 395: /* noarg_func ::= TIMEZONE */ yytestcase(yyruleno==395); + case 396: /* noarg_func ::= DATABASE */ yytestcase(yyruleno==396); + case 397: /* noarg_func ::= CLIENT_VERSION */ yytestcase(yyruleno==397); + case 398: /* noarg_func ::= SERVER_VERSION */ yytestcase(yyruleno==398); + case 399: /* noarg_func ::= SERVER_STATUS */ yytestcase(yyruleno==399); + case 400: /* noarg_func ::= CURRENT_USER */ yytestcase(yyruleno==400); + case 401: /* noarg_func ::= USER */ yytestcase(yyruleno==401); + case 402: /* star_func ::= COUNT */ yytestcase(yyruleno==402); + case 403: /* star_func ::= FIRST */ yytestcase(yyruleno==403); + case 404: /* star_func ::= LAST */ yytestcase(yyruleno==404); + case 405: /* star_func ::= LAST_ROW */ yytestcase(yyruleno==405); +{ yylhsminor.yy317 = yymsp[0].minor.yy0; } + yymsp[0].minor.yy317 = yylhsminor.yy317; break; case 54: /* force_opt ::= */ case 73: /* not_exists_opt ::= */ yytestcase(yyruleno==73); case 75: /* exists_opt ::= */ yytestcase(yyruleno==75); - case 282: /* analyze_opt ::= */ yytestcase(yyruleno==282); - case 289: /* agg_func_opt ::= */ yytestcase(yyruleno==289); - case 463: /* set_quantifier_opt ::= */ yytestcase(yyruleno==463); -{ yymsp[1].minor.yy397 = false; } + case 284: /* analyze_opt ::= */ yytestcase(yyruleno==284); + case 291: /* agg_func_opt ::= */ yytestcase(yyruleno==291); + case 466: /* set_quantifier_opt ::= */ yytestcase(yyruleno==466); +{ yymsp[1].minor.yy335 = false; } break; case 55: /* force_opt ::= FORCE */ - case 283: /* analyze_opt ::= ANALYZE */ yytestcase(yyruleno==283); - case 290: /* agg_func_opt ::= AGGREGATE */ yytestcase(yyruleno==290); - case 464: /* set_quantifier_opt ::= DISTINCT */ yytestcase(yyruleno==464); -{ yymsp[0].minor.yy397 = true; } + case 285: /* analyze_opt ::= ANALYZE */ yytestcase(yyruleno==285); + case 292: /* agg_func_opt ::= AGGREGATE */ yytestcase(yyruleno==292); + case 467: /* set_quantifier_opt ::= DISTINCT */ yytestcase(yyruleno==467); +{ yymsp[0].minor.yy335 = true; } break; case 56: /* cmd ::= ALTER LOCAL NK_STRING */ { pCxt->pRootNode = createAlterLocalStmt(pCxt, &yymsp[0].minor.yy0, NULL); } @@ -3819,206 +3836,206 @@ static YYACTIONTYPE yy_reduce( { pCxt->pRootNode = createDropComponentNodeStmt(pCxt, QUERY_NODE_DROP_MNODE_STMT, &yymsp[0].minor.yy0); } break; case 66: /* cmd ::= CREATE DATABASE not_exists_opt db_name db_options */ -{ pCxt->pRootNode = createCreateDatabaseStmt(pCxt, yymsp[-2].minor.yy397, &yymsp[-1].minor.yy199, yymsp[0].minor.yy148); } +{ pCxt->pRootNode = createCreateDatabaseStmt(pCxt, yymsp[-2].minor.yy335, &yymsp[-1].minor.yy317, yymsp[0].minor.yy74); } break; case 67: /* cmd ::= DROP DATABASE exists_opt db_name */ -{ pCxt->pRootNode = createDropDatabaseStmt(pCxt, yymsp[-1].minor.yy397, &yymsp[0].minor.yy199); } +{ pCxt->pRootNode = createDropDatabaseStmt(pCxt, yymsp[-1].minor.yy335, &yymsp[0].minor.yy317); } break; case 68: /* cmd ::= USE db_name */ -{ pCxt->pRootNode = createUseDatabaseStmt(pCxt, &yymsp[0].minor.yy199); } +{ pCxt->pRootNode = createUseDatabaseStmt(pCxt, &yymsp[0].minor.yy317); } break; case 69: /* cmd ::= ALTER DATABASE db_name alter_db_options */ -{ pCxt->pRootNode = createAlterDatabaseStmt(pCxt, &yymsp[-1].minor.yy199, yymsp[0].minor.yy148); } +{ pCxt->pRootNode = createAlterDatabaseStmt(pCxt, &yymsp[-1].minor.yy317, yymsp[0].minor.yy74); } break; case 70: /* cmd ::= FLUSH DATABASE db_name */ -{ pCxt->pRootNode = createFlushDatabaseStmt(pCxt, &yymsp[0].minor.yy199); } +{ pCxt->pRootNode = createFlushDatabaseStmt(pCxt, &yymsp[0].minor.yy317); } break; case 71: /* cmd ::= TRIM DATABASE db_name speed_opt */ -{ pCxt->pRootNode = createTrimDatabaseStmt(pCxt, &yymsp[-1].minor.yy199, yymsp[0].minor.yy706); } +{ pCxt->pRootNode = createTrimDatabaseStmt(pCxt, &yymsp[-1].minor.yy317, yymsp[0].minor.yy856); } break; case 72: /* not_exists_opt ::= IF NOT EXISTS */ -{ yymsp[-2].minor.yy397 = true; } +{ yymsp[-2].minor.yy335 = true; } break; case 74: /* exists_opt ::= IF EXISTS */ -{ yymsp[-1].minor.yy397 = true; } +{ yymsp[-1].minor.yy335 = true; } break; case 76: /* db_options ::= */ -{ yymsp[1].minor.yy148 = createDefaultDatabaseOptions(pCxt); } +{ yymsp[1].minor.yy74 = createDefaultDatabaseOptions(pCxt); } break; case 77: /* db_options ::= db_options BUFFER NK_INTEGER */ -{ yylhsminor.yy148 = setDatabaseOption(pCxt, yymsp[-2].minor.yy148, DB_OPTION_BUFFER, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setDatabaseOption(pCxt, yymsp[-2].minor.yy74, DB_OPTION_BUFFER, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 78: /* db_options ::= db_options CACHEMODEL NK_STRING */ -{ yylhsminor.yy148 = setDatabaseOption(pCxt, yymsp[-2].minor.yy148, DB_OPTION_CACHEMODEL, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setDatabaseOption(pCxt, yymsp[-2].minor.yy74, DB_OPTION_CACHEMODEL, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 79: /* db_options ::= db_options CACHESIZE NK_INTEGER */ -{ yylhsminor.yy148 = setDatabaseOption(pCxt, yymsp[-2].minor.yy148, DB_OPTION_CACHESIZE, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setDatabaseOption(pCxt, yymsp[-2].minor.yy74, DB_OPTION_CACHESIZE, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 80: /* db_options ::= db_options COMP NK_INTEGER */ -{ yylhsminor.yy148 = setDatabaseOption(pCxt, yymsp[-2].minor.yy148, DB_OPTION_COMP, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setDatabaseOption(pCxt, yymsp[-2].minor.yy74, DB_OPTION_COMP, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 81: /* db_options ::= db_options DURATION NK_INTEGER */ case 82: /* db_options ::= db_options DURATION NK_VARIABLE */ yytestcase(yyruleno==82); -{ yylhsminor.yy148 = setDatabaseOption(pCxt, yymsp[-2].minor.yy148, DB_OPTION_DAYS, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setDatabaseOption(pCxt, yymsp[-2].minor.yy74, DB_OPTION_DAYS, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 83: /* db_options ::= db_options MAXROWS NK_INTEGER */ -{ yylhsminor.yy148 = setDatabaseOption(pCxt, yymsp[-2].minor.yy148, DB_OPTION_MAXROWS, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setDatabaseOption(pCxt, yymsp[-2].minor.yy74, DB_OPTION_MAXROWS, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 84: /* db_options ::= db_options MINROWS NK_INTEGER */ -{ yylhsminor.yy148 = setDatabaseOption(pCxt, yymsp[-2].minor.yy148, DB_OPTION_MINROWS, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setDatabaseOption(pCxt, yymsp[-2].minor.yy74, DB_OPTION_MINROWS, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 85: /* db_options ::= db_options KEEP integer_list */ case 86: /* db_options ::= db_options KEEP variable_list */ yytestcase(yyruleno==86); -{ yylhsminor.yy148 = setDatabaseOption(pCxt, yymsp[-2].minor.yy148, DB_OPTION_KEEP, yymsp[0].minor.yy404); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setDatabaseOption(pCxt, yymsp[-2].minor.yy74, DB_OPTION_KEEP, yymsp[0].minor.yy874); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 87: /* db_options ::= db_options PAGES NK_INTEGER */ -{ yylhsminor.yy148 = setDatabaseOption(pCxt, yymsp[-2].minor.yy148, DB_OPTION_PAGES, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setDatabaseOption(pCxt, yymsp[-2].minor.yy74, DB_OPTION_PAGES, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 88: /* db_options ::= db_options PAGESIZE NK_INTEGER */ -{ yylhsminor.yy148 = setDatabaseOption(pCxt, yymsp[-2].minor.yy148, DB_OPTION_PAGESIZE, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setDatabaseOption(pCxt, yymsp[-2].minor.yy74, DB_OPTION_PAGESIZE, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 89: /* db_options ::= db_options TSDB_PAGESIZE NK_INTEGER */ -{ yylhsminor.yy148 = setDatabaseOption(pCxt, yymsp[-2].minor.yy148, DB_OPTION_TSDB_PAGESIZE, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setDatabaseOption(pCxt, yymsp[-2].minor.yy74, DB_OPTION_TSDB_PAGESIZE, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 90: /* db_options ::= db_options PRECISION NK_STRING */ -{ yylhsminor.yy148 = setDatabaseOption(pCxt, yymsp[-2].minor.yy148, DB_OPTION_PRECISION, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setDatabaseOption(pCxt, yymsp[-2].minor.yy74, DB_OPTION_PRECISION, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 91: /* db_options ::= db_options REPLICA NK_INTEGER */ -{ yylhsminor.yy148 = setDatabaseOption(pCxt, yymsp[-2].minor.yy148, DB_OPTION_REPLICA, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setDatabaseOption(pCxt, yymsp[-2].minor.yy74, DB_OPTION_REPLICA, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 92: /* db_options ::= db_options VGROUPS NK_INTEGER */ -{ yylhsminor.yy148 = setDatabaseOption(pCxt, yymsp[-2].minor.yy148, DB_OPTION_VGROUPS, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setDatabaseOption(pCxt, yymsp[-2].minor.yy74, DB_OPTION_VGROUPS, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 93: /* db_options ::= db_options SINGLE_STABLE NK_INTEGER */ -{ yylhsminor.yy148 = setDatabaseOption(pCxt, yymsp[-2].minor.yy148, DB_OPTION_SINGLE_STABLE, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setDatabaseOption(pCxt, yymsp[-2].minor.yy74, DB_OPTION_SINGLE_STABLE, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 94: /* db_options ::= db_options RETENTIONS retention_list */ -{ yylhsminor.yy148 = setDatabaseOption(pCxt, yymsp[-2].minor.yy148, DB_OPTION_RETENTIONS, yymsp[0].minor.yy404); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setDatabaseOption(pCxt, yymsp[-2].minor.yy74, DB_OPTION_RETENTIONS, yymsp[0].minor.yy874); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 95: /* db_options ::= db_options SCHEMALESS NK_INTEGER */ -{ yylhsminor.yy148 = setDatabaseOption(pCxt, yymsp[-2].minor.yy148, DB_OPTION_SCHEMALESS, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setDatabaseOption(pCxt, yymsp[-2].minor.yy74, DB_OPTION_SCHEMALESS, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 96: /* db_options ::= db_options WAL_LEVEL NK_INTEGER */ -{ yylhsminor.yy148 = setDatabaseOption(pCxt, yymsp[-2].minor.yy148, DB_OPTION_WAL, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setDatabaseOption(pCxt, yymsp[-2].minor.yy74, DB_OPTION_WAL, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 97: /* db_options ::= db_options WAL_FSYNC_PERIOD NK_INTEGER */ -{ yylhsminor.yy148 = setDatabaseOption(pCxt, yymsp[-2].minor.yy148, DB_OPTION_FSYNC, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setDatabaseOption(pCxt, yymsp[-2].minor.yy74, DB_OPTION_FSYNC, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 98: /* db_options ::= db_options WAL_RETENTION_PERIOD NK_INTEGER */ -{ yylhsminor.yy148 = setDatabaseOption(pCxt, yymsp[-2].minor.yy148, DB_OPTION_WAL_RETENTION_PERIOD, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setDatabaseOption(pCxt, yymsp[-2].minor.yy74, DB_OPTION_WAL_RETENTION_PERIOD, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 99: /* db_options ::= db_options WAL_RETENTION_PERIOD NK_MINUS NK_INTEGER */ { SToken t = yymsp[-1].minor.yy0; t.n = (yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n) - yymsp[-1].minor.yy0.z; - yylhsminor.yy148 = setDatabaseOption(pCxt, yymsp[-3].minor.yy148, DB_OPTION_WAL_RETENTION_PERIOD, &t); + yylhsminor.yy74 = setDatabaseOption(pCxt, yymsp[-3].minor.yy74, DB_OPTION_WAL_RETENTION_PERIOD, &t); } - yymsp[-3].minor.yy148 = yylhsminor.yy148; + yymsp[-3].minor.yy74 = yylhsminor.yy74; break; case 100: /* db_options ::= db_options WAL_RETENTION_SIZE NK_INTEGER */ -{ yylhsminor.yy148 = setDatabaseOption(pCxt, yymsp[-2].minor.yy148, DB_OPTION_WAL_RETENTION_SIZE, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setDatabaseOption(pCxt, yymsp[-2].minor.yy74, DB_OPTION_WAL_RETENTION_SIZE, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 101: /* db_options ::= db_options WAL_RETENTION_SIZE NK_MINUS NK_INTEGER */ { SToken t = yymsp[-1].minor.yy0; t.n = (yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n) - yymsp[-1].minor.yy0.z; - yylhsminor.yy148 = setDatabaseOption(pCxt, yymsp[-3].minor.yy148, DB_OPTION_WAL_RETENTION_SIZE, &t); + yylhsminor.yy74 = setDatabaseOption(pCxt, yymsp[-3].minor.yy74, DB_OPTION_WAL_RETENTION_SIZE, &t); } - yymsp[-3].minor.yy148 = yylhsminor.yy148; + yymsp[-3].minor.yy74 = yylhsminor.yy74; break; case 102: /* db_options ::= db_options WAL_ROLL_PERIOD NK_INTEGER */ -{ yylhsminor.yy148 = setDatabaseOption(pCxt, yymsp[-2].minor.yy148, DB_OPTION_WAL_ROLL_PERIOD, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setDatabaseOption(pCxt, yymsp[-2].minor.yy74, DB_OPTION_WAL_ROLL_PERIOD, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 103: /* db_options ::= db_options WAL_SEGMENT_SIZE NK_INTEGER */ -{ yylhsminor.yy148 = setDatabaseOption(pCxt, yymsp[-2].minor.yy148, DB_OPTION_WAL_SEGMENT_SIZE, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setDatabaseOption(pCxt, yymsp[-2].minor.yy74, DB_OPTION_WAL_SEGMENT_SIZE, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 104: /* db_options ::= db_options STT_TRIGGER NK_INTEGER */ -{ yylhsminor.yy148 = setDatabaseOption(pCxt, yymsp[-2].minor.yy148, DB_OPTION_STT_TRIGGER, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setDatabaseOption(pCxt, yymsp[-2].minor.yy74, DB_OPTION_STT_TRIGGER, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 105: /* db_options ::= db_options TABLE_PREFIX NK_INTEGER */ -{ yylhsminor.yy148 = setDatabaseOption(pCxt, yymsp[-2].minor.yy148, DB_OPTION_TABLE_PREFIX, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setDatabaseOption(pCxt, yymsp[-2].minor.yy74, DB_OPTION_TABLE_PREFIX, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 106: /* db_options ::= db_options TABLE_SUFFIX NK_INTEGER */ -{ yylhsminor.yy148 = setDatabaseOption(pCxt, yymsp[-2].minor.yy148, DB_OPTION_TABLE_SUFFIX, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setDatabaseOption(pCxt, yymsp[-2].minor.yy74, DB_OPTION_TABLE_SUFFIX, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 107: /* alter_db_options ::= alter_db_option */ -{ yylhsminor.yy148 = createAlterDatabaseOptions(pCxt); yylhsminor.yy148 = setAlterDatabaseOption(pCxt, yylhsminor.yy148, &yymsp[0].minor.yy123); } - yymsp[0].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = createAlterDatabaseOptions(pCxt); yylhsminor.yy74 = setAlterDatabaseOption(pCxt, yylhsminor.yy74, &yymsp[0].minor.yy767); } + yymsp[0].minor.yy74 = yylhsminor.yy74; break; case 108: /* alter_db_options ::= alter_db_options alter_db_option */ -{ yylhsminor.yy148 = setAlterDatabaseOption(pCxt, yymsp[-1].minor.yy148, &yymsp[0].minor.yy123); } - yymsp[-1].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setAlterDatabaseOption(pCxt, yymsp[-1].minor.yy74, &yymsp[0].minor.yy767); } + yymsp[-1].minor.yy74 = yylhsminor.yy74; break; case 109: /* alter_db_option ::= BUFFER NK_INTEGER */ -{ yymsp[-1].minor.yy123.type = DB_OPTION_BUFFER; yymsp[-1].minor.yy123.val = yymsp[0].minor.yy0; } +{ yymsp[-1].minor.yy767.type = DB_OPTION_BUFFER; yymsp[-1].minor.yy767.val = yymsp[0].minor.yy0; } break; case 110: /* alter_db_option ::= CACHEMODEL NK_STRING */ -{ yymsp[-1].minor.yy123.type = DB_OPTION_CACHEMODEL; yymsp[-1].minor.yy123.val = yymsp[0].minor.yy0; } +{ yymsp[-1].minor.yy767.type = DB_OPTION_CACHEMODEL; yymsp[-1].minor.yy767.val = yymsp[0].minor.yy0; } break; case 111: /* alter_db_option ::= CACHESIZE NK_INTEGER */ -{ yymsp[-1].minor.yy123.type = DB_OPTION_CACHESIZE; yymsp[-1].minor.yy123.val = yymsp[0].minor.yy0; } +{ yymsp[-1].minor.yy767.type = DB_OPTION_CACHESIZE; yymsp[-1].minor.yy767.val = yymsp[0].minor.yy0; } break; case 112: /* alter_db_option ::= WAL_FSYNC_PERIOD NK_INTEGER */ -{ yymsp[-1].minor.yy123.type = DB_OPTION_FSYNC; yymsp[-1].minor.yy123.val = yymsp[0].minor.yy0; } +{ yymsp[-1].minor.yy767.type = DB_OPTION_FSYNC; yymsp[-1].minor.yy767.val = yymsp[0].minor.yy0; } break; case 113: /* alter_db_option ::= KEEP integer_list */ case 114: /* alter_db_option ::= KEEP variable_list */ yytestcase(yyruleno==114); -{ yymsp[-1].minor.yy123.type = DB_OPTION_KEEP; yymsp[-1].minor.yy123.pList = yymsp[0].minor.yy404; } +{ yymsp[-1].minor.yy767.type = DB_OPTION_KEEP; yymsp[-1].minor.yy767.pList = yymsp[0].minor.yy874; } break; case 115: /* alter_db_option ::= PAGES NK_INTEGER */ -{ yymsp[-1].minor.yy123.type = DB_OPTION_PAGES; yymsp[-1].minor.yy123.val = yymsp[0].minor.yy0; } +{ yymsp[-1].minor.yy767.type = DB_OPTION_PAGES; yymsp[-1].minor.yy767.val = yymsp[0].minor.yy0; } break; case 116: /* alter_db_option ::= REPLICA NK_INTEGER */ -{ yymsp[-1].minor.yy123.type = DB_OPTION_REPLICA; yymsp[-1].minor.yy123.val = yymsp[0].minor.yy0; } +{ yymsp[-1].minor.yy767.type = DB_OPTION_REPLICA; yymsp[-1].minor.yy767.val = yymsp[0].minor.yy0; } break; case 117: /* alter_db_option ::= WAL_LEVEL NK_INTEGER */ -{ yymsp[-1].minor.yy123.type = DB_OPTION_WAL; yymsp[-1].minor.yy123.val = yymsp[0].minor.yy0; } +{ yymsp[-1].minor.yy767.type = DB_OPTION_WAL; yymsp[-1].minor.yy767.val = yymsp[0].minor.yy0; } break; case 118: /* alter_db_option ::= STT_TRIGGER NK_INTEGER */ -{ yymsp[-1].minor.yy123.type = DB_OPTION_STT_TRIGGER; yymsp[-1].minor.yy123.val = yymsp[0].minor.yy0; } +{ yymsp[-1].minor.yy767.type = DB_OPTION_STT_TRIGGER; yymsp[-1].minor.yy767.val = yymsp[0].minor.yy0; } break; case 119: /* integer_list ::= NK_INTEGER */ -{ yylhsminor.yy404 = createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy404 = yylhsminor.yy404; +{ yylhsminor.yy874 = createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy874 = yylhsminor.yy874; break; case 120: /* integer_list ::= integer_list NK_COMMA NK_INTEGER */ - case 312: /* dnode_list ::= dnode_list DNODE NK_INTEGER */ yytestcase(yyruleno==312); -{ yylhsminor.yy404 = addNodeToList(pCxt, yymsp[-2].minor.yy404, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); } - yymsp[-2].minor.yy404 = yylhsminor.yy404; + case 314: /* dnode_list ::= dnode_list DNODE NK_INTEGER */ yytestcase(yyruleno==314); +{ yylhsminor.yy874 = addNodeToList(pCxt, yymsp[-2].minor.yy874, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); } + yymsp[-2].minor.yy874 = yylhsminor.yy874; break; case 121: /* variable_list ::= NK_VARIABLE */ -{ yylhsminor.yy404 = createNodeList(pCxt, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy404 = yylhsminor.yy404; +{ yylhsminor.yy874 = createNodeList(pCxt, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy874 = yylhsminor.yy874; break; case 122: /* variable_list ::= variable_list NK_COMMA NK_VARIABLE */ -{ yylhsminor.yy404 = addNodeToList(pCxt, yymsp[-2].minor.yy404, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); } - yymsp[-2].minor.yy404 = yylhsminor.yy404; +{ yylhsminor.yy874 = addNodeToList(pCxt, yymsp[-2].minor.yy874, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); } + yymsp[-2].minor.yy874 = yylhsminor.yy874; break; case 123: /* retention_list ::= retention */ case 145: /* multi_create_clause ::= create_subtable_clause */ yytestcase(yyruleno==145); @@ -4027,287 +4044,287 @@ static YYACTIONTYPE yy_reduce( case 199: /* rollup_func_list ::= rollup_func_name */ yytestcase(yyruleno==199); case 204: /* col_name_list ::= col_name */ yytestcase(yyruleno==204); case 253: /* tag_list_opt ::= tag_item */ yytestcase(yyruleno==253); - case 264: /* func_list ::= func */ yytestcase(yyruleno==264); - case 340: /* literal_list ::= signed_literal */ yytestcase(yyruleno==340); - case 405: /* other_para_list ::= star_func_para */ yytestcase(yyruleno==405); - case 411: /* when_then_list ::= when_then_expr */ yytestcase(yyruleno==411); - case 466: /* select_list ::= select_item */ yytestcase(yyruleno==466); - case 477: /* partition_list ::= partition_item */ yytestcase(yyruleno==477); - case 529: /* sort_specification_list ::= sort_specification */ yytestcase(yyruleno==529); -{ yylhsminor.yy404 = createNodeList(pCxt, yymsp[0].minor.yy148); } - yymsp[0].minor.yy404 = yylhsminor.yy404; + case 266: /* func_list ::= func */ yytestcase(yyruleno==266); + case 342: /* literal_list ::= signed_literal */ yytestcase(yyruleno==342); + case 408: /* other_para_list ::= star_func_para */ yytestcase(yyruleno==408); + case 414: /* when_then_list ::= when_then_expr */ yytestcase(yyruleno==414); + case 469: /* select_list ::= select_item */ yytestcase(yyruleno==469); + case 480: /* partition_list ::= partition_item */ yytestcase(yyruleno==480); + case 532: /* sort_specification_list ::= sort_specification */ yytestcase(yyruleno==532); +{ yylhsminor.yy874 = createNodeList(pCxt, yymsp[0].minor.yy74); } + yymsp[0].minor.yy874 = yylhsminor.yy874; break; case 124: /* retention_list ::= retention_list NK_COMMA retention */ case 156: /* column_def_list ::= column_def_list NK_COMMA column_def */ yytestcase(yyruleno==156); case 200: /* rollup_func_list ::= rollup_func_list NK_COMMA rollup_func_name */ yytestcase(yyruleno==200); case 205: /* col_name_list ::= col_name_list NK_COMMA col_name */ yytestcase(yyruleno==205); case 254: /* tag_list_opt ::= tag_list_opt NK_COMMA tag_item */ yytestcase(yyruleno==254); - case 265: /* func_list ::= func_list NK_COMMA func */ yytestcase(yyruleno==265); - case 341: /* literal_list ::= literal_list NK_COMMA signed_literal */ yytestcase(yyruleno==341); - case 406: /* other_para_list ::= other_para_list NK_COMMA star_func_para */ yytestcase(yyruleno==406); - case 467: /* select_list ::= select_list NK_COMMA select_item */ yytestcase(yyruleno==467); - case 478: /* partition_list ::= partition_list NK_COMMA partition_item */ yytestcase(yyruleno==478); - case 530: /* sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */ yytestcase(yyruleno==530); -{ yylhsminor.yy404 = addNodeToList(pCxt, yymsp[-2].minor.yy404, yymsp[0].minor.yy148); } - yymsp[-2].minor.yy404 = yylhsminor.yy404; + case 267: /* func_list ::= func_list NK_COMMA func */ yytestcase(yyruleno==267); + case 343: /* literal_list ::= literal_list NK_COMMA signed_literal */ yytestcase(yyruleno==343); + case 409: /* other_para_list ::= other_para_list NK_COMMA star_func_para */ yytestcase(yyruleno==409); + case 470: /* select_list ::= select_list NK_COMMA select_item */ yytestcase(yyruleno==470); + case 481: /* partition_list ::= partition_list NK_COMMA partition_item */ yytestcase(yyruleno==481); + case 533: /* sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */ yytestcase(yyruleno==533); +{ yylhsminor.yy874 = addNodeToList(pCxt, yymsp[-2].minor.yy874, yymsp[0].minor.yy74); } + yymsp[-2].minor.yy874 = yylhsminor.yy874; break; case 125: /* retention ::= NK_VARIABLE NK_COLON NK_VARIABLE */ -{ yylhsminor.yy148 = createNodeListNodeEx(pCxt, createDurationValueNode(pCxt, &yymsp[-2].minor.yy0), createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = createNodeListNodeEx(pCxt, createDurationValueNode(pCxt, &yymsp[-2].minor.yy0), createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 126: /* speed_opt ::= */ - case 291: /* bufsize_opt ::= */ yytestcase(yyruleno==291); -{ yymsp[1].minor.yy706 = 0; } + case 293: /* bufsize_opt ::= */ yytestcase(yyruleno==293); +{ yymsp[1].minor.yy856 = 0; } break; case 127: /* speed_opt ::= MAX_SPEED NK_INTEGER */ - case 292: /* bufsize_opt ::= BUFSIZE NK_INTEGER */ yytestcase(yyruleno==292); -{ yymsp[-1].minor.yy706 = taosStr2Int32(yymsp[0].minor.yy0.z, NULL, 10); } + case 294: /* bufsize_opt ::= BUFSIZE NK_INTEGER */ yytestcase(yyruleno==294); +{ yymsp[-1].minor.yy856 = taosStr2Int32(yymsp[0].minor.yy0.z, NULL, 10); } break; case 128: /* cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options */ case 130: /* cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options */ yytestcase(yyruleno==130); -{ pCxt->pRootNode = createCreateTableStmt(pCxt, yymsp[-6].minor.yy397, yymsp[-5].minor.yy148, yymsp[-3].minor.yy404, yymsp[-1].minor.yy404, yymsp[0].minor.yy148); } +{ pCxt->pRootNode = createCreateTableStmt(pCxt, yymsp[-6].minor.yy335, yymsp[-5].minor.yy74, yymsp[-3].minor.yy874, yymsp[-1].minor.yy874, yymsp[0].minor.yy74); } break; case 129: /* cmd ::= CREATE TABLE multi_create_clause */ -{ pCxt->pRootNode = createCreateMultiTableStmt(pCxt, yymsp[0].minor.yy404); } +{ pCxt->pRootNode = createCreateMultiTableStmt(pCxt, yymsp[0].minor.yy874); } break; case 131: /* cmd ::= DROP TABLE multi_drop_clause */ -{ pCxt->pRootNode = createDropTableStmt(pCxt, yymsp[0].minor.yy404); } +{ pCxt->pRootNode = createDropTableStmt(pCxt, yymsp[0].minor.yy874); } break; case 132: /* cmd ::= DROP STABLE exists_opt full_table_name */ -{ pCxt->pRootNode = createDropSuperTableStmt(pCxt, yymsp[-1].minor.yy397, yymsp[0].minor.yy148); } +{ pCxt->pRootNode = createDropSuperTableStmt(pCxt, yymsp[-1].minor.yy335, yymsp[0].minor.yy74); } break; case 133: /* cmd ::= ALTER TABLE alter_table_clause */ - case 314: /* cmd ::= query_or_subquery */ yytestcase(yyruleno==314); -{ pCxt->pRootNode = yymsp[0].minor.yy148; } + case 316: /* cmd ::= query_or_subquery */ yytestcase(yyruleno==316); +{ pCxt->pRootNode = yymsp[0].minor.yy74; } break; case 134: /* cmd ::= ALTER STABLE alter_table_clause */ -{ pCxt->pRootNode = setAlterSuperTableType(yymsp[0].minor.yy148); } +{ pCxt->pRootNode = setAlterSuperTableType(yymsp[0].minor.yy74); } break; case 135: /* alter_table_clause ::= full_table_name alter_table_options */ -{ yylhsminor.yy148 = createAlterTableModifyOptions(pCxt, yymsp[-1].minor.yy148, yymsp[0].minor.yy148); } - yymsp[-1].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = createAlterTableModifyOptions(pCxt, yymsp[-1].minor.yy74, yymsp[0].minor.yy74); } + yymsp[-1].minor.yy74 = yylhsminor.yy74; break; case 136: /* alter_table_clause ::= full_table_name ADD COLUMN column_name type_name */ -{ yylhsminor.yy148 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy148, TSDB_ALTER_TABLE_ADD_COLUMN, &yymsp[-1].minor.yy199, yymsp[0].minor.yy530); } - yymsp[-4].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy74, TSDB_ALTER_TABLE_ADD_COLUMN, &yymsp[-1].minor.yy317, yymsp[0].minor.yy898); } + yymsp[-4].minor.yy74 = yylhsminor.yy74; break; case 137: /* alter_table_clause ::= full_table_name DROP COLUMN column_name */ -{ yylhsminor.yy148 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy148, TSDB_ALTER_TABLE_DROP_COLUMN, &yymsp[0].minor.yy199); } - yymsp[-3].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy74, TSDB_ALTER_TABLE_DROP_COLUMN, &yymsp[0].minor.yy317); } + yymsp[-3].minor.yy74 = yylhsminor.yy74; break; case 138: /* alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name */ -{ yylhsminor.yy148 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy148, TSDB_ALTER_TABLE_UPDATE_COLUMN_BYTES, &yymsp[-1].minor.yy199, yymsp[0].minor.yy530); } - yymsp[-4].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy74, TSDB_ALTER_TABLE_UPDATE_COLUMN_BYTES, &yymsp[-1].minor.yy317, yymsp[0].minor.yy898); } + yymsp[-4].minor.yy74 = yylhsminor.yy74; break; case 139: /* alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name */ -{ yylhsminor.yy148 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy148, TSDB_ALTER_TABLE_UPDATE_COLUMN_NAME, &yymsp[-1].minor.yy199, &yymsp[0].minor.yy199); } - yymsp[-4].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy74, TSDB_ALTER_TABLE_UPDATE_COLUMN_NAME, &yymsp[-1].minor.yy317, &yymsp[0].minor.yy317); } + yymsp[-4].minor.yy74 = yylhsminor.yy74; break; case 140: /* alter_table_clause ::= full_table_name ADD TAG column_name type_name */ -{ yylhsminor.yy148 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy148, TSDB_ALTER_TABLE_ADD_TAG, &yymsp[-1].minor.yy199, yymsp[0].minor.yy530); } - yymsp[-4].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy74, TSDB_ALTER_TABLE_ADD_TAG, &yymsp[-1].minor.yy317, yymsp[0].minor.yy898); } + yymsp[-4].minor.yy74 = yylhsminor.yy74; break; case 141: /* alter_table_clause ::= full_table_name DROP TAG column_name */ -{ yylhsminor.yy148 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy148, TSDB_ALTER_TABLE_DROP_TAG, &yymsp[0].minor.yy199); } - yymsp[-3].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy74, TSDB_ALTER_TABLE_DROP_TAG, &yymsp[0].minor.yy317); } + yymsp[-3].minor.yy74 = yylhsminor.yy74; break; case 142: /* alter_table_clause ::= full_table_name MODIFY TAG column_name type_name */ -{ yylhsminor.yy148 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy148, TSDB_ALTER_TABLE_UPDATE_TAG_BYTES, &yymsp[-1].minor.yy199, yymsp[0].minor.yy530); } - yymsp[-4].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy74, TSDB_ALTER_TABLE_UPDATE_TAG_BYTES, &yymsp[-1].minor.yy317, yymsp[0].minor.yy898); } + yymsp[-4].minor.yy74 = yylhsminor.yy74; break; case 143: /* alter_table_clause ::= full_table_name RENAME TAG column_name column_name */ -{ yylhsminor.yy148 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy148, TSDB_ALTER_TABLE_UPDATE_TAG_NAME, &yymsp[-1].minor.yy199, &yymsp[0].minor.yy199); } - yymsp[-4].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy74, TSDB_ALTER_TABLE_UPDATE_TAG_NAME, &yymsp[-1].minor.yy317, &yymsp[0].minor.yy317); } + yymsp[-4].minor.yy74 = yylhsminor.yy74; break; case 144: /* alter_table_clause ::= full_table_name SET TAG column_name NK_EQ signed_literal */ -{ yylhsminor.yy148 = createAlterTableSetTag(pCxt, yymsp[-5].minor.yy148, &yymsp[-2].minor.yy199, yymsp[0].minor.yy148); } - yymsp[-5].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = createAlterTableSetTag(pCxt, yymsp[-5].minor.yy74, &yymsp[-2].minor.yy317, yymsp[0].minor.yy74); } + yymsp[-5].minor.yy74 = yylhsminor.yy74; break; case 146: /* multi_create_clause ::= multi_create_clause create_subtable_clause */ case 149: /* multi_drop_clause ::= multi_drop_clause drop_table_clause */ yytestcase(yyruleno==149); - case 412: /* when_then_list ::= when_then_list when_then_expr */ yytestcase(yyruleno==412); -{ yylhsminor.yy404 = addNodeToList(pCxt, yymsp[-1].minor.yy404, yymsp[0].minor.yy148); } - yymsp[-1].minor.yy404 = yylhsminor.yy404; + case 415: /* when_then_list ::= when_then_list when_then_expr */ yytestcase(yyruleno==415); +{ yylhsminor.yy874 = addNodeToList(pCxt, yymsp[-1].minor.yy874, yymsp[0].minor.yy74); } + yymsp[-1].minor.yy874 = yylhsminor.yy874; break; case 147: /* create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_cols_opt TAGS NK_LP expression_list NK_RP table_options */ -{ yylhsminor.yy148 = createCreateSubTableClause(pCxt, yymsp[-9].minor.yy397, yymsp[-8].minor.yy148, yymsp[-6].minor.yy148, yymsp[-5].minor.yy404, yymsp[-2].minor.yy404, yymsp[0].minor.yy148); } - yymsp[-9].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = createCreateSubTableClause(pCxt, yymsp[-9].minor.yy335, yymsp[-8].minor.yy74, yymsp[-6].minor.yy74, yymsp[-5].minor.yy874, yymsp[-2].minor.yy874, yymsp[0].minor.yy74); } + yymsp[-9].minor.yy74 = yylhsminor.yy74; break; case 150: /* drop_table_clause ::= exists_opt full_table_name */ -{ yylhsminor.yy148 = createDropTableClause(pCxt, yymsp[-1].minor.yy397, yymsp[0].minor.yy148); } - yymsp[-1].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = createDropTableClause(pCxt, yymsp[-1].minor.yy335, yymsp[0].minor.yy74); } + yymsp[-1].minor.yy74 = yylhsminor.yy74; break; case 151: /* specific_cols_opt ::= */ case 182: /* tags_def_opt ::= */ yytestcase(yyruleno==182); case 252: /* tag_list_opt ::= */ yytestcase(yyruleno==252); - case 475: /* partition_by_clause_opt ::= */ yytestcase(yyruleno==475); - case 497: /* group_by_clause_opt ::= */ yytestcase(yyruleno==497); - case 516: /* order_by_clause_opt ::= */ yytestcase(yyruleno==516); -{ yymsp[1].minor.yy404 = NULL; } + case 478: /* partition_by_clause_opt ::= */ yytestcase(yyruleno==478); + case 500: /* group_by_clause_opt ::= */ yytestcase(yyruleno==500); + case 519: /* order_by_clause_opt ::= */ yytestcase(yyruleno==519); +{ yymsp[1].minor.yy874 = NULL; } break; case 152: /* specific_cols_opt ::= NK_LP col_name_list NK_RP */ -{ yymsp[-2].minor.yy404 = yymsp[-1].minor.yy404; } +{ yymsp[-2].minor.yy874 = yymsp[-1].minor.yy874; } break; case 153: /* full_table_name ::= table_name */ -{ yylhsminor.yy148 = createRealTableNode(pCxt, NULL, &yymsp[0].minor.yy199, NULL); } - yymsp[0].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = createRealTableNode(pCxt, NULL, &yymsp[0].minor.yy317, NULL); } + yymsp[0].minor.yy74 = yylhsminor.yy74; break; case 154: /* full_table_name ::= db_name NK_DOT table_name */ -{ yylhsminor.yy148 = createRealTableNode(pCxt, &yymsp[-2].minor.yy199, &yymsp[0].minor.yy199, NULL); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = createRealTableNode(pCxt, &yymsp[-2].minor.yy317, &yymsp[0].minor.yy317, NULL); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 157: /* column_def ::= column_name type_name */ -{ yylhsminor.yy148 = createColumnDefNode(pCxt, &yymsp[-1].minor.yy199, yymsp[0].minor.yy530, NULL); } - yymsp[-1].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = createColumnDefNode(pCxt, &yymsp[-1].minor.yy317, yymsp[0].minor.yy898, NULL); } + yymsp[-1].minor.yy74 = yylhsminor.yy74; break; case 158: /* column_def ::= column_name type_name COMMENT NK_STRING */ -{ yylhsminor.yy148 = createColumnDefNode(pCxt, &yymsp[-3].minor.yy199, yymsp[-2].minor.yy530, &yymsp[0].minor.yy0); } - yymsp[-3].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = createColumnDefNode(pCxt, &yymsp[-3].minor.yy317, yymsp[-2].minor.yy898, &yymsp[0].minor.yy0); } + yymsp[-3].minor.yy74 = yylhsminor.yy74; break; case 159: /* type_name ::= BOOL */ -{ yymsp[0].minor.yy530 = createDataType(TSDB_DATA_TYPE_BOOL); } +{ yymsp[0].minor.yy898 = createDataType(TSDB_DATA_TYPE_BOOL); } break; case 160: /* type_name ::= TINYINT */ -{ yymsp[0].minor.yy530 = createDataType(TSDB_DATA_TYPE_TINYINT); } +{ yymsp[0].minor.yy898 = createDataType(TSDB_DATA_TYPE_TINYINT); } break; case 161: /* type_name ::= SMALLINT */ -{ yymsp[0].minor.yy530 = createDataType(TSDB_DATA_TYPE_SMALLINT); } +{ yymsp[0].minor.yy898 = createDataType(TSDB_DATA_TYPE_SMALLINT); } break; case 162: /* type_name ::= INT */ case 163: /* type_name ::= INTEGER */ yytestcase(yyruleno==163); -{ yymsp[0].minor.yy530 = createDataType(TSDB_DATA_TYPE_INT); } +{ yymsp[0].minor.yy898 = createDataType(TSDB_DATA_TYPE_INT); } break; case 164: /* type_name ::= BIGINT */ -{ yymsp[0].minor.yy530 = createDataType(TSDB_DATA_TYPE_BIGINT); } +{ yymsp[0].minor.yy898 = createDataType(TSDB_DATA_TYPE_BIGINT); } break; case 165: /* type_name ::= FLOAT */ -{ yymsp[0].minor.yy530 = createDataType(TSDB_DATA_TYPE_FLOAT); } +{ yymsp[0].minor.yy898 = createDataType(TSDB_DATA_TYPE_FLOAT); } break; case 166: /* type_name ::= DOUBLE */ -{ yymsp[0].minor.yy530 = createDataType(TSDB_DATA_TYPE_DOUBLE); } +{ yymsp[0].minor.yy898 = createDataType(TSDB_DATA_TYPE_DOUBLE); } break; case 167: /* type_name ::= BINARY NK_LP NK_INTEGER NK_RP */ -{ yymsp[-3].minor.yy530 = createVarLenDataType(TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy0); } +{ yymsp[-3].minor.yy898 = createVarLenDataType(TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy0); } break; case 168: /* type_name ::= TIMESTAMP */ -{ yymsp[0].minor.yy530 = createDataType(TSDB_DATA_TYPE_TIMESTAMP); } +{ yymsp[0].minor.yy898 = createDataType(TSDB_DATA_TYPE_TIMESTAMP); } break; case 169: /* type_name ::= NCHAR NK_LP NK_INTEGER NK_RP */ -{ yymsp[-3].minor.yy530 = createVarLenDataType(TSDB_DATA_TYPE_NCHAR, &yymsp[-1].minor.yy0); } +{ yymsp[-3].minor.yy898 = createVarLenDataType(TSDB_DATA_TYPE_NCHAR, &yymsp[-1].minor.yy0); } break; case 170: /* type_name ::= TINYINT UNSIGNED */ -{ yymsp[-1].minor.yy530 = createDataType(TSDB_DATA_TYPE_UTINYINT); } +{ yymsp[-1].minor.yy898 = createDataType(TSDB_DATA_TYPE_UTINYINT); } break; case 171: /* type_name ::= SMALLINT UNSIGNED */ -{ yymsp[-1].minor.yy530 = createDataType(TSDB_DATA_TYPE_USMALLINT); } +{ yymsp[-1].minor.yy898 = createDataType(TSDB_DATA_TYPE_USMALLINT); } break; case 172: /* type_name ::= INT UNSIGNED */ -{ yymsp[-1].minor.yy530 = createDataType(TSDB_DATA_TYPE_UINT); } +{ yymsp[-1].minor.yy898 = createDataType(TSDB_DATA_TYPE_UINT); } break; case 173: /* type_name ::= BIGINT UNSIGNED */ -{ yymsp[-1].minor.yy530 = createDataType(TSDB_DATA_TYPE_UBIGINT); } +{ yymsp[-1].minor.yy898 = createDataType(TSDB_DATA_TYPE_UBIGINT); } break; case 174: /* type_name ::= JSON */ -{ yymsp[0].minor.yy530 = createDataType(TSDB_DATA_TYPE_JSON); } +{ yymsp[0].minor.yy898 = createDataType(TSDB_DATA_TYPE_JSON); } break; case 175: /* type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP */ -{ yymsp[-3].minor.yy530 = createVarLenDataType(TSDB_DATA_TYPE_VARCHAR, &yymsp[-1].minor.yy0); } +{ yymsp[-3].minor.yy898 = createVarLenDataType(TSDB_DATA_TYPE_VARCHAR, &yymsp[-1].minor.yy0); } break; case 176: /* type_name ::= MEDIUMBLOB */ -{ yymsp[0].minor.yy530 = createDataType(TSDB_DATA_TYPE_MEDIUMBLOB); } +{ yymsp[0].minor.yy898 = createDataType(TSDB_DATA_TYPE_MEDIUMBLOB); } break; case 177: /* type_name ::= BLOB */ -{ yymsp[0].minor.yy530 = createDataType(TSDB_DATA_TYPE_BLOB); } +{ yymsp[0].minor.yy898 = createDataType(TSDB_DATA_TYPE_BLOB); } break; case 178: /* type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP */ -{ yymsp[-3].minor.yy530 = createVarLenDataType(TSDB_DATA_TYPE_VARBINARY, &yymsp[-1].minor.yy0); } +{ yymsp[-3].minor.yy898 = createVarLenDataType(TSDB_DATA_TYPE_VARBINARY, &yymsp[-1].minor.yy0); } break; case 179: /* type_name ::= DECIMAL */ -{ yymsp[0].minor.yy530 = createDataType(TSDB_DATA_TYPE_DECIMAL); } +{ yymsp[0].minor.yy898 = createDataType(TSDB_DATA_TYPE_DECIMAL); } break; case 180: /* type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP */ -{ yymsp[-3].minor.yy530 = createDataType(TSDB_DATA_TYPE_DECIMAL); } +{ yymsp[-3].minor.yy898 = createDataType(TSDB_DATA_TYPE_DECIMAL); } break; case 181: /* type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */ -{ yymsp[-5].minor.yy530 = createDataType(TSDB_DATA_TYPE_DECIMAL); } +{ yymsp[-5].minor.yy898 = createDataType(TSDB_DATA_TYPE_DECIMAL); } break; case 183: /* tags_def_opt ::= tags_def */ - case 404: /* star_func_para_list ::= other_para_list */ yytestcase(yyruleno==404); -{ yylhsminor.yy404 = yymsp[0].minor.yy404; } - yymsp[0].minor.yy404 = yylhsminor.yy404; + case 407: /* star_func_para_list ::= other_para_list */ yytestcase(yyruleno==407); +{ yylhsminor.yy874 = yymsp[0].minor.yy874; } + yymsp[0].minor.yy874 = yylhsminor.yy874; break; case 184: /* tags_def ::= TAGS NK_LP column_def_list NK_RP */ -{ yymsp[-3].minor.yy404 = yymsp[-1].minor.yy404; } +{ yymsp[-3].minor.yy874 = yymsp[-1].minor.yy874; } break; case 185: /* table_options ::= */ -{ yymsp[1].minor.yy148 = createDefaultTableOptions(pCxt); } +{ yymsp[1].minor.yy74 = createDefaultTableOptions(pCxt); } break; case 186: /* table_options ::= table_options COMMENT NK_STRING */ -{ yylhsminor.yy148 = setTableOption(pCxt, yymsp[-2].minor.yy148, TABLE_OPTION_COMMENT, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setTableOption(pCxt, yymsp[-2].minor.yy74, TABLE_OPTION_COMMENT, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 187: /* table_options ::= table_options MAX_DELAY duration_list */ -{ yylhsminor.yy148 = setTableOption(pCxt, yymsp[-2].minor.yy148, TABLE_OPTION_MAXDELAY, yymsp[0].minor.yy404); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setTableOption(pCxt, yymsp[-2].minor.yy74, TABLE_OPTION_MAXDELAY, yymsp[0].minor.yy874); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 188: /* table_options ::= table_options WATERMARK duration_list */ -{ yylhsminor.yy148 = setTableOption(pCxt, yymsp[-2].minor.yy148, TABLE_OPTION_WATERMARK, yymsp[0].minor.yy404); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setTableOption(pCxt, yymsp[-2].minor.yy74, TABLE_OPTION_WATERMARK, yymsp[0].minor.yy874); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 189: /* table_options ::= table_options ROLLUP NK_LP rollup_func_list NK_RP */ -{ yylhsminor.yy148 = setTableOption(pCxt, yymsp[-4].minor.yy148, TABLE_OPTION_ROLLUP, yymsp[-1].minor.yy404); } - yymsp[-4].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setTableOption(pCxt, yymsp[-4].minor.yy74, TABLE_OPTION_ROLLUP, yymsp[-1].minor.yy874); } + yymsp[-4].minor.yy74 = yylhsminor.yy74; break; case 190: /* table_options ::= table_options TTL NK_INTEGER */ -{ yylhsminor.yy148 = setTableOption(pCxt, yymsp[-2].minor.yy148, TABLE_OPTION_TTL, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setTableOption(pCxt, yymsp[-2].minor.yy74, TABLE_OPTION_TTL, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 191: /* table_options ::= table_options SMA NK_LP col_name_list NK_RP */ -{ yylhsminor.yy148 = setTableOption(pCxt, yymsp[-4].minor.yy148, TABLE_OPTION_SMA, yymsp[-1].minor.yy404); } - yymsp[-4].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setTableOption(pCxt, yymsp[-4].minor.yy74, TABLE_OPTION_SMA, yymsp[-1].minor.yy874); } + yymsp[-4].minor.yy74 = yylhsminor.yy74; break; case 192: /* table_options ::= table_options DELETE_MARK duration_list */ -{ yylhsminor.yy148 = setTableOption(pCxt, yymsp[-2].minor.yy148, TABLE_OPTION_DELETE_MARK, yymsp[0].minor.yy404); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setTableOption(pCxt, yymsp[-2].minor.yy74, TABLE_OPTION_DELETE_MARK, yymsp[0].minor.yy874); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; case 193: /* alter_table_options ::= alter_table_option */ -{ yylhsminor.yy148 = createAlterTableOptions(pCxt); yylhsminor.yy148 = setTableOption(pCxt, yylhsminor.yy148, yymsp[0].minor.yy123.type, &yymsp[0].minor.yy123.val); } - yymsp[0].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = createAlterTableOptions(pCxt); yylhsminor.yy74 = setTableOption(pCxt, yylhsminor.yy74, yymsp[0].minor.yy767.type, &yymsp[0].minor.yy767.val); } + yymsp[0].minor.yy74 = yylhsminor.yy74; break; case 194: /* alter_table_options ::= alter_table_options alter_table_option */ -{ yylhsminor.yy148 = setTableOption(pCxt, yymsp[-1].minor.yy148, yymsp[0].minor.yy123.type, &yymsp[0].minor.yy123.val); } - yymsp[-1].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setTableOption(pCxt, yymsp[-1].minor.yy74, yymsp[0].minor.yy767.type, &yymsp[0].minor.yy767.val); } + yymsp[-1].minor.yy74 = yylhsminor.yy74; break; case 195: /* alter_table_option ::= COMMENT NK_STRING */ -{ yymsp[-1].minor.yy123.type = TABLE_OPTION_COMMENT; yymsp[-1].minor.yy123.val = yymsp[0].minor.yy0; } +{ yymsp[-1].minor.yy767.type = TABLE_OPTION_COMMENT; yymsp[-1].minor.yy767.val = yymsp[0].minor.yy0; } break; case 196: /* alter_table_option ::= TTL NK_INTEGER */ -{ yymsp[-1].minor.yy123.type = TABLE_OPTION_TTL; yymsp[-1].minor.yy123.val = yymsp[0].minor.yy0; } +{ yymsp[-1].minor.yy767.type = TABLE_OPTION_TTL; yymsp[-1].minor.yy767.val = yymsp[0].minor.yy0; } break; case 197: /* duration_list ::= duration_literal */ - case 369: /* expression_list ::= expr_or_subquery */ yytestcase(yyruleno==369); -{ yylhsminor.yy404 = createNodeList(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy148)); } - yymsp[0].minor.yy404 = yylhsminor.yy404; + case 372: /* expression_list ::= expr_or_subquery */ yytestcase(yyruleno==372); +{ yylhsminor.yy874 = createNodeList(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy74)); } + yymsp[0].minor.yy874 = yylhsminor.yy874; break; case 198: /* duration_list ::= duration_list NK_COMMA duration_literal */ - case 370: /* expression_list ::= expression_list NK_COMMA expr_or_subquery */ yytestcase(yyruleno==370); -{ yylhsminor.yy404 = addNodeToList(pCxt, yymsp[-2].minor.yy404, releaseRawExprNode(pCxt, yymsp[0].minor.yy148)); } - yymsp[-2].minor.yy404 = yylhsminor.yy404; + case 373: /* expression_list ::= expression_list NK_COMMA expr_or_subquery */ yytestcase(yyruleno==373); +{ yylhsminor.yy874 = addNodeToList(pCxt, yymsp[-2].minor.yy874, releaseRawExprNode(pCxt, yymsp[0].minor.yy74)); } + yymsp[-2].minor.yy874 = yylhsminor.yy874; break; case 201: /* rollup_func_name ::= function_name */ -{ yylhsminor.yy148 = createFunctionNode(pCxt, &yymsp[0].minor.yy199, NULL); } - yymsp[0].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = createFunctionNode(pCxt, &yymsp[0].minor.yy317, NULL); } + yymsp[0].minor.yy74 = yylhsminor.yy74; break; case 202: /* rollup_func_name ::= FIRST */ case 203: /* rollup_func_name ::= LAST */ yytestcase(yyruleno==203); case 256: /* tag_item ::= QTAGS */ yytestcase(yyruleno==256); -{ yylhsminor.yy148 = createFunctionNode(pCxt, &yymsp[0].minor.yy0, NULL); } - yymsp[0].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = createFunctionNode(pCxt, &yymsp[0].minor.yy0, NULL); } + yymsp[0].minor.yy74 = yylhsminor.yy74; break; case 206: /* col_name ::= column_name */ case 257: /* tag_item ::= column_name */ yytestcase(yyruleno==257); -{ yylhsminor.yy148 = createColumnNode(pCxt, NULL, &yymsp[0].minor.yy199); } - yymsp[0].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = createColumnNode(pCxt, NULL, &yymsp[0].minor.yy317); } + yymsp[0].minor.yy74 = yylhsminor.yy74; break; case 207: /* cmd ::= SHOW DNODES */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_DNODES_STMT); } @@ -4322,13 +4339,13 @@ static YYACTIONTYPE yy_reduce( { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_DATABASES_STMT); } break; case 211: /* cmd ::= SHOW db_name_cond_opt TABLES like_pattern_opt */ -{ pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_TABLES_STMT, yymsp[-2].minor.yy148, yymsp[0].minor.yy148, OP_TYPE_LIKE); } +{ pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_TABLES_STMT, yymsp[-2].minor.yy74, yymsp[0].minor.yy74, OP_TYPE_LIKE); } break; case 212: /* cmd ::= SHOW db_name_cond_opt STABLES like_pattern_opt */ -{ pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_STABLES_STMT, yymsp[-2].minor.yy148, yymsp[0].minor.yy148, OP_TYPE_LIKE); } +{ pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_STABLES_STMT, yymsp[-2].minor.yy74, yymsp[0].minor.yy74, OP_TYPE_LIKE); } break; case 213: /* cmd ::= SHOW db_name_cond_opt VGROUPS */ -{ pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_VGROUPS_STMT, yymsp[-1].minor.yy148, NULL, OP_TYPE_LIKE); } +{ pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_VGROUPS_STMT, yymsp[-1].minor.yy74, NULL, OP_TYPE_LIKE); } break; case 214: /* cmd ::= SHOW MNODES */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_MNODES_STMT); } @@ -4340,7 +4357,7 @@ static YYACTIONTYPE yy_reduce( { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_FUNCTIONS_STMT); } break; case 217: /* cmd ::= SHOW INDEXES FROM table_name_cond from_db_opt */ -{ pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_INDEXES_STMT, yymsp[0].minor.yy148, yymsp[-1].minor.yy148, OP_TYPE_EQUAL); } +{ pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_INDEXES_STMT, yymsp[0].minor.yy74, yymsp[-1].minor.yy74, OP_TYPE_EQUAL); } break; case 218: /* cmd ::= SHOW STREAMS */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_STREAMS_STMT); } @@ -4359,13 +4376,13 @@ static YYACTIONTYPE yy_reduce( { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_LICENCES_STMT); } break; case 224: /* cmd ::= SHOW CREATE DATABASE db_name */ -{ pCxt->pRootNode = createShowCreateDatabaseStmt(pCxt, &yymsp[0].minor.yy199); } +{ pCxt->pRootNode = createShowCreateDatabaseStmt(pCxt, &yymsp[0].minor.yy317); } break; case 225: /* cmd ::= SHOW CREATE TABLE full_table_name */ -{ pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_TABLE_STMT, yymsp[0].minor.yy148); } +{ pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_TABLE_STMT, yymsp[0].minor.yy74); } break; case 226: /* cmd ::= SHOW CREATE STABLE full_table_name */ -{ pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_STABLE_STMT, yymsp[0].minor.yy148); } +{ pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_STABLE_STMT, yymsp[0].minor.yy74); } break; case 227: /* cmd ::= SHOW QUERIES */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_QUERIES_STMT); } @@ -4384,7 +4401,7 @@ static YYACTIONTYPE yy_reduce( { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_LOCAL_VARIABLES_STMT); } break; case 233: /* cmd ::= SHOW DNODE NK_INTEGER VARIABLES like_pattern_opt */ -{ pCxt->pRootNode = createShowDnodeVariablesStmt(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[-2].minor.yy0), yymsp[0].minor.yy148); } +{ pCxt->pRootNode = createShowDnodeVariablesStmt(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[-2].minor.yy0), yymsp[0].minor.yy74); } break; case 234: /* cmd ::= SHOW BNODES */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_BNODES_STMT); } @@ -4399,7 +4416,7 @@ static YYACTIONTYPE yy_reduce( { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_TRANSACTIONS_STMT); } break; case 238: /* cmd ::= SHOW TABLE DISTRIBUTED full_table_name */ -{ pCxt->pRootNode = createShowTableDistributedStmt(pCxt, yymsp[0].minor.yy148); } +{ pCxt->pRootNode = createShowTableDistributedStmt(pCxt, yymsp[0].minor.yy74); } break; case 239: /* cmd ::= SHOW CONSUMERS */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_CONSUMERS_STMT); } @@ -4408,10 +4425,10 @@ static YYACTIONTYPE yy_reduce( { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_SUBSCRIPTIONS_STMT); } break; case 241: /* cmd ::= SHOW TAGS FROM table_name_cond from_db_opt */ -{ pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_TAGS_STMT, yymsp[0].minor.yy148, yymsp[-1].minor.yy148, OP_TYPE_EQUAL); } +{ pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_TAGS_STMT, yymsp[0].minor.yy74, yymsp[-1].minor.yy74, OP_TYPE_EQUAL); } break; case 242: /* cmd ::= SHOW TABLE TAGS tag_list_opt FROM table_name_cond from_db_opt */ -{ pCxt->pRootNode = createShowTableTagsStmt(pCxt, yymsp[-1].minor.yy148, yymsp[0].minor.yy148, yymsp[-3].minor.yy404); } +{ pCxt->pRootNode = createShowTableTagsStmt(pCxt, yymsp[-1].minor.yy74, yymsp[0].minor.yy74, yymsp[-3].minor.yy874); } break; case 243: /* cmd ::= SHOW VNODES NK_INTEGER */ { pCxt->pRootNode = createShowVnodesStmt(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0), NULL); } @@ -4421,733 +4438,741 @@ static YYACTIONTYPE yy_reduce( break; case 245: /* db_name_cond_opt ::= */ case 250: /* from_db_opt ::= */ yytestcase(yyruleno==250); -{ yymsp[1].minor.yy148 = createDefaultDatabaseCondValue(pCxt); } +{ yymsp[1].minor.yy74 = createDefaultDatabaseCondValue(pCxt); } break; case 246: /* db_name_cond_opt ::= db_name NK_DOT */ -{ yylhsminor.yy148 = createIdentifierValueNode(pCxt, &yymsp[-1].minor.yy199); } - yymsp[-1].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = createIdentifierValueNode(pCxt, &yymsp[-1].minor.yy317); } + yymsp[-1].minor.yy74 = yylhsminor.yy74; break; case 247: /* like_pattern_opt ::= */ - case 302: /* subtable_opt ::= */ yytestcase(yyruleno==302); - case 414: /* case_when_else_opt ::= */ yytestcase(yyruleno==414); - case 444: /* from_clause_opt ::= */ yytestcase(yyruleno==444); - case 473: /* where_clause_opt ::= */ yytestcase(yyruleno==473); - case 482: /* twindow_clause_opt ::= */ yytestcase(yyruleno==482); - case 487: /* sliding_opt ::= */ yytestcase(yyruleno==487); - case 489: /* fill_opt ::= */ yytestcase(yyruleno==489); - case 501: /* having_clause_opt ::= */ yytestcase(yyruleno==501); - case 503: /* range_opt ::= */ yytestcase(yyruleno==503); - case 505: /* every_opt ::= */ yytestcase(yyruleno==505); - case 518: /* slimit_clause_opt ::= */ yytestcase(yyruleno==518); - case 522: /* limit_clause_opt ::= */ yytestcase(yyruleno==522); -{ yymsp[1].minor.yy148 = NULL; } + case 304: /* subtable_opt ::= */ yytestcase(yyruleno==304); + case 417: /* case_when_else_opt ::= */ yytestcase(yyruleno==417); + case 447: /* from_clause_opt ::= */ yytestcase(yyruleno==447); + case 476: /* where_clause_opt ::= */ yytestcase(yyruleno==476); + case 485: /* twindow_clause_opt ::= */ yytestcase(yyruleno==485); + case 490: /* sliding_opt ::= */ yytestcase(yyruleno==490); + case 492: /* fill_opt ::= */ yytestcase(yyruleno==492); + case 504: /* having_clause_opt ::= */ yytestcase(yyruleno==504); + case 506: /* range_opt ::= */ yytestcase(yyruleno==506); + case 508: /* every_opt ::= */ yytestcase(yyruleno==508); + case 521: /* slimit_clause_opt ::= */ yytestcase(yyruleno==521); + case 525: /* limit_clause_opt ::= */ yytestcase(yyruleno==525); +{ yymsp[1].minor.yy74 = NULL; } break; case 248: /* like_pattern_opt ::= LIKE NK_STRING */ -{ yymsp[-1].minor.yy148 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); } +{ yymsp[-1].minor.yy74 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); } break; case 249: /* table_name_cond ::= table_name */ -{ yylhsminor.yy148 = createIdentifierValueNode(pCxt, &yymsp[0].minor.yy199); } - yymsp[0].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = createIdentifierValueNode(pCxt, &yymsp[0].minor.yy317); } + yymsp[0].minor.yy74 = yylhsminor.yy74; break; case 251: /* from_db_opt ::= FROM db_name */ -{ yymsp[-1].minor.yy148 = createIdentifierValueNode(pCxt, &yymsp[0].minor.yy199); } +{ yymsp[-1].minor.yy74 = createIdentifierValueNode(pCxt, &yymsp[0].minor.yy317); } break; case 255: /* tag_item ::= TBNAME */ -{ yylhsminor.yy148 = setProjectionAlias(pCxt, createFunctionNode(pCxt, &yymsp[0].minor.yy0, NULL), &yymsp[0].minor.yy0); } - yymsp[0].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setProjectionAlias(pCxt, createFunctionNode(pCxt, &yymsp[0].minor.yy0, NULL), &yymsp[0].minor.yy0); } + yymsp[0].minor.yy74 = yylhsminor.yy74; break; case 258: /* tag_item ::= column_name column_alias */ -{ yylhsminor.yy148 = setProjectionAlias(pCxt, createColumnNode(pCxt, NULL, &yymsp[-1].minor.yy199), &yymsp[0].minor.yy199); } - yymsp[-1].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setProjectionAlias(pCxt, createColumnNode(pCxt, NULL, &yymsp[-1].minor.yy317), &yymsp[0].minor.yy317); } + yymsp[-1].minor.yy74 = yylhsminor.yy74; break; case 259: /* tag_item ::= column_name AS column_alias */ -{ yylhsminor.yy148 = setProjectionAlias(pCxt, createColumnNode(pCxt, NULL, &yymsp[-2].minor.yy199), &yymsp[0].minor.yy199); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; +{ yylhsminor.yy74 = setProjectionAlias(pCxt, createColumnNode(pCxt, NULL, &yymsp[-2].minor.yy317), &yymsp[0].minor.yy317); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 260: /* cmd ::= CREATE SMA INDEX not_exists_opt full_table_name ON full_table_name index_options */ -{ pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_SMA, yymsp[-4].minor.yy397, yymsp[-3].minor.yy148, yymsp[-1].minor.yy148, NULL, yymsp[0].minor.yy148); } + case 260: /* cmd ::= CREATE SMA INDEX not_exists_opt full_index_name ON full_table_name index_options */ +{ pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_SMA, yymsp[-4].minor.yy335, yymsp[-3].minor.yy74, yymsp[-1].minor.yy74, NULL, yymsp[0].minor.yy74); } break; - case 261: /* cmd ::= DROP INDEX exists_opt full_table_name */ -{ pCxt->pRootNode = createDropIndexStmt(pCxt, yymsp[-1].minor.yy397, yymsp[0].minor.yy148); } + case 261: /* cmd ::= DROP INDEX exists_opt full_index_name */ +{ pCxt->pRootNode = createDropIndexStmt(pCxt, yymsp[-1].minor.yy335, yymsp[0].minor.yy74); } break; - case 262: /* index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt sma_stream_opt */ -{ yymsp[-9].minor.yy148 = createIndexOption(pCxt, yymsp[-7].minor.yy404, releaseRawExprNode(pCxt, yymsp[-3].minor.yy148), NULL, yymsp[-1].minor.yy148, yymsp[0].minor.yy148); } + case 262: /* full_index_name ::= index_name */ +{ yylhsminor.yy74 = createRealTableNodeForIndexName(pCxt, NULL, &yymsp[0].minor.yy317); } + yymsp[0].minor.yy74 = yylhsminor.yy74; break; - case 263: /* index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt sma_stream_opt */ -{ yymsp[-11].minor.yy148 = createIndexOption(pCxt, yymsp[-9].minor.yy404, releaseRawExprNode(pCxt, yymsp[-5].minor.yy148), releaseRawExprNode(pCxt, yymsp[-3].minor.yy148), yymsp[-1].minor.yy148, yymsp[0].minor.yy148); } + case 263: /* full_index_name ::= db_name NK_DOT index_name */ +{ yylhsminor.yy74 = createRealTableNodeForIndexName(pCxt, &yymsp[-2].minor.yy317, &yymsp[0].minor.yy317); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 266: /* func ::= function_name NK_LP expression_list NK_RP */ -{ yylhsminor.yy148 = createFunctionNode(pCxt, &yymsp[-3].minor.yy199, yymsp[-1].minor.yy404); } - yymsp[-3].minor.yy148 = yylhsminor.yy148; + case 264: /* index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt sma_stream_opt */ +{ yymsp[-9].minor.yy74 = createIndexOption(pCxt, yymsp[-7].minor.yy874, releaseRawExprNode(pCxt, yymsp[-3].minor.yy74), NULL, yymsp[-1].minor.yy74, yymsp[0].minor.yy74); } break; - case 267: /* sma_stream_opt ::= */ - case 295: /* stream_options ::= */ yytestcase(yyruleno==295); -{ yymsp[1].minor.yy148 = createStreamOptions(pCxt); } + case 265: /* index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt sma_stream_opt */ +{ yymsp[-11].minor.yy74 = createIndexOption(pCxt, yymsp[-9].minor.yy874, releaseRawExprNode(pCxt, yymsp[-5].minor.yy74), releaseRawExprNode(pCxt, yymsp[-3].minor.yy74), yymsp[-1].minor.yy74, yymsp[0].minor.yy74); } break; - case 268: /* sma_stream_opt ::= sma_stream_opt WATERMARK duration_literal */ - case 299: /* stream_options ::= stream_options WATERMARK duration_literal */ yytestcase(yyruleno==299); -{ ((SStreamOptions*)yymsp[-2].minor.yy148)->pWatermark = releaseRawExprNode(pCxt, yymsp[0].minor.yy148); yylhsminor.yy148 = yymsp[-2].minor.yy148; } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + case 268: /* func ::= function_name NK_LP expression_list NK_RP */ +{ yylhsminor.yy74 = createFunctionNode(pCxt, &yymsp[-3].minor.yy317, yymsp[-1].minor.yy874); } + yymsp[-3].minor.yy74 = yylhsminor.yy74; break; - case 269: /* sma_stream_opt ::= sma_stream_opt MAX_DELAY duration_literal */ -{ ((SStreamOptions*)yymsp[-2].minor.yy148)->pDelay = releaseRawExprNode(pCxt, yymsp[0].minor.yy148); yylhsminor.yy148 = yymsp[-2].minor.yy148; } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + case 269: /* sma_stream_opt ::= */ + case 297: /* stream_options ::= */ yytestcase(yyruleno==297); +{ yymsp[1].minor.yy74 = createStreamOptions(pCxt); } break; - case 270: /* sma_stream_opt ::= sma_stream_opt DELETE_MARK duration_literal */ -{ ((SStreamOptions*)yymsp[-2].minor.yy148)->pDeleteMark = releaseRawExprNode(pCxt, yymsp[0].minor.yy148); yylhsminor.yy148 = yymsp[-2].minor.yy148; } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + case 270: /* sma_stream_opt ::= sma_stream_opt WATERMARK duration_literal */ + case 301: /* stream_options ::= stream_options WATERMARK duration_literal */ yytestcase(yyruleno==301); +{ ((SStreamOptions*)yymsp[-2].minor.yy74)->pWatermark = releaseRawExprNode(pCxt, yymsp[0].minor.yy74); yylhsminor.yy74 = yymsp[-2].minor.yy74; } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 271: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_or_subquery */ -{ pCxt->pRootNode = createCreateTopicStmtUseQuery(pCxt, yymsp[-3].minor.yy397, &yymsp[-2].minor.yy199, yymsp[0].minor.yy148); } + case 271: /* sma_stream_opt ::= sma_stream_opt MAX_DELAY duration_literal */ +{ ((SStreamOptions*)yymsp[-2].minor.yy74)->pDelay = releaseRawExprNode(pCxt, yymsp[0].minor.yy74); yylhsminor.yy74 = yymsp[-2].minor.yy74; } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 272: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS DATABASE db_name */ -{ pCxt->pRootNode = createCreateTopicStmtUseDb(pCxt, yymsp[-4].minor.yy397, &yymsp[-3].minor.yy199, &yymsp[0].minor.yy199, false); } + case 272: /* sma_stream_opt ::= sma_stream_opt DELETE_MARK duration_literal */ +{ ((SStreamOptions*)yymsp[-2].minor.yy74)->pDeleteMark = releaseRawExprNode(pCxt, yymsp[0].minor.yy74); yylhsminor.yy74 = yymsp[-2].minor.yy74; } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 273: /* cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS DATABASE db_name */ -{ pCxt->pRootNode = createCreateTopicStmtUseDb(pCxt, yymsp[-6].minor.yy397, &yymsp[-5].minor.yy199, &yymsp[0].minor.yy199, true); } + case 273: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_or_subquery */ +{ pCxt->pRootNode = createCreateTopicStmtUseQuery(pCxt, yymsp[-3].minor.yy335, &yymsp[-2].minor.yy317, yymsp[0].minor.yy74); } break; - case 274: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS STABLE full_table_name */ -{ pCxt->pRootNode = createCreateTopicStmtUseTable(pCxt, yymsp[-4].minor.yy397, &yymsp[-3].minor.yy199, yymsp[0].minor.yy148, false); } + case 274: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS DATABASE db_name */ +{ pCxt->pRootNode = createCreateTopicStmtUseDb(pCxt, yymsp[-4].minor.yy335, &yymsp[-3].minor.yy317, &yymsp[0].minor.yy317, false); } break; - case 275: /* cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS STABLE full_table_name */ -{ pCxt->pRootNode = createCreateTopicStmtUseTable(pCxt, yymsp[-6].minor.yy397, &yymsp[-5].minor.yy199, yymsp[0].minor.yy148, true); } + case 275: /* cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS DATABASE db_name */ +{ pCxt->pRootNode = createCreateTopicStmtUseDb(pCxt, yymsp[-6].minor.yy335, &yymsp[-5].minor.yy317, &yymsp[0].minor.yy317, true); } break; - case 276: /* cmd ::= DROP TOPIC exists_opt topic_name */ -{ pCxt->pRootNode = createDropTopicStmt(pCxt, yymsp[-1].minor.yy397, &yymsp[0].minor.yy199); } + case 276: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS STABLE full_table_name */ +{ pCxt->pRootNode = createCreateTopicStmtUseTable(pCxt, yymsp[-4].minor.yy335, &yymsp[-3].minor.yy317, yymsp[0].minor.yy74, false); } break; - case 277: /* cmd ::= DROP CONSUMER GROUP exists_opt cgroup_name ON topic_name */ -{ pCxt->pRootNode = createDropCGroupStmt(pCxt, yymsp[-3].minor.yy397, &yymsp[-2].minor.yy199, &yymsp[0].minor.yy199); } + case 277: /* cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS STABLE full_table_name */ +{ pCxt->pRootNode = createCreateTopicStmtUseTable(pCxt, yymsp[-6].minor.yy335, &yymsp[-5].minor.yy317, yymsp[0].minor.yy74, true); } break; - case 278: /* cmd ::= DESC full_table_name */ - case 279: /* cmd ::= DESCRIBE full_table_name */ yytestcase(yyruleno==279); -{ pCxt->pRootNode = createDescribeStmt(pCxt, yymsp[0].minor.yy148); } + case 278: /* cmd ::= DROP TOPIC exists_opt topic_name */ +{ pCxt->pRootNode = createDropTopicStmt(pCxt, yymsp[-1].minor.yy335, &yymsp[0].minor.yy317); } break; - case 280: /* cmd ::= RESET QUERY CACHE */ + case 279: /* cmd ::= DROP CONSUMER GROUP exists_opt cgroup_name ON topic_name */ +{ pCxt->pRootNode = createDropCGroupStmt(pCxt, yymsp[-3].minor.yy335, &yymsp[-2].minor.yy317, &yymsp[0].minor.yy317); } + break; + case 280: /* cmd ::= DESC full_table_name */ + case 281: /* cmd ::= DESCRIBE full_table_name */ yytestcase(yyruleno==281); +{ pCxt->pRootNode = createDescribeStmt(pCxt, yymsp[0].minor.yy74); } + break; + case 282: /* cmd ::= RESET QUERY CACHE */ { pCxt->pRootNode = createResetQueryCacheStmt(pCxt); } break; - case 281: /* cmd ::= EXPLAIN analyze_opt explain_options query_or_subquery */ -{ pCxt->pRootNode = createExplainStmt(pCxt, yymsp[-2].minor.yy397, yymsp[-1].minor.yy148, yymsp[0].minor.yy148); } + case 283: /* cmd ::= EXPLAIN analyze_opt explain_options query_or_subquery */ +{ pCxt->pRootNode = createExplainStmt(pCxt, yymsp[-2].minor.yy335, yymsp[-1].minor.yy74, yymsp[0].minor.yy74); } break; - case 284: /* explain_options ::= */ -{ yymsp[1].minor.yy148 = createDefaultExplainOptions(pCxt); } + case 286: /* explain_options ::= */ +{ yymsp[1].minor.yy74 = createDefaultExplainOptions(pCxt); } break; - case 285: /* explain_options ::= explain_options VERBOSE NK_BOOL */ -{ yylhsminor.yy148 = setExplainVerbose(pCxt, yymsp[-2].minor.yy148, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + case 287: /* explain_options ::= explain_options VERBOSE NK_BOOL */ +{ yylhsminor.yy74 = setExplainVerbose(pCxt, yymsp[-2].minor.yy74, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 286: /* explain_options ::= explain_options RATIO NK_FLOAT */ -{ yylhsminor.yy148 = setExplainRatio(pCxt, yymsp[-2].minor.yy148, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + case 288: /* explain_options ::= explain_options RATIO NK_FLOAT */ +{ yylhsminor.yy74 = setExplainRatio(pCxt, yymsp[-2].minor.yy74, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 287: /* cmd ::= CREATE agg_func_opt FUNCTION not_exists_opt function_name AS NK_STRING OUTPUTTYPE type_name bufsize_opt */ -{ pCxt->pRootNode = createCreateFunctionStmt(pCxt, yymsp[-6].minor.yy397, yymsp[-8].minor.yy397, &yymsp[-5].minor.yy199, &yymsp[-3].minor.yy0, yymsp[-1].minor.yy530, yymsp[0].minor.yy706); } + case 289: /* cmd ::= CREATE agg_func_opt FUNCTION not_exists_opt function_name AS NK_STRING OUTPUTTYPE type_name bufsize_opt */ +{ pCxt->pRootNode = createCreateFunctionStmt(pCxt, yymsp[-6].minor.yy335, yymsp[-8].minor.yy335, &yymsp[-5].minor.yy317, &yymsp[-3].minor.yy0, yymsp[-1].minor.yy898, yymsp[0].minor.yy856); } break; - case 288: /* cmd ::= DROP FUNCTION exists_opt function_name */ -{ pCxt->pRootNode = createDropFunctionStmt(pCxt, yymsp[-1].minor.yy397, &yymsp[0].minor.yy199); } + case 290: /* cmd ::= DROP FUNCTION exists_opt function_name */ +{ pCxt->pRootNode = createDropFunctionStmt(pCxt, yymsp[-1].minor.yy335, &yymsp[0].minor.yy317); } break; - case 293: /* cmd ::= CREATE STREAM not_exists_opt stream_name stream_options INTO full_table_name tags_def_opt subtable_opt AS query_or_subquery */ -{ pCxt->pRootNode = createCreateStreamStmt(pCxt, yymsp[-8].minor.yy397, &yymsp[-7].minor.yy199, yymsp[-4].minor.yy148, yymsp[-6].minor.yy148, yymsp[-3].minor.yy404, yymsp[-2].minor.yy148, yymsp[0].minor.yy148); } + case 295: /* cmd ::= CREATE STREAM not_exists_opt stream_name stream_options INTO full_table_name tags_def_opt subtable_opt AS query_or_subquery */ +{ pCxt->pRootNode = createCreateStreamStmt(pCxt, yymsp[-8].minor.yy335, &yymsp[-7].minor.yy317, yymsp[-4].minor.yy74, yymsp[-6].minor.yy74, yymsp[-3].minor.yy874, yymsp[-2].minor.yy74, yymsp[0].minor.yy74); } break; - case 294: /* cmd ::= DROP STREAM exists_opt stream_name */ -{ pCxt->pRootNode = createDropStreamStmt(pCxt, yymsp[-1].minor.yy397, &yymsp[0].minor.yy199); } + case 296: /* cmd ::= DROP STREAM exists_opt stream_name */ +{ pCxt->pRootNode = createDropStreamStmt(pCxt, yymsp[-1].minor.yy335, &yymsp[0].minor.yy317); } break; - case 296: /* stream_options ::= stream_options TRIGGER AT_ONCE */ -{ ((SStreamOptions*)yymsp[-2].minor.yy148)->triggerType = STREAM_TRIGGER_AT_ONCE; yylhsminor.yy148 = yymsp[-2].minor.yy148; } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + case 298: /* stream_options ::= stream_options TRIGGER AT_ONCE */ +{ ((SStreamOptions*)yymsp[-2].minor.yy74)->triggerType = STREAM_TRIGGER_AT_ONCE; yylhsminor.yy74 = yymsp[-2].minor.yy74; } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 297: /* stream_options ::= stream_options TRIGGER WINDOW_CLOSE */ -{ ((SStreamOptions*)yymsp[-2].minor.yy148)->triggerType = STREAM_TRIGGER_WINDOW_CLOSE; yylhsminor.yy148 = yymsp[-2].minor.yy148; } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + case 299: /* stream_options ::= stream_options TRIGGER WINDOW_CLOSE */ +{ ((SStreamOptions*)yymsp[-2].minor.yy74)->triggerType = STREAM_TRIGGER_WINDOW_CLOSE; yylhsminor.yy74 = yymsp[-2].minor.yy74; } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 298: /* stream_options ::= stream_options TRIGGER MAX_DELAY duration_literal */ -{ ((SStreamOptions*)yymsp[-3].minor.yy148)->triggerType = STREAM_TRIGGER_MAX_DELAY; ((SStreamOptions*)yymsp[-3].minor.yy148)->pDelay = releaseRawExprNode(pCxt, yymsp[0].minor.yy148); yylhsminor.yy148 = yymsp[-3].minor.yy148; } - yymsp[-3].minor.yy148 = yylhsminor.yy148; + case 300: /* stream_options ::= stream_options TRIGGER MAX_DELAY duration_literal */ +{ ((SStreamOptions*)yymsp[-3].minor.yy74)->triggerType = STREAM_TRIGGER_MAX_DELAY; ((SStreamOptions*)yymsp[-3].minor.yy74)->pDelay = releaseRawExprNode(pCxt, yymsp[0].minor.yy74); yylhsminor.yy74 = yymsp[-3].minor.yy74; } + yymsp[-3].minor.yy74 = yylhsminor.yy74; break; - case 300: /* stream_options ::= stream_options IGNORE EXPIRED NK_INTEGER */ -{ ((SStreamOptions*)yymsp[-3].minor.yy148)->ignoreExpired = taosStr2Int8(yymsp[0].minor.yy0.z, NULL, 10); yylhsminor.yy148 = yymsp[-3].minor.yy148; } - yymsp[-3].minor.yy148 = yylhsminor.yy148; + case 302: /* stream_options ::= stream_options IGNORE EXPIRED NK_INTEGER */ +{ ((SStreamOptions*)yymsp[-3].minor.yy74)->ignoreExpired = taosStr2Int8(yymsp[0].minor.yy0.z, NULL, 10); yylhsminor.yy74 = yymsp[-3].minor.yy74; } + yymsp[-3].minor.yy74 = yylhsminor.yy74; break; - case 301: /* stream_options ::= stream_options FILL_HISTORY NK_INTEGER */ -{ ((SStreamOptions*)yymsp[-2].minor.yy148)->fillHistory = taosStr2Int8(yymsp[0].minor.yy0.z, NULL, 10); yylhsminor.yy148 = yymsp[-2].minor.yy148; } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + case 303: /* stream_options ::= stream_options FILL_HISTORY NK_INTEGER */ +{ ((SStreamOptions*)yymsp[-2].minor.yy74)->fillHistory = taosStr2Int8(yymsp[0].minor.yy0.z, NULL, 10); yylhsminor.yy74 = yymsp[-2].minor.yy74; } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 303: /* subtable_opt ::= SUBTABLE NK_LP expression NK_RP */ - case 488: /* sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */ yytestcase(yyruleno==488); - case 506: /* every_opt ::= EVERY NK_LP duration_literal NK_RP */ yytestcase(yyruleno==506); -{ yymsp[-3].minor.yy148 = releaseRawExprNode(pCxt, yymsp[-1].minor.yy148); } + case 305: /* subtable_opt ::= SUBTABLE NK_LP expression NK_RP */ + case 491: /* sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */ yytestcase(yyruleno==491); + case 509: /* every_opt ::= EVERY NK_LP duration_literal NK_RP */ yytestcase(yyruleno==509); +{ yymsp[-3].minor.yy74 = releaseRawExprNode(pCxt, yymsp[-1].minor.yy74); } break; - case 304: /* cmd ::= KILL CONNECTION NK_INTEGER */ + case 306: /* cmd ::= KILL CONNECTION NK_INTEGER */ { pCxt->pRootNode = createKillStmt(pCxt, QUERY_NODE_KILL_CONNECTION_STMT, &yymsp[0].minor.yy0); } break; - case 305: /* cmd ::= KILL QUERY NK_STRING */ + case 307: /* cmd ::= KILL QUERY NK_STRING */ { pCxt->pRootNode = createKillQueryStmt(pCxt, &yymsp[0].minor.yy0); } break; - case 306: /* cmd ::= KILL TRANSACTION NK_INTEGER */ + case 308: /* cmd ::= KILL TRANSACTION NK_INTEGER */ { pCxt->pRootNode = createKillStmt(pCxt, QUERY_NODE_KILL_TRANSACTION_STMT, &yymsp[0].minor.yy0); } break; - case 307: /* cmd ::= BALANCE VGROUP */ + case 309: /* cmd ::= BALANCE VGROUP */ { pCxt->pRootNode = createBalanceVgroupStmt(pCxt); } break; - case 308: /* cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER */ + case 310: /* cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER */ { pCxt->pRootNode = createMergeVgroupStmt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); } break; - case 309: /* cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list */ -{ pCxt->pRootNode = createRedistributeVgroupStmt(pCxt, &yymsp[-1].minor.yy0, yymsp[0].minor.yy404); } + case 311: /* cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list */ +{ pCxt->pRootNode = createRedistributeVgroupStmt(pCxt, &yymsp[-1].minor.yy0, yymsp[0].minor.yy874); } break; - case 310: /* cmd ::= SPLIT VGROUP NK_INTEGER */ + case 312: /* cmd ::= SPLIT VGROUP NK_INTEGER */ { pCxt->pRootNode = createSplitVgroupStmt(pCxt, &yymsp[0].minor.yy0); } break; - case 311: /* dnode_list ::= DNODE NK_INTEGER */ -{ yymsp[-1].minor.yy404 = createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); } + case 313: /* dnode_list ::= DNODE NK_INTEGER */ +{ yymsp[-1].minor.yy874 = createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); } break; - case 313: /* cmd ::= DELETE FROM full_table_name where_clause_opt */ -{ pCxt->pRootNode = createDeleteStmt(pCxt, yymsp[-1].minor.yy148, yymsp[0].minor.yy148); } + case 315: /* cmd ::= DELETE FROM full_table_name where_clause_opt */ +{ pCxt->pRootNode = createDeleteStmt(pCxt, yymsp[-1].minor.yy74, yymsp[0].minor.yy74); } break; - case 315: /* cmd ::= INSERT INTO full_table_name NK_LP col_name_list NK_RP query_or_subquery */ -{ pCxt->pRootNode = createInsertStmt(pCxt, yymsp[-4].minor.yy148, yymsp[-2].minor.yy404, yymsp[0].minor.yy148); } + case 317: /* cmd ::= INSERT INTO full_table_name NK_LP col_name_list NK_RP query_or_subquery */ +{ pCxt->pRootNode = createInsertStmt(pCxt, yymsp[-4].minor.yy74, yymsp[-2].minor.yy874, yymsp[0].minor.yy74); } break; - case 316: /* cmd ::= INSERT INTO full_table_name query_or_subquery */ -{ pCxt->pRootNode = createInsertStmt(pCxt, yymsp[-1].minor.yy148, NULL, yymsp[0].minor.yy148); } + case 318: /* cmd ::= INSERT INTO full_table_name query_or_subquery */ +{ pCxt->pRootNode = createInsertStmt(pCxt, yymsp[-1].minor.yy74, NULL, yymsp[0].minor.yy74); } break; - case 317: /* literal ::= NK_INTEGER */ -{ yylhsminor.yy148 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_UBIGINT, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy148 = yylhsminor.yy148; + case 319: /* literal ::= NK_INTEGER */ +{ yylhsminor.yy74 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_UBIGINT, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy74 = yylhsminor.yy74; break; - case 318: /* literal ::= NK_FLOAT */ -{ yylhsminor.yy148 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy148 = yylhsminor.yy148; + case 320: /* literal ::= NK_FLOAT */ +{ yylhsminor.yy74 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy74 = yylhsminor.yy74; break; - case 319: /* literal ::= NK_STRING */ -{ yylhsminor.yy148 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy148 = yylhsminor.yy148; + case 321: /* literal ::= NK_STRING */ +{ yylhsminor.yy74 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy74 = yylhsminor.yy74; break; - case 320: /* literal ::= NK_BOOL */ -{ yylhsminor.yy148 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy148 = yylhsminor.yy148; + case 322: /* literal ::= NK_BOOL */ +{ yylhsminor.yy74 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy74 = yylhsminor.yy74; break; - case 321: /* literal ::= TIMESTAMP NK_STRING */ -{ yylhsminor.yy148 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0)); } - yymsp[-1].minor.yy148 = yylhsminor.yy148; + case 323: /* literal ::= TIMESTAMP NK_STRING */ +{ yylhsminor.yy74 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0)); } + yymsp[-1].minor.yy74 = yylhsminor.yy74; break; - case 322: /* literal ::= duration_literal */ - case 332: /* signed_literal ::= signed */ yytestcase(yyruleno==332); - case 352: /* expr_or_subquery ::= expression */ yytestcase(yyruleno==352); - case 353: /* expression ::= literal */ yytestcase(yyruleno==353); - case 354: /* expression ::= pseudo_column */ yytestcase(yyruleno==354); - case 355: /* expression ::= column_reference */ yytestcase(yyruleno==355); - case 356: /* expression ::= function_expression */ yytestcase(yyruleno==356); - case 357: /* expression ::= case_when_expression */ yytestcase(yyruleno==357); - case 387: /* function_expression ::= literal_func */ yytestcase(yyruleno==387); - case 436: /* boolean_value_expression ::= boolean_primary */ yytestcase(yyruleno==436); - case 440: /* boolean_primary ::= predicate */ yytestcase(yyruleno==440); - case 442: /* common_expression ::= expr_or_subquery */ yytestcase(yyruleno==442); - case 443: /* common_expression ::= boolean_value_expression */ yytestcase(yyruleno==443); - case 446: /* table_reference_list ::= table_reference */ yytestcase(yyruleno==446); - case 448: /* table_reference ::= table_primary */ yytestcase(yyruleno==448); - case 449: /* table_reference ::= joined_table */ yytestcase(yyruleno==449); - case 453: /* table_primary ::= parenthesized_joined_table */ yytestcase(yyruleno==453); - case 508: /* query_simple ::= query_specification */ yytestcase(yyruleno==508); - case 509: /* query_simple ::= union_query_expression */ yytestcase(yyruleno==509); - case 512: /* query_simple_or_subquery ::= query_simple */ yytestcase(yyruleno==512); - case 514: /* query_or_subquery ::= query_expression */ yytestcase(yyruleno==514); -{ yylhsminor.yy148 = yymsp[0].minor.yy148; } - yymsp[0].minor.yy148 = yylhsminor.yy148; + case 324: /* literal ::= duration_literal */ + case 334: /* signed_literal ::= signed */ yytestcase(yyruleno==334); + case 355: /* expr_or_subquery ::= expression */ yytestcase(yyruleno==355); + case 356: /* expression ::= literal */ yytestcase(yyruleno==356); + case 357: /* expression ::= pseudo_column */ yytestcase(yyruleno==357); + case 358: /* expression ::= column_reference */ yytestcase(yyruleno==358); + case 359: /* expression ::= function_expression */ yytestcase(yyruleno==359); + case 360: /* expression ::= case_when_expression */ yytestcase(yyruleno==360); + case 390: /* function_expression ::= literal_func */ yytestcase(yyruleno==390); + case 439: /* boolean_value_expression ::= boolean_primary */ yytestcase(yyruleno==439); + case 443: /* boolean_primary ::= predicate */ yytestcase(yyruleno==443); + case 445: /* common_expression ::= expr_or_subquery */ yytestcase(yyruleno==445); + case 446: /* common_expression ::= boolean_value_expression */ yytestcase(yyruleno==446); + case 449: /* table_reference_list ::= table_reference */ yytestcase(yyruleno==449); + case 451: /* table_reference ::= table_primary */ yytestcase(yyruleno==451); + case 452: /* table_reference ::= joined_table */ yytestcase(yyruleno==452); + case 456: /* table_primary ::= parenthesized_joined_table */ yytestcase(yyruleno==456); + case 511: /* query_simple ::= query_specification */ yytestcase(yyruleno==511); + case 512: /* query_simple ::= union_query_expression */ yytestcase(yyruleno==512); + case 515: /* query_simple_or_subquery ::= query_simple */ yytestcase(yyruleno==515); + case 517: /* query_or_subquery ::= query_expression */ yytestcase(yyruleno==517); +{ yylhsminor.yy74 = yymsp[0].minor.yy74; } + yymsp[0].minor.yy74 = yylhsminor.yy74; break; - case 323: /* literal ::= NULL */ -{ yylhsminor.yy148 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_NULL, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy148 = yylhsminor.yy148; + case 325: /* literal ::= NULL */ +{ yylhsminor.yy74 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_NULL, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy74 = yylhsminor.yy74; break; - case 324: /* literal ::= NK_QUESTION */ -{ yylhsminor.yy148 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createPlaceholderValueNode(pCxt, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy148 = yylhsminor.yy148; + case 326: /* literal ::= NK_QUESTION */ +{ yylhsminor.yy74 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createPlaceholderValueNode(pCxt, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy74 = yylhsminor.yy74; break; - case 325: /* duration_literal ::= NK_VARIABLE */ -{ yylhsminor.yy148 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy148 = yylhsminor.yy148; + case 327: /* duration_literal ::= NK_VARIABLE */ +{ yylhsminor.yy74 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy74 = yylhsminor.yy74; break; - case 326: /* signed ::= NK_INTEGER */ -{ yylhsminor.yy148 = createValueNode(pCxt, TSDB_DATA_TYPE_UBIGINT, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy148 = yylhsminor.yy148; + case 328: /* signed ::= NK_INTEGER */ +{ yylhsminor.yy74 = createValueNode(pCxt, TSDB_DATA_TYPE_UBIGINT, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy74 = yylhsminor.yy74; break; - case 327: /* signed ::= NK_PLUS NK_INTEGER */ -{ yymsp[-1].minor.yy148 = createValueNode(pCxt, TSDB_DATA_TYPE_UBIGINT, &yymsp[0].minor.yy0); } + case 329: /* signed ::= NK_PLUS NK_INTEGER */ +{ yymsp[-1].minor.yy74 = createValueNode(pCxt, TSDB_DATA_TYPE_UBIGINT, &yymsp[0].minor.yy0); } break; - case 328: /* signed ::= NK_MINUS NK_INTEGER */ + case 330: /* signed ::= NK_MINUS NK_INTEGER */ { SToken t = yymsp[-1].minor.yy0; t.n = (yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n) - yymsp[-1].minor.yy0.z; - yylhsminor.yy148 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &t); + yylhsminor.yy74 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &t); } - yymsp[-1].minor.yy148 = yylhsminor.yy148; + yymsp[-1].minor.yy74 = yylhsminor.yy74; break; - case 329: /* signed ::= NK_FLOAT */ -{ yylhsminor.yy148 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy148 = yylhsminor.yy148; + case 331: /* signed ::= NK_FLOAT */ +{ yylhsminor.yy74 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy74 = yylhsminor.yy74; break; - case 330: /* signed ::= NK_PLUS NK_FLOAT */ -{ yymsp[-1].minor.yy148 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); } + case 332: /* signed ::= NK_PLUS NK_FLOAT */ +{ yymsp[-1].minor.yy74 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); } break; - case 331: /* signed ::= NK_MINUS NK_FLOAT */ + case 333: /* signed ::= NK_MINUS NK_FLOAT */ { SToken t = yymsp[-1].minor.yy0; t.n = (yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n) - yymsp[-1].minor.yy0.z; - yylhsminor.yy148 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &t); + yylhsminor.yy74 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &t); } - yymsp[-1].minor.yy148 = yylhsminor.yy148; + yymsp[-1].minor.yy74 = yylhsminor.yy74; break; - case 333: /* signed_literal ::= NK_STRING */ -{ yylhsminor.yy148 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy148 = yylhsminor.yy148; + case 335: /* signed_literal ::= NK_STRING */ +{ yylhsminor.yy74 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy74 = yylhsminor.yy74; break; - case 334: /* signed_literal ::= NK_BOOL */ -{ yylhsminor.yy148 = createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy148 = yylhsminor.yy148; + case 336: /* signed_literal ::= NK_BOOL */ +{ yylhsminor.yy74 = createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy74 = yylhsminor.yy74; break; - case 335: /* signed_literal ::= TIMESTAMP NK_STRING */ -{ yymsp[-1].minor.yy148 = createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0); } + case 337: /* signed_literal ::= TIMESTAMP NK_STRING */ +{ yymsp[-1].minor.yy74 = createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0); } break; - case 336: /* signed_literal ::= duration_literal */ - case 338: /* signed_literal ::= literal_func */ yytestcase(yyruleno==338); - case 407: /* star_func_para ::= expr_or_subquery */ yytestcase(yyruleno==407); - case 469: /* select_item ::= common_expression */ yytestcase(yyruleno==469); - case 479: /* partition_item ::= expr_or_subquery */ yytestcase(yyruleno==479); - case 513: /* query_simple_or_subquery ::= subquery */ yytestcase(yyruleno==513); - case 515: /* query_or_subquery ::= subquery */ yytestcase(yyruleno==515); - case 528: /* search_condition ::= common_expression */ yytestcase(yyruleno==528); -{ yylhsminor.yy148 = releaseRawExprNode(pCxt, yymsp[0].minor.yy148); } - yymsp[0].minor.yy148 = yylhsminor.yy148; + case 338: /* signed_literal ::= duration_literal */ + case 340: /* signed_literal ::= literal_func */ yytestcase(yyruleno==340); + case 410: /* star_func_para ::= expr_or_subquery */ yytestcase(yyruleno==410); + case 472: /* select_item ::= common_expression */ yytestcase(yyruleno==472); + case 482: /* partition_item ::= expr_or_subquery */ yytestcase(yyruleno==482); + case 516: /* query_simple_or_subquery ::= subquery */ yytestcase(yyruleno==516); + case 518: /* query_or_subquery ::= subquery */ yytestcase(yyruleno==518); + case 531: /* search_condition ::= common_expression */ yytestcase(yyruleno==531); +{ yylhsminor.yy74 = releaseRawExprNode(pCxt, yymsp[0].minor.yy74); } + yymsp[0].minor.yy74 = yylhsminor.yy74; break; - case 337: /* signed_literal ::= NULL */ -{ yylhsminor.yy148 = createValueNode(pCxt, TSDB_DATA_TYPE_NULL, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy148 = yylhsminor.yy148; + case 339: /* signed_literal ::= NULL */ +{ yylhsminor.yy74 = createValueNode(pCxt, TSDB_DATA_TYPE_NULL, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy74 = yylhsminor.yy74; break; - case 339: /* signed_literal ::= NK_QUESTION */ -{ yylhsminor.yy148 = createPlaceholderValueNode(pCxt, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy148 = yylhsminor.yy148; + case 341: /* signed_literal ::= NK_QUESTION */ +{ yylhsminor.yy74 = createPlaceholderValueNode(pCxt, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy74 = yylhsminor.yy74; break; - case 358: /* expression ::= NK_LP expression NK_RP */ - case 441: /* boolean_primary ::= NK_LP boolean_value_expression NK_RP */ yytestcase(yyruleno==441); - case 527: /* subquery ::= NK_LP subquery NK_RP */ yytestcase(yyruleno==527); -{ yylhsminor.yy148 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, releaseRawExprNode(pCxt, yymsp[-1].minor.yy148)); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + case 361: /* expression ::= NK_LP expression NK_RP */ + case 444: /* boolean_primary ::= NK_LP boolean_value_expression NK_RP */ yytestcase(yyruleno==444); + case 530: /* subquery ::= NK_LP subquery NK_RP */ yytestcase(yyruleno==530); +{ yylhsminor.yy74 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, releaseRawExprNode(pCxt, yymsp[-1].minor.yy74)); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 359: /* expression ::= NK_PLUS expr_or_subquery */ + case 362: /* expression ::= NK_PLUS expr_or_subquery */ { - SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy148); - yylhsminor.yy148 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, releaseRawExprNode(pCxt, yymsp[0].minor.yy148)); + SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy74); + yylhsminor.yy74 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, releaseRawExprNode(pCxt, yymsp[0].minor.yy74)); } - yymsp[-1].minor.yy148 = yylhsminor.yy148; + yymsp[-1].minor.yy74 = yylhsminor.yy74; break; - case 360: /* expression ::= NK_MINUS expr_or_subquery */ + case 363: /* expression ::= NK_MINUS expr_or_subquery */ { - SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy148); - yylhsminor.yy148 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, createOperatorNode(pCxt, OP_TYPE_MINUS, releaseRawExprNode(pCxt, yymsp[0].minor.yy148), NULL)); + SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy74); + yylhsminor.yy74 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, createOperatorNode(pCxt, OP_TYPE_MINUS, releaseRawExprNode(pCxt, yymsp[0].minor.yy74), NULL)); } - yymsp[-1].minor.yy148 = yylhsminor.yy148; + yymsp[-1].minor.yy74 = yylhsminor.yy74; break; - case 361: /* expression ::= expr_or_subquery NK_PLUS expr_or_subquery */ + case 364: /* expression ::= expr_or_subquery NK_PLUS expr_or_subquery */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy148); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy148); - yylhsminor.yy148 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_ADD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy148), releaseRawExprNode(pCxt, yymsp[0].minor.yy148))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy74); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy74); + yylhsminor.yy74 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_ADD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy74), releaseRawExprNode(pCxt, yymsp[0].minor.yy74))); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 362: /* expression ::= expr_or_subquery NK_MINUS expr_or_subquery */ + case 365: /* expression ::= expr_or_subquery NK_MINUS expr_or_subquery */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy148); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy148); - yylhsminor.yy148 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_SUB, releaseRawExprNode(pCxt, yymsp[-2].minor.yy148), releaseRawExprNode(pCxt, yymsp[0].minor.yy148))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy74); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy74); + yylhsminor.yy74 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_SUB, releaseRawExprNode(pCxt, yymsp[-2].minor.yy74), releaseRawExprNode(pCxt, yymsp[0].minor.yy74))); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 363: /* expression ::= expr_or_subquery NK_STAR expr_or_subquery */ + case 366: /* expression ::= expr_or_subquery NK_STAR expr_or_subquery */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy148); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy148); - yylhsminor.yy148 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MULTI, releaseRawExprNode(pCxt, yymsp[-2].minor.yy148), releaseRawExprNode(pCxt, yymsp[0].minor.yy148))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy74); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy74); + yylhsminor.yy74 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MULTI, releaseRawExprNode(pCxt, yymsp[-2].minor.yy74), releaseRawExprNode(pCxt, yymsp[0].minor.yy74))); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 364: /* expression ::= expr_or_subquery NK_SLASH expr_or_subquery */ + case 367: /* expression ::= expr_or_subquery NK_SLASH expr_or_subquery */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy148); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy148); - yylhsminor.yy148 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_DIV, releaseRawExprNode(pCxt, yymsp[-2].minor.yy148), releaseRawExprNode(pCxt, yymsp[0].minor.yy148))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy74); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy74); + yylhsminor.yy74 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_DIV, releaseRawExprNode(pCxt, yymsp[-2].minor.yy74), releaseRawExprNode(pCxt, yymsp[0].minor.yy74))); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 365: /* expression ::= expr_or_subquery NK_REM expr_or_subquery */ + case 368: /* expression ::= expr_or_subquery NK_REM expr_or_subquery */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy148); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy148); - yylhsminor.yy148 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_REM, releaseRawExprNode(pCxt, yymsp[-2].minor.yy148), releaseRawExprNode(pCxt, yymsp[0].minor.yy148))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy74); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy74); + yylhsminor.yy74 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_REM, releaseRawExprNode(pCxt, yymsp[-2].minor.yy74), releaseRawExprNode(pCxt, yymsp[0].minor.yy74))); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 366: /* expression ::= column_reference NK_ARROW NK_STRING */ + case 369: /* expression ::= column_reference NK_ARROW NK_STRING */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy148); - yylhsminor.yy148 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_JSON_GET_VALUE, releaseRawExprNode(pCxt, yymsp[-2].minor.yy148), createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy74); + yylhsminor.yy74 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_JSON_GET_VALUE, releaseRawExprNode(pCxt, yymsp[-2].minor.yy74), createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0))); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 367: /* expression ::= expr_or_subquery NK_BITAND expr_or_subquery */ + case 370: /* expression ::= expr_or_subquery NK_BITAND expr_or_subquery */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy148); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy148); - yylhsminor.yy148 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_BIT_AND, releaseRawExprNode(pCxt, yymsp[-2].minor.yy148), releaseRawExprNode(pCxt, yymsp[0].minor.yy148))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy74); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy74); + yylhsminor.yy74 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_BIT_AND, releaseRawExprNode(pCxt, yymsp[-2].minor.yy74), releaseRawExprNode(pCxt, yymsp[0].minor.yy74))); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 368: /* expression ::= expr_or_subquery NK_BITOR expr_or_subquery */ + case 371: /* expression ::= expr_or_subquery NK_BITOR expr_or_subquery */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy148); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy148); - yylhsminor.yy148 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_BIT_OR, releaseRawExprNode(pCxt, yymsp[-2].minor.yy148), releaseRawExprNode(pCxt, yymsp[0].minor.yy148))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy74); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy74); + yylhsminor.yy74 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_BIT_OR, releaseRawExprNode(pCxt, yymsp[-2].minor.yy74), releaseRawExprNode(pCxt, yymsp[0].minor.yy74))); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 371: /* column_reference ::= column_name */ -{ yylhsminor.yy148 = createRawExprNode(pCxt, &yymsp[0].minor.yy199, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy199)); } - yymsp[0].minor.yy148 = yylhsminor.yy148; + case 374: /* column_reference ::= column_name */ +{ yylhsminor.yy74 = createRawExprNode(pCxt, &yymsp[0].minor.yy317, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy317)); } + yymsp[0].minor.yy74 = yylhsminor.yy74; break; - case 372: /* column_reference ::= table_name NK_DOT column_name */ -{ yylhsminor.yy148 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy199, &yymsp[0].minor.yy199, createColumnNode(pCxt, &yymsp[-2].minor.yy199, &yymsp[0].minor.yy199)); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + case 375: /* column_reference ::= table_name NK_DOT column_name */ +{ yylhsminor.yy74 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy317, &yymsp[0].minor.yy317, createColumnNode(pCxt, &yymsp[-2].minor.yy317, &yymsp[0].minor.yy317)); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 373: /* pseudo_column ::= ROWTS */ - case 374: /* pseudo_column ::= TBNAME */ yytestcase(yyruleno==374); - case 376: /* pseudo_column ::= QSTART */ yytestcase(yyruleno==376); - case 377: /* pseudo_column ::= QEND */ yytestcase(yyruleno==377); - case 378: /* pseudo_column ::= QDURATION */ yytestcase(yyruleno==378); - case 379: /* pseudo_column ::= WSTART */ yytestcase(yyruleno==379); - case 380: /* pseudo_column ::= WEND */ yytestcase(yyruleno==380); - case 381: /* pseudo_column ::= WDURATION */ yytestcase(yyruleno==381); - case 382: /* pseudo_column ::= IROWTS */ yytestcase(yyruleno==382); - case 383: /* pseudo_column ::= QTAGS */ yytestcase(yyruleno==383); - case 389: /* literal_func ::= NOW */ yytestcase(yyruleno==389); -{ yylhsminor.yy148 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[0].minor.yy0, NULL)); } - yymsp[0].minor.yy148 = yylhsminor.yy148; + case 376: /* pseudo_column ::= ROWTS */ + case 377: /* pseudo_column ::= TBNAME */ yytestcase(yyruleno==377); + case 379: /* pseudo_column ::= QSTART */ yytestcase(yyruleno==379); + case 380: /* pseudo_column ::= QEND */ yytestcase(yyruleno==380); + case 381: /* pseudo_column ::= QDURATION */ yytestcase(yyruleno==381); + case 382: /* pseudo_column ::= WSTART */ yytestcase(yyruleno==382); + case 383: /* pseudo_column ::= WEND */ yytestcase(yyruleno==383); + case 384: /* pseudo_column ::= WDURATION */ yytestcase(yyruleno==384); + case 385: /* pseudo_column ::= IROWTS */ yytestcase(yyruleno==385); + case 386: /* pseudo_column ::= QTAGS */ yytestcase(yyruleno==386); + case 392: /* literal_func ::= NOW */ yytestcase(yyruleno==392); +{ yylhsminor.yy74 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[0].minor.yy0, NULL)); } + yymsp[0].minor.yy74 = yylhsminor.yy74; break; - case 375: /* pseudo_column ::= table_name NK_DOT TBNAME */ -{ yylhsminor.yy148 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy199, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[0].minor.yy0, createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[-2].minor.yy199)))); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + case 378: /* pseudo_column ::= table_name NK_DOT TBNAME */ +{ yylhsminor.yy74 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy317, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[0].minor.yy0, createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[-2].minor.yy317)))); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 384: /* function_expression ::= function_name NK_LP expression_list NK_RP */ - case 385: /* function_expression ::= star_func NK_LP star_func_para_list NK_RP */ yytestcase(yyruleno==385); -{ yylhsminor.yy148 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy199, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-3].minor.yy199, yymsp[-1].minor.yy404)); } - yymsp[-3].minor.yy148 = yylhsminor.yy148; + case 387: /* function_expression ::= function_name NK_LP expression_list NK_RP */ + case 388: /* function_expression ::= star_func NK_LP star_func_para_list NK_RP */ yytestcase(yyruleno==388); +{ yylhsminor.yy74 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy317, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-3].minor.yy317, yymsp[-1].minor.yy874)); } + yymsp[-3].minor.yy74 = yylhsminor.yy74; break; - case 386: /* function_expression ::= CAST NK_LP expr_or_subquery AS type_name NK_RP */ -{ yylhsminor.yy148 = createRawExprNodeExt(pCxt, &yymsp[-5].minor.yy0, &yymsp[0].minor.yy0, createCastFunctionNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy148), yymsp[-1].minor.yy530)); } - yymsp[-5].minor.yy148 = yylhsminor.yy148; + case 389: /* function_expression ::= CAST NK_LP expr_or_subquery AS type_name NK_RP */ +{ yylhsminor.yy74 = createRawExprNodeExt(pCxt, &yymsp[-5].minor.yy0, &yymsp[0].minor.yy0, createCastFunctionNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy74), yymsp[-1].minor.yy898)); } + yymsp[-5].minor.yy74 = yylhsminor.yy74; break; - case 388: /* literal_func ::= noarg_func NK_LP NK_RP */ -{ yylhsminor.yy148 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy199, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-2].minor.yy199, NULL)); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + case 391: /* literal_func ::= noarg_func NK_LP NK_RP */ +{ yylhsminor.yy74 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy317, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-2].minor.yy317, NULL)); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 403: /* star_func_para_list ::= NK_STAR */ -{ yylhsminor.yy404 = createNodeList(pCxt, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy404 = yylhsminor.yy404; + case 406: /* star_func_para_list ::= NK_STAR */ +{ yylhsminor.yy874 = createNodeList(pCxt, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy874 = yylhsminor.yy874; break; - case 408: /* star_func_para ::= table_name NK_DOT NK_STAR */ - case 472: /* select_item ::= table_name NK_DOT NK_STAR */ yytestcase(yyruleno==472); -{ yylhsminor.yy148 = createColumnNode(pCxt, &yymsp[-2].minor.yy199, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + case 411: /* star_func_para ::= table_name NK_DOT NK_STAR */ + case 475: /* select_item ::= table_name NK_DOT NK_STAR */ yytestcase(yyruleno==475); +{ yylhsminor.yy74 = createColumnNode(pCxt, &yymsp[-2].minor.yy317, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 409: /* case_when_expression ::= CASE when_then_list case_when_else_opt END */ -{ yylhsminor.yy148 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, createCaseWhenNode(pCxt, NULL, yymsp[-2].minor.yy404, yymsp[-1].minor.yy148)); } - yymsp[-3].minor.yy148 = yylhsminor.yy148; + case 412: /* case_when_expression ::= CASE when_then_list case_when_else_opt END */ +{ yylhsminor.yy74 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, createCaseWhenNode(pCxt, NULL, yymsp[-2].minor.yy874, yymsp[-1].minor.yy74)); } + yymsp[-3].minor.yy74 = yylhsminor.yy74; break; - case 410: /* case_when_expression ::= CASE common_expression when_then_list case_when_else_opt END */ -{ yylhsminor.yy148 = createRawExprNodeExt(pCxt, &yymsp[-4].minor.yy0, &yymsp[0].minor.yy0, createCaseWhenNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy148), yymsp[-2].minor.yy404, yymsp[-1].minor.yy148)); } - yymsp[-4].minor.yy148 = yylhsminor.yy148; + case 413: /* case_when_expression ::= CASE common_expression when_then_list case_when_else_opt END */ +{ yylhsminor.yy74 = createRawExprNodeExt(pCxt, &yymsp[-4].minor.yy0, &yymsp[0].minor.yy0, createCaseWhenNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy74), yymsp[-2].minor.yy874, yymsp[-1].minor.yy74)); } + yymsp[-4].minor.yy74 = yylhsminor.yy74; break; - case 413: /* when_then_expr ::= WHEN common_expression THEN common_expression */ -{ yymsp[-3].minor.yy148 = createWhenThenNode(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy148), releaseRawExprNode(pCxt, yymsp[0].minor.yy148)); } + case 416: /* when_then_expr ::= WHEN common_expression THEN common_expression */ +{ yymsp[-3].minor.yy74 = createWhenThenNode(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy74), releaseRawExprNode(pCxt, yymsp[0].minor.yy74)); } break; - case 415: /* case_when_else_opt ::= ELSE common_expression */ -{ yymsp[-1].minor.yy148 = releaseRawExprNode(pCxt, yymsp[0].minor.yy148); } + case 418: /* case_when_else_opt ::= ELSE common_expression */ +{ yymsp[-1].minor.yy74 = releaseRawExprNode(pCxt, yymsp[0].minor.yy74); } break; - case 416: /* predicate ::= expr_or_subquery compare_op expr_or_subquery */ - case 421: /* predicate ::= expr_or_subquery in_op in_predicate_value */ yytestcase(yyruleno==421); + case 419: /* predicate ::= expr_or_subquery compare_op expr_or_subquery */ + case 424: /* predicate ::= expr_or_subquery in_op in_predicate_value */ yytestcase(yyruleno==424); { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy148); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy148); - yylhsminor.yy148 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, yymsp[-1].minor.yy20, releaseRawExprNode(pCxt, yymsp[-2].minor.yy148), releaseRawExprNode(pCxt, yymsp[0].minor.yy148))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy74); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy74); + yylhsminor.yy74 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, yymsp[-1].minor.yy20, releaseRawExprNode(pCxt, yymsp[-2].minor.yy74), releaseRawExprNode(pCxt, yymsp[0].minor.yy74))); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 417: /* predicate ::= expr_or_subquery BETWEEN expr_or_subquery AND expr_or_subquery */ + case 420: /* predicate ::= expr_or_subquery BETWEEN expr_or_subquery AND expr_or_subquery */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-4].minor.yy148); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy148); - yylhsminor.yy148 = createRawExprNodeExt(pCxt, &s, &e, createBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-4].minor.yy148), releaseRawExprNode(pCxt, yymsp[-2].minor.yy148), releaseRawExprNode(pCxt, yymsp[0].minor.yy148))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-4].minor.yy74); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy74); + yylhsminor.yy74 = createRawExprNodeExt(pCxt, &s, &e, createBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-4].minor.yy74), releaseRawExprNode(pCxt, yymsp[-2].minor.yy74), releaseRawExprNode(pCxt, yymsp[0].minor.yy74))); } - yymsp[-4].minor.yy148 = yylhsminor.yy148; + yymsp[-4].minor.yy74 = yylhsminor.yy74; break; - case 418: /* predicate ::= expr_or_subquery NOT BETWEEN expr_or_subquery AND expr_or_subquery */ + case 421: /* predicate ::= expr_or_subquery NOT BETWEEN expr_or_subquery AND expr_or_subquery */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-5].minor.yy148); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy148); - yylhsminor.yy148 = createRawExprNodeExt(pCxt, &s, &e, createNotBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-5].minor.yy148), releaseRawExprNode(pCxt, yymsp[-2].minor.yy148), releaseRawExprNode(pCxt, yymsp[0].minor.yy148))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-5].minor.yy74); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy74); + yylhsminor.yy74 = createRawExprNodeExt(pCxt, &s, &e, createNotBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-5].minor.yy74), releaseRawExprNode(pCxt, yymsp[-2].minor.yy74), releaseRawExprNode(pCxt, yymsp[0].minor.yy74))); } - yymsp[-5].minor.yy148 = yylhsminor.yy148; + yymsp[-5].minor.yy74 = yylhsminor.yy74; break; - case 419: /* predicate ::= expr_or_subquery IS NULL */ + case 422: /* predicate ::= expr_or_subquery IS NULL */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy148); - yylhsminor.yy148 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NULL, releaseRawExprNode(pCxt, yymsp[-2].minor.yy148), NULL)); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy74); + yylhsminor.yy74 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NULL, releaseRawExprNode(pCxt, yymsp[-2].minor.yy74), NULL)); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 420: /* predicate ::= expr_or_subquery IS NOT NULL */ + case 423: /* predicate ::= expr_or_subquery IS NOT NULL */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-3].minor.yy148); - yylhsminor.yy148 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NOT_NULL, releaseRawExprNode(pCxt, yymsp[-3].minor.yy148), NULL)); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-3].minor.yy74); + yylhsminor.yy74 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NOT_NULL, releaseRawExprNode(pCxt, yymsp[-3].minor.yy74), NULL)); } - yymsp[-3].minor.yy148 = yylhsminor.yy148; + yymsp[-3].minor.yy74 = yylhsminor.yy74; break; - case 422: /* compare_op ::= NK_LT */ + case 425: /* compare_op ::= NK_LT */ { yymsp[0].minor.yy20 = OP_TYPE_LOWER_THAN; } break; - case 423: /* compare_op ::= NK_GT */ + case 426: /* compare_op ::= NK_GT */ { yymsp[0].minor.yy20 = OP_TYPE_GREATER_THAN; } break; - case 424: /* compare_op ::= NK_LE */ + case 427: /* compare_op ::= NK_LE */ { yymsp[0].minor.yy20 = OP_TYPE_LOWER_EQUAL; } break; - case 425: /* compare_op ::= NK_GE */ + case 428: /* compare_op ::= NK_GE */ { yymsp[0].minor.yy20 = OP_TYPE_GREATER_EQUAL; } break; - case 426: /* compare_op ::= NK_NE */ + case 429: /* compare_op ::= NK_NE */ { yymsp[0].minor.yy20 = OP_TYPE_NOT_EQUAL; } break; - case 427: /* compare_op ::= NK_EQ */ + case 430: /* compare_op ::= NK_EQ */ { yymsp[0].minor.yy20 = OP_TYPE_EQUAL; } break; - case 428: /* compare_op ::= LIKE */ + case 431: /* compare_op ::= LIKE */ { yymsp[0].minor.yy20 = OP_TYPE_LIKE; } break; - case 429: /* compare_op ::= NOT LIKE */ + case 432: /* compare_op ::= NOT LIKE */ { yymsp[-1].minor.yy20 = OP_TYPE_NOT_LIKE; } break; - case 430: /* compare_op ::= MATCH */ + case 433: /* compare_op ::= MATCH */ { yymsp[0].minor.yy20 = OP_TYPE_MATCH; } break; - case 431: /* compare_op ::= NMATCH */ + case 434: /* compare_op ::= NMATCH */ { yymsp[0].minor.yy20 = OP_TYPE_NMATCH; } break; - case 432: /* compare_op ::= CONTAINS */ + case 435: /* compare_op ::= CONTAINS */ { yymsp[0].minor.yy20 = OP_TYPE_JSON_CONTAINS; } break; - case 433: /* in_op ::= IN */ + case 436: /* in_op ::= IN */ { yymsp[0].minor.yy20 = OP_TYPE_IN; } break; - case 434: /* in_op ::= NOT IN */ + case 437: /* in_op ::= NOT IN */ { yymsp[-1].minor.yy20 = OP_TYPE_NOT_IN; } break; - case 435: /* in_predicate_value ::= NK_LP literal_list NK_RP */ -{ yylhsminor.yy148 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, createNodeListNode(pCxt, yymsp[-1].minor.yy404)); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + case 438: /* in_predicate_value ::= NK_LP literal_list NK_RP */ +{ yylhsminor.yy74 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, createNodeListNode(pCxt, yymsp[-1].minor.yy874)); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 437: /* boolean_value_expression ::= NOT boolean_primary */ + case 440: /* boolean_value_expression ::= NOT boolean_primary */ { - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy148); - yylhsminor.yy148 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_NOT, releaseRawExprNode(pCxt, yymsp[0].minor.yy148), NULL)); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy74); + yylhsminor.yy74 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_NOT, releaseRawExprNode(pCxt, yymsp[0].minor.yy74), NULL)); } - yymsp[-1].minor.yy148 = yylhsminor.yy148; + yymsp[-1].minor.yy74 = yylhsminor.yy74; break; - case 438: /* boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */ + case 441: /* boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy148); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy148); - yylhsminor.yy148 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_OR, releaseRawExprNode(pCxt, yymsp[-2].minor.yy148), releaseRawExprNode(pCxt, yymsp[0].minor.yy148))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy74); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy74); + yylhsminor.yy74 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_OR, releaseRawExprNode(pCxt, yymsp[-2].minor.yy74), releaseRawExprNode(pCxt, yymsp[0].minor.yy74))); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 439: /* boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */ + case 442: /* boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy148); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy148); - yylhsminor.yy148 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_AND, releaseRawExprNode(pCxt, yymsp[-2].minor.yy148), releaseRawExprNode(pCxt, yymsp[0].minor.yy148))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy74); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy74); + yylhsminor.yy74 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_AND, releaseRawExprNode(pCxt, yymsp[-2].minor.yy74), releaseRawExprNode(pCxt, yymsp[0].minor.yy74))); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 445: /* from_clause_opt ::= FROM table_reference_list */ - case 474: /* where_clause_opt ::= WHERE search_condition */ yytestcase(yyruleno==474); - case 502: /* having_clause_opt ::= HAVING search_condition */ yytestcase(yyruleno==502); -{ yymsp[-1].minor.yy148 = yymsp[0].minor.yy148; } + case 448: /* from_clause_opt ::= FROM table_reference_list */ + case 477: /* where_clause_opt ::= WHERE search_condition */ yytestcase(yyruleno==477); + case 505: /* having_clause_opt ::= HAVING search_condition */ yytestcase(yyruleno==505); +{ yymsp[-1].minor.yy74 = yymsp[0].minor.yy74; } break; - case 447: /* table_reference_list ::= table_reference_list NK_COMMA table_reference */ -{ yylhsminor.yy148 = createJoinTableNode(pCxt, JOIN_TYPE_INNER, yymsp[-2].minor.yy148, yymsp[0].minor.yy148, NULL); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + case 450: /* table_reference_list ::= table_reference_list NK_COMMA table_reference */ +{ yylhsminor.yy74 = createJoinTableNode(pCxt, JOIN_TYPE_INNER, yymsp[-2].minor.yy74, yymsp[0].minor.yy74, NULL); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 450: /* table_primary ::= table_name alias_opt */ -{ yylhsminor.yy148 = createRealTableNode(pCxt, NULL, &yymsp[-1].minor.yy199, &yymsp[0].minor.yy199); } - yymsp[-1].minor.yy148 = yylhsminor.yy148; + case 453: /* table_primary ::= table_name alias_opt */ +{ yylhsminor.yy74 = createRealTableNode(pCxt, NULL, &yymsp[-1].minor.yy317, &yymsp[0].minor.yy317); } + yymsp[-1].minor.yy74 = yylhsminor.yy74; break; - case 451: /* table_primary ::= db_name NK_DOT table_name alias_opt */ -{ yylhsminor.yy148 = createRealTableNode(pCxt, &yymsp[-3].minor.yy199, &yymsp[-1].minor.yy199, &yymsp[0].minor.yy199); } - yymsp[-3].minor.yy148 = yylhsminor.yy148; + case 454: /* table_primary ::= db_name NK_DOT table_name alias_opt */ +{ yylhsminor.yy74 = createRealTableNode(pCxt, &yymsp[-3].minor.yy317, &yymsp[-1].minor.yy317, &yymsp[0].minor.yy317); } + yymsp[-3].minor.yy74 = yylhsminor.yy74; break; - case 452: /* table_primary ::= subquery alias_opt */ -{ yylhsminor.yy148 = createTempTableNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy148), &yymsp[0].minor.yy199); } - yymsp[-1].minor.yy148 = yylhsminor.yy148; + case 455: /* table_primary ::= subquery alias_opt */ +{ yylhsminor.yy74 = createTempTableNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy74), &yymsp[0].minor.yy317); } + yymsp[-1].minor.yy74 = yylhsminor.yy74; break; - case 454: /* alias_opt ::= */ -{ yymsp[1].minor.yy199 = nil_token; } + case 457: /* alias_opt ::= */ +{ yymsp[1].minor.yy317 = nil_token; } break; - case 456: /* alias_opt ::= AS table_alias */ -{ yymsp[-1].minor.yy199 = yymsp[0].minor.yy199; } + case 459: /* alias_opt ::= AS table_alias */ +{ yymsp[-1].minor.yy317 = yymsp[0].minor.yy317; } break; - case 457: /* parenthesized_joined_table ::= NK_LP joined_table NK_RP */ - case 458: /* parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */ yytestcase(yyruleno==458); -{ yymsp[-2].minor.yy148 = yymsp[-1].minor.yy148; } + case 460: /* parenthesized_joined_table ::= NK_LP joined_table NK_RP */ + case 461: /* parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */ yytestcase(yyruleno==461); +{ yymsp[-2].minor.yy74 = yymsp[-1].minor.yy74; } break; - case 459: /* joined_table ::= table_reference join_type JOIN table_reference ON search_condition */ -{ yylhsminor.yy148 = createJoinTableNode(pCxt, yymsp[-4].minor.yy470, yymsp[-5].minor.yy148, yymsp[-2].minor.yy148, yymsp[0].minor.yy148); } - yymsp[-5].minor.yy148 = yylhsminor.yy148; + case 462: /* joined_table ::= table_reference join_type JOIN table_reference ON search_condition */ +{ yylhsminor.yy74 = createJoinTableNode(pCxt, yymsp[-4].minor.yy630, yymsp[-5].minor.yy74, yymsp[-2].minor.yy74, yymsp[0].minor.yy74); } + yymsp[-5].minor.yy74 = yylhsminor.yy74; break; - case 460: /* join_type ::= */ -{ yymsp[1].minor.yy470 = JOIN_TYPE_INNER; } + case 463: /* join_type ::= */ +{ yymsp[1].minor.yy630 = JOIN_TYPE_INNER; } break; - case 461: /* join_type ::= INNER */ -{ yymsp[0].minor.yy470 = JOIN_TYPE_INNER; } + case 464: /* join_type ::= INNER */ +{ yymsp[0].minor.yy630 = JOIN_TYPE_INNER; } break; - case 462: /* query_specification ::= SELECT set_quantifier_opt select_list from_clause_opt where_clause_opt partition_by_clause_opt range_opt every_opt fill_opt twindow_clause_opt group_by_clause_opt having_clause_opt */ + case 465: /* query_specification ::= SELECT set_quantifier_opt select_list from_clause_opt where_clause_opt partition_by_clause_opt range_opt every_opt fill_opt twindow_clause_opt group_by_clause_opt having_clause_opt */ { - yymsp[-11].minor.yy148 = createSelectStmt(pCxt, yymsp[-10].minor.yy397, yymsp[-9].minor.yy404, yymsp[-8].minor.yy148); - yymsp[-11].minor.yy148 = addWhereClause(pCxt, yymsp[-11].minor.yy148, yymsp[-7].minor.yy148); - yymsp[-11].minor.yy148 = addPartitionByClause(pCxt, yymsp[-11].minor.yy148, yymsp[-6].minor.yy404); - yymsp[-11].minor.yy148 = addWindowClauseClause(pCxt, yymsp[-11].minor.yy148, yymsp[-2].minor.yy148); - yymsp[-11].minor.yy148 = addGroupByClause(pCxt, yymsp[-11].minor.yy148, yymsp[-1].minor.yy404); - yymsp[-11].minor.yy148 = addHavingClause(pCxt, yymsp[-11].minor.yy148, yymsp[0].minor.yy148); - yymsp[-11].minor.yy148 = addRangeClause(pCxt, yymsp[-11].minor.yy148, yymsp[-5].minor.yy148); - yymsp[-11].minor.yy148 = addEveryClause(pCxt, yymsp[-11].minor.yy148, yymsp[-4].minor.yy148); - yymsp[-11].minor.yy148 = addFillClause(pCxt, yymsp[-11].minor.yy148, yymsp[-3].minor.yy148); + yymsp[-11].minor.yy74 = createSelectStmt(pCxt, yymsp[-10].minor.yy335, yymsp[-9].minor.yy874, yymsp[-8].minor.yy74); + yymsp[-11].minor.yy74 = addWhereClause(pCxt, yymsp[-11].minor.yy74, yymsp[-7].minor.yy74); + yymsp[-11].minor.yy74 = addPartitionByClause(pCxt, yymsp[-11].minor.yy74, yymsp[-6].minor.yy874); + yymsp[-11].minor.yy74 = addWindowClauseClause(pCxt, yymsp[-11].minor.yy74, yymsp[-2].minor.yy74); + yymsp[-11].minor.yy74 = addGroupByClause(pCxt, yymsp[-11].minor.yy74, yymsp[-1].minor.yy874); + yymsp[-11].minor.yy74 = addHavingClause(pCxt, yymsp[-11].minor.yy74, yymsp[0].minor.yy74); + yymsp[-11].minor.yy74 = addRangeClause(pCxt, yymsp[-11].minor.yy74, yymsp[-5].minor.yy74); + yymsp[-11].minor.yy74 = addEveryClause(pCxt, yymsp[-11].minor.yy74, yymsp[-4].minor.yy74); + yymsp[-11].minor.yy74 = addFillClause(pCxt, yymsp[-11].minor.yy74, yymsp[-3].minor.yy74); } break; - case 465: /* set_quantifier_opt ::= ALL */ -{ yymsp[0].minor.yy397 = false; } + case 468: /* set_quantifier_opt ::= ALL */ +{ yymsp[0].minor.yy335 = false; } break; - case 468: /* select_item ::= NK_STAR */ -{ yylhsminor.yy148 = createColumnNode(pCxt, NULL, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy148 = yylhsminor.yy148; + case 471: /* select_item ::= NK_STAR */ +{ yylhsminor.yy74 = createColumnNode(pCxt, NULL, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy74 = yylhsminor.yy74; break; - case 470: /* select_item ::= common_expression column_alias */ - case 480: /* partition_item ::= expr_or_subquery column_alias */ yytestcase(yyruleno==480); -{ yylhsminor.yy148 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy148), &yymsp[0].minor.yy199); } - yymsp[-1].minor.yy148 = yylhsminor.yy148; + case 473: /* select_item ::= common_expression column_alias */ + case 483: /* partition_item ::= expr_or_subquery column_alias */ yytestcase(yyruleno==483); +{ yylhsminor.yy74 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy74), &yymsp[0].minor.yy317); } + yymsp[-1].minor.yy74 = yylhsminor.yy74; break; - case 471: /* select_item ::= common_expression AS column_alias */ - case 481: /* partition_item ::= expr_or_subquery AS column_alias */ yytestcase(yyruleno==481); -{ yylhsminor.yy148 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy148), &yymsp[0].minor.yy199); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + case 474: /* select_item ::= common_expression AS column_alias */ + case 484: /* partition_item ::= expr_or_subquery AS column_alias */ yytestcase(yyruleno==484); +{ yylhsminor.yy74 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy74), &yymsp[0].minor.yy317); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 476: /* partition_by_clause_opt ::= PARTITION BY partition_list */ - case 498: /* group_by_clause_opt ::= GROUP BY group_by_list */ yytestcase(yyruleno==498); - case 517: /* order_by_clause_opt ::= ORDER BY sort_specification_list */ yytestcase(yyruleno==517); -{ yymsp[-2].minor.yy404 = yymsp[0].minor.yy404; } + case 479: /* partition_by_clause_opt ::= PARTITION BY partition_list */ + case 501: /* group_by_clause_opt ::= GROUP BY group_by_list */ yytestcase(yyruleno==501); + case 520: /* order_by_clause_opt ::= ORDER BY sort_specification_list */ yytestcase(yyruleno==520); +{ yymsp[-2].minor.yy874 = yymsp[0].minor.yy874; } break; - case 483: /* twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP */ -{ yymsp[-5].minor.yy148 = createSessionWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy148), releaseRawExprNode(pCxt, yymsp[-1].minor.yy148)); } + case 486: /* twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP */ +{ yymsp[-5].minor.yy74 = createSessionWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy74), releaseRawExprNode(pCxt, yymsp[-1].minor.yy74)); } break; - case 484: /* twindow_clause_opt ::= STATE_WINDOW NK_LP expr_or_subquery NK_RP */ -{ yymsp[-3].minor.yy148 = createStateWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy148)); } + case 487: /* twindow_clause_opt ::= STATE_WINDOW NK_LP expr_or_subquery NK_RP */ +{ yymsp[-3].minor.yy74 = createStateWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy74)); } break; - case 485: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */ -{ yymsp[-5].minor.yy148 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy148), NULL, yymsp[-1].minor.yy148, yymsp[0].minor.yy148); } + case 488: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */ +{ yymsp[-5].minor.yy74 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy74), NULL, yymsp[-1].minor.yy74, yymsp[0].minor.yy74); } break; - case 486: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */ -{ yymsp[-7].minor.yy148 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-5].minor.yy148), releaseRawExprNode(pCxt, yymsp[-3].minor.yy148), yymsp[-1].minor.yy148, yymsp[0].minor.yy148); } + case 489: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */ +{ yymsp[-7].minor.yy74 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-5].minor.yy74), releaseRawExprNode(pCxt, yymsp[-3].minor.yy74), yymsp[-1].minor.yy74, yymsp[0].minor.yy74); } break; - case 490: /* fill_opt ::= FILL NK_LP fill_mode NK_RP */ -{ yymsp[-3].minor.yy148 = createFillNode(pCxt, yymsp[-1].minor.yy334, NULL); } + case 493: /* fill_opt ::= FILL NK_LP fill_mode NK_RP */ +{ yymsp[-3].minor.yy74 = createFillNode(pCxt, yymsp[-1].minor.yy828, NULL); } break; - case 491: /* fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */ -{ yymsp[-5].minor.yy148 = createFillNode(pCxt, FILL_MODE_VALUE, createNodeListNode(pCxt, yymsp[-1].minor.yy404)); } + case 494: /* fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */ +{ yymsp[-5].minor.yy74 = createFillNode(pCxt, FILL_MODE_VALUE, createNodeListNode(pCxt, yymsp[-1].minor.yy874)); } break; - case 492: /* fill_mode ::= NONE */ -{ yymsp[0].minor.yy334 = FILL_MODE_NONE; } + case 495: /* fill_mode ::= NONE */ +{ yymsp[0].minor.yy828 = FILL_MODE_NONE; } break; - case 493: /* fill_mode ::= PREV */ -{ yymsp[0].minor.yy334 = FILL_MODE_PREV; } + case 496: /* fill_mode ::= PREV */ +{ yymsp[0].minor.yy828 = FILL_MODE_PREV; } break; - case 494: /* fill_mode ::= NULL */ -{ yymsp[0].minor.yy334 = FILL_MODE_NULL; } + case 497: /* fill_mode ::= NULL */ +{ yymsp[0].minor.yy828 = FILL_MODE_NULL; } break; - case 495: /* fill_mode ::= LINEAR */ -{ yymsp[0].minor.yy334 = FILL_MODE_LINEAR; } + case 498: /* fill_mode ::= LINEAR */ +{ yymsp[0].minor.yy828 = FILL_MODE_LINEAR; } break; - case 496: /* fill_mode ::= NEXT */ -{ yymsp[0].minor.yy334 = FILL_MODE_NEXT; } + case 499: /* fill_mode ::= NEXT */ +{ yymsp[0].minor.yy828 = FILL_MODE_NEXT; } break; - case 499: /* group_by_list ::= expr_or_subquery */ -{ yylhsminor.yy404 = createNodeList(pCxt, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy148))); } - yymsp[0].minor.yy404 = yylhsminor.yy404; + case 502: /* group_by_list ::= expr_or_subquery */ +{ yylhsminor.yy874 = createNodeList(pCxt, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy74))); } + yymsp[0].minor.yy874 = yylhsminor.yy874; break; - case 500: /* group_by_list ::= group_by_list NK_COMMA expr_or_subquery */ -{ yylhsminor.yy404 = addNodeToList(pCxt, yymsp[-2].minor.yy404, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy148))); } - yymsp[-2].minor.yy404 = yylhsminor.yy404; + case 503: /* group_by_list ::= group_by_list NK_COMMA expr_or_subquery */ +{ yylhsminor.yy874 = addNodeToList(pCxt, yymsp[-2].minor.yy874, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy74))); } + yymsp[-2].minor.yy874 = yylhsminor.yy874; break; - case 504: /* range_opt ::= RANGE NK_LP expr_or_subquery NK_COMMA expr_or_subquery NK_RP */ -{ yymsp[-5].minor.yy148 = createInterpTimeRange(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy148), releaseRawExprNode(pCxt, yymsp[-1].minor.yy148)); } + case 507: /* range_opt ::= RANGE NK_LP expr_or_subquery NK_COMMA expr_or_subquery NK_RP */ +{ yymsp[-5].minor.yy74 = createInterpTimeRange(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy74), releaseRawExprNode(pCxt, yymsp[-1].minor.yy74)); } break; - case 507: /* query_expression ::= query_simple order_by_clause_opt slimit_clause_opt limit_clause_opt */ + case 510: /* query_expression ::= query_simple order_by_clause_opt slimit_clause_opt limit_clause_opt */ { - yylhsminor.yy148 = addOrderByClause(pCxt, yymsp[-3].minor.yy148, yymsp[-2].minor.yy404); - yylhsminor.yy148 = addSlimitClause(pCxt, yylhsminor.yy148, yymsp[-1].minor.yy148); - yylhsminor.yy148 = addLimitClause(pCxt, yylhsminor.yy148, yymsp[0].minor.yy148); + yylhsminor.yy74 = addOrderByClause(pCxt, yymsp[-3].minor.yy74, yymsp[-2].minor.yy874); + yylhsminor.yy74 = addSlimitClause(pCxt, yylhsminor.yy74, yymsp[-1].minor.yy74); + yylhsminor.yy74 = addLimitClause(pCxt, yylhsminor.yy74, yymsp[0].minor.yy74); } - yymsp[-3].minor.yy148 = yylhsminor.yy148; + yymsp[-3].minor.yy74 = yylhsminor.yy74; break; - case 510: /* union_query_expression ::= query_simple_or_subquery UNION ALL query_simple_or_subquery */ -{ yylhsminor.yy148 = createSetOperator(pCxt, SET_OP_TYPE_UNION_ALL, yymsp[-3].minor.yy148, yymsp[0].minor.yy148); } - yymsp[-3].minor.yy148 = yylhsminor.yy148; + case 513: /* union_query_expression ::= query_simple_or_subquery UNION ALL query_simple_or_subquery */ +{ yylhsminor.yy74 = createSetOperator(pCxt, SET_OP_TYPE_UNION_ALL, yymsp[-3].minor.yy74, yymsp[0].minor.yy74); } + yymsp[-3].minor.yy74 = yylhsminor.yy74; break; - case 511: /* union_query_expression ::= query_simple_or_subquery UNION query_simple_or_subquery */ -{ yylhsminor.yy148 = createSetOperator(pCxt, SET_OP_TYPE_UNION, yymsp[-2].minor.yy148, yymsp[0].minor.yy148); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + case 514: /* union_query_expression ::= query_simple_or_subquery UNION query_simple_or_subquery */ +{ yylhsminor.yy74 = createSetOperator(pCxt, SET_OP_TYPE_UNION, yymsp[-2].minor.yy74, yymsp[0].minor.yy74); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 519: /* slimit_clause_opt ::= SLIMIT NK_INTEGER */ - case 523: /* limit_clause_opt ::= LIMIT NK_INTEGER */ yytestcase(yyruleno==523); -{ yymsp[-1].minor.yy148 = createLimitNode(pCxt, &yymsp[0].minor.yy0, NULL); } + case 522: /* slimit_clause_opt ::= SLIMIT NK_INTEGER */ + case 526: /* limit_clause_opt ::= LIMIT NK_INTEGER */ yytestcase(yyruleno==526); +{ yymsp[-1].minor.yy74 = createLimitNode(pCxt, &yymsp[0].minor.yy0, NULL); } break; - case 520: /* slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */ - case 524: /* limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */ yytestcase(yyruleno==524); -{ yymsp[-3].minor.yy148 = createLimitNode(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); } + case 523: /* slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */ + case 527: /* limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */ yytestcase(yyruleno==527); +{ yymsp[-3].minor.yy74 = createLimitNode(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); } break; - case 521: /* slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */ - case 525: /* limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */ yytestcase(yyruleno==525); -{ yymsp[-3].minor.yy148 = createLimitNode(pCxt, &yymsp[0].minor.yy0, &yymsp[-2].minor.yy0); } + case 524: /* slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */ + case 528: /* limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */ yytestcase(yyruleno==528); +{ yymsp[-3].minor.yy74 = createLimitNode(pCxt, &yymsp[0].minor.yy0, &yymsp[-2].minor.yy0); } break; - case 526: /* subquery ::= NK_LP query_expression NK_RP */ -{ yylhsminor.yy148 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, yymsp[-1].minor.yy148); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + case 529: /* subquery ::= NK_LP query_expression NK_RP */ +{ yylhsminor.yy74 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, yymsp[-1].minor.yy74); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 531: /* sort_specification ::= expr_or_subquery ordering_specification_opt null_ordering_opt */ -{ yylhsminor.yy148 = createOrderByExprNode(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy148), yymsp[-1].minor.yy898, yymsp[0].minor.yy499); } - yymsp[-2].minor.yy148 = yylhsminor.yy148; + case 534: /* sort_specification ::= expr_or_subquery ordering_specification_opt null_ordering_opt */ +{ yylhsminor.yy74 = createOrderByExprNode(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy74), yymsp[-1].minor.yy326, yymsp[0].minor.yy109); } + yymsp[-2].minor.yy74 = yylhsminor.yy74; break; - case 532: /* ordering_specification_opt ::= */ -{ yymsp[1].minor.yy898 = ORDER_ASC; } + case 535: /* ordering_specification_opt ::= */ +{ yymsp[1].minor.yy326 = ORDER_ASC; } break; - case 533: /* ordering_specification_opt ::= ASC */ -{ yymsp[0].minor.yy898 = ORDER_ASC; } + case 536: /* ordering_specification_opt ::= ASC */ +{ yymsp[0].minor.yy326 = ORDER_ASC; } break; - case 534: /* ordering_specification_opt ::= DESC */ -{ yymsp[0].minor.yy898 = ORDER_DESC; } + case 537: /* ordering_specification_opt ::= DESC */ +{ yymsp[0].minor.yy326 = ORDER_DESC; } break; - case 535: /* null_ordering_opt ::= */ -{ yymsp[1].minor.yy499 = NULL_ORDER_DEFAULT; } + case 538: /* null_ordering_opt ::= */ +{ yymsp[1].minor.yy109 = NULL_ORDER_DEFAULT; } break; - case 536: /* null_ordering_opt ::= NULLS FIRST */ -{ yymsp[-1].minor.yy499 = NULL_ORDER_FIRST; } + case 539: /* null_ordering_opt ::= NULLS FIRST */ +{ yymsp[-1].minor.yy109 = NULL_ORDER_FIRST; } break; - case 537: /* null_ordering_opt ::= NULLS LAST */ -{ yymsp[-1].minor.yy499 = NULL_ORDER_LAST; } + case 540: /* null_ordering_opt ::= NULLS LAST */ +{ yymsp[-1].minor.yy109 = NULL_ORDER_LAST; } break; default: break; From 93cf8e0186c67728e0d11c13a38943baf1b8056f Mon Sep 17 00:00:00 2001 From: Liu Jicong Date: Thu, 29 Dec 2022 14:43:45 +0800 Subject: [PATCH 26/40] fix: selectivity --- source/libs/function/src/builtinsimpl.c | 42 ++++++++++++------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c index 0d1a661de9..b5ebe60ce1 100644 --- a/source/libs/function/src/builtinsimpl.c +++ b/source/libs/function/src/builtinsimpl.c @@ -818,28 +818,27 @@ void setSelectivityValue(SqlFunctionCtx* pCtx, SSDataBlock* pBlock, const STuple return; } - if (pCtx->saveHandle.pBuf != NULL) { - if (pTuplePos->pageId != -1) { - int32_t numOfCols = pCtx->subsidiaries.num; - const char* p = loadTupleData(pCtx, pTuplePos); + if ((pCtx->saveHandle.pBuf != NULL && pTuplePos->pageId != -1) || + (pCtx->saveHandle.pState && pTuplePos->streamTupleKey.ts > 0)) { + int32_t numOfCols = pCtx->subsidiaries.num; + const char* p = loadTupleData(pCtx, pTuplePos); - bool* nullList = (bool*)p; - char* pStart = (char*)(nullList + numOfCols * sizeof(bool)); + bool* nullList = (bool*)p; + char* pStart = (char*)(nullList + numOfCols * sizeof(bool)); - // todo set the offset value to optimize the performance. - for (int32_t j = 0; j < numOfCols; ++j) { - SqlFunctionCtx* pc = pCtx->subsidiaries.pCtx[j]; - int32_t dstSlotId = pc->pExpr->base.resSchema.slotId; + // todo set the offset value to optimize the performance. + for (int32_t j = 0; j < numOfCols; ++j) { + SqlFunctionCtx* pc = pCtx->subsidiaries.pCtx[j]; + int32_t dstSlotId = pc->pExpr->base.resSchema.slotId; - SColumnInfoData* pDstCol = taosArrayGet(pBlock->pDataBlock, dstSlotId); - ASSERT(pc->pExpr->base.resSchema.bytes == pDstCol->info.bytes); - if (nullList[j]) { - colDataAppendNULL(pDstCol, rowIndex); - } else { - colDataAppend(pDstCol, rowIndex, pStart, false); - } - pStart += pDstCol->info.bytes; + SColumnInfoData* pDstCol = taosArrayGet(pBlock->pDataBlock, dstSlotId); + ASSERT(pc->pExpr->base.resSchema.bytes == pDstCol->info.bytes); + if (nullList[j]) { + colDataAppendNULL(pDstCol, rowIndex); + } else { + colDataAppend(pDstCol, rowIndex, pStart, false); } + pStart += pDstCol->info.bytes; } } } @@ -2071,8 +2070,8 @@ int32_t firstFunction(SqlFunctionCtx* pCtx) { int32_t blockDataOrder = (startKey <= endKey) ? TSDB_ORDER_ASC : TSDB_ORDER_DESC; - // please ref. to the comment in lastRowFunction for the reason why disabling the opt version of last/first function. - // we will use this opt implementation in an new version that is only available in scan subplan + // please ref. to the comment in lastRowFunction for the reason why disabling the opt version of last/first + // function. we will use this opt implementation in an new version that is only available in scan subplan #if 0 if (blockDataOrder == TSDB_ORDER_ASC) { // filter according to current result firstly @@ -2179,7 +2178,8 @@ int32_t lastFunction(SqlFunctionCtx* pCtx) { int32_t blockDataOrder = (startKey <= endKey) ? TSDB_ORDER_ASC : TSDB_ORDER_DESC; - // please ref. to the comment in lastRowFunction for the reason why disabling the opt version of last/first function. + // please ref. to the comment in lastRowFunction for the reason why disabling the opt version of last/first + // function. #if 0 if (blockDataOrder == TSDB_ORDER_ASC) { for (int32_t i = pInput->numOfRows + pInput->startRowIndex - 1; i >= pInput->startRowIndex; --i) { From 0e471afc03b500f16e367b20f603d78ad39d525b Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Thu, 29 Dec 2022 14:48:57 +0800 Subject: [PATCH 27/40] fix(query): fix the invalid access. --- include/util/tutil.h | 2 ++ source/util/src/tcompare.c | 45 ++++++++++++--------------- source/util/src/tutil.c | 56 ++++++++++++++++++++++++++++++++++ source/util/test/utilTests.cpp | 32 +++++++++++++++++++ 4 files changed, 109 insertions(+), 26 deletions(-) diff --git a/include/util/tutil.h b/include/util/tutil.h index de96300155..9f36cdba7c 100644 --- a/include/util/tutil.h +++ b/include/util/tutil.h @@ -34,6 +34,8 @@ char *strtolower(char *dst, const char *src); char *strntolower(char *dst, const char *src, int32_t n); char *strntolower_s(char *dst, const char *src, int32_t n); int64_t strnatoi(char *num, int32_t len); +size_t tstrncspn(const char *str, size_t ssize, const char *reject, size_t rsize); + char *strbetween(char *string, char *begin, char *end); char *paGetToken(char *src, char **token, int32_t *tokenLen); diff --git a/source/util/src/tcompare.c b/source/util/src/tcompare.c index 21e7d9e0cd..54b6d6d265 100644 --- a/source/util/src/tcompare.c +++ b/source/util/src/tcompare.c @@ -17,6 +17,7 @@ #define _XOPEN_SOURCE #define _DEFAULT_SOURCE #include "tcompare.h" +#include "tutil.h" #include "regex.h" #include "tdef.h" #include "thash.h" @@ -1014,16 +1015,12 @@ int32_t patternMatch(const char *pattern, size_t psize, const char *str, size_t int32_t j = 0; int32_t nMatchChar = 0; - while ((c = pattern[i++]) != 0 && (i <= psize)) { + while ((i < psize) && ((c = pattern[i++]) != 0)) { if (c == pInfo->matchAll) { /* Match "*" */ - while ((c = pattern[i++]) == pInfo->matchAll || c == pInfo->matchOne) { - if (i > psize) { // overflow check - break; - } - + while ((i < psize) && ((c = pattern[i++]) == pInfo->matchAll || c == pInfo->matchOne)) { if (c == pInfo->matchOne) { - if (j > ssize || str[j++] == 0) { // empty string, return not match + if (j >= ssize || str[j++] == 0) { // empty string, return not match return TSDB_PATTERN_NOWILDCARDMATCH; } else { ++nMatchChar; @@ -1031,21 +1028,21 @@ int32_t patternMatch(const char *pattern, size_t psize, const char *str, size_t } } - if (c == 0 || i > psize) { + if (i >= psize && (c == pInfo->umatchOne || c == pInfo->umatchAll)) { return TSDB_PATTERN_MATCH; /* "*" at the end of the pattern matches */ } - char acceptArray[3] = {toupper(c), tolower(c), 0}; + char rejectList[2] = {toupper(c), tolower(c)}; str += nMatchChar; int32_t remain = ssize - nMatchChar; while (1) { - size_t n = strcspn(str, acceptArray); + size_t n = tstrncspn(str, remain, rejectList, 2); str += n; remain -= n; - if (str[0] == 0 || (remain <= 0)) { + if ((remain <= 0) || str[0] == 0) { break; } @@ -1075,7 +1072,7 @@ int32_t patternMatch(const char *pattern, size_t psize, const char *str, size_t return TSDB_PATTERN_NOMATCH; } - return (str[j] == 0 || j >= ssize) ? TSDB_PATTERN_MATCH : TSDB_PATTERN_NOMATCH; + return (j >= ssize || str[j] == 0) ? TSDB_PATTERN_MATCH : TSDB_PATTERN_NOMATCH; } int32_t wcsPatternMatch(const TdUcs4 *pattern, size_t psize, const TdUcs4 *str, size_t ssize, const SPatternCompareInfo *pInfo) { @@ -1085,14 +1082,10 @@ int32_t wcsPatternMatch(const TdUcs4 *pattern, size_t psize, const TdUcs4 *str, int32_t j = 0; int32_t nMatchChar = 0; - while ((c = pattern[i++]) != 0 && (i <= psize)) { - /* Match "%" */ - if (c == pInfo->umatchAll) { - while ((c = pattern[i++]) == pInfo->umatchAll || c == pInfo->umatchOne) { - if (i > psize) { - break; - } + while ((i < psize) && ((c = pattern[i++]) != 0)) { + if (c == pInfo->umatchAll) { /* Match "%" */ + while ((i < psize) && ((c = pattern[i++]) == pInfo->umatchAll || c == pInfo->umatchOne)) { if (c == pInfo->umatchOne) { if (j >= ssize || str[j++] == 0) { return TSDB_PATTERN_NOWILDCARDMATCH; @@ -1102,7 +1095,7 @@ int32_t wcsPatternMatch(const TdUcs4 *pattern, size_t psize, const TdUcs4 *str, } } - if (c == 0 || i > psize) { + if (i >= psize && (c == pInfo->umatchOne || c == pInfo->umatchAll)) { return TSDB_PATTERN_MATCH; } @@ -1116,11 +1109,11 @@ int32_t wcsPatternMatch(const TdUcs4 *pattern, size_t psize, const TdUcs4 *str, str += n; remain -= n; - if (str[0] == 0 || (remain <= 0)) { + if ((remain <= 0) || str[0] == 0) { break; } - int32_t ret = wcsPatternMatch(&pattern[i], psize-i, ++str, --remain, pInfo); + int32_t ret = wcsPatternMatch(&pattern[i], psize - i, ++str, --remain, pInfo); if (ret != TSDB_PATTERN_NOMATCH) { return ret; } @@ -1146,7 +1139,7 @@ int32_t wcsPatternMatch(const TdUcs4 *pattern, size_t psize, const TdUcs4 *str, return TSDB_PATTERN_NOMATCH; } - return (str[j] == 0 || j >= ssize) ? TSDB_PATTERN_MATCH : TSDB_PATTERN_NOMATCH; + return (j >= ssize || str[j] == 0) ? TSDB_PATTERN_MATCH : TSDB_PATTERN_NOMATCH; } int32_t comparestrRegexNMatch(const void *pLeft, const void *pRight) { @@ -1198,7 +1191,7 @@ int32_t comparestrRegexMatch(const void *pLeft, const void *pRight) { int32_t comparewcsRegexMatch(const void* pString, const void* pPattern) { size_t len = varDataLen(pPattern); - char *pattern = taosMemoryMalloc(len + 1); + char *pattern = taosMemoryMalloc(len + TSDB_NCHAR_SIZE); int convertLen = taosUcs4ToMbs((TdUcs4 *)varDataVal(pPattern), len, pattern); if (convertLen < 0) { @@ -1206,7 +1199,7 @@ int32_t comparewcsRegexMatch(const void* pString, const void* pPattern) { return TSDB_CODE_APP_ERROR; } - pattern[len] = 0; + pattern[convertLen] = 0; len = varDataLen(pString); char *str = taosMemoryMalloc(len + 1); @@ -1218,7 +1211,7 @@ int32_t comparewcsRegexMatch(const void* pString, const void* pPattern) { return TSDB_CODE_APP_ERROR; } - str[len] = 0; + str[convertLen] = 0; int32_t ret = doExecRegexMatch(str, pattern); diff --git a/source/util/src/tutil.c b/source/util/src/tutil.c index addb9f55ba..7297849870 100644 --- a/source/util/src/tutil.c +++ b/source/util/src/tutil.c @@ -376,3 +376,59 @@ void taosIp2String(uint32_t ip, char *str) { void taosIpPort2String(uint32_t ip, uint16_t port, char *str) { sprintf(str, "%u.%u.%u.%u:%u", ip & 0xFF, (ip >> 8) & 0xFF, (ip >> 16) & 0xFF, (uint8_t)(ip >> 24), port); } + +size_t tstrncspn(const char *str, size_t size, const char *reject, size_t rsize) { + if (rsize == 0 || rsize == 1) { + char* p = strnchr(str, reject[0], size, false); + return (p == NULL)? size:(p-str); + } + + /* Use multiple small memsets to enable inlining on most targets. */ + unsigned char table[256]; + unsigned char *p = memset(table, 0, 64); + memset(p + 64, 0, 64); + memset(p + 128, 0, 64); + memset(p + 192, 0, 64); + + unsigned char *s = (unsigned char *)reject; + int32_t index = 0; + do { + p[s[index++]] = 1; + } while (index < rsize); + + s = (unsigned char*) str; + int32_t times = size >> 2; + if (times == 0) { + for(int32_t i = 0; i < size; ++i) { + if (p[s[i]]) { + return i; + } + } + + return size; + } + + index = 0; + uint32_t c0, c1, c2, c3; + for(int32_t i = 0; i < times; ++i, index += 4) { + int32_t j = index; + c0 = p[s[j]]; + c1 = p[s[j + 1]]; + c2 = p[s[j + 2]]; + c3 = p[s[j + 3]]; + + if ((c0 | c1 | c2 | c3) != 0) { + size_t count = ((i + 1) >> 2); + return (c0 | c1) != 0 ? count - c0 + 1 : count - c2 + 3; + } + } + + int32_t offset = times * 4; + for(int32_t i = offset; i < size; ++i) { + if (p[s[i]]) { + return i; + } + } + + return size; +} diff --git a/source/util/test/utilTests.cpp b/source/util/test/utilTests.cpp index 27496ff9b9..5ab93bedd3 100644 --- a/source/util/test/utilTests.cpp +++ b/source/util/test/utilTests.cpp @@ -1,5 +1,6 @@ #include #include +#include #include #include "tarray.h" @@ -232,4 +233,35 @@ TEST(utilTest, char_pattern_match_no_terminated) { const char* str10 = "6_6"; ret = patternMatch(pattern10, 1, str10, strlen(str10), &pInfo); ASSERT_EQ(ret, TSDB_PATTERN_MATCH); +} + +TEST(utilTest, tstrncspn) { + const char* p1 = "abc"; + const char* reject = "d"; + size_t v = tstrncspn(p1, strlen(p1), reject, 1); + ASSERT_EQ(v, 3); + + const char* reject1 = "a"; + v = tstrncspn(p1, strlen(p1), reject1, 1); + ASSERT_EQ(v, 0); + + const char* reject2 = "de"; + v = tstrncspn(p1, strlen(p1), reject2, 2); + ASSERT_EQ(v, 3); + + const char* p2 = "abcdefghijklmn"; + v = tstrncspn(p2, strlen(p2), reject2, 2); + ASSERT_EQ(v, 3); + + const char* reject3 = "12345n"; + v = tstrncspn(p2, strlen(p2), reject3, 6); + ASSERT_EQ(v, 13); + + const char* reject4 = ""; + v = tstrncspn(p2, strlen(p2), reject4, 0); + ASSERT_EQ(v, 14); + + const char* reject5 = "911"; + v = tstrncspn(p2, strlen(p2), reject5, 0); + ASSERT_EQ(v, 14); } \ No newline at end of file From 7f8d05128177cd54862c41d6b3812091d1c704bb Mon Sep 17 00:00:00 2001 From: Minglei Jin Date: Thu, 29 Dec 2022 14:51:55 +0800 Subject: [PATCH 28/40] fix(meta/snap): return -1 when decoder meta entry failed --- source/dnode/vnode/src/meta/metaEntry.c | 4 +++- source/dnode/vnode/src/meta/metaSnapshot.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/source/dnode/vnode/src/meta/metaEntry.c b/source/dnode/vnode/src/meta/metaEntry.c index 72f7365a1e..60df66fc01 100644 --- a/source/dnode/vnode/src/meta/metaEntry.c +++ b/source/dnode/vnode/src/meta/metaEntry.c @@ -99,7 +99,9 @@ int metaDecodeEntry(SDecoder *pCoder, SMetaEntry *pME) { } if (tDecodeTSma(pCoder, pME->smaEntry.tsma, true) < 0) return -1; } else { - ASSERT(0); + metaError("meta/entry: invalide table type: %" PRId8 " decode failed.", pME->type); + + return -1; } tEndDecode(pCoder); diff --git a/source/dnode/vnode/src/meta/metaSnapshot.c b/source/dnode/vnode/src/meta/metaSnapshot.c index 63d044df6e..8b023b7bc5 100644 --- a/source/dnode/vnode/src/meta/metaSnapshot.c +++ b/source/dnode/vnode/src/meta/metaSnapshot.c @@ -189,7 +189,8 @@ int32_t metaSnapWrite(SMetaSnapWriter* pWriter, uint8_t* pData, uint32_t nData) SDecoder* pDecoder = &(SDecoder){0}; tDecoderInit(pDecoder, pData + sizeof(SSnapDataHdr), nData - sizeof(SSnapDataHdr)); - metaDecodeEntry(pDecoder, &metaEntry); + code = metaDecodeEntry(pDecoder, &metaEntry); + if (code) goto _err; code = metaHandleEntry(pMeta, &metaEntry); if (code) goto _err; @@ -198,6 +199,7 @@ int32_t metaSnapWrite(SMetaSnapWriter* pWriter, uint8_t* pData, uint32_t nData) return code; _err: + tDecoderClear(pDecoder); metaError("vgId:%d, vnode snapshot meta write failed since %s", TD_VID(pMeta->pVnode), tstrerror(code)); return code; } From b2f6fcd06738cb9ecbaed2abbfe69ea2c0925f32 Mon Sep 17 00:00:00 2001 From: Liu Jicong Date: Thu, 29 Dec 2022 15:34:08 +0800 Subject: [PATCH 29/40] fix mem leak --- source/libs/function/src/builtinsimpl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c index b5ebe60ce1..26680971c5 100644 --- a/source/libs/function/src/builtinsimpl.c +++ b/source/libs/function/src/builtinsimpl.c @@ -840,6 +840,10 @@ void setSelectivityValue(SqlFunctionCtx* pCtx, SSDataBlock* pBlock, const STuple } pStart += pDstCol->info.bytes; } + + if (pCtx->saveHandle.pState) { + tdbFree((void*)p); + } } } From 66b9fa01f77b94d87738580baf3cb38d5358f056 Mon Sep 17 00:00:00 2001 From: Liu Jicong Date: Thu, 29 Dec 2022 15:51:12 +0800 Subject: [PATCH 30/40] enh: optimize drop when scan exec --- source/dnode/vnode/src/tq/tq.c | 14 ++++++++++++++ source/libs/stream/src/streamExec.c | 6 +++++- source/libs/stream/src/streamRecover.c | 1 - 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/source/dnode/vnode/src/tq/tq.c b/source/dnode/vnode/src/tq/tq.c index e366795fd3..1d5fae33eb 100644 --- a/source/dnode/vnode/src/tq/tq.c +++ b/source/dnode/vnode/src/tq/tq.c @@ -1112,6 +1112,11 @@ int32_t tqProcessTaskRecover1Req(STQ* pTq, SRpcMsg* pMsg) { // do recovery step 1 streamSourceRecoverScanStep1(pTask); + if (atomic_load_8(&pTask->taskStatus) == TASK_STATUS__DROPPING) { + streamMetaReleaseTask(pTq->pStreamMeta, pTask); + return 0; + } + // build msg to launch next step SStreamRecoverStep2Req req; code = streamBuildSourceRecover2Req(pTask, &req); @@ -1122,6 +1127,10 @@ int32_t tqProcessTaskRecover1Req(STQ* pTq, SRpcMsg* pMsg) { streamMetaReleaseTask(pTq->pStreamMeta, pTask); + if (atomic_load_8(&pTask->taskStatus) == TASK_STATUS__DROPPING) { + return 0; + } + // serialize msg int32_t len = sizeof(SStreamRecoverStep1Req); @@ -1160,6 +1169,11 @@ int32_t tqProcessTaskRecover2Req(STQ* pTq, int64_t version, char* msg, int32_t m return -1; } + if (atomic_load_8(&pTask->taskStatus) == TASK_STATUS__DROPPING) { + streamMetaReleaseTask(pTq->pStreamMeta, pTask); + return 0; + } + // restore param code = streamRestoreParam(pTask); if (code < 0) { diff --git a/source/libs/stream/src/streamExec.c b/source/libs/stream/src/streamExec.c index 3d42f759cb..786ee9d079 100644 --- a/source/libs/stream/src/streamExec.c +++ b/source/libs/stream/src/streamExec.c @@ -110,10 +110,14 @@ int32_t streamScanExec(SStreamTask* pTask, int32_t batchSz) { int32_t batchCnt = 0; while (1) { + if (atomic_load_8(&pTask->taskStatus) == TASK_STATUS__DROPPING) { + return 0; + } + SSDataBlock* output = NULL; uint64_t ts = 0; if (qExecTask(exec, &output, &ts) < 0) { - ASSERT(0); + return -1; } if (output == NULL) { if (qStreamRecoverScanFinished(exec)) { diff --git a/source/libs/stream/src/streamRecover.c b/source/libs/stream/src/streamRecover.c index 52777fd834..061b211ddf 100644 --- a/source/libs/stream/src/streamRecover.c +++ b/source/libs/stream/src/streamRecover.c @@ -200,7 +200,6 @@ int32_t streamBuildSourceRecover2Req(SStreamTask* pTask, SStreamRecoverStep2Req* int32_t streamSourceRecoverScanStep2(SStreamTask* pTask, int64_t ver) { void* exec = pTask->exec.executor; if (qStreamSourceRecoverStep2(exec, ver) < 0) { - ASSERT(0); } return streamScanExec(pTask, 100); } From 3d1b78902ff68e4fa493f03e236f82b522c2c550 Mon Sep 17 00:00:00 2001 From: Xiaoyu Wang Date: Thu, 29 Dec 2022 16:12:52 +0800 Subject: [PATCH 31/40] fix: error in deleting only tag columns --- source/libs/parser/src/parTranslater.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c index 0a20484179..c1982f3c7e 100644 --- a/source/libs/parser/src/parTranslater.c +++ b/source/libs/parser/src/parTranslater.c @@ -4948,6 +4948,10 @@ static int32_t checkAlterSuperTableBySchema(STranslateContext* pCxt, SAlterTable return generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_ONLY_ONE_JSON_TAG); } + if (getNumOfTags(pTableMeta) == 1 && pStmt->alterType == TSDB_ALTER_TABLE_DROP_TAG) { + return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_ALTER_TABLE, "the only tag cannot be dropped"); + } + int32_t tagsLen = 0; for (int32_t i = 0; i < pTableMeta->tableInfo.numOfTags; ++i) { tagsLen += pTagsSchema[i].bytes; @@ -7482,7 +7486,7 @@ static void destoryAlterTbReq(SVAlterTbReq* pReq) { static int32_t rewriteAlterTableImpl(STranslateContext* pCxt, SAlterTableStmt* pStmt, STableMeta* pTableMeta, SQuery* pQuery) { if (getNumOfTags(pTableMeta) == 1 && pStmt->alterType == TSDB_ALTER_TABLE_DROP_TAG) { - return generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_ALTER_TABLE); + return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_INVALID_ALTER_TABLE, "the only tag cannot be dropped"); } if (TSDB_SUPER_TABLE == pTableMeta->tableType) { From bfb92457fa906305b6ad00780d27fd3a2bd1c675 Mon Sep 17 00:00:00 2001 From: Liu Jicong Date: Thu, 29 Dec 2022 16:24:30 +0800 Subject: [PATCH 32/40] refactor: stream dispatch --- include/libs/stream/tstream.h | 16 +--------------- source/libs/stream/src/stream.c | 29 +++++++++++++++++++++++------ 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/include/libs/stream/tstream.h b/include/libs/stream/tstream.h index 16cf960724..c00625c51c 100644 --- a/include/libs/stream/tstream.h +++ b/include/libs/stream/tstream.h @@ -392,21 +392,6 @@ static FORCE_INLINE void streamTaskInputFail(SStreamTask* pTask) { atomic_store_8(&pTask->inputStatus, TASK_INPUT_STATUS__FAILED); } -static FORCE_INLINE int32_t streamTaskOutput(SStreamTask* pTask, SStreamDataBlock* pBlock) { - if (pTask->outputType == TASK_OUTPUT__TABLE) { - pTask->tbSink.tbSinkFunc(pTask, pTask->tbSink.vnode, 0, pBlock->blocks); - taosArrayDestroyEx(pBlock->blocks, (FDelete)blockDataFreeRes); - taosFreeQitem(pBlock); - } else if (pTask->outputType == TASK_OUTPUT__SMA) { - pTask->smaSink.smaSink(pTask->smaSink.vnode, pTask->smaSink.smaId, pBlock->blocks); - taosArrayDestroyEx(pBlock->blocks, (FDelete)blockDataFreeRes); - taosFreeQitem(pBlock); - } else { - taosWriteQitem(pTask->outputQueue->queue, pBlock); - } - return 0; -} - typedef struct { SMsgHead head; int64_t streamId; @@ -584,6 +569,7 @@ int32_t streamProcessRetrieveRsp(SStreamTask* pTask, SStreamRetrieveRsp* pRsp); int32_t streamTryExec(SStreamTask* pTask); int32_t streamSchedExec(SStreamTask* pTask); +int32_t streamTaskOutput(SStreamTask* pTask, SStreamDataBlock* pBlock); int32_t streamScanExec(SStreamTask* pTask, int32_t batchSz); diff --git a/source/libs/stream/src/stream.c b/source/libs/stream/src/stream.c index 5b542dd54b..60729c4d0e 100644 --- a/source/libs/stream/src/stream.c +++ b/source/libs/stream/src/stream.c @@ -187,6 +187,23 @@ int32_t streamTaskEnqueueRetrieve(SStreamTask* pTask, SStreamRetrieveReq* pReq, return status == TASK_INPUT_STATUS__NORMAL ? 0 : -1; } +int32_t streamTaskOutput(SStreamTask* pTask, SStreamDataBlock* pBlock) { + if (pTask->outputType == TASK_OUTPUT__TABLE) { + pTask->tbSink.tbSinkFunc(pTask, pTask->tbSink.vnode, 0, pBlock->blocks); + taosArrayDestroyEx(pBlock->blocks, (FDelete)blockDataFreeRes); + taosFreeQitem(pBlock); + } else if (pTask->outputType == TASK_OUTPUT__SMA) { + pTask->smaSink.smaSink(pTask->smaSink.vnode, pTask->smaSink.smaId, pBlock->blocks); + taosArrayDestroyEx(pBlock->blocks, (FDelete)blockDataFreeRes); + taosFreeQitem(pBlock); + } else { + ASSERT(pTask->outputType == TASK_OUTPUT__FIXED_DISPATCH || pTask->outputType == TASK_OUTPUT__SHUFFLE_DISPATCH); + taosWriteQitem(pTask->outputQueue->queue, pBlock); + streamDispatch(pTask); + } + return 0; +} + int32_t streamProcessDispatchReq(SStreamTask* pTask, SStreamDispatchReq* pReq, SRpcMsg* pRsp, bool exec) { qDebug("task %d receive dispatch req from node %d task %d", pTask->taskId, pReq->upstreamNodeId, pReq->upstreamTaskId); @@ -199,9 +216,9 @@ int32_t streamProcessDispatchReq(SStreamTask* pTask, SStreamDispatchReq* pReq, S return -1; } - if (pTask->outputType == TASK_OUTPUT__FIXED_DISPATCH || pTask->outputType == TASK_OUTPUT__SHUFFLE_DISPATCH) { - streamDispatch(pTask); - } + /*if (pTask->outputType == TASK_OUTPUT__FIXED_DISPATCH || pTask->outputType == TASK_OUTPUT__SHUFFLE_DISPATCH) {*/ + /*streamDispatch(pTask);*/ + /*}*/ } else { streamSchedExec(pTask); } @@ -237,9 +254,9 @@ int32_t streamProcessRunReq(SStreamTask* pTask) { return -1; } - if (pTask->outputType == TASK_OUTPUT__FIXED_DISPATCH || pTask->outputType == TASK_OUTPUT__SHUFFLE_DISPATCH) { - streamDispatch(pTask); - } + /*if (pTask->outputType == TASK_OUTPUT__FIXED_DISPATCH || pTask->outputType == TASK_OUTPUT__SHUFFLE_DISPATCH) {*/ + /*streamDispatch(pTask);*/ + /*}*/ return 0; } From f970dd24fce3afce8a30d7db1201c7461ac30f97 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Thu, 29 Dec 2022 16:34:14 +0800 Subject: [PATCH 33/40] fix(query): fix the invalid access. --- include/util/tutil.h | 4 ++++ source/util/src/tcompare.c | 17 +++++++++-------- source/util/src/tutil.c | 24 ++++++++++++++++++++++++ source/util/test/utilTests.cpp | 30 ++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 8 deletions(-) diff --git a/include/util/tutil.h b/include/util/tutil.h index 9f36cdba7c..9fb68aebdc 100644 --- a/include/util/tutil.h +++ b/include/util/tutil.h @@ -29,12 +29,16 @@ extern "C" { int32_t strdequote(char *src); size_t strtrim(char *src); char *strnchr(const char *haystack, char needle, int32_t len, bool skipquote); +TdUcs4* wcsnchr(const TdUcs4* haystack, TdUcs4 needle, size_t len); + char **strsplit(char *src, const char *delim, int32_t *num); char *strtolower(char *dst, const char *src); char *strntolower(char *dst, const char *src, int32_t n); char *strntolower_s(char *dst, const char *src, int32_t n); int64_t strnatoi(char *num, int32_t len); + size_t tstrncspn(const char *str, size_t ssize, const char *reject, size_t rsize); +size_t twcsncspn(const TdUcs4 *wcs, size_t size, const TdUcs4 *reject, size_t rsize); char *strbetween(char *string, char *begin, char *end); char *paGetToken(char *src, char **token, int32_t *tokenLen); diff --git a/source/util/src/tcompare.c b/source/util/src/tcompare.c index 54b6d6d265..62ccd2c50f 100644 --- a/source/util/src/tcompare.c +++ b/source/util/src/tcompare.c @@ -998,6 +998,7 @@ int32_t compareUint64Uint32(const void *pLeft, const void *pRight) { } int32_t compareJsonValDesc(const void *pLeft, const void *pRight) { return compareJsonVal(pRight, pLeft); } + /* * Compare two strings * TSDB_MATCH: Match @@ -1055,10 +1056,10 @@ int32_t patternMatch(const char *pattern, size_t psize, const char *str, size_t return TSDB_PATTERN_NOWILDCARDMATCH; } - c1 = str[j++]; - ++nMatchChar; + if (j < ssize) { + c1 = str[j++]; + ++nMatchChar; - if (j <= ssize) { if (c == '\\' && pattern[i] == '_' && c1 == '_') { i++; continue; @@ -1099,12 +1100,12 @@ int32_t wcsPatternMatch(const TdUcs4 *pattern, size_t psize, const TdUcs4 *str, return TSDB_PATTERN_MATCH; } - TdUcs4 acceptArray[3] = {towupper(c), towlower(c), 0}; + TdUcs4 rejectList[2] = {towupper(c), towlower(c)}; str += nMatchChar; int32_t remain = ssize - nMatchChar; while (1) { - size_t n = wcscspn(str, acceptArray); + size_t n = twcsncspn(str, remain, rejectList, 2); str += n; remain -= n; @@ -1122,10 +1123,10 @@ int32_t wcsPatternMatch(const TdUcs4 *pattern, size_t psize, const TdUcs4 *str, return TSDB_PATTERN_NOWILDCARDMATCH; } - c1 = str[j++]; - nMatchChar++; + if (j < ssize) { + c1 = str[j++]; + nMatchChar++; - if (j <= ssize) { if (c == L'\\' && pattern[i] == L'_' && c1 == L'_') { i++; continue; diff --git a/source/util/src/tutil.c b/source/util/src/tutil.c index 7297849870..cf1d3be3a6 100644 --- a/source/util/src/tutil.c +++ b/source/util/src/tutil.c @@ -144,6 +144,16 @@ char *strnchr(const char *haystack, char needle, int32_t len, bool skipquote) { return NULL; } +TdUcs4* wcsnchr(const TdUcs4* haystack, TdUcs4 needle, size_t len) { + for(int32_t i = 0; i < len; ++i) { + if (haystack[i] == needle) { + return (TdUcs4*) &haystack[i]; + } + } + + return NULL; +} + char *strtolower(char *dst, const char *src) { int32_t esc = 0; char quote = 0, *p = dst, c; @@ -432,3 +442,17 @@ size_t tstrncspn(const char *str, size_t size, const char *reject, size_t rsize) return size; } + +size_t twcsncspn(const TdUcs4 *wcs, size_t size, const TdUcs4 *reject, size_t rsize) { + if (rsize == 0 || rsize == 1) { + TdUcs4* p = wcsnchr(wcs, reject[0], size); + return (p == NULL)? size:(p-wcs); + } + + size_t index = 0; + while ((index < size) && (wcsnchr(reject, wcs[index], rsize) == NULL)) { + ++index; + } + + return index; +} diff --git a/source/util/test/utilTests.cpp b/source/util/test/utilTests.cpp index 5ab93bedd3..c56ef348cc 100644 --- a/source/util/test/utilTests.cpp +++ b/source/util/test/utilTests.cpp @@ -61,6 +61,21 @@ TEST(utilTest, wchar_pattern_match_test) { const TdWchar* str9 = L"6_66"; ret = wcsPatternMatch(reinterpret_cast(pattern9), 6, reinterpret_cast(str9), wcslen(str9), &pInfo); ASSERT_EQ(ret, TSDB_PATTERN_MATCH); + + const TdWchar* pattern10 = L"%"; + const TdWchar* str10 = L""; + ret = wcsPatternMatch(reinterpret_cast(pattern10), 1, reinterpret_cast(str10), 0, &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_MATCH); + + const TdWchar* pattern11 = L"china%"; + const TdWchar* str11 = L"CHI "; + ret = wcsPatternMatch(reinterpret_cast(pattern11), 6, reinterpret_cast(str11), 3, &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_NOMATCH); + + const TdWchar* pattern12 = L"abc%"; + const TdWchar* str12 = L""; + ret = wcsPatternMatch(reinterpret_cast(pattern12), 4, reinterpret_cast(str12), 0, &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_NOMATCH); } TEST(utilTest, wchar_pattern_match_no_terminated) { @@ -174,6 +189,21 @@ TEST(utilTest, char_pattern_match_test) { const char* str9 = "6_6"; ret = patternMatch(pattern9, 5, str9, strlen(str9), &pInfo); ASSERT_EQ(ret, TSDB_PATTERN_MATCH); + + const char* pattern10 = "%"; + const char* str10 = " "; + ret = patternMatch(pattern10, 1, str10, 0, &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_MATCH); + + const char* pattern11 = "china%"; + const char* str11 = "abc "; + ret = patternMatch(pattern11, 6, str11, 3, &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_NOMATCH); + + const char* pattern12 = "abc%"; + const char* str12 = NULL; + ret = patternMatch(pattern12, 4, str12, 0, &pInfo); + ASSERT_EQ(ret, TSDB_PATTERN_NOMATCH); } TEST(utilTest, char_pattern_match_no_terminated) { From 7eeea8a29c3d03b1dd3eac93732c38b9df4c5595 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Thu, 29 Dec 2022 17:56:20 +0800 Subject: [PATCH 34/40] fix(query): fix the invalid access, and do some internal refactor. --- source/common/src/ttypes.c | 5 ++++- source/libs/scalar/src/filter.c | 2 +- source/libs/scalar/src/sclvector.c | 14 ++------------ source/libs/scalar/test/scalar/scalarTests.cpp | 10 +++++++--- source/util/src/tcompare.c | 5 +++-- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/source/common/src/ttypes.c b/source/common/src/ttypes.c index 7b5d0a8805..d412fd89da 100644 --- a/source/common/src/ttypes.c +++ b/source/common/src/ttypes.c @@ -131,7 +131,10 @@ void assignVal(char *val, const char *src, int32_t len, int32_t type) { varDataCopy(val, src); break; default: { - memcpy(val, src, len); + if (len > 0) { + memcpy(val, src, len); + } + break; } } diff --git a/source/libs/scalar/src/filter.c b/source/libs/scalar/src/filter.c index 8b7651765b..d0c27560ca 100644 --- a/source/libs/scalar/src/filter.c +++ b/source/libs/scalar/src/filter.c @@ -338,7 +338,7 @@ int8_t filterGetCompFuncIdx(int32_t type, int32_t optr) { __compar_fn_t filterGetCompFunc(int32_t type, int32_t optr) { return gDataCompare[filterGetCompFuncIdx(type, optr)]; } __compar_fn_t filterGetCompFuncEx(int32_t lType, int32_t rType, int32_t optr) { - if (TSDB_DATA_TYPE_NULL == rType) { + if (TSDB_DATA_TYPE_NULL == rType || TSDB_DATA_TYPE_JSON == rType) { return NULL; } diff --git a/source/libs/scalar/src/sclvector.c b/source/libs/scalar/src/sclvector.c index 24ac5be845..8f2fe87a53 100644 --- a/source/libs/scalar/src/sclvector.c +++ b/source/libs/scalar/src/sclvector.c @@ -1723,18 +1723,8 @@ void vectorCompareImpl(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam * param2 = pRight; } else { vectorConvertCols(pLeft, pRight, &pLeftOut, &pRightOut, startIndex, numOfRows); - - if (pLeftOut.columnData != NULL) { - param1 = &pLeftOut; - } else { - param1 = pLeft; - } - - if (pRightOut.columnData != NULL) { - param2 = &pRightOut; - } else { - param2 = pRight; - } + param1 = (pLeftOut.columnData != NULL) ? &pLeftOut : pLeft; + param2 = (pRightOut.columnData != NULL) ? &pRightOut : pRight; } doVectorCompare(param1, param2, pOut, startIndex, numOfRows, _ord, optr); diff --git a/source/libs/scalar/test/scalar/scalarTests.cpp b/source/libs/scalar/test/scalar/scalarTests.cpp index f5a40c9a87..97002ed9bf 100644 --- a/source/libs/scalar/test/scalar/scalarTests.cpp +++ b/source/libs/scalar/test/scalar/scalarTests.cpp @@ -344,7 +344,7 @@ TEST(constantTest, int_or_binary) { ASSERT_EQ(nodeType(res), QUERY_NODE_VALUE); SValueNode *v = (SValueNode *)res; ASSERT_EQ(v->node.resType.type, TSDB_DATA_TYPE_BIGINT); - ASSERT_EQ(v->datum.b, scltLeftV | scltRightV); + ASSERT_EQ(v->datum.i, scltLeftV | scltRightV); nodesDestroyNode(res); } @@ -1101,7 +1101,8 @@ void makeCalculate(void *json, void *key, int32_t rightType, void *rightData, do opType == OP_TYPE_LIKE || opType == OP_TYPE_NOT_LIKE || opType == OP_TYPE_MATCH || opType == OP_TYPE_NMATCH) { printf("op:%s,3result:%d,except:%f\n", operatorTypeStr(opType), *((bool *)colDataGetData(column, 0)), exceptValue); - ASSERT_EQ(*((bool *)colDataGetData(column, 0)), exceptValue); + assert(*(bool *)colDataGetData(column, 0) == exceptValue); +// ASSERT_EQ((int) *((bool *)colDataGetData(column, 0)), (int)exceptValue); } taosArrayDestroyEx(blockList, scltFreeDataBlock); @@ -1426,7 +1427,7 @@ TEST(columnTest, json_column_logic_op) { printf("--------------------json string-- 6.6hello {1, 8, 2, 2, 3, 0, 0, 0, 0}-------------------\n"); key = "k9"; - bool eRes8[len + len1] = {false, false, false, false, false, false, false, true, true, false, true, false, true}; + bool eRes8[len + len1] = {false, false, false, false, false, false, false, true, true, false, true, true, true}; for (int i = 0; i < len; i++) { makeCalculate(row, key, TSDB_DATA_TYPE_INT, &input[i], eRes8[i], op[i], false); } @@ -1437,6 +1438,9 @@ TEST(columnTest, json_column_logic_op) { for (int i = len; i < len + len1; i++) { void *rightData = prepareNchar(inputNchar[i - len]); + if (i == 11) { + printf("abc\n"); + } makeCalculate(row, key, TSDB_DATA_TYPE_NCHAR, rightData, eRes8[i], op[i], false); taosMemoryFree(rightData); } diff --git a/source/util/src/tcompare.c b/source/util/src/tcompare.c index 62ccd2c50f..ca8b64fe1e 100644 --- a/source/util/src/tcompare.c +++ b/source/util/src/tcompare.c @@ -1161,7 +1161,8 @@ static int32_t doExecRegexMatch(const char *pString, const char *pPattern) { return 1; } - ret = regexec(®ex, pString, 0, NULL, 0); + regmatch_t pmatch[1]; + ret = regexec(®ex, pString, 1, pmatch, 0); if (ret != 0 && ret != REG_NOMATCH) { regerror(ret, ®ex, msgbuf, sizeof(msgbuf)); uDebug("Failed to match %s with pattern %s, reason %s", pString, pPattern, msgbuf) @@ -1192,7 +1193,7 @@ int32_t comparestrRegexMatch(const void *pLeft, const void *pRight) { int32_t comparewcsRegexMatch(const void* pString, const void* pPattern) { size_t len = varDataLen(pPattern); - char *pattern = taosMemoryMalloc(len + TSDB_NCHAR_SIZE); + char *pattern = taosMemoryMalloc(len + 1); int convertLen = taosUcs4ToMbs((TdUcs4 *)varDataVal(pPattern), len, pattern); if (convertLen < 0) { From adbc11f8e4638792080147a100a6b0ace9a88d5c Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Thu, 29 Dec 2022 23:05:14 +0800 Subject: [PATCH 35/40] fix(query): set simd conf --- source/common/src/tglobal.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c index 98b9b566ec..deefa65595 100644 --- a/source/common/src/tglobal.c +++ b/source/common/src/tglobal.c @@ -715,6 +715,8 @@ static int32_t taosSetServerCfg(SConfig *pCfg) { tsNumOfSnodeWriteThreads = cfgGetItem(pCfg, "numOfSnodeUniqueThreads")->i32; tsRpcQueueMemoryAllowed = cfgGetItem(pCfg, "rpcQueueMemoryAllowed")->i64; + tsSIMDBuiltins = (bool) cfgGetItem(pCfg, "SIMD-builtins")->bval; + tsEnableMonitor = cfgGetItem(pCfg, "monitor")->bval; tsMonitorInterval = cfgGetItem(pCfg, "monitorInterval")->i32; tstrncpy(tsMonitorFqdn, cfgGetItem(pCfg, "monitorFqdn")->str, TSDB_FQDN_LEN); From d4852fe133f54c2dfbf1d8152a20fe191fb51d8f Mon Sep 17 00:00:00 2001 From: jiacy-jcy <714897623@qq.com> Date: Fri, 30 Dec 2022 10:21:58 +0800 Subject: [PATCH 36/40] test:add test case info ci --- tests/parallel_test/cases.task | 1 + tests/system-test/0-others/backquote_check.py | 87 +++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 tests/system-test/0-others/backquote_check.py diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task index a912e925ec..d5aa560eb0 100644 --- a/tests/parallel_test/cases.task +++ b/tests/parallel_test/cases.task @@ -408,6 +408,7 @@ ,,y,system-test,./pytest.sh python3 ./test.py -f 0-others/taosShellError.py ,,y,system-test,./pytest.sh python3 ./test.py -f 0-others/taosShellNetChk.py ,,y,system-test,./pytest.sh python3 ./test.py -f 0-others/telemetry.py +,,y,system-test,./pytest.sh python3 ./test.py -f 0-others/backquote_check.py ,,y,system-test,./pytest.sh python3 ./test.py -f 0-others/taosdMonitor.py ,,n,system-test,python3 ./test.py -f 0-others/taosdShell.py -N 5 -M 3 -Q 3 ,,n,system-test,python3 ./test.py -f 0-others/udfTest.py diff --git a/tests/system-test/0-others/backquote_check.py b/tests/system-test/0-others/backquote_check.py new file mode 100644 index 0000000000..3357723253 --- /dev/null +++ b/tests/system-test/0-others/backquote_check.py @@ -0,0 +1,87 @@ +################################################################### +# Copyright (c) 2016 by TAOS Technologies, Inc. +# All rights reserved. +# +# This file is proprietary and confidential to TAOS Technologies. +# No part of this file may be reproduced, stored, transmitted, +# disclosed or used in any form or by any means other than as +# expressly provided by the written permission from Jianhui Tao +# +################################################################### + +# -*- coding: utf-8 -*- + + +from util.log import * +from util.cases import * +from util.sql import * +from util.common import * +from util.sqlset import * + +class TDTestCase: + def init(self, conn, logSql, replicaVar=1): + self.replicaVar = int(replicaVar) + tdLog.debug("start to execute %s" % __file__) + tdSql.init(conn.cursor()) + self.dbname = 'db' + self.setsql = TDSetSql() + self.stbname = 'stb' + self.streamname = 'stm' + self.streamtb = 'stm_stb' + def topic_name_check(self): + tdSql.execute(f'create database if not exists {self.dbname}') + tdSql.execute(f'use {self.dbname}') + tdSql.execute(f'create stable {self.stbname} (ts timestamp,c0 int) tags(t0 int)') + for name in [self.dbname,self.stbname]: + type = '' + if name == self.dbname: + type = 'database' + elif name == self.stbname: + type = 'stable' + tdSql.execute(f'create topic if not exists {name} as {type} {name}') + tdSql.query('show topics') + tdSql.checkEqual(tdSql.queryResult[0][0],name) + tdSql.execute(f'drop topic {name}') + tdSql.execute(f'create topic if not exists `{name}` as {type} {name}') + tdSql.query('show topics') + tdSql.checkEqual(tdSql.queryResult[0][0],name) + tdSql.execute(f'drop topic {name}') + tdSql.execute(f'create topic if not exists `{name}` as {type} `{name}`') + tdSql.query('show topics') + tdSql.checkEqual(tdSql.queryResult[0][0],name) + tdSql.execute(f'drop topic {name}') + tdSql.execute(f'create topic if not exists `{name}` as {type} `{name}`') + tdSql.query('show topics') + tdSql.checkEqual(tdSql.queryResult[0][0],name) + tdSql.execute(f'drop topic `{name}`') + + def db_name_check(self): + tdSql.execute(f'create database if not exists `{self.dbname}`') + tdSql.execute(f'use `{self.dbname}`') + tdSql.execute(f'drop database {self.dbname}') + + def stream_name_check(self): + tdSql.execute(f'create database if not exists {self.dbname}') + tdSql.execute(f'use {self.dbname}') + tdSql.execute(f'create stable {self.stbname} (ts timestamp,c0 int) tags(t0 int)') + tdSql.execute(f'create stream `{self.streamname}` into `{self.streamtb}` as select count(*) from {self.stbname} interval(10s);') + tdSql.query('show streams') + tdSql.checkEqual(tdSql.queryResult[0][0],self.streamname) + tdSql.execute(f'drop stream {self.streamname}') + tdSql.execute(f'drop stable {self.streamtb}') + tdSql.execute(f'create stream {self.streamname} into `{self.streamtb}` as select count(*) from {self.stbname} interval(10s);') + tdSql.query('show streams') + tdSql.checkEqual(tdSql.queryResult[0][0],self.streamname) + tdSql.execute(f'drop stream `{self.streamname}`') + tdSql.execute(f'drop database {self.dbname}') + + def run(self): + self.topic_name_check() + self.db_name_check() + self.stream_name_check() + def stop(self): + tdSql.close() + tdLog.success("%s successfully executed" % __file__) + +tdCases.addWindows(__file__, TDTestCase()) +tdCases.addLinux(__file__, TDTestCase()) \ No newline at end of file From 2cbbc88937df037126ab442493d0287dd9ddd462 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Fri, 30 Dec 2022 11:14:31 +0800 Subject: [PATCH 37/40] enh: speed assert in release mode --- include/util/tlog.h | 11 ++++++++--- source/util/src/tlog.c | 24 ++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/include/util/tlog.h b/include/util/tlog.h index e6ef7f388f..c7158def29 100644 --- a/include/util/tlog.h +++ b/include/util/tlog.h @@ -83,9 +83,14 @@ void taosPrintLongString(const char *flags, ELogLevel level, int32_t dflag, cons #endif ; -bool taosAssert(bool condition, const char *file, int32_t line, const char *format, ...); -#define ASSERTS(condition, ...) taosAssert(condition, __FILE__, __LINE__, __VA_ARGS__) -#define ASSERT(condition) ASSERTS(condition, "assert info not provided") +bool taosAssertDebug(bool condition, const char *file, int32_t line, const char *format, ...); +bool taosAssertRelease(bool condition); +#define ASSERTS(condition, ...) taosAssertDebug(condition, __FILE__, __LINE__, __VA_ARGS__) +#ifdef NDEBUG +#define ASSERT(condition) taosAssertRelease(condition) +#else +#define ASSERT(condition) taosAssertDebug(condition, __FILE__, __LINE__, "assert info not provided") +#endif // clang-format off #define uFatal(...) { if (uDebugFlag & DEBUG_FATAL) { taosPrintLog("UTL FATAL", DEBUG_FATAL, tsLogEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }} diff --git a/source/util/src/tlog.c b/source/util/src/tlog.c index f6f814d82b..53d0cad5ea 100644 --- a/source/util/src/tlog.c +++ b/source/util/src/tlog.c @@ -790,7 +790,7 @@ cmp_end: return ret; } -bool taosAssert(bool condition, const char *file, int32_t line, const char *format, ...) { +bool taosAssertDebug(bool condition, const char *file, int32_t line, const char *format, ...) { if (condition) return false; const char *flags = "UTL FATAL "; @@ -822,4 +822,24 @@ bool taosAssert(bool condition, const char *file, int32_t line, const char *form } return true; -} \ No newline at end of file +} + +#ifdef NDEBUG +bool taosAssertRelease(bool condition) { + if (condition) return false; + + const char *flags = "UTL FATAL "; + ELogLevel level = DEBUG_FATAL; + int32_t dflag = 255; // tsLogEmbedded ? 255 : uDebugFlag + + taosPrintLog(flags, level, dflag, "tAssert called in release mode, exit:%d", tsAssert); + taosPrintTrace(flags, level, dflag); + + if (tsAssert) { + taosMsleep(300); + abort(); + } + + return true; +} +#endif \ No newline at end of file From 5dc80c0bb1818a5c690c74ed0eb884f2f40b296f Mon Sep 17 00:00:00 2001 From: dapan1121 Date: Fri, 30 Dec 2022 11:20:25 +0800 Subject: [PATCH 38/40] fix: invalid msg order issue --- source/libs/qworker/src/qworker.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/source/libs/qworker/src/qworker.c b/source/libs/qworker/src/qworker.c index 6513845035..cf6e251d72 100644 --- a/source/libs/qworker/src/qworker.c +++ b/source/libs/qworker/src/qworker.c @@ -681,6 +681,7 @@ int32_t qwProcessCQuery(QW_FPARAMS_DEF, SQWMsg *qwMsg) { void *rsp = NULL; int32_t dataLen = 0; bool queryStop = false; + bool qComplete = false; do { ctx = NULL; @@ -705,11 +706,12 @@ int32_t qwProcessCQuery(QW_FPARAMS_DEF, SQWMsg *qwMsg) { } if (rsp) { - bool qComplete = (DS_BUF_EMPTY == sOutput.bufStatus && sOutput.queryEnd); + qComplete = (DS_BUF_EMPTY == sOutput.bufStatus && sOutput.queryEnd); qwBuildFetchRsp(rsp, &sOutput, dataLen, qComplete); if (qComplete) { atomic_store_8((int8_t *)&ctx->queryEnd, true); + atomic_store_8((int8_t *)&ctx->queryContinue, 0); } qwMsg->connInfo = ctx->dataConnInfo; @@ -743,8 +745,7 @@ int32_t qwProcessCQuery(QW_FPARAMS_DEF, SQWMsg *qwMsg) { } QW_LOCK(QW_WRITE, &ctx->lock); - if ((queryStop && (0 == atomic_load_8((int8_t *)&ctx->queryContinue))) || code || - 0 == atomic_load_8((int8_t *)&ctx->queryContinue)) { + if (qComplete || (queryStop && (0 == atomic_load_8((int8_t *)&ctx->queryContinue))) || code) { // Note: query is not running anymore QW_SET_PHASE(ctx, 0); QW_UNLOCK(QW_WRITE, &ctx->lock); From 4c6702ab7344a4ebfe5014674cd7aacc96d11b69 Mon Sep 17 00:00:00 2001 From: 54liuyao <54liuyao@163.com> Date: Fri, 30 Dec 2022 09:30:52 +0800 Subject: [PATCH 39/40] fix:modify parameter type --- source/libs/executor/inc/executorimpl.h | 2 ++ source/libs/executor/src/timewindowoperator.c | 4 ++-- source/libs/executor/test/executorTests.cpp | 13 +++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/source/libs/executor/inc/executorimpl.h b/source/libs/executor/inc/executorimpl.h index aeabae418f..fffe687ff6 100644 --- a/source/libs/executor/inc/executorimpl.h +++ b/source/libs/executor/inc/executorimpl.h @@ -852,6 +852,8 @@ int32_t releaseOutputBuf(SStreamState* pState, SWinKey* pKey, SResultRow* pResul int32_t saveOutputBuf(SStreamState* pState, SWinKey* pKey, SResultRow* pResult, int32_t resSize); void getNextIntervalWindow(SInterval* pInterval, STimeWindow* tw, int32_t order); int32_t qAppendTaskStopInfo(SExecTaskInfo* pTaskInfo, SExchangeOpStopInfo* pInfo); +int32_t getForwardStepsInBlock(int32_t numOfRows, __block_search_fn_t searchFn, TSKEY ekey, int32_t pos, + int32_t order, int64_t* pData); #ifdef __cplusplus } diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c index 02411435b6..58fadc60b0 100644 --- a/source/libs/executor/src/timewindowoperator.c +++ b/source/libs/executor/src/timewindowoperator.c @@ -119,8 +119,8 @@ static void doKeepNewWindowStartInfo(SWindowRowsSup* pRowSup, const int64_t* tsL pRowSup->groupId = groupId; } -static FORCE_INLINE int32_t getForwardStepsInBlock(int32_t numOfRows, __block_search_fn_t searchFn, TSKEY ekey, - int16_t pos, int16_t order, int64_t* pData) { +FORCE_INLINE int32_t getForwardStepsInBlock(int32_t numOfRows, __block_search_fn_t searchFn, TSKEY ekey, + int32_t pos, int32_t order, int64_t* pData) { int32_t forwardRows = 0; if (order == TSDB_ORDER_ASC) { diff --git a/source/libs/executor/test/executorTests.cpp b/source/libs/executor/test/executorTests.cpp index 2efd06f440..913aae6cc3 100644 --- a/source/libs/executor/test/executorTests.cpp +++ b/source/libs/executor/test/executorTests.cpp @@ -43,6 +43,19 @@ enum { data_desc = 0x3, }; +TEST(testCase, windowFunctionTest) { + int64_t tsCol[100000]; + int32_t rows = 100000; + for (int32_t i = 0; i < rows; i++) { + tsCol[i] = 1648791213000 + i; + } + int32_t ekeyNum = 50000; + int32_t pos = 40000; + int64_t ekey = tsCol[ekeyNum]; + int32_t num = getForwardStepsInBlock(rows, binarySearchForKey, ekey, pos, TSDB_ORDER_ASC, tsCol); + ASSERT_EQ(num, ekeyNum - pos + 1); +} + typedef struct SDummyInputInfo { int32_t totalPages; // numOfPages int32_t current; From fcf64fa3d55537737bec92e06e903bf45d96b344 Mon Sep 17 00:00:00 2001 From: xinsheng Ren <285808407@qq.com> Date: Fri, 30 Dec 2022 15:39:15 +0800 Subject: [PATCH 40/40] Enh/xsren/win print trace mainbase (#19279) * enh/TD-21425/windows print trace * enh/windows trace test * fix/check calloc failed * enh/windows print,stack size hard code --- include/os/osMemory.h | 6 +++++- include/os/osSystem.h | 33 +++++++++++++++++++++++++++--- source/os/CMakeLists.txt | 2 +- source/os/test/CMakeLists.txt | 24 ++++++++++++++++++++++ source/os/test/osTests.cpp | 38 +++++++++++++++++++++++++++++++++++ 5 files changed, 98 insertions(+), 5 deletions(-) create mode 100644 source/os/test/CMakeLists.txt diff --git a/include/os/osMemory.h b/include/os/osMemory.h index 4681ff6674..e6a4488287 100644 --- a/include/os/osMemory.h +++ b/include/os/osMemory.h @@ -22,12 +22,16 @@ extern "C" { // If the error is in a third-party library, place this header file under the third-party library header file. // When you want to use this feature, you should find or add the same function in the following sectio +#if !defined(WINDOWS) + #ifndef ALLOW_FORBID_FUNC #define malloc MALLOC_FUNC_TAOS_FORBID #define calloc CALLOC_FUNC_TAOS_FORBID #define realloc REALLOC_FUNC_TAOS_FORBID #define free FREE_FUNC_TAOS_FORBID -#endif +#endif // ifndef ALLOW_FORBID_FUNC + +#endif // if !defined(WINDOWS) void *taosMemoryMalloc(int64_t size); void *taosMemoryCalloc(int64_t num, int64_t size); diff --git a/include/os/osSystem.h b/include/os/osSystem.h index 8f1f5c58d5..58f34d26f0 100644 --- a/include/os/osSystem.h +++ b/include/os/osSystem.h @@ -62,11 +62,38 @@ void taosResetTerminalMode(); taosMemoryFree(strings); \ } #else +#include +#include + +#define STACKSIZE 64 #define taosPrintTrace(flags, level, dflag) \ { \ - taosPrintLog(flags, level, dflag, \ - "backtrace not implemented on windows, so detailed stack information cannot be printed"); \ - } + unsigned int i; \ + void* stack[STACKSIZE]; \ + unsigned short frames; \ + SYMBOL_INFO* symbol; \ + HANDLE process; \ + \ + process = GetCurrentProcess(); \ + \ + SymInitialize(process, NULL, TRUE); \ + \ + frames = CaptureStackBackTrace(0, STACKSIZE, stack, NULL); \ + symbol = (SYMBOL_INFO*)calloc(sizeof(SYMBOL_INFO) + 256 * sizeof(char), 1); \ + if (symbol != NULL) { \ + symbol->MaxNameLen = 255; \ + symbol->SizeOfStruct = sizeof(SYMBOL_INFO); \ + \ + if (frames > 0) { \ + taosPrintLog(flags, level, dflag, "obtained %d stack frames", frames); \ + for (i = 0; i < frames; i++) { \ + SymFromAddr(process, (DWORD64)(stack[i]), 0, symbol); \ + taosPrintLog(flags, level, dflag, "frame:%i: %s - 0x%0X", frames - i - 1, symbol->Name, symbol->Address); \ + } \ + } \ + free(symbol); \ + } \ + } #endif #ifdef __cplusplus diff --git a/source/os/CMakeLists.txt b/source/os/CMakeLists.txt index 0d85a8bec4..5d9b6ee5cc 100644 --- a/source/os/CMakeLists.txt +++ b/source/os/CMakeLists.txt @@ -41,7 +41,7 @@ target_link_libraries( ) if(TD_WINDOWS) target_link_libraries( - os PUBLIC ws2_32 iconv msvcregex wcwidth winmm crashdump + os PUBLIC ws2_32 iconv msvcregex wcwidth winmm crashdump dbghelp ) elseif(TD_DARWIN_64) find_library(CORE_FOUNDATION_FRAMEWORK CoreFoundation) diff --git a/source/os/test/CMakeLists.txt b/source/os/test/CMakeLists.txt new file mode 100644 index 0000000000..21fb2ee630 --- /dev/null +++ b/source/os/test/CMakeLists.txt @@ -0,0 +1,24 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 2.8...3.20) +PROJECT(TDengine) + +FIND_PATH(HEADER_GTEST_INCLUDE_DIR gtest.h /usr/include/gtest /usr/local/include/gtest) +FIND_LIBRARY(LIB_GTEST_STATIC_DIR libgtest.a /usr/lib/ /usr/local/lib /usr/lib64) +FIND_LIBRARY(LIB_GTEST_SHARED_DIR libgtest.so /usr/lib/ /usr/local/lib /usr/lib64) + +IF (HEADER_GTEST_INCLUDE_DIR AND (LIB_GTEST_STATIC_DIR OR LIB_GTEST_SHARED_DIR)) + MESSAGE(STATUS "gTest library found, build os test") + + INCLUDE_DIRECTORIES(${HEADER_GTEST_INCLUDE_DIR}) + AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST) + +ENDIF() + +INCLUDE_DIRECTORIES(${TD_SOURCE_DIR}/src/util/inc) + +# osTests +add_executable(osTests "osTests.cpp") +target_link_libraries(osTests os util gtest_main) +add_test( + NAME osTests + COMMAND osTests +) \ No newline at end of file diff --git a/source/os/test/osTests.cpp b/source/os/test/osTests.cpp index e69de29bb2..d79e1934de 100644 --- a/source/os/test/osTests.cpp +++ b/source/os/test/osTests.cpp @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2019 TAOS Data, Inc. + * + * This program is free software: you can use, redistribute, and/or modify + * it under the terms of the GNU Affero General Public License, version 3 + * or later ("AGPL"), as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +#include +#include + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wwrite-strings" +#pragma GCC diagnostic ignored "-Wunused-function" +#pragma GCC diagnostic ignored "-Wunused-variable" +#pragma GCC diagnostic ignored "-Wsign-compare" +#pragma GCC diagnostic ignored "-Wsign-compare" +#pragma GCC diagnostic ignored "-Wformat" +#pragma GCC diagnostic ignored "-Wint-to-pointer-cast" +#pragma GCC diagnostic ignored "-Wpointer-arith" + +#include "os.h" + +TEST(osTest, osSystem) { + const char *flags = "UTL FATAL "; + ELogLevel level = DEBUG_FATAL; + int32_t dflag = 255; // tsLogEmbedded ? 255 : uDebugFlag + taosPrintTrace(flags, level, dflag); +} + +#pragma GCC diagnostic pop