diff --git a/include/common/tmsg.h b/include/common/tmsg.h index b3e8cf7d262cd548c94fdd693ea5b0e724662526..f51075a89a11d8446e97c80cccb6aba29f9aa05d 100644 --- a/include/common/tmsg.h +++ b/include/common/tmsg.h @@ -826,7 +826,8 @@ typedef struct SShowRsp { } SShowRsp; typedef struct { - char ep[TSDB_EP_LEN]; // end point, hostname:port + char ep[TSDB_FQDN_LEN]; // end point, hostname:port + int32_t port; } SCreateDnodeMsg; typedef struct { diff --git a/include/libs/qcom/query.h b/include/libs/qcom/query.h index 1e970fbd663701d167b419bc4889810edd269eb4..5ff42146e9902e63bd34ba2c7792d92163333582 100644 --- a/include/libs/qcom/query.h +++ b/include/libs/qcom/query.h @@ -124,6 +124,15 @@ int32_t cleanupTaskQueue(); */ int32_t taosAsyncExec(__async_exec_fn_t execFn, void* execParam, int32_t* code); +/** + * Asynchronously send message to server, after the response received, the callback will be incured. + * + * @param pTransporter + * @param epSet + * @param pTransporterId + * @param pInfo + * @return + */ int32_t asyncSendMsgToServer(void *pTransporter, SEpSet* epSet, int64_t* pTransporterId, const SMsgSendInfo* pInfo); const SSchema* tGetTbnameColumnSchema(); diff --git a/source/client/src/clientImpl.c b/source/client/src/clientImpl.c index 64cbc8a5d07c57503a47ae41a3bf8e2d5c16420d..da10332652bcc5f182eedb857f68c758513b2dab 100644 --- a/source/client/src/clientImpl.c +++ b/source/client/src/clientImpl.c @@ -362,30 +362,6 @@ static void destroySendMsgInfo(SMsgSendInfo* pMsgBody) { tfree(pMsgBody); } -int32_t asyncSendMsgToServer(void *pTransporter, SEpSet* epSet, int64_t* pTransporterId, const SMsgSendInfo* pInfo) { - char *pMsg = rpcMallocCont(pInfo->msgInfo.len); - if (NULL == pMsg) { - tscError("0x%"PRIx64" msg:%s malloc failed", pInfo->requestId, TMSG_INFO(pInfo->msgType)); - terrno = TSDB_CODE_TSC_OUT_OF_MEMORY; - return -1; - } - - memcpy(pMsg, pInfo->msgInfo.pData, pInfo->msgInfo.len); - SRpcMsg rpcMsg = { - .msgType = pInfo->msgType, - .pCont = pMsg, - .contLen = pInfo->msgInfo.len, - .ahandle = (void*) pInfo, - .handle = NULL, - .code = 0 - }; - - assert(pInfo->fp != NULL); - - rpcSendRequest(pTransporter, epSet, &rpcMsg, pTransporterId); - return TSDB_CODE_SUCCESS; -} - void processMsgFromServer(void* parent, SRpcMsg* pMsg, SEpSet* pEpSet) { SMsgSendInfo *pSendInfo = (SMsgSendInfo *) pMsg->ahandle; assert(pMsg->ahandle != NULL); diff --git a/source/client/test/clientTests.cpp b/source/client/test/clientTests.cpp index 2a3b38b8282fbac02403ffb95d522cdbb56a0afc..83d0e61eb366be56cfb54016705de8b390608cca 100644 --- a/source/client/test/clientTests.cpp +++ b/source/client/test/clientTests.cpp @@ -173,7 +173,7 @@ TEST(testCase, create_dnode_Test) { TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0); assert(pConn != NULL); - TAOS_RES* pRes = taos_query(pConn, "create dnode abc1"); + TAOS_RES* pRes = taos_query(pConn, "create dnode abc1 port 7000"); if (taos_errno(pRes) != 0) { printf("error in create dnode, reason:%s\n", taos_errstr(pRes)); } @@ -291,7 +291,24 @@ TEST(testCase, create_table_Test) { // taos_close(pConn); } -TEST(testCase, create_ctable_Test) {} +TEST(testCase, create_ctable_Test) { + TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0); + assert(pConn != NULL); + + TAOS_RES* pRes = taos_query(pConn, "use abc1"); + if (taos_errno(pRes) != 0) { + printf("failed to use db, reason:%s\n", taos_errstr(pRes)); + } + taos_free_result(pRes); + + pRes = taos_query(pConn, "create table tm0 using st1 tags(1)"); + if (taos_errno(pRes) != 0) { + printf("failed to create child table tm0, reason:%s\n", taos_errstr(pRes)); + } + + taos_free_result(pRes); + taos_close(pConn); +} TEST(testCase, show_stable_Test) { TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0); diff --git a/source/libs/parser/inc/sql.y b/source/libs/parser/inc/sql.y index 183b71483be7d275f5745678e4882bc6ed444db3..a3ce3c2427d207af50c8e51eaff49389d611cdd1 100644 --- a/source/libs/parser/inc/sql.y +++ b/source/libs/parser/inc/sql.y @@ -200,7 +200,7 @@ ifnotexists(X) ::= . { X.n = 0;} /////////////////////////////////THE CREATE STATEMENT/////////////////////////////////////// //create option for dnode/db/user/account -cmd ::= CREATE DNODE ids(X). { setDCLSqlElems(pInfo, TSDB_SQL_CREATE_DNODE, 1, &X);} +cmd ::= CREATE DNODE ids(X) PORT ids(Y). { setDCLSqlElems(pInfo, TSDB_SQL_CREATE_DNODE, 2, &X, &Y);} cmd ::= CREATE ACCOUNT ids(X) PASS ids(Y) acct_optr(Z). { setCreateAcctSql(pInfo, TSDB_SQL_CREATE_ACCT, &X, &Y, &Z);} cmd ::= CREATE DATABASE ifnotexists(Z) ids(X) db_optr(Y). { setCreateDbInfo(pInfo, TSDB_SQL_CREATE_DB, &X, &Y, &Z);} @@ -398,13 +398,13 @@ create_stable_args(A) ::= ifnotexists(U) ids(V) cpxName(Z) LP columnlist(X) RP T // create table by using super table // create table table_name using super_table_name tags(tag_values1, tag_values2) %type create_from_stable{SCreatedTableInfo} -create_from_stable(A) ::= ifnotexists(U) ids(V) cpxName(Z) USING ids(X) cpxName(F) TAGS LP tagitemlist(Y) RP. { +create_from_stable(A) ::= ifnotexists(U) ids(V) cpxName(Z) USING ids(X) cpxName(F) TAGS LP tagitemlist1(Y) RP. { X.n += F.n; V.n += Z.n; A = createNewChildTableInfo(&X, NULL, Y, &V, &U); } -create_from_stable(A) ::= ifnotexists(U) ids(V) cpxName(Z) USING ids(X) cpxName(F) LP tagNamelist(P) RP TAGS LP tagitemlist(Y) RP. { +create_from_stable(A) ::= ifnotexists(U) ids(V) cpxName(Z) USING ids(X) cpxName(F) LP tagNamelist(P) RP TAGS LP tagitemlist1(Y) RP. { X.n += F.n; V.n += Z.n; A = createNewChildTableInfo(&X, P, Y, &V, &U); @@ -437,6 +437,15 @@ column(A) ::= ids(X) typename(Y). { tSetColumnInfo(&A, &X, &Y); } +%type tagitemlist1 {SArray*} +%destructor tagitemlist1 {taosArrayDestroy($$);} + +tagitemlist1(A) ::= tagitemlist1(X) COMMA tagitem1(Y). { taosArrayPush(X, &Y); A = X;} +tagitemlist1(A) ::= tagitem1(Y). { A = taosArrayInit(4, sizeof(SToken)); taosArrayPush(A, &Y); } + +%type tagitem1 {SToken} +tagitem1(A) ::= MINUS(X) INTEGER(Y). { A.n = X.n + Y.n; A.type = Y.type; } + %type tagitemlist {SArray*} %destructor tagitemlist {taosArrayDestroy($$);} diff --git a/source/libs/parser/inc/ttokendef.h b/source/libs/parser/inc/ttokendef.h index ccb62b33208ef2b5c766cdfeacd4899006db604e..4a5427c170e2e3c832b905a5f416c506b7d124b4 100644 --- a/source/libs/parser/inc/ttokendef.h +++ b/source/libs/parser/inc/ttokendef.h @@ -103,114 +103,115 @@ #define TK_RP 85 #define TK_IF 86 #define TK_EXISTS 87 -#define TK_AS 88 -#define TK_OUTPUTTYPE 89 -#define TK_AGGREGATE 90 -#define TK_BUFSIZE 91 -#define TK_PPS 92 -#define TK_TSERIES 93 -#define TK_DBS 94 -#define TK_STORAGE 95 -#define TK_QTIME 96 -#define TK_CONNS 97 -#define TK_STATE 98 -#define TK_COMMA 99 -#define TK_KEEP 100 -#define TK_CACHE 101 -#define TK_REPLICA 102 -#define TK_QUORUM 103 -#define TK_DAYS 104 -#define TK_MINROWS 105 -#define TK_MAXROWS 106 -#define TK_BLOCKS 107 -#define TK_CTIME 108 -#define TK_WAL 109 -#define TK_FSYNC 110 -#define TK_COMP 111 -#define TK_PRECISION 112 -#define TK_UPDATE 113 -#define TK_CACHELAST 114 -#define TK_UNSIGNED 115 -#define TK_TAGS 116 -#define TK_USING 117 -#define TK_NULL 118 -#define TK_NOW 119 -#define TK_SELECT 120 -#define TK_UNION 121 -#define TK_ALL 122 -#define TK_DISTINCT 123 -#define TK_FROM 124 -#define TK_VARIABLE 125 -#define TK_INTERVAL 126 -#define TK_EVERY 127 -#define TK_SESSION 128 -#define TK_STATE_WINDOW 129 -#define TK_FILL 130 -#define TK_SLIDING 131 -#define TK_ORDER 132 -#define TK_BY 133 -#define TK_ASC 134 -#define TK_GROUP 135 -#define TK_HAVING 136 -#define TK_LIMIT 137 -#define TK_OFFSET 138 -#define TK_SLIMIT 139 -#define TK_SOFFSET 140 -#define TK_WHERE 141 -#define TK_RESET 142 -#define TK_QUERY 143 -#define TK_SYNCDB 144 -#define TK_ADD 145 -#define TK_COLUMN 146 -#define TK_MODIFY 147 -#define TK_TAG 148 -#define TK_CHANGE 149 -#define TK_SET 150 -#define TK_KILL 151 -#define TK_CONNECTION 152 -#define TK_STREAM 153 -#define TK_COLON 154 -#define TK_ABORT 155 -#define TK_AFTER 156 -#define TK_ATTACH 157 -#define TK_BEFORE 158 -#define TK_BEGIN 159 -#define TK_CASCADE 160 -#define TK_CLUSTER 161 -#define TK_CONFLICT 162 -#define TK_COPY 163 -#define TK_DEFERRED 164 -#define TK_DELIMITERS 165 -#define TK_DETACH 166 -#define TK_EACH 167 -#define TK_END 168 -#define TK_EXPLAIN 169 -#define TK_FAIL 170 -#define TK_FOR 171 -#define TK_IGNORE 172 -#define TK_IMMEDIATE 173 -#define TK_INITIALLY 174 -#define TK_INSTEAD 175 -#define TK_KEY 176 -#define TK_OF 177 -#define TK_RAISE 178 -#define TK_REPLACE 179 -#define TK_RESTRICT 180 -#define TK_ROW 181 -#define TK_STATEMENT 182 -#define TK_TRIGGER 183 -#define TK_VIEW 184 -#define TK_IPTOKEN 185 -#define TK_SEMI 186 -#define TK_NONE 187 -#define TK_PREV 188 -#define TK_LINEAR 189 -#define TK_IMPORT 190 -#define TK_TBNAME 191 -#define TK_JOIN 192 -#define TK_INSERT 193 -#define TK_INTO 194 -#define TK_VALUES 195 +#define TK_PORT 88 +#define TK_AS 89 +#define TK_OUTPUTTYPE 90 +#define TK_AGGREGATE 91 +#define TK_BUFSIZE 92 +#define TK_PPS 93 +#define TK_TSERIES 94 +#define TK_DBS 95 +#define TK_STORAGE 96 +#define TK_QTIME 97 +#define TK_CONNS 98 +#define TK_STATE 99 +#define TK_COMMA 100 +#define TK_KEEP 101 +#define TK_CACHE 102 +#define TK_REPLICA 103 +#define TK_QUORUM 104 +#define TK_DAYS 105 +#define TK_MINROWS 106 +#define TK_MAXROWS 107 +#define TK_BLOCKS 108 +#define TK_CTIME 109 +#define TK_WAL 110 +#define TK_FSYNC 111 +#define TK_COMP 112 +#define TK_PRECISION 113 +#define TK_UPDATE 114 +#define TK_CACHELAST 115 +#define TK_UNSIGNED 116 +#define TK_TAGS 117 +#define TK_USING 118 +#define TK_NULL 119 +#define TK_NOW 120 +#define TK_SELECT 121 +#define TK_UNION 122 +#define TK_ALL 123 +#define TK_DISTINCT 124 +#define TK_FROM 125 +#define TK_VARIABLE 126 +#define TK_INTERVAL 127 +#define TK_EVERY 128 +#define TK_SESSION 129 +#define TK_STATE_WINDOW 130 +#define TK_FILL 131 +#define TK_SLIDING 132 +#define TK_ORDER 133 +#define TK_BY 134 +#define TK_ASC 135 +#define TK_GROUP 136 +#define TK_HAVING 137 +#define TK_LIMIT 138 +#define TK_OFFSET 139 +#define TK_SLIMIT 140 +#define TK_SOFFSET 141 +#define TK_WHERE 142 +#define TK_RESET 143 +#define TK_QUERY 144 +#define TK_SYNCDB 145 +#define TK_ADD 146 +#define TK_COLUMN 147 +#define TK_MODIFY 148 +#define TK_TAG 149 +#define TK_CHANGE 150 +#define TK_SET 151 +#define TK_KILL 152 +#define TK_CONNECTION 153 +#define TK_STREAM 154 +#define TK_COLON 155 +#define TK_ABORT 156 +#define TK_AFTER 157 +#define TK_ATTACH 158 +#define TK_BEFORE 159 +#define TK_BEGIN 160 +#define TK_CASCADE 161 +#define TK_CLUSTER 162 +#define TK_CONFLICT 163 +#define TK_COPY 164 +#define TK_DEFERRED 165 +#define TK_DELIMITERS 166 +#define TK_DETACH 167 +#define TK_EACH 168 +#define TK_END 169 +#define TK_EXPLAIN 170 +#define TK_FAIL 171 +#define TK_FOR 172 +#define TK_IGNORE 173 +#define TK_IMMEDIATE 174 +#define TK_INITIALLY 175 +#define TK_INSTEAD 176 +#define TK_KEY 177 +#define TK_OF 178 +#define TK_RAISE 179 +#define TK_REPLACE 180 +#define TK_RESTRICT 181 +#define TK_ROW 182 +#define TK_STATEMENT 183 +#define TK_TRIGGER 184 +#define TK_VIEW 185 +#define TK_IPTOKEN 186 +#define TK_SEMI 187 +#define TK_NONE 188 +#define TK_PREV 189 +#define TK_LINEAR 190 +#define TK_IMPORT 191 +#define TK_TBNAME 192 +#define TK_JOIN 193 +#define TK_INSERT 194 +#define TK_INTO 195 +#define TK_VALUES 196 diff --git a/source/libs/parser/src/astToMsg.c b/source/libs/parser/src/astToMsg.c index 025ec7fb0a5e0f0ff09dc2e183d35a74fa26397c..48bdf8d3e405937a0252fa436bf3112f3327102b 100644 --- a/source/libs/parser/src/astToMsg.c +++ b/source/libs/parser/src/astToMsg.c @@ -379,8 +379,10 @@ SDropStbMsg* buildDropStableMsg(SSqlInfo* pInfo, int32_t* len, SParseBasicCtx* p SCreateDnodeMsg *buildCreateDnodeMsg(SSqlInfo* pInfo, int32_t* len, SMsgBuf* pMsgBuf) { const char* msg1 = "invalid host name (name too long, maximum length 128)"; const char* msg2 = "dnode name can not be string"; + const char* msg3 = "port should be an integer that is less than 65535"; + const char* msg4 = "failed prepare create dnode message"; - if (taosArrayGetSize(pInfo->pMiscInfo->a) > 1) { + if (taosArrayGetSize(pInfo->pMiscInfo->a) != 2) { buildInvalidOperationMsg(pMsgBuf, msg1); return NULL; } @@ -391,10 +393,31 @@ SCreateDnodeMsg *buildCreateDnodeMsg(SSqlInfo* pInfo, int32_t* len, SMsgBuf* pMs return NULL; } + SToken* port = taosArrayGet(pInfo->pMiscInfo->a, 1); + if (port->type != TK_INTEGER) { + buildInvalidOperationMsg(pMsgBuf, msg3); + return NULL; + } + + bool isSign = false; + int64_t val = 0; + + toInteger(port->z, port->n, 10, &val, &isSign); + if (val >= UINT16_MAX) { + buildInvalidOperationMsg(pMsgBuf, msg3); + return NULL; + } + SCreateDnodeMsg *pCreate = (SCreateDnodeMsg *) calloc(1, sizeof(SCreateDnodeMsg)); + if (pCreate == NULL) { + buildInvalidOperationMsg(pMsgBuf, msg4); + return NULL; + } + strncpy(pCreate->ep, id->z, id->n); - *len = sizeof(SCreateDnodeMsg); + pCreate->port = val; + *len = sizeof(SCreateDnodeMsg); return pCreate; } diff --git a/source/libs/parser/src/astValidate.c b/source/libs/parser/src/astValidate.c index 6325620f548d88f87672fc6cd7bde5401f25ce7d..b2466fd2dcccb2938ef060991c2696f29916ccf2 100644 --- a/source/libs/parser/src/astValidate.c +++ b/source/libs/parser/src/astValidate.c @@ -3986,7 +3986,6 @@ int32_t qParserValidateSqlNode(struct SCatalog* pCatalog, SSqlInfo* pInfo, SQuer return buildInvalidOperationMsg(pMsgBuf, "not support sql expression"); } - SCatalogReq req = {0}; SMetaData data = {0}; @@ -4023,6 +4022,5 @@ int32_t qParserValidateSqlNode(struct SCatalog* pCatalog, SSqlInfo* pInfo, SQuer validateSqlNode(p, pQueryInfo, &buf); } - return code; } diff --git a/source/libs/parser/src/dCDAstProcess.c b/source/libs/parser/src/dCDAstProcess.c index bdddbec327f00a7dc9e70be3b44f9be4eb0068f1..a0410e6ec049a171f64f78adeda5b0b744fdfefa 100644 --- a/source/libs/parser/src/dCDAstProcess.c +++ b/source/libs/parser/src/dCDAstProcess.c @@ -1,8 +1,9 @@ -#include "tglobal.h" -#include "parserInt.h" +#include #include "astToMsg.h" +#include "parserInt.h" #include "parserUtil.h" #include "queryInfoUtil.h" +#include "tglobal.h" /* is contained in pFieldList or not */ static bool has(SArray* pFieldList, int32_t startIndex, const char* name) { @@ -293,7 +294,6 @@ int32_t doCheckForCreateCTable(SSqlInfo* pInfo, SParseBasicCtx *pCtx, SMsgBuf* p // super table name, create table by using dst int32_t numOfTables = (int32_t) taosArrayGetSize(pCreateTable->childTableInfo); for(int32_t j = 0; j < numOfTables; ++j) { -#if 0 SCreatedTableInfo* pCreateTableInfo = taosArrayGet(pCreateTable->childTableInfo, j); SToken* pSTableNameToken = &pCreateTableInfo->stbName; @@ -341,12 +341,7 @@ int32_t doCheckForCreateCTable(SSqlInfo* pInfo, SParseBasicCtx *pCtx, SMsgBuf* p pNameList = pCreateTableInfo->pTagNames; nameSize = taosArrayGetSize(pNameList); - if (valSize != nameSize) { - tdDestroyKVRowBuilder(&kvRowBuilder); - return buildInvalidOperationMsg(pMsgBuf, msg2); - } - - if (schemaSize < valSize) { + if (valSize != nameSize || schemaSize < valSize) { tdDestroyKVRowBuilder(&kvRowBuilder); return buildInvalidOperationMsg(pMsgBuf, msg2); } @@ -359,15 +354,15 @@ int32_t doCheckForCreateCTable(SSqlInfo* pInfo, SParseBasicCtx *pCtx, SMsgBuf* p strncpy(tmpTokenBuf, sToken->z, sToken->n); sToken->z = tmpTokenBuf; - if (TK_STRING == sToken->type) { - tscDequoteAndTrimToken(sToken); - } +// if (TK_STRING == sToken->type) { +// tscDequoteAndTrimToken(sToken); +// } - if (TK_ID == sToken->type) { - tscRmEscapeAndTrimToken(sToken); - } +// if (TK_ID == sToken->type) { +// tscRmEscapeAndTrimToken(sToken); +// } - tVariantListItem* pItem = taosArrayGet(pValList, i); + SListItem* pItem = taosArrayGet(pValList, i); findColumnIndex = false; @@ -384,16 +379,16 @@ int32_t doCheckForCreateCTable(SSqlInfo* pInfo, SParseBasicCtx *pCtx, SMsgBuf* p } } else if (pSchema->type == TSDB_DATA_TYPE_TIMESTAMP) { if (pItem->pVar.nType == TSDB_DATA_TYPE_BINARY) { - ret = convertTimestampStrToInt64(&(pItem->pVar), tinfo.precision); - if (ret != TSDB_CODE_SUCCESS) { - return buildInvalidOperationMsg(pMsgBuf, msg4); - } +// code = convertTimestampStrToInt64(&(pItem->pVar), tinfo.precision); +// if (code != TSDB_CODE_SUCCESS) { +// return buildInvalidOperationMsg(pMsgBuf, msg4); +// } } else if (pItem->pVar.nType == TSDB_DATA_TYPE_TIMESTAMP) { - pItem->pVar.i64 = convertTimePrecision(pItem->pVar.i64, TSDB_TIME_PRECISION_NANO, tinfo.precision); + pItem->pVar.i = convertTimePrecision(pItem->pVar.i, TSDB_TIME_PRECISION_NANO, tinfo.precision); } } - code = tVariantDump(&(pItem->pVar), tagVal, pSchema->type, true); + code = taosVariantDump(&(pItem->pVar), tagVal, pSchema->type, true); // check again after the convert since it may be converted from binary to nchar. if (pSchema->type == TSDB_DATA_TYPE_BINARY || pSchema->type == TSDB_DATA_TYPE_NCHAR) { @@ -428,8 +423,8 @@ int32_t doCheckForCreateCTable(SSqlInfo* pInfo, SParseBasicCtx *pCtx, SMsgBuf* p } for (int32_t i = 0; i < valSize; ++i) { - SSchema* pSchema = &pTagSchema[i]; - tVariantListItem* pItem = taosArrayGet(pValList, i); + SSchema *pSchema = &pTagSchema[i]; + SListItem *pItem = taosArrayGet(pValList, i); char tagVal[TSDB_MAX_TAGS_LEN]; if (pSchema->type == TSDB_DATA_TYPE_BINARY || pSchema->type == TSDB_DATA_TYPE_NCHAR) { @@ -439,16 +434,16 @@ int32_t doCheckForCreateCTable(SSqlInfo* pInfo, SParseBasicCtx *pCtx, SMsgBuf* p } } else if (pSchema->type == TSDB_DATA_TYPE_TIMESTAMP) { if (pItem->pVar.nType == TSDB_DATA_TYPE_BINARY) { - ret = convertTimestampStrToInt64(&(pItem->pVar), tinfo.precision); - if (ret != TSDB_CODE_SUCCESS) { +// code = convertTimestampStrToInt64(&(pItem->pVar), tinfo.precision); + if (code != TSDB_CODE_SUCCESS) { return buildInvalidOperationMsg(pMsgBuf, msg4); } } else if (pItem->pVar.nType == TSDB_DATA_TYPE_TIMESTAMP) { - pItem->pVar.i64 = convertTimePrecision(pItem->pVar.i64, TSDB_TIME_PRECISION_NANO, tinfo.precision); + pItem->pVar.i = convertTimePrecision(pItem->pVar.i, TSDB_TIME_PRECISION_NANO, tinfo.precision); } } - code = tVariantDump(&(pItem->pVar), tagVal, pSchema->type, true); + code = taosVariantDump(&(pItem->pVar), tagVal, pSchema->type, true); // check again after the convert since it may be converted from binary to nchar. if (pSchema->type == TSDB_DATA_TYPE_BINARY || pSchema->type == TSDB_DATA_TYPE_NCHAR) { @@ -485,22 +480,21 @@ int32_t doCheckForCreateCTable(SSqlInfo* pInfo, SParseBasicCtx *pCtx, SMsgBuf* p bool dbIncluded2 = false; // table name - if (tscValidateName(&(pCreateTableInfo->name), true, &dbIncluded2) != TSDB_CODE_SUCCESS) { - return buildInvalidOperationMsg(pMsgBuf, msg1); - } - - STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, TABLE_INDEX); - code = tscSetTableFullName(&pTableMetaInfo->name, &pCreateTableInfo->name, pSql, dbIncluded2); - if (code != TSDB_CODE_SUCCESS) { - return code; - } - - pCreateTableInfo->fullname = calloc(1, tNameLen(&pTableMetaInfo->name) + 1); - code = tNameExtractFullName(&pTableMetaInfo->name, pCreateTableInfo->fullname); - if (code != TSDB_CODE_SUCCESS) { - return buildInvalidOperationMsg(pMsgBuf, msg1); - } -#endif +// if (tscValidateName(&(pCreateTableInfo->name), true, &dbIncluded2) != TSDB_CODE_SUCCESS) { +// return buildInvalidOperationMsg(pMsgBuf, msg1); +// } + +// STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, TABLE_INDEX); +// code = tscSetTableFullName(&pTableMetaInfo->name, &pCreateTableInfo->name, pSql, dbIncluded2); +// if (code != TSDB_CODE_SUCCESS) { +// return code; +// } + +// pCreateTableInfo->fullname = calloc(1, tNameLen(&pTableMetaInfo->name) + 1); +// code = tNameExtractFullName(&pTableMetaInfo->name, pCreateTableInfo->fullname); +// if (code != TSDB_CODE_SUCCESS) { +// return buildInvalidOperationMsg(pMsgBuf, msg1); +// } } return TSDB_CODE_SUCCESS; diff --git a/source/libs/parser/src/sql.c b/source/libs/parser/src/sql.c index 5295faf645c137e749eac0b0f3ed30b2e393a562..5d8990198917a506de97438c1e24d13cb813c5ce 100644 --- a/source/libs/parser/src/sql.c +++ b/source/libs/parser/src/sql.c @@ -97,30 +97,30 @@ #endif /************* Begin control #defines *****************************************/ #define YYCODETYPE unsigned short int -#define YYNOCODE 276 +#define YYNOCODE 279 #define YYACTIONTYPE unsigned short int #define ParseTOKENTYPE SToken typedef union { int yyinit; ParseTOKENTYPE yy0; - SSessionWindowVal yy39; - SCreateDbInfo yy42; - SVariant yy43; - int yy44; - tSqlExpr* yy46; - SLimit yy55; - SCreatedTableInfo yy96; - SArray* yy131; - SSqlNode* yy256; - SCreateTableSql* yy272; - SField yy290; - SSubclause* yy303; - int32_t yy310; - SCreateAcctInfo yy341; - int64_t yy459; - SIntervalVal yy530; - SWindowStateVal yy538; - SRelationInfo* yy544; + SRelationInfo* yy8; + SWindowStateVal yy40; + SSqlNode* yy56; + SVariant yy69; + SCreateDbInfo yy90; + int yy96; + SField yy100; + int32_t yy104; + SSessionWindowVal yy147; + SSubclause* yy149; + SCreatedTableInfo yy152; + SCreateAcctInfo yy171; + SLimit yy231; + int64_t yy325; + SIntervalVal yy400; + SArray* yy421; + SCreateTableSql* yy438; + tSqlExpr* yy439; } YYMINORTYPE; #ifndef YYSTACKDEPTH #define YYSTACKDEPTH 100 @@ -130,17 +130,17 @@ typedef union { #define ParseARG_FETCH SSqlInfo* pInfo = yypParser->pInfo #define ParseARG_STORE yypParser->pInfo = pInfo #define YYFALLBACK 1 -#define YYNSTATE 358 -#define YYNRULE 288 -#define YYNTOKEN 196 -#define YY_MAX_SHIFT 357 -#define YY_MIN_SHIFTREDUCE 564 -#define YY_MAX_SHIFTREDUCE 851 -#define YY_ERROR_ACTION 852 -#define YY_ACCEPT_ACTION 853 -#define YY_NO_ACTION 854 -#define YY_MIN_REDUCE 855 -#define YY_MAX_REDUCE 1142 +#define YYNSTATE 362 +#define YYNRULE 291 +#define YYNTOKEN 197 +#define YY_MAX_SHIFT 361 +#define YY_MIN_SHIFTREDUCE 571 +#define YY_MAX_SHIFTREDUCE 861 +#define YY_ERROR_ACTION 862 +#define YY_ACCEPT_ACTION 863 +#define YY_NO_ACTION 864 +#define YY_MIN_REDUCE 865 +#define YY_MAX_REDUCE 1155 /************* End control #defines *******************************************/ /* Define the yytestcase() macro to be a no-op if is not already defined @@ -206,287 +206,291 @@ typedef union { ** yy_default[] Default action for each state. ** *********** Begin parsing tables **********************************************/ -#define YY_ACTTAB_COUNT (762) +#define YY_ACTTAB_COUNT (767) static const YYACTIONTYPE yy_action[] = { - /* 0 */ 94, 615, 233, 244, 356, 227, 1004, 239, 243, 616, - /* 10 */ 615, 1004, 21, 55, 56, 241, 59, 60, 616, 1004, - /* 20 */ 247, 49, 48, 47, 200, 58, 315, 63, 61, 64, - /* 30 */ 62, 987, 988, 33, 991, 54, 53, 853, 357, 52, - /* 40 */ 51, 50, 55, 56, 97, 59, 60, 650, 248, 247, - /* 50 */ 49, 48, 47, 201, 58, 315, 63, 61, 64, 62, - /* 60 */ 976, 203, 974, 975, 54, 53, 203, 977, 52, 51, - /* 70 */ 50, 978, 1119, 979, 980, 54, 53, 1119, 992, 52, - /* 80 */ 51, 50, 55, 56, 1017, 59, 60, 159, 79, 247, - /* 90 */ 49, 48, 47, 27, 58, 315, 63, 61, 64, 62, - /* 100 */ 269, 313, 693, 990, 54, 53, 203, 998, 52, 51, - /* 110 */ 50, 345, 55, 57, 788, 59, 60, 1119, 36, 247, - /* 120 */ 49, 48, 47, 615, 58, 315, 63, 61, 64, 62, - /* 130 */ 1017, 616, 335, 334, 54, 53, 152, 615, 52, 51, - /* 140 */ 50, 56, 36, 59, 60, 616, 230, 247, 49, 48, - /* 150 */ 47, 240, 58, 315, 63, 61, 64, 62, 159, 1066, - /* 160 */ 229, 287, 54, 53, 1001, 73, 52, 51, 50, 565, - /* 170 */ 566, 567, 568, 569, 570, 571, 572, 573, 574, 575, - /* 180 */ 576, 577, 578, 150, 237, 228, 59, 60, 1001, 313, - /* 190 */ 247, 49, 48, 47, 250, 58, 315, 63, 61, 64, - /* 200 */ 62, 203, 275, 274, 74, 54, 53, 753, 754, 52, - /* 210 */ 51, 50, 1118, 42, 311, 351, 350, 310, 309, 308, - /* 220 */ 349, 307, 306, 305, 348, 304, 347, 346, 289, 22, - /* 230 */ 90, 970, 958, 959, 960, 961, 962, 963, 964, 965, - /* 240 */ 966, 967, 968, 969, 971, 972, 212, 1017, 246, 803, - /* 250 */ 36, 36, 792, 213, 795, 36, 798, 168, 36, 134, - /* 260 */ 133, 132, 214, 231, 246, 803, 320, 85, 792, 251, - /* 270 */ 795, 249, 798, 323, 322, 277, 63, 61, 64, 62, - /* 280 */ 206, 255, 225, 226, 54, 53, 316, 85, 52, 51, - /* 290 */ 50, 12, 238, 324, 85, 93, 1001, 1001, 225, 226, - /* 300 */ 325, 1000, 717, 43, 1001, 714, 261, 715, 207, 716, - /* 310 */ 194, 192, 190, 159, 1027, 265, 264, 189, 138, 137, - /* 320 */ 136, 135, 36, 43, 96, 268, 42, 77, 351, 350, - /* 330 */ 43, 65, 84, 349, 221, 252, 253, 348, 36, 347, - /* 340 */ 346, 3, 39, 175, 119, 113, 123, 65, 36, 103, - /* 350 */ 107, 99, 106, 128, 131, 122, 257, 36, 254, 36, - /* 360 */ 330, 329, 125, 159, 326, 804, 799, 300, 1001, 734, - /* 370 */ 36, 121, 800, 52, 51, 50, 794, 256, 797, 1024, - /* 380 */ 327, 804, 799, 345, 1001, 1065, 173, 793, 800, 796, - /* 390 */ 331, 149, 147, 146, 1001, 355, 354, 143, 256, 332, - /* 400 */ 256, 333, 903, 1001, 770, 1001, 78, 174, 185, 1002, - /* 410 */ 352, 940, 337, 70, 92, 731, 1001, 913, 718, 719, - /* 420 */ 904, 82, 270, 185, 790, 83, 185, 750, 80, 760, - /* 430 */ 761, 703, 292, 705, 294, 91, 37, 704, 989, 32, - /* 440 */ 7, 154, 826, 66, 24, 37, 37, 66, 95, 805, - /* 450 */ 245, 66, 317, 738, 71, 614, 23, 69, 76, 208, - /* 460 */ 769, 69, 791, 23, 14, 112, 13, 111, 16, 23, - /* 470 */ 15, 295, 4, 722, 720, 723, 721, 18, 118, 17, - /* 480 */ 117, 20, 1113, 19, 130, 129, 1112, 1111, 223, 692, - /* 490 */ 224, 204, 205, 209, 202, 210, 801, 211, 216, 217, - /* 500 */ 218, 215, 199, 1003, 1138, 1130, 1019, 802, 1076, 1075, - /* 510 */ 235, 1072, 1071, 44, 236, 336, 266, 1058, 169, 151, - /* 520 */ 1026, 148, 1037, 1034, 1035, 1018, 272, 1057, 1039, 999, - /* 530 */ 1015, 276, 153, 232, 278, 280, 31, 158, 283, 163, - /* 540 */ 170, 160, 997, 161, 749, 162, 164, 165, 166, 171, - /* 550 */ 172, 301, 917, 297, 290, 807, 284, 298, 299, 302, - /* 560 */ 303, 197, 40, 75, 314, 912, 321, 1137, 109, 72, - /* 570 */ 46, 1136, 1133, 288, 176, 328, 1129, 115, 1128, 1125, - /* 580 */ 177, 286, 937, 41, 38, 198, 901, 279, 124, 899, - /* 590 */ 126, 127, 897, 896, 258, 187, 188, 893, 892, 891, - /* 600 */ 890, 889, 888, 282, 887, 191, 193, 884, 882, 880, - /* 610 */ 878, 195, 875, 196, 871, 45, 120, 271, 81, 86, - /* 620 */ 338, 281, 1059, 339, 340, 341, 222, 343, 342, 242, - /* 630 */ 296, 344, 353, 851, 259, 260, 219, 220, 850, 104, - /* 640 */ 916, 915, 262, 263, 849, 832, 895, 894, 831, 267, - /* 650 */ 291, 139, 69, 886, 180, 140, 179, 938, 178, 181, - /* 660 */ 182, 184, 183, 939, 141, 885, 8, 142, 877, 2, - /* 670 */ 1, 876, 725, 28, 273, 167, 87, 751, 155, 157, - /* 680 */ 762, 156, 234, 756, 88, 29, 758, 89, 285, 9, - /* 690 */ 30, 10, 11, 25, 293, 26, 96, 98, 101, 34, - /* 700 */ 100, 628, 35, 102, 663, 661, 660, 659, 657, 656, - /* 710 */ 655, 652, 619, 312, 105, 5, 318, 806, 319, 6, - /* 720 */ 808, 108, 110, 67, 68, 695, 37, 694, 691, 114, - /* 730 */ 644, 116, 642, 634, 640, 636, 638, 632, 630, 665, - /* 740 */ 664, 662, 658, 654, 653, 186, 617, 144, 582, 855, - /* 750 */ 854, 854, 854, 854, 854, 854, 854, 854, 854, 854, - /* 760 */ 854, 145, + /* 0 */ 94, 622, 34, 1008, 622, 21, 246, 700, 205, 623, + /* 10 */ 360, 229, 623, 55, 56, 1000, 59, 60, 160, 1131, + /* 20 */ 249, 49, 48, 47, 1040, 58, 319, 63, 61, 64, + /* 30 */ 62, 997, 998, 31, 1001, 54, 53, 339, 338, 52, + /* 40 */ 51, 50, 55, 56, 231, 59, 60, 242, 1011, 249, + /* 50 */ 49, 48, 47, 297, 58, 319, 63, 61, 64, 62, + /* 60 */ 657, 245, 863, 361, 54, 53, 205, 258, 52, 51, + /* 70 */ 50, 55, 56, 202, 59, 60, 175, 1132, 249, 49, + /* 80 */ 48, 47, 622, 58, 319, 63, 61, 64, 62, 79, + /* 90 */ 623, 1037, 1078, 54, 53, 235, 1017, 52, 51, 50, + /* 100 */ 622, 316, 247, 55, 57, 160, 59, 60, 623, 1030, + /* 110 */ 249, 49, 48, 47, 798, 58, 319, 63, 61, 64, + /* 120 */ 62, 205, 913, 153, 4, 54, 53, 271, 187, 52, + /* 130 */ 51, 50, 1132, 196, 194, 192, 160, 52, 51, 50, + /* 140 */ 191, 139, 138, 137, 136, 316, 572, 573, 574, 575, + /* 150 */ 576, 577, 578, 579, 580, 581, 582, 583, 584, 585, + /* 160 */ 151, 56, 230, 59, 60, 25, 92, 249, 49, 48, + /* 170 */ 47, 97, 58, 319, 63, 61, 64, 62, 321, 1079, + /* 180 */ 80, 289, 54, 53, 160, 34, 52, 51, 50, 59, + /* 190 */ 60, 277, 276, 249, 49, 48, 47, 263, 58, 319, + /* 200 */ 63, 61, 64, 62, 250, 1002, 267, 266, 54, 53, + /* 210 */ 91, 85, 52, 51, 50, 42, 314, 355, 354, 313, + /* 220 */ 312, 311, 353, 310, 309, 308, 352, 307, 351, 350, + /* 230 */ 22, 1010, 980, 968, 969, 970, 971, 972, 973, 974, + /* 240 */ 975, 976, 977, 978, 979, 981, 982, 214, 43, 248, + /* 250 */ 813, 763, 764, 802, 215, 805, 291, 808, 90, 252, + /* 260 */ 135, 134, 133, 216, 205, 248, 813, 324, 85, 802, + /* 270 */ 34, 805, 34, 808, 169, 1132, 12, 63, 61, 64, + /* 280 */ 62, 93, 817, 227, 228, 54, 53, 320, 34, 52, + /* 290 */ 51, 50, 279, 3, 37, 177, 804, 258, 807, 227, + /* 300 */ 228, 103, 108, 99, 106, 43, 176, 34, 727, 34, + /* 310 */ 96, 724, 239, 725, 240, 726, 1011, 34, 1011, 803, + /* 320 */ 303, 806, 258, 349, 257, 122, 744, 270, 203, 77, + /* 330 */ 328, 1012, 65, 34, 1011, 253, 223, 251, 349, 327, + /* 340 */ 326, 254, 255, 42, 208, 355, 354, 272, 65, 329, + /* 350 */ 353, 330, 85, 1011, 352, 1011, 351, 350, 986, 331, + /* 360 */ 984, 985, 35, 1011, 34, 987, 34, 814, 809, 988, + /* 370 */ 73, 989, 990, 1032, 810, 335, 120, 114, 124, 1011, + /* 380 */ 356, 950, 34, 814, 809, 129, 132, 123, 780, 43, + /* 390 */ 810, 84, 54, 53, 126, 78, 52, 51, 50, 1016, + /* 400 */ 259, 923, 256, 1030, 334, 333, 336, 187, 337, 74, + /* 410 */ 1011, 748, 1011, 359, 358, 144, 1030, 811, 150, 148, + /* 420 */ 147, 232, 741, 82, 341, 728, 729, 999, 1011, 241, + /* 430 */ 914, 70, 83, 1014, 233, 760, 187, 243, 770, 800, + /* 440 */ 812, 1014, 209, 771, 710, 779, 294, 7, 712, 296, + /* 450 */ 155, 711, 30, 66, 1151, 836, 815, 210, 24, 35, + /* 460 */ 69, 35, 76, 172, 95, 621, 172, 131, 130, 69, + /* 470 */ 23, 23, 71, 14, 113, 13, 112, 801, 1126, 16, + /* 480 */ 23, 15, 732, 1125, 733, 298, 730, 18, 731, 17, + /* 490 */ 119, 20, 118, 19, 699, 1089, 1143, 1124, 225, 226, + /* 500 */ 206, 207, 211, 204, 212, 213, 218, 219, 1088, 220, + /* 510 */ 217, 237, 201, 1085, 1084, 238, 340, 268, 152, 1039, + /* 520 */ 44, 1050, 149, 1047, 1048, 1031, 274, 1071, 1052, 154, + /* 530 */ 159, 1070, 162, 285, 170, 1009, 171, 1007, 304, 173, + /* 540 */ 167, 174, 927, 278, 1028, 300, 759, 161, 301, 302, + /* 550 */ 164, 305, 306, 163, 234, 199, 40, 288, 280, 282, + /* 560 */ 317, 75, 922, 292, 72, 318, 46, 325, 290, 1150, + /* 570 */ 165, 286, 110, 1149, 1146, 178, 332, 1142, 284, 116, + /* 580 */ 281, 1141, 1138, 179, 947, 41, 36, 45, 200, 911, + /* 590 */ 125, 909, 127, 128, 907, 906, 260, 189, 190, 903, + /* 600 */ 902, 901, 900, 899, 898, 897, 193, 195, 894, 892, + /* 610 */ 890, 888, 197, 885, 198, 881, 121, 342, 273, 81, + /* 620 */ 86, 283, 343, 1072, 344, 345, 347, 346, 348, 224, + /* 630 */ 357, 861, 262, 244, 261, 299, 860, 264, 265, 859, + /* 640 */ 842, 221, 222, 841, 104, 926, 925, 269, 69, 293, + /* 650 */ 8, 275, 735, 87, 158, 26, 156, 905, 904, 186, + /* 660 */ 181, 948, 180, 182, 140, 141, 184, 183, 185, 896, + /* 670 */ 2, 142, 895, 1, 143, 949, 887, 886, 166, 168, + /* 680 */ 29, 1013, 761, 772, 157, 236, 766, 88, 27, 768, + /* 690 */ 89, 287, 9, 28, 10, 11, 38, 295, 721, 39, + /* 700 */ 96, 98, 101, 32, 635, 100, 670, 33, 102, 668, + /* 710 */ 667, 666, 664, 663, 662, 659, 626, 315, 105, 5, + /* 720 */ 107, 816, 322, 6, 818, 323, 109, 67, 111, 68, + /* 730 */ 115, 702, 117, 701, 698, 651, 649, 35, 641, 647, + /* 740 */ 643, 645, 639, 637, 672, 671, 669, 665, 661, 660, + /* 750 */ 188, 589, 624, 145, 865, 864, 864, 864, 864, 864, + /* 760 */ 864, 864, 864, 864, 864, 864, 146, }; static const YYCODETYPE yy_lookahead[] = { - /* 0 */ 206, 1, 242, 205, 199, 200, 246, 242, 205, 9, - /* 10 */ 1, 246, 263, 13, 14, 242, 16, 17, 9, 246, - /* 20 */ 20, 21, 22, 23, 263, 25, 26, 27, 28, 29, - /* 30 */ 30, 237, 238, 239, 240, 35, 36, 197, 198, 39, - /* 40 */ 40, 41, 13, 14, 206, 16, 17, 5, 205, 20, - /* 50 */ 21, 22, 23, 263, 25, 26, 27, 28, 29, 30, - /* 60 */ 221, 263, 223, 224, 35, 36, 263, 228, 39, 40, - /* 70 */ 41, 232, 274, 234, 235, 35, 36, 274, 240, 39, - /* 80 */ 40, 41, 13, 14, 244, 16, 17, 199, 88, 20, - /* 90 */ 21, 22, 23, 84, 25, 26, 27, 28, 29, 30, - /* 100 */ 260, 86, 5, 0, 35, 36, 263, 199, 39, 40, - /* 110 */ 41, 92, 13, 14, 85, 16, 17, 274, 199, 20, - /* 120 */ 21, 22, 23, 1, 25, 26, 27, 28, 29, 30, - /* 130 */ 244, 9, 35, 36, 35, 36, 199, 1, 39, 40, - /* 140 */ 41, 14, 199, 16, 17, 9, 260, 20, 21, 22, - /* 150 */ 23, 243, 25, 26, 27, 28, 29, 30, 199, 271, - /* 160 */ 241, 273, 35, 36, 245, 99, 39, 40, 41, 47, - /* 170 */ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, - /* 180 */ 58, 59, 60, 61, 241, 63, 16, 17, 245, 86, - /* 190 */ 20, 21, 22, 23, 70, 25, 26, 27, 28, 29, - /* 200 */ 30, 263, 265, 266, 138, 35, 36, 126, 127, 39, - /* 210 */ 40, 41, 274, 100, 101, 102, 103, 104, 105, 106, - /* 220 */ 107, 108, 109, 110, 111, 112, 113, 114, 269, 46, - /* 230 */ 271, 221, 222, 223, 224, 225, 226, 227, 228, 229, - /* 240 */ 230, 231, 232, 233, 234, 235, 63, 244, 1, 2, - /* 250 */ 199, 199, 5, 70, 7, 199, 9, 250, 199, 76, - /* 260 */ 77, 78, 79, 260, 1, 2, 83, 84, 5, 145, - /* 270 */ 7, 147, 9, 149, 150, 268, 27, 28, 29, 30, - /* 280 */ 263, 70, 35, 36, 35, 36, 39, 84, 39, 40, - /* 290 */ 41, 84, 241, 241, 84, 88, 245, 245, 35, 36, - /* 300 */ 241, 245, 2, 120, 245, 5, 143, 7, 263, 9, - /* 310 */ 64, 65, 66, 199, 199, 152, 153, 71, 72, 73, - /* 320 */ 74, 75, 199, 120, 117, 142, 100, 144, 102, 103, - /* 330 */ 120, 84, 122, 107, 151, 35, 36, 111, 199, 113, - /* 340 */ 114, 64, 65, 66, 64, 65, 66, 84, 199, 72, - /* 350 */ 73, 74, 75, 73, 74, 75, 145, 199, 147, 199, - /* 360 */ 149, 150, 82, 199, 241, 118, 119, 90, 245, 39, - /* 370 */ 199, 80, 125, 39, 40, 41, 5, 199, 7, 264, - /* 380 */ 241, 118, 119, 92, 245, 271, 208, 5, 125, 7, - /* 390 */ 241, 64, 65, 66, 245, 67, 68, 69, 199, 241, - /* 400 */ 199, 241, 204, 245, 78, 245, 206, 208, 210, 208, - /* 410 */ 219, 220, 241, 99, 247, 99, 245, 204, 118, 119, - /* 420 */ 204, 85, 85, 210, 1, 85, 210, 85, 261, 85, - /* 430 */ 85, 85, 85, 85, 85, 271, 99, 85, 238, 84, - /* 440 */ 124, 99, 85, 99, 99, 99, 99, 99, 99, 85, - /* 450 */ 62, 99, 15, 123, 140, 85, 99, 121, 84, 263, - /* 460 */ 134, 121, 39, 99, 146, 146, 148, 148, 146, 99, - /* 470 */ 148, 116, 84, 5, 5, 7, 7, 146, 146, 148, - /* 480 */ 148, 146, 263, 148, 80, 81, 263, 263, 263, 115, - /* 490 */ 263, 263, 263, 263, 263, 263, 125, 263, 263, 263, - /* 500 */ 263, 263, 263, 246, 246, 246, 244, 125, 236, 236, - /* 510 */ 236, 236, 236, 262, 236, 236, 199, 272, 248, 199, - /* 520 */ 199, 62, 199, 199, 199, 244, 244, 272, 199, 244, - /* 530 */ 259, 267, 199, 267, 267, 267, 249, 199, 199, 255, - /* 540 */ 199, 258, 199, 257, 125, 256, 254, 253, 252, 199, - /* 550 */ 199, 91, 199, 199, 132, 118, 129, 199, 199, 199, - /* 560 */ 199, 199, 199, 137, 199, 199, 199, 199, 199, 139, - /* 570 */ 136, 199, 199, 135, 199, 199, 199, 199, 199, 199, - /* 580 */ 199, 130, 199, 199, 199, 199, 199, 131, 199, 199, - /* 590 */ 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, - /* 600 */ 199, 199, 199, 128, 199, 199, 199, 199, 199, 199, - /* 610 */ 199, 199, 199, 199, 199, 141, 98, 201, 201, 201, - /* 620 */ 97, 201, 201, 53, 94, 96, 201, 95, 57, 201, - /* 630 */ 201, 93, 86, 5, 154, 5, 201, 201, 5, 206, - /* 640 */ 209, 209, 154, 5, 5, 102, 201, 201, 101, 143, - /* 650 */ 116, 202, 121, 201, 212, 202, 216, 218, 217, 215, - /* 660 */ 213, 211, 214, 220, 202, 201, 84, 202, 201, 203, - /* 670 */ 207, 201, 85, 84, 99, 251, 99, 85, 84, 99, - /* 680 */ 85, 84, 1, 85, 84, 99, 85, 84, 84, 133, - /* 690 */ 99, 133, 84, 84, 116, 84, 117, 80, 72, 89, - /* 700 */ 88, 5, 89, 88, 9, 5, 5, 5, 5, 5, - /* 710 */ 5, 5, 87, 15, 80, 84, 26, 85, 61, 84, - /* 720 */ 118, 148, 148, 16, 16, 5, 99, 5, 85, 148, - /* 730 */ 5, 148, 5, 5, 5, 5, 5, 5, 5, 5, - /* 740 */ 5, 5, 5, 5, 5, 99, 87, 21, 62, 0, - /* 750 */ 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - /* 760 */ 275, 21, 275, 275, 275, 275, 275, 275, 275, 275, - /* 770 */ 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - /* 780 */ 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - /* 790 */ 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - /* 800 */ 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - /* 810 */ 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - /* 820 */ 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - /* 830 */ 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - /* 840 */ 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - /* 850 */ 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - /* 860 */ 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - /* 870 */ 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - /* 880 */ 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - /* 890 */ 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - /* 900 */ 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - /* 910 */ 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - /* 920 */ 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - /* 930 */ 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - /* 940 */ 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, - /* 950 */ 275, 275, 275, 275, 275, 275, 275, 275, + /* 0 */ 207, 1, 200, 200, 1, 266, 206, 5, 266, 9, + /* 10 */ 200, 201, 9, 13, 14, 0, 16, 17, 200, 277, + /* 20 */ 20, 21, 22, 23, 200, 25, 26, 27, 28, 29, + /* 30 */ 30, 238, 239, 240, 241, 35, 36, 35, 36, 39, + /* 40 */ 40, 41, 13, 14, 242, 16, 17, 244, 246, 20, + /* 50 */ 21, 22, 23, 36, 25, 26, 27, 28, 29, 30, + /* 60 */ 5, 206, 198, 199, 35, 36, 266, 200, 39, 40, + /* 70 */ 41, 13, 14, 266, 16, 17, 209, 277, 20, 21, + /* 80 */ 22, 23, 1, 25, 26, 27, 28, 29, 30, 89, + /* 90 */ 9, 267, 274, 35, 36, 248, 249, 39, 40, 41, + /* 100 */ 1, 86, 62, 13, 14, 200, 16, 17, 9, 245, + /* 110 */ 20, 21, 22, 23, 85, 25, 26, 27, 28, 29, + /* 120 */ 30, 266, 205, 200, 84, 35, 36, 263, 211, 39, + /* 130 */ 40, 41, 277, 64, 65, 66, 200, 39, 40, 41, + /* 140 */ 71, 72, 73, 74, 75, 86, 47, 48, 49, 50, + /* 150 */ 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, + /* 160 */ 61, 14, 63, 16, 17, 84, 250, 20, 21, 22, + /* 170 */ 23, 207, 25, 26, 27, 28, 29, 30, 15, 274, + /* 180 */ 264, 276, 35, 36, 200, 200, 39, 40, 41, 16, + /* 190 */ 17, 268, 269, 20, 21, 22, 23, 144, 25, 26, + /* 200 */ 27, 28, 29, 30, 206, 241, 153, 154, 35, 36, + /* 210 */ 274, 84, 39, 40, 41, 101, 102, 103, 104, 105, + /* 220 */ 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, + /* 230 */ 46, 246, 222, 223, 224, 225, 226, 227, 228, 229, + /* 240 */ 230, 231, 232, 233, 234, 235, 236, 63, 121, 1, + /* 250 */ 2, 127, 128, 5, 70, 7, 272, 9, 274, 70, + /* 260 */ 76, 77, 78, 79, 266, 1, 2, 83, 84, 5, + /* 270 */ 200, 7, 200, 9, 253, 277, 84, 27, 28, 29, + /* 280 */ 30, 89, 119, 35, 36, 35, 36, 39, 200, 39, + /* 290 */ 40, 41, 271, 64, 65, 66, 5, 200, 7, 35, + /* 300 */ 36, 72, 73, 74, 75, 121, 209, 200, 2, 200, + /* 310 */ 118, 5, 242, 7, 242, 9, 246, 200, 246, 5, + /* 320 */ 91, 7, 200, 93, 70, 80, 39, 143, 266, 145, + /* 330 */ 242, 209, 84, 200, 246, 146, 152, 148, 93, 150, + /* 340 */ 151, 35, 36, 101, 266, 103, 104, 85, 84, 242, + /* 350 */ 108, 242, 84, 246, 112, 246, 114, 115, 222, 242, + /* 360 */ 224, 225, 100, 246, 200, 229, 200, 119, 120, 233, + /* 370 */ 100, 235, 236, 245, 126, 242, 64, 65, 66, 246, + /* 380 */ 220, 221, 200, 119, 120, 73, 74, 75, 78, 121, + /* 390 */ 126, 123, 35, 36, 82, 207, 39, 40, 41, 249, + /* 400 */ 146, 205, 148, 245, 150, 151, 242, 211, 242, 139, + /* 410 */ 246, 124, 246, 67, 68, 69, 245, 126, 64, 65, + /* 420 */ 66, 263, 100, 85, 242, 119, 120, 239, 246, 243, + /* 430 */ 205, 100, 85, 247, 263, 85, 211, 243, 85, 1, + /* 440 */ 126, 247, 266, 85, 85, 135, 85, 125, 85, 85, + /* 450 */ 100, 85, 84, 100, 249, 85, 85, 266, 100, 100, + /* 460 */ 122, 100, 84, 100, 100, 85, 100, 80, 81, 122, + /* 470 */ 100, 100, 141, 147, 147, 149, 149, 39, 266, 147, + /* 480 */ 100, 149, 5, 266, 7, 117, 5, 147, 7, 149, + /* 490 */ 147, 147, 149, 149, 116, 237, 249, 266, 266, 266, + /* 500 */ 266, 266, 266, 266, 266, 266, 266, 266, 237, 266, + /* 510 */ 266, 237, 266, 237, 237, 237, 237, 200, 200, 200, + /* 520 */ 265, 200, 62, 200, 200, 245, 245, 275, 200, 200, + /* 530 */ 200, 275, 260, 200, 251, 245, 200, 200, 92, 200, + /* 540 */ 255, 200, 200, 270, 262, 200, 126, 261, 200, 200, + /* 550 */ 258, 200, 200, 259, 270, 200, 200, 131, 270, 270, + /* 560 */ 200, 138, 200, 133, 140, 200, 137, 200, 136, 200, + /* 570 */ 257, 130, 200, 200, 200, 200, 200, 200, 129, 200, + /* 580 */ 132, 200, 200, 200, 200, 200, 200, 142, 200, 200, + /* 590 */ 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, + /* 600 */ 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, + /* 610 */ 200, 200, 200, 200, 200, 200, 99, 98, 202, 202, + /* 620 */ 202, 202, 53, 202, 95, 97, 96, 57, 94, 202, + /* 630 */ 86, 5, 5, 202, 155, 202, 5, 155, 5, 5, + /* 640 */ 103, 202, 202, 102, 207, 210, 210, 144, 122, 117, + /* 650 */ 84, 100, 85, 100, 100, 84, 84, 202, 202, 212, + /* 660 */ 217, 219, 218, 213, 203, 203, 214, 216, 215, 202, + /* 670 */ 204, 203, 202, 208, 203, 221, 202, 202, 256, 254, + /* 680 */ 252, 247, 85, 85, 84, 1, 85, 84, 100, 85, + /* 690 */ 84, 84, 134, 100, 134, 84, 84, 117, 5, 84, + /* 700 */ 118, 80, 72, 90, 5, 89, 9, 90, 89, 5, + /* 710 */ 5, 5, 5, 5, 5, 5, 87, 15, 80, 84, + /* 720 */ 88, 85, 26, 84, 119, 61, 149, 16, 149, 16, + /* 730 */ 149, 5, 149, 5, 85, 5, 5, 100, 5, 5, + /* 740 */ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + /* 750 */ 100, 62, 87, 21, 0, 278, 278, 278, 278, 278, + /* 760 */ 278, 278, 278, 278, 278, 278, 21, 278, 278, 278, + /* 770 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, + /* 780 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, + /* 790 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, + /* 800 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, + /* 810 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, + /* 820 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, + /* 830 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, + /* 840 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, + /* 850 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, + /* 860 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, + /* 870 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, + /* 880 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, + /* 890 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, + /* 900 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, + /* 910 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, + /* 920 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, + /* 930 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, + /* 940 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, + /* 950 */ 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, + /* 960 */ 278, 278, 278, 278, }; -#define YY_SHIFT_COUNT (357) +#define YY_SHIFT_COUNT (361) #define YY_SHIFT_MIN (0) -#define YY_SHIFT_MAX (749) +#define YY_SHIFT_MAX (754) static const unsigned short int yy_shift_ofst[] = { - /* 0 */ 183, 113, 226, 15, 247, 263, 263, 9, 136, 136, - /* 10 */ 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, - /* 20 */ 136, 0, 122, 263, 300, 300, 300, 203, 203, 136, - /* 30 */ 136, 81, 136, 103, 136, 136, 136, 136, 291, 15, - /* 40 */ 19, 19, 42, 762, 263, 263, 263, 263, 263, 263, - /* 50 */ 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, - /* 60 */ 263, 263, 263, 263, 263, 263, 300, 300, 300, 210, - /* 70 */ 97, 97, 97, 97, 97, 97, 97, 136, 136, 136, - /* 80 */ 330, 136, 136, 136, 203, 203, 136, 136, 136, 136, - /* 90 */ 326, 326, 316, 203, 136, 136, 136, 136, 136, 136, - /* 100 */ 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, - /* 110 */ 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, - /* 120 */ 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, - /* 130 */ 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, - /* 140 */ 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, - /* 150 */ 136, 459, 459, 459, 419, 419, 419, 419, 459, 459, - /* 160 */ 426, 430, 422, 434, 438, 451, 427, 475, 456, 474, - /* 170 */ 459, 459, 459, 460, 460, 15, 459, 459, 518, 523, - /* 180 */ 570, 530, 529, 571, 532, 538, 42, 459, 459, 546, - /* 190 */ 546, 459, 546, 459, 546, 459, 459, 762, 762, 29, - /* 200 */ 69, 69, 99, 69, 127, 170, 249, 249, 249, 249, - /* 210 */ 249, 249, 277, 246, 280, 40, 40, 40, 40, 124, - /* 220 */ 211, 163, 207, 334, 334, 371, 382, 328, 327, 337, - /* 230 */ 336, 340, 342, 344, 345, 314, 66, 346, 347, 348, - /* 240 */ 349, 352, 355, 357, 364, 423, 388, 437, 370, 318, - /* 250 */ 319, 322, 468, 469, 331, 332, 374, 335, 404, 628, - /* 260 */ 480, 630, 633, 488, 638, 639, 543, 547, 506, 531, - /* 270 */ 534, 582, 587, 589, 575, 577, 592, 594, 595, 597, - /* 280 */ 598, 580, 600, 601, 603, 681, 604, 586, 556, 591, - /* 290 */ 558, 608, 534, 609, 578, 611, 579, 617, 610, 612, - /* 300 */ 626, 696, 613, 615, 695, 700, 701, 702, 703, 704, - /* 310 */ 705, 706, 625, 698, 634, 631, 632, 602, 635, 690, - /* 320 */ 657, 707, 573, 574, 627, 627, 627, 627, 708, 581, - /* 330 */ 583, 627, 627, 627, 720, 722, 643, 627, 725, 727, - /* 340 */ 728, 729, 730, 731, 732, 733, 734, 735, 736, 737, - /* 350 */ 738, 739, 646, 659, 726, 740, 686, 749, + /* 0 */ 184, 114, 242, 59, 248, 264, 264, 81, 3, 3, + /* 10 */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + /* 20 */ 3, 0, 99, 264, 306, 127, 127, 3, 3, 124, + /* 30 */ 3, 15, 3, 3, 3, 3, 245, 59, 17, 17, + /* 40 */ 230, 230, 55, 767, 264, 264, 264, 264, 264, 264, + /* 50 */ 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, + /* 60 */ 264, 264, 264, 264, 264, 264, 306, 306, 306, 268, + /* 70 */ 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, + /* 80 */ 287, 3, 3, 3, 127, 127, 3, 3, 3, 3, + /* 90 */ 310, 310, 322, 127, 3, 3, 3, 3, 3, 3, + /* 100 */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + /* 110 */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + /* 120 */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + /* 130 */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + /* 140 */ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + /* 150 */ 3, 3, 460, 460, 460, 420, 420, 420, 420, 460, + /* 160 */ 460, 423, 424, 430, 429, 432, 426, 441, 449, 448, + /* 170 */ 445, 460, 17, 460, 460, 446, 446, 59, 460, 460, + /* 180 */ 517, 519, 569, 529, 528, 570, 530, 534, 55, 460, + /* 190 */ 460, 544, 544, 460, 544, 460, 544, 460, 460, 767, + /* 200 */ 767, 29, 58, 58, 90, 58, 147, 173, 250, 250, + /* 210 */ 250, 250, 250, 250, 229, 69, 312, 357, 357, 357, + /* 220 */ 357, 189, 254, 53, 192, 98, 98, 291, 314, 346, + /* 230 */ 354, 262, 338, 347, 350, 353, 358, 331, 270, 359, + /* 240 */ 361, 363, 364, 366, 368, 370, 371, 438, 40, 163, + /* 250 */ 380, 326, 327, 332, 477, 481, 340, 343, 378, 344, + /* 260 */ 387, 626, 479, 627, 631, 482, 633, 634, 537, 541, + /* 270 */ 503, 526, 532, 566, 567, 571, 551, 553, 597, 572, + /* 280 */ 598, 600, 601, 554, 603, 604, 606, 684, 607, 588, + /* 290 */ 558, 593, 560, 611, 532, 612, 580, 693, 615, 582, + /* 300 */ 621, 613, 616, 630, 699, 617, 619, 697, 704, 705, + /* 310 */ 706, 707, 708, 709, 710, 629, 702, 638, 632, 635, + /* 320 */ 636, 605, 639, 696, 664, 711, 577, 579, 637, 637, + /* 330 */ 637, 637, 713, 581, 583, 637, 637, 637, 726, 728, + /* 340 */ 649, 637, 730, 731, 733, 734, 735, 736, 737, 738, + /* 350 */ 739, 740, 741, 742, 743, 744, 650, 665, 732, 745, + /* 360 */ 689, 754, }; -#define YY_REDUCE_COUNT (198) -#define YY_REDUCE_MIN (-251) -#define YY_REDUCE_MAX (470) +#define YY_REDUCE_COUNT (200) +#define YY_REDUCE_MIN (-261) +#define YY_REDUCE_MAX (475) static const short yy_reduce_ofst[] = { - /* 0 */ -160, 10, -161, -206, -202, -197, -157, -63, -81, -112, - /* 10 */ -41, -57, 51, 52, 59, 123, 139, 149, 158, 160, - /* 20 */ 171, 115, -195, -62, -240, -235, -227, -114, 3, 114, - /* 30 */ 164, 7, -92, -162, 178, 199, 201, 56, 198, 200, - /* 40 */ 213, 216, 191, 167, -251, -239, -210, 17, 45, 196, - /* 50 */ 219, 223, 224, 225, 227, 228, 229, 230, 231, 232, - /* 60 */ 234, 235, 236, 237, 238, 239, 257, 258, 259, 262, - /* 70 */ 272, 273, 274, 275, 276, 278, 279, 317, 320, 321, - /* 80 */ 251, 323, 324, 325, 281, 282, 329, 333, 338, 339, - /* 90 */ 245, 255, 270, 285, 341, 343, 350, 351, 353, 354, - /* 100 */ 358, 359, 360, 361, 362, 363, 365, 366, 367, 368, - /* 110 */ 369, 372, 373, 375, 376, 377, 378, 379, 380, 381, - /* 120 */ 383, 384, 385, 386, 387, 389, 390, 391, 392, 393, + /* 0 */ -136, 10, 136, -207, -200, -145, -2, -77, -198, -95, + /* 10 */ -16, 70, 72, 88, 107, 109, 117, 133, 164, 166, + /* 20 */ 182, -176, -190, -258, -153, 158, 171, -182, -64, 21, + /* 30 */ -197, -36, -133, 97, 122, -15, -83, 188, 186, 194, + /* 40 */ 196, 225, 160, -84, -261, -193, 62, 78, 176, 191, + /* 50 */ 212, 217, 231, 232, 233, 234, 235, 236, 237, 238, + /* 60 */ 239, 240, 241, 243, 244, 246, 150, 205, 247, 128, + /* 70 */ 258, 271, 274, 276, 277, 278, 279, 317, 318, 319, + /* 80 */ 255, 321, 323, 324, 280, 281, 328, 329, 330, 333, + /* 90 */ 252, 256, 283, 290, 336, 337, 339, 341, 342, 345, + /* 100 */ 348, 349, 351, 352, 355, 356, 360, 362, 365, 367, + /* 110 */ 369, 372, 373, 374, 375, 376, 377, 379, 381, 382, + /* 120 */ 383, 384, 385, 386, 388, 389, 390, 391, 392, 393, /* 130 */ 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, - /* 140 */ 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, - /* 150 */ 415, 416, 417, 418, 264, 266, 267, 268, 420, 421, - /* 160 */ 271, 283, 286, 289, 284, 292, 294, 296, 424, 287, - /* 170 */ 425, 428, 429, 431, 432, 433, 435, 436, 439, 441, - /* 180 */ 440, 442, 444, 447, 448, 450, 443, 445, 446, 449, - /* 190 */ 453, 452, 462, 464, 465, 467, 470, 463, 466, + /* 140 */ 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, + /* 150 */ 414, 415, 416, 417, 418, 273, 284, 288, 289, 419, + /* 160 */ 421, 282, 286, 272, 294, 292, 313, 422, 285, 425, + /* 170 */ 428, 427, 434, 431, 433, 435, 436, 437, 439, 440, + /* 180 */ 442, 444, 443, 450, 451, 452, 453, 447, 454, 455, + /* 190 */ 456, 461, 462, 467, 468, 470, 471, 474, 475, 465, + /* 200 */ 466, }; static const YYACTIONTYPE yy_default[] = { - /* 0 */ 852, 914, 902, 911, 1121, 1121, 1121, 852, 852, 852, - /* 10 */ 852, 852, 852, 852, 852, 852, 852, 852, 852, 852, - /* 20 */ 852, 1028, 872, 1121, 852, 852, 852, 852, 852, 852, - /* 30 */ 852, 1043, 852, 911, 852, 852, 852, 852, 920, 911, - /* 40 */ 920, 920, 852, 1023, 852, 852, 852, 852, 852, 852, - /* 50 */ 852, 852, 852, 852, 852, 852, 852, 852, 852, 852, - /* 60 */ 852, 852, 852, 852, 852, 852, 852, 852, 852, 852, - /* 70 */ 852, 852, 852, 852, 852, 852, 852, 852, 852, 852, - /* 80 */ 1030, 1036, 1033, 852, 852, 852, 1038, 852, 852, 852, - /* 90 */ 1062, 1062, 1021, 852, 852, 852, 852, 852, 852, 852, - /* 100 */ 852, 852, 852, 852, 852, 852, 852, 852, 852, 852, - /* 110 */ 852, 852, 852, 852, 852, 852, 852, 852, 852, 852, - /* 120 */ 852, 852, 852, 852, 900, 852, 898, 852, 852, 852, - /* 130 */ 852, 852, 852, 852, 852, 852, 852, 852, 852, 852, - /* 140 */ 852, 852, 852, 883, 852, 852, 852, 852, 852, 852, - /* 150 */ 870, 874, 874, 874, 852, 852, 852, 852, 874, 874, - /* 160 */ 1069, 1073, 1055, 1067, 1063, 1050, 1048, 1046, 1054, 1077, - /* 170 */ 874, 874, 874, 918, 918, 911, 874, 874, 936, 934, - /* 180 */ 932, 924, 930, 926, 928, 922, 852, 874, 874, 909, - /* 190 */ 909, 874, 909, 874, 909, 874, 874, 957, 973, 852, - /* 200 */ 1078, 1068, 852, 1120, 1108, 1107, 1116, 1115, 1114, 1106, - /* 210 */ 1105, 1104, 852, 852, 852, 1100, 1103, 1102, 1101, 852, - /* 220 */ 852, 852, 852, 1110, 1109, 852, 852, 852, 852, 852, - /* 230 */ 852, 852, 852, 852, 852, 1074, 1070, 852, 852, 852, - /* 240 */ 852, 852, 852, 852, 852, 852, 1080, 852, 852, 852, - /* 250 */ 852, 852, 852, 852, 852, 852, 981, 852, 852, 852, - /* 260 */ 852, 852, 852, 852, 852, 852, 852, 852, 852, 1020, - /* 270 */ 852, 852, 852, 852, 1032, 1031, 852, 852, 852, 852, - /* 280 */ 852, 852, 852, 852, 852, 852, 852, 1064, 852, 1056, - /* 290 */ 852, 852, 993, 852, 852, 852, 852, 852, 852, 852, - /* 300 */ 852, 852, 852, 852, 852, 852, 852, 852, 852, 852, - /* 310 */ 852, 852, 852, 852, 852, 852, 852, 852, 852, 852, - /* 320 */ 852, 852, 852, 852, 1139, 1134, 1135, 1132, 852, 852, - /* 330 */ 852, 1131, 1126, 1127, 852, 852, 852, 1124, 852, 852, - /* 340 */ 852, 852, 852, 852, 852, 852, 852, 852, 852, 852, - /* 350 */ 852, 852, 942, 852, 881, 879, 852, 852, + /* 0 */ 862, 924, 912, 921, 1134, 1134, 1134, 862, 862, 862, + /* 10 */ 862, 862, 862, 862, 862, 862, 862, 862, 862, 862, + /* 20 */ 862, 1041, 882, 1134, 862, 862, 862, 862, 862, 1056, + /* 30 */ 862, 921, 862, 862, 862, 862, 930, 921, 862, 862, + /* 40 */ 930, 930, 862, 1036, 862, 862, 862, 862, 862, 862, + /* 50 */ 862, 862, 862, 862, 862, 862, 862, 862, 862, 862, + /* 60 */ 862, 862, 862, 862, 862, 862, 862, 862, 862, 862, + /* 70 */ 862, 862, 862, 862, 862, 862, 862, 862, 862, 862, + /* 80 */ 1043, 1049, 1046, 862, 862, 862, 1051, 862, 862, 862, + /* 90 */ 1075, 1075, 1034, 862, 862, 862, 862, 862, 862, 862, + /* 100 */ 862, 862, 862, 862, 862, 862, 862, 862, 862, 862, + /* 110 */ 862, 862, 862, 862, 862, 862, 862, 862, 862, 862, + /* 120 */ 862, 862, 862, 862, 862, 910, 862, 908, 862, 862, + /* 130 */ 862, 862, 862, 862, 862, 862, 862, 862, 862, 862, + /* 140 */ 862, 862, 862, 862, 893, 862, 862, 862, 862, 862, + /* 150 */ 862, 880, 884, 884, 884, 862, 862, 862, 862, 884, + /* 160 */ 884, 1082, 1086, 1068, 1080, 1076, 1063, 1061, 1059, 1067, + /* 170 */ 1090, 884, 862, 884, 884, 928, 928, 921, 884, 884, + /* 180 */ 946, 944, 942, 934, 940, 936, 938, 932, 862, 884, + /* 190 */ 884, 919, 919, 884, 919, 884, 919, 884, 884, 967, + /* 200 */ 983, 862, 1091, 1081, 862, 1133, 1121, 1120, 1129, 1128, + /* 210 */ 1127, 1119, 1118, 1117, 862, 862, 862, 1113, 1116, 1115, + /* 220 */ 1114, 862, 862, 862, 862, 1123, 1122, 862, 862, 862, + /* 230 */ 862, 862, 862, 862, 862, 862, 862, 1087, 1083, 862, + /* 240 */ 862, 862, 862, 862, 862, 862, 862, 862, 1093, 862, + /* 250 */ 862, 862, 862, 862, 862, 862, 862, 862, 991, 862, + /* 260 */ 862, 862, 862, 862, 862, 862, 862, 862, 862, 862, + /* 270 */ 862, 1033, 862, 862, 862, 862, 1045, 1044, 862, 862, + /* 280 */ 862, 862, 862, 862, 862, 862, 862, 862, 862, 1077, + /* 290 */ 862, 1069, 862, 862, 1003, 862, 862, 862, 862, 862, + /* 300 */ 862, 862, 862, 862, 862, 862, 862, 862, 862, 862, + /* 310 */ 862, 862, 862, 862, 862, 862, 862, 862, 862, 862, + /* 320 */ 862, 862, 862, 862, 862, 862, 862, 862, 1152, 1147, + /* 330 */ 1148, 1145, 862, 862, 862, 1144, 1139, 1140, 862, 862, + /* 340 */ 862, 1137, 862, 862, 862, 862, 862, 862, 862, 862, + /* 350 */ 862, 862, 862, 862, 862, 862, 952, 862, 891, 889, + /* 360 */ 862, 862, }; /********** End of lemon-generated parsing tables *****************************/ @@ -594,6 +598,7 @@ static const YYCODETYPE yyFallback[] = { 0, /* RP => nothing */ 0, /* IF => nothing */ 0, /* EXISTS => nothing */ + 0, /* PORT => nothing */ 0, /* AS => nothing */ 0, /* OUTPUTTYPE => nothing */ 0, /* AGGREGATE => nothing */ @@ -876,193 +881,196 @@ static const char *const yyTokenName[] = { /* 85 */ "RP", /* 86 */ "IF", /* 87 */ "EXISTS", - /* 88 */ "AS", - /* 89 */ "OUTPUTTYPE", - /* 90 */ "AGGREGATE", - /* 91 */ "BUFSIZE", - /* 92 */ "PPS", - /* 93 */ "TSERIES", - /* 94 */ "DBS", - /* 95 */ "STORAGE", - /* 96 */ "QTIME", - /* 97 */ "CONNS", - /* 98 */ "STATE", - /* 99 */ "COMMA", - /* 100 */ "KEEP", - /* 101 */ "CACHE", - /* 102 */ "REPLICA", - /* 103 */ "QUORUM", - /* 104 */ "DAYS", - /* 105 */ "MINROWS", - /* 106 */ "MAXROWS", - /* 107 */ "BLOCKS", - /* 108 */ "CTIME", - /* 109 */ "WAL", - /* 110 */ "FSYNC", - /* 111 */ "COMP", - /* 112 */ "PRECISION", - /* 113 */ "UPDATE", - /* 114 */ "CACHELAST", - /* 115 */ "UNSIGNED", - /* 116 */ "TAGS", - /* 117 */ "USING", - /* 118 */ "NULL", - /* 119 */ "NOW", - /* 120 */ "SELECT", - /* 121 */ "UNION", - /* 122 */ "ALL", - /* 123 */ "DISTINCT", - /* 124 */ "FROM", - /* 125 */ "VARIABLE", - /* 126 */ "INTERVAL", - /* 127 */ "EVERY", - /* 128 */ "SESSION", - /* 129 */ "STATE_WINDOW", - /* 130 */ "FILL", - /* 131 */ "SLIDING", - /* 132 */ "ORDER", - /* 133 */ "BY", - /* 134 */ "ASC", - /* 135 */ "GROUP", - /* 136 */ "HAVING", - /* 137 */ "LIMIT", - /* 138 */ "OFFSET", - /* 139 */ "SLIMIT", - /* 140 */ "SOFFSET", - /* 141 */ "WHERE", - /* 142 */ "RESET", - /* 143 */ "QUERY", - /* 144 */ "SYNCDB", - /* 145 */ "ADD", - /* 146 */ "COLUMN", - /* 147 */ "MODIFY", - /* 148 */ "TAG", - /* 149 */ "CHANGE", - /* 150 */ "SET", - /* 151 */ "KILL", - /* 152 */ "CONNECTION", - /* 153 */ "STREAM", - /* 154 */ "COLON", - /* 155 */ "ABORT", - /* 156 */ "AFTER", - /* 157 */ "ATTACH", - /* 158 */ "BEFORE", - /* 159 */ "BEGIN", - /* 160 */ "CASCADE", - /* 161 */ "CLUSTER", - /* 162 */ "CONFLICT", - /* 163 */ "COPY", - /* 164 */ "DEFERRED", - /* 165 */ "DELIMITERS", - /* 166 */ "DETACH", - /* 167 */ "EACH", - /* 168 */ "END", - /* 169 */ "EXPLAIN", - /* 170 */ "FAIL", - /* 171 */ "FOR", - /* 172 */ "IGNORE", - /* 173 */ "IMMEDIATE", - /* 174 */ "INITIALLY", - /* 175 */ "INSTEAD", - /* 176 */ "KEY", - /* 177 */ "OF", - /* 178 */ "RAISE", - /* 179 */ "REPLACE", - /* 180 */ "RESTRICT", - /* 181 */ "ROW", - /* 182 */ "STATEMENT", - /* 183 */ "TRIGGER", - /* 184 */ "VIEW", - /* 185 */ "IPTOKEN", - /* 186 */ "SEMI", - /* 187 */ "NONE", - /* 188 */ "PREV", - /* 189 */ "LINEAR", - /* 190 */ "IMPORT", - /* 191 */ "TBNAME", - /* 192 */ "JOIN", - /* 193 */ "INSERT", - /* 194 */ "INTO", - /* 195 */ "VALUES", - /* 196 */ "error", - /* 197 */ "program", - /* 198 */ "cmd", - /* 199 */ "ids", - /* 200 */ "dbPrefix", - /* 201 */ "cpxName", - /* 202 */ "ifexists", - /* 203 */ "alter_db_optr", - /* 204 */ "acct_optr", - /* 205 */ "exprlist", - /* 206 */ "ifnotexists", - /* 207 */ "db_optr", - /* 208 */ "typename", - /* 209 */ "bufsize", - /* 210 */ "pps", - /* 211 */ "tseries", - /* 212 */ "dbs", - /* 213 */ "streams", - /* 214 */ "storage", - /* 215 */ "qtime", - /* 216 */ "users", - /* 217 */ "conns", - /* 218 */ "state", - /* 219 */ "intitemlist", - /* 220 */ "intitem", - /* 221 */ "keep", - /* 222 */ "cache", - /* 223 */ "replica", - /* 224 */ "quorum", - /* 225 */ "days", - /* 226 */ "minrows", - /* 227 */ "maxrows", - /* 228 */ "blocks", - /* 229 */ "ctime", - /* 230 */ "wal", - /* 231 */ "fsync", - /* 232 */ "comp", - /* 233 */ "prec", - /* 234 */ "update", - /* 235 */ "cachelast", - /* 236 */ "signed", - /* 237 */ "create_table_args", - /* 238 */ "create_stable_args", - /* 239 */ "create_table_list", - /* 240 */ "create_from_stable", - /* 241 */ "columnlist", - /* 242 */ "tagitemlist", - /* 243 */ "tagNamelist", - /* 244 */ "select", - /* 245 */ "column", - /* 246 */ "tagitem", - /* 247 */ "selcollist", - /* 248 */ "from", - /* 249 */ "where_opt", - /* 250 */ "interval_option", - /* 251 */ "sliding_opt", - /* 252 */ "session_option", - /* 253 */ "windowstate_option", - /* 254 */ "fill_opt", - /* 255 */ "groupby_opt", - /* 256 */ "having_opt", - /* 257 */ "orderby_opt", - /* 258 */ "slimit_opt", - /* 259 */ "limit_opt", - /* 260 */ "union", - /* 261 */ "sclp", - /* 262 */ "distinct", - /* 263 */ "expr", - /* 264 */ "as", - /* 265 */ "tablelist", - /* 266 */ "sub", - /* 267 */ "tmvar", - /* 268 */ "intervalKey", - /* 269 */ "sortlist", - /* 270 */ "sortitem", - /* 271 */ "item", - /* 272 */ "sortorder", - /* 273 */ "grouplist", - /* 274 */ "expritem", + /* 88 */ "PORT", + /* 89 */ "AS", + /* 90 */ "OUTPUTTYPE", + /* 91 */ "AGGREGATE", + /* 92 */ "BUFSIZE", + /* 93 */ "PPS", + /* 94 */ "TSERIES", + /* 95 */ "DBS", + /* 96 */ "STORAGE", + /* 97 */ "QTIME", + /* 98 */ "CONNS", + /* 99 */ "STATE", + /* 100 */ "COMMA", + /* 101 */ "KEEP", + /* 102 */ "CACHE", + /* 103 */ "REPLICA", + /* 104 */ "QUORUM", + /* 105 */ "DAYS", + /* 106 */ "MINROWS", + /* 107 */ "MAXROWS", + /* 108 */ "BLOCKS", + /* 109 */ "CTIME", + /* 110 */ "WAL", + /* 111 */ "FSYNC", + /* 112 */ "COMP", + /* 113 */ "PRECISION", + /* 114 */ "UPDATE", + /* 115 */ "CACHELAST", + /* 116 */ "UNSIGNED", + /* 117 */ "TAGS", + /* 118 */ "USING", + /* 119 */ "NULL", + /* 120 */ "NOW", + /* 121 */ "SELECT", + /* 122 */ "UNION", + /* 123 */ "ALL", + /* 124 */ "DISTINCT", + /* 125 */ "FROM", + /* 126 */ "VARIABLE", + /* 127 */ "INTERVAL", + /* 128 */ "EVERY", + /* 129 */ "SESSION", + /* 130 */ "STATE_WINDOW", + /* 131 */ "FILL", + /* 132 */ "SLIDING", + /* 133 */ "ORDER", + /* 134 */ "BY", + /* 135 */ "ASC", + /* 136 */ "GROUP", + /* 137 */ "HAVING", + /* 138 */ "LIMIT", + /* 139 */ "OFFSET", + /* 140 */ "SLIMIT", + /* 141 */ "SOFFSET", + /* 142 */ "WHERE", + /* 143 */ "RESET", + /* 144 */ "QUERY", + /* 145 */ "SYNCDB", + /* 146 */ "ADD", + /* 147 */ "COLUMN", + /* 148 */ "MODIFY", + /* 149 */ "TAG", + /* 150 */ "CHANGE", + /* 151 */ "SET", + /* 152 */ "KILL", + /* 153 */ "CONNECTION", + /* 154 */ "STREAM", + /* 155 */ "COLON", + /* 156 */ "ABORT", + /* 157 */ "AFTER", + /* 158 */ "ATTACH", + /* 159 */ "BEFORE", + /* 160 */ "BEGIN", + /* 161 */ "CASCADE", + /* 162 */ "CLUSTER", + /* 163 */ "CONFLICT", + /* 164 */ "COPY", + /* 165 */ "DEFERRED", + /* 166 */ "DELIMITERS", + /* 167 */ "DETACH", + /* 168 */ "EACH", + /* 169 */ "END", + /* 170 */ "EXPLAIN", + /* 171 */ "FAIL", + /* 172 */ "FOR", + /* 173 */ "IGNORE", + /* 174 */ "IMMEDIATE", + /* 175 */ "INITIALLY", + /* 176 */ "INSTEAD", + /* 177 */ "KEY", + /* 178 */ "OF", + /* 179 */ "RAISE", + /* 180 */ "REPLACE", + /* 181 */ "RESTRICT", + /* 182 */ "ROW", + /* 183 */ "STATEMENT", + /* 184 */ "TRIGGER", + /* 185 */ "VIEW", + /* 186 */ "IPTOKEN", + /* 187 */ "SEMI", + /* 188 */ "NONE", + /* 189 */ "PREV", + /* 190 */ "LINEAR", + /* 191 */ "IMPORT", + /* 192 */ "TBNAME", + /* 193 */ "JOIN", + /* 194 */ "INSERT", + /* 195 */ "INTO", + /* 196 */ "VALUES", + /* 197 */ "error", + /* 198 */ "program", + /* 199 */ "cmd", + /* 200 */ "ids", + /* 201 */ "dbPrefix", + /* 202 */ "cpxName", + /* 203 */ "ifexists", + /* 204 */ "alter_db_optr", + /* 205 */ "acct_optr", + /* 206 */ "exprlist", + /* 207 */ "ifnotexists", + /* 208 */ "db_optr", + /* 209 */ "typename", + /* 210 */ "bufsize", + /* 211 */ "pps", + /* 212 */ "tseries", + /* 213 */ "dbs", + /* 214 */ "streams", + /* 215 */ "storage", + /* 216 */ "qtime", + /* 217 */ "users", + /* 218 */ "conns", + /* 219 */ "state", + /* 220 */ "intitemlist", + /* 221 */ "intitem", + /* 222 */ "keep", + /* 223 */ "cache", + /* 224 */ "replica", + /* 225 */ "quorum", + /* 226 */ "days", + /* 227 */ "minrows", + /* 228 */ "maxrows", + /* 229 */ "blocks", + /* 230 */ "ctime", + /* 231 */ "wal", + /* 232 */ "fsync", + /* 233 */ "comp", + /* 234 */ "prec", + /* 235 */ "update", + /* 236 */ "cachelast", + /* 237 */ "signed", + /* 238 */ "create_table_args", + /* 239 */ "create_stable_args", + /* 240 */ "create_table_list", + /* 241 */ "create_from_stable", + /* 242 */ "columnlist", + /* 243 */ "tagitemlist1", + /* 244 */ "tagNamelist", + /* 245 */ "select", + /* 246 */ "column", + /* 247 */ "tagitem1", + /* 248 */ "tagitemlist", + /* 249 */ "tagitem", + /* 250 */ "selcollist", + /* 251 */ "from", + /* 252 */ "where_opt", + /* 253 */ "interval_option", + /* 254 */ "sliding_opt", + /* 255 */ "session_option", + /* 256 */ "windowstate_option", + /* 257 */ "fill_opt", + /* 258 */ "groupby_opt", + /* 259 */ "having_opt", + /* 260 */ "orderby_opt", + /* 261 */ "slimit_opt", + /* 262 */ "limit_opt", + /* 263 */ "union", + /* 264 */ "sclp", + /* 265 */ "distinct", + /* 266 */ "expr", + /* 267 */ "as", + /* 268 */ "tablelist", + /* 269 */ "sub", + /* 270 */ "tmvar", + /* 271 */ "intervalKey", + /* 272 */ "sortlist", + /* 273 */ "sortitem", + /* 274 */ "item", + /* 275 */ "sortorder", + /* 276 */ "grouplist", + /* 277 */ "expritem", }; #endif /* defined(YYCOVERAGE) || !defined(NDEBUG) */ @@ -1127,7 +1135,7 @@ static const char *const yyRuleName[] = { /* 54 */ "ifexists ::=", /* 55 */ "ifnotexists ::= IF NOT EXISTS", /* 56 */ "ifnotexists ::=", - /* 57 */ "cmd ::= CREATE DNODE ids", + /* 57 */ "cmd ::= CREATE DNODE ids PORT ids", /* 58 */ "cmd ::= CREATE ACCOUNT ids PASS ids acct_optr", /* 59 */ "cmd ::= CREATE DATABASE ifnotexists ids db_optr", /* 60 */ "cmd ::= CREATE FUNCTION ids AS ids OUTPUTTYPE typename bufsize", @@ -1210,154 +1218,157 @@ static const char *const yyRuleName[] = { /* 137 */ "create_table_list ::= create_table_list create_from_stable", /* 138 */ "create_table_args ::= ifnotexists ids cpxName LP columnlist RP", /* 139 */ "create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP", - /* 140 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP", - /* 141 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP", + /* 140 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist1 RP", + /* 141 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist1 RP", /* 142 */ "tagNamelist ::= tagNamelist COMMA ids", /* 143 */ "tagNamelist ::= ids", /* 144 */ "create_table_args ::= ifnotexists ids cpxName AS select", /* 145 */ "columnlist ::= columnlist COMMA column", /* 146 */ "columnlist ::= column", /* 147 */ "column ::= ids typename", - /* 148 */ "tagitemlist ::= tagitemlist COMMA tagitem", - /* 149 */ "tagitemlist ::= tagitem", - /* 150 */ "tagitem ::= INTEGER", - /* 151 */ "tagitem ::= FLOAT", - /* 152 */ "tagitem ::= STRING", - /* 153 */ "tagitem ::= BOOL", - /* 154 */ "tagitem ::= NULL", - /* 155 */ "tagitem ::= NOW", - /* 156 */ "tagitem ::= MINUS INTEGER", - /* 157 */ "tagitem ::= MINUS FLOAT", - /* 158 */ "tagitem ::= PLUS INTEGER", - /* 159 */ "tagitem ::= PLUS FLOAT", - /* 160 */ "select ::= SELECT selcollist from where_opt interval_option sliding_opt session_option windowstate_option fill_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt", - /* 161 */ "select ::= LP select RP", - /* 162 */ "union ::= select", - /* 163 */ "union ::= union UNION ALL select", - /* 164 */ "union ::= union UNION select", - /* 165 */ "cmd ::= union", - /* 166 */ "select ::= SELECT selcollist", - /* 167 */ "sclp ::= selcollist COMMA", - /* 168 */ "sclp ::=", - /* 169 */ "selcollist ::= sclp distinct expr as", - /* 170 */ "selcollist ::= sclp STAR", - /* 171 */ "as ::= AS ids", - /* 172 */ "as ::= ids", - /* 173 */ "as ::=", - /* 174 */ "distinct ::= DISTINCT", - /* 175 */ "distinct ::=", - /* 176 */ "from ::= FROM tablelist", - /* 177 */ "from ::= FROM sub", - /* 178 */ "sub ::= LP union RP", - /* 179 */ "sub ::= LP union RP ids", - /* 180 */ "sub ::= sub COMMA LP union RP ids", - /* 181 */ "tablelist ::= ids cpxName", - /* 182 */ "tablelist ::= ids cpxName ids", - /* 183 */ "tablelist ::= tablelist COMMA ids cpxName", - /* 184 */ "tablelist ::= tablelist COMMA ids cpxName ids", - /* 185 */ "tmvar ::= VARIABLE", - /* 186 */ "interval_option ::= intervalKey LP tmvar RP", - /* 187 */ "interval_option ::= intervalKey LP tmvar COMMA tmvar RP", - /* 188 */ "interval_option ::=", - /* 189 */ "intervalKey ::= INTERVAL", - /* 190 */ "intervalKey ::= EVERY", - /* 191 */ "session_option ::=", - /* 192 */ "session_option ::= SESSION LP ids cpxName COMMA tmvar RP", - /* 193 */ "windowstate_option ::=", - /* 194 */ "windowstate_option ::= STATE_WINDOW LP ids RP", - /* 195 */ "fill_opt ::=", - /* 196 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP", - /* 197 */ "fill_opt ::= FILL LP ID RP", - /* 198 */ "sliding_opt ::= SLIDING LP tmvar RP", - /* 199 */ "sliding_opt ::=", - /* 200 */ "orderby_opt ::=", - /* 201 */ "orderby_opt ::= ORDER BY sortlist", - /* 202 */ "sortlist ::= sortlist COMMA item sortorder", - /* 203 */ "sortlist ::= item sortorder", - /* 204 */ "item ::= ids cpxName", - /* 205 */ "sortorder ::= ASC", - /* 206 */ "sortorder ::= DESC", - /* 207 */ "sortorder ::=", - /* 208 */ "groupby_opt ::=", - /* 209 */ "groupby_opt ::= GROUP BY grouplist", - /* 210 */ "grouplist ::= grouplist COMMA item", - /* 211 */ "grouplist ::= item", - /* 212 */ "having_opt ::=", - /* 213 */ "having_opt ::= HAVING expr", - /* 214 */ "limit_opt ::=", - /* 215 */ "limit_opt ::= LIMIT signed", - /* 216 */ "limit_opt ::= LIMIT signed OFFSET signed", - /* 217 */ "limit_opt ::= LIMIT signed COMMA signed", - /* 218 */ "slimit_opt ::=", - /* 219 */ "slimit_opt ::= SLIMIT signed", - /* 220 */ "slimit_opt ::= SLIMIT signed SOFFSET signed", - /* 221 */ "slimit_opt ::= SLIMIT signed COMMA signed", - /* 222 */ "where_opt ::=", - /* 223 */ "where_opt ::= WHERE expr", - /* 224 */ "expr ::= LP expr RP", - /* 225 */ "expr ::= ID", - /* 226 */ "expr ::= ID DOT ID", - /* 227 */ "expr ::= ID DOT STAR", - /* 228 */ "expr ::= INTEGER", - /* 229 */ "expr ::= MINUS INTEGER", - /* 230 */ "expr ::= PLUS INTEGER", - /* 231 */ "expr ::= FLOAT", - /* 232 */ "expr ::= MINUS FLOAT", - /* 233 */ "expr ::= PLUS FLOAT", - /* 234 */ "expr ::= STRING", - /* 235 */ "expr ::= NOW", - /* 236 */ "expr ::= VARIABLE", - /* 237 */ "expr ::= PLUS VARIABLE", - /* 238 */ "expr ::= MINUS VARIABLE", - /* 239 */ "expr ::= BOOL", - /* 240 */ "expr ::= NULL", - /* 241 */ "expr ::= ID LP exprlist RP", - /* 242 */ "expr ::= ID LP STAR RP", - /* 243 */ "expr ::= expr IS NULL", - /* 244 */ "expr ::= expr IS NOT NULL", - /* 245 */ "expr ::= expr LT expr", - /* 246 */ "expr ::= expr GT expr", - /* 247 */ "expr ::= expr LE expr", - /* 248 */ "expr ::= expr GE expr", - /* 249 */ "expr ::= expr NE expr", - /* 250 */ "expr ::= expr EQ expr", - /* 251 */ "expr ::= expr BETWEEN expr AND expr", - /* 252 */ "expr ::= expr AND expr", - /* 253 */ "expr ::= expr OR expr", - /* 254 */ "expr ::= expr PLUS expr", - /* 255 */ "expr ::= expr MINUS expr", - /* 256 */ "expr ::= expr STAR expr", - /* 257 */ "expr ::= expr SLASH expr", - /* 258 */ "expr ::= expr REM expr", - /* 259 */ "expr ::= expr LIKE expr", - /* 260 */ "expr ::= expr MATCH expr", - /* 261 */ "expr ::= expr NMATCH expr", - /* 262 */ "expr ::= expr IN LP exprlist RP", - /* 263 */ "exprlist ::= exprlist COMMA expritem", - /* 264 */ "exprlist ::= expritem", - /* 265 */ "expritem ::= expr", - /* 266 */ "expritem ::=", - /* 267 */ "cmd ::= RESET QUERY CACHE", - /* 268 */ "cmd ::= SYNCDB ids REPLICA", - /* 269 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist", - /* 270 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids", - /* 271 */ "cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist", - /* 272 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist", - /* 273 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids", - /* 274 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids", - /* 275 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem", - /* 276 */ "cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist", - /* 277 */ "cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist", - /* 278 */ "cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids", - /* 279 */ "cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist", - /* 280 */ "cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist", - /* 281 */ "cmd ::= ALTER STABLE ids cpxName DROP TAG ids", - /* 282 */ "cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids", - /* 283 */ "cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem", - /* 284 */ "cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist", - /* 285 */ "cmd ::= KILL CONNECTION INTEGER", - /* 286 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER", - /* 287 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER", + /* 148 */ "tagitemlist1 ::= tagitemlist1 COMMA tagitem1", + /* 149 */ "tagitemlist1 ::= tagitem1", + /* 150 */ "tagitem1 ::= MINUS INTEGER", + /* 151 */ "tagitemlist ::= tagitemlist COMMA tagitem", + /* 152 */ "tagitemlist ::= tagitem", + /* 153 */ "tagitem ::= INTEGER", + /* 154 */ "tagitem ::= FLOAT", + /* 155 */ "tagitem ::= STRING", + /* 156 */ "tagitem ::= BOOL", + /* 157 */ "tagitem ::= NULL", + /* 158 */ "tagitem ::= NOW", + /* 159 */ "tagitem ::= MINUS INTEGER", + /* 160 */ "tagitem ::= MINUS FLOAT", + /* 161 */ "tagitem ::= PLUS INTEGER", + /* 162 */ "tagitem ::= PLUS FLOAT", + /* 163 */ "select ::= SELECT selcollist from where_opt interval_option sliding_opt session_option windowstate_option fill_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt", + /* 164 */ "select ::= LP select RP", + /* 165 */ "union ::= select", + /* 166 */ "union ::= union UNION ALL select", + /* 167 */ "union ::= union UNION select", + /* 168 */ "cmd ::= union", + /* 169 */ "select ::= SELECT selcollist", + /* 170 */ "sclp ::= selcollist COMMA", + /* 171 */ "sclp ::=", + /* 172 */ "selcollist ::= sclp distinct expr as", + /* 173 */ "selcollist ::= sclp STAR", + /* 174 */ "as ::= AS ids", + /* 175 */ "as ::= ids", + /* 176 */ "as ::=", + /* 177 */ "distinct ::= DISTINCT", + /* 178 */ "distinct ::=", + /* 179 */ "from ::= FROM tablelist", + /* 180 */ "from ::= FROM sub", + /* 181 */ "sub ::= LP union RP", + /* 182 */ "sub ::= LP union RP ids", + /* 183 */ "sub ::= sub COMMA LP union RP ids", + /* 184 */ "tablelist ::= ids cpxName", + /* 185 */ "tablelist ::= ids cpxName ids", + /* 186 */ "tablelist ::= tablelist COMMA ids cpxName", + /* 187 */ "tablelist ::= tablelist COMMA ids cpxName ids", + /* 188 */ "tmvar ::= VARIABLE", + /* 189 */ "interval_option ::= intervalKey LP tmvar RP", + /* 190 */ "interval_option ::= intervalKey LP tmvar COMMA tmvar RP", + /* 191 */ "interval_option ::=", + /* 192 */ "intervalKey ::= INTERVAL", + /* 193 */ "intervalKey ::= EVERY", + /* 194 */ "session_option ::=", + /* 195 */ "session_option ::= SESSION LP ids cpxName COMMA tmvar RP", + /* 196 */ "windowstate_option ::=", + /* 197 */ "windowstate_option ::= STATE_WINDOW LP ids RP", + /* 198 */ "fill_opt ::=", + /* 199 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP", + /* 200 */ "fill_opt ::= FILL LP ID RP", + /* 201 */ "sliding_opt ::= SLIDING LP tmvar RP", + /* 202 */ "sliding_opt ::=", + /* 203 */ "orderby_opt ::=", + /* 204 */ "orderby_opt ::= ORDER BY sortlist", + /* 205 */ "sortlist ::= sortlist COMMA item sortorder", + /* 206 */ "sortlist ::= item sortorder", + /* 207 */ "item ::= ids cpxName", + /* 208 */ "sortorder ::= ASC", + /* 209 */ "sortorder ::= DESC", + /* 210 */ "sortorder ::=", + /* 211 */ "groupby_opt ::=", + /* 212 */ "groupby_opt ::= GROUP BY grouplist", + /* 213 */ "grouplist ::= grouplist COMMA item", + /* 214 */ "grouplist ::= item", + /* 215 */ "having_opt ::=", + /* 216 */ "having_opt ::= HAVING expr", + /* 217 */ "limit_opt ::=", + /* 218 */ "limit_opt ::= LIMIT signed", + /* 219 */ "limit_opt ::= LIMIT signed OFFSET signed", + /* 220 */ "limit_opt ::= LIMIT signed COMMA signed", + /* 221 */ "slimit_opt ::=", + /* 222 */ "slimit_opt ::= SLIMIT signed", + /* 223 */ "slimit_opt ::= SLIMIT signed SOFFSET signed", + /* 224 */ "slimit_opt ::= SLIMIT signed COMMA signed", + /* 225 */ "where_opt ::=", + /* 226 */ "where_opt ::= WHERE expr", + /* 227 */ "expr ::= LP expr RP", + /* 228 */ "expr ::= ID", + /* 229 */ "expr ::= ID DOT ID", + /* 230 */ "expr ::= ID DOT STAR", + /* 231 */ "expr ::= INTEGER", + /* 232 */ "expr ::= MINUS INTEGER", + /* 233 */ "expr ::= PLUS INTEGER", + /* 234 */ "expr ::= FLOAT", + /* 235 */ "expr ::= MINUS FLOAT", + /* 236 */ "expr ::= PLUS FLOAT", + /* 237 */ "expr ::= STRING", + /* 238 */ "expr ::= NOW", + /* 239 */ "expr ::= VARIABLE", + /* 240 */ "expr ::= PLUS VARIABLE", + /* 241 */ "expr ::= MINUS VARIABLE", + /* 242 */ "expr ::= BOOL", + /* 243 */ "expr ::= NULL", + /* 244 */ "expr ::= ID LP exprlist RP", + /* 245 */ "expr ::= ID LP STAR RP", + /* 246 */ "expr ::= expr IS NULL", + /* 247 */ "expr ::= expr IS NOT NULL", + /* 248 */ "expr ::= expr LT expr", + /* 249 */ "expr ::= expr GT expr", + /* 250 */ "expr ::= expr LE expr", + /* 251 */ "expr ::= expr GE expr", + /* 252 */ "expr ::= expr NE expr", + /* 253 */ "expr ::= expr EQ expr", + /* 254 */ "expr ::= expr BETWEEN expr AND expr", + /* 255 */ "expr ::= expr AND expr", + /* 256 */ "expr ::= expr OR expr", + /* 257 */ "expr ::= expr PLUS expr", + /* 258 */ "expr ::= expr MINUS expr", + /* 259 */ "expr ::= expr STAR expr", + /* 260 */ "expr ::= expr SLASH expr", + /* 261 */ "expr ::= expr REM expr", + /* 262 */ "expr ::= expr LIKE expr", + /* 263 */ "expr ::= expr MATCH expr", + /* 264 */ "expr ::= expr NMATCH expr", + /* 265 */ "expr ::= expr IN LP exprlist RP", + /* 266 */ "exprlist ::= exprlist COMMA expritem", + /* 267 */ "exprlist ::= expritem", + /* 268 */ "expritem ::= expr", + /* 269 */ "expritem ::=", + /* 270 */ "cmd ::= RESET QUERY CACHE", + /* 271 */ "cmd ::= SYNCDB ids REPLICA", + /* 272 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist", + /* 273 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids", + /* 274 */ "cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist", + /* 275 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist", + /* 276 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids", + /* 277 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids", + /* 278 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem", + /* 279 */ "cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist", + /* 280 */ "cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist", + /* 281 */ "cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids", + /* 282 */ "cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist", + /* 283 */ "cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist", + /* 284 */ "cmd ::= ALTER STABLE ids cpxName DROP TAG ids", + /* 285 */ "cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids", + /* 286 */ "cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem", + /* 287 */ "cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist", + /* 288 */ "cmd ::= KILL CONNECTION INTEGER", + /* 289 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER", + /* 290 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER", }; #endif /* NDEBUG */ @@ -1478,60 +1489,61 @@ static void yy_destructor( ** inside the C code. */ /********* Begin destructor definitions ***************************************/ - case 205: /* exprlist */ - case 247: /* selcollist */ - case 261: /* sclp */ + case 206: /* exprlist */ + case 250: /* selcollist */ + case 264: /* sclp */ { -tSqlExprListDestroy((yypminor->yy131)); +tSqlExprListDestroy((yypminor->yy421)); } break; - case 219: /* intitemlist */ - case 221: /* keep */ - case 241: /* columnlist */ - case 242: /* tagitemlist */ - case 243: /* tagNamelist */ - case 254: /* fill_opt */ - case 255: /* groupby_opt */ - case 257: /* orderby_opt */ - case 269: /* sortlist */ - case 273: /* grouplist */ -{ -taosArrayDestroy((yypminor->yy131)); + case 220: /* intitemlist */ + case 222: /* keep */ + case 242: /* columnlist */ + case 243: /* tagitemlist1 */ + case 244: /* tagNamelist */ + case 248: /* tagitemlist */ + case 257: /* fill_opt */ + case 258: /* groupby_opt */ + case 260: /* orderby_opt */ + case 272: /* sortlist */ + case 276: /* grouplist */ +{ +taosArrayDestroy((yypminor->yy421)); } break; - case 239: /* create_table_list */ + case 240: /* create_table_list */ { -destroyCreateTableSql((yypminor->yy272)); +destroyCreateTableSql((yypminor->yy438)); } break; - case 244: /* select */ + case 245: /* select */ { -destroySqlNode((yypminor->yy256)); +destroySqlNode((yypminor->yy56)); } break; - case 248: /* from */ - case 265: /* tablelist */ - case 266: /* sub */ + case 251: /* from */ + case 268: /* tablelist */ + case 269: /* sub */ { -destroyRelationInfo((yypminor->yy544)); +destroyRelationInfo((yypminor->yy8)); } break; - case 249: /* where_opt */ - case 256: /* having_opt */ - case 263: /* expr */ - case 274: /* expritem */ + case 252: /* where_opt */ + case 259: /* having_opt */ + case 266: /* expr */ + case 277: /* expritem */ { -tSqlExprDestroy((yypminor->yy46)); +tSqlExprDestroy((yypminor->yy439)); } break; - case 260: /* union */ + case 263: /* union */ { -destroyAllSqlNode((yypminor->yy303)); +destroyAllSqlNode((yypminor->yy149)); } break; - case 270: /* sortitem */ + case 273: /* sortitem */ { -taosVariantDestroy(&(yypminor->yy43)); +taosVariantDestroy(&(yypminor->yy69)); } break; /********* End destructor definitions *****************************************/ @@ -1825,294 +1837,297 @@ static const struct { YYCODETYPE lhs; /* Symbol on the left-hand side of the rule */ signed char nrhs; /* Negative of the number of RHS symbols in the rule */ } yyRuleInfo[] = { - { 197, -1 }, /* (0) program ::= cmd */ - { 198, -2 }, /* (1) cmd ::= SHOW DATABASES */ - { 198, -2 }, /* (2) cmd ::= SHOW TOPICS */ - { 198, -2 }, /* (3) cmd ::= SHOW FUNCTIONS */ - { 198, -2 }, /* (4) cmd ::= SHOW MNODES */ - { 198, -2 }, /* (5) cmd ::= SHOW DNODES */ - { 198, -2 }, /* (6) cmd ::= SHOW ACCOUNTS */ - { 198, -2 }, /* (7) cmd ::= SHOW USERS */ - { 198, -2 }, /* (8) cmd ::= SHOW MODULES */ - { 198, -2 }, /* (9) cmd ::= SHOW QUERIES */ - { 198, -2 }, /* (10) cmd ::= SHOW CONNECTIONS */ - { 198, -2 }, /* (11) cmd ::= SHOW STREAMS */ - { 198, -2 }, /* (12) cmd ::= SHOW VARIABLES */ - { 198, -2 }, /* (13) cmd ::= SHOW SCORES */ - { 198, -2 }, /* (14) cmd ::= SHOW GRANTS */ - { 198, -2 }, /* (15) cmd ::= SHOW VNODES */ - { 198, -3 }, /* (16) cmd ::= SHOW VNODES ids */ - { 200, 0 }, /* (17) dbPrefix ::= */ - { 200, -2 }, /* (18) dbPrefix ::= ids DOT */ - { 201, 0 }, /* (19) cpxName ::= */ - { 201, -2 }, /* (20) cpxName ::= DOT ids */ - { 198, -5 }, /* (21) cmd ::= SHOW CREATE TABLE ids cpxName */ - { 198, -5 }, /* (22) cmd ::= SHOW CREATE STABLE ids cpxName */ - { 198, -4 }, /* (23) cmd ::= SHOW CREATE DATABASE ids */ - { 198, -3 }, /* (24) cmd ::= SHOW dbPrefix TABLES */ - { 198, -5 }, /* (25) cmd ::= SHOW dbPrefix TABLES LIKE ids */ - { 198, -3 }, /* (26) cmd ::= SHOW dbPrefix STABLES */ - { 198, -5 }, /* (27) cmd ::= SHOW dbPrefix STABLES LIKE ids */ - { 198, -3 }, /* (28) cmd ::= SHOW dbPrefix VGROUPS */ - { 198, -4 }, /* (29) cmd ::= SHOW dbPrefix VGROUPS ids */ - { 198, -5 }, /* (30) cmd ::= DROP TABLE ifexists ids cpxName */ - { 198, -5 }, /* (31) cmd ::= DROP STABLE ifexists ids cpxName */ - { 198, -4 }, /* (32) cmd ::= DROP DATABASE ifexists ids */ - { 198, -4 }, /* (33) cmd ::= DROP TOPIC ifexists ids */ - { 198, -3 }, /* (34) cmd ::= DROP FUNCTION ids */ - { 198, -3 }, /* (35) cmd ::= DROP DNODE ids */ - { 198, -3 }, /* (36) cmd ::= DROP USER ids */ - { 198, -3 }, /* (37) cmd ::= DROP ACCOUNT ids */ - { 198, -2 }, /* (38) cmd ::= USE ids */ - { 198, -3 }, /* (39) cmd ::= DESCRIBE ids cpxName */ - { 198, -3 }, /* (40) cmd ::= DESC ids cpxName */ - { 198, -5 }, /* (41) cmd ::= ALTER USER ids PASS ids */ - { 198, -5 }, /* (42) cmd ::= ALTER USER ids PRIVILEGE ids */ - { 198, -4 }, /* (43) cmd ::= ALTER DNODE ids ids */ - { 198, -5 }, /* (44) cmd ::= ALTER DNODE ids ids ids */ - { 198, -3 }, /* (45) cmd ::= ALTER LOCAL ids */ - { 198, -4 }, /* (46) cmd ::= ALTER LOCAL ids ids */ - { 198, -4 }, /* (47) cmd ::= ALTER DATABASE ids alter_db_optr */ - { 198, -4 }, /* (48) cmd ::= ALTER ACCOUNT ids acct_optr */ - { 198, -6 }, /* (49) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */ - { 198, -6 }, /* (50) cmd ::= COMPACT VNODES IN LP exprlist RP */ - { 199, -1 }, /* (51) ids ::= ID */ - { 199, -1 }, /* (52) ids ::= STRING */ - { 202, -2 }, /* (53) ifexists ::= IF EXISTS */ - { 202, 0 }, /* (54) ifexists ::= */ - { 206, -3 }, /* (55) ifnotexists ::= IF NOT EXISTS */ - { 206, 0 }, /* (56) ifnotexists ::= */ - { 198, -3 }, /* (57) cmd ::= CREATE DNODE ids */ - { 198, -6 }, /* (58) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */ - { 198, -5 }, /* (59) cmd ::= CREATE DATABASE ifnotexists ids db_optr */ - { 198, -8 }, /* (60) cmd ::= CREATE FUNCTION ids AS ids OUTPUTTYPE typename bufsize */ - { 198, -9 }, /* (61) cmd ::= CREATE AGGREGATE FUNCTION ids AS ids OUTPUTTYPE typename bufsize */ - { 198, -5 }, /* (62) cmd ::= CREATE USER ids PASS ids */ - { 209, 0 }, /* (63) bufsize ::= */ - { 209, -2 }, /* (64) bufsize ::= BUFSIZE INTEGER */ - { 210, 0 }, /* (65) pps ::= */ - { 210, -2 }, /* (66) pps ::= PPS INTEGER */ - { 211, 0 }, /* (67) tseries ::= */ - { 211, -2 }, /* (68) tseries ::= TSERIES INTEGER */ - { 212, 0 }, /* (69) dbs ::= */ - { 212, -2 }, /* (70) dbs ::= DBS INTEGER */ - { 213, 0 }, /* (71) streams ::= */ - { 213, -2 }, /* (72) streams ::= STREAMS INTEGER */ - { 214, 0 }, /* (73) storage ::= */ - { 214, -2 }, /* (74) storage ::= STORAGE INTEGER */ - { 215, 0 }, /* (75) qtime ::= */ - { 215, -2 }, /* (76) qtime ::= QTIME INTEGER */ - { 216, 0 }, /* (77) users ::= */ - { 216, -2 }, /* (78) users ::= USERS INTEGER */ - { 217, 0 }, /* (79) conns ::= */ - { 217, -2 }, /* (80) conns ::= CONNS INTEGER */ - { 218, 0 }, /* (81) state ::= */ - { 218, -2 }, /* (82) state ::= STATE ids */ - { 204, -9 }, /* (83) acct_optr ::= pps tseries storage streams qtime dbs users conns state */ - { 219, -3 }, /* (84) intitemlist ::= intitemlist COMMA intitem */ - { 219, -1 }, /* (85) intitemlist ::= intitem */ - { 220, -1 }, /* (86) intitem ::= INTEGER */ - { 221, -2 }, /* (87) keep ::= KEEP intitemlist */ - { 222, -2 }, /* (88) cache ::= CACHE INTEGER */ - { 223, -2 }, /* (89) replica ::= REPLICA INTEGER */ - { 224, -2 }, /* (90) quorum ::= QUORUM INTEGER */ - { 225, -2 }, /* (91) days ::= DAYS INTEGER */ - { 226, -2 }, /* (92) minrows ::= MINROWS INTEGER */ - { 227, -2 }, /* (93) maxrows ::= MAXROWS INTEGER */ - { 228, -2 }, /* (94) blocks ::= BLOCKS INTEGER */ - { 229, -2 }, /* (95) ctime ::= CTIME INTEGER */ - { 230, -2 }, /* (96) wal ::= WAL INTEGER */ - { 231, -2 }, /* (97) fsync ::= FSYNC INTEGER */ - { 232, -2 }, /* (98) comp ::= COMP INTEGER */ - { 233, -2 }, /* (99) prec ::= PRECISION STRING */ - { 234, -2 }, /* (100) update ::= UPDATE INTEGER */ - { 235, -2 }, /* (101) cachelast ::= CACHELAST INTEGER */ - { 207, 0 }, /* (102) db_optr ::= */ - { 207, -2 }, /* (103) db_optr ::= db_optr cache */ - { 207, -2 }, /* (104) db_optr ::= db_optr replica */ - { 207, -2 }, /* (105) db_optr ::= db_optr quorum */ - { 207, -2 }, /* (106) db_optr ::= db_optr days */ - { 207, -2 }, /* (107) db_optr ::= db_optr minrows */ - { 207, -2 }, /* (108) db_optr ::= db_optr maxrows */ - { 207, -2 }, /* (109) db_optr ::= db_optr blocks */ - { 207, -2 }, /* (110) db_optr ::= db_optr ctime */ - { 207, -2 }, /* (111) db_optr ::= db_optr wal */ - { 207, -2 }, /* (112) db_optr ::= db_optr fsync */ - { 207, -2 }, /* (113) db_optr ::= db_optr comp */ - { 207, -2 }, /* (114) db_optr ::= db_optr prec */ - { 207, -2 }, /* (115) db_optr ::= db_optr keep */ - { 207, -2 }, /* (116) db_optr ::= db_optr update */ - { 207, -2 }, /* (117) db_optr ::= db_optr cachelast */ - { 203, 0 }, /* (118) alter_db_optr ::= */ - { 203, -2 }, /* (119) alter_db_optr ::= alter_db_optr replica */ - { 203, -2 }, /* (120) alter_db_optr ::= alter_db_optr quorum */ - { 203, -2 }, /* (121) alter_db_optr ::= alter_db_optr keep */ - { 203, -2 }, /* (122) alter_db_optr ::= alter_db_optr blocks */ - { 203, -2 }, /* (123) alter_db_optr ::= alter_db_optr comp */ - { 203, -2 }, /* (124) alter_db_optr ::= alter_db_optr update */ - { 203, -2 }, /* (125) alter_db_optr ::= alter_db_optr cachelast */ - { 208, -1 }, /* (126) typename ::= ids */ - { 208, -4 }, /* (127) typename ::= ids LP signed RP */ - { 208, -2 }, /* (128) typename ::= ids UNSIGNED */ - { 236, -1 }, /* (129) signed ::= INTEGER */ - { 236, -2 }, /* (130) signed ::= PLUS INTEGER */ - { 236, -2 }, /* (131) signed ::= MINUS INTEGER */ - { 198, -3 }, /* (132) cmd ::= CREATE TABLE create_table_args */ - { 198, -3 }, /* (133) cmd ::= CREATE TABLE create_stable_args */ - { 198, -3 }, /* (134) cmd ::= CREATE STABLE create_stable_args */ - { 198, -3 }, /* (135) cmd ::= CREATE TABLE create_table_list */ - { 239, -1 }, /* (136) create_table_list ::= create_from_stable */ - { 239, -2 }, /* (137) create_table_list ::= create_table_list create_from_stable */ - { 237, -6 }, /* (138) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ - { 238, -10 }, /* (139) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ - { 240, -10 }, /* (140) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */ - { 240, -13 }, /* (141) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */ - { 243, -3 }, /* (142) tagNamelist ::= tagNamelist COMMA ids */ - { 243, -1 }, /* (143) tagNamelist ::= ids */ - { 237, -5 }, /* (144) create_table_args ::= ifnotexists ids cpxName AS select */ - { 241, -3 }, /* (145) columnlist ::= columnlist COMMA column */ - { 241, -1 }, /* (146) columnlist ::= column */ - { 245, -2 }, /* (147) column ::= ids typename */ - { 242, -3 }, /* (148) tagitemlist ::= tagitemlist COMMA tagitem */ - { 242, -1 }, /* (149) tagitemlist ::= tagitem */ - { 246, -1 }, /* (150) tagitem ::= INTEGER */ - { 246, -1 }, /* (151) tagitem ::= FLOAT */ - { 246, -1 }, /* (152) tagitem ::= STRING */ - { 246, -1 }, /* (153) tagitem ::= BOOL */ - { 246, -1 }, /* (154) tagitem ::= NULL */ - { 246, -1 }, /* (155) tagitem ::= NOW */ - { 246, -2 }, /* (156) tagitem ::= MINUS INTEGER */ - { 246, -2 }, /* (157) tagitem ::= MINUS FLOAT */ - { 246, -2 }, /* (158) tagitem ::= PLUS INTEGER */ - { 246, -2 }, /* (159) tagitem ::= PLUS FLOAT */ - { 244, -14 }, /* (160) select ::= SELECT selcollist from where_opt interval_option sliding_opt session_option windowstate_option fill_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt */ - { 244, -3 }, /* (161) select ::= LP select RP */ - { 260, -1 }, /* (162) union ::= select */ - { 260, -4 }, /* (163) union ::= union UNION ALL select */ - { 260, -3 }, /* (164) union ::= union UNION select */ - { 198, -1 }, /* (165) cmd ::= union */ - { 244, -2 }, /* (166) select ::= SELECT selcollist */ - { 261, -2 }, /* (167) sclp ::= selcollist COMMA */ - { 261, 0 }, /* (168) sclp ::= */ - { 247, -4 }, /* (169) selcollist ::= sclp distinct expr as */ - { 247, -2 }, /* (170) selcollist ::= sclp STAR */ - { 264, -2 }, /* (171) as ::= AS ids */ - { 264, -1 }, /* (172) as ::= ids */ - { 264, 0 }, /* (173) as ::= */ - { 262, -1 }, /* (174) distinct ::= DISTINCT */ - { 262, 0 }, /* (175) distinct ::= */ - { 248, -2 }, /* (176) from ::= FROM tablelist */ - { 248, -2 }, /* (177) from ::= FROM sub */ - { 266, -3 }, /* (178) sub ::= LP union RP */ - { 266, -4 }, /* (179) sub ::= LP union RP ids */ - { 266, -6 }, /* (180) sub ::= sub COMMA LP union RP ids */ - { 265, -2 }, /* (181) tablelist ::= ids cpxName */ - { 265, -3 }, /* (182) tablelist ::= ids cpxName ids */ - { 265, -4 }, /* (183) tablelist ::= tablelist COMMA ids cpxName */ - { 265, -5 }, /* (184) tablelist ::= tablelist COMMA ids cpxName ids */ - { 267, -1 }, /* (185) tmvar ::= VARIABLE */ - { 250, -4 }, /* (186) interval_option ::= intervalKey LP tmvar RP */ - { 250, -6 }, /* (187) interval_option ::= intervalKey LP tmvar COMMA tmvar RP */ - { 250, 0 }, /* (188) interval_option ::= */ - { 268, -1 }, /* (189) intervalKey ::= INTERVAL */ - { 268, -1 }, /* (190) intervalKey ::= EVERY */ - { 252, 0 }, /* (191) session_option ::= */ - { 252, -7 }, /* (192) session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ - { 253, 0 }, /* (193) windowstate_option ::= */ - { 253, -4 }, /* (194) windowstate_option ::= STATE_WINDOW LP ids RP */ - { 254, 0 }, /* (195) fill_opt ::= */ - { 254, -6 }, /* (196) fill_opt ::= FILL LP ID COMMA tagitemlist RP */ - { 254, -4 }, /* (197) fill_opt ::= FILL LP ID RP */ - { 251, -4 }, /* (198) sliding_opt ::= SLIDING LP tmvar RP */ - { 251, 0 }, /* (199) sliding_opt ::= */ - { 257, 0 }, /* (200) orderby_opt ::= */ - { 257, -3 }, /* (201) orderby_opt ::= ORDER BY sortlist */ - { 269, -4 }, /* (202) sortlist ::= sortlist COMMA item sortorder */ - { 269, -2 }, /* (203) sortlist ::= item sortorder */ - { 271, -2 }, /* (204) item ::= ids cpxName */ - { 272, -1 }, /* (205) sortorder ::= ASC */ - { 272, -1 }, /* (206) sortorder ::= DESC */ - { 272, 0 }, /* (207) sortorder ::= */ - { 255, 0 }, /* (208) groupby_opt ::= */ - { 255, -3 }, /* (209) groupby_opt ::= GROUP BY grouplist */ - { 273, -3 }, /* (210) grouplist ::= grouplist COMMA item */ - { 273, -1 }, /* (211) grouplist ::= item */ - { 256, 0 }, /* (212) having_opt ::= */ - { 256, -2 }, /* (213) having_opt ::= HAVING expr */ - { 259, 0 }, /* (214) limit_opt ::= */ - { 259, -2 }, /* (215) limit_opt ::= LIMIT signed */ - { 259, -4 }, /* (216) limit_opt ::= LIMIT signed OFFSET signed */ - { 259, -4 }, /* (217) limit_opt ::= LIMIT signed COMMA signed */ - { 258, 0 }, /* (218) slimit_opt ::= */ - { 258, -2 }, /* (219) slimit_opt ::= SLIMIT signed */ - { 258, -4 }, /* (220) slimit_opt ::= SLIMIT signed SOFFSET signed */ - { 258, -4 }, /* (221) slimit_opt ::= SLIMIT signed COMMA signed */ - { 249, 0 }, /* (222) where_opt ::= */ - { 249, -2 }, /* (223) where_opt ::= WHERE expr */ - { 263, -3 }, /* (224) expr ::= LP expr RP */ - { 263, -1 }, /* (225) expr ::= ID */ - { 263, -3 }, /* (226) expr ::= ID DOT ID */ - { 263, -3 }, /* (227) expr ::= ID DOT STAR */ - { 263, -1 }, /* (228) expr ::= INTEGER */ - { 263, -2 }, /* (229) expr ::= MINUS INTEGER */ - { 263, -2 }, /* (230) expr ::= PLUS INTEGER */ - { 263, -1 }, /* (231) expr ::= FLOAT */ - { 263, -2 }, /* (232) expr ::= MINUS FLOAT */ - { 263, -2 }, /* (233) expr ::= PLUS FLOAT */ - { 263, -1 }, /* (234) expr ::= STRING */ - { 263, -1 }, /* (235) expr ::= NOW */ - { 263, -1 }, /* (236) expr ::= VARIABLE */ - { 263, -2 }, /* (237) expr ::= PLUS VARIABLE */ - { 263, -2 }, /* (238) expr ::= MINUS VARIABLE */ - { 263, -1 }, /* (239) expr ::= BOOL */ - { 263, -1 }, /* (240) expr ::= NULL */ - { 263, -4 }, /* (241) expr ::= ID LP exprlist RP */ - { 263, -4 }, /* (242) expr ::= ID LP STAR RP */ - { 263, -3 }, /* (243) expr ::= expr IS NULL */ - { 263, -4 }, /* (244) expr ::= expr IS NOT NULL */ - { 263, -3 }, /* (245) expr ::= expr LT expr */ - { 263, -3 }, /* (246) expr ::= expr GT expr */ - { 263, -3 }, /* (247) expr ::= expr LE expr */ - { 263, -3 }, /* (248) expr ::= expr GE expr */ - { 263, -3 }, /* (249) expr ::= expr NE expr */ - { 263, -3 }, /* (250) expr ::= expr EQ expr */ - { 263, -5 }, /* (251) expr ::= expr BETWEEN expr AND expr */ - { 263, -3 }, /* (252) expr ::= expr AND expr */ - { 263, -3 }, /* (253) expr ::= expr OR expr */ - { 263, -3 }, /* (254) expr ::= expr PLUS expr */ - { 263, -3 }, /* (255) expr ::= expr MINUS expr */ - { 263, -3 }, /* (256) expr ::= expr STAR expr */ - { 263, -3 }, /* (257) expr ::= expr SLASH expr */ - { 263, -3 }, /* (258) expr ::= expr REM expr */ - { 263, -3 }, /* (259) expr ::= expr LIKE expr */ - { 263, -3 }, /* (260) expr ::= expr MATCH expr */ - { 263, -3 }, /* (261) expr ::= expr NMATCH expr */ - { 263, -5 }, /* (262) expr ::= expr IN LP exprlist RP */ - { 205, -3 }, /* (263) exprlist ::= exprlist COMMA expritem */ - { 205, -1 }, /* (264) exprlist ::= expritem */ - { 274, -1 }, /* (265) expritem ::= expr */ - { 274, 0 }, /* (266) expritem ::= */ - { 198, -3 }, /* (267) cmd ::= RESET QUERY CACHE */ - { 198, -3 }, /* (268) cmd ::= SYNCDB ids REPLICA */ - { 198, -7 }, /* (269) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ - { 198, -7 }, /* (270) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ - { 198, -7 }, /* (271) cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */ - { 198, -7 }, /* (272) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ - { 198, -7 }, /* (273) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ - { 198, -8 }, /* (274) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ - { 198, -9 }, /* (275) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ - { 198, -7 }, /* (276) cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */ - { 198, -7 }, /* (277) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ - { 198, -7 }, /* (278) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ - { 198, -7 }, /* (279) cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */ - { 198, -7 }, /* (280) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ - { 198, -7 }, /* (281) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ - { 198, -8 }, /* (282) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ - { 198, -9 }, /* (283) cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */ - { 198, -7 }, /* (284) cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */ - { 198, -3 }, /* (285) cmd ::= KILL CONNECTION INTEGER */ - { 198, -5 }, /* (286) cmd ::= KILL STREAM INTEGER COLON INTEGER */ - { 198, -5 }, /* (287) cmd ::= KILL QUERY INTEGER COLON INTEGER */ + { 198, -1 }, /* (0) program ::= cmd */ + { 199, -2 }, /* (1) cmd ::= SHOW DATABASES */ + { 199, -2 }, /* (2) cmd ::= SHOW TOPICS */ + { 199, -2 }, /* (3) cmd ::= SHOW FUNCTIONS */ + { 199, -2 }, /* (4) cmd ::= SHOW MNODES */ + { 199, -2 }, /* (5) cmd ::= SHOW DNODES */ + { 199, -2 }, /* (6) cmd ::= SHOW ACCOUNTS */ + { 199, -2 }, /* (7) cmd ::= SHOW USERS */ + { 199, -2 }, /* (8) cmd ::= SHOW MODULES */ + { 199, -2 }, /* (9) cmd ::= SHOW QUERIES */ + { 199, -2 }, /* (10) cmd ::= SHOW CONNECTIONS */ + { 199, -2 }, /* (11) cmd ::= SHOW STREAMS */ + { 199, -2 }, /* (12) cmd ::= SHOW VARIABLES */ + { 199, -2 }, /* (13) cmd ::= SHOW SCORES */ + { 199, -2 }, /* (14) cmd ::= SHOW GRANTS */ + { 199, -2 }, /* (15) cmd ::= SHOW VNODES */ + { 199, -3 }, /* (16) cmd ::= SHOW VNODES ids */ + { 201, 0 }, /* (17) dbPrefix ::= */ + { 201, -2 }, /* (18) dbPrefix ::= ids DOT */ + { 202, 0 }, /* (19) cpxName ::= */ + { 202, -2 }, /* (20) cpxName ::= DOT ids */ + { 199, -5 }, /* (21) cmd ::= SHOW CREATE TABLE ids cpxName */ + { 199, -5 }, /* (22) cmd ::= SHOW CREATE STABLE ids cpxName */ + { 199, -4 }, /* (23) cmd ::= SHOW CREATE DATABASE ids */ + { 199, -3 }, /* (24) cmd ::= SHOW dbPrefix TABLES */ + { 199, -5 }, /* (25) cmd ::= SHOW dbPrefix TABLES LIKE ids */ + { 199, -3 }, /* (26) cmd ::= SHOW dbPrefix STABLES */ + { 199, -5 }, /* (27) cmd ::= SHOW dbPrefix STABLES LIKE ids */ + { 199, -3 }, /* (28) cmd ::= SHOW dbPrefix VGROUPS */ + { 199, -4 }, /* (29) cmd ::= SHOW dbPrefix VGROUPS ids */ + { 199, -5 }, /* (30) cmd ::= DROP TABLE ifexists ids cpxName */ + { 199, -5 }, /* (31) cmd ::= DROP STABLE ifexists ids cpxName */ + { 199, -4 }, /* (32) cmd ::= DROP DATABASE ifexists ids */ + { 199, -4 }, /* (33) cmd ::= DROP TOPIC ifexists ids */ + { 199, -3 }, /* (34) cmd ::= DROP FUNCTION ids */ + { 199, -3 }, /* (35) cmd ::= DROP DNODE ids */ + { 199, -3 }, /* (36) cmd ::= DROP USER ids */ + { 199, -3 }, /* (37) cmd ::= DROP ACCOUNT ids */ + { 199, -2 }, /* (38) cmd ::= USE ids */ + { 199, -3 }, /* (39) cmd ::= DESCRIBE ids cpxName */ + { 199, -3 }, /* (40) cmd ::= DESC ids cpxName */ + { 199, -5 }, /* (41) cmd ::= ALTER USER ids PASS ids */ + { 199, -5 }, /* (42) cmd ::= ALTER USER ids PRIVILEGE ids */ + { 199, -4 }, /* (43) cmd ::= ALTER DNODE ids ids */ + { 199, -5 }, /* (44) cmd ::= ALTER DNODE ids ids ids */ + { 199, -3 }, /* (45) cmd ::= ALTER LOCAL ids */ + { 199, -4 }, /* (46) cmd ::= ALTER LOCAL ids ids */ + { 199, -4 }, /* (47) cmd ::= ALTER DATABASE ids alter_db_optr */ + { 199, -4 }, /* (48) cmd ::= ALTER ACCOUNT ids acct_optr */ + { 199, -6 }, /* (49) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */ + { 199, -6 }, /* (50) cmd ::= COMPACT VNODES IN LP exprlist RP */ + { 200, -1 }, /* (51) ids ::= ID */ + { 200, -1 }, /* (52) ids ::= STRING */ + { 203, -2 }, /* (53) ifexists ::= IF EXISTS */ + { 203, 0 }, /* (54) ifexists ::= */ + { 207, -3 }, /* (55) ifnotexists ::= IF NOT EXISTS */ + { 207, 0 }, /* (56) ifnotexists ::= */ + { 199, -5 }, /* (57) cmd ::= CREATE DNODE ids PORT ids */ + { 199, -6 }, /* (58) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */ + { 199, -5 }, /* (59) cmd ::= CREATE DATABASE ifnotexists ids db_optr */ + { 199, -8 }, /* (60) cmd ::= CREATE FUNCTION ids AS ids OUTPUTTYPE typename bufsize */ + { 199, -9 }, /* (61) cmd ::= CREATE AGGREGATE FUNCTION ids AS ids OUTPUTTYPE typename bufsize */ + { 199, -5 }, /* (62) cmd ::= CREATE USER ids PASS ids */ + { 210, 0 }, /* (63) bufsize ::= */ + { 210, -2 }, /* (64) bufsize ::= BUFSIZE INTEGER */ + { 211, 0 }, /* (65) pps ::= */ + { 211, -2 }, /* (66) pps ::= PPS INTEGER */ + { 212, 0 }, /* (67) tseries ::= */ + { 212, -2 }, /* (68) tseries ::= TSERIES INTEGER */ + { 213, 0 }, /* (69) dbs ::= */ + { 213, -2 }, /* (70) dbs ::= DBS INTEGER */ + { 214, 0 }, /* (71) streams ::= */ + { 214, -2 }, /* (72) streams ::= STREAMS INTEGER */ + { 215, 0 }, /* (73) storage ::= */ + { 215, -2 }, /* (74) storage ::= STORAGE INTEGER */ + { 216, 0 }, /* (75) qtime ::= */ + { 216, -2 }, /* (76) qtime ::= QTIME INTEGER */ + { 217, 0 }, /* (77) users ::= */ + { 217, -2 }, /* (78) users ::= USERS INTEGER */ + { 218, 0 }, /* (79) conns ::= */ + { 218, -2 }, /* (80) conns ::= CONNS INTEGER */ + { 219, 0 }, /* (81) state ::= */ + { 219, -2 }, /* (82) state ::= STATE ids */ + { 205, -9 }, /* (83) acct_optr ::= pps tseries storage streams qtime dbs users conns state */ + { 220, -3 }, /* (84) intitemlist ::= intitemlist COMMA intitem */ + { 220, -1 }, /* (85) intitemlist ::= intitem */ + { 221, -1 }, /* (86) intitem ::= INTEGER */ + { 222, -2 }, /* (87) keep ::= KEEP intitemlist */ + { 223, -2 }, /* (88) cache ::= CACHE INTEGER */ + { 224, -2 }, /* (89) replica ::= REPLICA INTEGER */ + { 225, -2 }, /* (90) quorum ::= QUORUM INTEGER */ + { 226, -2 }, /* (91) days ::= DAYS INTEGER */ + { 227, -2 }, /* (92) minrows ::= MINROWS INTEGER */ + { 228, -2 }, /* (93) maxrows ::= MAXROWS INTEGER */ + { 229, -2 }, /* (94) blocks ::= BLOCKS INTEGER */ + { 230, -2 }, /* (95) ctime ::= CTIME INTEGER */ + { 231, -2 }, /* (96) wal ::= WAL INTEGER */ + { 232, -2 }, /* (97) fsync ::= FSYNC INTEGER */ + { 233, -2 }, /* (98) comp ::= COMP INTEGER */ + { 234, -2 }, /* (99) prec ::= PRECISION STRING */ + { 235, -2 }, /* (100) update ::= UPDATE INTEGER */ + { 236, -2 }, /* (101) cachelast ::= CACHELAST INTEGER */ + { 208, 0 }, /* (102) db_optr ::= */ + { 208, -2 }, /* (103) db_optr ::= db_optr cache */ + { 208, -2 }, /* (104) db_optr ::= db_optr replica */ + { 208, -2 }, /* (105) db_optr ::= db_optr quorum */ + { 208, -2 }, /* (106) db_optr ::= db_optr days */ + { 208, -2 }, /* (107) db_optr ::= db_optr minrows */ + { 208, -2 }, /* (108) db_optr ::= db_optr maxrows */ + { 208, -2 }, /* (109) db_optr ::= db_optr blocks */ + { 208, -2 }, /* (110) db_optr ::= db_optr ctime */ + { 208, -2 }, /* (111) db_optr ::= db_optr wal */ + { 208, -2 }, /* (112) db_optr ::= db_optr fsync */ + { 208, -2 }, /* (113) db_optr ::= db_optr comp */ + { 208, -2 }, /* (114) db_optr ::= db_optr prec */ + { 208, -2 }, /* (115) db_optr ::= db_optr keep */ + { 208, -2 }, /* (116) db_optr ::= db_optr update */ + { 208, -2 }, /* (117) db_optr ::= db_optr cachelast */ + { 204, 0 }, /* (118) alter_db_optr ::= */ + { 204, -2 }, /* (119) alter_db_optr ::= alter_db_optr replica */ + { 204, -2 }, /* (120) alter_db_optr ::= alter_db_optr quorum */ + { 204, -2 }, /* (121) alter_db_optr ::= alter_db_optr keep */ + { 204, -2 }, /* (122) alter_db_optr ::= alter_db_optr blocks */ + { 204, -2 }, /* (123) alter_db_optr ::= alter_db_optr comp */ + { 204, -2 }, /* (124) alter_db_optr ::= alter_db_optr update */ + { 204, -2 }, /* (125) alter_db_optr ::= alter_db_optr cachelast */ + { 209, -1 }, /* (126) typename ::= ids */ + { 209, -4 }, /* (127) typename ::= ids LP signed RP */ + { 209, -2 }, /* (128) typename ::= ids UNSIGNED */ + { 237, -1 }, /* (129) signed ::= INTEGER */ + { 237, -2 }, /* (130) signed ::= PLUS INTEGER */ + { 237, -2 }, /* (131) signed ::= MINUS INTEGER */ + { 199, -3 }, /* (132) cmd ::= CREATE TABLE create_table_args */ + { 199, -3 }, /* (133) cmd ::= CREATE TABLE create_stable_args */ + { 199, -3 }, /* (134) cmd ::= CREATE STABLE create_stable_args */ + { 199, -3 }, /* (135) cmd ::= CREATE TABLE create_table_list */ + { 240, -1 }, /* (136) create_table_list ::= create_from_stable */ + { 240, -2 }, /* (137) create_table_list ::= create_table_list create_from_stable */ + { 238, -6 }, /* (138) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ + { 239, -10 }, /* (139) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ + { 241, -10 }, /* (140) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist1 RP */ + { 241, -13 }, /* (141) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist1 RP */ + { 244, -3 }, /* (142) tagNamelist ::= tagNamelist COMMA ids */ + { 244, -1 }, /* (143) tagNamelist ::= ids */ + { 238, -5 }, /* (144) create_table_args ::= ifnotexists ids cpxName AS select */ + { 242, -3 }, /* (145) columnlist ::= columnlist COMMA column */ + { 242, -1 }, /* (146) columnlist ::= column */ + { 246, -2 }, /* (147) column ::= ids typename */ + { 243, -3 }, /* (148) tagitemlist1 ::= tagitemlist1 COMMA tagitem1 */ + { 243, -1 }, /* (149) tagitemlist1 ::= tagitem1 */ + { 247, -2 }, /* (150) tagitem1 ::= MINUS INTEGER */ + { 248, -3 }, /* (151) tagitemlist ::= tagitemlist COMMA tagitem */ + { 248, -1 }, /* (152) tagitemlist ::= tagitem */ + { 249, -1 }, /* (153) tagitem ::= INTEGER */ + { 249, -1 }, /* (154) tagitem ::= FLOAT */ + { 249, -1 }, /* (155) tagitem ::= STRING */ + { 249, -1 }, /* (156) tagitem ::= BOOL */ + { 249, -1 }, /* (157) tagitem ::= NULL */ + { 249, -1 }, /* (158) tagitem ::= NOW */ + { 249, -2 }, /* (159) tagitem ::= MINUS INTEGER */ + { 249, -2 }, /* (160) tagitem ::= MINUS FLOAT */ + { 249, -2 }, /* (161) tagitem ::= PLUS INTEGER */ + { 249, -2 }, /* (162) tagitem ::= PLUS FLOAT */ + { 245, -14 }, /* (163) select ::= SELECT selcollist from where_opt interval_option sliding_opt session_option windowstate_option fill_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt */ + { 245, -3 }, /* (164) select ::= LP select RP */ + { 263, -1 }, /* (165) union ::= select */ + { 263, -4 }, /* (166) union ::= union UNION ALL select */ + { 263, -3 }, /* (167) union ::= union UNION select */ + { 199, -1 }, /* (168) cmd ::= union */ + { 245, -2 }, /* (169) select ::= SELECT selcollist */ + { 264, -2 }, /* (170) sclp ::= selcollist COMMA */ + { 264, 0 }, /* (171) sclp ::= */ + { 250, -4 }, /* (172) selcollist ::= sclp distinct expr as */ + { 250, -2 }, /* (173) selcollist ::= sclp STAR */ + { 267, -2 }, /* (174) as ::= AS ids */ + { 267, -1 }, /* (175) as ::= ids */ + { 267, 0 }, /* (176) as ::= */ + { 265, -1 }, /* (177) distinct ::= DISTINCT */ + { 265, 0 }, /* (178) distinct ::= */ + { 251, -2 }, /* (179) from ::= FROM tablelist */ + { 251, -2 }, /* (180) from ::= FROM sub */ + { 269, -3 }, /* (181) sub ::= LP union RP */ + { 269, -4 }, /* (182) sub ::= LP union RP ids */ + { 269, -6 }, /* (183) sub ::= sub COMMA LP union RP ids */ + { 268, -2 }, /* (184) tablelist ::= ids cpxName */ + { 268, -3 }, /* (185) tablelist ::= ids cpxName ids */ + { 268, -4 }, /* (186) tablelist ::= tablelist COMMA ids cpxName */ + { 268, -5 }, /* (187) tablelist ::= tablelist COMMA ids cpxName ids */ + { 270, -1 }, /* (188) tmvar ::= VARIABLE */ + { 253, -4 }, /* (189) interval_option ::= intervalKey LP tmvar RP */ + { 253, -6 }, /* (190) interval_option ::= intervalKey LP tmvar COMMA tmvar RP */ + { 253, 0 }, /* (191) interval_option ::= */ + { 271, -1 }, /* (192) intervalKey ::= INTERVAL */ + { 271, -1 }, /* (193) intervalKey ::= EVERY */ + { 255, 0 }, /* (194) session_option ::= */ + { 255, -7 }, /* (195) session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ + { 256, 0 }, /* (196) windowstate_option ::= */ + { 256, -4 }, /* (197) windowstate_option ::= STATE_WINDOW LP ids RP */ + { 257, 0 }, /* (198) fill_opt ::= */ + { 257, -6 }, /* (199) fill_opt ::= FILL LP ID COMMA tagitemlist RP */ + { 257, -4 }, /* (200) fill_opt ::= FILL LP ID RP */ + { 254, -4 }, /* (201) sliding_opt ::= SLIDING LP tmvar RP */ + { 254, 0 }, /* (202) sliding_opt ::= */ + { 260, 0 }, /* (203) orderby_opt ::= */ + { 260, -3 }, /* (204) orderby_opt ::= ORDER BY sortlist */ + { 272, -4 }, /* (205) sortlist ::= sortlist COMMA item sortorder */ + { 272, -2 }, /* (206) sortlist ::= item sortorder */ + { 274, -2 }, /* (207) item ::= ids cpxName */ + { 275, -1 }, /* (208) sortorder ::= ASC */ + { 275, -1 }, /* (209) sortorder ::= DESC */ + { 275, 0 }, /* (210) sortorder ::= */ + { 258, 0 }, /* (211) groupby_opt ::= */ + { 258, -3 }, /* (212) groupby_opt ::= GROUP BY grouplist */ + { 276, -3 }, /* (213) grouplist ::= grouplist COMMA item */ + { 276, -1 }, /* (214) grouplist ::= item */ + { 259, 0 }, /* (215) having_opt ::= */ + { 259, -2 }, /* (216) having_opt ::= HAVING expr */ + { 262, 0 }, /* (217) limit_opt ::= */ + { 262, -2 }, /* (218) limit_opt ::= LIMIT signed */ + { 262, -4 }, /* (219) limit_opt ::= LIMIT signed OFFSET signed */ + { 262, -4 }, /* (220) limit_opt ::= LIMIT signed COMMA signed */ + { 261, 0 }, /* (221) slimit_opt ::= */ + { 261, -2 }, /* (222) slimit_opt ::= SLIMIT signed */ + { 261, -4 }, /* (223) slimit_opt ::= SLIMIT signed SOFFSET signed */ + { 261, -4 }, /* (224) slimit_opt ::= SLIMIT signed COMMA signed */ + { 252, 0 }, /* (225) where_opt ::= */ + { 252, -2 }, /* (226) where_opt ::= WHERE expr */ + { 266, -3 }, /* (227) expr ::= LP expr RP */ + { 266, -1 }, /* (228) expr ::= ID */ + { 266, -3 }, /* (229) expr ::= ID DOT ID */ + { 266, -3 }, /* (230) expr ::= ID DOT STAR */ + { 266, -1 }, /* (231) expr ::= INTEGER */ + { 266, -2 }, /* (232) expr ::= MINUS INTEGER */ + { 266, -2 }, /* (233) expr ::= PLUS INTEGER */ + { 266, -1 }, /* (234) expr ::= FLOAT */ + { 266, -2 }, /* (235) expr ::= MINUS FLOAT */ + { 266, -2 }, /* (236) expr ::= PLUS FLOAT */ + { 266, -1 }, /* (237) expr ::= STRING */ + { 266, -1 }, /* (238) expr ::= NOW */ + { 266, -1 }, /* (239) expr ::= VARIABLE */ + { 266, -2 }, /* (240) expr ::= PLUS VARIABLE */ + { 266, -2 }, /* (241) expr ::= MINUS VARIABLE */ + { 266, -1 }, /* (242) expr ::= BOOL */ + { 266, -1 }, /* (243) expr ::= NULL */ + { 266, -4 }, /* (244) expr ::= ID LP exprlist RP */ + { 266, -4 }, /* (245) expr ::= ID LP STAR RP */ + { 266, -3 }, /* (246) expr ::= expr IS NULL */ + { 266, -4 }, /* (247) expr ::= expr IS NOT NULL */ + { 266, -3 }, /* (248) expr ::= expr LT expr */ + { 266, -3 }, /* (249) expr ::= expr GT expr */ + { 266, -3 }, /* (250) expr ::= expr LE expr */ + { 266, -3 }, /* (251) expr ::= expr GE expr */ + { 266, -3 }, /* (252) expr ::= expr NE expr */ + { 266, -3 }, /* (253) expr ::= expr EQ expr */ + { 266, -5 }, /* (254) expr ::= expr BETWEEN expr AND expr */ + { 266, -3 }, /* (255) expr ::= expr AND expr */ + { 266, -3 }, /* (256) expr ::= expr OR expr */ + { 266, -3 }, /* (257) expr ::= expr PLUS expr */ + { 266, -3 }, /* (258) expr ::= expr MINUS expr */ + { 266, -3 }, /* (259) expr ::= expr STAR expr */ + { 266, -3 }, /* (260) expr ::= expr SLASH expr */ + { 266, -3 }, /* (261) expr ::= expr REM expr */ + { 266, -3 }, /* (262) expr ::= expr LIKE expr */ + { 266, -3 }, /* (263) expr ::= expr MATCH expr */ + { 266, -3 }, /* (264) expr ::= expr NMATCH expr */ + { 266, -5 }, /* (265) expr ::= expr IN LP exprlist RP */ + { 206, -3 }, /* (266) exprlist ::= exprlist COMMA expritem */ + { 206, -1 }, /* (267) exprlist ::= expritem */ + { 277, -1 }, /* (268) expritem ::= expr */ + { 277, 0 }, /* (269) expritem ::= */ + { 199, -3 }, /* (270) cmd ::= RESET QUERY CACHE */ + { 199, -3 }, /* (271) cmd ::= SYNCDB ids REPLICA */ + { 199, -7 }, /* (272) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ + { 199, -7 }, /* (273) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ + { 199, -7 }, /* (274) cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */ + { 199, -7 }, /* (275) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ + { 199, -7 }, /* (276) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ + { 199, -8 }, /* (277) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ + { 199, -9 }, /* (278) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ + { 199, -7 }, /* (279) cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */ + { 199, -7 }, /* (280) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ + { 199, -7 }, /* (281) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ + { 199, -7 }, /* (282) cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */ + { 199, -7 }, /* (283) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ + { 199, -7 }, /* (284) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ + { 199, -8 }, /* (285) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ + { 199, -9 }, /* (286) cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */ + { 199, -7 }, /* (287) cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */ + { 199, -3 }, /* (288) cmd ::= KILL CONNECTION INTEGER */ + { 199, -5 }, /* (289) cmd ::= KILL STREAM INTEGER COLON INTEGER */ + { 199, -5 }, /* (290) cmd ::= KILL QUERY INTEGER COLON INTEGER */ }; static void yy_accept(yyParser*); /* Forward Declaration */ @@ -2371,16 +2386,16 @@ static void yy_reduce( { setDCLSqlElems(pInfo, TSDB_SQL_CFG_LOCAL, 2, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); } break; case 47: /* cmd ::= ALTER DATABASE ids alter_db_optr */ -{ SToken t = {0}; setCreateDbInfo(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy42, &t);} +{ SToken t = {0}; setCreateDbInfo(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy90, &t);} break; case 48: /* cmd ::= ALTER ACCOUNT ids acct_optr */ -{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy341);} +{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy171);} break; case 49: /* cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */ -{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy341);} +{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy171);} break; case 50: /* cmd ::= COMPACT VNODES IN LP exprlist RP */ -{ setCompactVnodeSql(pInfo, TSDB_SQL_COMPACT_VNODE, yymsp[-1].minor.yy131);} +{ setCompactVnodeSql(pInfo, TSDB_SQL_COMPACT_VNODE, yymsp[-1].minor.yy421);} break; case 51: /* ids ::= ID */ case 52: /* ids ::= STRING */ yytestcase(yyruleno==52); @@ -2392,26 +2407,26 @@ static void yy_reduce( break; case 54: /* ifexists ::= */ case 56: /* ifnotexists ::= */ yytestcase(yyruleno==56); - case 175: /* distinct ::= */ yytestcase(yyruleno==175); + case 178: /* distinct ::= */ yytestcase(yyruleno==178); { yymsp[1].minor.yy0.n = 0;} break; case 55: /* ifnotexists ::= IF NOT EXISTS */ { yymsp[-2].minor.yy0.n = 1;} break; - case 57: /* cmd ::= CREATE DNODE ids */ -{ setDCLSqlElems(pInfo, TSDB_SQL_CREATE_DNODE, 1, &yymsp[0].minor.yy0);} + case 57: /* cmd ::= CREATE DNODE ids PORT ids */ +{ setDCLSqlElems(pInfo, TSDB_SQL_CREATE_DNODE, 2, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);} break; case 58: /* cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */ -{ setCreateAcctSql(pInfo, TSDB_SQL_CREATE_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy341);} +{ setCreateAcctSql(pInfo, TSDB_SQL_CREATE_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy171);} break; case 59: /* cmd ::= CREATE DATABASE ifnotexists ids db_optr */ -{ setCreateDbInfo(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy42, &yymsp[-2].minor.yy0);} +{ setCreateDbInfo(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy90, &yymsp[-2].minor.yy0);} break; case 60: /* cmd ::= CREATE FUNCTION ids AS ids OUTPUTTYPE typename bufsize */ -{ setCreateFuncInfo(pInfo, TSDB_SQL_CREATE_FUNCTION, &yymsp[-5].minor.yy0, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy290, &yymsp[0].minor.yy0, 1);} +{ setCreateFuncInfo(pInfo, TSDB_SQL_CREATE_FUNCTION, &yymsp[-5].minor.yy0, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy100, &yymsp[0].minor.yy0, 1);} break; case 61: /* cmd ::= CREATE AGGREGATE FUNCTION ids AS ids OUTPUTTYPE typename bufsize */ -{ setCreateFuncInfo(pInfo, TSDB_SQL_CREATE_FUNCTION, &yymsp[-5].minor.yy0, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy290, &yymsp[0].minor.yy0, 2);} +{ setCreateFuncInfo(pInfo, TSDB_SQL_CREATE_FUNCTION, &yymsp[-5].minor.yy0, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy100, &yymsp[0].minor.yy0, 2);} break; case 62: /* cmd ::= CREATE USER ids PASS ids */ { setCreateUserSql(pInfo, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);} @@ -2442,38 +2457,38 @@ static void yy_reduce( break; case 83: /* acct_optr ::= pps tseries storage streams qtime dbs users conns state */ { - yylhsminor.yy341.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1; - yylhsminor.yy341.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1; - yylhsminor.yy341.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1; - yylhsminor.yy341.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1; - yylhsminor.yy341.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1; - yylhsminor.yy341.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1; - yylhsminor.yy341.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1; - yylhsminor.yy341.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1; - yylhsminor.yy341.stat = yymsp[0].minor.yy0; + yylhsminor.yy171.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1; + yylhsminor.yy171.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1; + yylhsminor.yy171.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1; + yylhsminor.yy171.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1; + yylhsminor.yy171.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1; + yylhsminor.yy171.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1; + yylhsminor.yy171.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1; + yylhsminor.yy171.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1; + yylhsminor.yy171.stat = yymsp[0].minor.yy0; } - yymsp[-8].minor.yy341 = yylhsminor.yy341; + yymsp[-8].minor.yy171 = yylhsminor.yy171; break; case 84: /* intitemlist ::= intitemlist COMMA intitem */ - case 148: /* tagitemlist ::= tagitemlist COMMA tagitem */ yytestcase(yyruleno==148); -{ yylhsminor.yy131 = tListItemAppend(yymsp[-2].minor.yy131, &yymsp[0].minor.yy43, -1); } - yymsp[-2].minor.yy131 = yylhsminor.yy131; + case 151: /* tagitemlist ::= tagitemlist COMMA tagitem */ yytestcase(yyruleno==151); +{ yylhsminor.yy421 = tListItemAppend(yymsp[-2].minor.yy421, &yymsp[0].minor.yy69, -1); } + yymsp[-2].minor.yy421 = yylhsminor.yy421; break; case 85: /* intitemlist ::= intitem */ - case 149: /* tagitemlist ::= tagitem */ yytestcase(yyruleno==149); -{ yylhsminor.yy131 = tListItemAppend(NULL, &yymsp[0].minor.yy43, -1); } - yymsp[0].minor.yy131 = yylhsminor.yy131; + case 152: /* tagitemlist ::= tagitem */ yytestcase(yyruleno==152); +{ yylhsminor.yy421 = tListItemAppend(NULL, &yymsp[0].minor.yy69, -1); } + yymsp[0].minor.yy421 = yylhsminor.yy421; break; case 86: /* intitem ::= INTEGER */ - case 150: /* tagitem ::= INTEGER */ yytestcase(yyruleno==150); - case 151: /* tagitem ::= FLOAT */ yytestcase(yyruleno==151); - case 152: /* tagitem ::= STRING */ yytestcase(yyruleno==152); - case 153: /* tagitem ::= BOOL */ yytestcase(yyruleno==153); -{ toTSDBType(yymsp[0].minor.yy0.type); taosVariantCreate(&yylhsminor.yy43, yymsp[0].minor.yy0.z, yymsp[0].minor.yy0.n, yymsp[0].minor.yy0.type); } - yymsp[0].minor.yy43 = yylhsminor.yy43; + case 153: /* tagitem ::= INTEGER */ yytestcase(yyruleno==153); + case 154: /* tagitem ::= FLOAT */ yytestcase(yyruleno==154); + case 155: /* tagitem ::= STRING */ yytestcase(yyruleno==155); + case 156: /* tagitem ::= BOOL */ yytestcase(yyruleno==156); +{ toTSDBType(yymsp[0].minor.yy0.type); taosVariantCreate(&yylhsminor.yy69, yymsp[0].minor.yy0.z, yymsp[0].minor.yy0.n, yymsp[0].minor.yy0.type); } + yymsp[0].minor.yy69 = yylhsminor.yy69; break; case 87: /* keep ::= KEEP intitemlist */ -{ yymsp[-1].minor.yy131 = yymsp[0].minor.yy131; } +{ yymsp[-1].minor.yy421 = yymsp[0].minor.yy421; } break; case 88: /* cache ::= CACHE INTEGER */ case 89: /* replica ::= REPLICA INTEGER */ yytestcase(yyruleno==89); @@ -2492,646 +2507,658 @@ static void yy_reduce( { yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } break; case 102: /* db_optr ::= */ -{setDefaultCreateDbOption(&yymsp[1].minor.yy42);} +{setDefaultCreateDbOption(&yymsp[1].minor.yy90);} break; case 103: /* db_optr ::= db_optr cache */ -{ yylhsminor.yy42 = yymsp[-1].minor.yy42; yylhsminor.yy42.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy42 = yylhsminor.yy42; +{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy90 = yylhsminor.yy90; break; case 104: /* db_optr ::= db_optr replica */ case 119: /* alter_db_optr ::= alter_db_optr replica */ yytestcase(yyruleno==119); -{ yylhsminor.yy42 = yymsp[-1].minor.yy42; yylhsminor.yy42.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy42 = yylhsminor.yy42; +{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy90 = yylhsminor.yy90; break; case 105: /* db_optr ::= db_optr quorum */ case 120: /* alter_db_optr ::= alter_db_optr quorum */ yytestcase(yyruleno==120); -{ yylhsminor.yy42 = yymsp[-1].minor.yy42; yylhsminor.yy42.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy42 = yylhsminor.yy42; +{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy90 = yylhsminor.yy90; break; case 106: /* db_optr ::= db_optr days */ -{ yylhsminor.yy42 = yymsp[-1].minor.yy42; yylhsminor.yy42.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy42 = yylhsminor.yy42; +{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy90 = yylhsminor.yy90; break; case 107: /* db_optr ::= db_optr minrows */ -{ yylhsminor.yy42 = yymsp[-1].minor.yy42; yylhsminor.yy42.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } - yymsp[-1].minor.yy42 = yylhsminor.yy42; +{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } + yymsp[-1].minor.yy90 = yylhsminor.yy90; break; case 108: /* db_optr ::= db_optr maxrows */ -{ yylhsminor.yy42 = yymsp[-1].minor.yy42; yylhsminor.yy42.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } - yymsp[-1].minor.yy42 = yylhsminor.yy42; +{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } + yymsp[-1].minor.yy90 = yylhsminor.yy90; break; case 109: /* db_optr ::= db_optr blocks */ case 122: /* alter_db_optr ::= alter_db_optr blocks */ yytestcase(yyruleno==122); -{ yylhsminor.yy42 = yymsp[-1].minor.yy42; yylhsminor.yy42.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy42 = yylhsminor.yy42; +{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy90 = yylhsminor.yy90; break; case 110: /* db_optr ::= db_optr ctime */ -{ yylhsminor.yy42 = yymsp[-1].minor.yy42; yylhsminor.yy42.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy42 = yylhsminor.yy42; +{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy90 = yylhsminor.yy90; break; case 111: /* db_optr ::= db_optr wal */ -{ yylhsminor.yy42 = yymsp[-1].minor.yy42; yylhsminor.yy42.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy42 = yylhsminor.yy42; +{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy90 = yylhsminor.yy90; break; case 112: /* db_optr ::= db_optr fsync */ -{ yylhsminor.yy42 = yymsp[-1].minor.yy42; yylhsminor.yy42.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy42 = yylhsminor.yy42; +{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy90 = yylhsminor.yy90; break; case 113: /* db_optr ::= db_optr comp */ case 123: /* alter_db_optr ::= alter_db_optr comp */ yytestcase(yyruleno==123); -{ yylhsminor.yy42 = yymsp[-1].minor.yy42; yylhsminor.yy42.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy42 = yylhsminor.yy42; +{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy90 = yylhsminor.yy90; break; case 114: /* db_optr ::= db_optr prec */ -{ yylhsminor.yy42 = yymsp[-1].minor.yy42; yylhsminor.yy42.precision = yymsp[0].minor.yy0; } - yymsp[-1].minor.yy42 = yylhsminor.yy42; +{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.precision = yymsp[0].minor.yy0; } + yymsp[-1].minor.yy90 = yylhsminor.yy90; break; case 115: /* db_optr ::= db_optr keep */ case 121: /* alter_db_optr ::= alter_db_optr keep */ yytestcase(yyruleno==121); -{ yylhsminor.yy42 = yymsp[-1].minor.yy42; yylhsminor.yy42.keep = yymsp[0].minor.yy131; } - yymsp[-1].minor.yy42 = yylhsminor.yy42; +{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.keep = yymsp[0].minor.yy421; } + yymsp[-1].minor.yy90 = yylhsminor.yy90; break; case 116: /* db_optr ::= db_optr update */ case 124: /* alter_db_optr ::= alter_db_optr update */ yytestcase(yyruleno==124); -{ yylhsminor.yy42 = yymsp[-1].minor.yy42; yylhsminor.yy42.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy42 = yylhsminor.yy42; +{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy90 = yylhsminor.yy90; break; case 117: /* db_optr ::= db_optr cachelast */ case 125: /* alter_db_optr ::= alter_db_optr cachelast */ yytestcase(yyruleno==125); -{ yylhsminor.yy42 = yymsp[-1].minor.yy42; yylhsminor.yy42.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy42 = yylhsminor.yy42; +{ yylhsminor.yy90 = yymsp[-1].minor.yy90; yylhsminor.yy90.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy90 = yylhsminor.yy90; break; case 118: /* alter_db_optr ::= */ -{ setDefaultCreateDbOption(&yymsp[1].minor.yy42);} +{ setDefaultCreateDbOption(&yymsp[1].minor.yy90);} break; case 126: /* typename ::= ids */ { yymsp[0].minor.yy0.type = 0; - tSetColumnType (&yylhsminor.yy290, &yymsp[0].minor.yy0); + tSetColumnType (&yylhsminor.yy100, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy290 = yylhsminor.yy290; + yymsp[0].minor.yy100 = yylhsminor.yy100; break; case 127: /* typename ::= ids LP signed RP */ { - if (yymsp[-1].minor.yy459 <= 0) { + if (yymsp[-1].minor.yy325 <= 0) { yymsp[-3].minor.yy0.type = 0; - tSetColumnType(&yylhsminor.yy290, &yymsp[-3].minor.yy0); + tSetColumnType(&yylhsminor.yy100, &yymsp[-3].minor.yy0); } else { - yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy459; // negative value of name length - tSetColumnType(&yylhsminor.yy290, &yymsp[-3].minor.yy0); + yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy325; // negative value of name length + tSetColumnType(&yylhsminor.yy100, &yymsp[-3].minor.yy0); } } - yymsp[-3].minor.yy290 = yylhsminor.yy290; + yymsp[-3].minor.yy100 = yylhsminor.yy100; break; case 128: /* typename ::= ids UNSIGNED */ { yymsp[-1].minor.yy0.type = 0; yymsp[-1].minor.yy0.n = ((yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n) - yymsp[-1].minor.yy0.z); - tSetColumnType (&yylhsminor.yy290, &yymsp[-1].minor.yy0); + tSetColumnType (&yylhsminor.yy100, &yymsp[-1].minor.yy0); } - yymsp[-1].minor.yy290 = yylhsminor.yy290; + yymsp[-1].minor.yy100 = yylhsminor.yy100; break; case 129: /* signed ::= INTEGER */ -{ yylhsminor.yy459 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[0].minor.yy459 = yylhsminor.yy459; +{ yylhsminor.yy325 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[0].minor.yy325 = yylhsminor.yy325; break; case 130: /* signed ::= PLUS INTEGER */ -{ yymsp[-1].minor.yy459 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } +{ yymsp[-1].minor.yy325 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } break; case 131: /* signed ::= MINUS INTEGER */ -{ yymsp[-1].minor.yy459 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);} +{ yymsp[-1].minor.yy325 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);} break; case 135: /* cmd ::= CREATE TABLE create_table_list */ -{ pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy272;} +{ pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy438;} break; case 136: /* create_table_list ::= create_from_stable */ { SCreateTableSql* pCreateTable = calloc(1, sizeof(SCreateTableSql)); pCreateTable->childTableInfo = taosArrayInit(4, sizeof(SCreatedTableInfo)); - taosArrayPush(pCreateTable->childTableInfo, &yymsp[0].minor.yy96); + taosArrayPush(pCreateTable->childTableInfo, &yymsp[0].minor.yy152); pCreateTable->type = TSQL_CREATE_CTABLE; - yylhsminor.yy272 = pCreateTable; + yylhsminor.yy438 = pCreateTable; } - yymsp[0].minor.yy272 = yylhsminor.yy272; + yymsp[0].minor.yy438 = yylhsminor.yy438; break; case 137: /* create_table_list ::= create_table_list create_from_stable */ { - taosArrayPush(yymsp[-1].minor.yy272->childTableInfo, &yymsp[0].minor.yy96); - yylhsminor.yy272 = yymsp[-1].minor.yy272; + taosArrayPush(yymsp[-1].minor.yy438->childTableInfo, &yymsp[0].minor.yy152); + yylhsminor.yy438 = yymsp[-1].minor.yy438; } - yymsp[-1].minor.yy272 = yylhsminor.yy272; + yymsp[-1].minor.yy438 = yylhsminor.yy438; break; case 138: /* create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ { - yylhsminor.yy272 = tSetCreateTableInfo(yymsp[-1].minor.yy131, NULL, NULL, TSQL_CREATE_TABLE); - setSqlInfo(pInfo, yylhsminor.yy272, NULL, TSDB_SQL_CREATE_TABLE); + yylhsminor.yy438 = tSetCreateTableInfo(yymsp[-1].minor.yy421, NULL, NULL, TSQL_CREATE_TABLE); + setSqlInfo(pInfo, yylhsminor.yy438, NULL, TSDB_SQL_CREATE_TABLE); yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; setCreatedTableName(pInfo, &yymsp[-4].minor.yy0, &yymsp[-5].minor.yy0); } - yymsp[-5].minor.yy272 = yylhsminor.yy272; + yymsp[-5].minor.yy438 = yylhsminor.yy438; break; case 139: /* create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ { - yylhsminor.yy272 = tSetCreateTableInfo(yymsp[-5].minor.yy131, yymsp[-1].minor.yy131, NULL, TSQL_CREATE_STABLE); - setSqlInfo(pInfo, yylhsminor.yy272, NULL, TSDB_SQL_CREATE_TABLE); + yylhsminor.yy438 = tSetCreateTableInfo(yymsp[-5].minor.yy421, yymsp[-1].minor.yy421, NULL, TSQL_CREATE_STABLE); + setSqlInfo(pInfo, yylhsminor.yy438, NULL, TSDB_SQL_CREATE_TABLE); yymsp[-8].minor.yy0.n += yymsp[-7].minor.yy0.n; setCreatedTableName(pInfo, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0); } - yymsp[-9].minor.yy272 = yylhsminor.yy272; + yymsp[-9].minor.yy438 = yylhsminor.yy438; break; - case 140: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */ + case 140: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist1 RP */ { yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n; yymsp[-8].minor.yy0.n += yymsp[-7].minor.yy0.n; - yylhsminor.yy96 = createNewChildTableInfo(&yymsp[-5].minor.yy0, NULL, yymsp[-1].minor.yy131, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0); + yylhsminor.yy152 = createNewChildTableInfo(&yymsp[-5].minor.yy0, NULL, yymsp[-1].minor.yy421, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0); } - yymsp[-9].minor.yy96 = yylhsminor.yy96; + yymsp[-9].minor.yy152 = yylhsminor.yy152; break; - case 141: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */ + case 141: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist1 RP */ { yymsp[-8].minor.yy0.n += yymsp[-7].minor.yy0.n; yymsp[-11].minor.yy0.n += yymsp[-10].minor.yy0.n; - yylhsminor.yy96 = createNewChildTableInfo(&yymsp[-8].minor.yy0, yymsp[-5].minor.yy131, yymsp[-1].minor.yy131, &yymsp[-11].minor.yy0, &yymsp[-12].minor.yy0); + yylhsminor.yy152 = createNewChildTableInfo(&yymsp[-8].minor.yy0, yymsp[-5].minor.yy421, yymsp[-1].minor.yy421, &yymsp[-11].minor.yy0, &yymsp[-12].minor.yy0); } - yymsp[-12].minor.yy96 = yylhsminor.yy96; + yymsp[-12].minor.yy152 = yylhsminor.yy152; break; case 142: /* tagNamelist ::= tagNamelist COMMA ids */ -{taosArrayPush(yymsp[-2].minor.yy131, &yymsp[0].minor.yy0); yylhsminor.yy131 = yymsp[-2].minor.yy131; } - yymsp[-2].minor.yy131 = yylhsminor.yy131; +{taosArrayPush(yymsp[-2].minor.yy421, &yymsp[0].minor.yy0); yylhsminor.yy421 = yymsp[-2].minor.yy421; } + yymsp[-2].minor.yy421 = yylhsminor.yy421; break; case 143: /* tagNamelist ::= ids */ -{yylhsminor.yy131 = taosArrayInit(4, sizeof(SToken)); taosArrayPush(yylhsminor.yy131, &yymsp[0].minor.yy0);} - yymsp[0].minor.yy131 = yylhsminor.yy131; +{yylhsminor.yy421 = taosArrayInit(4, sizeof(SToken)); taosArrayPush(yylhsminor.yy421, &yymsp[0].minor.yy0);} + yymsp[0].minor.yy421 = yylhsminor.yy421; break; case 144: /* create_table_args ::= ifnotexists ids cpxName AS select */ { - yylhsminor.yy272 = tSetCreateTableInfo(NULL, NULL, yymsp[0].minor.yy256, TSQL_CREATE_STREAM); - setSqlInfo(pInfo, yylhsminor.yy272, NULL, TSDB_SQL_CREATE_TABLE); + yylhsminor.yy438 = tSetCreateTableInfo(NULL, NULL, yymsp[0].minor.yy56, TSQL_CREATE_STREAM); + setSqlInfo(pInfo, yylhsminor.yy438, NULL, TSDB_SQL_CREATE_TABLE); yymsp[-3].minor.yy0.n += yymsp[-2].minor.yy0.n; setCreatedTableName(pInfo, &yymsp[-3].minor.yy0, &yymsp[-4].minor.yy0); } - yymsp[-4].minor.yy272 = yylhsminor.yy272; + yymsp[-4].minor.yy438 = yylhsminor.yy438; break; case 145: /* columnlist ::= columnlist COMMA column */ -{taosArrayPush(yymsp[-2].minor.yy131, &yymsp[0].minor.yy290); yylhsminor.yy131 = yymsp[-2].minor.yy131; } - yymsp[-2].minor.yy131 = yylhsminor.yy131; +{taosArrayPush(yymsp[-2].minor.yy421, &yymsp[0].minor.yy100); yylhsminor.yy421 = yymsp[-2].minor.yy421; } + yymsp[-2].minor.yy421 = yylhsminor.yy421; break; case 146: /* columnlist ::= column */ -{yylhsminor.yy131 = taosArrayInit(4, sizeof(SField)); taosArrayPush(yylhsminor.yy131, &yymsp[0].minor.yy290);} - yymsp[0].minor.yy131 = yylhsminor.yy131; +{yylhsminor.yy421 = taosArrayInit(4, sizeof(SField)); taosArrayPush(yylhsminor.yy421, &yymsp[0].minor.yy100);} + yymsp[0].minor.yy421 = yylhsminor.yy421; break; case 147: /* column ::= ids typename */ { - tSetColumnInfo(&yylhsminor.yy290, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy290); + tSetColumnInfo(&yylhsminor.yy100, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy100); } - yymsp[-1].minor.yy290 = yylhsminor.yy290; + yymsp[-1].minor.yy100 = yylhsminor.yy100; break; - case 154: /* tagitem ::= NULL */ -{ yymsp[0].minor.yy0.type = 0; taosVariantCreate(&yylhsminor.yy43, yymsp[0].minor.yy0.z, yymsp[0].minor.yy0.n, yymsp[0].minor.yy0.type); } - yymsp[0].minor.yy43 = yylhsminor.yy43; + case 148: /* tagitemlist1 ::= tagitemlist1 COMMA tagitem1 */ +{ taosArrayPush(yymsp[-2].minor.yy421, &yymsp[0].minor.yy0); yylhsminor.yy421 = yymsp[-2].minor.yy421;} + yymsp[-2].minor.yy421 = yylhsminor.yy421; break; - case 155: /* tagitem ::= NOW */ -{ yymsp[0].minor.yy0.type = TSDB_DATA_TYPE_TIMESTAMP; taosVariantCreate(&yylhsminor.yy43, yymsp[0].minor.yy0.z, yymsp[0].minor.yy0.n, yymsp[0].minor.yy0.type);} - yymsp[0].minor.yy43 = yylhsminor.yy43; + case 149: /* tagitemlist1 ::= tagitem1 */ +{ yylhsminor.yy421 = taosArrayInit(4, sizeof(SToken)); taosArrayPush(yylhsminor.yy421, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy421 = yylhsminor.yy421; break; - case 156: /* tagitem ::= MINUS INTEGER */ - case 157: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==157); - case 158: /* tagitem ::= PLUS INTEGER */ yytestcase(yyruleno==158); - case 159: /* tagitem ::= PLUS FLOAT */ yytestcase(yyruleno==159); + case 150: /* tagitem1 ::= MINUS INTEGER */ +{ yylhsminor.yy0.n = yymsp[-1].minor.yy0.n + yymsp[0].minor.yy0.n; yylhsminor.yy0.type = yymsp[0].minor.yy0.type; } + yymsp[-1].minor.yy0 = yylhsminor.yy0; + break; + case 157: /* tagitem ::= NULL */ +{ yymsp[0].minor.yy0.type = 0; taosVariantCreate(&yylhsminor.yy69, yymsp[0].minor.yy0.z, yymsp[0].minor.yy0.n, yymsp[0].minor.yy0.type); } + yymsp[0].minor.yy69 = yylhsminor.yy69; + break; + case 158: /* tagitem ::= NOW */ +{ yymsp[0].minor.yy0.type = TSDB_DATA_TYPE_TIMESTAMP; taosVariantCreate(&yylhsminor.yy69, yymsp[0].minor.yy0.z, yymsp[0].minor.yy0.n, yymsp[0].minor.yy0.type);} + yymsp[0].minor.yy69 = yylhsminor.yy69; + break; + case 159: /* tagitem ::= MINUS INTEGER */ + case 160: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==160); + case 161: /* tagitem ::= PLUS INTEGER */ yytestcase(yyruleno==161); + case 162: /* tagitem ::= PLUS FLOAT */ yytestcase(yyruleno==162); { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = yymsp[0].minor.yy0.type; toTSDBType(yymsp[-1].minor.yy0.type); - taosVariantCreate(&yylhsminor.yy43, yymsp[-1].minor.yy0.z, yymsp[-1].minor.yy0.n, yymsp[-1].minor.yy0.type); + taosVariantCreate(&yylhsminor.yy69, yymsp[-1].minor.yy0.z, yymsp[-1].minor.yy0.n, yymsp[-1].minor.yy0.type); } - yymsp[-1].minor.yy43 = yylhsminor.yy43; + yymsp[-1].minor.yy69 = yylhsminor.yy69; break; - case 160: /* select ::= SELECT selcollist from where_opt interval_option sliding_opt session_option windowstate_option fill_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt */ + case 163: /* select ::= SELECT selcollist from where_opt interval_option sliding_opt session_option windowstate_option fill_opt groupby_opt having_opt orderby_opt slimit_opt limit_opt */ { - yylhsminor.yy256 = tSetQuerySqlNode(&yymsp[-13].minor.yy0, yymsp[-12].minor.yy131, yymsp[-11].minor.yy544, yymsp[-10].minor.yy46, yymsp[-4].minor.yy131, yymsp[-2].minor.yy131, &yymsp[-9].minor.yy530, &yymsp[-7].minor.yy39, &yymsp[-6].minor.yy538, &yymsp[-8].minor.yy0, yymsp[-5].minor.yy131, &yymsp[0].minor.yy55, &yymsp[-1].minor.yy55, yymsp[-3].minor.yy46); + yylhsminor.yy56 = tSetQuerySqlNode(&yymsp[-13].minor.yy0, yymsp[-12].minor.yy421, yymsp[-11].minor.yy8, yymsp[-10].minor.yy439, yymsp[-4].minor.yy421, yymsp[-2].minor.yy421, &yymsp[-9].minor.yy400, &yymsp[-7].minor.yy147, &yymsp[-6].minor.yy40, &yymsp[-8].minor.yy0, yymsp[-5].minor.yy421, &yymsp[0].minor.yy231, &yymsp[-1].minor.yy231, yymsp[-3].minor.yy439); } - yymsp[-13].minor.yy256 = yylhsminor.yy256; + yymsp[-13].minor.yy56 = yylhsminor.yy56; break; - case 161: /* select ::= LP select RP */ -{yymsp[-2].minor.yy256 = yymsp[-1].minor.yy256;} + case 164: /* select ::= LP select RP */ +{yymsp[-2].minor.yy56 = yymsp[-1].minor.yy56;} break; - case 162: /* union ::= select */ -{ yylhsminor.yy303 = setSubclause(NULL, yymsp[0].minor.yy256); } - yymsp[0].minor.yy303 = yylhsminor.yy303; + case 165: /* union ::= select */ +{ yylhsminor.yy149 = setSubclause(NULL, yymsp[0].minor.yy56); } + yymsp[0].minor.yy149 = yylhsminor.yy149; break; - case 163: /* union ::= union UNION ALL select */ -{ yylhsminor.yy303 = appendSelectClause(yymsp[-3].minor.yy303, SQL_TYPE_UNIONALL, yymsp[0].minor.yy256); } - yymsp[-3].minor.yy303 = yylhsminor.yy303; + case 166: /* union ::= union UNION ALL select */ +{ yylhsminor.yy149 = appendSelectClause(yymsp[-3].minor.yy149, SQL_TYPE_UNIONALL, yymsp[0].minor.yy56); } + yymsp[-3].minor.yy149 = yylhsminor.yy149; break; - case 164: /* union ::= union UNION select */ -{ yylhsminor.yy303 = appendSelectClause(yymsp[-2].minor.yy303, SQL_TYPE_UNION, yymsp[0].minor.yy256); } - yymsp[-2].minor.yy303 = yylhsminor.yy303; + case 167: /* union ::= union UNION select */ +{ yylhsminor.yy149 = appendSelectClause(yymsp[-2].minor.yy149, SQL_TYPE_UNION, yymsp[0].minor.yy56); } + yymsp[-2].minor.yy149 = yylhsminor.yy149; break; - case 165: /* cmd ::= union */ -{ setSqlInfo(pInfo, yymsp[0].minor.yy303, NULL, TSDB_SQL_SELECT); } + case 168: /* cmd ::= union */ +{ setSqlInfo(pInfo, yymsp[0].minor.yy149, NULL, TSDB_SQL_SELECT); } break; - case 166: /* select ::= SELECT selcollist */ + case 169: /* select ::= SELECT selcollist */ { - yylhsminor.yy256 = tSetQuerySqlNode(&yymsp[-1].minor.yy0, yymsp[0].minor.yy131, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + yylhsminor.yy56 = tSetQuerySqlNode(&yymsp[-1].minor.yy0, yymsp[0].minor.yy421, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); } - yymsp[-1].minor.yy256 = yylhsminor.yy256; + yymsp[-1].minor.yy56 = yylhsminor.yy56; break; - case 167: /* sclp ::= selcollist COMMA */ -{yylhsminor.yy131 = yymsp[-1].minor.yy131;} - yymsp[-1].minor.yy131 = yylhsminor.yy131; + case 170: /* sclp ::= selcollist COMMA */ +{yylhsminor.yy421 = yymsp[-1].minor.yy421;} + yymsp[-1].minor.yy421 = yylhsminor.yy421; break; - case 168: /* sclp ::= */ - case 200: /* orderby_opt ::= */ yytestcase(yyruleno==200); -{yymsp[1].minor.yy131 = 0;} + case 171: /* sclp ::= */ + case 203: /* orderby_opt ::= */ yytestcase(yyruleno==203); +{yymsp[1].minor.yy421 = 0;} break; - case 169: /* selcollist ::= sclp distinct expr as */ + case 172: /* selcollist ::= sclp distinct expr as */ { - yylhsminor.yy131 = tSqlExprListAppend(yymsp[-3].minor.yy131, yymsp[-1].minor.yy46, yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0); + yylhsminor.yy421 = tSqlExprListAppend(yymsp[-3].minor.yy421, yymsp[-1].minor.yy439, yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0); } - yymsp[-3].minor.yy131 = yylhsminor.yy131; + yymsp[-3].minor.yy421 = yylhsminor.yy421; break; - case 170: /* selcollist ::= sclp STAR */ + case 173: /* selcollist ::= sclp STAR */ { tSqlExpr *pNode = tSqlExprCreateIdValue(NULL, TK_ALL); - yylhsminor.yy131 = tSqlExprListAppend(yymsp[-1].minor.yy131, pNode, 0, 0); + yylhsminor.yy421 = tSqlExprListAppend(yymsp[-1].minor.yy421, pNode, 0, 0); } - yymsp[-1].minor.yy131 = yylhsminor.yy131; + yymsp[-1].minor.yy421 = yylhsminor.yy421; break; - case 171: /* as ::= AS ids */ + case 174: /* as ::= AS ids */ { yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } break; - case 172: /* as ::= ids */ + case 175: /* as ::= ids */ { yylhsminor.yy0 = yymsp[0].minor.yy0; } yymsp[0].minor.yy0 = yylhsminor.yy0; break; - case 173: /* as ::= */ + case 176: /* as ::= */ { yymsp[1].minor.yy0.n = 0; } break; - case 174: /* distinct ::= DISTINCT */ + case 177: /* distinct ::= DISTINCT */ { yylhsminor.yy0 = yymsp[0].minor.yy0; } yymsp[0].minor.yy0 = yylhsminor.yy0; break; - case 176: /* from ::= FROM tablelist */ - case 177: /* from ::= FROM sub */ yytestcase(yyruleno==177); -{yymsp[-1].minor.yy544 = yymsp[0].minor.yy544;} + case 179: /* from ::= FROM tablelist */ + case 180: /* from ::= FROM sub */ yytestcase(yyruleno==180); +{yymsp[-1].minor.yy8 = yymsp[0].minor.yy8;} break; - case 178: /* sub ::= LP union RP */ -{yymsp[-2].minor.yy544 = addSubquery(NULL, yymsp[-1].minor.yy303, NULL);} + case 181: /* sub ::= LP union RP */ +{yymsp[-2].minor.yy8 = addSubquery(NULL, yymsp[-1].minor.yy149, NULL);} break; - case 179: /* sub ::= LP union RP ids */ -{yymsp[-3].minor.yy544 = addSubquery(NULL, yymsp[-2].minor.yy303, &yymsp[0].minor.yy0);} + case 182: /* sub ::= LP union RP ids */ +{yymsp[-3].minor.yy8 = addSubquery(NULL, yymsp[-2].minor.yy149, &yymsp[0].minor.yy0);} break; - case 180: /* sub ::= sub COMMA LP union RP ids */ -{yylhsminor.yy544 = addSubquery(yymsp[-5].minor.yy544, yymsp[-2].minor.yy303, &yymsp[0].minor.yy0);} - yymsp[-5].minor.yy544 = yylhsminor.yy544; + case 183: /* sub ::= sub COMMA LP union RP ids */ +{yylhsminor.yy8 = addSubquery(yymsp[-5].minor.yy8, yymsp[-2].minor.yy149, &yymsp[0].minor.yy0);} + yymsp[-5].minor.yy8 = yylhsminor.yy8; break; - case 181: /* tablelist ::= ids cpxName */ + case 184: /* tablelist ::= ids cpxName */ { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - yylhsminor.yy544 = setTableNameList(NULL, &yymsp[-1].minor.yy0, NULL); + yylhsminor.yy8 = setTableNameList(NULL, &yymsp[-1].minor.yy0, NULL); } - yymsp[-1].minor.yy544 = yylhsminor.yy544; + yymsp[-1].minor.yy8 = yylhsminor.yy8; break; - case 182: /* tablelist ::= ids cpxName ids */ + case 185: /* tablelist ::= ids cpxName ids */ { yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n; - yylhsminor.yy544 = setTableNameList(NULL, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); + yylhsminor.yy8 = setTableNameList(NULL, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy544 = yylhsminor.yy544; + yymsp[-2].minor.yy8 = yylhsminor.yy8; break; - case 183: /* tablelist ::= tablelist COMMA ids cpxName */ + case 186: /* tablelist ::= tablelist COMMA ids cpxName */ { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - yylhsminor.yy544 = setTableNameList(yymsp[-3].minor.yy544, &yymsp[-1].minor.yy0, NULL); + yylhsminor.yy8 = setTableNameList(yymsp[-3].minor.yy8, &yymsp[-1].minor.yy0, NULL); } - yymsp[-3].minor.yy544 = yylhsminor.yy544; + yymsp[-3].minor.yy8 = yylhsminor.yy8; break; - case 184: /* tablelist ::= tablelist COMMA ids cpxName ids */ + case 187: /* tablelist ::= tablelist COMMA ids cpxName ids */ { yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n; - yylhsminor.yy544 = setTableNameList(yymsp[-4].minor.yy544, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); + yylhsminor.yy8 = setTableNameList(yymsp[-4].minor.yy8, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); } - yymsp[-4].minor.yy544 = yylhsminor.yy544; + yymsp[-4].minor.yy8 = yylhsminor.yy8; break; - case 185: /* tmvar ::= VARIABLE */ + case 188: /* tmvar ::= VARIABLE */ {yylhsminor.yy0 = yymsp[0].minor.yy0;} yymsp[0].minor.yy0 = yylhsminor.yy0; break; - case 186: /* interval_option ::= intervalKey LP tmvar RP */ -{yylhsminor.yy530.interval = yymsp[-1].minor.yy0; yylhsminor.yy530.offset.n = 0; yylhsminor.yy530.token = yymsp[-3].minor.yy310;} - yymsp[-3].minor.yy530 = yylhsminor.yy530; + case 189: /* interval_option ::= intervalKey LP tmvar RP */ +{yylhsminor.yy400.interval = yymsp[-1].minor.yy0; yylhsminor.yy400.offset.n = 0; yylhsminor.yy400.token = yymsp[-3].minor.yy104;} + yymsp[-3].minor.yy400 = yylhsminor.yy400; break; - case 187: /* interval_option ::= intervalKey LP tmvar COMMA tmvar RP */ -{yylhsminor.yy530.interval = yymsp[-3].minor.yy0; yylhsminor.yy530.offset = yymsp[-1].minor.yy0; yylhsminor.yy530.token = yymsp[-5].minor.yy310;} - yymsp[-5].minor.yy530 = yylhsminor.yy530; + case 190: /* interval_option ::= intervalKey LP tmvar COMMA tmvar RP */ +{yylhsminor.yy400.interval = yymsp[-3].minor.yy0; yylhsminor.yy400.offset = yymsp[-1].minor.yy0; yylhsminor.yy400.token = yymsp[-5].minor.yy104;} + yymsp[-5].minor.yy400 = yylhsminor.yy400; break; - case 188: /* interval_option ::= */ -{memset(&yymsp[1].minor.yy530, 0, sizeof(yymsp[1].minor.yy530));} + case 191: /* interval_option ::= */ +{memset(&yymsp[1].minor.yy400, 0, sizeof(yymsp[1].minor.yy400));} break; - case 189: /* intervalKey ::= INTERVAL */ -{yymsp[0].minor.yy310 = TK_INTERVAL;} + case 192: /* intervalKey ::= INTERVAL */ +{yymsp[0].minor.yy104 = TK_INTERVAL;} break; - case 190: /* intervalKey ::= EVERY */ -{yymsp[0].minor.yy310 = TK_EVERY; } + case 193: /* intervalKey ::= EVERY */ +{yymsp[0].minor.yy104 = TK_EVERY; } break; - case 191: /* session_option ::= */ -{yymsp[1].minor.yy39.col.n = 0; yymsp[1].minor.yy39.gap.n = 0;} + case 194: /* session_option ::= */ +{yymsp[1].minor.yy147.col.n = 0; yymsp[1].minor.yy147.gap.n = 0;} break; - case 192: /* session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ + case 195: /* session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - yymsp[-6].minor.yy39.col = yymsp[-4].minor.yy0; - yymsp[-6].minor.yy39.gap = yymsp[-1].minor.yy0; + yymsp[-6].minor.yy147.col = yymsp[-4].minor.yy0; + yymsp[-6].minor.yy147.gap = yymsp[-1].minor.yy0; } break; - case 193: /* windowstate_option ::= */ -{ yymsp[1].minor.yy538.col.n = 0; yymsp[1].minor.yy538.col.z = NULL;} + case 196: /* windowstate_option ::= */ +{ yymsp[1].minor.yy40.col.n = 0; yymsp[1].minor.yy40.col.z = NULL;} break; - case 194: /* windowstate_option ::= STATE_WINDOW LP ids RP */ -{ yymsp[-3].minor.yy538.col = yymsp[-1].minor.yy0; } + case 197: /* windowstate_option ::= STATE_WINDOW LP ids RP */ +{ yymsp[-3].minor.yy40.col = yymsp[-1].minor.yy0; } break; - case 195: /* fill_opt ::= */ -{ yymsp[1].minor.yy131 = 0; } + case 198: /* fill_opt ::= */ +{ yymsp[1].minor.yy421 = 0; } break; - case 196: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */ + case 199: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */ { SVariant A = {0}; toTSDBType(yymsp[-3].minor.yy0.type); taosVariantCreate(&A, yymsp[-3].minor.yy0.z, yymsp[-3].minor.yy0.n, yymsp[-3].minor.yy0.type); - tListItemInsert(yymsp[-1].minor.yy131, &A, -1, 0); - yymsp[-5].minor.yy131 = yymsp[-1].minor.yy131; + tListItemInsert(yymsp[-1].minor.yy421, &A, -1, 0); + yymsp[-5].minor.yy421 = yymsp[-1].minor.yy421; } break; - case 197: /* fill_opt ::= FILL LP ID RP */ + case 200: /* fill_opt ::= FILL LP ID RP */ { toTSDBType(yymsp[-1].minor.yy0.type); - yymsp[-3].minor.yy131 = tListItemAppendToken(NULL, &yymsp[-1].minor.yy0, -1); + yymsp[-3].minor.yy421 = tListItemAppendToken(NULL, &yymsp[-1].minor.yy0, -1); } break; - case 198: /* sliding_opt ::= SLIDING LP tmvar RP */ + case 201: /* sliding_opt ::= SLIDING LP tmvar RP */ {yymsp[-3].minor.yy0 = yymsp[-1].minor.yy0; } break; - case 199: /* sliding_opt ::= */ + case 202: /* sliding_opt ::= */ {yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.z = NULL; yymsp[1].minor.yy0.type = 0; } break; - case 201: /* orderby_opt ::= ORDER BY sortlist */ -{yymsp[-2].minor.yy131 = yymsp[0].minor.yy131;} + case 204: /* orderby_opt ::= ORDER BY sortlist */ +{yymsp[-2].minor.yy421 = yymsp[0].minor.yy421;} break; - case 202: /* sortlist ::= sortlist COMMA item sortorder */ + case 205: /* sortlist ::= sortlist COMMA item sortorder */ { - yylhsminor.yy131 = tListItemAppend(yymsp[-3].minor.yy131, &yymsp[-1].minor.yy43, yymsp[0].minor.yy44); + yylhsminor.yy421 = tListItemAppend(yymsp[-3].minor.yy421, &yymsp[-1].minor.yy69, yymsp[0].minor.yy96); } - yymsp[-3].minor.yy131 = yylhsminor.yy131; + yymsp[-3].minor.yy421 = yylhsminor.yy421; break; - case 203: /* sortlist ::= item sortorder */ + case 206: /* sortlist ::= item sortorder */ { - yylhsminor.yy131 = tListItemAppend(NULL, &yymsp[-1].minor.yy43, yymsp[0].minor.yy44); + yylhsminor.yy421 = tListItemAppend(NULL, &yymsp[-1].minor.yy69, yymsp[0].minor.yy96); } - yymsp[-1].minor.yy131 = yylhsminor.yy131; + yymsp[-1].minor.yy421 = yylhsminor.yy421; break; - case 204: /* item ::= ids cpxName */ + case 207: /* item ::= ids cpxName */ { toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - taosVariantCreate(&yylhsminor.yy43, yymsp[-1].minor.yy0.z, yymsp[-1].minor.yy0.n, yymsp[-1].minor.yy0.type); + taosVariantCreate(&yylhsminor.yy69, yymsp[-1].minor.yy0.z, yymsp[-1].minor.yy0.n, yymsp[-1].minor.yy0.type); } - yymsp[-1].minor.yy43 = yylhsminor.yy43; + yymsp[-1].minor.yy69 = yylhsminor.yy69; break; - case 205: /* sortorder ::= ASC */ -{ yymsp[0].minor.yy44 = TSDB_ORDER_ASC; } + case 208: /* sortorder ::= ASC */ +{ yymsp[0].minor.yy96 = TSDB_ORDER_ASC; } break; - case 206: /* sortorder ::= DESC */ -{ yymsp[0].minor.yy44 = TSDB_ORDER_DESC;} + case 209: /* sortorder ::= DESC */ +{ yymsp[0].minor.yy96 = TSDB_ORDER_DESC;} break; - case 207: /* sortorder ::= */ -{ yymsp[1].minor.yy44 = TSDB_ORDER_ASC; } + case 210: /* sortorder ::= */ +{ yymsp[1].minor.yy96 = TSDB_ORDER_ASC; } break; - case 208: /* groupby_opt ::= */ -{ yymsp[1].minor.yy131 = 0;} + case 211: /* groupby_opt ::= */ +{ yymsp[1].minor.yy421 = 0;} break; - case 209: /* groupby_opt ::= GROUP BY grouplist */ -{ yymsp[-2].minor.yy131 = yymsp[0].minor.yy131;} + case 212: /* groupby_opt ::= GROUP BY grouplist */ +{ yymsp[-2].minor.yy421 = yymsp[0].minor.yy421;} break; - case 210: /* grouplist ::= grouplist COMMA item */ + case 213: /* grouplist ::= grouplist COMMA item */ { - yylhsminor.yy131 = tListItemAppend(yymsp[-2].minor.yy131, &yymsp[0].minor.yy43, -1); + yylhsminor.yy421 = tListItemAppend(yymsp[-2].minor.yy421, &yymsp[0].minor.yy69, -1); } - yymsp[-2].minor.yy131 = yylhsminor.yy131; + yymsp[-2].minor.yy421 = yylhsminor.yy421; break; - case 211: /* grouplist ::= item */ + case 214: /* grouplist ::= item */ { - yylhsminor.yy131 = tListItemAppend(NULL, &yymsp[0].minor.yy43, -1); + yylhsminor.yy421 = tListItemAppend(NULL, &yymsp[0].minor.yy69, -1); } - yymsp[0].minor.yy131 = yylhsminor.yy131; + yymsp[0].minor.yy421 = yylhsminor.yy421; break; - case 212: /* having_opt ::= */ - case 222: /* where_opt ::= */ yytestcase(yyruleno==222); - case 266: /* expritem ::= */ yytestcase(yyruleno==266); -{yymsp[1].minor.yy46 = 0;} + case 215: /* having_opt ::= */ + case 225: /* where_opt ::= */ yytestcase(yyruleno==225); + case 269: /* expritem ::= */ yytestcase(yyruleno==269); +{yymsp[1].minor.yy439 = 0;} break; - case 213: /* having_opt ::= HAVING expr */ - case 223: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==223); -{yymsp[-1].minor.yy46 = yymsp[0].minor.yy46;} + case 216: /* having_opt ::= HAVING expr */ + case 226: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==226); +{yymsp[-1].minor.yy439 = yymsp[0].minor.yy439;} break; - case 214: /* limit_opt ::= */ - case 218: /* slimit_opt ::= */ yytestcase(yyruleno==218); -{yymsp[1].minor.yy55.limit = -1; yymsp[1].minor.yy55.offset = 0;} + case 217: /* limit_opt ::= */ + case 221: /* slimit_opt ::= */ yytestcase(yyruleno==221); +{yymsp[1].minor.yy231.limit = -1; yymsp[1].minor.yy231.offset = 0;} break; - case 215: /* limit_opt ::= LIMIT signed */ - case 219: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==219); -{yymsp[-1].minor.yy55.limit = yymsp[0].minor.yy459; yymsp[-1].minor.yy55.offset = 0;} + case 218: /* limit_opt ::= LIMIT signed */ + case 222: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==222); +{yymsp[-1].minor.yy231.limit = yymsp[0].minor.yy325; yymsp[-1].minor.yy231.offset = 0;} break; - case 216: /* limit_opt ::= LIMIT signed OFFSET signed */ -{ yymsp[-3].minor.yy55.limit = yymsp[-2].minor.yy459; yymsp[-3].minor.yy55.offset = yymsp[0].minor.yy459;} + case 219: /* limit_opt ::= LIMIT signed OFFSET signed */ +{ yymsp[-3].minor.yy231.limit = yymsp[-2].minor.yy325; yymsp[-3].minor.yy231.offset = yymsp[0].minor.yy325;} break; - case 217: /* limit_opt ::= LIMIT signed COMMA signed */ -{ yymsp[-3].minor.yy55.limit = yymsp[0].minor.yy459; yymsp[-3].minor.yy55.offset = yymsp[-2].minor.yy459;} + case 220: /* limit_opt ::= LIMIT signed COMMA signed */ +{ yymsp[-3].minor.yy231.limit = yymsp[0].minor.yy325; yymsp[-3].minor.yy231.offset = yymsp[-2].minor.yy325;} break; - case 220: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ -{yymsp[-3].minor.yy55.limit = yymsp[-2].minor.yy459; yymsp[-3].minor.yy55.offset = yymsp[0].minor.yy459;} + case 223: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ +{yymsp[-3].minor.yy231.limit = yymsp[-2].minor.yy325; yymsp[-3].minor.yy231.offset = yymsp[0].minor.yy325;} break; - case 221: /* slimit_opt ::= SLIMIT signed COMMA signed */ -{yymsp[-3].minor.yy55.limit = yymsp[0].minor.yy459; yymsp[-3].minor.yy55.offset = yymsp[-2].minor.yy459;} + case 224: /* slimit_opt ::= SLIMIT signed COMMA signed */ +{yymsp[-3].minor.yy231.limit = yymsp[0].minor.yy325; yymsp[-3].minor.yy231.offset = yymsp[-2].minor.yy325;} break; - case 224: /* expr ::= LP expr RP */ -{yylhsminor.yy46 = yymsp[-1].minor.yy46; yylhsminor.yy46->exprToken.z = yymsp[-2].minor.yy0.z; yylhsminor.yy46->exprToken.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);} - yymsp[-2].minor.yy46 = yylhsminor.yy46; + case 227: /* expr ::= LP expr RP */ +{yylhsminor.yy439 = yymsp[-1].minor.yy439; yylhsminor.yy439->exprToken.z = yymsp[-2].minor.yy0.z; yylhsminor.yy439->exprToken.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);} + yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 225: /* expr ::= ID */ -{ yylhsminor.yy46 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_ID);} - yymsp[0].minor.yy46 = yylhsminor.yy46; + case 228: /* expr ::= ID */ +{ yylhsminor.yy439 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_ID);} + yymsp[0].minor.yy439 = yylhsminor.yy439; break; - case 226: /* expr ::= ID DOT ID */ -{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy46 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ID);} - yymsp[-2].minor.yy46 = yylhsminor.yy46; + case 229: /* expr ::= ID DOT ID */ +{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy439 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ID);} + yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 227: /* expr ::= ID DOT STAR */ -{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy46 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ALL);} - yymsp[-2].minor.yy46 = yylhsminor.yy46; + case 230: /* expr ::= ID DOT STAR */ +{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy439 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ALL);} + yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 228: /* expr ::= INTEGER */ -{ yylhsminor.yy46 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_INTEGER);} - yymsp[0].minor.yy46 = yylhsminor.yy46; + case 231: /* expr ::= INTEGER */ +{ yylhsminor.yy439 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_INTEGER);} + yymsp[0].minor.yy439 = yylhsminor.yy439; break; - case 229: /* expr ::= MINUS INTEGER */ - case 230: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==230); -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy46 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_INTEGER);} - yymsp[-1].minor.yy46 = yylhsminor.yy46; + case 232: /* expr ::= MINUS INTEGER */ + case 233: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==233); +{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy439 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_INTEGER);} + yymsp[-1].minor.yy439 = yylhsminor.yy439; break; - case 231: /* expr ::= FLOAT */ -{ yylhsminor.yy46 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_FLOAT);} - yymsp[0].minor.yy46 = yylhsminor.yy46; + case 234: /* expr ::= FLOAT */ +{ yylhsminor.yy439 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_FLOAT);} + yymsp[0].minor.yy439 = yylhsminor.yy439; break; - case 232: /* expr ::= MINUS FLOAT */ - case 233: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==233); -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy46 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_FLOAT);} - yymsp[-1].minor.yy46 = yylhsminor.yy46; + case 235: /* expr ::= MINUS FLOAT */ + case 236: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==236); +{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy439 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_FLOAT);} + yymsp[-1].minor.yy439 = yylhsminor.yy439; break; - case 234: /* expr ::= STRING */ -{ yylhsminor.yy46 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_STRING);} - yymsp[0].minor.yy46 = yylhsminor.yy46; + case 237: /* expr ::= STRING */ +{ yylhsminor.yy439 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_STRING);} + yymsp[0].minor.yy439 = yylhsminor.yy439; break; - case 235: /* expr ::= NOW */ -{ yylhsminor.yy46 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NOW); } - yymsp[0].minor.yy46 = yylhsminor.yy46; + case 238: /* expr ::= NOW */ +{ yylhsminor.yy439 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NOW); } + yymsp[0].minor.yy439 = yylhsminor.yy439; break; - case 236: /* expr ::= VARIABLE */ -{ yylhsminor.yy46 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_VARIABLE);} - yymsp[0].minor.yy46 = yylhsminor.yy46; + case 239: /* expr ::= VARIABLE */ +{ yylhsminor.yy439 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_VARIABLE);} + yymsp[0].minor.yy439 = yylhsminor.yy439; break; - case 237: /* expr ::= PLUS VARIABLE */ - case 238: /* expr ::= MINUS VARIABLE */ yytestcase(yyruleno==238); -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_VARIABLE; yylhsminor.yy46 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_VARIABLE);} - yymsp[-1].minor.yy46 = yylhsminor.yy46; + case 240: /* expr ::= PLUS VARIABLE */ + case 241: /* expr ::= MINUS VARIABLE */ yytestcase(yyruleno==241); +{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_VARIABLE; yylhsminor.yy439 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_VARIABLE);} + yymsp[-1].minor.yy439 = yylhsminor.yy439; break; - case 239: /* expr ::= BOOL */ -{ yylhsminor.yy46 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_BOOL);} - yymsp[0].minor.yy46 = yylhsminor.yy46; + case 242: /* expr ::= BOOL */ +{ yylhsminor.yy439 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_BOOL);} + yymsp[0].minor.yy439 = yylhsminor.yy439; break; - case 240: /* expr ::= NULL */ -{ yylhsminor.yy46 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NULL);} - yymsp[0].minor.yy46 = yylhsminor.yy46; + case 243: /* expr ::= NULL */ +{ yylhsminor.yy439 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NULL);} + yymsp[0].minor.yy439 = yylhsminor.yy439; break; - case 241: /* expr ::= ID LP exprlist RP */ -{ tRecordFuncName(pInfo->funcs, &yymsp[-3].minor.yy0); yylhsminor.yy46 = tSqlExprCreateFunction(yymsp[-1].minor.yy131, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } - yymsp[-3].minor.yy46 = yylhsminor.yy46; + case 244: /* expr ::= ID LP exprlist RP */ +{ tRecordFuncName(pInfo->funcs, &yymsp[-3].minor.yy0); yylhsminor.yy439 = tSqlExprCreateFunction(yymsp[-1].minor.yy421, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } + yymsp[-3].minor.yy439 = yylhsminor.yy439; break; - case 242: /* expr ::= ID LP STAR RP */ -{ tRecordFuncName(pInfo->funcs, &yymsp[-3].minor.yy0); yylhsminor.yy46 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } - yymsp[-3].minor.yy46 = yylhsminor.yy46; + case 245: /* expr ::= ID LP STAR RP */ +{ tRecordFuncName(pInfo->funcs, &yymsp[-3].minor.yy0); yylhsminor.yy439 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } + yymsp[-3].minor.yy439 = yylhsminor.yy439; break; - case 243: /* expr ::= expr IS NULL */ -{yylhsminor.yy46 = tSqlExprCreate(yymsp[-2].minor.yy46, NULL, TK_ISNULL);} - yymsp[-2].minor.yy46 = yylhsminor.yy46; + case 246: /* expr ::= expr IS NULL */ +{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, NULL, TK_ISNULL);} + yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 244: /* expr ::= expr IS NOT NULL */ -{yylhsminor.yy46 = tSqlExprCreate(yymsp[-3].minor.yy46, NULL, TK_NOTNULL);} - yymsp[-3].minor.yy46 = yylhsminor.yy46; + case 247: /* expr ::= expr IS NOT NULL */ +{yylhsminor.yy439 = tSqlExprCreate(yymsp[-3].minor.yy439, NULL, TK_NOTNULL);} + yymsp[-3].minor.yy439 = yylhsminor.yy439; break; - case 245: /* expr ::= expr LT expr */ -{yylhsminor.yy46 = tSqlExprCreate(yymsp[-2].minor.yy46, yymsp[0].minor.yy46, TK_LT);} - yymsp[-2].minor.yy46 = yylhsminor.yy46; + case 248: /* expr ::= expr LT expr */ +{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_LT);} + yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 246: /* expr ::= expr GT expr */ -{yylhsminor.yy46 = tSqlExprCreate(yymsp[-2].minor.yy46, yymsp[0].minor.yy46, TK_GT);} - yymsp[-2].minor.yy46 = yylhsminor.yy46; + case 249: /* expr ::= expr GT expr */ +{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_GT);} + yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 247: /* expr ::= expr LE expr */ -{yylhsminor.yy46 = tSqlExprCreate(yymsp[-2].minor.yy46, yymsp[0].minor.yy46, TK_LE);} - yymsp[-2].minor.yy46 = yylhsminor.yy46; + case 250: /* expr ::= expr LE expr */ +{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_LE);} + yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 248: /* expr ::= expr GE expr */ -{yylhsminor.yy46 = tSqlExprCreate(yymsp[-2].minor.yy46, yymsp[0].minor.yy46, TK_GE);} - yymsp[-2].minor.yy46 = yylhsminor.yy46; + case 251: /* expr ::= expr GE expr */ +{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_GE);} + yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 249: /* expr ::= expr NE expr */ -{yylhsminor.yy46 = tSqlExprCreate(yymsp[-2].minor.yy46, yymsp[0].minor.yy46, TK_NE);} - yymsp[-2].minor.yy46 = yylhsminor.yy46; + case 252: /* expr ::= expr NE expr */ +{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_NE);} + yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 250: /* expr ::= expr EQ expr */ -{yylhsminor.yy46 = tSqlExprCreate(yymsp[-2].minor.yy46, yymsp[0].minor.yy46, TK_EQ);} - yymsp[-2].minor.yy46 = yylhsminor.yy46; + case 253: /* expr ::= expr EQ expr */ +{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_EQ);} + yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 251: /* expr ::= expr BETWEEN expr AND expr */ -{ tSqlExpr* X2 = tSqlExprClone(yymsp[-4].minor.yy46); yylhsminor.yy46 = tSqlExprCreate(tSqlExprCreate(yymsp[-4].minor.yy46, yymsp[-2].minor.yy46, TK_GE), tSqlExprCreate(X2, yymsp[0].minor.yy46, TK_LE), TK_AND);} - yymsp[-4].minor.yy46 = yylhsminor.yy46; + case 254: /* expr ::= expr BETWEEN expr AND expr */ +{ tSqlExpr* X2 = tSqlExprClone(yymsp[-4].minor.yy439); yylhsminor.yy439 = tSqlExprCreate(tSqlExprCreate(yymsp[-4].minor.yy439, yymsp[-2].minor.yy439, TK_GE), tSqlExprCreate(X2, yymsp[0].minor.yy439, TK_LE), TK_AND);} + yymsp[-4].minor.yy439 = yylhsminor.yy439; break; - case 252: /* expr ::= expr AND expr */ -{yylhsminor.yy46 = tSqlExprCreate(yymsp[-2].minor.yy46, yymsp[0].minor.yy46, TK_AND);} - yymsp[-2].minor.yy46 = yylhsminor.yy46; + case 255: /* expr ::= expr AND expr */ +{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_AND);} + yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 253: /* expr ::= expr OR expr */ -{yylhsminor.yy46 = tSqlExprCreate(yymsp[-2].minor.yy46, yymsp[0].minor.yy46, TK_OR); } - yymsp[-2].minor.yy46 = yylhsminor.yy46; + case 256: /* expr ::= expr OR expr */ +{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_OR); } + yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 254: /* expr ::= expr PLUS expr */ -{yylhsminor.yy46 = tSqlExprCreate(yymsp[-2].minor.yy46, yymsp[0].minor.yy46, TK_PLUS); } - yymsp[-2].minor.yy46 = yylhsminor.yy46; + case 257: /* expr ::= expr PLUS expr */ +{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_PLUS); } + yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 255: /* expr ::= expr MINUS expr */ -{yylhsminor.yy46 = tSqlExprCreate(yymsp[-2].minor.yy46, yymsp[0].minor.yy46, TK_MINUS); } - yymsp[-2].minor.yy46 = yylhsminor.yy46; + case 258: /* expr ::= expr MINUS expr */ +{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_MINUS); } + yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 256: /* expr ::= expr STAR expr */ -{yylhsminor.yy46 = tSqlExprCreate(yymsp[-2].minor.yy46, yymsp[0].minor.yy46, TK_STAR); } - yymsp[-2].minor.yy46 = yylhsminor.yy46; + case 259: /* expr ::= expr STAR expr */ +{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_STAR); } + yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 257: /* expr ::= expr SLASH expr */ -{yylhsminor.yy46 = tSqlExprCreate(yymsp[-2].minor.yy46, yymsp[0].minor.yy46, TK_DIVIDE);} - yymsp[-2].minor.yy46 = yylhsminor.yy46; + case 260: /* expr ::= expr SLASH expr */ +{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_DIVIDE);} + yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 258: /* expr ::= expr REM expr */ -{yylhsminor.yy46 = tSqlExprCreate(yymsp[-2].minor.yy46, yymsp[0].minor.yy46, TK_REM); } - yymsp[-2].minor.yy46 = yylhsminor.yy46; + case 261: /* expr ::= expr REM expr */ +{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_REM); } + yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 259: /* expr ::= expr LIKE expr */ -{yylhsminor.yy46 = tSqlExprCreate(yymsp[-2].minor.yy46, yymsp[0].minor.yy46, TK_LIKE); } - yymsp[-2].minor.yy46 = yylhsminor.yy46; + case 262: /* expr ::= expr LIKE expr */ +{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_LIKE); } + yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 260: /* expr ::= expr MATCH expr */ -{yylhsminor.yy46 = tSqlExprCreate(yymsp[-2].minor.yy46, yymsp[0].minor.yy46, TK_MATCH); } - yymsp[-2].minor.yy46 = yylhsminor.yy46; + case 263: /* expr ::= expr MATCH expr */ +{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_MATCH); } + yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 261: /* expr ::= expr NMATCH expr */ -{yylhsminor.yy46 = tSqlExprCreate(yymsp[-2].minor.yy46, yymsp[0].minor.yy46, TK_NMATCH); } - yymsp[-2].minor.yy46 = yylhsminor.yy46; + case 264: /* expr ::= expr NMATCH expr */ +{yylhsminor.yy439 = tSqlExprCreate(yymsp[-2].minor.yy439, yymsp[0].minor.yy439, TK_NMATCH); } + yymsp[-2].minor.yy439 = yylhsminor.yy439; break; - case 262: /* expr ::= expr IN LP exprlist RP */ -{yylhsminor.yy46 = tSqlExprCreate(yymsp[-4].minor.yy46, (tSqlExpr*)yymsp[-1].minor.yy131, TK_IN); } - yymsp[-4].minor.yy46 = yylhsminor.yy46; + case 265: /* expr ::= expr IN LP exprlist RP */ +{yylhsminor.yy439 = tSqlExprCreate(yymsp[-4].minor.yy439, (tSqlExpr*)yymsp[-1].minor.yy421, TK_IN); } + yymsp[-4].minor.yy439 = yylhsminor.yy439; break; - case 263: /* exprlist ::= exprlist COMMA expritem */ -{yylhsminor.yy131 = tSqlExprListAppend(yymsp[-2].minor.yy131,yymsp[0].minor.yy46,0, 0);} - yymsp[-2].minor.yy131 = yylhsminor.yy131; + case 266: /* exprlist ::= exprlist COMMA expritem */ +{yylhsminor.yy421 = tSqlExprListAppend(yymsp[-2].minor.yy421,yymsp[0].minor.yy439,0, 0);} + yymsp[-2].minor.yy421 = yylhsminor.yy421; break; - case 264: /* exprlist ::= expritem */ -{yylhsminor.yy131 = tSqlExprListAppend(0,yymsp[0].minor.yy46,0, 0);} - yymsp[0].minor.yy131 = yylhsminor.yy131; + case 267: /* exprlist ::= expritem */ +{yylhsminor.yy421 = tSqlExprListAppend(0,yymsp[0].minor.yy439,0, 0);} + yymsp[0].minor.yy421 = yylhsminor.yy421; break; - case 265: /* expritem ::= expr */ -{yylhsminor.yy46 = yymsp[0].minor.yy46;} - yymsp[0].minor.yy46 = yylhsminor.yy46; + case 268: /* expritem ::= expr */ +{yylhsminor.yy439 = yymsp[0].minor.yy439;} + yymsp[0].minor.yy439 = yylhsminor.yy439; break; - case 267: /* cmd ::= RESET QUERY CACHE */ + case 270: /* cmd ::= RESET QUERY CACHE */ { setDCLSqlElems(pInfo, TSDB_SQL_RESET_CACHE, 0);} break; - case 268: /* cmd ::= SYNCDB ids REPLICA */ + case 271: /* cmd ::= SYNCDB ids REPLICA */ { setDCLSqlElems(pInfo, TSDB_SQL_SYNC_DB_REPLICA, 1, &yymsp[-1].minor.yy0);} break; - case 269: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ + case 272: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy131, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, -1); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 270: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ + case 273: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; toTSDBType(yymsp[0].minor.yy0.type); @@ -3140,21 +3167,21 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 271: /* cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */ + case 274: /* cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy131, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, -1); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 272: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ + case 275: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy131, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, -1); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 273: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ + case 276: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -3165,7 +3192,7 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 274: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ + case 277: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ { yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n; @@ -3179,33 +3206,33 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 275: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ + case 278: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ { yymsp[-6].minor.yy0.n += yymsp[-5].minor.yy0.n; toTSDBType(yymsp[-2].minor.yy0.type); SArray* A = tListItemAppendToken(NULL, &yymsp[-2].minor.yy0, -1); - A = tListItemAppend(A, &yymsp[0].minor.yy43, -1); + A = tListItemAppend(A, &yymsp[0].minor.yy69, -1); SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-6].minor.yy0, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 276: /* cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */ + case 279: /* cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy131, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, -1); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 277: /* cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ + case 280: /* cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy131, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, TSDB_SUPER_TABLE); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 278: /* cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ + case 281: /* cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -3216,21 +3243,21 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 279: /* cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */ + case 282: /* cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy131, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, TSDB_SUPER_TABLE); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 280: /* cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ + case 283: /* cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy131, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, TSDB_SUPER_TABLE); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 281: /* cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ + case 284: /* cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -3241,7 +3268,7 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 282: /* cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ + case 285: /* cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ { yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n; @@ -3255,32 +3282,32 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 283: /* cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */ + case 286: /* cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */ { yymsp[-6].minor.yy0.n += yymsp[-5].minor.yy0.n; toTSDBType(yymsp[-2].minor.yy0.type); SArray* A = tListItemAppendToken(NULL, &yymsp[-2].minor.yy0, -1); - A = tListItemAppend(A, &yymsp[0].minor.yy43, -1); + A = tListItemAppend(A, &yymsp[0].minor.yy69, -1); SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-6].minor.yy0, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 284: /* cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */ + case 287: /* cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy131, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, TSDB_SUPER_TABLE); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy421, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 285: /* cmd ::= KILL CONNECTION INTEGER */ + case 288: /* cmd ::= KILL CONNECTION INTEGER */ {setKillSql(pInfo, TSDB_SQL_KILL_CONNECTION, &yymsp[0].minor.yy0);} break; - case 286: /* cmd ::= KILL STREAM INTEGER COLON INTEGER */ + case 289: /* cmd ::= KILL STREAM INTEGER COLON INTEGER */ {yymsp[-2].minor.yy0.n += (yymsp[-1].minor.yy0.n + yymsp[0].minor.yy0.n); setKillSql(pInfo, TSDB_SQL_KILL_STREAM, &yymsp[-2].minor.yy0);} break; - case 287: /* cmd ::= KILL QUERY INTEGER COLON INTEGER */ + case 290: /* cmd ::= KILL QUERY INTEGER COLON INTEGER */ {yymsp[-2].minor.yy0.n += (yymsp[-1].minor.yy0.n + yymsp[0].minor.yy0.n); setKillSql(pInfo, TSDB_SQL_KILL_QUERY, &yymsp[-2].minor.yy0);} break; default: diff --git a/source/libs/parser/src/ttokenizer.c b/source/libs/parser/src/ttokenizer.c index 4e6b77a3d653088f091b8711b6e5843b59fe7ce7..6f2b52498dd321216111aa82c9d858c79f68cfa6 100644 --- a/source/libs/parser/src/ttokenizer.c +++ b/source/libs/parser/src/ttokenizer.c @@ -70,7 +70,7 @@ static SKeyword keywordTable[] = { {"STAR", TK_STAR}, {"SLASH", TK_SLASH}, {"REM ", TK_REM}, - {"||", TK_CONCAT}, + {"||", TK_CONCAT}, {"UMINUS", TK_UMINUS}, {"UPLUS", TK_UPLUS}, {"BITNOT", TK_BITNOT}, @@ -227,6 +227,7 @@ static SKeyword keywordTable[] = { {"OUTPUTTYPE", TK_OUTPUTTYPE}, {"AGGREGATE", TK_AGGREGATE}, {"BUFSIZE", TK_BUFSIZE}, + {"PORT", TK_PORT}, }; static const char isIdChar[] = { diff --git a/source/libs/qcom/src/queryUtil.c b/source/libs/qcom/src/queryUtil.c index 12fb6e3385cbd135448a492e44fc3840abbb70fb..90a4388485337eb46329cf17cf1eb705f05f5953 100644 --- a/source/libs/qcom/src/queryUtil.c +++ b/source/libs/qcom/src/queryUtil.c @@ -3,6 +3,7 @@ #include "query.h" #include "tglobal.h" #include "tsched.h" +#include "trpc.h" #define VALIDNUMOFCOLS(x) ((x) >= TSDB_MIN_COLUMNS && (x) <= TSDB_MAX_COLUMNS) #define VALIDNUMOFTAGS(x) ((x) >= 0 && (x) <= TSDB_MAX_TAGS) @@ -121,3 +122,27 @@ int32_t taosAsyncExec(__async_exec_fn_t execFn, void* execParam, int32_t* code) taosScheduleTask(pTaskQueue, &schedMsg); } + +int32_t asyncSendMsgToServer(void *pTransporter, SEpSet* epSet, int64_t* pTransporterId, const SMsgSendInfo* pInfo) { + char *pMsg = rpcMallocCont(pInfo->msgInfo.len); + if (NULL == pMsg) { + qError("0x%"PRIx64" msg:%s malloc failed", pInfo->requestId, TMSG_INFO(pInfo->msgType)); + terrno = TSDB_CODE_TSC_OUT_OF_MEMORY; + return -1; + } + + memcpy(pMsg, pInfo->msgInfo.pData, pInfo->msgInfo.len); + SRpcMsg rpcMsg = { + .msgType = pInfo->msgType, + .pCont = pMsg, + .contLen = pInfo->msgInfo.len, + .ahandle = (void*) pInfo, + .handle = NULL, + .code = 0 + }; + + assert(pInfo->fp != NULL); + + rpcSendRequest(pTransporter, epSet, &rpcMsg, pTransporterId); + return TSDB_CODE_SUCCESS; +} \ No newline at end of file diff --git a/src/query/inc/sql.y b/src/query/inc/sql.y index 50806fdfd6e9198b318e3a8a4aa3fcd928b527c1..d37aaf5a6d579166978baeb2b4bb7413dcd64edb 100644 --- a/src/query/inc/sql.y +++ b/src/query/inc/sql.y @@ -438,6 +438,12 @@ column(A) ::= ids(X) typename(Y). { tSetColumnInfo(&A, &X, &Y); } +%type tagitemlist1 {SArray*} +%destructor tagitemlist1 {taosArrayDestroy($$);} + +%type tagitem1 {SToken} + + %type tagitemlist {SArray*} %destructor tagitemlist {taosArrayDestroy($$);}