From 151fd310722cdc4683d94efe357600a6196c199c Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Sat, 22 May 2021 23:04:43 +0800 Subject: [PATCH] support compact vnode --- src/client/src/tscSQLParser.c | 19 +- src/client/src/tscServer.c | 86 + src/common/inc/tcmdtype.h | 2 + src/dnode/src/dnodePeer.c | 3 +- src/dnode/src/dnodeVMgmt.c | 13 +- src/inc/taosmsg.h | 12 +- src/inc/ttokendef.h | 373 ++-- src/mnode/inc/mnodeVgroup.h | 1 + src/mnode/src/mnodeDb.c | 48 +- src/mnode/src/mnodeSdb.c | 2 +- src/mnode/src/mnodeVgroup.c | 31 +- src/query/inc/qSqlparser.h | 2 + src/query/inc/sql.y | 4 + src/query/src/qSqlParser.c | 4 + src/query/src/sql.c | 3597 ++++++++++++++------------------- src/util/src/ttokenizer.c | 3 +- 16 files changed, 1974 insertions(+), 2226 deletions(-) diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c index acfc1b0cf5..3bc7377267 100644 --- a/src/client/src/tscSQLParser.c +++ b/src/client/src/tscSQLParser.c @@ -106,6 +106,7 @@ static int32_t validateDNodeConfig(SMiscInfo* pOptions); static int32_t validateLocalConfig(SMiscInfo* pOptions); static int32_t validateColumnName(char* name); static int32_t setKillInfo(SSqlObj* pSql, struct SSqlInfo* pInfo, int32_t killType); +static int32_t setCompactVnodeInfo(SSqlObj* pSql, struct SSqlInfo* pInfo); static bool validateOneTags(SSqlCmd* pCmd, TAOS_FIELD* pTagField); static bool hasTimestampForPointInterpQuery(SQueryInfo* pQueryInfo); @@ -377,7 +378,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) { break; } - + case TSDB_SQL_CREATE_DNODE: { const char* msg = "invalid host name (ip address)"; @@ -686,7 +687,13 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) { } break; } - + case TSDB_SQL_COMPACT_VNODE:{ + const char* msg = "invalid compact"; + if (setCompactVnodeInfo(pSql, pInfo) != TSDB_CODE_SUCCESS) { + return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg); + } + break; + } default: return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), "not support sql expression"); } @@ -2789,7 +2796,13 @@ int32_t setKillInfo(SSqlObj* pSql, struct SSqlInfo* pInfo, int32_t killType) { return TSDB_CODE_SUCCESS; } - +static int32_t setCompactVnodeInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) { + SSqlCmd* pCmd = &pSql->cmd; + //STableMetaInfo* pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0); + pCmd->command = pInfo->type; + + return TSDB_CODE_SUCCESS; +} bool validateIpAddress(const char* ip, size_t size) { char tmp[128] = {0}; // buffer to build null-terminated string assert(size < 128); diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c index 9b7d5c0c7f..180dae0afb 100644 --- a/src/client/src/tscServer.c +++ b/src/client/src/tscServer.c @@ -47,6 +47,31 @@ static int32_t getWaitingTimeInterval(int32_t count) { return initial * ((2u)<<(count - 2)); } +static int32_t vgIdCompare(const void *lhs, const void *rhs) { + int32_t left = *(int32_t *)lhs; + int32_t right = *(int32_t *)rhs; + + if (left == right) { + return 0; + } else { + return left > right ? 1 : -1; + } +} +static int32_t removeDupVgid(int32_t *src, int32_t sz) { + if (src == NULL || sz <= 0) { + return 0; + } + qsort(src, sz, sizeof(src[0]), vgIdCompare); + + int32_t ret = 1; + for (int i = 1; i < sz; i++) { + if (src[i] != src[i - 1]) { + src[ret++] = src[i]; + } + } + return ret; +} + static void tscSetDnodeEpSet(SRpcEpSet* pEpSet, SVgroupInfo* pVgroupInfo) { assert(pEpSet != NULL && pVgroupInfo != NULL && pVgroupInfo->numOfEps > 0); @@ -1532,6 +1557,61 @@ int tscAlterDbMsg(SSqlObj *pSql, SSqlInfo *pInfo) { return TSDB_CODE_SUCCESS; } +int tscBuildCompactMsg(SSqlObj *pSql, SSqlInfo *pInfo) { + if (pInfo->list == NULL || taosArrayGetSize(pInfo->list) <= 0) { + return TSDB_CODE_TSC_INVALID_SQL; + } + //const char *msg = "invalid compact param"; + STscObj *pObj = pSql->pTscObj; + SSqlCmd *pCmd = &pSql->cmd; + SArray *pList = pInfo->list; + int32_t size = taosArrayGetSize(pList); + + int32_t *result = malloc(sizeof(int32_t) * size); + if (result == NULL) { + return TSDB_CODE_TSC_OUT_OF_MEMORY; + } + + for (int32_t i = 0; i < size; i++) { + tSqlExprItem* pSub = taosArrayGet(pList, i); + tVariant* pVar = &pSub->pNode->value; + if (pVar->nType >= TSDB_DATA_TYPE_TINYINT && pVar->nType <= TSDB_DATA_TYPE_INT) { + result[i] = (int32_t)(pVar->i64); + } else { + free(result); + return TSDB_CODE_TSC_INVALID_SQL; + } + } + + int count = removeDupVgid(result, size); + pCmd->payloadLen = sizeof(SCompactMsg) + count * sizeof(int32_t); + pCmd->msgType = TSDB_MSG_TYPE_CM_COMPACT_VNODE; + + if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, pCmd->payloadLen)) { + tscError("0x%"PRIx64" failed to malloc for query msg", pSql->self); + free(result); + return TSDB_CODE_TSC_OUT_OF_MEMORY; + } + SCompactMsg *pCompactMsg = (SCompactMsg *)pCmd->payload; + + STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0); + + if (tNameIsEmpty(&pTableMetaInfo->name)) { + pthread_mutex_lock(&pObj->mutex); + tstrncpy(pCompactMsg->db, pObj->db, sizeof(pCompactMsg->db)); + pthread_mutex_unlock(&pObj->mutex); + } else { + tNameGetFullDbName(&pTableMetaInfo->name, pCompactMsg->db); + } + + pCompactMsg->numOfVgroup = htons(count); + for (int32_t i = 0; i < count; i++) { + pCompactMsg->vgid[i] = htons(result[i]); + } + free(result); + + return TSDB_CODE_SUCCESS; +} int tscBuildRetrieveFromMgmtMsg(SSqlObj *pSql, SSqlInfo *pInfo) { SSqlCmd *pCmd = &pSql->cmd; @@ -2302,6 +2382,10 @@ int tscProcessAlterDbMsgRsp(SSqlObj *pSql) { UNUSED(pSql); return 0; } +int tscProcessCompactRsp(SSqlObj *pSql) { + UNUSED(pSql); + return TSDB_CODE_SUCCESS; +} int tscProcessShowCreateRsp(SSqlObj *pSql) { return tscLocalResultCommonBuilder(pSql, 1); @@ -2614,6 +2698,7 @@ void tscInitMsgsFp() { tscBuildMsg[TSDB_SQL_ALTER_TABLE] = tscBuildAlterTableMsg; tscBuildMsg[TSDB_SQL_UPDATE_TAGS_VAL] = tscBuildUpdateTagMsg; tscBuildMsg[TSDB_SQL_ALTER_DB] = tscAlterDbMsg; + tscBuildMsg[TSDB_SQL_COMPACT_VNODE] = tscBuildCompactMsg; tscBuildMsg[TSDB_SQL_CONNECT] = tscBuildConnectMsg; tscBuildMsg[TSDB_SQL_USE_DB] = tscBuildUseDbMsg; @@ -2655,6 +2740,7 @@ void tscInitMsgsFp() { tscProcessMsgRsp[TSDB_SQL_ALTER_TABLE] = tscProcessAlterTableMsgRsp; tscProcessMsgRsp[TSDB_SQL_ALTER_DB] = tscProcessAlterDbMsgRsp; + tscProcessMsgRsp[TSDB_SQL_COMPACT_VNODE] = tscProcessCompactRsp; tscProcessMsgRsp[TSDB_SQL_SHOW_CREATE_TABLE] = tscProcessShowCreateRsp; tscProcessMsgRsp[TSDB_SQL_SHOW_CREATE_STABLE] = tscProcessShowCreateRsp; diff --git a/src/common/inc/tcmdtype.h b/src/common/inc/tcmdtype.h index adf210cfeb..928964857b 100644 --- a/src/common/inc/tcmdtype.h +++ b/src/common/inc/tcmdtype.h @@ -51,6 +51,7 @@ enum { TSDB_DEFINE_SQL_TYPE( TSDB_SQL_ALTER_ACCT, "alter-acct" ) TSDB_DEFINE_SQL_TYPE( TSDB_SQL_ALTER_TABLE, "alter-table" ) TSDB_DEFINE_SQL_TYPE( TSDB_SQL_ALTER_DB, "alter-db" ) + TSDB_DEFINE_SQL_TYPE(TSDB_SQL_SYNC_DB_REPLICA, "sync db-replica") TSDB_DEFINE_SQL_TYPE( TSDB_SQL_CREATE_MNODE, "create-mnode" ) TSDB_DEFINE_SQL_TYPE( TSDB_SQL_DROP_MNODE, "drop-mnode" ) @@ -63,6 +64,7 @@ enum { TSDB_DEFINE_SQL_TYPE( TSDB_SQL_KILL_QUERY, "kill-query" ) TSDB_DEFINE_SQL_TYPE( TSDB_SQL_KILL_STREAM, "kill-stream" ) TSDB_DEFINE_SQL_TYPE( TSDB_SQL_KILL_CONNECTION, "kill-connection" ) + TSDB_DEFINE_SQL_TYPE( TSDB_SQL_COMPACT_VNODE, "compact-vnode" ) // SQL below is for read operation TSDB_DEFINE_SQL_TYPE( TSDB_SQL_READ, "read" ) diff --git a/src/dnode/src/dnodePeer.c b/src/dnode/src/dnodePeer.c index b8ce1c802b..08269c0bf6 100644 --- a/src/dnode/src/dnodePeer.c +++ b/src/dnode/src/dnodePeer.c @@ -47,7 +47,8 @@ int32_t dnodeInitServer() { dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_DROP_VNODE] = dnodeDispatchToVMgmtQueue; dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_ALTER_STREAM] = dnodeDispatchToVMgmtQueue; dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_CONFIG_DNODE] = dnodeDispatchToVMgmtQueue; - dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_CREATE_MNODE] = dnodeDispatchToVMgmtQueue; + dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_CREATE_MNODE] = dnodeDispatchToVMgmtQueue; + dnodeProcessReqMsgFp[TSDB_MSG_TYPE_MD_COMPACT_VNODE] = dnodeDispatchToVMgmtQueue; dnodeProcessReqMsgFp[TSDB_MSG_TYPE_DM_CONFIG_TABLE] = dnodeDispatchToMPeerQueue; dnodeProcessReqMsgFp[TSDB_MSG_TYPE_DM_CONFIG_VNODE] = dnodeDispatchToMPeerQueue; diff --git a/src/dnode/src/dnodeVMgmt.c b/src/dnode/src/dnodeVMgmt.c index 66c94bf675..d270ca7ea9 100644 --- a/src/dnode/src/dnodeVMgmt.c +++ b/src/dnode/src/dnodeVMgmt.c @@ -31,6 +31,7 @@ static void * dnodeProcessMgmtQueue(void *param); static int32_t dnodeProcessCreateVnodeMsg(SRpcMsg *pMsg); static int32_t dnodeProcessAlterVnodeMsg(SRpcMsg *pMsg); static int32_t dnodeProcessSyncVnodeMsg(SRpcMsg *pMsg); +static int32_t dnodeProcessCompactVnodeMsg(SRpcMsg *pMsg); static int32_t dnodeProcessDropVnodeMsg(SRpcMsg *pMsg); static int32_t dnodeProcessAlterStreamMsg(SRpcMsg *pMsg); static int32_t dnodeProcessConfigDnodeMsg(SRpcMsg *pMsg); @@ -40,7 +41,8 @@ static int32_t (*dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MAX])(SRpcMsg *pMsg); int32_t dnodeInitVMgmt() { dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_CREATE_VNODE] = dnodeProcessCreateVnodeMsg; dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_ALTER_VNODE] = dnodeProcessAlterVnodeMsg; - dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_SYNC_VNODE] = dnodeProcessSyncVnodeMsg; + dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_SYNC_VNODE] = dnodeProcessSyncVnodeMsg; + dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_COMPACT_VNODE]= dnodeProcessCompactVnodeMsg; dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_DROP_VNODE] = dnodeProcessDropVnodeMsg; dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_ALTER_STREAM] = dnodeProcessAlterStreamMsg; dnodeProcessMgmtMsgFp[TSDB_MSG_TYPE_MD_CONFIG_DNODE] = dnodeProcessConfigDnodeMsg; @@ -188,6 +190,15 @@ static int32_t dnodeProcessSyncVnodeMsg(SRpcMsg *rpcMsg) { return vnodeSync(pSyncVnode->vgId); } +static int32_t dnodeProcessCompactVnodeMsg(SRpcMsg *rpcMsg) { + SCompactVnodeMsg *pCompactVnode = rpcMsg->pCont; + pCompactVnode->vgId = htonl(pCompactVnode->vgId); + //do nothing + dDebug("trige compact at vgid: %d", pCompactVnode->vgId); + + return TSDB_CODE_SUCCESS; +} + static int32_t dnodeProcessDropVnodeMsg(SRpcMsg *rpcMsg) { SDropVnodeMsg *pDrop = rpcMsg->pCont; pDrop->vgId = htonl(pDrop->vgId); diff --git a/src/inc/taosmsg.h b/src/inc/taosmsg.h index 3b7022fb88..a4cee6d394 100644 --- a/src/inc/taosmsg.h +++ b/src/inc/taosmsg.h @@ -61,9 +61,11 @@ TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_MD_CONFIG_DNODE, "config-dnode" ) TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_MD_ALTER_VNODE, "alter-vnode" ) TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_MD_SYNC_VNODE, "sync-vnode" ) TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_MD_CREATE_MNODE, "create-mnode" ) +TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_MD_COMPACT_VNODE, "compact-vnode" ) TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_DUMMY6, "dummy6" ) TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_DUMMY7, "dummy7" ) + // message from client to mnode TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_CONNECT, "connect" ) TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_CREATE_ACCT, "create-acct" ) @@ -84,6 +86,8 @@ TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_DROP_TABLE, "drop-table" ) TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_ALTER_TABLE, "alter-table" ) TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_TABLE_META, "table-meta" ) TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_STABLE_VGROUP, "stable-vgroup" ) +TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_COMPACT_VNODE, "compact-vnode" ) + TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_TABLES_META, "tables-meta" ) TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_ALTER_STREAM, "alter-stream" ) TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_SHOW, "show" ) @@ -390,7 +394,7 @@ typedef struct { typedef struct { int32_t vgId; -} SDropVnodeMsg, SSyncVnodeMsg; +} SDropVnodeMsg, SSyncVnodeMsg, SCompactVnodeMsg; typedef struct SColIndex { int16_t colId; // column id @@ -775,6 +779,12 @@ typedef struct { char payload[]; } SShowMsg; +typedef struct { + char db[TSDB_ACCT_ID_LEN + TSDB_DB_NAME_LEN]; + int32_t numOfVgroup; + int32_t vgid[]; +} SCompactMsg; + typedef struct SShowRsp { uint64_t qhandle; STableMetaMsg tableMeta; diff --git a/src/inc/ttokendef.h b/src/inc/ttokendef.h index ef3f8ed1fb..4f831fca98 100644 --- a/src/inc/ttokendef.h +++ b/src/inc/ttokendef.h @@ -17,192 +17,193 @@ #define TDENGINE_TTOKENDEF_H -#define TK_ID 1 -#define TK_BOOL 2 -#define TK_TINYINT 3 -#define TK_SMALLINT 4 -#define TK_INTEGER 5 -#define TK_BIGINT 6 -#define TK_FLOAT 7 -#define TK_DOUBLE 8 -#define TK_STRING 9 -#define TK_TIMESTAMP 10 -#define TK_BINARY 11 -#define TK_NCHAR 12 -#define TK_OR 13 -#define TK_AND 14 -#define TK_NOT 15 -#define TK_EQ 16 -#define TK_NE 17 -#define TK_ISNULL 18 -#define TK_NOTNULL 19 -#define TK_IS 20 -#define TK_LIKE 21 -#define TK_GLOB 22 -#define TK_BETWEEN 23 -#define TK_IN 24 -#define TK_GT 25 -#define TK_GE 26 -#define TK_LT 27 -#define TK_LE 28 -#define TK_BITAND 29 -#define TK_BITOR 30 -#define TK_LSHIFT 31 -#define TK_RSHIFT 32 -#define TK_PLUS 33 -#define TK_MINUS 34 -#define TK_DIVIDE 35 -#define TK_TIMES 36 -#define TK_STAR 37 -#define TK_SLASH 38 -#define TK_REM 39 -#define TK_CONCAT 40 -#define TK_UMINUS 41 -#define TK_UPLUS 42 -#define TK_BITNOT 43 -#define TK_SHOW 44 -#define TK_DATABASES 45 -#define TK_TOPICS 46 -#define TK_MNODES 47 -#define TK_DNODES 48 -#define TK_ACCOUNTS 49 -#define TK_USERS 50 -#define TK_MODULES 51 -#define TK_QUERIES 52 -#define TK_CONNECTIONS 53 -#define TK_STREAMS 54 -#define TK_VARIABLES 55 -#define TK_SCORES 56 -#define TK_GRANTS 57 -#define TK_VNODES 58 -#define TK_IPTOKEN 59 -#define TK_DOT 60 -#define TK_CREATE 61 -#define TK_TABLE 62 -#define TK_STABLE 63 -#define TK_DATABASE 64 -#define TK_TABLES 65 -#define TK_STABLES 66 -#define TK_VGROUPS 67 -#define TK_DROP 68 -#define TK_TOPIC 69 -#define TK_DNODE 70 -#define TK_USER 71 -#define TK_ACCOUNT 72 -#define TK_USE 73 -#define TK_DESCRIBE 74 -#define TK_ALTER 75 -#define TK_PASS 76 -#define TK_PRIVILEGE 77 -#define TK_LOCAL 78 -#define TK_IF 79 -#define TK_EXISTS 80 -#define TK_PPS 81 -#define TK_TSERIES 82 -#define TK_DBS 83 -#define TK_STORAGE 84 -#define TK_QTIME 85 -#define TK_CONNS 86 -#define TK_STATE 87 -#define TK_KEEP 88 -#define TK_CACHE 89 -#define TK_REPLICA 90 -#define TK_QUORUM 91 -#define TK_DAYS 92 -#define TK_MINROWS 93 -#define TK_MAXROWS 94 -#define TK_BLOCKS 95 -#define TK_CTIME 96 -#define TK_WAL 97 -#define TK_FSYNC 98 -#define TK_COMP 99 -#define TK_PRECISION 100 -#define TK_UPDATE 101 -#define TK_CACHELAST 102 -#define TK_PARTITIONS 103 -#define TK_LP 104 -#define TK_RP 105 -#define TK_UNSIGNED 106 -#define TK_TAGS 107 -#define TK_USING 108 -#define TK_COMMA 109 -#define TK_AS 110 -#define TK_NULL 111 -#define TK_SELECT 112 -#define TK_UNION 113 -#define TK_ALL 114 -#define TK_DISTINCT 115 -#define TK_FROM 116 -#define TK_VARIABLE 117 -#define TK_INTERVAL 118 -#define TK_SESSION 119 -#define TK_FILL 120 -#define TK_SLIDING 121 -#define TK_ORDER 122 -#define TK_BY 123 -#define TK_ASC 124 -#define TK_DESC 125 -#define TK_GROUP 126 -#define TK_HAVING 127 -#define TK_LIMIT 128 -#define TK_OFFSET 129 -#define TK_SLIMIT 130 -#define TK_SOFFSET 131 -#define TK_WHERE 132 -#define TK_NOW 133 -#define TK_RESET 134 -#define TK_QUERY 135 -#define TK_SYNCDB 136 -#define TK_ADD 137 -#define TK_COLUMN 138 -#define TK_TAG 139 -#define TK_CHANGE 140 -#define TK_SET 141 -#define TK_KILL 142 -#define TK_CONNECTION 143 -#define TK_STREAM 144 -#define TK_COLON 145 -#define TK_ABORT 146 -#define TK_AFTER 147 -#define TK_ATTACH 148 -#define TK_BEFORE 149 -#define TK_BEGIN 150 -#define TK_CASCADE 151 -#define TK_CLUSTER 152 -#define TK_CONFLICT 153 -#define TK_COPY 154 -#define TK_DEFERRED 155 -#define TK_DELIMITERS 156 -#define TK_DETACH 157 -#define TK_EACH 158 -#define TK_END 159 -#define TK_EXPLAIN 160 -#define TK_FAIL 161 -#define TK_FOR 162 -#define TK_IGNORE 163 -#define TK_IMMEDIATE 164 -#define TK_INITIALLY 165 -#define TK_INSTEAD 166 -#define TK_MATCH 167 -#define TK_KEY 168 -#define TK_OF 169 -#define TK_RAISE 170 -#define TK_REPLACE 171 -#define TK_RESTRICT 172 -#define TK_ROW 173 -#define TK_STATEMENT 174 -#define TK_TRIGGER 175 -#define TK_VIEW 176 -#define TK_SEMI 177 -#define TK_NONE 178 -#define TK_PREV 179 -#define TK_LINEAR 180 -#define TK_IMPORT 181 -#define TK_TBNAME 182 -#define TK_JOIN 183 -#define TK_INSERT 184 -#define TK_INTO 185 -#define TK_VALUES 186 +#define TK_ID 1 +#define TK_BOOL 2 +#define TK_TINYINT 3 +#define TK_SMALLINT 4 +#define TK_INTEGER 5 +#define TK_BIGINT 6 +#define TK_FLOAT 7 +#define TK_DOUBLE 8 +#define TK_STRING 9 +#define TK_TIMESTAMP 10 +#define TK_BINARY 11 +#define TK_NCHAR 12 +#define TK_OR 13 +#define TK_AND 14 +#define TK_NOT 15 +#define TK_EQ 16 +#define TK_NE 17 +#define TK_ISNULL 18 +#define TK_NOTNULL 19 +#define TK_IS 20 +#define TK_LIKE 21 +#define TK_GLOB 22 +#define TK_BETWEEN 23 +#define TK_IN 24 +#define TK_GT 25 +#define TK_GE 26 +#define TK_LT 27 +#define TK_LE 28 +#define TK_BITAND 29 +#define TK_BITOR 30 +#define TK_LSHIFT 31 +#define TK_RSHIFT 32 +#define TK_PLUS 33 +#define TK_MINUS 34 +#define TK_DIVIDE 35 +#define TK_TIMES 36 +#define TK_STAR 37 +#define TK_SLASH 38 +#define TK_REM 39 +#define TK_CONCAT 40 +#define TK_UMINUS 41 +#define TK_UPLUS 42 +#define TK_BITNOT 43 +#define TK_SHOW 44 +#define TK_DATABASES 45 +#define TK_TOPICS 46 +#define TK_MNODES 47 +#define TK_DNODES 48 +#define TK_ACCOUNTS 49 +#define TK_USERS 50 +#define TK_MODULES 51 +#define TK_QUERIES 52 +#define TK_CONNECTIONS 53 +#define TK_STREAMS 54 +#define TK_VARIABLES 55 +#define TK_SCORES 56 +#define TK_GRANTS 57 +#define TK_VNODES 58 +#define TK_IPTOKEN 59 +#define TK_DOT 60 +#define TK_CREATE 61 +#define TK_TABLE 62 +#define TK_STABLE 63 +#define TK_DATABASE 64 +#define TK_TABLES 65 +#define TK_STABLES 66 +#define TK_VGROUPS 67 +#define TK_DROP 68 +#define TK_TOPIC 69 +#define TK_DNODE 70 +#define TK_USER 71 +#define TK_ACCOUNT 72 +#define TK_USE 73 +#define TK_DESCRIBE 74 +#define TK_ALTER 75 +#define TK_PASS 76 +#define TK_PRIVILEGE 77 +#define TK_LOCAL 78 +#define TK_COMPACT 79 +#define TK_LP 80 +#define TK_RP 81 +#define TK_IF 82 +#define TK_EXISTS 83 +#define TK_PPS 84 +#define TK_TSERIES 85 +#define TK_DBS 86 +#define TK_STORAGE 87 +#define TK_QTIME 88 +#define TK_CONNS 89 +#define TK_STATE 90 +#define TK_KEEP 91 +#define TK_CACHE 92 +#define TK_REPLICA 93 +#define TK_QUORUM 94 +#define TK_DAYS 95 +#define TK_MINROWS 96 +#define TK_MAXROWS 97 +#define TK_BLOCKS 98 +#define TK_CTIME 99 +#define TK_WAL 100 +#define TK_FSYNC 101 +#define TK_COMP 102 +#define TK_PRECISION 103 +#define TK_UPDATE 104 +#define TK_CACHELAST 105 +#define TK_PARTITIONS 106 +#define TK_UNSIGNED 107 +#define TK_TAGS 108 +#define TK_USING 109 +#define TK_COMMA 110 +#define TK_AS 111 +#define TK_NULL 112 +#define TK_SELECT 113 +#define TK_UNION 114 +#define TK_ALL 115 +#define TK_DISTINCT 116 +#define TK_FROM 117 +#define TK_VARIABLE 118 +#define TK_INTERVAL 119 +#define TK_SESSION 120 +#define TK_FILL 121 +#define TK_SLIDING 122 +#define TK_ORDER 123 +#define TK_BY 124 +#define TK_ASC 125 +#define TK_DESC 126 +#define TK_GROUP 127 +#define TK_HAVING 128 +#define TK_LIMIT 129 +#define TK_OFFSET 130 +#define TK_SLIMIT 131 +#define TK_SOFFSET 132 +#define TK_WHERE 133 +#define TK_NOW 134 +#define TK_RESET 135 +#define TK_QUERY 136 +#define TK_SYNCDB 137 +#define TK_ADD 138 +#define TK_COLUMN 139 +#define TK_TAG 140 +#define TK_CHANGE 141 +#define TK_SET 142 +#define TK_KILL 143 +#define TK_CONNECTION 144 +#define TK_STREAM 145 +#define TK_COLON 146 +#define TK_ABORT 147 +#define TK_AFTER 148 +#define TK_ATTACH 149 +#define TK_BEFORE 150 +#define TK_BEGIN 151 +#define TK_CASCADE 152 +#define TK_CLUSTER 153 +#define TK_CONFLICT 154 +#define TK_COPY 155 +#define TK_DEFERRED 156 +#define TK_DELIMITERS 157 +#define TK_DETACH 158 +#define TK_EACH 159 +#define TK_END 160 +#define TK_EXPLAIN 161 +#define TK_FAIL 162 +#define TK_FOR 163 +#define TK_IGNORE 164 +#define TK_IMMEDIATE 165 +#define TK_INITIALLY 166 +#define TK_INSTEAD 167 +#define TK_MATCH 168 +#define TK_KEY 169 +#define TK_OF 170 +#define TK_RAISE 171 +#define TK_REPLACE 172 +#define TK_RESTRICT 173 +#define TK_ROW 174 +#define TK_STATEMENT 175 +#define TK_TRIGGER 176 +#define TK_VIEW 177 +#define TK_SEMI 178 +#define TK_NONE 179 +#define TK_PREV 180 +#define TK_LINEAR 181 +#define TK_IMPORT 182 +#define TK_TBNAME 183 +#define TK_JOIN 184 +#define TK_INSERT 185 +#define TK_INTO 186 +#define TK_VALUES 187 #define TK_SPACE 300 diff --git a/src/mnode/inc/mnodeVgroup.h b/src/mnode/inc/mnodeVgroup.h index 73b0e6ae1b..8ff4dbaaa5 100644 --- a/src/mnode/inc/mnodeVgroup.h +++ b/src/mnode/inc/mnodeVgroup.h @@ -51,6 +51,7 @@ void mnodeSendDropVnodeMsg(int32_t vgId, SRpcEpSet *epSet, void *ahandle); void mnodeSendCreateVgroupMsg(SVgObj *pVgroup, void *ahandle); void mnodeSendAlterVgroupMsg(SVgObj *pVgroup); void mnodeSendSyncVgroupMsg(SVgObj *pVgroup); +void mnodeSendCompactVgroupMsg(SVgObj *pVgroup); SRpcEpSet mnodeGetEpSetFromVgroup(SVgObj *pVgroup); SRpcEpSet mnodeGetEpSetFromIp(char *ep); diff --git a/src/mnode/src/mnodeDb.c b/src/mnode/src/mnodeDb.c index 5e06faaad9..9e064a2f9e 100644 --- a/src/mnode/src/mnodeDb.c +++ b/src/mnode/src/mnodeDb.c @@ -51,6 +51,7 @@ static int32_t mnodeRetrieveDbs(SShowObj *pShow, char *data, int32_t rows, void static int32_t mnodeProcessCreateDbMsg(SMnodeMsg *pMsg); static int32_t mnodeProcessDropDbMsg(SMnodeMsg *pMsg); static int32_t mnodeProcessSyncDbMsg(SMnodeMsg *pMsg); +static int32_t mnodeProcessCompactMsg(SMnodeMsg *pMsg); int32_t mnodeProcessAlterDbMsg(SMnodeMsg *pMsg); #ifndef _TOPIC @@ -198,10 +199,12 @@ int32_t mnodeInitDbs() { mnodeAddWriteMsgHandle(TSDB_MSG_TYPE_CM_ALTER_DB, mnodeProcessAlterDbMsg); mnodeAddWriteMsgHandle(TSDB_MSG_TYPE_CM_DROP_DB, mnodeProcessDropDbMsg); mnodeAddWriteMsgHandle(TSDB_MSG_TYPE_CM_SYNC_DB, mnodeProcessSyncDbMsg); + mnodeAddWriteMsgHandle(TSDB_MSG_TYPE_CM_COMPACT_VNODE, mnodeProcessCompactMsg); mnodeAddShowMetaHandle(TSDB_MGMT_TABLE_DB, mnodeGetDbMeta); mnodeAddShowRetrieveHandle(TSDB_MGMT_TABLE_DB, mnodeRetrieveDbs); mnodeAddShowFreeIterHandle(TSDB_MGMT_TABLE_DB, mnodeCancelGetNextDb); + mDebug("table:dbs table is created"); return tpInit(); } @@ -1207,7 +1210,7 @@ static int32_t mnodeProcessDropDbMsg(SMnodeMsg *pMsg) { static int32_t mnodeSyncDb(SDbObj *pDb, SMnodeMsg *pMsg) { void *pIter = NULL; SVgObj *pVgroup = NULL; - while (1) { + while (1) { pIter = mnodeGetNextVgroup(pIter, &pVgroup); if (pVgroup == NULL) break; if (pVgroup->pDb == pDb) { @@ -1221,6 +1224,34 @@ static int32_t mnodeSyncDb(SDbObj *pDb, SMnodeMsg *pMsg) { return TSDB_CODE_SUCCESS; } + +static int32_t mnodeCompact(SDbObj *pDb, SCompactMsg *pCompactMsg) { + int32_t count = htonl(pCompactMsg->numOfVgroup); + int32_t *buf = malloc(sizeof(int32_t) * count); + if (buf == NULL) { + return TSDB_CODE_MND_OUT_OF_MEMORY; + } + for (int32_t i = 0; i < count; i++) { + buf[i] = htonl(pCompactMsg->vgid[i]); + } + + // copy from mnodeSyncDb, so ugly + void *pIter = NULL; + SVgObj *pVgroup = NULL; + while (1) { + pIter = mnodeGetNextVgroup(pIter, &pVgroup); + if (pVgroup == NULL) break; + if (pVgroup->pDb == pDb) { + mnodeSendCompactVgroupMsg(pVgroup); + } + mnodeDecVgroupRef(pVgroup); + } + free(buf); + + mLInfo("db:%s, trigger compact", pDb->name); + return TSDB_CODE_SUCCESS; +} + static int32_t mnodeProcessSyncDbMsg(SMnodeMsg *pMsg) { SSyncDbMsg *pSyncDb = pMsg->rpcMsg.pCont; mDebug("db:%s, syncdb is received from thandle:%p, ignore:%d", pSyncDb->db, pMsg->rpcMsg.handle, pSyncDb->ignoreNotExists); @@ -1243,6 +1274,19 @@ static int32_t mnodeProcessSyncDbMsg(SMnodeMsg *pMsg) { return mnodeSyncDb(pMsg->pDb, pMsg); } +static int32_t mnodeProcessCompactMsg(SMnodeMsg *pMsg) { + SCompactMsg *pCompact = pMsg->rpcMsg.pCont; + mDebug("db:%s, compact is received from thandle:%p", pCompact->db, pMsg->rpcMsg.handle); + + if (pMsg->pDb == NULL) pMsg->pDb = mnodeGetDb(pCompact->db); + + if (pMsg->pDb->status != TSDB_DB_STATUS_READY) { + mError("db:%s, status:%d, in dropping, ignore compact request", pCompact->db, pMsg->pDb->status); + return TSDB_CODE_MND_DB_IN_DROPPING; + } + + return mnodeCompact(pMsg->pDb, pCompact); +} void mnodeDropAllDbs(SAcctObj *pAcct) { int32_t numOfDbs = 0; @@ -1297,4 +1341,4 @@ int32_t mnodeCompactDbs() { mInfo("end to compact dbs table..."); return 0; -} \ No newline at end of file +} diff --git a/src/mnode/src/mnodeSdb.c b/src/mnode/src/mnodeSdb.c index 9e3b87671e..5306142863 100644 --- a/src/mnode/src/mnodeSdb.c +++ b/src/mnode/src/mnodeSdb.c @@ -1193,4 +1193,4 @@ int32_t mnodeCompactWal() { sdbInfo("vgId:1, compact mnode wal success"); return 0; -} \ No newline at end of file +} diff --git a/src/mnode/src/mnodeVgroup.c b/src/mnode/src/mnodeVgroup.c index 67532ad85a..666de96854 100644 --- a/src/mnode/src/mnodeVgroup.c +++ b/src/mnode/src/mnodeVgroup.c @@ -61,6 +61,7 @@ static int32_t mnodeRetrieveVgroups(SShowObj *pShow, char *data, int32_t rows, v static void mnodeProcessCreateVnodeRsp(SRpcMsg *rpcMsg); static void mnodeProcessAlterVnodeRsp(SRpcMsg *rpcMsg); static void mnodeProcessSyncVnodeRsp(SRpcMsg *rpcMsg); +static void mnodeProcessCompactVnodeRsp(SRpcMsg *rpcMsg); static void mnodeProcessDropVnodeRsp(SRpcMsg *rpcMsg); static int32_t mnodeProcessVnodeCfgMsg(SMnodeMsg *pMsg) ; static void mnodeSendDropVgroupMsg(SVgObj *pVgroup, void *ahandle); @@ -238,6 +239,7 @@ int32_t mnodeInitVgroups() { mnodeAddPeerRspHandle(TSDB_MSG_TYPE_MD_CREATE_VNODE_RSP, mnodeProcessCreateVnodeRsp); mnodeAddPeerRspHandle(TSDB_MSG_TYPE_MD_ALTER_VNODE_RSP, mnodeProcessAlterVnodeRsp); mnodeAddPeerRspHandle(TSDB_MSG_TYPE_MD_ALTER_VNODE_RSP, mnodeProcessSyncVnodeRsp); + mnodeAddPeerRspHandle(TSDB_MSG_TYPE_MD_COMPACT_VNODE_RSP, mnodeProcessCompactVnodeRsp); mnodeAddPeerRspHandle(TSDB_MSG_TYPE_MD_DROP_VNODE_RSP, mnodeProcessDropVnodeRsp); mnodeAddPeerMsgHandle(TSDB_MSG_TYPE_DM_CONFIG_VNODE, mnodeProcessVnodeCfgMsg); @@ -977,6 +979,7 @@ static SSyncVnodeMsg *mnodeBuildSyncVnodeMsg(int32_t vgId) { return pSyncVnode; } + static void mnodeSendSyncVnodeMsg(SVgObj *pVgroup, SRpcEpSet *epSet) { SSyncVnodeMsg *pSyncVnode = mnodeBuildSyncVnodeMsg(pVgroup->vgId); SRpcMsg rpcMsg = { @@ -989,6 +992,18 @@ static void mnodeSendSyncVnodeMsg(SVgObj *pVgroup, SRpcEpSet *epSet) { dnodeSendMsgToDnode(epSet, &rpcMsg); } +static void mnodeSendCompactVnodeMsg(SVgObj *pVgroup, SRpcEpSet *epSet) { + SSyncVnodeMsg *pSyncVnode = mnodeBuildSyncVnodeMsg(pVgroup->vgId); + SRpcMsg rpcMsg = { + .ahandle = NULL, + .pCont = pSyncVnode, + .contLen = pSyncVnode ? sizeof(SCompactVnodeMsg) : 0, + .code = 0, + .msgType = TSDB_MSG_TYPE_MD_COMPACT_VNODE + }; + + dnodeSendMsgToDnode(epSet, &rpcMsg); +} void mnodeSendSyncVgroupMsg(SVgObj *pVgroup) { mDebug("vgId:%d, send sync all vnodes msg, numOfVnodes:%d db:%s", pVgroup->vgId, pVgroup->numOfVnodes, @@ -1002,6 +1017,17 @@ void mnodeSendSyncVgroupMsg(SVgObj *pVgroup) { } } +void mnodeSendCompactVgroupMsg(SVgObj *pVgroup) { + mDebug("vgId:%d, send compact all vnodes msg, numOfVnodes:%d db:%s", pVgroup->vgId, pVgroup->numOfVnodes, pVgroup->dbName); + for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) { + if (pVgroup->vnodeGid[i].role != TAOS_SYNC_ROLE_SLAVE) continue; //TODO(yihaoDeng): compact slave or not ? + SRpcEpSet epSet = mnodeGetEpSetFromIp(pVgroup->vnodeGid[i].pDnode->dnodeEp); + mDebug("vgId:%d, index:%d, send compact vnode msg to dnode %s", pVgroup->vgId, i, + pVgroup->vnodeGid[i].pDnode->dnodeEp); + mnodeSendCompactVnodeMsg(pVgroup, &epSet); + } + +} static void mnodeSendCreateVnodeMsg(SVgObj *pVgroup, SRpcEpSet *epSet, void *ahandle) { SCreateVnodeMsg *pCreate = mnodeBuildVnodeMsg(pVgroup); SRpcMsg rpcMsg = { @@ -1032,6 +1058,9 @@ static void mnodeProcessAlterVnodeRsp(SRpcMsg *rpcMsg) { static void mnodeProcessSyncVnodeRsp(SRpcMsg *rpcMsg) { mDebug("sync vnode rsp received"); } +static void mnodeProcessCompactVnodeRsp(SRpcMsg *rpcMsg) { + mDebug("compact vnode rsp received"); +} static void mnodeProcessCreateVnodeRsp(SRpcMsg *rpcMsg) { if (rpcMsg->ahandle == NULL) return; @@ -1328,4 +1357,4 @@ int32_t mnodeCompactVgroups() { mInfo("end to compact vgroups table..."); return 0; -} \ No newline at end of file +} diff --git a/src/query/inc/qSqlparser.h b/src/query/inc/qSqlparser.h index 2bdff1f94f..740acb678a 100644 --- a/src/query/inc/qSqlparser.h +++ b/src/query/inc/qSqlparser.h @@ -303,6 +303,8 @@ void setCreateUserSql(SSqlInfo *pInfo, SStrToken *pName, SStrToken *pPasswd); void setKillSql(SSqlInfo *pInfo, int32_t type, SStrToken *ip); void setAlterUserSql(SSqlInfo *pInfo, int16_t type, SStrToken *pName, SStrToken* pPwd, SStrToken *pPrivilege); +void setCompactVnodeSql(SSqlInfo *pInfo, int32_t type, SArray *pParam); + void setDefaultCreateDbOption(SCreateDbInfo *pDBInfo); void setDefaultCreateTopicOption(SCreateDbInfo *pDBInfo); diff --git a/src/query/inc/sql.y b/src/query/inc/sql.y index 8ef8ef0e2b..1ba28c0f1c 100644 --- a/src/query/inc/sql.y +++ b/src/query/inc/sql.y @@ -174,6 +174,10 @@ cmd ::= ALTER TOPIC ids(X) alter_topic_optr(Y). { SStrToken t = {0}; setCreateD cmd ::= ALTER ACCOUNT ids(X) acct_optr(Z). { setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &X, NULL, &Z);} cmd ::= ALTER ACCOUNT ids(X) PASS ids(Y) acct_optr(Z). { setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &X, &Y, &Z);} +////////////////////////////// COMPACT STATEMENT ////////////////////////////////////////////// + +cmd ::= COMPACT VNODES IN LP exprlist(Y) RP. { setCompactVnodeSql(pInfo, TSDB_SQL_COMPACT_VNODE, Y);} + // An IDENTIFIER can be a generic identifier, or one of several keywords. // Any non-standard keyword can also be an identifier. // And "ids" is an identifer-or-string. diff --git a/src/query/src/qSqlParser.c b/src/query/src/qSqlParser.c index 2459439b7b..38572ac2fd 100644 --- a/src/query/src/qSqlParser.c +++ b/src/query/src/qSqlParser.c @@ -1058,6 +1058,10 @@ void setCreateAcctSql(SSqlInfo *pInfo, int32_t type, SStrToken *pName, SStrToken pInfo->pMiscInfo->user.passwd = *pPwd; } } +void setCompactVnodeSql(SSqlInfo *pInfo, int32_t type, SArray *pParam) { + pInfo->type = type; + pInfo->list = pParam; +} void setCreateUserSql(SSqlInfo *pInfo, SStrToken *pName, SStrToken *pPasswd) { pInfo->type = TSDB_SQL_CREATE_USER; diff --git a/src/query/src/sql.c b/src/query/src/sql.c index 5a5038be79..38601b1631 100644 --- a/src/query/src/sql.c +++ b/src/query/src/sql.c @@ -1,123 +1,92 @@ -/* -** 2000-05-29 -** -** The author disclaims copyright to this source code. In place of -** a legal notice, here is a blessing: -** -** May you do good and not evil. -** May you find forgiveness for yourself and forgive others. -** May you share freely, never taking more than you give. -** -************************************************************************* -** Driver template for the LEMON parser generator. -** -** The "lemon" program processes an LALR(1) input grammar file, then uses -** this template to construct a parser. The "lemon" program inserts text -** at each "%%" line. Also, any "P-a-r-s-e" identifer prefix (without the -** interstitial "-" characters) contained in this template is changed into -** the value of the %name directive from the grammar. Otherwise, the content -** of this template is copied straight through into the generate parser -** source file. -** -** The following is the concatenation of all %include directives from the -** input grammar file: +/* Driver template for the LEMON parser generator. +** The author disclaims copyright to this source code. */ +/* First off, code is included that follows the "include" declaration +** in the input grammar file. */ #include -/************ Begin %include sections from the grammar ************************/ -#include -#include #include #include #include +#include +#include #include "qSqlparser.h" #include "tcmdtype.h" -#include "ttoken.h" +#include "tstoken.h" #include "ttokendef.h" #include "tutil.h" #include "tvariant.h" -/**************** End of %include directives **********************************/ -/* These constants specify the various numeric values for terminal symbols -** in a format understandable to "makeheaders". This section is blank unless -** "lemon" is run with the "-m" command-line option. -***************** Begin makeheaders token definitions *************************/ -/**************** End makeheaders token definitions ***************************/ - -/* The next sections is a series of control #defines. +/* Next is all token values, in a form suitable for use by makeheaders. +** This section will be null unless lemon is run with the -m switch. +*/ +/* +** These constants (all generated automatically by the parser generator) +** specify the various kinds of tokens (terminals) that the parser +** understands. +** +** Each symbol here is a terminal symbol in the grammar. +*/ +/* Make sure the INTERFACE macro is defined. +*/ +#ifndef INTERFACE +# define INTERFACE 1 +#endif +/* The next thing included is series of defines which control ** various aspects of the generated parser. -** YYCODETYPE is the data type used to store the integer codes -** that represent terminal and non-terminal symbols. -** "unsigned char" is used if there are fewer than -** 256 symbols. Larger types otherwise. -** YYNOCODE is a number of type YYCODETYPE that is not used for -** any terminal or nonterminal symbol. +** YYCODETYPE is the data type used for storing terminal +** and nonterminal numbers. "unsigned char" is +** used if there are fewer than 250 terminals +** and nonterminals. "int" is used otherwise. +** YYNOCODE is a number of type YYCODETYPE which corresponds +** to no legal terminal or nonterminal number. This +** number is used to fill in empty slots of the hash +** table. ** YYFALLBACK If defined, this indicates that one or more tokens -** (also known as: "terminal symbols") have fall-back -** values which should be used if the original symbol -** would not parse. This permits keywords to sometimes -** be used as identifiers, for example. -** YYACTIONTYPE is the data type used for "action codes" - numbers -** that indicate what to do in response to the next -** token. -** ParseTOKENTYPE is the data type used for minor type for terminal -** symbols. Background: A "minor type" is a semantic -** value associated with a terminal or non-terminal -** symbols. For example, for an "ID" terminal symbol, -** the minor type might be the name of the identifier. -** Each non-terminal can have a different minor type. -** Terminal symbols all have the same minor type, though. -** This macros defines the minor type for terminal -** symbols. -** YYMINORTYPE is the data type used for all minor types. +** have fall-back values which should be used if the +** original value of the token will not parse. +** YYACTIONTYPE is the data type used for storing terminal +** and nonterminal numbers. "unsigned char" is +** used if there are fewer than 250 rules and +** states combined. "int" is used otherwise. +** ParseTOKENTYPE is the data type used for minor tokens given +** directly to the parser from the tokenizer. +** YYMINORTYPE is the data type used for all minor tokens. ** This is typically a union of many types, one of ** which is ParseTOKENTYPE. The entry in the union -** for terminal symbols is called "yy0". +** for base tokens is called "yy0". ** YYSTACKDEPTH is the maximum depth of the parser's stack. If ** zero the stack is dynamically sized using realloc() ** ParseARG_SDECL A static variable declaration for the %extra_argument ** ParseARG_PDECL A parameter declaration for the %extra_argument ** ParseARG_STORE Code to store %extra_argument into yypParser ** ParseARG_FETCH Code to extract %extra_argument from yypParser -** YYERRORSYMBOL is the code number of the error symbol. If not -** defined, then do no error processing. ** YYNSTATE the combined number of states. ** YYNRULE the number of rules in the grammar -** YYNTOKEN Number of terminal symbols -** YY_MAX_SHIFT Maximum value for shift actions -** YY_MIN_SHIFTREDUCE Minimum value for shift-reduce actions -** YY_MAX_SHIFTREDUCE Maximum value for shift-reduce actions -** YY_ERROR_ACTION The yy_action[] code for syntax error -** YY_ACCEPT_ACTION The yy_action[] code for accept -** YY_NO_ACTION The yy_action[] code for no-op -** YY_MIN_REDUCE Minimum value for reduce actions -** YY_MAX_REDUCE Maximum value for reduce actions +** YYERRORSYMBOL is the code number of the error symbol. If not +** defined, then do no error processing. */ -#ifndef INTERFACE -# define INTERFACE 1 -#endif -/************* Begin control #defines *****************************************/ #define YYCODETYPE unsigned short int -#define YYNOCODE 264 +#define YYNOCODE 265 #define YYACTIONTYPE unsigned short int #define ParseTOKENTYPE SStrToken typedef union { int yyinit; ParseTOKENTYPE yy0; - SCreateTableSql* yy14; - int yy20; - SSqlNode* yy116; - tSqlExpr* yy118; - SArray* yy159; - SIntervalVal yy184; - SCreatedTableInfo yy206; - SRelationInfo* yy236; - SSessionWindowVal yy249; - int64_t yy317; - SCreateDbInfo yy322; - SCreateAcctInfo yy351; - TAOS_FIELD yy407; - SLimitVal yy440; - tVariant yy488; + SCreatedTableInfo yy96; + SRelationInfo* yy148; + tSqlExpr* yy178; + SCreateAcctInfo yy187; + SArray* yy285; + TAOS_FIELD yy295; + SSqlNode* yy344; + tVariant yy362; + SIntervalVal yy376; + SLimitVal yy438; + int yy460; + SCreateTableSql* yy470; + SSessionWindowVal yy523; + int64_t yy525; + SCreateDbInfo yy526; } YYMINORTYPE; #ifndef YYSTACKDEPTH #define YYSTACKDEPTH 100 @@ -126,19 +95,16 @@ typedef union { #define ParseARG_PDECL ,SSqlInfo* pInfo #define ParseARG_FETCH SSqlInfo* pInfo = yypParser->pInfo #define ParseARG_STORE yypParser->pInfo = pInfo +#define YYNSTATE 517 +#define YYNRULE 271 #define YYFALLBACK 1 -#define YYNSTATE 317 -#define YYNRULE 270 -#define YYNTOKEN 187 -#define YY_MAX_SHIFT 316 -#define YY_MIN_SHIFTREDUCE 511 -#define YY_MAX_SHIFTREDUCE 780 -#define YY_ERROR_ACTION 781 -#define YY_ACCEPT_ACTION 782 -#define YY_NO_ACTION 783 -#define YY_MIN_REDUCE 784 -#define YY_MAX_REDUCE 1053 -/************* End control #defines *******************************************/ +#define YY_NO_ACTION (YYNSTATE+YYNRULE+2) +#define YY_ACCEPT_ACTION (YYNSTATE+YYNRULE+1) +#define YY_ERROR_ACTION (YYNSTATE+YYNRULE) + +/* The yyzerominor constant is used to initialize instances of +** YYMINORTYPE objects to zero. */ +static const YYMINORTYPE yyzerominor = { 0 }; /* Define the yytestcase() macro to be a no-op if is not already defined ** otherwise. @@ -161,35 +127,33 @@ typedef union { ** Suppose the action integer is N. Then the action is determined as ** follows ** -** 0 <= N <= YY_MAX_SHIFT Shift N. That is, push the lookahead +** 0 <= N < YYNSTATE Shift N. That is, push the lookahead ** token onto the stack and goto state N. ** -** N between YY_MIN_SHIFTREDUCE Shift to an arbitrary state then -** and YY_MAX_SHIFTREDUCE reduce by rule N-YY_MIN_SHIFTREDUCE. +** YYNSTATE <= N < YYNSTATE+YYNRULE Reduce by rule N-YYNSTATE. ** -** N == YY_ERROR_ACTION A syntax error has occurred. +** N == YYNSTATE+YYNRULE A syntax error has occurred. ** -** N == YY_ACCEPT_ACTION The parser accepts its input. +** N == YYNSTATE+YYNRULE+1 The parser accepts its input. ** -** N == YY_NO_ACTION No such action. Denotes unused +** N == YYNSTATE+YYNRULE+2 No such action. Denotes unused ** slots in the yy_action[] table. ** -** N between YY_MIN_REDUCE Reduce by rule N-YY_MIN_REDUCE -** and YY_MAX_REDUCE -** ** The action table is constructed as a single large table named yy_action[]. -** Given state S and lookahead X, the action is computed as either: +** Given state S and lookahead X, the action is computed as ** -** (A) N = yy_action[ yy_shift_ofst[S] + X ] -** (B) N = yy_default[S] +** yy_action[ yy_shift_ofst[S] + X ] ** -** The (A) formula is preferred. The B formula is used instead if -** yy_lookahead[yy_shift_ofst[S]+X] is not equal to X. +** If the index value yy_shift_ofst[S]+X is out of range or if the value +** yy_lookahead[yy_shift_ofst[S]+X] is not equal to X or if yy_shift_ofst[S] +** is equal to YY_SHIFT_USE_DFLT, it means that the action is not in the table +** and that yy_default[S] should be used instead. ** -** The formulas above are for computing the action when the lookahead is +** The formula above is for computing the action when the lookahead is ** a terminal symbol. If the lookahead is a non-terminal (as occurs after ** a reduce action) then the yy_reduce_ofst[] array is used in place of -** the yy_shift_ofst[] array. +** the yy_shift_ofst[] array and YY_REDUCE_USE_DFLT is used in place of +** YY_SHIFT_USE_DFLT. ** ** The following are the tables generated in this section: ** @@ -201,268 +165,295 @@ typedef union { ** yy_reduce_ofst[] For each state, the offset into yy_action for ** shifting non-terminals after a reduce. ** yy_default[] Default action for each state. -** -*********** Begin parsing tables **********************************************/ -#define YY_ACTTAB_COUNT (685) +*/ +#define YY_ACTTAB_COUNT (804) static const YYACTIONTYPE yy_action[] = { - /* 0 */ 925, 559, 206, 314, 211, 141, 952, 3, 168, 560, - /* 10 */ 782, 316, 134, 47, 48, 141, 51, 52, 30, 183, - /* 20 */ 217, 41, 183, 50, 264, 55, 53, 57, 54, 1034, - /* 30 */ 931, 214, 1035, 46, 45, 17, 183, 44, 43, 42, - /* 40 */ 47, 48, 223, 51, 52, 213, 1035, 217, 41, 559, - /* 50 */ 50, 264, 55, 53, 57, 54, 943, 560, 181, 208, - /* 60 */ 46, 45, 928, 222, 44, 43, 42, 48, 949, 51, - /* 70 */ 52, 244, 983, 217, 41, 249, 50, 264, 55, 53, - /* 80 */ 57, 54, 984, 638, 259, 85, 46, 45, 280, 931, - /* 90 */ 44, 43, 42, 512, 513, 514, 515, 516, 517, 518, - /* 100 */ 519, 520, 521, 522, 523, 524, 315, 943, 187, 207, - /* 110 */ 70, 290, 289, 47, 48, 30, 51, 52, 300, 919, - /* 120 */ 217, 41, 209, 50, 264, 55, 53, 57, 54, 44, - /* 130 */ 43, 42, 724, 46, 45, 674, 224, 44, 43, 42, - /* 140 */ 47, 49, 24, 51, 52, 228, 141, 217, 41, 559, - /* 150 */ 50, 264, 55, 53, 57, 54, 220, 560, 105, 928, - /* 160 */ 46, 45, 931, 300, 44, 43, 42, 23, 278, 309, - /* 170 */ 308, 277, 276, 275, 307, 274, 306, 305, 304, 273, - /* 180 */ 303, 302, 891, 30, 879, 880, 881, 882, 883, 884, - /* 190 */ 885, 886, 887, 888, 889, 890, 892, 893, 51, 52, - /* 200 */ 830, 1031, 217, 41, 167, 50, 264, 55, 53, 57, - /* 210 */ 54, 261, 18, 78, 230, 46, 45, 287, 286, 44, - /* 220 */ 43, 42, 216, 739, 221, 30, 728, 928, 731, 192, - /* 230 */ 734, 216, 739, 310, 1030, 728, 193, 731, 236, 734, - /* 240 */ 30, 118, 117, 191, 677, 559, 240, 239, 55, 53, - /* 250 */ 57, 54, 25, 560, 202, 203, 46, 45, 263, 931, - /* 260 */ 44, 43, 42, 202, 203, 74, 283, 61, 23, 928, - /* 270 */ 309, 308, 74, 36, 730, 307, 733, 306, 305, 304, - /* 280 */ 36, 303, 302, 899, 927, 662, 897, 898, 659, 62, - /* 290 */ 660, 900, 661, 902, 903, 901, 82, 904, 905, 103, - /* 300 */ 97, 108, 243, 917, 68, 30, 107, 113, 116, 106, - /* 310 */ 199, 5, 33, 157, 141, 110, 231, 232, 156, 92, - /* 320 */ 87, 91, 681, 226, 30, 56, 30, 914, 915, 29, - /* 330 */ 918, 729, 740, 732, 56, 175, 173, 171, 736, 1, - /* 340 */ 155, 740, 170, 121, 120, 119, 284, 736, 229, 928, - /* 350 */ 265, 46, 45, 69, 735, 44, 43, 42, 839, 666, - /* 360 */ 12, 667, 167, 735, 84, 288, 81, 292, 928, 215, - /* 370 */ 928, 313, 312, 126, 132, 130, 129, 80, 705, 706, - /* 380 */ 831, 79, 280, 929, 167, 916, 737, 245, 726, 684, - /* 390 */ 71, 31, 227, 994, 663, 282, 690, 247, 696, 697, - /* 400 */ 136, 760, 60, 20, 741, 19, 64, 648, 19, 241, - /* 410 */ 267, 31, 650, 6, 31, 269, 60, 1029, 649, 83, - /* 420 */ 28, 200, 60, 270, 727, 201, 65, 96, 95, 185, - /* 430 */ 14, 13, 993, 102, 101, 67, 218, 637, 16, 15, - /* 440 */ 664, 186, 665, 738, 115, 114, 743, 188, 182, 189, - /* 450 */ 190, 196, 197, 195, 180, 194, 184, 133, 1045, 990, - /* 460 */ 930, 989, 219, 291, 39, 951, 959, 944, 961, 135, - /* 470 */ 139, 976, 248, 975, 926, 131, 152, 151, 924, 153, - /* 480 */ 250, 154, 689, 210, 252, 150, 257, 145, 142, 842, - /* 490 */ 941, 143, 272, 144, 262, 37, 146, 66, 58, 178, - /* 500 */ 63, 260, 34, 258, 256, 281, 838, 147, 1050, 254, - /* 510 */ 93, 1049, 1047, 158, 285, 1044, 99, 148, 1043, 1041, - /* 520 */ 159, 860, 251, 35, 32, 38, 149, 179, 827, 109, - /* 530 */ 825, 111, 112, 823, 822, 233, 169, 820, 819, 818, - /* 540 */ 817, 816, 815, 172, 174, 40, 812, 810, 808, 806, - /* 550 */ 176, 803, 177, 301, 246, 72, 75, 104, 253, 977, - /* 560 */ 293, 294, 295, 296, 297, 204, 225, 298, 271, 299, - /* 570 */ 311, 780, 205, 198, 234, 88, 89, 235, 779, 237, - /* 580 */ 238, 778, 766, 765, 242, 247, 821, 814, 162, 266, - /* 590 */ 122, 861, 160, 165, 161, 164, 163, 166, 123, 124, - /* 600 */ 813, 805, 895, 125, 804, 2, 8, 73, 4, 669, - /* 610 */ 76, 691, 137, 212, 694, 86, 138, 77, 907, 255, - /* 620 */ 9, 698, 140, 26, 742, 7, 27, 11, 10, 21, - /* 630 */ 84, 744, 22, 268, 601, 597, 595, 594, 593, 590, - /* 640 */ 563, 279, 94, 90, 31, 59, 640, 639, 636, 585, - /* 650 */ 583, 98, 575, 581, 577, 579, 573, 571, 604, 603, - /* 660 */ 602, 600, 599, 100, 598, 596, 592, 591, 60, 561, - /* 670 */ 528, 784, 526, 783, 783, 783, 783, 783, 783, 127, - /* 680 */ 783, 783, 783, 783, 128, + /* 0 */ 500, 48, 47, 31, 68, 46, 45, 44, 499, 789, + /* 10 */ 321, 517, 49, 50, 503, 53, 54, 116, 115, 226, + /* 20 */ 43, 224, 52, 281, 57, 55, 58, 56, 133, 131, + /* 30 */ 130, 431, 48, 47, 17, 16, 46, 45, 44, 49, + /* 40 */ 50, 6, 53, 54, 29, 297, 226, 43, 429, 52, + /* 50 */ 281, 57, 55, 58, 56, 472, 336, 471, 283, 48, + /* 60 */ 47, 103, 102, 46, 45, 44, 49, 50, 339, 53, + /* 70 */ 54, 246, 269, 226, 43, 25, 52, 281, 57, 55, + /* 80 */ 58, 56, 318, 317, 127, 238, 48, 47, 500, 502, + /* 90 */ 46, 45, 44, 242, 241, 230, 499, 83, 46, 45, + /* 100 */ 44, 49, 51, 129, 53, 54, 228, 420, 226, 43, + /* 110 */ 71, 52, 281, 57, 55, 58, 56, 414, 411, 413, + /* 120 */ 410, 48, 47, 434, 62, 46, 45, 44, 368, 367, + /* 130 */ 30, 361, 516, 515, 514, 513, 512, 511, 510, 509, + /* 140 */ 508, 507, 506, 505, 504, 320, 63, 50, 208, 53, + /* 150 */ 54, 295, 294, 226, 43, 419, 52, 281, 57, 55, + /* 160 */ 58, 56, 15, 14, 421, 232, 48, 47, 292, 291, + /* 170 */ 46, 45, 44, 53, 54, 128, 229, 226, 43, 287, + /* 180 */ 52, 281, 57, 55, 58, 56, 470, 447, 469, 651, + /* 190 */ 48, 47, 168, 20, 46, 45, 44, 373, 491, 385, + /* 200 */ 384, 383, 382, 381, 380, 379, 378, 377, 376, 375, + /* 210 */ 374, 372, 371, 24, 277, 314, 313, 276, 275, 274, + /* 220 */ 312, 273, 311, 310, 309, 272, 308, 307, 225, 404, + /* 230 */ 412, 409, 415, 467, 408, 185, 407, 402, 500, 19, + /* 240 */ 57, 55, 58, 56, 395, 227, 499, 142, 48, 47, + /* 250 */ 97, 96, 46, 45, 44, 13, 193, 31, 31, 397, + /* 260 */ 204, 205, 417, 194, 282, 65, 20, 365, 119, 118, + /* 270 */ 192, 279, 225, 404, 286, 75, 415, 268, 408, 457, + /* 280 */ 407, 466, 459, 458, 85, 66, 82, 456, 20, 454, + /* 290 */ 453, 455, 142, 452, 451, 31, 61, 329, 416, 293, + /* 300 */ 289, 185, 429, 429, 204, 205, 84, 59, 37, 24, + /* 310 */ 396, 314, 313, 263, 222, 79, 312, 26, 311, 310, + /* 320 */ 309, 223, 308, 307, 3, 169, 104, 98, 109, 435, + /* 330 */ 245, 81, 69, 108, 114, 117, 107, 288, 200, 403, + /* 340 */ 429, 465, 111, 31, 72, 405, 176, 174, 172, 364, + /* 350 */ 31, 59, 31, 171, 122, 121, 120, 5, 34, 158, + /* 360 */ 347, 406, 261, 31, 157, 93, 88, 92, 474, 266, + /* 370 */ 185, 477, 360, 476, 343, 475, 328, 185, 61, 396, + /* 380 */ 344, 341, 334, 403, 247, 217, 396, 75, 429, 405, + /* 390 */ 352, 351, 216, 70, 209, 429, 500, 429, 32, 233, + /* 400 */ 234, 32, 231, 21, 499, 406, 1, 156, 436, 61, + /* 410 */ 137, 393, 86, 32, 448, 249, 168, 362, 142, 168, + /* 420 */ 37, 106, 142, 135, 336, 327, 207, 319, 315, 305, + /* 430 */ 330, 220, 218, 212, 61, 464, 463, 462, 430, 210, + /* 440 */ 461, 460, 450, 446, 445, 444, 366, 443, 442, 441, + /* 450 */ 440, 439, 32, 433, 468, 432, 101, 468, 468, 468, + /* 460 */ 219, 99, 95, 60, 285, 284, 8, 418, 401, 7, + /* 470 */ 91, 278, 391, 392, 390, 389, 388, 387, 473, 87, + /* 480 */ 85, 23, 386, 267, 22, 265, 80, 251, 12, 11, + /* 490 */ 348, 28, 10, 332, 27, 141, 213, 345, 257, 78, + /* 500 */ 138, 139, 342, 340, 337, 9, 77, 74, 244, 326, + /* 510 */ 324, 249, 240, 239, 323, 237, 236, 325, 322, 2, + /* 520 */ 4, 498, 132, 497, 449, 126, 492, 164, 125, 124, + /* 530 */ 490, 316, 123, 483, 306, 167, 304, 302, 299, 303, + /* 540 */ 300, 301, 199, 206, 298, 166, 165, 163, 105, 270, + /* 550 */ 90, 89, 162, 370, 221, 161, 279, 437, 151, 41, + /* 560 */ 150, 146, 201, 143, 64, 259, 149, 350, 254, 255, + /* 570 */ 211, 148, 76, 73, 147, 248, 253, 178, 790, 256, + /* 580 */ 501, 258, 790, 260, 346, 177, 790, 264, 790, 790, + /* 590 */ 262, 496, 495, 42, 494, 145, 359, 67, 152, 493, + /* 600 */ 250, 144, 175, 173, 358, 489, 488, 296, 790, 335, + /* 610 */ 790, 790, 215, 790, 252, 790, 40, 790, 790, 487, + /* 620 */ 353, 486, 790, 349, 790, 790, 485, 357, 790, 790, + /* 630 */ 790, 790, 790, 790, 356, 305, 790, 790, 214, 790, + /* 640 */ 790, 355, 790, 790, 790, 790, 790, 790, 790, 790, + /* 650 */ 790, 790, 790, 790, 790, 790, 790, 790, 790, 790, + /* 660 */ 790, 790, 790, 790, 790, 790, 790, 484, 170, 235, + /* 670 */ 482, 481, 113, 112, 480, 790, 110, 479, 180, 39, + /* 680 */ 790, 33, 36, 438, 160, 428, 427, 790, 100, 426, + /* 690 */ 290, 159, 424, 423, 94, 422, 394, 790, 280, 790, + /* 700 */ 35, 790, 790, 179, 38, 790, 271, 369, 155, 154, + /* 710 */ 363, 153, 140, 136, 338, 333, 331, 134, 243, 790, + /* 720 */ 790, 790, 790, 790, 790, 790, 790, 790, 790, 790, + /* 730 */ 790, 790, 790, 790, 790, 790, 790, 790, 790, 790, + /* 740 */ 790, 790, 790, 790, 790, 790, 790, 790, 790, 790, + /* 750 */ 790, 790, 790, 790, 790, 790, 354, 790, 790, 790, + /* 760 */ 790, 790, 790, 790, 790, 790, 478, 425, 790, 790, + /* 770 */ 790, 790, 790, 790, 790, 790, 790, 790, 790, 790, + /* 780 */ 790, 790, 790, 790, 181, 195, 198, 197, 196, 191, + /* 790 */ 190, 184, 189, 187, 186, 203, 202, 400, 399, 398, + /* 800 */ 188, 183, 182, 18, }; static const YYCODETYPE yy_lookahead[] = { - /* 0 */ 191, 1, 190, 191, 210, 191, 191, 194, 195, 9, - /* 10 */ 188, 189, 191, 13, 14, 191, 16, 17, 191, 252, - /* 20 */ 20, 21, 252, 23, 24, 25, 26, 27, 28, 262, - /* 30 */ 236, 261, 262, 33, 34, 252, 252, 37, 38, 39, - /* 40 */ 13, 14, 233, 16, 17, 261, 262, 20, 21, 1, - /* 50 */ 23, 24, 25, 26, 27, 28, 234, 9, 252, 232, - /* 60 */ 33, 34, 235, 210, 37, 38, 39, 14, 253, 16, - /* 70 */ 17, 249, 258, 20, 21, 254, 23, 24, 25, 26, - /* 80 */ 27, 28, 258, 5, 260, 197, 33, 34, 79, 236, - /* 90 */ 37, 38, 39, 45, 46, 47, 48, 49, 50, 51, - /* 100 */ 52, 53, 54, 55, 56, 57, 58, 234, 252, 61, - /* 110 */ 110, 33, 34, 13, 14, 191, 16, 17, 81, 231, - /* 120 */ 20, 21, 249, 23, 24, 25, 26, 27, 28, 37, - /* 130 */ 38, 39, 105, 33, 34, 109, 210, 37, 38, 39, - /* 140 */ 13, 14, 116, 16, 17, 68, 191, 20, 21, 1, - /* 150 */ 23, 24, 25, 26, 27, 28, 232, 9, 76, 235, - /* 160 */ 33, 34, 236, 81, 37, 38, 39, 88, 89, 90, - /* 170 */ 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, - /* 180 */ 101, 102, 209, 191, 211, 212, 213, 214, 215, 216, - /* 190 */ 217, 218, 219, 220, 221, 222, 223, 224, 16, 17, - /* 200 */ 196, 252, 20, 21, 200, 23, 24, 25, 26, 27, - /* 210 */ 28, 256, 44, 258, 137, 33, 34, 140, 141, 37, - /* 220 */ 38, 39, 1, 2, 232, 191, 5, 235, 7, 61, - /* 230 */ 9, 1, 2, 210, 252, 5, 68, 7, 135, 9, - /* 240 */ 191, 73, 74, 75, 37, 1, 143, 144, 25, 26, - /* 250 */ 27, 28, 104, 9, 33, 34, 33, 34, 37, 236, - /* 260 */ 37, 38, 39, 33, 34, 104, 232, 109, 88, 235, - /* 270 */ 90, 91, 104, 112, 5, 95, 7, 97, 98, 99, - /* 280 */ 112, 101, 102, 209, 235, 2, 212, 213, 5, 131, - /* 290 */ 7, 217, 9, 219, 220, 221, 197, 223, 224, 62, - /* 300 */ 63, 64, 134, 0, 136, 191, 69, 70, 71, 72, - /* 310 */ 142, 62, 63, 64, 191, 78, 33, 34, 69, 70, - /* 320 */ 71, 72, 115, 68, 191, 104, 191, 228, 229, 230, - /* 330 */ 231, 5, 111, 7, 104, 62, 63, 64, 117, 198, - /* 340 */ 199, 111, 69, 70, 71, 72, 232, 117, 191, 235, - /* 350 */ 15, 33, 34, 197, 133, 37, 38, 39, 196, 5, - /* 360 */ 104, 7, 200, 133, 108, 232, 110, 232, 235, 60, - /* 370 */ 235, 65, 66, 67, 62, 63, 64, 237, 124, 125, - /* 380 */ 196, 258, 79, 226, 200, 229, 117, 105, 1, 105, - /* 390 */ 250, 109, 137, 227, 111, 140, 105, 113, 105, 105, - /* 400 */ 109, 105, 109, 109, 105, 109, 109, 105, 109, 191, - /* 410 */ 105, 109, 105, 104, 109, 105, 109, 252, 105, 109, - /* 420 */ 104, 252, 109, 107, 37, 252, 129, 138, 139, 252, - /* 430 */ 138, 139, 227, 138, 139, 104, 227, 106, 138, 139, - /* 440 */ 5, 252, 7, 117, 76, 77, 111, 252, 252, 252, - /* 450 */ 252, 252, 252, 252, 252, 252, 252, 191, 236, 227, - /* 460 */ 236, 227, 227, 227, 251, 191, 191, 234, 191, 191, - /* 470 */ 191, 259, 234, 259, 234, 60, 191, 238, 191, 191, - /* 480 */ 255, 191, 117, 255, 255, 239, 255, 244, 247, 191, - /* 490 */ 248, 246, 191, 245, 122, 191, 243, 128, 127, 191, - /* 500 */ 130, 126, 191, 121, 120, 191, 191, 242, 191, 119, - /* 510 */ 191, 191, 191, 191, 191, 191, 191, 241, 191, 191, - /* 520 */ 191, 191, 118, 191, 191, 191, 240, 191, 191, 191, - /* 530 */ 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, - /* 540 */ 191, 191, 191, 191, 191, 132, 191, 191, 191, 191, - /* 550 */ 191, 191, 191, 103, 192, 192, 192, 87, 192, 192, - /* 560 */ 86, 50, 83, 85, 54, 192, 192, 84, 192, 82, - /* 570 */ 79, 5, 192, 192, 145, 197, 197, 5, 5, 145, - /* 580 */ 5, 5, 90, 89, 135, 113, 192, 192, 202, 107, - /* 590 */ 193, 208, 207, 204, 206, 203, 205, 201, 193, 193, - /* 600 */ 192, 192, 225, 193, 192, 198, 104, 114, 194, 105, - /* 610 */ 109, 105, 104, 1, 105, 76, 109, 104, 225, 104, - /* 620 */ 123, 105, 104, 109, 105, 104, 109, 104, 123, 104, - /* 630 */ 108, 111, 104, 107, 9, 5, 5, 5, 5, 5, - /* 640 */ 80, 15, 139, 76, 109, 16, 5, 5, 105, 5, - /* 650 */ 5, 139, 5, 5, 5, 5, 5, 5, 5, 5, - /* 660 */ 5, 5, 5, 139, 5, 5, 5, 5, 109, 80, - /* 670 */ 60, 0, 59, 263, 263, 263, 263, 263, 263, 21, - /* 680 */ 263, 263, 263, 263, 21, 263, 263, 263, 263, 263, - /* 690 */ 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, - /* 700 */ 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, - /* 710 */ 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, - /* 720 */ 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, - /* 730 */ 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, - /* 740 */ 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, - /* 750 */ 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, - /* 760 */ 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, - /* 770 */ 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, - /* 780 */ 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, - /* 790 */ 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, - /* 800 */ 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, - /* 810 */ 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, - /* 820 */ 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, - /* 830 */ 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, - /* 840 */ 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, - /* 850 */ 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, - /* 860 */ 263, 263, 263, 263, 263, 263, 263, 263, 263, 263, - /* 870 */ 263, 263, + /* 0 */ 1, 33, 34, 192, 80, 37, 38, 39, 9, 189, + /* 10 */ 190, 0, 13, 14, 59, 16, 17, 76, 77, 20, + /* 20 */ 21, 60, 23, 24, 25, 26, 27, 28, 62, 63, + /* 30 */ 64, 107, 33, 34, 139, 140, 37, 38, 39, 13, + /* 40 */ 14, 80, 16, 17, 80, 234, 20, 21, 237, 23, + /* 50 */ 24, 25, 26, 27, 28, 5, 236, 7, 15, 33, + /* 60 */ 34, 139, 140, 37, 38, 39, 13, 14, 110, 16, + /* 70 */ 17, 251, 108, 20, 21, 117, 23, 24, 25, 26, + /* 80 */ 27, 28, 65, 66, 67, 136, 33, 34, 1, 60, + /* 90 */ 37, 38, 39, 144, 145, 68, 9, 199, 37, 38, + /* 100 */ 39, 13, 14, 21, 16, 17, 68, 81, 20, 21, + /* 110 */ 111, 23, 24, 25, 26, 27, 28, 5, 5, 7, + /* 120 */ 7, 33, 34, 5, 110, 37, 38, 39, 230, 231, + /* 130 */ 232, 233, 45, 46, 47, 48, 49, 50, 51, 52, + /* 140 */ 53, 54, 55, 56, 57, 58, 132, 14, 61, 16, + /* 150 */ 17, 33, 34, 20, 21, 112, 23, 24, 25, 26, + /* 160 */ 27, 28, 139, 140, 81, 138, 33, 34, 141, 142, + /* 170 */ 37, 38, 39, 16, 17, 21, 138, 20, 21, 141, + /* 180 */ 23, 24, 25, 26, 27, 28, 5, 197, 7, 0, + /* 190 */ 33, 34, 202, 110, 37, 38, 39, 211, 83, 213, + /* 200 */ 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, + /* 210 */ 224, 225, 226, 91, 92, 93, 94, 95, 96, 97, + /* 220 */ 98, 99, 100, 101, 102, 103, 104, 105, 1, 2, + /* 230 */ 118, 118, 5, 5, 7, 254, 9, 81, 1, 44, + /* 240 */ 25, 26, 27, 28, 263, 198, 9, 192, 33, 34, + /* 250 */ 139, 140, 37, 38, 39, 80, 61, 192, 192, 81, + /* 260 */ 33, 34, 1, 68, 37, 110, 110, 81, 73, 74, + /* 270 */ 75, 82, 1, 2, 79, 80, 5, 81, 7, 211, + /* 280 */ 9, 5, 214, 215, 109, 130, 111, 219, 110, 221, + /* 290 */ 222, 223, 192, 225, 226, 192, 110, 37, 37, 234, + /* 300 */ 234, 254, 237, 237, 33, 34, 110, 80, 113, 91, + /* 310 */ 263, 93, 94, 258, 198, 260, 98, 80, 100, 101, + /* 320 */ 102, 198, 104, 105, 195, 196, 62, 63, 64, 81, + /* 330 */ 135, 239, 137, 69, 70, 71, 72, 234, 143, 112, + /* 340 */ 237, 5, 78, 192, 252, 118, 62, 63, 64, 81, + /* 350 */ 192, 80, 192, 69, 70, 71, 72, 62, 63, 64, + /* 360 */ 260, 134, 262, 192, 69, 70, 71, 72, 2, 81, + /* 370 */ 254, 5, 81, 7, 81, 9, 116, 254, 110, 263, + /* 380 */ 81, 81, 81, 112, 81, 234, 263, 80, 237, 118, + /* 390 */ 125, 126, 234, 199, 234, 237, 1, 237, 110, 33, + /* 400 */ 34, 110, 192, 110, 9, 134, 200, 201, 237, 110, + /* 410 */ 110, 197, 199, 110, 197, 114, 202, 192, 192, 202, + /* 420 */ 113, 76, 192, 192, 236, 231, 191, 192, 212, 84, + /* 430 */ 192, 212, 212, 212, 110, 5, 5, 5, 228, 251, + /* 440 */ 5, 5, 5, 5, 5, 5, 233, 5, 5, 5, + /* 450 */ 5, 5, 110, 5, 238, 5, 140, 238, 238, 238, + /* 460 */ 235, 140, 140, 16, 58, 24, 80, 112, 81, 80, + /* 470 */ 76, 15, 5, 83, 5, 5, 5, 5, 112, 76, + /* 480 */ 109, 80, 9, 108, 80, 108, 260, 256, 80, 124, + /* 490 */ 260, 110, 124, 255, 110, 80, 1, 81, 80, 80, + /* 500 */ 80, 110, 81, 81, 81, 80, 110, 115, 136, 92, + /* 510 */ 5, 114, 5, 146, 5, 5, 146, 93, 5, 200, + /* 520 */ 195, 193, 60, 193, 227, 194, 193, 207, 194, 194, + /* 530 */ 193, 82, 194, 193, 106, 203, 85, 54, 50, 87, + /* 540 */ 86, 88, 193, 193, 89, 206, 205, 204, 90, 193, + /* 550 */ 199, 199, 208, 227, 193, 209, 82, 210, 241, 133, + /* 560 */ 242, 246, 193, 249, 131, 257, 243, 193, 257, 193, + /* 570 */ 257, 244, 193, 193, 245, 193, 119, 192, 264, 120, + /* 580 */ 192, 121, 264, 122, 118, 192, 264, 123, 264, 264, + /* 590 */ 127, 192, 192, 128, 192, 247, 236, 129, 240, 192, + /* 600 */ 236, 248, 192, 192, 250, 192, 192, 229, 264, 236, + /* 610 */ 264, 264, 229, 264, 257, 264, 253, 264, 264, 192, + /* 620 */ 261, 192, 264, 261, 264, 264, 192, 229, 264, 264, + /* 630 */ 264, 264, 264, 264, 229, 84, 264, 264, 229, 264, + /* 640 */ 264, 229, 264, 264, 264, 264, 264, 264, 264, 264, + /* 650 */ 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, + /* 660 */ 264, 264, 264, 264, 264, 264, 264, 192, 192, 192, + /* 670 */ 192, 192, 192, 192, 192, 264, 192, 192, 192, 192, + /* 680 */ 264, 192, 192, 192, 192, 192, 192, 264, 192, 192, + /* 690 */ 192, 192, 192, 192, 192, 192, 192, 264, 192, 264, + /* 700 */ 192, 264, 264, 192, 192, 264, 192, 192, 192, 192, + /* 710 */ 192, 192, 192, 192, 192, 192, 192, 192, 192, 264, + /* 720 */ 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, + /* 730 */ 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, + /* 740 */ 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, + /* 750 */ 264, 264, 264, 264, 264, 264, 229, 264, 264, 264, + /* 760 */ 264, 264, 264, 264, 264, 264, 238, 238, 264, 264, + /* 770 */ 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, + /* 780 */ 264, 264, 264, 264, 254, 254, 254, 254, 254, 254, + /* 790 */ 254, 254, 254, 254, 254, 254, 254, 254, 254, 254, + /* 800 */ 254, 254, 254, 254, }; -#define YY_SHIFT_COUNT (316) -#define YY_SHIFT_MIN (0) -#define YY_SHIFT_MAX (671) -static const unsigned short int yy_shift_ofst[] = { - /* 0 */ 168, 79, 79, 180, 180, 9, 221, 230, 244, 244, - /* 10 */ 244, 244, 244, 244, 244, 244, 244, 0, 48, 230, - /* 20 */ 283, 283, 283, 283, 148, 161, 244, 244, 244, 303, - /* 30 */ 244, 244, 82, 9, 37, 37, 685, 685, 685, 230, - /* 40 */ 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, - /* 50 */ 230, 230, 230, 230, 230, 230, 230, 230, 230, 283, - /* 60 */ 283, 78, 78, 78, 78, 78, 78, 78, 244, 244, - /* 70 */ 244, 207, 244, 161, 161, 244, 244, 244, 254, 254, - /* 80 */ 26, 161, 244, 244, 244, 244, 244, 244, 244, 244, - /* 90 */ 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - /* 100 */ 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - /* 110 */ 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - /* 120 */ 244, 244, 244, 244, 244, 244, 244, 244, 244, 244, - /* 130 */ 244, 244, 244, 415, 415, 415, 365, 365, 365, 415, - /* 140 */ 365, 415, 369, 370, 371, 372, 375, 382, 384, 390, - /* 150 */ 404, 413, 415, 415, 415, 450, 9, 9, 415, 415, - /* 160 */ 470, 474, 511, 479, 478, 510, 483, 487, 450, 415, - /* 170 */ 491, 491, 415, 491, 415, 491, 415, 415, 685, 685, - /* 180 */ 27, 100, 127, 100, 100, 53, 182, 223, 223, 223, - /* 190 */ 223, 237, 249, 273, 318, 318, 318, 318, 77, 103, - /* 200 */ 92, 92, 269, 326, 256, 255, 306, 312, 282, 284, - /* 210 */ 291, 293, 294, 296, 299, 387, 309, 335, 158, 297, - /* 220 */ 302, 305, 307, 310, 313, 316, 289, 292, 295, 331, - /* 230 */ 300, 354, 435, 368, 566, 429, 572, 573, 434, 575, - /* 240 */ 576, 492, 494, 449, 472, 482, 502, 493, 504, 501, - /* 250 */ 506, 508, 509, 507, 513, 612, 515, 516, 518, 514, - /* 260 */ 497, 517, 505, 519, 521, 520, 523, 482, 525, 526, - /* 270 */ 528, 522, 539, 625, 630, 631, 632, 633, 634, 560, - /* 280 */ 626, 567, 503, 535, 535, 629, 512, 524, 535, 641, - /* 290 */ 642, 543, 535, 644, 645, 647, 648, 649, 650, 651, - /* 300 */ 652, 653, 654, 655, 656, 657, 659, 660, 661, 662, - /* 310 */ 559, 589, 658, 663, 610, 613, 671, +#define YY_SHIFT_USE_DFLT (-106) +#define YY_SHIFT_COUNT (321) +#define YY_SHIFT_MIN (-105) +#define YY_SHIFT_MAX (551) +static const short yy_shift_ofst[] = { + /* 0 */ 195, 122, 122, 218, 218, 474, 227, 271, 271, 395, + /* 10 */ 395, 395, 395, 395, 395, 395, 395, 395, -1, 87, + /* 20 */ 271, 366, 366, 366, 366, 237, 307, 395, 395, 395, + /* 30 */ 189, 395, 395, 345, 474, 551, 551, -106, -106, -106, + /* 40 */ 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + /* 50 */ 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + /* 60 */ 366, 366, 118, 118, 118, 118, 118, 118, 118, 395, + /* 70 */ 395, 395, 260, 395, 307, 307, 395, 395, 395, 265, + /* 80 */ 265, -42, 307, 395, 395, 395, 395, 395, 395, 395, + /* 90 */ 395, 395, 395, 395, 395, 395, 395, 395, 395, 395, + /* 100 */ 395, 395, 395, 395, 395, 395, 395, 395, 395, 395, + /* 110 */ 395, 395, 395, 395, 395, 395, 395, 395, 395, 395, + /* 120 */ 395, 395, 395, 395, 395, 395, 395, 395, 395, 395, + /* 130 */ 395, 395, 395, 395, 462, 462, 462, 466, 466, 466, + /* 140 */ 462, 466, 462, 468, 433, 465, 464, 463, 461, 460, + /* 150 */ 459, 457, 426, 462, 462, 462, 428, 474, 474, 462, + /* 160 */ 462, 458, 455, 488, 454, 453, 483, 452, 451, 428, + /* 170 */ 462, 449, 449, 462, 449, 462, 449, 462, 462, -106, + /* 180 */ -106, 26, 53, 53, 88, 53, 133, 157, 215, 215, + /* 190 */ 215, 215, 264, 295, 284, -32, -32, -32, -32, 27, + /* 200 */ -51, 175, 61, 61, 113, 112, 38, 17, -34, 303, + /* 210 */ 301, 300, 299, 293, 14, 155, 291, 288, 268, 196, + /* 220 */ 186, -36, 178, 156, 261, -39, 43, 83, 111, 23, + /* 230 */ -78, -76, -105, 181, 50, -59, 513, 370, 510, 509, + /* 240 */ 367, 507, 505, 424, 417, 372, 397, 377, 425, 392, + /* 250 */ 423, 396, 422, 420, 421, 391, 419, 495, 418, 416, + /* 260 */ 415, 384, 368, 381, 365, 408, 377, 404, 375, 401, + /* 270 */ 371, 403, 473, 472, 471, 470, 469, 467, 390, 456, + /* 280 */ 394, 389, 387, 355, 386, 441, 406, 322, 342, 342, + /* 290 */ 447, 321, 316, 342, 450, 448, 248, 342, 446, 445, + /* 300 */ 444, 443, 442, 440, 439, 438, 437, 436, 435, 432, + /* 310 */ 431, 430, 336, 276, 228, 324, 115, 154, 82, 29, + /* 320 */ -45, 11, }; -#define YY_REDUCE_COUNT (179) -#define YY_REDUCE_MIN (-233) -#define YY_REDUCE_MAX (414) +#define YY_REDUCE_USE_DFLT (-190) +#define YY_REDUCE_COUNT (180) +#define YY_REDUCE_MIN (-189) +#define YY_REDUCE_MAX (549) static const short yy_reduce_ofst[] = { - /* 0 */ -178, -27, -27, 74, 74, 99, -230, -216, -173, -176, - /* 10 */ -45, -76, -8, 34, 114, 133, 135, -185, -188, -233, - /* 20 */ -206, -147, -74, 23, -179, -127, -186, 123, -191, -112, - /* 30 */ 157, 49, 4, 156, 162, 184, 140, 141, -187, -217, - /* 40 */ -194, -144, -51, -18, 165, 169, 173, 177, 189, 195, - /* 50 */ 196, 197, 198, 199, 200, 201, 202, 203, 204, 222, - /* 60 */ 224, 166, 205, 209, 232, 234, 235, 236, 218, 266, - /* 70 */ 274, 213, 275, 233, 238, 277, 278, 279, 212, 214, - /* 80 */ 239, 240, 285, 287, 288, 290, 298, 301, 304, 308, - /* 90 */ 311, 314, 315, 317, 319, 320, 321, 322, 323, 324, - /* 100 */ 325, 327, 328, 329, 330, 332, 333, 334, 336, 337, - /* 110 */ 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, - /* 120 */ 348, 349, 350, 351, 352, 353, 355, 356, 357, 358, - /* 130 */ 359, 360, 361, 362, 363, 364, 225, 228, 229, 366, - /* 140 */ 231, 367, 242, 241, 245, 248, 243, 253, 265, 276, - /* 150 */ 286, 246, 373, 374, 376, 377, 378, 379, 380, 381, - /* 160 */ 383, 385, 388, 386, 391, 392, 389, 396, 393, 394, - /* 170 */ 397, 405, 395, 406, 408, 410, 409, 412, 407, 414, + /* 0 */ -180, -14, -14, 68, 68, -102, 123, 116, 47, 160, + /* 10 */ 100, 55, 158, 151, 103, 66, 65, -189, 238, 235, + /* 20 */ -19, 221, 220, 219, 216, 231, 188, 230, 226, 225, + /* 30 */ 213, 210, 171, 217, 194, 214, -10, 92, 206, 129, + /* 40 */ 549, 548, 547, 546, 545, 544, 543, 542, 541, 540, + /* 50 */ 539, 538, 537, 536, 535, 534, 533, 532, 531, 530, + /* 60 */ 529, 528, 527, 412, 409, 405, 398, 383, 378, 526, + /* 70 */ 525, 524, 363, 523, 373, 364, 522, 521, 520, 362, + /* 80 */ 359, 358, 360, 519, 518, 517, 516, 515, 514, 512, + /* 90 */ 511, 508, 506, 504, 503, 502, 501, 500, 499, 498, + /* 100 */ 497, 496, 494, 493, 492, 491, 490, 489, 487, 486, + /* 110 */ 485, 484, 482, 481, 480, 479, 478, 477, 476, 475, + /* 120 */ 434, 429, 427, 414, 413, 411, 410, 407, 402, 400, + /* 130 */ 399, 393, 388, 385, 382, 380, 379, 357, 313, 311, + /* 140 */ 376, 308, 374, 354, 314, 353, 348, 315, 329, 327, + /* 150 */ 323, 318, 317, 369, 361, 356, 326, 352, 351, 350, + /* 160 */ 349, 347, 346, 344, 343, 320, 341, 339, 332, 297, + /* 170 */ 340, 338, 335, 337, 334, 333, 331, 330, 328, 319, + /* 180 */ 325, }; static const YYACTIONTYPE yy_default[] = { - /* 0 */ 781, 894, 840, 906, 828, 837, 1037, 1037, 781, 781, - /* 10 */ 781, 781, 781, 781, 781, 781, 781, 953, 800, 1037, - /* 20 */ 781, 781, 781, 781, 781, 781, 781, 781, 781, 837, - /* 30 */ 781, 781, 843, 837, 843, 843, 948, 878, 896, 781, - /* 40 */ 781, 781, 781, 781, 781, 781, 781, 781, 781, 781, - /* 50 */ 781, 781, 781, 781, 781, 781, 781, 781, 781, 781, - /* 60 */ 781, 781, 781, 781, 781, 781, 781, 781, 781, 781, - /* 70 */ 781, 955, 958, 781, 781, 960, 781, 781, 980, 980, - /* 80 */ 946, 781, 781, 781, 781, 781, 781, 781, 781, 781, - /* 90 */ 781, 781, 781, 781, 781, 781, 781, 781, 781, 781, - /* 100 */ 781, 781, 781, 781, 781, 781, 781, 781, 781, 826, - /* 110 */ 781, 824, 781, 781, 781, 781, 781, 781, 781, 781, - /* 120 */ 781, 781, 781, 781, 781, 781, 811, 781, 781, 781, - /* 130 */ 781, 781, 781, 802, 802, 802, 781, 781, 781, 802, - /* 140 */ 781, 802, 987, 991, 985, 973, 981, 972, 968, 966, - /* 150 */ 965, 995, 802, 802, 802, 841, 837, 837, 802, 802, - /* 160 */ 859, 857, 855, 847, 853, 849, 851, 845, 829, 802, - /* 170 */ 835, 835, 802, 835, 802, 835, 802, 802, 878, 896, - /* 180 */ 781, 996, 781, 1036, 986, 1026, 1025, 1032, 1024, 1023, - /* 190 */ 1022, 781, 781, 781, 1018, 1019, 1021, 1020, 781, 781, - /* 200 */ 1028, 1027, 781, 781, 781, 781, 781, 781, 781, 781, - /* 210 */ 781, 781, 781, 781, 781, 781, 998, 781, 992, 988, - /* 220 */ 781, 781, 781, 781, 781, 781, 781, 781, 781, 908, - /* 230 */ 781, 781, 781, 781, 781, 781, 781, 781, 781, 781, - /* 240 */ 781, 781, 781, 781, 945, 781, 781, 781, 781, 956, - /* 250 */ 781, 781, 781, 781, 781, 781, 781, 781, 781, 982, - /* 260 */ 781, 974, 781, 781, 781, 781, 781, 920, 781, 781, - /* 270 */ 781, 781, 781, 781, 781, 781, 781, 781, 781, 781, - /* 280 */ 781, 781, 781, 1048, 1046, 781, 781, 781, 1042, 781, - /* 290 */ 781, 781, 1040, 781, 781, 781, 781, 781, 781, 781, - /* 300 */ 781, 781, 781, 781, 781, 781, 781, 781, 781, 781, - /* 310 */ 862, 781, 809, 807, 781, 798, 781, + /* 0 */ 788, 628, 574, 640, 561, 571, 771, 771, 771, 788, + /* 10 */ 788, 788, 788, 788, 788, 788, 788, 788, 687, 533, + /* 20 */ 771, 788, 788, 788, 788, 788, 788, 788, 788, 788, + /* 30 */ 571, 788, 788, 577, 571, 577, 577, 682, 612, 630, + /* 40 */ 788, 788, 788, 788, 788, 788, 788, 788, 788, 788, + /* 50 */ 788, 788, 788, 788, 788, 788, 788, 788, 788, 788, + /* 60 */ 788, 788, 788, 788, 788, 788, 788, 788, 788, 788, + /* 70 */ 788, 788, 689, 692, 788, 788, 694, 788, 788, 714, + /* 80 */ 714, 680, 788, 788, 788, 788, 788, 788, 788, 788, + /* 90 */ 788, 788, 788, 788, 788, 788, 788, 788, 788, 788, + /* 100 */ 788, 788, 788, 788, 788, 788, 788, 788, 788, 788, + /* 110 */ 559, 788, 557, 788, 788, 788, 788, 788, 788, 788, + /* 120 */ 788, 788, 788, 788, 788, 788, 788, 544, 788, 788, + /* 130 */ 788, 788, 788, 788, 535, 535, 535, 788, 788, 788, + /* 140 */ 535, 788, 535, 721, 725, 719, 707, 715, 706, 702, + /* 150 */ 700, 699, 729, 535, 535, 535, 575, 571, 571, 535, + /* 160 */ 535, 593, 591, 589, 581, 587, 583, 585, 579, 562, + /* 170 */ 535, 569, 569, 535, 569, 535, 569, 535, 535, 612, + /* 180 */ 630, 788, 730, 720, 788, 770, 760, 759, 766, 758, + /* 190 */ 757, 756, 788, 788, 788, 752, 755, 754, 753, 788, + /* 200 */ 788, 788, 762, 761, 788, 788, 788, 788, 788, 788, + /* 210 */ 788, 788, 788, 788, 726, 722, 788, 788, 788, 788, + /* 220 */ 788, 788, 788, 788, 788, 732, 788, 788, 788, 788, + /* 230 */ 788, 642, 788, 788, 788, 788, 788, 788, 788, 788, + /* 240 */ 788, 788, 788, 788, 788, 788, 679, 788, 788, 788, + /* 250 */ 788, 690, 788, 788, 788, 788, 788, 788, 788, 788, + /* 260 */ 788, 716, 788, 708, 788, 788, 654, 788, 788, 788, + /* 270 */ 788, 788, 788, 788, 788, 788, 788, 788, 788, 788, + /* 280 */ 788, 788, 788, 788, 788, 788, 788, 788, 782, 780, + /* 290 */ 788, 788, 788, 776, 788, 788, 788, 774, 788, 788, + /* 300 */ 788, 788, 788, 788, 788, 788, 788, 788, 788, 788, + /* 310 */ 788, 788, 788, 788, 788, 596, 788, 542, 540, 788, + /* 320 */ 531, 788, 787, 786, 785, 773, 772, 650, 688, 684, + /* 330 */ 686, 685, 683, 693, 691, 678, 677, 676, 695, 681, + /* 340 */ 698, 697, 701, 704, 703, 705, 696, 718, 717, 710, + /* 350 */ 711, 713, 712, 709, 728, 727, 724, 723, 675, 660, + /* 360 */ 655, 652, 659, 658, 657, 656, 653, 649, 648, 576, + /* 370 */ 629, 627, 626, 625, 624, 623, 622, 621, 620, 619, + /* 380 */ 618, 617, 616, 615, 614, 613, 608, 604, 602, 601, + /* 390 */ 600, 597, 570, 573, 572, 768, 769, 767, 765, 764, + /* 400 */ 763, 749, 748, 747, 746, 743, 742, 741, 738, 744, + /* 410 */ 740, 737, 745, 739, 736, 735, 734, 733, 751, 750, + /* 420 */ 731, 565, 784, 783, 781, 779, 778, 777, 775, 662, + /* 430 */ 663, 644, 647, 646, 645, 643, 661, 595, 594, 592, + /* 440 */ 590, 582, 588, 584, 586, 580, 578, 564, 563, 641, + /* 450 */ 611, 639, 638, 637, 636, 635, 634, 633, 632, 631, + /* 460 */ 610, 609, 607, 606, 605, 603, 599, 598, 665, 674, + /* 470 */ 673, 672, 671, 670, 669, 668, 667, 666, 664, 560, + /* 480 */ 558, 556, 555, 554, 553, 552, 551, 550, 549, 548, + /* 490 */ 547, 568, 546, 545, 543, 541, 539, 538, 537, 567, + /* 500 */ 566, 536, 534, 532, 530, 529, 528, 527, 526, 525, + /* 510 */ 524, 523, 522, 521, 520, 519, 518, }; -/********** End of lemon-generated parsing tables *****************************/ -/* The next table maps tokens (terminal symbols) into fallback tokens. -** If a construct like the following: +/* The next table maps tokens into fallback tokens. If a construct +** like the following: ** ** %fallback ID X Y Z. ** @@ -470,10 +461,6 @@ static const YYACTIONTYPE yy_default[] = { ** and Z. Whenever one of the tokens X, Y, or Z is input to the parser ** but it does not parse, the type of the token is changed to ID and ** the parse is retried before an error is thrown. -** -** This feature can be used, for example, to cause some keywords in a language -** to revert to identifiers if they keyword does not apply in the context where -** it appears. */ #ifdef YYFALLBACK static const YYCODETYPE yyFallback[] = { @@ -556,6 +543,9 @@ static const YYCODETYPE yyFallback[] = { 0, /* PASS => nothing */ 0, /* PRIVILEGE => nothing */ 0, /* LOCAL => nothing */ + 0, /* COMPACT => nothing */ + 0, /* LP => nothing */ + 0, /* RP => nothing */ 0, /* IF => nothing */ 0, /* EXISTS => nothing */ 0, /* PPS => nothing */ @@ -581,8 +571,6 @@ static const YYCODETYPE yyFallback[] = { 0, /* UPDATE => nothing */ 0, /* CACHELAST => nothing */ 0, /* PARTITIONS => nothing */ - 0, /* LP => nothing */ - 0, /* RP => nothing */ 0, /* UNSIGNED => nothing */ 0, /* TAGS => nothing */ 0, /* USING => nothing */ @@ -678,13 +666,9 @@ static const YYCODETYPE yyFallback[] = { ** + The semantic value stored at this level of the stack. This is ** the information used by the action routines in the grammar. ** It is sometimes called the "minor" token. -** -** After the "shift" half of a SHIFTREDUCE action, the stateno field -** actually contains the reduce action for the second half of the -** SHIFTREDUCE. */ struct yyStackEntry { - YYACTIONTYPE stateno; /* The state-number, or reduce action in SHIFTREDUCE */ + YYACTIONTYPE stateno; /* The state-number */ YYCODETYPE major; /* The major token value. This is the code ** number for the token at this stack level */ YYMINORTYPE minor; /* The user-supplied minor token value. This @@ -695,21 +679,17 @@ typedef struct yyStackEntry yyStackEntry; /* The state of the parser is completely contained in an instance of ** the following structure */ struct yyParser { - yyStackEntry *yytos; /* Pointer to top element of the stack */ + int yyidx; /* Index of top element in stack */ #ifdef YYTRACKMAXSTACKDEPTH - int yyhwm; /* High-water mark of the stack */ + int yyidxMax; /* Maximum value of yyidx */ #endif -#ifndef YYNOERRORRECOVERY int yyerrcnt; /* Shifts left before out of the error */ -#endif ParseARG_SDECL /* A place to hold %extra_argument */ #if YYSTACKDEPTH<=0 int yystksz; /* Current side of the stack */ yyStackEntry *yystack; /* The parser's stack */ - yyStackEntry yystk0; /* First stack entry */ #else yyStackEntry yystack[YYSTACKDEPTH]; /* The parser's stack */ - yyStackEntry *yystackEnd; /* Last entry in the stack */ #endif }; typedef struct yyParser yyParser; @@ -746,275 +726,78 @@ void ParseTrace(FILE *TraceFILE, char *zTracePrompt){ } #endif /* NDEBUG */ -#if defined(YYCOVERAGE) || !defined(NDEBUG) +#ifndef NDEBUG /* For tracing shifts, the names of all terminals and nonterminals ** are required. The following table supplies these names */ static const char *const yyTokenName[] = { - /* 0 */ "$", - /* 1 */ "ID", - /* 2 */ "BOOL", - /* 3 */ "TINYINT", - /* 4 */ "SMALLINT", - /* 5 */ "INTEGER", - /* 6 */ "BIGINT", - /* 7 */ "FLOAT", - /* 8 */ "DOUBLE", - /* 9 */ "STRING", - /* 10 */ "TIMESTAMP", - /* 11 */ "BINARY", - /* 12 */ "NCHAR", - /* 13 */ "OR", - /* 14 */ "AND", - /* 15 */ "NOT", - /* 16 */ "EQ", - /* 17 */ "NE", - /* 18 */ "ISNULL", - /* 19 */ "NOTNULL", - /* 20 */ "IS", - /* 21 */ "LIKE", - /* 22 */ "GLOB", - /* 23 */ "BETWEEN", - /* 24 */ "IN", - /* 25 */ "GT", - /* 26 */ "GE", - /* 27 */ "LT", - /* 28 */ "LE", - /* 29 */ "BITAND", - /* 30 */ "BITOR", - /* 31 */ "LSHIFT", - /* 32 */ "RSHIFT", - /* 33 */ "PLUS", - /* 34 */ "MINUS", - /* 35 */ "DIVIDE", - /* 36 */ "TIMES", - /* 37 */ "STAR", - /* 38 */ "SLASH", - /* 39 */ "REM", - /* 40 */ "CONCAT", - /* 41 */ "UMINUS", - /* 42 */ "UPLUS", - /* 43 */ "BITNOT", - /* 44 */ "SHOW", - /* 45 */ "DATABASES", - /* 46 */ "TOPICS", - /* 47 */ "MNODES", - /* 48 */ "DNODES", - /* 49 */ "ACCOUNTS", - /* 50 */ "USERS", - /* 51 */ "MODULES", - /* 52 */ "QUERIES", - /* 53 */ "CONNECTIONS", - /* 54 */ "STREAMS", - /* 55 */ "VARIABLES", - /* 56 */ "SCORES", - /* 57 */ "GRANTS", - /* 58 */ "VNODES", - /* 59 */ "IPTOKEN", - /* 60 */ "DOT", - /* 61 */ "CREATE", - /* 62 */ "TABLE", - /* 63 */ "STABLE", - /* 64 */ "DATABASE", - /* 65 */ "TABLES", - /* 66 */ "STABLES", - /* 67 */ "VGROUPS", - /* 68 */ "DROP", - /* 69 */ "TOPIC", - /* 70 */ "DNODE", - /* 71 */ "USER", - /* 72 */ "ACCOUNT", - /* 73 */ "USE", - /* 74 */ "DESCRIBE", - /* 75 */ "ALTER", - /* 76 */ "PASS", - /* 77 */ "PRIVILEGE", - /* 78 */ "LOCAL", - /* 79 */ "IF", - /* 80 */ "EXISTS", - /* 81 */ "PPS", - /* 82 */ "TSERIES", - /* 83 */ "DBS", - /* 84 */ "STORAGE", - /* 85 */ "QTIME", - /* 86 */ "CONNS", - /* 87 */ "STATE", - /* 88 */ "KEEP", - /* 89 */ "CACHE", - /* 90 */ "REPLICA", - /* 91 */ "QUORUM", - /* 92 */ "DAYS", - /* 93 */ "MINROWS", - /* 94 */ "MAXROWS", - /* 95 */ "BLOCKS", - /* 96 */ "CTIME", - /* 97 */ "WAL", - /* 98 */ "FSYNC", - /* 99 */ "COMP", - /* 100 */ "PRECISION", - /* 101 */ "UPDATE", - /* 102 */ "CACHELAST", - /* 103 */ "PARTITIONS", - /* 104 */ "LP", - /* 105 */ "RP", - /* 106 */ "UNSIGNED", - /* 107 */ "TAGS", - /* 108 */ "USING", - /* 109 */ "COMMA", - /* 110 */ "AS", - /* 111 */ "NULL", - /* 112 */ "SELECT", - /* 113 */ "UNION", - /* 114 */ "ALL", - /* 115 */ "DISTINCT", - /* 116 */ "FROM", - /* 117 */ "VARIABLE", - /* 118 */ "INTERVAL", - /* 119 */ "SESSION", - /* 120 */ "FILL", - /* 121 */ "SLIDING", - /* 122 */ "ORDER", - /* 123 */ "BY", - /* 124 */ "ASC", - /* 125 */ "DESC", - /* 126 */ "GROUP", - /* 127 */ "HAVING", - /* 128 */ "LIMIT", - /* 129 */ "OFFSET", - /* 130 */ "SLIMIT", - /* 131 */ "SOFFSET", - /* 132 */ "WHERE", - /* 133 */ "NOW", - /* 134 */ "RESET", - /* 135 */ "QUERY", - /* 136 */ "SYNCDB", - /* 137 */ "ADD", - /* 138 */ "COLUMN", - /* 139 */ "TAG", - /* 140 */ "CHANGE", - /* 141 */ "SET", - /* 142 */ "KILL", - /* 143 */ "CONNECTION", - /* 144 */ "STREAM", - /* 145 */ "COLON", - /* 146 */ "ABORT", - /* 147 */ "AFTER", - /* 148 */ "ATTACH", - /* 149 */ "BEFORE", - /* 150 */ "BEGIN", - /* 151 */ "CASCADE", - /* 152 */ "CLUSTER", - /* 153 */ "CONFLICT", - /* 154 */ "COPY", - /* 155 */ "DEFERRED", - /* 156 */ "DELIMITERS", - /* 157 */ "DETACH", - /* 158 */ "EACH", - /* 159 */ "END", - /* 160 */ "EXPLAIN", - /* 161 */ "FAIL", - /* 162 */ "FOR", - /* 163 */ "IGNORE", - /* 164 */ "IMMEDIATE", - /* 165 */ "INITIALLY", - /* 166 */ "INSTEAD", - /* 167 */ "MATCH", - /* 168 */ "KEY", - /* 169 */ "OF", - /* 170 */ "RAISE", - /* 171 */ "REPLACE", - /* 172 */ "RESTRICT", - /* 173 */ "ROW", - /* 174 */ "STATEMENT", - /* 175 */ "TRIGGER", - /* 176 */ "VIEW", - /* 177 */ "SEMI", - /* 178 */ "NONE", - /* 179 */ "PREV", - /* 180 */ "LINEAR", - /* 181 */ "IMPORT", - /* 182 */ "TBNAME", - /* 183 */ "JOIN", - /* 184 */ "INSERT", - /* 185 */ "INTO", - /* 186 */ "VALUES", - /* 187 */ "error", - /* 188 */ "program", - /* 189 */ "cmd", - /* 190 */ "dbPrefix", - /* 191 */ "ids", - /* 192 */ "cpxName", - /* 193 */ "ifexists", - /* 194 */ "alter_db_optr", - /* 195 */ "alter_topic_optr", - /* 196 */ "acct_optr", - /* 197 */ "ifnotexists", - /* 198 */ "db_optr", - /* 199 */ "topic_optr", - /* 200 */ "pps", - /* 201 */ "tseries", - /* 202 */ "dbs", - /* 203 */ "streams", - /* 204 */ "storage", - /* 205 */ "qtime", - /* 206 */ "users", - /* 207 */ "conns", - /* 208 */ "state", - /* 209 */ "keep", - /* 210 */ "tagitemlist", - /* 211 */ "cache", - /* 212 */ "replica", - /* 213 */ "quorum", - /* 214 */ "days", - /* 215 */ "minrows", - /* 216 */ "maxrows", - /* 217 */ "blocks", - /* 218 */ "ctime", - /* 219 */ "wal", - /* 220 */ "fsync", - /* 221 */ "comp", - /* 222 */ "prec", - /* 223 */ "update", - /* 224 */ "cachelast", - /* 225 */ "partitions", - /* 226 */ "typename", - /* 227 */ "signed", - /* 228 */ "create_table_args", - /* 229 */ "create_stable_args", - /* 230 */ "create_table_list", - /* 231 */ "create_from_stable", - /* 232 */ "columnlist", - /* 233 */ "tagNamelist", - /* 234 */ "select", - /* 235 */ "column", - /* 236 */ "tagitem", - /* 237 */ "selcollist", - /* 238 */ "from", - /* 239 */ "where_opt", - /* 240 */ "interval_opt", - /* 241 */ "session_option", - /* 242 */ "fill_opt", - /* 243 */ "sliding_opt", - /* 244 */ "groupby_opt", - /* 245 */ "orderby_opt", - /* 246 */ "having_opt", - /* 247 */ "slimit_opt", - /* 248 */ "limit_opt", - /* 249 */ "union", - /* 250 */ "sclp", - /* 251 */ "distinct", - /* 252 */ "expr", - /* 253 */ "as", - /* 254 */ "tablelist", - /* 255 */ "tmvar", - /* 256 */ "sortlist", - /* 257 */ "sortitem", - /* 258 */ "item", - /* 259 */ "sortorder", - /* 260 */ "grouplist", - /* 261 */ "exprlist", - /* 262 */ "expritem", + "$", "ID", "BOOL", "TINYINT", + "SMALLINT", "INTEGER", "BIGINT", "FLOAT", + "DOUBLE", "STRING", "TIMESTAMP", "BINARY", + "NCHAR", "OR", "AND", "NOT", + "EQ", "NE", "ISNULL", "NOTNULL", + "IS", "LIKE", "GLOB", "BETWEEN", + "IN", "GT", "GE", "LT", + "LE", "BITAND", "BITOR", "LSHIFT", + "RSHIFT", "PLUS", "MINUS", "DIVIDE", + "TIMES", "STAR", "SLASH", "REM", + "CONCAT", "UMINUS", "UPLUS", "BITNOT", + "SHOW", "DATABASES", "TOPICS", "MNODES", + "DNODES", "ACCOUNTS", "USERS", "MODULES", + "QUERIES", "CONNECTIONS", "STREAMS", "VARIABLES", + "SCORES", "GRANTS", "VNODES", "IPTOKEN", + "DOT", "CREATE", "TABLE", "STABLE", + "DATABASE", "TABLES", "STABLES", "VGROUPS", + "DROP", "TOPIC", "DNODE", "USER", + "ACCOUNT", "USE", "DESCRIBE", "ALTER", + "PASS", "PRIVILEGE", "LOCAL", "COMPACT", + "LP", "RP", "IF", "EXISTS", + "PPS", "TSERIES", "DBS", "STORAGE", + "QTIME", "CONNS", "STATE", "KEEP", + "CACHE", "REPLICA", "QUORUM", "DAYS", + "MINROWS", "MAXROWS", "BLOCKS", "CTIME", + "WAL", "FSYNC", "COMP", "PRECISION", + "UPDATE", "CACHELAST", "PARTITIONS", "UNSIGNED", + "TAGS", "USING", "COMMA", "AS", + "NULL", "SELECT", "UNION", "ALL", + "DISTINCT", "FROM", "VARIABLE", "INTERVAL", + "SESSION", "FILL", "SLIDING", "ORDER", + "BY", "ASC", "DESC", "GROUP", + "HAVING", "LIMIT", "OFFSET", "SLIMIT", + "SOFFSET", "WHERE", "NOW", "RESET", + "QUERY", "SYNCDB", "ADD", "COLUMN", + "TAG", "CHANGE", "SET", "KILL", + "CONNECTION", "STREAM", "COLON", "ABORT", + "AFTER", "ATTACH", "BEFORE", "BEGIN", + "CASCADE", "CLUSTER", "CONFLICT", "COPY", + "DEFERRED", "DELIMITERS", "DETACH", "EACH", + "END", "EXPLAIN", "FAIL", "FOR", + "IGNORE", "IMMEDIATE", "INITIALLY", "INSTEAD", + "MATCH", "KEY", "OF", "RAISE", + "REPLACE", "RESTRICT", "ROW", "STATEMENT", + "TRIGGER", "VIEW", "SEMI", "NONE", + "PREV", "LINEAR", "IMPORT", "TBNAME", + "JOIN", "INSERT", "INTO", "VALUES", + "error", "program", "cmd", "dbPrefix", + "ids", "cpxName", "ifexists", "alter_db_optr", + "alter_topic_optr", "acct_optr", "exprlist", "ifnotexists", + "db_optr", "topic_optr", "pps", "tseries", + "dbs", "streams", "storage", "qtime", + "users", "conns", "state", "keep", + "tagitemlist", "cache", "replica", "quorum", + "days", "minrows", "maxrows", "blocks", + "ctime", "wal", "fsync", "comp", + "prec", "update", "cachelast", "partitions", + "typename", "signed", "create_table_args", "create_stable_args", + "create_table_list", "create_from_stable", "columnlist", "tagNamelist", + "select", "column", "tagitem", "selcollist", + "from", "where_opt", "interval_opt", "session_option", + "fill_opt", "sliding_opt", "groupby_opt", "orderby_opt", + "having_opt", "slimit_opt", "limit_opt", "union", + "sclp", "distinct", "expr", "as", + "tablelist", "tmvar", "sortlist", "sortitem", + "item", "sortorder", "grouplist", "expritem", }; -#endif /* defined(YYCOVERAGE) || !defined(NDEBUG) */ +#endif /* NDEBUG */ #ifndef NDEBUG /* For tracing reduce actions, the names of all rules are required. @@ -1068,302 +851,256 @@ static const char *const yyRuleName[] = { /* 45 */ "cmd ::= ALTER TOPIC ids alter_topic_optr", /* 46 */ "cmd ::= ALTER ACCOUNT ids acct_optr", /* 47 */ "cmd ::= ALTER ACCOUNT ids PASS ids acct_optr", - /* 48 */ "ids ::= ID", - /* 49 */ "ids ::= STRING", - /* 50 */ "ifexists ::= IF EXISTS", - /* 51 */ "ifexists ::=", - /* 52 */ "ifnotexists ::= IF NOT EXISTS", - /* 53 */ "ifnotexists ::=", - /* 54 */ "cmd ::= CREATE DNODE ids", - /* 55 */ "cmd ::= CREATE ACCOUNT ids PASS ids acct_optr", - /* 56 */ "cmd ::= CREATE DATABASE ifnotexists ids db_optr", - /* 57 */ "cmd ::= CREATE TOPIC ifnotexists ids topic_optr", - /* 58 */ "cmd ::= CREATE USER ids PASS ids", - /* 59 */ "pps ::=", - /* 60 */ "pps ::= PPS INTEGER", - /* 61 */ "tseries ::=", - /* 62 */ "tseries ::= TSERIES INTEGER", - /* 63 */ "dbs ::=", - /* 64 */ "dbs ::= DBS INTEGER", - /* 65 */ "streams ::=", - /* 66 */ "streams ::= STREAMS INTEGER", - /* 67 */ "storage ::=", - /* 68 */ "storage ::= STORAGE INTEGER", - /* 69 */ "qtime ::=", - /* 70 */ "qtime ::= QTIME INTEGER", - /* 71 */ "users ::=", - /* 72 */ "users ::= USERS INTEGER", - /* 73 */ "conns ::=", - /* 74 */ "conns ::= CONNS INTEGER", - /* 75 */ "state ::=", - /* 76 */ "state ::= STATE ids", - /* 77 */ "acct_optr ::= pps tseries storage streams qtime dbs users conns state", - /* 78 */ "keep ::= KEEP tagitemlist", - /* 79 */ "cache ::= CACHE INTEGER", - /* 80 */ "replica ::= REPLICA INTEGER", - /* 81 */ "quorum ::= QUORUM INTEGER", - /* 82 */ "days ::= DAYS INTEGER", - /* 83 */ "minrows ::= MINROWS INTEGER", - /* 84 */ "maxrows ::= MAXROWS INTEGER", - /* 85 */ "blocks ::= BLOCKS INTEGER", - /* 86 */ "ctime ::= CTIME INTEGER", - /* 87 */ "wal ::= WAL INTEGER", - /* 88 */ "fsync ::= FSYNC INTEGER", - /* 89 */ "comp ::= COMP INTEGER", - /* 90 */ "prec ::= PRECISION STRING", - /* 91 */ "update ::= UPDATE INTEGER", - /* 92 */ "cachelast ::= CACHELAST INTEGER", - /* 93 */ "partitions ::= PARTITIONS INTEGER", - /* 94 */ "db_optr ::=", - /* 95 */ "db_optr ::= db_optr cache", - /* 96 */ "db_optr ::= db_optr replica", - /* 97 */ "db_optr ::= db_optr quorum", - /* 98 */ "db_optr ::= db_optr days", - /* 99 */ "db_optr ::= db_optr minrows", - /* 100 */ "db_optr ::= db_optr maxrows", - /* 101 */ "db_optr ::= db_optr blocks", - /* 102 */ "db_optr ::= db_optr ctime", - /* 103 */ "db_optr ::= db_optr wal", - /* 104 */ "db_optr ::= db_optr fsync", - /* 105 */ "db_optr ::= db_optr comp", - /* 106 */ "db_optr ::= db_optr prec", - /* 107 */ "db_optr ::= db_optr keep", - /* 108 */ "db_optr ::= db_optr update", - /* 109 */ "db_optr ::= db_optr cachelast", - /* 110 */ "topic_optr ::= db_optr", - /* 111 */ "topic_optr ::= topic_optr partitions", - /* 112 */ "alter_db_optr ::=", - /* 113 */ "alter_db_optr ::= alter_db_optr replica", - /* 114 */ "alter_db_optr ::= alter_db_optr quorum", - /* 115 */ "alter_db_optr ::= alter_db_optr keep", - /* 116 */ "alter_db_optr ::= alter_db_optr blocks", - /* 117 */ "alter_db_optr ::= alter_db_optr comp", - /* 118 */ "alter_db_optr ::= alter_db_optr wal", - /* 119 */ "alter_db_optr ::= alter_db_optr fsync", - /* 120 */ "alter_db_optr ::= alter_db_optr update", - /* 121 */ "alter_db_optr ::= alter_db_optr cachelast", - /* 122 */ "alter_topic_optr ::= alter_db_optr", - /* 123 */ "alter_topic_optr ::= alter_topic_optr partitions", - /* 124 */ "typename ::= ids", - /* 125 */ "typename ::= ids LP signed RP", - /* 126 */ "typename ::= ids UNSIGNED", - /* 127 */ "signed ::= INTEGER", - /* 128 */ "signed ::= PLUS INTEGER", - /* 129 */ "signed ::= MINUS INTEGER", - /* 130 */ "cmd ::= CREATE TABLE create_table_args", - /* 131 */ "cmd ::= CREATE TABLE create_stable_args", - /* 132 */ "cmd ::= CREATE STABLE create_stable_args", - /* 133 */ "cmd ::= CREATE TABLE create_table_list", - /* 134 */ "create_table_list ::= create_from_stable", - /* 135 */ "create_table_list ::= create_table_list create_from_stable", - /* 136 */ "create_table_args ::= ifnotexists ids cpxName LP columnlist RP", - /* 137 */ "create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP", - /* 138 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP", - /* 139 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP", - /* 140 */ "tagNamelist ::= tagNamelist COMMA ids", - /* 141 */ "tagNamelist ::= ids", - /* 142 */ "create_table_args ::= ifnotexists ids cpxName AS select", - /* 143 */ "columnlist ::= columnlist COMMA column", - /* 144 */ "columnlist ::= column", - /* 145 */ "column ::= ids typename", - /* 146 */ "tagitemlist ::= tagitemlist COMMA tagitem", - /* 147 */ "tagitemlist ::= tagitem", - /* 148 */ "tagitem ::= INTEGER", - /* 149 */ "tagitem ::= FLOAT", - /* 150 */ "tagitem ::= STRING", - /* 151 */ "tagitem ::= BOOL", - /* 152 */ "tagitem ::= NULL", - /* 153 */ "tagitem ::= MINUS INTEGER", - /* 154 */ "tagitem ::= MINUS FLOAT", - /* 155 */ "tagitem ::= PLUS INTEGER", - /* 156 */ "tagitem ::= PLUS FLOAT", - /* 157 */ "select ::= SELECT selcollist from where_opt interval_opt session_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt", - /* 158 */ "select ::= LP select RP", - /* 159 */ "union ::= select", - /* 160 */ "union ::= union UNION ALL select", - /* 161 */ "cmd ::= union", - /* 162 */ "select ::= SELECT selcollist", - /* 163 */ "sclp ::= selcollist COMMA", - /* 164 */ "sclp ::=", - /* 165 */ "selcollist ::= sclp distinct expr as", - /* 166 */ "selcollist ::= sclp STAR", - /* 167 */ "as ::= AS ids", - /* 168 */ "as ::= ids", - /* 169 */ "as ::=", - /* 170 */ "distinct ::= DISTINCT", - /* 171 */ "distinct ::=", - /* 172 */ "from ::= FROM tablelist", - /* 173 */ "from ::= FROM LP union RP", - /* 174 */ "tablelist ::= ids cpxName", - /* 175 */ "tablelist ::= ids cpxName ids", - /* 176 */ "tablelist ::= tablelist COMMA ids cpxName", - /* 177 */ "tablelist ::= tablelist COMMA ids cpxName ids", - /* 178 */ "tmvar ::= VARIABLE", - /* 179 */ "interval_opt ::= INTERVAL LP tmvar RP", - /* 180 */ "interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP", - /* 181 */ "interval_opt ::=", - /* 182 */ "session_option ::=", - /* 183 */ "session_option ::= SESSION LP ids cpxName COMMA tmvar RP", - /* 184 */ "fill_opt ::=", - /* 185 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP", - /* 186 */ "fill_opt ::= FILL LP ID RP", - /* 187 */ "sliding_opt ::= SLIDING LP tmvar RP", - /* 188 */ "sliding_opt ::=", - /* 189 */ "orderby_opt ::=", - /* 190 */ "orderby_opt ::= ORDER BY sortlist", - /* 191 */ "sortlist ::= sortlist COMMA item sortorder", - /* 192 */ "sortlist ::= item sortorder", - /* 193 */ "item ::= ids cpxName", - /* 194 */ "sortorder ::= ASC", - /* 195 */ "sortorder ::= DESC", - /* 196 */ "sortorder ::=", - /* 197 */ "groupby_opt ::=", - /* 198 */ "groupby_opt ::= GROUP BY grouplist", - /* 199 */ "grouplist ::= grouplist COMMA item", - /* 200 */ "grouplist ::= item", - /* 201 */ "having_opt ::=", - /* 202 */ "having_opt ::= HAVING expr", - /* 203 */ "limit_opt ::=", - /* 204 */ "limit_opt ::= LIMIT signed", - /* 205 */ "limit_opt ::= LIMIT signed OFFSET signed", - /* 206 */ "limit_opt ::= LIMIT signed COMMA signed", - /* 207 */ "slimit_opt ::=", - /* 208 */ "slimit_opt ::= SLIMIT signed", - /* 209 */ "slimit_opt ::= SLIMIT signed SOFFSET signed", - /* 210 */ "slimit_opt ::= SLIMIT signed COMMA signed", - /* 211 */ "where_opt ::=", - /* 212 */ "where_opt ::= WHERE expr", - /* 213 */ "expr ::= LP expr RP", - /* 214 */ "expr ::= ID", - /* 215 */ "expr ::= ID DOT ID", - /* 216 */ "expr ::= ID DOT STAR", - /* 217 */ "expr ::= INTEGER", - /* 218 */ "expr ::= MINUS INTEGER", - /* 219 */ "expr ::= PLUS INTEGER", - /* 220 */ "expr ::= FLOAT", - /* 221 */ "expr ::= MINUS FLOAT", - /* 222 */ "expr ::= PLUS FLOAT", - /* 223 */ "expr ::= STRING", - /* 224 */ "expr ::= NOW", - /* 225 */ "expr ::= VARIABLE", - /* 226 */ "expr ::= PLUS VARIABLE", - /* 227 */ "expr ::= MINUS VARIABLE", - /* 228 */ "expr ::= BOOL", - /* 229 */ "expr ::= NULL", - /* 230 */ "expr ::= ID LP exprlist RP", - /* 231 */ "expr ::= ID LP STAR RP", - /* 232 */ "expr ::= expr IS NULL", - /* 233 */ "expr ::= expr IS NOT NULL", - /* 234 */ "expr ::= expr LT expr", - /* 235 */ "expr ::= expr GT expr", - /* 236 */ "expr ::= expr LE expr", - /* 237 */ "expr ::= expr GE expr", - /* 238 */ "expr ::= expr NE expr", - /* 239 */ "expr ::= expr EQ expr", - /* 240 */ "expr ::= expr BETWEEN expr AND expr", - /* 241 */ "expr ::= expr AND expr", - /* 242 */ "expr ::= expr OR expr", - /* 243 */ "expr ::= expr PLUS expr", - /* 244 */ "expr ::= expr MINUS expr", - /* 245 */ "expr ::= expr STAR expr", - /* 246 */ "expr ::= expr SLASH expr", - /* 247 */ "expr ::= expr REM expr", - /* 248 */ "expr ::= expr LIKE expr", - /* 249 */ "expr ::= expr IN LP exprlist RP", - /* 250 */ "exprlist ::= exprlist COMMA expritem", - /* 251 */ "exprlist ::= expritem", - /* 252 */ "expritem ::= expr", - /* 253 */ "expritem ::=", - /* 254 */ "cmd ::= RESET QUERY CACHE", - /* 255 */ "cmd ::= SYNCDB ids REPLICA", - /* 256 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist", - /* 257 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids", - /* 258 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist", - /* 259 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids", - /* 260 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids", - /* 261 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem", - /* 262 */ "cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist", - /* 263 */ "cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids", - /* 264 */ "cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist", - /* 265 */ "cmd ::= ALTER STABLE ids cpxName DROP TAG ids", - /* 266 */ "cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids", - /* 267 */ "cmd ::= KILL CONNECTION INTEGER", - /* 268 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER", - /* 269 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER", + /* 48 */ "cmd ::= COMPACT VNODES IN LP exprlist RP", + /* 49 */ "ids ::= ID", + /* 50 */ "ids ::= STRING", + /* 51 */ "ifexists ::= IF EXISTS", + /* 52 */ "ifexists ::=", + /* 53 */ "ifnotexists ::= IF NOT EXISTS", + /* 54 */ "ifnotexists ::=", + /* 55 */ "cmd ::= CREATE DNODE ids", + /* 56 */ "cmd ::= CREATE ACCOUNT ids PASS ids acct_optr", + /* 57 */ "cmd ::= CREATE DATABASE ifnotexists ids db_optr", + /* 58 */ "cmd ::= CREATE TOPIC ifnotexists ids topic_optr", + /* 59 */ "cmd ::= CREATE USER ids PASS ids", + /* 60 */ "pps ::=", + /* 61 */ "pps ::= PPS INTEGER", + /* 62 */ "tseries ::=", + /* 63 */ "tseries ::= TSERIES INTEGER", + /* 64 */ "dbs ::=", + /* 65 */ "dbs ::= DBS INTEGER", + /* 66 */ "streams ::=", + /* 67 */ "streams ::= STREAMS INTEGER", + /* 68 */ "storage ::=", + /* 69 */ "storage ::= STORAGE INTEGER", + /* 70 */ "qtime ::=", + /* 71 */ "qtime ::= QTIME INTEGER", + /* 72 */ "users ::=", + /* 73 */ "users ::= USERS INTEGER", + /* 74 */ "conns ::=", + /* 75 */ "conns ::= CONNS INTEGER", + /* 76 */ "state ::=", + /* 77 */ "state ::= STATE ids", + /* 78 */ "acct_optr ::= pps tseries storage streams qtime dbs users conns state", + /* 79 */ "keep ::= KEEP tagitemlist", + /* 80 */ "cache ::= CACHE INTEGER", + /* 81 */ "replica ::= REPLICA INTEGER", + /* 82 */ "quorum ::= QUORUM INTEGER", + /* 83 */ "days ::= DAYS INTEGER", + /* 84 */ "minrows ::= MINROWS INTEGER", + /* 85 */ "maxrows ::= MAXROWS INTEGER", + /* 86 */ "blocks ::= BLOCKS INTEGER", + /* 87 */ "ctime ::= CTIME INTEGER", + /* 88 */ "wal ::= WAL INTEGER", + /* 89 */ "fsync ::= FSYNC INTEGER", + /* 90 */ "comp ::= COMP INTEGER", + /* 91 */ "prec ::= PRECISION STRING", + /* 92 */ "update ::= UPDATE INTEGER", + /* 93 */ "cachelast ::= CACHELAST INTEGER", + /* 94 */ "partitions ::= PARTITIONS INTEGER", + /* 95 */ "db_optr ::=", + /* 96 */ "db_optr ::= db_optr cache", + /* 97 */ "db_optr ::= db_optr replica", + /* 98 */ "db_optr ::= db_optr quorum", + /* 99 */ "db_optr ::= db_optr days", + /* 100 */ "db_optr ::= db_optr minrows", + /* 101 */ "db_optr ::= db_optr maxrows", + /* 102 */ "db_optr ::= db_optr blocks", + /* 103 */ "db_optr ::= db_optr ctime", + /* 104 */ "db_optr ::= db_optr wal", + /* 105 */ "db_optr ::= db_optr fsync", + /* 106 */ "db_optr ::= db_optr comp", + /* 107 */ "db_optr ::= db_optr prec", + /* 108 */ "db_optr ::= db_optr keep", + /* 109 */ "db_optr ::= db_optr update", + /* 110 */ "db_optr ::= db_optr cachelast", + /* 111 */ "topic_optr ::= db_optr", + /* 112 */ "topic_optr ::= topic_optr partitions", + /* 113 */ "alter_db_optr ::=", + /* 114 */ "alter_db_optr ::= alter_db_optr replica", + /* 115 */ "alter_db_optr ::= alter_db_optr quorum", + /* 116 */ "alter_db_optr ::= alter_db_optr keep", + /* 117 */ "alter_db_optr ::= alter_db_optr blocks", + /* 118 */ "alter_db_optr ::= alter_db_optr comp", + /* 119 */ "alter_db_optr ::= alter_db_optr wal", + /* 120 */ "alter_db_optr ::= alter_db_optr fsync", + /* 121 */ "alter_db_optr ::= alter_db_optr update", + /* 122 */ "alter_db_optr ::= alter_db_optr cachelast", + /* 123 */ "alter_topic_optr ::= alter_db_optr", + /* 124 */ "alter_topic_optr ::= alter_topic_optr partitions", + /* 125 */ "typename ::= ids", + /* 126 */ "typename ::= ids LP signed RP", + /* 127 */ "typename ::= ids UNSIGNED", + /* 128 */ "signed ::= INTEGER", + /* 129 */ "signed ::= PLUS INTEGER", + /* 130 */ "signed ::= MINUS INTEGER", + /* 131 */ "cmd ::= CREATE TABLE create_table_args", + /* 132 */ "cmd ::= CREATE TABLE create_stable_args", + /* 133 */ "cmd ::= CREATE STABLE create_stable_args", + /* 134 */ "cmd ::= CREATE TABLE create_table_list", + /* 135 */ "create_table_list ::= create_from_stable", + /* 136 */ "create_table_list ::= create_table_list create_from_stable", + /* 137 */ "create_table_args ::= ifnotexists ids cpxName LP columnlist RP", + /* 138 */ "create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP", + /* 139 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP", + /* 140 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP", + /* 141 */ "tagNamelist ::= tagNamelist COMMA ids", + /* 142 */ "tagNamelist ::= ids", + /* 143 */ "create_table_args ::= ifnotexists ids cpxName AS select", + /* 144 */ "columnlist ::= columnlist COMMA column", + /* 145 */ "columnlist ::= column", + /* 146 */ "column ::= ids typename", + /* 147 */ "tagitemlist ::= tagitemlist COMMA tagitem", + /* 148 */ "tagitemlist ::= tagitem", + /* 149 */ "tagitem ::= INTEGER", + /* 150 */ "tagitem ::= FLOAT", + /* 151 */ "tagitem ::= STRING", + /* 152 */ "tagitem ::= BOOL", + /* 153 */ "tagitem ::= NULL", + /* 154 */ "tagitem ::= MINUS INTEGER", + /* 155 */ "tagitem ::= MINUS FLOAT", + /* 156 */ "tagitem ::= PLUS INTEGER", + /* 157 */ "tagitem ::= PLUS FLOAT", + /* 158 */ "select ::= SELECT selcollist from where_opt interval_opt session_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt", + /* 159 */ "select ::= LP select RP", + /* 160 */ "union ::= select", + /* 161 */ "union ::= union UNION ALL select", + /* 162 */ "cmd ::= union", + /* 163 */ "select ::= SELECT selcollist", + /* 164 */ "sclp ::= selcollist COMMA", + /* 165 */ "sclp ::=", + /* 166 */ "selcollist ::= sclp distinct expr as", + /* 167 */ "selcollist ::= sclp STAR", + /* 168 */ "as ::= AS ids", + /* 169 */ "as ::= ids", + /* 170 */ "as ::=", + /* 171 */ "distinct ::= DISTINCT", + /* 172 */ "distinct ::=", + /* 173 */ "from ::= FROM tablelist", + /* 174 */ "from ::= FROM LP union RP", + /* 175 */ "tablelist ::= ids cpxName", + /* 176 */ "tablelist ::= ids cpxName ids", + /* 177 */ "tablelist ::= tablelist COMMA ids cpxName", + /* 178 */ "tablelist ::= tablelist COMMA ids cpxName ids", + /* 179 */ "tmvar ::= VARIABLE", + /* 180 */ "interval_opt ::= INTERVAL LP tmvar RP", + /* 181 */ "interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP", + /* 182 */ "interval_opt ::=", + /* 183 */ "session_option ::=", + /* 184 */ "session_option ::= SESSION LP ids cpxName COMMA tmvar RP", + /* 185 */ "fill_opt ::=", + /* 186 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP", + /* 187 */ "fill_opt ::= FILL LP ID RP", + /* 188 */ "sliding_opt ::= SLIDING LP tmvar RP", + /* 189 */ "sliding_opt ::=", + /* 190 */ "orderby_opt ::=", + /* 191 */ "orderby_opt ::= ORDER BY sortlist", + /* 192 */ "sortlist ::= sortlist COMMA item sortorder", + /* 193 */ "sortlist ::= item sortorder", + /* 194 */ "item ::= ids cpxName", + /* 195 */ "sortorder ::= ASC", + /* 196 */ "sortorder ::= DESC", + /* 197 */ "sortorder ::=", + /* 198 */ "groupby_opt ::=", + /* 199 */ "groupby_opt ::= GROUP BY grouplist", + /* 200 */ "grouplist ::= grouplist COMMA item", + /* 201 */ "grouplist ::= item", + /* 202 */ "having_opt ::=", + /* 203 */ "having_opt ::= HAVING expr", + /* 204 */ "limit_opt ::=", + /* 205 */ "limit_opt ::= LIMIT signed", + /* 206 */ "limit_opt ::= LIMIT signed OFFSET signed", + /* 207 */ "limit_opt ::= LIMIT signed COMMA signed", + /* 208 */ "slimit_opt ::=", + /* 209 */ "slimit_opt ::= SLIMIT signed", + /* 210 */ "slimit_opt ::= SLIMIT signed SOFFSET signed", + /* 211 */ "slimit_opt ::= SLIMIT signed COMMA signed", + /* 212 */ "where_opt ::=", + /* 213 */ "where_opt ::= WHERE expr", + /* 214 */ "expr ::= LP expr RP", + /* 215 */ "expr ::= ID", + /* 216 */ "expr ::= ID DOT ID", + /* 217 */ "expr ::= ID DOT STAR", + /* 218 */ "expr ::= INTEGER", + /* 219 */ "expr ::= MINUS INTEGER", + /* 220 */ "expr ::= PLUS INTEGER", + /* 221 */ "expr ::= FLOAT", + /* 222 */ "expr ::= MINUS FLOAT", + /* 223 */ "expr ::= PLUS FLOAT", + /* 224 */ "expr ::= STRING", + /* 225 */ "expr ::= NOW", + /* 226 */ "expr ::= VARIABLE", + /* 227 */ "expr ::= PLUS VARIABLE", + /* 228 */ "expr ::= MINUS VARIABLE", + /* 229 */ "expr ::= BOOL", + /* 230 */ "expr ::= NULL", + /* 231 */ "expr ::= ID LP exprlist RP", + /* 232 */ "expr ::= ID LP STAR RP", + /* 233 */ "expr ::= expr IS NULL", + /* 234 */ "expr ::= expr IS NOT NULL", + /* 235 */ "expr ::= expr LT expr", + /* 236 */ "expr ::= expr GT expr", + /* 237 */ "expr ::= expr LE expr", + /* 238 */ "expr ::= expr GE expr", + /* 239 */ "expr ::= expr NE expr", + /* 240 */ "expr ::= expr EQ expr", + /* 241 */ "expr ::= expr BETWEEN expr AND expr", + /* 242 */ "expr ::= expr AND expr", + /* 243 */ "expr ::= expr OR expr", + /* 244 */ "expr ::= expr PLUS expr", + /* 245 */ "expr ::= expr MINUS expr", + /* 246 */ "expr ::= expr STAR expr", + /* 247 */ "expr ::= expr SLASH expr", + /* 248 */ "expr ::= expr REM expr", + /* 249 */ "expr ::= expr LIKE expr", + /* 250 */ "expr ::= expr IN LP exprlist RP", + /* 251 */ "exprlist ::= exprlist COMMA expritem", + /* 252 */ "exprlist ::= expritem", + /* 253 */ "expritem ::= expr", + /* 254 */ "expritem ::=", + /* 255 */ "cmd ::= RESET QUERY CACHE", + /* 256 */ "cmd ::= SYNCDB ids REPLICA", + /* 257 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist", + /* 258 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids", + /* 259 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist", + /* 260 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids", + /* 261 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids", + /* 262 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem", + /* 263 */ "cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist", + /* 264 */ "cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids", + /* 265 */ "cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist", + /* 266 */ "cmd ::= ALTER STABLE ids cpxName DROP TAG ids", + /* 267 */ "cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids", + /* 268 */ "cmd ::= KILL CONNECTION INTEGER", + /* 269 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER", + /* 270 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER", }; #endif /* NDEBUG */ #if YYSTACKDEPTH<=0 /* -** Try to increase the size of the parser stack. Return the number -** of errors. Return 0 on success. +** Try to increase the size of the parser stack. */ -static int yyGrowStack(yyParser *p){ +static void yyGrowStack(yyParser *p){ int newSize; - int idx; yyStackEntry *pNew; newSize = p->yystksz*2 + 100; - idx = p->yytos ? (int)(p->yytos - p->yystack) : 0; - if( p->yystack==&p->yystk0 ){ - pNew = malloc(newSize*sizeof(pNew[0])); - if( pNew ) pNew[0] = p->yystk0; - }else{ - pNew = realloc(p->yystack, newSize*sizeof(pNew[0])); - } + pNew = realloc(p->yystack, newSize*sizeof(pNew[0])); if( pNew ){ p->yystack = pNew; - p->yytos = &p->yystack[idx]; + p->yystksz = newSize; #ifndef NDEBUG if( yyTraceFILE ){ - fprintf(yyTraceFILE,"%sStack grows from %d to %d entries.\n", - yyTracePrompt, p->yystksz, newSize); + fprintf(yyTraceFILE,"%sStack grows to %d entries!\n", + yyTracePrompt, p->yystksz); } #endif - p->yystksz = newSize; } - return pNew==0; } #endif -/* Datatype of the argument to the memory allocated passed as the -** second argument to ParseAlloc() below. This can be changed by -** putting an appropriate #define in the %include section of the input -** grammar. -*/ -#ifndef YYMALLOCARGTYPE -# define YYMALLOCARGTYPE size_t -#endif - -/* Initialize a new parser that has already been allocated. -*/ -void ParseInit(void *yypParser){ - yyParser *pParser = (yyParser*)yypParser; -#ifdef YYTRACKMAXSTACKDEPTH - pParser->yyhwm = 0; -#endif -#if YYSTACKDEPTH<=0 - pParser->yytos = NULL; - pParser->yystack = NULL; - pParser->yystksz = 0; - if( yyGrowStack(pParser) ){ - pParser->yystack = &pParser->yystk0; - pParser->yystksz = 1; - } -#endif -#ifndef YYNOERRORRECOVERY - pParser->yyerrcnt = -1; -#endif - pParser->yytos = pParser->yystack; - pParser->yystack[0].stateno = 0; - pParser->yystack[0].major = 0; -#if YYSTACKDEPTH>0 - pParser->yystackEnd = &pParser->yystack[YYSTACKDEPTH-1]; -#endif -} - -#ifndef Parse_ENGINEALWAYSONSTACK /* ** This function allocates a new parser. ** The only argument is a pointer to a function which works like @@ -1376,21 +1113,27 @@ void ParseInit(void *yypParser){ ** A pointer to a parser. This pointer is used in subsequent calls ** to Parse and ParseFree. */ -void *ParseAlloc(void *(*mallocProc)(YYMALLOCARGTYPE)){ +void *ParseAlloc(void *(*mallocProc)(size_t)){ yyParser *pParser; - pParser = (yyParser*)(*mallocProc)( (YYMALLOCARGTYPE)sizeof(yyParser) ); - if( pParser ) ParseInit(pParser); + pParser = (yyParser*)(*mallocProc)( (size_t)sizeof(yyParser) ); + if( pParser ){ + pParser->yyidx = -1; +#ifdef YYTRACKMAXSTACKDEPTH + pParser->yyidxMax = 0; +#endif +#if YYSTACKDEPTH<=0 + pParser->yystack = NULL; + pParser->yystksz = 0; + yyGrowStack(pParser); +#endif + } return pParser; } -#endif /* Parse_ENGINEALWAYSONSTACK */ - -/* The following function deletes the "minor type" or semantic value -** associated with a symbol. The symbol can be either a terminal -** or nonterminal. "yymajor" is the symbol code, and "yypminor" is -** a pointer to the value to be deleted. The code used to do the -** deletions is derived from the %destructor and/or %token_destructor -** directives of the input grammar. +/* The following function deletes the value associated with a +** symbol. The symbol can be either a terminal or nonterminal. +** "yymajor" is the symbol code, and "yypminor" is a pointer to +** the value. */ static void yy_destructor( yyParser *yypParser, /* The parser */ @@ -1406,65 +1149,63 @@ static void yy_destructor( ** being destroyed before it is finished parsing. ** ** Note: during a reduce, the only symbols destroyed are those - ** which appear on the RHS of the rule, but which are *not* used + ** which appear on the RHS of the rule, but which are not used ** inside the C code. */ -/********* Begin destructor definitions ***************************************/ - case 209: /* keep */ - case 210: /* tagitemlist */ - case 232: /* columnlist */ - case 233: /* tagNamelist */ - case 242: /* fill_opt */ - case 244: /* groupby_opt */ - case 245: /* orderby_opt */ - case 256: /* sortlist */ - case 260: /* grouplist */ + case 198: /* exprlist */ + case 239: /* selcollist */ + case 252: /* sclp */ { -taosArrayDestroy((yypminor->yy159)); +tSqlExprListDestroy((yypminor->yy285)); } break; - case 230: /* create_table_list */ + case 211: /* keep */ + case 212: /* tagitemlist */ + case 234: /* columnlist */ + case 235: /* tagNamelist */ + case 244: /* fill_opt */ + case 246: /* groupby_opt */ + case 247: /* orderby_opt */ + case 258: /* sortlist */ + case 262: /* grouplist */ { -destroyCreateTableSql((yypminor->yy14)); +taosArrayDestroy((yypminor->yy285)); } break; - case 234: /* select */ + case 232: /* create_table_list */ { -destroySqlNode((yypminor->yy116)); +destroyCreateTableSql((yypminor->yy470)); } break; - case 237: /* selcollist */ - case 250: /* sclp */ - case 261: /* exprlist */ + case 236: /* select */ { -tSqlExprListDestroy((yypminor->yy159)); +destroySqlNode((yypminor->yy344)); } break; - case 238: /* from */ - case 254: /* tablelist */ + case 240: /* from */ + case 256: /* tablelist */ { -destroyRelationInfo((yypminor->yy236)); +destroyRelationInfo((yypminor->yy148)); } break; - case 239: /* where_opt */ - case 246: /* having_opt */ - case 252: /* expr */ - case 262: /* expritem */ + case 241: /* where_opt */ + case 248: /* having_opt */ + case 254: /* expr */ + case 263: /* expritem */ { -tSqlExprDestroy((yypminor->yy118)); +tSqlExprDestroy((yypminor->yy178)); } break; - case 249: /* union */ + case 251: /* union */ { -destroyAllSqlNode((yypminor->yy159)); +destroyAllSqlNode((yypminor->yy285)); } break; - case 257: /* sortitem */ + case 259: /* sortitem */ { -tVariantDestroy(&(yypminor->yy488)); +tVariantDestroy(&(yypminor->yy362)); } break; -/********* End destructor definitions *****************************************/ default: break; /* If no destructor action specified: do nothing */ } } @@ -1474,53 +1215,51 @@ tVariantDestroy(&(yypminor->yy488)); ** ** If there is a destructor routine associated with the token which ** is popped from the stack, then call it. +** +** Return the major token number for the symbol popped. */ -static void yy_pop_parser_stack(yyParser *pParser){ - yyStackEntry *yytos; - assert( pParser->yytos!=0 ); - assert( pParser->yytos > pParser->yystack ); - yytos = pParser->yytos--; +static int yy_pop_parser_stack(yyParser *pParser){ + YYCODETYPE yymajor; + yyStackEntry *yytos = &pParser->yystack[pParser->yyidx]; + + if( pParser->yyidx<0 ) return 0; #ifndef NDEBUG - if( yyTraceFILE ){ + if( yyTraceFILE && pParser->yyidx>=0 ){ fprintf(yyTraceFILE,"%sPopping %s\n", yyTracePrompt, yyTokenName[yytos->major]); } #endif - yy_destructor(pParser, yytos->major, &yytos->minor); + yymajor = yytos->major; + yy_destructor(pParser, yymajor, &yytos->minor); + pParser->yyidx--; + return yymajor; } -/* -** Clear all secondary memory allocations from the parser -*/ -void ParseFinalize(void *p){ - yyParser *pParser = (yyParser*)p; - while( pParser->yytos>pParser->yystack ) yy_pop_parser_stack(pParser); -#if YYSTACKDEPTH<=0 - if( pParser->yystack!=&pParser->yystk0 ) free(pParser->yystack); -#endif -} - -#ifndef Parse_ENGINEALWAYSONSTACK /* -** Deallocate and destroy a parser. Destructors are called for +** Deallocate and destroy a parser. Destructors are all called for ** all stack elements before shutting the parser down. ** -** If the YYPARSEFREENEVERNULL macro exists (for example because it -** is defined in a %include section of the input grammar) then it is -** assumed that the input pointer is never NULL. +** Inputs: +**
    +**
  • A pointer to the parser. This should be a pointer +** obtained from ParseAlloc. +**
  • A pointer to a function used to reclaim memory obtained +** from malloc. +**
*/ void ParseFree( void *p, /* The parser to be deleted */ void (*freeProc)(void*) /* Function used to reclaim memory */ ){ -#ifndef YYPARSEFREENEVERNULL - if( p==0 ) return; + yyParser *pParser = (yyParser*)p; + if( pParser==0 ) return; + while( pParser->yyidx>=0 ) yy_pop_parser_stack(pParser); +#if YYSTACKDEPTH<=0 + free(pParser->yystack); #endif - ParseFinalize(p); - (*freeProc)(p); + (*freeProc)((void*)pParser); } -#endif /* Parse_ENGINEALWAYSONSTACK */ /* ** Return the peak depth of the stack for a parser. @@ -1528,70 +1267,33 @@ void ParseFree( #ifdef YYTRACKMAXSTACKDEPTH int ParseStackPeak(void *p){ yyParser *pParser = (yyParser*)p; - return pParser->yyhwm; -} -#endif - -/* This array of booleans keeps track of the parser statement -** coverage. The element yycoverage[X][Y] is set when the parser -** is in state X and has a lookahead token Y. In a well-tested -** systems, every element of this matrix should end up being set. -*/ -#if defined(YYCOVERAGE) -static unsigned char yycoverage[YYNSTATE][YYNTOKEN]; -#endif - -/* -** Write into out a description of every state/lookahead combination that -** -** (1) has not been used by the parser, and -** (2) is not a syntax error. -** -** Return the number of missed state/lookahead combinations. -*/ -#if defined(YYCOVERAGE) -int ParseCoverage(FILE *out){ - int stateno, iLookAhead, i; - int nMissed = 0; - for(stateno=0; statenoyyidxMax; } #endif /* ** Find the appropriate action for a parser given the terminal ** look-ahead token iLookAhead. +** +** If the look-ahead token is YYNOCODE, then check to see if the action is +** independent of the look-ahead. If it is, return the action, otherwise +** return YY_NO_ACTION. */ -static unsigned int yy_find_shift_action( +static int yy_find_shift_action( yyParser *pParser, /* The parser */ YYCODETYPE iLookAhead /* The look-ahead token */ ){ int i; - int stateno = pParser->yytos->stateno; + int stateno = pParser->yystack[pParser->yyidx].stateno; - if( stateno>YY_MAX_SHIFT ) return stateno; - assert( stateno <= YY_SHIFT_COUNT ); -#if defined(YYCOVERAGE) - yycoverage[stateno][iLookAhead] = 1; -#endif - do{ - i = yy_shift_ofst[stateno]; - assert( i>=0 && i+YYNTOKEN<=sizeof(yy_lookahead)/sizeof(yy_lookahead[0]) ); - assert( iLookAhead!=YYNOCODE ); - assert( iLookAhead < YYNTOKEN ); - i += iLookAhead; - if( yy_lookahead[i]!=iLookAhead ){ + if( stateno>YY_SHIFT_COUNT + || (i = yy_shift_ofst[stateno])==YY_SHIFT_USE_DFLT ){ + return yy_default[stateno]; + } + assert( iLookAhead!=YYNOCODE ); + i += iLookAhead; + if( i<0 || i>=YY_ACTTAB_COUNT || yy_lookahead[i]!=iLookAhead ){ + if( iLookAhead>0 ){ #ifdef YYFALLBACK YYCODETYPE iFallback; /* Fallback token */ if( iLookAhead=YY_ACTTAB_COUNT j0 + yy_lookahead[j]==YYWILDCARD ){ #ifndef NDEBUG if( yyTraceFILE ){ fprintf(yyTraceFILE, "%sWILDCARD %s => %s\n", - yyTracePrompt, yyTokenName[iLookAhead], - yyTokenName[YYWILDCARD]); + yyTracePrompt, yyTokenName[iLookAhead], yyTokenName[YYWILDCARD]); } #endif /* NDEBUG */ return yy_action[j]; } } #endif /* YYWILDCARD */ - return yy_default[stateno]; - }else{ - return yy_action[i]; } - }while(1); + return yy_default[stateno]; + }else{ + return yy_action[i]; + } } /* ** Find the appropriate action for a parser given the non-terminal ** look-ahead token iLookAhead. +** +** If the look-ahead token is YYNOCODE, then check to see if the action is +** independent of the look-ahead. If it is, return the action, otherwise +** return YY_NO_ACTION. */ static int yy_find_reduce_action( int stateno, /* Current state number */ @@ -1654,6 +1357,7 @@ static int yy_find_reduce_action( assert( stateno<=YY_REDUCE_COUNT ); #endif i = yy_reduce_ofst[stateno]; + assert( i!=YY_REDUCE_USE_DFLT ); assert( iLookAhead!=YYNOCODE ); i += iLookAhead; #ifdef YYERRORSYMBOL @@ -1670,42 +1374,20 @@ static int yy_find_reduce_action( /* ** The following routine is called if the stack overflows. */ -static void yyStackOverflow(yyParser *yypParser){ +static void yyStackOverflow(yyParser *yypParser, YYMINORTYPE *yypMinor){ ParseARG_FETCH; + yypParser->yyidx--; #ifndef NDEBUG if( yyTraceFILE ){ fprintf(yyTraceFILE,"%sStack Overflow!\n",yyTracePrompt); } #endif - while( yypParser->yytos>yypParser->yystack ) yy_pop_parser_stack(yypParser); + while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser); /* Here code is inserted which will execute if the parser ** stack every overflows */ -/******** Begin %stack_overflow code ******************************************/ -/******** End %stack_overflow code ********************************************/ ParseARG_STORE; /* Suppress warning about unused %extra_argument var */ } -/* -** Print tracing information for a SHIFT action -*/ -#ifndef NDEBUG -static void yyTraceShift(yyParser *yypParser, int yyNewState, const char *zTag){ - if( yyTraceFILE ){ - if( yyNewStateyytos->major], - yyNewState); - }else{ - fprintf(yyTraceFILE,"%s%s '%s', pending reduce %d\n", - yyTracePrompt, zTag, yyTokenName[yypParser->yytos->major], - yyNewState - YY_MIN_REDUCE); - } - } -} -#else -# define yyTraceShift(X,Y,Z) -#endif - /* ** Perform a shift action. */ @@ -1713,318 +1395,323 @@ static void yy_shift( yyParser *yypParser, /* The parser to be shifted */ int yyNewState, /* The new state to shift in */ int yyMajor, /* The major token to shift in */ - ParseTOKENTYPE yyMinor /* The minor token to shift in */ + YYMINORTYPE *yypMinor /* Pointer to the minor token to shift in */ ){ yyStackEntry *yytos; - yypParser->yytos++; + yypParser->yyidx++; #ifdef YYTRACKMAXSTACKDEPTH - if( (int)(yypParser->yytos - yypParser->yystack)>yypParser->yyhwm ){ - yypParser->yyhwm++; - assert( yypParser->yyhwm == (int)(yypParser->yytos - yypParser->yystack) ); + if( yypParser->yyidx>yypParser->yyidxMax ){ + yypParser->yyidxMax = yypParser->yyidx; } #endif #if YYSTACKDEPTH>0 - if( yypParser->yytos>yypParser->yystackEnd ){ - yypParser->yytos--; - yyStackOverflow(yypParser); + if( yypParser->yyidx>=YYSTACKDEPTH ){ + yyStackOverflow(yypParser, yypMinor); return; } #else - if( yypParser->yytos>=&yypParser->yystack[yypParser->yystksz] ){ - if( yyGrowStack(yypParser) ){ - yypParser->yytos--; - yyStackOverflow(yypParser); + if( yypParser->yyidx>=yypParser->yystksz ){ + yyGrowStack(yypParser); + if( yypParser->yyidx>=yypParser->yystksz ){ + yyStackOverflow(yypParser, yypMinor); return; } } #endif - if( yyNewState > YY_MAX_SHIFT ){ - yyNewState += YY_MIN_REDUCE - YY_MIN_SHIFTREDUCE; - } - yytos = yypParser->yytos; + yytos = &yypParser->yystack[yypParser->yyidx]; yytos->stateno = (YYACTIONTYPE)yyNewState; yytos->major = (YYCODETYPE)yyMajor; - yytos->minor.yy0 = yyMinor; - yyTraceShift(yypParser, yyNewState, "Shift"); + yytos->minor = *yypMinor; +#ifndef NDEBUG + if( yyTraceFILE && yypParser->yyidx>0 ){ + int i; + fprintf(yyTraceFILE,"%sShift %d\n",yyTracePrompt,yyNewState); + fprintf(yyTraceFILE,"%sStack:",yyTracePrompt); + for(i=1; i<=yypParser->yyidx; i++) + fprintf(yyTraceFILE," %s",yyTokenName[yypParser->yystack[i].major]); + fprintf(yyTraceFILE,"\n"); + } +#endif } /* The following table contains information about every rule that ** is used during the reduce. */ 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 */ + YYCODETYPE lhs; /* Symbol on the left-hand side of the rule */ + unsigned char nrhs; /* Number of right-hand side symbols in the rule */ } yyRuleInfo[] = { - { 188, -1 }, /* (0) program ::= cmd */ - { 189, -2 }, /* (1) cmd ::= SHOW DATABASES */ - { 189, -2 }, /* (2) cmd ::= SHOW TOPICS */ - { 189, -2 }, /* (3) cmd ::= SHOW MNODES */ - { 189, -2 }, /* (4) cmd ::= SHOW DNODES */ - { 189, -2 }, /* (5) cmd ::= SHOW ACCOUNTS */ - { 189, -2 }, /* (6) cmd ::= SHOW USERS */ - { 189, -2 }, /* (7) cmd ::= SHOW MODULES */ - { 189, -2 }, /* (8) cmd ::= SHOW QUERIES */ - { 189, -2 }, /* (9) cmd ::= SHOW CONNECTIONS */ - { 189, -2 }, /* (10) cmd ::= SHOW STREAMS */ - { 189, -2 }, /* (11) cmd ::= SHOW VARIABLES */ - { 189, -2 }, /* (12) cmd ::= SHOW SCORES */ - { 189, -2 }, /* (13) cmd ::= SHOW GRANTS */ - { 189, -2 }, /* (14) cmd ::= SHOW VNODES */ - { 189, -3 }, /* (15) cmd ::= SHOW VNODES IPTOKEN */ - { 190, 0 }, /* (16) dbPrefix ::= */ - { 190, -2 }, /* (17) dbPrefix ::= ids DOT */ - { 192, 0 }, /* (18) cpxName ::= */ - { 192, -2 }, /* (19) cpxName ::= DOT ids */ - { 189, -5 }, /* (20) cmd ::= SHOW CREATE TABLE ids cpxName */ - { 189, -5 }, /* (21) cmd ::= SHOW CREATE STABLE ids cpxName */ - { 189, -4 }, /* (22) cmd ::= SHOW CREATE DATABASE ids */ - { 189, -3 }, /* (23) cmd ::= SHOW dbPrefix TABLES */ - { 189, -5 }, /* (24) cmd ::= SHOW dbPrefix TABLES LIKE ids */ - { 189, -3 }, /* (25) cmd ::= SHOW dbPrefix STABLES */ - { 189, -5 }, /* (26) cmd ::= SHOW dbPrefix STABLES LIKE ids */ - { 189, -3 }, /* (27) cmd ::= SHOW dbPrefix VGROUPS */ - { 189, -4 }, /* (28) cmd ::= SHOW dbPrefix VGROUPS ids */ - { 189, -5 }, /* (29) cmd ::= DROP TABLE ifexists ids cpxName */ - { 189, -5 }, /* (30) cmd ::= DROP STABLE ifexists ids cpxName */ - { 189, -4 }, /* (31) cmd ::= DROP DATABASE ifexists ids */ - { 189, -4 }, /* (32) cmd ::= DROP TOPIC ifexists ids */ - { 189, -3 }, /* (33) cmd ::= DROP DNODE ids */ - { 189, -3 }, /* (34) cmd ::= DROP USER ids */ - { 189, -3 }, /* (35) cmd ::= DROP ACCOUNT ids */ - { 189, -2 }, /* (36) cmd ::= USE ids */ - { 189, -3 }, /* (37) cmd ::= DESCRIBE ids cpxName */ - { 189, -5 }, /* (38) cmd ::= ALTER USER ids PASS ids */ - { 189, -5 }, /* (39) cmd ::= ALTER USER ids PRIVILEGE ids */ - { 189, -4 }, /* (40) cmd ::= ALTER DNODE ids ids */ - { 189, -5 }, /* (41) cmd ::= ALTER DNODE ids ids ids */ - { 189, -3 }, /* (42) cmd ::= ALTER LOCAL ids */ - { 189, -4 }, /* (43) cmd ::= ALTER LOCAL ids ids */ - { 189, -4 }, /* (44) cmd ::= ALTER DATABASE ids alter_db_optr */ - { 189, -4 }, /* (45) cmd ::= ALTER TOPIC ids alter_topic_optr */ - { 189, -4 }, /* (46) cmd ::= ALTER ACCOUNT ids acct_optr */ - { 189, -6 }, /* (47) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */ - { 191, -1 }, /* (48) ids ::= ID */ - { 191, -1 }, /* (49) ids ::= STRING */ - { 193, -2 }, /* (50) ifexists ::= IF EXISTS */ - { 193, 0 }, /* (51) ifexists ::= */ - { 197, -3 }, /* (52) ifnotexists ::= IF NOT EXISTS */ - { 197, 0 }, /* (53) ifnotexists ::= */ - { 189, -3 }, /* (54) cmd ::= CREATE DNODE ids */ - { 189, -6 }, /* (55) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */ - { 189, -5 }, /* (56) cmd ::= CREATE DATABASE ifnotexists ids db_optr */ - { 189, -5 }, /* (57) cmd ::= CREATE TOPIC ifnotexists ids topic_optr */ - { 189, -5 }, /* (58) cmd ::= CREATE USER ids PASS ids */ - { 200, 0 }, /* (59) pps ::= */ - { 200, -2 }, /* (60) pps ::= PPS INTEGER */ - { 201, 0 }, /* (61) tseries ::= */ - { 201, -2 }, /* (62) tseries ::= TSERIES INTEGER */ - { 202, 0 }, /* (63) dbs ::= */ - { 202, -2 }, /* (64) dbs ::= DBS INTEGER */ - { 203, 0 }, /* (65) streams ::= */ - { 203, -2 }, /* (66) streams ::= STREAMS INTEGER */ - { 204, 0 }, /* (67) storage ::= */ - { 204, -2 }, /* (68) storage ::= STORAGE INTEGER */ - { 205, 0 }, /* (69) qtime ::= */ - { 205, -2 }, /* (70) qtime ::= QTIME INTEGER */ - { 206, 0 }, /* (71) users ::= */ - { 206, -2 }, /* (72) users ::= USERS INTEGER */ - { 207, 0 }, /* (73) conns ::= */ - { 207, -2 }, /* (74) conns ::= CONNS INTEGER */ - { 208, 0 }, /* (75) state ::= */ - { 208, -2 }, /* (76) state ::= STATE ids */ - { 196, -9 }, /* (77) acct_optr ::= pps tseries storage streams qtime dbs users conns state */ - { 209, -2 }, /* (78) keep ::= KEEP tagitemlist */ - { 211, -2 }, /* (79) cache ::= CACHE INTEGER */ - { 212, -2 }, /* (80) replica ::= REPLICA INTEGER */ - { 213, -2 }, /* (81) quorum ::= QUORUM INTEGER */ - { 214, -2 }, /* (82) days ::= DAYS INTEGER */ - { 215, -2 }, /* (83) minrows ::= MINROWS INTEGER */ - { 216, -2 }, /* (84) maxrows ::= MAXROWS INTEGER */ - { 217, -2 }, /* (85) blocks ::= BLOCKS INTEGER */ - { 218, -2 }, /* (86) ctime ::= CTIME INTEGER */ - { 219, -2 }, /* (87) wal ::= WAL INTEGER */ - { 220, -2 }, /* (88) fsync ::= FSYNC INTEGER */ - { 221, -2 }, /* (89) comp ::= COMP INTEGER */ - { 222, -2 }, /* (90) prec ::= PRECISION STRING */ - { 223, -2 }, /* (91) update ::= UPDATE INTEGER */ - { 224, -2 }, /* (92) cachelast ::= CACHELAST INTEGER */ - { 225, -2 }, /* (93) partitions ::= PARTITIONS INTEGER */ - { 198, 0 }, /* (94) db_optr ::= */ - { 198, -2 }, /* (95) db_optr ::= db_optr cache */ - { 198, -2 }, /* (96) db_optr ::= db_optr replica */ - { 198, -2 }, /* (97) db_optr ::= db_optr quorum */ - { 198, -2 }, /* (98) db_optr ::= db_optr days */ - { 198, -2 }, /* (99) db_optr ::= db_optr minrows */ - { 198, -2 }, /* (100) db_optr ::= db_optr maxrows */ - { 198, -2 }, /* (101) db_optr ::= db_optr blocks */ - { 198, -2 }, /* (102) db_optr ::= db_optr ctime */ - { 198, -2 }, /* (103) db_optr ::= db_optr wal */ - { 198, -2 }, /* (104) db_optr ::= db_optr fsync */ - { 198, -2 }, /* (105) db_optr ::= db_optr comp */ - { 198, -2 }, /* (106) db_optr ::= db_optr prec */ - { 198, -2 }, /* (107) db_optr ::= db_optr keep */ - { 198, -2 }, /* (108) db_optr ::= db_optr update */ - { 198, -2 }, /* (109) db_optr ::= db_optr cachelast */ - { 199, -1 }, /* (110) topic_optr ::= db_optr */ - { 199, -2 }, /* (111) topic_optr ::= topic_optr partitions */ - { 194, 0 }, /* (112) alter_db_optr ::= */ - { 194, -2 }, /* (113) alter_db_optr ::= alter_db_optr replica */ - { 194, -2 }, /* (114) alter_db_optr ::= alter_db_optr quorum */ - { 194, -2 }, /* (115) alter_db_optr ::= alter_db_optr keep */ - { 194, -2 }, /* (116) alter_db_optr ::= alter_db_optr blocks */ - { 194, -2 }, /* (117) alter_db_optr ::= alter_db_optr comp */ - { 194, -2 }, /* (118) alter_db_optr ::= alter_db_optr wal */ - { 194, -2 }, /* (119) alter_db_optr ::= alter_db_optr fsync */ - { 194, -2 }, /* (120) alter_db_optr ::= alter_db_optr update */ - { 194, -2 }, /* (121) alter_db_optr ::= alter_db_optr cachelast */ - { 195, -1 }, /* (122) alter_topic_optr ::= alter_db_optr */ - { 195, -2 }, /* (123) alter_topic_optr ::= alter_topic_optr partitions */ - { 226, -1 }, /* (124) typename ::= ids */ - { 226, -4 }, /* (125) typename ::= ids LP signed RP */ - { 226, -2 }, /* (126) typename ::= ids UNSIGNED */ - { 227, -1 }, /* (127) signed ::= INTEGER */ - { 227, -2 }, /* (128) signed ::= PLUS INTEGER */ - { 227, -2 }, /* (129) signed ::= MINUS INTEGER */ - { 189, -3 }, /* (130) cmd ::= CREATE TABLE create_table_args */ - { 189, -3 }, /* (131) cmd ::= CREATE TABLE create_stable_args */ - { 189, -3 }, /* (132) cmd ::= CREATE STABLE create_stable_args */ - { 189, -3 }, /* (133) cmd ::= CREATE TABLE create_table_list */ - { 230, -1 }, /* (134) create_table_list ::= create_from_stable */ - { 230, -2 }, /* (135) create_table_list ::= create_table_list create_from_stable */ - { 228, -6 }, /* (136) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ - { 229, -10 }, /* (137) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ - { 231, -10 }, /* (138) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */ - { 231, -13 }, /* (139) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */ - { 233, -3 }, /* (140) tagNamelist ::= tagNamelist COMMA ids */ - { 233, -1 }, /* (141) tagNamelist ::= ids */ - { 228, -5 }, /* (142) create_table_args ::= ifnotexists ids cpxName AS select */ - { 232, -3 }, /* (143) columnlist ::= columnlist COMMA column */ - { 232, -1 }, /* (144) columnlist ::= column */ - { 235, -2 }, /* (145) column ::= ids typename */ - { 210, -3 }, /* (146) tagitemlist ::= tagitemlist COMMA tagitem */ - { 210, -1 }, /* (147) tagitemlist ::= tagitem */ - { 236, -1 }, /* (148) tagitem ::= INTEGER */ - { 236, -1 }, /* (149) tagitem ::= FLOAT */ - { 236, -1 }, /* (150) tagitem ::= STRING */ - { 236, -1 }, /* (151) tagitem ::= BOOL */ - { 236, -1 }, /* (152) tagitem ::= NULL */ - { 236, -2 }, /* (153) tagitem ::= MINUS INTEGER */ - { 236, -2 }, /* (154) tagitem ::= MINUS FLOAT */ - { 236, -2 }, /* (155) tagitem ::= PLUS INTEGER */ - { 236, -2 }, /* (156) tagitem ::= PLUS FLOAT */ - { 234, -13 }, /* (157) select ::= SELECT selcollist from where_opt interval_opt session_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ - { 234, -3 }, /* (158) select ::= LP select RP */ - { 249, -1 }, /* (159) union ::= select */ - { 249, -4 }, /* (160) union ::= union UNION ALL select */ - { 189, -1 }, /* (161) cmd ::= union */ - { 234, -2 }, /* (162) select ::= SELECT selcollist */ - { 250, -2 }, /* (163) sclp ::= selcollist COMMA */ - { 250, 0 }, /* (164) sclp ::= */ - { 237, -4 }, /* (165) selcollist ::= sclp distinct expr as */ - { 237, -2 }, /* (166) selcollist ::= sclp STAR */ - { 253, -2 }, /* (167) as ::= AS ids */ - { 253, -1 }, /* (168) as ::= ids */ - { 253, 0 }, /* (169) as ::= */ - { 251, -1 }, /* (170) distinct ::= DISTINCT */ - { 251, 0 }, /* (171) distinct ::= */ - { 238, -2 }, /* (172) from ::= FROM tablelist */ - { 238, -4 }, /* (173) from ::= FROM LP union RP */ - { 254, -2 }, /* (174) tablelist ::= ids cpxName */ - { 254, -3 }, /* (175) tablelist ::= ids cpxName ids */ - { 254, -4 }, /* (176) tablelist ::= tablelist COMMA ids cpxName */ - { 254, -5 }, /* (177) tablelist ::= tablelist COMMA ids cpxName ids */ - { 255, -1 }, /* (178) tmvar ::= VARIABLE */ - { 240, -4 }, /* (179) interval_opt ::= INTERVAL LP tmvar RP */ - { 240, -6 }, /* (180) interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ - { 240, 0 }, /* (181) interval_opt ::= */ - { 241, 0 }, /* (182) session_option ::= */ - { 241, -7 }, /* (183) session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ - { 242, 0 }, /* (184) fill_opt ::= */ - { 242, -6 }, /* (185) fill_opt ::= FILL LP ID COMMA tagitemlist RP */ - { 242, -4 }, /* (186) fill_opt ::= FILL LP ID RP */ - { 243, -4 }, /* (187) sliding_opt ::= SLIDING LP tmvar RP */ - { 243, 0 }, /* (188) sliding_opt ::= */ - { 245, 0 }, /* (189) orderby_opt ::= */ - { 245, -3 }, /* (190) orderby_opt ::= ORDER BY sortlist */ - { 256, -4 }, /* (191) sortlist ::= sortlist COMMA item sortorder */ - { 256, -2 }, /* (192) sortlist ::= item sortorder */ - { 258, -2 }, /* (193) item ::= ids cpxName */ - { 259, -1 }, /* (194) sortorder ::= ASC */ - { 259, -1 }, /* (195) sortorder ::= DESC */ - { 259, 0 }, /* (196) sortorder ::= */ - { 244, 0 }, /* (197) groupby_opt ::= */ - { 244, -3 }, /* (198) groupby_opt ::= GROUP BY grouplist */ - { 260, -3 }, /* (199) grouplist ::= grouplist COMMA item */ - { 260, -1 }, /* (200) grouplist ::= item */ - { 246, 0 }, /* (201) having_opt ::= */ - { 246, -2 }, /* (202) having_opt ::= HAVING expr */ - { 248, 0 }, /* (203) limit_opt ::= */ - { 248, -2 }, /* (204) limit_opt ::= LIMIT signed */ - { 248, -4 }, /* (205) limit_opt ::= LIMIT signed OFFSET signed */ - { 248, -4 }, /* (206) limit_opt ::= LIMIT signed COMMA signed */ - { 247, 0 }, /* (207) slimit_opt ::= */ - { 247, -2 }, /* (208) slimit_opt ::= SLIMIT signed */ - { 247, -4 }, /* (209) slimit_opt ::= SLIMIT signed SOFFSET signed */ - { 247, -4 }, /* (210) slimit_opt ::= SLIMIT signed COMMA signed */ - { 239, 0 }, /* (211) where_opt ::= */ - { 239, -2 }, /* (212) where_opt ::= WHERE expr */ - { 252, -3 }, /* (213) expr ::= LP expr RP */ - { 252, -1 }, /* (214) expr ::= ID */ - { 252, -3 }, /* (215) expr ::= ID DOT ID */ - { 252, -3 }, /* (216) expr ::= ID DOT STAR */ - { 252, -1 }, /* (217) expr ::= INTEGER */ - { 252, -2 }, /* (218) expr ::= MINUS INTEGER */ - { 252, -2 }, /* (219) expr ::= PLUS INTEGER */ - { 252, -1 }, /* (220) expr ::= FLOAT */ - { 252, -2 }, /* (221) expr ::= MINUS FLOAT */ - { 252, -2 }, /* (222) expr ::= PLUS FLOAT */ - { 252, -1 }, /* (223) expr ::= STRING */ - { 252, -1 }, /* (224) expr ::= NOW */ - { 252, -1 }, /* (225) expr ::= VARIABLE */ - { 252, -2 }, /* (226) expr ::= PLUS VARIABLE */ - { 252, -2 }, /* (227) expr ::= MINUS VARIABLE */ - { 252, -1 }, /* (228) expr ::= BOOL */ - { 252, -1 }, /* (229) expr ::= NULL */ - { 252, -4 }, /* (230) expr ::= ID LP exprlist RP */ - { 252, -4 }, /* (231) expr ::= ID LP STAR RP */ - { 252, -3 }, /* (232) expr ::= expr IS NULL */ - { 252, -4 }, /* (233) expr ::= expr IS NOT NULL */ - { 252, -3 }, /* (234) expr ::= expr LT expr */ - { 252, -3 }, /* (235) expr ::= expr GT expr */ - { 252, -3 }, /* (236) expr ::= expr LE expr */ - { 252, -3 }, /* (237) expr ::= expr GE expr */ - { 252, -3 }, /* (238) expr ::= expr NE expr */ - { 252, -3 }, /* (239) expr ::= expr EQ expr */ - { 252, -5 }, /* (240) expr ::= expr BETWEEN expr AND expr */ - { 252, -3 }, /* (241) expr ::= expr AND expr */ - { 252, -3 }, /* (242) expr ::= expr OR expr */ - { 252, -3 }, /* (243) expr ::= expr PLUS expr */ - { 252, -3 }, /* (244) expr ::= expr MINUS expr */ - { 252, -3 }, /* (245) expr ::= expr STAR expr */ - { 252, -3 }, /* (246) expr ::= expr SLASH expr */ - { 252, -3 }, /* (247) expr ::= expr REM expr */ - { 252, -3 }, /* (248) expr ::= expr LIKE expr */ - { 252, -5 }, /* (249) expr ::= expr IN LP exprlist RP */ - { 261, -3 }, /* (250) exprlist ::= exprlist COMMA expritem */ - { 261, -1 }, /* (251) exprlist ::= expritem */ - { 262, -1 }, /* (252) expritem ::= expr */ - { 262, 0 }, /* (253) expritem ::= */ - { 189, -3 }, /* (254) cmd ::= RESET QUERY CACHE */ - { 189, -3 }, /* (255) cmd ::= SYNCDB ids REPLICA */ - { 189, -7 }, /* (256) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ - { 189, -7 }, /* (257) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ - { 189, -7 }, /* (258) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ - { 189, -7 }, /* (259) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ - { 189, -8 }, /* (260) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ - { 189, -9 }, /* (261) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ - { 189, -7 }, /* (262) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ - { 189, -7 }, /* (263) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ - { 189, -7 }, /* (264) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ - { 189, -7 }, /* (265) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ - { 189, -8 }, /* (266) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ - { 189, -3 }, /* (267) cmd ::= KILL CONNECTION INTEGER */ - { 189, -5 }, /* (268) cmd ::= KILL STREAM INTEGER COLON INTEGER */ - { 189, -5 }, /* (269) cmd ::= KILL QUERY INTEGER COLON INTEGER */ + { 189, 1 }, + { 190, 2 }, + { 190, 2 }, + { 190, 2 }, + { 190, 2 }, + { 190, 2 }, + { 190, 2 }, + { 190, 2 }, + { 190, 2 }, + { 190, 2 }, + { 190, 2 }, + { 190, 2 }, + { 190, 2 }, + { 190, 2 }, + { 190, 2 }, + { 190, 3 }, + { 191, 0 }, + { 191, 2 }, + { 193, 0 }, + { 193, 2 }, + { 190, 5 }, + { 190, 5 }, + { 190, 4 }, + { 190, 3 }, + { 190, 5 }, + { 190, 3 }, + { 190, 5 }, + { 190, 3 }, + { 190, 4 }, + { 190, 5 }, + { 190, 5 }, + { 190, 4 }, + { 190, 4 }, + { 190, 3 }, + { 190, 3 }, + { 190, 3 }, + { 190, 2 }, + { 190, 3 }, + { 190, 5 }, + { 190, 5 }, + { 190, 4 }, + { 190, 5 }, + { 190, 3 }, + { 190, 4 }, + { 190, 4 }, + { 190, 4 }, + { 190, 4 }, + { 190, 6 }, + { 190, 6 }, + { 192, 1 }, + { 192, 1 }, + { 194, 2 }, + { 194, 0 }, + { 199, 3 }, + { 199, 0 }, + { 190, 3 }, + { 190, 6 }, + { 190, 5 }, + { 190, 5 }, + { 190, 5 }, + { 202, 0 }, + { 202, 2 }, + { 203, 0 }, + { 203, 2 }, + { 204, 0 }, + { 204, 2 }, + { 205, 0 }, + { 205, 2 }, + { 206, 0 }, + { 206, 2 }, + { 207, 0 }, + { 207, 2 }, + { 208, 0 }, + { 208, 2 }, + { 209, 0 }, + { 209, 2 }, + { 210, 0 }, + { 210, 2 }, + { 197, 9 }, + { 211, 2 }, + { 213, 2 }, + { 214, 2 }, + { 215, 2 }, + { 216, 2 }, + { 217, 2 }, + { 218, 2 }, + { 219, 2 }, + { 220, 2 }, + { 221, 2 }, + { 222, 2 }, + { 223, 2 }, + { 224, 2 }, + { 225, 2 }, + { 226, 2 }, + { 227, 2 }, + { 200, 0 }, + { 200, 2 }, + { 200, 2 }, + { 200, 2 }, + { 200, 2 }, + { 200, 2 }, + { 200, 2 }, + { 200, 2 }, + { 200, 2 }, + { 200, 2 }, + { 200, 2 }, + { 200, 2 }, + { 200, 2 }, + { 200, 2 }, + { 200, 2 }, + { 200, 2 }, + { 201, 1 }, + { 201, 2 }, + { 195, 0 }, + { 195, 2 }, + { 195, 2 }, + { 195, 2 }, + { 195, 2 }, + { 195, 2 }, + { 195, 2 }, + { 195, 2 }, + { 195, 2 }, + { 195, 2 }, + { 196, 1 }, + { 196, 2 }, + { 228, 1 }, + { 228, 4 }, + { 228, 2 }, + { 229, 1 }, + { 229, 2 }, + { 229, 2 }, + { 190, 3 }, + { 190, 3 }, + { 190, 3 }, + { 190, 3 }, + { 232, 1 }, + { 232, 2 }, + { 230, 6 }, + { 231, 10 }, + { 233, 10 }, + { 233, 13 }, + { 235, 3 }, + { 235, 1 }, + { 230, 5 }, + { 234, 3 }, + { 234, 1 }, + { 237, 2 }, + { 212, 3 }, + { 212, 1 }, + { 238, 1 }, + { 238, 1 }, + { 238, 1 }, + { 238, 1 }, + { 238, 1 }, + { 238, 2 }, + { 238, 2 }, + { 238, 2 }, + { 238, 2 }, + { 236, 13 }, + { 236, 3 }, + { 251, 1 }, + { 251, 4 }, + { 190, 1 }, + { 236, 2 }, + { 252, 2 }, + { 252, 0 }, + { 239, 4 }, + { 239, 2 }, + { 255, 2 }, + { 255, 1 }, + { 255, 0 }, + { 253, 1 }, + { 253, 0 }, + { 240, 2 }, + { 240, 4 }, + { 256, 2 }, + { 256, 3 }, + { 256, 4 }, + { 256, 5 }, + { 257, 1 }, + { 242, 4 }, + { 242, 6 }, + { 242, 0 }, + { 243, 0 }, + { 243, 7 }, + { 244, 0 }, + { 244, 6 }, + { 244, 4 }, + { 245, 4 }, + { 245, 0 }, + { 247, 0 }, + { 247, 3 }, + { 258, 4 }, + { 258, 2 }, + { 260, 2 }, + { 261, 1 }, + { 261, 1 }, + { 261, 0 }, + { 246, 0 }, + { 246, 3 }, + { 262, 3 }, + { 262, 1 }, + { 248, 0 }, + { 248, 2 }, + { 250, 0 }, + { 250, 2 }, + { 250, 4 }, + { 250, 4 }, + { 249, 0 }, + { 249, 2 }, + { 249, 4 }, + { 249, 4 }, + { 241, 0 }, + { 241, 2 }, + { 254, 3 }, + { 254, 1 }, + { 254, 3 }, + { 254, 3 }, + { 254, 1 }, + { 254, 2 }, + { 254, 2 }, + { 254, 1 }, + { 254, 2 }, + { 254, 2 }, + { 254, 1 }, + { 254, 1 }, + { 254, 1 }, + { 254, 2 }, + { 254, 2 }, + { 254, 1 }, + { 254, 1 }, + { 254, 4 }, + { 254, 4 }, + { 254, 3 }, + { 254, 4 }, + { 254, 3 }, + { 254, 3 }, + { 254, 3 }, + { 254, 3 }, + { 254, 3 }, + { 254, 3 }, + { 254, 5 }, + { 254, 3 }, + { 254, 3 }, + { 254, 3 }, + { 254, 3 }, + { 254, 3 }, + { 254, 3 }, + { 254, 3 }, + { 254, 3 }, + { 254, 5 }, + { 198, 3 }, + { 198, 1 }, + { 263, 1 }, + { 263, 0 }, + { 190, 3 }, + { 190, 3 }, + { 190, 7 }, + { 190, 7 }, + { 190, 7 }, + { 190, 7 }, + { 190, 8 }, + { 190, 9 }, + { 190, 7 }, + { 190, 7 }, + { 190, 7 }, + { 190, 7 }, + { 190, 8 }, + { 190, 3 }, + { 190, 5 }, + { 190, 5 }, }; static void yy_accept(yyParser*); /* Forward Declaration */ @@ -2032,66 +1719,43 @@ static void yy_accept(yyParser*); /* Forward Declaration */ /* ** Perform a reduce action and the shift that must immediately ** follow the reduce. -** -** The yyLookahead and yyLookaheadToken parameters provide reduce actions -** access to the lookahead token (if any). The yyLookahead will be YYNOCODE -** if the lookahead token has already been consumed. As this procedure is -** only called from one place, optimizing compilers will in-line it, which -** means that the extra parameters have no performance impact. */ static void yy_reduce( yyParser *yypParser, /* The parser */ - unsigned int yyruleno, /* Number of the rule by which to reduce */ - int yyLookahead, /* Lookahead token, or YYNOCODE if none */ - ParseTOKENTYPE yyLookaheadToken /* Value of the lookahead token */ + int yyruleno /* Number of the rule by which to reduce */ ){ int yygoto; /* The next state */ int yyact; /* The next action */ + YYMINORTYPE yygotominor; /* The LHS of the rule reduced */ yyStackEntry *yymsp; /* The top of the parser's stack */ int yysize; /* Amount to pop the stack */ ParseARG_FETCH; - (void)yyLookahead; - (void)yyLookaheadToken; - yymsp = yypParser->yytos; + yymsp = &yypParser->yystack[yypParser->yyidx]; #ifndef NDEBUG - if( yyTraceFILE && yyruleno<(int)(sizeof(yyRuleName)/sizeof(yyRuleName[0])) ){ - yysize = yyRuleInfo[yyruleno].nrhs; - if( yysize ){ - fprintf(yyTraceFILE, "%sReduce %d [%s], go to state %d.\n", - yyTracePrompt, - yyruleno, yyRuleName[yyruleno], yymsp[yysize].stateno); - }else{ - fprintf(yyTraceFILE, "%sReduce %d [%s].\n", - yyTracePrompt, yyruleno, yyRuleName[yyruleno]); - } + if( yyTraceFILE && yyruleno>=0 + && yyruleno<(int)(sizeof(yyRuleName)/sizeof(yyRuleName[0])) ){ + fprintf(yyTraceFILE, "%sReduce [%s].\n", yyTracePrompt, + yyRuleName[yyruleno]); } #endif /* NDEBUG */ - /* Check that the stack is large enough to grow by a single entry - ** if the RHS of the rule is empty. This ensures that there is room - ** enough on the stack to push the LHS value */ - if( yyRuleInfo[yyruleno].nrhs==0 ){ -#ifdef YYTRACKMAXSTACKDEPTH - if( (int)(yypParser->yytos - yypParser->yystack)>yypParser->yyhwm ){ - yypParser->yyhwm++; - assert( yypParser->yyhwm == (int)(yypParser->yytos - yypParser->yystack)); - } -#endif -#if YYSTACKDEPTH>0 - if( yypParser->yytos>=yypParser->yystackEnd ){ - yyStackOverflow(yypParser); - return; - } -#else - if( yypParser->yytos>=&yypParser->yystack[yypParser->yystksz-1] ){ - if( yyGrowStack(yypParser) ){ - yyStackOverflow(yypParser); - return; - } - yymsp = yypParser->yytos; - } -#endif - } + /* Silence complaints from purify about yygotominor being uninitialized + ** in some cases when it is copied into the stack after the following + ** switch. yygotominor is uninitialized when a rule reduces that does + ** not set the value of its left-hand side nonterminal. Leaving the + ** value of the nonterminal uninitialized is utterly harmless as long + ** as the value is never used. So really the only thing this code + ** accomplishes is to quieten purify. + ** + ** 2007-01-16: The wireshark project (www.wireshark.org) reports that + ** without this code, their parser segfaults. I'm not sure what there + ** parser is doing to make this happen. This is the second bug report + ** from wireshark this week. Clearly they are stressing Lemon in ways + ** that it has not been previously stressed... (SQLite ticket #2172) + */ + /*memset(&yygotominor, 0, sizeof(yygotominor));*/ + yygotominor = yyzerominor; + switch( yyruleno ){ /* Beginning here are the reduction cases. A typical example @@ -2102,12 +1766,7 @@ static void yy_reduce( ** #line ** break; */ -/********** Begin reduce actions **********************************************/ - YYMINORTYPE yylhsminor; case 0: /* program ::= cmd */ - case 130: /* cmd ::= CREATE TABLE create_table_args */ yytestcase(yyruleno==130); - case 131: /* cmd ::= CREATE TABLE create_stable_args */ yytestcase(yyruleno==131); - case 132: /* cmd ::= CREATE STABLE create_stable_args */ yytestcase(yyruleno==132); {} break; case 1: /* cmd ::= SHOW DATABASES */ @@ -2156,17 +1815,16 @@ static void yy_reduce( { setShowOptions(pInfo, TSDB_MGMT_TABLE_VNODES, &yymsp[0].minor.yy0, 0); } break; case 16: /* dbPrefix ::= */ -{yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.type = 0;} +{yygotominor.yy0.n = 0; yygotominor.yy0.type = 0;} break; case 17: /* dbPrefix ::= ids DOT */ -{yylhsminor.yy0 = yymsp[-1].minor.yy0; } - yymsp[-1].minor.yy0 = yylhsminor.yy0; +{yygotominor.yy0 = yymsp[-1].minor.yy0; } break; case 18: /* cpxName ::= */ -{yymsp[1].minor.yy0.n = 0; } +{yygotominor.yy0.n = 0; } break; case 19: /* cpxName ::= DOT ids */ -{yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; yymsp[-1].minor.yy0.n += 1; } +{yygotominor.yy0 = yymsp[0].minor.yy0; yygotominor.yy0.n += 1; } break; case 20: /* cmd ::= SHOW CREATE TABLE ids cpxName */ { @@ -2277,729 +1935,629 @@ static void yy_reduce( break; case 44: /* cmd ::= ALTER DATABASE ids alter_db_optr */ case 45: /* cmd ::= ALTER TOPIC ids alter_topic_optr */ yytestcase(yyruleno==45); -{ SStrToken t = {0}; setCreateDbInfo(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy322, &t);} +{ SStrToken t = {0}; setCreateDbInfo(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy526, &t);} break; case 46: /* cmd ::= ALTER ACCOUNT ids acct_optr */ -{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy351);} +{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy187);} break; case 47: /* 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.yy351);} +{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy187);} break; - case 48: /* ids ::= ID */ - case 49: /* ids ::= STRING */ yytestcase(yyruleno==49); -{yylhsminor.yy0 = yymsp[0].minor.yy0; } - yymsp[0].minor.yy0 = yylhsminor.yy0; + case 48: /* cmd ::= COMPACT VNODES IN LP exprlist RP */ +{ setCompactVnodeSql(pInfo, TSDB_SQL_COMPACT_VNODE, yymsp[-1].minor.yy285);} break; - case 50: /* ifexists ::= IF EXISTS */ -{ yymsp[-1].minor.yy0.n = 1;} + case 49: /* ids ::= ID */ + case 50: /* ids ::= STRING */ yytestcase(yyruleno==50); +{yygotominor.yy0 = yymsp[0].minor.yy0; } break; - case 51: /* ifexists ::= */ - case 53: /* ifnotexists ::= */ yytestcase(yyruleno==53); - case 171: /* distinct ::= */ yytestcase(yyruleno==171); -{ yymsp[1].minor.yy0.n = 0;} + case 51: /* ifexists ::= IF EXISTS */ + case 53: /* ifnotexists ::= IF NOT EXISTS */ yytestcase(yyruleno==53); +{ yygotominor.yy0.n = 1;} break; - case 52: /* ifnotexists ::= IF NOT EXISTS */ -{ yymsp[-2].minor.yy0.n = 1;} + case 52: /* ifexists ::= */ + case 54: /* ifnotexists ::= */ yytestcase(yyruleno==54); + case 172: /* distinct ::= */ yytestcase(yyruleno==172); +{ yygotominor.yy0.n = 0;} break; - case 54: /* cmd ::= CREATE DNODE ids */ + case 55: /* cmd ::= CREATE DNODE ids */ { setDCLSqlElems(pInfo, TSDB_SQL_CREATE_DNODE, 1, &yymsp[0].minor.yy0);} break; - case 55: /* 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.yy351);} + case 56: /* 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.yy187);} break; - case 56: /* cmd ::= CREATE DATABASE ifnotexists ids db_optr */ - case 57: /* cmd ::= CREATE TOPIC ifnotexists ids topic_optr */ yytestcase(yyruleno==57); -{ setCreateDbInfo(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy322, &yymsp[-2].minor.yy0);} + case 57: /* cmd ::= CREATE DATABASE ifnotexists ids db_optr */ + case 58: /* cmd ::= CREATE TOPIC ifnotexists ids topic_optr */ yytestcase(yyruleno==58); +{ setCreateDbInfo(pInfo, TSDB_SQL_CREATE_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy526, &yymsp[-2].minor.yy0);} break; - case 58: /* cmd ::= CREATE USER ids PASS ids */ + case 59: /* cmd ::= CREATE USER ids PASS ids */ { setCreateUserSql(pInfo, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0);} break; - case 59: /* pps ::= */ - case 61: /* tseries ::= */ yytestcase(yyruleno==61); - case 63: /* dbs ::= */ yytestcase(yyruleno==63); - case 65: /* streams ::= */ yytestcase(yyruleno==65); - case 67: /* storage ::= */ yytestcase(yyruleno==67); - case 69: /* qtime ::= */ yytestcase(yyruleno==69); - case 71: /* users ::= */ yytestcase(yyruleno==71); - case 73: /* conns ::= */ yytestcase(yyruleno==73); - case 75: /* state ::= */ yytestcase(yyruleno==75); -{ yymsp[1].minor.yy0.n = 0; } - break; - case 60: /* pps ::= PPS INTEGER */ - case 62: /* tseries ::= TSERIES INTEGER */ yytestcase(yyruleno==62); - case 64: /* dbs ::= DBS INTEGER */ yytestcase(yyruleno==64); - case 66: /* streams ::= STREAMS INTEGER */ yytestcase(yyruleno==66); - case 68: /* storage ::= STORAGE INTEGER */ yytestcase(yyruleno==68); - case 70: /* qtime ::= QTIME INTEGER */ yytestcase(yyruleno==70); - case 72: /* users ::= USERS INTEGER */ yytestcase(yyruleno==72); - case 74: /* conns ::= CONNS INTEGER */ yytestcase(yyruleno==74); - case 76: /* state ::= STATE ids */ yytestcase(yyruleno==76); -{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } - break; - case 77: /* acct_optr ::= pps tseries storage streams qtime dbs users conns state */ + case 60: /* pps ::= */ + case 62: /* tseries ::= */ yytestcase(yyruleno==62); + case 64: /* dbs ::= */ yytestcase(yyruleno==64); + case 66: /* streams ::= */ yytestcase(yyruleno==66); + case 68: /* storage ::= */ yytestcase(yyruleno==68); + case 70: /* qtime ::= */ yytestcase(yyruleno==70); + case 72: /* users ::= */ yytestcase(yyruleno==72); + case 74: /* conns ::= */ yytestcase(yyruleno==74); + case 76: /* state ::= */ yytestcase(yyruleno==76); +{ yygotominor.yy0.n = 0; } + break; + case 61: /* pps ::= PPS INTEGER */ + case 63: /* tseries ::= TSERIES INTEGER */ yytestcase(yyruleno==63); + case 65: /* dbs ::= DBS INTEGER */ yytestcase(yyruleno==65); + case 67: /* streams ::= STREAMS INTEGER */ yytestcase(yyruleno==67); + case 69: /* storage ::= STORAGE INTEGER */ yytestcase(yyruleno==69); + case 71: /* qtime ::= QTIME INTEGER */ yytestcase(yyruleno==71); + case 73: /* users ::= USERS INTEGER */ yytestcase(yyruleno==73); + case 75: /* conns ::= CONNS INTEGER */ yytestcase(yyruleno==75); + case 77: /* state ::= STATE ids */ yytestcase(yyruleno==77); +{ yygotominor.yy0 = yymsp[0].minor.yy0; } + break; + case 78: /* acct_optr ::= pps tseries storage streams qtime dbs users conns state */ { - yylhsminor.yy351.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1; - yylhsminor.yy351.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1; - yylhsminor.yy351.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1; - yylhsminor.yy351.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1; - yylhsminor.yy351.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1; - yylhsminor.yy351.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1; - yylhsminor.yy351.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1; - yylhsminor.yy351.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1; - yylhsminor.yy351.stat = yymsp[0].minor.yy0; -} - yymsp[-8].minor.yy351 = yylhsminor.yy351; - break; - case 78: /* keep ::= KEEP tagitemlist */ -{ yymsp[-1].minor.yy159 = yymsp[0].minor.yy159; } - break; - case 79: /* cache ::= CACHE INTEGER */ - case 80: /* replica ::= REPLICA INTEGER */ yytestcase(yyruleno==80); - case 81: /* quorum ::= QUORUM INTEGER */ yytestcase(yyruleno==81); - case 82: /* days ::= DAYS INTEGER */ yytestcase(yyruleno==82); - case 83: /* minrows ::= MINROWS INTEGER */ yytestcase(yyruleno==83); - case 84: /* maxrows ::= MAXROWS INTEGER */ yytestcase(yyruleno==84); - case 85: /* blocks ::= BLOCKS INTEGER */ yytestcase(yyruleno==85); - case 86: /* ctime ::= CTIME INTEGER */ yytestcase(yyruleno==86); - case 87: /* wal ::= WAL INTEGER */ yytestcase(yyruleno==87); - case 88: /* fsync ::= FSYNC INTEGER */ yytestcase(yyruleno==88); - case 89: /* comp ::= COMP INTEGER */ yytestcase(yyruleno==89); - case 90: /* prec ::= PRECISION STRING */ yytestcase(yyruleno==90); - case 91: /* update ::= UPDATE INTEGER */ yytestcase(yyruleno==91); - case 92: /* cachelast ::= CACHELAST INTEGER */ yytestcase(yyruleno==92); - case 93: /* partitions ::= PARTITIONS INTEGER */ yytestcase(yyruleno==93); -{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } - break; - case 94: /* db_optr ::= */ -{setDefaultCreateDbOption(&yymsp[1].minor.yy322); yymsp[1].minor.yy322.dbType = TSDB_DB_TYPE_DEFAULT;} - break; - case 95: /* db_optr ::= db_optr cache */ -{ yylhsminor.yy322 = yymsp[-1].minor.yy322; yylhsminor.yy322.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy322 = yylhsminor.yy322; - break; - case 96: /* db_optr ::= db_optr replica */ - case 113: /* alter_db_optr ::= alter_db_optr replica */ yytestcase(yyruleno==113); -{ yylhsminor.yy322 = yymsp[-1].minor.yy322; yylhsminor.yy322.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy322 = yylhsminor.yy322; - break; - case 97: /* db_optr ::= db_optr quorum */ - case 114: /* alter_db_optr ::= alter_db_optr quorum */ yytestcase(yyruleno==114); -{ yylhsminor.yy322 = yymsp[-1].minor.yy322; yylhsminor.yy322.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy322 = yylhsminor.yy322; - break; - case 98: /* db_optr ::= db_optr days */ -{ yylhsminor.yy322 = yymsp[-1].minor.yy322; yylhsminor.yy322.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy322 = yylhsminor.yy322; - break; - case 99: /* db_optr ::= db_optr minrows */ -{ yylhsminor.yy322 = yymsp[-1].minor.yy322; yylhsminor.yy322.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } - yymsp[-1].minor.yy322 = yylhsminor.yy322; - break; - case 100: /* db_optr ::= db_optr maxrows */ -{ yylhsminor.yy322 = yymsp[-1].minor.yy322; yylhsminor.yy322.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } - yymsp[-1].minor.yy322 = yylhsminor.yy322; - break; - case 101: /* db_optr ::= db_optr blocks */ - case 116: /* alter_db_optr ::= alter_db_optr blocks */ yytestcase(yyruleno==116); -{ yylhsminor.yy322 = yymsp[-1].minor.yy322; yylhsminor.yy322.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy322 = yylhsminor.yy322; - break; - case 102: /* db_optr ::= db_optr ctime */ -{ yylhsminor.yy322 = yymsp[-1].minor.yy322; yylhsminor.yy322.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy322 = yylhsminor.yy322; - break; - case 103: /* db_optr ::= db_optr wal */ - case 118: /* alter_db_optr ::= alter_db_optr wal */ yytestcase(yyruleno==118); -{ yylhsminor.yy322 = yymsp[-1].minor.yy322; yylhsminor.yy322.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy322 = yylhsminor.yy322; - break; - case 104: /* db_optr ::= db_optr fsync */ - case 119: /* alter_db_optr ::= alter_db_optr fsync */ yytestcase(yyruleno==119); -{ yylhsminor.yy322 = yymsp[-1].minor.yy322; yylhsminor.yy322.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy322 = yylhsminor.yy322; - break; - case 105: /* db_optr ::= db_optr comp */ - case 117: /* alter_db_optr ::= alter_db_optr comp */ yytestcase(yyruleno==117); -{ yylhsminor.yy322 = yymsp[-1].minor.yy322; yylhsminor.yy322.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy322 = yylhsminor.yy322; - break; - case 106: /* db_optr ::= db_optr prec */ -{ yylhsminor.yy322 = yymsp[-1].minor.yy322; yylhsminor.yy322.precision = yymsp[0].minor.yy0; } - yymsp[-1].minor.yy322 = yylhsminor.yy322; - break; - case 107: /* db_optr ::= db_optr keep */ - case 115: /* alter_db_optr ::= alter_db_optr keep */ yytestcase(yyruleno==115); -{ yylhsminor.yy322 = yymsp[-1].minor.yy322; yylhsminor.yy322.keep = yymsp[0].minor.yy159; } - yymsp[-1].minor.yy322 = yylhsminor.yy322; - break; - case 108: /* db_optr ::= db_optr update */ - case 120: /* alter_db_optr ::= alter_db_optr update */ yytestcase(yyruleno==120); -{ yylhsminor.yy322 = yymsp[-1].minor.yy322; yylhsminor.yy322.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy322 = yylhsminor.yy322; - break; - case 109: /* db_optr ::= db_optr cachelast */ - case 121: /* alter_db_optr ::= alter_db_optr cachelast */ yytestcase(yyruleno==121); -{ yylhsminor.yy322 = yymsp[-1].minor.yy322; yylhsminor.yy322.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy322 = yylhsminor.yy322; - break; - case 110: /* topic_optr ::= db_optr */ - case 122: /* alter_topic_optr ::= alter_db_optr */ yytestcase(yyruleno==122); -{ yylhsminor.yy322 = yymsp[0].minor.yy322; yylhsminor.yy322.dbType = TSDB_DB_TYPE_TOPIC; } - yymsp[0].minor.yy322 = yylhsminor.yy322; - break; - case 111: /* topic_optr ::= topic_optr partitions */ - case 123: /* alter_topic_optr ::= alter_topic_optr partitions */ yytestcase(yyruleno==123); -{ yylhsminor.yy322 = yymsp[-1].minor.yy322; yylhsminor.yy322.partitions = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy322 = yylhsminor.yy322; - break; - case 112: /* alter_db_optr ::= */ -{ setDefaultCreateDbOption(&yymsp[1].minor.yy322); yymsp[1].minor.yy322.dbType = TSDB_DB_TYPE_DEFAULT;} - break; - case 124: /* typename ::= ids */ + yygotominor.yy187.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1; + yygotominor.yy187.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1; + yygotominor.yy187.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1; + yygotominor.yy187.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1; + yygotominor.yy187.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1; + yygotominor.yy187.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1; + yygotominor.yy187.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1; + yygotominor.yy187.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1; + yygotominor.yy187.stat = yymsp[0].minor.yy0; +} + break; + case 79: /* keep ::= KEEP tagitemlist */ +{ yygotominor.yy285 = yymsp[0].minor.yy285; } + break; + case 80: /* cache ::= CACHE INTEGER */ + case 81: /* replica ::= REPLICA INTEGER */ yytestcase(yyruleno==81); + case 82: /* quorum ::= QUORUM INTEGER */ yytestcase(yyruleno==82); + case 83: /* days ::= DAYS INTEGER */ yytestcase(yyruleno==83); + case 84: /* minrows ::= MINROWS INTEGER */ yytestcase(yyruleno==84); + case 85: /* maxrows ::= MAXROWS INTEGER */ yytestcase(yyruleno==85); + case 86: /* blocks ::= BLOCKS INTEGER */ yytestcase(yyruleno==86); + case 87: /* ctime ::= CTIME INTEGER */ yytestcase(yyruleno==87); + case 88: /* wal ::= WAL INTEGER */ yytestcase(yyruleno==88); + case 89: /* fsync ::= FSYNC INTEGER */ yytestcase(yyruleno==89); + case 90: /* comp ::= COMP INTEGER */ yytestcase(yyruleno==90); + case 91: /* prec ::= PRECISION STRING */ yytestcase(yyruleno==91); + case 92: /* update ::= UPDATE INTEGER */ yytestcase(yyruleno==92); + case 93: /* cachelast ::= CACHELAST INTEGER */ yytestcase(yyruleno==93); + case 94: /* partitions ::= PARTITIONS INTEGER */ yytestcase(yyruleno==94); +{ yygotominor.yy0 = yymsp[0].minor.yy0; } + break; + case 95: /* db_optr ::= */ +{setDefaultCreateDbOption(&yygotominor.yy526); yygotominor.yy526.dbType = TSDB_DB_TYPE_DEFAULT;} + break; + case 96: /* db_optr ::= db_optr cache */ +{ yygotominor.yy526 = yymsp[-1].minor.yy526; yygotominor.yy526.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + break; + case 97: /* db_optr ::= db_optr replica */ + case 114: /* alter_db_optr ::= alter_db_optr replica */ yytestcase(yyruleno==114); +{ yygotominor.yy526 = yymsp[-1].minor.yy526; yygotominor.yy526.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + break; + case 98: /* db_optr ::= db_optr quorum */ + case 115: /* alter_db_optr ::= alter_db_optr quorum */ yytestcase(yyruleno==115); +{ yygotominor.yy526 = yymsp[-1].minor.yy526; yygotominor.yy526.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + break; + case 99: /* db_optr ::= db_optr days */ +{ yygotominor.yy526 = yymsp[-1].minor.yy526; yygotominor.yy526.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + break; + case 100: /* db_optr ::= db_optr minrows */ +{ yygotominor.yy526 = yymsp[-1].minor.yy526; yygotominor.yy526.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } + break; + case 101: /* db_optr ::= db_optr maxrows */ +{ yygotominor.yy526 = yymsp[-1].minor.yy526; yygotominor.yy526.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } + break; + case 102: /* db_optr ::= db_optr blocks */ + case 117: /* alter_db_optr ::= alter_db_optr blocks */ yytestcase(yyruleno==117); +{ yygotominor.yy526 = yymsp[-1].minor.yy526; yygotominor.yy526.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + break; + case 103: /* db_optr ::= db_optr ctime */ +{ yygotominor.yy526 = yymsp[-1].minor.yy526; yygotominor.yy526.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + break; + case 104: /* db_optr ::= db_optr wal */ + case 119: /* alter_db_optr ::= alter_db_optr wal */ yytestcase(yyruleno==119); +{ yygotominor.yy526 = yymsp[-1].minor.yy526; yygotominor.yy526.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + break; + case 105: /* db_optr ::= db_optr fsync */ + case 120: /* alter_db_optr ::= alter_db_optr fsync */ yytestcase(yyruleno==120); +{ yygotominor.yy526 = yymsp[-1].minor.yy526; yygotominor.yy526.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + break; + case 106: /* db_optr ::= db_optr comp */ + case 118: /* alter_db_optr ::= alter_db_optr comp */ yytestcase(yyruleno==118); +{ yygotominor.yy526 = yymsp[-1].minor.yy526; yygotominor.yy526.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + break; + case 107: /* db_optr ::= db_optr prec */ +{ yygotominor.yy526 = yymsp[-1].minor.yy526; yygotominor.yy526.precision = yymsp[0].minor.yy0; } + break; + case 108: /* db_optr ::= db_optr keep */ + case 116: /* alter_db_optr ::= alter_db_optr keep */ yytestcase(yyruleno==116); +{ yygotominor.yy526 = yymsp[-1].minor.yy526; yygotominor.yy526.keep = yymsp[0].minor.yy285; } + break; + case 109: /* db_optr ::= db_optr update */ + case 121: /* alter_db_optr ::= alter_db_optr update */ yytestcase(yyruleno==121); +{ yygotominor.yy526 = yymsp[-1].minor.yy526; yygotominor.yy526.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + break; + case 110: /* db_optr ::= db_optr cachelast */ + case 122: /* alter_db_optr ::= alter_db_optr cachelast */ yytestcase(yyruleno==122); +{ yygotominor.yy526 = yymsp[-1].minor.yy526; yygotominor.yy526.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + break; + case 111: /* topic_optr ::= db_optr */ + case 123: /* alter_topic_optr ::= alter_db_optr */ yytestcase(yyruleno==123); +{ yygotominor.yy526 = yymsp[0].minor.yy526; yygotominor.yy526.dbType = TSDB_DB_TYPE_TOPIC; } + break; + case 112: /* topic_optr ::= topic_optr partitions */ + case 124: /* alter_topic_optr ::= alter_topic_optr partitions */ yytestcase(yyruleno==124); +{ yygotominor.yy526 = yymsp[-1].minor.yy526; yygotominor.yy526.partitions = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + break; + case 113: /* alter_db_optr ::= */ +{ setDefaultCreateDbOption(&yygotominor.yy526); yygotominor.yy526.dbType = TSDB_DB_TYPE_DEFAULT;} + break; + case 125: /* typename ::= ids */ { yymsp[0].minor.yy0.type = 0; - tSetColumnType (&yylhsminor.yy407, &yymsp[0].minor.yy0); + tSetColumnType (&yygotominor.yy295, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy407 = yylhsminor.yy407; break; - case 125: /* typename ::= ids LP signed RP */ + case 126: /* typename ::= ids LP signed RP */ { - if (yymsp[-1].minor.yy317 <= 0) { + if (yymsp[-1].minor.yy525 <= 0) { yymsp[-3].minor.yy0.type = 0; - tSetColumnType(&yylhsminor.yy407, &yymsp[-3].minor.yy0); + tSetColumnType(&yygotominor.yy295, &yymsp[-3].minor.yy0); } else { - yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy317; // negative value of name length - tSetColumnType(&yylhsminor.yy407, &yymsp[-3].minor.yy0); + yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy525; // negative value of name length + tSetColumnType(&yygotominor.yy295, &yymsp[-3].minor.yy0); } } - yymsp[-3].minor.yy407 = yylhsminor.yy407; break; - case 126: /* typename ::= ids UNSIGNED */ + case 127: /* 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.yy407, &yymsp[-1].minor.yy0); + tSetColumnType (&yygotominor.yy295, &yymsp[-1].minor.yy0); } - yymsp[-1].minor.yy407 = yylhsminor.yy407; - break; - case 127: /* signed ::= INTEGER */ -{ yylhsminor.yy317 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[0].minor.yy317 = yylhsminor.yy317; break; - case 128: /* signed ::= PLUS INTEGER */ -{ yymsp[-1].minor.yy317 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + case 128: /* signed ::= INTEGER */ + case 129: /* signed ::= PLUS INTEGER */ yytestcase(yyruleno==129); +{ yygotominor.yy525 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } break; - case 129: /* signed ::= MINUS INTEGER */ -{ yymsp[-1].minor.yy317 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);} + case 130: /* signed ::= MINUS INTEGER */ + case 131: /* cmd ::= CREATE TABLE create_table_args */ yytestcase(yyruleno==131); + case 132: /* cmd ::= CREATE TABLE create_stable_args */ yytestcase(yyruleno==132); + case 133: /* cmd ::= CREATE STABLE create_stable_args */ yytestcase(yyruleno==133); +{ yygotominor.yy525 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);} break; - case 133: /* cmd ::= CREATE TABLE create_table_list */ -{ pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy14;} + case 134: /* cmd ::= CREATE TABLE create_table_list */ +{ pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy470;} break; - case 134: /* create_table_list ::= create_from_stable */ + case 135: /* create_table_list ::= create_from_stable */ { SCreateTableSql* pCreateTable = calloc(1, sizeof(SCreateTableSql)); pCreateTable->childTableInfo = taosArrayInit(4, sizeof(SCreatedTableInfo)); - taosArrayPush(pCreateTable->childTableInfo, &yymsp[0].minor.yy206); + taosArrayPush(pCreateTable->childTableInfo, &yymsp[0].minor.yy96); pCreateTable->type = TSQL_CREATE_TABLE_FROM_STABLE; - yylhsminor.yy14 = pCreateTable; + yygotominor.yy470 = pCreateTable; } - yymsp[0].minor.yy14 = yylhsminor.yy14; break; - case 135: /* create_table_list ::= create_table_list create_from_stable */ + case 136: /* create_table_list ::= create_table_list create_from_stable */ { - taosArrayPush(yymsp[-1].minor.yy14->childTableInfo, &yymsp[0].minor.yy206); - yylhsminor.yy14 = yymsp[-1].minor.yy14; + taosArrayPush(yymsp[-1].minor.yy470->childTableInfo, &yymsp[0].minor.yy96); + yygotominor.yy470 = yymsp[-1].minor.yy470; } - yymsp[-1].minor.yy14 = yylhsminor.yy14; break; - case 136: /* create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ + case 137: /* create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ { - yylhsminor.yy14 = tSetCreateTableInfo(yymsp[-1].minor.yy159, NULL, NULL, TSQL_CREATE_TABLE); - setSqlInfo(pInfo, yylhsminor.yy14, NULL, TSDB_SQL_CREATE_TABLE); + yygotominor.yy470 = tSetCreateTableInfo(yymsp[-1].minor.yy285, NULL, NULL, TSQL_CREATE_TABLE); + setSqlInfo(pInfo, yygotominor.yy470, 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.yy14 = yylhsminor.yy14; break; - case 137: /* create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ + case 138: /* create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ { - yylhsminor.yy14 = tSetCreateTableInfo(yymsp[-5].minor.yy159, yymsp[-1].minor.yy159, NULL, TSQL_CREATE_STABLE); - setSqlInfo(pInfo, yylhsminor.yy14, NULL, TSDB_SQL_CREATE_TABLE); + yygotominor.yy470 = tSetCreateTableInfo(yymsp[-5].minor.yy285, yymsp[-1].minor.yy285, NULL, TSQL_CREATE_STABLE); + setSqlInfo(pInfo, yygotominor.yy470, 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.yy14 = yylhsminor.yy14; break; - case 138: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */ + case 139: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */ { yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n; yymsp[-8].minor.yy0.n += yymsp[-7].minor.yy0.n; - yylhsminor.yy206 = createNewChildTableInfo(&yymsp[-5].minor.yy0, NULL, yymsp[-1].minor.yy159, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0); + yygotominor.yy96 = createNewChildTableInfo(&yymsp[-5].minor.yy0, NULL, yymsp[-1].minor.yy285, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0); } - yymsp[-9].minor.yy206 = yylhsminor.yy206; break; - case 139: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */ + case 140: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */ { yymsp[-8].minor.yy0.n += yymsp[-7].minor.yy0.n; yymsp[-11].minor.yy0.n += yymsp[-10].minor.yy0.n; - yylhsminor.yy206 = createNewChildTableInfo(&yymsp[-8].minor.yy0, yymsp[-5].minor.yy159, yymsp[-1].minor.yy159, &yymsp[-11].minor.yy0, &yymsp[-12].minor.yy0); + yygotominor.yy96 = createNewChildTableInfo(&yymsp[-8].minor.yy0, yymsp[-5].minor.yy285, yymsp[-1].minor.yy285, &yymsp[-11].minor.yy0, &yymsp[-12].minor.yy0); } - yymsp[-12].minor.yy206 = yylhsminor.yy206; break; - case 140: /* tagNamelist ::= tagNamelist COMMA ids */ -{taosArrayPush(yymsp[-2].minor.yy159, &yymsp[0].minor.yy0); yylhsminor.yy159 = yymsp[-2].minor.yy159; } - yymsp[-2].minor.yy159 = yylhsminor.yy159; + case 141: /* tagNamelist ::= tagNamelist COMMA ids */ +{taosArrayPush(yymsp[-2].minor.yy285, &yymsp[0].minor.yy0); yygotominor.yy285 = yymsp[-2].minor.yy285; } break; - case 141: /* tagNamelist ::= ids */ -{yylhsminor.yy159 = taosArrayInit(4, sizeof(SStrToken)); taosArrayPush(yylhsminor.yy159, &yymsp[0].minor.yy0);} - yymsp[0].minor.yy159 = yylhsminor.yy159; + case 142: /* tagNamelist ::= ids */ +{yygotominor.yy285 = taosArrayInit(4, sizeof(SStrToken)); taosArrayPush(yygotominor.yy285, &yymsp[0].minor.yy0);} break; - case 142: /* create_table_args ::= ifnotexists ids cpxName AS select */ + case 143: /* create_table_args ::= ifnotexists ids cpxName AS select */ { - yylhsminor.yy14 = tSetCreateTableInfo(NULL, NULL, yymsp[0].minor.yy116, TSQL_CREATE_STREAM); - setSqlInfo(pInfo, yylhsminor.yy14, NULL, TSDB_SQL_CREATE_TABLE); + yygotominor.yy470 = tSetCreateTableInfo(NULL, NULL, yymsp[0].minor.yy344, TSQL_CREATE_STREAM); + setSqlInfo(pInfo, yygotominor.yy470, 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.yy14 = yylhsminor.yy14; break; - case 143: /* columnlist ::= columnlist COMMA column */ -{taosArrayPush(yymsp[-2].minor.yy159, &yymsp[0].minor.yy407); yylhsminor.yy159 = yymsp[-2].minor.yy159; } - yymsp[-2].minor.yy159 = yylhsminor.yy159; + case 144: /* columnlist ::= columnlist COMMA column */ +{taosArrayPush(yymsp[-2].minor.yy285, &yymsp[0].minor.yy295); yygotominor.yy285 = yymsp[-2].minor.yy285; } break; - case 144: /* columnlist ::= column */ -{yylhsminor.yy159 = taosArrayInit(4, sizeof(TAOS_FIELD)); taosArrayPush(yylhsminor.yy159, &yymsp[0].minor.yy407);} - yymsp[0].minor.yy159 = yylhsminor.yy159; + case 145: /* columnlist ::= column */ +{yygotominor.yy285 = taosArrayInit(4, sizeof(TAOS_FIELD)); taosArrayPush(yygotominor.yy285, &yymsp[0].minor.yy295);} break; - case 145: /* column ::= ids typename */ + case 146: /* column ::= ids typename */ { - tSetColumnInfo(&yylhsminor.yy407, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy407); + tSetColumnInfo(&yygotominor.yy295, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy295); } - yymsp[-1].minor.yy407 = yylhsminor.yy407; break; - case 146: /* tagitemlist ::= tagitemlist COMMA tagitem */ -{ yylhsminor.yy159 = tVariantListAppend(yymsp[-2].minor.yy159, &yymsp[0].minor.yy488, -1); } - yymsp[-2].minor.yy159 = yylhsminor.yy159; + case 147: /* tagitemlist ::= tagitemlist COMMA tagitem */ +{ yygotominor.yy285 = tVariantListAppend(yymsp[-2].minor.yy285, &yymsp[0].minor.yy362, -1); } break; - case 147: /* tagitemlist ::= tagitem */ -{ yylhsminor.yy159 = tVariantListAppend(NULL, &yymsp[0].minor.yy488, -1); } - yymsp[0].minor.yy159 = yylhsminor.yy159; + case 148: /* tagitemlist ::= tagitem */ +{ yygotominor.yy285 = tVariantListAppend(NULL, &yymsp[0].minor.yy362, -1); } break; - case 148: /* tagitem ::= INTEGER */ - case 149: /* tagitem ::= FLOAT */ yytestcase(yyruleno==149); - case 150: /* tagitem ::= STRING */ yytestcase(yyruleno==150); - case 151: /* tagitem ::= BOOL */ yytestcase(yyruleno==151); -{ toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yylhsminor.yy488, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy488 = yylhsminor.yy488; + case 149: /* tagitem ::= INTEGER */ + case 150: /* tagitem ::= FLOAT */ yytestcase(yyruleno==150); + case 151: /* tagitem ::= STRING */ yytestcase(yyruleno==151); + case 152: /* tagitem ::= BOOL */ yytestcase(yyruleno==152); +{ toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yygotominor.yy362, &yymsp[0].minor.yy0); } break; - case 152: /* tagitem ::= NULL */ -{ yymsp[0].minor.yy0.type = 0; tVariantCreate(&yylhsminor.yy488, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy488 = yylhsminor.yy488; + case 153: /* tagitem ::= NULL */ +{ yymsp[0].minor.yy0.type = 0; tVariantCreate(&yygotominor.yy362, &yymsp[0].minor.yy0); } break; - case 153: /* tagitem ::= MINUS INTEGER */ - case 154: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==154); - case 155: /* tagitem ::= PLUS INTEGER */ yytestcase(yyruleno==155); - case 156: /* tagitem ::= PLUS FLOAT */ yytestcase(yyruleno==156); + case 154: /* tagitem ::= MINUS INTEGER */ + case 155: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==155); + case 156: /* tagitem ::= PLUS INTEGER */ yytestcase(yyruleno==156); + case 157: /* tagitem ::= PLUS FLOAT */ yytestcase(yyruleno==157); { 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); - tVariantCreate(&yylhsminor.yy488, &yymsp[-1].minor.yy0); + tVariantCreate(&yygotominor.yy362, &yymsp[-1].minor.yy0); } - yymsp[-1].minor.yy488 = yylhsminor.yy488; break; - case 157: /* select ::= SELECT selcollist from where_opt interval_opt session_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ + case 158: /* select ::= SELECT selcollist from where_opt interval_opt session_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ { - yylhsminor.yy116 = tSetQuerySqlNode(&yymsp[-12].minor.yy0, yymsp[-11].minor.yy159, yymsp[-10].minor.yy236, yymsp[-9].minor.yy118, yymsp[-4].minor.yy159, yymsp[-3].minor.yy159, &yymsp[-8].minor.yy184, &yymsp[-7].minor.yy249, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy159, &yymsp[0].minor.yy440, &yymsp[-1].minor.yy440, yymsp[-2].minor.yy118); + yygotominor.yy344 = tSetQuerySqlNode(&yymsp[-12].minor.yy0, yymsp[-11].minor.yy285, yymsp[-10].minor.yy148, yymsp[-9].minor.yy178, yymsp[-4].minor.yy285, yymsp[-3].minor.yy285, &yymsp[-8].minor.yy376, &yymsp[-7].minor.yy523, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy285, &yymsp[0].minor.yy438, &yymsp[-1].minor.yy438, yymsp[-2].minor.yy178); } - yymsp[-12].minor.yy116 = yylhsminor.yy116; break; - case 158: /* select ::= LP select RP */ -{yymsp[-2].minor.yy116 = yymsp[-1].minor.yy116;} + case 159: /* select ::= LP select RP */ +{yygotominor.yy344 = yymsp[-1].minor.yy344;} break; - case 159: /* union ::= select */ -{ yylhsminor.yy159 = setSubclause(NULL, yymsp[0].minor.yy116); } - yymsp[0].minor.yy159 = yylhsminor.yy159; + case 160: /* union ::= select */ +{ yygotominor.yy285 = setSubclause(NULL, yymsp[0].minor.yy344); } break; - case 160: /* union ::= union UNION ALL select */ -{ yylhsminor.yy159 = appendSelectClause(yymsp[-3].minor.yy159, yymsp[0].minor.yy116); } - yymsp[-3].minor.yy159 = yylhsminor.yy159; + case 161: /* union ::= union UNION ALL select */ +{ yygotominor.yy285 = appendSelectClause(yymsp[-3].minor.yy285, yymsp[0].minor.yy344); } break; - case 161: /* cmd ::= union */ -{ setSqlInfo(pInfo, yymsp[0].minor.yy159, NULL, TSDB_SQL_SELECT); } + case 162: /* cmd ::= union */ +{ setSqlInfo(pInfo, yymsp[0].minor.yy285, NULL, TSDB_SQL_SELECT); } break; - case 162: /* select ::= SELECT selcollist */ + case 163: /* select ::= SELECT selcollist */ { - yylhsminor.yy116 = tSetQuerySqlNode(&yymsp[-1].minor.yy0, yymsp[0].minor.yy159, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + yygotominor.yy344 = tSetQuerySqlNode(&yymsp[-1].minor.yy0, yymsp[0].minor.yy285, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); } - yymsp[-1].minor.yy116 = yylhsminor.yy116; break; - case 163: /* sclp ::= selcollist COMMA */ -{yylhsminor.yy159 = yymsp[-1].minor.yy159;} - yymsp[-1].minor.yy159 = yylhsminor.yy159; + case 164: /* sclp ::= selcollist COMMA */ +{yygotominor.yy285 = yymsp[-1].minor.yy285;} break; - case 164: /* sclp ::= */ - case 189: /* orderby_opt ::= */ yytestcase(yyruleno==189); -{yymsp[1].minor.yy159 = 0;} + case 165: /* sclp ::= */ + case 190: /* orderby_opt ::= */ yytestcase(yyruleno==190); +{yygotominor.yy285 = 0;} break; - case 165: /* selcollist ::= sclp distinct expr as */ + case 166: /* selcollist ::= sclp distinct expr as */ { - yylhsminor.yy159 = tSqlExprListAppend(yymsp[-3].minor.yy159, yymsp[-1].minor.yy118, yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0); + yygotominor.yy285 = tSqlExprListAppend(yymsp[-3].minor.yy285, yymsp[-1].minor.yy178, yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0); } - yymsp[-3].minor.yy159 = yylhsminor.yy159; break; - case 166: /* selcollist ::= sclp STAR */ + case 167: /* selcollist ::= sclp STAR */ { tSqlExpr *pNode = tSqlExprCreateIdValue(NULL, TK_ALL); - yylhsminor.yy159 = tSqlExprListAppend(yymsp[-1].minor.yy159, pNode, 0, 0); + yygotominor.yy285 = tSqlExprListAppend(yymsp[-1].minor.yy285, pNode, 0, 0); } - yymsp[-1].minor.yy159 = yylhsminor.yy159; break; - case 167: /* as ::= AS ids */ -{ yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } + case 168: /* as ::= AS ids */ + case 169: /* as ::= ids */ yytestcase(yyruleno==169); +{ yygotominor.yy0 = yymsp[0].minor.yy0; } break; - case 168: /* as ::= ids */ -{ yylhsminor.yy0 = yymsp[0].minor.yy0; } - yymsp[0].minor.yy0 = yylhsminor.yy0; + case 170: /* as ::= */ +{ yygotominor.yy0.n = 0; } break; - case 169: /* as ::= */ -{ yymsp[1].minor.yy0.n = 0; } + case 171: /* distinct ::= DISTINCT */ +{ yygotominor.yy0 = yymsp[0].minor.yy0; } break; - case 170: /* distinct ::= DISTINCT */ -{ yylhsminor.yy0 = yymsp[0].minor.yy0; } - yymsp[0].minor.yy0 = yylhsminor.yy0; + case 173: /* from ::= FROM tablelist */ +{yygotominor.yy148 = yymsp[0].minor.yy148;} break; - case 172: /* from ::= FROM tablelist */ -{yymsp[-1].minor.yy236 = yymsp[0].minor.yy236;} + case 174: /* from ::= FROM LP union RP */ +{yygotominor.yy148 = setSubquery(NULL, yymsp[-1].minor.yy285);} break; - case 173: /* from ::= FROM LP union RP */ -{yymsp[-3].minor.yy236 = setSubquery(NULL, yymsp[-1].minor.yy159);} - break; - case 174: /* tablelist ::= ids cpxName */ + case 175: /* tablelist ::= ids cpxName */ { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - yylhsminor.yy236 = setTableNameList(NULL, &yymsp[-1].minor.yy0, NULL); + yygotominor.yy148 = setTableNameList(NULL, &yymsp[-1].minor.yy0, NULL); } - yymsp[-1].minor.yy236 = yylhsminor.yy236; break; - case 175: /* tablelist ::= ids cpxName ids */ + case 176: /* tablelist ::= ids cpxName ids */ { yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n; - yylhsminor.yy236 = setTableNameList(NULL, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); + yygotominor.yy148 = setTableNameList(NULL, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy236 = yylhsminor.yy236; break; - case 176: /* tablelist ::= tablelist COMMA ids cpxName */ + case 177: /* tablelist ::= tablelist COMMA ids cpxName */ { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - yylhsminor.yy236 = setTableNameList(yymsp[-3].minor.yy236, &yymsp[-1].minor.yy0, NULL); + yygotominor.yy148 = setTableNameList(yymsp[-3].minor.yy148, &yymsp[-1].minor.yy0, NULL); } - yymsp[-3].minor.yy236 = yylhsminor.yy236; break; - case 177: /* tablelist ::= tablelist COMMA ids cpxName ids */ + case 178: /* tablelist ::= tablelist COMMA ids cpxName ids */ { yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n; - yylhsminor.yy236 = setTableNameList(yymsp[-4].minor.yy236, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); + yygotominor.yy148 = setTableNameList(yymsp[-4].minor.yy148, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); } - yymsp[-4].minor.yy236 = yylhsminor.yy236; break; - case 178: /* tmvar ::= VARIABLE */ -{yylhsminor.yy0 = yymsp[0].minor.yy0;} - yymsp[0].minor.yy0 = yylhsminor.yy0; + case 179: /* tmvar ::= VARIABLE */ +{yygotominor.yy0 = yymsp[0].minor.yy0;} break; - case 179: /* interval_opt ::= INTERVAL LP tmvar RP */ -{yymsp[-3].minor.yy184.interval = yymsp[-1].minor.yy0; yymsp[-3].minor.yy184.offset.n = 0;} + case 180: /* interval_opt ::= INTERVAL LP tmvar RP */ +{yygotominor.yy376.interval = yymsp[-1].minor.yy0; yygotominor.yy376.offset.n = 0;} break; - case 180: /* interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ -{yymsp[-5].minor.yy184.interval = yymsp[-3].minor.yy0; yymsp[-5].minor.yy184.offset = yymsp[-1].minor.yy0;} + case 181: /* interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ +{yygotominor.yy376.interval = yymsp[-3].minor.yy0; yygotominor.yy376.offset = yymsp[-1].minor.yy0;} break; - case 181: /* interval_opt ::= */ -{memset(&yymsp[1].minor.yy184, 0, sizeof(yymsp[1].minor.yy184));} + case 182: /* interval_opt ::= */ +{memset(&yygotominor.yy376, 0, sizeof(yygotominor.yy376));} break; - case 182: /* session_option ::= */ -{yymsp[1].minor.yy249.col.n = 0; yymsp[1].minor.yy249.gap.n = 0;} + case 183: /* session_option ::= */ +{yygotominor.yy523.col.n = 0; yygotominor.yy523.gap.n = 0;} break; - case 183: /* session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ + case 184: /* session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - yymsp[-6].minor.yy249.col = yymsp[-4].minor.yy0; - yymsp[-6].minor.yy249.gap = yymsp[-1].minor.yy0; + yygotominor.yy523.col = yymsp[-4].minor.yy0; + yygotominor.yy523.gap = yymsp[-1].minor.yy0; } break; - case 184: /* fill_opt ::= */ -{ yymsp[1].minor.yy159 = 0; } + case 185: /* fill_opt ::= */ +{ yygotominor.yy285 = 0; } break; - case 185: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */ + case 186: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */ { tVariant A = {0}; toTSDBType(yymsp[-3].minor.yy0.type); tVariantCreate(&A, &yymsp[-3].minor.yy0); - tVariantListInsert(yymsp[-1].minor.yy159, &A, -1, 0); - yymsp[-5].minor.yy159 = yymsp[-1].minor.yy159; + tVariantListInsert(yymsp[-1].minor.yy285, &A, -1, 0); + yygotominor.yy285 = yymsp[-1].minor.yy285; } break; - case 186: /* fill_opt ::= FILL LP ID RP */ + case 187: /* fill_opt ::= FILL LP ID RP */ { toTSDBType(yymsp[-1].minor.yy0.type); - yymsp[-3].minor.yy159 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); + yygotominor.yy285 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); } break; - case 187: /* sliding_opt ::= SLIDING LP tmvar RP */ -{yymsp[-3].minor.yy0 = yymsp[-1].minor.yy0; } + case 188: /* sliding_opt ::= SLIDING LP tmvar RP */ +{yygotominor.yy0 = yymsp[-1].minor.yy0; } break; - case 188: /* sliding_opt ::= */ -{yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.z = NULL; yymsp[1].minor.yy0.type = 0; } + case 189: /* sliding_opt ::= */ +{yygotominor.yy0.n = 0; yygotominor.yy0.z = NULL; yygotominor.yy0.type = 0; } break; - case 190: /* orderby_opt ::= ORDER BY sortlist */ -{yymsp[-2].minor.yy159 = yymsp[0].minor.yy159;} + case 191: /* orderby_opt ::= ORDER BY sortlist */ +{yygotominor.yy285 = yymsp[0].minor.yy285;} break; - case 191: /* sortlist ::= sortlist COMMA item sortorder */ + case 192: /* sortlist ::= sortlist COMMA item sortorder */ { - yylhsminor.yy159 = tVariantListAppend(yymsp[-3].minor.yy159, &yymsp[-1].minor.yy488, yymsp[0].minor.yy20); + yygotominor.yy285 = tVariantListAppend(yymsp[-3].minor.yy285, &yymsp[-1].minor.yy362, yymsp[0].minor.yy460); } - yymsp[-3].minor.yy159 = yylhsminor.yy159; break; - case 192: /* sortlist ::= item sortorder */ + case 193: /* sortlist ::= item sortorder */ { - yylhsminor.yy159 = tVariantListAppend(NULL, &yymsp[-1].minor.yy488, yymsp[0].minor.yy20); + yygotominor.yy285 = tVariantListAppend(NULL, &yymsp[-1].minor.yy362, yymsp[0].minor.yy460); } - yymsp[-1].minor.yy159 = yylhsminor.yy159; break; - case 193: /* item ::= ids cpxName */ + case 194: /* item ::= ids cpxName */ { toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - tVariantCreate(&yylhsminor.yy488, &yymsp[-1].minor.yy0); + tVariantCreate(&yygotominor.yy362, &yymsp[-1].minor.yy0); } - yymsp[-1].minor.yy488 = yylhsminor.yy488; - break; - case 194: /* sortorder ::= ASC */ -{ yymsp[0].minor.yy20 = TSDB_ORDER_ASC; } break; - case 195: /* sortorder ::= DESC */ -{ yymsp[0].minor.yy20 = TSDB_ORDER_DESC;} + case 195: /* sortorder ::= ASC */ + case 197: /* sortorder ::= */ yytestcase(yyruleno==197); +{ yygotominor.yy460 = TSDB_ORDER_ASC; } break; - case 196: /* sortorder ::= */ -{ yymsp[1].minor.yy20 = TSDB_ORDER_ASC; } + case 196: /* sortorder ::= DESC */ +{ yygotominor.yy460 = TSDB_ORDER_DESC;} break; - case 197: /* groupby_opt ::= */ -{ yymsp[1].minor.yy159 = 0;} + case 198: /* groupby_opt ::= */ +{ yygotominor.yy285 = 0;} break; - case 198: /* groupby_opt ::= GROUP BY grouplist */ -{ yymsp[-2].minor.yy159 = yymsp[0].minor.yy159;} + case 199: /* groupby_opt ::= GROUP BY grouplist */ +{ yygotominor.yy285 = yymsp[0].minor.yy285;} break; - case 199: /* grouplist ::= grouplist COMMA item */ + case 200: /* grouplist ::= grouplist COMMA item */ { - yylhsminor.yy159 = tVariantListAppend(yymsp[-2].minor.yy159, &yymsp[0].minor.yy488, -1); + yygotominor.yy285 = tVariantListAppend(yymsp[-2].minor.yy285, &yymsp[0].minor.yy362, -1); } - yymsp[-2].minor.yy159 = yylhsminor.yy159; break; - case 200: /* grouplist ::= item */ + case 201: /* grouplist ::= item */ { - yylhsminor.yy159 = tVariantListAppend(NULL, &yymsp[0].minor.yy488, -1); + yygotominor.yy285 = tVariantListAppend(NULL, &yymsp[0].minor.yy362, -1); } - yymsp[0].minor.yy159 = yylhsminor.yy159; break; - case 201: /* having_opt ::= */ - case 211: /* where_opt ::= */ yytestcase(yyruleno==211); - case 253: /* expritem ::= */ yytestcase(yyruleno==253); -{yymsp[1].minor.yy118 = 0;} + case 202: /* having_opt ::= */ + case 212: /* where_opt ::= */ yytestcase(yyruleno==212); + case 254: /* expritem ::= */ yytestcase(yyruleno==254); +{yygotominor.yy178 = 0;} break; - case 202: /* having_opt ::= HAVING expr */ - case 212: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==212); -{yymsp[-1].minor.yy118 = yymsp[0].minor.yy118;} + case 203: /* having_opt ::= HAVING expr */ + case 213: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==213); + case 253: /* expritem ::= expr */ yytestcase(yyruleno==253); +{yygotominor.yy178 = yymsp[0].minor.yy178;} break; - case 203: /* limit_opt ::= */ - case 207: /* slimit_opt ::= */ yytestcase(yyruleno==207); -{yymsp[1].minor.yy440.limit = -1; yymsp[1].minor.yy440.offset = 0;} + case 204: /* limit_opt ::= */ + case 208: /* slimit_opt ::= */ yytestcase(yyruleno==208); +{yygotominor.yy438.limit = -1; yygotominor.yy438.offset = 0;} break; - case 204: /* limit_opt ::= LIMIT signed */ - case 208: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==208); -{yymsp[-1].minor.yy440.limit = yymsp[0].minor.yy317; yymsp[-1].minor.yy440.offset = 0;} + case 205: /* limit_opt ::= LIMIT signed */ + case 209: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==209); +{yygotominor.yy438.limit = yymsp[0].minor.yy525; yygotominor.yy438.offset = 0;} break; - case 205: /* limit_opt ::= LIMIT signed OFFSET signed */ -{ yymsp[-3].minor.yy440.limit = yymsp[-2].minor.yy317; yymsp[-3].minor.yy440.offset = yymsp[0].minor.yy317;} + case 206: /* limit_opt ::= LIMIT signed OFFSET signed */ +{ yygotominor.yy438.limit = yymsp[-2].minor.yy525; yygotominor.yy438.offset = yymsp[0].minor.yy525;} break; - case 206: /* limit_opt ::= LIMIT signed COMMA signed */ -{ yymsp[-3].minor.yy440.limit = yymsp[0].minor.yy317; yymsp[-3].minor.yy440.offset = yymsp[-2].minor.yy317;} + case 207: /* limit_opt ::= LIMIT signed COMMA signed */ +{ yygotominor.yy438.limit = yymsp[0].minor.yy525; yygotominor.yy438.offset = yymsp[-2].minor.yy525;} break; - case 209: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ -{yymsp[-3].minor.yy440.limit = yymsp[-2].minor.yy317; yymsp[-3].minor.yy440.offset = yymsp[0].minor.yy317;} + case 210: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ +{yygotominor.yy438.limit = yymsp[-2].minor.yy525; yygotominor.yy438.offset = yymsp[0].minor.yy525;} break; - case 210: /* slimit_opt ::= SLIMIT signed COMMA signed */ -{yymsp[-3].minor.yy440.limit = yymsp[0].minor.yy317; yymsp[-3].minor.yy440.offset = yymsp[-2].minor.yy317;} + case 211: /* slimit_opt ::= SLIMIT signed COMMA signed */ +{yygotominor.yy438.limit = yymsp[0].minor.yy525; yygotominor.yy438.offset = yymsp[-2].minor.yy525;} break; - case 213: /* expr ::= LP expr RP */ -{yylhsminor.yy118 = yymsp[-1].minor.yy118; yylhsminor.yy118->token.z = yymsp[-2].minor.yy0.z; yylhsminor.yy118->token.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);} - yymsp[-2].minor.yy118 = yylhsminor.yy118; + case 214: /* expr ::= LP expr RP */ +{yygotominor.yy178 = yymsp[-1].minor.yy178; yygotominor.yy178->token.z = yymsp[-2].minor.yy0.z; yygotominor.yy178->token.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);} break; - case 214: /* expr ::= ID */ -{ yylhsminor.yy118 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_ID);} - yymsp[0].minor.yy118 = yylhsminor.yy118; + case 215: /* expr ::= ID */ +{ yygotominor.yy178 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_ID);} break; - case 215: /* expr ::= ID DOT ID */ -{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy118 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ID);} - yymsp[-2].minor.yy118 = yylhsminor.yy118; + case 216: /* expr ::= ID DOT ID */ +{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yygotominor.yy178 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ID);} break; - case 216: /* expr ::= ID DOT STAR */ -{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy118 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ALL);} - yymsp[-2].minor.yy118 = yylhsminor.yy118; + case 217: /* expr ::= ID DOT STAR */ +{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yygotominor.yy178 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ALL);} break; - case 217: /* expr ::= INTEGER */ -{ yylhsminor.yy118 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_INTEGER);} - yymsp[0].minor.yy118 = yylhsminor.yy118; + case 218: /* expr ::= INTEGER */ +{ yygotominor.yy178 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_INTEGER);} break; - case 218: /* expr ::= MINUS INTEGER */ - case 219: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==219); -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy118 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_INTEGER);} - yymsp[-1].minor.yy118 = yylhsminor.yy118; + case 219: /* expr ::= MINUS INTEGER */ + case 220: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==220); +{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yygotominor.yy178 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_INTEGER);} break; - case 220: /* expr ::= FLOAT */ -{ yylhsminor.yy118 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_FLOAT);} - yymsp[0].minor.yy118 = yylhsminor.yy118; + case 221: /* expr ::= FLOAT */ +{ yygotominor.yy178 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_FLOAT);} break; - case 221: /* expr ::= MINUS FLOAT */ - case 222: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==222); -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy118 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_FLOAT);} - yymsp[-1].minor.yy118 = yylhsminor.yy118; + case 222: /* expr ::= MINUS FLOAT */ + case 223: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==223); +{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yygotominor.yy178 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_FLOAT);} break; - case 223: /* expr ::= STRING */ -{ yylhsminor.yy118 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_STRING);} - yymsp[0].minor.yy118 = yylhsminor.yy118; + case 224: /* expr ::= STRING */ +{ yygotominor.yy178 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_STRING);} break; - case 224: /* expr ::= NOW */ -{ yylhsminor.yy118 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NOW); } - yymsp[0].minor.yy118 = yylhsminor.yy118; + case 225: /* expr ::= NOW */ +{ yygotominor.yy178 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NOW); } break; - case 225: /* expr ::= VARIABLE */ -{ yylhsminor.yy118 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_VARIABLE);} - yymsp[0].minor.yy118 = yylhsminor.yy118; + case 226: /* expr ::= VARIABLE */ +{ yygotominor.yy178 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_VARIABLE);} break; - case 226: /* expr ::= PLUS VARIABLE */ - case 227: /* expr ::= MINUS VARIABLE */ yytestcase(yyruleno==227); -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_VARIABLE; yylhsminor.yy118 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_VARIABLE);} - yymsp[-1].minor.yy118 = yylhsminor.yy118; + case 227: /* expr ::= PLUS VARIABLE */ + case 228: /* expr ::= MINUS VARIABLE */ yytestcase(yyruleno==228); +{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_VARIABLE; yygotominor.yy178 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_VARIABLE);} break; - case 228: /* expr ::= BOOL */ -{ yylhsminor.yy118 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_BOOL);} - yymsp[0].minor.yy118 = yylhsminor.yy118; + case 229: /* expr ::= BOOL */ +{ yygotominor.yy178 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_BOOL);} break; - case 229: /* expr ::= NULL */ -{ yylhsminor.yy118 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NULL);} - yymsp[0].minor.yy118 = yylhsminor.yy118; + case 230: /* expr ::= NULL */ +{ yygotominor.yy178 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NULL);} break; - case 230: /* expr ::= ID LP exprlist RP */ -{ yylhsminor.yy118 = tSqlExprCreateFunction(yymsp[-1].minor.yy159, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } - yymsp[-3].minor.yy118 = yylhsminor.yy118; + case 231: /* expr ::= ID LP exprlist RP */ +{ yygotominor.yy178 = tSqlExprCreateFunction(yymsp[-1].minor.yy285, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } break; - case 231: /* expr ::= ID LP STAR RP */ -{ yylhsminor.yy118 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } - yymsp[-3].minor.yy118 = yylhsminor.yy118; + case 232: /* expr ::= ID LP STAR RP */ +{ yygotominor.yy178 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } break; - case 232: /* expr ::= expr IS NULL */ -{yylhsminor.yy118 = tSqlExprCreate(yymsp[-2].minor.yy118, NULL, TK_ISNULL);} - yymsp[-2].minor.yy118 = yylhsminor.yy118; + case 233: /* expr ::= expr IS NULL */ +{yygotominor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, NULL, TK_ISNULL);} break; - case 233: /* expr ::= expr IS NOT NULL */ -{yylhsminor.yy118 = tSqlExprCreate(yymsp[-3].minor.yy118, NULL, TK_NOTNULL);} - yymsp[-3].minor.yy118 = yylhsminor.yy118; + case 234: /* expr ::= expr IS NOT NULL */ +{yygotominor.yy178 = tSqlExprCreate(yymsp[-3].minor.yy178, NULL, TK_NOTNULL);} break; - case 234: /* expr ::= expr LT expr */ -{yylhsminor.yy118 = tSqlExprCreate(yymsp[-2].minor.yy118, yymsp[0].minor.yy118, TK_LT);} - yymsp[-2].minor.yy118 = yylhsminor.yy118; + case 235: /* expr ::= expr LT expr */ +{yygotominor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, yymsp[0].minor.yy178, TK_LT);} break; - case 235: /* expr ::= expr GT expr */ -{yylhsminor.yy118 = tSqlExprCreate(yymsp[-2].minor.yy118, yymsp[0].minor.yy118, TK_GT);} - yymsp[-2].minor.yy118 = yylhsminor.yy118; + case 236: /* expr ::= expr GT expr */ +{yygotominor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, yymsp[0].minor.yy178, TK_GT);} break; - case 236: /* expr ::= expr LE expr */ -{yylhsminor.yy118 = tSqlExprCreate(yymsp[-2].minor.yy118, yymsp[0].minor.yy118, TK_LE);} - yymsp[-2].minor.yy118 = yylhsminor.yy118; + case 237: /* expr ::= expr LE expr */ +{yygotominor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, yymsp[0].minor.yy178, TK_LE);} break; - case 237: /* expr ::= expr GE expr */ -{yylhsminor.yy118 = tSqlExprCreate(yymsp[-2].minor.yy118, yymsp[0].minor.yy118, TK_GE);} - yymsp[-2].minor.yy118 = yylhsminor.yy118; + case 238: /* expr ::= expr GE expr */ +{yygotominor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, yymsp[0].minor.yy178, TK_GE);} break; - case 238: /* expr ::= expr NE expr */ -{yylhsminor.yy118 = tSqlExprCreate(yymsp[-2].minor.yy118, yymsp[0].minor.yy118, TK_NE);} - yymsp[-2].minor.yy118 = yylhsminor.yy118; + case 239: /* expr ::= expr NE expr */ +{yygotominor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, yymsp[0].minor.yy178, TK_NE);} break; - case 239: /* expr ::= expr EQ expr */ -{yylhsminor.yy118 = tSqlExprCreate(yymsp[-2].minor.yy118, yymsp[0].minor.yy118, TK_EQ);} - yymsp[-2].minor.yy118 = yylhsminor.yy118; + case 240: /* expr ::= expr EQ expr */ +{yygotominor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, yymsp[0].minor.yy178, TK_EQ);} break; - case 240: /* expr ::= expr BETWEEN expr AND expr */ -{ tSqlExpr* X2 = tSqlExprClone(yymsp[-4].minor.yy118); yylhsminor.yy118 = tSqlExprCreate(tSqlExprCreate(yymsp[-4].minor.yy118, yymsp[-2].minor.yy118, TK_GE), tSqlExprCreate(X2, yymsp[0].minor.yy118, TK_LE), TK_AND);} - yymsp[-4].minor.yy118 = yylhsminor.yy118; + case 241: /* expr ::= expr BETWEEN expr AND expr */ +{ tSqlExpr* X2 = tSqlExprClone(yymsp[-4].minor.yy178); yygotominor.yy178 = tSqlExprCreate(tSqlExprCreate(yymsp[-4].minor.yy178, yymsp[-2].minor.yy178, TK_GE), tSqlExprCreate(X2, yymsp[0].minor.yy178, TK_LE), TK_AND);} break; - case 241: /* expr ::= expr AND expr */ -{yylhsminor.yy118 = tSqlExprCreate(yymsp[-2].minor.yy118, yymsp[0].minor.yy118, TK_AND);} - yymsp[-2].minor.yy118 = yylhsminor.yy118; + case 242: /* expr ::= expr AND expr */ +{yygotominor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, yymsp[0].minor.yy178, TK_AND);} break; - case 242: /* expr ::= expr OR expr */ -{yylhsminor.yy118 = tSqlExprCreate(yymsp[-2].minor.yy118, yymsp[0].minor.yy118, TK_OR); } - yymsp[-2].minor.yy118 = yylhsminor.yy118; + case 243: /* expr ::= expr OR expr */ +{yygotominor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, yymsp[0].minor.yy178, TK_OR); } break; - case 243: /* expr ::= expr PLUS expr */ -{yylhsminor.yy118 = tSqlExprCreate(yymsp[-2].minor.yy118, yymsp[0].minor.yy118, TK_PLUS); } - yymsp[-2].minor.yy118 = yylhsminor.yy118; + case 244: /* expr ::= expr PLUS expr */ +{yygotominor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, yymsp[0].minor.yy178, TK_PLUS); } break; - case 244: /* expr ::= expr MINUS expr */ -{yylhsminor.yy118 = tSqlExprCreate(yymsp[-2].minor.yy118, yymsp[0].minor.yy118, TK_MINUS); } - yymsp[-2].minor.yy118 = yylhsminor.yy118; + case 245: /* expr ::= expr MINUS expr */ +{yygotominor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, yymsp[0].minor.yy178, TK_MINUS); } break; - case 245: /* expr ::= expr STAR expr */ -{yylhsminor.yy118 = tSqlExprCreate(yymsp[-2].minor.yy118, yymsp[0].minor.yy118, TK_STAR); } - yymsp[-2].minor.yy118 = yylhsminor.yy118; + case 246: /* expr ::= expr STAR expr */ +{yygotominor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, yymsp[0].minor.yy178, TK_STAR); } break; - case 246: /* expr ::= expr SLASH expr */ -{yylhsminor.yy118 = tSqlExprCreate(yymsp[-2].minor.yy118, yymsp[0].minor.yy118, TK_DIVIDE);} - yymsp[-2].minor.yy118 = yylhsminor.yy118; + case 247: /* expr ::= expr SLASH expr */ +{yygotominor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, yymsp[0].minor.yy178, TK_DIVIDE);} break; - case 247: /* expr ::= expr REM expr */ -{yylhsminor.yy118 = tSqlExprCreate(yymsp[-2].minor.yy118, yymsp[0].minor.yy118, TK_REM); } - yymsp[-2].minor.yy118 = yylhsminor.yy118; + case 248: /* expr ::= expr REM expr */ +{yygotominor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, yymsp[0].minor.yy178, TK_REM); } break; - case 248: /* expr ::= expr LIKE expr */ -{yylhsminor.yy118 = tSqlExprCreate(yymsp[-2].minor.yy118, yymsp[0].minor.yy118, TK_LIKE); } - yymsp[-2].minor.yy118 = yylhsminor.yy118; + case 249: /* expr ::= expr LIKE expr */ +{yygotominor.yy178 = tSqlExprCreate(yymsp[-2].minor.yy178, yymsp[0].minor.yy178, TK_LIKE); } break; - case 249: /* expr ::= expr IN LP exprlist RP */ -{yylhsminor.yy118 = tSqlExprCreate(yymsp[-4].minor.yy118, (tSqlExpr*)yymsp[-1].minor.yy159, TK_IN); } - yymsp[-4].minor.yy118 = yylhsminor.yy118; + case 250: /* expr ::= expr IN LP exprlist RP */ +{yygotominor.yy178 = tSqlExprCreate(yymsp[-4].minor.yy178, (tSqlExpr*)yymsp[-1].minor.yy285, TK_IN); } break; - case 250: /* exprlist ::= exprlist COMMA expritem */ -{yylhsminor.yy159 = tSqlExprListAppend(yymsp[-2].minor.yy159,yymsp[0].minor.yy118,0, 0);} - yymsp[-2].minor.yy159 = yylhsminor.yy159; + case 251: /* exprlist ::= exprlist COMMA expritem */ +{yygotominor.yy285 = tSqlExprListAppend(yymsp[-2].minor.yy285,yymsp[0].minor.yy178,0, 0);} break; - case 251: /* exprlist ::= expritem */ -{yylhsminor.yy159 = tSqlExprListAppend(0,yymsp[0].minor.yy118,0, 0);} - yymsp[0].minor.yy159 = yylhsminor.yy159; + case 252: /* exprlist ::= expritem */ +{yygotominor.yy285 = tSqlExprListAppend(0,yymsp[0].minor.yy178,0, 0);} break; - case 252: /* expritem ::= expr */ -{yylhsminor.yy118 = yymsp[0].minor.yy118;} - yymsp[0].minor.yy118 = yylhsminor.yy118; - break; - case 254: /* cmd ::= RESET QUERY CACHE */ + case 255: /* cmd ::= RESET QUERY CACHE */ { setDCLSqlElems(pInfo, TSDB_SQL_RESET_CACHE, 0);} break; - case 255: /* cmd ::= SYNCDB ids REPLICA */ + case 256: /* cmd ::= SYNCDB ids REPLICA */ { setDCLSqlElems(pInfo, TSDB_SQL_SYNC_DB_REPLICA, 1, &yymsp[-1].minor.yy0);} break; - case 256: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ + case 257: /* 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.yy159, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, -1); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy285, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 257: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ + case 258: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -3010,14 +2568,14 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 258: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ + case 259: /* 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.yy159, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, -1); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy285, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 259: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ + case 260: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -3028,7 +2586,7 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 260: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ + case 261: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ { yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n; @@ -3042,26 +2600,26 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 261: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ + case 262: /* 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 = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1); - A = tVariantListAppend(A, &yymsp[0].minor.yy488, -1); + A = tVariantListAppend(A, &yymsp[0].minor.yy362, -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 262: /* cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ + case 263: /* 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.yy159, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, TSDB_SUPER_TABLE); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy285, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 263: /* cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ + case 264: /* cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -3072,14 +2630,14 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 264: /* cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ + case 265: /* 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.yy159, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, TSDB_SUPER_TABLE); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy285, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 265: /* cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ + case 266: /* cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -3090,7 +2648,7 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 266: /* cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ + case 267: /* cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ { yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n; @@ -3104,36 +2662,43 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 267: /* cmd ::= KILL CONNECTION INTEGER */ + case 268: /* cmd ::= KILL CONNECTION INTEGER */ {setKillSql(pInfo, TSDB_SQL_KILL_CONNECTION, &yymsp[0].minor.yy0);} break; - case 268: /* cmd ::= KILL STREAM INTEGER COLON INTEGER */ + case 269: /* 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 269: /* cmd ::= KILL QUERY INTEGER COLON INTEGER */ + case 270: /* 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: break; -/********** End reduce actions ************************************************/ }; - assert( yyrulenoYY_MAX_SHIFT && yyact<=YY_MAX_SHIFTREDUCE) ); - - /* It is not possible for a REDUCE to be followed by an error */ - assert( yyact!=YY_ERROR_ACTION ); - - yymsp += yysize+1; - yypParser->yytos = yymsp; - yymsp->stateno = (YYACTIONTYPE)yyact; - yymsp->major = (YYCODETYPE)yygoto; - yyTraceShift(yypParser, yyact, "... then shift"); + yypParser->yyidx -= yysize; + yyact = yy_find_reduce_action(yymsp[-yysize].stateno,(YYCODETYPE)yygoto); + if( yyact < YYNSTATE ){ +#ifdef NDEBUG + /* If we are not debugging and the reduce action popped at least + ** one element off the stack, then we can push the new element back + ** onto the stack here, and skip the stack overflow test in yy_shift(). + ** That gives a significant speed improvement. */ + if( yysize ){ + yypParser->yyidx++; + yymsp -= yysize-1; + yymsp->stateno = (YYACTIONTYPE)yyact; + yymsp->major = (YYCODETYPE)yygoto; + yymsp->minor = yygotominor; + }else +#endif + { + yy_shift(yypParser,yyact,yygoto,&yygotominor); + } + }else{ + assert( yyact == YYNSTATE + YYNRULE + 1 ); + yy_accept(yypParser); + } } /* @@ -3149,11 +2714,9 @@ static void yy_parse_failed( fprintf(yyTraceFILE,"%sFail!\n",yyTracePrompt); } #endif - while( yypParser->yytos>yypParser->yystack ) yy_pop_parser_stack(yypParser); + while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser); /* Here code is inserted which will be executed whenever the ** parser fails */ -/************ Begin %parse_failure code ***************************************/ -/************ End %parse_failure code *****************************************/ ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */ } #endif /* YYNOERRORRECOVERY */ @@ -3164,11 +2727,10 @@ static void yy_parse_failed( static void yy_syntax_error( yyParser *yypParser, /* The parser */ int yymajor, /* The major type of the error token */ - ParseTOKENTYPE yyminor /* The minor type of the error token */ + YYMINORTYPE yyminor /* The minor type of the error token */ ){ ParseARG_FETCH; -#define TOKEN yyminor -/************ Begin %syntax_error code ****************************************/ +#define TOKEN (yyminor.yy0) pInfo->valid = false; int32_t outputBufLen = tListLen(pInfo->msg); @@ -3191,7 +2753,6 @@ static void yy_syntax_error( } assert(len <= outputBufLen); -/************ End %syntax_error code ******************************************/ ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */ } @@ -3207,15 +2768,10 @@ static void yy_accept( fprintf(yyTraceFILE,"%sAccept!\n",yyTracePrompt); } #endif -#ifndef YYNOERRORRECOVERY - yypParser->yyerrcnt = -1; -#endif - assert( yypParser->yytos==yypParser->yystack ); + while( yypParser->yyidx>=0 ) yy_pop_parser_stack(yypParser); /* Here code is inserted which will be executed whenever the ** parser accepts */ -/*********** Begin %parse_accept code *****************************************/ -/*********** End %parse_accept code *******************************************/ ParseARG_STORE; /* Suppress warning about unused %extra_argument variable */ } @@ -3245,52 +2801,50 @@ void Parse( ParseARG_PDECL /* Optional %extra_argument parameter */ ){ YYMINORTYPE yyminorunion; - unsigned int yyact; /* The parser action. */ -#if !defined(YYERRORSYMBOL) && !defined(YYNOERRORRECOVERY) + int yyact; /* The parser action. */ int yyendofinput; /* True if we are at the end of input */ -#endif #ifdef YYERRORSYMBOL int yyerrorhit = 0; /* True if yymajor has invoked an error */ #endif yyParser *yypParser; /* The parser */ + /* (re)initialize the parser, if necessary */ yypParser = (yyParser*)yyp; - assert( yypParser->yytos!=0 ); -#if !defined(YYERRORSYMBOL) && !defined(YYNOERRORRECOVERY) - yyendofinput = (yymajor==0); + if( yypParser->yyidx<0 ){ +#if YYSTACKDEPTH<=0 + if( yypParser->yystksz <=0 ){ + /*memset(&yyminorunion, 0, sizeof(yyminorunion));*/ + yyminorunion = yyzerominor; + yyStackOverflow(yypParser, &yyminorunion); + return; + } #endif + yypParser->yyidx = 0; + yypParser->yyerrcnt = -1; + yypParser->yystack[0].stateno = 0; + yypParser->yystack[0].major = 0; + } + yyminorunion.yy0 = yyminor; + yyendofinput = (yymajor==0); ParseARG_STORE; #ifndef NDEBUG if( yyTraceFILE ){ - int stateno = yypParser->yytos->stateno; - if( stateno < YY_MIN_REDUCE ){ - fprintf(yyTraceFILE,"%sInput '%s' in state %d\n", - yyTracePrompt,yyTokenName[yymajor],stateno); - }else{ - fprintf(yyTraceFILE,"%sInput '%s' with pending reduce %d\n", - yyTracePrompt,yyTokenName[yymajor],stateno-YY_MIN_REDUCE); - } + fprintf(yyTraceFILE,"%sInput %s\n",yyTracePrompt,yyTokenName[yymajor]); } #endif do{ yyact = yy_find_shift_action(yypParser,(YYCODETYPE)yymajor); - if( yyact >= YY_MIN_REDUCE ){ - yy_reduce(yypParser,yyact-YY_MIN_REDUCE,yymajor,yyminor); - }else if( yyact <= YY_MAX_SHIFTREDUCE ){ - yy_shift(yypParser,yyact,yymajor,yyminor); -#ifndef YYNOERRORRECOVERY + if( yyactyyerrcnt--; -#endif yymajor = YYNOCODE; - }else if( yyact==YY_ACCEPT_ACTION ){ - yypParser->yytos--; - yy_accept(yypParser); - return; + }else if( yyact < YYNSTATE + YYNRULE ){ + yy_reduce(yypParser,yyact-YYNSTATE); }else{ assert( yyact == YY_ERROR_ACTION ); - yyminorunion.yy0 = yyminor; #ifdef YYERRORSYMBOL int yymx; #endif @@ -3320,9 +2874,9 @@ void Parse( ** */ if( yypParser->yyerrcnt<0 ){ - yy_syntax_error(yypParser,yymajor,yyminor); + yy_syntax_error(yypParser,yymajor,yyminorunion); } - yymx = yypParser->yytos->major; + yymx = yypParser->yystack[yypParser->yyidx].major; if( yymx==YYERRORSYMBOL || yyerrorhit ){ #ifndef NDEBUG if( yyTraceFILE ){ @@ -3330,26 +2884,26 @@ void Parse( yyTracePrompt,yyTokenName[yymajor]); } #endif - yy_destructor(yypParser, (YYCODETYPE)yymajor, &yyminorunion); + yy_destructor(yypParser, (YYCODETYPE)yymajor,&yyminorunion); yymajor = YYNOCODE; }else{ - while( yypParser->yytos >= yypParser->yystack - && yymx != YYERRORSYMBOL - && (yyact = yy_find_reduce_action( - yypParser->yytos->stateno, - YYERRORSYMBOL)) >= YY_MIN_REDUCE + while( + yypParser->yyidx >= 0 && + yymx != YYERRORSYMBOL && + (yyact = yy_find_reduce_action( + yypParser->yystack[yypParser->yyidx].stateno, + YYERRORSYMBOL)) >= YYNSTATE ){ yy_pop_parser_stack(yypParser); } - if( yypParser->yytos < yypParser->yystack || yymajor==0 ){ + if( yypParser->yyidx < 0 || yymajor==0 ){ yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion); yy_parse_failed(yypParser); -#ifndef YYNOERRORRECOVERY - yypParser->yyerrcnt = -1; -#endif yymajor = YYNOCODE; }else if( yymx!=YYERRORSYMBOL ){ - yy_shift(yypParser,yyact,YYERRORSYMBOL,yyminor); + YYMINORTYPE u2; + u2.YYERRSYMDT = 0; + yy_shift(yypParser,yyact,YYERRORSYMBOL,&u2); } } yypParser->yyerrcnt = 3; @@ -3362,7 +2916,7 @@ void Parse( ** Applications can set this macro (for example inside %include) if ** they intend to abandon the parse upon the first syntax error seen. */ - yy_syntax_error(yypParser,yymajor, yyminor); + yy_syntax_error(yypParser,yymajor,yyminorunion); yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion); yymajor = YYNOCODE; @@ -3377,31 +2931,16 @@ void Parse( ** three input tokens have been successfully shifted. */ if( yypParser->yyerrcnt<=0 ){ - yy_syntax_error(yypParser,yymajor, yyminor); + yy_syntax_error(yypParser,yymajor,yyminorunion); } yypParser->yyerrcnt = 3; yy_destructor(yypParser,(YYCODETYPE)yymajor,&yyminorunion); if( yyendofinput ){ yy_parse_failed(yypParser); -#ifndef YYNOERRORRECOVERY - yypParser->yyerrcnt = -1; -#endif } yymajor = YYNOCODE; #endif } - }while( yymajor!=YYNOCODE && yypParser->yytos>yypParser->yystack ); -#ifndef NDEBUG - if( yyTraceFILE ){ - yyStackEntry *i; - char cDiv = '['; - fprintf(yyTraceFILE,"%sReturn. Stack=",yyTracePrompt); - for(i=&yypParser->yystack[1]; i<=yypParser->yytos; i++){ - fprintf(yyTraceFILE,"%c%s", cDiv, yyTokenName[i->major]); - cDiv = ' '; - } - fprintf(yyTraceFILE,"]\n"); - } -#endif + }while( yymajor!=YYNOCODE && yypParser->yyidx>=0 ); return; } diff --git a/src/util/src/ttokenizer.c b/src/util/src/ttokenizer.c index 93d4570ea8..a6d3b4df37 100644 --- a/src/util/src/ttokenizer.c +++ b/src/util/src/ttokenizer.c @@ -217,7 +217,8 @@ static SKeyword keywordTable[] = { {"DISTINCT", TK_DISTINCT}, {"PARTITIONS", TK_PARTITIONS}, {"TOPIC", TK_TOPIC}, - {"TOPICS", TK_TOPICS} + {"TOPICS", TK_TOPICS}, + {"COMPACT", TK_COMPACT} }; static const char isIdChar[] = { -- GitLab