diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c index 722f342964..e9bbac3cbe 100644 --- a/src/client/src/tscSQLParser.c +++ b/src/client/src/tscSQLParser.c @@ -111,6 +111,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); @@ -506,7 +507,7 @@ int32_t tscValidateSqlInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) { break; } - + case TSDB_SQL_CREATE_DNODE: { const char* msg = "invalid host name (ip address)"; @@ -802,7 +803,13 @@ int32_t tscValidateSqlInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) { } break; } - + case TSDB_SQL_COMPACT_VNODE:{ + const char* msg = "invalid compact"; + if (setCompactVnodeInfo(pSql, pInfo) != TSDB_CODE_SUCCESS) { + return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg); + } + break; + } default: return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), "not support sql expression"); } @@ -2963,7 +2970,12 @@ 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; + 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 b4c7a64fd0..8c5e99474d 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); @@ -1515,6 +1540,60 @@ 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_OPERATION; + } + STscObj *pObj = pSql->pTscObj; + SSqlCmd *pCmd = &pSql->cmd; + SArray *pList = pInfo->list; + int32_t size = (int32_t)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_BIGINT) { + result[i] = (int32_t)(pVar->i64); + } else { + free(result); + return TSDB_CODE_TSC_INVALID_OPERATION; + } + } + + 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, 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; @@ -2268,6 +2347,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); @@ -2654,6 +2737,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; @@ -2694,6 +2778,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 90426519e6..4331ddbf89 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/dnodeShell.c b/src/dnode/src/dnodeShell.c index 50343cfd32..c80e1059b4 100644 --- a/src/dnode/src/dnodeShell.c +++ b/src/dnode/src/dnodeShell.c @@ -61,6 +61,7 @@ int32_t dnodeInitShell() { dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_KILL_STREAM] = dnodeDispatchToMWriteQueue; dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_KILL_CONN] = dnodeDispatchToMWriteQueue; dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_CONFIG_DNODE]= dnodeDispatchToMWriteQueue; + dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_COMPACT_VNODE]= dnodeDispatchToMWriteQueue; // the following message shall be treated as mnode query dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_HEARTBEAT] = dnodeDispatchToMReadQueue; diff --git a/src/dnode/src/dnodeVMgmt.c b/src/dnode/src/dnodeVMgmt.c index ef99e70bd1..90bae8b9dd 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; @@ -187,6 +189,12 @@ 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); + return vnodeCompact(pCompactVnode->vgId); +} + 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 c7fe649748..61e1e88c13 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,7 @@ 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, "multiTable-meta" ) TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_ALTER_STREAM, "alter-stream" ) TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_CM_SHOW, "show" ) @@ -393,7 +396,7 @@ typedef struct { typedef struct { int32_t vgId; -} SDropVnodeMsg, SSyncVnodeMsg; +} SDropVnodeMsg, SSyncVnodeMsg, SCompactVnodeMsg; typedef struct SColIndex { int16_t colId; // column id @@ -539,7 +542,7 @@ typedef struct { uint8_t status; uint8_t role; uint8_t replica; - uint8_t reserved; + uint8_t compact; } SVnodeLoad; typedef struct { @@ -781,6 +784,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 fb860137f3..f6047d57dc 100644 --- a/src/inc/ttokendef.h +++ b/src/inc/ttokendef.h @@ -16,7 +16,6 @@ #ifndef TDENGINE_TTOKENDEF_H #define TDENGINE_TTOKENDEF_H - #define TK_ID 1 #define TK_BOOL 2 #define TK_TINYINT 3 @@ -95,121 +94,117 @@ #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_COMMA 88 -#define TK_KEEP 89 -#define TK_CACHE 90 -#define TK_REPLICA 91 -#define TK_QUORUM 92 -#define TK_DAYS 93 -#define TK_MINROWS 94 -#define TK_MAXROWS 95 -#define TK_BLOCKS 96 -#define TK_CTIME 97 -#define TK_WAL 98 -#define TK_FSYNC 99 -#define TK_COMP 100 -#define TK_PRECISION 101 -#define TK_UPDATE 102 -#define TK_CACHELAST 103 -#define TK_PARTITIONS 104 -#define TK_LP 105 -#define TK_RP 106 -#define TK_UNSIGNED 107 -#define TK_TAGS 108 -#define TK_USING 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_STATE_WINDOW 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_MODIFY 140 -#define TK_TAG 141 -#define TK_CHANGE 142 -#define TK_SET 143 -#define TK_KILL 144 -#define TK_CONNECTION 145 -#define TK_STREAM 146 -#define TK_COLON 147 -#define TK_ABORT 148 -#define TK_AFTER 149 -#define TK_ATTACH 150 -#define TK_BEFORE 151 -#define TK_BEGIN 152 -#define TK_CASCADE 153 -#define TK_CLUSTER 154 -#define TK_CONFLICT 155 -#define TK_COPY 156 -#define TK_DEFERRED 157 -#define TK_DELIMITERS 158 -#define TK_DETACH 159 -#define TK_EACH 160 -#define TK_END 161 -#define TK_EXPLAIN 162 -#define TK_FAIL 163 -#define TK_FOR 164 -#define TK_IGNORE 165 -#define TK_IMMEDIATE 166 -#define TK_INITIALLY 167 -#define TK_INSTEAD 168 -#define TK_MATCH 169 -#define TK_KEY 170 -#define TK_OF 171 -#define TK_RAISE 172 -#define TK_REPLACE 173 -#define TK_RESTRICT 174 -#define TK_ROW 175 -#define TK_STATEMENT 176 -#define TK_TRIGGER 177 -#define TK_VIEW 178 -#define TK_SEMI 179 -#define TK_NONE 180 -#define TK_PREV 181 -#define TK_LINEAR 182 -#define TK_IMPORT 183 -#define TK_TBNAME 184 -#define TK_JOIN 185 -#define TK_INSERT 186 -#define TK_INTO 187 -#define TK_VALUES 188 - - - - - +#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_COMMA 91 +#define TK_KEEP 92 +#define TK_CACHE 93 +#define TK_REPLICA 94 +#define TK_QUORUM 95 +#define TK_DAYS 96 +#define TK_MINROWS 97 +#define TK_MAXROWS 98 +#define TK_BLOCKS 99 +#define TK_CTIME 100 +#define TK_WAL 101 +#define TK_FSYNC 102 +#define TK_COMP 103 +#define TK_PRECISION 104 +#define TK_UPDATE 105 +#define TK_CACHELAST 106 +#define TK_PARTITIONS 107 +#define TK_UNSIGNED 108 +#define TK_TAGS 109 +#define TK_USING 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_STATE_WINDOW 121 +#define TK_FILL 122 +#define TK_SLIDING 123 +#define TK_ORDER 124 +#define TK_BY 125 +#define TK_ASC 126 +#define TK_DESC 127 +#define TK_GROUP 128 +#define TK_HAVING 129 +#define TK_LIMIT 130 +#define TK_OFFSET 131 +#define TK_SLIMIT 132 +#define TK_SOFFSET 133 +#define TK_WHERE 134 +#define TK_NOW 135 +#define TK_RESET 136 +#define TK_QUERY 137 +#define TK_SYNCDB 138 +#define TK_ADD 139 +#define TK_COLUMN 140 +#define TK_MODIFY 141 +#define TK_TAG 142 +#define TK_CHANGE 143 +#define TK_SET 144 +#define TK_KILL 145 +#define TK_CONNECTION 146 +#define TK_STREAM 147 +#define TK_COLON 148 +#define TK_ABORT 149 +#define TK_AFTER 150 +#define TK_ATTACH 151 +#define TK_BEFORE 152 +#define TK_BEGIN 153 +#define TK_CASCADE 154 +#define TK_CLUSTER 155 +#define TK_CONFLICT 156 +#define TK_COPY 157 +#define TK_DEFERRED 158 +#define TK_DELIMITERS 159 +#define TK_DETACH 160 +#define TK_EACH 161 +#define TK_END 162 +#define TK_EXPLAIN 163 +#define TK_FAIL 164 +#define TK_FOR 165 +#define TK_IGNORE 166 +#define TK_IMMEDIATE 167 +#define TK_INITIALLY 168 +#define TK_INSTEAD 169 +#define TK_MATCH 170 +#define TK_KEY 171 +#define TK_OF 172 +#define TK_RAISE 173 +#define TK_REPLACE 174 +#define TK_RESTRICT 175 +#define TK_ROW 176 +#define TK_STATEMENT 177 +#define TK_TRIGGER 178 +#define TK_VIEW 179 +#define TK_SEMI 180 +#define TK_NONE 181 +#define TK_PREV 182 +#define TK_LINEAR 183 +#define TK_IMPORT 184 +#define TK_TBNAME 185 +#define TK_JOIN 186 +#define TK_INSERT 187 +#define TK_INTO 188 +#define TK_VALUES 189 #define TK_SPACE 300 diff --git a/src/inc/vnode.h b/src/inc/vnode.h index 39bd2f46c3..9dae862344 100644 --- a/src/inc/vnode.h +++ b/src/inc/vnode.h @@ -62,6 +62,7 @@ int32_t vnodeOpen(int32_t vgId); int32_t vnodeAlter(void *pVnode, SCreateVnodeMsg *pVnodeCfg); int32_t vnodeSync(int32_t vgId); int32_t vnodeClose(int32_t vgId); +int32_t vnodeCompact(int32_t vgId); // vnodeMgmt int32_t vnodeInitMgmt(); diff --git a/src/mnode/inc/mnodeDef.h b/src/mnode/inc/mnodeDef.h index 0d64f42a98..e8cf7e30ac 100644 --- a/src/mnode/inc/mnodeDef.h +++ b/src/mnode/inc/mnodeDef.h @@ -144,6 +144,7 @@ typedef struct SVgObj { int8_t reserved0[4]; SVnodeGid vnodeGid[TSDB_MAX_REPLICA]; int32_t vgCfgVersion; + int8_t compact; int8_t reserved1[8]; int8_t updateEnd[4]; int32_t refCount; diff --git a/src/mnode/inc/mnodeVgroup.h b/src/mnode/inc/mnodeVgroup.h index c796365843..aff0411fdd 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,SMnodeMsg *pMsg); 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 334450f70b..f4fc88476f 100644 --- a/src/mnode/src/mnodeDb.c +++ b/src/mnode/src/mnodeDb.c @@ -53,6 +53,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 @@ -200,10 +201,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(); } @@ -1267,7 +1270,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) { @@ -1281,6 +1284,43 @@ static int32_t mnodeSyncDb(SDbObj *pDb, SMnodeMsg *pMsg) { return TSDB_CODE_SUCCESS; } + +static int32_t mnodeCompact(SDbObj *pDb, SCompactMsg *pCompactMsg) { + int32_t count = ntohs(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] = ntohs(pCompactMsg->vgid[i]); + } + + // copy from mnodeSyncDb, so ugly + for (int32_t i = 0; i < count; i++) { + SVgObj *pVgroup = NULL; + void *pIter = NULL; + bool valid = false; + while (1) { + pIter = mnodeGetNextVgroup(pIter, &pVgroup); + if (pVgroup == NULL) break; + if (pVgroup->pDb == pDb && pVgroup->vgId == buf[i]) { + mnodeSendCompactVgroupMsg(pVgroup); + mnodeDecVgroupRef(pVgroup); + valid = true; + break; + } + mnodeDecVgroupRef(pVgroup); + } + if (valid == false) { + mLError("db:%s, cannot find valid vgId: %d", pDb->name, buf[i]); + } + } + 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); @@ -1303,6 +1343,20 @@ 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 == NULL) return TSDB_CODE_MND_DB_NOT_SELECTED; + + 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; diff --git a/src/mnode/src/mnodeSdb.c b/src/mnode/src/mnodeSdb.c index 1c1252177e..897c3a2f0f 100644 --- a/src/mnode/src/mnodeSdb.c +++ b/src/mnode/src/mnodeSdb.c @@ -1202,4 +1202,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 af816d7ae7..a32da29124 100644 --- a/src/mnode/src/mnodeVgroup.c +++ b/src/mnode/src/mnodeVgroup.c @@ -60,6 +60,7 @@ static int32_t mnodeGetVgroupMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *p static int32_t mnodeRetrieveVgroups(SShowObj *pShow, char *data, int32_t rows, void *pConn); static void mnodeProcessCreateVnodeRsp(SRpcMsg *rpcMsg); static void mnodeProcessAlterVnodeRsp(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); @@ -236,6 +237,7 @@ int32_t mnodeInitVgroups() { mnodeAddShowFreeIterHandle(TSDB_MGMT_TABLE_VGROUP, mnodeCancelGetNextVgroup); mnodeAddPeerRspHandle(TSDB_MSG_TYPE_MD_CREATE_VNODE_RSP, mnodeProcessCreateVnodeRsp); mnodeAddPeerRspHandle(TSDB_MSG_TYPE_MD_ALTER_VNODE_RSP, mnodeProcessAlterVnodeRsp); + 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); @@ -350,6 +352,7 @@ void mnodeUpdateVgroupStatus(SVgObj *pVgroup, SDnodeObj *pDnode, SVnodeLoad *pVl pVgroup->pDb->dbCfgVersion, pVgroup->vgCfgVersion, pVgroup->numOfVnodes); mnodeSendAlterVgroupMsg(pVgroup,NULL); } + pVgroup->compact = pVload->compact; } static int32_t mnodeAllocVgroupIdPool(SVgObj *pInputVgroup) { @@ -717,6 +720,13 @@ static int32_t mnodeGetVgroupMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *p cols++; } + pShow->bytes[cols] = 4; + pSchema[cols].type = TSDB_DATA_TYPE_INT; + strcpy(pSchema[cols].name, "compacting"); + pSchema[cols].bytes = htons(pShow->bytes[cols]); + cols++; + + pMeta->numOfColumns = htons(cols); pShow->numOfColumns = cols; @@ -820,7 +830,11 @@ static int32_t mnodeRetrieveVgroups(SShowObj *pShow, char *data, int32_t rows, v STR_WITH_MAXSIZE_TO_VARSTR(pWrite, role, pShow->bytes[cols]); cols++; } - + + pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows; + *(int8_t *)pWrite = pVgroup->compact; + cols++; + mnodeDecVgroupRef(pVgroup); numOfRows++; } @@ -979,6 +993,7 @@ static SSyncVnodeMsg *mnodeBuildSyncVnodeMsg(int32_t vgId) { return pSyncVnode; } + static void mnodeSendSyncVnodeMsg(SVgObj *pVgroup, SRpcEpSet *epSet) { SSyncVnodeMsg *pSyncVnode = mnodeBuildSyncVnodeMsg(pVgroup->vgId); SRpcMsg rpcMsg = { @@ -991,6 +1006,18 @@ static void mnodeSendSyncVnodeMsg(SVgObj *pVgroup, SRpcEpSet *epSet) { dnodeSendMsgToDnode(epSet, &rpcMsg); } +static void mnodeSendCompactVnodeMsg(SVgObj *pVgroup, SRpcEpSet *epSet) { + SCompactVnodeMsg *pCompactVnode = mnodeBuildSyncVnodeMsg(pVgroup->vgId); + SRpcMsg rpcMsg = { + .ahandle = NULL, + .pCont = pCompactVnode, + .contLen = pCompactVnode ? 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, @@ -1004,6 +1031,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 = { @@ -1050,6 +1088,9 @@ static void mnodeProcessAlterVnodeRsp(SRpcMsg *rpcMsg) { dnodeSendRpcMWriteRsp(mnodeMsg, code); } } +static void mnodeProcessCompactVnodeRsp(SRpcMsg *rpcMsg) { + mDebug("compact vnode rsp received"); +} static void mnodeProcessCreateVnodeRsp(SRpcMsg *rpcMsg) { if (rpcMsg->ahandle == NULL) return; @@ -1346,4 +1387,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 c2a4e99b63..c6f667475e 100644 --- a/src/query/inc/qSqlparser.h +++ b/src/query/inc/qSqlparser.h @@ -312,6 +312,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 fbb59e4a72..2a37b1fc2d 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 f725c7da2f..a2cb7aee00 100644 --- a/src/query/src/qSqlParser.c +++ b/src/query/src/qSqlParser.c @@ -1067,6 +1067,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 83deb641f5..8764c6d0d3 100644 --- a/src/query/src/sql.c +++ b/src/query/src/sql.c @@ -97,28 +97,28 @@ #endif /************* Begin control #defines *****************************************/ #define YYCODETYPE unsigned short int -#define YYNOCODE 270 +#define YYNOCODE 271 #define YYACTIONTYPE unsigned short int #define ParseTOKENTYPE SStrToken typedef union { int yyinit; ParseTOKENTYPE yy0; - SSessionWindowVal yy15; - SIntervalVal yy42; - tSqlExpr* yy68; - SCreateAcctInfo yy77; - SArray* yy93; - int yy150; - SSqlNode* yy224; - SWindowStateVal yy274; - int64_t yy279; - SLimitVal yy284; - TAOS_FIELD yy325; - SRelationInfo* yy330; - SCreateDbInfo yy372; - tVariant yy518; - SCreatedTableInfo yy528; - SCreateTableSql* yy532; + int yy112; + SCreateAcctInfo yy151; + tSqlExpr* yy166; + SCreateTableSql* yy182; + SSqlNode* yy236; + SRelationInfo* yy244; + SSessionWindowVal yy259; + SIntervalVal yy340; + TAOS_FIELD yy343; + SWindowStateVal yy348; + int64_t yy369; + SCreateDbInfo yy382; + SLimitVal yy414; + SArray* yy441; + SCreatedTableInfo yy456; + tVariant yy506; } YYMINORTYPE; #ifndef YYSTACKDEPTH #define YYSTACKDEPTH 100 @@ -128,17 +128,17 @@ typedef union { #define ParseARG_FETCH SSqlInfo* pInfo = yypParser->pInfo #define ParseARG_STORE yypParser->pInfo = pInfo #define YYFALLBACK 1 -#define YYNSTATE 342 -#define YYNRULE 283 -#define YYNTOKEN 189 -#define YY_MAX_SHIFT 341 -#define YY_MIN_SHIFTREDUCE 542 -#define YY_MAX_SHIFTREDUCE 824 -#define YY_ERROR_ACTION 825 -#define YY_ACCEPT_ACTION 826 -#define YY_NO_ACTION 827 -#define YY_MIN_REDUCE 828 -#define YY_MAX_REDUCE 1110 +#define YYNSTATE 347 +#define YYNRULE 284 +#define YYNTOKEN 190 +#define YY_MAX_SHIFT 346 +#define YY_MIN_SHIFTREDUCE 548 +#define YY_MAX_SHIFTREDUCE 831 +#define YY_ERROR_ACTION 832 +#define YY_ACCEPT_ACTION 833 +#define YY_NO_ACTION 834 +#define YY_MIN_REDUCE 835 +#define YY_MAX_REDUCE 1118 /************* End control #defines *******************************************/ /* Define the yytestcase() macro to be a no-op if is not already defined @@ -204,277 +204,279 @@ typedef union { ** yy_default[] Default action for each state. ** *********** Begin parsing tables **********************************************/ -#define YY_ACTTAB_COUNT (725) +#define YY_ACTTAB_COUNT (734) static const YYACTIONTYPE yy_action[] = { - /* 0 */ 224, 590, 235, 999, 978, 144, 978, 590, 195, 591, - /* 10 */ 964, 826, 341, 52, 53, 591, 56, 57, 227, 1087, - /* 20 */ 230, 46, 246, 55, 283, 60, 58, 62, 59, 218, - /* 30 */ 339, 622, 237, 51, 50, 195, 978, 49, 48, 47, - /* 40 */ 52, 53, 34, 56, 57, 226, 1087, 230, 46, 590, - /* 50 */ 55, 283, 60, 58, 62, 59, 151, 591, 976, 990, - /* 60 */ 51, 50, 228, 151, 49, 48, 47, 53, 996, 56, - /* 70 */ 57, 266, 265, 230, 46, 259, 55, 283, 60, 58, - /* 80 */ 62, 59, 299, 75, 220, 151, 51, 50, 975, 299, - /* 90 */ 49, 48, 47, 543, 544, 545, 546, 547, 548, 549, - /* 100 */ 550, 551, 552, 553, 554, 555, 340, 6, 94, 219, - /* 110 */ 76, 52, 53, 82, 56, 57, 963, 195, 230, 46, - /* 120 */ 41, 55, 283, 60, 58, 62, 59, 1036, 1086, 278, - /* 130 */ 325, 51, 50, 763, 1035, 49, 48, 47, 52, 54, - /* 140 */ 22, 56, 57, 966, 990, 230, 46, 35, 55, 283, - /* 150 */ 60, 58, 62, 59, 280, 193, 87, 874, 51, 50, - /* 160 */ 221, 178, 49, 48, 47, 260, 40, 297, 334, 333, - /* 170 */ 296, 295, 294, 332, 293, 331, 330, 329, 292, 328, - /* 180 */ 327, 938, 926, 927, 928, 929, 930, 931, 932, 933, - /* 190 */ 934, 935, 936, 937, 939, 940, 56, 57, 146, 990, - /* 200 */ 230, 46, 199, 55, 283, 60, 58, 62, 59, 49, - /* 210 */ 48, 47, 23, 51, 50, 222, 727, 49, 48, 47, - /* 220 */ 229, 778, 972, 883, 767, 115, 770, 178, 773, 204, - /* 230 */ 325, 229, 778, 335, 907, 767, 205, 770, 769, 773, - /* 240 */ 772, 128, 127, 203, 338, 337, 136, 15, 40, 14, - /* 250 */ 334, 333, 215, 216, 151, 332, 282, 331, 330, 329, - /* 260 */ 977, 328, 327, 215, 216, 946, 236, 944, 945, 590, - /* 270 */ 1083, 34, 947, 82, 949, 950, 948, 591, 951, 952, - /* 280 */ 41, 60, 58, 62, 59, 34, 768, 251, 771, 51, - /* 290 */ 50, 1, 166, 49, 48, 47, 255, 254, 34, 113, - /* 300 */ 107, 118, 1082, 258, 240, 74, 117, 123, 126, 116, - /* 310 */ 245, 696, 212, 233, 693, 120, 694, 975, 695, 5, - /* 320 */ 37, 168, 91, 672, 61, 88, 167, 101, 96, 100, - /* 330 */ 779, 974, 711, 51, 50, 61, 775, 49, 48, 47, - /* 340 */ 234, 779, 242, 243, 975, 34, 34, 775, 34, 284, - /* 350 */ 776, 315, 314, 774, 961, 962, 33, 965, 187, 185, - /* 360 */ 183, 89, 34, 34, 774, 182, 131, 130, 129, 34, - /* 370 */ 34, 34, 1081, 28, 241, 77, 239, 1106, 303, 302, - /* 380 */ 247, 700, 244, 701, 310, 309, 708, 304, 305, 875, - /* 390 */ 306, 975, 975, 178, 975, 13, 3, 179, 777, 93, - /* 400 */ 90, 142, 140, 139, 307, 311, 1098, 64, 975, 975, - /* 410 */ 715, 312, 313, 317, 8, 975, 975, 975, 744, 745, - /* 420 */ 697, 79, 80, 25, 24, 735, 24, 765, 262, 262, - /* 430 */ 67, 70, 35, 35, 64, 92, 64, 32, 125, 124, - /* 440 */ 289, 736, 799, 213, 780, 782, 106, 17, 105, 16, - /* 450 */ 682, 286, 684, 288, 683, 698, 19, 699, 18, 112, - /* 460 */ 73, 111, 671, 766, 21, 214, 20, 197, 198, 200, - /* 470 */ 194, 201, 202, 71, 68, 208, 1046, 209, 207, 192, - /* 480 */ 206, 196, 1045, 231, 1042, 1041, 991, 256, 232, 316, - /* 490 */ 143, 44, 998, 1028, 1009, 1006, 1007, 1011, 263, 145, - /* 500 */ 973, 141, 267, 149, 272, 1027, 162, 163, 223, 726, - /* 510 */ 269, 276, 155, 152, 971, 164, 165, 886, 988, 291, - /* 520 */ 42, 190, 38, 300, 882, 72, 301, 63, 69, 153, - /* 530 */ 1105, 281, 154, 103, 1104, 277, 279, 156, 275, 157, - /* 540 */ 273, 271, 1101, 169, 308, 1097, 109, 1096, 268, 1093, - /* 550 */ 170, 904, 39, 36, 43, 161, 191, 871, 119, 869, - /* 560 */ 121, 122, 867, 866, 248, 181, 864, 863, 862, 45, - /* 570 */ 861, 860, 859, 184, 186, 856, 854, 852, 850, 188, - /* 580 */ 847, 189, 326, 261, 78, 83, 114, 270, 1029, 318, - /* 590 */ 319, 320, 321, 322, 323, 217, 238, 290, 324, 336, - /* 600 */ 824, 210, 249, 250, 97, 98, 211, 823, 252, 253, - /* 610 */ 822, 257, 805, 804, 262, 264, 9, 285, 177, 172, - /* 620 */ 905, 175, 173, 171, 132, 865, 174, 176, 133, 858, - /* 630 */ 4, 857, 942, 134, 135, 703, 906, 849, 848, 81, - /* 640 */ 2, 158, 29, 159, 160, 84, 148, 728, 147, 225, - /* 650 */ 731, 954, 85, 30, 733, 86, 274, 10, 737, 150, - /* 660 */ 31, 781, 11, 95, 7, 12, 26, 783, 27, 635, - /* 670 */ 287, 631, 629, 93, 628, 627, 624, 594, 298, 99, - /* 680 */ 65, 35, 674, 102, 66, 673, 104, 108, 670, 616, - /* 690 */ 110, 614, 606, 612, 608, 610, 604, 602, 638, 637, - /* 700 */ 636, 634, 633, 632, 630, 626, 625, 180, 592, 559, - /* 710 */ 557, 828, 827, 827, 827, 827, 827, 827, 827, 827, - /* 720 */ 827, 827, 827, 137, 138, + /* 0 */ 23, 597, 1007, 597, 219, 344, 194, 833, 346, 598, + /* 10 */ 597, 598, 197, 54, 55, 225, 58, 59, 598, 986, + /* 20 */ 239, 48, 1094, 57, 300, 62, 60, 63, 61, 998, + /* 30 */ 998, 231, 233, 53, 52, 986, 986, 51, 50, 49, + /* 40 */ 54, 55, 35, 58, 59, 222, 223, 239, 48, 597, + /* 50 */ 57, 300, 62, 60, 63, 61, 998, 598, 152, 236, + /* 60 */ 53, 52, 235, 152, 51, 50, 49, 55, 1004, 58, + /* 70 */ 59, 772, 261, 239, 48, 240, 57, 300, 62, 60, + /* 80 */ 63, 61, 29, 195, 83, 221, 53, 52, 145, 983, + /* 90 */ 51, 50, 49, 549, 550, 551, 552, 553, 554, 555, + /* 100 */ 556, 557, 558, 559, 560, 561, 345, 773, 770, 220, + /* 110 */ 95, 77, 54, 55, 35, 58, 59, 42, 197, 239, + /* 120 */ 48, 197, 57, 300, 62, 60, 63, 61, 1095, 298, + /* 130 */ 1043, 1095, 53, 52, 197, 89, 51, 50, 49, 54, + /* 140 */ 56, 330, 58, 59, 1095, 974, 239, 48, 629, 57, + /* 150 */ 300, 62, 60, 63, 61, 268, 267, 229, 152, 53, + /* 160 */ 52, 983, 248, 51, 50, 49, 41, 296, 339, 338, + /* 170 */ 295, 294, 293, 337, 292, 336, 335, 334, 291, 333, + /* 180 */ 332, 946, 934, 935, 936, 937, 938, 939, 940, 941, + /* 190 */ 942, 943, 944, 945, 947, 948, 58, 59, 24, 984, + /* 200 */ 239, 48, 35, 57, 300, 62, 60, 63, 61, 51, + /* 210 */ 50, 49, 972, 53, 52, 205, 881, 51, 50, 49, + /* 220 */ 76, 179, 206, 35, 340, 915, 92, 129, 128, 204, + /* 230 */ 1044, 237, 280, 305, 83, 200, 238, 785, 35, 776, + /* 240 */ 774, 779, 777, 980, 780, 230, 238, 785, 715, 983, + /* 250 */ 774, 6, 777, 971, 780, 114, 108, 119, 969, 970, + /* 260 */ 34, 973, 118, 124, 127, 117, 309, 42, 217, 218, + /* 270 */ 983, 121, 301, 41, 9, 339, 338, 35, 217, 218, + /* 280 */ 337, 310, 336, 335, 334, 983, 333, 332, 232, 116, + /* 290 */ 260, 262, 75, 954, 298, 952, 953, 330, 242, 213, + /* 300 */ 955, 36, 957, 958, 956, 718, 959, 960, 62, 60, + /* 310 */ 63, 61, 775, 152, 778, 64, 53, 52, 14, 247, + /* 320 */ 51, 50, 49, 703, 982, 64, 700, 1091, 701, 35, + /* 330 */ 702, 5, 38, 169, 35, 188, 186, 184, 168, 102, + /* 340 */ 97, 101, 183, 132, 131, 130, 35, 786, 94, 91, + /* 350 */ 679, 1090, 783, 782, 244, 245, 35, 786, 35, 35, + /* 360 */ 53, 52, 891, 782, 51, 50, 49, 179, 90, 243, + /* 370 */ 781, 241, 311, 308, 307, 1089, 983, 312, 320, 319, + /* 380 */ 781, 983, 78, 282, 722, 88, 882, 253, 71, 316, + /* 390 */ 249, 179, 246, 983, 315, 314, 257, 256, 80, 317, + /* 400 */ 68, 318, 322, 983, 81, 983, 983, 343, 342, 137, + /* 410 */ 143, 141, 140, 1, 167, 3, 180, 751, 752, 734, + /* 420 */ 742, 302, 743, 1054, 689, 784, 33, 215, 72, 147, + /* 430 */ 65, 264, 26, 704, 36, 285, 691, 264, 287, 690, + /* 440 */ 806, 787, 69, 596, 74, 36, 65, 216, 93, 65, + /* 450 */ 25, 25, 16, 25, 15, 288, 107, 198, 106, 18, + /* 460 */ 707, 17, 708, 199, 705, 20, 706, 19, 201, 113, + /* 470 */ 985, 112, 678, 22, 196, 21, 126, 125, 202, 203, + /* 480 */ 208, 209, 210, 207, 193, 1114, 1106, 1053, 227, 1050, + /* 490 */ 1049, 228, 321, 258, 144, 1006, 1017, 45, 1014, 1015, + /* 500 */ 1019, 999, 265, 1036, 146, 150, 981, 274, 1035, 163, + /* 510 */ 142, 269, 164, 157, 979, 733, 165, 224, 789, 263, + /* 520 */ 166, 153, 894, 283, 290, 43, 191, 271, 39, 299, + /* 530 */ 890, 306, 73, 278, 1113, 996, 70, 47, 104, 154, + /* 540 */ 155, 1112, 281, 1109, 170, 313, 1105, 110, 279, 156, + /* 550 */ 1104, 277, 158, 275, 273, 1101, 159, 171, 270, 912, + /* 560 */ 40, 37, 44, 192, 878, 120, 876, 122, 123, 874, + /* 570 */ 873, 250, 182, 871, 870, 869, 868, 867, 866, 185, + /* 580 */ 187, 863, 861, 859, 857, 189, 854, 190, 46, 79, + /* 590 */ 84, 272, 331, 1037, 115, 323, 324, 325, 326, 327, + /* 600 */ 328, 329, 214, 341, 234, 289, 831, 252, 251, 830, + /* 610 */ 211, 212, 254, 98, 99, 255, 829, 812, 811, 259, + /* 620 */ 10, 264, 872, 284, 133, 710, 174, 134, 173, 913, + /* 630 */ 172, 175, 177, 176, 135, 178, 865, 914, 864, 2, + /* 640 */ 136, 950, 856, 855, 82, 30, 4, 266, 160, 161, + /* 650 */ 162, 962, 85, 735, 148, 149, 738, 86, 226, 740, + /* 660 */ 87, 276, 31, 744, 151, 13, 11, 32, 12, 27, + /* 670 */ 28, 286, 96, 94, 642, 638, 636, 635, 634, 631, + /* 680 */ 601, 297, 100, 7, 303, 790, 788, 8, 304, 103, + /* 690 */ 105, 66, 67, 109, 111, 681, 680, 677, 623, 36, + /* 700 */ 621, 613, 619, 615, 617, 611, 609, 645, 644, 643, + /* 710 */ 641, 640, 639, 637, 633, 632, 181, 599, 565, 835, + /* 720 */ 563, 834, 834, 834, 834, 834, 834, 834, 834, 834, + /* 730 */ 834, 834, 138, 139, }; static const YYCODETYPE yy_lookahead[] = { - /* 0 */ 236, 1, 236, 193, 240, 193, 240, 1, 257, 9, - /* 10 */ 0, 190, 191, 13, 14, 9, 16, 17, 267, 268, - /* 20 */ 20, 21, 193, 23, 24, 25, 26, 27, 28, 192, - /* 30 */ 193, 5, 236, 33, 34, 257, 240, 37, 38, 39, - /* 40 */ 13, 14, 193, 16, 17, 267, 268, 20, 21, 1, - /* 50 */ 23, 24, 25, 26, 27, 28, 193, 9, 229, 238, - /* 60 */ 33, 34, 60, 193, 37, 38, 39, 14, 258, 16, - /* 70 */ 17, 259, 260, 20, 21, 254, 23, 24, 25, 26, - /* 80 */ 27, 28, 79, 199, 235, 193, 33, 34, 239, 79, + /* 0 */ 259, 1, 194, 1, 193, 194, 259, 191, 192, 9, + /* 10 */ 1, 9, 259, 13, 14, 238, 16, 17, 9, 242, + /* 20 */ 20, 21, 269, 23, 24, 25, 26, 27, 28, 240, + /* 30 */ 240, 238, 238, 33, 34, 242, 242, 37, 38, 39, + /* 40 */ 13, 14, 194, 16, 17, 256, 256, 20, 21, 1, + /* 50 */ 23, 24, 25, 26, 27, 28, 240, 9, 194, 200, + /* 60 */ 33, 34, 200, 194, 37, 38, 39, 14, 260, 16, + /* 70 */ 17, 1, 256, 20, 21, 200, 23, 24, 25, 26, + /* 80 */ 27, 28, 80, 259, 80, 237, 33, 34, 194, 241, /* 90 */ 37, 38, 39, 45, 46, 47, 48, 49, 50, 51, - /* 100 */ 52, 53, 54, 55, 56, 57, 58, 105, 199, 61, - /* 110 */ 110, 13, 14, 105, 16, 17, 232, 257, 20, 21, - /* 120 */ 112, 23, 24, 25, 26, 27, 28, 264, 268, 266, - /* 130 */ 81, 33, 34, 106, 264, 37, 38, 39, 13, 14, - /* 140 */ 257, 16, 17, 234, 238, 20, 21, 88, 23, 24, - /* 150 */ 25, 26, 27, 28, 262, 257, 264, 198, 33, 34, - /* 160 */ 254, 202, 37, 38, 39, 106, 89, 90, 91, 92, - /* 170 */ 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, - /* 180 */ 103, 213, 214, 215, 216, 217, 218, 219, 220, 221, - /* 190 */ 222, 223, 224, 225, 226, 227, 16, 17, 88, 238, - /* 200 */ 20, 21, 257, 23, 24, 25, 26, 27, 28, 37, - /* 210 */ 38, 39, 44, 33, 34, 254, 106, 37, 38, 39, - /* 220 */ 1, 2, 193, 198, 5, 76, 7, 202, 9, 61, - /* 230 */ 81, 1, 2, 211, 212, 5, 68, 7, 5, 9, - /* 240 */ 7, 73, 74, 75, 65, 66, 67, 139, 89, 141, - /* 250 */ 91, 92, 33, 34, 193, 96, 37, 98, 99, 100, - /* 260 */ 240, 102, 103, 33, 34, 213, 237, 215, 216, 1, - /* 270 */ 257, 193, 220, 105, 222, 223, 224, 9, 226, 227, - /* 280 */ 112, 25, 26, 27, 28, 193, 5, 136, 7, 33, - /* 290 */ 34, 200, 201, 37, 38, 39, 145, 146, 193, 62, - /* 300 */ 63, 64, 257, 135, 68, 137, 69, 70, 71, 72, - /* 310 */ 68, 2, 144, 235, 5, 78, 7, 239, 9, 62, - /* 320 */ 63, 64, 199, 5, 105, 264, 69, 70, 71, 72, - /* 330 */ 111, 239, 37, 33, 34, 105, 117, 37, 38, 39, - /* 340 */ 235, 111, 33, 34, 239, 193, 193, 117, 193, 15, - /* 350 */ 117, 33, 34, 134, 231, 232, 233, 234, 62, 63, - /* 360 */ 64, 241, 193, 193, 134, 69, 70, 71, 72, 193, - /* 370 */ 193, 193, 257, 105, 138, 255, 140, 240, 142, 143, - /* 380 */ 138, 5, 140, 7, 142, 143, 88, 235, 235, 198, - /* 390 */ 235, 239, 239, 202, 239, 105, 196, 197, 117, 109, - /* 400 */ 110, 62, 63, 64, 235, 235, 240, 88, 239, 239, - /* 410 */ 115, 235, 235, 235, 116, 239, 239, 239, 125, 126, - /* 420 */ 111, 106, 106, 88, 88, 106, 88, 1, 113, 113, - /* 430 */ 88, 88, 88, 88, 88, 88, 88, 105, 76, 77, - /* 440 */ 108, 106, 106, 257, 106, 111, 139, 139, 141, 141, - /* 450 */ 106, 106, 106, 106, 106, 5, 139, 7, 141, 139, - /* 460 */ 105, 141, 107, 37, 139, 257, 141, 257, 257, 257, - /* 470 */ 257, 257, 257, 130, 132, 257, 230, 257, 257, 257, - /* 480 */ 257, 257, 230, 230, 230, 230, 238, 193, 230, 230, - /* 490 */ 193, 256, 193, 265, 193, 193, 193, 193, 238, 193, - /* 500 */ 238, 60, 261, 193, 193, 265, 242, 193, 261, 117, - /* 510 */ 261, 261, 249, 252, 193, 193, 193, 193, 253, 193, - /* 520 */ 193, 193, 193, 193, 193, 129, 193, 128, 131, 251, - /* 530 */ 193, 123, 250, 193, 193, 122, 127, 248, 121, 247, - /* 540 */ 120, 119, 193, 193, 193, 193, 193, 193, 118, 193, - /* 550 */ 193, 193, 193, 193, 193, 243, 193, 193, 193, 193, - /* 560 */ 193, 193, 193, 193, 193, 193, 193, 193, 193, 133, - /* 570 */ 193, 193, 193, 193, 193, 193, 193, 193, 193, 193, - /* 580 */ 193, 193, 104, 194, 194, 194, 87, 194, 194, 86, - /* 590 */ 50, 83, 85, 54, 84, 194, 194, 194, 82, 79, - /* 600 */ 5, 194, 147, 5, 199, 199, 194, 5, 147, 5, - /* 610 */ 5, 136, 91, 90, 113, 88, 105, 108, 203, 208, - /* 620 */ 210, 205, 204, 209, 195, 194, 207, 206, 195, 194, - /* 630 */ 196, 194, 228, 195, 195, 106, 212, 194, 194, 114, - /* 640 */ 200, 246, 105, 245, 244, 88, 88, 106, 105, 1, - /* 650 */ 106, 228, 105, 88, 106, 105, 105, 124, 106, 105, - /* 660 */ 88, 106, 124, 76, 105, 105, 105, 111, 105, 9, - /* 670 */ 108, 5, 5, 109, 5, 5, 5, 80, 15, 76, - /* 680 */ 16, 88, 5, 141, 16, 5, 141, 141, 106, 5, - /* 690 */ 141, 5, 5, 5, 5, 5, 5, 5, 5, 5, - /* 700 */ 5, 5, 5, 5, 5, 5, 5, 88, 80, 60, - /* 710 */ 59, 0, 269, 269, 269, 269, 269, 269, 269, 269, - /* 720 */ 269, 269, 269, 21, 21, 269, 269, 269, 269, 269, - /* 730 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 740 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 750 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 760 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 770 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 780 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 790 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 800 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 810 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 820 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 830 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 840 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 850 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 860 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 870 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 880 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 890 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 900 */ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269, - /* 910 */ 269, 269, 269, 269, + /* 100 */ 52, 53, 54, 55, 56, 57, 58, 37, 81, 61, + /* 110 */ 201, 111, 13, 14, 194, 16, 17, 113, 259, 20, + /* 120 */ 21, 259, 23, 24, 25, 26, 27, 28, 269, 82, + /* 130 */ 266, 269, 33, 34, 259, 266, 37, 38, 39, 13, + /* 140 */ 14, 84, 16, 17, 269, 236, 20, 21, 5, 23, + /* 150 */ 24, 25, 26, 27, 28, 261, 262, 237, 194, 33, + /* 160 */ 34, 241, 194, 37, 38, 39, 92, 93, 94, 95, + /* 170 */ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, + /* 180 */ 106, 215, 216, 217, 218, 219, 220, 221, 222, 223, + /* 190 */ 224, 225, 226, 227, 228, 229, 16, 17, 44, 231, + /* 200 */ 20, 21, 194, 23, 24, 25, 26, 27, 28, 37, + /* 210 */ 38, 39, 0, 33, 34, 61, 199, 37, 38, 39, + /* 220 */ 201, 204, 68, 194, 213, 214, 201, 73, 74, 75, + /* 230 */ 266, 60, 268, 79, 80, 259, 1, 2, 194, 5, + /* 240 */ 5, 7, 7, 194, 9, 237, 1, 2, 91, 241, + /* 250 */ 5, 80, 7, 234, 9, 62, 63, 64, 233, 234, + /* 260 */ 235, 236, 69, 70, 71, 72, 237, 113, 33, 34, + /* 270 */ 241, 78, 37, 92, 117, 94, 95, 194, 33, 34, + /* 280 */ 99, 237, 101, 102, 103, 241, 105, 106, 239, 76, + /* 290 */ 136, 81, 138, 215, 82, 217, 218, 84, 68, 145, + /* 300 */ 222, 91, 224, 225, 226, 37, 228, 229, 25, 26, + /* 310 */ 27, 28, 5, 194, 7, 80, 33, 34, 80, 68, + /* 320 */ 37, 38, 39, 2, 241, 80, 5, 259, 7, 194, + /* 330 */ 9, 62, 63, 64, 194, 62, 63, 64, 69, 70, + /* 340 */ 71, 72, 69, 70, 71, 72, 194, 112, 110, 111, + /* 350 */ 5, 259, 118, 118, 33, 34, 194, 112, 194, 194, + /* 360 */ 33, 34, 199, 118, 37, 38, 39, 204, 243, 139, + /* 370 */ 135, 141, 237, 143, 144, 259, 241, 237, 33, 34, + /* 380 */ 135, 241, 257, 264, 116, 266, 199, 137, 91, 237, + /* 390 */ 139, 204, 141, 241, 143, 144, 146, 147, 81, 237, + /* 400 */ 91, 237, 237, 241, 81, 241, 241, 65, 66, 67, + /* 410 */ 62, 63, 64, 202, 203, 197, 198, 126, 127, 81, + /* 420 */ 81, 15, 81, 232, 81, 118, 80, 259, 131, 91, + /* 430 */ 91, 114, 91, 112, 91, 81, 81, 114, 81, 81, + /* 440 */ 81, 81, 133, 81, 80, 91, 91, 259, 91, 91, + /* 450 */ 91, 91, 140, 91, 142, 109, 140, 259, 142, 140, + /* 460 */ 5, 142, 7, 259, 5, 140, 7, 142, 259, 140, + /* 470 */ 242, 142, 108, 140, 259, 142, 76, 77, 259, 259, + /* 480 */ 259, 259, 259, 259, 259, 242, 242, 232, 232, 232, + /* 490 */ 232, 232, 232, 194, 194, 194, 194, 258, 194, 194, + /* 500 */ 194, 240, 240, 267, 194, 194, 240, 194, 267, 244, + /* 510 */ 60, 263, 194, 250, 194, 118, 194, 263, 112, 195, + /* 520 */ 194, 254, 194, 124, 194, 194, 194, 263, 194, 194, + /* 530 */ 194, 194, 130, 263, 194, 255, 132, 129, 194, 253, + /* 540 */ 252, 194, 128, 194, 194, 194, 194, 194, 123, 251, + /* 550 */ 194, 122, 249, 121, 120, 194, 248, 194, 119, 194, + /* 560 */ 194, 194, 194, 194, 194, 194, 194, 194, 194, 194, + /* 570 */ 194, 194, 194, 194, 194, 194, 194, 194, 194, 194, + /* 580 */ 194, 194, 194, 194, 194, 194, 194, 194, 134, 195, + /* 590 */ 195, 195, 107, 195, 90, 89, 50, 86, 88, 54, + /* 600 */ 87, 85, 195, 82, 195, 195, 5, 5, 148, 5, + /* 610 */ 195, 195, 148, 201, 201, 5, 5, 94, 93, 137, + /* 620 */ 80, 114, 195, 109, 196, 81, 206, 196, 210, 212, + /* 630 */ 211, 209, 208, 207, 196, 205, 195, 214, 195, 202, + /* 640 */ 196, 230, 195, 195, 115, 80, 197, 91, 247, 246, + /* 650 */ 245, 230, 91, 81, 80, 91, 81, 80, 1, 81, + /* 660 */ 80, 80, 91, 81, 80, 80, 125, 91, 125, 80, + /* 670 */ 80, 109, 76, 110, 9, 5, 5, 5, 5, 5, + /* 680 */ 83, 15, 76, 80, 24, 112, 81, 80, 58, 142, + /* 690 */ 142, 16, 16, 142, 142, 5, 5, 81, 5, 91, + /* 700 */ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + /* 710 */ 5, 5, 5, 5, 5, 5, 91, 83, 60, 0, + /* 720 */ 59, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 730 */ 270, 270, 21, 21, 270, 270, 270, 270, 270, 270, + /* 740 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 750 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 760 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 770 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 780 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 790 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 800 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 810 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 820 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 830 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 840 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 850 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 860 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 870 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 880 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 890 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 900 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 910 */ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270, + /* 920 */ 270, 270, 270, 270, }; -#define YY_SHIFT_COUNT (341) +#define YY_SHIFT_COUNT (346) #define YY_SHIFT_MIN (0) -#define YY_SHIFT_MAX (711) +#define YY_SHIFT_MAX (719) static const unsigned short int yy_shift_ofst[] = { - /* 0 */ 168, 77, 77, 159, 159, 3, 219, 230, 268, 6, - /* 10 */ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - /* 20 */ 6, 6, 0, 48, 230, 309, 309, 309, 8, 8, - /* 30 */ 6, 6, 6, 10, 6, 6, 149, 3, 49, 49, - /* 40 */ 26, 725, 725, 725, 230, 230, 230, 230, 230, 230, - /* 50 */ 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, - /* 60 */ 230, 230, 230, 230, 309, 309, 309, 318, 318, 318, - /* 70 */ 318, 318, 318, 318, 6, 6, 6, 295, 6, 6, - /* 80 */ 6, 8, 8, 6, 6, 6, 6, 293, 293, 298, - /* 90 */ 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, - /* 100 */ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - /* 110 */ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - /* 120 */ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - /* 130 */ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - /* 140 */ 6, 6, 6, 441, 441, 441, 392, 392, 392, 441, - /* 150 */ 392, 441, 396, 397, 399, 408, 409, 413, 417, 420, - /* 160 */ 422, 430, 436, 441, 441, 441, 478, 3, 3, 441, - /* 170 */ 441, 499, 503, 540, 508, 507, 539, 510, 516, 478, - /* 180 */ 26, 441, 520, 520, 441, 520, 441, 520, 441, 441, - /* 190 */ 725, 725, 27, 98, 125, 98, 98, 53, 180, 256, - /* 200 */ 256, 256, 256, 237, 257, 296, 300, 300, 300, 300, - /* 210 */ 236, 242, 151, 172, 172, 233, 281, 290, 179, 339, - /* 220 */ 59, 315, 316, 110, 319, 335, 336, 338, 426, 2, - /* 230 */ 334, 342, 343, 344, 345, 346, 347, 348, 332, 108, - /* 240 */ 307, 308, 376, 450, 317, 320, 355, 325, 362, 595, - /* 250 */ 455, 598, 602, 461, 604, 605, 521, 523, 475, 501, - /* 260 */ 509, 511, 525, 529, 537, 527, 557, 541, 543, 544, - /* 270 */ 558, 547, 548, 550, 648, 551, 552, 554, 565, 533, - /* 280 */ 572, 538, 555, 559, 556, 560, 509, 561, 562, 563, - /* 290 */ 564, 587, 660, 666, 667, 669, 670, 671, 597, 663, - /* 300 */ 603, 664, 542, 545, 593, 593, 593, 593, 668, 546, - /* 310 */ 549, 593, 593, 593, 677, 680, 582, 593, 684, 686, - /* 320 */ 687, 688, 689, 690, 691, 692, 693, 694, 695, 696, - /* 330 */ 697, 698, 699, 700, 701, 619, 628, 702, 703, 649, - /* 340 */ 651, 711, + /* 0 */ 154, 74, 74, 181, 181, 47, 235, 245, 245, 2, + /* 10 */ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + /* 20 */ 9, 9, 9, 0, 48, 245, 321, 321, 321, 4, + /* 30 */ 4, 9, 9, 9, 212, 9, 9, 213, 47, 57, + /* 40 */ 57, 143, 734, 734, 734, 245, 245, 245, 245, 245, + /* 50 */ 245, 245, 245, 245, 245, 245, 245, 245, 245, 245, + /* 60 */ 245, 245, 245, 245, 245, 321, 321, 321, 345, 345, + /* 70 */ 345, 345, 345, 345, 345, 9, 9, 9, 268, 9, + /* 80 */ 9, 9, 4, 4, 9, 9, 9, 9, 291, 291, + /* 90 */ 157, 4, 9, 9, 9, 9, 9, 9, 9, 9, + /* 100 */ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + /* 110 */ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + /* 120 */ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + /* 130 */ 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + /* 140 */ 9, 9, 9, 9, 450, 450, 450, 397, 397, 397, + /* 150 */ 450, 397, 450, 402, 404, 408, 399, 414, 425, 429, + /* 160 */ 432, 434, 439, 454, 450, 450, 450, 485, 47, 47, + /* 170 */ 450, 450, 504, 506, 546, 511, 510, 545, 513, 516, + /* 180 */ 485, 143, 450, 521, 521, 450, 521, 450, 521, 450, + /* 190 */ 450, 734, 734, 27, 99, 99, 126, 99, 53, 180, + /* 200 */ 283, 283, 283, 283, 193, 269, 273, 327, 327, 327, + /* 210 */ 327, 230, 251, 250, 238, 172, 172, 234, 307, 342, + /* 220 */ 348, 210, 317, 323, 338, 339, 341, 309, 297, 343, + /* 230 */ 354, 355, 357, 358, 346, 359, 360, 70, 171, 406, + /* 240 */ 362, 312, 316, 319, 455, 459, 325, 329, 364, 333, + /* 250 */ 400, 601, 460, 602, 604, 464, 610, 611, 523, 525, + /* 260 */ 482, 507, 514, 540, 529, 544, 565, 556, 561, 572, + /* 270 */ 574, 575, 564, 577, 578, 580, 657, 581, 582, 584, + /* 280 */ 571, 541, 576, 543, 585, 514, 589, 562, 590, 563, + /* 290 */ 596, 665, 670, 671, 672, 673, 674, 597, 666, 606, + /* 300 */ 603, 605, 573, 607, 660, 630, 675, 547, 548, 608, + /* 310 */ 608, 608, 608, 676, 551, 552, 608, 608, 608, 690, + /* 320 */ 691, 616, 608, 693, 695, 696, 697, 698, 699, 700, + /* 330 */ 701, 702, 703, 704, 705, 706, 707, 708, 709, 710, + /* 340 */ 625, 634, 711, 712, 658, 661, 719, }; -#define YY_REDUCE_COUNT (191) -#define YY_REDUCE_MIN (-249) -#define YY_REDUCE_MAX (444) +#define YY_REDUCE_COUNT (192) +#define YY_REDUCE_MIN (-259) +#define YY_REDUCE_MAX (449) static const short yy_reduce_ofst[] = { - /* 0 */ -179, -32, -32, 52, 52, 123, -249, -222, -188, -151, - /* 10 */ -137, -108, 78, 105, 152, 153, 155, 169, 170, 176, - /* 20 */ 177, 178, -190, -163, -140, -236, -234, -204, -94, -39, - /* 30 */ -130, 61, 29, -91, -171, 92, -41, -116, 25, 191, - /* 40 */ 22, 120, 91, 200, -117, -102, -55, 13, 45, 115, - /* 50 */ 186, 208, 210, 211, 212, 213, 214, 215, 218, 220, - /* 60 */ 221, 222, 223, 224, 20, 137, 166, 246, 252, 253, - /* 70 */ 254, 255, 258, 259, 294, 297, 299, 235, 301, 302, - /* 80 */ 303, 248, 260, 304, 306, 310, 311, 228, 240, 264, - /* 90 */ 262, 314, 321, 322, 323, 324, 326, 327, 328, 329, - /* 100 */ 330, 331, 333, 337, 340, 341, 349, 350, 351, 352, - /* 110 */ 353, 354, 356, 357, 358, 359, 360, 361, 363, 364, - /* 120 */ 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, - /* 130 */ 375, 377, 378, 379, 380, 381, 382, 383, 384, 385, - /* 140 */ 386, 387, 388, 389, 390, 391, 241, 247, 249, 393, - /* 150 */ 250, 394, 265, 261, 278, 282, 263, 289, 292, 395, - /* 160 */ 398, 400, 312, 401, 402, 403, 404, 405, 406, 407, - /* 170 */ 412, 410, 414, 411, 418, 419, 416, 421, 415, 423, - /* 180 */ 424, 431, 429, 433, 435, 438, 437, 439, 443, 444, - /* 190 */ 440, 434, + /* 0 */ -184, -34, -34, 78, 78, 25, -141, -138, -125, -106, + /* 10 */ -152, -36, 119, -80, 8, 29, 44, 135, 140, 152, + /* 20 */ 162, 164, 165, -192, -189, -247, -223, -207, -206, -211, + /* 30 */ -210, -136, -131, 49, -91, -32, 83, 17, 19, 163, + /* 40 */ 187, 11, 125, 211, 218, -259, -253, -176, -24, 68, + /* 50 */ 92, 116, 168, 188, 198, 204, 209, 215, 219, 220, + /* 60 */ 221, 222, 223, 224, 225, 228, 243, 244, 191, 255, + /* 70 */ 256, 257, 258, 259, 260, 299, 300, 301, 239, 302, + /* 80 */ 304, 305, 261, 262, 306, 310, 311, 313, 236, 241, + /* 90 */ 265, 266, 318, 320, 322, 326, 328, 330, 331, 332, + /* 100 */ 334, 335, 336, 337, 340, 344, 347, 349, 350, 351, + /* 110 */ 352, 353, 356, 361, 363, 365, 366, 367, 368, 369, + /* 120 */ 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, + /* 130 */ 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, + /* 140 */ 390, 391, 392, 393, 324, 394, 395, 248, 254, 264, + /* 150 */ 396, 270, 398, 280, 267, 286, 288, 298, 263, 303, + /* 160 */ 308, 401, 403, 405, 407, 409, 410, 411, 412, 413, + /* 170 */ 415, 416, 417, 419, 418, 420, 422, 426, 424, 430, + /* 180 */ 421, 423, 427, 428, 431, 441, 438, 443, 444, 447, + /* 190 */ 448, 437, 449, }; static const YYACTIONTYPE yy_default[] = { - /* 0 */ 825, 941, 884, 953, 872, 881, 1089, 1089, 825, 825, - /* 10 */ 825, 825, 825, 825, 825, 825, 825, 825, 825, 825, - /* 20 */ 825, 825, 1000, 844, 1089, 825, 825, 825, 825, 825, - /* 30 */ 825, 825, 825, 881, 825, 825, 887, 881, 887, 887, - /* 40 */ 825, 995, 925, 943, 825, 825, 825, 825, 825, 825, - /* 50 */ 825, 825, 825, 825, 825, 825, 825, 825, 825, 825, - /* 60 */ 825, 825, 825, 825, 825, 825, 825, 825, 825, 825, - /* 70 */ 825, 825, 825, 825, 825, 825, 825, 1002, 1008, 1005, - /* 80 */ 825, 825, 825, 1010, 825, 825, 825, 1032, 1032, 993, - /* 90 */ 825, 825, 825, 825, 825, 825, 825, 825, 825, 825, - /* 100 */ 825, 825, 825, 825, 825, 825, 825, 825, 825, 825, - /* 110 */ 825, 825, 825, 825, 825, 825, 825, 825, 825, 870, - /* 120 */ 825, 868, 825, 825, 825, 825, 825, 825, 825, 825, - /* 130 */ 825, 825, 825, 825, 825, 825, 855, 825, 825, 825, - /* 140 */ 825, 825, 825, 846, 846, 846, 825, 825, 825, 846, - /* 150 */ 825, 846, 1039, 1043, 1037, 1025, 1033, 1024, 1020, 1018, - /* 160 */ 1016, 1015, 1047, 846, 846, 846, 885, 881, 881, 846, - /* 170 */ 846, 903, 901, 899, 891, 897, 893, 895, 889, 873, - /* 180 */ 825, 846, 879, 879, 846, 879, 846, 879, 846, 846, - /* 190 */ 925, 943, 825, 1048, 825, 1088, 1038, 1078, 1077, 1084, - /* 200 */ 1076, 1075, 1074, 825, 825, 825, 1070, 1071, 1073, 1072, - /* 210 */ 825, 825, 825, 1080, 1079, 825, 825, 825, 825, 825, - /* 220 */ 825, 825, 825, 825, 825, 825, 825, 825, 825, 1050, - /* 230 */ 825, 1044, 1040, 825, 825, 825, 825, 825, 825, 825, - /* 240 */ 825, 825, 825, 825, 825, 825, 955, 825, 825, 825, - /* 250 */ 825, 825, 825, 825, 825, 825, 825, 825, 825, 992, - /* 260 */ 825, 825, 825, 825, 825, 1004, 1003, 825, 825, 825, - /* 270 */ 825, 825, 825, 825, 825, 825, 825, 825, 1034, 825, - /* 280 */ 1026, 825, 825, 825, 825, 825, 967, 825, 825, 825, - /* 290 */ 825, 825, 825, 825, 825, 825, 825, 825, 825, 825, - /* 300 */ 825, 825, 825, 825, 1107, 1102, 1103, 1100, 825, 825, - /* 310 */ 825, 1099, 1094, 1095, 825, 825, 825, 1092, 825, 825, - /* 320 */ 825, 825, 825, 825, 825, 825, 825, 825, 825, 825, - /* 330 */ 825, 825, 825, 825, 825, 909, 825, 853, 851, 825, - /* 340 */ 842, 825, + /* 0 */ 832, 949, 892, 961, 879, 889, 1097, 1097, 1097, 832, + /* 10 */ 832, 832, 832, 832, 832, 832, 832, 832, 832, 832, + /* 20 */ 832, 832, 832, 1008, 851, 1097, 832, 832, 832, 832, + /* 30 */ 832, 832, 832, 832, 889, 832, 832, 895, 889, 895, + /* 40 */ 895, 832, 1003, 933, 951, 832, 832, 832, 832, 832, + /* 50 */ 832, 832, 832, 832, 832, 832, 832, 832, 832, 832, + /* 60 */ 832, 832, 832, 832, 832, 832, 832, 832, 832, 832, + /* 70 */ 832, 832, 832, 832, 832, 832, 832, 832, 1010, 1016, + /* 80 */ 1013, 832, 832, 832, 1018, 832, 832, 832, 1040, 1040, + /* 90 */ 1001, 832, 832, 832, 832, 832, 832, 832, 832, 832, + /* 100 */ 832, 832, 832, 832, 832, 832, 832, 832, 832, 832, + /* 110 */ 832, 832, 832, 832, 832, 832, 832, 832, 832, 832, + /* 120 */ 877, 832, 875, 832, 832, 832, 832, 832, 832, 832, + /* 130 */ 832, 832, 832, 832, 832, 832, 832, 862, 832, 832, + /* 140 */ 832, 832, 832, 832, 853, 853, 853, 832, 832, 832, + /* 150 */ 853, 832, 853, 1047, 1051, 1045, 1033, 1041, 1032, 1028, + /* 160 */ 1026, 1024, 1023, 1055, 853, 853, 853, 893, 889, 889, + /* 170 */ 853, 853, 911, 909, 907, 899, 905, 901, 903, 897, + /* 180 */ 880, 832, 853, 887, 887, 853, 887, 853, 887, 853, + /* 190 */ 853, 933, 951, 832, 1056, 1046, 832, 1096, 1086, 1085, + /* 200 */ 1092, 1084, 1083, 1082, 832, 832, 832, 1078, 1081, 1080, + /* 210 */ 1079, 832, 832, 832, 832, 1088, 1087, 832, 832, 832, + /* 220 */ 832, 832, 832, 832, 832, 832, 832, 1052, 1048, 832, + /* 230 */ 832, 832, 832, 832, 832, 832, 832, 832, 1058, 832, + /* 240 */ 832, 832, 832, 832, 832, 832, 832, 832, 963, 832, + /* 250 */ 832, 832, 832, 832, 832, 832, 832, 832, 832, 832, + /* 260 */ 832, 1000, 832, 832, 832, 832, 832, 1012, 1011, 832, + /* 270 */ 832, 832, 832, 832, 832, 832, 832, 832, 832, 832, + /* 280 */ 1042, 832, 1034, 832, 832, 975, 832, 832, 832, 832, + /* 290 */ 832, 832, 832, 832, 832, 832, 832, 832, 832, 832, + /* 300 */ 832, 832, 832, 832, 832, 832, 832, 832, 832, 1115, + /* 310 */ 1110, 1111, 1108, 832, 832, 832, 1107, 1102, 1103, 832, + /* 320 */ 832, 832, 1100, 832, 832, 832, 832, 832, 832, 832, + /* 330 */ 832, 832, 832, 832, 832, 832, 832, 832, 832, 832, + /* 340 */ 917, 832, 860, 858, 832, 849, 832, }; /********** End of lemon-generated parsing tables *****************************/ @@ -573,6 +575,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 */ @@ -599,8 +604,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 */ @@ -848,196 +851,197 @@ static const char *const yyTokenName[] = { /* 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 */ "COMMA", - /* 89 */ "KEEP", - /* 90 */ "CACHE", - /* 91 */ "REPLICA", - /* 92 */ "QUORUM", - /* 93 */ "DAYS", - /* 94 */ "MINROWS", - /* 95 */ "MAXROWS", - /* 96 */ "BLOCKS", - /* 97 */ "CTIME", - /* 98 */ "WAL", - /* 99 */ "FSYNC", - /* 100 */ "COMP", - /* 101 */ "PRECISION", - /* 102 */ "UPDATE", - /* 103 */ "CACHELAST", - /* 104 */ "PARTITIONS", - /* 105 */ "LP", - /* 106 */ "RP", - /* 107 */ "UNSIGNED", - /* 108 */ "TAGS", - /* 109 */ "USING", - /* 110 */ "AS", - /* 111 */ "NULL", - /* 112 */ "SELECT", - /* 113 */ "UNION", - /* 114 */ "ALL", - /* 115 */ "DISTINCT", - /* 116 */ "FROM", - /* 117 */ "VARIABLE", - /* 118 */ "INTERVAL", - /* 119 */ "SESSION", - /* 120 */ "STATE_WINDOW", - /* 121 */ "FILL", - /* 122 */ "SLIDING", - /* 123 */ "ORDER", - /* 124 */ "BY", - /* 125 */ "ASC", - /* 126 */ "DESC", - /* 127 */ "GROUP", - /* 128 */ "HAVING", - /* 129 */ "LIMIT", - /* 130 */ "OFFSET", - /* 131 */ "SLIMIT", - /* 132 */ "SOFFSET", - /* 133 */ "WHERE", - /* 134 */ "NOW", - /* 135 */ "RESET", - /* 136 */ "QUERY", - /* 137 */ "SYNCDB", - /* 138 */ "ADD", - /* 139 */ "COLUMN", - /* 140 */ "MODIFY", - /* 141 */ "TAG", - /* 142 */ "CHANGE", - /* 143 */ "SET", - /* 144 */ "KILL", - /* 145 */ "CONNECTION", - /* 146 */ "STREAM", - /* 147 */ "COLON", - /* 148 */ "ABORT", - /* 149 */ "AFTER", - /* 150 */ "ATTACH", - /* 151 */ "BEFORE", - /* 152 */ "BEGIN", - /* 153 */ "CASCADE", - /* 154 */ "CLUSTER", - /* 155 */ "CONFLICT", - /* 156 */ "COPY", - /* 157 */ "DEFERRED", - /* 158 */ "DELIMITERS", - /* 159 */ "DETACH", - /* 160 */ "EACH", - /* 161 */ "END", - /* 162 */ "EXPLAIN", - /* 163 */ "FAIL", - /* 164 */ "FOR", - /* 165 */ "IGNORE", - /* 166 */ "IMMEDIATE", - /* 167 */ "INITIALLY", - /* 168 */ "INSTEAD", - /* 169 */ "MATCH", - /* 170 */ "KEY", - /* 171 */ "OF", - /* 172 */ "RAISE", - /* 173 */ "REPLACE", - /* 174 */ "RESTRICT", - /* 175 */ "ROW", - /* 176 */ "STATEMENT", - /* 177 */ "TRIGGER", - /* 178 */ "VIEW", - /* 179 */ "SEMI", - /* 180 */ "NONE", - /* 181 */ "PREV", - /* 182 */ "LINEAR", - /* 183 */ "IMPORT", - /* 184 */ "TBNAME", - /* 185 */ "JOIN", - /* 186 */ "INSERT", - /* 187 */ "INTO", - /* 188 */ "VALUES", - /* 189 */ "error", - /* 190 */ "program", - /* 191 */ "cmd", - /* 192 */ "dbPrefix", - /* 193 */ "ids", - /* 194 */ "cpxName", - /* 195 */ "ifexists", - /* 196 */ "alter_db_optr", - /* 197 */ "alter_topic_optr", - /* 198 */ "acct_optr", - /* 199 */ "ifnotexists", - /* 200 */ "db_optr", - /* 201 */ "topic_optr", - /* 202 */ "pps", - /* 203 */ "tseries", - /* 204 */ "dbs", - /* 205 */ "streams", - /* 206 */ "storage", - /* 207 */ "qtime", - /* 208 */ "users", - /* 209 */ "conns", - /* 210 */ "state", - /* 211 */ "intitemlist", - /* 212 */ "intitem", - /* 213 */ "keep", - /* 214 */ "cache", - /* 215 */ "replica", - /* 216 */ "quorum", - /* 217 */ "days", - /* 218 */ "minrows", - /* 219 */ "maxrows", - /* 220 */ "blocks", - /* 221 */ "ctime", - /* 222 */ "wal", - /* 223 */ "fsync", - /* 224 */ "comp", - /* 225 */ "prec", - /* 226 */ "update", - /* 227 */ "cachelast", - /* 228 */ "partitions", - /* 229 */ "typename", - /* 230 */ "signed", - /* 231 */ "create_table_args", - /* 232 */ "create_stable_args", - /* 233 */ "create_table_list", - /* 234 */ "create_from_stable", - /* 235 */ "columnlist", - /* 236 */ "tagitemlist", - /* 237 */ "tagNamelist", - /* 238 */ "select", - /* 239 */ "column", - /* 240 */ "tagitem", - /* 241 */ "selcollist", - /* 242 */ "from", - /* 243 */ "where_opt", - /* 244 */ "interval_opt", - /* 245 */ "session_option", - /* 246 */ "windowstate_option", - /* 247 */ "fill_opt", - /* 248 */ "sliding_opt", - /* 249 */ "groupby_opt", - /* 250 */ "orderby_opt", - /* 251 */ "having_opt", - /* 252 */ "slimit_opt", - /* 253 */ "limit_opt", - /* 254 */ "union", - /* 255 */ "sclp", - /* 256 */ "distinct", - /* 257 */ "expr", - /* 258 */ "as", - /* 259 */ "tablelist", - /* 260 */ "sub", - /* 261 */ "tmvar", - /* 262 */ "sortlist", - /* 263 */ "sortitem", - /* 264 */ "item", - /* 265 */ "sortorder", - /* 266 */ "grouplist", - /* 267 */ "exprlist", - /* 268 */ "expritem", + /* 79 */ "COMPACT", + /* 80 */ "LP", + /* 81 */ "RP", + /* 82 */ "IF", + /* 83 */ "EXISTS", + /* 84 */ "PPS", + /* 85 */ "TSERIES", + /* 86 */ "DBS", + /* 87 */ "STORAGE", + /* 88 */ "QTIME", + /* 89 */ "CONNS", + /* 90 */ "STATE", + /* 91 */ "COMMA", + /* 92 */ "KEEP", + /* 93 */ "CACHE", + /* 94 */ "REPLICA", + /* 95 */ "QUORUM", + /* 96 */ "DAYS", + /* 97 */ "MINROWS", + /* 98 */ "MAXROWS", + /* 99 */ "BLOCKS", + /* 100 */ "CTIME", + /* 101 */ "WAL", + /* 102 */ "FSYNC", + /* 103 */ "COMP", + /* 104 */ "PRECISION", + /* 105 */ "UPDATE", + /* 106 */ "CACHELAST", + /* 107 */ "PARTITIONS", + /* 108 */ "UNSIGNED", + /* 109 */ "TAGS", + /* 110 */ "USING", + /* 111 */ "AS", + /* 112 */ "NULL", + /* 113 */ "SELECT", + /* 114 */ "UNION", + /* 115 */ "ALL", + /* 116 */ "DISTINCT", + /* 117 */ "FROM", + /* 118 */ "VARIABLE", + /* 119 */ "INTERVAL", + /* 120 */ "SESSION", + /* 121 */ "STATE_WINDOW", + /* 122 */ "FILL", + /* 123 */ "SLIDING", + /* 124 */ "ORDER", + /* 125 */ "BY", + /* 126 */ "ASC", + /* 127 */ "DESC", + /* 128 */ "GROUP", + /* 129 */ "HAVING", + /* 130 */ "LIMIT", + /* 131 */ "OFFSET", + /* 132 */ "SLIMIT", + /* 133 */ "SOFFSET", + /* 134 */ "WHERE", + /* 135 */ "NOW", + /* 136 */ "RESET", + /* 137 */ "QUERY", + /* 138 */ "SYNCDB", + /* 139 */ "ADD", + /* 140 */ "COLUMN", + /* 141 */ "MODIFY", + /* 142 */ "TAG", + /* 143 */ "CHANGE", + /* 144 */ "SET", + /* 145 */ "KILL", + /* 146 */ "CONNECTION", + /* 147 */ "STREAM", + /* 148 */ "COLON", + /* 149 */ "ABORT", + /* 150 */ "AFTER", + /* 151 */ "ATTACH", + /* 152 */ "BEFORE", + /* 153 */ "BEGIN", + /* 154 */ "CASCADE", + /* 155 */ "CLUSTER", + /* 156 */ "CONFLICT", + /* 157 */ "COPY", + /* 158 */ "DEFERRED", + /* 159 */ "DELIMITERS", + /* 160 */ "DETACH", + /* 161 */ "EACH", + /* 162 */ "END", + /* 163 */ "EXPLAIN", + /* 164 */ "FAIL", + /* 165 */ "FOR", + /* 166 */ "IGNORE", + /* 167 */ "IMMEDIATE", + /* 168 */ "INITIALLY", + /* 169 */ "INSTEAD", + /* 170 */ "MATCH", + /* 171 */ "KEY", + /* 172 */ "OF", + /* 173 */ "RAISE", + /* 174 */ "REPLACE", + /* 175 */ "RESTRICT", + /* 176 */ "ROW", + /* 177 */ "STATEMENT", + /* 178 */ "TRIGGER", + /* 179 */ "VIEW", + /* 180 */ "SEMI", + /* 181 */ "NONE", + /* 182 */ "PREV", + /* 183 */ "LINEAR", + /* 184 */ "IMPORT", + /* 185 */ "TBNAME", + /* 186 */ "JOIN", + /* 187 */ "INSERT", + /* 188 */ "INTO", + /* 189 */ "VALUES", + /* 190 */ "error", + /* 191 */ "program", + /* 192 */ "cmd", + /* 193 */ "dbPrefix", + /* 194 */ "ids", + /* 195 */ "cpxName", + /* 196 */ "ifexists", + /* 197 */ "alter_db_optr", + /* 198 */ "alter_topic_optr", + /* 199 */ "acct_optr", + /* 200 */ "exprlist", + /* 201 */ "ifnotexists", + /* 202 */ "db_optr", + /* 203 */ "topic_optr", + /* 204 */ "pps", + /* 205 */ "tseries", + /* 206 */ "dbs", + /* 207 */ "streams", + /* 208 */ "storage", + /* 209 */ "qtime", + /* 210 */ "users", + /* 211 */ "conns", + /* 212 */ "state", + /* 213 */ "intitemlist", + /* 214 */ "intitem", + /* 215 */ "keep", + /* 216 */ "cache", + /* 217 */ "replica", + /* 218 */ "quorum", + /* 219 */ "days", + /* 220 */ "minrows", + /* 221 */ "maxrows", + /* 222 */ "blocks", + /* 223 */ "ctime", + /* 224 */ "wal", + /* 225 */ "fsync", + /* 226 */ "comp", + /* 227 */ "prec", + /* 228 */ "update", + /* 229 */ "cachelast", + /* 230 */ "partitions", + /* 231 */ "typename", + /* 232 */ "signed", + /* 233 */ "create_table_args", + /* 234 */ "create_stable_args", + /* 235 */ "create_table_list", + /* 236 */ "create_from_stable", + /* 237 */ "columnlist", + /* 238 */ "tagitemlist", + /* 239 */ "tagNamelist", + /* 240 */ "select", + /* 241 */ "column", + /* 242 */ "tagitem", + /* 243 */ "selcollist", + /* 244 */ "from", + /* 245 */ "where_opt", + /* 246 */ "interval_opt", + /* 247 */ "session_option", + /* 248 */ "windowstate_option", + /* 249 */ "fill_opt", + /* 250 */ "sliding_opt", + /* 251 */ "groupby_opt", + /* 252 */ "orderby_opt", + /* 253 */ "having_opt", + /* 254 */ "slimit_opt", + /* 255 */ "limit_opt", + /* 256 */ "union", + /* 257 */ "sclp", + /* 258 */ "distinct", + /* 259 */ "expr", + /* 260 */ "as", + /* 261 */ "tablelist", + /* 262 */ "sub", + /* 263 */ "tmvar", + /* 264 */ "sortlist", + /* 265 */ "sortitem", + /* 266 */ "item", + /* 267 */ "sortorder", + /* 268 */ "grouplist", + /* 269 */ "expritem", }; #endif /* defined(YYCOVERAGE) || !defined(NDEBUG) */ @@ -1093,241 +1097,242 @@ 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 */ "intitemlist ::= intitemlist COMMA intitem", - /* 79 */ "intitemlist ::= intitem", - /* 80 */ "intitem ::= INTEGER", - /* 81 */ "keep ::= KEEP intitemlist", - /* 82 */ "cache ::= CACHE INTEGER", - /* 83 */ "replica ::= REPLICA INTEGER", - /* 84 */ "quorum ::= QUORUM INTEGER", - /* 85 */ "days ::= DAYS INTEGER", - /* 86 */ "minrows ::= MINROWS INTEGER", - /* 87 */ "maxrows ::= MAXROWS INTEGER", - /* 88 */ "blocks ::= BLOCKS INTEGER", - /* 89 */ "ctime ::= CTIME INTEGER", - /* 90 */ "wal ::= WAL INTEGER", - /* 91 */ "fsync ::= FSYNC INTEGER", - /* 92 */ "comp ::= COMP INTEGER", - /* 93 */ "prec ::= PRECISION STRING", - /* 94 */ "update ::= UPDATE INTEGER", - /* 95 */ "cachelast ::= CACHELAST INTEGER", - /* 96 */ "partitions ::= PARTITIONS INTEGER", - /* 97 */ "db_optr ::=", - /* 98 */ "db_optr ::= db_optr cache", - /* 99 */ "db_optr ::= db_optr replica", - /* 100 */ "db_optr ::= db_optr quorum", - /* 101 */ "db_optr ::= db_optr days", - /* 102 */ "db_optr ::= db_optr minrows", - /* 103 */ "db_optr ::= db_optr maxrows", - /* 104 */ "db_optr ::= db_optr blocks", - /* 105 */ "db_optr ::= db_optr ctime", - /* 106 */ "db_optr ::= db_optr wal", - /* 107 */ "db_optr ::= db_optr fsync", - /* 108 */ "db_optr ::= db_optr comp", - /* 109 */ "db_optr ::= db_optr prec", - /* 110 */ "db_optr ::= db_optr keep", - /* 111 */ "db_optr ::= db_optr update", - /* 112 */ "db_optr ::= db_optr cachelast", - /* 113 */ "topic_optr ::= db_optr", - /* 114 */ "topic_optr ::= topic_optr partitions", - /* 115 */ "alter_db_optr ::=", - /* 116 */ "alter_db_optr ::= alter_db_optr replica", - /* 117 */ "alter_db_optr ::= alter_db_optr quorum", - /* 118 */ "alter_db_optr ::= alter_db_optr keep", - /* 119 */ "alter_db_optr ::= alter_db_optr blocks", - /* 120 */ "alter_db_optr ::= alter_db_optr comp", - /* 121 */ "alter_db_optr ::= alter_db_optr wal", - /* 122 */ "alter_db_optr ::= alter_db_optr fsync", - /* 123 */ "alter_db_optr ::= alter_db_optr update", - /* 124 */ "alter_db_optr ::= alter_db_optr cachelast", - /* 125 */ "alter_topic_optr ::= alter_db_optr", - /* 126 */ "alter_topic_optr ::= alter_topic_optr partitions", - /* 127 */ "typename ::= ids", - /* 128 */ "typename ::= ids LP signed RP", - /* 129 */ "typename ::= ids UNSIGNED", - /* 130 */ "signed ::= INTEGER", - /* 131 */ "signed ::= PLUS INTEGER", - /* 132 */ "signed ::= MINUS INTEGER", - /* 133 */ "cmd ::= CREATE TABLE create_table_args", - /* 134 */ "cmd ::= CREATE TABLE create_stable_args", - /* 135 */ "cmd ::= CREATE STABLE create_stable_args", - /* 136 */ "cmd ::= CREATE TABLE create_table_list", - /* 137 */ "create_table_list ::= create_from_stable", - /* 138 */ "create_table_list ::= create_table_list create_from_stable", - /* 139 */ "create_table_args ::= ifnotexists ids cpxName LP columnlist RP", - /* 140 */ "create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP", - /* 141 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP", - /* 142 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP", - /* 143 */ "tagNamelist ::= tagNamelist COMMA ids", - /* 144 */ "tagNamelist ::= ids", - /* 145 */ "create_table_args ::= ifnotexists ids cpxName AS select", - /* 146 */ "columnlist ::= columnlist COMMA column", - /* 147 */ "columnlist ::= column", - /* 148 */ "column ::= ids typename", - /* 149 */ "tagitemlist ::= tagitemlist COMMA tagitem", - /* 150 */ "tagitemlist ::= tagitem", - /* 151 */ "tagitem ::= INTEGER", - /* 152 */ "tagitem ::= FLOAT", - /* 153 */ "tagitem ::= STRING", - /* 154 */ "tagitem ::= BOOL", - /* 155 */ "tagitem ::= NULL", - /* 156 */ "tagitem ::= MINUS INTEGER", - /* 157 */ "tagitem ::= MINUS FLOAT", - /* 158 */ "tagitem ::= PLUS INTEGER", - /* 159 */ "tagitem ::= PLUS FLOAT", - /* 160 */ "select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt", - /* 161 */ "select ::= LP select RP", - /* 162 */ "union ::= select", - /* 163 */ "union ::= union UNION ALL select", - /* 164 */ "cmd ::= union", - /* 165 */ "select ::= SELECT selcollist", - /* 166 */ "sclp ::= selcollist COMMA", - /* 167 */ "sclp ::=", - /* 168 */ "selcollist ::= sclp distinct expr as", - /* 169 */ "selcollist ::= sclp STAR", - /* 170 */ "as ::= AS ids", - /* 171 */ "as ::= ids", - /* 172 */ "as ::=", - /* 173 */ "distinct ::= DISTINCT", - /* 174 */ "distinct ::=", - /* 175 */ "from ::= FROM tablelist", - /* 176 */ "from ::= FROM sub", - /* 177 */ "sub ::= LP union RP", - /* 178 */ "sub ::= LP union RP ids", - /* 179 */ "sub ::= sub COMMA LP union RP ids", - /* 180 */ "tablelist ::= ids cpxName", - /* 181 */ "tablelist ::= ids cpxName ids", - /* 182 */ "tablelist ::= tablelist COMMA ids cpxName", - /* 183 */ "tablelist ::= tablelist COMMA ids cpxName ids", - /* 184 */ "tmvar ::= VARIABLE", - /* 185 */ "interval_opt ::= INTERVAL LP tmvar RP", - /* 186 */ "interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP", - /* 187 */ "interval_opt ::=", - /* 188 */ "session_option ::=", - /* 189 */ "session_option ::= SESSION LP ids cpxName COMMA tmvar RP", - /* 190 */ "windowstate_option ::=", - /* 191 */ "windowstate_option ::= STATE_WINDOW LP ids RP", - /* 192 */ "fill_opt ::=", - /* 193 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP", - /* 194 */ "fill_opt ::= FILL LP ID RP", - /* 195 */ "sliding_opt ::= SLIDING LP tmvar RP", - /* 196 */ "sliding_opt ::=", - /* 197 */ "orderby_opt ::=", - /* 198 */ "orderby_opt ::= ORDER BY sortlist", - /* 199 */ "sortlist ::= sortlist COMMA item sortorder", - /* 200 */ "sortlist ::= item sortorder", - /* 201 */ "item ::= ids cpxName", - /* 202 */ "sortorder ::= ASC", - /* 203 */ "sortorder ::= DESC", - /* 204 */ "sortorder ::=", - /* 205 */ "groupby_opt ::=", - /* 206 */ "groupby_opt ::= GROUP BY grouplist", - /* 207 */ "grouplist ::= grouplist COMMA item", - /* 208 */ "grouplist ::= item", - /* 209 */ "having_opt ::=", - /* 210 */ "having_opt ::= HAVING expr", - /* 211 */ "limit_opt ::=", - /* 212 */ "limit_opt ::= LIMIT signed", - /* 213 */ "limit_opt ::= LIMIT signed OFFSET signed", - /* 214 */ "limit_opt ::= LIMIT signed COMMA signed", - /* 215 */ "slimit_opt ::=", - /* 216 */ "slimit_opt ::= SLIMIT signed", - /* 217 */ "slimit_opt ::= SLIMIT signed SOFFSET signed", - /* 218 */ "slimit_opt ::= SLIMIT signed COMMA signed", - /* 219 */ "where_opt ::=", - /* 220 */ "where_opt ::= WHERE expr", - /* 221 */ "expr ::= LP expr RP", - /* 222 */ "expr ::= ID", - /* 223 */ "expr ::= ID DOT ID", - /* 224 */ "expr ::= ID DOT STAR", - /* 225 */ "expr ::= INTEGER", - /* 226 */ "expr ::= MINUS INTEGER", - /* 227 */ "expr ::= PLUS INTEGER", - /* 228 */ "expr ::= FLOAT", - /* 229 */ "expr ::= MINUS FLOAT", - /* 230 */ "expr ::= PLUS FLOAT", - /* 231 */ "expr ::= STRING", - /* 232 */ "expr ::= NOW", - /* 233 */ "expr ::= VARIABLE", - /* 234 */ "expr ::= PLUS VARIABLE", - /* 235 */ "expr ::= MINUS VARIABLE", - /* 236 */ "expr ::= BOOL", - /* 237 */ "expr ::= NULL", - /* 238 */ "expr ::= ID LP exprlist RP", - /* 239 */ "expr ::= ID LP STAR RP", - /* 240 */ "expr ::= expr IS NULL", - /* 241 */ "expr ::= expr IS NOT NULL", - /* 242 */ "expr ::= expr LT expr", - /* 243 */ "expr ::= expr GT expr", - /* 244 */ "expr ::= expr LE expr", - /* 245 */ "expr ::= expr GE expr", - /* 246 */ "expr ::= expr NE expr", - /* 247 */ "expr ::= expr EQ expr", - /* 248 */ "expr ::= expr BETWEEN expr AND expr", - /* 249 */ "expr ::= expr AND expr", - /* 250 */ "expr ::= expr OR expr", - /* 251 */ "expr ::= expr PLUS expr", - /* 252 */ "expr ::= expr MINUS expr", - /* 253 */ "expr ::= expr STAR expr", - /* 254 */ "expr ::= expr SLASH expr", - /* 255 */ "expr ::= expr REM expr", - /* 256 */ "expr ::= expr LIKE expr", - /* 257 */ "expr ::= expr IN LP exprlist RP", - /* 258 */ "exprlist ::= exprlist COMMA expritem", - /* 259 */ "exprlist ::= expritem", - /* 260 */ "expritem ::= expr", - /* 261 */ "expritem ::=", - /* 262 */ "cmd ::= RESET QUERY CACHE", - /* 263 */ "cmd ::= SYNCDB ids REPLICA", - /* 264 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist", - /* 265 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids", - /* 266 */ "cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist", - /* 267 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist", - /* 268 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids", - /* 269 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids", - /* 270 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem", - /* 271 */ "cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist", - /* 272 */ "cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist", - /* 273 */ "cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids", - /* 274 */ "cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist", - /* 275 */ "cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist", - /* 276 */ "cmd ::= ALTER STABLE ids cpxName DROP TAG ids", - /* 277 */ "cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids", - /* 278 */ "cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem", - /* 279 */ "cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist", - /* 280 */ "cmd ::= KILL CONNECTION INTEGER", - /* 281 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER", - /* 282 */ "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 */ "intitemlist ::= intitemlist COMMA intitem", + /* 80 */ "intitemlist ::= intitem", + /* 81 */ "intitem ::= INTEGER", + /* 82 */ "keep ::= KEEP intitemlist", + /* 83 */ "cache ::= CACHE INTEGER", + /* 84 */ "replica ::= REPLICA INTEGER", + /* 85 */ "quorum ::= QUORUM INTEGER", + /* 86 */ "days ::= DAYS INTEGER", + /* 87 */ "minrows ::= MINROWS INTEGER", + /* 88 */ "maxrows ::= MAXROWS INTEGER", + /* 89 */ "blocks ::= BLOCKS INTEGER", + /* 90 */ "ctime ::= CTIME INTEGER", + /* 91 */ "wal ::= WAL INTEGER", + /* 92 */ "fsync ::= FSYNC INTEGER", + /* 93 */ "comp ::= COMP INTEGER", + /* 94 */ "prec ::= PRECISION STRING", + /* 95 */ "update ::= UPDATE INTEGER", + /* 96 */ "cachelast ::= CACHELAST INTEGER", + /* 97 */ "partitions ::= PARTITIONS INTEGER", + /* 98 */ "db_optr ::=", + /* 99 */ "db_optr ::= db_optr cache", + /* 100 */ "db_optr ::= db_optr replica", + /* 101 */ "db_optr ::= db_optr quorum", + /* 102 */ "db_optr ::= db_optr days", + /* 103 */ "db_optr ::= db_optr minrows", + /* 104 */ "db_optr ::= db_optr maxrows", + /* 105 */ "db_optr ::= db_optr blocks", + /* 106 */ "db_optr ::= db_optr ctime", + /* 107 */ "db_optr ::= db_optr wal", + /* 108 */ "db_optr ::= db_optr fsync", + /* 109 */ "db_optr ::= db_optr comp", + /* 110 */ "db_optr ::= db_optr prec", + /* 111 */ "db_optr ::= db_optr keep", + /* 112 */ "db_optr ::= db_optr update", + /* 113 */ "db_optr ::= db_optr cachelast", + /* 114 */ "topic_optr ::= db_optr", + /* 115 */ "topic_optr ::= topic_optr partitions", + /* 116 */ "alter_db_optr ::=", + /* 117 */ "alter_db_optr ::= alter_db_optr replica", + /* 118 */ "alter_db_optr ::= alter_db_optr quorum", + /* 119 */ "alter_db_optr ::= alter_db_optr keep", + /* 120 */ "alter_db_optr ::= alter_db_optr blocks", + /* 121 */ "alter_db_optr ::= alter_db_optr comp", + /* 122 */ "alter_db_optr ::= alter_db_optr wal", + /* 123 */ "alter_db_optr ::= alter_db_optr fsync", + /* 124 */ "alter_db_optr ::= alter_db_optr update", + /* 125 */ "alter_db_optr ::= alter_db_optr cachelast", + /* 126 */ "alter_topic_optr ::= alter_db_optr", + /* 127 */ "alter_topic_optr ::= alter_topic_optr partitions", + /* 128 */ "typename ::= ids", + /* 129 */ "typename ::= ids LP signed RP", + /* 130 */ "typename ::= ids UNSIGNED", + /* 131 */ "signed ::= INTEGER", + /* 132 */ "signed ::= PLUS INTEGER", + /* 133 */ "signed ::= MINUS INTEGER", + /* 134 */ "cmd ::= CREATE TABLE create_table_args", + /* 135 */ "cmd ::= CREATE TABLE create_stable_args", + /* 136 */ "cmd ::= CREATE STABLE create_stable_args", + /* 137 */ "cmd ::= CREATE TABLE create_table_list", + /* 138 */ "create_table_list ::= create_from_stable", + /* 139 */ "create_table_list ::= create_table_list create_from_stable", + /* 140 */ "create_table_args ::= ifnotexists ids cpxName LP columnlist RP", + /* 141 */ "create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP", + /* 142 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP", + /* 143 */ "create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP", + /* 144 */ "tagNamelist ::= tagNamelist COMMA ids", + /* 145 */ "tagNamelist ::= ids", + /* 146 */ "create_table_args ::= ifnotexists ids cpxName AS select", + /* 147 */ "columnlist ::= columnlist COMMA column", + /* 148 */ "columnlist ::= column", + /* 149 */ "column ::= ids typename", + /* 150 */ "tagitemlist ::= tagitemlist COMMA tagitem", + /* 151 */ "tagitemlist ::= tagitem", + /* 152 */ "tagitem ::= INTEGER", + /* 153 */ "tagitem ::= FLOAT", + /* 154 */ "tagitem ::= STRING", + /* 155 */ "tagitem ::= BOOL", + /* 156 */ "tagitem ::= NULL", + /* 157 */ "tagitem ::= MINUS INTEGER", + /* 158 */ "tagitem ::= MINUS FLOAT", + /* 159 */ "tagitem ::= PLUS INTEGER", + /* 160 */ "tagitem ::= PLUS FLOAT", + /* 161 */ "select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt", + /* 162 */ "select ::= LP select RP", + /* 163 */ "union ::= select", + /* 164 */ "union ::= union UNION ALL select", + /* 165 */ "cmd ::= union", + /* 166 */ "select ::= SELECT selcollist", + /* 167 */ "sclp ::= selcollist COMMA", + /* 168 */ "sclp ::=", + /* 169 */ "selcollist ::= sclp distinct expr as", + /* 170 */ "selcollist ::= sclp STAR", + /* 171 */ "as ::= AS ids", + /* 172 */ "as ::= ids", + /* 173 */ "as ::=", + /* 174 */ "distinct ::= DISTINCT", + /* 175 */ "distinct ::=", + /* 176 */ "from ::= FROM tablelist", + /* 177 */ "from ::= FROM sub", + /* 178 */ "sub ::= LP union RP", + /* 179 */ "sub ::= LP union RP ids", + /* 180 */ "sub ::= sub COMMA LP union RP ids", + /* 181 */ "tablelist ::= ids cpxName", + /* 182 */ "tablelist ::= ids cpxName ids", + /* 183 */ "tablelist ::= tablelist COMMA ids cpxName", + /* 184 */ "tablelist ::= tablelist COMMA ids cpxName ids", + /* 185 */ "tmvar ::= VARIABLE", + /* 186 */ "interval_opt ::= INTERVAL LP tmvar RP", + /* 187 */ "interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP", + /* 188 */ "interval_opt ::=", + /* 189 */ "session_option ::=", + /* 190 */ "session_option ::= SESSION LP ids cpxName COMMA tmvar RP", + /* 191 */ "windowstate_option ::=", + /* 192 */ "windowstate_option ::= STATE_WINDOW LP ids RP", + /* 193 */ "fill_opt ::=", + /* 194 */ "fill_opt ::= FILL LP ID COMMA tagitemlist RP", + /* 195 */ "fill_opt ::= FILL LP ID RP", + /* 196 */ "sliding_opt ::= SLIDING LP tmvar RP", + /* 197 */ "sliding_opt ::=", + /* 198 */ "orderby_opt ::=", + /* 199 */ "orderby_opt ::= ORDER BY sortlist", + /* 200 */ "sortlist ::= sortlist COMMA item sortorder", + /* 201 */ "sortlist ::= item sortorder", + /* 202 */ "item ::= ids cpxName", + /* 203 */ "sortorder ::= ASC", + /* 204 */ "sortorder ::= DESC", + /* 205 */ "sortorder ::=", + /* 206 */ "groupby_opt ::=", + /* 207 */ "groupby_opt ::= GROUP BY grouplist", + /* 208 */ "grouplist ::= grouplist COMMA item", + /* 209 */ "grouplist ::= item", + /* 210 */ "having_opt ::=", + /* 211 */ "having_opt ::= HAVING expr", + /* 212 */ "limit_opt ::=", + /* 213 */ "limit_opt ::= LIMIT signed", + /* 214 */ "limit_opt ::= LIMIT signed OFFSET signed", + /* 215 */ "limit_opt ::= LIMIT signed COMMA signed", + /* 216 */ "slimit_opt ::=", + /* 217 */ "slimit_opt ::= SLIMIT signed", + /* 218 */ "slimit_opt ::= SLIMIT signed SOFFSET signed", + /* 219 */ "slimit_opt ::= SLIMIT signed COMMA signed", + /* 220 */ "where_opt ::=", + /* 221 */ "where_opt ::= WHERE expr", + /* 222 */ "expr ::= LP expr RP", + /* 223 */ "expr ::= ID", + /* 224 */ "expr ::= ID DOT ID", + /* 225 */ "expr ::= ID DOT STAR", + /* 226 */ "expr ::= INTEGER", + /* 227 */ "expr ::= MINUS INTEGER", + /* 228 */ "expr ::= PLUS INTEGER", + /* 229 */ "expr ::= FLOAT", + /* 230 */ "expr ::= MINUS FLOAT", + /* 231 */ "expr ::= PLUS FLOAT", + /* 232 */ "expr ::= STRING", + /* 233 */ "expr ::= NOW", + /* 234 */ "expr ::= VARIABLE", + /* 235 */ "expr ::= PLUS VARIABLE", + /* 236 */ "expr ::= MINUS VARIABLE", + /* 237 */ "expr ::= BOOL", + /* 238 */ "expr ::= NULL", + /* 239 */ "expr ::= ID LP exprlist RP", + /* 240 */ "expr ::= ID LP STAR RP", + /* 241 */ "expr ::= expr IS NULL", + /* 242 */ "expr ::= expr IS NOT NULL", + /* 243 */ "expr ::= expr LT expr", + /* 244 */ "expr ::= expr GT expr", + /* 245 */ "expr ::= expr LE expr", + /* 246 */ "expr ::= expr GE expr", + /* 247 */ "expr ::= expr NE expr", + /* 248 */ "expr ::= expr EQ expr", + /* 249 */ "expr ::= expr BETWEEN expr AND expr", + /* 250 */ "expr ::= expr AND expr", + /* 251 */ "expr ::= expr OR expr", + /* 252 */ "expr ::= expr PLUS expr", + /* 253 */ "expr ::= expr MINUS expr", + /* 254 */ "expr ::= expr STAR expr", + /* 255 */ "expr ::= expr SLASH expr", + /* 256 */ "expr ::= expr REM expr", + /* 257 */ "expr ::= expr LIKE expr", + /* 258 */ "expr ::= expr IN LP exprlist RP", + /* 259 */ "exprlist ::= exprlist COMMA expritem", + /* 260 */ "exprlist ::= expritem", + /* 261 */ "expritem ::= expr", + /* 262 */ "expritem ::=", + /* 263 */ "cmd ::= RESET QUERY CACHE", + /* 264 */ "cmd ::= SYNCDB ids REPLICA", + /* 265 */ "cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist", + /* 266 */ "cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids", + /* 267 */ "cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist", + /* 268 */ "cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist", + /* 269 */ "cmd ::= ALTER TABLE ids cpxName DROP TAG ids", + /* 270 */ "cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids", + /* 271 */ "cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem", + /* 272 */ "cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist", + /* 273 */ "cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist", + /* 274 */ "cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids", + /* 275 */ "cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist", + /* 276 */ "cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist", + /* 277 */ "cmd ::= ALTER STABLE ids cpxName DROP TAG ids", + /* 278 */ "cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids", + /* 279 */ "cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem", + /* 280 */ "cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist", + /* 281 */ "cmd ::= KILL CONNECTION INTEGER", + /* 282 */ "cmd ::= KILL STREAM INTEGER COLON INTEGER", + /* 283 */ "cmd ::= KILL QUERY INTEGER COLON INTEGER", }; #endif /* NDEBUG */ @@ -1448,60 +1453,60 @@ static void yy_destructor( ** inside the C code. */ /********* Begin destructor definitions ***************************************/ - case 211: /* intitemlist */ - case 213: /* keep */ - case 235: /* columnlist */ - case 236: /* tagitemlist */ - case 237: /* tagNamelist */ - case 247: /* fill_opt */ - case 249: /* groupby_opt */ - case 250: /* orderby_opt */ - case 262: /* sortlist */ - case 266: /* grouplist */ + case 200: /* exprlist */ + case 243: /* selcollist */ + case 257: /* sclp */ { -taosArrayDestroy((yypminor->yy93)); +tSqlExprListDestroy((yypminor->yy441)); } break; - case 233: /* create_table_list */ + case 213: /* intitemlist */ + case 215: /* keep */ + case 237: /* columnlist */ + case 238: /* tagitemlist */ + case 239: /* tagNamelist */ + case 249: /* fill_opt */ + case 251: /* groupby_opt */ + case 252: /* orderby_opt */ + case 264: /* sortlist */ + case 268: /* grouplist */ { -destroyCreateTableSql((yypminor->yy532)); +taosArrayDestroy((yypminor->yy441)); } break; - case 238: /* select */ + case 235: /* create_table_list */ { -destroySqlNode((yypminor->yy224)); +destroyCreateTableSql((yypminor->yy182)); } break; - case 241: /* selcollist */ - case 255: /* sclp */ - case 267: /* exprlist */ + case 240: /* select */ { -tSqlExprListDestroy((yypminor->yy93)); +destroySqlNode((yypminor->yy236)); } break; - case 242: /* from */ - case 259: /* tablelist */ - case 260: /* sub */ + case 244: /* from */ + case 261: /* tablelist */ + case 262: /* sub */ { -destroyRelationInfo((yypminor->yy330)); +destroyRelationInfo((yypminor->yy244)); } break; - case 243: /* where_opt */ - case 251: /* having_opt */ - case 257: /* expr */ - case 268: /* expritem */ + case 245: /* where_opt */ + case 253: /* having_opt */ + case 259: /* expr */ + case 269: /* expritem */ { -tSqlExprDestroy((yypminor->yy68)); +tSqlExprDestroy((yypminor->yy166)); } break; - case 254: /* union */ + case 256: /* union */ { -destroyAllSqlNode((yypminor->yy93)); +destroyAllSqlNode((yypminor->yy441)); } break; - case 263: /* sortitem */ + case 265: /* sortitem */ { -tVariantDestroy(&(yypminor->yy518)); +tVariantDestroy(&(yypminor->yy506)); } break; /********* End destructor definitions *****************************************/ @@ -1795,289 +1800,290 @@ static const struct { YYCODETYPE lhs; /* Symbol on the left-hand side of the rule */ signed char nrhs; /* Negative of the number of RHS symbols in the rule */ } yyRuleInfo[] = { - { 190, -1 }, /* (0) program ::= cmd */ - { 191, -2 }, /* (1) cmd ::= SHOW DATABASES */ - { 191, -2 }, /* (2) cmd ::= SHOW TOPICS */ - { 191, -2 }, /* (3) cmd ::= SHOW MNODES */ - { 191, -2 }, /* (4) cmd ::= SHOW DNODES */ - { 191, -2 }, /* (5) cmd ::= SHOW ACCOUNTS */ - { 191, -2 }, /* (6) cmd ::= SHOW USERS */ - { 191, -2 }, /* (7) cmd ::= SHOW MODULES */ - { 191, -2 }, /* (8) cmd ::= SHOW QUERIES */ - { 191, -2 }, /* (9) cmd ::= SHOW CONNECTIONS */ - { 191, -2 }, /* (10) cmd ::= SHOW STREAMS */ - { 191, -2 }, /* (11) cmd ::= SHOW VARIABLES */ - { 191, -2 }, /* (12) cmd ::= SHOW SCORES */ - { 191, -2 }, /* (13) cmd ::= SHOW GRANTS */ - { 191, -2 }, /* (14) cmd ::= SHOW VNODES */ - { 191, -3 }, /* (15) cmd ::= SHOW VNODES IPTOKEN */ - { 192, 0 }, /* (16) dbPrefix ::= */ - { 192, -2 }, /* (17) dbPrefix ::= ids DOT */ - { 194, 0 }, /* (18) cpxName ::= */ - { 194, -2 }, /* (19) cpxName ::= DOT ids */ - { 191, -5 }, /* (20) cmd ::= SHOW CREATE TABLE ids cpxName */ - { 191, -5 }, /* (21) cmd ::= SHOW CREATE STABLE ids cpxName */ - { 191, -4 }, /* (22) cmd ::= SHOW CREATE DATABASE ids */ - { 191, -3 }, /* (23) cmd ::= SHOW dbPrefix TABLES */ - { 191, -5 }, /* (24) cmd ::= SHOW dbPrefix TABLES LIKE ids */ - { 191, -3 }, /* (25) cmd ::= SHOW dbPrefix STABLES */ - { 191, -5 }, /* (26) cmd ::= SHOW dbPrefix STABLES LIKE ids */ - { 191, -3 }, /* (27) cmd ::= SHOW dbPrefix VGROUPS */ - { 191, -4 }, /* (28) cmd ::= SHOW dbPrefix VGROUPS ids */ - { 191, -5 }, /* (29) cmd ::= DROP TABLE ifexists ids cpxName */ - { 191, -5 }, /* (30) cmd ::= DROP STABLE ifexists ids cpxName */ - { 191, -4 }, /* (31) cmd ::= DROP DATABASE ifexists ids */ - { 191, -4 }, /* (32) cmd ::= DROP TOPIC ifexists ids */ - { 191, -3 }, /* (33) cmd ::= DROP DNODE ids */ - { 191, -3 }, /* (34) cmd ::= DROP USER ids */ - { 191, -3 }, /* (35) cmd ::= DROP ACCOUNT ids */ - { 191, -2 }, /* (36) cmd ::= USE ids */ - { 191, -3 }, /* (37) cmd ::= DESCRIBE ids cpxName */ - { 191, -5 }, /* (38) cmd ::= ALTER USER ids PASS ids */ - { 191, -5 }, /* (39) cmd ::= ALTER USER ids PRIVILEGE ids */ - { 191, -4 }, /* (40) cmd ::= ALTER DNODE ids ids */ - { 191, -5 }, /* (41) cmd ::= ALTER DNODE ids ids ids */ - { 191, -3 }, /* (42) cmd ::= ALTER LOCAL ids */ - { 191, -4 }, /* (43) cmd ::= ALTER LOCAL ids ids */ - { 191, -4 }, /* (44) cmd ::= ALTER DATABASE ids alter_db_optr */ - { 191, -4 }, /* (45) cmd ::= ALTER TOPIC ids alter_topic_optr */ - { 191, -4 }, /* (46) cmd ::= ALTER ACCOUNT ids acct_optr */ - { 191, -6 }, /* (47) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */ - { 193, -1 }, /* (48) ids ::= ID */ - { 193, -1 }, /* (49) ids ::= STRING */ - { 195, -2 }, /* (50) ifexists ::= IF EXISTS */ - { 195, 0 }, /* (51) ifexists ::= */ - { 199, -3 }, /* (52) ifnotexists ::= IF NOT EXISTS */ - { 199, 0 }, /* (53) ifnotexists ::= */ - { 191, -3 }, /* (54) cmd ::= CREATE DNODE ids */ - { 191, -6 }, /* (55) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */ - { 191, -5 }, /* (56) cmd ::= CREATE DATABASE ifnotexists ids db_optr */ - { 191, -5 }, /* (57) cmd ::= CREATE TOPIC ifnotexists ids topic_optr */ - { 191, -5 }, /* (58) cmd ::= CREATE USER ids PASS ids */ - { 202, 0 }, /* (59) pps ::= */ - { 202, -2 }, /* (60) pps ::= PPS INTEGER */ - { 203, 0 }, /* (61) tseries ::= */ - { 203, -2 }, /* (62) tseries ::= TSERIES INTEGER */ - { 204, 0 }, /* (63) dbs ::= */ - { 204, -2 }, /* (64) dbs ::= DBS INTEGER */ - { 205, 0 }, /* (65) streams ::= */ - { 205, -2 }, /* (66) streams ::= STREAMS INTEGER */ - { 206, 0 }, /* (67) storage ::= */ - { 206, -2 }, /* (68) storage ::= STORAGE INTEGER */ - { 207, 0 }, /* (69) qtime ::= */ - { 207, -2 }, /* (70) qtime ::= QTIME INTEGER */ - { 208, 0 }, /* (71) users ::= */ - { 208, -2 }, /* (72) users ::= USERS INTEGER */ - { 209, 0 }, /* (73) conns ::= */ - { 209, -2 }, /* (74) conns ::= CONNS INTEGER */ - { 210, 0 }, /* (75) state ::= */ - { 210, -2 }, /* (76) state ::= STATE ids */ - { 198, -9 }, /* (77) acct_optr ::= pps tseries storage streams qtime dbs users conns state */ - { 211, -3 }, /* (78) intitemlist ::= intitemlist COMMA intitem */ - { 211, -1 }, /* (79) intitemlist ::= intitem */ - { 212, -1 }, /* (80) intitem ::= INTEGER */ - { 213, -2 }, /* (81) keep ::= KEEP intitemlist */ - { 214, -2 }, /* (82) cache ::= CACHE INTEGER */ - { 215, -2 }, /* (83) replica ::= REPLICA INTEGER */ - { 216, -2 }, /* (84) quorum ::= QUORUM INTEGER */ - { 217, -2 }, /* (85) days ::= DAYS INTEGER */ - { 218, -2 }, /* (86) minrows ::= MINROWS INTEGER */ - { 219, -2 }, /* (87) maxrows ::= MAXROWS INTEGER */ - { 220, -2 }, /* (88) blocks ::= BLOCKS INTEGER */ - { 221, -2 }, /* (89) ctime ::= CTIME INTEGER */ - { 222, -2 }, /* (90) wal ::= WAL INTEGER */ - { 223, -2 }, /* (91) fsync ::= FSYNC INTEGER */ - { 224, -2 }, /* (92) comp ::= COMP INTEGER */ - { 225, -2 }, /* (93) prec ::= PRECISION STRING */ - { 226, -2 }, /* (94) update ::= UPDATE INTEGER */ - { 227, -2 }, /* (95) cachelast ::= CACHELAST INTEGER */ - { 228, -2 }, /* (96) partitions ::= PARTITIONS INTEGER */ - { 200, 0 }, /* (97) db_optr ::= */ - { 200, -2 }, /* (98) db_optr ::= db_optr cache */ - { 200, -2 }, /* (99) db_optr ::= db_optr replica */ - { 200, -2 }, /* (100) db_optr ::= db_optr quorum */ - { 200, -2 }, /* (101) db_optr ::= db_optr days */ - { 200, -2 }, /* (102) db_optr ::= db_optr minrows */ - { 200, -2 }, /* (103) db_optr ::= db_optr maxrows */ - { 200, -2 }, /* (104) db_optr ::= db_optr blocks */ - { 200, -2 }, /* (105) db_optr ::= db_optr ctime */ - { 200, -2 }, /* (106) db_optr ::= db_optr wal */ - { 200, -2 }, /* (107) db_optr ::= db_optr fsync */ - { 200, -2 }, /* (108) db_optr ::= db_optr comp */ - { 200, -2 }, /* (109) db_optr ::= db_optr prec */ - { 200, -2 }, /* (110) db_optr ::= db_optr keep */ - { 200, -2 }, /* (111) db_optr ::= db_optr update */ - { 200, -2 }, /* (112) db_optr ::= db_optr cachelast */ - { 201, -1 }, /* (113) topic_optr ::= db_optr */ - { 201, -2 }, /* (114) topic_optr ::= topic_optr partitions */ - { 196, 0 }, /* (115) alter_db_optr ::= */ - { 196, -2 }, /* (116) alter_db_optr ::= alter_db_optr replica */ - { 196, -2 }, /* (117) alter_db_optr ::= alter_db_optr quorum */ - { 196, -2 }, /* (118) alter_db_optr ::= alter_db_optr keep */ - { 196, -2 }, /* (119) alter_db_optr ::= alter_db_optr blocks */ - { 196, -2 }, /* (120) alter_db_optr ::= alter_db_optr comp */ - { 196, -2 }, /* (121) alter_db_optr ::= alter_db_optr wal */ - { 196, -2 }, /* (122) alter_db_optr ::= alter_db_optr fsync */ - { 196, -2 }, /* (123) alter_db_optr ::= alter_db_optr update */ - { 196, -2 }, /* (124) alter_db_optr ::= alter_db_optr cachelast */ - { 197, -1 }, /* (125) alter_topic_optr ::= alter_db_optr */ - { 197, -2 }, /* (126) alter_topic_optr ::= alter_topic_optr partitions */ - { 229, -1 }, /* (127) typename ::= ids */ - { 229, -4 }, /* (128) typename ::= ids LP signed RP */ - { 229, -2 }, /* (129) typename ::= ids UNSIGNED */ - { 230, -1 }, /* (130) signed ::= INTEGER */ - { 230, -2 }, /* (131) signed ::= PLUS INTEGER */ - { 230, -2 }, /* (132) signed ::= MINUS INTEGER */ - { 191, -3 }, /* (133) cmd ::= CREATE TABLE create_table_args */ - { 191, -3 }, /* (134) cmd ::= CREATE TABLE create_stable_args */ - { 191, -3 }, /* (135) cmd ::= CREATE STABLE create_stable_args */ - { 191, -3 }, /* (136) cmd ::= CREATE TABLE create_table_list */ - { 233, -1 }, /* (137) create_table_list ::= create_from_stable */ - { 233, -2 }, /* (138) create_table_list ::= create_table_list create_from_stable */ - { 231, -6 }, /* (139) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ - { 232, -10 }, /* (140) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ - { 234, -10 }, /* (141) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */ - { 234, -13 }, /* (142) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */ - { 237, -3 }, /* (143) tagNamelist ::= tagNamelist COMMA ids */ - { 237, -1 }, /* (144) tagNamelist ::= ids */ - { 231, -5 }, /* (145) create_table_args ::= ifnotexists ids cpxName AS select */ - { 235, -3 }, /* (146) columnlist ::= columnlist COMMA column */ - { 235, -1 }, /* (147) columnlist ::= column */ - { 239, -2 }, /* (148) column ::= ids typename */ - { 236, -3 }, /* (149) tagitemlist ::= tagitemlist COMMA tagitem */ - { 236, -1 }, /* (150) tagitemlist ::= tagitem */ - { 240, -1 }, /* (151) tagitem ::= INTEGER */ - { 240, -1 }, /* (152) tagitem ::= FLOAT */ - { 240, -1 }, /* (153) tagitem ::= STRING */ - { 240, -1 }, /* (154) tagitem ::= BOOL */ - { 240, -1 }, /* (155) tagitem ::= NULL */ - { 240, -2 }, /* (156) tagitem ::= MINUS INTEGER */ - { 240, -2 }, /* (157) tagitem ::= MINUS FLOAT */ - { 240, -2 }, /* (158) tagitem ::= PLUS INTEGER */ - { 240, -2 }, /* (159) tagitem ::= PLUS FLOAT */ - { 238, -14 }, /* (160) select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ - { 238, -3 }, /* (161) select ::= LP select RP */ - { 254, -1 }, /* (162) union ::= select */ - { 254, -4 }, /* (163) union ::= union UNION ALL select */ - { 191, -1 }, /* (164) cmd ::= union */ - { 238, -2 }, /* (165) select ::= SELECT selcollist */ - { 255, -2 }, /* (166) sclp ::= selcollist COMMA */ - { 255, 0 }, /* (167) sclp ::= */ - { 241, -4 }, /* (168) selcollist ::= sclp distinct expr as */ - { 241, -2 }, /* (169) selcollist ::= sclp STAR */ - { 258, -2 }, /* (170) as ::= AS ids */ - { 258, -1 }, /* (171) as ::= ids */ - { 258, 0 }, /* (172) as ::= */ - { 256, -1 }, /* (173) distinct ::= DISTINCT */ - { 256, 0 }, /* (174) distinct ::= */ - { 242, -2 }, /* (175) from ::= FROM tablelist */ - { 242, -2 }, /* (176) from ::= FROM sub */ - { 260, -3 }, /* (177) sub ::= LP union RP */ - { 260, -4 }, /* (178) sub ::= LP union RP ids */ - { 260, -6 }, /* (179) sub ::= sub COMMA LP union RP ids */ - { 259, -2 }, /* (180) tablelist ::= ids cpxName */ - { 259, -3 }, /* (181) tablelist ::= ids cpxName ids */ - { 259, -4 }, /* (182) tablelist ::= tablelist COMMA ids cpxName */ - { 259, -5 }, /* (183) tablelist ::= tablelist COMMA ids cpxName ids */ - { 261, -1 }, /* (184) tmvar ::= VARIABLE */ - { 244, -4 }, /* (185) interval_opt ::= INTERVAL LP tmvar RP */ - { 244, -6 }, /* (186) interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ - { 244, 0 }, /* (187) interval_opt ::= */ - { 245, 0 }, /* (188) session_option ::= */ - { 245, -7 }, /* (189) session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ - { 246, 0 }, /* (190) windowstate_option ::= */ - { 246, -4 }, /* (191) windowstate_option ::= STATE_WINDOW LP ids RP */ - { 247, 0 }, /* (192) fill_opt ::= */ - { 247, -6 }, /* (193) fill_opt ::= FILL LP ID COMMA tagitemlist RP */ - { 247, -4 }, /* (194) fill_opt ::= FILL LP ID RP */ - { 248, -4 }, /* (195) sliding_opt ::= SLIDING LP tmvar RP */ - { 248, 0 }, /* (196) sliding_opt ::= */ - { 250, 0 }, /* (197) orderby_opt ::= */ - { 250, -3 }, /* (198) orderby_opt ::= ORDER BY sortlist */ - { 262, -4 }, /* (199) sortlist ::= sortlist COMMA item sortorder */ - { 262, -2 }, /* (200) sortlist ::= item sortorder */ - { 264, -2 }, /* (201) item ::= ids cpxName */ - { 265, -1 }, /* (202) sortorder ::= ASC */ - { 265, -1 }, /* (203) sortorder ::= DESC */ - { 265, 0 }, /* (204) sortorder ::= */ - { 249, 0 }, /* (205) groupby_opt ::= */ - { 249, -3 }, /* (206) groupby_opt ::= GROUP BY grouplist */ - { 266, -3 }, /* (207) grouplist ::= grouplist COMMA item */ - { 266, -1 }, /* (208) grouplist ::= item */ - { 251, 0 }, /* (209) having_opt ::= */ - { 251, -2 }, /* (210) having_opt ::= HAVING expr */ - { 253, 0 }, /* (211) limit_opt ::= */ - { 253, -2 }, /* (212) limit_opt ::= LIMIT signed */ - { 253, -4 }, /* (213) limit_opt ::= LIMIT signed OFFSET signed */ - { 253, -4 }, /* (214) limit_opt ::= LIMIT signed COMMA signed */ - { 252, 0 }, /* (215) slimit_opt ::= */ - { 252, -2 }, /* (216) slimit_opt ::= SLIMIT signed */ - { 252, -4 }, /* (217) slimit_opt ::= SLIMIT signed SOFFSET signed */ - { 252, -4 }, /* (218) slimit_opt ::= SLIMIT signed COMMA signed */ - { 243, 0 }, /* (219) where_opt ::= */ - { 243, -2 }, /* (220) where_opt ::= WHERE expr */ - { 257, -3 }, /* (221) expr ::= LP expr RP */ - { 257, -1 }, /* (222) expr ::= ID */ - { 257, -3 }, /* (223) expr ::= ID DOT ID */ - { 257, -3 }, /* (224) expr ::= ID DOT STAR */ - { 257, -1 }, /* (225) expr ::= INTEGER */ - { 257, -2 }, /* (226) expr ::= MINUS INTEGER */ - { 257, -2 }, /* (227) expr ::= PLUS INTEGER */ - { 257, -1 }, /* (228) expr ::= FLOAT */ - { 257, -2 }, /* (229) expr ::= MINUS FLOAT */ - { 257, -2 }, /* (230) expr ::= PLUS FLOAT */ - { 257, -1 }, /* (231) expr ::= STRING */ - { 257, -1 }, /* (232) expr ::= NOW */ - { 257, -1 }, /* (233) expr ::= VARIABLE */ - { 257, -2 }, /* (234) expr ::= PLUS VARIABLE */ - { 257, -2 }, /* (235) expr ::= MINUS VARIABLE */ - { 257, -1 }, /* (236) expr ::= BOOL */ - { 257, -1 }, /* (237) expr ::= NULL */ - { 257, -4 }, /* (238) expr ::= ID LP exprlist RP */ - { 257, -4 }, /* (239) expr ::= ID LP STAR RP */ - { 257, -3 }, /* (240) expr ::= expr IS NULL */ - { 257, -4 }, /* (241) expr ::= expr IS NOT NULL */ - { 257, -3 }, /* (242) expr ::= expr LT expr */ - { 257, -3 }, /* (243) expr ::= expr GT expr */ - { 257, -3 }, /* (244) expr ::= expr LE expr */ - { 257, -3 }, /* (245) expr ::= expr GE expr */ - { 257, -3 }, /* (246) expr ::= expr NE expr */ - { 257, -3 }, /* (247) expr ::= expr EQ expr */ - { 257, -5 }, /* (248) expr ::= expr BETWEEN expr AND expr */ - { 257, -3 }, /* (249) expr ::= expr AND expr */ - { 257, -3 }, /* (250) expr ::= expr OR expr */ - { 257, -3 }, /* (251) expr ::= expr PLUS expr */ - { 257, -3 }, /* (252) expr ::= expr MINUS expr */ - { 257, -3 }, /* (253) expr ::= expr STAR expr */ - { 257, -3 }, /* (254) expr ::= expr SLASH expr */ - { 257, -3 }, /* (255) expr ::= expr REM expr */ - { 257, -3 }, /* (256) expr ::= expr LIKE expr */ - { 257, -5 }, /* (257) expr ::= expr IN LP exprlist RP */ - { 267, -3 }, /* (258) exprlist ::= exprlist COMMA expritem */ - { 267, -1 }, /* (259) exprlist ::= expritem */ - { 268, -1 }, /* (260) expritem ::= expr */ - { 268, 0 }, /* (261) expritem ::= */ - { 191, -3 }, /* (262) cmd ::= RESET QUERY CACHE */ - { 191, -3 }, /* (263) cmd ::= SYNCDB ids REPLICA */ - { 191, -7 }, /* (264) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ - { 191, -7 }, /* (265) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ - { 191, -7 }, /* (266) cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */ - { 191, -7 }, /* (267) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ - { 191, -7 }, /* (268) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ - { 191, -8 }, /* (269) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ - { 191, -9 }, /* (270) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ - { 191, -7 }, /* (271) cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */ - { 191, -7 }, /* (272) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ - { 191, -7 }, /* (273) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ - { 191, -7 }, /* (274) cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */ - { 191, -7 }, /* (275) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ - { 191, -7 }, /* (276) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ - { 191, -8 }, /* (277) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ - { 191, -9 }, /* (278) cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */ - { 191, -7 }, /* (279) cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */ - { 191, -3 }, /* (280) cmd ::= KILL CONNECTION INTEGER */ - { 191, -5 }, /* (281) cmd ::= KILL STREAM INTEGER COLON INTEGER */ - { 191, -5 }, /* (282) cmd ::= KILL QUERY INTEGER COLON INTEGER */ + { 191, -1 }, /* (0) program ::= cmd */ + { 192, -2 }, /* (1) cmd ::= SHOW DATABASES */ + { 192, -2 }, /* (2) cmd ::= SHOW TOPICS */ + { 192, -2 }, /* (3) cmd ::= SHOW MNODES */ + { 192, -2 }, /* (4) cmd ::= SHOW DNODES */ + { 192, -2 }, /* (5) cmd ::= SHOW ACCOUNTS */ + { 192, -2 }, /* (6) cmd ::= SHOW USERS */ + { 192, -2 }, /* (7) cmd ::= SHOW MODULES */ + { 192, -2 }, /* (8) cmd ::= SHOW QUERIES */ + { 192, -2 }, /* (9) cmd ::= SHOW CONNECTIONS */ + { 192, -2 }, /* (10) cmd ::= SHOW STREAMS */ + { 192, -2 }, /* (11) cmd ::= SHOW VARIABLES */ + { 192, -2 }, /* (12) cmd ::= SHOW SCORES */ + { 192, -2 }, /* (13) cmd ::= SHOW GRANTS */ + { 192, -2 }, /* (14) cmd ::= SHOW VNODES */ + { 192, -3 }, /* (15) cmd ::= SHOW VNODES IPTOKEN */ + { 193, 0 }, /* (16) dbPrefix ::= */ + { 193, -2 }, /* (17) dbPrefix ::= ids DOT */ + { 195, 0 }, /* (18) cpxName ::= */ + { 195, -2 }, /* (19) cpxName ::= DOT ids */ + { 192, -5 }, /* (20) cmd ::= SHOW CREATE TABLE ids cpxName */ + { 192, -5 }, /* (21) cmd ::= SHOW CREATE STABLE ids cpxName */ + { 192, -4 }, /* (22) cmd ::= SHOW CREATE DATABASE ids */ + { 192, -3 }, /* (23) cmd ::= SHOW dbPrefix TABLES */ + { 192, -5 }, /* (24) cmd ::= SHOW dbPrefix TABLES LIKE ids */ + { 192, -3 }, /* (25) cmd ::= SHOW dbPrefix STABLES */ + { 192, -5 }, /* (26) cmd ::= SHOW dbPrefix STABLES LIKE ids */ + { 192, -3 }, /* (27) cmd ::= SHOW dbPrefix VGROUPS */ + { 192, -4 }, /* (28) cmd ::= SHOW dbPrefix VGROUPS ids */ + { 192, -5 }, /* (29) cmd ::= DROP TABLE ifexists ids cpxName */ + { 192, -5 }, /* (30) cmd ::= DROP STABLE ifexists ids cpxName */ + { 192, -4 }, /* (31) cmd ::= DROP DATABASE ifexists ids */ + { 192, -4 }, /* (32) cmd ::= DROP TOPIC ifexists ids */ + { 192, -3 }, /* (33) cmd ::= DROP DNODE ids */ + { 192, -3 }, /* (34) cmd ::= DROP USER ids */ + { 192, -3 }, /* (35) cmd ::= DROP ACCOUNT ids */ + { 192, -2 }, /* (36) cmd ::= USE ids */ + { 192, -3 }, /* (37) cmd ::= DESCRIBE ids cpxName */ + { 192, -5 }, /* (38) cmd ::= ALTER USER ids PASS ids */ + { 192, -5 }, /* (39) cmd ::= ALTER USER ids PRIVILEGE ids */ + { 192, -4 }, /* (40) cmd ::= ALTER DNODE ids ids */ + { 192, -5 }, /* (41) cmd ::= ALTER DNODE ids ids ids */ + { 192, -3 }, /* (42) cmd ::= ALTER LOCAL ids */ + { 192, -4 }, /* (43) cmd ::= ALTER LOCAL ids ids */ + { 192, -4 }, /* (44) cmd ::= ALTER DATABASE ids alter_db_optr */ + { 192, -4 }, /* (45) cmd ::= ALTER TOPIC ids alter_topic_optr */ + { 192, -4 }, /* (46) cmd ::= ALTER ACCOUNT ids acct_optr */ + { 192, -6 }, /* (47) cmd ::= ALTER ACCOUNT ids PASS ids acct_optr */ + { 192, -6 }, /* (48) cmd ::= COMPACT VNODES IN LP exprlist RP */ + { 194, -1 }, /* (49) ids ::= ID */ + { 194, -1 }, /* (50) ids ::= STRING */ + { 196, -2 }, /* (51) ifexists ::= IF EXISTS */ + { 196, 0 }, /* (52) ifexists ::= */ + { 201, -3 }, /* (53) ifnotexists ::= IF NOT EXISTS */ + { 201, 0 }, /* (54) ifnotexists ::= */ + { 192, -3 }, /* (55) cmd ::= CREATE DNODE ids */ + { 192, -6 }, /* (56) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */ + { 192, -5 }, /* (57) cmd ::= CREATE DATABASE ifnotexists ids db_optr */ + { 192, -5 }, /* (58) cmd ::= CREATE TOPIC ifnotexists ids topic_optr */ + { 192, -5 }, /* (59) cmd ::= CREATE USER ids PASS ids */ + { 204, 0 }, /* (60) pps ::= */ + { 204, -2 }, /* (61) pps ::= PPS INTEGER */ + { 205, 0 }, /* (62) tseries ::= */ + { 205, -2 }, /* (63) tseries ::= TSERIES INTEGER */ + { 206, 0 }, /* (64) dbs ::= */ + { 206, -2 }, /* (65) dbs ::= DBS INTEGER */ + { 207, 0 }, /* (66) streams ::= */ + { 207, -2 }, /* (67) streams ::= STREAMS INTEGER */ + { 208, 0 }, /* (68) storage ::= */ + { 208, -2 }, /* (69) storage ::= STORAGE INTEGER */ + { 209, 0 }, /* (70) qtime ::= */ + { 209, -2 }, /* (71) qtime ::= QTIME INTEGER */ + { 210, 0 }, /* (72) users ::= */ + { 210, -2 }, /* (73) users ::= USERS INTEGER */ + { 211, 0 }, /* (74) conns ::= */ + { 211, -2 }, /* (75) conns ::= CONNS INTEGER */ + { 212, 0 }, /* (76) state ::= */ + { 212, -2 }, /* (77) state ::= STATE ids */ + { 199, -9 }, /* (78) acct_optr ::= pps tseries storage streams qtime dbs users conns state */ + { 213, -3 }, /* (79) intitemlist ::= intitemlist COMMA intitem */ + { 213, -1 }, /* (80) intitemlist ::= intitem */ + { 214, -1 }, /* (81) intitem ::= INTEGER */ + { 215, -2 }, /* (82) keep ::= KEEP intitemlist */ + { 216, -2 }, /* (83) cache ::= CACHE INTEGER */ + { 217, -2 }, /* (84) replica ::= REPLICA INTEGER */ + { 218, -2 }, /* (85) quorum ::= QUORUM INTEGER */ + { 219, -2 }, /* (86) days ::= DAYS INTEGER */ + { 220, -2 }, /* (87) minrows ::= MINROWS INTEGER */ + { 221, -2 }, /* (88) maxrows ::= MAXROWS INTEGER */ + { 222, -2 }, /* (89) blocks ::= BLOCKS INTEGER */ + { 223, -2 }, /* (90) ctime ::= CTIME INTEGER */ + { 224, -2 }, /* (91) wal ::= WAL INTEGER */ + { 225, -2 }, /* (92) fsync ::= FSYNC INTEGER */ + { 226, -2 }, /* (93) comp ::= COMP INTEGER */ + { 227, -2 }, /* (94) prec ::= PRECISION STRING */ + { 228, -2 }, /* (95) update ::= UPDATE INTEGER */ + { 229, -2 }, /* (96) cachelast ::= CACHELAST INTEGER */ + { 230, -2 }, /* (97) partitions ::= PARTITIONS INTEGER */ + { 202, 0 }, /* (98) db_optr ::= */ + { 202, -2 }, /* (99) db_optr ::= db_optr cache */ + { 202, -2 }, /* (100) db_optr ::= db_optr replica */ + { 202, -2 }, /* (101) db_optr ::= db_optr quorum */ + { 202, -2 }, /* (102) db_optr ::= db_optr days */ + { 202, -2 }, /* (103) db_optr ::= db_optr minrows */ + { 202, -2 }, /* (104) db_optr ::= db_optr maxrows */ + { 202, -2 }, /* (105) db_optr ::= db_optr blocks */ + { 202, -2 }, /* (106) db_optr ::= db_optr ctime */ + { 202, -2 }, /* (107) db_optr ::= db_optr wal */ + { 202, -2 }, /* (108) db_optr ::= db_optr fsync */ + { 202, -2 }, /* (109) db_optr ::= db_optr comp */ + { 202, -2 }, /* (110) db_optr ::= db_optr prec */ + { 202, -2 }, /* (111) db_optr ::= db_optr keep */ + { 202, -2 }, /* (112) db_optr ::= db_optr update */ + { 202, -2 }, /* (113) db_optr ::= db_optr cachelast */ + { 203, -1 }, /* (114) topic_optr ::= db_optr */ + { 203, -2 }, /* (115) topic_optr ::= topic_optr partitions */ + { 197, 0 }, /* (116) alter_db_optr ::= */ + { 197, -2 }, /* (117) alter_db_optr ::= alter_db_optr replica */ + { 197, -2 }, /* (118) alter_db_optr ::= alter_db_optr quorum */ + { 197, -2 }, /* (119) alter_db_optr ::= alter_db_optr keep */ + { 197, -2 }, /* (120) alter_db_optr ::= alter_db_optr blocks */ + { 197, -2 }, /* (121) alter_db_optr ::= alter_db_optr comp */ + { 197, -2 }, /* (122) alter_db_optr ::= alter_db_optr wal */ + { 197, -2 }, /* (123) alter_db_optr ::= alter_db_optr fsync */ + { 197, -2 }, /* (124) alter_db_optr ::= alter_db_optr update */ + { 197, -2 }, /* (125) alter_db_optr ::= alter_db_optr cachelast */ + { 198, -1 }, /* (126) alter_topic_optr ::= alter_db_optr */ + { 198, -2 }, /* (127) alter_topic_optr ::= alter_topic_optr partitions */ + { 231, -1 }, /* (128) typename ::= ids */ + { 231, -4 }, /* (129) typename ::= ids LP signed RP */ + { 231, -2 }, /* (130) typename ::= ids UNSIGNED */ + { 232, -1 }, /* (131) signed ::= INTEGER */ + { 232, -2 }, /* (132) signed ::= PLUS INTEGER */ + { 232, -2 }, /* (133) signed ::= MINUS INTEGER */ + { 192, -3 }, /* (134) cmd ::= CREATE TABLE create_table_args */ + { 192, -3 }, /* (135) cmd ::= CREATE TABLE create_stable_args */ + { 192, -3 }, /* (136) cmd ::= CREATE STABLE create_stable_args */ + { 192, -3 }, /* (137) cmd ::= CREATE TABLE create_table_list */ + { 235, -1 }, /* (138) create_table_list ::= create_from_stable */ + { 235, -2 }, /* (139) create_table_list ::= create_table_list create_from_stable */ + { 233, -6 }, /* (140) create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ + { 234, -10 }, /* (141) create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ + { 236, -10 }, /* (142) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */ + { 236, -13 }, /* (143) create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */ + { 239, -3 }, /* (144) tagNamelist ::= tagNamelist COMMA ids */ + { 239, -1 }, /* (145) tagNamelist ::= ids */ + { 233, -5 }, /* (146) create_table_args ::= ifnotexists ids cpxName AS select */ + { 237, -3 }, /* (147) columnlist ::= columnlist COMMA column */ + { 237, -1 }, /* (148) columnlist ::= column */ + { 241, -2 }, /* (149) column ::= ids typename */ + { 238, -3 }, /* (150) tagitemlist ::= tagitemlist COMMA tagitem */ + { 238, -1 }, /* (151) tagitemlist ::= tagitem */ + { 242, -1 }, /* (152) tagitem ::= INTEGER */ + { 242, -1 }, /* (153) tagitem ::= FLOAT */ + { 242, -1 }, /* (154) tagitem ::= STRING */ + { 242, -1 }, /* (155) tagitem ::= BOOL */ + { 242, -1 }, /* (156) tagitem ::= NULL */ + { 242, -2 }, /* (157) tagitem ::= MINUS INTEGER */ + { 242, -2 }, /* (158) tagitem ::= MINUS FLOAT */ + { 242, -2 }, /* (159) tagitem ::= PLUS INTEGER */ + { 242, -2 }, /* (160) tagitem ::= PLUS FLOAT */ + { 240, -14 }, /* (161) select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ + { 240, -3 }, /* (162) select ::= LP select RP */ + { 256, -1 }, /* (163) union ::= select */ + { 256, -4 }, /* (164) union ::= union UNION ALL select */ + { 192, -1 }, /* (165) cmd ::= union */ + { 240, -2 }, /* (166) select ::= SELECT selcollist */ + { 257, -2 }, /* (167) sclp ::= selcollist COMMA */ + { 257, 0 }, /* (168) sclp ::= */ + { 243, -4 }, /* (169) selcollist ::= sclp distinct expr as */ + { 243, -2 }, /* (170) selcollist ::= sclp STAR */ + { 260, -2 }, /* (171) as ::= AS ids */ + { 260, -1 }, /* (172) as ::= ids */ + { 260, 0 }, /* (173) as ::= */ + { 258, -1 }, /* (174) distinct ::= DISTINCT */ + { 258, 0 }, /* (175) distinct ::= */ + { 244, -2 }, /* (176) from ::= FROM tablelist */ + { 244, -2 }, /* (177) from ::= FROM sub */ + { 262, -3 }, /* (178) sub ::= LP union RP */ + { 262, -4 }, /* (179) sub ::= LP union RP ids */ + { 262, -6 }, /* (180) sub ::= sub COMMA LP union RP ids */ + { 261, -2 }, /* (181) tablelist ::= ids cpxName */ + { 261, -3 }, /* (182) tablelist ::= ids cpxName ids */ + { 261, -4 }, /* (183) tablelist ::= tablelist COMMA ids cpxName */ + { 261, -5 }, /* (184) tablelist ::= tablelist COMMA ids cpxName ids */ + { 263, -1 }, /* (185) tmvar ::= VARIABLE */ + { 246, -4 }, /* (186) interval_opt ::= INTERVAL LP tmvar RP */ + { 246, -6 }, /* (187) interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ + { 246, 0 }, /* (188) interval_opt ::= */ + { 247, 0 }, /* (189) session_option ::= */ + { 247, -7 }, /* (190) session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ + { 248, 0 }, /* (191) windowstate_option ::= */ + { 248, -4 }, /* (192) windowstate_option ::= STATE_WINDOW LP ids RP */ + { 249, 0 }, /* (193) fill_opt ::= */ + { 249, -6 }, /* (194) fill_opt ::= FILL LP ID COMMA tagitemlist RP */ + { 249, -4 }, /* (195) fill_opt ::= FILL LP ID RP */ + { 250, -4 }, /* (196) sliding_opt ::= SLIDING LP tmvar RP */ + { 250, 0 }, /* (197) sliding_opt ::= */ + { 252, 0 }, /* (198) orderby_opt ::= */ + { 252, -3 }, /* (199) orderby_opt ::= ORDER BY sortlist */ + { 264, -4 }, /* (200) sortlist ::= sortlist COMMA item sortorder */ + { 264, -2 }, /* (201) sortlist ::= item sortorder */ + { 266, -2 }, /* (202) item ::= ids cpxName */ + { 267, -1 }, /* (203) sortorder ::= ASC */ + { 267, -1 }, /* (204) sortorder ::= DESC */ + { 267, 0 }, /* (205) sortorder ::= */ + { 251, 0 }, /* (206) groupby_opt ::= */ + { 251, -3 }, /* (207) groupby_opt ::= GROUP BY grouplist */ + { 268, -3 }, /* (208) grouplist ::= grouplist COMMA item */ + { 268, -1 }, /* (209) grouplist ::= item */ + { 253, 0 }, /* (210) having_opt ::= */ + { 253, -2 }, /* (211) having_opt ::= HAVING expr */ + { 255, 0 }, /* (212) limit_opt ::= */ + { 255, -2 }, /* (213) limit_opt ::= LIMIT signed */ + { 255, -4 }, /* (214) limit_opt ::= LIMIT signed OFFSET signed */ + { 255, -4 }, /* (215) limit_opt ::= LIMIT signed COMMA signed */ + { 254, 0 }, /* (216) slimit_opt ::= */ + { 254, -2 }, /* (217) slimit_opt ::= SLIMIT signed */ + { 254, -4 }, /* (218) slimit_opt ::= SLIMIT signed SOFFSET signed */ + { 254, -4 }, /* (219) slimit_opt ::= SLIMIT signed COMMA signed */ + { 245, 0 }, /* (220) where_opt ::= */ + { 245, -2 }, /* (221) where_opt ::= WHERE expr */ + { 259, -3 }, /* (222) expr ::= LP expr RP */ + { 259, -1 }, /* (223) expr ::= ID */ + { 259, -3 }, /* (224) expr ::= ID DOT ID */ + { 259, -3 }, /* (225) expr ::= ID DOT STAR */ + { 259, -1 }, /* (226) expr ::= INTEGER */ + { 259, -2 }, /* (227) expr ::= MINUS INTEGER */ + { 259, -2 }, /* (228) expr ::= PLUS INTEGER */ + { 259, -1 }, /* (229) expr ::= FLOAT */ + { 259, -2 }, /* (230) expr ::= MINUS FLOAT */ + { 259, -2 }, /* (231) expr ::= PLUS FLOAT */ + { 259, -1 }, /* (232) expr ::= STRING */ + { 259, -1 }, /* (233) expr ::= NOW */ + { 259, -1 }, /* (234) expr ::= VARIABLE */ + { 259, -2 }, /* (235) expr ::= PLUS VARIABLE */ + { 259, -2 }, /* (236) expr ::= MINUS VARIABLE */ + { 259, -1 }, /* (237) expr ::= BOOL */ + { 259, -1 }, /* (238) expr ::= NULL */ + { 259, -4 }, /* (239) expr ::= ID LP exprlist RP */ + { 259, -4 }, /* (240) expr ::= ID LP STAR RP */ + { 259, -3 }, /* (241) expr ::= expr IS NULL */ + { 259, -4 }, /* (242) expr ::= expr IS NOT NULL */ + { 259, -3 }, /* (243) expr ::= expr LT expr */ + { 259, -3 }, /* (244) expr ::= expr GT expr */ + { 259, -3 }, /* (245) expr ::= expr LE expr */ + { 259, -3 }, /* (246) expr ::= expr GE expr */ + { 259, -3 }, /* (247) expr ::= expr NE expr */ + { 259, -3 }, /* (248) expr ::= expr EQ expr */ + { 259, -5 }, /* (249) expr ::= expr BETWEEN expr AND expr */ + { 259, -3 }, /* (250) expr ::= expr AND expr */ + { 259, -3 }, /* (251) expr ::= expr OR expr */ + { 259, -3 }, /* (252) expr ::= expr PLUS expr */ + { 259, -3 }, /* (253) expr ::= expr MINUS expr */ + { 259, -3 }, /* (254) expr ::= expr STAR expr */ + { 259, -3 }, /* (255) expr ::= expr SLASH expr */ + { 259, -3 }, /* (256) expr ::= expr REM expr */ + { 259, -3 }, /* (257) expr ::= expr LIKE expr */ + { 259, -5 }, /* (258) expr ::= expr IN LP exprlist RP */ + { 200, -3 }, /* (259) exprlist ::= exprlist COMMA expritem */ + { 200, -1 }, /* (260) exprlist ::= expritem */ + { 269, -1 }, /* (261) expritem ::= expr */ + { 269, 0 }, /* (262) expritem ::= */ + { 192, -3 }, /* (263) cmd ::= RESET QUERY CACHE */ + { 192, -3 }, /* (264) cmd ::= SYNCDB ids REPLICA */ + { 192, -7 }, /* (265) cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ + { 192, -7 }, /* (266) cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ + { 192, -7 }, /* (267) cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */ + { 192, -7 }, /* (268) cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ + { 192, -7 }, /* (269) cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ + { 192, -8 }, /* (270) cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ + { 192, -9 }, /* (271) cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ + { 192, -7 }, /* (272) cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */ + { 192, -7 }, /* (273) cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ + { 192, -7 }, /* (274) cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ + { 192, -7 }, /* (275) cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */ + { 192, -7 }, /* (276) cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ + { 192, -7 }, /* (277) cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ + { 192, -8 }, /* (278) cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ + { 192, -9 }, /* (279) cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */ + { 192, -7 }, /* (280) cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */ + { 192, -3 }, /* (281) cmd ::= KILL CONNECTION INTEGER */ + { 192, -5 }, /* (282) cmd ::= KILL STREAM INTEGER COLON INTEGER */ + { 192, -5 }, /* (283) cmd ::= KILL QUERY INTEGER COLON INTEGER */ }; static void yy_accept(yyParser*); /* Forward Declaration */ @@ -2158,9 +2164,9 @@ static void yy_reduce( /********** Begin reduce actions **********************************************/ YYMINORTYPE yylhsminor; case 0: /* program ::= cmd */ - case 133: /* cmd ::= CREATE TABLE create_table_args */ yytestcase(yyruleno==133); - case 134: /* cmd ::= CREATE TABLE create_stable_args */ yytestcase(yyruleno==134); - case 135: /* cmd ::= CREATE STABLE create_stable_args */ yytestcase(yyruleno==135); + case 134: /* cmd ::= CREATE TABLE create_table_args */ yytestcase(yyruleno==134); + case 135: /* cmd ::= CREATE TABLE create_stable_args */ yytestcase(yyruleno==135); + case 136: /* cmd ::= CREATE STABLE create_stable_args */ yytestcase(yyruleno==136); {} break; case 1: /* cmd ::= SHOW DATABASES */ @@ -2330,746 +2336,749 @@ 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.yy372, &t);} +{ SStrToken t = {0}; setCreateDbInfo(pInfo, TSDB_SQL_ALTER_DB, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy382, &t);} break; case 46: /* cmd ::= ALTER ACCOUNT ids acct_optr */ -{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy77);} +{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-1].minor.yy0, NULL, &yymsp[0].minor.yy151);} 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.yy77);} +{ setCreateAcctSql(pInfo, TSDB_SQL_ALTER_ACCT, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy151);} break; - case 48: /* ids ::= ID */ - case 49: /* ids ::= STRING */ yytestcase(yyruleno==49); + case 48: /* cmd ::= COMPACT VNODES IN LP exprlist RP */ +{ setCompactVnodeSql(pInfo, TSDB_SQL_COMPACT_VNODE, yymsp[-1].minor.yy441);} + break; + case 49: /* ids ::= ID */ + case 50: /* ids ::= STRING */ yytestcase(yyruleno==50); {yylhsminor.yy0 = yymsp[0].minor.yy0; } yymsp[0].minor.yy0 = yylhsminor.yy0; break; - case 50: /* ifexists ::= IF EXISTS */ + case 51: /* ifexists ::= IF EXISTS */ { yymsp[-1].minor.yy0.n = 1;} break; - case 51: /* ifexists ::= */ - case 53: /* ifnotexists ::= */ yytestcase(yyruleno==53); - case 174: /* distinct ::= */ yytestcase(yyruleno==174); + case 52: /* ifexists ::= */ + case 54: /* ifnotexists ::= */ yytestcase(yyruleno==54); + case 175: /* distinct ::= */ yytestcase(yyruleno==175); { yymsp[1].minor.yy0.n = 0;} break; - case 52: /* ifnotexists ::= IF NOT EXISTS */ + case 53: /* ifnotexists ::= IF NOT EXISTS */ { yymsp[-2].minor.yy0.n = 1;} 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.yy77);} + 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.yy151);} 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.yy372, &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.yy382, &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); + 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); { 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); + 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); { yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } break; - case 77: /* acct_optr ::= pps tseries storage streams qtime dbs users conns state */ + case 78: /* acct_optr ::= pps tseries storage streams qtime dbs users conns state */ { - yylhsminor.yy77.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1; - yylhsminor.yy77.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1; - yylhsminor.yy77.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1; - yylhsminor.yy77.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1; - yylhsminor.yy77.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1; - yylhsminor.yy77.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1; - yylhsminor.yy77.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1; - yylhsminor.yy77.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1; - yylhsminor.yy77.stat = yymsp[0].minor.yy0; + yylhsminor.yy151.maxUsers = (yymsp[-2].minor.yy0.n>0)?atoi(yymsp[-2].minor.yy0.z):-1; + yylhsminor.yy151.maxDbs = (yymsp[-3].minor.yy0.n>0)?atoi(yymsp[-3].minor.yy0.z):-1; + yylhsminor.yy151.maxTimeSeries = (yymsp[-7].minor.yy0.n>0)?atoi(yymsp[-7].minor.yy0.z):-1; + yylhsminor.yy151.maxStreams = (yymsp[-5].minor.yy0.n>0)?atoi(yymsp[-5].minor.yy0.z):-1; + yylhsminor.yy151.maxPointsPerSecond = (yymsp[-8].minor.yy0.n>0)?atoi(yymsp[-8].minor.yy0.z):-1; + yylhsminor.yy151.maxStorage = (yymsp[-6].minor.yy0.n>0)?strtoll(yymsp[-6].minor.yy0.z, NULL, 10):-1; + yylhsminor.yy151.maxQueryTime = (yymsp[-4].minor.yy0.n>0)?strtoll(yymsp[-4].minor.yy0.z, NULL, 10):-1; + yylhsminor.yy151.maxConnections = (yymsp[-1].minor.yy0.n>0)?atoi(yymsp[-1].minor.yy0.z):-1; + yylhsminor.yy151.stat = yymsp[0].minor.yy0; } - yymsp[-8].minor.yy77 = yylhsminor.yy77; + yymsp[-8].minor.yy151 = yylhsminor.yy151; break; - case 78: /* intitemlist ::= intitemlist COMMA intitem */ - case 149: /* tagitemlist ::= tagitemlist COMMA tagitem */ yytestcase(yyruleno==149); -{ yylhsminor.yy93 = tVariantListAppend(yymsp[-2].minor.yy93, &yymsp[0].minor.yy518, -1); } - yymsp[-2].minor.yy93 = yylhsminor.yy93; + case 79: /* intitemlist ::= intitemlist COMMA intitem */ + case 150: /* tagitemlist ::= tagitemlist COMMA tagitem */ yytestcase(yyruleno==150); +{ yylhsminor.yy441 = tVariantListAppend(yymsp[-2].minor.yy441, &yymsp[0].minor.yy506, -1); } + yymsp[-2].minor.yy441 = yylhsminor.yy441; break; - case 79: /* intitemlist ::= intitem */ - case 150: /* tagitemlist ::= tagitem */ yytestcase(yyruleno==150); -{ yylhsminor.yy93 = tVariantListAppend(NULL, &yymsp[0].minor.yy518, -1); } - yymsp[0].minor.yy93 = yylhsminor.yy93; + case 80: /* intitemlist ::= intitem */ + case 151: /* tagitemlist ::= tagitem */ yytestcase(yyruleno==151); +{ yylhsminor.yy441 = tVariantListAppend(NULL, &yymsp[0].minor.yy506, -1); } + yymsp[0].minor.yy441 = yylhsminor.yy441; break; - case 80: /* intitem ::= INTEGER */ - case 151: /* tagitem ::= INTEGER */ yytestcase(yyruleno==151); - case 152: /* tagitem ::= FLOAT */ yytestcase(yyruleno==152); - case 153: /* tagitem ::= STRING */ yytestcase(yyruleno==153); - case 154: /* tagitem ::= BOOL */ yytestcase(yyruleno==154); -{ toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yylhsminor.yy518, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy518 = yylhsminor.yy518; + case 81: /* intitem ::= INTEGER */ + case 152: /* tagitem ::= INTEGER */ yytestcase(yyruleno==152); + case 153: /* tagitem ::= FLOAT */ yytestcase(yyruleno==153); + case 154: /* tagitem ::= STRING */ yytestcase(yyruleno==154); + case 155: /* tagitem ::= BOOL */ yytestcase(yyruleno==155); +{ toTSDBType(yymsp[0].minor.yy0.type); tVariantCreate(&yylhsminor.yy506, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy506 = yylhsminor.yy506; break; - case 81: /* keep ::= KEEP intitemlist */ -{ yymsp[-1].minor.yy93 = yymsp[0].minor.yy93; } + case 82: /* keep ::= KEEP intitemlist */ +{ yymsp[-1].minor.yy441 = yymsp[0].minor.yy441; } break; - case 82: /* cache ::= CACHE INTEGER */ - case 83: /* replica ::= REPLICA INTEGER */ yytestcase(yyruleno==83); - case 84: /* quorum ::= QUORUM INTEGER */ yytestcase(yyruleno==84); - case 85: /* days ::= DAYS INTEGER */ yytestcase(yyruleno==85); - case 86: /* minrows ::= MINROWS INTEGER */ yytestcase(yyruleno==86); - case 87: /* maxrows ::= MAXROWS INTEGER */ yytestcase(yyruleno==87); - case 88: /* blocks ::= BLOCKS INTEGER */ yytestcase(yyruleno==88); - case 89: /* ctime ::= CTIME INTEGER */ yytestcase(yyruleno==89); - case 90: /* wal ::= WAL INTEGER */ yytestcase(yyruleno==90); - case 91: /* fsync ::= FSYNC INTEGER */ yytestcase(yyruleno==91); - case 92: /* comp ::= COMP INTEGER */ yytestcase(yyruleno==92); - case 93: /* prec ::= PRECISION STRING */ yytestcase(yyruleno==93); - case 94: /* update ::= UPDATE INTEGER */ yytestcase(yyruleno==94); - case 95: /* cachelast ::= CACHELAST INTEGER */ yytestcase(yyruleno==95); - case 96: /* partitions ::= PARTITIONS INTEGER */ yytestcase(yyruleno==96); + case 83: /* cache ::= CACHE INTEGER */ + case 84: /* replica ::= REPLICA INTEGER */ yytestcase(yyruleno==84); + case 85: /* quorum ::= QUORUM INTEGER */ yytestcase(yyruleno==85); + case 86: /* days ::= DAYS INTEGER */ yytestcase(yyruleno==86); + case 87: /* minrows ::= MINROWS INTEGER */ yytestcase(yyruleno==87); + case 88: /* maxrows ::= MAXROWS INTEGER */ yytestcase(yyruleno==88); + case 89: /* blocks ::= BLOCKS INTEGER */ yytestcase(yyruleno==89); + case 90: /* ctime ::= CTIME INTEGER */ yytestcase(yyruleno==90); + case 91: /* wal ::= WAL INTEGER */ yytestcase(yyruleno==91); + case 92: /* fsync ::= FSYNC INTEGER */ yytestcase(yyruleno==92); + case 93: /* comp ::= COMP INTEGER */ yytestcase(yyruleno==93); + case 94: /* prec ::= PRECISION STRING */ yytestcase(yyruleno==94); + case 95: /* update ::= UPDATE INTEGER */ yytestcase(yyruleno==95); + case 96: /* cachelast ::= CACHELAST INTEGER */ yytestcase(yyruleno==96); + case 97: /* partitions ::= PARTITIONS INTEGER */ yytestcase(yyruleno==97); { yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } break; - case 97: /* db_optr ::= */ -{setDefaultCreateDbOption(&yymsp[1].minor.yy372); yymsp[1].minor.yy372.dbType = TSDB_DB_TYPE_DEFAULT;} + case 98: /* db_optr ::= */ +{setDefaultCreateDbOption(&yymsp[1].minor.yy382); yymsp[1].minor.yy382.dbType = TSDB_DB_TYPE_DEFAULT;} break; - case 98: /* db_optr ::= db_optr cache */ -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy372 = yylhsminor.yy372; + case 99: /* db_optr ::= db_optr cache */ +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.cacheBlockSize = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; - case 99: /* db_optr ::= db_optr replica */ - case 116: /* alter_db_optr ::= alter_db_optr replica */ yytestcase(yyruleno==116); -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy372 = yylhsminor.yy372; + case 100: /* db_optr ::= db_optr replica */ + case 117: /* alter_db_optr ::= alter_db_optr replica */ yytestcase(yyruleno==117); +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.replica = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; - case 100: /* db_optr ::= db_optr quorum */ - case 117: /* alter_db_optr ::= alter_db_optr quorum */ yytestcase(yyruleno==117); -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy372 = yylhsminor.yy372; + case 101: /* db_optr ::= db_optr quorum */ + case 118: /* alter_db_optr ::= alter_db_optr quorum */ yytestcase(yyruleno==118); +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.quorum = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; - case 101: /* db_optr ::= db_optr days */ -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy372 = yylhsminor.yy372; + case 102: /* db_optr ::= db_optr days */ +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.daysPerFile = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; - case 102: /* db_optr ::= db_optr minrows */ -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } - yymsp[-1].minor.yy372 = yylhsminor.yy372; + case 103: /* db_optr ::= db_optr minrows */ +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.minRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; - case 103: /* db_optr ::= db_optr maxrows */ -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } - yymsp[-1].minor.yy372 = yylhsminor.yy372; + case 104: /* db_optr ::= db_optr maxrows */ +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.maxRowsPerBlock = strtod(yymsp[0].minor.yy0.z, NULL); } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; - case 104: /* db_optr ::= db_optr blocks */ - case 119: /* alter_db_optr ::= alter_db_optr blocks */ yytestcase(yyruleno==119); -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy372 = yylhsminor.yy372; + case 105: /* db_optr ::= db_optr blocks */ + case 120: /* alter_db_optr ::= alter_db_optr blocks */ yytestcase(yyruleno==120); +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.numOfBlocks = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; - case 105: /* db_optr ::= db_optr ctime */ -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy372 = yylhsminor.yy372; + case 106: /* db_optr ::= db_optr ctime */ +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.commitTime = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; - case 106: /* db_optr ::= db_optr wal */ - case 121: /* alter_db_optr ::= alter_db_optr wal */ yytestcase(yyruleno==121); -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy372 = yylhsminor.yy372; + case 107: /* db_optr ::= db_optr wal */ + case 122: /* alter_db_optr ::= alter_db_optr wal */ yytestcase(yyruleno==122); +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.walLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; - case 107: /* db_optr ::= db_optr fsync */ - case 122: /* alter_db_optr ::= alter_db_optr fsync */ yytestcase(yyruleno==122); -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy372 = yylhsminor.yy372; + case 108: /* db_optr ::= db_optr fsync */ + case 123: /* alter_db_optr ::= alter_db_optr fsync */ yytestcase(yyruleno==123); +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.fsyncPeriod = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; - case 108: /* db_optr ::= db_optr comp */ - case 120: /* alter_db_optr ::= alter_db_optr comp */ yytestcase(yyruleno==120); -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy372 = yylhsminor.yy372; + case 109: /* db_optr ::= db_optr comp */ + case 121: /* alter_db_optr ::= alter_db_optr comp */ yytestcase(yyruleno==121); +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.compressionLevel = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; - case 109: /* db_optr ::= db_optr prec */ -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.precision = yymsp[0].minor.yy0; } - yymsp[-1].minor.yy372 = yylhsminor.yy372; + case 110: /* db_optr ::= db_optr prec */ +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.precision = yymsp[0].minor.yy0; } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; - case 110: /* db_optr ::= db_optr keep */ - case 118: /* alter_db_optr ::= alter_db_optr keep */ yytestcase(yyruleno==118); -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.keep = yymsp[0].minor.yy93; } - yymsp[-1].minor.yy372 = yylhsminor.yy372; + case 111: /* db_optr ::= db_optr keep */ + case 119: /* alter_db_optr ::= alter_db_optr keep */ yytestcase(yyruleno==119); +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.keep = yymsp[0].minor.yy441; } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; - case 111: /* db_optr ::= db_optr update */ - case 123: /* alter_db_optr ::= alter_db_optr update */ yytestcase(yyruleno==123); -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy372 = yylhsminor.yy372; + case 112: /* db_optr ::= db_optr update */ + case 124: /* alter_db_optr ::= alter_db_optr update */ yytestcase(yyruleno==124); +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.update = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; - case 112: /* db_optr ::= db_optr cachelast */ - case 124: /* alter_db_optr ::= alter_db_optr cachelast */ yytestcase(yyruleno==124); -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy372 = yylhsminor.yy372; + case 113: /* db_optr ::= db_optr cachelast */ + case 125: /* alter_db_optr ::= alter_db_optr cachelast */ yytestcase(yyruleno==125); +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.cachelast = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; - case 113: /* topic_optr ::= db_optr */ - case 125: /* alter_topic_optr ::= alter_db_optr */ yytestcase(yyruleno==125); -{ yylhsminor.yy372 = yymsp[0].minor.yy372; yylhsminor.yy372.dbType = TSDB_DB_TYPE_TOPIC; } - yymsp[0].minor.yy372 = yylhsminor.yy372; + case 114: /* topic_optr ::= db_optr */ + case 126: /* alter_topic_optr ::= alter_db_optr */ yytestcase(yyruleno==126); +{ yylhsminor.yy382 = yymsp[0].minor.yy382; yylhsminor.yy382.dbType = TSDB_DB_TYPE_TOPIC; } + yymsp[0].minor.yy382 = yylhsminor.yy382; break; - case 114: /* topic_optr ::= topic_optr partitions */ - case 126: /* alter_topic_optr ::= alter_topic_optr partitions */ yytestcase(yyruleno==126); -{ yylhsminor.yy372 = yymsp[-1].minor.yy372; yylhsminor.yy372.partitions = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[-1].minor.yy372 = yylhsminor.yy372; + case 115: /* topic_optr ::= topic_optr partitions */ + case 127: /* alter_topic_optr ::= alter_topic_optr partitions */ yytestcase(yyruleno==127); +{ yylhsminor.yy382 = yymsp[-1].minor.yy382; yylhsminor.yy382.partitions = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[-1].minor.yy382 = yylhsminor.yy382; break; - case 115: /* alter_db_optr ::= */ -{ setDefaultCreateDbOption(&yymsp[1].minor.yy372); yymsp[1].minor.yy372.dbType = TSDB_DB_TYPE_DEFAULT;} + case 116: /* alter_db_optr ::= */ +{ setDefaultCreateDbOption(&yymsp[1].minor.yy382); yymsp[1].minor.yy382.dbType = TSDB_DB_TYPE_DEFAULT;} break; - case 127: /* typename ::= ids */ + case 128: /* typename ::= ids */ { yymsp[0].minor.yy0.type = 0; - tSetColumnType (&yylhsminor.yy325, &yymsp[0].minor.yy0); + tSetColumnType (&yylhsminor.yy343, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy325 = yylhsminor.yy325; + yymsp[0].minor.yy343 = yylhsminor.yy343; break; - case 128: /* typename ::= ids LP signed RP */ + case 129: /* typename ::= ids LP signed RP */ { - if (yymsp[-1].minor.yy279 <= 0) { + if (yymsp[-1].minor.yy369 <= 0) { yymsp[-3].minor.yy0.type = 0; - tSetColumnType(&yylhsminor.yy325, &yymsp[-3].minor.yy0); + tSetColumnType(&yylhsminor.yy343, &yymsp[-3].minor.yy0); } else { - yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy279; // negative value of name length - tSetColumnType(&yylhsminor.yy325, &yymsp[-3].minor.yy0); + yymsp[-3].minor.yy0.type = -yymsp[-1].minor.yy369; // negative value of name length + tSetColumnType(&yylhsminor.yy343, &yymsp[-3].minor.yy0); } } - yymsp[-3].minor.yy325 = yylhsminor.yy325; + yymsp[-3].minor.yy343 = yylhsminor.yy343; break; - case 129: /* typename ::= ids UNSIGNED */ + case 130: /* 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.yy325, &yymsp[-1].minor.yy0); + tSetColumnType (&yylhsminor.yy343, &yymsp[-1].minor.yy0); } - yymsp[-1].minor.yy325 = yylhsminor.yy325; + yymsp[-1].minor.yy343 = yylhsminor.yy343; break; - case 130: /* signed ::= INTEGER */ -{ yylhsminor.yy279 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } - yymsp[0].minor.yy279 = yylhsminor.yy279; + case 131: /* signed ::= INTEGER */ +{ yylhsminor.yy369 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + yymsp[0].minor.yy369 = yylhsminor.yy369; break; - case 131: /* signed ::= PLUS INTEGER */ -{ yymsp[-1].minor.yy279 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + case 132: /* signed ::= PLUS INTEGER */ +{ yymsp[-1].minor.yy369 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } break; - case 132: /* signed ::= MINUS INTEGER */ -{ yymsp[-1].minor.yy279 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);} + case 133: /* signed ::= MINUS INTEGER */ +{ yymsp[-1].minor.yy369 = -strtol(yymsp[0].minor.yy0.z, NULL, 10);} break; - case 136: /* cmd ::= CREATE TABLE create_table_list */ -{ pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy532;} + case 137: /* cmd ::= CREATE TABLE create_table_list */ +{ pInfo->type = TSDB_SQL_CREATE_TABLE; pInfo->pCreateTableInfo = yymsp[0].minor.yy182;} break; - case 137: /* create_table_list ::= create_from_stable */ + case 138: /* create_table_list ::= create_from_stable */ { SCreateTableSql* pCreateTable = calloc(1, sizeof(SCreateTableSql)); pCreateTable->childTableInfo = taosArrayInit(4, sizeof(SCreatedTableInfo)); - taosArrayPush(pCreateTable->childTableInfo, &yymsp[0].minor.yy528); + taosArrayPush(pCreateTable->childTableInfo, &yymsp[0].minor.yy456); pCreateTable->type = TSQL_CREATE_TABLE_FROM_STABLE; - yylhsminor.yy532 = pCreateTable; + yylhsminor.yy182 = pCreateTable; } - yymsp[0].minor.yy532 = yylhsminor.yy532; + yymsp[0].minor.yy182 = yylhsminor.yy182; break; - case 138: /* create_table_list ::= create_table_list create_from_stable */ + case 139: /* create_table_list ::= create_table_list create_from_stable */ { - taosArrayPush(yymsp[-1].minor.yy532->childTableInfo, &yymsp[0].minor.yy528); - yylhsminor.yy532 = yymsp[-1].minor.yy532; + taosArrayPush(yymsp[-1].minor.yy182->childTableInfo, &yymsp[0].minor.yy456); + yylhsminor.yy182 = yymsp[-1].minor.yy182; } - yymsp[-1].minor.yy532 = yylhsminor.yy532; + yymsp[-1].minor.yy182 = yylhsminor.yy182; break; - case 139: /* create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ + case 140: /* create_table_args ::= ifnotexists ids cpxName LP columnlist RP */ { - yylhsminor.yy532 = tSetCreateTableInfo(yymsp[-1].minor.yy93, NULL, NULL, TSQL_CREATE_TABLE); - setSqlInfo(pInfo, yylhsminor.yy532, NULL, TSDB_SQL_CREATE_TABLE); + yylhsminor.yy182 = tSetCreateTableInfo(yymsp[-1].minor.yy441, NULL, NULL, TSQL_CREATE_TABLE); + setSqlInfo(pInfo, yylhsminor.yy182, 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.yy532 = yylhsminor.yy532; + yymsp[-5].minor.yy182 = yylhsminor.yy182; break; - case 140: /* create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ + case 141: /* create_stable_args ::= ifnotexists ids cpxName LP columnlist RP TAGS LP columnlist RP */ { - yylhsminor.yy532 = tSetCreateTableInfo(yymsp[-5].minor.yy93, yymsp[-1].minor.yy93, NULL, TSQL_CREATE_STABLE); - setSqlInfo(pInfo, yylhsminor.yy532, NULL, TSDB_SQL_CREATE_TABLE); + yylhsminor.yy182 = tSetCreateTableInfo(yymsp[-5].minor.yy441, yymsp[-1].minor.yy441, NULL, TSQL_CREATE_STABLE); + setSqlInfo(pInfo, yylhsminor.yy182, 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.yy532 = yylhsminor.yy532; + yymsp[-9].minor.yy182 = yylhsminor.yy182; break; - case 141: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName TAGS LP tagitemlist RP */ + case 142: /* 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.yy528 = createNewChildTableInfo(&yymsp[-5].minor.yy0, NULL, yymsp[-1].minor.yy93, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0); + yylhsminor.yy456 = createNewChildTableInfo(&yymsp[-5].minor.yy0, NULL, yymsp[-1].minor.yy441, &yymsp[-8].minor.yy0, &yymsp[-9].minor.yy0); } - yymsp[-9].minor.yy528 = yylhsminor.yy528; + yymsp[-9].minor.yy456 = yylhsminor.yy456; break; - case 142: /* create_from_stable ::= ifnotexists ids cpxName USING ids cpxName LP tagNamelist RP TAGS LP tagitemlist RP */ + case 143: /* 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.yy528 = createNewChildTableInfo(&yymsp[-8].minor.yy0, yymsp[-5].minor.yy93, yymsp[-1].minor.yy93, &yymsp[-11].minor.yy0, &yymsp[-12].minor.yy0); + yylhsminor.yy456 = createNewChildTableInfo(&yymsp[-8].minor.yy0, yymsp[-5].minor.yy441, yymsp[-1].minor.yy441, &yymsp[-11].minor.yy0, &yymsp[-12].minor.yy0); } - yymsp[-12].minor.yy528 = yylhsminor.yy528; + yymsp[-12].minor.yy456 = yylhsminor.yy456; break; - case 143: /* tagNamelist ::= tagNamelist COMMA ids */ -{taosArrayPush(yymsp[-2].minor.yy93, &yymsp[0].minor.yy0); yylhsminor.yy93 = yymsp[-2].minor.yy93; } - yymsp[-2].minor.yy93 = yylhsminor.yy93; + case 144: /* tagNamelist ::= tagNamelist COMMA ids */ +{taosArrayPush(yymsp[-2].minor.yy441, &yymsp[0].minor.yy0); yylhsminor.yy441 = yymsp[-2].minor.yy441; } + yymsp[-2].minor.yy441 = yylhsminor.yy441; break; - case 144: /* tagNamelist ::= ids */ -{yylhsminor.yy93 = taosArrayInit(4, sizeof(SStrToken)); taosArrayPush(yylhsminor.yy93, &yymsp[0].minor.yy0);} - yymsp[0].minor.yy93 = yylhsminor.yy93; + case 145: /* tagNamelist ::= ids */ +{yylhsminor.yy441 = taosArrayInit(4, sizeof(SStrToken)); taosArrayPush(yylhsminor.yy441, &yymsp[0].minor.yy0);} + yymsp[0].minor.yy441 = yylhsminor.yy441; break; - case 145: /* create_table_args ::= ifnotexists ids cpxName AS select */ + case 146: /* create_table_args ::= ifnotexists ids cpxName AS select */ { - yylhsminor.yy532 = tSetCreateTableInfo(NULL, NULL, yymsp[0].minor.yy224, TSQL_CREATE_STREAM); - setSqlInfo(pInfo, yylhsminor.yy532, NULL, TSDB_SQL_CREATE_TABLE); + yylhsminor.yy182 = tSetCreateTableInfo(NULL, NULL, yymsp[0].minor.yy236, TSQL_CREATE_STREAM); + setSqlInfo(pInfo, yylhsminor.yy182, 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.yy532 = yylhsminor.yy532; + yymsp[-4].minor.yy182 = yylhsminor.yy182; break; - case 146: /* columnlist ::= columnlist COMMA column */ -{taosArrayPush(yymsp[-2].minor.yy93, &yymsp[0].minor.yy325); yylhsminor.yy93 = yymsp[-2].minor.yy93; } - yymsp[-2].minor.yy93 = yylhsminor.yy93; + case 147: /* columnlist ::= columnlist COMMA column */ +{taosArrayPush(yymsp[-2].minor.yy441, &yymsp[0].minor.yy343); yylhsminor.yy441 = yymsp[-2].minor.yy441; } + yymsp[-2].minor.yy441 = yylhsminor.yy441; break; - case 147: /* columnlist ::= column */ -{yylhsminor.yy93 = taosArrayInit(4, sizeof(TAOS_FIELD)); taosArrayPush(yylhsminor.yy93, &yymsp[0].minor.yy325);} - yymsp[0].minor.yy93 = yylhsminor.yy93; + case 148: /* columnlist ::= column */ +{yylhsminor.yy441 = taosArrayInit(4, sizeof(TAOS_FIELD)); taosArrayPush(yylhsminor.yy441, &yymsp[0].minor.yy343);} + yymsp[0].minor.yy441 = yylhsminor.yy441; break; - case 148: /* column ::= ids typename */ + case 149: /* column ::= ids typename */ { - tSetColumnInfo(&yylhsminor.yy325, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy325); + tSetColumnInfo(&yylhsminor.yy343, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy343); } - yymsp[-1].minor.yy325 = yylhsminor.yy325; + yymsp[-1].minor.yy343 = yylhsminor.yy343; break; - case 155: /* tagitem ::= NULL */ -{ yymsp[0].minor.yy0.type = 0; tVariantCreate(&yylhsminor.yy518, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy518 = yylhsminor.yy518; + case 156: /* tagitem ::= NULL */ +{ yymsp[0].minor.yy0.type = 0; tVariantCreate(&yylhsminor.yy506, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy506 = yylhsminor.yy506; break; - case 156: /* tagitem ::= MINUS INTEGER */ - case 157: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==157); - case 158: /* tagitem ::= PLUS INTEGER */ yytestcase(yyruleno==158); - case 159: /* tagitem ::= PLUS FLOAT */ yytestcase(yyruleno==159); + case 157: /* tagitem ::= MINUS INTEGER */ + case 158: /* tagitem ::= MINUS FLOAT */ yytestcase(yyruleno==158); + case 159: /* tagitem ::= PLUS INTEGER */ yytestcase(yyruleno==159); + case 160: /* tagitem ::= PLUS FLOAT */ yytestcase(yyruleno==160); { 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.yy518, &yymsp[-1].minor.yy0); + tVariantCreate(&yylhsminor.yy506, &yymsp[-1].minor.yy0); } - yymsp[-1].minor.yy518 = yylhsminor.yy518; + yymsp[-1].minor.yy506 = yylhsminor.yy506; break; - case 160: /* select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ + case 161: /* select ::= SELECT selcollist from where_opt interval_opt session_option windowstate_option fill_opt sliding_opt groupby_opt orderby_opt having_opt slimit_opt limit_opt */ { - yylhsminor.yy224 = tSetQuerySqlNode(&yymsp[-13].minor.yy0, yymsp[-12].minor.yy93, yymsp[-11].minor.yy330, yymsp[-10].minor.yy68, yymsp[-4].minor.yy93, yymsp[-3].minor.yy93, &yymsp[-9].minor.yy42, &yymsp[-8].minor.yy15, &yymsp[-7].minor.yy274, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy93, &yymsp[0].minor.yy284, &yymsp[-1].minor.yy284, yymsp[-2].minor.yy68); + yylhsminor.yy236 = tSetQuerySqlNode(&yymsp[-13].minor.yy0, yymsp[-12].minor.yy441, yymsp[-11].minor.yy244, yymsp[-10].minor.yy166, yymsp[-4].minor.yy441, yymsp[-3].minor.yy441, &yymsp[-9].minor.yy340, &yymsp[-8].minor.yy259, &yymsp[-7].minor.yy348, &yymsp[-5].minor.yy0, yymsp[-6].minor.yy441, &yymsp[0].minor.yy414, &yymsp[-1].minor.yy414, yymsp[-2].minor.yy166); } - yymsp[-13].minor.yy224 = yylhsminor.yy224; + yymsp[-13].minor.yy236 = yylhsminor.yy236; break; - case 161: /* select ::= LP select RP */ -{yymsp[-2].minor.yy224 = yymsp[-1].minor.yy224;} + case 162: /* select ::= LP select RP */ +{yymsp[-2].minor.yy236 = yymsp[-1].minor.yy236;} break; - case 162: /* union ::= select */ -{ yylhsminor.yy93 = setSubclause(NULL, yymsp[0].minor.yy224); } - yymsp[0].minor.yy93 = yylhsminor.yy93; + case 163: /* union ::= select */ +{ yylhsminor.yy441 = setSubclause(NULL, yymsp[0].minor.yy236); } + yymsp[0].minor.yy441 = yylhsminor.yy441; break; - case 163: /* union ::= union UNION ALL select */ -{ yylhsminor.yy93 = appendSelectClause(yymsp[-3].minor.yy93, yymsp[0].minor.yy224); } - yymsp[-3].minor.yy93 = yylhsminor.yy93; + case 164: /* union ::= union UNION ALL select */ +{ yylhsminor.yy441 = appendSelectClause(yymsp[-3].minor.yy441, yymsp[0].minor.yy236); } + yymsp[-3].minor.yy441 = yylhsminor.yy441; break; - case 164: /* cmd ::= union */ -{ setSqlInfo(pInfo, yymsp[0].minor.yy93, NULL, TSDB_SQL_SELECT); } + case 165: /* cmd ::= union */ +{ setSqlInfo(pInfo, yymsp[0].minor.yy441, NULL, TSDB_SQL_SELECT); } break; - case 165: /* select ::= SELECT selcollist */ + case 166: /* select ::= SELECT selcollist */ { - yylhsminor.yy224 = tSetQuerySqlNode(&yymsp[-1].minor.yy0, yymsp[0].minor.yy93, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + yylhsminor.yy236 = tSetQuerySqlNode(&yymsp[-1].minor.yy0, yymsp[0].minor.yy441, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); } - yymsp[-1].minor.yy224 = yylhsminor.yy224; + yymsp[-1].minor.yy236 = yylhsminor.yy236; break; - case 166: /* sclp ::= selcollist COMMA */ -{yylhsminor.yy93 = yymsp[-1].minor.yy93;} - yymsp[-1].minor.yy93 = yylhsminor.yy93; + case 167: /* sclp ::= selcollist COMMA */ +{yylhsminor.yy441 = yymsp[-1].minor.yy441;} + yymsp[-1].minor.yy441 = yylhsminor.yy441; break; - case 167: /* sclp ::= */ - case 197: /* orderby_opt ::= */ yytestcase(yyruleno==197); -{yymsp[1].minor.yy93 = 0;} + case 168: /* sclp ::= */ + case 198: /* orderby_opt ::= */ yytestcase(yyruleno==198); +{yymsp[1].minor.yy441 = 0;} break; - case 168: /* selcollist ::= sclp distinct expr as */ + case 169: /* selcollist ::= sclp distinct expr as */ { - yylhsminor.yy93 = tSqlExprListAppend(yymsp[-3].minor.yy93, yymsp[-1].minor.yy68, yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0); + yylhsminor.yy441 = tSqlExprListAppend(yymsp[-3].minor.yy441, yymsp[-1].minor.yy166, yymsp[-2].minor.yy0.n? &yymsp[-2].minor.yy0:0, yymsp[0].minor.yy0.n?&yymsp[0].minor.yy0:0); } - yymsp[-3].minor.yy93 = yylhsminor.yy93; + yymsp[-3].minor.yy441 = yylhsminor.yy441; break; - case 169: /* selcollist ::= sclp STAR */ + case 170: /* selcollist ::= sclp STAR */ { tSqlExpr *pNode = tSqlExprCreateIdValue(NULL, TK_ALL); - yylhsminor.yy93 = tSqlExprListAppend(yymsp[-1].minor.yy93, pNode, 0, 0); + yylhsminor.yy441 = tSqlExprListAppend(yymsp[-1].minor.yy441, pNode, 0, 0); } - yymsp[-1].minor.yy93 = yylhsminor.yy93; + yymsp[-1].minor.yy441 = yylhsminor.yy441; break; - case 170: /* as ::= AS ids */ + case 171: /* as ::= AS ids */ { yymsp[-1].minor.yy0 = yymsp[0].minor.yy0; } break; - case 171: /* as ::= ids */ + case 172: /* as ::= ids */ { yylhsminor.yy0 = yymsp[0].minor.yy0; } yymsp[0].minor.yy0 = yylhsminor.yy0; break; - case 172: /* as ::= */ + case 173: /* as ::= */ { yymsp[1].minor.yy0.n = 0; } break; - case 173: /* distinct ::= DISTINCT */ + case 174: /* distinct ::= DISTINCT */ { yylhsminor.yy0 = yymsp[0].minor.yy0; } yymsp[0].minor.yy0 = yylhsminor.yy0; break; - case 175: /* from ::= FROM tablelist */ - case 176: /* from ::= FROM sub */ yytestcase(yyruleno==176); -{yymsp[-1].minor.yy330 = yymsp[0].minor.yy330;} + case 176: /* from ::= FROM tablelist */ + case 177: /* from ::= FROM sub */ yytestcase(yyruleno==177); +{yymsp[-1].minor.yy244 = yymsp[0].minor.yy244;} break; - case 177: /* sub ::= LP union RP */ -{yymsp[-2].minor.yy330 = addSubqueryElem(NULL, yymsp[-1].minor.yy93, NULL);} + case 178: /* sub ::= LP union RP */ +{yymsp[-2].minor.yy244 = addSubqueryElem(NULL, yymsp[-1].minor.yy441, NULL);} break; - case 178: /* sub ::= LP union RP ids */ -{yymsp[-3].minor.yy330 = addSubqueryElem(NULL, yymsp[-2].minor.yy93, &yymsp[0].minor.yy0);} + case 179: /* sub ::= LP union RP ids */ +{yymsp[-3].minor.yy244 = addSubqueryElem(NULL, yymsp[-2].minor.yy441, &yymsp[0].minor.yy0);} break; - case 179: /* sub ::= sub COMMA LP union RP ids */ -{yylhsminor.yy330 = addSubqueryElem(yymsp[-5].minor.yy330, yymsp[-2].minor.yy93, &yymsp[0].minor.yy0);} - yymsp[-5].minor.yy330 = yylhsminor.yy330; + case 180: /* sub ::= sub COMMA LP union RP ids */ +{yylhsminor.yy244 = addSubqueryElem(yymsp[-5].minor.yy244, yymsp[-2].minor.yy441, &yymsp[0].minor.yy0);} + yymsp[-5].minor.yy244 = yylhsminor.yy244; break; - case 180: /* tablelist ::= ids cpxName */ + case 181: /* tablelist ::= ids cpxName */ { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - yylhsminor.yy330 = setTableNameList(NULL, &yymsp[-1].minor.yy0, NULL); + yylhsminor.yy244 = setTableNameList(NULL, &yymsp[-1].minor.yy0, NULL); } - yymsp[-1].minor.yy330 = yylhsminor.yy330; + yymsp[-1].minor.yy244 = yylhsminor.yy244; break; - case 181: /* tablelist ::= ids cpxName ids */ + case 182: /* tablelist ::= ids cpxName ids */ { yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n; - yylhsminor.yy330 = setTableNameList(NULL, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); + yylhsminor.yy244 = setTableNameList(NULL, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy330 = yylhsminor.yy330; + yymsp[-2].minor.yy244 = yylhsminor.yy244; break; - case 182: /* tablelist ::= tablelist COMMA ids cpxName */ + case 183: /* tablelist ::= tablelist COMMA ids cpxName */ { yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - yylhsminor.yy330 = setTableNameList(yymsp[-3].minor.yy330, &yymsp[-1].minor.yy0, NULL); + yylhsminor.yy244 = setTableNameList(yymsp[-3].minor.yy244, &yymsp[-1].minor.yy0, NULL); } - yymsp[-3].minor.yy330 = yylhsminor.yy330; + yymsp[-3].minor.yy244 = yylhsminor.yy244; break; - case 183: /* tablelist ::= tablelist COMMA ids cpxName ids */ + case 184: /* tablelist ::= tablelist COMMA ids cpxName ids */ { yymsp[-2].minor.yy0.n += yymsp[-1].minor.yy0.n; - yylhsminor.yy330 = setTableNameList(yymsp[-4].minor.yy330, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); + yylhsminor.yy244 = setTableNameList(yymsp[-4].minor.yy244, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); } - yymsp[-4].minor.yy330 = yylhsminor.yy330; + yymsp[-4].minor.yy244 = yylhsminor.yy244; break; - case 184: /* tmvar ::= VARIABLE */ + case 185: /* tmvar ::= VARIABLE */ {yylhsminor.yy0 = yymsp[0].minor.yy0;} yymsp[0].minor.yy0 = yylhsminor.yy0; break; - case 185: /* interval_opt ::= INTERVAL LP tmvar RP */ -{yymsp[-3].minor.yy42.interval = yymsp[-1].minor.yy0; yymsp[-3].minor.yy42.offset.n = 0;} + case 186: /* interval_opt ::= INTERVAL LP tmvar RP */ +{yymsp[-3].minor.yy340.interval = yymsp[-1].minor.yy0; yymsp[-3].minor.yy340.offset.n = 0;} break; - case 186: /* interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ -{yymsp[-5].minor.yy42.interval = yymsp[-3].minor.yy0; yymsp[-5].minor.yy42.offset = yymsp[-1].minor.yy0;} + case 187: /* interval_opt ::= INTERVAL LP tmvar COMMA tmvar RP */ +{yymsp[-5].minor.yy340.interval = yymsp[-3].minor.yy0; yymsp[-5].minor.yy340.offset = yymsp[-1].minor.yy0;} break; - case 187: /* interval_opt ::= */ -{memset(&yymsp[1].minor.yy42, 0, sizeof(yymsp[1].minor.yy42));} + case 188: /* interval_opt ::= */ +{memset(&yymsp[1].minor.yy340, 0, sizeof(yymsp[1].minor.yy340));} break; - case 188: /* session_option ::= */ -{yymsp[1].minor.yy15.col.n = 0; yymsp[1].minor.yy15.gap.n = 0;} + case 189: /* session_option ::= */ +{yymsp[1].minor.yy259.col.n = 0; yymsp[1].minor.yy259.gap.n = 0;} break; - case 189: /* session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ + case 190: /* session_option ::= SESSION LP ids cpxName COMMA tmvar RP */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - yymsp[-6].minor.yy15.col = yymsp[-4].minor.yy0; - yymsp[-6].minor.yy15.gap = yymsp[-1].minor.yy0; + yymsp[-6].minor.yy259.col = yymsp[-4].minor.yy0; + yymsp[-6].minor.yy259.gap = yymsp[-1].minor.yy0; } break; - case 190: /* windowstate_option ::= */ -{ yymsp[1].minor.yy274.col.n = 0; yymsp[1].minor.yy274.col.z = NULL;} + case 191: /* windowstate_option ::= */ +{ yymsp[1].minor.yy348.col.n = 0; yymsp[1].minor.yy348.col.z = NULL;} break; - case 191: /* windowstate_option ::= STATE_WINDOW LP ids RP */ -{ yymsp[-3].minor.yy274.col = yymsp[-1].minor.yy0; } + case 192: /* windowstate_option ::= STATE_WINDOW LP ids RP */ +{ yymsp[-3].minor.yy348.col = yymsp[-1].minor.yy0; } break; - case 192: /* fill_opt ::= */ -{ yymsp[1].minor.yy93 = 0; } + case 193: /* fill_opt ::= */ +{ yymsp[1].minor.yy441 = 0; } break; - case 193: /* fill_opt ::= FILL LP ID COMMA tagitemlist RP */ + case 194: /* 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.yy93, &A, -1, 0); - yymsp[-5].minor.yy93 = yymsp[-1].minor.yy93; + tVariantListInsert(yymsp[-1].minor.yy441, &A, -1, 0); + yymsp[-5].minor.yy441 = yymsp[-1].minor.yy441; } break; - case 194: /* fill_opt ::= FILL LP ID RP */ + case 195: /* fill_opt ::= FILL LP ID RP */ { toTSDBType(yymsp[-1].minor.yy0.type); - yymsp[-3].minor.yy93 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); + yymsp[-3].minor.yy441 = tVariantListAppendToken(NULL, &yymsp[-1].minor.yy0, -1); } break; - case 195: /* sliding_opt ::= SLIDING LP tmvar RP */ + case 196: /* sliding_opt ::= SLIDING LP tmvar RP */ {yymsp[-3].minor.yy0 = yymsp[-1].minor.yy0; } break; - case 196: /* sliding_opt ::= */ + case 197: /* sliding_opt ::= */ {yymsp[1].minor.yy0.n = 0; yymsp[1].minor.yy0.z = NULL; yymsp[1].minor.yy0.type = 0; } break; - case 198: /* orderby_opt ::= ORDER BY sortlist */ -{yymsp[-2].minor.yy93 = yymsp[0].minor.yy93;} + case 199: /* orderby_opt ::= ORDER BY sortlist */ +{yymsp[-2].minor.yy441 = yymsp[0].minor.yy441;} break; - case 199: /* sortlist ::= sortlist COMMA item sortorder */ + case 200: /* sortlist ::= sortlist COMMA item sortorder */ { - yylhsminor.yy93 = tVariantListAppend(yymsp[-3].minor.yy93, &yymsp[-1].minor.yy518, yymsp[0].minor.yy150); + yylhsminor.yy441 = tVariantListAppend(yymsp[-3].minor.yy441, &yymsp[-1].minor.yy506, yymsp[0].minor.yy112); } - yymsp[-3].minor.yy93 = yylhsminor.yy93; + yymsp[-3].minor.yy441 = yylhsminor.yy441; break; - case 200: /* sortlist ::= item sortorder */ + case 201: /* sortlist ::= item sortorder */ { - yylhsminor.yy93 = tVariantListAppend(NULL, &yymsp[-1].minor.yy518, yymsp[0].minor.yy150); + yylhsminor.yy441 = tVariantListAppend(NULL, &yymsp[-1].minor.yy506, yymsp[0].minor.yy112); } - yymsp[-1].minor.yy93 = yylhsminor.yy93; + yymsp[-1].minor.yy441 = yylhsminor.yy441; break; - case 201: /* item ::= ids cpxName */ + case 202: /* item ::= ids cpxName */ { toTSDBType(yymsp[-1].minor.yy0.type); yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; - tVariantCreate(&yylhsminor.yy518, &yymsp[-1].minor.yy0); + tVariantCreate(&yylhsminor.yy506, &yymsp[-1].minor.yy0); } - yymsp[-1].minor.yy518 = yylhsminor.yy518; + yymsp[-1].minor.yy506 = yylhsminor.yy506; break; - case 202: /* sortorder ::= ASC */ -{ yymsp[0].minor.yy150 = TSDB_ORDER_ASC; } + case 203: /* sortorder ::= ASC */ +{ yymsp[0].minor.yy112 = TSDB_ORDER_ASC; } break; - case 203: /* sortorder ::= DESC */ -{ yymsp[0].minor.yy150 = TSDB_ORDER_DESC;} + case 204: /* sortorder ::= DESC */ +{ yymsp[0].minor.yy112 = TSDB_ORDER_DESC;} break; - case 204: /* sortorder ::= */ -{ yymsp[1].minor.yy150 = TSDB_ORDER_ASC; } + case 205: /* sortorder ::= */ +{ yymsp[1].minor.yy112 = TSDB_ORDER_ASC; } break; - case 205: /* groupby_opt ::= */ -{ yymsp[1].minor.yy93 = 0;} + case 206: /* groupby_opt ::= */ +{ yymsp[1].minor.yy441 = 0;} break; - case 206: /* groupby_opt ::= GROUP BY grouplist */ -{ yymsp[-2].minor.yy93 = yymsp[0].minor.yy93;} + case 207: /* groupby_opt ::= GROUP BY grouplist */ +{ yymsp[-2].minor.yy441 = yymsp[0].minor.yy441;} break; - case 207: /* grouplist ::= grouplist COMMA item */ + case 208: /* grouplist ::= grouplist COMMA item */ { - yylhsminor.yy93 = tVariantListAppend(yymsp[-2].minor.yy93, &yymsp[0].minor.yy518, -1); + yylhsminor.yy441 = tVariantListAppend(yymsp[-2].minor.yy441, &yymsp[0].minor.yy506, -1); } - yymsp[-2].minor.yy93 = yylhsminor.yy93; + yymsp[-2].minor.yy441 = yylhsminor.yy441; break; - case 208: /* grouplist ::= item */ + case 209: /* grouplist ::= item */ { - yylhsminor.yy93 = tVariantListAppend(NULL, &yymsp[0].minor.yy518, -1); + yylhsminor.yy441 = tVariantListAppend(NULL, &yymsp[0].minor.yy506, -1); } - yymsp[0].minor.yy93 = yylhsminor.yy93; + yymsp[0].minor.yy441 = yylhsminor.yy441; break; - case 209: /* having_opt ::= */ - case 219: /* where_opt ::= */ yytestcase(yyruleno==219); - case 261: /* expritem ::= */ yytestcase(yyruleno==261); -{yymsp[1].minor.yy68 = 0;} + case 210: /* having_opt ::= */ + case 220: /* where_opt ::= */ yytestcase(yyruleno==220); + case 262: /* expritem ::= */ yytestcase(yyruleno==262); +{yymsp[1].minor.yy166 = 0;} break; - case 210: /* having_opt ::= HAVING expr */ - case 220: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==220); -{yymsp[-1].minor.yy68 = yymsp[0].minor.yy68;} + case 211: /* having_opt ::= HAVING expr */ + case 221: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==221); +{yymsp[-1].minor.yy166 = yymsp[0].minor.yy166;} break; - case 211: /* limit_opt ::= */ - case 215: /* slimit_opt ::= */ yytestcase(yyruleno==215); -{yymsp[1].minor.yy284.limit = -1; yymsp[1].minor.yy284.offset = 0;} + case 212: /* limit_opt ::= */ + case 216: /* slimit_opt ::= */ yytestcase(yyruleno==216); +{yymsp[1].minor.yy414.limit = -1; yymsp[1].minor.yy414.offset = 0;} break; - case 212: /* limit_opt ::= LIMIT signed */ - case 216: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==216); -{yymsp[-1].minor.yy284.limit = yymsp[0].minor.yy279; yymsp[-1].minor.yy284.offset = 0;} + case 213: /* limit_opt ::= LIMIT signed */ + case 217: /* slimit_opt ::= SLIMIT signed */ yytestcase(yyruleno==217); +{yymsp[-1].minor.yy414.limit = yymsp[0].minor.yy369; yymsp[-1].minor.yy414.offset = 0;} break; - case 213: /* limit_opt ::= LIMIT signed OFFSET signed */ -{ yymsp[-3].minor.yy284.limit = yymsp[-2].minor.yy279; yymsp[-3].minor.yy284.offset = yymsp[0].minor.yy279;} + case 214: /* limit_opt ::= LIMIT signed OFFSET signed */ +{ yymsp[-3].minor.yy414.limit = yymsp[-2].minor.yy369; yymsp[-3].minor.yy414.offset = yymsp[0].minor.yy369;} break; - case 214: /* limit_opt ::= LIMIT signed COMMA signed */ -{ yymsp[-3].minor.yy284.limit = yymsp[0].minor.yy279; yymsp[-3].minor.yy284.offset = yymsp[-2].minor.yy279;} + case 215: /* limit_opt ::= LIMIT signed COMMA signed */ +{ yymsp[-3].minor.yy414.limit = yymsp[0].minor.yy369; yymsp[-3].minor.yy414.offset = yymsp[-2].minor.yy369;} break; - case 217: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ -{yymsp[-3].minor.yy284.limit = yymsp[-2].minor.yy279; yymsp[-3].minor.yy284.offset = yymsp[0].minor.yy279;} + case 218: /* slimit_opt ::= SLIMIT signed SOFFSET signed */ +{yymsp[-3].minor.yy414.limit = yymsp[-2].minor.yy369; yymsp[-3].minor.yy414.offset = yymsp[0].minor.yy369;} break; - case 218: /* slimit_opt ::= SLIMIT signed COMMA signed */ -{yymsp[-3].minor.yy284.limit = yymsp[0].minor.yy279; yymsp[-3].minor.yy284.offset = yymsp[-2].minor.yy279;} + case 219: /* slimit_opt ::= SLIMIT signed COMMA signed */ +{yymsp[-3].minor.yy414.limit = yymsp[0].minor.yy369; yymsp[-3].minor.yy414.offset = yymsp[-2].minor.yy369;} break; - case 221: /* expr ::= LP expr RP */ -{yylhsminor.yy68 = yymsp[-1].minor.yy68; yylhsminor.yy68->token.z = yymsp[-2].minor.yy0.z; yylhsminor.yy68->token.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);} - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 222: /* expr ::= LP expr RP */ +{yylhsminor.yy166 = yymsp[-1].minor.yy166; yylhsminor.yy166->token.z = yymsp[-2].minor.yy0.z; yylhsminor.yy166->token.n = (yymsp[0].minor.yy0.z - yymsp[-2].minor.yy0.z + 1);} + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; - case 222: /* expr ::= ID */ -{ yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_ID);} - yymsp[0].minor.yy68 = yylhsminor.yy68; + case 223: /* expr ::= ID */ +{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_ID);} + yymsp[0].minor.yy166 = yylhsminor.yy166; break; - case 223: /* expr ::= ID DOT ID */ -{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ID);} - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 224: /* expr ::= ID DOT ID */ +{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ID);} + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; - case 224: /* expr ::= ID DOT STAR */ -{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ALL);} - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 225: /* expr ::= ID DOT STAR */ +{ yymsp[-2].minor.yy0.n += (1+yymsp[0].minor.yy0.n); yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[-2].minor.yy0, TK_ALL);} + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; - case 225: /* expr ::= INTEGER */ -{ yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_INTEGER);} - yymsp[0].minor.yy68 = yylhsminor.yy68; + case 226: /* expr ::= INTEGER */ +{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_INTEGER);} + yymsp[0].minor.yy166 = yylhsminor.yy166; break; - case 226: /* expr ::= MINUS INTEGER */ - case 227: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==227); -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_INTEGER);} - yymsp[-1].minor.yy68 = yylhsminor.yy68; + case 227: /* expr ::= MINUS INTEGER */ + case 228: /* expr ::= PLUS INTEGER */ yytestcase(yyruleno==228); +{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_INTEGER; yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_INTEGER);} + yymsp[-1].minor.yy166 = yylhsminor.yy166; break; - case 228: /* expr ::= FLOAT */ -{ yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_FLOAT);} - yymsp[0].minor.yy68 = yylhsminor.yy68; + case 229: /* expr ::= FLOAT */ +{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_FLOAT);} + yymsp[0].minor.yy166 = yylhsminor.yy166; break; - case 229: /* expr ::= MINUS FLOAT */ - case 230: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==230); -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_FLOAT);} - yymsp[-1].minor.yy68 = yylhsminor.yy68; + case 230: /* expr ::= MINUS FLOAT */ + case 231: /* expr ::= PLUS FLOAT */ yytestcase(yyruleno==231); +{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_FLOAT; yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_FLOAT);} + yymsp[-1].minor.yy166 = yylhsminor.yy166; break; - case 231: /* expr ::= STRING */ -{ yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_STRING);} - yymsp[0].minor.yy68 = yylhsminor.yy68; + case 232: /* expr ::= STRING */ +{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_STRING);} + yymsp[0].minor.yy166 = yylhsminor.yy166; break; - case 232: /* expr ::= NOW */ -{ yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NOW); } - yymsp[0].minor.yy68 = yylhsminor.yy68; + case 233: /* expr ::= NOW */ +{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NOW); } + yymsp[0].minor.yy166 = yylhsminor.yy166; break; - case 233: /* expr ::= VARIABLE */ -{ yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_VARIABLE);} - yymsp[0].minor.yy68 = yylhsminor.yy68; + case 234: /* expr ::= VARIABLE */ +{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_VARIABLE);} + yymsp[0].minor.yy166 = yylhsminor.yy166; break; - case 234: /* expr ::= PLUS VARIABLE */ - case 235: /* expr ::= MINUS VARIABLE */ yytestcase(yyruleno==235); -{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_VARIABLE; yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_VARIABLE);} - yymsp[-1].minor.yy68 = yylhsminor.yy68; + case 235: /* expr ::= PLUS VARIABLE */ + case 236: /* expr ::= MINUS VARIABLE */ yytestcase(yyruleno==236); +{ yymsp[-1].minor.yy0.n += yymsp[0].minor.yy0.n; yymsp[-1].minor.yy0.type = TK_VARIABLE; yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[-1].minor.yy0, TK_VARIABLE);} + yymsp[-1].minor.yy166 = yylhsminor.yy166; break; - case 236: /* expr ::= BOOL */ -{ yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_BOOL);} - yymsp[0].minor.yy68 = yylhsminor.yy68; + case 237: /* expr ::= BOOL */ +{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_BOOL);} + yymsp[0].minor.yy166 = yylhsminor.yy166; break; - case 237: /* expr ::= NULL */ -{ yylhsminor.yy68 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NULL);} - yymsp[0].minor.yy68 = yylhsminor.yy68; + case 238: /* expr ::= NULL */ +{ yylhsminor.yy166 = tSqlExprCreateIdValue(&yymsp[0].minor.yy0, TK_NULL);} + yymsp[0].minor.yy166 = yylhsminor.yy166; break; - case 238: /* expr ::= ID LP exprlist RP */ -{ yylhsminor.yy68 = tSqlExprCreateFunction(yymsp[-1].minor.yy93, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } - yymsp[-3].minor.yy68 = yylhsminor.yy68; + case 239: /* expr ::= ID LP exprlist RP */ +{ yylhsminor.yy166 = tSqlExprCreateFunction(yymsp[-1].minor.yy441, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } + yymsp[-3].minor.yy166 = yylhsminor.yy166; break; - case 239: /* expr ::= ID LP STAR RP */ -{ yylhsminor.yy68 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } - yymsp[-3].minor.yy68 = yylhsminor.yy68; + case 240: /* expr ::= ID LP STAR RP */ +{ yylhsminor.yy166 = tSqlExprCreateFunction(NULL, &yymsp[-3].minor.yy0, &yymsp[0].minor.yy0, yymsp[-3].minor.yy0.type); } + yymsp[-3].minor.yy166 = yylhsminor.yy166; break; - case 240: /* expr ::= expr IS NULL */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, NULL, TK_ISNULL);} - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 241: /* expr ::= expr IS NULL */ +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, NULL, TK_ISNULL);} + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; - case 241: /* expr ::= expr IS NOT NULL */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-3].minor.yy68, NULL, TK_NOTNULL);} - yymsp[-3].minor.yy68 = yylhsminor.yy68; + case 242: /* expr ::= expr IS NOT NULL */ +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-3].minor.yy166, NULL, TK_NOTNULL);} + yymsp[-3].minor.yy166 = yylhsminor.yy166; break; - case 242: /* expr ::= expr LT expr */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_LT);} - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 243: /* expr ::= expr LT expr */ +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_LT);} + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; - case 243: /* expr ::= expr GT expr */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_GT);} - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 244: /* expr ::= expr GT expr */ +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_GT);} + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; - case 244: /* expr ::= expr LE expr */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_LE);} - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 245: /* expr ::= expr LE expr */ +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_LE);} + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; - case 245: /* expr ::= expr GE expr */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_GE);} - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 246: /* expr ::= expr GE expr */ +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_GE);} + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; - case 246: /* expr ::= expr NE expr */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_NE);} - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 247: /* expr ::= expr NE expr */ +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_NE);} + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; - case 247: /* expr ::= expr EQ expr */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_EQ);} - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 248: /* expr ::= expr EQ expr */ +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_EQ);} + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; - case 248: /* expr ::= expr BETWEEN expr AND expr */ -{ tSqlExpr* X2 = tSqlExprClone(yymsp[-4].minor.yy68); yylhsminor.yy68 = tSqlExprCreate(tSqlExprCreate(yymsp[-4].minor.yy68, yymsp[-2].minor.yy68, TK_GE), tSqlExprCreate(X2, yymsp[0].minor.yy68, TK_LE), TK_AND);} - yymsp[-4].minor.yy68 = yylhsminor.yy68; + case 249: /* expr ::= expr BETWEEN expr AND expr */ +{ tSqlExpr* X2 = tSqlExprClone(yymsp[-4].minor.yy166); yylhsminor.yy166 = tSqlExprCreate(tSqlExprCreate(yymsp[-4].minor.yy166, yymsp[-2].minor.yy166, TK_GE), tSqlExprCreate(X2, yymsp[0].minor.yy166, TK_LE), TK_AND);} + yymsp[-4].minor.yy166 = yylhsminor.yy166; break; - case 249: /* expr ::= expr AND expr */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_AND);} - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 250: /* expr ::= expr AND expr */ +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_AND);} + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; - case 250: /* expr ::= expr OR expr */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_OR); } - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 251: /* expr ::= expr OR expr */ +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_OR); } + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; - case 251: /* expr ::= expr PLUS expr */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_PLUS); } - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 252: /* expr ::= expr PLUS expr */ +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_PLUS); } + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; - case 252: /* expr ::= expr MINUS expr */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_MINUS); } - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 253: /* expr ::= expr MINUS expr */ +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_MINUS); } + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; - case 253: /* expr ::= expr STAR expr */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_STAR); } - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 254: /* expr ::= expr STAR expr */ +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_STAR); } + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; - case 254: /* expr ::= expr SLASH expr */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_DIVIDE);} - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 255: /* expr ::= expr SLASH expr */ +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_DIVIDE);} + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; - case 255: /* expr ::= expr REM expr */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_REM); } - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 256: /* expr ::= expr REM expr */ +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_REM); } + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; - case 256: /* expr ::= expr LIKE expr */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-2].minor.yy68, yymsp[0].minor.yy68, TK_LIKE); } - yymsp[-2].minor.yy68 = yylhsminor.yy68; + case 257: /* expr ::= expr LIKE expr */ +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-2].minor.yy166, yymsp[0].minor.yy166, TK_LIKE); } + yymsp[-2].minor.yy166 = yylhsminor.yy166; break; - case 257: /* expr ::= expr IN LP exprlist RP */ -{yylhsminor.yy68 = tSqlExprCreate(yymsp[-4].minor.yy68, (tSqlExpr*)yymsp[-1].minor.yy93, TK_IN); } - yymsp[-4].minor.yy68 = yylhsminor.yy68; + case 258: /* expr ::= expr IN LP exprlist RP */ +{yylhsminor.yy166 = tSqlExprCreate(yymsp[-4].minor.yy166, (tSqlExpr*)yymsp[-1].minor.yy441, TK_IN); } + yymsp[-4].minor.yy166 = yylhsminor.yy166; break; - case 258: /* exprlist ::= exprlist COMMA expritem */ -{yylhsminor.yy93 = tSqlExprListAppend(yymsp[-2].minor.yy93,yymsp[0].minor.yy68,0, 0);} - yymsp[-2].minor.yy93 = yylhsminor.yy93; + case 259: /* exprlist ::= exprlist COMMA expritem */ +{yylhsminor.yy441 = tSqlExprListAppend(yymsp[-2].minor.yy441,yymsp[0].minor.yy166,0, 0);} + yymsp[-2].minor.yy441 = yylhsminor.yy441; break; - case 259: /* exprlist ::= expritem */ -{yylhsminor.yy93 = tSqlExprListAppend(0,yymsp[0].minor.yy68,0, 0);} - yymsp[0].minor.yy93 = yylhsminor.yy93; + case 260: /* exprlist ::= expritem */ +{yylhsminor.yy441 = tSqlExprListAppend(0,yymsp[0].minor.yy166,0, 0);} + yymsp[0].minor.yy441 = yylhsminor.yy441; break; - case 260: /* expritem ::= expr */ -{yylhsminor.yy68 = yymsp[0].minor.yy68;} - yymsp[0].minor.yy68 = yylhsminor.yy68; + case 261: /* expritem ::= expr */ +{yylhsminor.yy166 = yymsp[0].minor.yy166;} + yymsp[0].minor.yy166 = yylhsminor.yy166; break; - case 262: /* cmd ::= RESET QUERY CACHE */ + case 263: /* cmd ::= RESET QUERY CACHE */ { setDCLSqlElems(pInfo, TSDB_SQL_RESET_CACHE, 0);} break; - case 263: /* cmd ::= SYNCDB ids REPLICA */ + case 264: /* cmd ::= SYNCDB ids REPLICA */ { setDCLSqlElems(pInfo, TSDB_SQL_SYNC_DB_REPLICA, 1, &yymsp[-1].minor.yy0);} break; - case 264: /* cmd ::= ALTER TABLE ids cpxName ADD COLUMN columnlist */ + case 265: /* 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.yy93, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, -1); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy441, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 265: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ + case 266: /* cmd ::= ALTER TABLE ids cpxName DROP COLUMN ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -3080,21 +3089,21 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 266: /* cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */ + case 267: /* cmd ::= ALTER TABLE ids cpxName MODIFY COLUMN columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy93, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, -1); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy441, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 267: /* cmd ::= ALTER TABLE ids cpxName ADD TAG columnlist */ + case 268: /* 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.yy93, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, -1); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy441, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 268: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ + case 269: /* cmd ::= ALTER TABLE ids cpxName DROP TAG ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -3105,7 +3114,7 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 269: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ + case 270: /* cmd ::= ALTER TABLE ids cpxName CHANGE TAG ids ids */ { yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n; @@ -3119,33 +3128,33 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 270: /* cmd ::= ALTER TABLE ids cpxName SET TAG ids EQ tagitem */ + case 271: /* 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.yy518, -1); + A = tVariantListAppend(A, &yymsp[0].minor.yy506, -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 271: /* cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */ + case 272: /* cmd ::= ALTER TABLE ids cpxName MODIFY TAG columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy93, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, -1); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy441, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, -1); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 272: /* cmd ::= ALTER STABLE ids cpxName ADD COLUMN columnlist */ + case 273: /* 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.yy93, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, TSDB_SUPER_TABLE); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy441, NULL, TSDB_ALTER_TABLE_ADD_COLUMN, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 273: /* cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ + case 274: /* cmd ::= ALTER STABLE ids cpxName DROP COLUMN ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -3156,21 +3165,21 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 274: /* cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */ + case 275: /* cmd ::= ALTER STABLE ids cpxName MODIFY COLUMN columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy93, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, TSDB_SUPER_TABLE); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy441, NULL, TSDB_ALTER_TABLE_CHANGE_COLUMN, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 275: /* cmd ::= ALTER STABLE ids cpxName ADD TAG columnlist */ + case 276: /* 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.yy93, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, TSDB_SUPER_TABLE); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy441, NULL, TSDB_ALTER_TABLE_ADD_TAG_COLUMN, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 276: /* cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ + case 277: /* cmd ::= ALTER STABLE ids cpxName DROP TAG ids */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; @@ -3181,7 +3190,7 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 277: /* cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ + case 278: /* cmd ::= ALTER STABLE ids cpxName CHANGE TAG ids ids */ { yymsp[-5].minor.yy0.n += yymsp[-4].minor.yy0.n; @@ -3195,32 +3204,32 @@ static void yy_reduce( setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 278: /* cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */ + case 279: /* cmd ::= ALTER STABLE ids cpxName SET TAG ids EQ tagitem */ { yymsp[-6].minor.yy0.n += yymsp[-5].minor.yy0.n; toTSDBType(yymsp[-2].minor.yy0.type); SArray* A = tVariantListAppendToken(NULL, &yymsp[-2].minor.yy0, -1); - A = tVariantListAppend(A, &yymsp[0].minor.yy518, -1); + A = tVariantListAppend(A, &yymsp[0].minor.yy506, -1); SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-6].minor.yy0, NULL, A, TSDB_ALTER_TABLE_UPDATE_TAG_VAL, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 279: /* cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */ + case 280: /* cmd ::= ALTER STABLE ids cpxName MODIFY TAG columnlist */ { yymsp[-4].minor.yy0.n += yymsp[-3].minor.yy0.n; - SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy93, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, TSDB_SUPER_TABLE); + SAlterTableInfo* pAlterTable = tSetAlterTableInfo(&yymsp[-4].minor.yy0, yymsp[0].minor.yy441, NULL, TSDB_ALTER_TABLE_MODIFY_TAG_COLUMN, TSDB_SUPER_TABLE); setSqlInfo(pInfo, pAlterTable, NULL, TSDB_SQL_ALTER_TABLE); } break; - case 280: /* cmd ::= KILL CONNECTION INTEGER */ + case 281: /* cmd ::= KILL CONNECTION INTEGER */ {setKillSql(pInfo, TSDB_SQL_KILL_CONNECTION, &yymsp[0].minor.yy0);} break; - case 281: /* cmd ::= KILL STREAM INTEGER COLON INTEGER */ + case 282: /* 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 282: /* cmd ::= KILL QUERY INTEGER COLON INTEGER */ + case 283: /* cmd ::= KILL QUERY INTEGER COLON INTEGER */ {yymsp[-2].minor.yy0.n += (yymsp[-1].minor.yy0.n + yymsp[0].minor.yy0.n); setKillSql(pInfo, TSDB_SQL_KILL_QUERY, &yymsp[-2].minor.yy0);} break; default: diff --git a/src/tsdb/src/tsdbCompact.c b/src/tsdb/src/tsdbCompact.c index c98e9175b8..5211ee3c61 100644 --- a/src/tsdb/src/tsdbCompact.c +++ b/src/tsdb/src/tsdbCompact.c @@ -118,406 +118,407 @@ static int tsdbCompactMeta(STsdbRepo *pRepo) { return 0; } -static int tsdbCompactTSData(STsdbRepo *pRepo) { - SCompactH compactH; - SDFileSet *pSet = NULL; + static int tsdbCompactTSData(STsdbRepo *pRepo) { + SCompactH compactH; + SDFileSet *pSet = NULL; - tsdbDebug("vgId:%d start to compact TS data", REPO_ID(pRepo)); + tsdbDebug("vgId:%d start to compact TS data", REPO_ID(pRepo)); - // If no file, just return 0; - if (taosArrayGetSize(REPO_FS(pRepo)->cstatus->df) <= 0) { - tsdbDebug("vgId:%d no TS data file to compact, compact over", REPO_ID(pRepo)); + // If no file, just return 0; + if (taosArrayGetSize(REPO_FS(pRepo)->cstatus->df) <= 0) { + tsdbDebug("vgId:%d no TS data file to compact, compact over", REPO_ID(pRepo)); + return 0; + } + + if (tsdbInitCompactH(&compactH, pRepo) < 0) { + return -1; + } + + while ((pSet = tsdbFSIterNext(&(compactH.fsIter)))) { + // Remove those expired files + if (pSet->fid < compactH.rtn.minFid) { + tsdbInfo("vgId:%d FSET %d on level %d disk id %d expires, remove it", REPO_ID(pRepo), pSet->fid, + TSDB_FSET_LEVEL(pSet), TSDB_FSET_ID(pSet)); + continue; + } + + if (TSDB_FSET_LEVEL(pSet) == TFS_MAX_LEVEL) { + tsdbDebug("vgId:%d FSET %d on level %d, should not compact", REPO_ID(pRepo), pSet->fid, TFS_MAX_LEVEL); + tsdbUpdateDFileSet(REPO_FS(pRepo), pSet); + continue; + } + + if (tsdbCompactFSet(&compactH, pSet) < 0) { + tsdbDestroyCompactH(&compactH); + tsdbError("vgId:%d failed to compact FSET %d since %s", REPO_ID(pRepo), pSet->fid, tstrerror(terrno)); + return -1; + } + } + + tsdbDestroyCompactH(&compactH); + tsdbDebug("vgId:%d compact TS data over", REPO_ID(pRepo)); return 0; } - if (tsdbInitCompactH(&compactH, pRepo) < 0) { - return -1; - } + static int tsdbCompactFSet(SCompactH *pComph, SDFileSet *pSet) { + STsdbRepo *pRepo = TSDB_COMPACT_REPO(pComph); + SDiskID did; - while ((pSet = tsdbFSIterNext(&(compactH.fsIter)))) { - // Remove those expired files - if (pSet->fid < compactH.rtn.minFid) { - tsdbInfo("vgId:%d FSET %d on level %d disk id %d expires, remove it", REPO_ID(pRepo), pSet->fid, - TSDB_FSET_LEVEL(pSet), TSDB_FSET_ID(pSet)); - continue; - } + tsdbDebug("vgId:%d start to compact FSET %d on level %d id %d", REPO_ID(pRepo), pSet->fid, TSDB_FSET_LEVEL(pSet), + TSDB_FSET_ID(pSet)); - if (TSDB_FSET_LEVEL(pSet) == TFS_MAX_LEVEL) { - tsdbDebug("vgId:%d FSET %d on level %d, should not compact", REPO_ID(pRepo), pSet->fid, TFS_MAX_LEVEL); - tsdbUpdateDFileSet(REPO_FS(pRepo), pSet); - continue; - } - - if (tsdbCompactFSet(&compactH, pSet) < 0) { - tsdbDestroyCompactH(&compactH); - tsdbError("vgId:%d failed to compact FSET %d since %s", REPO_ID(pRepo), pSet->fid, tstrerror(terrno)); - return -1; - } - } - - tsdbDestroyCompactH(&compactH); - tsdbDebug("vgId:%d compact TS data over", REPO_ID(pRepo)); - return 0; -} - -static int tsdbCompactFSet(SCompactH *pComph, SDFileSet *pSet) { - STsdbRepo *pRepo = TSDB_COMPACT_REPO(pComph); - SDiskID did; - - tsdbDebug("vgId:%d start to compact FSET %d on level %d id %d", REPO_ID(pRepo), pSet->fid, TSDB_FSET_LEVEL(pSet), - TSDB_FSET_ID(pSet)); - - if (tsdbCompactFSetInit(pComph, pSet) < 0) { - return -1; - } - - if (!tsdbShouldCompact(pComph)) { - tsdbDebug("vgId:%d no need to compact FSET %d", REPO_ID(pRepo), pSet->fid); - if (tsdbApplyRtnOnFSet(TSDB_COMPACT_REPO(pComph), pSet, &(pComph->rtn)) < 0) { - tsdbCompactFSetEnd(pComph); - return -1; - } - } else { - // Create new fset as compacted fset - tfsAllocDisk(tsdbGetFidLevel(pSet->fid, &(pComph->rtn)), &(did.level), &(did.id)); - if (did.level == TFS_UNDECIDED_LEVEL) { - terrno = TSDB_CODE_TDB_NO_AVAIL_DISK; - tsdbError("vgId:%d failed to compact FSET %d since %s", REPO_ID(pRepo), pSet->fid, tstrerror(terrno)); - tsdbCompactFSetEnd(pComph); + if (tsdbCompactFSetInit(pComph, pSet) < 0) { return -1; } - tsdbInitDFileSet(TSDB_COMPACT_WSET(pComph), did, REPO_ID(pRepo), TSDB_FSET_FID(pSet), - FS_TXN_VERSION(REPO_FS(pRepo))); - if (tsdbCreateDFileSet(TSDB_COMPACT_WSET(pComph), true) < 0) { - tsdbError("vgId:%d failed to compact FSET %d since %s", REPO_ID(pRepo), pSet->fid, tstrerror(terrno)); - tsdbCompactFSetEnd(pComph); - return -1; - } + if (!tsdbShouldCompact(pComph)) { + tsdbDebug("vgId:%d no need to compact FSET %d", REPO_ID(pRepo), pSet->fid); + if (tsdbApplyRtnOnFSet(TSDB_COMPACT_REPO(pComph), pSet, &(pComph->rtn)) < 0) { + tsdbCompactFSetEnd(pComph); + return -1; + } + } else { + // Create new fset as compacted fset + tfsAllocDisk(tsdbGetFidLevel(pSet->fid, &(pComph->rtn)), &(did.level), &(did.id)); + if (did.level == TFS_UNDECIDED_LEVEL) { + terrno = TSDB_CODE_TDB_NO_AVAIL_DISK; + tsdbError("vgId:%d failed to compact FSET %d since %s", REPO_ID(pRepo), pSet->fid, tstrerror(terrno)); + tsdbCompactFSetEnd(pComph); + return -1; + } + + tsdbInitDFileSet(TSDB_COMPACT_WSET(pComph), did, REPO_ID(pRepo), TSDB_FSET_FID(pSet), + FS_TXN_VERSION(REPO_FS(pRepo))); + if (tsdbCreateDFileSet(TSDB_COMPACT_WSET(pComph), true) < 0) { + tsdbError("vgId:%d failed to compact FSET %d since %s", REPO_ID(pRepo), pSet->fid, tstrerror(terrno)); + tsdbCompactFSetEnd(pComph); + return -1; + } + + if (tsdbCompactFSetImpl(pComph) < 0) { + tsdbCloseDFileSet(TSDB_COMPACT_WSET(pComph)); + tsdbRemoveDFileSet(TSDB_COMPACT_WSET(pComph)); + tsdbCompactFSetEnd(pComph); + return -1; + } - if (tsdbCompactFSetImpl(pComph) < 0) { tsdbCloseDFileSet(TSDB_COMPACT_WSET(pComph)); - tsdbRemoveDFileSet(TSDB_COMPACT_WSET(pComph)); - tsdbCompactFSetEnd(pComph); + tsdbUpdateDFileSet(REPO_FS(pRepo), TSDB_COMPACT_WSET(pComph)); + tsdbDebug("vgId:%d FSET %d compact over", REPO_ID(pRepo), pSet->fid); + } + + tsdbCompactFSetEnd(pComph); + return 0; + } + + static bool tsdbShouldCompact(SCompactH *pComph) { + STsdbRepo * pRepo = TSDB_COMPACT_REPO(pComph); + STsdbCfg * pCfg = REPO_CFG(pRepo); + SReadH * pReadh = &(pComph->readh); + STableCompactH *pTh; + SBlock * pBlock; + int defaultRows = TSDB_DEFAULT_BLOCK_ROWS(pCfg->maxRowsPerFileBlock); + SDFile * pDataF = TSDB_READ_DATA_FILE(pReadh); + SDFile * pLastF = TSDB_READ_LAST_FILE(pReadh); + + int tblocks = 0; // total blocks + int nSubBlocks = 0; // # of blocks with sub-blocks + int nSmallBlocks = 0; // # of blocks with rows < defaultRows + int64_t tsize = 0; + + for (size_t i = 0; i < taosArrayGetSize(pComph->tbArray); i++) { + pTh = (STableCompactH *)taosArrayGet(pComph->tbArray, i); + + if (pTh->pTable == NULL || pTh->pBlkIdx == NULL) continue; + + for (size_t bidx = 0; bidx < pTh->pBlkIdx->numOfBlocks; bidx++) { + tblocks++; + pBlock = pTh->pInfo->blocks + bidx; + + if (pBlock->numOfRows < defaultRows) { + nSmallBlocks++; + } + + if (pBlock->numOfSubBlocks > 1) { + nSubBlocks++; + for (int k = 0; k < pBlock->numOfSubBlocks; k++) { + SBlock *iBlock = ((SBlock *)POINTER_SHIFT(pTh->pInfo, pBlock->offset)) + k; + tsize = tsize + iBlock->len; + } + } else if (pBlock->numOfSubBlocks == 1) { + tsize += pBlock->len; + } else { + ASSERT(0); + } + } + } + + return (((nSubBlocks * 1.0 / tblocks) > 0.33) || ((nSmallBlocks * 1.0 / tblocks) > 0.33) || + (tsize * 1.0 / (pDataF->info.size + pLastF->info.size - 2 * TSDB_FILE_HEAD_SIZE) < 0.85)); + } + + static int tsdbInitCompactH(SCompactH *pComph, STsdbRepo *pRepo) { + STsdbCfg *pCfg = REPO_CFG(pRepo); + + memset(pComph, 0, sizeof(*pComph)); + + TSDB_FSET_SET_CLOSED(TSDB_COMPACT_WSET(pComph)); + + tsdbGetRtnSnap(pRepo, &(pComph->rtn)); + tsdbFSIterInit(&(pComph->fsIter), REPO_FS(pRepo), TSDB_FS_ITER_FORWARD); + + if (tsdbInitReadH(&(pComph->readh), pRepo) < 0) { return -1; } + if (tsdbInitCompTbArray(pComph) < 0) { + tsdbDestroyCompactH(pComph); + return -1; + } + + pComph->aBlkIdx = taosArrayInit(1024, sizeof(SBlockIdx)); + if (pComph->aBlkIdx == NULL) { + terrno = TSDB_CODE_TDB_OUT_OF_MEMORY; + tsdbDestroyCompactH(pComph); + return -1; + } + + pComph->aSupBlk = taosArrayInit(1024, sizeof(SBlock)); + if (pComph->aSupBlk == NULL) { + terrno = TSDB_CODE_TDB_OUT_OF_MEMORY; + tsdbDestroyCompactH(pComph); + return -1; + } + + pComph->pDataCols = tdNewDataCols(0, 0, pCfg->maxRowsPerFileBlock); + if (pComph->pDataCols == NULL) { + terrno = TSDB_CODE_TDB_OUT_OF_MEMORY; + tsdbDestroyCompactH(pComph); + return -1; + } + + return 0; + } + + static void tsdbDestroyCompactH(SCompactH *pComph) { + pComph->pDataCols = tdFreeDataCols(pComph->pDataCols); + pComph->aSupBlk = taosArrayDestroy(pComph->aSupBlk); + pComph->aBlkIdx = taosArrayDestroy(pComph->aBlkIdx); + tsdbDestroyCompTbArray(pComph); + tsdbDestroyReadH(&(pComph->readh)); tsdbCloseDFileSet(TSDB_COMPACT_WSET(pComph)); - tsdbUpdateDFileSet(REPO_FS(pRepo), TSDB_COMPACT_WSET(pComph)); - tsdbDebug("vgId:%d FSET %d compact over", REPO_ID(pRepo), pSet->fid); } - tsdbCompactFSetEnd(pComph); - return 0; -} + static int tsdbInitCompTbArray(SCompactH *pComph) { // Init pComp->tbArray + STsdbRepo *pRepo = TSDB_COMPACT_REPO(pComph); + STsdbMeta *pMeta = pRepo->tsdbMeta; -static bool tsdbShouldCompact(SCompactH *pComph) { - STsdbRepo * pRepo = TSDB_COMPACT_REPO(pComph); - STsdbCfg * pCfg = REPO_CFG(pRepo); - SReadH * pReadh = &(pComph->readh); - STableCompactH *pTh; - SBlock * pBlock; - int defaultRows = TSDB_DEFAULT_BLOCK_ROWS(pCfg->maxRowsPerFileBlock); - SDFile * pDataF = TSDB_READ_DATA_FILE(pReadh); - SDFile * pLastF = TSDB_READ_LAST_FILE(pReadh); + if (tsdbRLockRepoMeta(pRepo) < 0) return -1; - int tblocks = 0; // total blocks - int nSubBlocks = 0; // # of blocks with sub-blocks - int nSmallBlocks = 0; // # of blocks with rows < defaultRows - int64_t tsize = 0; - - for (size_t i = 0; i < taosArrayGetSize(pComph->tbArray); i++) { - pTh = (STableCompactH *)taosArrayGet(pComph->tbArray, i); - - if (pTh->pTable == NULL || pTh->pBlkIdx == NULL) continue; - - for (size_t bidx = 0; bidx < pTh->pBlkIdx->numOfBlocks; bidx++) { - tblocks++; - pBlock = pTh->pInfo->blocks + bidx; - - if (pBlock->numOfRows < defaultRows) { - nSmallBlocks++; - } - - if (pBlock->numOfSubBlocks > 1) { - nSubBlocks++; - for (int k = 0; k < pBlock->numOfSubBlocks; k++) { - SBlock *iBlock = ((SBlock *)POINTER_SHIFT(pTh->pInfo, pBlock->offset)) + k; - tsize = tsize + iBlock->len; - } - } else if (pBlock->numOfSubBlocks == 1) { - tsize += pBlock->len; - } else { - ASSERT(0); - } - } - } - - return (((nSubBlocks * 1.0 / tblocks) > 0.33) || ((nSmallBlocks * 1.0 / tblocks) > 0.33) || - (tsize * 1.0 / (pDataF->info.size + pLastF->info.size - 2 * TSDB_FILE_HEAD_SIZE) < 0.85)); -} - -static int tsdbInitCompactH(SCompactH *pComph, STsdbRepo *pRepo) { - STsdbCfg *pCfg = REPO_CFG(pRepo); - - memset(pComph, 0, sizeof(*pComph)); - - TSDB_FSET_SET_CLOSED(TSDB_COMPACT_WSET(pComph)); - - tsdbGetRtnSnap(pRepo, &(pComph->rtn)); - tsdbFSIterInit(&(pComph->fsIter), REPO_FS(pRepo), TSDB_FS_ITER_FORWARD); - - if (tsdbInitReadH(&(pComph->readh), pRepo) < 0) { - return -1; - } - - if (tsdbInitCompTbArray(pComph) < 0) { - tsdbDestroyCompactH(pComph); - return -1; - } - - pComph->aBlkIdx = taosArrayInit(1024, sizeof(SBlockIdx)); - if (pComph->aBlkIdx == NULL) { - terrno = TSDB_CODE_TDB_OUT_OF_MEMORY; - tsdbDestroyCompactH(pComph); - return -1; - } - - pComph->aSupBlk = taosArrayInit(1024, sizeof(SBlock)); - if (pComph->aSupBlk == NULL) { - terrno = TSDB_CODE_TDB_OUT_OF_MEMORY; - tsdbDestroyCompactH(pComph); - return -1; - } - - pComph->pDataCols = tdNewDataCols(0, 0, pCfg->maxRowsPerFileBlock); - if (pComph->pDataCols == NULL) { - terrno = TSDB_CODE_TDB_OUT_OF_MEMORY; - tsdbDestroyCompactH(pComph); - return -1; - } - - return 0; -} - -static void tsdbDestroyCompactH(SCompactH *pComph) { - pComph->pDataCols = tdFreeDataCols(pComph->pDataCols); - pComph->aSupBlk = taosArrayDestroy(pComph->aSupBlk); - pComph->aBlkIdx = taosArrayDestroy(pComph->aBlkIdx); - tsdbDestroyCompTbArray(pComph); - tsdbDestroyReadH(&(pComph->readh)); - tsdbCloseDFileSet(TSDB_COMPACT_WSET(pComph)); -} - -static int tsdbInitCompTbArray(SCompactH *pComph) { // Init pComp->tbArray - STsdbRepo *pRepo = TSDB_COMPACT_REPO(pComph); - STsdbMeta *pMeta = pRepo->tsdbMeta; - - if (tsdbRLockRepoMeta(pRepo) < 0) return -1; - - pComph->tbArray = taosArrayInit(pMeta->maxTables, sizeof(STableCompactH)); - if (pComph->tbArray == NULL) { - terrno = TSDB_CODE_TDB_OUT_OF_MEMORY; - tsdbUnlockRepoMeta(pRepo); - return -1; - } - - // Note here must start from 0 - for (int i = 0; i < pMeta->maxTables; i++) { - STableCompactH ch = {0}; - if (pMeta->tables[i] != NULL) { - tsdbRefTable(pMeta->tables[i]); - ch.pTable = pMeta->tables[i]; - } - - if (taosArrayPush(pComph->tbArray, &ch) == NULL) { + pComph->tbArray = taosArrayInit(pMeta->maxTables, sizeof(STableCompactH)); + if (pComph->tbArray == NULL) { terrno = TSDB_CODE_TDB_OUT_OF_MEMORY; tsdbUnlockRepoMeta(pRepo); return -1; } - } - if (tsdbUnlockRepoMeta(pRepo) < 0) return -1; - return 0; -} + // Note here must start from 0 + for (int i = 0; i < pMeta->maxTables; i++) { + STableCompactH ch = {0}; + if (pMeta->tables[i] != NULL) { + tsdbRefTable(pMeta->tables[i]); + ch.pTable = pMeta->tables[i]; + } -static void tsdbDestroyCompTbArray(SCompactH *pComph) { - STableCompactH *pTh; - - if (pComph->tbArray == NULL) return; - - for (size_t i = 0; i < taosArrayGetSize(pComph->tbArray); i++) { - pTh = (STableCompactH *)taosArrayGet(pComph->tbArray, i); - if (pTh->pTable) { - tsdbUnRefTable(pTh->pTable); + if (taosArrayPush(pComph->tbArray, &ch) == NULL) { + terrno = TSDB_CODE_TDB_OUT_OF_MEMORY; + tsdbUnlockRepoMeta(pRepo); + return -1; + } } - pTh->pInfo = taosTZfree(pTh->pInfo); + if (tsdbUnlockRepoMeta(pRepo) < 0) return -1; + return 0; } - pComph->tbArray = taosArrayDestroy(pComph->tbArray); -} + static void tsdbDestroyCompTbArray(SCompactH *pComph) { + STableCompactH *pTh; -static int tsdbCacheFSetIndex(SCompactH *pComph) { - SReadH *pReadH = &(pComph->readh); + if (pComph->tbArray == NULL) return; - if (tsdbLoadBlockIdx(pReadH) < 0) { - return -1; + for (size_t i = 0; i < taosArrayGetSize(pComph->tbArray); i++) { + pTh = (STableCompactH *)taosArrayGet(pComph->tbArray, i); + if (pTh->pTable) { + tsdbUnRefTable(pTh->pTable); + } + + pTh->pInfo = taosTZfree(pTh->pInfo); + } + + pComph->tbArray = taosArrayDestroy(pComph->tbArray); } - for (int tid = 1; tid < taosArrayGetSize(pComph->tbArray); tid++) { - STableCompactH *pTh = (STableCompactH *)taosArrayGet(pComph->tbArray, tid); - pTh->pBlkIdx = NULL; + static int tsdbCacheFSetIndex(SCompactH *pComph) { + SReadH *pReadH = &(pComph->readh); - if (pTh->pTable == NULL) continue; - if (tsdbSetReadTable(pReadH, pTh->pTable) < 0) { + if (tsdbLoadBlockIdx(pReadH) < 0) { return -1; } - if (pReadH->pBlkIdx == NULL) continue; - pTh->bindex = *(pReadH->pBlkIdx); - pTh->pBlkIdx = &(pTh->bindex); + for (int tid = 1; tid < taosArrayGetSize(pComph->tbArray); tid++) { + STableCompactH *pTh = (STableCompactH *)taosArrayGet(pComph->tbArray, tid); + pTh->pBlkIdx = NULL; - if (tsdbMakeRoom((void **)(&(pTh->pInfo)), pTh->pBlkIdx->len) < 0) { - return -1; - } - - if (tsdbLoadBlockInfo(pReadH, (void *)(pTh->pInfo)) < 0) { - return -1; - } - } - - return 0; -} - -static int tsdbCompactFSetInit(SCompactH *pComph, SDFileSet *pSet) { - taosArrayClear(pComph->aBlkIdx); - taosArrayClear(pComph->aSupBlk); - - if (tsdbSetAndOpenReadFSet(&(pComph->readh), pSet) < 0) { - return -1; - } - - if (tsdbCacheFSetIndex(pComph) < 0) { - tsdbCloseAndUnsetFSet(&(pComph->readh)); - return -1; - } - - return 0; -} - -static void tsdbCompactFSetEnd(SCompactH *pComph) { tsdbCloseAndUnsetFSet(&(pComph->readh)); } - -static int tsdbCompactFSetImpl(SCompactH *pComph) { - STsdbRepo *pRepo = TSDB_COMPACT_REPO(pComph); - STsdbCfg * pCfg = REPO_CFG(pRepo); - SReadH * pReadh = &(pComph->readh); - SBlockIdx blkIdx; - void ** ppBuf = &(TSDB_COMPACT_BUF(pComph)); - void ** ppCBuf = &(TSDB_COMPACT_COMP_BUF(pComph)); - int defaultRows = TSDB_DEFAULT_BLOCK_ROWS(pCfg->maxRowsPerFileBlock); - - taosArrayClear(pComph->aBlkIdx); - - for (int tid = 1; tid < taosArrayGetSize(pComph->tbArray); tid++) { - STableCompactH *pTh = (STableCompactH *)taosArrayGet(pComph->tbArray, tid); - STSchema * pSchema; - - if (pTh->pTable == NULL || pTh->pBlkIdx == NULL) continue; - - pSchema = tsdbGetTableSchemaImpl(pTh->pTable, true, true, -1); - taosArrayClear(pComph->aSupBlk); - if ((tdInitDataCols(pComph->pDataCols, pSchema) < 0) || (tdInitDataCols(pReadh->pDCols[0], pSchema) < 0) || - (tdInitDataCols(pReadh->pDCols[1], pSchema) < 0)) { - terrno = TSDB_CODE_TDB_OUT_OF_MEMORY; - return -1; - } - tdFreeSchema(pSchema); - - // Loop to compact each block data - for (int i = 0; i < pTh->pBlkIdx->numOfBlocks; i++) { - SBlock *pBlock = pTh->pInfo->blocks + i; - - // Load the block data - if (tsdbLoadBlockData(pReadh, pBlock, pTh->pInfo) < 0) { + if (pTh->pTable == NULL) continue; + if (tsdbSetReadTable(pReadH, pTh->pTable) < 0) { return -1; } - // Merge pComph->pDataCols and pReadh->pDCols[0] and write data to file - if (pComph->pDataCols->numOfRows == 0 && pBlock->numOfRows >= defaultRows) { - if (tsdbWriteBlockToRightFile(pComph, pTh->pTable, pReadh->pDCols[0], ppBuf, ppCBuf) < 0) { - return -1; - } - } else { - int ridx = 0; + if (pReadH->pBlkIdx == NULL) continue; + pTh->bindex = *(pReadH->pBlkIdx); + pTh->pBlkIdx = &(pTh->bindex); - while (true) { - if (pReadh->pDCols[0]->numOfRows - ridx == 0) break; - int rowsToMerge = MIN(pReadh->pDCols[0]->numOfRows - ridx, defaultRows - pComph->pDataCols->numOfRows); + if (tsdbMakeRoom((void **)(&(pTh->pInfo)), pTh->pBlkIdx->len) < 0) { + return -1; + } - tdMergeDataCols(pComph->pDataCols, pReadh->pDCols[0], rowsToMerge, &ridx); - - if (pComph->pDataCols->numOfRows < defaultRows) { - break; - } - - if (tsdbWriteBlockToRightFile(pComph, pTh->pTable, pComph->pDataCols, ppBuf, ppCBuf) < 0) { - return -1; - } - tdResetDataCols(pComph->pDataCols); - } + if (tsdbLoadBlockInfo(pReadH, (void *)(pTh->pInfo)) < 0) { + return -1; } } - if (pComph->pDataCols->numOfRows > 0 && - tsdbWriteBlockToRightFile(pComph, pTh->pTable, pComph->pDataCols, ppBuf, ppCBuf) < 0) { + return 0; + } + + static int tsdbCompactFSetInit(SCompactH *pComph, SDFileSet *pSet) { + taosArrayClear(pComph->aBlkIdx); + taosArrayClear(pComph->aSupBlk); + + if (tsdbSetAndOpenReadFSet(&(pComph->readh), pSet) < 0) { return -1; } - if (tsdbWriteBlockInfoImpl(TSDB_COMPACT_HEAD_FILE(pComph), pTh->pTable, pComph->aSupBlk, NULL, ppBuf, &blkIdx) < - 0) { + if (tsdbCacheFSetIndex(pComph) < 0) { + tsdbCloseAndUnsetFSet(&(pComph->readh)); return -1; } - if ((blkIdx.numOfBlocks > 0) && (taosArrayPush(pComph->aBlkIdx, (void *)(&blkIdx)) == NULL)) { + return 0; + } + + static void tsdbCompactFSetEnd(SCompactH *pComph) { tsdbCloseAndUnsetFSet(&(pComph->readh)); } + + static int tsdbCompactFSetImpl(SCompactH *pComph) { + STsdbRepo *pRepo = TSDB_COMPACT_REPO(pComph); + STsdbCfg * pCfg = REPO_CFG(pRepo); + SReadH * pReadh = &(pComph->readh); + SBlockIdx blkIdx; + void ** ppBuf = &(TSDB_COMPACT_BUF(pComph)); + void ** ppCBuf = &(TSDB_COMPACT_COMP_BUF(pComph)); + int defaultRows = TSDB_DEFAULT_BLOCK_ROWS(pCfg->maxRowsPerFileBlock); + + taosArrayClear(pComph->aBlkIdx); + + for (int tid = 1; tid < taosArrayGetSize(pComph->tbArray); tid++) { + STableCompactH *pTh = (STableCompactH *)taosArrayGet(pComph->tbArray, tid); + STSchema * pSchema; + + if (pTh->pTable == NULL || pTh->pBlkIdx == NULL) continue; + + pSchema = tsdbGetTableSchemaImpl(pTh->pTable, true, true, -1); + taosArrayClear(pComph->aSupBlk); + if ((tdInitDataCols(pComph->pDataCols, pSchema) < 0) || (tdInitDataCols(pReadh->pDCols[0], pSchema) < 0) || + (tdInitDataCols(pReadh->pDCols[1], pSchema) < 0)) { + terrno = TSDB_CODE_TDB_OUT_OF_MEMORY; + return -1; + } + tdFreeSchema(pSchema); + + // Loop to compact each block data + for (int i = 0; i < pTh->pBlkIdx->numOfBlocks; i++) { + SBlock *pBlock = pTh->pInfo->blocks + i; + + // Load the block data + if (tsdbLoadBlockData(pReadh, pBlock, pTh->pInfo) < 0) { + return -1; + } + + // Merge pComph->pDataCols and pReadh->pDCols[0] and write data to file + if (pComph->pDataCols->numOfRows == 0 && pBlock->numOfRows >= defaultRows) { + if (tsdbWriteBlockToRightFile(pComph, pTh->pTable, pReadh->pDCols[0], ppBuf, ppCBuf) < 0) { + return -1; + } + } else { + int ridx = 0; + + while (true) { + if (pReadh->pDCols[0]->numOfRows - ridx == 0) break; + int rowsToMerge = MIN(pReadh->pDCols[0]->numOfRows - ridx, defaultRows - pComph->pDataCols->numOfRows); + + tdMergeDataCols(pComph->pDataCols, pReadh->pDCols[0], rowsToMerge, &ridx); + + if (pComph->pDataCols->numOfRows < defaultRows) { + break; + } + + if (tsdbWriteBlockToRightFile(pComph, pTh->pTable, pComph->pDataCols, ppBuf, ppCBuf) < 0) { + return -1; + } + tdResetDataCols(pComph->pDataCols); + } + } + } + + if (pComph->pDataCols->numOfRows > 0 && + tsdbWriteBlockToRightFile(pComph, pTh->pTable, pComph->pDataCols, ppBuf, ppCBuf) < 0) { + return -1; + } + + if (tsdbWriteBlockInfoImpl(TSDB_COMPACT_HEAD_FILE(pComph), pTh->pTable, pComph->aSupBlk, NULL, ppBuf, &blkIdx) < + 0) { + return -1; + } + + if ((blkIdx.numOfBlocks > 0) && (taosArrayPush(pComph->aBlkIdx, (void *)(&blkIdx)) == NULL)) { + terrno = TSDB_CODE_TDB_OUT_OF_MEMORY; + return -1; + } + } + + if (tsdbWriteBlockIdx(TSDB_COMPACT_HEAD_FILE(pComph), pComph->aBlkIdx, ppBuf) < 0) { + return -1; + } + + return 0; + } + + static int tsdbWriteBlockToRightFile(SCompactH *pComph, STable *pTable, SDataCols *pDataCols, void **ppBuf, + void **ppCBuf) { + STsdbRepo *pRepo = TSDB_COMPACT_REPO(pComph); + STsdbCfg * pCfg = REPO_CFG(pRepo); + SDFile * pDFile; + bool isLast; + SBlock block; + + ASSERT(pDataCols->numOfRows > 0); + + if (pDataCols->numOfRows < pCfg->minRowsPerFileBlock) { + pDFile = TSDB_COMPACT_LAST_FILE(pComph); + isLast = true; + } else { + pDFile = TSDB_COMPACT_DATA_FILE(pComph); + isLast = false; + } + + if (tsdbWriteBlockImpl(pRepo, pTable, pDFile, pDataCols, &block, isLast, true, ppBuf, ppCBuf) < 0) { + return -1; + } + + if (taosArrayPush(pComph->aSupBlk, (void *)(&block)) == NULL) { terrno = TSDB_CODE_TDB_OUT_OF_MEMORY; return -1; } - } - if (tsdbWriteBlockIdx(TSDB_COMPACT_HEAD_FILE(pComph), pComph->aBlkIdx, ppBuf) < 0) { - return -1; - } - - return 0; + return 0; } -static int tsdbWriteBlockToRightFile(SCompactH *pComph, STable *pTable, SDataCols *pDataCols, void **ppBuf, - void **ppCBuf) { - STsdbRepo *pRepo = TSDB_COMPACT_REPO(pComph); - STsdbCfg * pCfg = REPO_CFG(pRepo); - SDFile * pDFile; - bool isLast; - SBlock block; - - ASSERT(pDataCols->numOfRows > 0); - - if (pDataCols->numOfRows < pCfg->minRowsPerFileBlock) { - pDFile = TSDB_COMPACT_LAST_FILE(pComph); - isLast = true; - } else { - pDFile = TSDB_COMPACT_DATA_FILE(pComph); - isLast = false; - } - - if (tsdbWriteBlockImpl(pRepo, pTable, pDFile, pDataCols, &block, isLast, true, ppBuf, ppCBuf) < 0) { - return -1; - } - - if (taosArrayPush(pComph->aSupBlk, (void *)(&block)) == NULL) { - terrno = TSDB_CODE_TDB_OUT_OF_MEMORY; - return -1; - } - - return 0; -} diff --git a/src/util/src/ttokenizer.c b/src/util/src/ttokenizer.c index 62389f191f..88c2a3369b 100644 --- a/src/util/src/ttokenizer.c +++ b/src/util/src/ttokenizer.c @@ -219,6 +219,7 @@ static SKeyword keywordTable[] = { {"PARTITIONS", TK_PARTITIONS}, {"TOPIC", TK_TOPIC}, {"TOPICS", TK_TOPICS}, + {"COMPACT", TK_COMPACT}, {"MODIFY", TK_MODIFY} }; diff --git a/src/vnode/src/vnodeMain.c b/src/vnode/src/vnodeMain.c index fdf215a966..074f0f681f 100644 --- a/src/vnode/src/vnodeMain.c +++ b/src/vnode/src/vnodeMain.c @@ -114,6 +114,7 @@ int32_t vnodeSync(int32_t vgId) { return TSDB_CODE_SUCCESS; } + int32_t vnodeDrop(int32_t vgId) { SVnodeObj *pVnode = vnodeAcquire(vgId); if (pVnode == NULL) { @@ -133,6 +134,19 @@ int32_t vnodeDrop(int32_t vgId) { return TSDB_CODE_SUCCESS; } +int32_t vnodeCompact(int32_t vgId) { + void *pVnode = vnodeAcquire(vgId); + if (pVnode != NULL) { + vDebug("vgId:%d, compact vnode msg is received", vgId); + //not care success or not + tsdbCompact(((SVnodeObj*)pVnode)->tsdb); + vnodeRelease(pVnode); + } else { + vInfo("vgId:%d, vnode not exist, can't compact it", vgId); + return TSDB_CODE_VND_INVALID_VGROUP_ID; + } + return TSDB_CODE_SUCCESS; +} static int32_t vnodeAlterImp(SVnodeObj *pVnode, SCreateVnodeMsg *pVnodeCfg) { STsdbCfg tsdbCfg = pVnode->tsdbCfg; diff --git a/src/vnode/src/vnodeMgmt.c b/src/vnode/src/vnodeMgmt.c index 7e6022fc87..5a0bafe823 100644 --- a/src/vnode/src/vnodeMgmt.c +++ b/src/vnode/src/vnodeMgmt.c @@ -148,6 +148,7 @@ static void vnodeBuildVloadMsg(SVnodeObj *pVnode, SStatusMsg *pStatus) { pLoad->status = pVnode->status; pLoad->role = pVnode->role; pLoad->replica = pVnode->syncCfg.replica; + pLoad->compact = (pVnode->tsdb != NULL) && tsdbInCompact(pVnode->tsdb) ? 1 : 0; } int32_t vnodeGetVnodeList(int32_t vnodeList[], int32_t *numOfVnodes) {