diff --git a/include/client/taos.h b/include/client/taos.h index ed00fbe69a..8b3fd14118 100644 --- a/include/client/taos.h +++ b/include/client/taos.h @@ -291,6 +291,16 @@ DLL_EXPORT TAOS_RES *tmq_create_stream(TAOS *taos, const char *streamName, const typedef void (*TAOS_SUBSCRIBE_CALLBACK)(TAOS_SUB *tsub, TAOS_RES *res, void *param, int code); #endif +typedef enum { + TSDB_SRV_STATUS_UNAVAILABLE = 0, + TSDB_SRV_STATUS_NETWORK_OK = 1, + TSDB_SRV_STATUS_SERVICE_OK = 2, + TSDB_SRV_STATUS_SERVICE_DEGRADED = 3, + TSDB_SRV_STATUS_EXTING = 4, +} TSDB_SERVER_STATUS; + +DLL_EXPORT TSDB_SERVER_STATUS taos_check_server_status(const char *fqdn, int port, char *details, int maxlen); + #ifdef __cplusplus } #endif diff --git a/include/common/tglobal.h b/include/common/tglobal.h index 97f84f82d7..88ce0cd970 100644 --- a/include/common/tglobal.h +++ b/include/common/tglobal.h @@ -32,7 +32,6 @@ extern char tsLocalEp[]; extern uint16_t tsServerPort; extern int32_t tsVersion; extern int32_t tsStatusInterval; -extern bool tsEnableTelemetryReporting; // common extern int32_t tsRpcTimer; @@ -82,6 +81,12 @@ extern uint16_t tsMonitorPort; extern int32_t tsMonitorMaxLogs; extern bool tsMonitorComp; +// telem +extern bool tsEnableTelem; +extern int32_t tsTelemInterval; +extern char tsTelemServer[]; +extern uint16_t tsTelemPort; + // query buffer management extern int32_t tsQueryBufferSize; // maximum allowed usage buffer size in MB for each data node during query processing extern int64_t tsQueryBufferSizeBytes; // maximum allowed usage buffer size in byte for each data node diff --git a/include/common/tmsg.h b/include/common/tmsg.h index 32d59c6929..95694353d3 100644 --- a/include/common/tmsg.h +++ b/include/common/tmsg.h @@ -269,6 +269,8 @@ typedef struct SSchema { #define SSCHMEA_BYTES(s) ((s)->bytes) #define SSCHMEA_NAME(s) ((s)->name) +STSchema* tdGetSTSChemaFromSSChema(SSchema** pSchema, int32_t nCols); + typedef struct { char name[TSDB_TABLE_FNAME_LEN]; int8_t igExists; @@ -280,10 +282,14 @@ typedef struct { int32_t numOfTags; int32_t numOfSmas; int32_t commentLen; + int32_t ast1Len; + int32_t ast2Len; SArray* pColumns; // array of SField SArray* pTags; // array of SField SArray* pSmas; // array of SField char* comment; + char* pAst1; + char* pAst2; } SMCreateStbReq; int32_t tSerializeSMCreateStbReq(void* buf, int32_t bufLen, SMCreateStbReq* pReq); @@ -509,7 +515,7 @@ typedef struct { int8_t precision; // time resolution int8_t compression; int8_t replications; - int8_t quorum; + int8_t strict; int8_t update; int8_t cacheLastRow; int8_t ignoreExist; @@ -531,7 +537,7 @@ typedef struct { int32_t daysToKeep2; int32_t fsyncPeriod; int8_t walLevel; - int8_t quorum; + int8_t strict; int8_t cacheLastRow; int8_t replications; } SAlterDbReq; @@ -604,11 +610,13 @@ typedef struct { int8_t precision; int8_t compression; int8_t replications; - int8_t quorum; + int8_t strict; int8_t update; int8_t cacheLastRow; int8_t streamMode; int8_t singleSTable; + int32_t numOfRetensions; + SArray* pRetensions; } SDbCfgRsp; int32_t tSerializeSDbCfgRsp(void* buf, int32_t bufLen, const SDbCfgRsp* pRsp); @@ -639,10 +647,10 @@ void tFreeSUseDbBatchRsp(SUseDbBatchRsp* pRsp); typedef struct { char db[TSDB_DB_FNAME_LEN]; -} SSyncDbReq, SCompactDbReq; +} SCompactDbReq; -int32_t tSerializeSSyncDbReq(void* buf, int32_t bufLen, SSyncDbReq* pReq); -int32_t tDeserializeSSyncDbReq(void* buf, int32_t bufLen, SSyncDbReq* pReq); +int32_t tSerializeSCompactDbReq(void* buf, int32_t bufLen, SCompactDbReq* pReq); +int32_t tDeserializeSCompactDbReq(void* buf, int32_t bufLen, SCompactDbReq* pReq); typedef struct { char name[TSDB_FUNC_NAME_LEN]; @@ -723,7 +731,7 @@ typedef struct { typedef struct { int32_t vgId; - int8_t role; + int32_t syncState; int64_t numOfTables; int64_t numOfTimeSeries; int64_t totalStorage; @@ -736,6 +744,10 @@ typedef struct { int64_t numOfBatchInsertSuccessReqs; } SVnodeLoad; +typedef struct { + int32_t syncState; +} SMnodeLoad; + typedef struct { int32_t sver; // software version int64_t dnodeVer; // dnode table version in sdb @@ -810,7 +822,7 @@ typedef struct { int8_t walLevel; int8_t precision; int8_t compression; - int8_t quorum; + int8_t strict; int8_t update; int8_t cacheLastRow; int8_t replica; @@ -819,7 +831,7 @@ typedef struct { SReplica replicas[TSDB_MAX_REPLICA]; int32_t numOfRetensions; SArray* pRetensions; // SRetention -} SCreateVnodeReq, SAlterVnodeReq; +} SCreateVnodeReq; int32_t tSerializeSCreateVnodeReq(void* buf, int32_t bufLen, SCreateVnodeReq* pReq); int32_t tDeserializeSCreateVnodeReq(void* buf, int32_t bufLen, SCreateVnodeReq* pReq); @@ -830,11 +842,36 @@ typedef struct { int32_t dnodeId; int64_t dbUid; char db[TSDB_DB_FNAME_LEN]; -} SDropVnodeReq, SSyncVnodeReq, SCompactVnodeReq; +} SDropVnodeReq; int32_t tSerializeSDropVnodeReq(void* buf, int32_t bufLen, SDropVnodeReq* pReq); int32_t tDeserializeSDropVnodeReq(void* buf, int32_t bufLen, SDropVnodeReq* pReq); +typedef struct { + int64_t dbUid; + char db[TSDB_DB_FNAME_LEN]; +} SCompactVnodeReq; + +int32_t tSerializeSCompactVnodeReq(void* buf, int32_t bufLen, SCompactVnodeReq* pReq); +int32_t tDeserializeSCompactVnodeReq(void* buf, int32_t bufLen, SCompactVnodeReq* pReq); + +typedef struct { + int32_t vgVersion; + int32_t totalBlocks; + int32_t daysToKeep0; + int32_t daysToKeep1; + int32_t daysToKeep2; + int8_t walLevel; + int8_t strict; + int8_t cacheLastRow; + int8_t replica; + int8_t selfIndex; + SReplica replicas[TSDB_MAX_REPLICA]; +} SAlterVnodeReq; + +int32_t tSerializeSAlterVnodeReq(void* buf, int32_t bufLen, SAlterVnodeReq* pReq); +int32_t tDeserializeSAlterVnodeReq(void* buf, int32_t bufLen, SAlterVnodeReq* pReq); + typedef struct { SMsgHead header; char dbFName[TSDB_DB_FNAME_LEN]; @@ -1071,10 +1108,12 @@ int32_t tSerializeSAuthReq(void* buf, int32_t bufLen, SAuthReq* pReq); int32_t tDeserializeSAuthReq(void* buf, int32_t bufLen, SAuthReq* pReq); typedef struct { - int8_t finished; - char name[TSDB_STEP_NAME_LEN]; - char desc[TSDB_STEP_DESC_LEN]; -} SStartupReq; + int32_t statusCode; + char details[1024]; +} SServerStatusRsp; + +int32_t tSerializeSServerStatusRsp(void* buf, int32_t bufLen, SServerStatusRsp* pRsp); +int32_t tDeserializeSServerStatusRsp(void* buf, int32_t bufLen, SServerStatusRsp* pRsp); /** * The layout of the query message payload is as following: diff --git a/include/common/tmsgcb.h b/include/common/tmsgcb.h index 6c3671a8d6..02d8b76b9b 100644 --- a/include/common/tmsgcb.h +++ b/include/common/tmsgcb.h @@ -44,6 +44,7 @@ typedef int32_t (*SendMnodeReqFp)(SMgmtWrapper* pWrapper, SRpcMsg* pReq); typedef void (*SendRspFp)(SMgmtWrapper* pWrapper, const SRpcMsg* pRsp); typedef void (*RegisterBrokenLinkArgFp)(SMgmtWrapper* pWrapper, SRpcMsg* pMsg); typedef void (*ReleaseHandleFp)(SMgmtWrapper* pWrapper, void* handle, int8_t type); +typedef void (*ReportStartup)(SMgmtWrapper* pWrapper, const char* name, const char* desc); typedef struct { SMgmtWrapper* pWrapper; @@ -53,6 +54,7 @@ typedef struct { SendRspFp sendRspFp; RegisterBrokenLinkArgFp registerBrokenLinkArgFp; ReleaseHandleFp releaseHandleFp; + ReportStartup reportStartupFp; } SMsgCb; void tmsgSetDefaultMsgCb(const SMsgCb* pMsgCb); @@ -62,6 +64,7 @@ int32_t tmsgSendReq(const SMsgCb* pMsgCb, const SEpSet* epSet, SRpcMsg* pReq); void tmsgSendRsp(const SRpcMsg* pRsp); void tmsgRegisterBrokenLinkArg(const SMsgCb* pMsgCb, SRpcMsg* pMsg); void tmsgReleaseHandle(void* handle, int8_t type); +void tmsgReportStartup(const char* name, const char* desc); #ifdef __cplusplus } diff --git a/include/common/tmsgdef.h b/include/common/tmsgdef.h index e553dff270..e519a84615 100644 --- a/include/common/tmsgdef.h +++ b/include/common/tmsgdef.h @@ -82,12 +82,9 @@ enum { TD_DEF_MSG_TYPE(TDMT_DND_ALTER_BNODE, "dnode-alter-bnode", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_DND_DROP_BNODE, "dnode-drop-bnode", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_DND_CREATE_VNODE, "dnode-create-vnode", NULL, NULL) - TD_DEF_MSG_TYPE(TDMT_DND_ALTER_VNODE, "dnode-alter-vnode", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_DND_DROP_VNODE, "dnode-drop-vnode", NULL, NULL) - TD_DEF_MSG_TYPE(TDMT_DND_SYNC_VNODE, "dnode-sync-vnode", NULL, NULL) - TD_DEF_MSG_TYPE(TDMT_DND_COMPACT_VNODE, "dnode-compact-vnode", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_DND_CONFIG_DNODE, "dnode-config-dnode", NULL, NULL) - TD_DEF_MSG_TYPE(TDMT_DND_NETWORK_TEST, "dnode-nettest", NULL, NULL) + TD_DEF_MSG_TYPE(TDMT_DND_SERVER_STATUS, "dnode-server-status", NULL, NULL) // Requests handled by MNODE TD_NEW_MSG_SEG(TDMT_MND_MSG) @@ -206,6 +203,10 @@ enum { TD_DEF_MSG_TYPE(TDMT_VND_CANCEL_SMA, "vnode-cancel-sma", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_VND_DROP_SMA, "vnode-drop-sma", NULL, NULL) + TD_DEF_MSG_TYPE(TDMT_VND_SYNC_VNODE, "vnode-sync-vnode", NULL, NULL) + TD_DEF_MSG_TYPE(TDMT_VND_ALTER_VNODE, "vnode-alter-vnode", NULL, NULL) + TD_DEF_MSG_TYPE(TDMT_VND_COMPACT_VNODE, "vnode-compact-vnode", NULL, NULL) + // Requests handled by QNODE TD_NEW_MSG_SEG(TDMT_QND_MSG) @@ -228,7 +229,8 @@ enum { TD_DEF_MSG_TYPE(TDMT_MON_SM_INFO, "monitor-sinfo", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_MON_BM_INFO, "monitor-binfo", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_MON_VM_LOAD, "monitor-vload", NULL, NULL) - + TD_DEF_MSG_TYPE(TDMT_MON_MM_LOAD, "monitor-mload", NULL, NULL) + #if defined(TD_MSG_NUMBER_) TDMT_MAX #endif diff --git a/include/common/trow.h b/include/common/trow.h index 83bcc67bb5..7b0c009a11 100644 --- a/include/common/trow.h +++ b/include/common/trow.h @@ -219,7 +219,7 @@ static FORCE_INLINE void *tdKVRowColVal(STSRow *pRow, SKvRowIdx *pIdx) { return #define TD_ROW_OFFSET(p) ((p)->toffset); // During ParseInsert when without STSchema, how to get the offset for STpRow? -void tdMergeBitmap(uint8_t *srcBitmap, int32_t srcLen, uint8_t *dstBitmap); +void tdMergeBitmap(uint8_t *srcBitmap, int32_t nBits, uint8_t *dstBitmap); static FORCE_INLINE void tdRowCopy(void *dst, STSRow *row) { memcpy(dst, row, TD_ROW_LEN(row)); } static FORCE_INLINE int32_t tdSetBitmapValTypeI(void *pBitmap, int16_t colIdx, TDRowValT valType); static FORCE_INLINE int32_t tdSetBitmapValTypeII(void *pBitmap, int16_t colIdx, TDRowValT valType); @@ -308,8 +308,8 @@ static FORCE_INLINE int32_t tdSetBitmapValTypeII(void *pBitmap, int16_t colIdx, // use literal value directly and not use formula to simplify the codes switch (nOffset) { case 0: + *pDestByte = ((*pDestByte) & 0x3F) | (valType << 6); // set the value and clear other partitions for offset 0 - *pDestByte = (valType << 6); // *pDestByte |= (valType << 6); break; case 1: @@ -417,8 +417,8 @@ static FORCE_INLINE int32_t tdSetBitmapValTypeI(void *pBitmap, int16_t colIdx, T // use literal value directly and not use formula to simplify the codes switch (nOffset) { case 0: + *pDestByte = ((*pDestByte) & 0x7F) | (valType << 7); // set the value and clear other partitions for offset 0 - *pDestByte = (valType << 7); // *pDestByte |= (valType << 7); break; case 1: @@ -1144,11 +1144,11 @@ static FORCE_INLINE bool tdSTSRowIterNext(STSRowIter *pIter, col_id_t colId, col if (TD_IS_TP_ROW(pIter->pRow)) { STColumn *pCol = NULL; STSchema *pSchema = pIter->pSchema; - while (pIter->colIdx <= pSchema->numOfCols) { + while (pIter->colIdx < pSchema->numOfCols) { pCol = &pSchema->columns[pIter->colIdx]; // 1st column of schema is primary TS key if (colId == pCol->colId) { break; - } else if (colId < pCol->colId) { + } else if (pCol->colId < colId) { ++pIter->colIdx; continue; } else { @@ -1274,6 +1274,101 @@ static FORCE_INLINE int32_t dataColGetNEleLen(SDataCol *pDataCol, int32_t rows, return result; } +static void tdSCellValPrint(SCellVal *pVal, int8_t colType) { + if (tdValTypeIsNull(pVal->valType)) { + printf("NULL "); + return; + } else if (tdValTypeIsNone(pVal->valType)) { + printf("NONE "); + return; + } + switch (colType) { + case TSDB_DATA_TYPE_BOOL: + printf("%s ", (*(int8_t *)pVal->val) == 0 ? "false" : "true"); + break; + case TSDB_DATA_TYPE_TINYINT: + printf("%" PRIi8 " ", *(int8_t *)pVal->val); + break; + case TSDB_DATA_TYPE_SMALLINT: + printf("%" PRIi16 " ", *(int16_t *)pVal->val); + break; + case TSDB_DATA_TYPE_INT: + printf("%" PRIi32 " ", *(int32_t *)pVal->val); + break; + case TSDB_DATA_TYPE_BIGINT: + printf("%" PRIi64 " ", *(int64_t *)pVal->val); + break; + case TSDB_DATA_TYPE_FLOAT: + printf("%f ", *(float *)pVal->val); + break; + case TSDB_DATA_TYPE_DOUBLE: + printf("%lf ", *(double *)pVal->val); + break; + case TSDB_DATA_TYPE_VARCHAR: + printf("VARCHAR "); + break; + case TSDB_DATA_TYPE_TIMESTAMP: + printf("%" PRIi64 " ", *(int64_t *)pVal->val); + break; + case TSDB_DATA_TYPE_NCHAR: + printf("NCHAR "); + break; + case TSDB_DATA_TYPE_UTINYINT: + printf("%" PRIu8 " ", *(uint8_t *)pVal->val); + break; + case TSDB_DATA_TYPE_USMALLINT: + printf("%" PRIu16 " ", *(uint16_t *)pVal->val); + break; + case TSDB_DATA_TYPE_UINT: + printf("%" PRIu32 " ", *(uint32_t *)pVal->val); + break; + case TSDB_DATA_TYPE_UBIGINT: + printf("%" PRIu64 " ", *(uint64_t *)pVal->val); + break; + case TSDB_DATA_TYPE_JSON: + printf("JSON "); + break; + case TSDB_DATA_TYPE_VARBINARY: + printf("VARBIN "); + break; + case TSDB_DATA_TYPE_DECIMAL: + printf("DECIMAL "); + break; + case TSDB_DATA_TYPE_BLOB: + printf("BLOB "); + break; + case TSDB_DATA_TYPE_MEDIUMBLOB: + printf("MedBLOB "); + break; + // case TSDB_DATA_TYPE_BINARY: + // printf("BINARY "); + // break; + case TSDB_DATA_TYPE_MAX: + printf("UNDEF "); + break; + default: + printf("UNDEF "); + break; + } +} + +static void tdSRowPrint(STSRow *row, STSchema *pSchema) { + STSRowIter iter = {0}; + tdSTSRowIterInit(&iter, pSchema); + tdSTSRowIterReset(&iter, row); + printf(">>>"); + for (int i = 0; i < pSchema->numOfCols; ++i) { + STColumn *stCol = pSchema->columns + i; + SCellVal sVal = {.valType = 255, .val = NULL}; + if (!tdSTSRowIterNext(&iter, stCol->colId, stCol->type, &sVal)) { + break; + } + ASSERT(sVal.valType == 0 || sVal.valType == 1 || sVal.valType == 2); + tdSCellValPrint(&sVal, stCol->type); + } + printf("\n"); +} + #ifdef TROW_ORIGIN_HZ typedef struct { uint32_t nRows; diff --git a/include/common/ttokendef.h b/include/common/ttokendef.h index c98e5bf99d..5d8227daa1 100644 --- a/include/common/ttokendef.h +++ b/include/common/ttokendef.h @@ -86,155 +86,156 @@ #define TK_SINGLE_STABLE 68 #define TK_STREAM_MODE 69 #define TK_RETENTIONS 70 -#define TK_NK_COMMA 71 -#define TK_NK_COLON 72 -#define TK_TABLE 73 -#define TK_NK_LP 74 -#define TK_NK_RP 75 -#define TK_STABLE 76 -#define TK_ADD 77 -#define TK_COLUMN 78 -#define TK_MODIFY 79 -#define TK_RENAME 80 -#define TK_TAG 81 -#define TK_SET 82 -#define TK_NK_EQ 83 -#define TK_USING 84 -#define TK_TAGS 85 -#define TK_NK_DOT 86 -#define TK_COMMENT 87 -#define TK_BOOL 88 -#define TK_TINYINT 89 -#define TK_SMALLINT 90 -#define TK_INT 91 -#define TK_INTEGER 92 -#define TK_BIGINT 93 -#define TK_FLOAT 94 -#define TK_DOUBLE 95 -#define TK_BINARY 96 -#define TK_TIMESTAMP 97 -#define TK_NCHAR 98 -#define TK_UNSIGNED 99 -#define TK_JSON 100 -#define TK_VARCHAR 101 -#define TK_MEDIUMBLOB 102 -#define TK_BLOB 103 -#define TK_VARBINARY 104 -#define TK_DECIMAL 105 -#define TK_SMA 106 -#define TK_ROLLUP 107 -#define TK_FILE_FACTOR 108 -#define TK_NK_FLOAT 109 -#define TK_DELAY 110 -#define TK_SHOW 111 -#define TK_DATABASES 112 -#define TK_TABLES 113 -#define TK_STABLES 114 -#define TK_MNODES 115 -#define TK_MODULES 116 -#define TK_QNODES 117 -#define TK_FUNCTIONS 118 -#define TK_INDEXES 119 -#define TK_FROM 120 -#define TK_ACCOUNTS 121 -#define TK_APPS 122 -#define TK_CONNECTIONS 123 -#define TK_LICENCE 124 -#define TK_GRANTS 125 -#define TK_QUERIES 126 -#define TK_SCORES 127 -#define TK_TOPICS 128 -#define TK_VARIABLES 129 -#define TK_BNODES 130 -#define TK_SNODES 131 -#define TK_LIKE 132 -#define TK_INDEX 133 -#define TK_FULLTEXT 134 -#define TK_FUNCTION 135 -#define TK_INTERVAL 136 -#define TK_TOPIC 137 -#define TK_AS 138 -#define TK_DESC 139 -#define TK_DESCRIBE 140 -#define TK_RESET 141 -#define TK_QUERY 142 -#define TK_EXPLAIN 143 -#define TK_ANALYZE 144 -#define TK_VERBOSE 145 -#define TK_NK_BOOL 146 -#define TK_RATIO 147 -#define TK_COMPACT 148 -#define TK_VNODES 149 -#define TK_IN 150 -#define TK_OUTPUTTYPE 151 -#define TK_AGGREGATE 152 -#define TK_BUFSIZE 153 -#define TK_STREAM 154 -#define TK_INTO 155 -#define TK_TRIGGER 156 -#define TK_AT_ONCE 157 -#define TK_WINDOW_CLOSE 158 -#define TK_WATERMARK 159 -#define TK_KILL 160 -#define TK_CONNECTION 161 -#define TK_MERGE 162 -#define TK_VGROUP 163 -#define TK_REDISTRIBUTE 164 -#define TK_SPLIT 165 -#define TK_SYNCDB 166 -#define TK_NULL 167 -#define TK_NK_QUESTION 168 -#define TK_NK_ARROW 169 -#define TK_ROWTS 170 -#define TK_TBNAME 171 -#define TK_QSTARTTS 172 -#define TK_QENDTS 173 -#define TK_WSTARTTS 174 -#define TK_WENDTS 175 -#define TK_WDURATION 176 -#define TK_CAST 177 -#define TK_NOW 178 -#define TK_TODAY 179 -#define TK_TIMEZONE 180 -#define TK_COUNT 181 -#define TK_FIRST 182 -#define TK_LAST 183 -#define TK_LAST_ROW 184 -#define TK_BETWEEN 185 -#define TK_IS 186 -#define TK_NK_LT 187 -#define TK_NK_GT 188 -#define TK_NK_LE 189 -#define TK_NK_GE 190 -#define TK_NK_NE 191 -#define TK_MATCH 192 -#define TK_NMATCH 193 -#define TK_CONTAINS 194 -#define TK_JOIN 195 -#define TK_INNER 196 -#define TK_SELECT 197 -#define TK_DISTINCT 198 -#define TK_WHERE 199 -#define TK_PARTITION 200 -#define TK_BY 201 -#define TK_SESSION 202 -#define TK_STATE_WINDOW 203 -#define TK_SLIDING 204 -#define TK_FILL 205 -#define TK_VALUE 206 -#define TK_NONE 207 -#define TK_PREV 208 -#define TK_LINEAR 209 -#define TK_NEXT 210 -#define TK_GROUP 211 -#define TK_HAVING 212 -#define TK_ORDER 213 -#define TK_SLIMIT 214 -#define TK_SOFFSET 215 -#define TK_LIMIT 216 -#define TK_OFFSET 217 -#define TK_ASC 218 -#define TK_NULLS 219 +#define TK_STRICT 71 +#define TK_NK_COMMA 72 +#define TK_NK_COLON 73 +#define TK_TABLE 74 +#define TK_NK_LP 75 +#define TK_NK_RP 76 +#define TK_STABLE 77 +#define TK_ADD 78 +#define TK_COLUMN 79 +#define TK_MODIFY 80 +#define TK_RENAME 81 +#define TK_TAG 82 +#define TK_SET 83 +#define TK_NK_EQ 84 +#define TK_USING 85 +#define TK_TAGS 86 +#define TK_NK_DOT 87 +#define TK_COMMENT 88 +#define TK_BOOL 89 +#define TK_TINYINT 90 +#define TK_SMALLINT 91 +#define TK_INT 92 +#define TK_INTEGER 93 +#define TK_BIGINT 94 +#define TK_FLOAT 95 +#define TK_DOUBLE 96 +#define TK_BINARY 97 +#define TK_TIMESTAMP 98 +#define TK_NCHAR 99 +#define TK_UNSIGNED 100 +#define TK_JSON 101 +#define TK_VARCHAR 102 +#define TK_MEDIUMBLOB 103 +#define TK_BLOB 104 +#define TK_VARBINARY 105 +#define TK_DECIMAL 106 +#define TK_SMA 107 +#define TK_ROLLUP 108 +#define TK_FILE_FACTOR 109 +#define TK_NK_FLOAT 110 +#define TK_DELAY 111 +#define TK_SHOW 112 +#define TK_DATABASES 113 +#define TK_TABLES 114 +#define TK_STABLES 115 +#define TK_MNODES 116 +#define TK_MODULES 117 +#define TK_QNODES 118 +#define TK_FUNCTIONS 119 +#define TK_INDEXES 120 +#define TK_FROM 121 +#define TK_ACCOUNTS 122 +#define TK_APPS 123 +#define TK_CONNECTIONS 124 +#define TK_LICENCE 125 +#define TK_GRANTS 126 +#define TK_QUERIES 127 +#define TK_SCORES 128 +#define TK_TOPICS 129 +#define TK_VARIABLES 130 +#define TK_BNODES 131 +#define TK_SNODES 132 +#define TK_LIKE 133 +#define TK_INDEX 134 +#define TK_FULLTEXT 135 +#define TK_FUNCTION 136 +#define TK_INTERVAL 137 +#define TK_TOPIC 138 +#define TK_AS 139 +#define TK_DESC 140 +#define TK_DESCRIBE 141 +#define TK_RESET 142 +#define TK_QUERY 143 +#define TK_EXPLAIN 144 +#define TK_ANALYZE 145 +#define TK_VERBOSE 146 +#define TK_NK_BOOL 147 +#define TK_RATIO 148 +#define TK_COMPACT 149 +#define TK_VNODES 150 +#define TK_IN 151 +#define TK_OUTPUTTYPE 152 +#define TK_AGGREGATE 153 +#define TK_BUFSIZE 154 +#define TK_STREAM 155 +#define TK_INTO 156 +#define TK_TRIGGER 157 +#define TK_AT_ONCE 158 +#define TK_WINDOW_CLOSE 159 +#define TK_WATERMARK 160 +#define TK_KILL 161 +#define TK_CONNECTION 162 +#define TK_MERGE 163 +#define TK_VGROUP 164 +#define TK_REDISTRIBUTE 165 +#define TK_SPLIT 166 +#define TK_SYNCDB 167 +#define TK_NULL 168 +#define TK_NK_QUESTION 169 +#define TK_NK_ARROW 170 +#define TK_ROWTS 171 +#define TK_TBNAME 172 +#define TK_QSTARTTS 173 +#define TK_QENDTS 174 +#define TK_WSTARTTS 175 +#define TK_WENDTS 176 +#define TK_WDURATION 177 +#define TK_CAST 178 +#define TK_NOW 179 +#define TK_TODAY 180 +#define TK_TIMEZONE 181 +#define TK_COUNT 182 +#define TK_FIRST 183 +#define TK_LAST 184 +#define TK_LAST_ROW 185 +#define TK_BETWEEN 186 +#define TK_IS 187 +#define TK_NK_LT 188 +#define TK_NK_GT 189 +#define TK_NK_LE 190 +#define TK_NK_GE 191 +#define TK_NK_NE 192 +#define TK_MATCH 193 +#define TK_NMATCH 194 +#define TK_CONTAINS 195 +#define TK_JOIN 196 +#define TK_INNER 197 +#define TK_SELECT 198 +#define TK_DISTINCT 199 +#define TK_WHERE 200 +#define TK_PARTITION 201 +#define TK_BY 202 +#define TK_SESSION 203 +#define TK_STATE_WINDOW 204 +#define TK_SLIDING 205 +#define TK_FILL 206 +#define TK_VALUE 207 +#define TK_NONE 208 +#define TK_PREV 209 +#define TK_LINEAR 210 +#define TK_NEXT 211 +#define TK_GROUP 212 +#define TK_HAVING 213 +#define TK_ORDER 214 +#define TK_SLIMIT 215 +#define TK_SOFFSET 216 +#define TK_LIMIT 217 +#define TK_OFFSET 218 +#define TK_ASC 219 +#define TK_NULLS 220 #define TK_NK_SPACE 300 #define TK_NK_COMMENT 301 diff --git a/include/dnode/mnode/mnode.h b/include/dnode/mnode/mnode.h index 9848125919..eed91d7561 100644 --- a/include/dnode/mnode/mnode.h +++ b/include/dnode/mnode/mnode.h @@ -80,6 +80,7 @@ void mndStop(SMnode *pMnode); * @return int32_t 0 for success, -1 for failure. */ int32_t mndGetMonitorInfo(SMnode *pMnode, SMonClusterInfo *pCluster, SMonVgroupInfo *pVgroup, SMonGrantInfo *pGrant); +int32_t mndGetLoad(SMnode *pMnode, SMnodeLoad *pLoad); /** * @brief Process the read, write, sync request. diff --git a/include/libs/function/function.h b/include/libs/function/function.h index 1303a1fb6a..eafe64c294 100644 --- a/include/libs/function/function.h +++ b/include/libs/function/function.h @@ -295,19 +295,19 @@ typedef struct SPoint { void * val; } SPoint; -void taosFillSetStartInfo(struct SFillInfo* pFillInfo, int32_t numOfRows, TSKEY endKey); -void taosResetFillInfo(struct SFillInfo* pFillInfo, TSKEY startTimestamp); -void taosFillSetInputDataBlock(struct SFillInfo* pFillInfo, const struct SSDataBlock* pInput); -struct SFillColInfo* createFillColInfo(SExprInfo* pExpr, int32_t numOfOutput, const int64_t* fillVal); -bool taosFillHasMoreResults(struct SFillInfo* pFillInfo); - -struct SFillInfo* taosCreateFillInfo(int32_t order, TSKEY skey, int32_t numOfTags, int32_t capacity, int32_t numOfCols, - int64_t slidingTime, int8_t slidingUnit, int8_t precision, int32_t fillType, - struct SFillColInfo* pFillCol, const char* id); - -void* taosDestroyFillInfo(struct SFillInfo *pFillInfo); -int64_t taosFillResultDataBlock(struct SFillInfo* pFillInfo, void** output, int32_t capacity); -int64_t getFillInfoStart(struct SFillInfo *pFillInfo); +//void taosFillSetStartInfo(struct SFillInfo* pFillInfo, int32_t numOfRows, TSKEY endKey); +//void taosResetFillInfo(struct SFillInfo* pFillInfo, TSKEY startTimestamp); +//void taosFillSetInputDataBlock(struct SFillInfo* pFillInfo, const struct SSDataBlock* pInput); +//struct SFillColInfo* createFillColInfo(SExprInfo* pExpr, int32_t numOfOutput, const SValueNode* val); +//bool taosFillHasMoreResults(struct SFillInfo* pFillInfo); +// +//struct SFillInfo* taosCreateFillInfo(int32_t order, TSKEY skey, int32_t numOfTags, int32_t capacity, int32_t numOfCols, +// SInterval* pInterval, int32_t fillType, +// struct SFillColInfo* pCol, const char* id); +// +//void* taosDestroyFillInfo(struct SFillInfo *pFillInfo); +//int64_t taosFillResultDataBlock(struct SFillInfo* pFillInfo, void** output, int32_t capacity); +//int64_t getFillInfoStart(struct SFillInfo *pFillInfo); int32_t taosGetLinearInterpolationVal(SPoint* point, int32_t outputType, SPoint* point1, SPoint* point2, int32_t inputType); diff --git a/include/libs/monitor/monitor.h b/include/libs/monitor/monitor.h index af0580674d..9d8cf61b06 100644 --- a/include/libs/monitor/monitor.h +++ b/include/libs/monitor/monitor.h @@ -202,6 +202,14 @@ int32_t tSerializeSMonVloadInfo(void *buf, int32_t bufLen, SMonVloadInfo *pInfo) int32_t tDeserializeSMonVloadInfo(void *buf, int32_t bufLen, SMonVloadInfo *pInfo); void tFreeSMonVloadInfo(SMonVloadInfo *pInfo); +typedef struct { + int8_t isMnode; + SMnodeLoad load; +} SMonMloadInfo; + +int32_t tSerializeSMonMloadInfo(void *buf, int32_t bufLen, SMonMloadInfo *pInfo); +int32_t tDeserializeSMonMloadInfo(void *buf, int32_t bufLen, SMonMloadInfo *pInfo); + typedef struct { const char *server; uint16_t port; diff --git a/include/libs/nodes/cmdnodes.h b/include/libs/nodes/cmdnodes.h index b62555d549..84f2d9ed6b 100644 --- a/include/libs/nodes/cmdnodes.h +++ b/include/libs/nodes/cmdnodes.h @@ -47,6 +47,7 @@ typedef struct SDatabaseOptions { SValueNode* pNumOfVgroups; SValueNode* pSingleStable; SValueNode* pStreamMode; + SValueNode* pStrict; SNodeList* pRetentions; } SDatabaseOptions; diff --git a/include/libs/sync/sync.h b/include/libs/sync/sync.h index a2f88490f0..a4ff1b23a7 100644 --- a/include/libs/sync/sync.h +++ b/include/libs/sync/sync.h @@ -172,6 +172,8 @@ int32_t syncForwardToPeer(int64_t rid, const SRpcMsg* pMsg, bool isWeak); extern int32_t sDebugFlag; +const char *syncStr(ESyncState state); + #ifdef __cplusplus } #endif diff --git a/include/util/tdef.h b/include/util/tdef.h index ec90dd888a..c379eb1cf6 100644 --- a/include/util/tdef.h +++ b/include/util/tdef.h @@ -297,16 +297,6 @@ typedef enum ELogicConditionType { #define TSDB_DNODE_CONFIG_LEN 128 #define TSDB_DNODE_VALUE_LEN 256 -#define TSDB_MQTT_HOSTNAME_LEN 64 -#define TSDB_MQTT_PORT_LEN 8 -#define TSDB_MQTT_USER_LEN 24 -#define TSDB_MQTT_PASS_LEN 24 -#define TSDB_MQTT_TOPIC_LEN 64 -#define TSDB_MQTT_CLIENT_ID_LEN 32 - -#define TSDB_DB_TYPE_DEFAULT 0 -#define TSDB_DB_TYPE_TOPIC 1 - #define TSDB_DEFAULT_PKT_SIZE 65480 // same as RPC_MAX_UDP_SIZE #define TSDB_PAYLOAD_SIZE TSDB_DEFAULT_PKT_SIZE @@ -315,9 +305,6 @@ typedef enum ELogicConditionType { #define TSDB_CQ_SQL_SIZE 1024 #define TSDB_MIN_VNODES 16 #define TSDB_MAX_VNODES 512 -#define TSDB_MIN_VNODES_PER_DB 1 -#define TSDB_MAX_VNODES_PER_DB 4096 -#define TSDB_DEFAULT_VN_PER_DB 2 #define TSDB_DNODE_ROLE_ANY 0 #define TSDB_DNODE_ROLE_MGMT 1 @@ -331,104 +318,81 @@ typedef enum ELogicConditionType { #define TSDB_MULTI_TABLEMETA_MAX_NUM 100000 // maximum batch size allowed to load table meta +#define TSDB_MIN_VNODES_PER_DB 1 +#define TSDB_MAX_VNODES_PER_DB 4096 +#define TSDB_DEFAULT_VN_PER_DB 2 #define TSDB_MIN_CACHE_BLOCK_SIZE 1 #define TSDB_MAX_CACHE_BLOCK_SIZE 128 // 128MB for each vnode #define TSDB_DEFAULT_CACHE_BLOCK_SIZE 16 - -#define TSDB_MIN_TOTAL_BLOCKS 3 -#define TSDB_MAX_TOTAL_BLOCKS 10000 -#define TSDB_DEFAULT_TOTAL_BLOCKS 6 - -#define TSDB_MIN_DAYS_PER_FILE 60 // unit minute -#define TSDB_MAX_DAYS_PER_FILE (3650 * 1440) -#define TSDB_DEFAULT_DAYS_PER_FILE (10 * 1440) - -#define TSDB_MIN_KEEP (1 * 1440) // data in db to be reserved. unit minute -#define TSDB_MAX_KEEP (365000 * 1440) // data in db to be reserved. -#define TSDB_DEFAULT_KEEP (3650 * 1440) // ten years - -#define TSDB_MIN_MIN_ROW_FBLOCK 10 -#define TSDB_MAX_MIN_ROW_FBLOCK 1000 -#define TSDB_DEFAULT_MIN_ROW_FBLOCK 100 - -#define TSDB_MIN_MAX_ROW_FBLOCK 200 -#define TSDB_MAX_MAX_ROW_FBLOCK 10000 -#define TSDB_DEFAULT_MAX_ROW_FBLOCK 4096 - -#define TSDB_MIN_COMMIT_TIME 30 -#define TSDB_MAX_COMMIT_TIME 40960 -#define TSDB_DEFAULT_COMMIT_TIME 3600 - -#define TSDB_MIN_FSYNC_PERIOD 0 -#define TSDB_MAX_FSYNC_PERIOD 180000 // millisecond -#define TSDB_DEFAULT_FSYNC_PERIOD 3000 // three second - -#define TSDB_MIN_WAL_LEVEL 1 -#define TSDB_MAX_WAL_LEVEL 2 -#define TSDB_DEFAULT_WAL_LEVEL 1 - -#define TSDB_MIN_PRECISION TSDB_TIME_PRECISION_MILLI -#define TSDB_MAX_PRECISION TSDB_TIME_PRECISION_NANO -#define TSDB_DEFAULT_PRECISION TSDB_TIME_PRECISION_MILLI - -#define TSDB_MIN_COMP_LEVEL 0 -#define TSDB_MAX_COMP_LEVEL 2 -#define TSDB_DEFAULT_COMP_LEVEL 2 - -#define TSDB_MIN_DB_REPLICA_OPTION 1 -#define TSDB_MAX_DB_REPLICA_OPTION 3 -#define TSDB_DEFAULT_DB_REPLICA_OPTION 1 - -#define TSDB_MIN_DB_QUORUM_OPTION 1 -#define TSDB_MAX_DB_QUORUM_OPTION 2 -#define TSDB_DEFAULT_DB_QUORUM_OPTION 1 - -#define TSDB_MIN_DB_TTL_OPTION 1 -#define TSDB_DEFAULT_DB_TTL_OPTION 0 - -#define TSDB_MIN_DB_SINGLE_STABLE_OPTION 0 -#define TSDB_MAX_DB_SINGLE_STABLE_OPTION 1 -#define TSDB_DEFAULT_DB_SINGLE_STABLE_OPTION 0 - -#define TSDB_MIN_DB_STREAM_MODE_OPTION 0 -#define TSDB_MAX_DB_STREAM_MODE_OPTION 1 -#define TSDB_DEFAULT_DB_STREAM_MODE_OPTION 0 - -#define TSDB_MAX_JOIN_TABLE_NUM 10 -#define TSDB_MAX_UNION_CLAUSE 5 - +#define TSDB_MIN_TOTAL_BLOCKS 3 +#define TSDB_MAX_TOTAL_BLOCKS 10000 +#define TSDB_DEFAULT_TOTAL_BLOCKS 6 +#define TSDB_MIN_DAYS_PER_FILE 60 // unit minute +#define TSDB_MAX_DAYS_PER_FILE (3650 * 1440) +#define TSDB_DEFAULT_DAYS_PER_FILE (10 * 1440) +#define TSDB_MIN_KEEP (1 * 1440) // data in db to be reserved. unit minute +#define TSDB_MAX_KEEP (365000 * 1440) // data in db to be reserved. +#define TSDB_DEFAULT_KEEP (3650 * 1440) // ten years +#define TSDB_MIN_MINROWS_FBLOCK 10 +#define TSDB_MAX_MINROWS_FBLOCK 1000 +#define TSDB_DEFAULT_MINROWS_FBLOCK 100 +#define TSDB_MIN_MAXROWS_FBLOCK 200 +#define TSDB_MAX_MAXROWS_FBLOCK 10000 +#define TSDB_DEFAULT_MAXROWS_FBLOCK 4096 +#define TSDB_MIN_COMMIT_TIME 30 +#define TSDB_MAX_COMMIT_TIME 40960 +#define TSDB_DEFAULT_COMMIT_TIME 3600 +#define TSDB_MIN_FSYNC_PERIOD 0 +#define TSDB_MAX_FSYNC_PERIOD 180000 // millisecond +#define TSDB_DEFAULT_FSYNC_PERIOD 3000 // three second +#define TSDB_MIN_DB_TTL 1 +#define TSDB_DEFAULT_DB_TTL 1 +#define TSDB_MIN_WAL_LEVEL 1 +#define TSDB_MAX_WAL_LEVEL 2 +#define TSDB_DEFAULT_WAL_LEVEL 1 +#define TSDB_MIN_PRECISION TSDB_TIME_PRECISION_MILLI +#define TSDB_MAX_PRECISION TSDB_TIME_PRECISION_NANO +#define TSDB_DEFAULT_PRECISION TSDB_TIME_PRECISION_MILLI +#define TSDB_MIN_COMP_LEVEL 0 +#define TSDB_MAX_COMP_LEVEL 2 +#define TSDB_DEFAULT_COMP_LEVEL 2 +#define TSDB_MIN_DB_REPLICA 1 +#define TSDB_MAX_DB_REPLICA 3 +#define TSDB_DEFAULT_DB_REPLICA 1 +#define TSDB_DB_STRICT_OFF 0 +#define TSDB_DB_STRICT_ON 1 +#define TSDB_DEFAULT_DB_STRICT 0 #define TSDB_MIN_DB_UPDATE 0 #define TSDB_MAX_DB_UPDATE 2 -#define TSDB_DEFAULT_DB_UPDATE_OPTION 0 - -#define TSDB_MIN_DB_CACHE_LAST_ROW 0 -#define TSDB_MAX_DB_CACHE_LAST_ROW 3 -#define TSDB_DEFAULT_CACHE_LAST_ROW 0 - -#define TSDB_MIN_DB_STREAM_MODE 0 -#define TSDB_MAX_DB_STREAM_MODE 1 -#define TSDB_DEFAULT_DB_STREAM_MODE 0 +#define TSDB_DEFAULT_DB_UPDATE 0 +#define TSDB_MIN_DB_CACHE_LAST_ROW 0 +#define TSDB_MAX_DB_CACHE_LAST_ROW 3 +#define TSDB_DEFAULT_CACHE_LAST_ROW 0 +#define TSDB_DB_STREAM_MODE_OFF 0 +#define TSDB_DB_STREAM_MODE_ON 1 +#define TSDB_DEFAULT_DB_STREAM_MODE 0 +#define TSDB_DB_SINGLE_STABLE_ON 0 +#define TSDB_DB_SINGLE_STABLE_OFF 1 +#define TSDB_DEFAULT_DB_SINGLE_STABLE 0 #define TSDB_MIN_DB_FILE_FACTOR 0 #define TSDB_MAX_DB_FILE_FACTOR 1 #define TSDB_DEFAULT_DB_FILE_FACTOR 0.1 - -#define TSDB_MIN_DB_DELAY 1 -#define TSDB_MAX_DB_DELAY 10 -#define TSDB_DEFAULT_DB_DELAY 2 - -#define TSDB_DEFAULT_EXPLAIN_VERBOSE false - -#define TSDB_MIN_EXPLAIN_RATIO 0 -#define TSDB_MAX_EXPLAIN_RATIO 1 -#define TSDB_DEFAULT_EXPLAIN_RATIO 0.001 - -#define TSDB_EXPLAIN_RESULT_ROW_SIZE 1024 -#define TSDB_EXPLAIN_RESULT_COLUMN_NAME "QUERY PLAN" +#define TSDB_MIN_DB_DELAY 1 +#define TSDB_MAX_DB_DELAY 10 +#define TSDB_DEFAULT_DB_DELAY 2 +#define TSDB_MIN_EXPLAIN_RATIO 0 +#define TSDB_MAX_EXPLAIN_RATIO 1 +#define TSDB_DEFAULT_EXPLAIN_RATIO 0.001 #define TSDB_MAX_JOIN_TABLE_NUM 10 #define TSDB_MAX_UNION_CLAUSE 5 +#define TSDB_DEFAULT_EXPLAIN_VERBOSE false + +#define TSDB_EXPLAIN_RESULT_ROW_SIZE 1024 +#define TSDB_EXPLAIN_RESULT_COLUMN_NAME "QUERY PLAN" + #define TSDB_MAX_FIELD_LEN 16384 #define TSDB_MAX_BINARY_LEN (TSDB_MAX_FIELD_LEN - TSDB_KEYSIZE) // keep 16384 #define TSDB_MAX_NCHAR_LEN (TSDB_MAX_FIELD_LEN - TSDB_KEYSIZE) // keep 16384 diff --git a/source/client/src/clientImpl.c b/source/client/src/clientImpl.c index da1d214e4f..d626fffc8e 100644 --- a/source/client/src/clientImpl.c +++ b/source/client/src/clientImpl.c @@ -825,3 +825,68 @@ int32_t setQueryResultFromRsp(SReqResultInfo* pResultInfo, const SRetrieveTableR return setResultDataPtr(pResultInfo, pResultInfo->fields, pResultInfo->numOfCols, pResultInfo->numOfRows, convertUcs4); } + +TSDB_SERVER_STATUS taos_check_server_status(const char* fqdn, int port, char* details, int maxlen) { + TSDB_SERVER_STATUS code = TSDB_SRV_STATUS_UNAVAILABLE; + void* clientRpc = NULL; + SServerStatusRsp statusRsp = {0}; + SEpSet epSet = {.inUse = 0, .numOfEps = 1}; + SRpcMsg rpcMsg = {.ahandle = (void*)0x9526, .msgType = TDMT_DND_SERVER_STATUS}; + SRpcMsg rpcRsp = {0}; + SRpcInit rpcInit = {0}; + char pass[TSDB_PASSWORD_LEN + 1] = {0}; + + taosEncryptPass_c((uint8_t*)("_pwd"), strlen("_pwd"), pass); + rpcInit.label = "CHK"; + rpcInit.numOfThreads = 1; + rpcInit.cfp = NULL; + rpcInit.sessions = 16; + rpcInit.connType = TAOS_CONN_CLIENT; + rpcInit.idleTime = tsShellActivityTimer * 1000; + rpcInit.user = "_dnd"; + rpcInit.ckey = "_key"; + rpcInit.spi = 1; + rpcInit.secret = pass; + + clientRpc = rpcOpen(&rpcInit); + if (clientRpc == NULL) { + tscError("failed to init server status client"); + goto _OVER; + } + + if (fqdn == NULL) { + fqdn = tsLocalFqdn; + } + + if (port == 0) { + port = tsServerPort; + } + + tstrncpy(epSet.eps[0].fqdn, fqdn, TSDB_FQDN_LEN); + epSet.eps[0].port = (uint16_t)port; + rpcSendRecv(clientRpc, &epSet, &rpcMsg, &rpcRsp); + + if (rpcRsp.code != 0 || rpcRsp.contLen <= 0 || rpcRsp.pCont == NULL) { + tscError("failed to send server status req since %s", terrstr()); + goto _OVER; + } + + if (tDeserializeSServerStatusRsp(rpcRsp.pCont, rpcRsp.contLen, &statusRsp) != 0) { + tscError("failed to parse server status rsp since %s", terrstr()); + goto _OVER; + } + + code = statusRsp.statusCode; + if (details != NULL && statusRsp.details != NULL) { + tstrncpy(details, statusRsp.details, maxlen); + } + +_OVER: + if (clientRpc != NULL) { + rpcClose(clientRpc); + } + if (rpcRsp.pCont != NULL) { + rpcFreeCont(rpcRsp.pCont); + } + return code; +} diff --git a/source/client/src/clientMsgHandler.c b/source/client/src/clientMsgHandler.c index 74347cabf7..06b4c7b8e0 100644 --- a/source/client/src/clientMsgHandler.c +++ b/source/client/src/clientMsgHandler.c @@ -209,9 +209,9 @@ int32_t processDropDbRsp(void* param, const SDataBuf* pMsg, int32_t code) { } void initMsgHandleFp() { - handleRequestRspFp[TMSG_INDEX(TDMT_MND_CONNECT)] = processConnectRsp; - handleRequestRspFp[TMSG_INDEX(TDMT_MND_CREATE_DB)] = processCreateDbRsp; - handleRequestRspFp[TMSG_INDEX(TDMT_MND_USE_DB)] = processUseDbRsp; + handleRequestRspFp[TMSG_INDEX(TDMT_MND_CONNECT)] = processConnectRsp; + handleRequestRspFp[TMSG_INDEX(TDMT_MND_CREATE_DB)] = processCreateDbRsp; + handleRequestRspFp[TMSG_INDEX(TDMT_MND_USE_DB)] = processUseDbRsp; handleRequestRspFp[TMSG_INDEX(TDMT_MND_CREATE_STB)] = processCreateTableRsp; - handleRequestRspFp[TMSG_INDEX(TDMT_MND_DROP_DB)] = processDropDbRsp; + handleRequestRspFp[TMSG_INDEX(TDMT_MND_DROP_DB)] = processDropDbRsp; } diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c index 49f4afc12b..e9babc1298 100644 --- a/source/common/src/tglobal.c +++ b/source/common/src/tglobal.c @@ -30,7 +30,6 @@ char tsLocalEp[TSDB_EP_LEN] = {0}; // Local End Point, hostname:port uint16_t tsServerPort = 6030; int32_t tsVersion = 30000000; int32_t tsStatusInterval = 1; // second -bool tsEnableTelemetryReporting = false; // common int32_t tsRpcTimer = 300; @@ -75,6 +74,12 @@ uint16_t tsMonitorPort = 6043; int32_t tsMonitorMaxLogs = 100; bool tsMonitorComp = false; +// telem +bool tsEnableTelem = false; +int32_t tsTelemInterval = 86400; +char tsTelemServer[TSDB_FQDN_LEN] = "telemetry.taosdata.com"; +uint16_t tsTelemPort = 80; + /* * denote if the server needs to compress response message at the application layer to client, including query rsp, * metricmeta rsp, and multi-meter query rsp message body. The client compress the submit message to server. @@ -354,7 +359,6 @@ static int32_t taosAddServerCfg(SConfig *pCfg) { if (cfgAddDir(pCfg, "dataDir", tsDataDir, 0) != 0) return -1; if (cfgAddFloat(pCfg, "minimalDataDirGB", 2.0f, 0.001f, 10000000, 0) != 0) return -1; if (cfgAddInt32(pCfg, "maxNumOfDistinctRes", tsMaxNumOfDistinctResults, 10 * 10000, 10000 * 10000, 0) != 0) return -1; - if (cfgAddBool(pCfg, "telemetryReporting", tsEnableTelemetryReporting, 0) != 0) return -1; if (cfgAddInt32(pCfg, "maxConnections", tsMaxConnections, 1, 100000, 0) != 0) return -1; if (cfgAddInt32(pCfg, "maxShellConns", tsMaxShellConns, 10, 50000000, 0) != 0) return -1; if (cfgAddInt32(pCfg, "statusInterval", tsStatusInterval, 1, 30, 0) != 0) return -1; @@ -430,12 +434,17 @@ static int32_t taosAddServerCfg(SConfig *pCfg) { if (cfgAddInt32(pCfg, "numOfSnodeUniqueThreads", tsNumOfSnodeUniqueThreads, 1, 1024, 0) != 0) return -1; if (cfgAddBool(pCfg, "monitor", tsEnableMonitor, 0) != 0) return -1; - if (cfgAddInt32(pCfg, "monitorInterval", tsMonitorInterval, 1, 360000, 0) != 0) return -1; + if (cfgAddInt32(pCfg, "monitorInterval", tsMonitorInterval, 1, 200000, 0) != 0) return -1; if (cfgAddString(pCfg, "monitorFqdn", tsMonitorFqdn, 0) != 0) return -1; if (cfgAddInt32(pCfg, "monitorPort", tsMonitorPort, 1, 65056, 0) != 0) return -1; if (cfgAddInt32(pCfg, "monitorMaxLogs", tsMonitorMaxLogs, 1, 1000000, 0) != 0) return -1; if (cfgAddBool(pCfg, "monitorComp", tsMonitorComp, 0) != 0) return -1; + if (cfgAddBool(pCfg, "telemetryReporting", tsEnableTelem, 0) != 0) return -1; + if (cfgAddInt32(pCfg, "telemetryInterval", tsTelemInterval, 1, 200000, 0) != 0) return -1; + if (cfgAddString(pCfg, "telemetryServer", tsTelemServer, 0) != 0) return -1; + if (cfgAddInt32(pCfg, "telemetryPort", tsTelemPort, 1, 65056, 0) != 0) return -1; + return 0; } @@ -528,7 +537,6 @@ static void taosSetSystemCfg(SConfig *pCfg) { static int32_t taosSetServerCfg(SConfig *pCfg) { tsDataSpace.reserved = cfgGetItem(pCfg, "minimalDataDirGB")->fval; tsMaxNumOfDistinctResults = cfgGetItem(pCfg, "maxNumOfDistinctRes")->i32; - tsEnableTelemetryReporting = cfgGetItem(pCfg, "telemetryReporting")->bval; tsMaxConnections = cfgGetItem(pCfg, "maxConnections")->i32; tsMaxShellConns = cfgGetItem(pCfg, "maxShellConns")->i32; tsStatusInterval = cfgGetItem(pCfg, "statusInterval")->i32; @@ -572,6 +580,11 @@ static int32_t taosSetServerCfg(SConfig *pCfg) { tsMonitorMaxLogs = cfgGetItem(pCfg, "monitorMaxLogs")->i32; tsMonitorComp = cfgGetItem(pCfg, "monitorComp")->bval; + tsEnableTelem = cfgGetItem(pCfg, "telemetryReporting")->bval; + tsTelemInterval = cfgGetItem(pCfg, "telemetryInterval")->i32; + tstrncpy(tsTelemServer, cfgGetItem(pCfg, "telemetryServer")->str, TSDB_FQDN_LEN); + tsTelemPort = (uint16_t)cfgGetItem(pCfg, "telemetryPort")->i32; + if (tsQueryBufferSize >= 0) { tsQueryBufferSizeBytes = tsQueryBufferSize * 1048576UL; } diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c index f4ef55f865..9090ebebdb 100644 --- a/source/common/src/tmsg.c +++ b/source/common/src/tmsg.c @@ -611,6 +611,8 @@ int32_t tSerializeSMCreateStbReq(void *buf, int32_t bufLen, SMCreateStbReq *pReq if (tEncodeI32(&encoder, pReq->numOfTags) < 0) return -1; if (tEncodeI32(&encoder, pReq->numOfSmas) < 0) return -1; if (tEncodeI32(&encoder, pReq->commentLen) < 0) return -1; + if (tEncodeI32(&encoder, pReq->ast1Len) < 0) return -1; + if (tEncodeI32(&encoder, pReq->ast2Len) < 0) return -1; for (int32_t i = 0; i < pReq->numOfColumns; ++i) { SField *pField = taosArrayGet(pReq->pColumns, i); @@ -636,6 +638,12 @@ int32_t tSerializeSMCreateStbReq(void *buf, int32_t bufLen, SMCreateStbReq *pReq if (pReq->commentLen > 0) { if (tEncodeBinary(&encoder, pReq->comment, pReq->commentLen) < 0) return -1; } + if (pReq->ast1Len > 0) { + if (tEncodeBinary(&encoder, pReq->pAst1, pReq->ast1Len) < 0) return -1; + } + if (pReq->ast2Len > 0) { + if (tEncodeBinary(&encoder, pReq->pAst2, pReq->ast2Len) < 0) return -1; + } tEndEncode(&encoder); int32_t tlen = encoder.pos; @@ -658,6 +666,8 @@ int32_t tDeserializeSMCreateStbReq(void *buf, int32_t bufLen, SMCreateStbReq *pR if (tDecodeI32(&decoder, &pReq->numOfTags) < 0) return -1; if (tDecodeI32(&decoder, &pReq->numOfSmas) < 0) return -1; if (tDecodeI32(&decoder, &pReq->commentLen) < 0) return -1; + if (tDecodeI32(&decoder, &pReq->ast1Len) < 0) return -1; + if (tDecodeI32(&decoder, &pReq->ast2Len) < 0) return -1; pReq->pColumns = taosArrayInit(pReq->numOfColumns, sizeof(SField)); pReq->pTags = taosArrayInit(pReq->numOfTags, sizeof(SField)); @@ -706,6 +716,18 @@ int32_t tDeserializeSMCreateStbReq(void *buf, int32_t bufLen, SMCreateStbReq *pR if (tDecodeCStrTo(&decoder, pReq->comment) < 0) return -1; } + if (pReq->ast1Len > 0) { + pReq->pAst1 = taosMemoryMalloc(pReq->ast1Len); + if (pReq->pAst1 == NULL) return -1; + if (tDecodeCStrTo(&decoder, pReq->pAst1) < 0) return -1; + } + + if (pReq->ast2Len > 0) { + pReq->pAst2 = taosMemoryMalloc(pReq->ast2Len); + if (pReq->pAst2 == NULL) return -1; + if (tDecodeCStrTo(&decoder, pReq->pAst2) < 0) return -1; + } + tEndDecode(&decoder); tCoderClear(&decoder); @@ -717,6 +739,8 @@ void tFreeSMCreateStbReq(SMCreateStbReq *pReq) { taosArrayDestroy(pReq->pTags); taosArrayDestroy(pReq->pSmas); taosMemoryFreeClear(pReq->comment); + taosMemoryFreeClear(pReq->pAst1); + taosMemoryFreeClear(pReq->pAst2); pReq->pColumns = NULL; pReq->pTags = NULL; pReq->pSmas = NULL; @@ -1003,7 +1027,7 @@ int32_t tSerializeSStatusReq(void *buf, int32_t bufLen, SStatusReq *pReq) { for (int32_t i = 0; i < vlen; ++i) { SVnodeLoad *pload = taosArrayGet(pReq->pVloads, i); if (tEncodeI32(&encoder, pload->vgId) < 0) return -1; - if (tEncodeI8(&encoder, pload->role) < 0) return -1; + if (tEncodeI32(&encoder, pload->syncState) < 0) return -1; if (tEncodeI64(&encoder, pload->numOfTables) < 0) return -1; if (tEncodeI64(&encoder, pload->numOfTimeSeries) < 0) return -1; if (tEncodeI64(&encoder, pload->totalStorage) < 0) return -1; @@ -1054,7 +1078,7 @@ int32_t tDeserializeSStatusReq(void *buf, int32_t bufLen, SStatusReq *pReq) { for (int32_t i = 0; i < vlen; ++i) { SVnodeLoad vload = {0}; if (tDecodeI32(&decoder, &vload.vgId) < 0) return -1; - if (tDecodeI8(&decoder, &vload.role) < 0) return -1; + if (tDecodeI32(&decoder, &vload.syncState) < 0) return -1; if (tDecodeI64(&decoder, &vload.numOfTables) < 0) return -1; if (tDecodeI64(&decoder, &vload.numOfTimeSeries) < 0) return -1; if (tDecodeI64(&decoder, &vload.totalStorage) < 0) return -1; @@ -1736,7 +1760,7 @@ int32_t tSerializeSCreateDbReq(void *buf, int32_t bufLen, SCreateDbReq *pReq) { if (tEncodeI8(&encoder, pReq->precision) < 0) return -1; if (tEncodeI8(&encoder, pReq->compression) < 0) return -1; if (tEncodeI8(&encoder, pReq->replications) < 0) return -1; - if (tEncodeI8(&encoder, pReq->quorum) < 0) return -1; + if (tEncodeI8(&encoder, pReq->strict) < 0) return -1; if (tEncodeI8(&encoder, pReq->update) < 0) return -1; if (tEncodeI8(&encoder, pReq->cacheLastRow) < 0) return -1; if (tEncodeI8(&encoder, pReq->ignoreExist) < 0) return -1; @@ -1779,7 +1803,7 @@ int32_t tDeserializeSCreateDbReq(void *buf, int32_t bufLen, SCreateDbReq *pReq) if (tDecodeI8(&decoder, &pReq->precision) < 0) return -1; if (tDecodeI8(&decoder, &pReq->compression) < 0) return -1; if (tDecodeI8(&decoder, &pReq->replications) < 0) return -1; - if (tDecodeI8(&decoder, &pReq->quorum) < 0) return -1; + if (tDecodeI8(&decoder, &pReq->strict) < 0) return -1; if (tDecodeI8(&decoder, &pReq->update) < 0) return -1; if (tDecodeI8(&decoder, &pReq->cacheLastRow) < 0) return -1; if (tDecodeI8(&decoder, &pReq->ignoreExist) < 0) return -1; @@ -1827,7 +1851,7 @@ int32_t tSerializeSAlterDbReq(void *buf, int32_t bufLen, SAlterDbReq *pReq) { if (tEncodeI32(&encoder, pReq->daysToKeep2) < 0) return -1; if (tEncodeI32(&encoder, pReq->fsyncPeriod) < 0) return -1; if (tEncodeI8(&encoder, pReq->walLevel) < 0) return -1; - if (tEncodeI8(&encoder, pReq->quorum) < 0) return -1; + if (tEncodeI8(&encoder, pReq->strict) < 0) return -1; if (tEncodeI8(&encoder, pReq->cacheLastRow) < 0) return -1; if (tEncodeI8(&encoder, pReq->replications) < 0) return -1; tEndEncode(&encoder); @@ -1849,7 +1873,7 @@ int32_t tDeserializeSAlterDbReq(void *buf, int32_t bufLen, SAlterDbReq *pReq) { if (tDecodeI32(&decoder, &pReq->daysToKeep2) < 0) return -1; if (tDecodeI32(&decoder, &pReq->fsyncPeriod) < 0) return -1; if (tDecodeI8(&decoder, &pReq->walLevel) < 0) return -1; - if (tDecodeI8(&decoder, &pReq->quorum) < 0) return -1; + if (tDecodeI8(&decoder, &pReq->strict) < 0) return -1; if (tDecodeI8(&decoder, &pReq->cacheLastRow) < 0) return -1; if (tDecodeI8(&decoder, &pReq->replications) < 0) return -1; tEndDecode(&decoder); @@ -2006,7 +2030,7 @@ int32_t tDeserializeSQnodeListRsp(void *buf, int32_t bufLen, SQnodeListRsp *pRsp void tFreeSQnodeListRsp(SQnodeListRsp *pRsp) { taosArrayDestroy(pRsp->epSetList); } -int32_t tSerializeSSyncDbReq(void *buf, int32_t bufLen, SSyncDbReq *pReq) { +int32_t tSerializeSCompactDbReq(void *buf, int32_t bufLen, SCompactDbReq *pReq) { SCoder encoder = {0}; tCoderInit(&encoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_ENCODER); @@ -2019,7 +2043,7 @@ int32_t tSerializeSSyncDbReq(void *buf, int32_t bufLen, SSyncDbReq *pReq) { return tlen; } -int32_t tDeserializeSSyncDbReq(void *buf, int32_t bufLen, SSyncDbReq *pReq) { +int32_t tDeserializeSCompactDbReq(void *buf, int32_t bufLen, SCompactDbReq *pReq) { SCoder decoder = {0}; tCoderInit(&decoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_DECODER); @@ -2207,10 +2231,18 @@ int32_t tSerializeSDbCfgRsp(void *buf, int32_t bufLen, const SDbCfgRsp *pRsp) { if (tEncodeI8(&encoder, pRsp->precision) < 0) return -1; if (tEncodeI8(&encoder, pRsp->compression) < 0) return -1; if (tEncodeI8(&encoder, pRsp->replications) < 0) return -1; - if (tEncodeI8(&encoder, pRsp->quorum) < 0) return -1; + if (tEncodeI8(&encoder, pRsp->strict) < 0) return -1; if (tEncodeI8(&encoder, pRsp->update) < 0) return -1; if (tEncodeI8(&encoder, pRsp->cacheLastRow) < 0) return -1; if (tEncodeI8(&encoder, pRsp->streamMode) < 0) return -1; + if (tEncodeI32(&encoder, pRsp->numOfRetensions) < 0) return -1; + for (int32_t i = 0; i < pRsp->numOfRetensions; ++i) { + SRetention *pRetension = taosArrayGet(pRsp->pRetensions, i); + if (tEncodeI32(&encoder, pRetension->freq) < 0) return -1; + if (tEncodeI32(&encoder, pRetension->keep) < 0) return -1; + if (tEncodeI8(&encoder, pRetension->freqUnit) < 0) return -1; + if (tEncodeI8(&encoder, pRetension->keepUnit) < 0) return -1; + } tEndEncode(&encoder); int32_t tlen = encoder.pos; @@ -2238,11 +2270,28 @@ int32_t tDeserializeSDbCfgRsp(void *buf, int32_t bufLen, SDbCfgRsp *pRsp) { if (tDecodeI8(&decoder, &pRsp->precision) < 0) return -1; if (tDecodeI8(&decoder, &pRsp->compression) < 0) return -1; if (tDecodeI8(&decoder, &pRsp->replications) < 0) return -1; - if (tDecodeI8(&decoder, &pRsp->quorum) < 0) return -1; + if (tDecodeI8(&decoder, &pRsp->strict) < 0) return -1; if (tDecodeI8(&decoder, &pRsp->update) < 0) return -1; if (tDecodeI8(&decoder, &pRsp->cacheLastRow) < 0) return -1; if (tDecodeI8(&decoder, &pRsp->streamMode) < 0) return -1; + if (tDecodeI32(&decoder, &pRsp->numOfRetensions) < 0) return -1; + pRsp->pRetensions = taosArrayInit(pRsp->numOfRetensions, sizeof(SRetention)); + if (pRsp->pRetensions == NULL) { + terrno = TSDB_CODE_OUT_OF_MEMORY; + return -1; + } + for (int32_t i = 0; i < pRsp->numOfRetensions; ++i) { + SRetention rentension = {0}; + if (tDecodeI32(&decoder, &rentension.freq) < 0) return -1; + if (tDecodeI32(&decoder, &rentension.keep) < 0) return -1; + if (tDecodeI8(&decoder, &rentension.freqUnit) < 0) return -1; + if (tDecodeI8(&decoder, &rentension.keepUnit) < 0) return -1; + if (taosArrayPush(pRsp->pRetensions, &rentension) == NULL) { + terrno = TSDB_CODE_OUT_OF_MEMORY; + return -1; + } + } tEndDecode(&decoder); tCoderClear(&decoder); @@ -2831,7 +2880,7 @@ int32_t tSerializeSCreateVnodeReq(void *buf, int32_t bufLen, SCreateVnodeReq *pR if (tEncodeI8(&encoder, pReq->walLevel) < 0) return -1; if (tEncodeI8(&encoder, pReq->precision) < 0) return -1; if (tEncodeI8(&encoder, pReq->compression) < 0) return -1; - if (tEncodeI8(&encoder, pReq->quorum) < 0) return -1; + if (tEncodeI8(&encoder, pReq->strict) < 0) return -1; if (tEncodeI8(&encoder, pReq->update) < 0) return -1; if (tEncodeI8(&encoder, pReq->cacheLastRow) < 0) return -1; if (tEncodeI8(&encoder, pReq->replica) < 0) return -1; @@ -2882,7 +2931,7 @@ int32_t tDeserializeSCreateVnodeReq(void *buf, int32_t bufLen, SCreateVnodeReq * if (tDecodeI8(&decoder, &pReq->walLevel) < 0) return -1; if (tDecodeI8(&decoder, &pReq->precision) < 0) return -1; if (tDecodeI8(&decoder, &pReq->compression) < 0) return -1; - if (tDecodeI8(&decoder, &pReq->quorum) < 0) return -1; + if (tDecodeI8(&decoder, &pReq->strict) < 0) return -1; if (tDecodeI8(&decoder, &pReq->update) < 0) return -1; if (tDecodeI8(&decoder, &pReq->cacheLastRow) < 0) return -1; if (tDecodeI8(&decoder, &pReq->replica) < 0) return -1; @@ -2954,6 +3003,87 @@ int32_t tDeserializeSDropVnodeReq(void *buf, int32_t bufLen, SDropVnodeReq *pReq return 0; } +int32_t tSerializeSCompactVnodeReq(void *buf, int32_t bufLen, SCompactVnodeReq *pReq) { + SCoder encoder = {0}; + tCoderInit(&encoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_ENCODER); + + if (tStartEncode(&encoder) < 0) return -1; + if (tEncodeI64(&encoder, pReq->dbUid) < 0) return -1; + if (tEncodeCStr(&encoder, pReq->db) < 0) return -1; + tEndEncode(&encoder); + + int32_t tlen = encoder.pos; + tCoderClear(&encoder); + return tlen; +} + +int32_t tDeserializeSCompactVnodeReq(void *buf, int32_t bufLen, SCompactVnodeReq *pReq) { + SCoder decoder = {0}; + tCoderInit(&decoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_DECODER); + + if (tStartDecode(&decoder) < 0) return -1; + if (tDecodeI64(&decoder, &pReq->dbUid) < 0) return -1; + if (tDecodeCStrTo(&decoder, pReq->db) < 0) return -1; + tEndDecode(&decoder); + + tCoderClear(&decoder); + return 0; +} + + +int32_t tSerializeSAlterVnodeReq(void *buf, int32_t bufLen, SAlterVnodeReq *pReq) { + SCoder encoder = {0}; + tCoderInit(&encoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_ENCODER); + + if (tStartEncode(&encoder) < 0) return -1; + if (tEncodeI32(&encoder, pReq->vgVersion) < 0) return -1; + if (tEncodeI32(&encoder, pReq->totalBlocks) < 0) return -1; + if (tEncodeI32(&encoder, pReq->daysToKeep0) < 0) return -1; + if (tEncodeI32(&encoder, pReq->daysToKeep1) < 0) return -1; + if (tEncodeI32(&encoder, pReq->daysToKeep2) < 0) return -1; + if (tEncodeI8(&encoder, pReq->walLevel) < 0) return -1; + if (tEncodeI8(&encoder, pReq->strict) < 0) return -1; + if (tEncodeI8(&encoder, pReq->cacheLastRow) < 0) return -1; + if (tEncodeI8(&encoder, pReq->replica) < 0) return -1; + if (tEncodeI8(&encoder, pReq->selfIndex) < 0) return -1; + for (int32_t i = 0; i < TSDB_MAX_REPLICA; ++i) { + SReplica *pReplica = &pReq->replicas[i]; + if (tEncodeSReplica(&encoder, pReplica) < 0) return -1; + } + + tEndEncode(&encoder); + + int32_t tlen = encoder.pos; + tCoderClear(&encoder); + return tlen; +} + +int32_t tDeserializeSAlterVnodeReq(void *buf, int32_t bufLen, SAlterVnodeReq *pReq) { + SCoder decoder = {0}; + tCoderInit(&decoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_DECODER); + + if (tStartDecode(&decoder) < 0) return -1; + if (tDecodeI32(&decoder, &pReq->vgVersion) < 0) return -1; + if (tDecodeI32(&decoder, &pReq->totalBlocks) < 0) return -1; + if (tDecodeI32(&decoder, &pReq->daysToKeep0) < 0) return -1; + if (tDecodeI32(&decoder, &pReq->daysToKeep1) < 0) return -1; + if (tDecodeI32(&decoder, &pReq->daysToKeep2) < 0) return -1; + if (tDecodeI8(&decoder, &pReq->walLevel) < 0) return -1; + if (tDecodeI8(&decoder, &pReq->strict) < 0) return -1; + if (tDecodeI8(&decoder, &pReq->cacheLastRow) < 0) return -1; + if (tDecodeI8(&decoder, &pReq->replica) < 0) return -1; + if (tDecodeI8(&decoder, &pReq->selfIndex) < 0) return -1; + for (int32_t i = 0; i < TSDB_MAX_REPLICA; ++i) { + SReplica *pReplica = &pReq->replicas[i]; + if (tDecodeSReplica(&decoder, pReplica) < 0) return -1; + } + + tEndDecode(&decoder); + tCoderClear(&decoder); + return 0; +} + + int32_t tSerializeSKillQueryReq(void *buf, int32_t bufLen, SKillQueryReq *pReq) { SCoder encoder = {0}; tCoderInit(&encoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_ENCODER); @@ -3099,6 +3229,34 @@ int32_t tDeserializeSAuthReq(void *buf, int32_t bufLen, SAuthReq *pReq) { return 0; } +int32_t tSerializeSServerStatusRsp(void *buf, int32_t bufLen, SServerStatusRsp *pRsp) { + SCoder encoder = {0}; + tCoderInit(&encoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_ENCODER); + + if (tStartEncode(&encoder) < 0) return -1; + if (tEncodeI32(&encoder, pRsp->statusCode) < 0) return -1; + if (tEncodeCStr(&encoder, pRsp->details) < 0) return -1; + + tEndEncode(&encoder); + + int32_t tlen = encoder.pos; + tCoderClear(&encoder); + return tlen; +} + +int32_t tDeserializeSServerStatusRsp(void *buf, int32_t bufLen, SServerStatusRsp *pRsp) { + SCoder decoder = {0}; + tCoderInit(&decoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_DECODER); + + if (tStartDecode(&decoder) < 0) return -1; + if (tDecodeI32(&decoder, &pRsp->statusCode) < 0) return -1; + if (tDecodeCStrTo(&decoder, pRsp->details) < 0) return -1; + + tEndDecode(&decoder); + tCoderClear(&decoder); + return 0; +} + int32_t tEncodeSMqOffset(SCoder *encoder, const SMqOffset *pOffset) { if (tEncodeI32(encoder, pOffset->vgId) < 0) return -1; if (tEncodeI64(encoder, pOffset->offset) < 0) return -1; @@ -3488,3 +3646,27 @@ void tFreeSCMCreateStreamReq(SCMCreateStreamReq *pReq) { taosMemoryFreeClear(pReq->sql); taosMemoryFreeClear(pReq->ast); } + +STSchema *tdGetSTSChemaFromSSChema(SSchema **pSchema, int32_t nCols) { + STSchemaBuilder schemaBuilder = {0}; + if (tdInitTSchemaBuilder(&schemaBuilder, 0) < 0) { + return NULL; + } + + for (int i = 0; i < nCols; i++) { + SSchema *schema = *pSchema + i; + if (tdAddColToSchema(&schemaBuilder, schema->type, schema->flags, schema->colId, schema->bytes) < 0) { + tdDestroyTSchemaBuilder(&schemaBuilder); + return NULL; + } + } + + STSchema *pNSchema = tdGetSchemaFromBuilder(&schemaBuilder); + if (pNSchema == NULL) { + tdDestroyTSchemaBuilder(&schemaBuilder); + return NULL; + } + + tdDestroyTSchemaBuilder(&schemaBuilder); + return pNSchema; +} diff --git a/source/common/src/tmsgcb.c b/source/common/src/tmsgcb.c index cb5e2b07c1..5b4bb539e3 100644 --- a/source/common/src/tmsgcb.c +++ b/source/common/src/tmsgcb.c @@ -40,4 +40,8 @@ void tmsgRegisterBrokenLinkArg(const SMsgCb* pMsgCb, SRpcMsg* pMsg) { void tmsgReleaseHandle(void* handle, int8_t type) { (*tsDefaultMsgCb.releaseHandleFp)(tsDefaultMsgCb.pWrapper, handle, type); +} + +void tmsgReportStartup(const char* name, const char* desc) { + (*tsDefaultMsgCb.reportStartupFp)(tsDefaultMsgCb.pWrapper, name, desc); } \ No newline at end of file diff --git a/source/common/src/trow.c b/source/common/src/trow.c index 6685fdf2a7..c73f26e6da 100644 --- a/source/common/src/trow.c +++ b/source/common/src/trow.c @@ -24,9 +24,8 @@ const uint8_t tdVTypeByte[2][3] = {{ }, { // 1 bit - TD_VTYPE_NORM_BYTE_I, - TD_VTYPE_NULL_BYTE_I, - TD_VTYPE_NULL_BYTE_I, // padding + TD_VTYPE_NORM_BYTE_I, TD_VTYPE_NULL_BYTE_I, + TD_VTYPE_NULL_BYTE_I, // padding } }; @@ -224,17 +223,40 @@ static uint8_t tdGetMergedBitmapByte(uint8_t byte) { * @brief Merge bitmap from 2 bits to 1 bits, and the memory buffer should be guaranteed by the invoker. * * @param srcBitmap - * @param srcLen + * @param nBits * @param dstBitmap */ -void tdMergeBitmap(uint8_t *srcBitmap, int32_t srcLen, uint8_t *dstBitmap) { +void tdMergeBitmap(uint8_t *srcBitmap, int32_t nBits, uint8_t *dstBitmap) { int32_t i = 0, j = 0; + int32_t nBytes = TD_BITMAP_BYTES(nBits); + int32_t nStrictBytes = nBits / 4; + int32_t nPartialBits = nBits - nStrictBytes * 4; - if (srcLen > 0) { + switch (nPartialBits) { + case 0: + // NOTHING TODO + break; + case 1: { + void *lastByte = POINTER_SHIFT(srcBitmap, nStrictBytes); + *(uint8_t *)lastByte &= 0xC0; + } break; + case 2: { + void *lastByte = POINTER_SHIFT(srcBitmap, nStrictBytes); + *(uint8_t *)lastByte &= 0xF0; + } break; + case 3: { + void *lastByte = POINTER_SHIFT(srcBitmap, nStrictBytes); + *(uint8_t *)lastByte &= 0xFC; + } break; + default: + ASSERT(0); + } + + if (nBytes > 0) { dstBitmap[j] = (tdGetMergedBitmapByte(srcBitmap[i]) << 4); } - while ((++i) < srcLen) { + while ((++i) < nBytes) { if ((i & 1) == 0) { dstBitmap[j] = (tdGetMergedBitmapByte(srcBitmap[i]) << 4); } else { @@ -381,17 +403,18 @@ STSRow *tdRowDup(STSRow *row) { } /** - * @brief - * - * @param pCol - * @param valType - * @param val - * @param numOfRows - * @param maxPoints + * @brief + * + * @param pCol + * @param valType + * @param val + * @param numOfRows + * @param maxPoints * @param bitmapMode default is 0(2 bits), otherwise 1(1 bit) - * @return int + * @return int */ -int tdAppendValToDataCol(SDataCol *pCol, TDRowValT valType, const void *val, int numOfRows, int maxPoints, int8_t bitmapMode) { +int tdAppendValToDataCol(SDataCol *pCol, TDRowValT valType, const void *val, int numOfRows, int maxPoints, + int8_t bitmapMode) { TASSERT(pCol != NULL); // Assume that the columns not specified during insert/upsert mean None. @@ -426,7 +449,7 @@ int tdAppendValToDataCol(SDataCol *pCol, TDRowValT valType, const void *val, int pCol->len += pCol->bytes; } #ifdef TD_SUPPORT_BITMAP - tdSetBitmapValType(pCol->pBitmap, numOfRows, valType, bitmapMode); + tdSetBitmapValType(pCol->pBitmap, numOfRows, valType, bitmapMode); #endif return 0; } @@ -538,7 +561,8 @@ int32_t tdAppendSTSRowToDataCol(STSRow *pRow, STSchema *pSchema, SDataCols *pCol return TSDB_CODE_SUCCESS; } -int tdMergeDataCols(SDataCols *target, SDataCols *source, int rowsToMerge, int *pOffset, bool forceSetNull, TDRowVerT maxVer) { +int tdMergeDataCols(SDataCols *target, SDataCols *source, int rowsToMerge, int *pOffset, bool forceSetNull, + TDRowVerT maxVer) { ASSERT(rowsToMerge > 0 && rowsToMerge <= source->numOfRows); ASSERT(target->numOfCols == source->numOfCols); int offset = 0; @@ -559,7 +583,8 @@ int tdMergeDataCols(SDataCols *target, SDataCols *source, int rowsToMerge, int * if (tdGetColDataOfRow(&sVal, source->cols + j, i + (*pOffset), source->bitmapMode) < 0) { TASSERT(0); } - tdAppendValToDataCol(target->cols + j, sVal.valType, sVal.val, target->numOfRows, target->maxPoints, target->bitmapMode); + tdAppendValToDataCol(target->cols + j, sVal.valType, sVal.val, target->numOfRows, target->maxPoints, + target->bitmapMode); } } ++target->numOfRows; @@ -606,7 +631,8 @@ static void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, i if (tdGetColDataOfRow(&sVal, src1->cols + i, *iter1, src1->bitmapMode) < 0) { TASSERT(0); } - tdAppendValToDataCol(&(target->cols[i]), sVal.valType, sVal.val, target->numOfRows, target->maxPoints, target->bitmapMode); + tdAppendValToDataCol(&(target->cols[i]), sVal.valType, sVal.val, target->numOfRows, target->maxPoints, + target->bitmapMode); } } @@ -622,12 +648,14 @@ static void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, i TASSERT(0); } if (src2->cols[i].len > 0 && !tdValTypeIsNull(sVal.valType)) { - tdAppendValToDataCol(&(target->cols[i]), sVal.valType, sVal.val, target->numOfRows, target->maxPoints, target->bitmapMode); + tdAppendValToDataCol(&(target->cols[i]), sVal.valType, sVal.val, target->numOfRows, target->maxPoints, + target->bitmapMode); } else if (!forceSetNull && key1 == key2 && src1->cols[i].len > 0) { if (tdGetColDataOfRow(&sVal, src1->cols + i, *iter1, src1->bitmapMode) < 0) { TASSERT(0); } - tdAppendValToDataCol(&(target->cols[i]), sVal.valType, sVal.val, target->numOfRows, target->maxPoints, target->bitmapMode); + tdAppendValToDataCol(&(target->cols[i]), sVal.valType, sVal.val, target->numOfRows, target->maxPoints, + target->bitmapMode); } else if (target->cols[i].len > 0) { dataColSetNullAt(&target->cols[i], target->numOfRows, true, target->bitmapMode); } diff --git a/source/dnode/mgmt/implement/inc/dmImp.h b/source/dnode/mgmt/implement/inc/dmImp.h index 52a56305fd..32869aee9e 100644 --- a/source/dnode/mgmt/implement/inc/dmImp.h +++ b/source/dnode/mgmt/implement/inc/dmImp.h @@ -49,6 +49,7 @@ int32_t dmProcessDropNodeReq(SDnode *pDnode, EDndNodeType ntype, SNodeMsg *pMsg) // dmMonitor.c void dmGetVnodeLoads(SDnode *pDnode, SMonVloadInfo *pInfo); +void dmGetMnodeLoads(SDnode *pDnode, SMonMloadInfo *pInfo); void dmSendMonitorReport(SDnode *pDnode); // dmWorker.c @@ -70,6 +71,7 @@ void vmSetMgmtFp(SMgmtWrapper *pWrapper); void mmSetMgmtFp(SMgmtWrapper *pWrapper); void vmGetVnodeLoads(SMgmtWrapper *pWrapper, SMonVloadInfo *pInfo); +void mmGetMnodeLoads(SMgmtWrapper *pWrapper, SMonMloadInfo *pInfo); void mmGetMonitorInfo(SMgmtWrapper *pWrapper, SMonMmInfo *mmInfo); void vmGetMonitorInfo(SMgmtWrapper *pWrapper, SMonVmInfo *vmInfo); void qmGetMonitorInfo(SMgmtWrapper *pWrapper, SMonQmInfo *qmInfo); diff --git a/source/dnode/mgmt/implement/src/dmExec.c b/source/dnode/mgmt/implement/src/dmExec.c index f66e7cd9d3..c0b85ed705 100644 --- a/source/dnode/mgmt/implement/src/dmExec.c +++ b/source/dnode/mgmt/implement/src/dmExec.c @@ -140,6 +140,7 @@ int32_t dmOpenNode(SMgmtWrapper *pWrapper) { if (dmRunParentProc(pWrapper) != 0) return -1; } + dmReportStartup(pWrapper->pDnode, pWrapper->name, "openned"); return 0; } @@ -161,6 +162,7 @@ int32_t dmStartNode(SMgmtWrapper *pWrapper) { } } + dmReportStartup(pWrapper->pDnode, pWrapper->name, "started"); return 0; } @@ -172,6 +174,11 @@ void dmStopNode(SMgmtWrapper *pWrapper) { void dmCloseNode(SMgmtWrapper *pWrapper) { dInfo("node:%s, start to close", pWrapper->name); + + while (pWrapper->refCount > 0) { + taosMsleep(10); + } + if (pWrapper->procType == DND_PROC_PARENT) { if (pWrapper->procId > 0 && taosProcExist(pWrapper->procId)) { dInfo("node:%s, send kill signal to the child process:%d", pWrapper->name, pWrapper->procId); @@ -184,18 +191,10 @@ void dmCloseNode(SMgmtWrapper *pWrapper) { dmStopNode(pWrapper); - pWrapper->required = false; taosWLockLatch(&pWrapper->latch); - if (pWrapper->deployed) { - (*pWrapper->fp.closeFp)(pWrapper); - pWrapper->deployed = false; - } + (*pWrapper->fp.closeFp)(pWrapper); taosWUnLockLatch(&pWrapper->latch); - while (pWrapper->refCount > 0) { - taosMsleep(10); - } - if (pWrapper->procObj) { taosProcCleanup(pWrapper->procObj); pWrapper->procObj = NULL; diff --git a/source/dnode/mgmt/implement/src/dmHandle.c b/source/dnode/mgmt/implement/src/dmHandle.c index 1179db8ae2..dd221f8404 100644 --- a/source/dnode/mgmt/implement/src/dmHandle.c +++ b/source/dnode/mgmt/implement/src/dmHandle.c @@ -36,7 +36,8 @@ static int32_t dmProcessStatusRsp(SDnode *pDnode, SRpcMsg *pRsp) { } } else { SStatusRsp statusRsp = {0}; - if (pRsp->pCont != NULL && pRsp->contLen > 0 && tDeserializeSStatusRsp(pRsp->pCont, pRsp->contLen, &statusRsp) == 0) { + if (pRsp->pCont != NULL && pRsp->contLen > 0 && + tDeserializeSStatusRsp(pRsp->pCont, pRsp->contLen, &statusRsp) == 0) { pDnode->data.dnodeVer = statusRsp.dnodeVer; dmUpdateDnodeCfg(pDnode, &statusRsp.dnodeCfg); dmUpdateEps(pDnode, statusRsp.pDnodeEps); @@ -71,12 +72,26 @@ void dmSendStatusReq(SDnode *pDnode) { memcpy(req.clusterCfg.charset, tsCharset, TD_LOCALE_LEN); taosRUnLockLatch(&pDnode->data.latch); - SMonVloadInfo info = {0}; - dmGetVnodeLoads(pDnode, &info); - req.pVloads = info.pVloads; + SMonVloadInfo vinfo = {0}; + dmGetVnodeLoads(pDnode, &vinfo); + req.pVloads = vinfo.pVloads; + pDnode->data.unsyncedVgId = 0; + pDnode->data.vndState = TAOS_SYNC_STATE_LEADER; + for (int32_t i = 0; i < taosArrayGetSize(req.pVloads); ++i) { + SVnodeLoad *pLoad = taosArrayGet(req.pVloads, i); + if (pLoad->syncState != TAOS_SYNC_STATE_LEADER && pLoad->syncState != TAOS_SYNC_STATE_FOLLOWER) { + pDnode->data.unsyncedVgId = pLoad->vgId; + pDnode->data.vndState = pLoad->syncState; + } + } + + SMonMloadInfo minfo = {0}; + dmGetMnodeLoads(pDnode, &minfo); + pDnode->data.isMnode = minfo.isMnode; + pDnode->data.mndState = minfo.load.syncState; int32_t contLen = tSerializeSStatusReq(NULL, 0, &req); - void * pHead = rpcMallocCont(contLen); + void *pHead = rpcMallocCont(contLen); tSerializeSStatusReq(pHead, contLen, &req); tFreeSStatusReq(&req); @@ -101,7 +116,7 @@ int32_t dmProcessGrantRsp(SDnode *pDnode, SNodeMsg *pMsg) { } int32_t dmProcessConfigReq(SDnode *pDnode, SNodeMsg *pMsg) { - SRpcMsg * pReq = &pMsg->rpcMsg; + SRpcMsg *pReq = &pMsg->rpcMsg; SDCfgDnodeReq *pCfg = pReq->pCont; dError("config req is received, but not supported yet"); return TSDB_CODE_OPS_NOT_SUPPORT; @@ -160,9 +175,9 @@ int32_t dmProcessDropNodeReq(SDnode *pDnode, EDndNodeType ntype, SNodeMsg *pMsg) dmReleaseWrapper(pWrapper); if (code == 0) { - dmCloseNode(pWrapper); pWrapper->required = false; pWrapper->deployed = false; + dmCloseNode(pWrapper); taosRemoveDir(pWrapper->path); } taosThreadMutexUnlock(&pDnode->mutex); @@ -230,6 +245,7 @@ static int32_t dmInitMgmt(SMgmtWrapper *pWrapper) { dError("failed to init transport since %s", terrstr()); return -1; } + dmReportStartup(pDnode, "dnode-transport", "initialized"); dInfo("dnode-mgmt is initialized"); return 0; diff --git a/source/dnode/mgmt/implement/src/dmMonitor.c b/source/dnode/mgmt/implement/src/dmMonitor.c index b0774cd66f..8543310eb5 100644 --- a/source/dnode/mgmt/implement/src/dmMonitor.c +++ b/source/dnode/mgmt/implement/src/dmMonitor.c @@ -183,3 +183,29 @@ void dmGetVnodeLoads(SDnode *pDnode, SMonVloadInfo *pInfo) { } dmReleaseWrapper(pWrapper); } + +void dmGetMnodeLoads(SDnode *pDnode, SMonMloadInfo *pInfo) { + SMgmtWrapper *pWrapper = dmAcquireWrapper(pDnode, MNODE); + if (pWrapper == NULL) { + pInfo->isMnode = 0; + return; + } + + bool getFromAPI = !tsMultiProcess; + if (getFromAPI) { + mmGetMnodeLoads(pWrapper, pInfo); + } else { + SRpcMsg req = {.msgType = TDMT_MON_MM_LOAD}; + SRpcMsg rsp = {0}; + SEpSet epset = {.inUse = 0, .numOfEps = 1}; + tstrncpy(epset.eps[0].fqdn, pDnode->data.localFqdn, TSDB_FQDN_LEN); + epset.eps[0].port = tsServerPort; + + dmSendRecv(pDnode, &epset, &req, &rsp); + if (rsp.code == 0 && rsp.contLen > 0) { + tDeserializeSMonMloadInfo(rsp.pCont, rsp.contLen, pInfo); + } + rpcFreeCont(rsp.pCont); + } + dmReleaseWrapper(pWrapper); +} diff --git a/source/dnode/mgmt/implement/src/dmTransport.c b/source/dnode/mgmt/implement/src/dmTransport.c index aa38c2492d..7cfec917b1 100644 --- a/source/dnode/mgmt/implement/src/dmTransport.c +++ b/source/dnode/mgmt/implement/src/dmTransport.c @@ -125,9 +125,9 @@ static void dmProcessMsg(SDnode *pDnode, SRpcMsg *pMsg, SEpSet *pEpSet) { SMsgHandle *pHandle = &pTrans->msgHandles[TMSG_INDEX(msgType)]; SMgmtWrapper *pWrapper = pHandle->pNdWrapper; - if (msgType == TDMT_DND_NETWORK_TEST) { - dTrace("network test req will be processed, handle:%p, app:%p", pMsg->handle, pMsg->ahandle); - dmProcessStartupReq(pDnode, pMsg); + if (msgType == TDMT_DND_SERVER_STATUS) { + dTrace("server status req will be processed, handle:%p, app:%p", pMsg->handle, pMsg->ahandle); + dmProcessServerStatusReq(pDnode, pMsg); return; } @@ -519,6 +519,7 @@ SMsgCb dmGetMsgcb(SMgmtWrapper *pWrapper) { .sendRspFp = dmSendRsp, .registerBrokenLinkArgFp = dmRegisterBrokenLinkArg, .releaseHandleFp = dmReleaseHandle, + .reportStartupFp = dmReportStartupByWrapper, .pWrapper = pWrapper, }; return msgCb; diff --git a/source/dnode/mgmt/implement/src/dmWorker.c b/source/dnode/mgmt/implement/src/dmWorker.c index 6ffb8e1a23..505efeb8c6 100644 --- a/source/dnode/mgmt/implement/src/dmWorker.c +++ b/source/dnode/mgmt/implement/src/dmWorker.c @@ -74,6 +74,7 @@ int32_t dmStartStatusThread(SDnode *pDnode) { return -1; } + dmReportStartup(pDnode, "dnode-status", "initialized"); return 0; } @@ -92,6 +93,7 @@ int32_t dmStartMonitorThread(SDnode *pDnode) { return -1; } + dmReportStartup(pDnode, "dnode-monitor", "initialized"); return 0; } diff --git a/source/dnode/mgmt/interface/inc/dmDef.h b/source/dnode/mgmt/interface/inc/dmDef.h index a38349f852..e6537dcf73 100644 --- a/source/dnode/mgmt/interface/inc/dmDef.h +++ b/source/dnode/mgmt/interface/inc/dmDef.h @@ -38,6 +38,7 @@ #include "dnode.h" #include "mnode.h" #include "monitor.h" +#include "sync.h" #ifdef __cplusplus extern "C" { @@ -110,6 +111,10 @@ typedef struct { int64_t dnodeVer; int64_t updateTime; int64_t rebootTime; + int32_t unsyncedVgId; + ESyncState vndState; + ESyncState mndState; + bool isMnode; bool dropped; SEpSet mnodeEps; SArray *dnodeEps; @@ -132,12 +137,17 @@ typedef struct { uint16_t serverPort; } SDnodeData; +typedef struct { + char name[TSDB_STEP_NAME_LEN]; + char desc[TSDB_STEP_DESC_LEN]; +} SStartupInfo; + typedef struct SDnode { EDndProcType ptype; EDndNodeType ntype; EDndRunStatus status; EDndEvent event; - SStartupReq startup; + SStartupInfo startup; SDnodeTrans trans; SDnodeData data; TdThreadMutex mutex; diff --git a/source/dnode/mgmt/interface/inc/dmInt.h b/source/dnode/mgmt/interface/inc/dmInt.h index 3c8ecdc71b..a2368f3173 100644 --- a/source/dnode/mgmt/interface/inc/dmInt.h +++ b/source/dnode/mgmt/interface/inc/dmInt.h @@ -35,7 +35,8 @@ void dmSetStatus(SDnode *pDnode, EDndRunStatus stat); void dmSetEvent(SDnode *pDnode, EDndEvent event); void dmSetMsgHandle(SMgmtWrapper *pWrapper, tmsg_t msgType, NodeMsgFp nodeMsgFp, int8_t vgId); void dmReportStartup(SDnode *pDnode, const char *pName, const char *pDesc); -void dmProcessStartupReq(SDnode *pDnode, SRpcMsg *pMsg); +void dmReportStartupByWrapper(SMgmtWrapper *pWrapper, const char *pName, const char *pDesc); +void dmProcessServerStatusReq(SDnode *pDnode, SRpcMsg *pMsg); void dmGetMonitorSysInfo(SMonSysInfo *pInfo); // dmFile.c diff --git a/source/dnode/mgmt/interface/src/dmInt.c b/source/dnode/mgmt/interface/src/dmInt.c index 10599c0043..00abbd0199 100644 --- a/source/dnode/mgmt/interface/src/dmInt.c +++ b/source/dnode/mgmt/interface/src/dmInt.c @@ -137,26 +137,65 @@ void dmReleaseWrapper(SMgmtWrapper *pWrapper) { } void dmReportStartup(SDnode *pDnode, const char *pName, const char *pDesc) { - SStartupReq *pStartup = &pDnode->startup; + SStartupInfo *pStartup = &pDnode->startup; tstrncpy(pStartup->name, pName, TSDB_STEP_NAME_LEN); tstrncpy(pStartup->desc, pDesc, TSDB_STEP_DESC_LEN); - pStartup->finished = 0; + dInfo("step:%s, %s", pStartup->name, pStartup->desc); } -static void dmGetStartup(SDnode *pDnode, SStartupReq *pStartup) { - memcpy(pStartup, &pDnode->startup, sizeof(SStartupReq)); - pStartup->finished = (pDnode->status == DND_STAT_RUNNING); +void dmReportStartupByWrapper(SMgmtWrapper *pWrapper, const char *pName, const char *pDesc) { + dmReportStartup(pWrapper->pDnode, pName, pDesc); } -void dmProcessStartupReq(SDnode *pDnode, SRpcMsg *pReq) { - dDebug("startup req is received"); - SStartupReq *pStartup = rpcMallocCont(sizeof(SStartupReq)); - dmGetStartup(pDnode, pStartup); +static void dmGetServerStatus(SDnode *pDnode, SServerStatusRsp *pStatus) { + pStatus->details[0] = 0; - dDebug("startup req is sent, step:%s desc:%s finished:%d", pStartup->name, pStartup->desc, pStartup->finished); - SRpcMsg rpcRsp = { - .handle = pReq->handle, .pCont = pStartup, .contLen = sizeof(SStartupReq), .ahandle = pReq->ahandle}; - rpcSendResponse(&rpcRsp); + if (pDnode->status == DND_STAT_INIT) { + pStatus->statusCode = TSDB_SRV_STATUS_NETWORK_OK; + snprintf(pStatus->details, sizeof(pStatus->details), "%s: %s", pDnode->startup.name, pDnode->startup.desc); + } else if (pDnode->status == DND_STAT_STOPPED) { + pStatus->statusCode = TSDB_SRV_STATUS_EXTING; + } else { + SDnodeData *pData = &pDnode->data; + if (pData->isMnode && pData->mndState != TAOS_SYNC_STATE_LEADER && pData->mndState == TAOS_SYNC_STATE_FOLLOWER) { + pStatus->statusCode = TSDB_SRV_STATUS_SERVICE_DEGRADED; + snprintf(pStatus->details, sizeof(pStatus->details), "mnode sync state is %s", syncStr(pData->mndState)); + } else if (pData->unsyncedVgId != 0 && pData->vndState != TAOS_SYNC_STATE_LEADER && + pData->vndState != TAOS_SYNC_STATE_FOLLOWER) { + pStatus->statusCode = TSDB_SRV_STATUS_SERVICE_DEGRADED; + snprintf(pStatus->details, sizeof(pStatus->details), "vnode:%d sync state is %s", pData->unsyncedVgId, + syncStr(pData->vndState)); + } else { + pStatus->statusCode = TSDB_SRV_STATUS_SERVICE_OK; + } + } +} + +void dmProcessServerStatusReq(SDnode *pDnode, SRpcMsg *pReq) { + dDebug("server status req is received"); + + SServerStatusRsp statusRsp = {0}; + dmGetServerStatus(pDnode, &statusRsp); + + SRpcMsg rspMsg = {.handle = pReq->handle, .ahandle = pReq->ahandle}; + int32_t rspLen = tSerializeSServerStatusRsp(NULL, 0, &statusRsp); + if (rspLen < 0) { + rspMsg.code = TSDB_CODE_OUT_OF_MEMORY; + goto _OVER; + } + + void *pRsp = rpcMallocCont(rspLen); + if (pRsp == NULL) { + rspMsg.code = TSDB_CODE_OUT_OF_MEMORY; + goto _OVER; + } + + tSerializeSServerStatusRsp(pRsp, rspLen, &statusRsp); + rspMsg.pCont = pRsp; + rspMsg.contLen = rspLen; + +_OVER: + rpcSendResponse(&rspMsg); } void dmGetMonitorSysInfo(SMonSysInfo *pInfo) { diff --git a/source/dnode/mgmt/mgmt_bnode/src/bmInt.c b/source/dnode/mgmt/mgmt_bnode/src/bmInt.c index f635df8ec7..2920d12eb4 100644 --- a/source/dnode/mgmt/mgmt_bnode/src/bmInt.c +++ b/source/dnode/mgmt/mgmt_bnode/src/bmInt.c @@ -61,12 +61,14 @@ int32_t bmOpen(SMgmtWrapper *pWrapper) { bmClose(pWrapper); return -1; } + dmReportStartup(pWrapper->pDnode, "bnode-impl", "initialized"); if (bmStartWorker(pMgmt) != 0) { dError("failed to start bnode worker since %s", terrstr()); bmClose(pWrapper); return -1; } + dmReportStartup(pWrapper->pDnode, "bnode-worker", "initialized"); return 0; } diff --git a/source/dnode/mgmt/mgmt_mnode/inc/mmInt.h b/source/dnode/mgmt/mgmt_mnode/inc/mmInt.h index 5f66ae230a..4d40d1fa28 100644 --- a/source/dnode/mgmt/mgmt_mnode/inc/mmInt.h +++ b/source/dnode/mgmt/mgmt_mnode/inc/mmInt.h @@ -52,6 +52,8 @@ int32_t mmProcessCreateReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg); int32_t mmProcessDropReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg); int32_t mmProcessAlterReq(SMnodeMgmt *pMgmt, SNodeMsg *pMsg); int32_t mmProcessGetMonMmInfoReq(SMgmtWrapper *pWrapper, SNodeMsg *pReq); +int32_t mmProcessGetMnodeLoadsReq(SMgmtWrapper *pWrapper, SNodeMsg *pReq); +void mmGetMnodeLoads(SMgmtWrapper *pWrapper, SMonMloadInfo *pInfo); // mmWorker.c int32_t mmStartWorker(SMnodeMgmt *pMgmt); diff --git a/source/dnode/mgmt/mgmt_mnode/src/mmHandle.c b/source/dnode/mgmt/mgmt_mnode/src/mmHandle.c index 38885333c9..aa0cebe13c 100644 --- a/source/dnode/mgmt/mgmt_mnode/src/mmHandle.c +++ b/source/dnode/mgmt/mgmt_mnode/src/mmHandle.c @@ -46,6 +46,34 @@ int32_t mmProcessGetMonMmInfoReq(SMgmtWrapper *pWrapper, SNodeMsg *pReq) { return 0; } +void mmGetMnodeLoads(SMgmtWrapper *pWrapper, SMonMloadInfo *pInfo) { + SMnodeMgmt *pMgmt = pWrapper->pMgmt; + pInfo->isMnode = 1; + mndGetLoad(pMgmt->pMnode, &pInfo->load); +} + +int32_t mmProcessGetMnodeLoadsReq(SMgmtWrapper *pWrapper, SNodeMsg *pReq) { + SMonMloadInfo mloads = {0}; + mmGetMnodeLoads(pWrapper, &mloads); + + int32_t rspLen = tSerializeSMonMloadInfo(NULL, 0, &mloads); + if (rspLen < 0) { + terrno = TSDB_CODE_INVALID_MSG; + return -1; + } + + void *pRsp = rpcMallocCont(rspLen); + if (pRsp == NULL) { + terrno = TSDB_CODE_OUT_OF_MEMORY; + return -1; + } + + tSerializeSMonMloadInfo(pRsp, rspLen, &mloads); + pReq->pRsp = pRsp; + pReq->rspLen = rspLen; + return 0; +} + int32_t mmProcessCreateReq(SMgmtWrapper *pWrapper, SNodeMsg *pMsg) { SDnode *pDnode = pWrapper->pDnode; SRpcMsg *pReq = &pMsg->rpcMsg; @@ -117,6 +145,7 @@ int32_t mmProcessAlterReq(SMnodeMgmt *pMgmt, SNodeMsg *pMsg) { void mmInitMsgHandle(SMgmtWrapper *pWrapper) { dmSetMsgHandle(pWrapper, TDMT_MON_MM_INFO, mmProcessMonitorMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_MON_MM_LOAD, mmProcessMonitorMsg, DEFAULT_HANDLE); // Requests handled by DNODE dmSetMsgHandle(pWrapper, TDMT_DND_CREATE_MNODE_RSP, mmProcessWriteMsg, DEFAULT_HANDLE); @@ -129,10 +158,7 @@ void mmInitMsgHandle(SMgmtWrapper *pWrapper) { dmSetMsgHandle(pWrapper, TDMT_DND_CREATE_BNODE_RSP, mmProcessWriteMsg, DEFAULT_HANDLE); dmSetMsgHandle(pWrapper, TDMT_DND_DROP_BNODE_RSP, mmProcessWriteMsg, DEFAULT_HANDLE); dmSetMsgHandle(pWrapper, TDMT_DND_CREATE_VNODE_RSP, mmProcessWriteMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_DND_ALTER_VNODE_RSP, mmProcessWriteMsg, DEFAULT_HANDLE); dmSetMsgHandle(pWrapper, TDMT_DND_DROP_VNODE_RSP, mmProcessWriteMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_DND_SYNC_VNODE_RSP, mmProcessWriteMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_DND_COMPACT_VNODE_RSP, mmProcessWriteMsg, DEFAULT_HANDLE); dmSetMsgHandle(pWrapper, TDMT_DND_CONFIG_DNODE_RSP, mmProcessWriteMsg, DEFAULT_HANDLE); // Requests handled by MNODE @@ -159,7 +185,6 @@ void mmInitMsgHandle(SMgmtWrapper *pWrapper) { dmSetMsgHandle(pWrapper, TDMT_MND_DROP_DB, mmProcessWriteMsg, DEFAULT_HANDLE); dmSetMsgHandle(pWrapper, TDMT_MND_USE_DB, mmProcessWriteMsg, DEFAULT_HANDLE); dmSetMsgHandle(pWrapper, TDMT_MND_ALTER_DB, mmProcessWriteMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_MND_SYNC_DB, mmProcessWriteMsg, DEFAULT_HANDLE); dmSetMsgHandle(pWrapper, TDMT_MND_COMPACT_DB, mmProcessWriteMsg, DEFAULT_HANDLE); dmSetMsgHandle(pWrapper, TDMT_MND_CREATE_FUNC, mmProcessWriteMsg, DEFAULT_HANDLE); dmSetMsgHandle(pWrapper, TDMT_MND_RETRIEVE_FUNC, mmProcessWriteMsg, DEFAULT_HANDLE); @@ -206,4 +231,8 @@ void mmInitMsgHandle(SMgmtWrapper *pWrapper) { dmSetMsgHandle(pWrapper, TDMT_VND_FETCH, mmProcessQueryMsg, MNODE_HANDLE); dmSetMsgHandle(pWrapper, TDMT_VND_DROP_TASK, mmProcessQueryMsg, MNODE_HANDLE); dmSetMsgHandle(pWrapper, TDMT_VND_QUERY_HEARTBEAT, mmProcessQueryMsg, MNODE_HANDLE); + + dmSetMsgHandle(pWrapper, TDMT_VND_ALTER_VNODE_RSP, mmProcessWriteMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_SYNC_VNODE_RSP, mmProcessWriteMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_COMPACT_VNODE_RSP, mmProcessWriteMsg, DEFAULT_HANDLE); } diff --git a/source/dnode/mgmt/mgmt_mnode/src/mmInt.c b/source/dnode/mgmt/mgmt_mnode/src/mmInt.c index 69b4d50939..f707426ab4 100644 --- a/source/dnode/mgmt/mgmt_mnode/src/mmInt.c +++ b/source/dnode/mgmt/mgmt_mnode/src/mmInt.c @@ -176,12 +176,14 @@ static int32_t mmOpen(SMgmtWrapper *pWrapper) { mmClose(pWrapper); return -1; } + dmReportStartup(pWrapper->pDnode, "mnode-impl", "initialized"); if (mmStartWorker(pMgmt) != 0) { dError("failed to start mnode worker since %s", terrstr()); mmClose(pWrapper); return -1; } + dmReportStartup(pWrapper->pDnode, "mnode-worker", "initialized"); if (!deployed) { deployed = true; diff --git a/source/dnode/mgmt/mgmt_mnode/src/mmWorker.c b/source/dnode/mgmt/mgmt_mnode/src/mmWorker.c index c575266b44..e9c40fdd0f 100644 --- a/source/dnode/mgmt/mgmt_mnode/src/mmWorker.c +++ b/source/dnode/mgmt/mgmt_mnode/src/mmWorker.c @@ -36,6 +36,8 @@ static void mmProcessQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) { code = mmProcessAlterReq(pMgmt, pMsg); } else if (pMsg->rpcMsg.msgType == TDMT_MON_MM_INFO) { code = mmProcessGetMonMmInfoReq(pMgmt->pWrapper, pMsg); + } else if (pMsg->rpcMsg.msgType == TDMT_MON_MM_LOAD) { + code = mmProcessGetMnodeLoadsReq(pMgmt->pWrapper, pMsg); } else { pMsg->pNode = pMgmt->pMnode; code = mndProcessMsg(pMsg); diff --git a/source/dnode/mgmt/mgmt_qnode/src/qmInt.c b/source/dnode/mgmt/mgmt_qnode/src/qmInt.c index d8d02b2619..d03f001a8d 100644 --- a/source/dnode/mgmt/mgmt_qnode/src/qmInt.c +++ b/source/dnode/mgmt/mgmt_qnode/src/qmInt.c @@ -64,12 +64,14 @@ static int32_t qmOpen(SMgmtWrapper *pWrapper) { qmClose(pWrapper); return -1; } + dmReportStartup(pWrapper->pDnode, "qnode-impl", "initialized"); if (qmStartWorker(pMgmt) != 0) { dError("failed to start qnode worker since %s", terrstr()); qmClose(pWrapper); return -1; } + dmReportStartup(pWrapper->pDnode, "qnode-worker", "initialized"); dInfo("qnode-mgmt is initialized"); return 0; diff --git a/source/dnode/mgmt/mgmt_snode/src/smInt.c b/source/dnode/mgmt/mgmt_snode/src/smInt.c index 8adf643a2b..3757dcd72a 100644 --- a/source/dnode/mgmt/mgmt_snode/src/smInt.c +++ b/source/dnode/mgmt/mgmt_snode/src/smInt.c @@ -60,11 +60,13 @@ int32_t smOpen(SMgmtWrapper *pWrapper) { dError("failed to open snode since %s", terrstr()); return -1; } + dmReportStartup(pWrapper->pDnode, "snode-impl", "initialized"); if (smStartWorker(pMgmt) != 0) { dError("failed to start snode worker since %s", terrstr()); return -1; } + dmReportStartup(pWrapper->pDnode, "snode-worker", "initialized"); return 0; } diff --git a/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h b/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h index ab8328d038..02be03ebba 100644 --- a/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h +++ b/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h @@ -29,7 +29,6 @@ typedef struct SVnodesMgmt { SHashObj *hash; SRWLatch latch; SVnodesStat state; - SVnodesStat lastState; STfs *pTfs; SQWorkerPool queryPool; SQWorkerPool fetchPool; @@ -90,10 +89,7 @@ void vmCloseVnode(SVnodesMgmt *pMgmt, SVnodeObj *pVnode); // vmHandle.c void vmInitMsgHandle(SMgmtWrapper *pWrapper); int32_t vmProcessCreateVnodeReq(SVnodesMgmt *pMgmt, SNodeMsg *pReq); -int32_t vmProcessAlterVnodeReq(SVnodesMgmt *pMgmt, SNodeMsg *pReq); int32_t vmProcessDropVnodeReq(SVnodesMgmt *pMgmt, SNodeMsg *pReq); -int32_t vmProcessSyncVnodeReq(SVnodesMgmt *pMgmt, SNodeMsg *pReq); -int32_t vmProcessCompactVnodeReq(SVnodesMgmt *pMgmt, SNodeMsg *pReq); int32_t vmProcessGetMonVmInfoReq(SMgmtWrapper *pWrapper, SNodeMsg *pReq); int32_t vmProcessGetVnodeLoadsReq(SMgmtWrapper *pWrapper, SNodeMsg *pReq); void vmGetVnodeLoads(SMgmtWrapper *pWrapper, SMonVloadInfo *pInfo); diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c index 751edd6f98..5aade6bdfc 100644 --- a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c +++ b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c @@ -16,21 +16,42 @@ #define _DEFAULT_SOURCE #include "vmInt.h" -void vmGetMonitorInfo(SMgmtWrapper *pWrapper, SMonVmInfo *vmInfo) { +void vmGetMonitorInfo(SMgmtWrapper *pWrapper, SMonVmInfo *pInfo) { SVnodesMgmt *pMgmt = pWrapper->pMgmt; - tfsGetMonitorInfo(pMgmt->pTfs, &vmInfo->tfs); - taosWLockLatch(&pMgmt->latch); - vmInfo->vstat.totalVnodes = pMgmt->state.totalVnodes; - vmInfo->vstat.masterNum = pMgmt->state.masterNum; - vmInfo->vstat.numOfSelectReqs = pMgmt->state.numOfSelectReqs - pMgmt->lastState.numOfSelectReqs; - vmInfo->vstat.numOfInsertReqs = pMgmt->state.numOfInsertReqs - pMgmt->lastState.numOfInsertReqs; - vmInfo->vstat.numOfInsertSuccessReqs = pMgmt->state.numOfInsertSuccessReqs - pMgmt->lastState.numOfInsertSuccessReqs; - vmInfo->vstat.numOfBatchInsertReqs = pMgmt->state.numOfBatchInsertReqs - pMgmt->lastState.numOfBatchInsertReqs; - vmInfo->vstat.numOfBatchInsertSuccessReqs = - pMgmt->state.numOfBatchInsertSuccessReqs - pMgmt->lastState.numOfBatchInsertSuccessReqs; - pMgmt->lastState = pMgmt->state; - taosWUnLockLatch(&pMgmt->latch); + SMonVloadInfo vloads = {0}; + vmGetVnodeLoads(pWrapper, &vloads); + if (vloads.pVloads == NULL) return; + + int32_t totalVnodes = 0; + int32_t masterNum = 0; + int64_t numOfSelectReqs = 0; + int64_t numOfInsertReqs = 0; + int64_t numOfInsertSuccessReqs = 0; + int64_t numOfBatchInsertReqs = 0; + int64_t numOfBatchInsertSuccessReqs = 0; + + for (int32_t i = 0; i < taosArrayGetSize(vloads.pVloads); ++i) { + SVnodeLoad *pLoad = taosArrayGet(vloads.pVloads, i); + numOfSelectReqs += pLoad->numOfSelectReqs; + numOfInsertReqs += pLoad->numOfInsertReqs; + numOfInsertSuccessReqs += pLoad->numOfInsertSuccessReqs; + numOfBatchInsertReqs += pLoad->numOfBatchInsertReqs; + numOfBatchInsertSuccessReqs += pLoad->numOfBatchInsertSuccessReqs; + if (pLoad->syncState == TAOS_SYNC_STATE_LEADER) masterNum++; + totalVnodes++; + } + + pInfo->vstat.totalVnodes = totalVnodes; + pInfo->vstat.masterNum = masterNum; + pInfo->vstat.numOfSelectReqs = numOfSelectReqs - pMgmt->state.numOfSelectReqs; + pInfo->vstat.numOfInsertReqs = numOfInsertReqs - pMgmt->state.numOfInsertReqs; + pInfo->vstat.numOfInsertSuccessReqs = numOfInsertSuccessReqs - pMgmt->state.numOfInsertSuccessReqs; + pInfo->vstat.numOfBatchInsertReqs = numOfBatchInsertReqs - pMgmt->state.numOfBatchInsertReqs; + pInfo->vstat.numOfBatchInsertSuccessReqs = numOfBatchInsertSuccessReqs - pMgmt->state.numOfBatchInsertSuccessReqs; + pMgmt->state = pInfo->vstat; + + taosArrayDestroy(vloads.pVloads); } int32_t vmProcessGetMonVmInfoReq(SMgmtWrapper *pWrapper, SNodeMsg *pReq) { @@ -182,48 +203,6 @@ int32_t vmProcessCreateVnodeReq(SVnodesMgmt *pMgmt, SNodeMsg *pMsg) { return 0; } -int32_t vmProcessAlterVnodeReq(SVnodesMgmt *pMgmt, SNodeMsg *pMsg) { - SRpcMsg *pReq = &pMsg->rpcMsg; - SAlterVnodeReq alterReq = {0}; - if (tDeserializeSCreateVnodeReq(pReq->pCont, pReq->contLen, &alterReq) != 0) { - terrno = TSDB_CODE_INVALID_MSG; - return -1; - } - - dDebug("vgId:%d, alter vnode req is received", alterReq.vgId); - - SVnodeCfg vnodeCfg = {0}; - vmGenerateVnodeCfg(&alterReq, &vnodeCfg); - - SVnodeObj *pVnode = vmAcquireVnode(pMgmt, alterReq.vgId); - if (pVnode == NULL) { - dDebug("vgId:%d, failed to alter vnode since %s", alterReq.vgId, terrstr()); - return -1; - } - - if (alterReq.vgVersion == pVnode->vgVersion) { - vmReleaseVnode(pMgmt, pVnode); - dDebug("vgId:%d, no need to alter vnode cfg for version unchanged ", alterReq.vgId); - return 0; - } - - if (vnodeAlter(pVnode->pImpl, &vnodeCfg) != 0) { - dError("vgId:%d, failed to alter vnode since %s", alterReq.vgId, terrstr()); - vmReleaseVnode(pMgmt, pVnode); - return -1; - } - - int32_t oldVersion = pVnode->vgVersion; - pVnode->vgVersion = alterReq.vgVersion; - int32_t code = vmWriteVnodesToFile(pMgmt); - if (code != 0) { - pVnode->vgVersion = oldVersion; - } - - vmReleaseVnode(pMgmt, pVnode); - return code; -} - int32_t vmProcessDropVnodeReq(SVnodesMgmt *pMgmt, SNodeMsg *pMsg) { SRpcMsg *pReq = &pMsg->rpcMsg; SDropVnodeReq dropReq = {0}; @@ -255,100 +234,52 @@ int32_t vmProcessDropVnodeReq(SVnodesMgmt *pMgmt, SNodeMsg *pMsg) { return 0; } -int32_t vmProcessSyncVnodeReq(SVnodesMgmt *pMgmt, SNodeMsg *pMsg) { - SRpcMsg *pReq = &pMsg->rpcMsg; - SSyncVnodeReq syncReq = {0}; - tDeserializeSDropVnodeReq(pReq->pCont, pReq->contLen, &syncReq); - - int32_t vgId = syncReq.vgId; - dDebug("vgId:%d, sync vnode req is received", vgId); - - SVnodeObj *pVnode = vmAcquireVnode(pMgmt, vgId); - if (pVnode == NULL) { - dDebug("vgId:%d, failed to sync since %s", vgId, terrstr()); - return -1; - } - - if (vnodeSync(pVnode->pImpl) != 0) { - dError("vgId:%d, failed to sync vnode since %s", vgId, terrstr()); - vmReleaseVnode(pMgmt, pVnode); - return -1; - } - - vmReleaseVnode(pMgmt, pVnode); - return 0; -} - -int32_t vmProcessCompactVnodeReq(SVnodesMgmt *pMgmt, SNodeMsg *pMsg) { - SRpcMsg *pReq = &pMsg->rpcMsg; - SCompactVnodeReq compatcReq = {0}; - tDeserializeSDropVnodeReq(pReq->pCont, pReq->contLen, &compatcReq); - - int32_t vgId = compatcReq.vgId; - dDebug("vgId:%d, compact vnode req is received", vgId); - - SVnodeObj *pVnode = vmAcquireVnode(pMgmt, vgId); - if (pVnode == NULL) { - dDebug("vgId:%d, failed to compact since %s", vgId, terrstr()); - return -1; - } - - if (vnodeCompact(pVnode->pImpl) != 0) { - dError("vgId:%d, failed to compact vnode since %s", vgId, terrstr()); - vmReleaseVnode(pMgmt, pVnode); - return -1; - } - - vmReleaseVnode(pMgmt, pVnode); - return 0; -} - void vmInitMsgHandle(SMgmtWrapper *pWrapper) { dmSetMsgHandle(pWrapper, TDMT_MON_VM_INFO, vmProcessMonitorMsg, DEFAULT_HANDLE); dmSetMsgHandle(pWrapper, TDMT_MON_VM_LOAD, vmProcessMonitorMsg, DEFAULT_HANDLE); // Requests handled by VNODE - dmSetMsgHandle(pWrapper, TDMT_VND_SUBMIT, (NodeMsgFp)vmProcessWriteMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_QUERY, (NodeMsgFp)vmProcessQueryMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_QUERY_CONTINUE, (NodeMsgFp)vmProcessQueryMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_FETCH, (NodeMsgFp)vmProcessFetchMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_FETCH_RSP, (NodeMsgFp)vmProcessFetchMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_ALTER_TABLE, (NodeMsgFp)vmProcessWriteMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_UPDATE_TAG_VAL, (NodeMsgFp)vmProcessWriteMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_TABLE_META, (NodeMsgFp)vmProcessFetchMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_TABLES_META, (NodeMsgFp)vmProcessFetchMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_MQ_CONSUME, (NodeMsgFp)vmProcessQueryMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_MQ_QUERY, (NodeMsgFp)vmProcessQueryMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_MQ_CONNECT, (NodeMsgFp)vmProcessWriteMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_MQ_DISCONNECT, (NodeMsgFp)vmProcessWriteMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_MQ_SET_CUR, (NodeMsgFp)vmProcessWriteMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_RES_READY, (NodeMsgFp)vmProcessFetchMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_TASKS_STATUS, (NodeMsgFp)vmProcessFetchMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_CANCEL_TASK, (NodeMsgFp)vmProcessFetchMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_DROP_TASK, (NodeMsgFp)vmProcessFetchMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_CREATE_STB, (NodeMsgFp)vmProcessWriteMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_ALTER_STB, (NodeMsgFp)vmProcessWriteMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_DROP_STB, (NodeMsgFp)vmProcessWriteMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_CREATE_TABLE, (NodeMsgFp)vmProcessWriteMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_DROP_TABLE, (NodeMsgFp)vmProcessWriteMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_CREATE_SMA, (NodeMsgFp)vmProcessWriteMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_CANCEL_SMA, (NodeMsgFp)vmProcessWriteMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_DROP_SMA, (NodeMsgFp)vmProcessWriteMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_MQ_SET_CONN, (NodeMsgFp)vmProcessWriteMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_MQ_REB, (NodeMsgFp)vmProcessWriteMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_MQ_CANCEL_CONN, (NodeMsgFp)vmProcessWriteMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_MQ_SET_CUR, (NodeMsgFp)vmProcessFetchMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_CONSUME, (NodeMsgFp)vmProcessFetchMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_TASK_DEPLOY, (NodeMsgFp)vmProcessWriteMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_QUERY_HEARTBEAT, (NodeMsgFp)vmProcessFetchMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_TASK_PIPE_EXEC, (NodeMsgFp)vmProcessFetchMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_TASK_MERGE_EXEC, (NodeMsgFp)vmProcessMergeMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_TASK_WRITE_EXEC, (NodeMsgFp)vmProcessWriteMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_VND_STREAM_TRIGGER, (NodeMsgFp)vmProcessFetchMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_SUBMIT, vmProcessWriteMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_QUERY, vmProcessQueryMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_QUERY_CONTINUE, vmProcessQueryMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_FETCH, vmProcessFetchMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_FETCH_RSP, vmProcessFetchMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_ALTER_TABLE, vmProcessWriteMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_UPDATE_TAG_VAL, vmProcessWriteMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_TABLE_META, vmProcessFetchMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_TABLES_META, vmProcessFetchMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_MQ_CONSUME, vmProcessQueryMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_MQ_QUERY, vmProcessQueryMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_MQ_CONNECT, vmProcessWriteMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_MQ_DISCONNECT, vmProcessWriteMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_MQ_SET_CUR, vmProcessWriteMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_RES_READY, vmProcessFetchMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_TASKS_STATUS, vmProcessFetchMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_CANCEL_TASK, vmProcessFetchMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_DROP_TASK, vmProcessFetchMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_CREATE_STB, vmProcessWriteMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_ALTER_STB, vmProcessWriteMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_DROP_STB, vmProcessWriteMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_CREATE_TABLE, vmProcessWriteMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_DROP_TABLE, vmProcessWriteMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_CREATE_SMA, vmProcessWriteMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_CANCEL_SMA, vmProcessWriteMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_DROP_SMA, vmProcessWriteMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_MQ_SET_CONN, vmProcessWriteMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_MQ_REB, vmProcessWriteMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_MQ_CANCEL_CONN, vmProcessWriteMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_MQ_SET_CUR, vmProcessFetchMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_CONSUME, vmProcessFetchMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_TASK_DEPLOY, vmProcessWriteMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_QUERY_HEARTBEAT, vmProcessFetchMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_TASK_PIPE_EXEC, vmProcessFetchMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_TASK_MERGE_EXEC, vmProcessMergeMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_TASK_WRITE_EXEC, vmProcessWriteMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_STREAM_TRIGGER, vmProcessFetchMsg, DEFAULT_HANDLE); + + dmSetMsgHandle(pWrapper, TDMT_VND_ALTER_VNODE, vmProcessWriteMsg, DEFAULT_HANDLE); + dmSetMsgHandle(pWrapper, TDMT_VND_COMPACT_VNODE, vmProcessWriteMsg, DEFAULT_HANDLE); dmSetMsgHandle(pWrapper, TDMT_DND_CREATE_VNODE, vmProcessMgmtMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_DND_ALTER_VNODE, vmProcessMgmtMsg, DEFAULT_HANDLE); dmSetMsgHandle(pWrapper, TDMT_DND_DROP_VNODE, vmProcessMgmtMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_DND_SYNC_VNODE, vmProcessMgmtMsg, DEFAULT_HANDLE); - dmSetMsgHandle(pWrapper, TDMT_DND_COMPACT_VNODE, vmProcessMgmtMsg, DEFAULT_HANDLE); } diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c index a212d7edf4..a67533009a 100644 --- a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c +++ b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c @@ -130,7 +130,7 @@ static void *vmOpenVnodeFunc(void *param) { char stepDesc[TSDB_STEP_DESC_LEN] = {0}; snprintf(stepDesc, TSDB_STEP_DESC_LEN, "vgId:%d, start to restore, %d of %d have been opened", pCfg->vgId, pMgmt->state.openVnodes, pMgmt->state.totalVnodes); - dmReportStartup(pDnode, "open-vnodes", stepDesc); + dmReportStartup(pDnode, "vnode-open", stepDesc); SMsgCb msgCb = pMgmt->pDnode->data.msgCb; msgCb.pWrapper = pMgmt->pWrapper; @@ -298,25 +298,30 @@ static int32_t vmInit(SMgmtWrapper *pWrapper) { dError("failed to init tfs since %s", terrstr()); goto _OVER; } + dmReportStartup(pDnode, "vnode-tfs", "initialized"); if (walInit() != 0) { dError("failed to init wal since %s", terrstr()); goto _OVER; } + dmReportStartup(pDnode, "vnode-wal", "initialized"); if (vnodeInit(tsNumOfCommitThreads) != 0) { dError("failed to init vnode since %s", terrstr()); goto _OVER; } + dmReportStartup(pDnode, "vnode-commit", "initialized"); if (vmStartWorker(pMgmt) != 0) { dError("failed to init workers since %s", terrstr()) goto _OVER; } + dmReportStartup(pDnode, "vnode-worker", "initialized"); if (vmOpenVnodes(pMgmt) != 0) { dError("failed to open vnode since %s", terrstr()); return -1; } + dmReportStartup(pDnode, "vnode-vnodes", "initialized"); code = 0; @@ -351,19 +356,9 @@ void vmSetMgmtFp(SMgmtWrapper *pWrapper) { void vmGetVnodeLoads(SMgmtWrapper *pWrapper, SMonVloadInfo *pInfo) { SVnodesMgmt *pMgmt = pWrapper->pMgmt; - SVnodesStat *pStat = &pMgmt->state; - SArray *pLoads = taosArrayInit(pMgmt->state.totalVnodes, sizeof(SVnodeLoad)); - int32_t totalVnodes = 0; - int32_t masterNum = 0; - int64_t numOfSelectReqs = 0; - int64_t numOfInsertReqs = 0; - int64_t numOfInsertSuccessReqs = 0; - int64_t numOfBatchInsertReqs = 0; - int64_t numOfBatchInsertSuccessReqs = 0; - - pInfo->pVloads = pLoads; - if (pLoads == NULL) return; + pInfo->pVloads = taosArrayInit(pMgmt->state.totalVnodes, sizeof(SVnodeLoad)); + if (pInfo->pVloads == NULL) return; taosRLockLatch(&pMgmt->latch); @@ -375,28 +370,9 @@ void vmGetVnodeLoads(SMgmtWrapper *pWrapper, SMonVloadInfo *pInfo) { SVnodeObj *pVnode = *ppVnode; SVnodeLoad vload = {0}; vnodeGetLoad(pVnode->pImpl, &vload); - taosArrayPush(pLoads, &vload); - - numOfSelectReqs += vload.numOfSelectReqs; - numOfInsertReqs += vload.numOfInsertReqs; - numOfInsertSuccessReqs += vload.numOfInsertSuccessReqs; - numOfBatchInsertReqs += vload.numOfBatchInsertReqs; - numOfBatchInsertSuccessReqs += vload.numOfBatchInsertSuccessReqs; - totalVnodes++; - if (vload.role == TAOS_SYNC_STATE_LEADER) masterNum++; - + taosArrayPush(pInfo->pVloads, &vload); pIter = taosHashIterate(pMgmt->hash, pIter); } taosRUnLockLatch(&pMgmt->latch); - - taosWLockLatch(&pMgmt->latch); - pStat->totalVnodes = totalVnodes; - pStat->masterNum = masterNum; - pStat->numOfSelectReqs = numOfSelectReqs; - pStat->numOfInsertReqs = numOfInsertReqs; - pStat->numOfInsertSuccessReqs = numOfInsertSuccessReqs; - pStat->numOfBatchInsertReqs = numOfBatchInsertReqs; - pStat->numOfBatchInsertSuccessReqs = numOfBatchInsertSuccessReqs; - taosWUnLockLatch(&pMgmt->latch); } \ No newline at end of file diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c b/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c index 777f9eb36e..dce5f1b422 100644 --- a/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c +++ b/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c @@ -42,18 +42,9 @@ static void vmProcessMgmtQueue(SQueueInfo *pInfo, SNodeMsg *pMsg) { case TDMT_DND_CREATE_VNODE: code = vmProcessCreateVnodeReq(pMgmt, pMsg); break; - case TDMT_DND_ALTER_VNODE: - code = vmProcessAlterVnodeReq(pMgmt, pMsg); - break; case TDMT_DND_DROP_VNODE: code = vmProcessDropVnodeReq(pMgmt, pMsg); break; - case TDMT_DND_SYNC_VNODE: - code = vmProcessSyncVnodeReq(pMgmt, pMsg); - break; - case TDMT_DND_COMPACT_VNODE: - code = vmProcessCompactVnodeReq(pMgmt, pMsg); - break; default: terrno = TSDB_CODE_MSG_NOT_PROCESSED; dError("msg:%p, not processed in vnode-mgmt queue", pMsg); diff --git a/source/dnode/mgmt/test/vnode/vnode.cpp b/source/dnode/mgmt/test/vnode/vnode.cpp index 0daea3f666..51b7d6818f 100644 --- a/source/dnode/mgmt/test/vnode/vnode.cpp +++ b/source/dnode/mgmt/test/vnode/vnode.cpp @@ -47,7 +47,7 @@ TEST_F(DndTestVnode, 01_Create_Vnode) { createReq.precision = 0; createReq.compression = 2; createReq.replica = 1; - createReq.quorum = 1; + createReq.strict = 1; createReq.update = 0; createReq.cacheLastRow = 0; createReq.selfIndex = 0; @@ -94,7 +94,7 @@ TEST_F(DndTestVnode, 02_Alter_Vnode) { alterReq.precision = 0; alterReq.compression = 2; alterReq.replica = 1; - alterReq.quorum = 1; + alterReq.strict = 1; alterReq.update = 0; alterReq.cacheLastRow = 0; alterReq.selfIndex = 0; @@ -108,7 +108,7 @@ TEST_F(DndTestVnode, 02_Alter_Vnode) { void* pReq = rpcMallocCont(contLen); tSerializeSCreateVnodeReq(pReq, contLen, &alterReq); - SRpcMsg* pRsp = test.SendReq(TDMT_DND_ALTER_VNODE, pReq, contLen); + SRpcMsg* pRsp = test.SendReq(TDMT_VND_ALTER_VNODE, pReq, contLen); ASSERT_NE(pRsp, nullptr); ASSERT_EQ(pRsp->code, 0); } diff --git a/source/dnode/mnode/impl/inc/mndAuth.h b/source/dnode/mnode/impl/inc/mndAuth.h index 7dcb518f9b..ae7663a775 100644 --- a/source/dnode/mnode/impl/inc/mndAuth.h +++ b/source/dnode/mnode/impl/inc/mndAuth.h @@ -33,7 +33,7 @@ int32_t mndCheckNodeAuth(SUserObj *pOperUser); int32_t mndCheckFuncAuth(SUserObj *pOperUser); int32_t mndCheckCreateDbAuth(SUserObj *pOperUser); -int32_t mndCheckAlterDropCompactSyncDbAuth(SUserObj *pOperUser, SDbObj *pDb); +int32_t mndCheckAlterDropCompactDbAuth(SUserObj *pOperUser, SDbObj *pDb); int32_t mndCheckUseDbAuth(SUserObj *pOperUser, SDbObj *pDb); int32_t mndCheckWriteAuth(SUserObj *pOperUser, SDbObj *pDb); diff --git a/source/dnode/mnode/impl/inc/mndDb.h b/source/dnode/mnode/impl/inc/mndDb.h index 146c6e2523..38a5ecd273 100644 --- a/source/dnode/mnode/impl/inc/mndDb.h +++ b/source/dnode/mnode/impl/inc/mndDb.h @@ -27,9 +27,10 @@ void mndCleanupDb(SMnode *pMnode); SDbObj *mndAcquireDb(SMnode *pMnode, const char *db); void mndReleaseDb(SMnode *pMnode, SDbObj *pDb); int32_t mndValidateDbInfo(SMnode *pMnode, SDbVgVersion *pDbs, int32_t numOfDbs, void **ppRsp, int32_t *pRspLen); -char *mndGetDbStr(char *src); int32_t mndExtractDbInfo(SMnode *pMnode, SDbObj *pDb, SUseDbRsp *pRsp, const SUseDbReq *pReq); +const char *mndGetDbStr(const char *src); + #ifdef __cplusplus } #endif diff --git a/source/dnode/mnode/impl/inc/mndDef.h b/source/dnode/mnode/impl/inc/mndDef.h index 4a6455c0ed..6940f55f8a 100644 --- a/source/dnode/mnode/impl/inc/mndDef.h +++ b/source/dnode/mnode/impl/inc/mndDef.h @@ -265,11 +265,12 @@ typedef struct { int8_t precision; int8_t compression; int8_t replications; - int8_t quorum; + int8_t strict; int8_t update; int8_t cacheLastRow; int8_t streamMode; int8_t singleSTable; + int8_t hashMethod; // default is 1 int32_t numOfRetensions; SArray* pRetensions; } SDbCfg; @@ -283,7 +284,6 @@ typedef struct { int64_t uid; int32_t cfgVersion; int32_t vgVersion; - int8_t hashMethod; // default is 1 SDbCfg cfg; SRWLatch lock; } SDbObj; @@ -355,10 +355,14 @@ typedef struct { int32_t numOfTags; int32_t numOfSmas; int32_t commentLen; + int32_t ast1Len; + int32_t ast2Len; SSchema* pColumns; SSchema* pTags; SSchema* pSmas; char* comment; + char* pAst1; + char* pAst2; SRWLatch lock; } SStbObj; diff --git a/source/dnode/mnode/impl/inc/mndInt.h b/source/dnode/mnode/impl/inc/mndInt.h index 7b67308876..b9ec1905e6 100644 --- a/source/dnode/mnode/impl/inc/mndInt.h +++ b/source/dnode/mnode/impl/inc/mndInt.h @@ -47,21 +47,6 @@ typedef int32_t (*MndInitFp)(SMnode *pMnode); typedef void (*MndCleanupFp)(SMnode *pMnode); typedef int32_t (*ShowRetrieveFp)(SNodeMsg *pMsg, SShowObj *pShow, SSDataBlock* pBlock, int32_t rows); typedef void (*ShowFreeIterFp)(SMnode *pMnode, void *pIter); - -typedef struct SMnodeLoad { - int64_t numOfDnode; - int64_t numOfMnode; - int64_t numOfVgroup; - int64_t numOfDatabase; - int64_t numOfSuperTable; - int64_t numOfChildTable; - int64_t numOfNormalTable; - int64_t numOfColumn; - int64_t totalPoints; - int64_t totalStorage; - int64_t compStorage; -} SMnodeLoad; - typedef struct SQWorkerMgmt SQHandle; typedef struct { @@ -82,7 +67,6 @@ typedef struct { } SProfileMgmt; typedef struct { - bool enable; SRWLatch lock; char email[TSDB_FQDN_LEN]; } STelemMgmt; @@ -129,7 +113,6 @@ struct SMnode { void mndSetMsgHandle(SMnode *pMnode, tmsg_t msgType, MndMsgFp fp); int64_t mndGenerateUid(char *name, int32_t len); -void mndGetLoad(SMnode *pMnode, SMnodeLoad *pLoad); #ifdef __cplusplus } diff --git a/source/dnode/mnode/impl/inc/mndMnode.h b/source/dnode/mnode/impl/inc/mndMnode.h index 8041cc8fef..a5cdfa1061 100644 --- a/source/dnode/mnode/impl/inc/mndMnode.h +++ b/source/dnode/mnode/impl/inc/mndMnode.h @@ -22,14 +22,13 @@ extern "C" { #endif -int32_t mndInitMnode(SMnode *pMnode); -void mndCleanupMnode(SMnode *pMnode); -SMnodeObj *mndAcquireMnode(SMnode *pMnode, int32_t mnodeId); -void mndReleaseMnode(SMnode *pMnode, SMnodeObj *pObj); -bool mndIsMnode(SMnode *pMnode, int32_t dnodeId); -void mndGetMnodeEpSet(SMnode *pMnode, SEpSet *pEpSet); -void mndUpdateMnodeRole(SMnode *pMnode); -const char *mndGetRoleStr(int32_t role); +int32_t mndInitMnode(SMnode *pMnode); +void mndCleanupMnode(SMnode *pMnode); +SMnodeObj *mndAcquireMnode(SMnode *pMnode, int32_t mnodeId); +void mndReleaseMnode(SMnode *pMnode, SMnodeObj *pObj); +bool mndIsMnode(SMnode *pMnode, int32_t dnodeId); +void mndGetMnodeEpSet(SMnode *pMnode, SEpSet *pEpSet); +void mndUpdateMnodeRole(SMnode *pMnode); #ifdef __cplusplus } diff --git a/source/dnode/mnode/impl/src/mndAuth.c b/source/dnode/mnode/impl/src/mndAuth.c index fc94ec3645..696d850266 100644 --- a/source/dnode/mnode/impl/src/mndAuth.c +++ b/source/dnode/mnode/impl/src/mndAuth.c @@ -146,7 +146,7 @@ int32_t mndCheckFuncAuth(SUserObj *pOperUser) { int32_t mndCheckCreateDbAuth(SUserObj *pOperUser) { return 0; } -int32_t mndCheckAlterDropCompactSyncDbAuth(SUserObj *pOperUser, SDbObj *pDb) { +int32_t mndCheckAlterDropCompactDbAuth(SUserObj *pOperUser, SDbObj *pDb) { if (pOperUser->superUser || strcmp(pOperUser->user, pDb->createUser) == 0) { return 0; } diff --git a/source/dnode/mnode/impl/src/mndDb.c b/source/dnode/mnode/impl/src/mndDb.c index 755e2828de..c67c6862e7 100644 --- a/source/dnode/mnode/impl/src/mndDb.c +++ b/source/dnode/mnode/impl/src/mndDb.c @@ -18,14 +18,14 @@ #include "mndAuth.h" #include "mndDnode.h" #include "mndShow.h" +#include "mndSma.h" #include "mndStb.h" #include "mndTrans.h" #include "mndUser.h" #include "mndVgroup.h" -#include "mndSma.h" -#define TSDB_DB_VER_NUMBER 1 -#define TSDB_DB_RESERVE_SIZE 64 +#define DB_VER_NUMBER 1 +#define DB_RESERVE_SIZE 64 static SSdbRaw *mndDbActionEncode(SDbObj *pDb); static SSdbRow *mndDbActionDecode(SSdbRaw *pRaw); @@ -36,9 +36,8 @@ static int32_t mndProcessCreateDbReq(SNodeMsg *pReq); static int32_t mndProcessAlterDbReq(SNodeMsg *pReq); static int32_t mndProcessDropDbReq(SNodeMsg *pReq); static int32_t mndProcessUseDbReq(SNodeMsg *pReq); -static int32_t mndProcessSyncDbReq(SNodeMsg *pReq); static int32_t mndProcessCompactDbReq(SNodeMsg *pReq); -static int32_t mndRetrieveDbs(SNodeMsg *pReq, SShowObj *pShow, SSDataBlock* pBlock, int32_t rowsCapacity); +static int32_t mndRetrieveDbs(SNodeMsg *pReq, SShowObj *pShow, SSDataBlock *pBlock, int32_t rowsCapacity); static void mndCancelGetNextDb(SMnode *pMnode, void *pIter); static int32_t mndProcessGetDbCfgReq(SNodeMsg *pReq); static int32_t mndProcessGetIndexReq(SNodeMsg *pReq); @@ -56,7 +55,6 @@ int32_t mndInitDb(SMnode *pMnode) { mndSetMsgHandle(pMnode, TDMT_MND_ALTER_DB, mndProcessAlterDbReq); mndSetMsgHandle(pMnode, TDMT_MND_DROP_DB, mndProcessDropDbReq); mndSetMsgHandle(pMnode, TDMT_MND_USE_DB, mndProcessUseDbReq); - mndSetMsgHandle(pMnode, TDMT_MND_SYNC_DB, mndProcessSyncDbReq); mndSetMsgHandle(pMnode, TDMT_MND_COMPACT_DB, mndProcessCompactDbReq); mndSetMsgHandle(pMnode, TDMT_MND_GET_DB_CFG, mndProcessGetDbCfgReq); mndSetMsgHandle(pMnode, TDMT_MND_GET_INDEX, mndProcessGetIndexReq); @@ -72,54 +70,57 @@ void mndCleanupDb(SMnode *pMnode) {} static SSdbRaw *mndDbActionEncode(SDbObj *pDb) { terrno = TSDB_CODE_OUT_OF_MEMORY; - SSdbRaw *pRaw = sdbAllocRaw(SDB_DB, TSDB_DB_VER_NUMBER, - sizeof(SDbObj) + pDb->cfg.numOfRetensions * sizeof(SRetention) + TSDB_DB_RESERVE_SIZE); - if (pRaw == NULL) goto DB_ENCODE_OVER; + int32_t size = sizeof(SDbObj) + pDb->cfg.numOfRetensions * sizeof(SRetention) + DB_RESERVE_SIZE; + SSdbRaw *pRaw = sdbAllocRaw(SDB_DB, DB_VER_NUMBER, size); + if (pRaw == NULL) goto _OVER; int32_t dataPos = 0; - SDB_SET_BINARY(pRaw, dataPos, pDb->name, TSDB_DB_FNAME_LEN, DB_ENCODE_OVER) - SDB_SET_BINARY(pRaw, dataPos, pDb->acct, TSDB_USER_LEN, DB_ENCODE_OVER) - SDB_SET_BINARY(pRaw, dataPos, pDb->createUser, TSDB_USER_LEN, DB_ENCODE_OVER) - SDB_SET_INT64(pRaw, dataPos, pDb->createdTime, DB_ENCODE_OVER) - SDB_SET_INT64(pRaw, dataPos, pDb->updateTime, DB_ENCODE_OVER) - SDB_SET_INT64(pRaw, dataPos, pDb->uid, DB_ENCODE_OVER) - SDB_SET_INT32(pRaw, dataPos, pDb->cfgVersion, DB_ENCODE_OVER) - SDB_SET_INT32(pRaw, dataPos, pDb->vgVersion, DB_ENCODE_OVER) - SDB_SET_INT8(pRaw, dataPos, pDb->hashMethod, DB_ENCODE_OVER) - SDB_SET_INT32(pRaw, dataPos, pDb->cfg.numOfVgroups, DB_ENCODE_OVER) - SDB_SET_INT32(pRaw, dataPos, pDb->cfg.cacheBlockSize, DB_ENCODE_OVER) - SDB_SET_INT32(pRaw, dataPos, pDb->cfg.totalBlocks, DB_ENCODE_OVER) - SDB_SET_INT32(pRaw, dataPos, pDb->cfg.daysPerFile, DB_ENCODE_OVER) - SDB_SET_INT32(pRaw, dataPos, pDb->cfg.daysToKeep0, DB_ENCODE_OVER) - SDB_SET_INT32(pRaw, dataPos, pDb->cfg.daysToKeep1, DB_ENCODE_OVER) - SDB_SET_INT32(pRaw, dataPos, pDb->cfg.daysToKeep2, DB_ENCODE_OVER) - SDB_SET_INT32(pRaw, dataPos, pDb->cfg.minRows, DB_ENCODE_OVER) - SDB_SET_INT32(pRaw, dataPos, pDb->cfg.maxRows, DB_ENCODE_OVER) - SDB_SET_INT32(pRaw, dataPos, pDb->cfg.commitTime, DB_ENCODE_OVER) - SDB_SET_INT32(pRaw, dataPos, pDb->cfg.fsyncPeriod, DB_ENCODE_OVER) - SDB_SET_INT8(pRaw, dataPos, pDb->cfg.walLevel, DB_ENCODE_OVER) - SDB_SET_INT8(pRaw, dataPos, pDb->cfg.precision, DB_ENCODE_OVER) - SDB_SET_INT8(pRaw, dataPos, pDb->cfg.compression, DB_ENCODE_OVER) - SDB_SET_INT8(pRaw, dataPos, pDb->cfg.replications, DB_ENCODE_OVER) - SDB_SET_INT8(pRaw, dataPos, pDb->cfg.quorum, DB_ENCODE_OVER) - SDB_SET_INT8(pRaw, dataPos, pDb->cfg.update, DB_ENCODE_OVER) - SDB_SET_INT8(pRaw, dataPos, pDb->cfg.cacheLastRow, DB_ENCODE_OVER) - SDB_SET_INT32(pRaw, dataPos, pDb->cfg.numOfRetensions, DB_ENCODE_OVER) + SDB_SET_BINARY(pRaw, dataPos, pDb->name, TSDB_DB_FNAME_LEN, _OVER) + SDB_SET_BINARY(pRaw, dataPos, pDb->acct, TSDB_USER_LEN, _OVER) + SDB_SET_BINARY(pRaw, dataPos, pDb->createUser, TSDB_USER_LEN, _OVER) + SDB_SET_INT64(pRaw, dataPos, pDb->createdTime, _OVER) + SDB_SET_INT64(pRaw, dataPos, pDb->updateTime, _OVER) + SDB_SET_INT64(pRaw, dataPos, pDb->uid, _OVER) + SDB_SET_INT32(pRaw, dataPos, pDb->cfgVersion, _OVER) + SDB_SET_INT32(pRaw, dataPos, pDb->vgVersion, _OVER) + SDB_SET_INT32(pRaw, dataPos, pDb->cfg.numOfVgroups, _OVER) + SDB_SET_INT32(pRaw, dataPos, pDb->cfg.cacheBlockSize, _OVER) + SDB_SET_INT32(pRaw, dataPos, pDb->cfg.totalBlocks, _OVER) + SDB_SET_INT32(pRaw, dataPos, pDb->cfg.daysPerFile, _OVER) + SDB_SET_INT32(pRaw, dataPos, pDb->cfg.daysToKeep0, _OVER) + SDB_SET_INT32(pRaw, dataPos, pDb->cfg.daysToKeep1, _OVER) + SDB_SET_INT32(pRaw, dataPos, pDb->cfg.daysToKeep2, _OVER) + SDB_SET_INT32(pRaw, dataPos, pDb->cfg.minRows, _OVER) + SDB_SET_INT32(pRaw, dataPos, pDb->cfg.maxRows, _OVER) + SDB_SET_INT32(pRaw, dataPos, pDb->cfg.commitTime, _OVER) + SDB_SET_INT32(pRaw, dataPos, pDb->cfg.fsyncPeriod, _OVER) + SDB_SET_INT32(pRaw, dataPos, pDb->cfg.ttl, _OVER) + SDB_SET_INT8(pRaw, dataPos, pDb->cfg.walLevel, _OVER) + SDB_SET_INT8(pRaw, dataPos, pDb->cfg.precision, _OVER) + SDB_SET_INT8(pRaw, dataPos, pDb->cfg.compression, _OVER) + SDB_SET_INT8(pRaw, dataPos, pDb->cfg.replications, _OVER) + SDB_SET_INT8(pRaw, dataPos, pDb->cfg.strict, _OVER) + SDB_SET_INT8(pRaw, dataPos, pDb->cfg.update, _OVER) + SDB_SET_INT8(pRaw, dataPos, pDb->cfg.cacheLastRow, _OVER) + SDB_SET_INT8(pRaw, dataPos, pDb->cfg.streamMode, _OVER) + SDB_SET_INT8(pRaw, dataPos, pDb->cfg.singleSTable, _OVER) + SDB_SET_INT8(pRaw, dataPos, pDb->cfg.hashMethod, _OVER) + SDB_SET_INT32(pRaw, dataPos, pDb->cfg.numOfRetensions, _OVER) for (int32_t i = 0; i < pDb->cfg.numOfRetensions; ++i) { TASSERT(taosArrayGetSize(pDb->cfg.pRetensions) == pDb->cfg.numOfRetensions); SRetention *pRetension = taosArrayGet(pDb->cfg.pRetensions, i); - SDB_SET_INT32(pRaw, dataPos, pRetension->freq, DB_ENCODE_OVER) - SDB_SET_INT32(pRaw, dataPos, pRetension->keep, DB_ENCODE_OVER) - SDB_SET_INT8(pRaw, dataPos, pRetension->freqUnit, DB_ENCODE_OVER) - SDB_SET_INT8(pRaw, dataPos, pRetension->keepUnit, DB_ENCODE_OVER) + SDB_SET_INT32(pRaw, dataPos, pRetension->freq, _OVER) + SDB_SET_INT32(pRaw, dataPos, pRetension->keep, _OVER) + SDB_SET_INT8(pRaw, dataPos, pRetension->freqUnit, _OVER) + SDB_SET_INT8(pRaw, dataPos, pRetension->keepUnit, _OVER) } - SDB_SET_RESERVE(pRaw, dataPos, TSDB_DB_RESERVE_SIZE, DB_ENCODE_OVER) - SDB_SET_DATALEN(pRaw, dataPos, DB_ENCODE_OVER) + SDB_SET_RESERVE(pRaw, dataPos, DB_RESERVE_SIZE, _OVER) + SDB_SET_DATALEN(pRaw, dataPos, _OVER) terrno = 0; -DB_ENCODE_OVER: +_OVER: if (terrno != 0) { mError("db:%s, failed to encode to raw:%p since %s", pDb->name, pRaw, terrstr()); sdbFreeRaw(pRaw); @@ -134,68 +135,71 @@ static SSdbRow *mndDbActionDecode(SSdbRaw *pRaw) { terrno = TSDB_CODE_OUT_OF_MEMORY; int8_t sver = 0; - if (sdbGetRawSoftVer(pRaw, &sver) != 0) goto DB_DECODE_OVER; + if (sdbGetRawSoftVer(pRaw, &sver) != 0) goto _OVER; - if (sver != TSDB_DB_VER_NUMBER) { + if (sver != DB_VER_NUMBER) { terrno = TSDB_CODE_SDB_INVALID_DATA_VER; - goto DB_DECODE_OVER; + goto _OVER; } SSdbRow *pRow = sdbAllocRow(sizeof(SDbObj)); - if (pRow == NULL) goto DB_DECODE_OVER; + if (pRow == NULL) goto _OVER; SDbObj *pDb = sdbGetRowObj(pRow); - if (pDb == NULL) goto DB_DECODE_OVER; + if (pDb == NULL) goto _OVER; int32_t dataPos = 0; - SDB_GET_BINARY(pRaw, dataPos, pDb->name, TSDB_DB_FNAME_LEN, DB_DECODE_OVER) - SDB_GET_BINARY(pRaw, dataPos, pDb->acct, TSDB_USER_LEN, DB_DECODE_OVER) - SDB_GET_BINARY(pRaw, dataPos, pDb->createUser, TSDB_USER_LEN, DB_DECODE_OVER) - SDB_GET_INT64(pRaw, dataPos, &pDb->createdTime, DB_DECODE_OVER) - SDB_GET_INT64(pRaw, dataPos, &pDb->updateTime, DB_DECODE_OVER) - SDB_GET_INT64(pRaw, dataPos, &pDb->uid, DB_DECODE_OVER) - SDB_GET_INT32(pRaw, dataPos, &pDb->cfgVersion, DB_DECODE_OVER) - SDB_GET_INT32(pRaw, dataPos, &pDb->vgVersion, DB_DECODE_OVER) - SDB_GET_INT8(pRaw, dataPos, &pDb->hashMethod, DB_DECODE_OVER) - SDB_GET_INT32(pRaw, dataPos, &pDb->cfg.numOfVgroups, DB_DECODE_OVER) - SDB_GET_INT32(pRaw, dataPos, &pDb->cfg.cacheBlockSize, DB_DECODE_OVER) - SDB_GET_INT32(pRaw, dataPos, &pDb->cfg.totalBlocks, DB_DECODE_OVER) - SDB_GET_INT32(pRaw, dataPos, &pDb->cfg.daysPerFile, DB_DECODE_OVER) - SDB_GET_INT32(pRaw, dataPos, &pDb->cfg.daysToKeep0, DB_DECODE_OVER) - SDB_GET_INT32(pRaw, dataPos, &pDb->cfg.daysToKeep1, DB_DECODE_OVER) - SDB_GET_INT32(pRaw, dataPos, &pDb->cfg.daysToKeep2, DB_DECODE_OVER) - SDB_GET_INT32(pRaw, dataPos, &pDb->cfg.minRows, DB_DECODE_OVER) - SDB_GET_INT32(pRaw, dataPos, &pDb->cfg.maxRows, DB_DECODE_OVER) - SDB_GET_INT32(pRaw, dataPos, &pDb->cfg.commitTime, DB_DECODE_OVER) - SDB_GET_INT32(pRaw, dataPos, &pDb->cfg.fsyncPeriod, DB_DECODE_OVER) - SDB_GET_INT8(pRaw, dataPos, &pDb->cfg.walLevel, DB_DECODE_OVER) - SDB_GET_INT8(pRaw, dataPos, &pDb->cfg.precision, DB_DECODE_OVER) - SDB_GET_INT8(pRaw, dataPos, &pDb->cfg.compression, DB_DECODE_OVER) - SDB_GET_INT8(pRaw, dataPos, &pDb->cfg.replications, DB_DECODE_OVER) - SDB_GET_INT8(pRaw, dataPos, &pDb->cfg.quorum, DB_DECODE_OVER) - SDB_GET_INT8(pRaw, dataPos, &pDb->cfg.update, DB_DECODE_OVER) - SDB_GET_INT8(pRaw, dataPos, &pDb->cfg.cacheLastRow, DB_DECODE_OVER) - SDB_GET_INT32(pRaw, dataPos, &pDb->cfg.numOfRetensions, DB_DECODE_OVER) + SDB_GET_BINARY(pRaw, dataPos, pDb->name, TSDB_DB_FNAME_LEN, _OVER) + SDB_GET_BINARY(pRaw, dataPos, pDb->acct, TSDB_USER_LEN, _OVER) + SDB_GET_BINARY(pRaw, dataPos, pDb->createUser, TSDB_USER_LEN, _OVER) + SDB_GET_INT64(pRaw, dataPos, &pDb->createdTime, _OVER) + SDB_GET_INT64(pRaw, dataPos, &pDb->updateTime, _OVER) + SDB_GET_INT64(pRaw, dataPos, &pDb->uid, _OVER) + SDB_GET_INT32(pRaw, dataPos, &pDb->cfgVersion, _OVER) + SDB_GET_INT32(pRaw, dataPos, &pDb->vgVersion, _OVER) + SDB_GET_INT32(pRaw, dataPos, &pDb->cfg.numOfVgroups, _OVER) + SDB_GET_INT32(pRaw, dataPos, &pDb->cfg.cacheBlockSize, _OVER) + SDB_GET_INT32(pRaw, dataPos, &pDb->cfg.totalBlocks, _OVER) + SDB_GET_INT32(pRaw, dataPos, &pDb->cfg.daysPerFile, _OVER) + SDB_GET_INT32(pRaw, dataPos, &pDb->cfg.daysToKeep0, _OVER) + SDB_GET_INT32(pRaw, dataPos, &pDb->cfg.daysToKeep1, _OVER) + SDB_GET_INT32(pRaw, dataPos, &pDb->cfg.daysToKeep2, _OVER) + SDB_GET_INT32(pRaw, dataPos, &pDb->cfg.minRows, _OVER) + SDB_GET_INT32(pRaw, dataPos, &pDb->cfg.maxRows, _OVER) + SDB_GET_INT32(pRaw, dataPos, &pDb->cfg.commitTime, _OVER) + SDB_GET_INT32(pRaw, dataPos, &pDb->cfg.fsyncPeriod, _OVER) + SDB_GET_INT32(pRaw, dataPos, &pDb->cfg.ttl, _OVER) + SDB_GET_INT8(pRaw, dataPos, &pDb->cfg.walLevel, _OVER) + SDB_GET_INT8(pRaw, dataPos, &pDb->cfg.precision, _OVER) + SDB_GET_INT8(pRaw, dataPos, &pDb->cfg.compression, _OVER) + SDB_GET_INT8(pRaw, dataPos, &pDb->cfg.replications, _OVER) + SDB_GET_INT8(pRaw, dataPos, &pDb->cfg.strict, _OVER) + SDB_GET_INT8(pRaw, dataPos, &pDb->cfg.update, _OVER) + SDB_GET_INT8(pRaw, dataPos, &pDb->cfg.cacheLastRow, _OVER) + SDB_GET_INT8(pRaw, dataPos, &pDb->cfg.streamMode, _OVER) + SDB_GET_INT8(pRaw, dataPos, &pDb->cfg.singleSTable, _OVER) + SDB_GET_INT8(pRaw, dataPos, &pDb->cfg.hashMethod, _OVER) + SDB_GET_INT32(pRaw, dataPos, &pDb->cfg.numOfRetensions, _OVER) if (pDb->cfg.numOfRetensions > 0) { pDb->cfg.pRetensions = taosArrayInit(pDb->cfg.numOfRetensions, sizeof(SRetention)); - if (pDb->cfg.pRetensions == NULL) goto DB_DECODE_OVER; + if (pDb->cfg.pRetensions == NULL) goto _OVER; for (int32_t i = 0; i < pDb->cfg.numOfRetensions; ++i) { SRetention retension = {0}; - SDB_GET_INT32(pRaw, dataPos, &retension.freq, DB_DECODE_OVER) - SDB_GET_INT32(pRaw, dataPos, &retension.keep, DB_DECODE_OVER) - SDB_GET_INT8(pRaw, dataPos, &retension.freqUnit, DB_DECODE_OVER) - SDB_GET_INT8(pRaw, dataPos, &retension.keepUnit, DB_DECODE_OVER) + SDB_GET_INT32(pRaw, dataPos, &retension.freq, _OVER) + SDB_GET_INT32(pRaw, dataPos, &retension.keep, _OVER) + SDB_GET_INT8(pRaw, dataPos, &retension.freqUnit, _OVER) + SDB_GET_INT8(pRaw, dataPos, &retension.keepUnit, _OVER) if (taosArrayPush(pDb->cfg.pRetensions, &retension) == NULL) { - goto DB_DECODE_OVER; + goto _OVER; } } } - SDB_GET_RESERVE(pRaw, dataPos, TSDB_DB_RESERVE_SIZE, DB_DECODE_OVER) + SDB_GET_RESERVE(pRaw, dataPos, DB_RESERVE_SIZE, _OVER) terrno = 0; -DB_DECODE_OVER: +_OVER: if (terrno != 0) { mError("db:%s, failed to decode from raw:%p since %s", pDb->name, pRaw, terrstr()); taosMemoryFreeClear(pRow); @@ -244,7 +248,7 @@ void mndReleaseDb(SMnode *pMnode, SDbObj *pDb) { sdbRelease(pSdb, pDb); } -static int32_t mndCheckDbName(char *dbName, SUserObj *pUser) { +static int32_t mndCheckDbName(const char *dbName, SUserObj *pUser) { char *pos = strstr(dbName, TS_PATH_DELIMITER); if (pos == NULL) { terrno = TSDB_CODE_MND_INVALID_DB; @@ -271,23 +275,24 @@ static int32_t mndCheckDbCfg(SMnode *pMnode, SDbCfg *pCfg) { if (pCfg->daysToKeep0 < pCfg->daysPerFile) return -1; if (pCfg->daysToKeep0 > pCfg->daysToKeep1) return -1; if (pCfg->daysToKeep1 > pCfg->daysToKeep2) return -1; - if (pCfg->minRows < TSDB_MIN_MIN_ROW_FBLOCK || pCfg->minRows > TSDB_MAX_MIN_ROW_FBLOCK) return -1; - if (pCfg->maxRows < TSDB_MIN_MAX_ROW_FBLOCK || pCfg->maxRows > TSDB_MAX_MAX_ROW_FBLOCK) return -1; + if (pCfg->minRows < TSDB_MIN_MINROWS_FBLOCK || pCfg->minRows > TSDB_MAX_MINROWS_FBLOCK) return -1; + if (pCfg->maxRows < TSDB_MIN_MAXROWS_FBLOCK || pCfg->maxRows > TSDB_MAX_MAXROWS_FBLOCK) return -1; if (pCfg->minRows > pCfg->maxRows) return -1; if (pCfg->commitTime < TSDB_MIN_COMMIT_TIME || pCfg->commitTime > TSDB_MAX_COMMIT_TIME) return -1; if (pCfg->fsyncPeriod < TSDB_MIN_FSYNC_PERIOD || pCfg->fsyncPeriod > TSDB_MAX_FSYNC_PERIOD) return -1; - if (pCfg->ttl < TSDB_MIN_DB_TTL_OPTION && pCfg->ttl != TSDB_DEFAULT_DB_TTL_OPTION) return -1; + if (pCfg->ttl < TSDB_MIN_DB_TTL) return -1; if (pCfg->walLevel < TSDB_MIN_WAL_LEVEL || pCfg->walLevel > TSDB_MAX_WAL_LEVEL) return -1; if (pCfg->precision < TSDB_MIN_PRECISION && pCfg->precision > TSDB_MAX_PRECISION) return -1; if (pCfg->compression < TSDB_MIN_COMP_LEVEL || pCfg->compression > TSDB_MAX_COMP_LEVEL) return -1; - if (pCfg->replications < TSDB_MIN_DB_REPLICA_OPTION || pCfg->replications > TSDB_MAX_DB_REPLICA_OPTION) return -1; + if (pCfg->replications < TSDB_MIN_DB_REPLICA || pCfg->replications > TSDB_MAX_DB_REPLICA) return -1; if (pCfg->replications > mndGetDnodeSize(pMnode)) return -1; - if (pCfg->quorum < TSDB_MIN_DB_QUORUM_OPTION || pCfg->quorum > TSDB_MAX_DB_QUORUM_OPTION) return -1; - if (pCfg->quorum > pCfg->replications) return -1; + if (pCfg->strict < TSDB_DB_STRICT_OFF || pCfg->strict > TSDB_DB_STRICT_ON) return -1; + if (pCfg->strict > pCfg->replications) return -1; if (pCfg->update < TSDB_MIN_DB_UPDATE || pCfg->update > TSDB_MAX_DB_UPDATE) return -1; if (pCfg->cacheLastRow < TSDB_MIN_DB_CACHE_LAST_ROW || pCfg->cacheLastRow > TSDB_MAX_DB_CACHE_LAST_ROW) return -1; - if (pCfg->streamMode < TSDB_MIN_DB_STREAM_MODE || pCfg->streamMode > TSDB_MAX_DB_STREAM_MODE) return -1; - if (pCfg->singleSTable < TSDB_MIN_DB_SINGLE_STABLE_OPTION || pCfg->streamMode > TSDB_MAX_DB_SINGLE_STABLE_OPTION) return -1; + if (pCfg->streamMode < TSDB_DB_STREAM_MODE_OFF || pCfg->streamMode > TSDB_DB_STREAM_MODE_ON) return -1; + if (pCfg->singleSTable < TSDB_DB_SINGLE_STABLE_ON || pCfg->streamMode > TSDB_DB_SINGLE_STABLE_OFF) return -1; + if (pCfg->hashMethod != 1) return -1; return TSDB_CODE_SUCCESS; } @@ -299,20 +304,20 @@ static void mndSetDefaultDbCfg(SDbCfg *pCfg) { if (pCfg->daysToKeep0 < 0) pCfg->daysToKeep0 = TSDB_DEFAULT_KEEP; if (pCfg->daysToKeep1 < 0) pCfg->daysToKeep1 = pCfg->daysToKeep0; if (pCfg->daysToKeep2 < 0) pCfg->daysToKeep2 = pCfg->daysToKeep1; - if (pCfg->minRows < 0) pCfg->minRows = TSDB_DEFAULT_MIN_ROW_FBLOCK; - if (pCfg->maxRows < 0) pCfg->maxRows = TSDB_DEFAULT_MAX_ROW_FBLOCK; + if (pCfg->minRows < 0) pCfg->minRows = TSDB_DEFAULT_MINROWS_FBLOCK; + if (pCfg->maxRows < 0) pCfg->maxRows = TSDB_DEFAULT_MAXROWS_FBLOCK; if (pCfg->commitTime < 0) pCfg->commitTime = TSDB_DEFAULT_COMMIT_TIME; if (pCfg->fsyncPeriod < 0) pCfg->fsyncPeriod = TSDB_DEFAULT_FSYNC_PERIOD; - if (pCfg->ttl < 0) pCfg->ttl = TSDB_DEFAULT_DB_TTL_OPTION; + if (pCfg->ttl < 0) pCfg->ttl = TSDB_DEFAULT_DB_TTL; if (pCfg->walLevel < 0) pCfg->walLevel = TSDB_DEFAULT_WAL_LEVEL; if (pCfg->precision < 0) pCfg->precision = TSDB_DEFAULT_PRECISION; if (pCfg->compression < 0) pCfg->compression = TSDB_DEFAULT_COMP_LEVEL; - if (pCfg->replications < 0) pCfg->replications = TSDB_DEFAULT_DB_REPLICA_OPTION; - if (pCfg->quorum < 0) pCfg->quorum = TSDB_DEFAULT_DB_QUORUM_OPTION; - if (pCfg->update < 0) pCfg->update = TSDB_DEFAULT_DB_UPDATE_OPTION; + if (pCfg->replications < 0) pCfg->replications = TSDB_DEFAULT_DB_REPLICA; + if (pCfg->strict < 0) pCfg->strict = TSDB_DEFAULT_DB_STRICT; + if (pCfg->update < 0) pCfg->update = TSDB_DEFAULT_DB_UPDATE; if (pCfg->cacheLastRow < 0) pCfg->cacheLastRow = TSDB_DEFAULT_CACHE_LAST_ROW; if (pCfg->streamMode < 0) pCfg->streamMode = TSDB_DEFAULT_DB_STREAM_MODE; - if (pCfg->singleSTable < 0) pCfg->singleSTable = TSDB_DEFAULT_DB_SINGLE_STABLE_OPTION; + if (pCfg->singleSTable < 0) pCfg->singleSTable = TSDB_DEFAULT_DB_SINGLE_STABLE; if (pCfg->numOfRetensions < 0) pCfg->numOfRetensions = 0; } @@ -435,7 +440,6 @@ static int32_t mndCreateDb(SMnode *pMnode, SNodeMsg *pReq, SCreateDbReq *pCreate dbObj.uid = mndGenerateUid(dbObj.name, TSDB_DB_FNAME_LEN); dbObj.cfgVersion = 1; dbObj.vgVersion = 1; - dbObj.hashMethod = 1; memcpy(dbObj.createUser, pUser->user, TSDB_USER_LEN); dbObj.cfg = (SDbCfg){ .numOfVgroups = pCreate->numOfVgroups, @@ -454,11 +458,12 @@ static int32_t mndCreateDb(SMnode *pMnode, SNodeMsg *pReq, SCreateDbReq *pCreate .precision = pCreate->precision, .compression = pCreate->compression, .replications = pCreate->replications, - .quorum = pCreate->quorum, + .strict = pCreate->strict, .update = pCreate->update, .cacheLastRow = pCreate->cacheLastRow, .streamMode = pCreate->streamMode, .singleSTable = pCreate->singleSTable, + .hashMethod = 1, }; dbObj.cfg.numOfRetensions = pCreate->numOfRetensions; @@ -486,21 +491,21 @@ static int32_t mndCreateDb(SMnode *pMnode, SNodeMsg *pReq, SCreateDbReq *pCreate int32_t code = -1; STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_ROLLBACK, TRN_TYPE_CREATE_DB, &pReq->rpcMsg); - if (pTrans == NULL) goto CREATE_DB_OVER; + if (pTrans == NULL) goto _OVER; mDebug("trans:%d, used to create db:%s", pTrans->id, pCreate->db); mndTransSetDbInfo(pTrans, &dbObj); - if (mndSetCreateDbRedoLogs(pMnode, pTrans, &dbObj, pVgroups) != 0) goto CREATE_DB_OVER; - if (mndSetCreateDbUndoLogs(pMnode, pTrans, &dbObj, pVgroups) != 0) goto CREATE_DB_OVER; - if (mndSetCreateDbCommitLogs(pMnode, pTrans, &dbObj, pVgroups) != 0) goto CREATE_DB_OVER; - if (mndSetCreateDbRedoActions(pMnode, pTrans, &dbObj, pVgroups) != 0) goto CREATE_DB_OVER; - if (mndSetCreateDbUndoActions(pMnode, pTrans, &dbObj, pVgroups) != 0) goto CREATE_DB_OVER; - if (mndTransPrepare(pMnode, pTrans) != 0) goto CREATE_DB_OVER; + if (mndSetCreateDbRedoLogs(pMnode, pTrans, &dbObj, pVgroups) != 0) goto _OVER; + if (mndSetCreateDbUndoLogs(pMnode, pTrans, &dbObj, pVgroups) != 0) goto _OVER; + if (mndSetCreateDbCommitLogs(pMnode, pTrans, &dbObj, pVgroups) != 0) goto _OVER; + if (mndSetCreateDbRedoActions(pMnode, pTrans, &dbObj, pVgroups) != 0) goto _OVER; + if (mndSetCreateDbUndoActions(pMnode, pTrans, &dbObj, pVgroups) != 0) goto _OVER; + if (mndTransPrepare(pMnode, pTrans) != 0) goto _OVER; code = 0; -CREATE_DB_OVER: +_OVER: taosMemoryFree(pVgroups); mndTransDrop(pTrans); return code; @@ -515,7 +520,7 @@ static int32_t mndProcessCreateDbReq(SNodeMsg *pReq) { if (tDeserializeSCreateDbReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &createReq) != 0) { terrno = TSDB_CODE_INVALID_MSG; - goto CREATE_DB_OVER; + goto _OVER; } mDebug("db:%s, start to create, vgroups:%d", createReq.db, createReq.numOfVgroups); @@ -525,28 +530,28 @@ static int32_t mndProcessCreateDbReq(SNodeMsg *pReq) { if (createReq.ignoreExist) { mDebug("db:%s, already exist, ignore exist is set", createReq.db); code = 0; - goto CREATE_DB_OVER; + goto _OVER; } else { terrno = TSDB_CODE_MND_DB_ALREADY_EXIST; - goto CREATE_DB_OVER; + goto _OVER; } } else if (terrno != TSDB_CODE_MND_DB_NOT_EXIST) { - goto CREATE_DB_OVER; + goto _OVER; } pUser = mndAcquireUser(pMnode, pReq->user); if (pUser == NULL) { - goto CREATE_DB_OVER; + goto _OVER; } if (mndCheckCreateDbAuth(pUser) != 0) { - goto CREATE_DB_OVER; + goto _OVER; } code = mndCreateDb(pMnode, pReq, &createReq, pUser); if (code == 0) code = TSDB_CODE_MND_ACTION_IN_PROGRESS; -CREATE_DB_OVER: +_OVER: if (code != 0 && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) { mError("db:%s, failed to create since %s", createReq.db, terrstr()); } @@ -591,8 +596,8 @@ static int32_t mndSetDbCfgFromAlterDbReq(SDbObj *pDb, SAlterDbReq *pAlter) { terrno = 0; } - if (pAlter->quorum >= 0 && pAlter->quorum != pDb->cfg.quorum) { - pDb->cfg.quorum = pAlter->quorum; + if (pAlter->strict >= 0 && pAlter->strict != pDb->cfg.strict) { + pDb->cfg.strict = pAlter->strict; terrno = 0; } @@ -601,10 +606,15 @@ static int32_t mndSetDbCfgFromAlterDbReq(SDbObj *pDb, SAlterDbReq *pAlter) { terrno = 0; } + if (pAlter->replications >= 0 && pAlter->replications != pDb->cfg.replications) { + pDb->cfg.replications = pAlter->replications; + terrno = 0; + } + return terrno; } -static int32_t mndSetUpdateDbRedoLogs(SMnode *pMnode, STrans *pTrans, SDbObj *pOld, SDbObj *pNew) { +static int32_t mndSetAlterDbRedoLogs(SMnode *pMnode, STrans *pTrans, SDbObj *pOld, SDbObj *pNew) { SSdbRaw *pRedoRaw = mndDbActionEncode(pOld); if (pRedoRaw == NULL) return -1; if (mndTransAppendRedolog(pTrans, pRedoRaw) != 0) return -1; @@ -613,7 +623,7 @@ static int32_t mndSetUpdateDbRedoLogs(SMnode *pMnode, STrans *pTrans, SDbObj *pO return 0; } -static int32_t mndSetUpdateDbCommitLogs(SMnode *pMnode, STrans *pTrans, SDbObj *pOld, SDbObj *pNew) { +static int32_t mndSetAlterDbCommitLogs(SMnode *pMnode, STrans *pTrans, SDbObj *pOld, SDbObj *pNew) { SSdbRaw *pCommitRaw = mndDbActionEncode(pNew); if (pCommitRaw == NULL) return -1; if (mndTransAppendCommitlog(pTrans, pCommitRaw) != 0) return -1; @@ -622,7 +632,65 @@ static int32_t mndSetUpdateDbCommitLogs(SMnode *pMnode, STrans *pTrans, SDbObj * return 0; } -static int32_t mndBuildUpdateVgroupAction(SMnode *pMnode, STrans *pTrans, SDbObj *pDb, SVgObj *pVgroup) { +void *mndBuildAlterVnodeReq(SMnode *pMnode, SDnodeObj *pDnode, SDbObj *pDb, SVgObj *pVgroup, int32_t *pContLen) { + SAlterVnodeReq alterReq = {0}; + alterReq.vgVersion = pVgroup->version; + alterReq.totalBlocks = pDb->cfg.totalBlocks; + alterReq.daysToKeep0 = pDb->cfg.daysToKeep0; + alterReq.daysToKeep1 = pDb->cfg.daysToKeep1; + alterReq.daysToKeep2 = pDb->cfg.daysToKeep2; + alterReq.walLevel = pDb->cfg.walLevel; + alterReq.strict = pDb->cfg.strict; + alterReq.cacheLastRow = pDb->cfg.cacheLastRow; + alterReq.replica = pVgroup->replica; + alterReq.selfIndex = -1; + + for (int32_t v = 0; v < pVgroup->replica; ++v) { + SReplica *pReplica = &alterReq.replicas[v]; + SVnodeGid *pVgid = &pVgroup->vnodeGid[v]; + SDnodeObj *pVgidDnode = mndAcquireDnode(pMnode, pVgid->dnodeId); + if (pVgidDnode == NULL) { + return NULL; + } + + pReplica->id = pVgidDnode->id; + pReplica->port = pVgidDnode->port; + memcpy(pReplica->fqdn, pVgidDnode->fqdn, TSDB_FQDN_LEN); + mndReleaseDnode(pMnode, pVgidDnode); + + if (pDnode->id == pVgid->dnodeId) { + alterReq.selfIndex = v; + } + } + + if (alterReq.selfIndex == -1) { + terrno = TSDB_CODE_MND_APP_ERROR; + return NULL; + } + + int32_t contLen = tSerializeSAlterVnodeReq(NULL, 0, &alterReq); + if (contLen < 0) { + terrno = TSDB_CODE_OUT_OF_MEMORY; + return NULL; + } + contLen += +sizeof(SMsgHead); + + void *pReq = taosMemoryMalloc(contLen); + if (pReq == NULL) { + terrno = TSDB_CODE_OUT_OF_MEMORY; + return NULL; + } + + SMsgHead *pHead = pReq; + pHead->contLen = htonl(contLen); + pHead->vgId = htonl(pVgroup->vgId); + + tSerializeSAlterVnodeReq((char *)pReq + sizeof(SMsgHead), contLen, &alterReq); + *pContLen = contLen; + return pReq; +} + +static int32_t mndBuilAlterVgroupAction(SMnode *pMnode, STrans *pTrans, SDbObj *pDb, SVgObj *pVgroup) { for (int32_t vn = 0; vn < pVgroup->replica; ++vn) { STransAction action = {0}; SVnodeGid *pVgid = pVgroup->vnodeGid + vn; @@ -633,12 +701,12 @@ static int32_t mndBuildUpdateVgroupAction(SMnode *pMnode, STrans *pTrans, SDbObj mndReleaseDnode(pMnode, pDnode); int32_t contLen = 0; - void *pReq = mndBuildCreateVnodeReq(pMnode, pDnode, pDb, pVgroup, &contLen); + void *pReq = mndBuildAlterVnodeReq(pMnode, pDnode, pDb, pVgroup, &contLen); if (pReq == NULL) return -1; action.pCont = pReq; action.contLen = contLen; - action.msgType = TDMT_DND_ALTER_VNODE; + action.msgType = TDMT_VND_ALTER_VNODE; if (mndTransAppendRedoAction(pTrans, &action) != 0) { taosMemoryFree(pReq); return -1; @@ -648,7 +716,7 @@ static int32_t mndBuildUpdateVgroupAction(SMnode *pMnode, STrans *pTrans, SDbObj return 0; } -static int32_t mndSetUpdateDbRedoActions(SMnode *pMnode, STrans *pTrans, SDbObj *pOld, SDbObj *pNew) { +static int32_t mndSetAlterDbRedoActions(SMnode *pMnode, STrans *pTrans, SDbObj *pOld, SDbObj *pNew) { SSdb *pSdb = pMnode->pSdb; void *pIter = NULL; @@ -658,7 +726,7 @@ static int32_t mndSetUpdateDbRedoActions(SMnode *pMnode, STrans *pTrans, SDbObj if (pIter == NULL) break; if (pVgroup->dbUid == pNew->uid) { - if (mndBuildUpdateVgroupAction(pMnode, pTrans, pNew, pVgroup) != 0) { + if (mndBuilAlterVgroupAction(pMnode, pTrans, pNew, pVgroup) != 0) { sdbCancelFetch(pSdb, pIter); sdbRelease(pSdb, pVgroup); return -1; @@ -671,17 +739,17 @@ static int32_t mndSetUpdateDbRedoActions(SMnode *pMnode, STrans *pTrans, SDbObj return 0; } -static int32_t mndUpdateDb(SMnode *pMnode, SNodeMsg *pReq, SDbObj *pOld, SDbObj *pNew) { +static int32_t mndAlterDb(SMnode *pMnode, SNodeMsg *pReq, SDbObj *pOld, SDbObj *pNew) { int32_t code = -1; STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_TYPE_ALTER_DB, &pReq->rpcMsg); if (pTrans == NULL) goto UPDATE_DB_OVER; - mDebug("trans:%d, used to update db:%s", pTrans->id, pOld->name); + mDebug("trans:%d, used to alter db:%s", pTrans->id, pOld->name); mndTransSetDbInfo(pTrans, pOld); - if (mndSetUpdateDbRedoLogs(pMnode, pTrans, pOld, pNew) != 0) goto UPDATE_DB_OVER; - if (mndSetUpdateDbCommitLogs(pMnode, pTrans, pOld, pNew) != 0) goto UPDATE_DB_OVER; - if (mndSetUpdateDbRedoActions(pMnode, pTrans, pOld, pNew) != 0) goto UPDATE_DB_OVER; + if (mndSetAlterDbRedoLogs(pMnode, pTrans, pOld, pNew) != 0) goto UPDATE_DB_OVER; + if (mndSetAlterDbCommitLogs(pMnode, pTrans, pOld, pNew) != 0) goto UPDATE_DB_OVER; + if (mndSetAlterDbRedoActions(pMnode, pTrans, pOld, pNew) != 0) goto UPDATE_DB_OVER; if (mndTransPrepare(pMnode, pTrans) != 0) goto UPDATE_DB_OVER; code = 0; @@ -716,7 +784,7 @@ static int32_t mndProcessAlterDbReq(SNodeMsg *pReq) { goto ALTER_DB_OVER; } - if (mndCheckAlterDropCompactSyncDbAuth(pUser, pDb) != 0) { + if (mndCheckAlterDropCompactDbAuth(pUser, pDb) != 0) { goto ALTER_DB_OVER; } @@ -730,7 +798,7 @@ static int32_t mndProcessAlterDbReq(SNodeMsg *pReq) { dbObj.cfgVersion++; dbObj.updateTime = taosGetTimestampMs(); - code = mndUpdateDb(pMnode, pReq, pDb, &dbObj); + code = mndAlterDb(pMnode, pReq, pDb, &dbObj); if (code == 0) code = TSDB_CODE_MND_ACTION_IN_PROGRESS; ALTER_DB_OVER: @@ -745,11 +813,11 @@ ALTER_DB_OVER: } static int32_t mndProcessGetDbCfgReq(SNodeMsg *pReq) { - SMnode *pMnode = pReq->pNode; - int32_t code = -1; - SDbObj *pDb = NULL; - SDbCfgReq cfgReq = {0}; - SDbCfgRsp cfgRsp = {0}; + SMnode *pMnode = pReq->pNode; + int32_t code = -1; + SDbObj *pDb = NULL; + SDbCfgReq cfgReq = {0}; + SDbCfgRsp cfgRsp = {0}; if (tDeserializeSDbCfgReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &cfgReq) != 0) { terrno = TSDB_CODE_INVALID_MSG; @@ -762,27 +830,27 @@ static int32_t mndProcessGetDbCfgReq(SNodeMsg *pReq) { goto GET_DB_CFG_OVER; } - cfgRsp.numOfVgroups = pDb->cfg.numOfVgroups; + cfgRsp.numOfVgroups = pDb->cfg.numOfVgroups; cfgRsp.cacheBlockSize = pDb->cfg.cacheBlockSize; - cfgRsp.totalBlocks = pDb->cfg.totalBlocks; - cfgRsp.daysPerFile = pDb->cfg.daysPerFile; - cfgRsp.daysToKeep0 = pDb->cfg.daysToKeep0; - cfgRsp.daysToKeep1 = pDb->cfg.daysToKeep1; - cfgRsp.daysToKeep2 = pDb->cfg.daysToKeep2; - cfgRsp.minRows = pDb->cfg.minRows; - cfgRsp.maxRows = pDb->cfg.maxRows; - cfgRsp.commitTime = pDb->cfg.commitTime; - cfgRsp.fsyncPeriod = pDb->cfg.fsyncPeriod; - cfgRsp.ttl = pDb->cfg.ttl; - cfgRsp.walLevel = pDb->cfg.walLevel; - cfgRsp.precision = pDb->cfg.precision; - cfgRsp.compression = pDb->cfg.compression; - cfgRsp.replications = pDb->cfg.replications; - cfgRsp.quorum = pDb->cfg.quorum; - cfgRsp.update = pDb->cfg.update; - cfgRsp.cacheLastRow = pDb->cfg.cacheLastRow; - cfgRsp.streamMode = pDb->cfg.streamMode; - cfgRsp.singleSTable = pDb->cfg.singleSTable; + cfgRsp.totalBlocks = pDb->cfg.totalBlocks; + cfgRsp.daysPerFile = pDb->cfg.daysPerFile; + cfgRsp.daysToKeep0 = pDb->cfg.daysToKeep0; + cfgRsp.daysToKeep1 = pDb->cfg.daysToKeep1; + cfgRsp.daysToKeep2 = pDb->cfg.daysToKeep2; + cfgRsp.minRows = pDb->cfg.minRows; + cfgRsp.maxRows = pDb->cfg.maxRows; + cfgRsp.commitTime = pDb->cfg.commitTime; + cfgRsp.fsyncPeriod = pDb->cfg.fsyncPeriod; + cfgRsp.ttl = pDb->cfg.ttl; + cfgRsp.walLevel = pDb->cfg.walLevel; + cfgRsp.precision = pDb->cfg.precision; + cfgRsp.compression = pDb->cfg.compression; + cfgRsp.replications = pDb->cfg.replications; + cfgRsp.strict = pDb->cfg.strict; + cfgRsp.update = pDb->cfg.update; + cfgRsp.cacheLastRow = pDb->cfg.cacheLastRow; + cfgRsp.streamMode = pDb->cfg.streamMode; + cfgRsp.singleSTable = pDb->cfg.singleSTable; int32_t contLen = tSerializeSDbCfgRsp(NULL, 0, &cfgRsp); void *pRsp = rpcMallocCont(contLen); @@ -797,6 +865,8 @@ static int32_t mndProcessGetDbCfgReq(SNodeMsg *pReq) { pReq->pRsp = pRsp; pReq->rspLen = contLen; + code = 0; + GET_DB_CFG_OVER: if (code != 0 && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) { @@ -808,7 +878,6 @@ GET_DB_CFG_OVER: return code; } - static int32_t mndSetDropDbRedoLogs(SMnode *pMnode, STrans *pTrans, SDbObj *pDb) { SSdbRaw *pRedoRaw = mndDbActionEncode(pDb); if (pRedoRaw == NULL) return -1; @@ -945,25 +1014,25 @@ static int32_t mndBuildDropDbRsp(SDbObj *pDb, int32_t *pRspLen, void **ppRsp, bo static int32_t mndDropDb(SMnode *pMnode, SNodeMsg *pReq, SDbObj *pDb) { int32_t code = -1; STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_TYPE_DROP_DB, &pReq->rpcMsg); - if (pTrans == NULL) goto DROP_DB_OVER; + if (pTrans == NULL) goto _OVER; mDebug("trans:%d, used to drop db:%s", pTrans->id, pDb->name); mndTransSetDbInfo(pTrans, pDb); - if (mndSetDropDbRedoLogs(pMnode, pTrans, pDb) != 0) goto DROP_DB_OVER; - if (mndSetDropDbCommitLogs(pMnode, pTrans, pDb) != 0) goto DROP_DB_OVER; - if (mndSetDropDbRedoActions(pMnode, pTrans, pDb) != 0) goto DROP_DB_OVER; + if (mndSetDropDbRedoLogs(pMnode, pTrans, pDb) != 0) goto _OVER; + if (mndSetDropDbCommitLogs(pMnode, pTrans, pDb) != 0) goto _OVER; + if (mndSetDropDbRedoActions(pMnode, pTrans, pDb) != 0) goto _OVER; int32_t rspLen = 0; void *pRsp = NULL; - if (mndBuildDropDbRsp(pDb, &rspLen, &pRsp, false) < 0) goto DROP_DB_OVER; + if (mndBuildDropDbRsp(pDb, &rspLen, &pRsp, false) < 0) goto _OVER; mndTransSetRpcRsp(pTrans, pRsp, rspLen); - if (mndTransPrepare(pMnode, pTrans) != 0) goto DROP_DB_OVER; + if (mndTransPrepare(pMnode, pTrans) != 0) goto _OVER; code = 0; -DROP_DB_OVER: +_OVER: mndTransDrop(pTrans); return code; } @@ -977,7 +1046,7 @@ static int32_t mndProcessDropDbReq(SNodeMsg *pReq) { if (tDeserializeSDropDbReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &dropReq) != 0) { terrno = TSDB_CODE_INVALID_MSG; - goto DROP_DB_OVER; + goto _OVER; } mDebug("db:%s, start to drop", dropReq.db); @@ -986,26 +1055,26 @@ static int32_t mndProcessDropDbReq(SNodeMsg *pReq) { if (pDb == NULL) { if (dropReq.ignoreNotExists) { code = mndBuildDropDbRsp(pDb, &pReq->rspLen, &pReq->pRsp, true); - goto DROP_DB_OVER; + goto _OVER; } else { terrno = TSDB_CODE_MND_DB_NOT_EXIST; - goto DROP_DB_OVER; + goto _OVER; } } pUser = mndAcquireUser(pMnode, pReq->user); if (pUser == NULL) { - goto DROP_DB_OVER; + goto _OVER; } - if (mndCheckAlterDropCompactSyncDbAuth(pUser, pDb) != 0) { - goto DROP_DB_OVER; + if (mndCheckAlterDropCompactDbAuth(pUser, pDb) != 0) { + goto _OVER; } code = mndDropDb(pMnode, pReq, pDb); if (code == 0) code = TSDB_CODE_MND_ACTION_IN_PROGRESS; -DROP_DB_OVER: +_OVER: if (code != 0 && code != TSDB_CODE_MND_ACTION_IN_PROGRESS) { mError("db:%s, failed to drop since %s", dropReq.db, terrstr()); } @@ -1100,7 +1169,7 @@ int32_t mndExtractDbInfo(SMnode *pMnode, SDbObj *pDb, SUseDbRsp *pRsp, const SUs pRsp->uid = pDb->uid; pRsp->vgVersion = pDb->vgVersion; pRsp->vgNum = taosArrayGetSize(pRsp->pVgroupInfos); - pRsp->hashMethod = pDb->hashMethod; + pRsp->hashMethod = pDb->cfg.hashMethod; return 0; } @@ -1243,7 +1312,7 @@ int32_t mndValidateDbInfo(SMnode *pMnode, SDbVgVersion *pDbs, int32_t numOfDbs, usedbRsp.uid = pDb->uid; usedbRsp.vgVersion = pDb->vgVersion; usedbRsp.vgNum = (int32_t)taosArrayGetSize(usedbRsp.pVgroupInfos); - usedbRsp.hashMethod = pDb->hashMethod; + usedbRsp.hashMethod = pDb->cfg.hashMethod; taosArrayPush(batchUseRsp.pArray, &usedbRsp); mndReleaseDb(pMnode, pDb); @@ -1265,47 +1334,6 @@ int32_t mndValidateDbInfo(SMnode *pMnode, SDbVgVersion *pDbs, int32_t numOfDbs, return 0; } -static int32_t mndProcessSyncDbReq(SNodeMsg *pReq) { - SMnode *pMnode = pReq->pNode; - int32_t code = -1; - SDbObj *pDb = NULL; - SUserObj *pUser = NULL; - SSyncDbReq syncReq = {0}; - - if (tDeserializeSSyncDbReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &syncReq) != 0) { - terrno = TSDB_CODE_INVALID_MSG; - goto SYNC_DB_OVER; - } - - mDebug("db:%s, start to sync", syncReq.db); - - pDb = mndAcquireDb(pMnode, syncReq.db); - if (pDb == NULL) { - goto SYNC_DB_OVER; - } - - pUser = mndAcquireUser(pMnode, pReq->user); - if (pUser == NULL) { - goto SYNC_DB_OVER; - } - - if (mndCheckAlterDropCompactSyncDbAuth(pUser, pDb) != 0) { - goto SYNC_DB_OVER; - } - - // code = mndSyncDb(); - -SYNC_DB_OVER: - if (code != 0) { - mError("db:%s, failed to process sync db req since %s", syncReq.db, terrstr()); - } - - mndReleaseDb(pMnode, pDb); - mndReleaseUser(pMnode, pUser); - - return code; -} - static int32_t mndProcessCompactDbReq(SNodeMsg *pReq) { SMnode *pMnode = pReq->pNode; int32_t code = -1; @@ -1313,30 +1341,30 @@ static int32_t mndProcessCompactDbReq(SNodeMsg *pReq) { SUserObj *pUser = NULL; SCompactDbReq compactReq = {0}; - if (tDeserializeSSyncDbReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &compactReq) != 0) { + if (tDeserializeSCompactDbReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &compactReq) != 0) { terrno = TSDB_CODE_INVALID_MSG; - goto SYNC_DB_OVER; + goto _OVER; } mDebug("db:%s, start to sync", compactReq.db); pDb = mndAcquireDb(pMnode, compactReq.db); if (pDb == NULL) { - goto SYNC_DB_OVER; + goto _OVER; } pUser = mndAcquireUser(pMnode, pReq->user); if (pUser == NULL) { - goto SYNC_DB_OVER; + goto _OVER; } - if (mndCheckAlterDropCompactSyncDbAuth(pUser, pDb) != 0) { - goto SYNC_DB_OVER; + if (mndCheckAlterDropCompactDbAuth(pUser, pDb) != 0) { + goto _OVER; } - // code = mndSyncDb(); + // code = mndCompactDb(); -SYNC_DB_OVER: +_OVER: if (code != 0) { mError("db:%s, failed to process compact db req since %s", compactReq.db, terrstr()); } @@ -1347,27 +1375,23 @@ SYNC_DB_OVER: return code; } -char *mndGetDbStr(char *src) { +const char *mndGetDbStr(const char *src) { char *pos = strstr(src, TS_PATH_DELIMITER); if (pos != NULL) ++pos; - - if (pos == NULL) { - return src; - } - + if (pos == NULL) return src; return pos; } -static void dumpDbInfoData(SSDataBlock* pBlock, SDbObj *pDb, SShowObj *pShow, int32_t rows, int64_t numOfTables, bool sysDb) { +static void dumpDbInfoData(SSDataBlock *pBlock, SDbObj *pDb, SShowObj *pShow, int32_t rows, int64_t numOfTables, + bool sysDb) { int32_t cols = 0; - char* buf = taosMemoryMalloc(pShow->bytes[cols]); - char *name = mndGetDbStr(pDb->name); + char *buf = taosMemoryMalloc(pShow->bytes[cols]); + const char *name = mndGetDbStr(pDb->name); if (name != NULL) { STR_WITH_MAXSIZE_TO_VARSTR(buf, name, pShow->bytes[cols]); } else { -// STR_TO_VARSTR(pWrite, "NULL"); - ASSERT(0); + STR_WITH_MAXSIZE_TO_VARSTR(buf, "NULL", pShow->bytes[cols]); } char *status = "ready"; @@ -1375,8 +1399,8 @@ static void dumpDbInfoData(SSDataBlock* pBlock, SDbObj *pDb, SShowObj *pShow, in STR_WITH_SIZE_TO_VARSTR(b, status, strlen(status)); if (sysDb) { - for(int32_t i = 0; i < pShow->numOfColumns; ++i) { - SColumnInfoData* pColInfo = taosArrayGet(pBlock->pDataBlock, i); + for (int32_t i = 0; i < pShow->numOfColumns; ++i) { + SColumnInfoData *pColInfo = taosArrayGet(pBlock->pDataBlock, i); if (i == 0) { colDataAppend(pColInfo, rows, buf, false); } else if (i == 3) { @@ -1404,8 +1428,11 @@ static void dumpDbInfoData(SSDataBlock* pBlock, SDbObj *pDb, SShowObj *pShow, in pColInfo = taosArrayGet(pBlock->pDataBlock, cols++); colDataAppend(pColInfo, rows, (const char *)&pDb->cfg.replications, false); + const char *src = pDb->cfg.strict ? "strict" : "nostrict"; + char b[9 + VARSTR_HEADER_SIZE] = {0}; + STR_WITH_SIZE_TO_VARSTR(b, src, strlen(src)); pColInfo = taosArrayGet(pBlock->pDataBlock, cols++); - colDataAppend(pColInfo, rows, (const char *)&pDb->cfg.quorum, false); + colDataAppend(pColInfo, rows, (const char *)b, false); pColInfo = taosArrayGet(pBlock->pDataBlock, cols++); colDataAppend(pColInfo, rows, (const char *)&pDb->cfg.daysPerFile, false); @@ -1484,7 +1511,6 @@ static void dumpDbInfoData(SSDataBlock* pBlock, SDbObj *pDb, SShowObj *pShow, in // pWrite = getDataPosition(data, pShow, cols, rows, rowCapacity); // *(int8_t *)pWrite = pDb->cfg.update; - } static void setInformationSchemaDbCfg(SDbObj *pDbObj) { @@ -1493,19 +1519,19 @@ static void setInformationSchemaDbCfg(SDbObj *pDbObj) { pDbObj->createdTime = 0; pDbObj->cfg.numOfVgroups = 0; - pDbObj->cfg.quorum = 1; + pDbObj->cfg.strict = 1; pDbObj->cfg.replications = 1; pDbObj->cfg.update = 1; pDbObj->cfg.precision = TSDB_TIME_PRECISION_MILLI; } -static void setPerfSchemaDbCfg(SDbObj* pDbObj) { +static void setPerfSchemaDbCfg(SDbObj *pDbObj) { ASSERT(pDbObj != NULL); strncpy(pDbObj->name, TSDB_PERFORMANCE_SCHEMA_DB, tListLen(pDbObj->name)); pDbObj->createdTime = 0; pDbObj->cfg.numOfVgroups = 0; - pDbObj->cfg.quorum = 1; + pDbObj->cfg.strict = 1; pDbObj->cfg.replications = 1; pDbObj->cfg.update = 1; pDbObj->cfg.precision = TSDB_TIME_PRECISION_MILLI; @@ -1519,7 +1545,7 @@ static bool mndGetTablesOfDbFp(SMnode *pMnode, void *pObj, void *p1, void *p2, v return true; } -static int32_t mndRetrieveDbs(SNodeMsg *pReq, SShowObj *pShow, SSDataBlock* pBlock, int32_t rowsCapacity) { +static int32_t mndRetrieveDbs(SNodeMsg *pReq, SShowObj *pShow, SSDataBlock *pBlock, int32_t rowsCapacity) { SMnode *pMnode = pReq->pNode; SSdb *pSdb = pMnode->pSdb; int32_t numOfRows = 0; @@ -1567,10 +1593,10 @@ static void mndCancelGetNextDb(SMnode *pMnode, void *pIter) { static int32_t mndProcessGetIndexReq(SNodeMsg *pReq) { SUserIndexReq indexReq = {0}; - SMnode *pMnode = pReq->pNode; - int32_t code = -1; + SMnode *pMnode = pReq->pNode; + int32_t code = -1; SUserIndexRsp rsp = {0}; - bool exist = false; + bool exist = false; if (tDeserializeSUserIndexReq(pReq->rpcMsg.pCont, pReq->rpcMsg.contLen, &indexReq) != 0) { terrno = TSDB_CODE_INVALID_MSG; @@ -1583,7 +1609,7 @@ static int32_t mndProcessGetIndexReq(SNodeMsg *pReq) { } if (!exist) { - //TODO GET INDEX FROM FULLTEXT + // TODO GET INDEX FROM FULLTEXT code = -1; terrno = TSDB_CODE_MND_DB_INDEX_NOT_EXIST; } else { @@ -1594,9 +1620,9 @@ static int32_t mndProcessGetIndexReq(SNodeMsg *pReq) { code = -1; goto _OVER; } - + tSerializeSUserIndexRsp(pRsp, contLen, &rsp); - + pReq->pRsp = pRsp; pReq->rspLen = contLen; @@ -1610,4 +1636,3 @@ _OVER: return code; } - diff --git a/source/dnode/mnode/impl/src/mndDnode.c b/source/dnode/mnode/impl/src/mndDnode.c index 5ce87a413c..e9b02ca3ad 100644 --- a/source/dnode/mnode/impl/src/mndDnode.c +++ b/source/dnode/mnode/impl/src/mndDnode.c @@ -326,7 +326,7 @@ static int32_t mndProcessStatusReq(SNodeMsg *pReq) { SVgObj *pVgroup = mndAcquireVgroup(pMnode, pVload->vgId); if (pVgroup != NULL) { - if (pVload->role == TAOS_SYNC_STATE_LEADER) { + if (pVload->syncState == TAOS_SYNC_STATE_LEADER) { pVgroup->numOfTables = pVload->numOfTables; pVgroup->numOfTimeSeries = pVload->numOfTimeSeries; pVgroup->totalStorage = pVload->totalStorage; @@ -335,10 +335,10 @@ static int32_t mndProcessStatusReq(SNodeMsg *pReq) { } bool roleChanged = false; for (int32_t vg = 0; vg < pVgroup->replica; ++vg) { - if (pVgroup->vnodeGid[vg].role != pVload->role) { + if (pVgroup->vnodeGid[vg].role != pVload->syncState) { roleChanged = true; } - pVgroup->vnodeGid[vg].role = pVload->role; + pVgroup->vnodeGid[vg].role = pVload->syncState; } if (roleChanged) { // notify scheduler role has changed diff --git a/source/dnode/mnode/impl/src/mndInfoSchema.c b/source/dnode/mnode/impl/src/mndInfoSchema.c index d84c5f84cf..7c115c2e24 100644 --- a/source/dnode/mnode/impl/src/mndInfoSchema.c +++ b/source/dnode/mnode/impl/src/mndInfoSchema.c @@ -75,7 +75,7 @@ static const SInfosTableSchema userDBSchema[] = { {.name = "vgroups", .bytes = 2, .type = TSDB_DATA_TYPE_SMALLINT}, {.name = "ntables", .bytes = 8, .type = TSDB_DATA_TYPE_BIGINT}, {.name = "replica", .bytes = 2, .type = TSDB_DATA_TYPE_TINYINT}, - {.name = "quorum", .bytes = 1, .type = TSDB_DATA_TYPE_TINYINT}, + {.name = "strict", .bytes = 9 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR}, {.name = "days", .bytes = 4, .type = TSDB_DATA_TYPE_INT}, {.name = "keep", .bytes = 24 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR}, {.name = "cache", .bytes = 4, .type = TSDB_DATA_TYPE_INT}, diff --git a/source/dnode/mnode/impl/src/mndMnode.c b/source/dnode/mnode/impl/src/mndMnode.c index f403da2f2d..b51c545a6d 100644 --- a/source/dnode/mnode/impl/src/mndMnode.c +++ b/source/dnode/mnode/impl/src/mndMnode.c @@ -75,19 +75,6 @@ void mndReleaseMnode(SMnode *pMnode, SMnodeObj *pObj) { sdbRelease(pMnode->pSdb, pObj); } -const char *mndGetRoleStr(int32_t showType) { - switch (showType) { - case TAOS_SYNC_STATE_FOLLOWER: - return "FOLLOWER"; - case TAOS_SYNC_STATE_CANDIDATE: - return "CANDIDATE"; - case TAOS_SYNC_STATE_LEADER: - return "LEADER"; - default: - return "ERROR"; - } -} - void mndUpdateMnodeRole(SMnode *pMnode) { SSdb *pSdb = pMnode->pSdb; void *pIter = NULL; @@ -637,7 +624,7 @@ static int32_t mndRetrieveMnodes(SNodeMsg *pReq, SShowObj *pShow, SSDataBlock *p pColInfo = taosArrayGet(pBlock->pDataBlock, cols++); colDataAppend(pColInfo, numOfRows, b1, false); - const char *roles = mndGetRoleStr(pObj->role); + const char *roles = syncStr(pObj->role); char *b2 = taosMemoryCalloc(1, strlen(roles) + VARSTR_HEADER_SIZE); STR_WITH_MAXSIZE_TO_VARSTR(b2, roles, pShow->bytes[cols]); diff --git a/source/dnode/mnode/impl/src/mndStb.c b/source/dnode/mnode/impl/src/mndStb.c index 3ead2f26a3..d8b94f5ffe 100644 --- a/source/dnode/mnode/impl/src/mndStb.c +++ b/source/dnode/mnode/impl/src/mndStb.c @@ -72,7 +72,7 @@ SSdbRaw *mndStbActionEncode(SStbObj *pStb) { terrno = TSDB_CODE_OUT_OF_MEMORY; int32_t size = sizeof(SStbObj) + (pStb->numOfColumns + pStb->numOfTags + pStb->numOfSmas) * sizeof(SSchema) + - TSDB_STB_RESERVE_SIZE; + + pStb->commentLen + pStb->ast1Len + pStb->ast2Len + TSDB_STB_RESERVE_SIZE; SSdbRaw *pRaw = sdbAllocRaw(SDB_STB, TSDB_STB_VER_NUMBER, size); if (pRaw == NULL) goto _OVER; @@ -93,6 +93,8 @@ SSdbRaw *mndStbActionEncode(SStbObj *pStb) { SDB_SET_INT32(pRaw, dataPos, pStb->numOfTags, _OVER) SDB_SET_INT32(pRaw, dataPos, pStb->numOfSmas, _OVER) SDB_SET_INT32(pRaw, dataPos, pStb->commentLen, _OVER) + SDB_SET_INT32(pRaw, dataPos, pStb->ast1Len, _OVER) + SDB_SET_INT32(pRaw, dataPos, pStb->ast2Len, _OVER) for (int32_t i = 0; i < pStb->numOfColumns; ++i) { SSchema *pSchema = &pStb->pColumns[i]; @@ -121,6 +123,12 @@ SSdbRaw *mndStbActionEncode(SStbObj *pStb) { if (pStb->commentLen > 0) { SDB_SET_BINARY(pRaw, dataPos, pStb->comment, pStb->commentLen, _OVER) } + if (pStb->ast1Len > 0) { + SDB_SET_BINARY(pRaw, dataPos, pStb->pAst1, pStb->ast1Len, _OVER) + } + if (pStb->ast2Len > 0) { + SDB_SET_BINARY(pRaw, dataPos, pStb->pAst2, pStb->ast2Len, _OVER) + } SDB_SET_RESERVE(pRaw, dataPos, TSDB_STB_RESERVE_SIZE, _OVER) SDB_SET_DATALEN(pRaw, dataPos, _OVER) @@ -173,6 +181,8 @@ static SSdbRow *mndStbActionDecode(SSdbRaw *pRaw) { SDB_GET_INT32(pRaw, dataPos, &pStb->numOfTags, _OVER) SDB_GET_INT32(pRaw, dataPos, &pStb->numOfSmas, _OVER) SDB_GET_INT32(pRaw, dataPos, &pStb->commentLen, _OVER) + SDB_GET_INT32(pRaw, dataPos, &pStb->ast1Len, _OVER) + SDB_GET_INT32(pRaw, dataPos, &pStb->ast2Len, _OVER) pStb->pColumns = taosMemoryCalloc(pStb->numOfColumns, sizeof(SSchema)); pStb->pTags = taosMemoryCalloc(pStb->numOfTags, sizeof(SSchema)); @@ -210,6 +220,16 @@ static SSdbRow *mndStbActionDecode(SSdbRaw *pRaw) { if (pStb->comment == NULL) goto _OVER; SDB_GET_BINARY(pRaw, dataPos, pStb->comment, pStb->commentLen, _OVER) } + if (pStb->ast1Len > 0) { + pStb->pAst1 = taosMemoryCalloc(pStb->ast1Len, 1); + if (pStb->pAst1 == NULL) goto _OVER; + SDB_GET_BINARY(pRaw, dataPos, pStb->pAst1, pStb->ast1Len, _OVER) + } + if (pStb->ast2Len > 0) { + pStb->pAst2 = taosMemoryCalloc(pStb->ast2Len, 1); + if (pStb->pAst2 == NULL) goto _OVER; + SDB_GET_BINARY(pRaw, dataPos, pStb->pAst2, pStb->ast2Len, _OVER) + } SDB_GET_RESERVE(pRaw, dataPos, TSDB_STB_RESERVE_SIZE, _OVER) terrno = 0; @@ -238,6 +258,8 @@ static int32_t mndStbActionDelete(SSdb *pSdb, SStbObj *pStb) { taosMemoryFreeClear(pStb->pColumns); taosMemoryFreeClear(pStb->pTags); taosMemoryFreeClear(pStb->comment); + taosMemoryFreeClear(pStb->pAst1); + taosMemoryFreeClear(pStb->pAst2); return 0; } @@ -294,6 +316,30 @@ static int32_t mndStbActionUpdate(SSdb *pSdb, SStbObj *pOld, SStbObj *pNew) { } } + if (pOld->ast1Len < pNew->ast1Len) { + void *pAst1 = taosMemoryMalloc(pNew->ast1Len); + if (pAst1 != NULL) { + taosMemoryFree(pOld->pAst1); + pOld->pAst1 = pAst1; + } else { + terrno = TSDB_CODE_OUT_OF_MEMORY; + mTrace("stb:%s, failed to perform update action since %s", pOld->name, terrstr()); + taosWUnLockLatch(&pOld->lock); + } + } + + if (pOld->ast2Len < pNew->ast2Len) { + void *pAst2 = taosMemoryMalloc(pNew->ast2Len); + if (pAst2 != NULL) { + taosMemoryFree(pOld->pAst2); + pOld->pAst2 = pAst2; + } else { + terrno = TSDB_CODE_OUT_OF_MEMORY; + mTrace("stb:%s, failed to perform update action since %s", pOld->name, terrstr()); + taosWUnLockLatch(&pOld->lock); + } + } + pOld->updateTime = pNew->updateTime; pOld->version = pNew->version; pOld->nextColId = pNew->nextColId; @@ -304,6 +350,12 @@ static int32_t mndStbActionUpdate(SSdb *pSdb, SStbObj *pOld, SStbObj *pNew) { if (pNew->commentLen != 0) { memcpy(pOld->comment, pNew->comment, TSDB_STB_COMMENT_LEN); } + if (pNew->ast1Len != 0) { + memcpy(pOld->pAst1, pNew->pAst1, pNew->ast1Len); + } + if (pNew->ast2Len != 0) { + memcpy(pOld->pAst2, pNew->pAst2, pNew->ast2Len); + } taosWUnLockLatch(&pOld->lock); return 0; } @@ -646,6 +698,26 @@ static int32_t mndCreateStb(SMnode *pMnode, SNodeMsg *pReq, SMCreateStbReq *pCre memcpy(stbObj.comment, pCreate->comment, stbObj.commentLen); } + stbObj.ast1Len = pCreate->ast1Len; + if (stbObj.ast1Len > 0) { + stbObj.pAst1 = taosMemoryCalloc(stbObj.ast1Len, 1); + if (stbObj.pAst1 == NULL) { + terrno = TSDB_CODE_OUT_OF_MEMORY; + return -1; + } + memcpy(stbObj.pAst1, pCreate->pAst1, stbObj.ast1Len); + } + + stbObj.ast2Len = pCreate->ast2Len; + if (stbObj.ast2Len > 0) { + stbObj.pAst2 = taosMemoryCalloc(stbObj.ast2Len, 1); + if (stbObj.pAst2 == NULL) { + terrno = TSDB_CODE_OUT_OF_MEMORY; + return -1; + } + memcpy(stbObj.pAst2, pCreate->pAst2, stbObj.ast2Len); + } + stbObj.pColumns = taosMemoryMalloc(stbObj.numOfColumns * sizeof(SSchema)); stbObj.pTags = taosMemoryMalloc(stbObj.numOfTags * sizeof(SSchema)); stbObj.pSmas = taosMemoryMalloc(stbObj.numOfSmas * sizeof(SSchema)); diff --git a/source/dnode/mnode/impl/src/mndTelem.c b/source/dnode/mnode/impl/src/mndTelem.c index d6c1b6c94f..e445022548 100644 --- a/source/dnode/mnode/impl/src/mndTelem.c +++ b/source/dnode/mnode/impl/src/mndTelem.c @@ -21,23 +21,66 @@ #include "thttp.h" #include "tjson.h" -#define TELEMETRY_SERVER "telemetry.taosdata.com" -#define TELEMETRY_PORT 80 +typedef struct { + int64_t numOfDnode; + int64_t numOfMnode; + int64_t numOfVgroup; + int64_t numOfDatabase; + int64_t numOfSuperTable; + int64_t numOfChildTable; + int64_t numOfNormalTable; + int64_t numOfColumn; + int64_t totalPoints; + int64_t totalStorage; + int64_t compStorage; +} SMnodeStat; + +static void mndGetStat(SMnode* pMnode, SMnodeStat* pStat) { + memset(pStat, 0, sizeof(SMnodeStat)); + + SSdb* pSdb = pMnode->pSdb; + pStat->numOfDnode = sdbGetSize(pSdb, SDB_DNODE); + pStat->numOfMnode = sdbGetSize(pSdb, SDB_MNODE); + pStat->numOfVgroup = sdbGetSize(pSdb, SDB_VGROUP); + pStat->numOfDatabase = sdbGetSize(pSdb, SDB_DB); + pStat->numOfSuperTable = sdbGetSize(pSdb, SDB_STB); + + void* pIter = NULL; + while (1) { + SVgObj* pVgroup = NULL; + pIter = sdbFetch(pSdb, SDB_VGROUP, pIter, (void**)&pVgroup); + if (pIter == NULL) break; + + pStat->numOfChildTable += pVgroup->numOfTables; + pStat->numOfColumn += pVgroup->numOfTimeSeries; + pStat->totalPoints += pVgroup->pointsWritten; + pStat->totalStorage += pVgroup->totalStorage; + pStat->compStorage += pVgroup->compStorage; + + sdbRelease(pSdb, pVgroup); + } + + pStat->numOfChildTable = 100; + pStat->numOfColumn = 200; + pStat->totalPoints = 300; + pStat->totalStorage = 400; + pStat->compStorage = 500; +} static void mndBuildRuntimeInfo(SMnode* pMnode, SJson* pJson) { - SMnodeLoad load = {0}; - mndGetLoad(pMnode, &load); + SMnodeStat mstat = {0}; + mndGetStat(pMnode, &mstat); - tjsonAddDoubleToObject(pJson, "numOfDnode", load.numOfDnode); - tjsonAddDoubleToObject(pJson, "numOfMnode", load.numOfMnode); - tjsonAddDoubleToObject(pJson, "numOfVgroup", load.numOfVgroup); - tjsonAddDoubleToObject(pJson, "numOfDatabase", load.numOfDatabase); - tjsonAddDoubleToObject(pJson, "numOfSuperTable", load.numOfSuperTable); - tjsonAddDoubleToObject(pJson, "numOfChildTable", load.numOfChildTable); - tjsonAddDoubleToObject(pJson, "numOfColumn", load.numOfColumn); - tjsonAddDoubleToObject(pJson, "numOfPoint", load.totalPoints); - tjsonAddDoubleToObject(pJson, "totalStorage", load.totalStorage); - tjsonAddDoubleToObject(pJson, "compStorage", load.compStorage); + tjsonAddDoubleToObject(pJson, "numOfDnode", mstat.numOfDnode); + tjsonAddDoubleToObject(pJson, "numOfMnode", mstat.numOfMnode); + tjsonAddDoubleToObject(pJson, "numOfVgroup", mstat.numOfVgroup); + tjsonAddDoubleToObject(pJson, "numOfDatabase", mstat.numOfDatabase); + tjsonAddDoubleToObject(pJson, "numOfSuperTable", mstat.numOfSuperTable); + tjsonAddDoubleToObject(pJson, "numOfChildTable", mstat.numOfChildTable); + tjsonAddDoubleToObject(pJson, "numOfColumn", mstat.numOfColumn); + tjsonAddDoubleToObject(pJson, "numOfPoint", mstat.totalPoints); + tjsonAddDoubleToObject(pJson, "totalStorage", mstat.totalStorage); + tjsonAddDoubleToObject(pJson, "compStorage", mstat.compStorage); } static char* mndBuildTelemetryReport(SMnode* pMnode) { @@ -82,12 +125,14 @@ static char* mndBuildTelemetryReport(SMnode* pMnode) { static int32_t mndProcessTelemTimer(SNodeMsg* pReq) { SMnode* pMnode = pReq->pNode; STelemMgmt* pMgmt = &pMnode->telemMgmt; - if (!pMgmt->enable) return 0; + if (!tsEnableTelem) return 0; taosWLockLatch(&pMgmt->lock); char* pCont = mndBuildTelemetryReport(pMnode); if (pCont != NULL) { - taosSendHttpReport(TELEMETRY_SERVER, TELEMETRY_PORT, pCont, strlen(pCont), HTTP_FLAT); + if (taosSendHttpReport(tsTelemServer, tsTelemPort, pCont, strlen(pCont), HTTP_FLAT) != 0) { + mError("failed to send telemetry msg"); + } taosMemoryFree(pCont); } taosWUnLockLatch(&pMgmt->lock); @@ -98,7 +143,6 @@ int32_t mndInitTelem(SMnode* pMnode) { STelemMgmt* pMgmt = &pMnode->telemMgmt; taosInitRWLatch(&pMgmt->lock); - pMgmt->enable = tsEnableTelemetryReporting; taosGetEmail(pMgmt->email, sizeof(pMgmt->email)); mndSetMsgHandle(pMnode, TDMT_MND_TELEM_TIMER, mndProcessTelemTimer); diff --git a/source/dnode/mnode/impl/src/mndVgroup.c b/source/dnode/mnode/impl/src/mndVgroup.c index 75fe409d2a..3a4fde992f 100644 --- a/source/dnode/mnode/impl/src/mndVgroup.c +++ b/source/dnode/mnode/impl/src/mndVgroup.c @@ -32,7 +32,6 @@ static int32_t mndVgroupActionUpdate(SSdb *pSdb, SVgObj *pOld, SVgObj *pNew); static int32_t mndProcessCreateVnodeRsp(SNodeMsg *pRsp); static int32_t mndProcessAlterVnodeRsp(SNodeMsg *pRsp); static int32_t mndProcessDropVnodeRsp(SNodeMsg *pRsp); -static int32_t mndProcessSyncVnodeRsp(SNodeMsg *pRsp); static int32_t mndProcessCompactVnodeRsp(SNodeMsg *pRsp); static int32_t mndRetrieveVgroups(SNodeMsg *pReq, SShowObj *pShow, SSDataBlock* pBlock, int32_t rows); @@ -50,10 +49,9 @@ int32_t mndInitVgroup(SMnode *pMnode) { .deleteFp = (SdbDeleteFp)mndVgroupActionUpdate}; mndSetMsgHandle(pMnode, TDMT_DND_CREATE_VNODE_RSP, mndProcessCreateVnodeRsp); - mndSetMsgHandle(pMnode, TDMT_DND_ALTER_VNODE_RSP, mndProcessAlterVnodeRsp); + mndSetMsgHandle(pMnode, TDMT_VND_ALTER_VNODE_RSP, mndProcessAlterVnodeRsp); mndSetMsgHandle(pMnode, TDMT_DND_DROP_VNODE_RSP, mndProcessDropVnodeRsp); - mndSetMsgHandle(pMnode, TDMT_DND_SYNC_VNODE_RSP, mndProcessSyncVnodeRsp); - mndSetMsgHandle(pMnode, TDMT_DND_COMPACT_VNODE_RSP, mndProcessCompactVnodeRsp); + mndSetMsgHandle(pMnode, TDMT_VND_COMPACT_VNODE_RSP, mndProcessCompactVnodeRsp); mndAddShowRetrieveHandle(pMnode, TSDB_MGMT_TABLE_VGROUP, mndRetrieveVgroups); mndAddShowFreeIterHandle(pMnode, TSDB_MGMT_TABLE_VGROUP, mndCancelGetNextVgroup); @@ -205,7 +203,7 @@ void *mndBuildCreateVnodeReq(SMnode *pMnode, SDnodeObj *pDnode, SDbObj *pDb, SVg createReq.walLevel = pDb->cfg.walLevel; createReq.precision = pDb->cfg.precision; createReq.compression = pDb->cfg.compression; - createReq.quorum = pDb->cfg.quorum; + createReq.strict = pDb->cfg.strict; createReq.update = pDb->cfg.update; createReq.cacheLastRow = pDb->cfg.cacheLastRow; createReq.replica = pVgroup->replica; @@ -213,7 +211,7 @@ void *mndBuildCreateVnodeReq(SMnode *pMnode, SDnodeObj *pDnode, SDbObj *pDb, SVg createReq.streamMode = pVgroup->streamMode; createReq.hashBegin = pVgroup->hashBegin; createReq.hashEnd = pVgroup->hashEnd; - createReq.hashMethod = pDb->hashMethod; + createReq.hashMethod = pDb->cfg.hashMethod; createReq.numOfRetensions = pDb->cfg.numOfRetensions; createReq.pRetensions = pDb->cfg.pRetensions; @@ -465,8 +463,6 @@ static int32_t mndProcessDropVnodeRsp(SNodeMsg *pRsp) { return 0; } -static int32_t mndProcessSyncVnodeRsp(SNodeMsg *pRsp) { return 0; } - static int32_t mndProcessCompactVnodeRsp(SNodeMsg *pRsp) { return 0; } static bool mndGetVgroupMaxReplicaFp(SMnode *pMnode, void *pObj, void *p1, void *p2, void *p3) { @@ -545,7 +541,7 @@ static int32_t mndRetrieveVgroups(SNodeMsg *pReq, SShowObj *pShow, SSDataBlock* colDataAppend(pColInfo, numOfRows, (const char *)&pVgroup->vnodeGid[i].dnodeId, false); char buf1[20] = {0}; - const char *role = mndGetRoleStr(pVgroup->vnodeGid[i].role); + const char *role = syncStr(pVgroup->vnodeGid[i].role); STR_WITH_MAXSIZE_TO_VARSTR(buf1, role, pShow->bytes[cols]); pColInfo = taosArrayGet(pBlock->pDataBlock, cols++); @@ -636,7 +632,7 @@ static int32_t mndRetrieveVnodes(SNodeMsg *pReq, SShowObj *pShow, SSDataBlock* p colDataAppend(pColInfo, numOfRows, (const char *)&val, false); char buf[20] = {0}; - STR_TO_VARSTR(buf, mndGetRoleStr(pVgid->role)); + STR_TO_VARSTR(buf, syncStr(pVgid->role)); pColInfo = taosArrayGet(pBlock->pDataBlock, cols++); colDataAppend(pColInfo, numOfRows, (const char *)buf, false); diff --git a/source/dnode/mnode/impl/src/mnode.c b/source/dnode/mnode/impl/src/mnode.c index 3ac1c522b2..3b7d955c02 100644 --- a/source/dnode/mnode/impl/src/mnode.c +++ b/source/dnode/mnode/impl/src/mnode.c @@ -45,7 +45,6 @@ #define MQ_TIMER_MS 3000 #define TRNAS_TIMER_MS 6000 -#define TELEM_TIMER_MS 86400000 static void *mndBuildTimerMsg(int32_t *pContLen) { SMTimerReq timerReq = {0}; @@ -97,7 +96,7 @@ static void mndPullupTelem(void *param, void *tmrId) { tmsgPutToQueue(&pMnode->msgCb, READ_QUEUE, &rpcMsg); } - taosTmrReset(mndPullupTelem, TELEM_TIMER_MS, pMnode, pMnode->timer, &pMnode->telemTimer); + taosTmrReset(mndPullupTelem, tsTelemInterval * 1000, pMnode, pMnode->timer, &pMnode->telemTimer); } static int32_t mndInitTimer(SMnode *pMnode) { @@ -117,7 +116,8 @@ static int32_t mndInitTimer(SMnode *pMnode) { return -1; } - if (taosTmrReset(mndPullupTelem, 60000, pMnode, pMnode->timer, &pMnode->telemTimer)) { + int32_t interval = tsTelemInterval < 10 ? tsTelemInterval : 10; + if (taosTmrReset(mndPullupTelem, interval * 1000, pMnode, pMnode->timer, &pMnode->telemTimer)) { terrno = TSDB_CODE_OUT_OF_MEMORY; return -1; } @@ -262,6 +262,7 @@ static int32_t mndExecSteps(SMnode *pMnode) { return -1; } else { mDebug("%s is initialized", pStep->name); + tmsgReportStartup(pStep->name, "initialized"); } } @@ -413,31 +414,6 @@ int64_t mndGenerateUid(char *name, int32_t len) { } while (true); } -void mndGetLoad(SMnode *pMnode, SMnodeLoad *pLoad) { - memset(pLoad, 0, sizeof(SMnodeLoad)); - - SSdb *pSdb = pMnode->pSdb; - pLoad->numOfDnode = sdbGetSize(pSdb, SDB_DNODE); - pLoad->numOfMnode = sdbGetSize(pSdb, SDB_MNODE); - pLoad->numOfVgroup = sdbGetSize(pSdb, SDB_VGROUP); - pLoad->numOfDatabase = sdbGetSize(pSdb, SDB_DB); - pLoad->numOfSuperTable = sdbGetSize(pSdb, SDB_STB); - - void *pIter = NULL; - while (1) { - SVgObj *pVgroup = NULL; - pIter = sdbFetch(pSdb, SDB_VGROUP, pIter, (void **)&pVgroup); - if (pIter == NULL) break; - - pLoad->numOfChildTable += pVgroup->numOfTables; - pLoad->numOfColumn += pVgroup->numOfTimeSeries; - pLoad->totalPoints += pVgroup->pointsWritten; - pLoad->totalStorage += pVgroup->totalStorage; - pLoad->compStorage += pVgroup->compStorage; - - sdbRelease(pSdb, pVgroup); - } -} int32_t mndGetMonitorInfo(SMnode *pMnode, SMonClusterInfo *pClusterInfo, SMonVgroupInfo *pVgroupInfo, SMonGrantInfo *pGrantInfo) { @@ -485,7 +461,7 @@ int32_t mndGetMonitorInfo(SMnode *pMnode, SMonClusterInfo *pClusterInfo, SMonVgr SMonMnodeDesc desc = {0}; desc.mnode_id = pObj->id; tstrncpy(desc.mnode_ep, pObj->pDnode->ep, sizeof(desc.mnode_ep)); - tstrncpy(desc.role, mndGetRoleStr(pObj->role), sizeof(desc.role)); + tstrncpy(desc.role, syncStr(pObj->role), sizeof(desc.role)); taosArrayPush(pClusterInfo->mnodes, &desc); sdbRelease(pSdb, pObj); @@ -519,7 +495,7 @@ int32_t mndGetMonitorInfo(SMnode *pMnode, SMonClusterInfo *pClusterInfo, SMonVgr SVnodeGid *pVgid = &pVgroup->vnodeGid[i]; SMonVnodeDesc *pVnDesc = &desc.vnodes[i]; pVnDesc->dnode_id = pVgid->dnodeId; - tstrncpy(pVnDesc->vnode_role, mndGetRoleStr(pVgid->role), sizeof(pVnDesc->vnode_role)); + tstrncpy(pVnDesc->vnode_role, syncStr(pVgid->role), sizeof(pVnDesc->vnode_role)); if (pVgid->role == TAOS_SYNC_STATE_LEADER) { tstrncpy(desc.status, "ready", sizeof(desc.status)); pClusterInfo->vgroups_alive++; @@ -544,3 +520,8 @@ int32_t mndGetMonitorInfo(SMnode *pMnode, SMonClusterInfo *pClusterInfo, SMonVgr return 0; } + +int32_t mndGetLoad(SMnode *pMnode, SMnodeLoad *pLoad) { + pLoad->syncState = pMnode->syncMgmt.state; + return 0; +} \ No newline at end of file diff --git a/source/dnode/mnode/impl/test/db/db.cpp b/source/dnode/mnode/impl/test/db/db.cpp index adba6ca434..6e72ce89d3 100644 --- a/source/dnode/mnode/impl/test/db/db.cpp +++ b/source/dnode/mnode/impl/test/db/db.cpp @@ -45,12 +45,12 @@ TEST_F(MndTestDb, 02_Create_Alter_Drop_Db) { createReq.maxRows = 4096; createReq.commitTime = 3600; createReq.fsyncPeriod = 3000; - createReq.ttl = 0; + createReq.ttl = 1; createReq.walLevel = 1; createReq.precision = 0; createReq.compression = 2; createReq.replications = 1; - createReq.quorum = 1; + createReq.strict = 1; createReq.update = 0; createReq.cacheLastRow = 0; createReq.ignoreExist = 1; @@ -82,7 +82,7 @@ TEST_F(MndTestDb, 02_Create_Alter_Drop_Db) { alterdbReq.daysToKeep2 = 500; alterdbReq.fsyncPeriod = 4000; alterdbReq.walLevel = 2; - alterdbReq.quorum = 2; + alterdbReq.strict = 2; alterdbReq.cacheLastRow = 1; int32_t contLen = tSerializeSAlterDbReq(NULL, 0, &alterdbReq); @@ -139,12 +139,12 @@ TEST_F(MndTestDb, 03_Create_Use_Restart_Use_Db) { createReq.maxRows = 4096; createReq.commitTime = 3600; createReq.fsyncPeriod = 3000; - createReq.ttl = 0; + createReq.ttl = 1; createReq.walLevel = 1; createReq.precision = 0; createReq.compression = 2; createReq.replications = 1; - createReq.quorum = 1; + createReq.strict = 1; createReq.update = 0; createReq.cacheLastRow = 0; createReq.ignoreExist = 1; diff --git a/source/dnode/mnode/impl/test/sma/sma.cpp b/source/dnode/mnode/impl/test/sma/sma.cpp index 4f3b0d6e37..0d41d5de20 100644 --- a/source/dnode/mnode/impl/test/sma/sma.cpp +++ b/source/dnode/mnode/impl/test/sma/sma.cpp @@ -54,9 +54,10 @@ void* MndTestSma::BuildCreateDbReq(const char* dbname, int32_t* pContLen) { createReq.precision = 0; createReq.compression = 2; createReq.replications = 1; - createReq.quorum = 1; + createReq.strict = 1; createReq.update = 0; createReq.cacheLastRow = 0; + createReq.ttl = 1; createReq.ignoreExist = 1; int32_t contLen = tSerializeSCreateDbReq(NULL, 0, &createReq); diff --git a/source/dnode/mnode/impl/test/stb/stb.cpp b/source/dnode/mnode/impl/test/stb/stb.cpp index f8f8799c9f..9270d38e11 100644 --- a/source/dnode/mnode/impl/test/stb/stb.cpp +++ b/source/dnode/mnode/impl/test/stb/stb.cpp @@ -55,9 +55,10 @@ void* MndTestStb::BuildCreateDbReq(const char* dbname, int32_t* pContLen) { createReq.precision = 0; createReq.compression = 2; createReq.replications = 1; - createReq.quorum = 1; + createReq.strict = 1; createReq.update = 0; createReq.cacheLastRow = 0; + createReq.ttl = 1; createReq.ignoreExist = 1; int32_t contLen = tSerializeSCreateDbReq(NULL, 0, &createReq); diff --git a/source/dnode/mnode/impl/test/topic/topic.cpp b/source/dnode/mnode/impl/test/topic/topic.cpp index ee47a3c8b4..917cb23fc9 100644 --- a/source/dnode/mnode/impl/test/topic/topic.cpp +++ b/source/dnode/mnode/impl/test/topic/topic.cpp @@ -47,9 +47,10 @@ void* MndTestTopic::BuildCreateDbReq(const char* dbname, int32_t* pContLen) { createReq.precision = 0; createReq.compression = 2; createReq.replications = 1; - createReq.quorum = 1; + createReq.strict = 1; createReq.update = 0; createReq.cacheLastRow = 0; + createReq.ttl = 1; createReq.ignoreExist = 1; int32_t contLen = tSerializeSCreateDbReq(NULL, 0, &createReq); diff --git a/source/dnode/mnode/impl/test/user/user.cpp b/source/dnode/mnode/impl/test/user/user.cpp index 4e7f3c0213..79464db134 100644 --- a/source/dnode/mnode/impl/test/user/user.cpp +++ b/source/dnode/mnode/impl/test/user/user.cpp @@ -300,9 +300,10 @@ TEST_F(MndTestUser, 03_Alter_User) { createReq.precision = 0; createReq.compression = 2; createReq.replications = 1; - createReq.quorum = 1; + createReq.strict = 1; createReq.update = 0; createReq.cacheLastRow = 0; + createReq.ttl = 1; createReq.ignoreExist = 1; int32_t contLen = tSerializeSCreateDbReq(NULL, 0, &createReq); diff --git a/source/dnode/vnode/src/tsdb/tsdbCommit.c b/source/dnode/vnode/src/tsdb/tsdbCommit.c index 09616a8969..28ba50c3df 100644 --- a/source/dnode/vnode/src/tsdb/tsdbCommit.c +++ b/source/dnode/vnode/src/tsdb/tsdbCommit.c @@ -1350,7 +1350,7 @@ int tsdbWriteBlockImpl(STsdb *pRepo, STable *pTable, SDFile *pDFile, SDFile *pDF if (tBitmaps > 0) { bptr = POINTER_SHIFT(pBlockData, lsize + flen); if (isSuper && !tdDataColsIsBitmapI(pDataCols)) { - tdMergeBitmap((uint8_t *)pDataCol->pBitmap, nBitmaps, (uint8_t *)pDataCol->pBitmap); + tdMergeBitmap((uint8_t *)pDataCol->pBitmap, rowsToWrite, (uint8_t *)pDataCol->pBitmap); } tBitmapsLen = tsCompressTinyint((char *)pDataCol->pBitmap, tBitmaps, tBitmaps, bptr, tBitmaps + COMP_OVERFLOW_BYTES, diff --git a/source/dnode/vnode/src/tsdb/tsdbMain.c b/source/dnode/vnode/src/tsdb/tsdbMain.c index dd8723366d..2753579e9e 100644 --- a/source/dnode/vnode/src/tsdb/tsdbMain.c +++ b/source/dnode/vnode/src/tsdb/tsdbMain.c @@ -601,26 +601,26 @@ static int32_t tsdbCheckAndSetDefaultCfg(STsdbCfg *pCfg) { // Check minRowsPerFileBlock and maxRowsPerFileBlock if (pCfg->minRowsPerFileBlock == -1) { - pCfg->minRowsPerFileBlock = TSDB_DEFAULT_MIN_ROW_FBLOCK; + pCfg->minRowsPerFileBlock = TSDB_DEFAULT_MINROWS_FBLOCK; } else { - if (pCfg->minRowsPerFileBlock < TSDB_MIN_MIN_ROW_FBLOCK || pCfg->minRowsPerFileBlock > TSDB_MAX_MIN_ROW_FBLOCK) { + if (pCfg->minRowsPerFileBlock < TSDB_MIN_MINROWS_FBLOCK || pCfg->minRowsPerFileBlock > TSDB_MAX_MINROWS_FBLOCK) { tsdbError( - "vgId:%d invalid minRowsPerFileBlock configuration! minRowsPerFileBlock %d TSDB_MIN_MIN_ROW_FBLOCK %d " - "TSDB_MAX_MIN_ROW_FBLOCK %d", - pCfg->tsdbId, pCfg->minRowsPerFileBlock, TSDB_MIN_MIN_ROW_FBLOCK, TSDB_MAX_MIN_ROW_FBLOCK); + "vgId:%d invalid minRowsPerFileBlock configuration! minRowsPerFileBlock %d TSDB_MIN_MINROWS_FBLOCK %d " + "TSDB_MAX_MINROWS_FBLOCK %d", + pCfg->tsdbId, pCfg->minRowsPerFileBlock, TSDB_MIN_MINROWS_FBLOCK, TSDB_MAX_MINROWS_FBLOCK); terrno = TSDB_CODE_TDB_INVALID_CONFIG; return -1; } } if (pCfg->maxRowsPerFileBlock == -1) { - pCfg->maxRowsPerFileBlock = TSDB_DEFAULT_MAX_ROW_FBLOCK; + pCfg->maxRowsPerFileBlock = TSDB_DEFAULT_MAXROWS_FBLOCK; } else { - if (pCfg->maxRowsPerFileBlock < TSDB_MIN_MAX_ROW_FBLOCK || pCfg->maxRowsPerFileBlock > TSDB_MAX_MAX_ROW_FBLOCK) { + if (pCfg->maxRowsPerFileBlock < TSDB_MIN_MAXROWS_FBLOCK || pCfg->maxRowsPerFileBlock > TSDB_MAX_MAXROWS_FBLOCK) { tsdbError( - "vgId:%d invalid maxRowsPerFileBlock configuration! maxRowsPerFileBlock %d TSDB_MIN_MAX_ROW_FBLOCK %d " - "TSDB_MAX_MAX_ROW_FBLOCK %d", - pCfg->tsdbId, pCfg->maxRowsPerFileBlock, TSDB_MIN_MIN_ROW_FBLOCK, TSDB_MAX_MIN_ROW_FBLOCK); + "vgId:%d invalid maxRowsPerFileBlock configuration! maxRowsPerFileBlock %d TSDB_MIN_MAXROWS_FBLOCK %d " + "TSDB_MAX_MAXROWS_FBLOCK %d", + pCfg->tsdbId, pCfg->maxRowsPerFileBlock, TSDB_MIN_MINROWS_FBLOCK, TSDB_MAX_MINROWS_FBLOCK); terrno = TSDB_CODE_TDB_INVALID_CONFIG; return -1; } diff --git a/source/dnode/vnode/src/tsdb/tsdbRead.c b/source/dnode/vnode/src/tsdb/tsdbRead.c index 1331fcf30a..fd640471bd 100644 --- a/source/dnode/vnode/src/tsdb/tsdbRead.c +++ b/source/dnode/vnode/src/tsdb/tsdbRead.c @@ -652,7 +652,7 @@ static bool initTableMemIterator(STsdbReadHandle* pHandle, STableCheckInfo* pChe STbData** pMem = NULL; STbData** pIMem = NULL; - TSKEY tLastKey = 0; /// keyToTkey(pCheckInfo->lastKey); + TSKEY tLastKey = keyToTkey(pCheckInfo->lastKey); if (pHandle->pTsdb->mem != NULL) { pMem = taosHashGet(pHandle->pTsdb->mem->pHashIdx, &pCheckInfo->tableId, sizeof(pCheckInfo->tableId)); if (pMem != NULL) { diff --git a/source/dnode/vnode/src/tsdb/tsdbReadImpl.c b/source/dnode/vnode/src/tsdb/tsdbReadImpl.c index b15271a51a..0cf8a0d359 100644 --- a/source/dnode/vnode/src/tsdb/tsdbReadImpl.c +++ b/source/dnode/vnode/src/tsdb/tsdbReadImpl.c @@ -305,7 +305,7 @@ int tsdbLoadBlockDataCols(SReadH *pReadh, SBlock *pBlock, SBlockInfo *pBlkInfo, SDataCol *pDataCol = pReadh->pDCols[0]->cols + i; if (pDataCol->bitmap) { ASSERT(pDataCol->colId != PRIMARYKEY_TIMESTAMP_COL_ID); - tdMergeBitmap(pDataCol->pBitmap, TD_BITMAP_BYTES(pReadh->pDCols[0]->numOfRows), pDataCol->pBitmap); + tdMergeBitmap(pDataCol->pBitmap, pReadh->pDCols[0]->numOfRows, pDataCol->pBitmap); tdDataColsSetBitmapI(pReadh->pDCols[0]); } } diff --git a/source/dnode/vnode/src/vnd/vnodeQuery.c b/source/dnode/vnode/src/vnd/vnodeQuery.c index 4202c02a0c..3747e1dbc7 100644 --- a/source/dnode/vnode/src/vnd/vnodeQuery.c +++ b/source/dnode/vnode/src/vnd/vnodeQuery.c @@ -152,7 +152,7 @@ _exit: int32_t vnodeGetLoad(SVnode *pVnode, SVnodeLoad *pLoad) { pLoad->vgId = TD_VID(pVnode); - pLoad->role = TAOS_SYNC_STATE_LEADER; + pLoad->syncState = TAOS_SYNC_STATE_LEADER; pLoad->numOfTables = metaGetTbNum(pVnode->pMeta); pLoad->numOfTimeSeries = 400; pLoad->totalStorage = 300; diff --git a/source/dnode/vnode/src/vnd/vnodeSvr.c b/source/dnode/vnode/src/vnd/vnodeSvr.c index fface9d6c5..2a8d78b827 100644 --- a/source/dnode/vnode/src/vnd/vnodeSvr.c +++ b/source/dnode/vnode/src/vnd/vnodeSvr.c @@ -117,6 +117,8 @@ int vnodeProcessWriteReq(SVnode *pVnode, SRpcMsg *pMsg, int64_t version, SRpcMsg // } } break; + case TDMT_VND_ALTER_VNODE: + break; default: ASSERT(0); break; diff --git a/source/libs/catalog/test/catalogTests.cpp b/source/libs/catalog/test/catalogTests.cpp index 73d0dc2011..9a6356acbd 100644 --- a/source/libs/catalog/test/catalogTests.cpp +++ b/source/libs/catalog/test/catalogTests.cpp @@ -108,9 +108,10 @@ void sendCreateDbMsg(void *shandle, SEpSet *pEpSet) { createReq.precision = 0; createReq.compression = 2; createReq.replications = 1; - createReq.quorum = 1; + createReq.strict = 1; createReq.update = 0; createReq.cacheLastRow = 0; + createReq.ttl = 1; createReq.ignoreExist = 1; int32_t contLen = tSerializeSCreateDbReq(NULL, 0, &createReq); diff --git a/source/libs/executor/inc/executorimpl.h b/source/libs/executor/inc/executorimpl.h index 4c9ed78769..9e48e12cb5 100644 --- a/source/libs/executor/inc/executorimpl.h +++ b/source/libs/executor/inc/executorimpl.h @@ -427,6 +427,7 @@ typedef struct STableIntervalOperatorInfo { EOPTR_EXEC_MODEL execModel; // operator execution model [batch model|stream model] SArray* pUpdatedWindow; // updated time window due to the input data block from the downstream operator. STimeWindowAggSupp twAggSup; + struct SFillInfo* pFillInfo; // fill info } STableIntervalOperatorInfo; typedef struct SAggOperatorInfo { @@ -467,7 +468,6 @@ typedef struct SFillOperatorInfo { SSDataBlock* existNewGroupBlock; bool multigroupResult; SInterval intervalInfo; - int32_t capacity; } SFillOperatorInfo; typedef struct { @@ -609,7 +609,7 @@ int32_t appendDownstream(SOperatorInfo* p, SOperatorInfo** pDownstream, int32_t int32_t initAggInfo(SOptrBasicInfo* pBasicInfo, SAggSupporter* pAggSup, SExprInfo* pExprInfo, int32_t numOfCols, SSDataBlock* pResultBlock, size_t keyBufSize, const char* pkey); void initResultSizeInfo(SOperatorInfo* pOperator, int32_t numOfRows); -void toSDatablock(SSDataBlock* pBlock, int32_t rowCapacity, SGroupResInfo* pGroupResInfo, SExprInfo* pExprInfo, +void doBuildResultDatablock(SSDataBlock* pBlock, int32_t rowCapacity, SGroupResInfo* pGroupResInfo, SExprInfo* pExprInfo, SDiskbasedBuf* pBuf, int32_t* rowCellOffset); void finalizeMultiTupleQueryResult(SqlFunctionCtx* pCtx, int32_t numOfOutput, SDiskbasedBuf* pBuf, SResultRowInfo* pResultRowInfo, int32_t* rowCellInfoOffset); @@ -621,7 +621,7 @@ void doDestroyBasicInfo(SOptrBasicInfo* pInfo, int32_t numOfOutput); int32_t setSDataBlockFromFetchRsp(SSDataBlock* pRes, SLoadRemoteDataInfo* pLoadInfo, int32_t numOfRows, char* pData, int32_t compLen, int32_t numOfOutput, int64_t startTs, uint64_t* total, SArray* pColList); -void getAlignQueryTimeWindow(SInterval* pInterval, int32_t precision, int64_t key, int64_t keyFirst, int64_t keyLast, STimeWindow* win); +void getAlignQueryTimeWindow(SInterval* pInterval, int32_t precision, int64_t key, STimeWindow* win); void doSetOperatorCompleted(SOperatorInfo* pOperator); void doFilter(const SNode* pFilterNode, SSDataBlock* pBlock); @@ -645,8 +645,7 @@ SOperatorInfo* createSysTableScanOperatorInfo(void* pSysTableReadHandle, SSDataB SExecTaskInfo* pTaskInfo, bool showRewrite, int32_t accountId); SOperatorInfo* createIntervalOperatorInfo(SOperatorInfo* downstream, SExprInfo* pExprInfo, int32_t numOfCols, SSDataBlock* pResBlock, SInterval* pInterval, int32_t primaryTsSlotId, - STimeWindowAggSupp *pTwAggSupp, const STableGroupInfo* pTableGroupInfo, - SExecTaskInfo* pTaskInfo); + STimeWindowAggSupp *pTwAggSupp, const STableGroupInfo* pTableGroupInfo, SExecTaskInfo* pTaskInfo); SOperatorInfo* createSessionAggOperatorInfo(SOperatorInfo* downstream, SExprInfo* pExprInfo, int32_t numOfCols, SSDataBlock* pResBlock, int64_t gap, STimeWindowAggSupp *pTwAggSupp, SExecTaskInfo* pTaskInfo); SOperatorInfo* createGroupOperatorInfo(SOperatorInfo* downstream, SExprInfo* pExprInfo, int32_t numOfCols, diff --git a/source/libs/function/inc/tfill.h b/source/libs/executor/inc/tfill.h similarity index 71% rename from source/libs/function/inc/tfill.h rename to source/libs/executor/inc/tfill.h index b90dbf7799..26d066d9a9 100644 --- a/source/libs/function/inc/tfill.h +++ b/source/libs/executor/inc/tfill.h @@ -22,15 +22,18 @@ extern "C" { #include "os.h" #include "taosdef.h" +#include "tcommon.h" struct SSDataBlock; typedef struct SFillColInfo { - STColumn col; // column info +// STColumn col; // column info + SResSchema col; int16_t functionId; // sql function id int16_t flag; // column flag: TAG COLUMN|NORMAL COLUMN int16_t tagIndex; // index of current tag in SFillTagColInfo array list - union {int64_t i; double d;} fillVal; + int32_t offset; + union {int64_t i; double d;} val; } SFillColInfo; typedef struct { @@ -57,7 +60,6 @@ typedef struct SFillInfo { char * nextValues; // next row of data char** pData; // original result data block involved in filling data int32_t alloc; // data buffer size in rows - int8_t precision; // time resoluation SFillColInfo* pFillCol; // column info for fill operations SFillTagColInfo* pTags; // tags value for filling gap @@ -67,7 +69,19 @@ typedef struct SFillInfo { int64_t getNumOfResultsAfterFillGap(SFillInfo* pFillInfo, int64_t ekey, int32_t maxNumOfRows); +void taosFillSetStartInfo(struct SFillInfo* pFillInfo, int32_t numOfRows, TSKEY endKey); +void taosResetFillInfo(struct SFillInfo* pFillInfo, TSKEY startTimestamp); +void taosFillSetInputDataBlock(struct SFillInfo* pFillInfo, const struct SSDataBlock* pInput); +struct SFillColInfo* createFillColInfo(SExprInfo* pExpr, int32_t numOfOutput, const struct SValueNode* val); +bool taosFillHasMoreResults(struct SFillInfo* pFillInfo); +SFillInfo* taosCreateFillInfo(int32_t order, TSKEY skey, int32_t numOfTags, int32_t capacity, int32_t numOfCols, + SInterval* pInterval, int32_t fillType, + struct SFillColInfo* pCol, const char* id); + +void* taosDestroyFillInfo(struct SFillInfo *pFillInfo); +int64_t taosFillResultDataBlock(struct SFillInfo* pFillInfo, void** output, int32_t capacity); +int64_t getFillInfoStart(struct SFillInfo *pFillInfo); #ifdef __cplusplus diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c index cd129b54fb..7791a345ed 100644 --- a/source/libs/executor/src/executorimpl.c +++ b/source/libs/executor/src/executorimpl.c @@ -14,11 +14,12 @@ */ #include "filter.h" -#include "functionMgt.h" #include "function.h" +#include "functionMgt.h" +#include "os.h" #include "querynodes.h" #include "tname.h" -#include "os.h" +#include "tfill.h" #include "tdatablock.h" #include "tglobal.h" @@ -514,13 +515,12 @@ static SResultRow* doSetResultOutBufByKey_rv(SDiskbasedBuf* pResultBuf, SResultR return pResult; } -static void getInitialStartTimeWindow(SInterval* pInterval, int32_t precision, TSKEY ts, STimeWindow* w, TSKEY ekey, - bool ascQuery) { +static void getInitialStartTimeWindow(SInterval* pInterval, int32_t precision, TSKEY ts, STimeWindow* w, bool ascQuery) { if (ascQuery) { - getAlignQueryTimeWindow(pInterval, precision, ts, ts, ekey, w); + getAlignQueryTimeWindow(pInterval, precision, ts, w); } else { // the start position of the first time window in the endpoint that spreads beyond the queried last timestamp - getAlignQueryTimeWindow(pInterval, precision, ts, ekey, ts, w); + getAlignQueryTimeWindow(pInterval, precision, ts, w); int64_t key = w->skey; while (key < ts) { // moving towards end @@ -540,7 +540,7 @@ static STimeWindow getActiveTimeWindow(SDiskbasedBuf * pBuf, SResultRowInfo* pRe STimeWindow w = {0}; if (pResultRowInfo->cur.pageId == -1) { // the first window, from the previous stored value - getInitialStartTimeWindow(pInterval, precision, ts, &w, win->ekey, true); + getInitialStartTimeWindow(pInterval, precision, ts, &w, true); w.ekey = taosTimeAdd(w.skey, pInterval->interval, pInterval->intervalUnit, precision) - 1; } else { w = getResultRowByPos(pBuf, &pResultRowInfo->cur)->win; @@ -2015,20 +2015,16 @@ static bool isCachedLastQuery(STaskAttr* pQueryAttr) { ///////////////////////////////////////////////////////////////////////////////////////////// // todo refactor : return window -void getAlignQueryTimeWindow(SInterval* pInterval, int32_t precision, int64_t key, int64_t keyFirst, int64_t keyLast, - STimeWindow* win) { - ASSERT(key >= keyFirst && key <= keyLast); +void getAlignQueryTimeWindow(SInterval* pInterval, int32_t precision, int64_t key, STimeWindow* win) { win->skey = taosTimeTruncate(key, pInterval, precision); /* * if the realSkey > INT64_MAX - pInterval->interval, the query duration between * realSkey and realEkey must be less than one interval.Therefore, no need to adjust the query ranges. */ - if (keyFirst > (INT64_MAX - pInterval->interval)) { - assert(keyLast - keyFirst < pInterval->interval); + win->ekey = taosTimeAdd(win->skey, pInterval->interval, pInterval->intervalUnit, precision) - 1; + if (win->ekey < win->skey) { win->ekey = INT64_MAX; - } else { - win->ekey = taosTimeAdd(win->skey, pInterval->interval, pInterval->intervalUnit, precision) - 1; } } @@ -3176,10 +3172,12 @@ int32_t doCopyToSDataBlock(SSDataBlock* pBlock, int32_t rowCapacity, SExprInfo* // qDebug("QInfo:0x%"PRIx64" copy data to query buf completed", GET_TASKID(pRuntimeEnv)); pBlock->info.rows = numOfResult; + blockDataUpdateTsWindow(pBlock); + return 0; } -void toSDatablock(SSDataBlock* pBlock, int32_t rowCapacity, SGroupResInfo* pGroupResInfo, SExprInfo* pExprInfo, SDiskbasedBuf* pBuf, +void doBuildResultDatablock(SSDataBlock* pBlock, int32_t rowCapacity, SGroupResInfo* pGroupResInfo, SExprInfo* pExprInfo, SDiskbasedBuf* pBuf, int32_t* rowCellOffset) { assert(pGroupResInfo->currentGroup <= pGroupResInfo->totalGroup); @@ -4813,7 +4811,7 @@ static SSDataBlock* getAggregateResult(SOperatorInfo* pOperator, bool* newgroup) } blockDataEnsureCapacity(pInfo->pRes, pOperator->resultInfo.capacity); - toSDatablock(pInfo->pRes, pOperator->resultInfo.capacity, &pAggInfo->groupResInfo, pOperator->pExpr, pAggInfo->aggSup.pResultBuf, pInfo->rowCellInfoOffset); + doBuildResultDatablock(pInfo->pRes, pOperator->resultInfo.capacity, &pAggInfo->groupResInfo, pOperator->pExpr, pAggInfo->aggSup.pResultBuf, pInfo->rowCellInfoOffset); if (pInfo->pRes->info.rows == 0 || !hasRemainDataInCurrentGroup(&pAggInfo->groupResInfo)) { doSetOperatorCompleted(pOperator); } @@ -5126,6 +5124,8 @@ static SSDataBlock* doBuildIntervalResult(SOperatorInfo* pOperator, bool* newgro return NULL; } + SSDataBlock* pBlock = pInfo->binfo.pRes; + if (pInfo->execModel == OPTR_EXEC_MODEL_STREAM) { return pOperator->getStreamResFn(pOperator, newgroup); } else { @@ -5134,15 +5134,15 @@ static SSDataBlock* doBuildIntervalResult(SOperatorInfo* pOperator, bool* newgro return NULL; } - blockDataEnsureCapacity(pInfo->binfo.pRes, pOperator->resultInfo.capacity); - toSDatablock(pInfo->binfo.pRes, pOperator->resultInfo.capacity, &pInfo->groupResInfo, pOperator->pExpr, - pInfo->aggSup.pResultBuf, pInfo->binfo.rowCellInfoOffset); + blockDataEnsureCapacity(pBlock, pOperator->resultInfo.capacity); + doBuildResultDatablock(pBlock, pOperator->resultInfo.capacity, &pInfo->groupResInfo, pOperator->pExpr, + pInfo->aggSup.pResultBuf, pInfo->binfo.rowCellInfoOffset); - if (pInfo->binfo.pRes->info.rows == 0 || !hasRemainDataInCurrentGroup(&pInfo->groupResInfo)) { + if (pBlock->info.rows == 0 || !hasRemainDataInCurrentGroup(&pInfo->groupResInfo)) { doSetOperatorCompleted(pOperator); } - return pInfo->binfo.pRes->info.rows == 0 ? NULL : pInfo->binfo.pRes; + return pBlock->info.rows == 0 ? NULL : pBlock; } } @@ -5155,7 +5155,7 @@ static SSDataBlock* doStreamIntervalAgg(SOperatorInfo *pOperator, bool* newgroup } if (pOperator->status == OP_RES_TO_RETURN) { - toSDatablock(pInfo->binfo.pRes, pOperator->resultInfo.capacity, &pInfo->groupResInfo, pOperator->pExpr, pInfo->aggSup.pResultBuf, pInfo->binfo.rowCellInfoOffset); + doBuildResultDatablock(pInfo->binfo.pRes, pOperator->resultInfo.capacity, &pInfo->groupResInfo, pOperator->pExpr, pInfo->aggSup.pResultBuf, pInfo->binfo.rowCellInfoOffset); if (pInfo->binfo.pRes->info.rows == 0 || !hasRemainDataInCurrentGroup(&pInfo->groupResInfo)) { pOperator->status = OP_EXEC_DONE; } @@ -5190,7 +5190,7 @@ static SSDataBlock* doStreamIntervalAgg(SOperatorInfo *pOperator, bool* newgroup initMultiResInfoFromArrayList(&pInfo->groupResInfo, pUpdated); blockDataEnsureCapacity(pInfo->binfo.pRes, pOperator->resultInfo.capacity); - toSDatablock(pInfo->binfo.pRes, pOperator->resultInfo.capacity, &pInfo->groupResInfo, pOperator->pExpr, pInfo->aggSup.pResultBuf, pInfo->binfo.rowCellInfoOffset); + doBuildResultDatablock(pInfo->binfo.pRes, pOperator->resultInfo.capacity, &pInfo->groupResInfo, pOperator->pExpr, pInfo->aggSup.pResultBuf, pInfo->binfo.rowCellInfoOffset); ASSERT(pInfo->binfo.pRes->info.rows > 0); pOperator->status = OP_RES_TO_RETURN; @@ -5205,7 +5205,7 @@ static SSDataBlock* doAllIntervalAgg(SOperatorInfo *pOperator, bool* newgroup) { STimeSliceOperatorInfo* pSliceInfo = pOperator->info; if (pOperator->status == OP_RES_TO_RETURN) { - // toSDatablock(&pRuntimeEnv->groupResInfo, pRuntimeEnv, pIntervalInfo->pRes); + // doBuildResultDatablock(&pRuntimeEnv->groupResInfo, pRuntimeEnv, pIntervalInfo->pRes); if (pSliceInfo->binfo.pRes->info.rows == 0 || !hasRemainDataInCurrentGroup(&pSliceInfo->groupResInfo)) { doSetOperatorCompleted(pOperator); } @@ -5238,7 +5238,7 @@ static SSDataBlock* doAllIntervalAgg(SOperatorInfo *pOperator, bool* newgroup) { finalizeQueryResult(pSliceInfo->binfo.pCtx, pOperator->numOfOutput); initGroupResInfo(&pSliceInfo->groupResInfo, &pSliceInfo->binfo.resultRowInfo); - // toSDatablock(&pRuntimeEnv->groupResInfo, pRuntimeEnv, pSliceInfo->pRes); + // doBuildResultDatablock(&pRuntimeEnv->groupResInfo, pRuntimeEnv, pSliceInfo->pRes); if (pSliceInfo->binfo.pRes->info.rows == 0 || !hasRemainDataInCurrentGroup(&pSliceInfo->groupResInfo)) { pOperator->status = OP_EXEC_DONE; @@ -5292,7 +5292,7 @@ static SSDataBlock* doSTableIntervalAgg(SOperatorInfo* pOperator, bool* newgroup OPTR_SET_OPENED(pOperator); blockDataEnsureCapacity(pInfo->binfo.pRes, pOperator->resultInfo.capacity); - toSDatablock(pInfo->binfo.pRes, pOperator->resultInfo.capacity, &pInfo->groupResInfo, pOperator->pExpr, + doBuildResultDatablock(pInfo->binfo.pRes, pOperator->resultInfo.capacity, &pInfo->groupResInfo, pOperator->pExpr, pInfo->aggSup.pResultBuf, pInfo->binfo.rowCellInfoOffset); if (pInfo->binfo.pRes->info.rows == 0 || !hasRemainDataInCurrentGroup(&pInfo->groupResInfo)) { @@ -5383,7 +5383,7 @@ static SSDataBlock* doStateWindowAgg(SOperatorInfo* pOperator, bool* newgroup) { SOptrBasicInfo* pBInfo = &pInfo->binfo; if (pOperator->status == OP_RES_TO_RETURN) { - toSDatablock(pBInfo->pRes, pOperator->resultInfo.capacity, &pInfo->groupResInfo, pOperator->pExpr, pInfo->aggSup.pResultBuf, pBInfo->rowCellInfoOffset); + doBuildResultDatablock(pBInfo->pRes, pOperator->resultInfo.capacity, &pInfo->groupResInfo, pOperator->pExpr, pInfo->aggSup.pResultBuf, pBInfo->rowCellInfoOffset); if (pBInfo->pRes->info.rows == 0 || !hasRemainDataInCurrentGroup(&pInfo->groupResInfo)) { doSetOperatorCompleted(pOperator); return NULL; @@ -5415,7 +5415,7 @@ static SSDataBlock* doStateWindowAgg(SOperatorInfo* pOperator, bool* newgroup) { initGroupResInfo(&pInfo->groupResInfo, &pBInfo->resultRowInfo); blockDataEnsureCapacity(pBInfo->pRes, pOperator->resultInfo.capacity); - toSDatablock(pBInfo->pRes, pOperator->resultInfo.capacity, &pInfo->groupResInfo, pOperator->pExpr, pInfo->aggSup.pResultBuf, pBInfo->rowCellInfoOffset); + doBuildResultDatablock(pBInfo->pRes, pOperator->resultInfo.capacity, &pInfo->groupResInfo, pOperator->pExpr, pInfo->aggSup.pResultBuf, pBInfo->rowCellInfoOffset); if (pBInfo->pRes->info.rows == 0 || !hasRemainDataInCurrentGroup(&pInfo->groupResInfo)) { doSetOperatorCompleted(pOperator); } @@ -5432,7 +5432,7 @@ static SSDataBlock* doSessionWindowAgg(SOperatorInfo* pOperator, bool* newgroup) SOptrBasicInfo* pBInfo = &pInfo->binfo; if (pOperator->status == OP_RES_TO_RETURN) { - toSDatablock(pBInfo->pRes, pOperator->resultInfo.capacity, &pInfo->groupResInfo, pOperator->pExpr, pInfo->aggSup.pResultBuf, pBInfo->rowCellInfoOffset); + doBuildResultDatablock(pBInfo->pRes, pOperator->resultInfo.capacity, &pInfo->groupResInfo, pOperator->pExpr, pInfo->aggSup.pResultBuf, pBInfo->rowCellInfoOffset); if (pBInfo->pRes->info.rows == 0 || !hasRemainDataInCurrentGroup(&pInfo->groupResInfo)) { doSetOperatorCompleted(pOperator); return NULL; @@ -5464,7 +5464,7 @@ static SSDataBlock* doSessionWindowAgg(SOperatorInfo* pOperator, bool* newgroup) initGroupResInfo(&pInfo->groupResInfo, &pBInfo->resultRowInfo); blockDataEnsureCapacity(pBInfo->pRes, pOperator->resultInfo.capacity); - toSDatablock(pBInfo->pRes, pOperator->resultInfo.capacity, &pInfo->groupResInfo, pOperator->pExpr, pInfo->aggSup.pResultBuf, pBInfo->rowCellInfoOffset); + doBuildResultDatablock(pBInfo->pRes, pOperator->resultInfo.capacity, &pInfo->groupResInfo, pOperator->pExpr, pInfo->aggSup.pResultBuf, pBInfo->rowCellInfoOffset); if (pBInfo->pRes->info.rows == 0 || !hasRemainDataInCurrentGroup(&pInfo->groupResInfo)) { doSetOperatorCompleted(pOperator); } @@ -5509,14 +5509,16 @@ static SSDataBlock* doFill(SOperatorInfo* pOperator, bool* newgroup) { SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo; SResultInfo* pResultInfo = &pOperator->resultInfo; - blockDataCleanup(pInfo->pRes); + SSDataBlock* pResBlock = pInfo->pRes; + + blockDataCleanup(pResBlock); if (pOperator->status == OP_EXEC_DONE) { return NULL; } doHandleRemainBlockFromNewGroup(pInfo, pResultInfo, newgroup, pTaskInfo); - if (pInfo->pRes->info.rows > pResultInfo->threshold || (!pInfo->multigroupResult && pInfo->pRes->info.rows > 0)) { - return pInfo->pRes; + if (pResBlock->info.rows > pResultInfo->threshold || (!pInfo->multigroupResult && pResBlock->info.rows > 0)) { + return pResBlock; } SOperatorInfo* pDownstream = pOperator->pDownstream[0]; @@ -5551,25 +5553,25 @@ static SSDataBlock* doFill(SOperatorInfo* pOperator, bool* newgroup) { } } - doFillTimeIntervalGapsInResults(pInfo->pFillInfo, pInfo->pRes, pInfo->capacity, pInfo->p); + doFillTimeIntervalGapsInResults(pInfo->pFillInfo, pResBlock, pOperator->resultInfo.capacity, pInfo->p); // current group has no more result to return - if (pInfo->pRes->info.rows > 0) { + if (pResBlock->info.rows > 0) { // 1. The result in current group not reach the threshold of output result, continue // 2. If multiple group results existing in one SSDataBlock is not allowed, return immediately - if (pInfo->pRes->info.rows > pResultInfo->threshold || pBlock == NULL || (!pInfo->multigroupResult)) { - return pInfo->pRes; + if (pResBlock->info.rows > pResultInfo->threshold || pBlock == NULL || (!pInfo->multigroupResult)) { + return pResBlock; } doHandleRemainBlockFromNewGroup(pInfo, pResultInfo, newgroup, pTaskInfo); - if (pInfo->pRes->info.rows > pOperator->resultInfo.threshold || pBlock == NULL) { - return pInfo->pRes; + if (pResBlock->info.rows > pOperator->resultInfo.threshold || pBlock == NULL) { + return pResBlock; } } else if (pInfo->existNewGroupBlock) { // try next group assert(pBlock != NULL); doHandleRemainBlockForNewGroupImpl(pInfo, pResultInfo, newgroup, pTaskInfo); - if (pInfo->pRes->info.rows > pResultInfo->threshold) { - return pInfo->pRes; + if (pResBlock->info.rows > pResultInfo->threshold) { + return pResBlock; } } else { return NULL; @@ -5615,7 +5617,7 @@ int32_t doInitAggInfoSup(SAggSupporter* pAggSup, SqlFunctionCtx* pCtx, int32_t n _hash_fn_t hashFn = taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY); pAggSup->resultRowSize = getResultRowSize(pCtx, numOfOutput); - pAggSup->keyBuf = taosMemoryCalloc(1, keyBufSize); + pAggSup->keyBuf = taosMemoryCalloc(1, keyBufSize + POINTER_BYTES + sizeof(int64_t)); pAggSup->pResultRowHashTable = taosHashInit(10, hashFn, true, HASH_NO_LOCK); pAggSup->pResultRowListSet = taosHashInit(100, hashFn, false, HASH_NO_LOCK); pAggSup->pResultRowArrayList = taosArrayInit(10, sizeof(SResultRowCell)); @@ -5878,8 +5880,7 @@ _error: SOperatorInfo* createIntervalOperatorInfo(SOperatorInfo* downstream, SExprInfo* pExprInfo, int32_t numOfCols, SSDataBlock* pResBlock, SInterval* pInterval, int32_t primaryTsSlotId, - STimeWindowAggSupp *pTwAggSupp, const STableGroupInfo* pTableGroupInfo, - SExecTaskInfo* pTaskInfo) { + STimeWindowAggSupp* pTwAggSupp, const STableGroupInfo* pTableGroupInfo, SExecTaskInfo* pTaskInfo) { STableIntervalOperatorInfo* pInfo = taosMemoryCalloc(1, sizeof(STableIntervalOperatorInfo)); SOperatorInfo* pOperator = taosMemoryCalloc(1, sizeof(SOperatorInfo)); if (pInfo == NULL || pOperator == NULL) { @@ -5890,10 +5891,8 @@ SOperatorInfo* createIntervalOperatorInfo(SOperatorInfo* downstream, SExprInfo* pInfo->interval = *pInterval; pInfo->execModel = pTaskInfo->execModel; pInfo->win = pTaskInfo->window; - pInfo->win.skey = 0; - pInfo->win.ekey = INT64_MAX; - pInfo->primaryTsIndex = primaryTsSlotId; pInfo->twAggSup = *pTwAggSupp; + pInfo->primaryTsIndex = primaryTsSlotId; int32_t numOfRows = 4096; size_t keyBufSize = sizeof(int64_t) + sizeof(int64_t) + POINTER_BYTES; @@ -6063,18 +6062,14 @@ _error: static int32_t initFillInfo(SFillOperatorInfo* pInfo, SExprInfo* pExpr, int32_t numOfCols, int64_t* fillVal, STimeWindow win, int32_t capacity, const char* id, SInterval* pInterval, int32_t fillType) { - struct SFillColInfo* pColInfo = createFillColInfo(pExpr, numOfCols, (int64_t*)fillVal); - - TSKEY sk = TMIN(win.skey, win.ekey); - TSKEY ek = TMAX(win.skey, win.ekey); + SFillColInfo* pColInfo = createFillColInfo(pExpr, numOfCols, NULL); // TODO set correct time precision STimeWindow w = TSWINDOW_INITIALIZER; - getAlignQueryTimeWindow(pInterval, TSDB_TIME_PRECISION_MILLI, win.skey, sk, ek, &w); + getAlignQueryTimeWindow(pInterval, TSDB_TIME_PRECISION_MILLI, win.skey, &w); int32_t order = TSDB_ORDER_ASC; - pInfo->pFillInfo = taosCreateFillInfo(order, w.skey, 0, capacity, numOfCols, pInterval->sliding, - pInterval->slidingUnit, (int8_t)pInterval->precision, fillType, pColInfo, id); + pInfo->pFillInfo = taosCreateFillInfo(order, w.skey, 0, capacity, numOfCols, pInterval, fillType, pColInfo, id); pInfo->p = taosMemoryCalloc(numOfCols, POINTER_BYTES); @@ -6095,23 +6090,37 @@ SOperatorInfo* createFillOperatorInfo(SOperatorInfo* downstream, SExprInfo* pExp pInfo->multigroupResult = multigroupResult; pInfo->intervalInfo = *pInterval; + int32_t type = TSDB_FILL_NONE; + switch (fillType) { + case FILL_MODE_PREV: type = TSDB_FILL_PREV;break; + case FILL_MODE_NONE: type = TSDB_FILL_NONE;break; + case FILL_MODE_NULL: type = TSDB_FILL_NULL;break; + case FILL_MODE_NEXT: type = TSDB_FILL_NEXT;break; + case FILL_MODE_VALUE: type = TSDB_FILL_SET_VALUE;break; + case FILL_MODE_LINEAR: type = TSDB_FILL_LINEAR;break; + default: + type = TSDB_FILL_NONE; + } + SResultInfo* pResultInfo = &pOperator->resultInfo; - int32_t code = initFillInfo(pInfo, pExpr, numOfCols, (int64_t*)fillVal, pTaskInfo->window, pResultInfo->capacity, - pTaskInfo->id.str, pInterval, fillType); + initResultSizeInfo(pOperator, 4096); + + int32_t code = initFillInfo(pInfo, pExpr, numOfCols, (int64_t*)fillVal, pTaskInfo->window, pResultInfo->capacity, + pTaskInfo->id.str, pInterval, type); if (code != TSDB_CODE_SUCCESS) { goto _error; } - pOperator->name = "FillOperator"; + pOperator->name = "FillOperator"; pOperator->blockingOptr = false; - pOperator->status = OP_NOT_OPENED; + pOperator->status = OP_NOT_OPENED; // pOperator->operatorType = OP_Fill; - pOperator->pExpr = pExpr; - pOperator->numOfOutput = numOfCols; - pOperator->info = pInfo; - pOperator->_openFn = operatorDummyOpenFn; - pOperator->getNextFn = doFill; - pOperator->pTaskInfo = pTaskInfo; + pOperator->pExpr = pExpr; + pOperator->numOfOutput = numOfCols; + pOperator->info = pInfo; + pOperator->_openFn = operatorDummyOpenFn; + pOperator->getNextFn = doFill; + pOperator->pTaskInfo = pTaskInfo; pOperator->closeFn = destroySFillOperatorInfo; @@ -6582,6 +6591,11 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo int32_t primaryTsSlotId = ((SColumnNode*) pIntervalPhyNode->window.pTspk)->slotId; pOptr = createIntervalOperatorInfo(ops[0], pExprInfo, num, pResBlock, &interval, primaryTsSlotId, &as, pTableGroupInfo, pTaskInfo); + + if (pIntervalPhyNode->pFill != NULL) { + pOptr = createFillOperatorInfo(pOptr, pExprInfo, num, &interval, pResBlock, pIntervalPhyNode->pFill->mode, NULL, false, pTaskInfo); + } + } else if (QUERY_NODE_PHYSICAL_PLAN_SORT == type) { SSortPhysiNode* pSortPhyNode = (SSortPhysiNode*)pPhyNode; diff --git a/source/libs/executor/src/groupoperator.c b/source/libs/executor/src/groupoperator.c index d610880e30..9f75f97632 100644 --- a/source/libs/executor/src/groupoperator.c +++ b/source/libs/executor/src/groupoperator.c @@ -265,7 +265,7 @@ static SSDataBlock* hashGroupbyAggregate(SOperatorInfo* pOperator, bool* newgrou SSDataBlock* pRes = pInfo->binfo.pRes; if (pOperator->status == OP_RES_TO_RETURN) { - toSDatablock(pRes, pOperator->resultInfo.capacity, &pInfo->groupResInfo, pOperator->pExpr, pInfo->aggSup.pResultBuf, pInfo->binfo.rowCellInfoOffset); + doBuildResultDatablock(pRes, pOperator->resultInfo.capacity, &pInfo->groupResInfo, pOperator->pExpr, pInfo->aggSup.pResultBuf, pInfo->binfo.rowCellInfoOffset); if (pRes->info.rows == 0 || !hasRemainDataInCurrentGroup(&pInfo->groupResInfo)) { pOperator->status = OP_EXEC_DONE; } @@ -311,7 +311,7 @@ static SSDataBlock* hashGroupbyAggregate(SOperatorInfo* pOperator, bool* newgrou initGroupResInfo(&pInfo->groupResInfo, &pInfo->binfo.resultRowInfo); while(1) { - toSDatablock(pRes, pOperator->resultInfo.capacity, &pInfo->groupResInfo, pOperator->pExpr, pInfo->aggSup.pResultBuf, pInfo->binfo.rowCellInfoOffset); + doBuildResultDatablock(pRes, pOperator->resultInfo.capacity, &pInfo->groupResInfo, pOperator->pExpr, pInfo->aggSup.pResultBuf, pInfo->binfo.rowCellInfoOffset); doFilter(pInfo->pCondition, pRes); bool hasRemain = hasRemainDataInCurrentGroup(&pInfo->groupResInfo); diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c index 6b06f3e89b..f0d3d95b6a 100644 --- a/source/libs/executor/src/scanoperator.c +++ b/source/libs/executor/src/scanoperator.c @@ -129,7 +129,7 @@ static bool overlapWithTimeWindow(SInterval* pInterval, SDataBlockInfo* pBlockIn // TSKEY ek = MAX(pQueryAttr->window.skey, pQueryAttr->window.ekey); if (true) { - getAlignQueryTimeWindow(pInterval, pInterval->precision, pBlockInfo->window.skey, sk, ek, &w); + getAlignQueryTimeWindow(pInterval, pInterval->precision, pBlockInfo->window.skey, &w); assert(w.ekey >= pBlockInfo->window.skey); if (w.ekey < pBlockInfo->window.ekey) { @@ -451,8 +451,8 @@ static SSDataBlock* doBlockInfoScan(SOperatorInfo* pOperator, bool* newgroup) { STableBlockDistInfo tableBlockDist = {0}; tableBlockDist.numOfTables = 1; // TODO set the correct number of tables - int32_t numRowSteps = TSDB_DEFAULT_MAX_ROW_FBLOCK / TSDB_BLOCK_DIST_STEP_ROWS; - if (TSDB_DEFAULT_MAX_ROW_FBLOCK % TSDB_BLOCK_DIST_STEP_ROWS != 0) { + int32_t numRowSteps = TSDB_DEFAULT_MAXROWS_FBLOCK / TSDB_BLOCK_DIST_STEP_ROWS; + if (TSDB_DEFAULT_MAXROWS_FBLOCK % TSDB_BLOCK_DIST_STEP_ROWS != 0) { ++numRowSteps; } diff --git a/source/libs/function/src/tfill.c b/source/libs/executor/src/tfill.c similarity index 88% rename from source/libs/function/src/tfill.c rename to source/libs/executor/src/tfill.c index b6b5362187..aeed07c636 100644 --- a/source/libs/function/src/tfill.c +++ b/source/libs/executor/src/tfill.c @@ -13,17 +13,18 @@ * along with this program. If not, see . */ -#include +#include "function.h" #include "os.h" +#include "querynodes.h" #include "taosdef.h" #include "tmsg.h" #include "ttypes.h" #include "tfill.h" -#include "thash.h" #include "function.h" #include "tcommon.h" +#include "thash.h" #include "ttime.h" #define FILL_IS_ASC_FILL(_f) ((_f)->order == TSDB_ORDER_ASC) @@ -41,7 +42,7 @@ static void setTagsValue(SFillInfo* pFillInfo, void** data, int32_t genRows) { assert(pCol->tagIndex >= 0 && pCol->tagIndex < pFillInfo->numOfTags); SFillTagColInfo* pTag = &pFillInfo->pTags[pCol->tagIndex]; - assert (pTag->col.colId == pCol->col.colId); +// assert (pTag->col.colId == pCol->col.colId); assignVal(val1, pTag->tagVal, pCol->col.bytes, pCol->col.type); } } @@ -80,7 +81,7 @@ static void doFillOneRowResult(SFillInfo* pFillInfo, void** data, char** srcData } char* output = elePtrAt(data[i], pCol->col.bytes, index); - assignVal(output, p + pCol->col.offset, pCol->col.bytes, pCol->col.type); +// assignVal(output, p + pCol->offset, pCol->col.bytes, pCol->col.type); } } else { // no prev value yet, set the value for NULL setNullValueForRow(pFillInfo, data, pFillInfo->numOfCols, index); @@ -96,7 +97,7 @@ static void doFillOneRowResult(SFillInfo* pFillInfo, void** data, char** srcData } char* output = elePtrAt(data[i], pCol->col.bytes, index); - assignVal(output, p + pCol->col.offset, pCol->col.bytes, pCol->col.type); +// assignVal(output, p + pCol->offset, pCol->col.bytes, pCol->col.type); } } else { // no prev value yet, set the value for NULL setNullValueForRow(pFillInfo, data, pFillInfo->numOfCols, index); @@ -119,7 +120,7 @@ static void doFillOneRowResult(SFillInfo* pFillInfo, void** data, char** srcData continue; } - point1 = (SPoint){.key = *(TSKEY*)(prev), .val = prev + pCol->col.offset}; + point1 = (SPoint){.key = *(TSKEY*)(prev), .val = prev + pCol->offset}; point2 = (SPoint){.key = ts, .val = srcData[i] + pFillInfo->index * bytes}; point = (SPoint){.key = pFillInfo->currentKey, .val = val1}; taosGetLinearInterpolationVal(&point, type, &point1, &point2, type); @@ -135,12 +136,13 @@ static void doFillOneRowResult(SFillInfo* pFillInfo, void** data, char** srcData } char* val1 = elePtrAt(data[i], pCol->col.bytes, index); - assignVal(val1, (char*)&pCol->fillVal.i, pCol->col.bytes, pCol->col.type); + assignVal(val1, (char*)&pCol->val, pCol->col.bytes, pCol->col.type); } } setTagsValue(pFillInfo, data, index); - pFillInfo->currentKey = taosTimeAdd(pFillInfo->currentKey, pFillInfo->interval.sliding * step, pFillInfo->interval.slidingUnit, pFillInfo->precision); + pFillInfo->currentKey = taosTimeAdd(pFillInfo->currentKey, pFillInfo->interval.sliding * step, pFillInfo->interval.slidingUnit, + pFillInfo->interval.precision); pFillInfo->numOfCurrent++; } @@ -152,7 +154,7 @@ static void initBeforeAfterDataBuf(SFillInfo* pFillInfo, char** next) { *next = taosMemoryCalloc(1, pFillInfo->rowSize); for (int i = 1; i < pFillInfo->numOfCols; i++) { SFillColInfo* pCol = &pFillInfo->pFillCol[i]; - setNull(*next + pCol->col.offset, pCol->col.type, pCol->col.bytes); + setNull(*next + pCol->offset, pCol->col.type, pCol->col.bytes); } } @@ -160,7 +162,7 @@ static void copyCurrentRowIntoBuf(SFillInfo* pFillInfo, char** srcData, char* bu int32_t rowIndex = pFillInfo->index; for (int32_t i = 0; i < pFillInfo->numOfCols; ++i) { SFillColInfo* pCol = &pFillInfo->pFillCol[i]; - memcpy(buf + pCol->col.offset, srcData[i] + rowIndex * pCol->col.bytes, pCol->col.bytes); + memcpy(buf + pCol->offset, srcData[i] + rowIndex * pCol->col.bytes, pCol->col.bytes); } } @@ -227,21 +229,21 @@ static int32_t fillResultImpl(SFillInfo* pFillInfo, void** data, int32_t outputR if (i == 0 || (pCol->functionId != FUNCTION_COUNT && !isNull(src, pCol->col.type)) || (pCol->functionId == FUNCTION_COUNT && GET_INT64_VAL(src) != 0)) { assignVal(output, src, pCol->col.bytes, pCol->col.type); - memcpy(*prev + pCol->col.offset, src, pCol->col.bytes); + memcpy(*prev + pCol->offset, src, pCol->col.bytes); } else { // i > 0 and data is null , do interpolation if (pFillInfo->type == TSDB_FILL_PREV) { - assignVal(output, *prev + pCol->col.offset, pCol->col.bytes, pCol->col.type); + assignVal(output, *prev + pCol->offset, pCol->col.bytes, pCol->col.type); } else if (pFillInfo->type == TSDB_FILL_LINEAR) { assignVal(output, src, pCol->col.bytes, pCol->col.type); - memcpy(*prev + pCol->col.offset, src, pCol->col.bytes); + memcpy(*prev + pCol->offset, src, pCol->col.bytes); } else if (pFillInfo->type == TSDB_FILL_NEXT) { if (*next) { - assignVal(output, *next + pCol->col.offset, pCol->col.bytes, pCol->col.type); + assignVal(output, *next + pCol->offset, pCol->col.bytes, pCol->col.type); } else { setNull(output, pCol->col.type, pCol->col.bytes); } } else { - assignVal(output, (char*)&pCol->fillVal.i, pCol->col.bytes, pCol->col.type); + assignVal(output, (char*)&pCol->val, pCol->col.bytes, pCol->col.type); } } } @@ -250,7 +252,7 @@ static int32_t fillResultImpl(SFillInfo* pFillInfo, void** data, int32_t outputR setTagsValue(pFillInfo, data, pFillInfo->numOfCurrent); pFillInfo->currentKey = taosTimeAdd(pFillInfo->currentKey, pFillInfo->interval.sliding * step, - pFillInfo->interval.slidingUnit, pFillInfo->precision); + pFillInfo->interval.slidingUnit, pFillInfo->interval.precision); pFillInfo->index += 1; pFillInfo->numOfCurrent += 1; } @@ -301,7 +303,7 @@ static int32_t setTagColumnInfo(SFillInfo* pFillInfo, int32_t numOfCols, int32_t bool exists = false; int32_t index = -1; for (int32_t j = 0; j < k; ++j) { - if (pFillInfo->pTags[j].col.colId == pColInfo->col.colId) { + if (pFillInfo->pTags[j].col.colId == pColInfo->col.slotId) { exists = true; index = j; break; @@ -310,7 +312,7 @@ static int32_t setTagColumnInfo(SFillInfo* pFillInfo, int32_t numOfCols, int32_t if (!exists) { SSchema* pSchema = &pFillInfo->pTags[k].col; - pSchema->colId = pColInfo->col.colId; + pSchema->colId = pColInfo->col.slotId; pSchema->type = pColInfo->col.type; pSchema->bytes = pColInfo->col.bytes; @@ -341,30 +343,40 @@ static int32_t taosNumOfRemainRows(SFillInfo* pFillInfo) { } struct SFillInfo* taosCreateFillInfo(int32_t order, TSKEY skey, int32_t numOfTags, int32_t capacity, int32_t numOfCols, - int64_t slidingTime, int8_t slidingUnit, int8_t precision, int32_t fillType, - struct SFillColInfo* pCol, const char* id) { + SInterval* pInterval, int32_t fillType, struct SFillColInfo* pCol, const char* id) { if (fillType == TSDB_FILL_NONE) { return NULL; } SFillInfo* pFillInfo = taosMemoryCalloc(1, sizeof(SFillInfo)); + if (pFillInfo == NULL) { + terrno = TSDB_CODE_OUT_OF_MEMORY; + return NULL; + } + taosResetFillInfo(pFillInfo, skey); - pFillInfo->order = order; + pFillInfo->order = order; + + switch(fillType) { + case FILL_MODE_NONE: pFillInfo->type = TSDB_FILL_NONE; break; + case FILL_MODE_PREV: pFillInfo->type = TSDB_FILL_PREV; break; + case FILL_MODE_NULL: pFillInfo->type = TSDB_FILL_NULL; break; + case FILL_MODE_LINEAR: pFillInfo->type = TSDB_FILL_LINEAR;break; + case FILL_MODE_NEXT: pFillInfo->type = TSDB_FILL_NEXT; break; + default: + terrno = TSDB_CODE_INVALID_PARA; + return NULL; + } + pFillInfo->type = fillType; pFillInfo->pFillCol = pCol; pFillInfo->numOfTags = numOfTags; pFillInfo->numOfCols = numOfCols; - pFillInfo->precision = precision; pFillInfo->alloc = capacity; pFillInfo->id = id; - - pFillInfo->interval.interval = slidingTime; - pFillInfo->interval.intervalUnit = slidingUnit; - pFillInfo->interval.sliding = slidingTime; - pFillInfo->interval.slidingUnit = slidingUnit; - - pFillInfo->pData = taosMemoryMalloc(POINTER_BYTES * numOfCols); + pFillInfo->interval = *pInterval; + pFillInfo->pData = taosMemoryMalloc(POINTER_BYTES * numOfCols); // if (numOfTags > 0) { pFillInfo->pTags = taosMemoryCalloc(numOfCols, sizeof(SFillTagColInfo)); @@ -375,7 +387,6 @@ struct SFillInfo* taosCreateFillInfo(int32_t order, TSKEY skey, int32_t numOfTag pFillInfo->rowSize = setTagColumnInfo(pFillInfo, pFillInfo->numOfCols, pFillInfo->alloc); assert(pFillInfo->rowSize > 0); - return pFillInfo; } @@ -417,7 +428,7 @@ void taosFillSetStartInfo(SFillInfo* pFillInfo, int32_t numOfRows, TSKEY endKey) pFillInfo->end = endKey; if (!FILL_IS_ASC_FILL(pFillInfo)) { - pFillInfo->end = taosTimeTruncate(endKey, &pFillInfo->interval, pFillInfo->precision); + pFillInfo->end = taosTimeTruncate(endKey, &pFillInfo->interval, pFillInfo->interval.precision); } pFillInfo->index = 0; @@ -433,7 +444,7 @@ void taosFillSetInputDataBlock(SFillInfo* pFillInfo, const SSDataBlock* pInput) if (TSDB_COL_IS_TAG(pCol->flag)) { // copy the tag value to tag value buffer SFillTagColInfo* pTag = &pFillInfo->pTags[pCol->tagIndex]; - assert (pTag->col.colId == pCol->col.colId); + assert (pTag->col.colId == pCol->col.slotId); memcpy(pTag->tagVal, pColData->pData, pCol->col.bytes); // TODO not memcpy?? } } @@ -460,7 +471,7 @@ int64_t getNumOfResultsAfterFillGap(SFillInfo* pFillInfo, TSKEY ekey, int32_t ma TSKEY ekey1 = ekey; if (!FILL_IS_ASC_FILL(pFillInfo)) { - pFillInfo->end = taosTimeTruncate(ekey, &pFillInfo->interval, pFillInfo->precision); + pFillInfo->end = taosTimeTruncate(ekey, &pFillInfo->interval, pFillInfo->interval.precision); } int64_t numOfRes = -1; @@ -471,7 +482,7 @@ int64_t getNumOfResultsAfterFillGap(SFillInfo* pFillInfo, TSKEY ekey, int32_t ma pFillInfo->currentKey, pFillInfo->interval.sliding, pFillInfo->interval.slidingUnit, - pFillInfo->precision); + pFillInfo->interval.precision); numOfRes += 1; assert(numOfRes >= numOfRows); } else { // reach the end of data @@ -484,7 +495,7 @@ int64_t getNumOfResultsAfterFillGap(SFillInfo* pFillInfo, TSKEY ekey, int32_t ma pFillInfo->currentKey, pFillInfo->interval.sliding, pFillInfo->interval.slidingUnit, - pFillInfo->precision); + pFillInfo->interval.precision); numOfRes += 1; } @@ -527,7 +538,7 @@ int64_t getFillInfoStart(struct SFillInfo *pFillInfo) { return pFillInfo->start; } -struct SFillColInfo* createFillColInfo(SExprInfo* pExpr, int32_t numOfOutput, const int64_t* fillVal) { +struct SFillColInfo* createFillColInfo(SExprInfo* pExpr, int32_t numOfOutput, const struct SValueNode* val) { int32_t offset = 0; struct SFillColInfo* pFillCol = taosMemoryCalloc(numOfOutput, sizeof(SFillColInfo)); @@ -538,14 +549,15 @@ struct SFillColInfo* createFillColInfo(SExprInfo* pExpr, int32_t numOfOutput, co for(int32_t i = 0; i < numOfOutput; ++i) { SExprInfo* pExprInfo = &pExpr[i]; - pFillCol[i].col.bytes = pExprInfo->base.resSchema.bytes; - pFillCol[i].col.type = (int8_t)pExprInfo->base.resSchema.type; - pFillCol[i].col.offset = offset; - pFillCol[i].col.colId = pExprInfo->base.resSchema.slotId; + pFillCol[i].col = pExprInfo->base.resSchema; + pFillCol[i].offset = offset; pFillCol[i].tagIndex = -2; - pFillCol[i].flag = pExprInfo->base.pParam[0].pCol->flag; // always be the normal column for table query + + if (pExprInfo->base.numOfParams > 0) { + pFillCol[i].flag = pExprInfo->base.pParam[0].pCol->flag; // always be the normal column for table query + } // pFillCol[i].functionId = pExprInfo->pExpr->_function.functionId; - pFillCol[i].fillVal.i = fillVal[i]; +// pFillCol[i].val.d = *val; offset += pExprInfo->base.resSchema.bytes; } diff --git a/source/libs/function/src/taggfunction.c b/source/libs/function/src/taggfunction.c index e001ef4071..56ee9bc9ae 100644 --- a/source/libs/function/src/taggfunction.c +++ b/source/libs/function/src/taggfunction.c @@ -19,14 +19,14 @@ #include "thash.h" #include "ttypes.h" +//#include "tfill.h" #include "function.h" #include "taggfunction.h" -#include "tfill.h" -#include "thistogram.h" -#include "ttszip.h" -#include "tpercentile.h" #include "tbuffer.h" #include "tcompression.h" +#include "thistogram.h" +#include "tpercentile.h" +#include "ttszip.h" //#include "queryLog.h" #include "tdatablock.h" #include "tudf.h" @@ -3608,7 +3608,7 @@ static void interp_function_impl(SqlFunctionCtx *pCtx) { if (isNull((char *)&pCtx->start.val, srcType) || isNull((char *)&pCtx->end.val, srcType)) { setNull(pCtx->pOutput, srcType, pCtx->inputBytes); } else { - taosGetLinearInterpolationVal(&point, pCtx->resDataInfo.type, &point1, &point2, TSDB_DATA_TYPE_DOUBLE); +// taosGetLinearInterpolationVal(&point, pCtx->resDataInfo.type, &point1, &point2, TSDB_DATA_TYPE_DOUBLE); } } else { setNull(pCtx->pOutput, srcType, pCtx->inputBytes); @@ -3681,7 +3681,7 @@ static void interp_function_impl(SqlFunctionCtx *pCtx) { if (isNull(start, srcType) || isNull(end, srcType)) { setNull(pCtx->pOutput, srcType, pCtx->inputBytes); } else { - taosGetLinearInterpolationVal(&point, pCtx->resDataInfo.type, &point1, &point2, srcType); +// taosGetLinearInterpolationVal(&point, pCtx->resDataInfo.type, &point1, &point2, srcType); } } else { setNull(pCtx->pOutput, srcType, pCtx->inputBytes); @@ -4034,8 +4034,8 @@ static void mergeTableBlockDist(SResultRowEntryInfo* pResInfo, const STableBlock pDist->maxRows = pSrc->maxRows; pDist->minRows = pSrc->minRows; - int32_t maxSteps = TSDB_MAX_MAX_ROW_FBLOCK/TSDB_BLOCK_DIST_STEP_ROWS; - if (TSDB_MAX_MAX_ROW_FBLOCK % TSDB_BLOCK_DIST_STEP_ROWS != 0) { + int32_t maxSteps = TSDB_MAX_MAXROWS_FBLOCK/TSDB_BLOCK_DIST_STEP_ROWS; + if (TSDB_MAX_MAXROWS_FBLOCK % TSDB_BLOCK_DIST_STEP_ROWS != 0) { ++maxSteps; } pDist->dataBlockInfos = taosArrayInit(maxSteps, sizeof(SFileBlockInfo)); diff --git a/source/libs/monitor/src/monMsg.c b/source/libs/monitor/src/monMsg.c index adacbf479b..24ea474cea 100644 --- a/source/libs/monitor/src/monMsg.c +++ b/source/libs/monitor/src/monMsg.c @@ -473,7 +473,7 @@ int32_t tSerializeSMonVloadInfo(void *buf, int32_t bufLen, SMonVloadInfo *pInfo) for (int32_t i = 0; i < taosArrayGetSize(pInfo->pVloads); ++i) { SVnodeLoad *pLoad = taosArrayGet(pInfo->pVloads, i); if (tEncodeI32(&encoder, pLoad->vgId) < 0) return -1; - if (tEncodeI8(&encoder, pLoad->role) < 0) return -1; + if (tEncodeI32(&encoder, pLoad->syncState) < 0) return -1; if (tEncodeI64(&encoder, pLoad->numOfTables) < 0) return -1; if (tEncodeI64(&encoder, pLoad->numOfTimeSeries) < 0) return -1; if (tEncodeI64(&encoder, pLoad->totalStorage) < 0) return -1; @@ -507,7 +507,7 @@ int32_t tDeserializeSMonVloadInfo(void *buf, int32_t bufLen, SMonVloadInfo *pInf for (int32_t i = 0; i < arraySize; ++i) { SVnodeLoad load = {0}; if (tDecodeI32(&decoder, &load.vgId) < 0) return -1; - if (tDecodeI8(&decoder, &load.role) < 0) return -1; + if (tDecodeI32(&decoder, &load.syncState) < 0) return -1; if (tDecodeI64(&decoder, &load.numOfTables) < 0) return -1; if (tDecodeI64(&decoder, &load.numOfTimeSeries) < 0) return -1; if (tDecodeI64(&decoder, &load.totalStorage) < 0) return -1; @@ -530,3 +530,30 @@ void tFreeSMonVloadInfo(SMonVloadInfo *pInfo) { taosArrayDestroy(pInfo->pVloads); pInfo->pVloads = NULL; } + +int32_t tSerializeSMonMloadInfo(void *buf, int32_t bufLen, SMonMloadInfo *pInfo) { + SCoder encoder = {0}; + tCoderInit(&encoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_ENCODER); + + if (tStartEncode(&encoder) < 0) return -1; + if (tEncodeI8(&encoder, pInfo->isMnode) < 0) return -1; + if (tEncodeI32(&encoder, pInfo->load.syncState) < 0) return -1; + tEndEncode(&encoder); + + int32_t tlen = encoder.pos; + tCoderClear(&encoder); + return tlen; +} + +int32_t tDeserializeSMonMloadInfo(void *buf, int32_t bufLen, SMonMloadInfo *pInfo) { + SCoder decoder = {0}; + tCoderInit(&decoder, TD_LITTLE_ENDIAN, buf, bufLen, TD_DECODER); + + if (tStartDecode(&decoder) < 0) return -1; + if (tDecodeI8(&decoder, &pInfo->isMnode) < 0) return -1; + if (tDecodeI32(&decoder, &pInfo->load.syncState) < 0) return -1; + tEndDecode(&decoder); + + tCoderClear(&decoder); + return 0; +} \ No newline at end of file diff --git a/source/libs/parser/inc/parAst.h b/source/libs/parser/inc/parAst.h index 85f9b3399c..d53181b76f 100644 --- a/source/libs/parser/inc/parAst.h +++ b/source/libs/parser/inc/parAst.h @@ -53,6 +53,7 @@ typedef enum EDatabaseOptionType { DB_OPTION_VGROUPS, DB_OPTION_SINGLE_STABLE, DB_OPTION_STREAM_MODE, + DB_OPTION_STRICT, DB_OPTION_RETENTIONS } EDatabaseOptionType; diff --git a/source/libs/parser/inc/sql.y b/source/libs/parser/inc/sql.y index 93e56424df..94913eb7c2 100644 --- a/source/libs/parser/inc/sql.y +++ b/source/libs/parser/inc/sql.y @@ -161,6 +161,7 @@ db_options(A) ::= db_options(B) VGROUPS NK_INTEGER(C). db_options(A) ::= db_options(B) SINGLE_STABLE NK_INTEGER(C). { ((SDatabaseOptions*)B)->pSingleStable = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &C); A = B; } db_options(A) ::= db_options(B) STREAM_MODE NK_INTEGER(C). { ((SDatabaseOptions*)B)->pStreamMode = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &C); A = B; } db_options(A) ::= db_options(B) RETENTIONS retention_list(C). { ((SDatabaseOptions*)B)->pRetentions = C; A = B; } +db_options(A) ::= db_options(B) STRICT NK_INTEGER(C). { ((SDatabaseOptions*)B)->pStrict = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &C); A = B; } alter_db_options(A) ::= alter_db_option(B). { A = createDatabaseOptions(pCxt); A = setDatabaseAlterOption(pCxt, A, &B); } alter_db_options(A) ::= alter_db_options(B) alter_db_option(C). { A = setDatabaseAlterOption(pCxt, B, &C); } @@ -175,6 +176,7 @@ alter_db_option(A) ::= WAL NK_INTEGER(B). alter_db_option(A) ::= QUORUM NK_INTEGER(B). { A.type = DB_OPTION_QUORUM; A.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &B); } alter_db_option(A) ::= CACHELAST NK_INTEGER(B). { A.type = DB_OPTION_CACHELAST; A.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &B); } alter_db_option(A) ::= REPLICA NK_INTEGER(B). { A.type = DB_OPTION_REPLICA; A.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &B); } +alter_db_option(A) ::= STRICT NK_INTEGER(B). { A.type = DB_OPTION_STRICT; A.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &B); } %type integer_list { SNodeList* } %destructor integer_list { nodesDestroyList($$); } @@ -359,7 +361,7 @@ from_db_opt(A) ::= FROM db_name(B). %type func_name_list { SNodeList* } %destructor func_name_list { nodesDestroyList($$); } func_name_list(A) ::= func_name(B). { A = createNodeList(pCxt, B); } -func_name_list(A) ::= func_name_list(B) NK_COMMA col_name(C). { A = addNodeToList(pCxt, B, C); } +func_name_list(A) ::= func_name_list(B) NK_COMMA func_name(C). { A = addNodeToList(pCxt, B, C); } func_name(A) ::= function_name(B). { A = createFunctionNode(pCxt, &B, NULL); } diff --git a/source/libs/parser/src/parAstCreater.c b/source/libs/parser/src/parAstCreater.c index 0bc28beef9..0296495d05 100644 --- a/source/libs/parser/src/parAstCreater.c +++ b/source/libs/parser/src/parAstCreater.c @@ -677,9 +677,6 @@ SNode* setDatabaseAlterOption(SAstCreateContext* pCxt, SNode* pOptions, SAlterOp case DB_OPTION_PRECISION: ((SDatabaseOptions*)pOptions)->pPrecision = pAlterOption->pVal; break; - case DB_OPTION_QUORUM: - ((SDatabaseOptions*)pOptions)->pQuorum = pAlterOption->pVal; - break; case DB_OPTION_REPLICA: ((SDatabaseOptions*)pOptions)->pReplica = pAlterOption->pVal; break; diff --git a/source/libs/parser/src/parTokenizer.c b/source/libs/parser/src/parTokenizer.c index 2a191b7bf2..d8ab3f8ced 100644 --- a/source/libs/parser/src/parTokenizer.c +++ b/source/libs/parser/src/parTokenizer.c @@ -168,6 +168,7 @@ static SKeyword keywordTable[] = { {"STREAM", TK_STREAM}, {"STREAMS", TK_STREAMS}, {"STREAM_MODE", TK_STREAM_MODE}, + {"STRICT", TK_STRICT}, {"SYNCDB", TK_SYNCDB}, {"TABLE", TK_TABLE}, {"TABLES", TK_TABLES}, diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c index 30fc0c6944..4e1749ac02 100644 --- a/source/libs/parser/src/parTranslater.c +++ b/source/libs/parser/src/parTranslater.c @@ -198,6 +198,56 @@ static int32_t getDBVgVersion(STranslateContext* pCxt, const char* pDbFName, int return code; } +static int32_t getDBCfg(STranslateContext* pCxt, const char* pDbName, SDbCfgInfo* pInfo) { + SParseContext* pParCxt = pCxt->pParseCxt; + SName name; + tNameSetDbName(&name, pCxt->pParseCxt->acctId, pDbName, strlen(pDbName)); + char dbFname[TSDB_DB_FNAME_LEN] = {0}; + tNameGetFullDbName(&name, dbFname); + int32_t code = collectUseDatabaseImpl(dbFname, pCxt->pDbs); + if (TSDB_CODE_SUCCESS == code) { + code = catalogGetDBCfg(pParCxt->pCatalog, pParCxt->pTransporter, &pParCxt->mgmtEpSet, dbFname, pInfo); + } + if (TSDB_CODE_SUCCESS != code) { + parserError("catalogGetDBCfg error, code:%s, dbFName:%s", tstrerror(code), dbFname); + } + return code; +} + +static int32_t initTranslateContext(SParseContext* pParseCxt, STranslateContext* pCxt) { + pCxt->pParseCxt = pParseCxt; + pCxt->errCode = TSDB_CODE_SUCCESS; + pCxt->msgBuf.buf = pParseCxt->pMsg; + pCxt->msgBuf.len = pParseCxt->msgLen; + pCxt->pNsLevel = taosArrayInit(TARRAY_MIN_SIZE, POINTER_BYTES); + pCxt->currLevel = 0; + pCxt->currClause = 0; + pCxt->pDbs = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_NO_LOCK); + pCxt->pTables = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_NO_LOCK); + if (NULL == pCxt->pNsLevel || NULL == pCxt->pDbs || NULL == pCxt->pTables) { + return TSDB_CODE_OUT_OF_MEMORY; + } + return TSDB_CODE_SUCCESS; +} + +static void destroyTranslateContext(STranslateContext* pCxt) { + if (NULL != pCxt->pNsLevel) { + size_t size = taosArrayGetSize(pCxt->pNsLevel); + for (size_t i = 0; i < size; ++i) { + taosArrayDestroy(taosArrayGetP(pCxt->pNsLevel, i)); + } + taosArrayDestroy(pCxt->pNsLevel); + } + + if (NULL != pCxt->pCmdMsg) { + taosMemoryFreeClear(pCxt->pCmdMsg->pMsg); + taosMemoryFreeClear(pCxt->pCmdMsg); + } + + taosHashCleanup(pCxt->pDbs); + taosHashCleanup(pCxt->pTables); +} + static bool belongTable(const char* currentDb, const SColumnNode* pCol, const STableNode* pTable) { int cmp = 0; if ('\0' != pCol->dbName[0]) { @@ -749,15 +799,18 @@ static int32_t translateTable(STranslateContext* pCxt, SNode* pTable) { case QUERY_NODE_REAL_TABLE: { SRealTableNode* pRealTable = (SRealTableNode*)pTable; pRealTable->ratio = (NULL != pCxt->pExplainOpt ? pCxt->pExplainOpt->ratio : 1.0); - SName name; - code = getTableMetaImpl( - pCxt, toName(pCxt->pParseCxt->acctId, pRealTable->table.dbName, pRealTable->table.tableName, &name), - &(pRealTable->pMeta)); - if (TSDB_CODE_SUCCESS != code) { - return generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_TABLE_NOT_EXIST, pRealTable->table.tableName); + // The SRealTableNode created through ROLLUP already has STableMeta. + if (NULL == pRealTable->pMeta) { + SName name; + code = getTableMetaImpl( + pCxt, toName(pCxt->pParseCxt->acctId, pRealTable->table.dbName, pRealTable->table.tableName, &name), + &(pRealTable->pMeta)); + if (TSDB_CODE_SUCCESS != code) { + return generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_TABLE_NOT_EXIST, pRealTable->table.tableName); + } + code = setTableVgroupList(pCxt, &name, pRealTable); } pRealTable->table.precision = pRealTable->pMeta->tableInfo.precision; - code = setTableVgroupList(pCxt, &name, pRealTable); if (TSDB_CODE_SUCCESS == code) { code = addNamespace(pCxt, pRealTable); } @@ -1350,21 +1403,22 @@ static int32_t buildCreateDbReq(STranslateContext* pCxt, SCreateDatabaseStmt* pS pReq->daysToKeep0 = GET_OPTION_VAL(nodesListGetNode(pStmt->pOptions->pKeep, 0), TSDB_DEFAULT_KEEP); pReq->daysToKeep1 = GET_OPTION_VAL(nodesListGetNode(pStmt->pOptions->pKeep, 1), TSDB_DEFAULT_KEEP); pReq->daysToKeep2 = GET_OPTION_VAL(nodesListGetNode(pStmt->pOptions->pKeep, 2), TSDB_DEFAULT_KEEP); - pReq->minRows = GET_OPTION_VAL(pStmt->pOptions->pMinRowsPerBlock, TSDB_DEFAULT_MIN_ROW_FBLOCK); - pReq->maxRows = GET_OPTION_VAL(pStmt->pOptions->pMaxRowsPerBlock, TSDB_DEFAULT_MAX_ROW_FBLOCK); + pReq->minRows = GET_OPTION_VAL(pStmt->pOptions->pMinRowsPerBlock, TSDB_DEFAULT_MINROWS_FBLOCK); + pReq->maxRows = GET_OPTION_VAL(pStmt->pOptions->pMaxRowsPerBlock, TSDB_DEFAULT_MAXROWS_FBLOCK); pReq->commitTime = -1; pReq->fsyncPeriod = GET_OPTION_VAL(pStmt->pOptions->pFsyncPeriod, TSDB_DEFAULT_FSYNC_PERIOD); pReq->walLevel = GET_OPTION_VAL(pStmt->pOptions->pWalLevel, TSDB_DEFAULT_WAL_LEVEL); pReq->precision = GET_OPTION_VAL(pStmt->pOptions->pPrecision, TSDB_TIME_PRECISION_MILLI); pReq->compression = GET_OPTION_VAL(pStmt->pOptions->pCompressionLevel, TSDB_DEFAULT_COMP_LEVEL); - pReq->replications = GET_OPTION_VAL(pStmt->pOptions->pReplica, TSDB_DEFAULT_DB_REPLICA_OPTION); - pReq->quorum = GET_OPTION_VAL(pStmt->pOptions->pQuorum, TSDB_DEFAULT_DB_QUORUM_OPTION); + pReq->replications = GET_OPTION_VAL(pStmt->pOptions->pReplica, TSDB_DEFAULT_DB_REPLICA); pReq->update = -1; pReq->cacheLastRow = GET_OPTION_VAL(pStmt->pOptions->pCachelast, TSDB_DEFAULT_CACHE_LAST_ROW); pReq->ignoreExist = pStmt->ignoreExists; - pReq->streamMode = GET_OPTION_VAL(pStmt->pOptions->pStreamMode, TSDB_DEFAULT_DB_STREAM_MODE_OPTION); - pReq->ttl = GET_OPTION_VAL(pStmt->pOptions->pTtl, TSDB_DEFAULT_DB_TTL_OPTION); - pReq->singleSTable = GET_OPTION_VAL(pStmt->pOptions->pSingleStable, TSDB_DEFAULT_DB_SINGLE_STABLE_OPTION); + pReq->streamMode = GET_OPTION_VAL(pStmt->pOptions->pStreamMode, TSDB_DEFAULT_DB_STREAM_MODE); + pReq->ttl = GET_OPTION_VAL(pStmt->pOptions->pTtl, TSDB_DEFAULT_DB_TTL); + pReq->singleSTable = GET_OPTION_VAL(pStmt->pOptions->pSingleStable, TSDB_DEFAULT_DB_SINGLE_STABLE); + pReq->strict = GET_OPTION_VAL(pStmt->pOptions->pStrict, TSDB_DEFAULT_DB_STRICT); + return buildCreateDbRetentions(pStmt->pOptions->pRetentions, pReq); } @@ -1431,8 +1485,8 @@ static int32_t checkTtlOption(STranslateContext* pCxt, SValueNode* pVal) { return pCxt->errCode; } int64_t val = pVal->datum.i; - if (val < TSDB_MIN_DB_TTL_OPTION) { - return generateDealNodeErrMsg(pCxt, TSDB_CODE_PAR_INVALID_TTL_OPTION, val, TSDB_MIN_DB_TTL_OPTION); + if (val < TSDB_MIN_DB_TTL) { + return generateDealNodeErrMsg(pCxt, TSDB_CODE_PAR_INVALID_TTL_OPTION, val, TSDB_MIN_DB_TTL); } } return TSDB_CODE_SUCCESS; @@ -1539,12 +1593,12 @@ static int32_t checkDatabaseOptions(STranslateContext* pCxt, SDatabaseOptions* p code = checkRangeOption(pCxt, "fsyncPeriod", pOptions->pFsyncPeriod, TSDB_MIN_FSYNC_PERIOD, TSDB_MAX_FSYNC_PERIOD); } if (TSDB_CODE_SUCCESS == code) { - code = checkRangeOption(pCxt, "maxRowsPerBlock", pOptions->pMaxRowsPerBlock, TSDB_MIN_MAX_ROW_FBLOCK, - TSDB_MAX_MAX_ROW_FBLOCK); + code = checkRangeOption(pCxt, "maxRowsPerBlock", pOptions->pMaxRowsPerBlock, TSDB_MIN_MAXROWS_FBLOCK, + TSDB_MAX_MAXROWS_FBLOCK); } if (TSDB_CODE_SUCCESS == code) { - code = checkRangeOption(pCxt, "minRowsPerBlock", pOptions->pMinRowsPerBlock, TSDB_MIN_MIN_ROW_FBLOCK, - TSDB_MAX_MIN_ROW_FBLOCK); + code = checkRangeOption(pCxt, "minRowsPerBlock", pOptions->pMinRowsPerBlock, TSDB_MIN_MINROWS_FBLOCK, + TSDB_MAX_MINROWS_FBLOCK); } if (TSDB_CODE_SUCCESS == code) { code = checkKeepOption(pCxt, pOptions->pKeep); @@ -1553,11 +1607,7 @@ static int32_t checkDatabaseOptions(STranslateContext* pCxt, SDatabaseOptions* p code = checkDbPrecisionOption(pCxt, pOptions->pPrecision); } if (TSDB_CODE_SUCCESS == code) { - code = checkRangeOption(pCxt, "quorum", pOptions->pQuorum, TSDB_MIN_DB_QUORUM_OPTION, TSDB_MAX_DB_QUORUM_OPTION); - } - if (TSDB_CODE_SUCCESS == code) { - code = checkDbEnumOption(pCxt, "replications", pOptions->pReplica, TSDB_MIN_DB_REPLICA_OPTION, - TSDB_MAX_DB_REPLICA_OPTION); + code = checkDbEnumOption(pCxt, "replications", pOptions->pReplica, TSDB_MIN_DB_REPLICA, TSDB_MAX_DB_REPLICA); } if (TSDB_CODE_SUCCESS == code) { code = checkTtlOption(pCxt, pOptions->pTtl); @@ -1569,16 +1619,19 @@ static int32_t checkDatabaseOptions(STranslateContext* pCxt, SDatabaseOptions* p code = checkRangeOption(pCxt, "vgroups", pOptions->pNumOfVgroups, TSDB_MIN_VNODES_PER_DB, TSDB_MAX_VNODES_PER_DB); } if (TSDB_CODE_SUCCESS == code) { - code = checkDbEnumOption(pCxt, "singleStable", pOptions->pSingleStable, TSDB_MIN_DB_SINGLE_STABLE_OPTION, - TSDB_MAX_DB_SINGLE_STABLE_OPTION); + code = checkDbEnumOption(pCxt, "singleStable", pOptions->pSingleStable, TSDB_DB_SINGLE_STABLE_ON, + TSDB_DB_SINGLE_STABLE_OFF); } if (TSDB_CODE_SUCCESS == code) { - code = checkDbEnumOption(pCxt, "streamMode", pOptions->pStreamMode, TSDB_MIN_DB_STREAM_MODE_OPTION, - TSDB_MAX_DB_STREAM_MODE_OPTION); + code = + checkDbEnumOption(pCxt, "streamMode", pOptions->pStreamMode, TSDB_DB_STREAM_MODE_OFF, TSDB_DB_STREAM_MODE_ON); } if (TSDB_CODE_SUCCESS == code) { code = checkDbRetentionsOption(pCxt, pOptions->pRetentions); } + if (TSDB_CODE_SUCCESS == code) { + code = checkDbEnumOption(pCxt, "strict", pOptions->pStrict, TSDB_DB_STRICT_OFF, TSDB_DB_STRICT_ON); + } return code; } @@ -1640,7 +1693,7 @@ static void buildAlterDbReq(STranslateContext* pCxt, SAlterDatabaseStmt* pStmt, pReq->daysToKeep2 = GET_OPTION_VAL(nodesListGetNode(pStmt->pOptions->pKeep, 2), -1); pReq->fsyncPeriod = GET_OPTION_VAL(pStmt->pOptions->pFsyncPeriod, -1); pReq->walLevel = GET_OPTION_VAL(pStmt->pOptions->pWalLevel, -1); - pReq->quorum = GET_OPTION_VAL(pStmt->pOptions->pQuorum, -1); + pReq->strict = GET_OPTION_VAL(pStmt->pOptions->pQuorum, -1); pReq->cacheLastRow = GET_OPTION_VAL(pStmt->pOptions->pCachelast, -1); pReq->replications = GET_OPTION_VAL(pStmt->pOptions->pReplica, -1); return; @@ -1789,35 +1842,259 @@ static int32_t getAggregationMethod(SNodeList* pFuncs) { return ((SFunctionNode*)nodesListGetNode(pFuncs, 0))->funcId; } -static int32_t translateCreateSuperTable(STranslateContext* pCxt, SCreateTableStmt* pStmt) { - int32_t code = checkCreateTable(pCxt, pStmt); - if (TSDB_CODE_SUCCESS != code) { - return code; +static void toSchema(const SColumnDefNode* pCol, col_id_t colId, SSchema* pSchema) { + int8_t flags = 0; + if (pCol->sma) { + flags |= SCHEMA_SMA_ON; + } + pSchema->colId = colId; + pSchema->type = pCol->dataType.type; + pSchema->bytes = calcTypeBytes(pCol->dataType); + pSchema->flags = flags; + strcpy(pSchema->name, pCol->colName); +} + +typedef struct SSampleAstInfo { + const char* pDbName; + const char* pTableName; + SNodeList* pFuncs; + SNode* pInterval; + SNode* pOffset; + SNode* pSliding; + STableMeta* pRollupTableMeta; +} SSampleAstInfo; + +static int32_t buildSampleAst(STranslateContext* pCxt, SSampleAstInfo* pInfo, char** pAst, int32_t* pLen) { + SSelectStmt* pSelect = nodesMakeNode(QUERY_NODE_SELECT_STMT); + if (NULL == pSelect) { + return TSDB_CODE_OUT_OF_MEMORY; + } + sprintf(pSelect->stmtName, "%p", pSelect); + + SRealTableNode* pTable = nodesMakeNode(QUERY_NODE_REAL_TABLE); + if (NULL == pTable) { + nodesDestroyNode(pSelect); + return TSDB_CODE_OUT_OF_MEMORY; + } + strcpy(pTable->table.dbName, pInfo->pDbName); + strcpy(pTable->table.tableName, pInfo->pTableName); + TSWAP(pTable->pMeta, pInfo->pRollupTableMeta, STableMeta*); + pSelect->pFromTable = (SNode*)pTable; + + TSWAP(pSelect->pProjectionList, pInfo->pFuncs, SNodeList*); + SFunctionNode* pFunc = nodesMakeNode(QUERY_NODE_FUNCTION); + if (NULL == pSelect->pProjectionList || NULL == pFunc) { + nodesDestroyNode(pSelect); + return TSDB_CODE_OUT_OF_MEMORY; + } + strcpy(pFunc->functionName, "_wstartts"); + nodesListPushFront(pSelect->pProjectionList, pFunc); + SNode* pProject = NULL; + FOREACH(pProject, pSelect->pProjectionList) { sprintf(((SExprNode*)pProject)->aliasName, "#%p", pProject); } + + SIntervalWindowNode* pInterval = nodesMakeNode(QUERY_NODE_INTERVAL_WINDOW); + if (NULL == pInterval) { + nodesDestroyNode(pSelect); + return TSDB_CODE_OUT_OF_MEMORY; + } + pSelect->pWindow = (SNode*)pInterval; + TSWAP(pInterval->pInterval, pInfo->pInterval, SNode*); + TSWAP(pInterval->pOffset, pInfo->pOffset, SNode*); + TSWAP(pInterval->pSliding, pInfo->pSliding, SNode*); + pInterval->pCol = nodesMakeNode(QUERY_NODE_COLUMN); + if (NULL == pInterval->pCol) { + nodesDestroyNode(pSelect); + return TSDB_CODE_OUT_OF_MEMORY; + } + ((SColumnNode*)pInterval->pCol)->colId = PRIMARYKEY_TIMESTAMP_COL_ID; + strcpy(((SColumnNode*)pInterval->pCol)->colName, PK_TS_COL_INTERNAL_NAME); + + int32_t code = translateQuery(pCxt, (SNode*)pSelect); + if (TSDB_CODE_SUCCESS == code) { + code = nodesNodeToString(pSelect, false, pAst, pLen); + } + nodesDestroyNode(pSelect); + return code; +} + +static void clearSampleAstInfo(SSampleAstInfo* pInfo) { + nodesDestroyList(pInfo->pFuncs); + nodesDestroyNode(pInfo->pInterval); + nodesDestroyNode(pInfo->pOffset); + nodesDestroyNode(pInfo->pSliding); +} + +static SNode* makeIntervalVal(SRetention* pRetension, int8_t precision) { + SValueNode* pVal = nodesMakeNode(QUERY_NODE_VALUE); + if (NULL == pVal) { + return NULL; + } + int64_t timeVal = convertTimeFromPrecisionToUnit(pRetension->freq, precision, pRetension->freqUnit); + char buf[20] = {0}; + int32_t len = snprintf(buf, sizeof(buf), "%"PRId64"%c", timeVal, pRetension->freqUnit); + pVal->literal = strndup(buf, len); + if (NULL == pVal->literal) { + nodesDestroyNode(pVal); + return NULL; + } + pVal->isDuration = true; + pVal->node.resType.type = TSDB_DATA_TYPE_BIGINT; + pVal->node.resType.bytes = tDataTypes[TSDB_DATA_TYPE_BIGINT].bytes; + pVal->node.resType.precision = precision; + return (SNode*)pVal; +} + +static SNode* createColumnFromDef(SColumnDefNode* pDef) { + SColumnNode* pCol = nodesMakeNode(QUERY_NODE_COLUMN); + if (NULL == pCol) { + return NULL; + } + strcpy(pCol->colName, pDef->colName); + return (SNode*)pCol; +} + +static SNode* createRollupFunc(SNode* pSrcFunc, SColumnDefNode* pColDef) { + SFunctionNode* pFunc = nodesCloneNode(pSrcFunc); + if (NULL == pFunc) { + return NULL; + } + if (TSDB_CODE_SUCCESS != nodesListMakeStrictAppend(&pFunc->pParameterList, createColumnFromDef(pColDef))) { + nodesDestroyNode(pFunc); + return NULL; + } + return (SNode*)pFunc; +} + +static SNodeList* createRollupFuncs(SCreateTableStmt* pStmt) { + SNodeList* pFuncs = nodesMakeList(); + if (NULL == pFuncs) { + return NULL; } - SMCreateStbReq createReq = {0}; - createReq.igExists = pStmt->ignoreExists; - createReq.aggregationMethod = getAggregationMethod(pStmt->pOptions->pFuncs); - createReq.xFilesFactor = GET_OPTION_VAL(pStmt->pOptions->pFilesFactor, TSDB_DEFAULT_DB_FILE_FACTOR); - createReq.delay = GET_OPTION_VAL(pStmt->pOptions->pDelay, TSDB_DEFAULT_DB_DELAY); - columnDefNodeToField(pStmt->pCols, &createReq.pColumns); - columnDefNodeToField(pStmt->pTags, &createReq.pTags); - createReq.numOfColumns = LIST_LENGTH(pStmt->pCols); - createReq.numOfTags = LIST_LENGTH(pStmt->pTags); + SNode* pFunc = NULL; + FOREACH(pFunc, pStmt->pOptions->pFuncs) { + SNode* pCol = NULL; + bool primaryKey = true; + FOREACH(pCol, pStmt->pCols) { + if (primaryKey) { + primaryKey = false; + continue; + } + if (TSDB_CODE_SUCCESS != nodesListStrictAppend(pFuncs, createRollupFunc(pFunc, (SColumnDefNode*)pCol))) { + nodesDestroyList(pFuncs); + return NULL; + } + } + } + + return pFuncs; +} + +static STableMeta* createRollupTableMeta(SCreateTableStmt* pStmt, int8_t precision) { + int32_t numOfField = LIST_LENGTH(pStmt->pCols) + LIST_LENGTH(pStmt->pTags); + STableMeta* pMeta = taosMemoryCalloc(1, sizeof(STableMeta) + numOfField * sizeof(SSchema)); + if (NULL == pMeta) { + return NULL; + } + pMeta->tableType = TSDB_SUPER_TABLE; + pMeta->tableInfo.numOfTags = LIST_LENGTH(pStmt->pTags); + pMeta->tableInfo.precision = precision; + pMeta->tableInfo.numOfColumns = LIST_LENGTH(pStmt->pCols); + + int32_t index = 0; + SNode* pCol = NULL; + FOREACH(pCol, pStmt->pCols) { + toSchema((SColumnDefNode*)pCol, index + 1, pMeta->schema + index); + ++index; + } + SNode* pTag = NULL; + FOREACH(pTag, pStmt->pTags) { + toSchema((SColumnDefNode*)pTag, index + 1, pMeta->schema + index); + ++index; + } + + return pMeta; +} + +static int32_t buildSampleAstInfoByTable(STranslateContext* pCxt, + SCreateTableStmt* pStmt, SRetention* pRetension, int8_t precision, SSampleAstInfo* pInfo) { + pInfo->pDbName = pStmt->dbName; + pInfo->pTableName = pStmt->tableName; + pInfo->pFuncs = createRollupFuncs(pStmt); + pInfo->pInterval = makeIntervalVal(pRetension, precision); + pInfo->pRollupTableMeta = createRollupTableMeta(pStmt, precision); + if (NULL == pInfo->pFuncs || NULL == pInfo->pInterval || NULL == pInfo->pRollupTableMeta) { + return TSDB_CODE_OUT_OF_MEMORY; + } + return TSDB_CODE_SUCCESS; +} + +static int32_t getRollupAst(STranslateContext* pCxt, + SCreateTableStmt* pStmt, SRetention* pRetension, int8_t precision, char** pAst, int32_t* pLen) { + SSampleAstInfo info = {0}; + int32_t code = buildSampleAstInfoByTable(pCxt, pStmt, pRetension, precision, &info); + if (TSDB_CODE_SUCCESS == code) { + code = buildSampleAst(pCxt, &info, pAst, pLen); + } + clearSampleAstInfo(&info); + return code; +} + +static int32_t buildRollupAst(STranslateContext* pCxt, SCreateTableStmt* pStmt, SMCreateStbReq* pReq) { + SDbCfgInfo dbCfg = {0}; + int32_t code = getDBCfg(pCxt, pStmt->dbName, &dbCfg); + int32_t num = taosArrayGetSize(dbCfg.pRetensions); + if (TSDB_CODE_SUCCESS != code || num < 2) { + return code; + } + for (int32_t i = 1; i < num; ++i) { + SRetention *pRetension = taosArrayGet(dbCfg.pRetensions, i); + STranslateContext cxt = {0}; + initTranslateContext(pCxt->pParseCxt, &cxt); + code = getRollupAst(&cxt, pStmt, pRetension, dbCfg.precision, + 1 == i ? &pReq->pAst1 : &pReq->pAst2, 1 == i ? &pReq->ast1Len : &pReq->ast2Len); + destroyTranslateContext(&cxt); + if (TSDB_CODE_SUCCESS != code) { + break; + } + } + return code; +} + +static int32_t buildCreateStbReq(STranslateContext* pCxt, SCreateTableStmt* pStmt, SMCreateStbReq* pReq) { + pReq->igExists = pStmt->ignoreExists; + pReq->aggregationMethod = getAggregationMethod(pStmt->pOptions->pFuncs); + pReq->xFilesFactor = GET_OPTION_VAL(pStmt->pOptions->pFilesFactor, TSDB_DEFAULT_DB_FILE_FACTOR); + pReq->delay = GET_OPTION_VAL(pStmt->pOptions->pDelay, TSDB_DEFAULT_DB_DELAY); + columnDefNodeToField(pStmt->pCols, &pReq->pColumns); + columnDefNodeToField(pStmt->pTags, &pReq->pTags); + pReq->numOfColumns = LIST_LENGTH(pStmt->pCols); + pReq->numOfTags = LIST_LENGTH(pStmt->pTags); if (NULL == pStmt->pOptions->pSma) { - columnDefNodeToField(pStmt->pCols, &createReq.pSmas); - createReq.numOfSmas = createReq.numOfColumns; + columnDefNodeToField(pStmt->pCols, &pReq->pSmas); + pReq->numOfSmas = pReq->numOfColumns; } else { - columnNodeToField(pStmt->pOptions->pSma, &createReq.pSmas); - createReq.numOfSmas = LIST_LENGTH(pStmt->pOptions->pSma); + columnNodeToField(pStmt->pOptions->pSma, &pReq->pSmas); + pReq->numOfSmas = LIST_LENGTH(pStmt->pOptions->pSma); } SName tableName = {.type = TSDB_TABLE_NAME_T, .acctId = pCxt->pParseCxt->acctId}; strcpy(tableName.dbname, pStmt->dbName); strcpy(tableName.tname, pStmt->tableName); - tNameExtractFullName(&tableName, createReq.name); + tNameExtractFullName(&tableName, pReq->name); - code = buildCmdMsg(pCxt, TDMT_MND_CREATE_STB, (FSerializeFunc)tSerializeSMCreateStbReq, &createReq); + return buildRollupAst(pCxt, pStmt, pReq); +} + +static int32_t translateCreateSuperTable(STranslateContext* pCxt, SCreateTableStmt* pStmt) { + SMCreateStbReq createReq = {0}; + int32_t code = checkCreateTable(pCxt, pStmt); + if (TSDB_CODE_SUCCESS == code) { + code = buildCreateStbReq(pCxt, pStmt, &createReq); + } + if (TSDB_CODE_SUCCESS == code) { + code = buildCmdMsg(pCxt, TDMT_MND_CREATE_STB, (FSerializeFunc)tSerializeSMCreateStbReq, &createReq); + } tFreeSMCreateStbReq(&createReq); return code; } @@ -1983,20 +2260,20 @@ static int32_t translateAlterDnode(STranslateContext* pCxt, SAlterDnodeStmt* pSt } static int32_t nodeTypeToShowType(ENodeType nt) { - // switch (nt) { - // case QUERY_NODE_SHOW_CONNECTIONS_STMT: - // return TSDB_MGMT_TABLE_CONNS; - // case QUERY_NODE_SHOW_LICENCE_STMT: - // return TSDB_MGMT_TABLE_GRANTS; - // case QUERY_NODE_SHOW_QUERIES_STMT: - // return TSDB_MGMT_TABLE_QUERIES; - // case QUERY_NODE_SHOW_TOPICS_STMT: - // return 0; // todo - // case QUERY_NODE_SHOW_VARIABLE_STMT: - // return TSDB_MGMT_TABLE_VARIABLES; - // default: - // break; - // } + switch (nt) { + case QUERY_NODE_SHOW_CONNECTIONS_STMT: + return TSDB_MGMT_TABLE_CONNS; + case QUERY_NODE_SHOW_LICENCE_STMT: + return TSDB_MGMT_TABLE_GRANTS; + case QUERY_NODE_SHOW_QUERIES_STMT: + return TSDB_MGMT_TABLE_QUERIES; + case QUERY_NODE_SHOW_TOPICS_STMT: + return 0; // todo + case QUERY_NODE_SHOW_VARIABLE_STMT: + return 0; // todo + default: + break; + } return 0; } @@ -2027,57 +2304,28 @@ static int32_t getSmaIndexExpr(STranslateContext* pCxt, SCreateIndexStmt* pStmt, return nodesListToString(pStmt->pOptions->pFuncs, false, pExpr, pLen); } -static int32_t getSmaIndexBuildAst(STranslateContext* pCxt, SCreateIndexStmt* pStmt, char** pAst, int32_t* pLen) { - SSelectStmt* pSelect = nodesMakeNode(QUERY_NODE_SELECT_STMT); - if (NULL == pSelect) { +static int32_t buildSampleAstInfoByIndex(STranslateContext* pCxt, SCreateIndexStmt* pStmt, SSampleAstInfo* pInfo) { + pInfo->pDbName = pCxt->pParseCxt->db; + pInfo->pTableName = pStmt->tableName; + pInfo->pFuncs = nodesCloneList(pStmt->pOptions->pFuncs); + pInfo->pInterval = nodesCloneNode(pStmt->pOptions->pInterval); + pInfo->pOffset = nodesCloneNode(pStmt->pOptions->pOffset); + pInfo->pSliding = nodesCloneNode(pStmt->pOptions->pSliding); + if (NULL == pInfo->pFuncs || NULL == pInfo->pInterval || + (NULL != pStmt->pOptions->pOffset && NULL == pInfo->pOffset) || + (NULL != pStmt->pOptions->pSliding && NULL == pInfo->pSliding)) { return TSDB_CODE_OUT_OF_MEMORY; } - sprintf(pSelect->stmtName, "%p", pSelect); + return TSDB_CODE_SUCCESS; +} - SRealTableNode* pTable = nodesMakeNode(QUERY_NODE_REAL_TABLE); - if (NULL == pTable) { - nodesDestroyNode(pSelect); - return TSDB_CODE_OUT_OF_MEMORY; - } - strcpy(pTable->table.dbName, pCxt->pParseCxt->db); - strcpy(pTable->table.tableName, pStmt->tableName); - pSelect->pFromTable = (SNode*)pTable; - - pSelect->pProjectionList = nodesCloneList(pStmt->pOptions->pFuncs); - SFunctionNode* pFunc = nodesMakeNode(QUERY_NODE_FUNCTION); - if (NULL == pSelect->pProjectionList || NULL == pFunc) { - nodesDestroyNode(pSelect); - return TSDB_CODE_OUT_OF_MEMORY; - } - strcpy(pFunc->functionName, "_wstartts"); - nodesListPushFront(pSelect->pProjectionList, pFunc); - SNode* pProject = NULL; - FOREACH(pProject, pSelect->pProjectionList) { sprintf(((SExprNode*)pProject)->aliasName, "#sma_%p", pProject); } - - SIntervalWindowNode* pInterval = nodesMakeNode(QUERY_NODE_INTERVAL_WINDOW); - if (NULL == pInterval) { - nodesDestroyNode(pSelect); - return TSDB_CODE_OUT_OF_MEMORY; - } - pSelect->pWindow = (SNode*)pInterval; - pInterval->pCol = nodesMakeNode(QUERY_NODE_COLUMN); - pInterval->pInterval = nodesCloneNode(pStmt->pOptions->pInterval); - pInterval->pOffset = nodesCloneNode(pStmt->pOptions->pOffset); - pInterval->pSliding = nodesCloneNode(pStmt->pOptions->pSliding); - if (NULL == pInterval->pCol || NULL == pInterval->pInterval || - (NULL != pStmt->pOptions->pOffset && NULL == pInterval->pOffset) || - (NULL != pStmt->pOptions->pSliding && NULL == pInterval->pSliding)) { - nodesDestroyNode(pSelect); - return TSDB_CODE_OUT_OF_MEMORY; - } - ((SColumnNode*)pInterval->pCol)->colId = PRIMARYKEY_TIMESTAMP_COL_ID; - strcpy(((SColumnNode*)pInterval->pCol)->colName, PK_TS_COL_INTERNAL_NAME); - - int32_t code = translateQuery(pCxt, (SNode*)pSelect); +static int32_t getSmaIndexAst(STranslateContext* pCxt, SCreateIndexStmt* pStmt, char** pAst, int32_t* pLen) { + SSampleAstInfo info = {0}; + int32_t code = buildSampleAstInfoByIndex(pCxt, pStmt, &info); if (TSDB_CODE_SUCCESS == code) { - code = nodesNodeToString(pSelect, false, pAst, pLen); + code = buildSampleAst(pCxt, &info, pAst, pLen); } - nodesDestroyNode(pSelect); + clearSampleAstInfo(&info); return code; } @@ -2106,7 +2354,7 @@ static int32_t buildCreateSmaReq(STranslateContext* pCxt, SCreateIndexStmt* pStm code = getSmaIndexExpr(pCxt, pStmt, &pReq->expr, &pReq->exprLen); } if (TSDB_CODE_SUCCESS == code) { - code = getSmaIndexBuildAst(pCxt, pStmt, &pReq->ast, &pReq->astLen); + code = getSmaIndexAst(pCxt, pStmt, &pReq->ast, &pReq->astLen); } return code; @@ -2129,10 +2377,12 @@ static int32_t translateCreateSmaIndex(STranslateContext* pCxt, SCreateIndexStmt tFreeSMCreateSmaReq(&createSmaReq); return code; } + static int32_t buildCreateFullTextReq(STranslateContext* pCxt, SCreateIndexStmt* pStmt, SMCreateFullTextReq* pReq) { // impl later return 0; } + static int32_t translateCreateFullTextIndex(STranslateContext* pCxt, SCreateIndexStmt* pStmt) { SMCreateFullTextReq createFTReq = {0}; int32_t code = buildCreateFullTextReq(pCxt, pStmt, &createFTReq); @@ -2535,24 +2785,6 @@ int32_t extractResultSchema(const SNode* pRoot, int32_t* numOfCols, SSchema** pS return TSDB_CODE_FAILED; } -static void destroyTranslateContext(STranslateContext* pCxt) { - if (NULL != pCxt->pNsLevel) { - size_t size = taosArrayGetSize(pCxt->pNsLevel); - for (size_t i = 0; i < size; ++i) { - taosArrayDestroy(taosArrayGetP(pCxt->pNsLevel, i)); - } - taosArrayDestroy(pCxt->pNsLevel); - } - - if (NULL != pCxt->pCmdMsg) { - taosMemoryFreeClear(pCxt->pCmdMsg->pMsg); - taosMemoryFreeClear(pCxt->pCmdMsg); - } - - taosHashCleanup(pCxt->pDbs); - taosHashCleanup(pCxt->pTables); -} - static const char* getSysDbName(ENodeType type) { switch (type) { case QUERY_NODE_SHOW_DATABASES_STMT: @@ -2613,8 +2845,9 @@ static const char* getSysTableName(ENodeType type) { case QUERY_NODE_SHOW_LICENCE_STMT: return TSDB_INS_TABLE_LICENCES; case QUERY_NODE_SHOW_CONNECTIONS_STMT: + return TSDB_PERFS_TABLE_CONNECTIONS; case QUERY_NODE_SHOW_QUERIES_STMT: - // todo + return TSDB_PERFS_TABLE_QUERIES; default: break; } @@ -2739,18 +2972,6 @@ typedef struct SVgroupTablesBatch { char dbName[TSDB_DB_NAME_LEN]; } SVgroupTablesBatch; -static void toSchemaEx(const SColumnDefNode* pCol, col_id_t colId, SSchema* pSchema) { - int8_t flags = 0; - if (pCol->sma) { - flags |= SCHEMA_SMA_ON; - } - pSchema->colId = colId; - pSchema->type = pCol->dataType.type; - pSchema->bytes = calcTypeBytes(pCol->dataType); - pSchema->flags = flags; - strcpy(pSchema->name, pCol->colName); -} - static void destroyCreateTbReq(SVCreateTbReq* pReq) { taosMemoryFreeClear(pReq->name); taosMemoryFreeClear(pReq->ntbCfg.pSchema); @@ -2798,7 +3019,7 @@ static int32_t buildNormalTableBatchReq(int32_t acctId, const SCreateTableStmt* SNode* pCol; col_id_t index = 0; FOREACH(pCol, pStmt->pCols) { - toSchemaEx((SColumnDefNode*)pCol, index + 1, req.ntbCfg.pSchema + index); + toSchema((SColumnDefNode*)pCol, index + 1, req.ntbCfg.pSchema + index); ++index; } if (TSDB_CODE_SUCCESS != buildSmaParam(pStmt->pOptions, &req)) { @@ -3224,19 +3445,11 @@ static int32_t setQuery(STranslateContext* pCxt, SQuery* pQuery) { } int32_t translate(SParseContext* pParseCxt, SQuery* pQuery) { - STranslateContext cxt = { - .pParseCxt = pParseCxt, - .errCode = TSDB_CODE_SUCCESS, - .msgBuf = {.buf = pParseCxt->pMsg, .len = pParseCxt->msgLen}, - .pNsLevel = taosArrayInit(TARRAY_MIN_SIZE, POINTER_BYTES), - .currLevel = 0, - .currClause = 0, - .pDbs = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_NO_LOCK), - .pTables = taosHashInit(4, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, HASH_NO_LOCK)}; - if (NULL == cxt.pNsLevel) { - return TSDB_CODE_OUT_OF_MEMORY; + STranslateContext cxt = {0}; + int32_t code = initTranslateContext(pParseCxt, &cxt); + if (TSDB_CODE_SUCCESS == code) { + code = fmFuncMgtInit(); } - int32_t code = fmFuncMgtInit(); if (TSDB_CODE_SUCCESS == code) { code = rewriteQuery(&cxt, pQuery); } diff --git a/source/libs/parser/src/sql.c b/source/libs/parser/src/sql.c index 110f4f9fb5..f8396dc50c 100644 --- a/source/libs/parser/src/sql.c +++ b/source/libs/parser/src/sql.c @@ -100,24 +100,24 @@ #endif /************* Begin control #defines *****************************************/ #define YYCODETYPE unsigned short int -#define YYNOCODE 334 +#define YYNOCODE 335 #define YYACTIONTYPE unsigned short int #define ParseTOKENTYPE SToken typedef union { int yyinit; ParseTOKENTYPE yy0; - SAlterOption yy29; - EJoinType yy164; - ENullOrder yy209; - SDataType yy388; - EOperatorType yy416; - SNode* yy456; - SToken yy537; - EOrder yy626; - SNodeList* yy632; - EFillMode yy646; - bool yy649; - int32_t yy652; + SNode* yy42; + EJoinType yy102; + ENullOrder yy197; + bool yy237; + int32_t yy240; + SNodeList* yy244; + EOperatorType yy270; + SDataType yy314; + SAlterOption yy325; + SToken yy359; + EOrder yy508; + EFillMode yy544; } YYMINORTYPE; #ifndef YYSTACKDEPTH #define YYSTACKDEPTH 100 @@ -132,17 +132,17 @@ typedef union { #define ParseCTX_PARAM #define ParseCTX_FETCH #define ParseCTX_STORE -#define YYNSTATE 568 -#define YYNRULE 433 -#define YYNTOKEN 220 -#define YY_MAX_SHIFT 567 -#define YY_MIN_SHIFTREDUCE 843 -#define YY_MAX_SHIFTREDUCE 1275 -#define YY_ERROR_ACTION 1276 -#define YY_ACCEPT_ACTION 1277 -#define YY_NO_ACTION 1278 -#define YY_MIN_REDUCE 1279 -#define YY_MAX_REDUCE 1711 +#define YYNSTATE 570 +#define YYNRULE 435 +#define YYNTOKEN 221 +#define YY_MAX_SHIFT 569 +#define YY_MIN_SHIFTREDUCE 847 +#define YY_MAX_SHIFTREDUCE 1281 +#define YY_ERROR_ACTION 1282 +#define YY_ACCEPT_ACTION 1283 +#define YY_NO_ACTION 1284 +#define YY_MIN_REDUCE 1285 +#define YY_MAX_REDUCE 1719 /************* End control #defines *******************************************/ #define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0]))) @@ -209,534 +209,536 @@ typedef union { ** yy_default[] Default action for each state. ** *********** Begin parsing tables **********************************************/ -#define YY_ACTTAB_COUNT (1863) +#define YY_ACTTAB_COUNT (1813) static const YYACTIONTYPE yy_action[] = { - /* 0 */ 1390, 1690, 1388, 1563, 268, 26, 203, 323, 482, 1277, - /* 10 */ 469, 1549, 33, 31, 1689, 1563, 1492, 77, 1688, 1302, - /* 20 */ 277, 1549, 1096, 285, 380, 1545, 1552, 1579, 34, 32, - /* 30 */ 30, 29, 28, 1399, 466, 1545, 1551, 248, 1094, 1579, - /* 40 */ 1549, 481, 53, 417, 465, 1535, 466, 441, 1535, 1301, - /* 50 */ 12, 33, 31, 1218, 1545, 1551, 465, 1102, 481, 277, - /* 60 */ 1535, 1096, 293, 1395, 1535, 445, 125, 1564, 468, 1566, - /* 70 */ 1567, 464, 104, 459, 1, 482, 359, 1094, 72, 1564, - /* 80 */ 468, 1566, 1567, 464, 321, 459, 1377, 418, 1629, 12, - /* 90 */ 482, 1232, 249, 1625, 1535, 36, 1102, 564, 62, 77, - /* 100 */ 1399, 1690, 33, 31, 1690, 123, 387, 1291, 102, 1095, - /* 110 */ 277, 1704, 1096, 1, 136, 1399, 1375, 136, 1688, 1392, - /* 120 */ 22, 1688, 443, 132, 1636, 1637, 1690, 1641, 1094, 1280, - /* 130 */ 34, 32, 30, 29, 28, 359, 564, 1331, 1448, 136, - /* 140 */ 12, 1117, 481, 1688, 267, 1579, 1097, 1102, 1095, 1446, - /* 150 */ 87, 127, 466, 86, 85, 84, 83, 82, 81, 80, - /* 160 */ 79, 78, 1440, 469, 1, 518, 280, 1100, 1101, 1491, - /* 170 */ 1145, 1146, 1147, 1148, 1149, 1150, 1151, 461, 1156, 1157, - /* 180 */ 1158, 1159, 1160, 1161, 1162, 1097, 434, 564, 431, 395, - /* 190 */ 316, 389, 315, 560, 559, 394, 36, 137, 101, 1095, - /* 200 */ 390, 388, 137, 391, 55, 266, 1100, 1101, 174, 1145, - /* 210 */ 1146, 1147, 1148, 1149, 1150, 1151, 461, 1156, 1157, 1158, - /* 220 */ 1159, 1160, 1161, 1162, 482, 482, 482, 441, 482, 931, - /* 230 */ 33, 31, 452, 322, 330, 331, 1097, 358, 277, 880, - /* 240 */ 1096, 879, 137, 34, 32, 30, 29, 28, 933, 1399, - /* 250 */ 1399, 1399, 104, 1399, 436, 432, 1094, 1100, 1101, 881, - /* 260 */ 1145, 1146, 1147, 1148, 1149, 1150, 1151, 461, 1156, 1157, - /* 270 */ 1158, 1159, 1160, 1161, 1162, 1102, 33, 31, 1163, 385, - /* 280 */ 384, 250, 345, 143, 277, 1300, 1096, 1328, 102, 521, - /* 290 */ 87, 1371, 7, 86, 85, 84, 83, 82, 81, 80, - /* 300 */ 79, 78, 1094, 133, 1636, 1637, 1132, 1641, 281, 51, - /* 310 */ 1119, 395, 50, 389, 1180, 564, 121, 394, 137, 137, - /* 320 */ 101, 1102, 390, 388, 1401, 391, 1242, 1095, 147, 146, - /* 330 */ 1535, 317, 260, 34, 32, 30, 29, 28, 7, 540, - /* 340 */ 539, 538, 537, 292, 879, 536, 535, 534, 107, 529, - /* 350 */ 528, 527, 526, 525, 524, 523, 522, 114, 100, 53, - /* 360 */ 378, 564, 383, 1181, 1097, 428, 1240, 1241, 1243, 1244, - /* 370 */ 1690, 124, 99, 1095, 261, 1357, 259, 258, 453, 382, - /* 380 */ 1394, 1186, 435, 136, 386, 1100, 1101, 1688, 1145, 1146, - /* 390 */ 1147, 1148, 1149, 1150, 1151, 461, 1156, 1157, 1158, 1159, - /* 400 */ 1160, 1161, 1162, 441, 33, 31, 393, 392, 441, 532, - /* 410 */ 1097, 1120, 277, 311, 1096, 137, 25, 275, 1175, 1176, - /* 420 */ 1177, 1178, 1179, 1183, 1184, 1185, 515, 514, 104, 456, - /* 430 */ 1094, 1100, 1101, 104, 1145, 1146, 1147, 1148, 1149, 1150, - /* 440 */ 1151, 461, 1156, 1157, 1158, 1159, 1160, 1161, 1162, 1102, - /* 450 */ 33, 31, 445, 482, 409, 287, 69, 1096, 277, 120, - /* 460 */ 1096, 1448, 1396, 121, 102, 1121, 7, 282, 905, 102, - /* 470 */ 105, 1401, 1446, 1094, 9, 8, 1094, 1391, 1399, 134, - /* 480 */ 1636, 1637, 449, 1641, 196, 1636, 440, 906, 439, 564, - /* 490 */ 1376, 1690, 1102, 1690, 1299, 1102, 34, 32, 30, 29, - /* 500 */ 28, 1095, 1318, 1118, 136, 1298, 136, 518, 1688, 1297, - /* 510 */ 1688, 1296, 1, 969, 505, 504, 503, 973, 502, 975, - /* 520 */ 976, 501, 978, 498, 396, 984, 495, 986, 987, 492, - /* 530 */ 489, 247, 564, 1117, 288, 564, 482, 508, 1097, 1535, - /* 540 */ 338, 1482, 1484, 350, 1095, 1516, 1172, 1095, 1194, 1295, - /* 550 */ 1535, 106, 351, 100, 1535, 513, 1535, 383, 1313, 1100, - /* 560 */ 1101, 1399, 1145, 1146, 1147, 1148, 1149, 1150, 1151, 461, - /* 570 */ 1156, 1157, 1158, 1159, 1160, 1161, 1162, 516, 1479, 386, - /* 580 */ 398, 1097, 482, 198, 1097, 145, 34, 32, 30, 29, - /* 590 */ 28, 479, 225, 1448, 1535, 1429, 512, 511, 510, 289, - /* 600 */ 509, 520, 1100, 1101, 1446, 1100, 1101, 1399, 1145, 1146, - /* 610 */ 1147, 1148, 1149, 1150, 1151, 461, 1156, 1157, 1158, 1159, - /* 620 */ 1160, 1161, 1162, 1563, 250, 349, 450, 1294, 344, 343, - /* 630 */ 342, 341, 340, 1384, 337, 336, 335, 334, 333, 329, - /* 640 */ 328, 327, 326, 325, 324, 448, 482, 1579, 34, 32, - /* 650 */ 30, 29, 28, 482, 444, 480, 567, 1180, 1182, 290, - /* 660 */ 482, 1386, 217, 1293, 465, 533, 531, 121, 1535, 291, - /* 670 */ 221, 1399, 1535, 98, 1563, 1401, 1187, 1290, 1399, 556, - /* 680 */ 1289, 552, 548, 544, 220, 1399, 73, 1564, 468, 1566, - /* 690 */ 1567, 464, 1122, 459, 1648, 1213, 1629, 6, 1579, 1643, - /* 700 */ 270, 1625, 131, 1288, 1287, 444, 1181, 1448, 1535, 1286, - /* 710 */ 70, 23, 1285, 215, 199, 465, 24, 1382, 1483, 1535, - /* 720 */ 424, 1656, 1535, 1640, 1186, 1535, 34, 32, 30, 29, - /* 730 */ 28, 30, 29, 28, 1448, 1284, 1217, 73, 1564, 468, - /* 740 */ 1566, 1567, 464, 478, 459, 1447, 1643, 1629, 1535, 1535, - /* 750 */ 1225, 270, 1625, 131, 1535, 1563, 1119, 1535, 400, 25, - /* 760 */ 275, 1175, 1176, 1177, 1178, 1179, 1183, 1184, 1185, 1283, - /* 770 */ 1639, 423, 1657, 408, 180, 1272, 1524, 1311, 1643, 1579, - /* 780 */ 1535, 34, 32, 30, 29, 28, 466, 173, 1168, 1074, - /* 790 */ 403, 176, 1282, 177, 1119, 397, 465, 121, 308, 401, - /* 800 */ 1535, 172, 1638, 165, 167, 1402, 163, 166, 1082, 1083, - /* 810 */ 184, 1563, 300, 169, 1535, 460, 168, 310, 73, 1564, - /* 820 */ 468, 1566, 1567, 464, 507, 459, 171, 45, 1629, 170, - /* 830 */ 44, 416, 270, 1625, 1702, 1579, 1374, 1535, 407, 1292, - /* 840 */ 122, 1563, 466, 1663, 1132, 231, 9, 8, 1358, 112, - /* 850 */ 1213, 405, 465, 420, 1271, 447, 1535, 229, 47, 187, - /* 860 */ 1274, 1275, 1239, 189, 35, 1579, 200, 1441, 1188, 35, - /* 870 */ 148, 1563, 466, 1152, 73, 1564, 468, 1566, 1567, 464, - /* 880 */ 1556, 459, 465, 429, 1629, 1105, 1535, 410, 270, 1625, - /* 890 */ 1702, 377, 1554, 1104, 35, 1579, 193, 106, 1057, 1686, - /* 900 */ 68, 513, 466, 442, 73, 1564, 468, 1566, 1567, 464, - /* 910 */ 64, 459, 465, 206, 1629, 1659, 1535, 208, 270, 1625, - /* 920 */ 1702, 445, 1580, 516, 109, 202, 1563, 110, 474, 1647, - /* 930 */ 1216, 214, 2, 71, 238, 1564, 468, 1566, 1567, 464, - /* 940 */ 1117, 459, 512, 511, 510, 112, 509, 47, 487, 962, - /* 950 */ 1579, 957, 990, 295, 299, 255, 1108, 466, 1066, 222, - /* 960 */ 1690, 49, 48, 320, 1107, 142, 931, 465, 144, 332, - /* 970 */ 314, 1535, 257, 136, 110, 1481, 1563, 1688, 994, 111, - /* 980 */ 339, 112, 256, 1001, 306, 1000, 302, 298, 139, 74, - /* 990 */ 1564, 468, 1566, 1567, 464, 347, 459, 346, 110, 1629, - /* 1000 */ 1579, 348, 113, 1628, 1625, 1126, 353, 466, 352, 354, - /* 1010 */ 1125, 149, 152, 356, 355, 1124, 357, 465, 360, 137, - /* 1020 */ 160, 1535, 155, 130, 1563, 52, 158, 1123, 379, 376, - /* 1030 */ 381, 372, 368, 364, 159, 1563, 97, 1389, 265, 74, - /* 1040 */ 1564, 468, 1566, 1567, 464, 1102, 459, 162, 1579, 1629, - /* 1050 */ 1520, 1385, 164, 455, 1625, 463, 115, 116, 1387, 1579, - /* 1060 */ 54, 175, 1383, 157, 223, 465, 466, 117, 118, 1535, - /* 1070 */ 411, 419, 415, 412, 179, 1122, 465, 182, 421, 1670, - /* 1080 */ 1535, 422, 1660, 430, 472, 1669, 427, 245, 1564, 468, - /* 1090 */ 1566, 1567, 464, 462, 459, 457, 1601, 185, 125, 1564, - /* 1100 */ 468, 1566, 1567, 464, 188, 459, 1563, 269, 284, 283, - /* 1110 */ 5, 433, 438, 103, 426, 4, 1644, 1121, 1110, 1213, - /* 1120 */ 156, 1650, 151, 37, 153, 271, 451, 454, 16, 1490, - /* 1130 */ 1579, 1489, 195, 470, 1103, 129, 1563, 466, 471, 1610, - /* 1140 */ 194, 150, 446, 1703, 1563, 192, 475, 465, 476, 279, - /* 1150 */ 210, 1535, 477, 1102, 212, 63, 1400, 61, 224, 1687, - /* 1160 */ 1579, 201, 1372, 1705, 226, 219, 563, 466, 1579, 74, - /* 1170 */ 1564, 468, 1566, 1567, 464, 466, 459, 465, 128, 1629, - /* 1180 */ 485, 1535, 43, 232, 1626, 465, 233, 228, 230, 1535, - /* 1190 */ 1529, 1563, 425, 483, 1528, 294, 1525, 296, 297, 241, - /* 1200 */ 1564, 468, 1566, 1567, 464, 1106, 459, 246, 1564, 468, - /* 1210 */ 1566, 1567, 464, 1090, 459, 1579, 1091, 140, 1523, 303, - /* 1220 */ 301, 304, 466, 305, 1522, 307, 1521, 309, 1506, 141, - /* 1230 */ 312, 313, 465, 1069, 1068, 1500, 1535, 437, 1040, 274, - /* 1240 */ 1499, 1563, 1111, 319, 318, 1498, 1497, 1474, 1473, 1472, - /* 1250 */ 1471, 1470, 1469, 1468, 246, 1564, 468, 1566, 1567, 464, - /* 1260 */ 1467, 459, 1466, 1114, 1465, 1579, 1464, 1463, 1462, 1461, - /* 1270 */ 1460, 1459, 463, 108, 1458, 1457, 1456, 1455, 1454, 1563, - /* 1280 */ 1453, 1042, 465, 1452, 1451, 1450, 1535, 1449, 1330, 1514, - /* 1290 */ 1563, 1508, 1496, 1487, 1378, 898, 1329, 154, 1327, 361, - /* 1300 */ 363, 362, 1325, 1579, 245, 1564, 468, 1566, 1567, 464, - /* 1310 */ 466, 459, 1323, 1602, 1579, 367, 371, 365, 366, 369, - /* 1320 */ 465, 466, 370, 1321, 1535, 1310, 1309, 276, 373, 1306, - /* 1330 */ 1380, 465, 1006, 374, 530, 1535, 161, 1009, 278, 1279, - /* 1340 */ 1379, 76, 246, 1564, 468, 1566, 1567, 464, 1563, 459, - /* 1350 */ 1319, 375, 930, 246, 1564, 468, 1566, 1567, 464, 929, - /* 1360 */ 459, 1563, 928, 96, 95, 94, 93, 92, 91, 90, - /* 1370 */ 89, 88, 1579, 927, 532, 924, 923, 262, 1314, 466, - /* 1380 */ 263, 399, 1312, 264, 402, 1579, 1305, 404, 1304, 465, - /* 1390 */ 406, 75, 466, 1535, 1513, 1076, 1507, 413, 1495, 1563, - /* 1400 */ 1494, 1486, 465, 181, 3, 56, 1535, 119, 1563, 13, - /* 1410 */ 126, 234, 1564, 468, 1566, 1567, 464, 190, 459, 35, - /* 1420 */ 41, 14, 186, 1579, 240, 1564, 468, 1566, 1567, 464, - /* 1430 */ 466, 459, 1579, 46, 1238, 191, 178, 20, 414, 466, - /* 1440 */ 465, 1231, 40, 57, 1535, 21, 1563, 1210, 1554, 465, - /* 1450 */ 183, 1209, 39, 1535, 1265, 15, 197, 58, 1260, 135, - /* 1460 */ 1259, 1563, 242, 1564, 468, 1566, 1567, 464, 272, 459, - /* 1470 */ 1579, 235, 1564, 468, 1566, 1567, 464, 466, 459, 1264, - /* 1480 */ 1263, 273, 8, 1173, 17, 1579, 1155, 465, 458, 138, - /* 1490 */ 1154, 1535, 466, 27, 204, 1140, 1153, 10, 18, 19, - /* 1500 */ 38, 467, 465, 205, 1236, 1485, 1535, 11, 207, 243, - /* 1510 */ 1564, 468, 1566, 1567, 464, 211, 459, 64, 209, 473, - /* 1520 */ 59, 60, 213, 1553, 236, 1564, 468, 1566, 1567, 464, - /* 1530 */ 1563, 459, 1112, 42, 216, 484, 991, 486, 1563, 286, - /* 1540 */ 488, 490, 988, 491, 493, 985, 979, 496, 494, 497, - /* 1550 */ 499, 977, 968, 500, 1579, 983, 982, 981, 65, 980, - /* 1560 */ 1003, 466, 1579, 1002, 506, 66, 67, 999, 1563, 466, - /* 1570 */ 996, 465, 896, 517, 937, 1535, 519, 919, 218, 465, - /* 1580 */ 918, 917, 916, 1535, 915, 914, 912, 913, 932, 934, - /* 1590 */ 909, 908, 1579, 244, 1564, 468, 1566, 1567, 464, 466, - /* 1600 */ 459, 237, 1564, 468, 1566, 1567, 464, 1326, 459, 465, - /* 1610 */ 907, 904, 903, 1535, 902, 901, 1563, 541, 542, 1324, - /* 1620 */ 1322, 543, 545, 546, 547, 550, 549, 1320, 551, 553, - /* 1630 */ 554, 1575, 1564, 468, 1566, 1567, 464, 1308, 459, 555, - /* 1640 */ 1579, 557, 558, 1307, 1303, 561, 562, 466, 1098, 566, - /* 1650 */ 227, 565, 1278, 1278, 1563, 1278, 1278, 465, 1278, 1278, - /* 1660 */ 1278, 1535, 1278, 1563, 1278, 1278, 1278, 1278, 1278, 1278, - /* 1670 */ 1278, 1278, 1278, 1278, 1278, 1278, 1278, 1278, 1579, 1574, - /* 1680 */ 1564, 468, 1566, 1567, 464, 466, 459, 1579, 1278, 1278, - /* 1690 */ 1278, 1278, 1278, 1278, 466, 465, 1278, 1278, 1278, 1535, - /* 1700 */ 1278, 1563, 1278, 1278, 465, 1278, 1278, 1278, 1535, 1278, - /* 1710 */ 1278, 1278, 1278, 1278, 1278, 1278, 1563, 1573, 1564, 468, - /* 1720 */ 1566, 1567, 464, 1278, 459, 1579, 253, 1564, 468, 1566, - /* 1730 */ 1567, 464, 466, 459, 1278, 1278, 1278, 1278, 1278, 1278, - /* 1740 */ 1579, 1278, 465, 1278, 1278, 1278, 1535, 466, 1278, 1278, - /* 1750 */ 1278, 1278, 1278, 1278, 1563, 1278, 1278, 465, 1278, 1278, - /* 1760 */ 1278, 1535, 1278, 1278, 252, 1564, 468, 1566, 1567, 464, - /* 1770 */ 1278, 459, 1278, 1278, 1278, 1278, 1278, 1278, 1579, 254, - /* 1780 */ 1564, 468, 1566, 1567, 464, 466, 459, 1278, 1278, 1278, - /* 1790 */ 1278, 1278, 1563, 1278, 1278, 465, 1278, 1278, 1278, 1535, - /* 1800 */ 1278, 1278, 1278, 1278, 1278, 1278, 1278, 1278, 1278, 1278, - /* 1810 */ 1278, 1278, 1278, 1278, 1278, 1278, 1579, 251, 1564, 468, - /* 1820 */ 1566, 1567, 464, 466, 459, 1278, 1278, 1278, 1278, 1278, - /* 1830 */ 1278, 1278, 1278, 465, 1278, 1278, 1278, 1535, 1278, 1278, - /* 1840 */ 1278, 1278, 1278, 1278, 1278, 1278, 1278, 1278, 1278, 1278, - /* 1850 */ 1278, 1278, 1278, 1278, 1278, 239, 1564, 468, 1566, 1567, - /* 1860 */ 464, 1278, 459, + /* 0 */ 268, 1587, 285, 53, 1571, 483, 26, 203, 467, 1385, + /* 10 */ 1283, 1557, 33, 31, 77, 1571, 99, 1557, 483, 1557, + /* 20 */ 277, 380, 1102, 442, 1402, 1553, 1560, 321, 1587, 288, + /* 30 */ 1407, 1553, 1559, 1553, 1559, 467, 1490, 1492, 1100, 1587, + /* 40 */ 124, 69, 435, 1407, 1364, 466, 467, 1384, 104, 1543, + /* 50 */ 12, 33, 31, 1224, 482, 105, 466, 1108, 359, 277, + /* 60 */ 1543, 1102, 1399, 293, 1123, 446, 1571, 241, 1572, 469, + /* 70 */ 1574, 1575, 465, 482, 460, 1, 323, 1100, 72, 1572, + /* 80 */ 469, 1574, 1575, 465, 102, 460, 562, 561, 1637, 12, + /* 90 */ 1587, 100, 249, 1633, 482, 383, 1108, 445, 566, 133, + /* 100 */ 1644, 1645, 1698, 1649, 1698, 438, 248, 466, 106, 36, + /* 110 */ 1101, 1543, 514, 483, 1, 136, 1651, 136, 386, 1696, + /* 120 */ 359, 1696, 322, 34, 32, 30, 29, 28, 36, 73, + /* 130 */ 1572, 469, 1574, 1575, 465, 517, 460, 566, 1407, 1637, + /* 140 */ 1648, 483, 483, 270, 1633, 131, 123, 1103, 1297, 1101, + /* 150 */ 330, 331, 1398, 1487, 513, 512, 511, 199, 510, 470, + /* 160 */ 145, 250, 280, 425, 1664, 1499, 1407, 1407, 1106, 1107, + /* 170 */ 1651, 1151, 1152, 1153, 1154, 1155, 1156, 1157, 462, 1162, + /* 180 */ 1163, 1164, 1165, 1166, 1167, 1168, 1103, 1138, 1127, 34, + /* 190 */ 32, 30, 29, 28, 1647, 1186, 418, 1543, 137, 34, + /* 200 */ 32, 30, 29, 28, 523, 442, 1379, 1106, 1107, 432, + /* 210 */ 1151, 1152, 1153, 1154, 1155, 1156, 1157, 462, 1162, 1163, + /* 220 */ 1164, 1165, 1166, 1167, 1168, 33, 31, 250, 483, 483, + /* 230 */ 104, 937, 137, 277, 247, 1102, 1123, 358, 77, 317, + /* 240 */ 419, 260, 137, 338, 1187, 387, 350, 1111, 55, 266, + /* 250 */ 939, 1100, 174, 1407, 1407, 351, 34, 32, 30, 29, + /* 260 */ 28, 1186, 1192, 12, 33, 31, 102, 100, 483, 410, + /* 270 */ 1108, 383, 277, 1383, 1102, 437, 433, 291, 1698, 1698, + /* 280 */ 444, 132, 1644, 1645, 261, 1649, 259, 258, 1, 382, + /* 290 */ 1100, 136, 136, 1407, 386, 1696, 1696, 25, 275, 1181, + /* 300 */ 1182, 1183, 1184, 1185, 1189, 1190, 1191, 198, 1698, 1108, + /* 310 */ 1187, 566, 1248, 127, 34, 32, 30, 29, 28, 1114, + /* 320 */ 1238, 136, 519, 1101, 1448, 1696, 120, 7, 1192, 349, + /* 330 */ 385, 384, 344, 343, 342, 341, 340, 449, 337, 336, + /* 340 */ 335, 334, 333, 329, 328, 327, 326, 325, 324, 137, + /* 350 */ 566, 429, 1246, 1247, 1249, 1250, 30, 29, 28, 884, + /* 360 */ 1103, 883, 1101, 25, 275, 1181, 1182, 1183, 1184, 1185, + /* 370 */ 1189, 1190, 1191, 34, 32, 30, 29, 28, 1125, 885, + /* 380 */ 225, 1106, 1107, 1437, 1151, 1152, 1153, 1154, 1155, 1156, + /* 390 */ 1157, 462, 1162, 1163, 1164, 1165, 1166, 1167, 1168, 1103, + /* 400 */ 975, 506, 505, 504, 979, 503, 981, 982, 502, 984, + /* 410 */ 499, 121, 990, 496, 992, 993, 493, 490, 442, 1410, + /* 420 */ 1106, 1107, 1324, 1151, 1152, 1153, 1154, 1155, 1156, 1157, + /* 430 */ 462, 1162, 1163, 1164, 1165, 1166, 1167, 1168, 33, 31, + /* 440 */ 1169, 1571, 1278, 104, 397, 316, 277, 315, 1102, 442, + /* 450 */ 137, 88, 394, 393, 87, 86, 85, 84, 83, 82, + /* 460 */ 81, 80, 79, 1698, 1100, 1587, 483, 34, 32, 30, + /* 470 */ 29, 28, 445, 281, 104, 1404, 1697, 33, 31, 102, + /* 480 */ 1696, 121, 466, 1108, 883, 277, 1543, 1102, 1651, 1409, + /* 490 */ 483, 1407, 436, 446, 134, 1644, 1645, 137, 1649, 1524, + /* 500 */ 378, 7, 519, 1100, 73, 1572, 469, 1574, 1575, 465, + /* 510 */ 102, 460, 1646, 1571, 1637, 1407, 522, 345, 270, 1633, + /* 520 */ 131, 1277, 1108, 401, 566, 196, 1644, 441, 1126, 440, + /* 530 */ 6, 1138, 1698, 1188, 483, 1456, 1101, 1587, 409, 1665, + /* 540 */ 7, 267, 1308, 480, 464, 136, 1454, 483, 448, 1696, + /* 550 */ 1564, 1193, 173, 53, 466, 404, 481, 22, 1543, 1407, + /* 560 */ 398, 143, 1562, 566, 147, 146, 172, 34, 32, 30, + /* 570 */ 29, 28, 1407, 1103, 1403, 1101, 245, 1572, 469, 1574, + /* 580 */ 1575, 465, 463, 460, 458, 1609, 23, 1543, 51, 165, + /* 590 */ 1571, 50, 163, 45, 1106, 1107, 44, 1151, 1152, 1153, + /* 600 */ 1154, 1155, 1156, 1157, 462, 1162, 1163, 1164, 1165, 1166, + /* 610 */ 1167, 1168, 1103, 24, 1587, 450, 9, 8, 534, 516, + /* 620 */ 515, 467, 311, 34, 32, 30, 29, 28, 1307, 535, + /* 630 */ 533, 466, 1223, 1106, 1107, 1543, 1151, 1152, 1153, 1154, + /* 640 */ 1155, 1156, 1157, 462, 1162, 1163, 1164, 1165, 1166, 1167, + /* 650 */ 1168, 33, 31, 73, 1572, 469, 1574, 1575, 465, 277, + /* 660 */ 460, 1102, 1571, 1637, 1456, 483, 308, 270, 1633, 1710, + /* 670 */ 282, 287, 290, 1543, 217, 1454, 1306, 1100, 1671, 121, + /* 680 */ 121, 1491, 1492, 62, 1219, 310, 1587, 1409, 1409, 1456, + /* 690 */ 1407, 1200, 470, 467, 1124, 289, 1108, 1305, 1500, 396, + /* 700 */ 1454, 390, 1304, 466, 1400, 395, 1303, 1543, 101, 1319, + /* 710 */ 391, 389, 1571, 392, 1, 453, 1302, 509, 388, 1301, + /* 720 */ 1300, 1543, 1299, 1296, 417, 73, 1572, 469, 1574, 1575, + /* 730 */ 465, 399, 460, 1396, 1456, 1637, 1587, 566, 1231, 270, + /* 740 */ 1633, 1710, 1543, 467, 1125, 1455, 569, 1543, 1295, 1101, + /* 750 */ 1694, 1543, 1294, 466, 1293, 1128, 1174, 1543, 1292, 451, + /* 760 */ 221, 1543, 1125, 98, 1543, 1543, 1532, 1543, 1543, 558, + /* 770 */ 1317, 554, 550, 546, 220, 73, 1572, 469, 1574, 1575, + /* 780 */ 465, 1291, 460, 1290, 1289, 1637, 1103, 1334, 1288, 270, + /* 790 */ 1633, 1710, 402, 1543, 1656, 1219, 408, 1543, 1110, 1543, + /* 800 */ 1655, 70, 300, 1543, 215, 9, 8, 1106, 1107, 406, + /* 810 */ 1151, 1152, 1153, 1154, 1155, 1156, 1157, 462, 1162, 1163, + /* 820 */ 1164, 1165, 1166, 1167, 1168, 1392, 1543, 1222, 1543, 1543, + /* 830 */ 1088, 1089, 167, 1543, 479, 166, 1571, 1280, 1281, 542, + /* 840 */ 541, 540, 539, 292, 1394, 538, 537, 536, 107, 531, + /* 850 */ 530, 529, 528, 527, 526, 525, 524, 114, 520, 122, + /* 860 */ 1587, 454, 424, 1382, 231, 180, 1571, 467, 169, 171, + /* 870 */ 1113, 168, 170, 457, 184, 112, 229, 466, 1390, 421, + /* 880 */ 1080, 1543, 176, 47, 187, 68, 446, 1245, 189, 148, + /* 890 */ 1587, 1286, 35, 177, 35, 64, 1194, 467, 1158, 238, + /* 900 */ 1572, 469, 1574, 1575, 465, 35, 460, 466, 909, 1063, + /* 910 */ 206, 1543, 88, 461, 208, 87, 86, 85, 84, 83, + /* 920 */ 82, 81, 80, 79, 106, 1698, 508, 910, 514, 74, + /* 930 */ 1572, 469, 1574, 1575, 465, 1285, 460, 109, 136, 1637, + /* 940 */ 1298, 475, 1696, 1636, 1633, 110, 112, 1365, 47, 214, + /* 950 */ 968, 517, 963, 71, 488, 1571, 200, 430, 996, 97, + /* 960 */ 96, 95, 94, 93, 92, 91, 90, 89, 411, 110, + /* 970 */ 513, 512, 511, 1000, 510, 1449, 111, 193, 377, 1587, + /* 980 */ 1007, 49, 48, 320, 112, 142, 467, 1667, 1006, 110, + /* 990 */ 314, 1178, 443, 113, 1588, 202, 466, 2, 1123, 295, + /* 1000 */ 1543, 299, 256, 1571, 306, 255, 302, 298, 139, 937, + /* 1010 */ 257, 1072, 1571, 222, 332, 1489, 144, 339, 74, 1572, + /* 1020 */ 469, 1574, 1575, 465, 346, 460, 347, 1587, 1637, 348, + /* 1030 */ 1102, 352, 456, 1633, 467, 1132, 1587, 353, 149, 137, + /* 1040 */ 1131, 152, 354, 467, 466, 355, 1100, 356, 1543, 357, + /* 1050 */ 1130, 155, 1129, 466, 379, 360, 52, 1543, 158, 78, + /* 1060 */ 265, 381, 1397, 162, 1571, 1108, 125, 1572, 469, 1574, + /* 1070 */ 1575, 465, 1571, 460, 1108, 74, 1572, 469, 1574, 1575, + /* 1080 */ 465, 223, 460, 1393, 164, 1637, 1528, 115, 1587, 175, + /* 1090 */ 1634, 116, 1395, 1391, 117, 467, 1587, 118, 412, 413, + /* 1100 */ 420, 179, 1571, 467, 182, 466, 566, 416, 422, 1543, + /* 1110 */ 447, 1711, 426, 466, 1128, 431, 423, 1543, 1101, 1678, + /* 1120 */ 473, 185, 1677, 1668, 428, 269, 1587, 246, 1572, 469, + /* 1130 */ 1574, 1575, 465, 467, 460, 125, 1572, 469, 1574, 1575, + /* 1140 */ 465, 188, 460, 466, 5, 439, 434, 1543, 427, 192, + /* 1150 */ 274, 1658, 4, 1219, 1571, 1103, 103, 1127, 37, 271, + /* 1160 */ 455, 1695, 195, 452, 129, 246, 1572, 469, 1574, 1575, + /* 1170 */ 465, 1652, 460, 194, 16, 1498, 1106, 1107, 1587, 1618, + /* 1180 */ 1712, 1497, 201, 471, 476, 464, 1713, 472, 279, 477, + /* 1190 */ 478, 210, 212, 224, 63, 466, 61, 1408, 1380, 1543, + /* 1200 */ 160, 486, 226, 130, 1571, 219, 128, 565, 43, 376, + /* 1210 */ 232, 372, 368, 364, 159, 1571, 233, 245, 1572, 469, + /* 1220 */ 1574, 1575, 465, 228, 460, 230, 1610, 294, 1587, 1537, + /* 1230 */ 1536, 1533, 296, 297, 1096, 467, 1097, 140, 301, 1587, + /* 1240 */ 303, 54, 1531, 304, 157, 466, 467, 305, 1530, 1543, + /* 1250 */ 307, 1529, 276, 1571, 309, 1514, 466, 141, 312, 313, + /* 1260 */ 1543, 1074, 1075, 278, 1508, 1507, 318, 246, 1572, 469, + /* 1270 */ 1574, 1575, 465, 319, 460, 1506, 1505, 1587, 246, 1572, + /* 1280 */ 469, 1574, 1575, 465, 467, 460, 1482, 1046, 1481, 1480, + /* 1290 */ 1479, 1478, 1477, 1476, 466, 1475, 1474, 1473, 1543, 1472, + /* 1300 */ 1571, 156, 1471, 151, 1470, 153, 1469, 1468, 1467, 108, + /* 1310 */ 1466, 1465, 1464, 1571, 1463, 1462, 234, 1572, 469, 1574, + /* 1320 */ 1575, 465, 150, 460, 1587, 1048, 1460, 1459, 1571, 1461, + /* 1330 */ 1458, 467, 1457, 1336, 1522, 1516, 1504, 1587, 902, 1335, + /* 1340 */ 1333, 466, 1495, 154, 467, 1543, 1386, 361, 363, 362, + /* 1350 */ 1331, 1329, 1587, 76, 466, 365, 366, 369, 1543, 467, + /* 1360 */ 370, 367, 1327, 240, 1572, 469, 1574, 1575, 465, 466, + /* 1370 */ 460, 371, 1316, 1543, 375, 1571, 242, 1572, 469, 1574, + /* 1380 */ 1575, 465, 373, 460, 374, 1315, 1312, 1388, 532, 1012, + /* 1390 */ 1571, 235, 1572, 469, 1574, 1575, 465, 1015, 460, 1587, + /* 1400 */ 262, 936, 935, 1571, 161, 1387, 467, 934, 933, 534, + /* 1410 */ 1325, 932, 929, 928, 1587, 263, 466, 1320, 400, 1318, + /* 1420 */ 1543, 467, 403, 264, 1311, 405, 1310, 1587, 407, 75, + /* 1430 */ 1521, 466, 1082, 46, 467, 1543, 1515, 119, 243, 1572, + /* 1440 */ 469, 1574, 1575, 465, 466, 460, 1503, 414, 1543, 1502, + /* 1450 */ 1494, 1571, 56, 236, 1572, 469, 1574, 1575, 465, 181, + /* 1460 */ 460, 3, 415, 35, 1571, 13, 244, 1572, 469, 1574, + /* 1470 */ 1575, 465, 186, 460, 41, 1587, 14, 178, 38, 191, + /* 1480 */ 1244, 183, 467, 126, 40, 1562, 190, 20, 1587, 1237, + /* 1490 */ 1216, 58, 466, 57, 21, 467, 1543, 1215, 1266, 39, + /* 1500 */ 11, 15, 1571, 1265, 272, 466, 1270, 197, 1271, 1543, + /* 1510 */ 135, 1269, 273, 8, 237, 1572, 469, 1574, 1575, 465, + /* 1520 */ 1179, 460, 459, 17, 1161, 138, 1587, 1583, 1572, 469, + /* 1530 */ 1574, 1575, 465, 467, 460, 1160, 27, 1146, 1159, 10, + /* 1540 */ 204, 468, 18, 466, 19, 1493, 205, 1543, 1242, 1571, + /* 1550 */ 207, 209, 59, 211, 60, 1118, 64, 42, 487, 997, + /* 1560 */ 286, 489, 1571, 491, 485, 1582, 1572, 469, 1574, 1575, + /* 1570 */ 465, 474, 460, 1587, 213, 1561, 216, 1571, 994, 492, + /* 1580 */ 467, 991, 494, 495, 497, 985, 1587, 498, 500, 983, + /* 1590 */ 466, 501, 989, 467, 1543, 988, 987, 986, 974, 65, + /* 1600 */ 1009, 1587, 507, 466, 1008, 66, 67, 1543, 467, 1005, + /* 1610 */ 1002, 900, 1581, 1572, 469, 1574, 1575, 465, 466, 460, + /* 1620 */ 518, 925, 1543, 943, 1571, 253, 1572, 469, 1574, 1575, + /* 1630 */ 465, 521, 460, 218, 923, 922, 921, 920, 919, 1571, + /* 1640 */ 252, 1572, 469, 1574, 1575, 465, 918, 460, 1587, 917, + /* 1650 */ 916, 940, 1571, 938, 913, 467, 284, 283, 912, 911, + /* 1660 */ 908, 907, 906, 1587, 905, 466, 1116, 1332, 543, 1543, + /* 1670 */ 467, 544, 545, 1330, 547, 548, 1587, 1337, 1328, 551, + /* 1680 */ 466, 549, 1109, 467, 1543, 552, 553, 254, 1572, 469, + /* 1690 */ 1574, 1575, 465, 466, 460, 1326, 555, 1543, 556, 557, + /* 1700 */ 1314, 1108, 251, 1572, 469, 1574, 1575, 465, 559, 460, + /* 1710 */ 1313, 560, 1309, 563, 564, 239, 1572, 469, 1574, 1575, + /* 1720 */ 465, 1104, 460, 227, 567, 568, 1284, 1284, 1284, 396, + /* 1730 */ 1284, 390, 1284, 1284, 1284, 395, 1284, 1284, 101, 1284, + /* 1740 */ 391, 389, 484, 392, 1284, 1284, 1284, 1284, 388, 1284, + /* 1750 */ 1284, 1284, 1284, 1284, 1112, 1284, 1284, 1284, 1284, 1284, + /* 1760 */ 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, + /* 1770 */ 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, + /* 1780 */ 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, + /* 1790 */ 1284, 1117, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, + /* 1800 */ 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, + /* 1810 */ 1284, 1284, 1120, }; static const YYCODETYPE yy_lookahead[] = { - /* 0 */ 223, 312, 248, 223, 251, 297, 298, 229, 229, 220, - /* 10 */ 264, 268, 12, 13, 325, 223, 270, 238, 329, 223, - /* 20 */ 20, 268, 22, 251, 245, 282, 283, 247, 12, 13, - /* 30 */ 14, 15, 16, 254, 254, 282, 283, 259, 38, 247, - /* 40 */ 268, 20, 231, 229, 264, 268, 254, 229, 268, 223, - /* 50 */ 50, 12, 13, 14, 282, 283, 264, 57, 20, 20, - /* 60 */ 268, 22, 273, 252, 268, 273, 286, 287, 288, 289, - /* 70 */ 290, 291, 254, 293, 74, 229, 49, 38, 286, 287, - /* 80 */ 288, 289, 290, 291, 238, 293, 0, 273, 296, 50, - /* 90 */ 229, 75, 300, 301, 268, 74, 57, 97, 228, 238, - /* 100 */ 254, 312, 12, 13, 312, 222, 245, 224, 290, 109, - /* 110 */ 20, 331, 22, 74, 325, 254, 0, 325, 329, 249, - /* 120 */ 2, 329, 304, 305, 306, 307, 312, 309, 38, 0, - /* 130 */ 12, 13, 14, 15, 16, 49, 97, 0, 247, 325, - /* 140 */ 50, 20, 20, 329, 253, 247, 146, 57, 109, 258, - /* 150 */ 21, 246, 254, 24, 25, 26, 27, 28, 29, 30, - /* 160 */ 31, 32, 257, 264, 74, 49, 267, 167, 168, 270, - /* 170 */ 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, - /* 180 */ 180, 181, 182, 183, 184, 146, 288, 97, 136, 52, - /* 190 */ 145, 54, 147, 226, 227, 58, 74, 197, 61, 109, - /* 200 */ 63, 64, 197, 66, 155, 156, 167, 168, 159, 170, + /* 0 */ 252, 248, 252, 232, 224, 230, 298, 299, 255, 0, + /* 10 */ 221, 269, 12, 13, 239, 224, 245, 269, 230, 269, + /* 20 */ 20, 246, 22, 230, 253, 283, 284, 239, 248, 257, + /* 30 */ 255, 283, 284, 283, 284, 255, 264, 265, 38, 248, + /* 40 */ 233, 229, 289, 255, 237, 265, 255, 0, 255, 269, + /* 50 */ 50, 12, 13, 14, 20, 243, 265, 57, 49, 20, + /* 60 */ 269, 22, 250, 274, 20, 274, 224, 287, 288, 289, + /* 70 */ 290, 291, 292, 20, 294, 75, 230, 38, 287, 288, + /* 80 */ 289, 290, 291, 292, 291, 294, 227, 228, 297, 50, + /* 90 */ 248, 61, 301, 302, 20, 65, 57, 255, 98, 306, + /* 100 */ 307, 308, 313, 310, 313, 325, 260, 265, 61, 75, + /* 110 */ 110, 269, 65, 230, 75, 326, 285, 326, 88, 330, + /* 120 */ 49, 330, 239, 12, 13, 14, 15, 16, 75, 287, + /* 130 */ 288, 289, 290, 291, 292, 88, 294, 98, 255, 297, + /* 140 */ 309, 230, 230, 301, 302, 303, 223, 147, 225, 110, + /* 150 */ 239, 239, 224, 255, 107, 108, 109, 315, 111, 265, + /* 160 */ 262, 50, 268, 321, 322, 271, 255, 255, 168, 169, + /* 170 */ 285, 171, 172, 173, 174, 175, 176, 177, 178, 179, + /* 180 */ 180, 181, 182, 183, 184, 185, 147, 76, 20, 12, + /* 190 */ 13, 14, 15, 16, 309, 84, 230, 269, 198, 12, + /* 200 */ 13, 14, 15, 16, 236, 230, 238, 168, 169, 137, /* 210 */ 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, - /* 220 */ 181, 182, 183, 184, 229, 229, 229, 229, 229, 38, - /* 230 */ 12, 13, 71, 238, 238, 238, 146, 238, 20, 20, - /* 240 */ 22, 22, 197, 12, 13, 14, 15, 16, 57, 254, - /* 250 */ 254, 254, 254, 254, 202, 203, 38, 167, 168, 40, - /* 260 */ 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, - /* 270 */ 180, 181, 182, 183, 184, 57, 12, 13, 14, 233, - /* 280 */ 234, 50, 67, 47, 20, 223, 22, 0, 290, 235, - /* 290 */ 21, 237, 74, 24, 25, 26, 27, 28, 29, 30, - /* 300 */ 31, 32, 38, 305, 306, 307, 75, 309, 239, 73, - /* 310 */ 20, 52, 76, 54, 83, 97, 247, 58, 197, 197, - /* 320 */ 61, 57, 63, 64, 255, 66, 167, 109, 113, 114, - /* 330 */ 268, 273, 35, 12, 13, 14, 15, 16, 74, 52, - /* 340 */ 53, 54, 55, 56, 22, 58, 59, 60, 61, 62, - /* 350 */ 63, 64, 65, 66, 67, 68, 69, 70, 61, 231, - /* 360 */ 38, 97, 65, 132, 146, 206, 207, 208, 209, 210, - /* 370 */ 312, 232, 244, 109, 77, 236, 79, 80, 217, 82, - /* 380 */ 252, 150, 20, 325, 87, 167, 168, 329, 170, 171, - /* 390 */ 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, - /* 400 */ 182, 183, 184, 229, 12, 13, 233, 234, 229, 71, - /* 410 */ 146, 20, 20, 75, 22, 197, 185, 186, 187, 188, - /* 420 */ 189, 190, 191, 192, 193, 194, 233, 234, 254, 50, - /* 430 */ 38, 167, 168, 254, 170, 171, 172, 173, 174, 175, - /* 440 */ 176, 177, 178, 179, 180, 181, 182, 183, 184, 57, - /* 450 */ 12, 13, 273, 229, 273, 239, 228, 22, 20, 138, - /* 460 */ 22, 247, 238, 247, 290, 20, 74, 253, 38, 290, - /* 470 */ 242, 255, 258, 38, 1, 2, 38, 249, 254, 305, - /* 480 */ 306, 307, 71, 309, 305, 306, 307, 57, 309, 97, - /* 490 */ 0, 312, 57, 312, 223, 57, 12, 13, 14, 15, - /* 500 */ 16, 109, 0, 20, 325, 223, 325, 49, 329, 223, - /* 510 */ 329, 223, 74, 88, 89, 90, 91, 92, 93, 94, - /* 520 */ 95, 96, 97, 98, 22, 100, 101, 102, 103, 104, - /* 530 */ 105, 18, 97, 20, 256, 97, 229, 85, 146, 268, - /* 540 */ 27, 263, 264, 30, 109, 238, 167, 109, 75, 223, - /* 550 */ 268, 61, 39, 61, 268, 65, 268, 65, 0, 167, - /* 560 */ 168, 254, 170, 171, 172, 173, 174, 175, 176, 177, - /* 570 */ 178, 179, 180, 181, 182, 183, 184, 87, 254, 87, - /* 580 */ 22, 146, 229, 138, 146, 261, 12, 13, 14, 15, - /* 590 */ 16, 238, 240, 247, 268, 243, 106, 107, 108, 253, - /* 600 */ 110, 57, 167, 168, 258, 167, 168, 254, 170, 171, - /* 610 */ 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, - /* 620 */ 182, 183, 184, 223, 50, 112, 215, 223, 115, 116, - /* 630 */ 117, 118, 119, 248, 121, 122, 123, 124, 125, 126, - /* 640 */ 127, 128, 129, 130, 131, 3, 229, 247, 12, 13, - /* 650 */ 14, 15, 16, 229, 254, 238, 19, 83, 132, 239, - /* 660 */ 229, 248, 238, 223, 264, 233, 234, 247, 268, 238, - /* 670 */ 33, 254, 268, 36, 223, 255, 150, 223, 254, 42, - /* 680 */ 223, 44, 45, 46, 47, 254, 286, 287, 288, 289, - /* 690 */ 290, 291, 20, 293, 195, 196, 296, 43, 247, 284, - /* 700 */ 300, 301, 302, 223, 223, 254, 132, 247, 268, 223, - /* 710 */ 73, 185, 223, 76, 314, 264, 2, 248, 258, 268, - /* 720 */ 320, 321, 268, 308, 150, 268, 12, 13, 14, 15, - /* 730 */ 16, 14, 15, 16, 247, 223, 4, 286, 287, 288, - /* 740 */ 289, 290, 291, 106, 293, 258, 284, 296, 268, 268, - /* 750 */ 14, 300, 301, 302, 268, 223, 20, 268, 4, 185, - /* 760 */ 186, 187, 188, 189, 190, 191, 192, 193, 194, 223, - /* 770 */ 308, 134, 321, 19, 137, 139, 0, 0, 284, 247, - /* 780 */ 268, 12, 13, 14, 15, 16, 254, 33, 14, 152, - /* 790 */ 36, 154, 223, 248, 20, 41, 264, 247, 142, 22, - /* 800 */ 268, 47, 308, 78, 78, 255, 81, 81, 157, 158, - /* 810 */ 138, 223, 36, 78, 268, 248, 81, 161, 286, 287, - /* 820 */ 288, 289, 290, 291, 248, 293, 78, 73, 296, 81, - /* 830 */ 76, 276, 300, 301, 302, 247, 0, 268, 21, 224, - /* 840 */ 18, 223, 254, 311, 75, 23, 1, 2, 236, 71, - /* 850 */ 196, 34, 264, 75, 218, 213, 268, 35, 71, 71, - /* 860 */ 182, 183, 75, 75, 71, 247, 332, 257, 75, 71, - /* 870 */ 48, 223, 254, 75, 286, 287, 288, 289, 290, 291, - /* 880 */ 74, 293, 264, 323, 296, 38, 268, 280, 300, 301, - /* 890 */ 302, 226, 86, 38, 71, 247, 317, 61, 75, 311, - /* 900 */ 74, 65, 254, 310, 286, 287, 288, 289, 290, 291, - /* 910 */ 84, 293, 264, 71, 296, 285, 268, 75, 300, 301, - /* 920 */ 302, 273, 247, 87, 71, 326, 223, 71, 75, 311, - /* 930 */ 198, 75, 313, 111, 286, 287, 288, 289, 290, 291, - /* 940 */ 20, 293, 106, 107, 108, 71, 110, 71, 71, 75, - /* 950 */ 247, 75, 75, 229, 36, 281, 109, 254, 144, 274, - /* 960 */ 312, 139, 140, 141, 109, 143, 38, 264, 120, 229, - /* 970 */ 148, 268, 233, 325, 71, 229, 223, 329, 75, 71, - /* 980 */ 262, 71, 160, 75, 162, 75, 164, 165, 166, 286, - /* 990 */ 287, 288, 289, 290, 291, 132, 293, 260, 71, 296, - /* 1000 */ 247, 260, 75, 300, 301, 20, 278, 254, 229, 264, - /* 1010 */ 20, 231, 231, 254, 272, 20, 265, 264, 229, 197, - /* 1020 */ 33, 268, 231, 36, 223, 231, 231, 20, 225, 42, - /* 1030 */ 247, 44, 45, 46, 47, 223, 229, 247, 225, 286, - /* 1040 */ 287, 288, 289, 290, 291, 57, 293, 247, 247, 296, - /* 1050 */ 268, 247, 247, 300, 301, 254, 247, 247, 247, 247, - /* 1060 */ 73, 228, 247, 76, 278, 264, 254, 247, 247, 268, - /* 1070 */ 153, 272, 264, 277, 228, 20, 264, 228, 254, 322, - /* 1080 */ 268, 265, 285, 205, 204, 322, 268, 286, 287, 288, - /* 1090 */ 289, 290, 291, 292, 293, 294, 295, 269, 286, 287, - /* 1100 */ 288, 289, 290, 291, 269, 293, 223, 268, 12, 13, - /* 1110 */ 212, 268, 211, 254, 200, 199, 284, 20, 22, 196, - /* 1120 */ 133, 319, 135, 120, 137, 219, 214, 216, 74, 269, - /* 1130 */ 247, 269, 303, 268, 38, 316, 223, 254, 268, 299, - /* 1140 */ 315, 154, 330, 331, 223, 318, 135, 264, 266, 268, - /* 1150 */ 254, 268, 265, 57, 228, 74, 254, 228, 243, 328, - /* 1160 */ 247, 327, 237, 333, 229, 228, 225, 254, 247, 286, - /* 1170 */ 287, 288, 289, 290, 291, 254, 293, 264, 279, 296, - /* 1180 */ 250, 268, 275, 241, 301, 264, 241, 230, 221, 268, - /* 1190 */ 0, 223, 271, 97, 0, 64, 0, 38, 163, 286, - /* 1200 */ 287, 288, 289, 290, 291, 109, 293, 286, 287, 288, - /* 1210 */ 289, 290, 291, 38, 293, 247, 38, 38, 0, 38, - /* 1220 */ 163, 38, 254, 163, 0, 38, 0, 38, 0, 74, - /* 1230 */ 150, 149, 264, 109, 146, 0, 268, 324, 86, 271, - /* 1240 */ 0, 223, 146, 142, 53, 0, 0, 0, 0, 0, - /* 1250 */ 0, 0, 0, 0, 286, 287, 288, 289, 290, 291, - /* 1260 */ 0, 293, 0, 167, 0, 247, 0, 0, 0, 0, - /* 1270 */ 0, 0, 254, 120, 0, 0, 0, 0, 0, 223, - /* 1280 */ 0, 22, 264, 0, 0, 0, 268, 0, 0, 0, - /* 1290 */ 223, 0, 0, 0, 0, 51, 0, 43, 0, 38, - /* 1300 */ 43, 36, 0, 247, 286, 287, 288, 289, 290, 291, - /* 1310 */ 254, 293, 0, 295, 247, 43, 43, 38, 36, 38, - /* 1320 */ 264, 254, 36, 0, 268, 0, 0, 271, 38, 0, - /* 1330 */ 0, 264, 22, 36, 71, 268, 81, 38, 271, 0, - /* 1340 */ 0, 83, 286, 287, 288, 289, 290, 291, 223, 293, - /* 1350 */ 0, 43, 38, 286, 287, 288, 289, 290, 291, 38, - /* 1360 */ 293, 223, 38, 24, 25, 26, 27, 28, 29, 30, - /* 1370 */ 31, 32, 247, 38, 71, 38, 38, 22, 0, 254, - /* 1380 */ 22, 39, 0, 22, 38, 247, 0, 22, 0, 264, - /* 1390 */ 22, 20, 254, 268, 0, 38, 0, 22, 0, 223, - /* 1400 */ 0, 0, 264, 43, 71, 74, 268, 151, 223, 201, - /* 1410 */ 74, 286, 287, 288, 289, 290, 291, 74, 293, 71, - /* 1420 */ 71, 201, 75, 247, 286, 287, 288, 289, 290, 291, - /* 1430 */ 254, 293, 247, 138, 75, 71, 135, 74, 138, 254, - /* 1440 */ 264, 75, 138, 74, 268, 71, 223, 75, 86, 264, - /* 1450 */ 133, 75, 71, 268, 75, 71, 86, 4, 38, 86, - /* 1460 */ 38, 223, 286, 287, 288, 289, 290, 291, 38, 293, - /* 1470 */ 247, 286, 287, 288, 289, 290, 291, 254, 293, 38, - /* 1480 */ 38, 38, 2, 167, 71, 247, 75, 264, 74, 86, - /* 1490 */ 75, 268, 254, 74, 86, 22, 75, 74, 74, 74, - /* 1500 */ 195, 169, 264, 75, 75, 0, 268, 201, 74, 286, - /* 1510 */ 287, 288, 289, 290, 291, 43, 293, 84, 74, 136, - /* 1520 */ 74, 74, 133, 86, 286, 287, 288, 289, 290, 291, - /* 1530 */ 223, 293, 22, 74, 86, 85, 75, 38, 223, 38, - /* 1540 */ 74, 38, 75, 74, 38, 75, 75, 38, 74, 74, - /* 1550 */ 38, 75, 22, 74, 247, 99, 99, 99, 74, 99, - /* 1560 */ 38, 254, 247, 109, 87, 74, 74, 38, 223, 254, - /* 1570 */ 22, 264, 51, 50, 57, 268, 72, 38, 71, 264, - /* 1580 */ 38, 38, 38, 268, 38, 38, 22, 38, 38, 57, - /* 1590 */ 38, 38, 247, 286, 287, 288, 289, 290, 291, 254, - /* 1600 */ 293, 286, 287, 288, 289, 290, 291, 0, 293, 264, - /* 1610 */ 38, 38, 38, 268, 38, 38, 223, 38, 36, 0, - /* 1620 */ 0, 43, 38, 36, 43, 36, 38, 0, 43, 38, - /* 1630 */ 36, 286, 287, 288, 289, 290, 291, 0, 293, 43, - /* 1640 */ 247, 38, 37, 0, 0, 22, 21, 254, 22, 20, - /* 1650 */ 22, 21, 334, 334, 223, 334, 334, 264, 334, 334, - /* 1660 */ 334, 268, 334, 223, 334, 334, 334, 334, 334, 334, - /* 1670 */ 334, 334, 334, 334, 334, 334, 334, 334, 247, 286, - /* 1680 */ 287, 288, 289, 290, 291, 254, 293, 247, 334, 334, - /* 1690 */ 334, 334, 334, 334, 254, 264, 334, 334, 334, 268, - /* 1700 */ 334, 223, 334, 334, 264, 334, 334, 334, 268, 334, - /* 1710 */ 334, 334, 334, 334, 334, 334, 223, 286, 287, 288, - /* 1720 */ 289, 290, 291, 334, 293, 247, 286, 287, 288, 289, - /* 1730 */ 290, 291, 254, 293, 334, 334, 334, 334, 334, 334, - /* 1740 */ 247, 334, 264, 334, 334, 334, 268, 254, 334, 334, - /* 1750 */ 334, 334, 334, 334, 223, 334, 334, 264, 334, 334, - /* 1760 */ 334, 268, 334, 334, 286, 287, 288, 289, 290, 291, - /* 1770 */ 334, 293, 334, 334, 334, 334, 334, 334, 247, 286, - /* 1780 */ 287, 288, 289, 290, 291, 254, 293, 334, 334, 334, - /* 1790 */ 334, 334, 223, 334, 334, 264, 334, 334, 334, 268, - /* 1800 */ 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - /* 1810 */ 334, 334, 334, 334, 334, 334, 247, 286, 287, 288, - /* 1820 */ 289, 290, 291, 254, 293, 334, 334, 334, 334, 334, - /* 1830 */ 334, 334, 334, 264, 334, 334, 334, 268, 334, 334, - /* 1840 */ 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - /* 1850 */ 334, 334, 334, 334, 334, 286, 287, 288, 289, 290, - /* 1860 */ 291, 334, 293, 334, 334, 334, 334, 334, 334, 334, - /* 1870 */ 334, 334, + /* 220 */ 181, 182, 183, 184, 185, 12, 13, 50, 230, 230, + /* 230 */ 255, 38, 198, 20, 18, 22, 20, 239, 239, 274, + /* 240 */ 274, 35, 198, 27, 133, 246, 30, 38, 156, 157, + /* 250 */ 57, 38, 160, 255, 255, 39, 12, 13, 14, 15, + /* 260 */ 16, 84, 151, 50, 12, 13, 291, 61, 230, 274, + /* 270 */ 57, 65, 20, 0, 22, 203, 204, 239, 313, 313, + /* 280 */ 305, 306, 307, 308, 78, 310, 80, 81, 75, 83, + /* 290 */ 38, 326, 326, 255, 88, 330, 330, 186, 187, 188, + /* 300 */ 189, 190, 191, 192, 193, 194, 195, 139, 313, 57, + /* 310 */ 133, 98, 168, 247, 12, 13, 14, 15, 16, 110, + /* 320 */ 76, 326, 49, 110, 258, 330, 139, 75, 151, 113, + /* 330 */ 234, 235, 116, 117, 118, 119, 120, 3, 122, 123, + /* 340 */ 124, 125, 126, 127, 128, 129, 130, 131, 132, 198, + /* 350 */ 98, 207, 208, 209, 210, 211, 14, 15, 16, 20, + /* 360 */ 147, 22, 110, 186, 187, 188, 189, 190, 191, 192, + /* 370 */ 193, 194, 195, 12, 13, 14, 15, 16, 20, 40, + /* 380 */ 241, 168, 169, 244, 171, 172, 173, 174, 175, 176, + /* 390 */ 177, 178, 179, 180, 181, 182, 183, 184, 185, 147, + /* 400 */ 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, + /* 410 */ 99, 248, 101, 102, 103, 104, 105, 106, 230, 256, + /* 420 */ 168, 169, 0, 171, 172, 173, 174, 175, 176, 177, + /* 430 */ 178, 179, 180, 181, 182, 183, 184, 185, 12, 13, + /* 440 */ 14, 224, 140, 255, 22, 146, 20, 148, 22, 230, + /* 450 */ 198, 21, 234, 235, 24, 25, 26, 27, 28, 29, + /* 460 */ 30, 31, 32, 313, 38, 248, 230, 12, 13, 14, + /* 470 */ 15, 16, 255, 240, 255, 239, 326, 12, 13, 291, + /* 480 */ 330, 248, 265, 57, 22, 20, 269, 22, 285, 256, + /* 490 */ 230, 255, 20, 274, 306, 307, 308, 198, 310, 239, + /* 500 */ 38, 75, 49, 38, 287, 288, 289, 290, 291, 292, + /* 510 */ 291, 294, 309, 224, 297, 255, 57, 67, 301, 302, + /* 520 */ 303, 219, 57, 4, 98, 306, 307, 308, 20, 310, + /* 530 */ 43, 76, 313, 133, 230, 248, 110, 248, 19, 322, + /* 540 */ 75, 254, 224, 239, 255, 326, 259, 230, 214, 330, + /* 550 */ 75, 151, 33, 232, 265, 36, 239, 2, 269, 255, + /* 560 */ 41, 47, 87, 98, 114, 115, 47, 12, 13, 14, + /* 570 */ 15, 16, 255, 147, 253, 110, 287, 288, 289, 290, + /* 580 */ 291, 292, 293, 294, 295, 296, 186, 269, 74, 79, + /* 590 */ 224, 77, 82, 74, 168, 169, 77, 171, 172, 173, + /* 600 */ 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, + /* 610 */ 184, 185, 147, 2, 248, 72, 1, 2, 72, 234, + /* 620 */ 235, 255, 76, 12, 13, 14, 15, 16, 224, 234, + /* 630 */ 235, 265, 4, 168, 169, 269, 171, 172, 173, 174, + /* 640 */ 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, + /* 650 */ 185, 12, 13, 287, 288, 289, 290, 291, 292, 20, + /* 660 */ 294, 22, 224, 297, 248, 230, 143, 301, 302, 303, + /* 670 */ 254, 240, 240, 269, 239, 259, 224, 38, 312, 248, + /* 680 */ 248, 264, 265, 229, 197, 162, 248, 256, 256, 248, + /* 690 */ 255, 76, 265, 255, 20, 254, 57, 224, 271, 52, + /* 700 */ 259, 54, 224, 265, 250, 58, 224, 269, 61, 0, + /* 710 */ 63, 64, 224, 66, 75, 72, 224, 86, 71, 224, + /* 720 */ 224, 269, 224, 224, 277, 287, 288, 289, 290, 291, + /* 730 */ 292, 22, 294, 249, 248, 297, 248, 98, 14, 301, + /* 740 */ 302, 303, 269, 255, 20, 259, 19, 269, 224, 110, + /* 750 */ 312, 269, 224, 265, 224, 20, 14, 269, 224, 216, + /* 760 */ 33, 269, 20, 36, 269, 269, 0, 269, 269, 42, + /* 770 */ 0, 44, 45, 46, 47, 287, 288, 289, 290, 291, + /* 780 */ 292, 224, 294, 224, 224, 297, 147, 0, 224, 301, + /* 790 */ 302, 303, 22, 269, 196, 197, 21, 269, 38, 269, + /* 800 */ 312, 74, 36, 269, 77, 1, 2, 168, 169, 34, + /* 810 */ 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, + /* 820 */ 181, 182, 183, 184, 185, 249, 269, 199, 269, 269, + /* 830 */ 158, 159, 79, 269, 107, 82, 224, 183, 184, 52, + /* 840 */ 53, 54, 55, 56, 249, 58, 59, 60, 61, 62, + /* 850 */ 63, 64, 65, 66, 67, 68, 69, 70, 71, 18, + /* 860 */ 248, 218, 135, 0, 23, 138, 224, 255, 79, 79, + /* 870 */ 110, 82, 82, 50, 139, 72, 35, 265, 249, 76, + /* 880 */ 153, 269, 155, 72, 72, 75, 274, 76, 76, 48, + /* 890 */ 248, 0, 72, 249, 72, 85, 76, 255, 76, 287, + /* 900 */ 288, 289, 290, 291, 292, 72, 294, 265, 38, 76, + /* 910 */ 72, 269, 21, 249, 76, 24, 25, 26, 27, 28, + /* 920 */ 29, 30, 31, 32, 61, 313, 249, 57, 65, 287, + /* 930 */ 288, 289, 290, 291, 292, 0, 294, 72, 326, 297, + /* 940 */ 225, 76, 330, 301, 302, 72, 72, 237, 72, 76, + /* 950 */ 76, 88, 76, 112, 72, 224, 333, 324, 76, 24, + /* 960 */ 25, 26, 27, 28, 29, 30, 31, 32, 281, 72, + /* 970 */ 107, 108, 109, 76, 111, 258, 72, 318, 227, 248, + /* 980 */ 76, 140, 141, 142, 72, 144, 255, 286, 76, 72, + /* 990 */ 149, 168, 311, 76, 248, 327, 265, 314, 20, 230, + /* 1000 */ 269, 36, 161, 224, 163, 282, 165, 166, 167, 38, + /* 1010 */ 234, 145, 224, 275, 230, 230, 121, 263, 287, 288, + /* 1020 */ 289, 290, 291, 292, 261, 294, 133, 248, 297, 261, + /* 1030 */ 22, 230, 301, 302, 255, 20, 248, 279, 232, 198, + /* 1040 */ 20, 232, 265, 255, 265, 273, 38, 255, 269, 266, + /* 1050 */ 20, 232, 20, 265, 226, 230, 232, 269, 232, 230, + /* 1060 */ 226, 248, 248, 248, 224, 57, 287, 288, 289, 290, + /* 1070 */ 291, 292, 224, 294, 57, 287, 288, 289, 290, 291, + /* 1080 */ 292, 279, 294, 248, 248, 297, 269, 248, 248, 229, + /* 1090 */ 302, 248, 248, 248, 248, 255, 248, 248, 154, 278, + /* 1100 */ 273, 229, 224, 255, 229, 265, 98, 265, 255, 269, + /* 1110 */ 331, 332, 272, 265, 20, 206, 266, 269, 110, 323, + /* 1120 */ 205, 270, 323, 286, 269, 269, 248, 287, 288, 289, + /* 1130 */ 290, 291, 292, 255, 294, 287, 288, 289, 290, 291, + /* 1140 */ 292, 270, 294, 265, 213, 212, 269, 269, 201, 319, + /* 1150 */ 272, 320, 200, 197, 224, 147, 255, 20, 121, 220, + /* 1160 */ 217, 329, 304, 215, 317, 287, 288, 289, 290, 291, + /* 1170 */ 292, 285, 294, 316, 75, 270, 168, 169, 248, 300, + /* 1180 */ 332, 270, 328, 269, 136, 255, 334, 269, 269, 267, + /* 1190 */ 266, 255, 229, 244, 75, 265, 229, 255, 238, 269, + /* 1200 */ 33, 251, 230, 36, 224, 229, 280, 226, 276, 42, + /* 1210 */ 242, 44, 45, 46, 47, 224, 242, 287, 288, 289, + /* 1220 */ 290, 291, 292, 231, 294, 222, 296, 64, 248, 0, + /* 1230 */ 0, 0, 38, 164, 38, 255, 38, 38, 164, 248, + /* 1240 */ 38, 74, 0, 38, 77, 265, 255, 164, 0, 269, + /* 1250 */ 38, 0, 272, 224, 38, 0, 265, 75, 151, 150, + /* 1260 */ 269, 147, 110, 272, 0, 0, 53, 287, 288, 289, + /* 1270 */ 290, 291, 292, 143, 294, 0, 0, 248, 287, 288, + /* 1280 */ 289, 290, 291, 292, 255, 294, 0, 87, 0, 0, + /* 1290 */ 0, 0, 0, 0, 265, 0, 0, 0, 269, 0, + /* 1300 */ 224, 134, 0, 136, 0, 138, 0, 0, 0, 121, + /* 1310 */ 0, 0, 0, 224, 0, 0, 287, 288, 289, 290, + /* 1320 */ 291, 292, 155, 294, 248, 22, 0, 0, 224, 0, + /* 1330 */ 0, 255, 0, 0, 0, 0, 0, 248, 51, 0, + /* 1340 */ 0, 265, 0, 43, 255, 269, 0, 38, 43, 36, + /* 1350 */ 0, 0, 248, 84, 265, 38, 36, 38, 269, 255, + /* 1360 */ 36, 43, 0, 287, 288, 289, 290, 291, 292, 265, + /* 1370 */ 294, 43, 0, 269, 43, 224, 287, 288, 289, 290, + /* 1380 */ 291, 292, 38, 294, 36, 0, 0, 0, 72, 22, + /* 1390 */ 224, 287, 288, 289, 290, 291, 292, 38, 294, 248, + /* 1400 */ 22, 38, 38, 224, 82, 0, 255, 38, 38, 72, + /* 1410 */ 0, 38, 38, 38, 248, 22, 265, 0, 39, 0, + /* 1420 */ 269, 255, 38, 22, 0, 22, 0, 248, 22, 20, + /* 1430 */ 0, 265, 38, 139, 255, 269, 0, 152, 287, 288, + /* 1440 */ 289, 290, 291, 292, 265, 294, 0, 22, 269, 0, + /* 1450 */ 0, 224, 75, 287, 288, 289, 290, 291, 292, 43, + /* 1460 */ 294, 72, 139, 72, 224, 202, 287, 288, 289, 290, + /* 1470 */ 291, 292, 76, 294, 72, 248, 202, 136, 196, 72, + /* 1480 */ 76, 134, 255, 75, 139, 87, 75, 75, 248, 76, + /* 1490 */ 76, 4, 265, 75, 72, 255, 269, 76, 38, 72, + /* 1500 */ 202, 72, 224, 38, 38, 265, 38, 87, 76, 269, + /* 1510 */ 87, 38, 38, 2, 287, 288, 289, 290, 291, 292, + /* 1520 */ 168, 294, 75, 72, 76, 87, 248, 287, 288, 289, + /* 1530 */ 290, 291, 292, 255, 294, 76, 75, 22, 76, 75, + /* 1540 */ 87, 170, 75, 265, 75, 0, 76, 269, 76, 224, + /* 1550 */ 75, 75, 75, 43, 75, 22, 85, 75, 38, 76, + /* 1560 */ 38, 75, 224, 38, 86, 287, 288, 289, 290, 291, + /* 1570 */ 292, 137, 294, 248, 134, 87, 87, 224, 76, 75, + /* 1580 */ 255, 76, 38, 75, 38, 76, 248, 75, 38, 76, + /* 1590 */ 265, 75, 100, 255, 269, 100, 100, 100, 22, 75, + /* 1600 */ 38, 248, 88, 265, 110, 75, 75, 269, 255, 38, + /* 1610 */ 22, 51, 287, 288, 289, 290, 291, 292, 265, 294, + /* 1620 */ 50, 38, 269, 57, 224, 287, 288, 289, 290, 291, + /* 1630 */ 292, 73, 294, 72, 38, 38, 38, 38, 38, 224, + /* 1640 */ 287, 288, 289, 290, 291, 292, 38, 294, 248, 38, + /* 1650 */ 22, 57, 224, 38, 38, 255, 12, 13, 38, 38, + /* 1660 */ 38, 38, 38, 248, 38, 265, 22, 0, 38, 269, + /* 1670 */ 255, 36, 43, 0, 38, 36, 248, 0, 0, 38, + /* 1680 */ 265, 43, 38, 255, 269, 36, 43, 287, 288, 289, + /* 1690 */ 290, 291, 292, 265, 294, 0, 38, 269, 36, 43, + /* 1700 */ 0, 57, 287, 288, 289, 290, 291, 292, 38, 294, + /* 1710 */ 0, 37, 0, 22, 21, 287, 288, 289, 290, 291, + /* 1720 */ 292, 22, 294, 22, 21, 20, 335, 335, 335, 52, + /* 1730 */ 335, 54, 335, 335, 335, 58, 335, 335, 61, 335, + /* 1740 */ 63, 64, 98, 66, 335, 335, 335, 335, 71, 335, + /* 1750 */ 335, 335, 335, 335, 110, 335, 335, 335, 335, 335, + /* 1760 */ 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + /* 1770 */ 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + /* 1780 */ 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + /* 1790 */ 335, 147, 335, 335, 335, 335, 335, 335, 335, 335, + /* 1800 */ 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + /* 1810 */ 335, 335, 168, 335, 335, 335, 335, 335, 335, 335, + /* 1820 */ 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + /* 1830 */ 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + /* 1840 */ 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + /* 1850 */ 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + /* 1860 */ 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + /* 1870 */ 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + /* 1880 */ 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + /* 1890 */ 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + /* 1900 */ 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + /* 1910 */ 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + /* 1920 */ 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + /* 1930 */ 335, 335, 335, 335, 335, 335, 335, 335, 335, 335, + /* 1940 */ 335, 335, 335, 335, 335, 335, 335, }; -#define YY_SHIFT_COUNT (567) +#define YY_SHIFT_COUNT (569) #define YY_SHIFT_MIN (0) -#define YY_SHIFT_MAX (1644) +#define YY_SHIFT_MAX (1712) static const unsigned short int yy_shift_ofst[] = { - /* 0 */ 822, 0, 39, 90, 90, 90, 90, 218, 90, 90, - /* 10 */ 264, 392, 438, 392, 392, 392, 392, 392, 392, 392, - /* 20 */ 392, 392, 392, 392, 392, 392, 392, 392, 392, 392, - /* 30 */ 392, 392, 392, 392, 392, 392, 122, 21, 21, 21, - /* 40 */ 121, 1096, 1096, 45, 38, 38, 5, 1096, 38, 38, - /* 50 */ 38, 38, 38, 38, 27, 38, 290, 362, 5, 391, - /* 60 */ 290, 38, 38, 290, 38, 290, 391, 290, 290, 38, - /* 70 */ 458, 513, 231, 574, 574, 269, 435, 297, 435, 435, - /* 80 */ 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, - /* 90 */ 435, 435, 435, 435, 435, 435, 435, 259, 219, 86, - /* 100 */ 191, 191, 445, 445, 445, 116, 191, 191, 483, 391, - /* 110 */ 290, 290, 290, 452, 544, 425, 425, 425, 425, 425, - /* 120 */ 425, 425, 637, 129, 137, 636, 159, 492, 49, 52, - /* 130 */ 322, 672, 499, 654, 499, 736, 642, 732, 774, 920, - /* 140 */ 918, 928, 814, 920, 920, 848, 863, 863, 920, 985, - /* 150 */ 27, 391, 990, 27, 483, 995, 27, 27, 920, 27, - /* 160 */ 1007, 290, 290, 290, 290, 290, 290, 290, 290, 290, - /* 170 */ 290, 290, 920, 1007, 988, 985, 458, 917, 391, 990, - /* 180 */ 458, 483, 995, 458, 1055, 878, 880, 988, 878, 880, - /* 190 */ 988, 988, 898, 901, 914, 916, 923, 483, 1097, 1003, - /* 200 */ 906, 911, 912, 1054, 290, 880, 988, 988, 880, 988, - /* 210 */ 1011, 483, 995, 458, 452, 458, 483, 1081, 544, 920, - /* 220 */ 458, 1007, 1863, 1863, 1863, 1863, 1863, 1863, 287, 987, - /* 230 */ 1339, 754, 490, 836, 16, 118, 714, 321, 769, 484, - /* 240 */ 484, 484, 484, 484, 484, 484, 484, 236, 215, 473, - /* 250 */ 526, 717, 717, 717, 717, 776, 656, 338, 725, 726, - /* 260 */ 735, 748, 502, 558, 777, 817, 651, 778, 787, 788, - /* 270 */ 845, 678, 411, 161, 793, 379, 798, 806, 823, 842, - /* 280 */ 853, 856, 874, 847, 855, 876, 877, 903, 908, 910, - /* 290 */ 927, 826, 430, 1190, 1194, 1131, 1196, 1159, 1035, 1175, - /* 300 */ 1178, 1179, 1057, 1218, 1181, 1183, 1060, 1224, 1187, 1226, - /* 310 */ 1189, 1228, 1155, 1080, 1082, 1124, 1088, 1235, 1240, 1191, - /* 320 */ 1101, 1245, 1246, 1152, 1247, 1248, 1249, 1250, 1251, 1252, - /* 330 */ 1253, 1260, 1262, 1264, 1266, 1267, 1268, 1269, 1270, 1271, - /* 340 */ 1153, 1274, 1275, 1276, 1277, 1278, 1280, 1259, 1283, 1284, - /* 350 */ 1285, 1287, 1288, 1289, 1291, 1292, 1293, 1254, 1294, 1244, - /* 360 */ 1296, 1298, 1261, 1265, 1257, 1302, 1279, 1282, 1272, 1312, - /* 370 */ 1281, 1286, 1273, 1323, 1290, 1297, 1308, 1325, 1326, 1329, - /* 380 */ 1330, 1258, 1255, 1299, 1263, 1303, 1310, 1340, 1314, 1321, - /* 390 */ 1324, 1335, 1263, 1303, 1337, 1338, 1350, 1355, 1378, 1358, - /* 400 */ 1342, 1382, 1361, 1346, 1386, 1365, 1388, 1368, 1371, 1394, - /* 410 */ 1295, 1357, 1396, 1256, 1375, 1300, 1301, 1398, 1400, 1304, - /* 420 */ 1401, 1331, 1360, 1317, 1333, 1348, 1208, 1347, 1349, 1359, - /* 430 */ 1336, 1343, 1363, 1366, 1364, 1362, 1369, 1374, 1220, 1372, - /* 440 */ 1376, 1370, 1305, 1381, 1373, 1379, 1384, 1306, 1453, 1420, - /* 450 */ 1422, 1430, 1441, 1442, 1443, 1480, 1316, 1413, 1411, 1414, - /* 460 */ 1415, 1419, 1421, 1403, 1423, 1424, 1408, 1473, 1332, 1425, - /* 470 */ 1428, 1429, 1434, 1444, 1383, 1446, 1505, 1472, 1389, 1447, - /* 480 */ 1433, 1437, 1448, 1510, 1459, 1450, 1461, 1499, 1501, 1466, - /* 490 */ 1467, 1503, 1469, 1470, 1506, 1474, 1471, 1509, 1475, 1476, - /* 500 */ 1512, 1479, 1456, 1457, 1458, 1460, 1530, 1477, 1484, 1522, - /* 510 */ 1454, 1491, 1492, 1529, 1263, 1303, 1548, 1521, 1523, 1517, - /* 520 */ 1504, 1507, 1539, 1542, 1543, 1544, 1546, 1547, 1549, 1564, - /* 530 */ 1532, 1263, 1550, 1303, 1552, 1553, 1572, 1573, 1574, 1576, - /* 540 */ 1577, 1607, 1579, 1582, 1578, 1619, 1584, 1587, 1581, 1620, - /* 550 */ 1588, 1589, 1585, 1627, 1591, 1594, 1596, 1637, 1603, 1605, - /* 560 */ 1643, 1644, 1623, 1625, 1626, 1628, 1630, 1629, + /* 0 */ 841, 0, 39, 213, 213, 213, 213, 252, 213, 213, + /* 10 */ 426, 465, 639, 465, 465, 465, 465, 465, 465, 465, + /* 20 */ 465, 465, 465, 465, 465, 465, 465, 465, 465, 465, + /* 30 */ 465, 465, 465, 465, 465, 465, 34, 53, 53, 53, + /* 40 */ 44, 1644, 1644, 299, 74, 74, 151, 1644, 74, 74, + /* 50 */ 74, 74, 74, 74, 71, 74, 358, 472, 151, 508, + /* 60 */ 358, 74, 74, 358, 74, 358, 508, 358, 358, 74, + /* 70 */ 453, 216, 111, 177, 177, 430, 1008, 206, 647, 1008, + /* 80 */ 1008, 1008, 1008, 1008, 1008, 1008, 1008, 1008, 1008, 1008, + /* 90 */ 1008, 1008, 1008, 1008, 1008, 1008, 1008, 1008, 339, 9, + /* 100 */ 193, 193, 168, 168, 168, 273, 193, 193, 674, 508, + /* 110 */ 358, 508, 358, 631, 459, 311, 311, 311, 311, 311, + /* 120 */ 311, 311, 727, 891, 1677, 302, 144, 30, 92, 72, + /* 130 */ 462, 735, 598, 487, 598, 724, 334, 628, 742, 978, + /* 140 */ 965, 971, 866, 978, 978, 895, 893, 893, 978, 1015, + /* 150 */ 71, 508, 1020, 71, 674, 1030, 71, 71, 978, 71, + /* 160 */ 1032, 358, 358, 358, 358, 358, 358, 358, 358, 358, + /* 170 */ 358, 358, 978, 1032, 1017, 1015, 453, 944, 508, 1020, + /* 180 */ 453, 674, 1030, 453, 1094, 909, 915, 1017, 909, 915, + /* 190 */ 1017, 1017, 931, 933, 947, 952, 956, 674, 1137, 1037, + /* 200 */ 939, 943, 948, 1099, 358, 915, 1017, 1017, 915, 1017, + /* 210 */ 1048, 674, 1030, 453, 631, 453, 674, 1119, 459, 978, + /* 220 */ 453, 1032, 1813, 1813, 1813, 1813, 1813, 1813, 787, 1167, + /* 230 */ 935, 519, 47, 863, 244, 555, 611, 187, 455, 361, + /* 240 */ 361, 361, 361, 361, 361, 361, 361, 514, 450, 615, + /* 250 */ 400, 342, 342, 342, 342, 766, 523, 546, 510, 753, + /* 260 */ 789, 790, 422, 709, 770, 775, 672, 803, 811, 812, + /* 270 */ 804, 654, 543, 643, 820, 823, 822, 475, 833, 838, + /* 280 */ 865, 873, 874, 209, 760, 876, 882, 897, 904, 912, + /* 290 */ 917, 810, 870, 1229, 1230, 1163, 1231, 1194, 1069, 1196, + /* 300 */ 1198, 1199, 1074, 1242, 1202, 1205, 1083, 1248, 1212, 1251, + /* 310 */ 1216, 1255, 1182, 1107, 1109, 1152, 1114, 1264, 1265, 1213, + /* 320 */ 1130, 1275, 1276, 1200, 1286, 1288, 1289, 1290, 1291, 1292, + /* 330 */ 1293, 1295, 1296, 1297, 1299, 1302, 1304, 1306, 1307, 1308, + /* 340 */ 1188, 1310, 1311, 1312, 1314, 1315, 1329, 1303, 1326, 1327, + /* 350 */ 1330, 1332, 1333, 1334, 1335, 1336, 1342, 1300, 1346, 1287, + /* 360 */ 1339, 1340, 1309, 1313, 1305, 1350, 1317, 1320, 1318, 1351, + /* 370 */ 1319, 1324, 1328, 1362, 1344, 1348, 1331, 1372, 1385, 1386, + /* 380 */ 1387, 1269, 1322, 1359, 1316, 1337, 1367, 1405, 1363, 1364, + /* 390 */ 1369, 1370, 1373, 1316, 1337, 1374, 1375, 1410, 1378, 1417, + /* 400 */ 1393, 1379, 1419, 1401, 1384, 1424, 1403, 1426, 1406, 1409, + /* 410 */ 1430, 1294, 1394, 1436, 1285, 1425, 1323, 1341, 1446, 1449, + /* 420 */ 1345, 1450, 1377, 1416, 1347, 1389, 1391, 1263, 1396, 1402, + /* 430 */ 1404, 1408, 1411, 1412, 1413, 1407, 1398, 1418, 1422, 1274, + /* 440 */ 1414, 1421, 1420, 1282, 1427, 1423, 1432, 1429, 1298, 1487, + /* 450 */ 1460, 1465, 1466, 1468, 1473, 1474, 1511, 1352, 1451, 1448, + /* 460 */ 1447, 1459, 1461, 1462, 1438, 1464, 1467, 1453, 1515, 1371, + /* 470 */ 1469, 1470, 1472, 1475, 1476, 1434, 1477, 1545, 1510, 1440, + /* 480 */ 1479, 1471, 1488, 1489, 1533, 1482, 1478, 1483, 1520, 1522, + /* 490 */ 1486, 1502, 1525, 1504, 1505, 1544, 1508, 1509, 1546, 1512, + /* 500 */ 1513, 1550, 1516, 1492, 1495, 1496, 1497, 1576, 1514, 1524, + /* 510 */ 1562, 1494, 1530, 1531, 1571, 1316, 1337, 1588, 1560, 1570, + /* 520 */ 1583, 1566, 1558, 1561, 1596, 1597, 1598, 1599, 1600, 1608, + /* 530 */ 1611, 1628, 1594, 1316, 1615, 1337, 1616, 1620, 1621, 1622, + /* 540 */ 1623, 1624, 1626, 1667, 1630, 1635, 1629, 1673, 1636, 1639, + /* 550 */ 1638, 1678, 1641, 1649, 1643, 1695, 1658, 1662, 1656, 1700, + /* 560 */ 1670, 1674, 1710, 1712, 1691, 1693, 1699, 1701, 1703, 1705, }; #define YY_REDUCE_COUNT (227) -#define YY_REDUCE_MIN (-311) -#define YY_REDUCE_MAX (1569) +#define YY_REDUCE_MIN (-292) +#define YY_REDUCE_MAX (1428) static const short yy_reduce_ofst[] = { - /* 0 */ -211, -208, 400, 451, 532, 588, 618, 648, 703, 753, - /* 10 */ 801, 812, 883, 921, 913, -220, 968, 1018, 1056, 1067, - /* 20 */ 1125, 1138, 1176, 1185, 1223, 1238, 1307, 1315, 1345, 1393, - /* 30 */ 1431, 1440, 1478, 1493, 1531, 1569, 179, -182, -2, 174, - /* 40 */ -186, -247, -228, 58, -221, -139, 181, -257, -154, -5, - /* 50 */ -4, -3, -1, 224, 128, 307, -109, -102, -311, -101, - /* 60 */ 69, 353, 417, 214, 424, 216, 278, 346, 420, 431, - /* 70 */ 228, -222, -292, -292, -292, -117, -223, -95, -204, -174, - /* 80 */ 62, 271, 282, 286, 288, 326, 404, 440, 454, 457, - /* 90 */ 480, 481, 486, 489, 512, 546, 569, 139, -33, -189, - /* 100 */ 46, 173, 415, 462, 494, -130, 193, 432, 324, -254, - /* 110 */ 550, 460, 487, 352, 54, -246, 385, 413, 469, 545, - /* 120 */ 567, 576, 555, 615, 612, 534, 560, 610, 607, 579, - /* 130 */ 665, 630, 593, 593, 593, 675, 599, 619, 675, 724, - /* 140 */ 674, 739, 685, 740, 746, 718, 737, 741, 779, 728, - /* 150 */ 780, 745, 742, 781, 759, 751, 791, 794, 789, 795, - /* 160 */ 803, 783, 790, 800, 804, 805, 809, 810, 811, 815, - /* 170 */ 820, 821, 807, 813, 782, 786, 833, 796, 808, 799, - /* 180 */ 846, 824, 816, 849, 797, 757, 828, 818, 763, 835, - /* 190 */ 839, 843, 802, 827, 819, 825, 593, 859, 832, 829, - /* 200 */ 830, 831, 834, 840, 675, 860, 865, 870, 862, 881, - /* 210 */ 882, 896, 887, 926, 915, 929, 902, 930, 925, 935, - /* 220 */ 937, 941, 907, 899, 942, 945, 957, 967, + /* 0 */ -211, -209, -158, 217, 366, 438, 488, 612, 642, 731, + /* 10 */ 289, 779, 788, 840, -220, 848, 878, 930, 980, 991, + /* 20 */ 1029, 1076, 1089, 1104, 1151, 1166, 1179, 1227, 1240, 1278, + /* 30 */ 1325, 1338, 1353, 1400, 1415, 1428, 219, -25, -207, 188, + /* 40 */ -34, -252, -250, -35, -225, -1, -5, -258, -212, -117, + /* 50 */ -89, -88, -2, 236, -229, 260, 287, -247, 150, -106, + /* 60 */ 233, 304, 317, 416, 435, 431, -228, 441, 432, 38, + /* 70 */ -188, -154, -292, -292, -292, -77, -72, 66, -193, 318, + /* 80 */ 404, 452, 473, 478, 482, 492, 495, 496, 498, 499, + /* 90 */ 524, 528, 530, 534, 557, 559, 560, 564, -141, 321, + /* 100 */ 96, 218, -169, -115, 203, 454, 385, 395, -102, 427, + /* 110 */ 163, 417, 486, 139, -32, 484, 576, 595, 629, 644, + /* 120 */ 664, 677, 447, 715, 710, 623, 633, 717, 687, 659, + /* 130 */ 751, 701, 681, 681, 681, 746, 668, 683, 746, 769, + /* 140 */ 723, 776, 738, 784, 785, 754, 763, 768, 801, 758, + /* 150 */ 806, 777, 772, 809, 792, 783, 819, 824, 825, 826, + /* 160 */ 828, 813, 814, 815, 835, 836, 839, 843, 844, 845, + /* 170 */ 846, 849, 829, 834, 817, 802, 860, 821, 842, 827, + /* 180 */ 872, 853, 850, 875, 837, 796, 851, 855, 799, 871, + /* 190 */ 856, 877, 831, 830, 847, 857, 681, 901, 886, 858, + /* 200 */ 852, 832, 854, 879, 746, 905, 914, 918, 911, 919, + /* 210 */ 922, 936, 924, 963, 949, 967, 942, 950, 960, 972, + /* 220 */ 976, 981, 932, 926, 968, 974, 992, 1003, }; static const YYACTIONTYPE yy_default[] = { - /* 0 */ 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - /* 10 */ 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - /* 20 */ 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - /* 30 */ 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - /* 40 */ 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - /* 50 */ 1276, 1276, 1276, 1276, 1335, 1276, 1276, 1276, 1276, 1276, - /* 60 */ 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - /* 70 */ 1333, 1475, 1276, 1631, 1276, 1276, 1276, 1276, 1276, 1276, - /* 80 */ 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - /* 90 */ 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1335, - /* 100 */ 1276, 1276, 1642, 1642, 1642, 1333, 1276, 1276, 1276, 1276, - /* 110 */ 1276, 1276, 1276, 1428, 1276, 1276, 1276, 1276, 1276, 1276, - /* 120 */ 1276, 1276, 1509, 1276, 1276, 1706, 1276, 1381, 1515, 1666, - /* 130 */ 1276, 1658, 1634, 1648, 1635, 1276, 1691, 1651, 1276, 1276, - /* 140 */ 1276, 1276, 1501, 1276, 1276, 1480, 1477, 1477, 1276, 1276, - /* 150 */ 1335, 1276, 1276, 1335, 1276, 1276, 1335, 1335, 1276, 1335, - /* 160 */ 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - /* 170 */ 1276, 1276, 1276, 1276, 1276, 1276, 1333, 1511, 1276, 1276, - /* 180 */ 1333, 1276, 1276, 1333, 1276, 1673, 1671, 1276, 1673, 1671, - /* 190 */ 1276, 1276, 1685, 1681, 1664, 1662, 1648, 1276, 1276, 1276, - /* 200 */ 1709, 1697, 1693, 1276, 1276, 1671, 1276, 1276, 1671, 1276, - /* 210 */ 1488, 1276, 1276, 1333, 1276, 1333, 1276, 1397, 1276, 1276, - /* 220 */ 1333, 1276, 1503, 1517, 1431, 1431, 1336, 1281, 1276, 1276, - /* 230 */ 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1578, - /* 240 */ 1684, 1683, 1607, 1606, 1605, 1603, 1577, 1276, 1276, 1276, - /* 250 */ 1276, 1571, 1572, 1570, 1569, 1276, 1276, 1276, 1276, 1276, - /* 260 */ 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - /* 270 */ 1632, 1276, 1694, 1698, 1276, 1276, 1276, 1555, 1276, 1276, - /* 280 */ 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - /* 290 */ 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - /* 300 */ 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - /* 310 */ 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - /* 320 */ 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - /* 330 */ 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - /* 340 */ 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - /* 350 */ 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - /* 360 */ 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - /* 370 */ 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - /* 380 */ 1276, 1276, 1276, 1276, 1444, 1443, 1276, 1276, 1276, 1276, - /* 390 */ 1276, 1276, 1362, 1361, 1276, 1276, 1276, 1276, 1276, 1276, - /* 400 */ 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - /* 410 */ 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - /* 420 */ 1276, 1276, 1276, 1276, 1655, 1665, 1276, 1276, 1276, 1276, - /* 430 */ 1276, 1276, 1276, 1276, 1276, 1555, 1276, 1682, 1276, 1641, - /* 440 */ 1637, 1276, 1276, 1633, 1276, 1276, 1692, 1276, 1276, 1276, - /* 450 */ 1276, 1276, 1276, 1276, 1276, 1627, 1276, 1600, 1276, 1276, - /* 460 */ 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1565, 1276, - /* 470 */ 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - /* 480 */ 1276, 1554, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1425, - /* 490 */ 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - /* 500 */ 1276, 1276, 1410, 1408, 1407, 1406, 1276, 1403, 1276, 1276, - /* 510 */ 1276, 1276, 1276, 1276, 1434, 1433, 1276, 1276, 1276, 1276, - /* 520 */ 1276, 1356, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - /* 530 */ 1276, 1347, 1276, 1346, 1276, 1276, 1276, 1276, 1276, 1276, - /* 540 */ 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - /* 550 */ 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - /* 560 */ 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, + /* 0 */ 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + /* 10 */ 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + /* 20 */ 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + /* 30 */ 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + /* 40 */ 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + /* 50 */ 1282, 1282, 1282, 1282, 1341, 1282, 1282, 1282, 1282, 1282, + /* 60 */ 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + /* 70 */ 1339, 1483, 1282, 1639, 1282, 1282, 1282, 1282, 1282, 1282, + /* 80 */ 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + /* 90 */ 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1341, + /* 100 */ 1282, 1282, 1650, 1650, 1650, 1339, 1282, 1282, 1282, 1282, + /* 110 */ 1282, 1282, 1282, 1436, 1282, 1282, 1282, 1282, 1282, 1282, + /* 120 */ 1282, 1282, 1517, 1282, 1282, 1714, 1282, 1389, 1523, 1674, + /* 130 */ 1282, 1666, 1642, 1656, 1643, 1282, 1699, 1659, 1282, 1282, + /* 140 */ 1282, 1282, 1509, 1282, 1282, 1488, 1485, 1485, 1282, 1282, + /* 150 */ 1341, 1282, 1282, 1341, 1282, 1282, 1341, 1341, 1282, 1341, + /* 160 */ 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + /* 170 */ 1282, 1282, 1282, 1282, 1282, 1282, 1339, 1519, 1282, 1282, + /* 180 */ 1339, 1282, 1282, 1339, 1282, 1681, 1679, 1282, 1681, 1679, + /* 190 */ 1282, 1282, 1693, 1689, 1672, 1670, 1656, 1282, 1282, 1282, + /* 200 */ 1717, 1705, 1701, 1282, 1282, 1679, 1282, 1282, 1679, 1282, + /* 210 */ 1496, 1282, 1282, 1339, 1282, 1339, 1282, 1405, 1282, 1282, + /* 220 */ 1339, 1282, 1511, 1525, 1439, 1439, 1342, 1287, 1282, 1282, + /* 230 */ 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1586, + /* 240 */ 1692, 1691, 1615, 1614, 1613, 1611, 1585, 1282, 1282, 1282, + /* 250 */ 1282, 1579, 1580, 1578, 1577, 1282, 1282, 1282, 1282, 1282, + /* 260 */ 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + /* 270 */ 1640, 1282, 1702, 1706, 1282, 1282, 1282, 1563, 1282, 1282, + /* 280 */ 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + /* 290 */ 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + /* 300 */ 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + /* 310 */ 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + /* 320 */ 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + /* 330 */ 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + /* 340 */ 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + /* 350 */ 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + /* 360 */ 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + /* 370 */ 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + /* 380 */ 1282, 1282, 1282, 1282, 1452, 1451, 1282, 1282, 1282, 1282, + /* 390 */ 1282, 1282, 1282, 1369, 1368, 1282, 1282, 1282, 1282, 1282, + /* 400 */ 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + /* 410 */ 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + /* 420 */ 1282, 1282, 1282, 1282, 1282, 1663, 1673, 1282, 1282, 1282, + /* 430 */ 1282, 1282, 1282, 1282, 1282, 1282, 1563, 1282, 1690, 1282, + /* 440 */ 1649, 1645, 1282, 1282, 1641, 1282, 1282, 1700, 1282, 1282, + /* 450 */ 1282, 1282, 1282, 1282, 1282, 1282, 1635, 1282, 1608, 1282, + /* 460 */ 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1573, + /* 470 */ 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + /* 480 */ 1282, 1282, 1562, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + /* 490 */ 1433, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + /* 500 */ 1282, 1282, 1282, 1418, 1416, 1415, 1414, 1282, 1411, 1282, + /* 510 */ 1282, 1282, 1282, 1282, 1282, 1442, 1441, 1282, 1282, 1282, + /* 520 */ 1282, 1282, 1282, 1362, 1282, 1282, 1282, 1282, 1282, 1282, + /* 530 */ 1282, 1282, 1282, 1353, 1282, 1352, 1282, 1282, 1282, 1282, + /* 540 */ 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + /* 550 */ 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + /* 560 */ 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, }; /********** End of lemon-generated parsing tables *****************************/ @@ -914,269 +916,270 @@ static const char *const yyTokenName[] = { /* 68 */ "SINGLE_STABLE", /* 69 */ "STREAM_MODE", /* 70 */ "RETENTIONS", - /* 71 */ "NK_COMMA", - /* 72 */ "NK_COLON", - /* 73 */ "TABLE", - /* 74 */ "NK_LP", - /* 75 */ "NK_RP", - /* 76 */ "STABLE", - /* 77 */ "ADD", - /* 78 */ "COLUMN", - /* 79 */ "MODIFY", - /* 80 */ "RENAME", - /* 81 */ "TAG", - /* 82 */ "SET", - /* 83 */ "NK_EQ", - /* 84 */ "USING", - /* 85 */ "TAGS", - /* 86 */ "NK_DOT", - /* 87 */ "COMMENT", - /* 88 */ "BOOL", - /* 89 */ "TINYINT", - /* 90 */ "SMALLINT", - /* 91 */ "INT", - /* 92 */ "INTEGER", - /* 93 */ "BIGINT", - /* 94 */ "FLOAT", - /* 95 */ "DOUBLE", - /* 96 */ "BINARY", - /* 97 */ "TIMESTAMP", - /* 98 */ "NCHAR", - /* 99 */ "UNSIGNED", - /* 100 */ "JSON", - /* 101 */ "VARCHAR", - /* 102 */ "MEDIUMBLOB", - /* 103 */ "BLOB", - /* 104 */ "VARBINARY", - /* 105 */ "DECIMAL", - /* 106 */ "SMA", - /* 107 */ "ROLLUP", - /* 108 */ "FILE_FACTOR", - /* 109 */ "NK_FLOAT", - /* 110 */ "DELAY", - /* 111 */ "SHOW", - /* 112 */ "DATABASES", - /* 113 */ "TABLES", - /* 114 */ "STABLES", - /* 115 */ "MNODES", - /* 116 */ "MODULES", - /* 117 */ "QNODES", - /* 118 */ "FUNCTIONS", - /* 119 */ "INDEXES", - /* 120 */ "FROM", - /* 121 */ "ACCOUNTS", - /* 122 */ "APPS", - /* 123 */ "CONNECTIONS", - /* 124 */ "LICENCE", - /* 125 */ "GRANTS", - /* 126 */ "QUERIES", - /* 127 */ "SCORES", - /* 128 */ "TOPICS", - /* 129 */ "VARIABLES", - /* 130 */ "BNODES", - /* 131 */ "SNODES", - /* 132 */ "LIKE", - /* 133 */ "INDEX", - /* 134 */ "FULLTEXT", - /* 135 */ "FUNCTION", - /* 136 */ "INTERVAL", - /* 137 */ "TOPIC", - /* 138 */ "AS", - /* 139 */ "DESC", - /* 140 */ "DESCRIBE", - /* 141 */ "RESET", - /* 142 */ "QUERY", - /* 143 */ "EXPLAIN", - /* 144 */ "ANALYZE", - /* 145 */ "VERBOSE", - /* 146 */ "NK_BOOL", - /* 147 */ "RATIO", - /* 148 */ "COMPACT", - /* 149 */ "VNODES", - /* 150 */ "IN", - /* 151 */ "OUTPUTTYPE", - /* 152 */ "AGGREGATE", - /* 153 */ "BUFSIZE", - /* 154 */ "STREAM", - /* 155 */ "INTO", - /* 156 */ "TRIGGER", - /* 157 */ "AT_ONCE", - /* 158 */ "WINDOW_CLOSE", - /* 159 */ "WATERMARK", - /* 160 */ "KILL", - /* 161 */ "CONNECTION", - /* 162 */ "MERGE", - /* 163 */ "VGROUP", - /* 164 */ "REDISTRIBUTE", - /* 165 */ "SPLIT", - /* 166 */ "SYNCDB", - /* 167 */ "NULL", - /* 168 */ "NK_QUESTION", - /* 169 */ "NK_ARROW", - /* 170 */ "ROWTS", - /* 171 */ "TBNAME", - /* 172 */ "QSTARTTS", - /* 173 */ "QENDTS", - /* 174 */ "WSTARTTS", - /* 175 */ "WENDTS", - /* 176 */ "WDURATION", - /* 177 */ "CAST", - /* 178 */ "NOW", - /* 179 */ "TODAY", - /* 180 */ "TIMEZONE", - /* 181 */ "COUNT", - /* 182 */ "FIRST", - /* 183 */ "LAST", - /* 184 */ "LAST_ROW", - /* 185 */ "BETWEEN", - /* 186 */ "IS", - /* 187 */ "NK_LT", - /* 188 */ "NK_GT", - /* 189 */ "NK_LE", - /* 190 */ "NK_GE", - /* 191 */ "NK_NE", - /* 192 */ "MATCH", - /* 193 */ "NMATCH", - /* 194 */ "CONTAINS", - /* 195 */ "JOIN", - /* 196 */ "INNER", - /* 197 */ "SELECT", - /* 198 */ "DISTINCT", - /* 199 */ "WHERE", - /* 200 */ "PARTITION", - /* 201 */ "BY", - /* 202 */ "SESSION", - /* 203 */ "STATE_WINDOW", - /* 204 */ "SLIDING", - /* 205 */ "FILL", - /* 206 */ "VALUE", - /* 207 */ "NONE", - /* 208 */ "PREV", - /* 209 */ "LINEAR", - /* 210 */ "NEXT", - /* 211 */ "GROUP", - /* 212 */ "HAVING", - /* 213 */ "ORDER", - /* 214 */ "SLIMIT", - /* 215 */ "SOFFSET", - /* 216 */ "LIMIT", - /* 217 */ "OFFSET", - /* 218 */ "ASC", - /* 219 */ "NULLS", - /* 220 */ "cmd", - /* 221 */ "account_options", - /* 222 */ "alter_account_options", - /* 223 */ "literal", - /* 224 */ "alter_account_option", - /* 225 */ "user_name", - /* 226 */ "dnode_endpoint", - /* 227 */ "dnode_host_name", - /* 228 */ "not_exists_opt", - /* 229 */ "db_name", - /* 230 */ "db_options", - /* 231 */ "exists_opt", - /* 232 */ "alter_db_options", - /* 233 */ "integer_list", - /* 234 */ "variable_list", - /* 235 */ "retention_list", - /* 236 */ "alter_db_option", - /* 237 */ "retention", - /* 238 */ "full_table_name", - /* 239 */ "column_def_list", - /* 240 */ "tags_def_opt", - /* 241 */ "table_options", - /* 242 */ "multi_create_clause", - /* 243 */ "tags_def", - /* 244 */ "multi_drop_clause", - /* 245 */ "alter_table_clause", - /* 246 */ "alter_table_options", - /* 247 */ "column_name", - /* 248 */ "type_name", - /* 249 */ "create_subtable_clause", - /* 250 */ "specific_tags_opt", - /* 251 */ "literal_list", - /* 252 */ "drop_table_clause", - /* 253 */ "col_name_list", - /* 254 */ "table_name", - /* 255 */ "column_def", - /* 256 */ "func_name_list", - /* 257 */ "alter_table_option", - /* 258 */ "col_name", - /* 259 */ "db_name_cond_opt", - /* 260 */ "like_pattern_opt", - /* 261 */ "table_name_cond", - /* 262 */ "from_db_opt", - /* 263 */ "func_name", - /* 264 */ "function_name", - /* 265 */ "index_name", - /* 266 */ "index_options", - /* 267 */ "func_list", - /* 268 */ "duration_literal", - /* 269 */ "sliding_opt", - /* 270 */ "func", - /* 271 */ "expression_list", - /* 272 */ "topic_name", - /* 273 */ "query_expression", - /* 274 */ "analyze_opt", - /* 275 */ "explain_options", - /* 276 */ "agg_func_opt", - /* 277 */ "bufsize_opt", - /* 278 */ "stream_name", - /* 279 */ "stream_options", - /* 280 */ "into_opt", - /* 281 */ "dnode_list", - /* 282 */ "signed", - /* 283 */ "signed_literal", - /* 284 */ "table_alias", - /* 285 */ "column_alias", - /* 286 */ "expression", - /* 287 */ "pseudo_column", - /* 288 */ "column_reference", - /* 289 */ "function_expression", - /* 290 */ "subquery", - /* 291 */ "star_func", - /* 292 */ "star_func_para_list", - /* 293 */ "noarg_func", - /* 294 */ "other_para_list", - /* 295 */ "star_func_para", - /* 296 */ "predicate", - /* 297 */ "compare_op", - /* 298 */ "in_op", - /* 299 */ "in_predicate_value", - /* 300 */ "boolean_value_expression", - /* 301 */ "boolean_primary", - /* 302 */ "common_expression", - /* 303 */ "from_clause", - /* 304 */ "table_reference_list", - /* 305 */ "table_reference", - /* 306 */ "table_primary", - /* 307 */ "joined_table", - /* 308 */ "alias_opt", - /* 309 */ "parenthesized_joined_table", - /* 310 */ "join_type", - /* 311 */ "search_condition", - /* 312 */ "query_specification", - /* 313 */ "set_quantifier_opt", - /* 314 */ "select_list", - /* 315 */ "where_clause_opt", - /* 316 */ "partition_by_clause_opt", - /* 317 */ "twindow_clause_opt", - /* 318 */ "group_by_clause_opt", - /* 319 */ "having_clause_opt", - /* 320 */ "select_sublist", - /* 321 */ "select_item", - /* 322 */ "fill_opt", - /* 323 */ "fill_mode", - /* 324 */ "group_by_list", - /* 325 */ "query_expression_body", - /* 326 */ "order_by_clause_opt", - /* 327 */ "slimit_clause_opt", - /* 328 */ "limit_clause_opt", - /* 329 */ "query_primary", - /* 330 */ "sort_specification_list", - /* 331 */ "sort_specification", - /* 332 */ "ordering_specification_opt", - /* 333 */ "null_ordering_opt", + /* 71 */ "STRICT", + /* 72 */ "NK_COMMA", + /* 73 */ "NK_COLON", + /* 74 */ "TABLE", + /* 75 */ "NK_LP", + /* 76 */ "NK_RP", + /* 77 */ "STABLE", + /* 78 */ "ADD", + /* 79 */ "COLUMN", + /* 80 */ "MODIFY", + /* 81 */ "RENAME", + /* 82 */ "TAG", + /* 83 */ "SET", + /* 84 */ "NK_EQ", + /* 85 */ "USING", + /* 86 */ "TAGS", + /* 87 */ "NK_DOT", + /* 88 */ "COMMENT", + /* 89 */ "BOOL", + /* 90 */ "TINYINT", + /* 91 */ "SMALLINT", + /* 92 */ "INT", + /* 93 */ "INTEGER", + /* 94 */ "BIGINT", + /* 95 */ "FLOAT", + /* 96 */ "DOUBLE", + /* 97 */ "BINARY", + /* 98 */ "TIMESTAMP", + /* 99 */ "NCHAR", + /* 100 */ "UNSIGNED", + /* 101 */ "JSON", + /* 102 */ "VARCHAR", + /* 103 */ "MEDIUMBLOB", + /* 104 */ "BLOB", + /* 105 */ "VARBINARY", + /* 106 */ "DECIMAL", + /* 107 */ "SMA", + /* 108 */ "ROLLUP", + /* 109 */ "FILE_FACTOR", + /* 110 */ "NK_FLOAT", + /* 111 */ "DELAY", + /* 112 */ "SHOW", + /* 113 */ "DATABASES", + /* 114 */ "TABLES", + /* 115 */ "STABLES", + /* 116 */ "MNODES", + /* 117 */ "MODULES", + /* 118 */ "QNODES", + /* 119 */ "FUNCTIONS", + /* 120 */ "INDEXES", + /* 121 */ "FROM", + /* 122 */ "ACCOUNTS", + /* 123 */ "APPS", + /* 124 */ "CONNECTIONS", + /* 125 */ "LICENCE", + /* 126 */ "GRANTS", + /* 127 */ "QUERIES", + /* 128 */ "SCORES", + /* 129 */ "TOPICS", + /* 130 */ "VARIABLES", + /* 131 */ "BNODES", + /* 132 */ "SNODES", + /* 133 */ "LIKE", + /* 134 */ "INDEX", + /* 135 */ "FULLTEXT", + /* 136 */ "FUNCTION", + /* 137 */ "INTERVAL", + /* 138 */ "TOPIC", + /* 139 */ "AS", + /* 140 */ "DESC", + /* 141 */ "DESCRIBE", + /* 142 */ "RESET", + /* 143 */ "QUERY", + /* 144 */ "EXPLAIN", + /* 145 */ "ANALYZE", + /* 146 */ "VERBOSE", + /* 147 */ "NK_BOOL", + /* 148 */ "RATIO", + /* 149 */ "COMPACT", + /* 150 */ "VNODES", + /* 151 */ "IN", + /* 152 */ "OUTPUTTYPE", + /* 153 */ "AGGREGATE", + /* 154 */ "BUFSIZE", + /* 155 */ "STREAM", + /* 156 */ "INTO", + /* 157 */ "TRIGGER", + /* 158 */ "AT_ONCE", + /* 159 */ "WINDOW_CLOSE", + /* 160 */ "WATERMARK", + /* 161 */ "KILL", + /* 162 */ "CONNECTION", + /* 163 */ "MERGE", + /* 164 */ "VGROUP", + /* 165 */ "REDISTRIBUTE", + /* 166 */ "SPLIT", + /* 167 */ "SYNCDB", + /* 168 */ "NULL", + /* 169 */ "NK_QUESTION", + /* 170 */ "NK_ARROW", + /* 171 */ "ROWTS", + /* 172 */ "TBNAME", + /* 173 */ "QSTARTTS", + /* 174 */ "QENDTS", + /* 175 */ "WSTARTTS", + /* 176 */ "WENDTS", + /* 177 */ "WDURATION", + /* 178 */ "CAST", + /* 179 */ "NOW", + /* 180 */ "TODAY", + /* 181 */ "TIMEZONE", + /* 182 */ "COUNT", + /* 183 */ "FIRST", + /* 184 */ "LAST", + /* 185 */ "LAST_ROW", + /* 186 */ "BETWEEN", + /* 187 */ "IS", + /* 188 */ "NK_LT", + /* 189 */ "NK_GT", + /* 190 */ "NK_LE", + /* 191 */ "NK_GE", + /* 192 */ "NK_NE", + /* 193 */ "MATCH", + /* 194 */ "NMATCH", + /* 195 */ "CONTAINS", + /* 196 */ "JOIN", + /* 197 */ "INNER", + /* 198 */ "SELECT", + /* 199 */ "DISTINCT", + /* 200 */ "WHERE", + /* 201 */ "PARTITION", + /* 202 */ "BY", + /* 203 */ "SESSION", + /* 204 */ "STATE_WINDOW", + /* 205 */ "SLIDING", + /* 206 */ "FILL", + /* 207 */ "VALUE", + /* 208 */ "NONE", + /* 209 */ "PREV", + /* 210 */ "LINEAR", + /* 211 */ "NEXT", + /* 212 */ "GROUP", + /* 213 */ "HAVING", + /* 214 */ "ORDER", + /* 215 */ "SLIMIT", + /* 216 */ "SOFFSET", + /* 217 */ "LIMIT", + /* 218 */ "OFFSET", + /* 219 */ "ASC", + /* 220 */ "NULLS", + /* 221 */ "cmd", + /* 222 */ "account_options", + /* 223 */ "alter_account_options", + /* 224 */ "literal", + /* 225 */ "alter_account_option", + /* 226 */ "user_name", + /* 227 */ "dnode_endpoint", + /* 228 */ "dnode_host_name", + /* 229 */ "not_exists_opt", + /* 230 */ "db_name", + /* 231 */ "db_options", + /* 232 */ "exists_opt", + /* 233 */ "alter_db_options", + /* 234 */ "integer_list", + /* 235 */ "variable_list", + /* 236 */ "retention_list", + /* 237 */ "alter_db_option", + /* 238 */ "retention", + /* 239 */ "full_table_name", + /* 240 */ "column_def_list", + /* 241 */ "tags_def_opt", + /* 242 */ "table_options", + /* 243 */ "multi_create_clause", + /* 244 */ "tags_def", + /* 245 */ "multi_drop_clause", + /* 246 */ "alter_table_clause", + /* 247 */ "alter_table_options", + /* 248 */ "column_name", + /* 249 */ "type_name", + /* 250 */ "create_subtable_clause", + /* 251 */ "specific_tags_opt", + /* 252 */ "literal_list", + /* 253 */ "drop_table_clause", + /* 254 */ "col_name_list", + /* 255 */ "table_name", + /* 256 */ "column_def", + /* 257 */ "func_name_list", + /* 258 */ "alter_table_option", + /* 259 */ "col_name", + /* 260 */ "db_name_cond_opt", + /* 261 */ "like_pattern_opt", + /* 262 */ "table_name_cond", + /* 263 */ "from_db_opt", + /* 264 */ "func_name", + /* 265 */ "function_name", + /* 266 */ "index_name", + /* 267 */ "index_options", + /* 268 */ "func_list", + /* 269 */ "duration_literal", + /* 270 */ "sliding_opt", + /* 271 */ "func", + /* 272 */ "expression_list", + /* 273 */ "topic_name", + /* 274 */ "query_expression", + /* 275 */ "analyze_opt", + /* 276 */ "explain_options", + /* 277 */ "agg_func_opt", + /* 278 */ "bufsize_opt", + /* 279 */ "stream_name", + /* 280 */ "stream_options", + /* 281 */ "into_opt", + /* 282 */ "dnode_list", + /* 283 */ "signed", + /* 284 */ "signed_literal", + /* 285 */ "table_alias", + /* 286 */ "column_alias", + /* 287 */ "expression", + /* 288 */ "pseudo_column", + /* 289 */ "column_reference", + /* 290 */ "function_expression", + /* 291 */ "subquery", + /* 292 */ "star_func", + /* 293 */ "star_func_para_list", + /* 294 */ "noarg_func", + /* 295 */ "other_para_list", + /* 296 */ "star_func_para", + /* 297 */ "predicate", + /* 298 */ "compare_op", + /* 299 */ "in_op", + /* 300 */ "in_predicate_value", + /* 301 */ "boolean_value_expression", + /* 302 */ "boolean_primary", + /* 303 */ "common_expression", + /* 304 */ "from_clause", + /* 305 */ "table_reference_list", + /* 306 */ "table_reference", + /* 307 */ "table_primary", + /* 308 */ "joined_table", + /* 309 */ "alias_opt", + /* 310 */ "parenthesized_joined_table", + /* 311 */ "join_type", + /* 312 */ "search_condition", + /* 313 */ "query_specification", + /* 314 */ "set_quantifier_opt", + /* 315 */ "select_list", + /* 316 */ "where_clause_opt", + /* 317 */ "partition_by_clause_opt", + /* 318 */ "twindow_clause_opt", + /* 319 */ "group_by_clause_opt", + /* 320 */ "having_clause_opt", + /* 321 */ "select_sublist", + /* 322 */ "select_item", + /* 323 */ "fill_opt", + /* 324 */ "fill_mode", + /* 325 */ "group_by_list", + /* 326 */ "query_expression_body", + /* 327 */ "order_by_clause_opt", + /* 328 */ "slimit_clause_opt", + /* 329 */ "limit_clause_opt", + /* 330 */ "query_primary", + /* 331 */ "sort_specification_list", + /* 332 */ "sort_specification", + /* 333 */ "ordering_specification_opt", + /* 334 */ "null_ordering_opt", }; #endif /* defined(YYCOVERAGE) || !defined(NDEBUG) */ @@ -1262,361 +1265,363 @@ static const char *const yyRuleName[] = { /* 75 */ "db_options ::= db_options SINGLE_STABLE NK_INTEGER", /* 76 */ "db_options ::= db_options STREAM_MODE NK_INTEGER", /* 77 */ "db_options ::= db_options RETENTIONS retention_list", - /* 78 */ "alter_db_options ::= alter_db_option", - /* 79 */ "alter_db_options ::= alter_db_options alter_db_option", - /* 80 */ "alter_db_option ::= BLOCKS NK_INTEGER", - /* 81 */ "alter_db_option ::= FSYNC NK_INTEGER", - /* 82 */ "alter_db_option ::= KEEP integer_list", - /* 83 */ "alter_db_option ::= KEEP variable_list", - /* 84 */ "alter_db_option ::= WAL NK_INTEGER", - /* 85 */ "alter_db_option ::= QUORUM NK_INTEGER", - /* 86 */ "alter_db_option ::= CACHELAST NK_INTEGER", - /* 87 */ "alter_db_option ::= REPLICA NK_INTEGER", - /* 88 */ "integer_list ::= NK_INTEGER", - /* 89 */ "integer_list ::= integer_list NK_COMMA NK_INTEGER", - /* 90 */ "variable_list ::= NK_VARIABLE", - /* 91 */ "variable_list ::= variable_list NK_COMMA NK_VARIABLE", - /* 92 */ "retention_list ::= retention", - /* 93 */ "retention_list ::= retention_list NK_COMMA retention", - /* 94 */ "retention ::= NK_VARIABLE NK_COLON NK_VARIABLE", - /* 95 */ "cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options", - /* 96 */ "cmd ::= CREATE TABLE multi_create_clause", - /* 97 */ "cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options", - /* 98 */ "cmd ::= DROP TABLE multi_drop_clause", - /* 99 */ "cmd ::= DROP STABLE exists_opt full_table_name", - /* 100 */ "cmd ::= ALTER TABLE alter_table_clause", - /* 101 */ "cmd ::= ALTER STABLE alter_table_clause", - /* 102 */ "alter_table_clause ::= full_table_name alter_table_options", - /* 103 */ "alter_table_clause ::= full_table_name ADD COLUMN column_name type_name", - /* 104 */ "alter_table_clause ::= full_table_name DROP COLUMN column_name", - /* 105 */ "alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name", - /* 106 */ "alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name", - /* 107 */ "alter_table_clause ::= full_table_name ADD TAG column_name type_name", - /* 108 */ "alter_table_clause ::= full_table_name DROP TAG column_name", - /* 109 */ "alter_table_clause ::= full_table_name MODIFY TAG column_name type_name", - /* 110 */ "alter_table_clause ::= full_table_name RENAME TAG column_name column_name", - /* 111 */ "alter_table_clause ::= full_table_name SET TAG column_name NK_EQ literal", - /* 112 */ "multi_create_clause ::= create_subtable_clause", - /* 113 */ "multi_create_clause ::= multi_create_clause create_subtable_clause", - /* 114 */ "create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_tags_opt TAGS NK_LP literal_list NK_RP", - /* 115 */ "multi_drop_clause ::= drop_table_clause", - /* 116 */ "multi_drop_clause ::= multi_drop_clause drop_table_clause", - /* 117 */ "drop_table_clause ::= exists_opt full_table_name", - /* 118 */ "specific_tags_opt ::=", - /* 119 */ "specific_tags_opt ::= NK_LP col_name_list NK_RP", - /* 120 */ "full_table_name ::= table_name", - /* 121 */ "full_table_name ::= db_name NK_DOT table_name", - /* 122 */ "column_def_list ::= column_def", - /* 123 */ "column_def_list ::= column_def_list NK_COMMA column_def", - /* 124 */ "column_def ::= column_name type_name", - /* 125 */ "column_def ::= column_name type_name COMMENT NK_STRING", - /* 126 */ "type_name ::= BOOL", - /* 127 */ "type_name ::= TINYINT", - /* 128 */ "type_name ::= SMALLINT", - /* 129 */ "type_name ::= INT", - /* 130 */ "type_name ::= INTEGER", - /* 131 */ "type_name ::= BIGINT", - /* 132 */ "type_name ::= FLOAT", - /* 133 */ "type_name ::= DOUBLE", - /* 134 */ "type_name ::= BINARY NK_LP NK_INTEGER NK_RP", - /* 135 */ "type_name ::= TIMESTAMP", - /* 136 */ "type_name ::= NCHAR NK_LP NK_INTEGER NK_RP", - /* 137 */ "type_name ::= TINYINT UNSIGNED", - /* 138 */ "type_name ::= SMALLINT UNSIGNED", - /* 139 */ "type_name ::= INT UNSIGNED", - /* 140 */ "type_name ::= BIGINT UNSIGNED", - /* 141 */ "type_name ::= JSON", - /* 142 */ "type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP", - /* 143 */ "type_name ::= MEDIUMBLOB", - /* 144 */ "type_name ::= BLOB", - /* 145 */ "type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP", - /* 146 */ "type_name ::= DECIMAL", - /* 147 */ "type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP", - /* 148 */ "type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP", - /* 149 */ "tags_def_opt ::=", - /* 150 */ "tags_def_opt ::= tags_def", - /* 151 */ "tags_def ::= TAGS NK_LP column_def_list NK_RP", - /* 152 */ "table_options ::=", - /* 153 */ "table_options ::= table_options COMMENT NK_STRING", - /* 154 */ "table_options ::= table_options KEEP integer_list", - /* 155 */ "table_options ::= table_options KEEP variable_list", - /* 156 */ "table_options ::= table_options TTL NK_INTEGER", - /* 157 */ "table_options ::= table_options SMA NK_LP col_name_list NK_RP", - /* 158 */ "table_options ::= table_options ROLLUP NK_LP func_name_list NK_RP", - /* 159 */ "table_options ::= table_options FILE_FACTOR NK_FLOAT", - /* 160 */ "table_options ::= table_options DELAY NK_INTEGER", - /* 161 */ "alter_table_options ::= alter_table_option", - /* 162 */ "alter_table_options ::= alter_table_options alter_table_option", - /* 163 */ "alter_table_option ::= COMMENT NK_STRING", - /* 164 */ "alter_table_option ::= KEEP integer_list", - /* 165 */ "alter_table_option ::= KEEP variable_list", - /* 166 */ "alter_table_option ::= TTL NK_INTEGER", - /* 167 */ "col_name_list ::= col_name", - /* 168 */ "col_name_list ::= col_name_list NK_COMMA col_name", - /* 169 */ "col_name ::= column_name", - /* 170 */ "cmd ::= SHOW DNODES", - /* 171 */ "cmd ::= SHOW USERS", - /* 172 */ "cmd ::= SHOW DATABASES", - /* 173 */ "cmd ::= SHOW db_name_cond_opt TABLES like_pattern_opt", - /* 174 */ "cmd ::= SHOW db_name_cond_opt STABLES like_pattern_opt", - /* 175 */ "cmd ::= SHOW db_name_cond_opt VGROUPS", - /* 176 */ "cmd ::= SHOW MNODES", - /* 177 */ "cmd ::= SHOW MODULES", - /* 178 */ "cmd ::= SHOW QNODES", - /* 179 */ "cmd ::= SHOW FUNCTIONS", - /* 180 */ "cmd ::= SHOW INDEXES FROM table_name_cond from_db_opt", - /* 181 */ "cmd ::= SHOW STREAMS", - /* 182 */ "cmd ::= SHOW ACCOUNTS", - /* 183 */ "cmd ::= SHOW APPS", - /* 184 */ "cmd ::= SHOW CONNECTIONS", - /* 185 */ "cmd ::= SHOW LICENCE", - /* 186 */ "cmd ::= SHOW GRANTS", - /* 187 */ "cmd ::= SHOW CREATE DATABASE db_name", - /* 188 */ "cmd ::= SHOW CREATE TABLE full_table_name", - /* 189 */ "cmd ::= SHOW CREATE STABLE full_table_name", - /* 190 */ "cmd ::= SHOW QUERIES", - /* 191 */ "cmd ::= SHOW SCORES", - /* 192 */ "cmd ::= SHOW TOPICS", - /* 193 */ "cmd ::= SHOW VARIABLES", - /* 194 */ "cmd ::= SHOW BNODES", - /* 195 */ "cmd ::= SHOW SNODES", - /* 196 */ "db_name_cond_opt ::=", - /* 197 */ "db_name_cond_opt ::= db_name NK_DOT", - /* 198 */ "like_pattern_opt ::=", - /* 199 */ "like_pattern_opt ::= LIKE NK_STRING", - /* 200 */ "table_name_cond ::= table_name", - /* 201 */ "from_db_opt ::=", - /* 202 */ "from_db_opt ::= FROM db_name", - /* 203 */ "func_name_list ::= func_name", - /* 204 */ "func_name_list ::= func_name_list NK_COMMA col_name", - /* 205 */ "func_name ::= function_name", - /* 206 */ "cmd ::= CREATE SMA INDEX not_exists_opt index_name ON table_name index_options", - /* 207 */ "cmd ::= CREATE FULLTEXT INDEX not_exists_opt index_name ON table_name NK_LP col_name_list NK_RP", - /* 208 */ "cmd ::= DROP INDEX exists_opt index_name ON table_name", - /* 209 */ "index_options ::=", - /* 210 */ "index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt", - /* 211 */ "index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt", - /* 212 */ "func_list ::= func", - /* 213 */ "func_list ::= func_list NK_COMMA func", - /* 214 */ "func ::= function_name NK_LP expression_list NK_RP", - /* 215 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression", - /* 216 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name AS db_name", - /* 217 */ "cmd ::= DROP TOPIC exists_opt topic_name", - /* 218 */ "cmd ::= DESC full_table_name", - /* 219 */ "cmd ::= DESCRIBE full_table_name", - /* 220 */ "cmd ::= RESET QUERY CACHE", - /* 221 */ "cmd ::= EXPLAIN analyze_opt explain_options query_expression", - /* 222 */ "analyze_opt ::=", - /* 223 */ "analyze_opt ::= ANALYZE", - /* 224 */ "explain_options ::=", - /* 225 */ "explain_options ::= explain_options VERBOSE NK_BOOL", - /* 226 */ "explain_options ::= explain_options RATIO NK_FLOAT", - /* 227 */ "cmd ::= COMPACT VNODES IN NK_LP integer_list NK_RP", - /* 228 */ "cmd ::= CREATE agg_func_opt FUNCTION function_name AS NK_STRING OUTPUTTYPE type_name bufsize_opt", - /* 229 */ "cmd ::= DROP FUNCTION function_name", - /* 230 */ "agg_func_opt ::=", - /* 231 */ "agg_func_opt ::= AGGREGATE", - /* 232 */ "bufsize_opt ::=", - /* 233 */ "bufsize_opt ::= BUFSIZE NK_INTEGER", - /* 234 */ "cmd ::= CREATE STREAM not_exists_opt stream_name stream_options into_opt AS query_expression", - /* 235 */ "cmd ::= DROP STREAM exists_opt stream_name", - /* 236 */ "into_opt ::=", - /* 237 */ "into_opt ::= INTO full_table_name", - /* 238 */ "stream_options ::=", - /* 239 */ "stream_options ::= stream_options TRIGGER AT_ONCE", - /* 240 */ "stream_options ::= stream_options TRIGGER WINDOW_CLOSE", - /* 241 */ "stream_options ::= stream_options WATERMARK duration_literal", - /* 242 */ "cmd ::= KILL CONNECTION NK_INTEGER", - /* 243 */ "cmd ::= KILL QUERY NK_INTEGER", - /* 244 */ "cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER", - /* 245 */ "cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list", - /* 246 */ "cmd ::= SPLIT VGROUP NK_INTEGER", - /* 247 */ "dnode_list ::= DNODE NK_INTEGER", - /* 248 */ "dnode_list ::= dnode_list DNODE NK_INTEGER", - /* 249 */ "cmd ::= SYNCDB db_name REPLICA", - /* 250 */ "cmd ::= query_expression", - /* 251 */ "literal ::= NK_INTEGER", - /* 252 */ "literal ::= NK_FLOAT", - /* 253 */ "literal ::= NK_STRING", - /* 254 */ "literal ::= NK_BOOL", - /* 255 */ "literal ::= TIMESTAMP NK_STRING", - /* 256 */ "literal ::= duration_literal", - /* 257 */ "literal ::= NULL", - /* 258 */ "literal ::= NK_QUESTION", - /* 259 */ "duration_literal ::= NK_VARIABLE", - /* 260 */ "signed ::= NK_INTEGER", - /* 261 */ "signed ::= NK_PLUS NK_INTEGER", - /* 262 */ "signed ::= NK_MINUS NK_INTEGER", - /* 263 */ "signed ::= NK_FLOAT", - /* 264 */ "signed ::= NK_PLUS NK_FLOAT", - /* 265 */ "signed ::= NK_MINUS NK_FLOAT", - /* 266 */ "signed_literal ::= signed", - /* 267 */ "signed_literal ::= NK_STRING", - /* 268 */ "signed_literal ::= NK_BOOL", - /* 269 */ "signed_literal ::= TIMESTAMP NK_STRING", - /* 270 */ "signed_literal ::= duration_literal", - /* 271 */ "signed_literal ::= NULL", - /* 272 */ "literal_list ::= signed_literal", - /* 273 */ "literal_list ::= literal_list NK_COMMA signed_literal", - /* 274 */ "db_name ::= NK_ID", - /* 275 */ "table_name ::= NK_ID", - /* 276 */ "column_name ::= NK_ID", - /* 277 */ "function_name ::= NK_ID", - /* 278 */ "table_alias ::= NK_ID", - /* 279 */ "column_alias ::= NK_ID", - /* 280 */ "user_name ::= NK_ID", - /* 281 */ "index_name ::= NK_ID", - /* 282 */ "topic_name ::= NK_ID", - /* 283 */ "stream_name ::= NK_ID", - /* 284 */ "expression ::= literal", - /* 285 */ "expression ::= pseudo_column", - /* 286 */ "expression ::= column_reference", - /* 287 */ "expression ::= function_expression", - /* 288 */ "expression ::= subquery", - /* 289 */ "expression ::= NK_LP expression NK_RP", - /* 290 */ "expression ::= NK_PLUS expression", - /* 291 */ "expression ::= NK_MINUS expression", - /* 292 */ "expression ::= expression NK_PLUS expression", - /* 293 */ "expression ::= expression NK_MINUS expression", - /* 294 */ "expression ::= expression NK_STAR expression", - /* 295 */ "expression ::= expression NK_SLASH expression", - /* 296 */ "expression ::= expression NK_REM expression", - /* 297 */ "expression ::= column_reference NK_ARROW NK_STRING", - /* 298 */ "expression_list ::= expression", - /* 299 */ "expression_list ::= expression_list NK_COMMA expression", - /* 300 */ "column_reference ::= column_name", - /* 301 */ "column_reference ::= table_name NK_DOT column_name", - /* 302 */ "pseudo_column ::= ROWTS", - /* 303 */ "pseudo_column ::= TBNAME", - /* 304 */ "pseudo_column ::= QSTARTTS", - /* 305 */ "pseudo_column ::= QENDTS", - /* 306 */ "pseudo_column ::= WSTARTTS", - /* 307 */ "pseudo_column ::= WENDTS", - /* 308 */ "pseudo_column ::= WDURATION", - /* 309 */ "function_expression ::= function_name NK_LP expression_list NK_RP", - /* 310 */ "function_expression ::= star_func NK_LP star_func_para_list NK_RP", - /* 311 */ "function_expression ::= CAST NK_LP expression AS type_name NK_RP", - /* 312 */ "function_expression ::= noarg_func NK_LP NK_RP", - /* 313 */ "noarg_func ::= NOW", - /* 314 */ "noarg_func ::= TODAY", - /* 315 */ "noarg_func ::= TIMEZONE", - /* 316 */ "star_func ::= COUNT", - /* 317 */ "star_func ::= FIRST", - /* 318 */ "star_func ::= LAST", - /* 319 */ "star_func ::= LAST_ROW", - /* 320 */ "star_func_para_list ::= NK_STAR", - /* 321 */ "star_func_para_list ::= other_para_list", - /* 322 */ "other_para_list ::= star_func_para", - /* 323 */ "other_para_list ::= other_para_list NK_COMMA star_func_para", - /* 324 */ "star_func_para ::= expression", - /* 325 */ "star_func_para ::= table_name NK_DOT NK_STAR", - /* 326 */ "predicate ::= expression compare_op expression", - /* 327 */ "predicate ::= expression BETWEEN expression AND expression", - /* 328 */ "predicate ::= expression NOT BETWEEN expression AND expression", - /* 329 */ "predicate ::= expression IS NULL", - /* 330 */ "predicate ::= expression IS NOT NULL", - /* 331 */ "predicate ::= expression in_op in_predicate_value", - /* 332 */ "compare_op ::= NK_LT", - /* 333 */ "compare_op ::= NK_GT", - /* 334 */ "compare_op ::= NK_LE", - /* 335 */ "compare_op ::= NK_GE", - /* 336 */ "compare_op ::= NK_NE", - /* 337 */ "compare_op ::= NK_EQ", - /* 338 */ "compare_op ::= LIKE", - /* 339 */ "compare_op ::= NOT LIKE", - /* 340 */ "compare_op ::= MATCH", - /* 341 */ "compare_op ::= NMATCH", - /* 342 */ "compare_op ::= CONTAINS", - /* 343 */ "in_op ::= IN", - /* 344 */ "in_op ::= NOT IN", - /* 345 */ "in_predicate_value ::= NK_LP expression_list NK_RP", - /* 346 */ "boolean_value_expression ::= boolean_primary", - /* 347 */ "boolean_value_expression ::= NOT boolean_primary", - /* 348 */ "boolean_value_expression ::= boolean_value_expression OR boolean_value_expression", - /* 349 */ "boolean_value_expression ::= boolean_value_expression AND boolean_value_expression", - /* 350 */ "boolean_primary ::= predicate", - /* 351 */ "boolean_primary ::= NK_LP boolean_value_expression NK_RP", - /* 352 */ "common_expression ::= expression", - /* 353 */ "common_expression ::= boolean_value_expression", - /* 354 */ "from_clause ::= FROM table_reference_list", - /* 355 */ "table_reference_list ::= table_reference", - /* 356 */ "table_reference_list ::= table_reference_list NK_COMMA table_reference", - /* 357 */ "table_reference ::= table_primary", - /* 358 */ "table_reference ::= joined_table", - /* 359 */ "table_primary ::= table_name alias_opt", - /* 360 */ "table_primary ::= db_name NK_DOT table_name alias_opt", - /* 361 */ "table_primary ::= subquery alias_opt", - /* 362 */ "table_primary ::= parenthesized_joined_table", - /* 363 */ "alias_opt ::=", - /* 364 */ "alias_opt ::= table_alias", - /* 365 */ "alias_opt ::= AS table_alias", - /* 366 */ "parenthesized_joined_table ::= NK_LP joined_table NK_RP", - /* 367 */ "parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP", - /* 368 */ "joined_table ::= table_reference join_type JOIN table_reference ON search_condition", - /* 369 */ "join_type ::=", - /* 370 */ "join_type ::= INNER", - /* 371 */ "query_specification ::= SELECT set_quantifier_opt select_list from_clause where_clause_opt partition_by_clause_opt twindow_clause_opt group_by_clause_opt having_clause_opt", - /* 372 */ "set_quantifier_opt ::=", - /* 373 */ "set_quantifier_opt ::= DISTINCT", - /* 374 */ "set_quantifier_opt ::= ALL", - /* 375 */ "select_list ::= NK_STAR", - /* 376 */ "select_list ::= select_sublist", - /* 377 */ "select_sublist ::= select_item", - /* 378 */ "select_sublist ::= select_sublist NK_COMMA select_item", - /* 379 */ "select_item ::= common_expression", - /* 380 */ "select_item ::= common_expression column_alias", - /* 381 */ "select_item ::= common_expression AS column_alias", - /* 382 */ "select_item ::= table_name NK_DOT NK_STAR", - /* 383 */ "where_clause_opt ::=", - /* 384 */ "where_clause_opt ::= WHERE search_condition", - /* 385 */ "partition_by_clause_opt ::=", - /* 386 */ "partition_by_clause_opt ::= PARTITION BY expression_list", - /* 387 */ "twindow_clause_opt ::=", - /* 388 */ "twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP", - /* 389 */ "twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP", - /* 390 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt", - /* 391 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt", - /* 392 */ "sliding_opt ::=", - /* 393 */ "sliding_opt ::= SLIDING NK_LP duration_literal NK_RP", - /* 394 */ "fill_opt ::=", - /* 395 */ "fill_opt ::= FILL NK_LP fill_mode NK_RP", - /* 396 */ "fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP", - /* 397 */ "fill_mode ::= NONE", - /* 398 */ "fill_mode ::= PREV", - /* 399 */ "fill_mode ::= NULL", - /* 400 */ "fill_mode ::= LINEAR", - /* 401 */ "fill_mode ::= NEXT", - /* 402 */ "group_by_clause_opt ::=", - /* 403 */ "group_by_clause_opt ::= GROUP BY group_by_list", - /* 404 */ "group_by_list ::= expression", - /* 405 */ "group_by_list ::= group_by_list NK_COMMA expression", - /* 406 */ "having_clause_opt ::=", - /* 407 */ "having_clause_opt ::= HAVING search_condition", - /* 408 */ "query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt", - /* 409 */ "query_expression_body ::= query_primary", - /* 410 */ "query_expression_body ::= query_expression_body UNION ALL query_expression_body", - /* 411 */ "query_primary ::= query_specification", - /* 412 */ "order_by_clause_opt ::=", - /* 413 */ "order_by_clause_opt ::= ORDER BY sort_specification_list", - /* 414 */ "slimit_clause_opt ::=", - /* 415 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER", - /* 416 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER", - /* 417 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER", - /* 418 */ "limit_clause_opt ::=", - /* 419 */ "limit_clause_opt ::= LIMIT NK_INTEGER", - /* 420 */ "limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER", - /* 421 */ "limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER", - /* 422 */ "subquery ::= NK_LP query_expression NK_RP", - /* 423 */ "search_condition ::= common_expression", - /* 424 */ "sort_specification_list ::= sort_specification", - /* 425 */ "sort_specification_list ::= sort_specification_list NK_COMMA sort_specification", - /* 426 */ "sort_specification ::= expression ordering_specification_opt null_ordering_opt", - /* 427 */ "ordering_specification_opt ::=", - /* 428 */ "ordering_specification_opt ::= ASC", - /* 429 */ "ordering_specification_opt ::= DESC", - /* 430 */ "null_ordering_opt ::=", - /* 431 */ "null_ordering_opt ::= NULLS FIRST", - /* 432 */ "null_ordering_opt ::= NULLS LAST", + /* 78 */ "db_options ::= db_options STRICT NK_INTEGER", + /* 79 */ "alter_db_options ::= alter_db_option", + /* 80 */ "alter_db_options ::= alter_db_options alter_db_option", + /* 81 */ "alter_db_option ::= BLOCKS NK_INTEGER", + /* 82 */ "alter_db_option ::= FSYNC NK_INTEGER", + /* 83 */ "alter_db_option ::= KEEP integer_list", + /* 84 */ "alter_db_option ::= KEEP variable_list", + /* 85 */ "alter_db_option ::= WAL NK_INTEGER", + /* 86 */ "alter_db_option ::= QUORUM NK_INTEGER", + /* 87 */ "alter_db_option ::= CACHELAST NK_INTEGER", + /* 88 */ "alter_db_option ::= REPLICA NK_INTEGER", + /* 89 */ "alter_db_option ::= STRICT NK_INTEGER", + /* 90 */ "integer_list ::= NK_INTEGER", + /* 91 */ "integer_list ::= integer_list NK_COMMA NK_INTEGER", + /* 92 */ "variable_list ::= NK_VARIABLE", + /* 93 */ "variable_list ::= variable_list NK_COMMA NK_VARIABLE", + /* 94 */ "retention_list ::= retention", + /* 95 */ "retention_list ::= retention_list NK_COMMA retention", + /* 96 */ "retention ::= NK_VARIABLE NK_COLON NK_VARIABLE", + /* 97 */ "cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options", + /* 98 */ "cmd ::= CREATE TABLE multi_create_clause", + /* 99 */ "cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options", + /* 100 */ "cmd ::= DROP TABLE multi_drop_clause", + /* 101 */ "cmd ::= DROP STABLE exists_opt full_table_name", + /* 102 */ "cmd ::= ALTER TABLE alter_table_clause", + /* 103 */ "cmd ::= ALTER STABLE alter_table_clause", + /* 104 */ "alter_table_clause ::= full_table_name alter_table_options", + /* 105 */ "alter_table_clause ::= full_table_name ADD COLUMN column_name type_name", + /* 106 */ "alter_table_clause ::= full_table_name DROP COLUMN column_name", + /* 107 */ "alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name", + /* 108 */ "alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name", + /* 109 */ "alter_table_clause ::= full_table_name ADD TAG column_name type_name", + /* 110 */ "alter_table_clause ::= full_table_name DROP TAG column_name", + /* 111 */ "alter_table_clause ::= full_table_name MODIFY TAG column_name type_name", + /* 112 */ "alter_table_clause ::= full_table_name RENAME TAG column_name column_name", + /* 113 */ "alter_table_clause ::= full_table_name SET TAG column_name NK_EQ literal", + /* 114 */ "multi_create_clause ::= create_subtable_clause", + /* 115 */ "multi_create_clause ::= multi_create_clause create_subtable_clause", + /* 116 */ "create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_tags_opt TAGS NK_LP literal_list NK_RP", + /* 117 */ "multi_drop_clause ::= drop_table_clause", + /* 118 */ "multi_drop_clause ::= multi_drop_clause drop_table_clause", + /* 119 */ "drop_table_clause ::= exists_opt full_table_name", + /* 120 */ "specific_tags_opt ::=", + /* 121 */ "specific_tags_opt ::= NK_LP col_name_list NK_RP", + /* 122 */ "full_table_name ::= table_name", + /* 123 */ "full_table_name ::= db_name NK_DOT table_name", + /* 124 */ "column_def_list ::= column_def", + /* 125 */ "column_def_list ::= column_def_list NK_COMMA column_def", + /* 126 */ "column_def ::= column_name type_name", + /* 127 */ "column_def ::= column_name type_name COMMENT NK_STRING", + /* 128 */ "type_name ::= BOOL", + /* 129 */ "type_name ::= TINYINT", + /* 130 */ "type_name ::= SMALLINT", + /* 131 */ "type_name ::= INT", + /* 132 */ "type_name ::= INTEGER", + /* 133 */ "type_name ::= BIGINT", + /* 134 */ "type_name ::= FLOAT", + /* 135 */ "type_name ::= DOUBLE", + /* 136 */ "type_name ::= BINARY NK_LP NK_INTEGER NK_RP", + /* 137 */ "type_name ::= TIMESTAMP", + /* 138 */ "type_name ::= NCHAR NK_LP NK_INTEGER NK_RP", + /* 139 */ "type_name ::= TINYINT UNSIGNED", + /* 140 */ "type_name ::= SMALLINT UNSIGNED", + /* 141 */ "type_name ::= INT UNSIGNED", + /* 142 */ "type_name ::= BIGINT UNSIGNED", + /* 143 */ "type_name ::= JSON", + /* 144 */ "type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP", + /* 145 */ "type_name ::= MEDIUMBLOB", + /* 146 */ "type_name ::= BLOB", + /* 147 */ "type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP", + /* 148 */ "type_name ::= DECIMAL", + /* 149 */ "type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP", + /* 150 */ "type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP", + /* 151 */ "tags_def_opt ::=", + /* 152 */ "tags_def_opt ::= tags_def", + /* 153 */ "tags_def ::= TAGS NK_LP column_def_list NK_RP", + /* 154 */ "table_options ::=", + /* 155 */ "table_options ::= table_options COMMENT NK_STRING", + /* 156 */ "table_options ::= table_options KEEP integer_list", + /* 157 */ "table_options ::= table_options KEEP variable_list", + /* 158 */ "table_options ::= table_options TTL NK_INTEGER", + /* 159 */ "table_options ::= table_options SMA NK_LP col_name_list NK_RP", + /* 160 */ "table_options ::= table_options ROLLUP NK_LP func_name_list NK_RP", + /* 161 */ "table_options ::= table_options FILE_FACTOR NK_FLOAT", + /* 162 */ "table_options ::= table_options DELAY NK_INTEGER", + /* 163 */ "alter_table_options ::= alter_table_option", + /* 164 */ "alter_table_options ::= alter_table_options alter_table_option", + /* 165 */ "alter_table_option ::= COMMENT NK_STRING", + /* 166 */ "alter_table_option ::= KEEP integer_list", + /* 167 */ "alter_table_option ::= KEEP variable_list", + /* 168 */ "alter_table_option ::= TTL NK_INTEGER", + /* 169 */ "col_name_list ::= col_name", + /* 170 */ "col_name_list ::= col_name_list NK_COMMA col_name", + /* 171 */ "col_name ::= column_name", + /* 172 */ "cmd ::= SHOW DNODES", + /* 173 */ "cmd ::= SHOW USERS", + /* 174 */ "cmd ::= SHOW DATABASES", + /* 175 */ "cmd ::= SHOW db_name_cond_opt TABLES like_pattern_opt", + /* 176 */ "cmd ::= SHOW db_name_cond_opt STABLES like_pattern_opt", + /* 177 */ "cmd ::= SHOW db_name_cond_opt VGROUPS", + /* 178 */ "cmd ::= SHOW MNODES", + /* 179 */ "cmd ::= SHOW MODULES", + /* 180 */ "cmd ::= SHOW QNODES", + /* 181 */ "cmd ::= SHOW FUNCTIONS", + /* 182 */ "cmd ::= SHOW INDEXES FROM table_name_cond from_db_opt", + /* 183 */ "cmd ::= SHOW STREAMS", + /* 184 */ "cmd ::= SHOW ACCOUNTS", + /* 185 */ "cmd ::= SHOW APPS", + /* 186 */ "cmd ::= SHOW CONNECTIONS", + /* 187 */ "cmd ::= SHOW LICENCE", + /* 188 */ "cmd ::= SHOW GRANTS", + /* 189 */ "cmd ::= SHOW CREATE DATABASE db_name", + /* 190 */ "cmd ::= SHOW CREATE TABLE full_table_name", + /* 191 */ "cmd ::= SHOW CREATE STABLE full_table_name", + /* 192 */ "cmd ::= SHOW QUERIES", + /* 193 */ "cmd ::= SHOW SCORES", + /* 194 */ "cmd ::= SHOW TOPICS", + /* 195 */ "cmd ::= SHOW VARIABLES", + /* 196 */ "cmd ::= SHOW BNODES", + /* 197 */ "cmd ::= SHOW SNODES", + /* 198 */ "db_name_cond_opt ::=", + /* 199 */ "db_name_cond_opt ::= db_name NK_DOT", + /* 200 */ "like_pattern_opt ::=", + /* 201 */ "like_pattern_opt ::= LIKE NK_STRING", + /* 202 */ "table_name_cond ::= table_name", + /* 203 */ "from_db_opt ::=", + /* 204 */ "from_db_opt ::= FROM db_name", + /* 205 */ "func_name_list ::= func_name", + /* 206 */ "func_name_list ::= func_name_list NK_COMMA func_name", + /* 207 */ "func_name ::= function_name", + /* 208 */ "cmd ::= CREATE SMA INDEX not_exists_opt index_name ON table_name index_options", + /* 209 */ "cmd ::= CREATE FULLTEXT INDEX not_exists_opt index_name ON table_name NK_LP col_name_list NK_RP", + /* 210 */ "cmd ::= DROP INDEX exists_opt index_name ON table_name", + /* 211 */ "index_options ::=", + /* 212 */ "index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt", + /* 213 */ "index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt", + /* 214 */ "func_list ::= func", + /* 215 */ "func_list ::= func_list NK_COMMA func", + /* 216 */ "func ::= function_name NK_LP expression_list NK_RP", + /* 217 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression", + /* 218 */ "cmd ::= CREATE TOPIC not_exists_opt topic_name AS db_name", + /* 219 */ "cmd ::= DROP TOPIC exists_opt topic_name", + /* 220 */ "cmd ::= DESC full_table_name", + /* 221 */ "cmd ::= DESCRIBE full_table_name", + /* 222 */ "cmd ::= RESET QUERY CACHE", + /* 223 */ "cmd ::= EXPLAIN analyze_opt explain_options query_expression", + /* 224 */ "analyze_opt ::=", + /* 225 */ "analyze_opt ::= ANALYZE", + /* 226 */ "explain_options ::=", + /* 227 */ "explain_options ::= explain_options VERBOSE NK_BOOL", + /* 228 */ "explain_options ::= explain_options RATIO NK_FLOAT", + /* 229 */ "cmd ::= COMPACT VNODES IN NK_LP integer_list NK_RP", + /* 230 */ "cmd ::= CREATE agg_func_opt FUNCTION function_name AS NK_STRING OUTPUTTYPE type_name bufsize_opt", + /* 231 */ "cmd ::= DROP FUNCTION function_name", + /* 232 */ "agg_func_opt ::=", + /* 233 */ "agg_func_opt ::= AGGREGATE", + /* 234 */ "bufsize_opt ::=", + /* 235 */ "bufsize_opt ::= BUFSIZE NK_INTEGER", + /* 236 */ "cmd ::= CREATE STREAM not_exists_opt stream_name stream_options into_opt AS query_expression", + /* 237 */ "cmd ::= DROP STREAM exists_opt stream_name", + /* 238 */ "into_opt ::=", + /* 239 */ "into_opt ::= INTO full_table_name", + /* 240 */ "stream_options ::=", + /* 241 */ "stream_options ::= stream_options TRIGGER AT_ONCE", + /* 242 */ "stream_options ::= stream_options TRIGGER WINDOW_CLOSE", + /* 243 */ "stream_options ::= stream_options WATERMARK duration_literal", + /* 244 */ "cmd ::= KILL CONNECTION NK_INTEGER", + /* 245 */ "cmd ::= KILL QUERY NK_INTEGER", + /* 246 */ "cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER", + /* 247 */ "cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list", + /* 248 */ "cmd ::= SPLIT VGROUP NK_INTEGER", + /* 249 */ "dnode_list ::= DNODE NK_INTEGER", + /* 250 */ "dnode_list ::= dnode_list DNODE NK_INTEGER", + /* 251 */ "cmd ::= SYNCDB db_name REPLICA", + /* 252 */ "cmd ::= query_expression", + /* 253 */ "literal ::= NK_INTEGER", + /* 254 */ "literal ::= NK_FLOAT", + /* 255 */ "literal ::= NK_STRING", + /* 256 */ "literal ::= NK_BOOL", + /* 257 */ "literal ::= TIMESTAMP NK_STRING", + /* 258 */ "literal ::= duration_literal", + /* 259 */ "literal ::= NULL", + /* 260 */ "literal ::= NK_QUESTION", + /* 261 */ "duration_literal ::= NK_VARIABLE", + /* 262 */ "signed ::= NK_INTEGER", + /* 263 */ "signed ::= NK_PLUS NK_INTEGER", + /* 264 */ "signed ::= NK_MINUS NK_INTEGER", + /* 265 */ "signed ::= NK_FLOAT", + /* 266 */ "signed ::= NK_PLUS NK_FLOAT", + /* 267 */ "signed ::= NK_MINUS NK_FLOAT", + /* 268 */ "signed_literal ::= signed", + /* 269 */ "signed_literal ::= NK_STRING", + /* 270 */ "signed_literal ::= NK_BOOL", + /* 271 */ "signed_literal ::= TIMESTAMP NK_STRING", + /* 272 */ "signed_literal ::= duration_literal", + /* 273 */ "signed_literal ::= NULL", + /* 274 */ "literal_list ::= signed_literal", + /* 275 */ "literal_list ::= literal_list NK_COMMA signed_literal", + /* 276 */ "db_name ::= NK_ID", + /* 277 */ "table_name ::= NK_ID", + /* 278 */ "column_name ::= NK_ID", + /* 279 */ "function_name ::= NK_ID", + /* 280 */ "table_alias ::= NK_ID", + /* 281 */ "column_alias ::= NK_ID", + /* 282 */ "user_name ::= NK_ID", + /* 283 */ "index_name ::= NK_ID", + /* 284 */ "topic_name ::= NK_ID", + /* 285 */ "stream_name ::= NK_ID", + /* 286 */ "expression ::= literal", + /* 287 */ "expression ::= pseudo_column", + /* 288 */ "expression ::= column_reference", + /* 289 */ "expression ::= function_expression", + /* 290 */ "expression ::= subquery", + /* 291 */ "expression ::= NK_LP expression NK_RP", + /* 292 */ "expression ::= NK_PLUS expression", + /* 293 */ "expression ::= NK_MINUS expression", + /* 294 */ "expression ::= expression NK_PLUS expression", + /* 295 */ "expression ::= expression NK_MINUS expression", + /* 296 */ "expression ::= expression NK_STAR expression", + /* 297 */ "expression ::= expression NK_SLASH expression", + /* 298 */ "expression ::= expression NK_REM expression", + /* 299 */ "expression ::= column_reference NK_ARROW NK_STRING", + /* 300 */ "expression_list ::= expression", + /* 301 */ "expression_list ::= expression_list NK_COMMA expression", + /* 302 */ "column_reference ::= column_name", + /* 303 */ "column_reference ::= table_name NK_DOT column_name", + /* 304 */ "pseudo_column ::= ROWTS", + /* 305 */ "pseudo_column ::= TBNAME", + /* 306 */ "pseudo_column ::= QSTARTTS", + /* 307 */ "pseudo_column ::= QENDTS", + /* 308 */ "pseudo_column ::= WSTARTTS", + /* 309 */ "pseudo_column ::= WENDTS", + /* 310 */ "pseudo_column ::= WDURATION", + /* 311 */ "function_expression ::= function_name NK_LP expression_list NK_RP", + /* 312 */ "function_expression ::= star_func NK_LP star_func_para_list NK_RP", + /* 313 */ "function_expression ::= CAST NK_LP expression AS type_name NK_RP", + /* 314 */ "function_expression ::= noarg_func NK_LP NK_RP", + /* 315 */ "noarg_func ::= NOW", + /* 316 */ "noarg_func ::= TODAY", + /* 317 */ "noarg_func ::= TIMEZONE", + /* 318 */ "star_func ::= COUNT", + /* 319 */ "star_func ::= FIRST", + /* 320 */ "star_func ::= LAST", + /* 321 */ "star_func ::= LAST_ROW", + /* 322 */ "star_func_para_list ::= NK_STAR", + /* 323 */ "star_func_para_list ::= other_para_list", + /* 324 */ "other_para_list ::= star_func_para", + /* 325 */ "other_para_list ::= other_para_list NK_COMMA star_func_para", + /* 326 */ "star_func_para ::= expression", + /* 327 */ "star_func_para ::= table_name NK_DOT NK_STAR", + /* 328 */ "predicate ::= expression compare_op expression", + /* 329 */ "predicate ::= expression BETWEEN expression AND expression", + /* 330 */ "predicate ::= expression NOT BETWEEN expression AND expression", + /* 331 */ "predicate ::= expression IS NULL", + /* 332 */ "predicate ::= expression IS NOT NULL", + /* 333 */ "predicate ::= expression in_op in_predicate_value", + /* 334 */ "compare_op ::= NK_LT", + /* 335 */ "compare_op ::= NK_GT", + /* 336 */ "compare_op ::= NK_LE", + /* 337 */ "compare_op ::= NK_GE", + /* 338 */ "compare_op ::= NK_NE", + /* 339 */ "compare_op ::= NK_EQ", + /* 340 */ "compare_op ::= LIKE", + /* 341 */ "compare_op ::= NOT LIKE", + /* 342 */ "compare_op ::= MATCH", + /* 343 */ "compare_op ::= NMATCH", + /* 344 */ "compare_op ::= CONTAINS", + /* 345 */ "in_op ::= IN", + /* 346 */ "in_op ::= NOT IN", + /* 347 */ "in_predicate_value ::= NK_LP expression_list NK_RP", + /* 348 */ "boolean_value_expression ::= boolean_primary", + /* 349 */ "boolean_value_expression ::= NOT boolean_primary", + /* 350 */ "boolean_value_expression ::= boolean_value_expression OR boolean_value_expression", + /* 351 */ "boolean_value_expression ::= boolean_value_expression AND boolean_value_expression", + /* 352 */ "boolean_primary ::= predicate", + /* 353 */ "boolean_primary ::= NK_LP boolean_value_expression NK_RP", + /* 354 */ "common_expression ::= expression", + /* 355 */ "common_expression ::= boolean_value_expression", + /* 356 */ "from_clause ::= FROM table_reference_list", + /* 357 */ "table_reference_list ::= table_reference", + /* 358 */ "table_reference_list ::= table_reference_list NK_COMMA table_reference", + /* 359 */ "table_reference ::= table_primary", + /* 360 */ "table_reference ::= joined_table", + /* 361 */ "table_primary ::= table_name alias_opt", + /* 362 */ "table_primary ::= db_name NK_DOT table_name alias_opt", + /* 363 */ "table_primary ::= subquery alias_opt", + /* 364 */ "table_primary ::= parenthesized_joined_table", + /* 365 */ "alias_opt ::=", + /* 366 */ "alias_opt ::= table_alias", + /* 367 */ "alias_opt ::= AS table_alias", + /* 368 */ "parenthesized_joined_table ::= NK_LP joined_table NK_RP", + /* 369 */ "parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP", + /* 370 */ "joined_table ::= table_reference join_type JOIN table_reference ON search_condition", + /* 371 */ "join_type ::=", + /* 372 */ "join_type ::= INNER", + /* 373 */ "query_specification ::= SELECT set_quantifier_opt select_list from_clause where_clause_opt partition_by_clause_opt twindow_clause_opt group_by_clause_opt having_clause_opt", + /* 374 */ "set_quantifier_opt ::=", + /* 375 */ "set_quantifier_opt ::= DISTINCT", + /* 376 */ "set_quantifier_opt ::= ALL", + /* 377 */ "select_list ::= NK_STAR", + /* 378 */ "select_list ::= select_sublist", + /* 379 */ "select_sublist ::= select_item", + /* 380 */ "select_sublist ::= select_sublist NK_COMMA select_item", + /* 381 */ "select_item ::= common_expression", + /* 382 */ "select_item ::= common_expression column_alias", + /* 383 */ "select_item ::= common_expression AS column_alias", + /* 384 */ "select_item ::= table_name NK_DOT NK_STAR", + /* 385 */ "where_clause_opt ::=", + /* 386 */ "where_clause_opt ::= WHERE search_condition", + /* 387 */ "partition_by_clause_opt ::=", + /* 388 */ "partition_by_clause_opt ::= PARTITION BY expression_list", + /* 389 */ "twindow_clause_opt ::=", + /* 390 */ "twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP", + /* 391 */ "twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP", + /* 392 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt", + /* 393 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt", + /* 394 */ "sliding_opt ::=", + /* 395 */ "sliding_opt ::= SLIDING NK_LP duration_literal NK_RP", + /* 396 */ "fill_opt ::=", + /* 397 */ "fill_opt ::= FILL NK_LP fill_mode NK_RP", + /* 398 */ "fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP", + /* 399 */ "fill_mode ::= NONE", + /* 400 */ "fill_mode ::= PREV", + /* 401 */ "fill_mode ::= NULL", + /* 402 */ "fill_mode ::= LINEAR", + /* 403 */ "fill_mode ::= NEXT", + /* 404 */ "group_by_clause_opt ::=", + /* 405 */ "group_by_clause_opt ::= GROUP BY group_by_list", + /* 406 */ "group_by_list ::= expression", + /* 407 */ "group_by_list ::= group_by_list NK_COMMA expression", + /* 408 */ "having_clause_opt ::=", + /* 409 */ "having_clause_opt ::= HAVING search_condition", + /* 410 */ "query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt", + /* 411 */ "query_expression_body ::= query_primary", + /* 412 */ "query_expression_body ::= query_expression_body UNION ALL query_expression_body", + /* 413 */ "query_primary ::= query_specification", + /* 414 */ "order_by_clause_opt ::=", + /* 415 */ "order_by_clause_opt ::= ORDER BY sort_specification_list", + /* 416 */ "slimit_clause_opt ::=", + /* 417 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER", + /* 418 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER", + /* 419 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER", + /* 420 */ "limit_clause_opt ::=", + /* 421 */ "limit_clause_opt ::= LIMIT NK_INTEGER", + /* 422 */ "limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER", + /* 423 */ "limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER", + /* 424 */ "subquery ::= NK_LP query_expression NK_RP", + /* 425 */ "search_condition ::= common_expression", + /* 426 */ "sort_specification_list ::= sort_specification", + /* 427 */ "sort_specification_list ::= sort_specification_list NK_COMMA sort_specification", + /* 428 */ "sort_specification ::= expression ordering_specification_opt null_ordering_opt", + /* 429 */ "ordering_specification_opt ::=", + /* 430 */ "ordering_specification_opt ::= ASC", + /* 431 */ "ordering_specification_opt ::= DESC", + /* 432 */ "null_ordering_opt ::=", + /* 433 */ "null_ordering_opt ::= NULLS FIRST", + /* 434 */ "null_ordering_opt ::= NULLS LAST", }; #endif /* NDEBUG */ @@ -1743,164 +1748,164 @@ static void yy_destructor( */ /********* Begin destructor definitions ***************************************/ /* Default NON-TERMINAL Destructor */ - case 220: /* cmd */ - case 223: /* literal */ - case 230: /* db_options */ - case 232: /* alter_db_options */ - case 237: /* retention */ - case 238: /* full_table_name */ - case 241: /* table_options */ - case 245: /* alter_table_clause */ - case 246: /* alter_table_options */ - case 249: /* create_subtable_clause */ - case 252: /* drop_table_clause */ - case 255: /* column_def */ - case 258: /* col_name */ - case 259: /* db_name_cond_opt */ - case 260: /* like_pattern_opt */ - case 261: /* table_name_cond */ - case 262: /* from_db_opt */ - case 263: /* func_name */ - case 266: /* index_options */ - case 268: /* duration_literal */ - case 269: /* sliding_opt */ - case 270: /* func */ - case 273: /* query_expression */ - case 275: /* explain_options */ - case 279: /* stream_options */ - case 280: /* into_opt */ - case 282: /* signed */ - case 283: /* signed_literal */ - case 286: /* expression */ - case 287: /* pseudo_column */ - case 288: /* column_reference */ - case 289: /* function_expression */ - case 290: /* subquery */ - case 295: /* star_func_para */ - case 296: /* predicate */ - case 299: /* in_predicate_value */ - case 300: /* boolean_value_expression */ - case 301: /* boolean_primary */ - case 302: /* common_expression */ - case 303: /* from_clause */ - case 304: /* table_reference_list */ - case 305: /* table_reference */ - case 306: /* table_primary */ - case 307: /* joined_table */ - case 309: /* parenthesized_joined_table */ - case 311: /* search_condition */ - case 312: /* query_specification */ - case 315: /* where_clause_opt */ - case 317: /* twindow_clause_opt */ - case 319: /* having_clause_opt */ - case 321: /* select_item */ - case 322: /* fill_opt */ - case 325: /* query_expression_body */ - case 327: /* slimit_clause_opt */ - case 328: /* limit_clause_opt */ - case 329: /* query_primary */ - case 331: /* sort_specification */ + case 221: /* cmd */ + case 224: /* literal */ + case 231: /* db_options */ + case 233: /* alter_db_options */ + case 238: /* retention */ + case 239: /* full_table_name */ + case 242: /* table_options */ + case 246: /* alter_table_clause */ + case 247: /* alter_table_options */ + case 250: /* create_subtable_clause */ + case 253: /* drop_table_clause */ + case 256: /* column_def */ + case 259: /* col_name */ + case 260: /* db_name_cond_opt */ + case 261: /* like_pattern_opt */ + case 262: /* table_name_cond */ + case 263: /* from_db_opt */ + case 264: /* func_name */ + case 267: /* index_options */ + case 269: /* duration_literal */ + case 270: /* sliding_opt */ + case 271: /* func */ + case 274: /* query_expression */ + case 276: /* explain_options */ + case 280: /* stream_options */ + case 281: /* into_opt */ + case 283: /* signed */ + case 284: /* signed_literal */ + case 287: /* expression */ + case 288: /* pseudo_column */ + case 289: /* column_reference */ + case 290: /* function_expression */ + case 291: /* subquery */ + case 296: /* star_func_para */ + case 297: /* predicate */ + case 300: /* in_predicate_value */ + case 301: /* boolean_value_expression */ + case 302: /* boolean_primary */ + case 303: /* common_expression */ + case 304: /* from_clause */ + case 305: /* table_reference_list */ + case 306: /* table_reference */ + case 307: /* table_primary */ + case 308: /* joined_table */ + case 310: /* parenthesized_joined_table */ + case 312: /* search_condition */ + case 313: /* query_specification */ + case 316: /* where_clause_opt */ + case 318: /* twindow_clause_opt */ + case 320: /* having_clause_opt */ + case 322: /* select_item */ + case 323: /* fill_opt */ + case 326: /* query_expression_body */ + case 328: /* slimit_clause_opt */ + case 329: /* limit_clause_opt */ + case 330: /* query_primary */ + case 332: /* sort_specification */ { - nodesDestroyNode((yypminor->yy456)); + nodesDestroyNode((yypminor->yy42)); } break; - case 221: /* account_options */ - case 222: /* alter_account_options */ - case 224: /* alter_account_option */ - case 277: /* bufsize_opt */ + case 222: /* account_options */ + case 223: /* alter_account_options */ + case 225: /* alter_account_option */ + case 278: /* bufsize_opt */ { } break; - case 225: /* user_name */ - case 226: /* dnode_endpoint */ - case 227: /* dnode_host_name */ - case 229: /* db_name */ - case 247: /* column_name */ - case 254: /* table_name */ - case 264: /* function_name */ - case 265: /* index_name */ - case 272: /* topic_name */ - case 278: /* stream_name */ - case 284: /* table_alias */ - case 285: /* column_alias */ - case 291: /* star_func */ - case 293: /* noarg_func */ - case 308: /* alias_opt */ + case 226: /* user_name */ + case 227: /* dnode_endpoint */ + case 228: /* dnode_host_name */ + case 230: /* db_name */ + case 248: /* column_name */ + case 255: /* table_name */ + case 265: /* function_name */ + case 266: /* index_name */ + case 273: /* topic_name */ + case 279: /* stream_name */ + case 285: /* table_alias */ + case 286: /* column_alias */ + case 292: /* star_func */ + case 294: /* noarg_func */ + case 309: /* alias_opt */ { } break; - case 228: /* not_exists_opt */ - case 231: /* exists_opt */ - case 274: /* analyze_opt */ - case 276: /* agg_func_opt */ - case 313: /* set_quantifier_opt */ + case 229: /* not_exists_opt */ + case 232: /* exists_opt */ + case 275: /* analyze_opt */ + case 277: /* agg_func_opt */ + case 314: /* set_quantifier_opt */ { } break; - case 233: /* integer_list */ - case 234: /* variable_list */ - case 235: /* retention_list */ - case 239: /* column_def_list */ - case 240: /* tags_def_opt */ - case 242: /* multi_create_clause */ - case 243: /* tags_def */ - case 244: /* multi_drop_clause */ - case 250: /* specific_tags_opt */ - case 251: /* literal_list */ - case 253: /* col_name_list */ - case 256: /* func_name_list */ - case 267: /* func_list */ - case 271: /* expression_list */ - case 281: /* dnode_list */ - case 292: /* star_func_para_list */ - case 294: /* other_para_list */ - case 314: /* select_list */ - case 316: /* partition_by_clause_opt */ - case 318: /* group_by_clause_opt */ - case 320: /* select_sublist */ - case 324: /* group_by_list */ - case 326: /* order_by_clause_opt */ - case 330: /* sort_specification_list */ + case 234: /* integer_list */ + case 235: /* variable_list */ + case 236: /* retention_list */ + case 240: /* column_def_list */ + case 241: /* tags_def_opt */ + case 243: /* multi_create_clause */ + case 244: /* tags_def */ + case 245: /* multi_drop_clause */ + case 251: /* specific_tags_opt */ + case 252: /* literal_list */ + case 254: /* col_name_list */ + case 257: /* func_name_list */ + case 268: /* func_list */ + case 272: /* expression_list */ + case 282: /* dnode_list */ + case 293: /* star_func_para_list */ + case 295: /* other_para_list */ + case 315: /* select_list */ + case 317: /* partition_by_clause_opt */ + case 319: /* group_by_clause_opt */ + case 321: /* select_sublist */ + case 325: /* group_by_list */ + case 327: /* order_by_clause_opt */ + case 331: /* sort_specification_list */ { - nodesDestroyList((yypminor->yy632)); + nodesDestroyList((yypminor->yy244)); } break; - case 236: /* alter_db_option */ - case 257: /* alter_table_option */ + case 237: /* alter_db_option */ + case 258: /* alter_table_option */ { } break; - case 248: /* type_name */ + case 249: /* type_name */ { } break; - case 297: /* compare_op */ - case 298: /* in_op */ + case 298: /* compare_op */ + case 299: /* in_op */ { } break; - case 310: /* join_type */ + case 311: /* join_type */ { } break; - case 323: /* fill_mode */ + case 324: /* fill_mode */ { } break; - case 332: /* ordering_specification_opt */ + case 333: /* ordering_specification_opt */ { } break; - case 333: /* null_ordering_opt */ + case 334: /* null_ordering_opt */ { } @@ -2199,439 +2204,441 @@ 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[] = { - { 220, -6 }, /* (0) cmd ::= CREATE ACCOUNT NK_ID PASS NK_STRING account_options */ - { 220, -4 }, /* (1) cmd ::= ALTER ACCOUNT NK_ID alter_account_options */ - { 221, 0 }, /* (2) account_options ::= */ - { 221, -3 }, /* (3) account_options ::= account_options PPS literal */ - { 221, -3 }, /* (4) account_options ::= account_options TSERIES literal */ - { 221, -3 }, /* (5) account_options ::= account_options STORAGE literal */ - { 221, -3 }, /* (6) account_options ::= account_options STREAMS literal */ - { 221, -3 }, /* (7) account_options ::= account_options QTIME literal */ - { 221, -3 }, /* (8) account_options ::= account_options DBS literal */ - { 221, -3 }, /* (9) account_options ::= account_options USERS literal */ - { 221, -3 }, /* (10) account_options ::= account_options CONNS literal */ - { 221, -3 }, /* (11) account_options ::= account_options STATE literal */ - { 222, -1 }, /* (12) alter_account_options ::= alter_account_option */ - { 222, -2 }, /* (13) alter_account_options ::= alter_account_options alter_account_option */ - { 224, -2 }, /* (14) alter_account_option ::= PASS literal */ - { 224, -2 }, /* (15) alter_account_option ::= PPS literal */ - { 224, -2 }, /* (16) alter_account_option ::= TSERIES literal */ - { 224, -2 }, /* (17) alter_account_option ::= STORAGE literal */ - { 224, -2 }, /* (18) alter_account_option ::= STREAMS literal */ - { 224, -2 }, /* (19) alter_account_option ::= QTIME literal */ - { 224, -2 }, /* (20) alter_account_option ::= DBS literal */ - { 224, -2 }, /* (21) alter_account_option ::= USERS literal */ - { 224, -2 }, /* (22) alter_account_option ::= CONNS literal */ - { 224, -2 }, /* (23) alter_account_option ::= STATE literal */ - { 220, -5 }, /* (24) cmd ::= CREATE USER user_name PASS NK_STRING */ - { 220, -5 }, /* (25) cmd ::= ALTER USER user_name PASS NK_STRING */ - { 220, -5 }, /* (26) cmd ::= ALTER USER user_name PRIVILEGE NK_STRING */ - { 220, -3 }, /* (27) cmd ::= DROP USER user_name */ - { 220, -3 }, /* (28) cmd ::= CREATE DNODE dnode_endpoint */ - { 220, -5 }, /* (29) cmd ::= CREATE DNODE dnode_host_name PORT NK_INTEGER */ - { 220, -3 }, /* (30) cmd ::= DROP DNODE NK_INTEGER */ - { 220, -3 }, /* (31) cmd ::= DROP DNODE dnode_endpoint */ - { 220, -4 }, /* (32) cmd ::= ALTER DNODE NK_INTEGER NK_STRING */ - { 220, -5 }, /* (33) cmd ::= ALTER DNODE NK_INTEGER NK_STRING NK_STRING */ - { 220, -4 }, /* (34) cmd ::= ALTER ALL DNODES NK_STRING */ - { 220, -5 }, /* (35) cmd ::= ALTER ALL DNODES NK_STRING NK_STRING */ - { 226, -1 }, /* (36) dnode_endpoint ::= NK_STRING */ - { 227, -1 }, /* (37) dnode_host_name ::= NK_ID */ - { 227, -1 }, /* (38) dnode_host_name ::= NK_IPTOKEN */ - { 220, -3 }, /* (39) cmd ::= ALTER LOCAL NK_STRING */ - { 220, -4 }, /* (40) cmd ::= ALTER LOCAL NK_STRING NK_STRING */ - { 220, -5 }, /* (41) cmd ::= CREATE QNODE ON DNODE NK_INTEGER */ - { 220, -5 }, /* (42) cmd ::= DROP QNODE ON DNODE NK_INTEGER */ - { 220, -5 }, /* (43) cmd ::= CREATE BNODE ON DNODE NK_INTEGER */ - { 220, -5 }, /* (44) cmd ::= DROP BNODE ON DNODE NK_INTEGER */ - { 220, -5 }, /* (45) cmd ::= CREATE SNODE ON DNODE NK_INTEGER */ - { 220, -5 }, /* (46) cmd ::= DROP SNODE ON DNODE NK_INTEGER */ - { 220, -5 }, /* (47) cmd ::= CREATE MNODE ON DNODE NK_INTEGER */ - { 220, -5 }, /* (48) cmd ::= DROP MNODE ON DNODE NK_INTEGER */ - { 220, -5 }, /* (49) cmd ::= CREATE DATABASE not_exists_opt db_name db_options */ - { 220, -4 }, /* (50) cmd ::= DROP DATABASE exists_opt db_name */ - { 220, -2 }, /* (51) cmd ::= USE db_name */ - { 220, -4 }, /* (52) cmd ::= ALTER DATABASE db_name alter_db_options */ - { 228, -3 }, /* (53) not_exists_opt ::= IF NOT EXISTS */ - { 228, 0 }, /* (54) not_exists_opt ::= */ - { 231, -2 }, /* (55) exists_opt ::= IF EXISTS */ - { 231, 0 }, /* (56) exists_opt ::= */ - { 230, 0 }, /* (57) db_options ::= */ - { 230, -3 }, /* (58) db_options ::= db_options BLOCKS NK_INTEGER */ - { 230, -3 }, /* (59) db_options ::= db_options CACHE NK_INTEGER */ - { 230, -3 }, /* (60) db_options ::= db_options CACHELAST NK_INTEGER */ - { 230, -3 }, /* (61) db_options ::= db_options COMP NK_INTEGER */ - { 230, -3 }, /* (62) db_options ::= db_options DAYS NK_INTEGER */ - { 230, -3 }, /* (63) db_options ::= db_options DAYS NK_VARIABLE */ - { 230, -3 }, /* (64) db_options ::= db_options FSYNC NK_INTEGER */ - { 230, -3 }, /* (65) db_options ::= db_options MAXROWS NK_INTEGER */ - { 230, -3 }, /* (66) db_options ::= db_options MINROWS NK_INTEGER */ - { 230, -3 }, /* (67) db_options ::= db_options KEEP integer_list */ - { 230, -3 }, /* (68) db_options ::= db_options KEEP variable_list */ - { 230, -3 }, /* (69) db_options ::= db_options PRECISION NK_STRING */ - { 230, -3 }, /* (70) db_options ::= db_options QUORUM NK_INTEGER */ - { 230, -3 }, /* (71) db_options ::= db_options REPLICA NK_INTEGER */ - { 230, -3 }, /* (72) db_options ::= db_options TTL NK_INTEGER */ - { 230, -3 }, /* (73) db_options ::= db_options WAL NK_INTEGER */ - { 230, -3 }, /* (74) db_options ::= db_options VGROUPS NK_INTEGER */ - { 230, -3 }, /* (75) db_options ::= db_options SINGLE_STABLE NK_INTEGER */ - { 230, -3 }, /* (76) db_options ::= db_options STREAM_MODE NK_INTEGER */ - { 230, -3 }, /* (77) db_options ::= db_options RETENTIONS retention_list */ - { 232, -1 }, /* (78) alter_db_options ::= alter_db_option */ - { 232, -2 }, /* (79) alter_db_options ::= alter_db_options alter_db_option */ - { 236, -2 }, /* (80) alter_db_option ::= BLOCKS NK_INTEGER */ - { 236, -2 }, /* (81) alter_db_option ::= FSYNC NK_INTEGER */ - { 236, -2 }, /* (82) alter_db_option ::= KEEP integer_list */ - { 236, -2 }, /* (83) alter_db_option ::= KEEP variable_list */ - { 236, -2 }, /* (84) alter_db_option ::= WAL NK_INTEGER */ - { 236, -2 }, /* (85) alter_db_option ::= QUORUM NK_INTEGER */ - { 236, -2 }, /* (86) alter_db_option ::= CACHELAST NK_INTEGER */ - { 236, -2 }, /* (87) alter_db_option ::= REPLICA NK_INTEGER */ - { 233, -1 }, /* (88) integer_list ::= NK_INTEGER */ - { 233, -3 }, /* (89) integer_list ::= integer_list NK_COMMA NK_INTEGER */ - { 234, -1 }, /* (90) variable_list ::= NK_VARIABLE */ - { 234, -3 }, /* (91) variable_list ::= variable_list NK_COMMA NK_VARIABLE */ - { 235, -1 }, /* (92) retention_list ::= retention */ - { 235, -3 }, /* (93) retention_list ::= retention_list NK_COMMA retention */ - { 237, -3 }, /* (94) retention ::= NK_VARIABLE NK_COLON NK_VARIABLE */ - { 220, -9 }, /* (95) cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options */ - { 220, -3 }, /* (96) cmd ::= CREATE TABLE multi_create_clause */ - { 220, -9 }, /* (97) cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options */ - { 220, -3 }, /* (98) cmd ::= DROP TABLE multi_drop_clause */ - { 220, -4 }, /* (99) cmd ::= DROP STABLE exists_opt full_table_name */ - { 220, -3 }, /* (100) cmd ::= ALTER TABLE alter_table_clause */ - { 220, -3 }, /* (101) cmd ::= ALTER STABLE alter_table_clause */ - { 245, -2 }, /* (102) alter_table_clause ::= full_table_name alter_table_options */ - { 245, -5 }, /* (103) alter_table_clause ::= full_table_name ADD COLUMN column_name type_name */ - { 245, -4 }, /* (104) alter_table_clause ::= full_table_name DROP COLUMN column_name */ - { 245, -5 }, /* (105) alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name */ - { 245, -5 }, /* (106) alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name */ - { 245, -5 }, /* (107) alter_table_clause ::= full_table_name ADD TAG column_name type_name */ - { 245, -4 }, /* (108) alter_table_clause ::= full_table_name DROP TAG column_name */ - { 245, -5 }, /* (109) alter_table_clause ::= full_table_name MODIFY TAG column_name type_name */ - { 245, -5 }, /* (110) alter_table_clause ::= full_table_name RENAME TAG column_name column_name */ - { 245, -6 }, /* (111) alter_table_clause ::= full_table_name SET TAG column_name NK_EQ literal */ - { 242, -1 }, /* (112) multi_create_clause ::= create_subtable_clause */ - { 242, -2 }, /* (113) multi_create_clause ::= multi_create_clause create_subtable_clause */ - { 249, -9 }, /* (114) create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_tags_opt TAGS NK_LP literal_list NK_RP */ - { 244, -1 }, /* (115) multi_drop_clause ::= drop_table_clause */ - { 244, -2 }, /* (116) multi_drop_clause ::= multi_drop_clause drop_table_clause */ - { 252, -2 }, /* (117) drop_table_clause ::= exists_opt full_table_name */ - { 250, 0 }, /* (118) specific_tags_opt ::= */ - { 250, -3 }, /* (119) specific_tags_opt ::= NK_LP col_name_list NK_RP */ - { 238, -1 }, /* (120) full_table_name ::= table_name */ - { 238, -3 }, /* (121) full_table_name ::= db_name NK_DOT table_name */ - { 239, -1 }, /* (122) column_def_list ::= column_def */ - { 239, -3 }, /* (123) column_def_list ::= column_def_list NK_COMMA column_def */ - { 255, -2 }, /* (124) column_def ::= column_name type_name */ - { 255, -4 }, /* (125) column_def ::= column_name type_name COMMENT NK_STRING */ - { 248, -1 }, /* (126) type_name ::= BOOL */ - { 248, -1 }, /* (127) type_name ::= TINYINT */ - { 248, -1 }, /* (128) type_name ::= SMALLINT */ - { 248, -1 }, /* (129) type_name ::= INT */ - { 248, -1 }, /* (130) type_name ::= INTEGER */ - { 248, -1 }, /* (131) type_name ::= BIGINT */ - { 248, -1 }, /* (132) type_name ::= FLOAT */ - { 248, -1 }, /* (133) type_name ::= DOUBLE */ - { 248, -4 }, /* (134) type_name ::= BINARY NK_LP NK_INTEGER NK_RP */ - { 248, -1 }, /* (135) type_name ::= TIMESTAMP */ - { 248, -4 }, /* (136) type_name ::= NCHAR NK_LP NK_INTEGER NK_RP */ - { 248, -2 }, /* (137) type_name ::= TINYINT UNSIGNED */ - { 248, -2 }, /* (138) type_name ::= SMALLINT UNSIGNED */ - { 248, -2 }, /* (139) type_name ::= INT UNSIGNED */ - { 248, -2 }, /* (140) type_name ::= BIGINT UNSIGNED */ - { 248, -1 }, /* (141) type_name ::= JSON */ - { 248, -4 }, /* (142) type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP */ - { 248, -1 }, /* (143) type_name ::= MEDIUMBLOB */ - { 248, -1 }, /* (144) type_name ::= BLOB */ - { 248, -4 }, /* (145) type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP */ - { 248, -1 }, /* (146) type_name ::= DECIMAL */ - { 248, -4 }, /* (147) type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP */ - { 248, -6 }, /* (148) type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */ - { 240, 0 }, /* (149) tags_def_opt ::= */ - { 240, -1 }, /* (150) tags_def_opt ::= tags_def */ - { 243, -4 }, /* (151) tags_def ::= TAGS NK_LP column_def_list NK_RP */ - { 241, 0 }, /* (152) table_options ::= */ - { 241, -3 }, /* (153) table_options ::= table_options COMMENT NK_STRING */ - { 241, -3 }, /* (154) table_options ::= table_options KEEP integer_list */ - { 241, -3 }, /* (155) table_options ::= table_options KEEP variable_list */ - { 241, -3 }, /* (156) table_options ::= table_options TTL NK_INTEGER */ - { 241, -5 }, /* (157) table_options ::= table_options SMA NK_LP col_name_list NK_RP */ - { 241, -5 }, /* (158) table_options ::= table_options ROLLUP NK_LP func_name_list NK_RP */ - { 241, -3 }, /* (159) table_options ::= table_options FILE_FACTOR NK_FLOAT */ - { 241, -3 }, /* (160) table_options ::= table_options DELAY NK_INTEGER */ - { 246, -1 }, /* (161) alter_table_options ::= alter_table_option */ - { 246, -2 }, /* (162) alter_table_options ::= alter_table_options alter_table_option */ - { 257, -2 }, /* (163) alter_table_option ::= COMMENT NK_STRING */ - { 257, -2 }, /* (164) alter_table_option ::= KEEP integer_list */ - { 257, -2 }, /* (165) alter_table_option ::= KEEP variable_list */ - { 257, -2 }, /* (166) alter_table_option ::= TTL NK_INTEGER */ - { 253, -1 }, /* (167) col_name_list ::= col_name */ - { 253, -3 }, /* (168) col_name_list ::= col_name_list NK_COMMA col_name */ - { 258, -1 }, /* (169) col_name ::= column_name */ - { 220, -2 }, /* (170) cmd ::= SHOW DNODES */ - { 220, -2 }, /* (171) cmd ::= SHOW USERS */ - { 220, -2 }, /* (172) cmd ::= SHOW DATABASES */ - { 220, -4 }, /* (173) cmd ::= SHOW db_name_cond_opt TABLES like_pattern_opt */ - { 220, -4 }, /* (174) cmd ::= SHOW db_name_cond_opt STABLES like_pattern_opt */ - { 220, -3 }, /* (175) cmd ::= SHOW db_name_cond_opt VGROUPS */ - { 220, -2 }, /* (176) cmd ::= SHOW MNODES */ - { 220, -2 }, /* (177) cmd ::= SHOW MODULES */ - { 220, -2 }, /* (178) cmd ::= SHOW QNODES */ - { 220, -2 }, /* (179) cmd ::= SHOW FUNCTIONS */ - { 220, -5 }, /* (180) cmd ::= SHOW INDEXES FROM table_name_cond from_db_opt */ - { 220, -2 }, /* (181) cmd ::= SHOW STREAMS */ - { 220, -2 }, /* (182) cmd ::= SHOW ACCOUNTS */ - { 220, -2 }, /* (183) cmd ::= SHOW APPS */ - { 220, -2 }, /* (184) cmd ::= SHOW CONNECTIONS */ - { 220, -2 }, /* (185) cmd ::= SHOW LICENCE */ - { 220, -2 }, /* (186) cmd ::= SHOW GRANTS */ - { 220, -4 }, /* (187) cmd ::= SHOW CREATE DATABASE db_name */ - { 220, -4 }, /* (188) cmd ::= SHOW CREATE TABLE full_table_name */ - { 220, -4 }, /* (189) cmd ::= SHOW CREATE STABLE full_table_name */ - { 220, -2 }, /* (190) cmd ::= SHOW QUERIES */ - { 220, -2 }, /* (191) cmd ::= SHOW SCORES */ - { 220, -2 }, /* (192) cmd ::= SHOW TOPICS */ - { 220, -2 }, /* (193) cmd ::= SHOW VARIABLES */ - { 220, -2 }, /* (194) cmd ::= SHOW BNODES */ - { 220, -2 }, /* (195) cmd ::= SHOW SNODES */ - { 259, 0 }, /* (196) db_name_cond_opt ::= */ - { 259, -2 }, /* (197) db_name_cond_opt ::= db_name NK_DOT */ - { 260, 0 }, /* (198) like_pattern_opt ::= */ - { 260, -2 }, /* (199) like_pattern_opt ::= LIKE NK_STRING */ - { 261, -1 }, /* (200) table_name_cond ::= table_name */ - { 262, 0 }, /* (201) from_db_opt ::= */ - { 262, -2 }, /* (202) from_db_opt ::= FROM db_name */ - { 256, -1 }, /* (203) func_name_list ::= func_name */ - { 256, -3 }, /* (204) func_name_list ::= func_name_list NK_COMMA col_name */ - { 263, -1 }, /* (205) func_name ::= function_name */ - { 220, -8 }, /* (206) cmd ::= CREATE SMA INDEX not_exists_opt index_name ON table_name index_options */ - { 220, -10 }, /* (207) cmd ::= CREATE FULLTEXT INDEX not_exists_opt index_name ON table_name NK_LP col_name_list NK_RP */ - { 220, -6 }, /* (208) cmd ::= DROP INDEX exists_opt index_name ON table_name */ - { 266, 0 }, /* (209) index_options ::= */ - { 266, -9 }, /* (210) index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt */ - { 266, -11 }, /* (211) index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt */ - { 267, -1 }, /* (212) func_list ::= func */ - { 267, -3 }, /* (213) func_list ::= func_list NK_COMMA func */ - { 270, -4 }, /* (214) func ::= function_name NK_LP expression_list NK_RP */ - { 220, -6 }, /* (215) cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression */ - { 220, -6 }, /* (216) cmd ::= CREATE TOPIC not_exists_opt topic_name AS db_name */ - { 220, -4 }, /* (217) cmd ::= DROP TOPIC exists_opt topic_name */ - { 220, -2 }, /* (218) cmd ::= DESC full_table_name */ - { 220, -2 }, /* (219) cmd ::= DESCRIBE full_table_name */ - { 220, -3 }, /* (220) cmd ::= RESET QUERY CACHE */ - { 220, -4 }, /* (221) cmd ::= EXPLAIN analyze_opt explain_options query_expression */ - { 274, 0 }, /* (222) analyze_opt ::= */ - { 274, -1 }, /* (223) analyze_opt ::= ANALYZE */ - { 275, 0 }, /* (224) explain_options ::= */ - { 275, -3 }, /* (225) explain_options ::= explain_options VERBOSE NK_BOOL */ - { 275, -3 }, /* (226) explain_options ::= explain_options RATIO NK_FLOAT */ - { 220, -6 }, /* (227) cmd ::= COMPACT VNODES IN NK_LP integer_list NK_RP */ - { 220, -9 }, /* (228) cmd ::= CREATE agg_func_opt FUNCTION function_name AS NK_STRING OUTPUTTYPE type_name bufsize_opt */ - { 220, -3 }, /* (229) cmd ::= DROP FUNCTION function_name */ - { 276, 0 }, /* (230) agg_func_opt ::= */ - { 276, -1 }, /* (231) agg_func_opt ::= AGGREGATE */ - { 277, 0 }, /* (232) bufsize_opt ::= */ - { 277, -2 }, /* (233) bufsize_opt ::= BUFSIZE NK_INTEGER */ - { 220, -8 }, /* (234) cmd ::= CREATE STREAM not_exists_opt stream_name stream_options into_opt AS query_expression */ - { 220, -4 }, /* (235) cmd ::= DROP STREAM exists_opt stream_name */ - { 280, 0 }, /* (236) into_opt ::= */ - { 280, -2 }, /* (237) into_opt ::= INTO full_table_name */ - { 279, 0 }, /* (238) stream_options ::= */ - { 279, -3 }, /* (239) stream_options ::= stream_options TRIGGER AT_ONCE */ - { 279, -3 }, /* (240) stream_options ::= stream_options TRIGGER WINDOW_CLOSE */ - { 279, -3 }, /* (241) stream_options ::= stream_options WATERMARK duration_literal */ - { 220, -3 }, /* (242) cmd ::= KILL CONNECTION NK_INTEGER */ - { 220, -3 }, /* (243) cmd ::= KILL QUERY NK_INTEGER */ - { 220, -4 }, /* (244) cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER */ - { 220, -4 }, /* (245) cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list */ - { 220, -3 }, /* (246) cmd ::= SPLIT VGROUP NK_INTEGER */ - { 281, -2 }, /* (247) dnode_list ::= DNODE NK_INTEGER */ - { 281, -3 }, /* (248) dnode_list ::= dnode_list DNODE NK_INTEGER */ - { 220, -3 }, /* (249) cmd ::= SYNCDB db_name REPLICA */ - { 220, -1 }, /* (250) cmd ::= query_expression */ - { 223, -1 }, /* (251) literal ::= NK_INTEGER */ - { 223, -1 }, /* (252) literal ::= NK_FLOAT */ - { 223, -1 }, /* (253) literal ::= NK_STRING */ - { 223, -1 }, /* (254) literal ::= NK_BOOL */ - { 223, -2 }, /* (255) literal ::= TIMESTAMP NK_STRING */ - { 223, -1 }, /* (256) literal ::= duration_literal */ - { 223, -1 }, /* (257) literal ::= NULL */ - { 223, -1 }, /* (258) literal ::= NK_QUESTION */ - { 268, -1 }, /* (259) duration_literal ::= NK_VARIABLE */ - { 282, -1 }, /* (260) signed ::= NK_INTEGER */ - { 282, -2 }, /* (261) signed ::= NK_PLUS NK_INTEGER */ - { 282, -2 }, /* (262) signed ::= NK_MINUS NK_INTEGER */ - { 282, -1 }, /* (263) signed ::= NK_FLOAT */ - { 282, -2 }, /* (264) signed ::= NK_PLUS NK_FLOAT */ - { 282, -2 }, /* (265) signed ::= NK_MINUS NK_FLOAT */ - { 283, -1 }, /* (266) signed_literal ::= signed */ - { 283, -1 }, /* (267) signed_literal ::= NK_STRING */ - { 283, -1 }, /* (268) signed_literal ::= NK_BOOL */ - { 283, -2 }, /* (269) signed_literal ::= TIMESTAMP NK_STRING */ - { 283, -1 }, /* (270) signed_literal ::= duration_literal */ - { 283, -1 }, /* (271) signed_literal ::= NULL */ - { 251, -1 }, /* (272) literal_list ::= signed_literal */ - { 251, -3 }, /* (273) literal_list ::= literal_list NK_COMMA signed_literal */ - { 229, -1 }, /* (274) db_name ::= NK_ID */ - { 254, -1 }, /* (275) table_name ::= NK_ID */ - { 247, -1 }, /* (276) column_name ::= NK_ID */ - { 264, -1 }, /* (277) function_name ::= NK_ID */ - { 284, -1 }, /* (278) table_alias ::= NK_ID */ - { 285, -1 }, /* (279) column_alias ::= NK_ID */ - { 225, -1 }, /* (280) user_name ::= NK_ID */ - { 265, -1 }, /* (281) index_name ::= NK_ID */ - { 272, -1 }, /* (282) topic_name ::= NK_ID */ - { 278, -1 }, /* (283) stream_name ::= NK_ID */ - { 286, -1 }, /* (284) expression ::= literal */ - { 286, -1 }, /* (285) expression ::= pseudo_column */ - { 286, -1 }, /* (286) expression ::= column_reference */ - { 286, -1 }, /* (287) expression ::= function_expression */ - { 286, -1 }, /* (288) expression ::= subquery */ - { 286, -3 }, /* (289) expression ::= NK_LP expression NK_RP */ - { 286, -2 }, /* (290) expression ::= NK_PLUS expression */ - { 286, -2 }, /* (291) expression ::= NK_MINUS expression */ - { 286, -3 }, /* (292) expression ::= expression NK_PLUS expression */ - { 286, -3 }, /* (293) expression ::= expression NK_MINUS expression */ - { 286, -3 }, /* (294) expression ::= expression NK_STAR expression */ - { 286, -3 }, /* (295) expression ::= expression NK_SLASH expression */ - { 286, -3 }, /* (296) expression ::= expression NK_REM expression */ - { 286, -3 }, /* (297) expression ::= column_reference NK_ARROW NK_STRING */ - { 271, -1 }, /* (298) expression_list ::= expression */ - { 271, -3 }, /* (299) expression_list ::= expression_list NK_COMMA expression */ - { 288, -1 }, /* (300) column_reference ::= column_name */ - { 288, -3 }, /* (301) column_reference ::= table_name NK_DOT column_name */ - { 287, -1 }, /* (302) pseudo_column ::= ROWTS */ - { 287, -1 }, /* (303) pseudo_column ::= TBNAME */ - { 287, -1 }, /* (304) pseudo_column ::= QSTARTTS */ - { 287, -1 }, /* (305) pseudo_column ::= QENDTS */ - { 287, -1 }, /* (306) pseudo_column ::= WSTARTTS */ - { 287, -1 }, /* (307) pseudo_column ::= WENDTS */ - { 287, -1 }, /* (308) pseudo_column ::= WDURATION */ - { 289, -4 }, /* (309) function_expression ::= function_name NK_LP expression_list NK_RP */ - { 289, -4 }, /* (310) function_expression ::= star_func NK_LP star_func_para_list NK_RP */ - { 289, -6 }, /* (311) function_expression ::= CAST NK_LP expression AS type_name NK_RP */ - { 289, -3 }, /* (312) function_expression ::= noarg_func NK_LP NK_RP */ - { 293, -1 }, /* (313) noarg_func ::= NOW */ - { 293, -1 }, /* (314) noarg_func ::= TODAY */ - { 293, -1 }, /* (315) noarg_func ::= TIMEZONE */ - { 291, -1 }, /* (316) star_func ::= COUNT */ - { 291, -1 }, /* (317) star_func ::= FIRST */ - { 291, -1 }, /* (318) star_func ::= LAST */ - { 291, -1 }, /* (319) star_func ::= LAST_ROW */ - { 292, -1 }, /* (320) star_func_para_list ::= NK_STAR */ - { 292, -1 }, /* (321) star_func_para_list ::= other_para_list */ - { 294, -1 }, /* (322) other_para_list ::= star_func_para */ - { 294, -3 }, /* (323) other_para_list ::= other_para_list NK_COMMA star_func_para */ - { 295, -1 }, /* (324) star_func_para ::= expression */ - { 295, -3 }, /* (325) star_func_para ::= table_name NK_DOT NK_STAR */ - { 296, -3 }, /* (326) predicate ::= expression compare_op expression */ - { 296, -5 }, /* (327) predicate ::= expression BETWEEN expression AND expression */ - { 296, -6 }, /* (328) predicate ::= expression NOT BETWEEN expression AND expression */ - { 296, -3 }, /* (329) predicate ::= expression IS NULL */ - { 296, -4 }, /* (330) predicate ::= expression IS NOT NULL */ - { 296, -3 }, /* (331) predicate ::= expression in_op in_predicate_value */ - { 297, -1 }, /* (332) compare_op ::= NK_LT */ - { 297, -1 }, /* (333) compare_op ::= NK_GT */ - { 297, -1 }, /* (334) compare_op ::= NK_LE */ - { 297, -1 }, /* (335) compare_op ::= NK_GE */ - { 297, -1 }, /* (336) compare_op ::= NK_NE */ - { 297, -1 }, /* (337) compare_op ::= NK_EQ */ - { 297, -1 }, /* (338) compare_op ::= LIKE */ - { 297, -2 }, /* (339) compare_op ::= NOT LIKE */ - { 297, -1 }, /* (340) compare_op ::= MATCH */ - { 297, -1 }, /* (341) compare_op ::= NMATCH */ - { 297, -1 }, /* (342) compare_op ::= CONTAINS */ - { 298, -1 }, /* (343) in_op ::= IN */ - { 298, -2 }, /* (344) in_op ::= NOT IN */ - { 299, -3 }, /* (345) in_predicate_value ::= NK_LP expression_list NK_RP */ - { 300, -1 }, /* (346) boolean_value_expression ::= boolean_primary */ - { 300, -2 }, /* (347) boolean_value_expression ::= NOT boolean_primary */ - { 300, -3 }, /* (348) boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */ - { 300, -3 }, /* (349) boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */ - { 301, -1 }, /* (350) boolean_primary ::= predicate */ - { 301, -3 }, /* (351) boolean_primary ::= NK_LP boolean_value_expression NK_RP */ - { 302, -1 }, /* (352) common_expression ::= expression */ - { 302, -1 }, /* (353) common_expression ::= boolean_value_expression */ - { 303, -2 }, /* (354) from_clause ::= FROM table_reference_list */ - { 304, -1 }, /* (355) table_reference_list ::= table_reference */ - { 304, -3 }, /* (356) table_reference_list ::= table_reference_list NK_COMMA table_reference */ - { 305, -1 }, /* (357) table_reference ::= table_primary */ - { 305, -1 }, /* (358) table_reference ::= joined_table */ - { 306, -2 }, /* (359) table_primary ::= table_name alias_opt */ - { 306, -4 }, /* (360) table_primary ::= db_name NK_DOT table_name alias_opt */ - { 306, -2 }, /* (361) table_primary ::= subquery alias_opt */ - { 306, -1 }, /* (362) table_primary ::= parenthesized_joined_table */ - { 308, 0 }, /* (363) alias_opt ::= */ - { 308, -1 }, /* (364) alias_opt ::= table_alias */ - { 308, -2 }, /* (365) alias_opt ::= AS table_alias */ - { 309, -3 }, /* (366) parenthesized_joined_table ::= NK_LP joined_table NK_RP */ - { 309, -3 }, /* (367) parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */ - { 307, -6 }, /* (368) joined_table ::= table_reference join_type JOIN table_reference ON search_condition */ - { 310, 0 }, /* (369) join_type ::= */ - { 310, -1 }, /* (370) join_type ::= INNER */ - { 312, -9 }, /* (371) query_specification ::= SELECT set_quantifier_opt select_list from_clause where_clause_opt partition_by_clause_opt twindow_clause_opt group_by_clause_opt having_clause_opt */ - { 313, 0 }, /* (372) set_quantifier_opt ::= */ - { 313, -1 }, /* (373) set_quantifier_opt ::= DISTINCT */ - { 313, -1 }, /* (374) set_quantifier_opt ::= ALL */ - { 314, -1 }, /* (375) select_list ::= NK_STAR */ - { 314, -1 }, /* (376) select_list ::= select_sublist */ - { 320, -1 }, /* (377) select_sublist ::= select_item */ - { 320, -3 }, /* (378) select_sublist ::= select_sublist NK_COMMA select_item */ - { 321, -1 }, /* (379) select_item ::= common_expression */ - { 321, -2 }, /* (380) select_item ::= common_expression column_alias */ - { 321, -3 }, /* (381) select_item ::= common_expression AS column_alias */ - { 321, -3 }, /* (382) select_item ::= table_name NK_DOT NK_STAR */ - { 315, 0 }, /* (383) where_clause_opt ::= */ - { 315, -2 }, /* (384) where_clause_opt ::= WHERE search_condition */ - { 316, 0 }, /* (385) partition_by_clause_opt ::= */ - { 316, -3 }, /* (386) partition_by_clause_opt ::= PARTITION BY expression_list */ - { 317, 0 }, /* (387) twindow_clause_opt ::= */ - { 317, -6 }, /* (388) twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP */ - { 317, -4 }, /* (389) twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP */ - { 317, -6 }, /* (390) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */ - { 317, -8 }, /* (391) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */ - { 269, 0 }, /* (392) sliding_opt ::= */ - { 269, -4 }, /* (393) sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */ - { 322, 0 }, /* (394) fill_opt ::= */ - { 322, -4 }, /* (395) fill_opt ::= FILL NK_LP fill_mode NK_RP */ - { 322, -6 }, /* (396) fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */ - { 323, -1 }, /* (397) fill_mode ::= NONE */ - { 323, -1 }, /* (398) fill_mode ::= PREV */ - { 323, -1 }, /* (399) fill_mode ::= NULL */ - { 323, -1 }, /* (400) fill_mode ::= LINEAR */ - { 323, -1 }, /* (401) fill_mode ::= NEXT */ - { 318, 0 }, /* (402) group_by_clause_opt ::= */ - { 318, -3 }, /* (403) group_by_clause_opt ::= GROUP BY group_by_list */ - { 324, -1 }, /* (404) group_by_list ::= expression */ - { 324, -3 }, /* (405) group_by_list ::= group_by_list NK_COMMA expression */ - { 319, 0 }, /* (406) having_clause_opt ::= */ - { 319, -2 }, /* (407) having_clause_opt ::= HAVING search_condition */ - { 273, -4 }, /* (408) query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */ - { 325, -1 }, /* (409) query_expression_body ::= query_primary */ - { 325, -4 }, /* (410) query_expression_body ::= query_expression_body UNION ALL query_expression_body */ - { 329, -1 }, /* (411) query_primary ::= query_specification */ - { 326, 0 }, /* (412) order_by_clause_opt ::= */ - { 326, -3 }, /* (413) order_by_clause_opt ::= ORDER BY sort_specification_list */ - { 327, 0 }, /* (414) slimit_clause_opt ::= */ - { 327, -2 }, /* (415) slimit_clause_opt ::= SLIMIT NK_INTEGER */ - { 327, -4 }, /* (416) slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */ - { 327, -4 }, /* (417) slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */ - { 328, 0 }, /* (418) limit_clause_opt ::= */ - { 328, -2 }, /* (419) limit_clause_opt ::= LIMIT NK_INTEGER */ - { 328, -4 }, /* (420) limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */ - { 328, -4 }, /* (421) limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */ - { 290, -3 }, /* (422) subquery ::= NK_LP query_expression NK_RP */ - { 311, -1 }, /* (423) search_condition ::= common_expression */ - { 330, -1 }, /* (424) sort_specification_list ::= sort_specification */ - { 330, -3 }, /* (425) sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */ - { 331, -3 }, /* (426) sort_specification ::= expression ordering_specification_opt null_ordering_opt */ - { 332, 0 }, /* (427) ordering_specification_opt ::= */ - { 332, -1 }, /* (428) ordering_specification_opt ::= ASC */ - { 332, -1 }, /* (429) ordering_specification_opt ::= DESC */ - { 333, 0 }, /* (430) null_ordering_opt ::= */ - { 333, -2 }, /* (431) null_ordering_opt ::= NULLS FIRST */ - { 333, -2 }, /* (432) null_ordering_opt ::= NULLS LAST */ + { 221, -6 }, /* (0) cmd ::= CREATE ACCOUNT NK_ID PASS NK_STRING account_options */ + { 221, -4 }, /* (1) cmd ::= ALTER ACCOUNT NK_ID alter_account_options */ + { 222, 0 }, /* (2) account_options ::= */ + { 222, -3 }, /* (3) account_options ::= account_options PPS literal */ + { 222, -3 }, /* (4) account_options ::= account_options TSERIES literal */ + { 222, -3 }, /* (5) account_options ::= account_options STORAGE literal */ + { 222, -3 }, /* (6) account_options ::= account_options STREAMS literal */ + { 222, -3 }, /* (7) account_options ::= account_options QTIME literal */ + { 222, -3 }, /* (8) account_options ::= account_options DBS literal */ + { 222, -3 }, /* (9) account_options ::= account_options USERS literal */ + { 222, -3 }, /* (10) account_options ::= account_options CONNS literal */ + { 222, -3 }, /* (11) account_options ::= account_options STATE literal */ + { 223, -1 }, /* (12) alter_account_options ::= alter_account_option */ + { 223, -2 }, /* (13) alter_account_options ::= alter_account_options alter_account_option */ + { 225, -2 }, /* (14) alter_account_option ::= PASS literal */ + { 225, -2 }, /* (15) alter_account_option ::= PPS literal */ + { 225, -2 }, /* (16) alter_account_option ::= TSERIES literal */ + { 225, -2 }, /* (17) alter_account_option ::= STORAGE literal */ + { 225, -2 }, /* (18) alter_account_option ::= STREAMS literal */ + { 225, -2 }, /* (19) alter_account_option ::= QTIME literal */ + { 225, -2 }, /* (20) alter_account_option ::= DBS literal */ + { 225, -2 }, /* (21) alter_account_option ::= USERS literal */ + { 225, -2 }, /* (22) alter_account_option ::= CONNS literal */ + { 225, -2 }, /* (23) alter_account_option ::= STATE literal */ + { 221, -5 }, /* (24) cmd ::= CREATE USER user_name PASS NK_STRING */ + { 221, -5 }, /* (25) cmd ::= ALTER USER user_name PASS NK_STRING */ + { 221, -5 }, /* (26) cmd ::= ALTER USER user_name PRIVILEGE NK_STRING */ + { 221, -3 }, /* (27) cmd ::= DROP USER user_name */ + { 221, -3 }, /* (28) cmd ::= CREATE DNODE dnode_endpoint */ + { 221, -5 }, /* (29) cmd ::= CREATE DNODE dnode_host_name PORT NK_INTEGER */ + { 221, -3 }, /* (30) cmd ::= DROP DNODE NK_INTEGER */ + { 221, -3 }, /* (31) cmd ::= DROP DNODE dnode_endpoint */ + { 221, -4 }, /* (32) cmd ::= ALTER DNODE NK_INTEGER NK_STRING */ + { 221, -5 }, /* (33) cmd ::= ALTER DNODE NK_INTEGER NK_STRING NK_STRING */ + { 221, -4 }, /* (34) cmd ::= ALTER ALL DNODES NK_STRING */ + { 221, -5 }, /* (35) cmd ::= ALTER ALL DNODES NK_STRING NK_STRING */ + { 227, -1 }, /* (36) dnode_endpoint ::= NK_STRING */ + { 228, -1 }, /* (37) dnode_host_name ::= NK_ID */ + { 228, -1 }, /* (38) dnode_host_name ::= NK_IPTOKEN */ + { 221, -3 }, /* (39) cmd ::= ALTER LOCAL NK_STRING */ + { 221, -4 }, /* (40) cmd ::= ALTER LOCAL NK_STRING NK_STRING */ + { 221, -5 }, /* (41) cmd ::= CREATE QNODE ON DNODE NK_INTEGER */ + { 221, -5 }, /* (42) cmd ::= DROP QNODE ON DNODE NK_INTEGER */ + { 221, -5 }, /* (43) cmd ::= CREATE BNODE ON DNODE NK_INTEGER */ + { 221, -5 }, /* (44) cmd ::= DROP BNODE ON DNODE NK_INTEGER */ + { 221, -5 }, /* (45) cmd ::= CREATE SNODE ON DNODE NK_INTEGER */ + { 221, -5 }, /* (46) cmd ::= DROP SNODE ON DNODE NK_INTEGER */ + { 221, -5 }, /* (47) cmd ::= CREATE MNODE ON DNODE NK_INTEGER */ + { 221, -5 }, /* (48) cmd ::= DROP MNODE ON DNODE NK_INTEGER */ + { 221, -5 }, /* (49) cmd ::= CREATE DATABASE not_exists_opt db_name db_options */ + { 221, -4 }, /* (50) cmd ::= DROP DATABASE exists_opt db_name */ + { 221, -2 }, /* (51) cmd ::= USE db_name */ + { 221, -4 }, /* (52) cmd ::= ALTER DATABASE db_name alter_db_options */ + { 229, -3 }, /* (53) not_exists_opt ::= IF NOT EXISTS */ + { 229, 0 }, /* (54) not_exists_opt ::= */ + { 232, -2 }, /* (55) exists_opt ::= IF EXISTS */ + { 232, 0 }, /* (56) exists_opt ::= */ + { 231, 0 }, /* (57) db_options ::= */ + { 231, -3 }, /* (58) db_options ::= db_options BLOCKS NK_INTEGER */ + { 231, -3 }, /* (59) db_options ::= db_options CACHE NK_INTEGER */ + { 231, -3 }, /* (60) db_options ::= db_options CACHELAST NK_INTEGER */ + { 231, -3 }, /* (61) db_options ::= db_options COMP NK_INTEGER */ + { 231, -3 }, /* (62) db_options ::= db_options DAYS NK_INTEGER */ + { 231, -3 }, /* (63) db_options ::= db_options DAYS NK_VARIABLE */ + { 231, -3 }, /* (64) db_options ::= db_options FSYNC NK_INTEGER */ + { 231, -3 }, /* (65) db_options ::= db_options MAXROWS NK_INTEGER */ + { 231, -3 }, /* (66) db_options ::= db_options MINROWS NK_INTEGER */ + { 231, -3 }, /* (67) db_options ::= db_options KEEP integer_list */ + { 231, -3 }, /* (68) db_options ::= db_options KEEP variable_list */ + { 231, -3 }, /* (69) db_options ::= db_options PRECISION NK_STRING */ + { 231, -3 }, /* (70) db_options ::= db_options QUORUM NK_INTEGER */ + { 231, -3 }, /* (71) db_options ::= db_options REPLICA NK_INTEGER */ + { 231, -3 }, /* (72) db_options ::= db_options TTL NK_INTEGER */ + { 231, -3 }, /* (73) db_options ::= db_options WAL NK_INTEGER */ + { 231, -3 }, /* (74) db_options ::= db_options VGROUPS NK_INTEGER */ + { 231, -3 }, /* (75) db_options ::= db_options SINGLE_STABLE NK_INTEGER */ + { 231, -3 }, /* (76) db_options ::= db_options STREAM_MODE NK_INTEGER */ + { 231, -3 }, /* (77) db_options ::= db_options RETENTIONS retention_list */ + { 231, -3 }, /* (78) db_options ::= db_options STRICT NK_INTEGER */ + { 233, -1 }, /* (79) alter_db_options ::= alter_db_option */ + { 233, -2 }, /* (80) alter_db_options ::= alter_db_options alter_db_option */ + { 237, -2 }, /* (81) alter_db_option ::= BLOCKS NK_INTEGER */ + { 237, -2 }, /* (82) alter_db_option ::= FSYNC NK_INTEGER */ + { 237, -2 }, /* (83) alter_db_option ::= KEEP integer_list */ + { 237, -2 }, /* (84) alter_db_option ::= KEEP variable_list */ + { 237, -2 }, /* (85) alter_db_option ::= WAL NK_INTEGER */ + { 237, -2 }, /* (86) alter_db_option ::= QUORUM NK_INTEGER */ + { 237, -2 }, /* (87) alter_db_option ::= CACHELAST NK_INTEGER */ + { 237, -2 }, /* (88) alter_db_option ::= REPLICA NK_INTEGER */ + { 237, -2 }, /* (89) alter_db_option ::= STRICT NK_INTEGER */ + { 234, -1 }, /* (90) integer_list ::= NK_INTEGER */ + { 234, -3 }, /* (91) integer_list ::= integer_list NK_COMMA NK_INTEGER */ + { 235, -1 }, /* (92) variable_list ::= NK_VARIABLE */ + { 235, -3 }, /* (93) variable_list ::= variable_list NK_COMMA NK_VARIABLE */ + { 236, -1 }, /* (94) retention_list ::= retention */ + { 236, -3 }, /* (95) retention_list ::= retention_list NK_COMMA retention */ + { 238, -3 }, /* (96) retention ::= NK_VARIABLE NK_COLON NK_VARIABLE */ + { 221, -9 }, /* (97) cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options */ + { 221, -3 }, /* (98) cmd ::= CREATE TABLE multi_create_clause */ + { 221, -9 }, /* (99) cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options */ + { 221, -3 }, /* (100) cmd ::= DROP TABLE multi_drop_clause */ + { 221, -4 }, /* (101) cmd ::= DROP STABLE exists_opt full_table_name */ + { 221, -3 }, /* (102) cmd ::= ALTER TABLE alter_table_clause */ + { 221, -3 }, /* (103) cmd ::= ALTER STABLE alter_table_clause */ + { 246, -2 }, /* (104) alter_table_clause ::= full_table_name alter_table_options */ + { 246, -5 }, /* (105) alter_table_clause ::= full_table_name ADD COLUMN column_name type_name */ + { 246, -4 }, /* (106) alter_table_clause ::= full_table_name DROP COLUMN column_name */ + { 246, -5 }, /* (107) alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name */ + { 246, -5 }, /* (108) alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name */ + { 246, -5 }, /* (109) alter_table_clause ::= full_table_name ADD TAG column_name type_name */ + { 246, -4 }, /* (110) alter_table_clause ::= full_table_name DROP TAG column_name */ + { 246, -5 }, /* (111) alter_table_clause ::= full_table_name MODIFY TAG column_name type_name */ + { 246, -5 }, /* (112) alter_table_clause ::= full_table_name RENAME TAG column_name column_name */ + { 246, -6 }, /* (113) alter_table_clause ::= full_table_name SET TAG column_name NK_EQ literal */ + { 243, -1 }, /* (114) multi_create_clause ::= create_subtable_clause */ + { 243, -2 }, /* (115) multi_create_clause ::= multi_create_clause create_subtable_clause */ + { 250, -9 }, /* (116) create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_tags_opt TAGS NK_LP literal_list NK_RP */ + { 245, -1 }, /* (117) multi_drop_clause ::= drop_table_clause */ + { 245, -2 }, /* (118) multi_drop_clause ::= multi_drop_clause drop_table_clause */ + { 253, -2 }, /* (119) drop_table_clause ::= exists_opt full_table_name */ + { 251, 0 }, /* (120) specific_tags_opt ::= */ + { 251, -3 }, /* (121) specific_tags_opt ::= NK_LP col_name_list NK_RP */ + { 239, -1 }, /* (122) full_table_name ::= table_name */ + { 239, -3 }, /* (123) full_table_name ::= db_name NK_DOT table_name */ + { 240, -1 }, /* (124) column_def_list ::= column_def */ + { 240, -3 }, /* (125) column_def_list ::= column_def_list NK_COMMA column_def */ + { 256, -2 }, /* (126) column_def ::= column_name type_name */ + { 256, -4 }, /* (127) column_def ::= column_name type_name COMMENT NK_STRING */ + { 249, -1 }, /* (128) type_name ::= BOOL */ + { 249, -1 }, /* (129) type_name ::= TINYINT */ + { 249, -1 }, /* (130) type_name ::= SMALLINT */ + { 249, -1 }, /* (131) type_name ::= INT */ + { 249, -1 }, /* (132) type_name ::= INTEGER */ + { 249, -1 }, /* (133) type_name ::= BIGINT */ + { 249, -1 }, /* (134) type_name ::= FLOAT */ + { 249, -1 }, /* (135) type_name ::= DOUBLE */ + { 249, -4 }, /* (136) type_name ::= BINARY NK_LP NK_INTEGER NK_RP */ + { 249, -1 }, /* (137) type_name ::= TIMESTAMP */ + { 249, -4 }, /* (138) type_name ::= NCHAR NK_LP NK_INTEGER NK_RP */ + { 249, -2 }, /* (139) type_name ::= TINYINT UNSIGNED */ + { 249, -2 }, /* (140) type_name ::= SMALLINT UNSIGNED */ + { 249, -2 }, /* (141) type_name ::= INT UNSIGNED */ + { 249, -2 }, /* (142) type_name ::= BIGINT UNSIGNED */ + { 249, -1 }, /* (143) type_name ::= JSON */ + { 249, -4 }, /* (144) type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP */ + { 249, -1 }, /* (145) type_name ::= MEDIUMBLOB */ + { 249, -1 }, /* (146) type_name ::= BLOB */ + { 249, -4 }, /* (147) type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP */ + { 249, -1 }, /* (148) type_name ::= DECIMAL */ + { 249, -4 }, /* (149) type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP */ + { 249, -6 }, /* (150) type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */ + { 241, 0 }, /* (151) tags_def_opt ::= */ + { 241, -1 }, /* (152) tags_def_opt ::= tags_def */ + { 244, -4 }, /* (153) tags_def ::= TAGS NK_LP column_def_list NK_RP */ + { 242, 0 }, /* (154) table_options ::= */ + { 242, -3 }, /* (155) table_options ::= table_options COMMENT NK_STRING */ + { 242, -3 }, /* (156) table_options ::= table_options KEEP integer_list */ + { 242, -3 }, /* (157) table_options ::= table_options KEEP variable_list */ + { 242, -3 }, /* (158) table_options ::= table_options TTL NK_INTEGER */ + { 242, -5 }, /* (159) table_options ::= table_options SMA NK_LP col_name_list NK_RP */ + { 242, -5 }, /* (160) table_options ::= table_options ROLLUP NK_LP func_name_list NK_RP */ + { 242, -3 }, /* (161) table_options ::= table_options FILE_FACTOR NK_FLOAT */ + { 242, -3 }, /* (162) table_options ::= table_options DELAY NK_INTEGER */ + { 247, -1 }, /* (163) alter_table_options ::= alter_table_option */ + { 247, -2 }, /* (164) alter_table_options ::= alter_table_options alter_table_option */ + { 258, -2 }, /* (165) alter_table_option ::= COMMENT NK_STRING */ + { 258, -2 }, /* (166) alter_table_option ::= KEEP integer_list */ + { 258, -2 }, /* (167) alter_table_option ::= KEEP variable_list */ + { 258, -2 }, /* (168) alter_table_option ::= TTL NK_INTEGER */ + { 254, -1 }, /* (169) col_name_list ::= col_name */ + { 254, -3 }, /* (170) col_name_list ::= col_name_list NK_COMMA col_name */ + { 259, -1 }, /* (171) col_name ::= column_name */ + { 221, -2 }, /* (172) cmd ::= SHOW DNODES */ + { 221, -2 }, /* (173) cmd ::= SHOW USERS */ + { 221, -2 }, /* (174) cmd ::= SHOW DATABASES */ + { 221, -4 }, /* (175) cmd ::= SHOW db_name_cond_opt TABLES like_pattern_opt */ + { 221, -4 }, /* (176) cmd ::= SHOW db_name_cond_opt STABLES like_pattern_opt */ + { 221, -3 }, /* (177) cmd ::= SHOW db_name_cond_opt VGROUPS */ + { 221, -2 }, /* (178) cmd ::= SHOW MNODES */ + { 221, -2 }, /* (179) cmd ::= SHOW MODULES */ + { 221, -2 }, /* (180) cmd ::= SHOW QNODES */ + { 221, -2 }, /* (181) cmd ::= SHOW FUNCTIONS */ + { 221, -5 }, /* (182) cmd ::= SHOW INDEXES FROM table_name_cond from_db_opt */ + { 221, -2 }, /* (183) cmd ::= SHOW STREAMS */ + { 221, -2 }, /* (184) cmd ::= SHOW ACCOUNTS */ + { 221, -2 }, /* (185) cmd ::= SHOW APPS */ + { 221, -2 }, /* (186) cmd ::= SHOW CONNECTIONS */ + { 221, -2 }, /* (187) cmd ::= SHOW LICENCE */ + { 221, -2 }, /* (188) cmd ::= SHOW GRANTS */ + { 221, -4 }, /* (189) cmd ::= SHOW CREATE DATABASE db_name */ + { 221, -4 }, /* (190) cmd ::= SHOW CREATE TABLE full_table_name */ + { 221, -4 }, /* (191) cmd ::= SHOW CREATE STABLE full_table_name */ + { 221, -2 }, /* (192) cmd ::= SHOW QUERIES */ + { 221, -2 }, /* (193) cmd ::= SHOW SCORES */ + { 221, -2 }, /* (194) cmd ::= SHOW TOPICS */ + { 221, -2 }, /* (195) cmd ::= SHOW VARIABLES */ + { 221, -2 }, /* (196) cmd ::= SHOW BNODES */ + { 221, -2 }, /* (197) cmd ::= SHOW SNODES */ + { 260, 0 }, /* (198) db_name_cond_opt ::= */ + { 260, -2 }, /* (199) db_name_cond_opt ::= db_name NK_DOT */ + { 261, 0 }, /* (200) like_pattern_opt ::= */ + { 261, -2 }, /* (201) like_pattern_opt ::= LIKE NK_STRING */ + { 262, -1 }, /* (202) table_name_cond ::= table_name */ + { 263, 0 }, /* (203) from_db_opt ::= */ + { 263, -2 }, /* (204) from_db_opt ::= FROM db_name */ + { 257, -1 }, /* (205) func_name_list ::= func_name */ + { 257, -3 }, /* (206) func_name_list ::= func_name_list NK_COMMA func_name */ + { 264, -1 }, /* (207) func_name ::= function_name */ + { 221, -8 }, /* (208) cmd ::= CREATE SMA INDEX not_exists_opt index_name ON table_name index_options */ + { 221, -10 }, /* (209) cmd ::= CREATE FULLTEXT INDEX not_exists_opt index_name ON table_name NK_LP col_name_list NK_RP */ + { 221, -6 }, /* (210) cmd ::= DROP INDEX exists_opt index_name ON table_name */ + { 267, 0 }, /* (211) index_options ::= */ + { 267, -9 }, /* (212) index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt */ + { 267, -11 }, /* (213) index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt */ + { 268, -1 }, /* (214) func_list ::= func */ + { 268, -3 }, /* (215) func_list ::= func_list NK_COMMA func */ + { 271, -4 }, /* (216) func ::= function_name NK_LP expression_list NK_RP */ + { 221, -6 }, /* (217) cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression */ + { 221, -6 }, /* (218) cmd ::= CREATE TOPIC not_exists_opt topic_name AS db_name */ + { 221, -4 }, /* (219) cmd ::= DROP TOPIC exists_opt topic_name */ + { 221, -2 }, /* (220) cmd ::= DESC full_table_name */ + { 221, -2 }, /* (221) cmd ::= DESCRIBE full_table_name */ + { 221, -3 }, /* (222) cmd ::= RESET QUERY CACHE */ + { 221, -4 }, /* (223) cmd ::= EXPLAIN analyze_opt explain_options query_expression */ + { 275, 0 }, /* (224) analyze_opt ::= */ + { 275, -1 }, /* (225) analyze_opt ::= ANALYZE */ + { 276, 0 }, /* (226) explain_options ::= */ + { 276, -3 }, /* (227) explain_options ::= explain_options VERBOSE NK_BOOL */ + { 276, -3 }, /* (228) explain_options ::= explain_options RATIO NK_FLOAT */ + { 221, -6 }, /* (229) cmd ::= COMPACT VNODES IN NK_LP integer_list NK_RP */ + { 221, -9 }, /* (230) cmd ::= CREATE agg_func_opt FUNCTION function_name AS NK_STRING OUTPUTTYPE type_name bufsize_opt */ + { 221, -3 }, /* (231) cmd ::= DROP FUNCTION function_name */ + { 277, 0 }, /* (232) agg_func_opt ::= */ + { 277, -1 }, /* (233) agg_func_opt ::= AGGREGATE */ + { 278, 0 }, /* (234) bufsize_opt ::= */ + { 278, -2 }, /* (235) bufsize_opt ::= BUFSIZE NK_INTEGER */ + { 221, -8 }, /* (236) cmd ::= CREATE STREAM not_exists_opt stream_name stream_options into_opt AS query_expression */ + { 221, -4 }, /* (237) cmd ::= DROP STREAM exists_opt stream_name */ + { 281, 0 }, /* (238) into_opt ::= */ + { 281, -2 }, /* (239) into_opt ::= INTO full_table_name */ + { 280, 0 }, /* (240) stream_options ::= */ + { 280, -3 }, /* (241) stream_options ::= stream_options TRIGGER AT_ONCE */ + { 280, -3 }, /* (242) stream_options ::= stream_options TRIGGER WINDOW_CLOSE */ + { 280, -3 }, /* (243) stream_options ::= stream_options WATERMARK duration_literal */ + { 221, -3 }, /* (244) cmd ::= KILL CONNECTION NK_INTEGER */ + { 221, -3 }, /* (245) cmd ::= KILL QUERY NK_INTEGER */ + { 221, -4 }, /* (246) cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER */ + { 221, -4 }, /* (247) cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list */ + { 221, -3 }, /* (248) cmd ::= SPLIT VGROUP NK_INTEGER */ + { 282, -2 }, /* (249) dnode_list ::= DNODE NK_INTEGER */ + { 282, -3 }, /* (250) dnode_list ::= dnode_list DNODE NK_INTEGER */ + { 221, -3 }, /* (251) cmd ::= SYNCDB db_name REPLICA */ + { 221, -1 }, /* (252) cmd ::= query_expression */ + { 224, -1 }, /* (253) literal ::= NK_INTEGER */ + { 224, -1 }, /* (254) literal ::= NK_FLOAT */ + { 224, -1 }, /* (255) literal ::= NK_STRING */ + { 224, -1 }, /* (256) literal ::= NK_BOOL */ + { 224, -2 }, /* (257) literal ::= TIMESTAMP NK_STRING */ + { 224, -1 }, /* (258) literal ::= duration_literal */ + { 224, -1 }, /* (259) literal ::= NULL */ + { 224, -1 }, /* (260) literal ::= NK_QUESTION */ + { 269, -1 }, /* (261) duration_literal ::= NK_VARIABLE */ + { 283, -1 }, /* (262) signed ::= NK_INTEGER */ + { 283, -2 }, /* (263) signed ::= NK_PLUS NK_INTEGER */ + { 283, -2 }, /* (264) signed ::= NK_MINUS NK_INTEGER */ + { 283, -1 }, /* (265) signed ::= NK_FLOAT */ + { 283, -2 }, /* (266) signed ::= NK_PLUS NK_FLOAT */ + { 283, -2 }, /* (267) signed ::= NK_MINUS NK_FLOAT */ + { 284, -1 }, /* (268) signed_literal ::= signed */ + { 284, -1 }, /* (269) signed_literal ::= NK_STRING */ + { 284, -1 }, /* (270) signed_literal ::= NK_BOOL */ + { 284, -2 }, /* (271) signed_literal ::= TIMESTAMP NK_STRING */ + { 284, -1 }, /* (272) signed_literal ::= duration_literal */ + { 284, -1 }, /* (273) signed_literal ::= NULL */ + { 252, -1 }, /* (274) literal_list ::= signed_literal */ + { 252, -3 }, /* (275) literal_list ::= literal_list NK_COMMA signed_literal */ + { 230, -1 }, /* (276) db_name ::= NK_ID */ + { 255, -1 }, /* (277) table_name ::= NK_ID */ + { 248, -1 }, /* (278) column_name ::= NK_ID */ + { 265, -1 }, /* (279) function_name ::= NK_ID */ + { 285, -1 }, /* (280) table_alias ::= NK_ID */ + { 286, -1 }, /* (281) column_alias ::= NK_ID */ + { 226, -1 }, /* (282) user_name ::= NK_ID */ + { 266, -1 }, /* (283) index_name ::= NK_ID */ + { 273, -1 }, /* (284) topic_name ::= NK_ID */ + { 279, -1 }, /* (285) stream_name ::= NK_ID */ + { 287, -1 }, /* (286) expression ::= literal */ + { 287, -1 }, /* (287) expression ::= pseudo_column */ + { 287, -1 }, /* (288) expression ::= column_reference */ + { 287, -1 }, /* (289) expression ::= function_expression */ + { 287, -1 }, /* (290) expression ::= subquery */ + { 287, -3 }, /* (291) expression ::= NK_LP expression NK_RP */ + { 287, -2 }, /* (292) expression ::= NK_PLUS expression */ + { 287, -2 }, /* (293) expression ::= NK_MINUS expression */ + { 287, -3 }, /* (294) expression ::= expression NK_PLUS expression */ + { 287, -3 }, /* (295) expression ::= expression NK_MINUS expression */ + { 287, -3 }, /* (296) expression ::= expression NK_STAR expression */ + { 287, -3 }, /* (297) expression ::= expression NK_SLASH expression */ + { 287, -3 }, /* (298) expression ::= expression NK_REM expression */ + { 287, -3 }, /* (299) expression ::= column_reference NK_ARROW NK_STRING */ + { 272, -1 }, /* (300) expression_list ::= expression */ + { 272, -3 }, /* (301) expression_list ::= expression_list NK_COMMA expression */ + { 289, -1 }, /* (302) column_reference ::= column_name */ + { 289, -3 }, /* (303) column_reference ::= table_name NK_DOT column_name */ + { 288, -1 }, /* (304) pseudo_column ::= ROWTS */ + { 288, -1 }, /* (305) pseudo_column ::= TBNAME */ + { 288, -1 }, /* (306) pseudo_column ::= QSTARTTS */ + { 288, -1 }, /* (307) pseudo_column ::= QENDTS */ + { 288, -1 }, /* (308) pseudo_column ::= WSTARTTS */ + { 288, -1 }, /* (309) pseudo_column ::= WENDTS */ + { 288, -1 }, /* (310) pseudo_column ::= WDURATION */ + { 290, -4 }, /* (311) function_expression ::= function_name NK_LP expression_list NK_RP */ + { 290, -4 }, /* (312) function_expression ::= star_func NK_LP star_func_para_list NK_RP */ + { 290, -6 }, /* (313) function_expression ::= CAST NK_LP expression AS type_name NK_RP */ + { 290, -3 }, /* (314) function_expression ::= noarg_func NK_LP NK_RP */ + { 294, -1 }, /* (315) noarg_func ::= NOW */ + { 294, -1 }, /* (316) noarg_func ::= TODAY */ + { 294, -1 }, /* (317) noarg_func ::= TIMEZONE */ + { 292, -1 }, /* (318) star_func ::= COUNT */ + { 292, -1 }, /* (319) star_func ::= FIRST */ + { 292, -1 }, /* (320) star_func ::= LAST */ + { 292, -1 }, /* (321) star_func ::= LAST_ROW */ + { 293, -1 }, /* (322) star_func_para_list ::= NK_STAR */ + { 293, -1 }, /* (323) star_func_para_list ::= other_para_list */ + { 295, -1 }, /* (324) other_para_list ::= star_func_para */ + { 295, -3 }, /* (325) other_para_list ::= other_para_list NK_COMMA star_func_para */ + { 296, -1 }, /* (326) star_func_para ::= expression */ + { 296, -3 }, /* (327) star_func_para ::= table_name NK_DOT NK_STAR */ + { 297, -3 }, /* (328) predicate ::= expression compare_op expression */ + { 297, -5 }, /* (329) predicate ::= expression BETWEEN expression AND expression */ + { 297, -6 }, /* (330) predicate ::= expression NOT BETWEEN expression AND expression */ + { 297, -3 }, /* (331) predicate ::= expression IS NULL */ + { 297, -4 }, /* (332) predicate ::= expression IS NOT NULL */ + { 297, -3 }, /* (333) predicate ::= expression in_op in_predicate_value */ + { 298, -1 }, /* (334) compare_op ::= NK_LT */ + { 298, -1 }, /* (335) compare_op ::= NK_GT */ + { 298, -1 }, /* (336) compare_op ::= NK_LE */ + { 298, -1 }, /* (337) compare_op ::= NK_GE */ + { 298, -1 }, /* (338) compare_op ::= NK_NE */ + { 298, -1 }, /* (339) compare_op ::= NK_EQ */ + { 298, -1 }, /* (340) compare_op ::= LIKE */ + { 298, -2 }, /* (341) compare_op ::= NOT LIKE */ + { 298, -1 }, /* (342) compare_op ::= MATCH */ + { 298, -1 }, /* (343) compare_op ::= NMATCH */ + { 298, -1 }, /* (344) compare_op ::= CONTAINS */ + { 299, -1 }, /* (345) in_op ::= IN */ + { 299, -2 }, /* (346) in_op ::= NOT IN */ + { 300, -3 }, /* (347) in_predicate_value ::= NK_LP expression_list NK_RP */ + { 301, -1 }, /* (348) boolean_value_expression ::= boolean_primary */ + { 301, -2 }, /* (349) boolean_value_expression ::= NOT boolean_primary */ + { 301, -3 }, /* (350) boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */ + { 301, -3 }, /* (351) boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */ + { 302, -1 }, /* (352) boolean_primary ::= predicate */ + { 302, -3 }, /* (353) boolean_primary ::= NK_LP boolean_value_expression NK_RP */ + { 303, -1 }, /* (354) common_expression ::= expression */ + { 303, -1 }, /* (355) common_expression ::= boolean_value_expression */ + { 304, -2 }, /* (356) from_clause ::= FROM table_reference_list */ + { 305, -1 }, /* (357) table_reference_list ::= table_reference */ + { 305, -3 }, /* (358) table_reference_list ::= table_reference_list NK_COMMA table_reference */ + { 306, -1 }, /* (359) table_reference ::= table_primary */ + { 306, -1 }, /* (360) table_reference ::= joined_table */ + { 307, -2 }, /* (361) table_primary ::= table_name alias_opt */ + { 307, -4 }, /* (362) table_primary ::= db_name NK_DOT table_name alias_opt */ + { 307, -2 }, /* (363) table_primary ::= subquery alias_opt */ + { 307, -1 }, /* (364) table_primary ::= parenthesized_joined_table */ + { 309, 0 }, /* (365) alias_opt ::= */ + { 309, -1 }, /* (366) alias_opt ::= table_alias */ + { 309, -2 }, /* (367) alias_opt ::= AS table_alias */ + { 310, -3 }, /* (368) parenthesized_joined_table ::= NK_LP joined_table NK_RP */ + { 310, -3 }, /* (369) parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */ + { 308, -6 }, /* (370) joined_table ::= table_reference join_type JOIN table_reference ON search_condition */ + { 311, 0 }, /* (371) join_type ::= */ + { 311, -1 }, /* (372) join_type ::= INNER */ + { 313, -9 }, /* (373) query_specification ::= SELECT set_quantifier_opt select_list from_clause where_clause_opt partition_by_clause_opt twindow_clause_opt group_by_clause_opt having_clause_opt */ + { 314, 0 }, /* (374) set_quantifier_opt ::= */ + { 314, -1 }, /* (375) set_quantifier_opt ::= DISTINCT */ + { 314, -1 }, /* (376) set_quantifier_opt ::= ALL */ + { 315, -1 }, /* (377) select_list ::= NK_STAR */ + { 315, -1 }, /* (378) select_list ::= select_sublist */ + { 321, -1 }, /* (379) select_sublist ::= select_item */ + { 321, -3 }, /* (380) select_sublist ::= select_sublist NK_COMMA select_item */ + { 322, -1 }, /* (381) select_item ::= common_expression */ + { 322, -2 }, /* (382) select_item ::= common_expression column_alias */ + { 322, -3 }, /* (383) select_item ::= common_expression AS column_alias */ + { 322, -3 }, /* (384) select_item ::= table_name NK_DOT NK_STAR */ + { 316, 0 }, /* (385) where_clause_opt ::= */ + { 316, -2 }, /* (386) where_clause_opt ::= WHERE search_condition */ + { 317, 0 }, /* (387) partition_by_clause_opt ::= */ + { 317, -3 }, /* (388) partition_by_clause_opt ::= PARTITION BY expression_list */ + { 318, 0 }, /* (389) twindow_clause_opt ::= */ + { 318, -6 }, /* (390) twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP */ + { 318, -4 }, /* (391) twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP */ + { 318, -6 }, /* (392) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */ + { 318, -8 }, /* (393) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */ + { 270, 0 }, /* (394) sliding_opt ::= */ + { 270, -4 }, /* (395) sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */ + { 323, 0 }, /* (396) fill_opt ::= */ + { 323, -4 }, /* (397) fill_opt ::= FILL NK_LP fill_mode NK_RP */ + { 323, -6 }, /* (398) fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */ + { 324, -1 }, /* (399) fill_mode ::= NONE */ + { 324, -1 }, /* (400) fill_mode ::= PREV */ + { 324, -1 }, /* (401) fill_mode ::= NULL */ + { 324, -1 }, /* (402) fill_mode ::= LINEAR */ + { 324, -1 }, /* (403) fill_mode ::= NEXT */ + { 319, 0 }, /* (404) group_by_clause_opt ::= */ + { 319, -3 }, /* (405) group_by_clause_opt ::= GROUP BY group_by_list */ + { 325, -1 }, /* (406) group_by_list ::= expression */ + { 325, -3 }, /* (407) group_by_list ::= group_by_list NK_COMMA expression */ + { 320, 0 }, /* (408) having_clause_opt ::= */ + { 320, -2 }, /* (409) having_clause_opt ::= HAVING search_condition */ + { 274, -4 }, /* (410) query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */ + { 326, -1 }, /* (411) query_expression_body ::= query_primary */ + { 326, -4 }, /* (412) query_expression_body ::= query_expression_body UNION ALL query_expression_body */ + { 330, -1 }, /* (413) query_primary ::= query_specification */ + { 327, 0 }, /* (414) order_by_clause_opt ::= */ + { 327, -3 }, /* (415) order_by_clause_opt ::= ORDER BY sort_specification_list */ + { 328, 0 }, /* (416) slimit_clause_opt ::= */ + { 328, -2 }, /* (417) slimit_clause_opt ::= SLIMIT NK_INTEGER */ + { 328, -4 }, /* (418) slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */ + { 328, -4 }, /* (419) slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */ + { 329, 0 }, /* (420) limit_clause_opt ::= */ + { 329, -2 }, /* (421) limit_clause_opt ::= LIMIT NK_INTEGER */ + { 329, -4 }, /* (422) limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */ + { 329, -4 }, /* (423) limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */ + { 291, -3 }, /* (424) subquery ::= NK_LP query_expression NK_RP */ + { 312, -1 }, /* (425) search_condition ::= common_expression */ + { 331, -1 }, /* (426) sort_specification_list ::= sort_specification */ + { 331, -3 }, /* (427) sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */ + { 332, -3 }, /* (428) sort_specification ::= expression ordering_specification_opt null_ordering_opt */ + { 333, 0 }, /* (429) ordering_specification_opt ::= */ + { 333, -1 }, /* (430) ordering_specification_opt ::= ASC */ + { 333, -1 }, /* (431) ordering_specification_opt ::= DESC */ + { 334, 0 }, /* (432) null_ordering_opt ::= */ + { 334, -2 }, /* (433) null_ordering_opt ::= NULLS FIRST */ + { 334, -2 }, /* (434) null_ordering_opt ::= NULLS LAST */ }; static void yy_accept(yyParser*); /* Forward Declaration */ @@ -2720,11 +2727,11 @@ static YYACTIONTYPE yy_reduce( YYMINORTYPE yylhsminor; case 0: /* cmd ::= CREATE ACCOUNT NK_ID PASS NK_STRING account_options */ { pCxt->valid = false; generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_EXPRIE_STATEMENT); } - yy_destructor(yypParser,221,&yymsp[0].minor); + yy_destructor(yypParser,222,&yymsp[0].minor); break; case 1: /* cmd ::= ALTER ACCOUNT NK_ID alter_account_options */ { pCxt->valid = false; generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_EXPRIE_STATEMENT); } - yy_destructor(yypParser,222,&yymsp[0].minor); + yy_destructor(yypParser,223,&yymsp[0].minor); break; case 2: /* account_options ::= */ { } @@ -2738,20 +2745,20 @@ static YYACTIONTYPE yy_reduce( case 9: /* account_options ::= account_options USERS literal */ yytestcase(yyruleno==9); case 10: /* account_options ::= account_options CONNS literal */ yytestcase(yyruleno==10); case 11: /* account_options ::= account_options STATE literal */ yytestcase(yyruleno==11); -{ yy_destructor(yypParser,221,&yymsp[-2].minor); +{ yy_destructor(yypParser,222,&yymsp[-2].minor); { } - yy_destructor(yypParser,223,&yymsp[0].minor); + yy_destructor(yypParser,224,&yymsp[0].minor); } break; case 12: /* alter_account_options ::= alter_account_option */ -{ yy_destructor(yypParser,224,&yymsp[0].minor); +{ yy_destructor(yypParser,225,&yymsp[0].minor); { } } break; case 13: /* alter_account_options ::= alter_account_options alter_account_option */ -{ yy_destructor(yypParser,222,&yymsp[-1].minor); +{ yy_destructor(yypParser,223,&yymsp[-1].minor); { } - yy_destructor(yypParser,224,&yymsp[0].minor); + yy_destructor(yypParser,225,&yymsp[0].minor); } break; case 14: /* alter_account_option ::= PASS literal */ @@ -2765,31 +2772,31 @@ static YYACTIONTYPE yy_reduce( case 22: /* alter_account_option ::= CONNS literal */ yytestcase(yyruleno==22); case 23: /* alter_account_option ::= STATE literal */ yytestcase(yyruleno==23); { } - yy_destructor(yypParser,223,&yymsp[0].minor); + yy_destructor(yypParser,224,&yymsp[0].minor); break; case 24: /* cmd ::= CREATE USER user_name PASS NK_STRING */ -{ pCxt->pRootNode = createCreateUserStmt(pCxt, &yymsp[-2].minor.yy537, &yymsp[0].minor.yy0); } +{ pCxt->pRootNode = createCreateUserStmt(pCxt, &yymsp[-2].minor.yy359, &yymsp[0].minor.yy0); } break; case 25: /* cmd ::= ALTER USER user_name PASS NK_STRING */ -{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy537, TSDB_ALTER_USER_PASSWD, &yymsp[0].minor.yy0); } +{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy359, TSDB_ALTER_USER_PASSWD, &yymsp[0].minor.yy0); } break; case 26: /* cmd ::= ALTER USER user_name PRIVILEGE NK_STRING */ -{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy537, TSDB_ALTER_USER_PRIVILEGES, &yymsp[0].minor.yy0); } +{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy359, TSDB_ALTER_USER_PRIVILEGES, &yymsp[0].minor.yy0); } break; case 27: /* cmd ::= DROP USER user_name */ -{ pCxt->pRootNode = createDropUserStmt(pCxt, &yymsp[0].minor.yy537); } +{ pCxt->pRootNode = createDropUserStmt(pCxt, &yymsp[0].minor.yy359); } break; case 28: /* cmd ::= CREATE DNODE dnode_endpoint */ -{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[0].minor.yy537, NULL); } +{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[0].minor.yy359, NULL); } break; case 29: /* cmd ::= CREATE DNODE dnode_host_name PORT NK_INTEGER */ -{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[-2].minor.yy537, &yymsp[0].minor.yy0); } +{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[-2].minor.yy359, &yymsp[0].minor.yy0); } break; case 30: /* cmd ::= DROP DNODE NK_INTEGER */ { pCxt->pRootNode = createDropDnodeStmt(pCxt, &yymsp[0].minor.yy0); } break; case 31: /* cmd ::= DROP DNODE dnode_endpoint */ -{ pCxt->pRootNode = createDropDnodeStmt(pCxt, &yymsp[0].minor.yy537); } +{ pCxt->pRootNode = createDropDnodeStmt(pCxt, &yymsp[0].minor.yy359); } break; case 32: /* cmd ::= ALTER DNODE NK_INTEGER NK_STRING */ { pCxt->pRootNode = createAlterDnodeStmt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0, NULL); } @@ -2806,25 +2813,25 @@ static YYACTIONTYPE yy_reduce( case 36: /* dnode_endpoint ::= NK_STRING */ case 37: /* dnode_host_name ::= NK_ID */ yytestcase(yyruleno==37); case 38: /* dnode_host_name ::= NK_IPTOKEN */ yytestcase(yyruleno==38); - case 274: /* db_name ::= NK_ID */ yytestcase(yyruleno==274); - case 275: /* table_name ::= NK_ID */ yytestcase(yyruleno==275); - case 276: /* column_name ::= NK_ID */ yytestcase(yyruleno==276); - case 277: /* function_name ::= NK_ID */ yytestcase(yyruleno==277); - case 278: /* table_alias ::= NK_ID */ yytestcase(yyruleno==278); - case 279: /* column_alias ::= NK_ID */ yytestcase(yyruleno==279); - case 280: /* user_name ::= NK_ID */ yytestcase(yyruleno==280); - case 281: /* index_name ::= NK_ID */ yytestcase(yyruleno==281); - case 282: /* topic_name ::= NK_ID */ yytestcase(yyruleno==282); - case 283: /* stream_name ::= NK_ID */ yytestcase(yyruleno==283); - case 313: /* noarg_func ::= NOW */ yytestcase(yyruleno==313); - case 314: /* noarg_func ::= TODAY */ yytestcase(yyruleno==314); - case 315: /* noarg_func ::= TIMEZONE */ yytestcase(yyruleno==315); - case 316: /* star_func ::= COUNT */ yytestcase(yyruleno==316); - case 317: /* star_func ::= FIRST */ yytestcase(yyruleno==317); - case 318: /* star_func ::= LAST */ yytestcase(yyruleno==318); - case 319: /* star_func ::= LAST_ROW */ yytestcase(yyruleno==319); -{ yylhsminor.yy537 = yymsp[0].minor.yy0; } - yymsp[0].minor.yy537 = yylhsminor.yy537; + case 276: /* db_name ::= NK_ID */ yytestcase(yyruleno==276); + case 277: /* table_name ::= NK_ID */ yytestcase(yyruleno==277); + case 278: /* column_name ::= NK_ID */ yytestcase(yyruleno==278); + case 279: /* function_name ::= NK_ID */ yytestcase(yyruleno==279); + case 280: /* table_alias ::= NK_ID */ yytestcase(yyruleno==280); + case 281: /* column_alias ::= NK_ID */ yytestcase(yyruleno==281); + case 282: /* user_name ::= NK_ID */ yytestcase(yyruleno==282); + case 283: /* index_name ::= NK_ID */ yytestcase(yyruleno==283); + case 284: /* topic_name ::= NK_ID */ yytestcase(yyruleno==284); + case 285: /* stream_name ::= NK_ID */ yytestcase(yyruleno==285); + case 315: /* noarg_func ::= NOW */ yytestcase(yyruleno==315); + case 316: /* noarg_func ::= TODAY */ yytestcase(yyruleno==316); + case 317: /* noarg_func ::= TIMEZONE */ yytestcase(yyruleno==317); + case 318: /* star_func ::= COUNT */ yytestcase(yyruleno==318); + case 319: /* star_func ::= FIRST */ yytestcase(yyruleno==319); + case 320: /* star_func ::= LAST */ yytestcase(yyruleno==320); + case 321: /* star_func ::= LAST_ROW */ yytestcase(yyruleno==321); +{ yylhsminor.yy359 = yymsp[0].minor.yy0; } + yymsp[0].minor.yy359 = yylhsminor.yy359; break; case 39: /* cmd ::= ALTER LOCAL NK_STRING */ { pCxt->pRootNode = createAlterLocalStmt(pCxt, &yymsp[0].minor.yy0, NULL); } @@ -2857,1125 +2864,1132 @@ static YYACTIONTYPE yy_reduce( { pCxt->pRootNode = createDropComponentNodeStmt(pCxt, QUERY_NODE_DROP_MNODE_STMT, &yymsp[0].minor.yy0); } break; case 49: /* cmd ::= CREATE DATABASE not_exists_opt db_name db_options */ -{ pCxt->pRootNode = createCreateDatabaseStmt(pCxt, yymsp[-2].minor.yy649, &yymsp[-1].minor.yy537, yymsp[0].minor.yy456); } +{ pCxt->pRootNode = createCreateDatabaseStmt(pCxt, yymsp[-2].minor.yy237, &yymsp[-1].minor.yy359, yymsp[0].minor.yy42); } break; case 50: /* cmd ::= DROP DATABASE exists_opt db_name */ -{ pCxt->pRootNode = createDropDatabaseStmt(pCxt, yymsp[-1].minor.yy649, &yymsp[0].minor.yy537); } +{ pCxt->pRootNode = createDropDatabaseStmt(pCxt, yymsp[-1].minor.yy237, &yymsp[0].minor.yy359); } break; case 51: /* cmd ::= USE db_name */ -{ pCxt->pRootNode = createUseDatabaseStmt(pCxt, &yymsp[0].minor.yy537); } +{ pCxt->pRootNode = createUseDatabaseStmt(pCxt, &yymsp[0].minor.yy359); } break; case 52: /* cmd ::= ALTER DATABASE db_name alter_db_options */ -{ pCxt->pRootNode = createAlterDatabaseStmt(pCxt, &yymsp[-1].minor.yy537, yymsp[0].minor.yy456); } +{ pCxt->pRootNode = createAlterDatabaseStmt(pCxt, &yymsp[-1].minor.yy359, yymsp[0].minor.yy42); } break; case 53: /* not_exists_opt ::= IF NOT EXISTS */ -{ yymsp[-2].minor.yy649 = true; } +{ yymsp[-2].minor.yy237 = true; } break; case 54: /* not_exists_opt ::= */ case 56: /* exists_opt ::= */ yytestcase(yyruleno==56); - case 222: /* analyze_opt ::= */ yytestcase(yyruleno==222); - case 230: /* agg_func_opt ::= */ yytestcase(yyruleno==230); - case 372: /* set_quantifier_opt ::= */ yytestcase(yyruleno==372); -{ yymsp[1].minor.yy649 = false; } + case 224: /* analyze_opt ::= */ yytestcase(yyruleno==224); + case 232: /* agg_func_opt ::= */ yytestcase(yyruleno==232); + case 374: /* set_quantifier_opt ::= */ yytestcase(yyruleno==374); +{ yymsp[1].minor.yy237 = false; } break; case 55: /* exists_opt ::= IF EXISTS */ -{ yymsp[-1].minor.yy649 = true; } +{ yymsp[-1].minor.yy237 = true; } break; case 57: /* db_options ::= */ -{ yymsp[1].minor.yy456 = createDatabaseOptions(pCxt); } +{ yymsp[1].minor.yy42 = createDatabaseOptions(pCxt); } break; case 58: /* db_options ::= db_options BLOCKS NK_INTEGER */ -{ ((SDatabaseOptions*)yymsp[-2].minor.yy456)->pNumOfBlocks = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy456 = yymsp[-2].minor.yy456; } - yymsp[-2].minor.yy456 = yylhsminor.yy456; +{ ((SDatabaseOptions*)yymsp[-2].minor.yy42)->pNumOfBlocks = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy42 = yymsp[-2].minor.yy42; } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; case 59: /* db_options ::= db_options CACHE NK_INTEGER */ -{ ((SDatabaseOptions*)yymsp[-2].minor.yy456)->pCacheBlockSize = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy456 = yymsp[-2].minor.yy456; } - yymsp[-2].minor.yy456 = yylhsminor.yy456; +{ ((SDatabaseOptions*)yymsp[-2].minor.yy42)->pCacheBlockSize = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy42 = yymsp[-2].minor.yy42; } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; case 60: /* db_options ::= db_options CACHELAST NK_INTEGER */ -{ ((SDatabaseOptions*)yymsp[-2].minor.yy456)->pCachelast = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy456 = yymsp[-2].minor.yy456; } - yymsp[-2].minor.yy456 = yylhsminor.yy456; +{ ((SDatabaseOptions*)yymsp[-2].minor.yy42)->pCachelast = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy42 = yymsp[-2].minor.yy42; } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; case 61: /* db_options ::= db_options COMP NK_INTEGER */ -{ ((SDatabaseOptions*)yymsp[-2].minor.yy456)->pCompressionLevel = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy456 = yymsp[-2].minor.yy456; } - yymsp[-2].minor.yy456 = yylhsminor.yy456; +{ ((SDatabaseOptions*)yymsp[-2].minor.yy42)->pCompressionLevel = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy42 = yymsp[-2].minor.yy42; } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; case 62: /* db_options ::= db_options DAYS NK_INTEGER */ -{ ((SDatabaseOptions*)yymsp[-2].minor.yy456)->pDaysPerFile = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy456 = yymsp[-2].minor.yy456; } - yymsp[-2].minor.yy456 = yylhsminor.yy456; +{ ((SDatabaseOptions*)yymsp[-2].minor.yy42)->pDaysPerFile = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy42 = yymsp[-2].minor.yy42; } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; case 63: /* db_options ::= db_options DAYS NK_VARIABLE */ -{ ((SDatabaseOptions*)yymsp[-2].minor.yy456)->pDaysPerFile = (SValueNode*)createDurationValueNode(pCxt, &yymsp[0].minor.yy0); yylhsminor.yy456 = yymsp[-2].minor.yy456; } - yymsp[-2].minor.yy456 = yylhsminor.yy456; +{ ((SDatabaseOptions*)yymsp[-2].minor.yy42)->pDaysPerFile = (SValueNode*)createDurationValueNode(pCxt, &yymsp[0].minor.yy0); yylhsminor.yy42 = yymsp[-2].minor.yy42; } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; case 64: /* db_options ::= db_options FSYNC NK_INTEGER */ -{ ((SDatabaseOptions*)yymsp[-2].minor.yy456)->pFsyncPeriod = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy456 = yymsp[-2].minor.yy456; } - yymsp[-2].minor.yy456 = yylhsminor.yy456; +{ ((SDatabaseOptions*)yymsp[-2].minor.yy42)->pFsyncPeriod = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy42 = yymsp[-2].minor.yy42; } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; case 65: /* db_options ::= db_options MAXROWS NK_INTEGER */ -{ ((SDatabaseOptions*)yymsp[-2].minor.yy456)->pMaxRowsPerBlock = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy456 = yymsp[-2].minor.yy456; } - yymsp[-2].minor.yy456 = yylhsminor.yy456; +{ ((SDatabaseOptions*)yymsp[-2].minor.yy42)->pMaxRowsPerBlock = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy42 = yymsp[-2].minor.yy42; } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; case 66: /* db_options ::= db_options MINROWS NK_INTEGER */ -{ ((SDatabaseOptions*)yymsp[-2].minor.yy456)->pMinRowsPerBlock = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy456 = yymsp[-2].minor.yy456; } - yymsp[-2].minor.yy456 = yylhsminor.yy456; +{ ((SDatabaseOptions*)yymsp[-2].minor.yy42)->pMinRowsPerBlock = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy42 = yymsp[-2].minor.yy42; } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; case 67: /* db_options ::= db_options KEEP integer_list */ case 68: /* db_options ::= db_options KEEP variable_list */ yytestcase(yyruleno==68); -{ ((SDatabaseOptions*)yymsp[-2].minor.yy456)->pKeep = yymsp[0].minor.yy632; yylhsminor.yy456 = yymsp[-2].minor.yy456; } - yymsp[-2].minor.yy456 = yylhsminor.yy456; +{ ((SDatabaseOptions*)yymsp[-2].minor.yy42)->pKeep = yymsp[0].minor.yy244; yylhsminor.yy42 = yymsp[-2].minor.yy42; } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; case 69: /* db_options ::= db_options PRECISION NK_STRING */ -{ ((SDatabaseOptions*)yymsp[-2].minor.yy456)->pPrecision = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); yylhsminor.yy456 = yymsp[-2].minor.yy456; } - yymsp[-2].minor.yy456 = yylhsminor.yy456; +{ ((SDatabaseOptions*)yymsp[-2].minor.yy42)->pPrecision = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); yylhsminor.yy42 = yymsp[-2].minor.yy42; } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; case 70: /* db_options ::= db_options QUORUM NK_INTEGER */ -{ ((SDatabaseOptions*)yymsp[-2].minor.yy456)->pQuorum = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy456 = yymsp[-2].minor.yy456; } - yymsp[-2].minor.yy456 = yylhsminor.yy456; +{ ((SDatabaseOptions*)yymsp[-2].minor.yy42)->pQuorum = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy42 = yymsp[-2].minor.yy42; } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; case 71: /* db_options ::= db_options REPLICA NK_INTEGER */ -{ ((SDatabaseOptions*)yymsp[-2].minor.yy456)->pReplica = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy456 = yymsp[-2].minor.yy456; } - yymsp[-2].minor.yy456 = yylhsminor.yy456; +{ ((SDatabaseOptions*)yymsp[-2].minor.yy42)->pReplica = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy42 = yymsp[-2].minor.yy42; } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; case 72: /* db_options ::= db_options TTL NK_INTEGER */ -{ ((SDatabaseOptions*)yymsp[-2].minor.yy456)->pTtl = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy456 = yymsp[-2].minor.yy456; } - yymsp[-2].minor.yy456 = yylhsminor.yy456; +{ ((SDatabaseOptions*)yymsp[-2].minor.yy42)->pTtl = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy42 = yymsp[-2].minor.yy42; } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; case 73: /* db_options ::= db_options WAL NK_INTEGER */ -{ ((SDatabaseOptions*)yymsp[-2].minor.yy456)->pWalLevel = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy456 = yymsp[-2].minor.yy456; } - yymsp[-2].minor.yy456 = yylhsminor.yy456; +{ ((SDatabaseOptions*)yymsp[-2].minor.yy42)->pWalLevel = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy42 = yymsp[-2].minor.yy42; } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; case 74: /* db_options ::= db_options VGROUPS NK_INTEGER */ -{ ((SDatabaseOptions*)yymsp[-2].minor.yy456)->pNumOfVgroups = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy456 = yymsp[-2].minor.yy456; } - yymsp[-2].minor.yy456 = yylhsminor.yy456; +{ ((SDatabaseOptions*)yymsp[-2].minor.yy42)->pNumOfVgroups = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy42 = yymsp[-2].minor.yy42; } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; case 75: /* db_options ::= db_options SINGLE_STABLE NK_INTEGER */ -{ ((SDatabaseOptions*)yymsp[-2].minor.yy456)->pSingleStable = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy456 = yymsp[-2].minor.yy456; } - yymsp[-2].minor.yy456 = yylhsminor.yy456; +{ ((SDatabaseOptions*)yymsp[-2].minor.yy42)->pSingleStable = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy42 = yymsp[-2].minor.yy42; } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; case 76: /* db_options ::= db_options STREAM_MODE NK_INTEGER */ -{ ((SDatabaseOptions*)yymsp[-2].minor.yy456)->pStreamMode = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy456 = yymsp[-2].minor.yy456; } - yymsp[-2].minor.yy456 = yylhsminor.yy456; +{ ((SDatabaseOptions*)yymsp[-2].minor.yy42)->pStreamMode = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy42 = yymsp[-2].minor.yy42; } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; case 77: /* db_options ::= db_options RETENTIONS retention_list */ -{ ((SDatabaseOptions*)yymsp[-2].minor.yy456)->pRetentions = yymsp[0].minor.yy632; yylhsminor.yy456 = yymsp[-2].minor.yy456; } - yymsp[-2].minor.yy456 = yylhsminor.yy456; - break; - case 78: /* alter_db_options ::= alter_db_option */ -{ yylhsminor.yy456 = createDatabaseOptions(pCxt); yylhsminor.yy456 = setDatabaseAlterOption(pCxt, yylhsminor.yy456, &yymsp[0].minor.yy29); } - yymsp[0].minor.yy456 = yylhsminor.yy456; - break; - case 79: /* alter_db_options ::= alter_db_options alter_db_option */ -{ yylhsminor.yy456 = setDatabaseAlterOption(pCxt, yymsp[-1].minor.yy456, &yymsp[0].minor.yy29); } - yymsp[-1].minor.yy456 = yylhsminor.yy456; - break; - case 80: /* alter_db_option ::= BLOCKS NK_INTEGER */ -{ yymsp[-1].minor.yy29.type = DB_OPTION_BLOCKS; yymsp[-1].minor.yy29.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); } - break; - case 81: /* alter_db_option ::= FSYNC NK_INTEGER */ -{ yymsp[-1].minor.yy29.type = DB_OPTION_FSYNC; yymsp[-1].minor.yy29.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); } - break; - case 82: /* alter_db_option ::= KEEP integer_list */ - case 83: /* alter_db_option ::= KEEP variable_list */ yytestcase(yyruleno==83); -{ yymsp[-1].minor.yy29.type = DB_OPTION_KEEP; yymsp[-1].minor.yy29.pList = yymsp[0].minor.yy632; } - break; - case 84: /* alter_db_option ::= WAL NK_INTEGER */ -{ yymsp[-1].minor.yy29.type = DB_OPTION_WAL; yymsp[-1].minor.yy29.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); } - break; - case 85: /* alter_db_option ::= QUORUM NK_INTEGER */ -{ yymsp[-1].minor.yy29.type = DB_OPTION_QUORUM; yymsp[-1].minor.yy29.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); } - break; - case 86: /* alter_db_option ::= CACHELAST NK_INTEGER */ -{ yymsp[-1].minor.yy29.type = DB_OPTION_CACHELAST; yymsp[-1].minor.yy29.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); } - break; - case 87: /* alter_db_option ::= REPLICA NK_INTEGER */ -{ yymsp[-1].minor.yy29.type = DB_OPTION_REPLICA; yymsp[-1].minor.yy29.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); } - break; - case 88: /* integer_list ::= NK_INTEGER */ -{ yylhsminor.yy632 = createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy632 = yylhsminor.yy632; - break; - case 89: /* integer_list ::= integer_list NK_COMMA NK_INTEGER */ - case 248: /* dnode_list ::= dnode_list DNODE NK_INTEGER */ yytestcase(yyruleno==248); -{ yylhsminor.yy632 = addNodeToList(pCxt, yymsp[-2].minor.yy632, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); } - yymsp[-2].minor.yy632 = yylhsminor.yy632; - break; - case 90: /* variable_list ::= NK_VARIABLE */ -{ yylhsminor.yy632 = createNodeList(pCxt, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy632 = yylhsminor.yy632; - break; - case 91: /* variable_list ::= variable_list NK_COMMA NK_VARIABLE */ -{ yylhsminor.yy632 = addNodeToList(pCxt, yymsp[-2].minor.yy632, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); } - yymsp[-2].minor.yy632 = yylhsminor.yy632; - break; - case 92: /* retention_list ::= retention */ - case 112: /* multi_create_clause ::= create_subtable_clause */ yytestcase(yyruleno==112); - case 115: /* multi_drop_clause ::= drop_table_clause */ yytestcase(yyruleno==115); - case 122: /* column_def_list ::= column_def */ yytestcase(yyruleno==122); - case 167: /* col_name_list ::= col_name */ yytestcase(yyruleno==167); - case 203: /* func_name_list ::= func_name */ yytestcase(yyruleno==203); - case 212: /* func_list ::= func */ yytestcase(yyruleno==212); - case 272: /* literal_list ::= signed_literal */ yytestcase(yyruleno==272); - case 322: /* other_para_list ::= star_func_para */ yytestcase(yyruleno==322); - case 377: /* select_sublist ::= select_item */ yytestcase(yyruleno==377); - case 424: /* sort_specification_list ::= sort_specification */ yytestcase(yyruleno==424); -{ yylhsminor.yy632 = createNodeList(pCxt, yymsp[0].minor.yy456); } - yymsp[0].minor.yy632 = yylhsminor.yy632; - break; - case 93: /* retention_list ::= retention_list NK_COMMA retention */ - case 123: /* column_def_list ::= column_def_list NK_COMMA column_def */ yytestcase(yyruleno==123); - case 168: /* col_name_list ::= col_name_list NK_COMMA col_name */ yytestcase(yyruleno==168); - case 204: /* func_name_list ::= func_name_list NK_COMMA col_name */ yytestcase(yyruleno==204); - case 213: /* func_list ::= func_list NK_COMMA func */ yytestcase(yyruleno==213); - case 273: /* literal_list ::= literal_list NK_COMMA signed_literal */ yytestcase(yyruleno==273); - case 323: /* other_para_list ::= other_para_list NK_COMMA star_func_para */ yytestcase(yyruleno==323); - case 378: /* select_sublist ::= select_sublist NK_COMMA select_item */ yytestcase(yyruleno==378); - case 425: /* sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */ yytestcase(yyruleno==425); -{ yylhsminor.yy632 = addNodeToList(pCxt, yymsp[-2].minor.yy632, yymsp[0].minor.yy456); } - yymsp[-2].minor.yy632 = yylhsminor.yy632; - break; - case 94: /* retention ::= NK_VARIABLE NK_COLON NK_VARIABLE */ -{ yylhsminor.yy456 = createNodeListNodeEx(pCxt, createDurationValueNode(pCxt, &yymsp[-2].minor.yy0), createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); } - yymsp[-2].minor.yy456 = yylhsminor.yy456; - break; - case 95: /* cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options */ - case 97: /* cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options */ yytestcase(yyruleno==97); -{ pCxt->pRootNode = createCreateTableStmt(pCxt, yymsp[-6].minor.yy649, yymsp[-5].minor.yy456, yymsp[-3].minor.yy632, yymsp[-1].minor.yy632, yymsp[0].minor.yy456); } - break; - case 96: /* cmd ::= CREATE TABLE multi_create_clause */ -{ pCxt->pRootNode = createCreateMultiTableStmt(pCxt, yymsp[0].minor.yy632); } - break; - case 98: /* cmd ::= DROP TABLE multi_drop_clause */ -{ pCxt->pRootNode = createDropTableStmt(pCxt, yymsp[0].minor.yy632); } - break; - case 99: /* cmd ::= DROP STABLE exists_opt full_table_name */ -{ pCxt->pRootNode = createDropSuperTableStmt(pCxt, yymsp[-1].minor.yy649, yymsp[0].minor.yy456); } - break; - case 100: /* cmd ::= ALTER TABLE alter_table_clause */ - case 101: /* cmd ::= ALTER STABLE alter_table_clause */ yytestcase(yyruleno==101); - case 250: /* cmd ::= query_expression */ yytestcase(yyruleno==250); -{ pCxt->pRootNode = yymsp[0].minor.yy456; } - break; - case 102: /* alter_table_clause ::= full_table_name alter_table_options */ -{ yylhsminor.yy456 = createAlterTableOption(pCxt, yymsp[-1].minor.yy456, yymsp[0].minor.yy456); } - yymsp[-1].minor.yy456 = yylhsminor.yy456; - break; - case 103: /* alter_table_clause ::= full_table_name ADD COLUMN column_name type_name */ -{ yylhsminor.yy456 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy456, TSDB_ALTER_TABLE_ADD_COLUMN, &yymsp[-1].minor.yy537, yymsp[0].minor.yy388); } - yymsp[-4].minor.yy456 = yylhsminor.yy456; - break; - case 104: /* alter_table_clause ::= full_table_name DROP COLUMN column_name */ -{ yylhsminor.yy456 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy456, TSDB_ALTER_TABLE_DROP_COLUMN, &yymsp[0].minor.yy537); } - yymsp[-3].minor.yy456 = yylhsminor.yy456; - break; - case 105: /* alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name */ -{ yylhsminor.yy456 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy456, TSDB_ALTER_TABLE_UPDATE_COLUMN_BYTES, &yymsp[-1].minor.yy537, yymsp[0].minor.yy388); } - yymsp[-4].minor.yy456 = yylhsminor.yy456; +{ ((SDatabaseOptions*)yymsp[-2].minor.yy42)->pRetentions = yymsp[0].minor.yy244; yylhsminor.yy42 = yymsp[-2].minor.yy42; } + yymsp[-2].minor.yy42 = yylhsminor.yy42; + break; + case 78: /* db_options ::= db_options STRICT NK_INTEGER */ +{ ((SDatabaseOptions*)yymsp[-2].minor.yy42)->pStrict = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy42 = yymsp[-2].minor.yy42; } + yymsp[-2].minor.yy42 = yylhsminor.yy42; + break; + case 79: /* alter_db_options ::= alter_db_option */ +{ yylhsminor.yy42 = createDatabaseOptions(pCxt); yylhsminor.yy42 = setDatabaseAlterOption(pCxt, yylhsminor.yy42, &yymsp[0].minor.yy325); } + yymsp[0].minor.yy42 = yylhsminor.yy42; + break; + case 80: /* alter_db_options ::= alter_db_options alter_db_option */ +{ yylhsminor.yy42 = setDatabaseAlterOption(pCxt, yymsp[-1].minor.yy42, &yymsp[0].minor.yy325); } + yymsp[-1].minor.yy42 = yylhsminor.yy42; + break; + case 81: /* alter_db_option ::= BLOCKS NK_INTEGER */ +{ yymsp[-1].minor.yy325.type = DB_OPTION_BLOCKS; yymsp[-1].minor.yy325.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); } + break; + case 82: /* alter_db_option ::= FSYNC NK_INTEGER */ +{ yymsp[-1].minor.yy325.type = DB_OPTION_FSYNC; yymsp[-1].minor.yy325.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); } + break; + case 83: /* alter_db_option ::= KEEP integer_list */ + case 84: /* alter_db_option ::= KEEP variable_list */ yytestcase(yyruleno==84); +{ yymsp[-1].minor.yy325.type = DB_OPTION_KEEP; yymsp[-1].minor.yy325.pList = yymsp[0].minor.yy244; } + break; + case 85: /* alter_db_option ::= WAL NK_INTEGER */ +{ yymsp[-1].minor.yy325.type = DB_OPTION_WAL; yymsp[-1].minor.yy325.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); } + break; + case 86: /* alter_db_option ::= QUORUM NK_INTEGER */ +{ yymsp[-1].minor.yy325.type = DB_OPTION_QUORUM; yymsp[-1].minor.yy325.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); } + break; + case 87: /* alter_db_option ::= CACHELAST NK_INTEGER */ +{ yymsp[-1].minor.yy325.type = DB_OPTION_CACHELAST; yymsp[-1].minor.yy325.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); } + break; + case 88: /* alter_db_option ::= REPLICA NK_INTEGER */ +{ yymsp[-1].minor.yy325.type = DB_OPTION_REPLICA; yymsp[-1].minor.yy325.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); } + break; + case 89: /* alter_db_option ::= STRICT NK_INTEGER */ +{ yymsp[-1].minor.yy325.type = DB_OPTION_STRICT; yymsp[-1].minor.yy325.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); } + break; + case 90: /* integer_list ::= NK_INTEGER */ +{ yylhsminor.yy244 = createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy244 = yylhsminor.yy244; + break; + case 91: /* integer_list ::= integer_list NK_COMMA NK_INTEGER */ + case 250: /* dnode_list ::= dnode_list DNODE NK_INTEGER */ yytestcase(yyruleno==250); +{ yylhsminor.yy244 = addNodeToList(pCxt, yymsp[-2].minor.yy244, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); } + yymsp[-2].minor.yy244 = yylhsminor.yy244; + break; + case 92: /* variable_list ::= NK_VARIABLE */ +{ yylhsminor.yy244 = createNodeList(pCxt, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy244 = yylhsminor.yy244; + break; + case 93: /* variable_list ::= variable_list NK_COMMA NK_VARIABLE */ +{ yylhsminor.yy244 = addNodeToList(pCxt, yymsp[-2].minor.yy244, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); } + yymsp[-2].minor.yy244 = yylhsminor.yy244; + break; + case 94: /* retention_list ::= retention */ + case 114: /* multi_create_clause ::= create_subtable_clause */ yytestcase(yyruleno==114); + case 117: /* multi_drop_clause ::= drop_table_clause */ yytestcase(yyruleno==117); + case 124: /* column_def_list ::= column_def */ yytestcase(yyruleno==124); + case 169: /* col_name_list ::= col_name */ yytestcase(yyruleno==169); + case 205: /* func_name_list ::= func_name */ yytestcase(yyruleno==205); + case 214: /* func_list ::= func */ yytestcase(yyruleno==214); + case 274: /* literal_list ::= signed_literal */ yytestcase(yyruleno==274); + case 324: /* other_para_list ::= star_func_para */ yytestcase(yyruleno==324); + case 379: /* select_sublist ::= select_item */ yytestcase(yyruleno==379); + case 426: /* sort_specification_list ::= sort_specification */ yytestcase(yyruleno==426); +{ yylhsminor.yy244 = createNodeList(pCxt, yymsp[0].minor.yy42); } + yymsp[0].minor.yy244 = yylhsminor.yy244; + break; + case 95: /* retention_list ::= retention_list NK_COMMA retention */ + case 125: /* column_def_list ::= column_def_list NK_COMMA column_def */ yytestcase(yyruleno==125); + case 170: /* col_name_list ::= col_name_list NK_COMMA col_name */ yytestcase(yyruleno==170); + case 206: /* func_name_list ::= func_name_list NK_COMMA func_name */ yytestcase(yyruleno==206); + case 215: /* func_list ::= func_list NK_COMMA func */ yytestcase(yyruleno==215); + case 275: /* literal_list ::= literal_list NK_COMMA signed_literal */ yytestcase(yyruleno==275); + case 325: /* other_para_list ::= other_para_list NK_COMMA star_func_para */ yytestcase(yyruleno==325); + case 380: /* select_sublist ::= select_sublist NK_COMMA select_item */ yytestcase(yyruleno==380); + case 427: /* sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */ yytestcase(yyruleno==427); +{ yylhsminor.yy244 = addNodeToList(pCxt, yymsp[-2].minor.yy244, yymsp[0].minor.yy42); } + yymsp[-2].minor.yy244 = yylhsminor.yy244; + break; + case 96: /* retention ::= NK_VARIABLE NK_COLON NK_VARIABLE */ +{ yylhsminor.yy42 = createNodeListNodeEx(pCxt, createDurationValueNode(pCxt, &yymsp[-2].minor.yy0), createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); } + yymsp[-2].minor.yy42 = yylhsminor.yy42; + break; + case 97: /* cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options */ + case 99: /* cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options */ yytestcase(yyruleno==99); +{ pCxt->pRootNode = createCreateTableStmt(pCxt, yymsp[-6].minor.yy237, yymsp[-5].minor.yy42, yymsp[-3].minor.yy244, yymsp[-1].minor.yy244, yymsp[0].minor.yy42); } + break; + case 98: /* cmd ::= CREATE TABLE multi_create_clause */ +{ pCxt->pRootNode = createCreateMultiTableStmt(pCxt, yymsp[0].minor.yy244); } + break; + case 100: /* cmd ::= DROP TABLE multi_drop_clause */ +{ pCxt->pRootNode = createDropTableStmt(pCxt, yymsp[0].minor.yy244); } + break; + case 101: /* cmd ::= DROP STABLE exists_opt full_table_name */ +{ pCxt->pRootNode = createDropSuperTableStmt(pCxt, yymsp[-1].minor.yy237, yymsp[0].minor.yy42); } + break; + case 102: /* cmd ::= ALTER TABLE alter_table_clause */ + case 103: /* cmd ::= ALTER STABLE alter_table_clause */ yytestcase(yyruleno==103); + case 252: /* cmd ::= query_expression */ yytestcase(yyruleno==252); +{ pCxt->pRootNode = yymsp[0].minor.yy42; } + break; + case 104: /* alter_table_clause ::= full_table_name alter_table_options */ +{ yylhsminor.yy42 = createAlterTableOption(pCxt, yymsp[-1].minor.yy42, yymsp[0].minor.yy42); } + yymsp[-1].minor.yy42 = yylhsminor.yy42; + break; + case 105: /* alter_table_clause ::= full_table_name ADD COLUMN column_name type_name */ +{ yylhsminor.yy42 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy42, TSDB_ALTER_TABLE_ADD_COLUMN, &yymsp[-1].minor.yy359, yymsp[0].minor.yy314); } + yymsp[-4].minor.yy42 = yylhsminor.yy42; + break; + case 106: /* alter_table_clause ::= full_table_name DROP COLUMN column_name */ +{ yylhsminor.yy42 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy42, TSDB_ALTER_TABLE_DROP_COLUMN, &yymsp[0].minor.yy359); } + yymsp[-3].minor.yy42 = yylhsminor.yy42; + break; + case 107: /* alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name */ +{ yylhsminor.yy42 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy42, TSDB_ALTER_TABLE_UPDATE_COLUMN_BYTES, &yymsp[-1].minor.yy359, yymsp[0].minor.yy314); } + yymsp[-4].minor.yy42 = yylhsminor.yy42; break; - case 106: /* alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name */ -{ yylhsminor.yy456 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy456, TSDB_ALTER_TABLE_UPDATE_COLUMN_NAME, &yymsp[-1].minor.yy537, &yymsp[0].minor.yy537); } - yymsp[-4].minor.yy456 = yylhsminor.yy456; - break; - case 107: /* alter_table_clause ::= full_table_name ADD TAG column_name type_name */ -{ yylhsminor.yy456 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy456, TSDB_ALTER_TABLE_ADD_TAG, &yymsp[-1].minor.yy537, yymsp[0].minor.yy388); } - yymsp[-4].minor.yy456 = yylhsminor.yy456; - break; - case 108: /* alter_table_clause ::= full_table_name DROP TAG column_name */ -{ yylhsminor.yy456 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy456, TSDB_ALTER_TABLE_DROP_TAG, &yymsp[0].minor.yy537); } - yymsp[-3].minor.yy456 = yylhsminor.yy456; + case 108: /* alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name */ +{ yylhsminor.yy42 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy42, TSDB_ALTER_TABLE_UPDATE_COLUMN_NAME, &yymsp[-1].minor.yy359, &yymsp[0].minor.yy359); } + yymsp[-4].minor.yy42 = yylhsminor.yy42; break; - case 109: /* alter_table_clause ::= full_table_name MODIFY TAG column_name type_name */ -{ yylhsminor.yy456 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy456, TSDB_ALTER_TABLE_UPDATE_TAG_BYTES, &yymsp[-1].minor.yy537, yymsp[0].minor.yy388); } - yymsp[-4].minor.yy456 = yylhsminor.yy456; + case 109: /* alter_table_clause ::= full_table_name ADD TAG column_name type_name */ +{ yylhsminor.yy42 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy42, TSDB_ALTER_TABLE_ADD_TAG, &yymsp[-1].minor.yy359, yymsp[0].minor.yy314); } + yymsp[-4].minor.yy42 = yylhsminor.yy42; + break; + case 110: /* alter_table_clause ::= full_table_name DROP TAG column_name */ +{ yylhsminor.yy42 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy42, TSDB_ALTER_TABLE_DROP_TAG, &yymsp[0].minor.yy359); } + yymsp[-3].minor.yy42 = yylhsminor.yy42; break; - case 110: /* alter_table_clause ::= full_table_name RENAME TAG column_name column_name */ -{ yylhsminor.yy456 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy456, TSDB_ALTER_TABLE_UPDATE_TAG_NAME, &yymsp[-1].minor.yy537, &yymsp[0].minor.yy537); } - yymsp[-4].minor.yy456 = yylhsminor.yy456; - break; - case 111: /* alter_table_clause ::= full_table_name SET TAG column_name NK_EQ literal */ -{ yylhsminor.yy456 = createAlterTableSetTag(pCxt, yymsp[-5].minor.yy456, &yymsp[-2].minor.yy537, yymsp[0].minor.yy456); } - yymsp[-5].minor.yy456 = yylhsminor.yy456; + case 111: /* alter_table_clause ::= full_table_name MODIFY TAG column_name type_name */ +{ yylhsminor.yy42 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy42, TSDB_ALTER_TABLE_UPDATE_TAG_BYTES, &yymsp[-1].minor.yy359, yymsp[0].minor.yy314); } + yymsp[-4].minor.yy42 = yylhsminor.yy42; break; - case 113: /* multi_create_clause ::= multi_create_clause create_subtable_clause */ - case 116: /* multi_drop_clause ::= multi_drop_clause drop_table_clause */ yytestcase(yyruleno==116); -{ yylhsminor.yy632 = addNodeToList(pCxt, yymsp[-1].minor.yy632, yymsp[0].minor.yy456); } - yymsp[-1].minor.yy632 = yylhsminor.yy632; + case 112: /* alter_table_clause ::= full_table_name RENAME TAG column_name column_name */ +{ yylhsminor.yy42 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy42, TSDB_ALTER_TABLE_UPDATE_TAG_NAME, &yymsp[-1].minor.yy359, &yymsp[0].minor.yy359); } + yymsp[-4].minor.yy42 = yylhsminor.yy42; + break; + case 113: /* alter_table_clause ::= full_table_name SET TAG column_name NK_EQ literal */ +{ yylhsminor.yy42 = createAlterTableSetTag(pCxt, yymsp[-5].minor.yy42, &yymsp[-2].minor.yy359, yymsp[0].minor.yy42); } + yymsp[-5].minor.yy42 = yylhsminor.yy42; break; - case 114: /* create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_tags_opt TAGS NK_LP literal_list NK_RP */ -{ yylhsminor.yy456 = createCreateSubTableClause(pCxt, yymsp[-8].minor.yy649, yymsp[-7].minor.yy456, yymsp[-5].minor.yy456, yymsp[-4].minor.yy632, yymsp[-1].minor.yy632); } - yymsp[-8].minor.yy456 = yylhsminor.yy456; + case 115: /* multi_create_clause ::= multi_create_clause create_subtable_clause */ + case 118: /* multi_drop_clause ::= multi_drop_clause drop_table_clause */ yytestcase(yyruleno==118); +{ yylhsminor.yy244 = addNodeToList(pCxt, yymsp[-1].minor.yy244, yymsp[0].minor.yy42); } + yymsp[-1].minor.yy244 = yylhsminor.yy244; break; - case 117: /* drop_table_clause ::= exists_opt full_table_name */ -{ yylhsminor.yy456 = createDropTableClause(pCxt, yymsp[-1].minor.yy649, yymsp[0].minor.yy456); } - yymsp[-1].minor.yy456 = yylhsminor.yy456; + case 116: /* create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_tags_opt TAGS NK_LP literal_list NK_RP */ +{ yylhsminor.yy42 = createCreateSubTableClause(pCxt, yymsp[-8].minor.yy237, yymsp[-7].minor.yy42, yymsp[-5].minor.yy42, yymsp[-4].minor.yy244, yymsp[-1].minor.yy244); } + yymsp[-8].minor.yy42 = yylhsminor.yy42; break; - case 118: /* specific_tags_opt ::= */ - case 149: /* tags_def_opt ::= */ yytestcase(yyruleno==149); - case 385: /* partition_by_clause_opt ::= */ yytestcase(yyruleno==385); - case 402: /* group_by_clause_opt ::= */ yytestcase(yyruleno==402); - case 412: /* order_by_clause_opt ::= */ yytestcase(yyruleno==412); -{ yymsp[1].minor.yy632 = NULL; } + case 119: /* drop_table_clause ::= exists_opt full_table_name */ +{ yylhsminor.yy42 = createDropTableClause(pCxt, yymsp[-1].minor.yy237, yymsp[0].minor.yy42); } + yymsp[-1].minor.yy42 = yylhsminor.yy42; break; - case 119: /* specific_tags_opt ::= NK_LP col_name_list NK_RP */ -{ yymsp[-2].minor.yy632 = yymsp[-1].minor.yy632; } + case 120: /* specific_tags_opt ::= */ + case 151: /* tags_def_opt ::= */ yytestcase(yyruleno==151); + case 387: /* partition_by_clause_opt ::= */ yytestcase(yyruleno==387); + case 404: /* group_by_clause_opt ::= */ yytestcase(yyruleno==404); + case 414: /* order_by_clause_opt ::= */ yytestcase(yyruleno==414); +{ yymsp[1].minor.yy244 = NULL; } break; - case 120: /* full_table_name ::= table_name */ -{ yylhsminor.yy456 = createRealTableNode(pCxt, NULL, &yymsp[0].minor.yy537, NULL); } - yymsp[0].minor.yy456 = yylhsminor.yy456; + case 121: /* specific_tags_opt ::= NK_LP col_name_list NK_RP */ +{ yymsp[-2].minor.yy244 = yymsp[-1].minor.yy244; } break; - case 121: /* full_table_name ::= db_name NK_DOT table_name */ -{ yylhsminor.yy456 = createRealTableNode(pCxt, &yymsp[-2].minor.yy537, &yymsp[0].minor.yy537, NULL); } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + case 122: /* full_table_name ::= table_name */ +{ yylhsminor.yy42 = createRealTableNode(pCxt, NULL, &yymsp[0].minor.yy359, NULL); } + yymsp[0].minor.yy42 = yylhsminor.yy42; break; - case 124: /* column_def ::= column_name type_name */ -{ yylhsminor.yy456 = createColumnDefNode(pCxt, &yymsp[-1].minor.yy537, yymsp[0].minor.yy388, NULL); } - yymsp[-1].minor.yy456 = yylhsminor.yy456; + case 123: /* full_table_name ::= db_name NK_DOT table_name */ +{ yylhsminor.yy42 = createRealTableNode(pCxt, &yymsp[-2].minor.yy359, &yymsp[0].minor.yy359, NULL); } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 125: /* column_def ::= column_name type_name COMMENT NK_STRING */ -{ yylhsminor.yy456 = createColumnDefNode(pCxt, &yymsp[-3].minor.yy537, yymsp[-2].minor.yy388, &yymsp[0].minor.yy0); } - yymsp[-3].minor.yy456 = yylhsminor.yy456; + case 126: /* column_def ::= column_name type_name */ +{ yylhsminor.yy42 = createColumnDefNode(pCxt, &yymsp[-1].minor.yy359, yymsp[0].minor.yy314, NULL); } + yymsp[-1].minor.yy42 = yylhsminor.yy42; break; - case 126: /* type_name ::= BOOL */ -{ yymsp[0].minor.yy388 = createDataType(TSDB_DATA_TYPE_BOOL); } + case 127: /* column_def ::= column_name type_name COMMENT NK_STRING */ +{ yylhsminor.yy42 = createColumnDefNode(pCxt, &yymsp[-3].minor.yy359, yymsp[-2].minor.yy314, &yymsp[0].minor.yy0); } + yymsp[-3].minor.yy42 = yylhsminor.yy42; break; - case 127: /* type_name ::= TINYINT */ -{ yymsp[0].minor.yy388 = createDataType(TSDB_DATA_TYPE_TINYINT); } + case 128: /* type_name ::= BOOL */ +{ yymsp[0].minor.yy314 = createDataType(TSDB_DATA_TYPE_BOOL); } break; - case 128: /* type_name ::= SMALLINT */ -{ yymsp[0].minor.yy388 = createDataType(TSDB_DATA_TYPE_SMALLINT); } + case 129: /* type_name ::= TINYINT */ +{ yymsp[0].minor.yy314 = createDataType(TSDB_DATA_TYPE_TINYINT); } break; - case 129: /* type_name ::= INT */ - case 130: /* type_name ::= INTEGER */ yytestcase(yyruleno==130); -{ yymsp[0].minor.yy388 = createDataType(TSDB_DATA_TYPE_INT); } + case 130: /* type_name ::= SMALLINT */ +{ yymsp[0].minor.yy314 = createDataType(TSDB_DATA_TYPE_SMALLINT); } break; - case 131: /* type_name ::= BIGINT */ -{ yymsp[0].minor.yy388 = createDataType(TSDB_DATA_TYPE_BIGINT); } + case 131: /* type_name ::= INT */ + case 132: /* type_name ::= INTEGER */ yytestcase(yyruleno==132); +{ yymsp[0].minor.yy314 = createDataType(TSDB_DATA_TYPE_INT); } break; - case 132: /* type_name ::= FLOAT */ -{ yymsp[0].minor.yy388 = createDataType(TSDB_DATA_TYPE_FLOAT); } + case 133: /* type_name ::= BIGINT */ +{ yymsp[0].minor.yy314 = createDataType(TSDB_DATA_TYPE_BIGINT); } break; - case 133: /* type_name ::= DOUBLE */ -{ yymsp[0].minor.yy388 = createDataType(TSDB_DATA_TYPE_DOUBLE); } + case 134: /* type_name ::= FLOAT */ +{ yymsp[0].minor.yy314 = createDataType(TSDB_DATA_TYPE_FLOAT); } break; - case 134: /* type_name ::= BINARY NK_LP NK_INTEGER NK_RP */ -{ yymsp[-3].minor.yy388 = createVarLenDataType(TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy0); } + case 135: /* type_name ::= DOUBLE */ +{ yymsp[0].minor.yy314 = createDataType(TSDB_DATA_TYPE_DOUBLE); } break; - case 135: /* type_name ::= TIMESTAMP */ -{ yymsp[0].minor.yy388 = createDataType(TSDB_DATA_TYPE_TIMESTAMP); } + case 136: /* type_name ::= BINARY NK_LP NK_INTEGER NK_RP */ +{ yymsp[-3].minor.yy314 = createVarLenDataType(TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy0); } break; - case 136: /* type_name ::= NCHAR NK_LP NK_INTEGER NK_RP */ -{ yymsp[-3].minor.yy388 = createVarLenDataType(TSDB_DATA_TYPE_NCHAR, &yymsp[-1].minor.yy0); } + case 137: /* type_name ::= TIMESTAMP */ +{ yymsp[0].minor.yy314 = createDataType(TSDB_DATA_TYPE_TIMESTAMP); } break; - case 137: /* type_name ::= TINYINT UNSIGNED */ -{ yymsp[-1].minor.yy388 = createDataType(TSDB_DATA_TYPE_UTINYINT); } + case 138: /* type_name ::= NCHAR NK_LP NK_INTEGER NK_RP */ +{ yymsp[-3].minor.yy314 = createVarLenDataType(TSDB_DATA_TYPE_NCHAR, &yymsp[-1].minor.yy0); } break; - case 138: /* type_name ::= SMALLINT UNSIGNED */ -{ yymsp[-1].minor.yy388 = createDataType(TSDB_DATA_TYPE_USMALLINT); } + case 139: /* type_name ::= TINYINT UNSIGNED */ +{ yymsp[-1].minor.yy314 = createDataType(TSDB_DATA_TYPE_UTINYINT); } break; - case 139: /* type_name ::= INT UNSIGNED */ -{ yymsp[-1].minor.yy388 = createDataType(TSDB_DATA_TYPE_UINT); } + case 140: /* type_name ::= SMALLINT UNSIGNED */ +{ yymsp[-1].minor.yy314 = createDataType(TSDB_DATA_TYPE_USMALLINT); } break; - case 140: /* type_name ::= BIGINT UNSIGNED */ -{ yymsp[-1].minor.yy388 = createDataType(TSDB_DATA_TYPE_UBIGINT); } + case 141: /* type_name ::= INT UNSIGNED */ +{ yymsp[-1].minor.yy314 = createDataType(TSDB_DATA_TYPE_UINT); } break; - case 141: /* type_name ::= JSON */ -{ yymsp[0].minor.yy388 = createDataType(TSDB_DATA_TYPE_JSON); } + case 142: /* type_name ::= BIGINT UNSIGNED */ +{ yymsp[-1].minor.yy314 = createDataType(TSDB_DATA_TYPE_UBIGINT); } break; - case 142: /* type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP */ -{ yymsp[-3].minor.yy388 = createVarLenDataType(TSDB_DATA_TYPE_VARCHAR, &yymsp[-1].minor.yy0); } + case 143: /* type_name ::= JSON */ +{ yymsp[0].minor.yy314 = createDataType(TSDB_DATA_TYPE_JSON); } break; - case 143: /* type_name ::= MEDIUMBLOB */ -{ yymsp[0].minor.yy388 = createDataType(TSDB_DATA_TYPE_MEDIUMBLOB); } + case 144: /* type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP */ +{ yymsp[-3].minor.yy314 = createVarLenDataType(TSDB_DATA_TYPE_VARCHAR, &yymsp[-1].minor.yy0); } break; - case 144: /* type_name ::= BLOB */ -{ yymsp[0].minor.yy388 = createDataType(TSDB_DATA_TYPE_BLOB); } + case 145: /* type_name ::= MEDIUMBLOB */ +{ yymsp[0].minor.yy314 = createDataType(TSDB_DATA_TYPE_MEDIUMBLOB); } break; - case 145: /* type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP */ -{ yymsp[-3].minor.yy388 = createVarLenDataType(TSDB_DATA_TYPE_VARBINARY, &yymsp[-1].minor.yy0); } + case 146: /* type_name ::= BLOB */ +{ yymsp[0].minor.yy314 = createDataType(TSDB_DATA_TYPE_BLOB); } break; - case 146: /* type_name ::= DECIMAL */ -{ yymsp[0].minor.yy388 = createDataType(TSDB_DATA_TYPE_DECIMAL); } + case 147: /* type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP */ +{ yymsp[-3].minor.yy314 = createVarLenDataType(TSDB_DATA_TYPE_VARBINARY, &yymsp[-1].minor.yy0); } break; - case 147: /* type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP */ -{ yymsp[-3].minor.yy388 = createDataType(TSDB_DATA_TYPE_DECIMAL); } + case 148: /* type_name ::= DECIMAL */ +{ yymsp[0].minor.yy314 = createDataType(TSDB_DATA_TYPE_DECIMAL); } break; - case 148: /* type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */ -{ yymsp[-5].minor.yy388 = createDataType(TSDB_DATA_TYPE_DECIMAL); } + case 149: /* type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP */ +{ yymsp[-3].minor.yy314 = createDataType(TSDB_DATA_TYPE_DECIMAL); } break; - case 150: /* tags_def_opt ::= tags_def */ - case 321: /* star_func_para_list ::= other_para_list */ yytestcase(yyruleno==321); - case 376: /* select_list ::= select_sublist */ yytestcase(yyruleno==376); -{ yylhsminor.yy632 = yymsp[0].minor.yy632; } - yymsp[0].minor.yy632 = yylhsminor.yy632; + case 150: /* type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */ +{ yymsp[-5].minor.yy314 = createDataType(TSDB_DATA_TYPE_DECIMAL); } break; - case 151: /* tags_def ::= TAGS NK_LP column_def_list NK_RP */ -{ yymsp[-3].minor.yy632 = yymsp[-1].minor.yy632; } + case 152: /* tags_def_opt ::= tags_def */ + case 323: /* star_func_para_list ::= other_para_list */ yytestcase(yyruleno==323); + case 378: /* select_list ::= select_sublist */ yytestcase(yyruleno==378); +{ yylhsminor.yy244 = yymsp[0].minor.yy244; } + yymsp[0].minor.yy244 = yylhsminor.yy244; break; - case 152: /* table_options ::= */ -{ yymsp[1].minor.yy456 = createTableOptions(pCxt); } + case 153: /* tags_def ::= TAGS NK_LP column_def_list NK_RP */ +{ yymsp[-3].minor.yy244 = yymsp[-1].minor.yy244; } break; - case 153: /* table_options ::= table_options COMMENT NK_STRING */ -{ ((STableOptions*)yymsp[-2].minor.yy456)->pComments = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); yylhsminor.yy456 = yymsp[-2].minor.yy456; } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + case 154: /* table_options ::= */ +{ yymsp[1].minor.yy42 = createTableOptions(pCxt); } break; - case 154: /* table_options ::= table_options KEEP integer_list */ - case 155: /* table_options ::= table_options KEEP variable_list */ yytestcase(yyruleno==155); -{ ((STableOptions*)yymsp[-2].minor.yy456)->pKeep = yymsp[0].minor.yy632; yylhsminor.yy456 = yymsp[-2].minor.yy456; } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + case 155: /* table_options ::= table_options COMMENT NK_STRING */ +{ ((STableOptions*)yymsp[-2].minor.yy42)->pComments = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); yylhsminor.yy42 = yymsp[-2].minor.yy42; } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 156: /* table_options ::= table_options TTL NK_INTEGER */ -{ ((STableOptions*)yymsp[-2].minor.yy456)->pTtl = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy456 = yymsp[-2].minor.yy456; } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + case 156: /* table_options ::= table_options KEEP integer_list */ + case 157: /* table_options ::= table_options KEEP variable_list */ yytestcase(yyruleno==157); +{ ((STableOptions*)yymsp[-2].minor.yy42)->pKeep = yymsp[0].minor.yy244; yylhsminor.yy42 = yymsp[-2].minor.yy42; } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 157: /* table_options ::= table_options SMA NK_LP col_name_list NK_RP */ -{ ((STableOptions*)yymsp[-4].minor.yy456)->pSma = yymsp[-1].minor.yy632; yylhsminor.yy456 = yymsp[-4].minor.yy456; } - yymsp[-4].minor.yy456 = yylhsminor.yy456; + case 158: /* table_options ::= table_options TTL NK_INTEGER */ +{ ((STableOptions*)yymsp[-2].minor.yy42)->pTtl = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy42 = yymsp[-2].minor.yy42; } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 158: /* table_options ::= table_options ROLLUP NK_LP func_name_list NK_RP */ -{ ((STableOptions*)yymsp[-4].minor.yy456)->pFuncs = yymsp[-1].minor.yy632; yylhsminor.yy456 = yymsp[-4].minor.yy456; } - yymsp[-4].minor.yy456 = yylhsminor.yy456; + case 159: /* table_options ::= table_options SMA NK_LP col_name_list NK_RP */ +{ ((STableOptions*)yymsp[-4].minor.yy42)->pSma = yymsp[-1].minor.yy244; yylhsminor.yy42 = yymsp[-4].minor.yy42; } + yymsp[-4].minor.yy42 = yylhsminor.yy42; break; - case 159: /* table_options ::= table_options FILE_FACTOR NK_FLOAT */ -{ ((STableOptions*)yymsp[-2].minor.yy456)->pFilesFactor = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); yylhsminor.yy456 = yymsp[-2].minor.yy456; } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + case 160: /* table_options ::= table_options ROLLUP NK_LP func_name_list NK_RP */ +{ ((STableOptions*)yymsp[-4].minor.yy42)->pFuncs = yymsp[-1].minor.yy244; yylhsminor.yy42 = yymsp[-4].minor.yy42; } + yymsp[-4].minor.yy42 = yylhsminor.yy42; break; - case 160: /* table_options ::= table_options DELAY NK_INTEGER */ -{ ((STableOptions*)yymsp[-2].minor.yy456)->pDelay = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy456 = yymsp[-2].minor.yy456; } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + case 161: /* table_options ::= table_options FILE_FACTOR NK_FLOAT */ +{ ((STableOptions*)yymsp[-2].minor.yy42)->pFilesFactor = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); yylhsminor.yy42 = yymsp[-2].minor.yy42; } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 161: /* alter_table_options ::= alter_table_option */ -{ yylhsminor.yy456 = createTableOptions(pCxt); yylhsminor.yy456 = setTableAlterOption(pCxt, yylhsminor.yy456, &yymsp[0].minor.yy29); } - yymsp[0].minor.yy456 = yylhsminor.yy456; + case 162: /* table_options ::= table_options DELAY NK_INTEGER */ +{ ((STableOptions*)yymsp[-2].minor.yy42)->pDelay = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); yylhsminor.yy42 = yymsp[-2].minor.yy42; } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 162: /* alter_table_options ::= alter_table_options alter_table_option */ -{ yylhsminor.yy456 = setTableAlterOption(pCxt, yymsp[-1].minor.yy456, &yymsp[0].minor.yy29); } - yymsp[-1].minor.yy456 = yylhsminor.yy456; + case 163: /* alter_table_options ::= alter_table_option */ +{ yylhsminor.yy42 = createTableOptions(pCxt); yylhsminor.yy42 = setTableAlterOption(pCxt, yylhsminor.yy42, &yymsp[0].minor.yy325); } + yymsp[0].minor.yy42 = yylhsminor.yy42; break; - case 163: /* alter_table_option ::= COMMENT NK_STRING */ -{ yymsp[-1].minor.yy29.type = TABLE_OPTION_COMMENT; yymsp[-1].minor.yy29.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); } + case 164: /* alter_table_options ::= alter_table_options alter_table_option */ +{ yylhsminor.yy42 = setTableAlterOption(pCxt, yymsp[-1].minor.yy42, &yymsp[0].minor.yy325); } + yymsp[-1].minor.yy42 = yylhsminor.yy42; break; - case 164: /* alter_table_option ::= KEEP integer_list */ - case 165: /* alter_table_option ::= KEEP variable_list */ yytestcase(yyruleno==165); -{ yymsp[-1].minor.yy29.type = TABLE_OPTION_KEEP; yymsp[-1].minor.yy29.pList = yymsp[0].minor.yy632; } + case 165: /* alter_table_option ::= COMMENT NK_STRING */ +{ yymsp[-1].minor.yy325.type = TABLE_OPTION_COMMENT; yymsp[-1].minor.yy325.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); } break; - case 166: /* alter_table_option ::= TTL NK_INTEGER */ -{ yymsp[-1].minor.yy29.type = TABLE_OPTION_TTL; yymsp[-1].minor.yy29.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); } + case 166: /* alter_table_option ::= KEEP integer_list */ + case 167: /* alter_table_option ::= KEEP variable_list */ yytestcase(yyruleno==167); +{ yymsp[-1].minor.yy325.type = TABLE_OPTION_KEEP; yymsp[-1].minor.yy325.pList = yymsp[0].minor.yy244; } break; - case 169: /* col_name ::= column_name */ -{ yylhsminor.yy456 = createColumnNode(pCxt, NULL, &yymsp[0].minor.yy537); } - yymsp[0].minor.yy456 = yylhsminor.yy456; + case 168: /* alter_table_option ::= TTL NK_INTEGER */ +{ yymsp[-1].minor.yy325.type = TABLE_OPTION_TTL; yymsp[-1].minor.yy325.pVal = (SValueNode*)createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); } break; - case 170: /* cmd ::= SHOW DNODES */ + case 171: /* col_name ::= column_name */ +{ yylhsminor.yy42 = createColumnNode(pCxt, NULL, &yymsp[0].minor.yy359); } + yymsp[0].minor.yy42 = yylhsminor.yy42; + break; + case 172: /* cmd ::= SHOW DNODES */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_DNODES_STMT, NULL, NULL); } break; - case 171: /* cmd ::= SHOW USERS */ + case 173: /* cmd ::= SHOW USERS */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_USERS_STMT, NULL, NULL); } break; - case 172: /* cmd ::= SHOW DATABASES */ + case 174: /* cmd ::= SHOW DATABASES */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_DATABASES_STMT, NULL, NULL); } break; - case 173: /* cmd ::= SHOW db_name_cond_opt TABLES like_pattern_opt */ -{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_TABLES_STMT, yymsp[-2].minor.yy456, yymsp[0].minor.yy456); } + case 175: /* cmd ::= SHOW db_name_cond_opt TABLES like_pattern_opt */ +{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_TABLES_STMT, yymsp[-2].minor.yy42, yymsp[0].minor.yy42); } break; - case 174: /* cmd ::= SHOW db_name_cond_opt STABLES like_pattern_opt */ -{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_STABLES_STMT, yymsp[-2].minor.yy456, yymsp[0].minor.yy456); } + case 176: /* cmd ::= SHOW db_name_cond_opt STABLES like_pattern_opt */ +{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_STABLES_STMT, yymsp[-2].minor.yy42, yymsp[0].minor.yy42); } break; - case 175: /* cmd ::= SHOW db_name_cond_opt VGROUPS */ -{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_VGROUPS_STMT, yymsp[-1].minor.yy456, NULL); } + case 177: /* cmd ::= SHOW db_name_cond_opt VGROUPS */ +{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_VGROUPS_STMT, yymsp[-1].minor.yy42, NULL); } break; - case 176: /* cmd ::= SHOW MNODES */ + case 178: /* cmd ::= SHOW MNODES */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_MNODES_STMT, NULL, NULL); } break; - case 177: /* cmd ::= SHOW MODULES */ + case 179: /* cmd ::= SHOW MODULES */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_MODULES_STMT, NULL, NULL); } break; - case 178: /* cmd ::= SHOW QNODES */ + case 180: /* cmd ::= SHOW QNODES */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_QNODES_STMT, NULL, NULL); } break; - case 179: /* cmd ::= SHOW FUNCTIONS */ + case 181: /* cmd ::= SHOW FUNCTIONS */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_FUNCTIONS_STMT, NULL, NULL); } break; - case 180: /* cmd ::= SHOW INDEXES FROM table_name_cond from_db_opt */ -{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_INDEXES_STMT, yymsp[-1].minor.yy456, yymsp[0].minor.yy456); } + case 182: /* cmd ::= SHOW INDEXES FROM table_name_cond from_db_opt */ +{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_INDEXES_STMT, yymsp[-1].minor.yy42, yymsp[0].minor.yy42); } break; - case 181: /* cmd ::= SHOW STREAMS */ + case 183: /* cmd ::= SHOW STREAMS */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_STREAMS_STMT, NULL, NULL); } break; - case 182: /* cmd ::= SHOW ACCOUNTS */ + case 184: /* cmd ::= SHOW ACCOUNTS */ { pCxt->valid = false; generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_EXPRIE_STATEMENT); } break; - case 183: /* cmd ::= SHOW APPS */ + case 185: /* cmd ::= SHOW APPS */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_APPS_STMT, NULL, NULL); } break; - case 184: /* cmd ::= SHOW CONNECTIONS */ + case 186: /* cmd ::= SHOW CONNECTIONS */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_CONNECTIONS_STMT, NULL, NULL); } break; - case 185: /* cmd ::= SHOW LICENCE */ - case 186: /* cmd ::= SHOW GRANTS */ yytestcase(yyruleno==186); + case 187: /* cmd ::= SHOW LICENCE */ + case 188: /* cmd ::= SHOW GRANTS */ yytestcase(yyruleno==188); { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_LICENCE_STMT, NULL, NULL); } break; - case 187: /* cmd ::= SHOW CREATE DATABASE db_name */ -{ pCxt->pRootNode = createShowCreateDatabaseStmt(pCxt, &yymsp[0].minor.yy537); } + case 189: /* cmd ::= SHOW CREATE DATABASE db_name */ +{ pCxt->pRootNode = createShowCreateDatabaseStmt(pCxt, &yymsp[0].minor.yy359); } break; - case 188: /* cmd ::= SHOW CREATE TABLE full_table_name */ -{ pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_TABLE_STMT, yymsp[0].minor.yy456); } + case 190: /* cmd ::= SHOW CREATE TABLE full_table_name */ +{ pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_TABLE_STMT, yymsp[0].minor.yy42); } break; - case 189: /* cmd ::= SHOW CREATE STABLE full_table_name */ -{ pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_STABLE_STMT, yymsp[0].minor.yy456); } + case 191: /* cmd ::= SHOW CREATE STABLE full_table_name */ +{ pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_STABLE_STMT, yymsp[0].minor.yy42); } break; - case 190: /* cmd ::= SHOW QUERIES */ + case 192: /* cmd ::= SHOW QUERIES */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_QUERIES_STMT, NULL, NULL); } break; - case 191: /* cmd ::= SHOW SCORES */ + case 193: /* cmd ::= SHOW SCORES */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_SCORES_STMT, NULL, NULL); } break; - case 192: /* cmd ::= SHOW TOPICS */ + case 194: /* cmd ::= SHOW TOPICS */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_TOPICS_STMT, NULL, NULL); } break; - case 193: /* cmd ::= SHOW VARIABLES */ + case 195: /* cmd ::= SHOW VARIABLES */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_VARIABLE_STMT, NULL, NULL); } break; - case 194: /* cmd ::= SHOW BNODES */ + case 196: /* cmd ::= SHOW BNODES */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_BNODES_STMT, NULL, NULL); } break; - case 195: /* cmd ::= SHOW SNODES */ + case 197: /* cmd ::= SHOW SNODES */ { pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_SNODES_STMT, NULL, NULL); } break; - case 196: /* db_name_cond_opt ::= */ - case 201: /* from_db_opt ::= */ yytestcase(yyruleno==201); -{ yymsp[1].minor.yy456 = createDefaultDatabaseCondValue(pCxt); } + case 198: /* db_name_cond_opt ::= */ + case 203: /* from_db_opt ::= */ yytestcase(yyruleno==203); +{ yymsp[1].minor.yy42 = createDefaultDatabaseCondValue(pCxt); } break; - case 197: /* db_name_cond_opt ::= db_name NK_DOT */ -{ yylhsminor.yy456 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy537); } - yymsp[-1].minor.yy456 = yylhsminor.yy456; + case 199: /* db_name_cond_opt ::= db_name NK_DOT */ +{ yylhsminor.yy42 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy359); } + yymsp[-1].minor.yy42 = yylhsminor.yy42; break; - case 198: /* like_pattern_opt ::= */ - case 209: /* index_options ::= */ yytestcase(yyruleno==209); - case 236: /* into_opt ::= */ yytestcase(yyruleno==236); - case 383: /* where_clause_opt ::= */ yytestcase(yyruleno==383); - case 387: /* twindow_clause_opt ::= */ yytestcase(yyruleno==387); - case 392: /* sliding_opt ::= */ yytestcase(yyruleno==392); - case 394: /* fill_opt ::= */ yytestcase(yyruleno==394); - case 406: /* having_clause_opt ::= */ yytestcase(yyruleno==406); - case 414: /* slimit_clause_opt ::= */ yytestcase(yyruleno==414); - case 418: /* limit_clause_opt ::= */ yytestcase(yyruleno==418); -{ yymsp[1].minor.yy456 = NULL; } + case 200: /* like_pattern_opt ::= */ + case 211: /* index_options ::= */ yytestcase(yyruleno==211); + case 238: /* into_opt ::= */ yytestcase(yyruleno==238); + case 385: /* where_clause_opt ::= */ yytestcase(yyruleno==385); + case 389: /* twindow_clause_opt ::= */ yytestcase(yyruleno==389); + case 394: /* sliding_opt ::= */ yytestcase(yyruleno==394); + case 396: /* fill_opt ::= */ yytestcase(yyruleno==396); + case 408: /* having_clause_opt ::= */ yytestcase(yyruleno==408); + case 416: /* slimit_clause_opt ::= */ yytestcase(yyruleno==416); + case 420: /* limit_clause_opt ::= */ yytestcase(yyruleno==420); +{ yymsp[1].minor.yy42 = NULL; } break; - case 199: /* like_pattern_opt ::= LIKE NK_STRING */ -{ yymsp[-1].minor.yy456 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); } + case 201: /* like_pattern_opt ::= LIKE NK_STRING */ +{ yymsp[-1].minor.yy42 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); } break; - case 200: /* table_name_cond ::= table_name */ -{ yylhsminor.yy456 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy537); } - yymsp[0].minor.yy456 = yylhsminor.yy456; + case 202: /* table_name_cond ::= table_name */ +{ yylhsminor.yy42 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy359); } + yymsp[0].minor.yy42 = yylhsminor.yy42; break; - case 202: /* from_db_opt ::= FROM db_name */ -{ yymsp[-1].minor.yy456 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy537); } + case 204: /* from_db_opt ::= FROM db_name */ +{ yymsp[-1].minor.yy42 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy359); } break; - case 205: /* func_name ::= function_name */ -{ yylhsminor.yy456 = createFunctionNode(pCxt, &yymsp[0].minor.yy537, NULL); } - yymsp[0].minor.yy456 = yylhsminor.yy456; + case 207: /* func_name ::= function_name */ +{ yylhsminor.yy42 = createFunctionNode(pCxt, &yymsp[0].minor.yy359, NULL); } + yymsp[0].minor.yy42 = yylhsminor.yy42; break; - case 206: /* cmd ::= CREATE SMA INDEX not_exists_opt index_name ON table_name index_options */ -{ pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_SMA, yymsp[-4].minor.yy649, &yymsp[-3].minor.yy537, &yymsp[-1].minor.yy537, NULL, yymsp[0].minor.yy456); } + case 208: /* cmd ::= CREATE SMA INDEX not_exists_opt index_name ON table_name index_options */ +{ pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_SMA, yymsp[-4].minor.yy237, &yymsp[-3].minor.yy359, &yymsp[-1].minor.yy359, NULL, yymsp[0].minor.yy42); } break; - case 207: /* cmd ::= CREATE FULLTEXT INDEX not_exists_opt index_name ON table_name NK_LP col_name_list NK_RP */ -{ pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_FULLTEXT, yymsp[-6].minor.yy649, &yymsp[-5].minor.yy537, &yymsp[-3].minor.yy537, yymsp[-1].minor.yy632, NULL); } + case 209: /* cmd ::= CREATE FULLTEXT INDEX not_exists_opt index_name ON table_name NK_LP col_name_list NK_RP */ +{ pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_FULLTEXT, yymsp[-6].minor.yy237, &yymsp[-5].minor.yy359, &yymsp[-3].minor.yy359, yymsp[-1].minor.yy244, NULL); } break; - case 208: /* cmd ::= DROP INDEX exists_opt index_name ON table_name */ -{ pCxt->pRootNode = createDropIndexStmt(pCxt, yymsp[-3].minor.yy649, &yymsp[-2].minor.yy537, &yymsp[0].minor.yy537); } + case 210: /* cmd ::= DROP INDEX exists_opt index_name ON table_name */ +{ pCxt->pRootNode = createDropIndexStmt(pCxt, yymsp[-3].minor.yy237, &yymsp[-2].minor.yy359, &yymsp[0].minor.yy359); } break; - case 210: /* index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt */ -{ yymsp[-8].minor.yy456 = createIndexOption(pCxt, yymsp[-6].minor.yy632, releaseRawExprNode(pCxt, yymsp[-2].minor.yy456), NULL, yymsp[0].minor.yy456); } + case 212: /* index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt */ +{ yymsp[-8].minor.yy42 = createIndexOption(pCxt, yymsp[-6].minor.yy244, releaseRawExprNode(pCxt, yymsp[-2].minor.yy42), NULL, yymsp[0].minor.yy42); } break; - case 211: /* index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt */ -{ yymsp[-10].minor.yy456 = createIndexOption(pCxt, yymsp[-8].minor.yy632, releaseRawExprNode(pCxt, yymsp[-4].minor.yy456), releaseRawExprNode(pCxt, yymsp[-2].minor.yy456), yymsp[0].minor.yy456); } + case 213: /* index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt */ +{ yymsp[-10].minor.yy42 = createIndexOption(pCxt, yymsp[-8].minor.yy244, releaseRawExprNode(pCxt, yymsp[-4].minor.yy42), releaseRawExprNode(pCxt, yymsp[-2].minor.yy42), yymsp[0].minor.yy42); } break; - case 214: /* func ::= function_name NK_LP expression_list NK_RP */ -{ yylhsminor.yy456 = createFunctionNode(pCxt, &yymsp[-3].minor.yy537, yymsp[-1].minor.yy632); } - yymsp[-3].minor.yy456 = yylhsminor.yy456; + case 216: /* func ::= function_name NK_LP expression_list NK_RP */ +{ yylhsminor.yy42 = createFunctionNode(pCxt, &yymsp[-3].minor.yy359, yymsp[-1].minor.yy244); } + yymsp[-3].minor.yy42 = yylhsminor.yy42; break; - case 215: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression */ -{ pCxt->pRootNode = createCreateTopicStmt(pCxt, yymsp[-3].minor.yy649, &yymsp[-2].minor.yy537, yymsp[0].minor.yy456, NULL); } + case 217: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression */ +{ pCxt->pRootNode = createCreateTopicStmt(pCxt, yymsp[-3].minor.yy237, &yymsp[-2].minor.yy359, yymsp[0].minor.yy42, NULL); } break; - case 216: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS db_name */ -{ pCxt->pRootNode = createCreateTopicStmt(pCxt, yymsp[-3].minor.yy649, &yymsp[-2].minor.yy537, NULL, &yymsp[0].minor.yy537); } + case 218: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS db_name */ +{ pCxt->pRootNode = createCreateTopicStmt(pCxt, yymsp[-3].minor.yy237, &yymsp[-2].minor.yy359, NULL, &yymsp[0].minor.yy359); } break; - case 217: /* cmd ::= DROP TOPIC exists_opt topic_name */ -{ pCxt->pRootNode = createDropTopicStmt(pCxt, yymsp[-1].minor.yy649, &yymsp[0].minor.yy537); } + case 219: /* cmd ::= DROP TOPIC exists_opt topic_name */ +{ pCxt->pRootNode = createDropTopicStmt(pCxt, yymsp[-1].minor.yy237, &yymsp[0].minor.yy359); } break; - case 218: /* cmd ::= DESC full_table_name */ - case 219: /* cmd ::= DESCRIBE full_table_name */ yytestcase(yyruleno==219); -{ pCxt->pRootNode = createDescribeStmt(pCxt, yymsp[0].minor.yy456); } + case 220: /* cmd ::= DESC full_table_name */ + case 221: /* cmd ::= DESCRIBE full_table_name */ yytestcase(yyruleno==221); +{ pCxt->pRootNode = createDescribeStmt(pCxt, yymsp[0].minor.yy42); } break; - case 220: /* cmd ::= RESET QUERY CACHE */ + case 222: /* cmd ::= RESET QUERY CACHE */ { pCxt->pRootNode = createResetQueryCacheStmt(pCxt); } break; - case 221: /* cmd ::= EXPLAIN analyze_opt explain_options query_expression */ -{ pCxt->pRootNode = createExplainStmt(pCxt, yymsp[-2].minor.yy649, yymsp[-1].minor.yy456, yymsp[0].minor.yy456); } + case 223: /* cmd ::= EXPLAIN analyze_opt explain_options query_expression */ +{ pCxt->pRootNode = createExplainStmt(pCxt, yymsp[-2].minor.yy237, yymsp[-1].minor.yy42, yymsp[0].minor.yy42); } break; - case 223: /* analyze_opt ::= ANALYZE */ - case 231: /* agg_func_opt ::= AGGREGATE */ yytestcase(yyruleno==231); - case 373: /* set_quantifier_opt ::= DISTINCT */ yytestcase(yyruleno==373); -{ yymsp[0].minor.yy649 = true; } + case 225: /* analyze_opt ::= ANALYZE */ + case 233: /* agg_func_opt ::= AGGREGATE */ yytestcase(yyruleno==233); + case 375: /* set_quantifier_opt ::= DISTINCT */ yytestcase(yyruleno==375); +{ yymsp[0].minor.yy237 = true; } break; - case 224: /* explain_options ::= */ -{ yymsp[1].minor.yy456 = createDefaultExplainOptions(pCxt); } + case 226: /* explain_options ::= */ +{ yymsp[1].minor.yy42 = createDefaultExplainOptions(pCxt); } break; - case 225: /* explain_options ::= explain_options VERBOSE NK_BOOL */ -{ yylhsminor.yy456 = setExplainVerbose(pCxt, yymsp[-2].minor.yy456, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + case 227: /* explain_options ::= explain_options VERBOSE NK_BOOL */ +{ yylhsminor.yy42 = setExplainVerbose(pCxt, yymsp[-2].minor.yy42, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 226: /* explain_options ::= explain_options RATIO NK_FLOAT */ -{ yylhsminor.yy456 = setExplainRatio(pCxt, yymsp[-2].minor.yy456, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + case 228: /* explain_options ::= explain_options RATIO NK_FLOAT */ +{ yylhsminor.yy42 = setExplainRatio(pCxt, yymsp[-2].minor.yy42, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 227: /* cmd ::= COMPACT VNODES IN NK_LP integer_list NK_RP */ -{ pCxt->pRootNode = createCompactStmt(pCxt, yymsp[-1].minor.yy632); } + case 229: /* cmd ::= COMPACT VNODES IN NK_LP integer_list NK_RP */ +{ pCxt->pRootNode = createCompactStmt(pCxt, yymsp[-1].minor.yy244); } break; - case 228: /* cmd ::= CREATE agg_func_opt FUNCTION function_name AS NK_STRING OUTPUTTYPE type_name bufsize_opt */ -{ pCxt->pRootNode = createCreateFunctionStmt(pCxt, yymsp[-7].minor.yy649, &yymsp[-5].minor.yy537, &yymsp[-3].minor.yy0, yymsp[-1].minor.yy388, yymsp[0].minor.yy652); } + case 230: /* cmd ::= CREATE agg_func_opt FUNCTION function_name AS NK_STRING OUTPUTTYPE type_name bufsize_opt */ +{ pCxt->pRootNode = createCreateFunctionStmt(pCxt, yymsp[-7].minor.yy237, &yymsp[-5].minor.yy359, &yymsp[-3].minor.yy0, yymsp[-1].minor.yy314, yymsp[0].minor.yy240); } break; - case 229: /* cmd ::= DROP FUNCTION function_name */ -{ pCxt->pRootNode = createDropFunctionStmt(pCxt, &yymsp[0].minor.yy537); } + case 231: /* cmd ::= DROP FUNCTION function_name */ +{ pCxt->pRootNode = createDropFunctionStmt(pCxt, &yymsp[0].minor.yy359); } break; - case 232: /* bufsize_opt ::= */ -{ yymsp[1].minor.yy652 = 0; } + case 234: /* bufsize_opt ::= */ +{ yymsp[1].minor.yy240 = 0; } break; - case 233: /* bufsize_opt ::= BUFSIZE NK_INTEGER */ -{ yymsp[-1].minor.yy652 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } + case 235: /* bufsize_opt ::= BUFSIZE NK_INTEGER */ +{ yymsp[-1].minor.yy240 = strtol(yymsp[0].minor.yy0.z, NULL, 10); } break; - case 234: /* cmd ::= CREATE STREAM not_exists_opt stream_name stream_options into_opt AS query_expression */ -{ pCxt->pRootNode = createCreateStreamStmt(pCxt, yymsp[-5].minor.yy649, &yymsp[-4].minor.yy537, yymsp[-2].minor.yy456, yymsp[-3].minor.yy456, yymsp[0].minor.yy456); } + case 236: /* cmd ::= CREATE STREAM not_exists_opt stream_name stream_options into_opt AS query_expression */ +{ pCxt->pRootNode = createCreateStreamStmt(pCxt, yymsp[-5].minor.yy237, &yymsp[-4].minor.yy359, yymsp[-2].minor.yy42, yymsp[-3].minor.yy42, yymsp[0].minor.yy42); } break; - case 235: /* cmd ::= DROP STREAM exists_opt stream_name */ -{ pCxt->pRootNode = createDropStreamStmt(pCxt, yymsp[-1].minor.yy649, &yymsp[0].minor.yy537); } + case 237: /* cmd ::= DROP STREAM exists_opt stream_name */ +{ pCxt->pRootNode = createDropStreamStmt(pCxt, yymsp[-1].minor.yy237, &yymsp[0].minor.yy359); } break; - case 237: /* into_opt ::= INTO full_table_name */ - case 354: /* from_clause ::= FROM table_reference_list */ yytestcase(yyruleno==354); - case 384: /* where_clause_opt ::= WHERE search_condition */ yytestcase(yyruleno==384); - case 407: /* having_clause_opt ::= HAVING search_condition */ yytestcase(yyruleno==407); -{ yymsp[-1].minor.yy456 = yymsp[0].minor.yy456; } + case 239: /* into_opt ::= INTO full_table_name */ + case 356: /* from_clause ::= FROM table_reference_list */ yytestcase(yyruleno==356); + case 386: /* where_clause_opt ::= WHERE search_condition */ yytestcase(yyruleno==386); + case 409: /* having_clause_opt ::= HAVING search_condition */ yytestcase(yyruleno==409); +{ yymsp[-1].minor.yy42 = yymsp[0].minor.yy42; } break; - case 238: /* stream_options ::= */ -{ yymsp[1].minor.yy456 = createStreamOptions(pCxt); } + case 240: /* stream_options ::= */ +{ yymsp[1].minor.yy42 = createStreamOptions(pCxt); } break; - case 239: /* stream_options ::= stream_options TRIGGER AT_ONCE */ -{ ((SStreamOptions*)yymsp[-2].minor.yy456)->triggerType = STREAM_TRIGGER_AT_ONCE; yylhsminor.yy456 = yymsp[-2].minor.yy456; } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + case 241: /* stream_options ::= stream_options TRIGGER AT_ONCE */ +{ ((SStreamOptions*)yymsp[-2].minor.yy42)->triggerType = STREAM_TRIGGER_AT_ONCE; yylhsminor.yy42 = yymsp[-2].minor.yy42; } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 240: /* stream_options ::= stream_options TRIGGER WINDOW_CLOSE */ -{ ((SStreamOptions*)yymsp[-2].minor.yy456)->triggerType = STREAM_TRIGGER_WINDOW_CLOSE; yylhsminor.yy456 = yymsp[-2].minor.yy456; } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + case 242: /* stream_options ::= stream_options TRIGGER WINDOW_CLOSE */ +{ ((SStreamOptions*)yymsp[-2].minor.yy42)->triggerType = STREAM_TRIGGER_WINDOW_CLOSE; yylhsminor.yy42 = yymsp[-2].minor.yy42; } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 241: /* stream_options ::= stream_options WATERMARK duration_literal */ -{ ((SStreamOptions*)yymsp[-2].minor.yy456)->pWatermark = releaseRawExprNode(pCxt, yymsp[0].minor.yy456); yylhsminor.yy456 = yymsp[-2].minor.yy456; } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + case 243: /* stream_options ::= stream_options WATERMARK duration_literal */ +{ ((SStreamOptions*)yymsp[-2].minor.yy42)->pWatermark = releaseRawExprNode(pCxt, yymsp[0].minor.yy42); yylhsminor.yy42 = yymsp[-2].minor.yy42; } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 242: /* cmd ::= KILL CONNECTION NK_INTEGER */ + case 244: /* cmd ::= KILL CONNECTION NK_INTEGER */ { pCxt->pRootNode = createKillStmt(pCxt, QUERY_NODE_KILL_CONNECTION_STMT, &yymsp[0].minor.yy0); } break; - case 243: /* cmd ::= KILL QUERY NK_INTEGER */ + case 245: /* cmd ::= KILL QUERY NK_INTEGER */ { pCxt->pRootNode = createKillStmt(pCxt, QUERY_NODE_KILL_QUERY_STMT, &yymsp[0].minor.yy0); } break; - case 244: /* cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER */ + case 246: /* cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER */ { pCxt->pRootNode = createMergeVgroupStmt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); } break; - case 245: /* cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list */ -{ pCxt->pRootNode = createRedistributeVgroupStmt(pCxt, &yymsp[-1].minor.yy0, yymsp[0].minor.yy632); } + case 247: /* cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list */ +{ pCxt->pRootNode = createRedistributeVgroupStmt(pCxt, &yymsp[-1].minor.yy0, yymsp[0].minor.yy244); } break; - case 246: /* cmd ::= SPLIT VGROUP NK_INTEGER */ + case 248: /* cmd ::= SPLIT VGROUP NK_INTEGER */ { pCxt->pRootNode = createSplitVgroupStmt(pCxt, &yymsp[0].minor.yy0); } break; - case 247: /* dnode_list ::= DNODE NK_INTEGER */ -{ yymsp[-1].minor.yy632 = createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); } + case 249: /* dnode_list ::= DNODE NK_INTEGER */ +{ yymsp[-1].minor.yy244 = createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); } break; - case 249: /* cmd ::= SYNCDB db_name REPLICA */ -{ pCxt->pRootNode = createSyncdbStmt(pCxt, &yymsp[-1].minor.yy537); } + case 251: /* cmd ::= SYNCDB db_name REPLICA */ +{ pCxt->pRootNode = createSyncdbStmt(pCxt, &yymsp[-1].minor.yy359); } break; - case 251: /* literal ::= NK_INTEGER */ -{ yylhsminor.yy456 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy456 = yylhsminor.yy456; + case 253: /* literal ::= NK_INTEGER */ +{ yylhsminor.yy42 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy42 = yylhsminor.yy42; break; - case 252: /* literal ::= NK_FLOAT */ -{ yylhsminor.yy456 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy456 = yylhsminor.yy456; + case 254: /* literal ::= NK_FLOAT */ +{ yylhsminor.yy42 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy42 = yylhsminor.yy42; break; - case 253: /* literal ::= NK_STRING */ -{ yylhsminor.yy456 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy456 = yylhsminor.yy456; + case 255: /* literal ::= NK_STRING */ +{ yylhsminor.yy42 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy42 = yylhsminor.yy42; break; - case 254: /* literal ::= NK_BOOL */ -{ yylhsminor.yy456 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy456 = yylhsminor.yy456; + case 256: /* literal ::= NK_BOOL */ +{ yylhsminor.yy42 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy42 = yylhsminor.yy42; break; - case 255: /* literal ::= TIMESTAMP NK_STRING */ -{ yylhsminor.yy456 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0)); } - yymsp[-1].minor.yy456 = yylhsminor.yy456; + case 257: /* literal ::= TIMESTAMP NK_STRING */ +{ yylhsminor.yy42 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0)); } + yymsp[-1].minor.yy42 = yylhsminor.yy42; break; - case 256: /* literal ::= duration_literal */ - case 266: /* signed_literal ::= signed */ yytestcase(yyruleno==266); - case 284: /* expression ::= literal */ yytestcase(yyruleno==284); - case 285: /* expression ::= pseudo_column */ yytestcase(yyruleno==285); - case 286: /* expression ::= column_reference */ yytestcase(yyruleno==286); - case 287: /* expression ::= function_expression */ yytestcase(yyruleno==287); - case 288: /* expression ::= subquery */ yytestcase(yyruleno==288); - case 346: /* boolean_value_expression ::= boolean_primary */ yytestcase(yyruleno==346); - case 350: /* boolean_primary ::= predicate */ yytestcase(yyruleno==350); - case 352: /* common_expression ::= expression */ yytestcase(yyruleno==352); - case 353: /* common_expression ::= boolean_value_expression */ yytestcase(yyruleno==353); - case 355: /* table_reference_list ::= table_reference */ yytestcase(yyruleno==355); - case 357: /* table_reference ::= table_primary */ yytestcase(yyruleno==357); - case 358: /* table_reference ::= joined_table */ yytestcase(yyruleno==358); - case 362: /* table_primary ::= parenthesized_joined_table */ yytestcase(yyruleno==362); - case 409: /* query_expression_body ::= query_primary */ yytestcase(yyruleno==409); - case 411: /* query_primary ::= query_specification */ yytestcase(yyruleno==411); -{ yylhsminor.yy456 = yymsp[0].minor.yy456; } - yymsp[0].minor.yy456 = yylhsminor.yy456; + case 258: /* literal ::= duration_literal */ + case 268: /* signed_literal ::= signed */ yytestcase(yyruleno==268); + case 286: /* expression ::= literal */ yytestcase(yyruleno==286); + case 287: /* expression ::= pseudo_column */ yytestcase(yyruleno==287); + case 288: /* expression ::= column_reference */ yytestcase(yyruleno==288); + case 289: /* expression ::= function_expression */ yytestcase(yyruleno==289); + case 290: /* expression ::= subquery */ yytestcase(yyruleno==290); + case 348: /* boolean_value_expression ::= boolean_primary */ yytestcase(yyruleno==348); + case 352: /* boolean_primary ::= predicate */ yytestcase(yyruleno==352); + case 354: /* common_expression ::= expression */ yytestcase(yyruleno==354); + case 355: /* common_expression ::= boolean_value_expression */ yytestcase(yyruleno==355); + case 357: /* table_reference_list ::= table_reference */ yytestcase(yyruleno==357); + case 359: /* table_reference ::= table_primary */ yytestcase(yyruleno==359); + case 360: /* table_reference ::= joined_table */ yytestcase(yyruleno==360); + case 364: /* table_primary ::= parenthesized_joined_table */ yytestcase(yyruleno==364); + case 411: /* query_expression_body ::= query_primary */ yytestcase(yyruleno==411); + case 413: /* query_primary ::= query_specification */ yytestcase(yyruleno==413); +{ yylhsminor.yy42 = yymsp[0].minor.yy42; } + yymsp[0].minor.yy42 = yylhsminor.yy42; break; - case 257: /* literal ::= NULL */ -{ yylhsminor.yy456 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_NULL, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy456 = yylhsminor.yy456; + case 259: /* literal ::= NULL */ +{ yylhsminor.yy42 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_NULL, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy42 = yylhsminor.yy42; break; - case 258: /* literal ::= NK_QUESTION */ -{ yylhsminor.yy456 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createPlaceholderValueNode(pCxt, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy456 = yylhsminor.yy456; + case 260: /* literal ::= NK_QUESTION */ +{ yylhsminor.yy42 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createPlaceholderValueNode(pCxt, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy42 = yylhsminor.yy42; break; - case 259: /* duration_literal ::= NK_VARIABLE */ -{ yylhsminor.yy456 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy456 = yylhsminor.yy456; + case 261: /* duration_literal ::= NK_VARIABLE */ +{ yylhsminor.yy42 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy42 = yylhsminor.yy42; break; - case 260: /* signed ::= NK_INTEGER */ -{ yylhsminor.yy456 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy456 = yylhsminor.yy456; + case 262: /* signed ::= NK_INTEGER */ +{ yylhsminor.yy42 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy42 = yylhsminor.yy42; break; - case 261: /* signed ::= NK_PLUS NK_INTEGER */ -{ yymsp[-1].minor.yy456 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); } + case 263: /* signed ::= NK_PLUS NK_INTEGER */ +{ yymsp[-1].minor.yy42 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); } break; - case 262: /* signed ::= NK_MINUS NK_INTEGER */ + case 264: /* signed ::= NK_MINUS NK_INTEGER */ { SToken t = yymsp[-1].minor.yy0; t.n = (yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n) - yymsp[-1].minor.yy0.z; - yylhsminor.yy456 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &t); + yylhsminor.yy42 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &t); } - yymsp[-1].minor.yy456 = yylhsminor.yy456; + yymsp[-1].minor.yy42 = yylhsminor.yy42; break; - case 263: /* signed ::= NK_FLOAT */ -{ yylhsminor.yy456 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy456 = yylhsminor.yy456; + case 265: /* signed ::= NK_FLOAT */ +{ yylhsminor.yy42 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy42 = yylhsminor.yy42; break; - case 264: /* signed ::= NK_PLUS NK_FLOAT */ -{ yymsp[-1].minor.yy456 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); } + case 266: /* signed ::= NK_PLUS NK_FLOAT */ +{ yymsp[-1].minor.yy42 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); } break; - case 265: /* signed ::= NK_MINUS NK_FLOAT */ + case 267: /* signed ::= NK_MINUS NK_FLOAT */ { SToken t = yymsp[-1].minor.yy0; t.n = (yymsp[0].minor.yy0.z + yymsp[0].minor.yy0.n) - yymsp[-1].minor.yy0.z; - yylhsminor.yy456 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &t); + yylhsminor.yy42 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &t); } - yymsp[-1].minor.yy456 = yylhsminor.yy456; + yymsp[-1].minor.yy42 = yylhsminor.yy42; break; - case 267: /* signed_literal ::= NK_STRING */ -{ yylhsminor.yy456 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy456 = yylhsminor.yy456; + case 269: /* signed_literal ::= NK_STRING */ +{ yylhsminor.yy42 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy42 = yylhsminor.yy42; break; - case 268: /* signed_literal ::= NK_BOOL */ -{ yylhsminor.yy456 = createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0); } - yymsp[0].minor.yy456 = yylhsminor.yy456; + case 270: /* signed_literal ::= NK_BOOL */ +{ yylhsminor.yy42 = createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0); } + yymsp[0].minor.yy42 = yylhsminor.yy42; break; - case 269: /* signed_literal ::= TIMESTAMP NK_STRING */ -{ yymsp[-1].minor.yy456 = createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0); } + case 271: /* signed_literal ::= TIMESTAMP NK_STRING */ +{ yymsp[-1].minor.yy42 = createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0); } break; - case 270: /* signed_literal ::= duration_literal */ - case 324: /* star_func_para ::= expression */ yytestcase(yyruleno==324); - case 379: /* select_item ::= common_expression */ yytestcase(yyruleno==379); - case 423: /* search_condition ::= common_expression */ yytestcase(yyruleno==423); -{ yylhsminor.yy456 = releaseRawExprNode(pCxt, yymsp[0].minor.yy456); } - yymsp[0].minor.yy456 = yylhsminor.yy456; + case 272: /* signed_literal ::= duration_literal */ + case 326: /* star_func_para ::= expression */ yytestcase(yyruleno==326); + case 381: /* select_item ::= common_expression */ yytestcase(yyruleno==381); + case 425: /* search_condition ::= common_expression */ yytestcase(yyruleno==425); +{ yylhsminor.yy42 = releaseRawExprNode(pCxt, yymsp[0].minor.yy42); } + yymsp[0].minor.yy42 = yylhsminor.yy42; break; - case 271: /* signed_literal ::= NULL */ -{ yymsp[0].minor.yy456 = createValueNode(pCxt, TSDB_DATA_TYPE_NULL, NULL); } + case 273: /* signed_literal ::= NULL */ +{ yymsp[0].minor.yy42 = createValueNode(pCxt, TSDB_DATA_TYPE_NULL, NULL); } break; - case 289: /* expression ::= NK_LP expression NK_RP */ - case 351: /* boolean_primary ::= NK_LP boolean_value_expression NK_RP */ yytestcase(yyruleno==351); -{ yylhsminor.yy456 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, releaseRawExprNode(pCxt, yymsp[-1].minor.yy456)); } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + case 291: /* expression ::= NK_LP expression NK_RP */ + case 353: /* boolean_primary ::= NK_LP boolean_value_expression NK_RP */ yytestcase(yyruleno==353); +{ yylhsminor.yy42 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, releaseRawExprNode(pCxt, yymsp[-1].minor.yy42)); } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 290: /* expression ::= NK_PLUS expression */ + case 292: /* expression ::= NK_PLUS expression */ { - SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy456); - yylhsminor.yy456 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, releaseRawExprNode(pCxt, yymsp[0].minor.yy456)); + SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy42); + yylhsminor.yy42 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, releaseRawExprNode(pCxt, yymsp[0].minor.yy42)); } - yymsp[-1].minor.yy456 = yylhsminor.yy456; + yymsp[-1].minor.yy42 = yylhsminor.yy42; break; - case 291: /* expression ::= NK_MINUS expression */ + case 293: /* expression ::= NK_MINUS expression */ { - SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy456); - yylhsminor.yy456 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, createOperatorNode(pCxt, OP_TYPE_MINUS, releaseRawExprNode(pCxt, yymsp[0].minor.yy456), NULL)); + SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy42); + yylhsminor.yy42 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, createOperatorNode(pCxt, OP_TYPE_MINUS, releaseRawExprNode(pCxt, yymsp[0].minor.yy42), NULL)); } - yymsp[-1].minor.yy456 = yylhsminor.yy456; + yymsp[-1].minor.yy42 = yylhsminor.yy42; break; - case 292: /* expression ::= expression NK_PLUS expression */ + case 294: /* expression ::= expression NK_PLUS expression */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy456); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy456); - yylhsminor.yy456 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_ADD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy456), releaseRawExprNode(pCxt, yymsp[0].minor.yy456))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy42); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy42); + yylhsminor.yy42 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_ADD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy42), releaseRawExprNode(pCxt, yymsp[0].minor.yy42))); } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 293: /* expression ::= expression NK_MINUS expression */ + case 295: /* expression ::= expression NK_MINUS expression */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy456); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy456); - yylhsminor.yy456 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_SUB, releaseRawExprNode(pCxt, yymsp[-2].minor.yy456), releaseRawExprNode(pCxt, yymsp[0].minor.yy456))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy42); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy42); + yylhsminor.yy42 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_SUB, releaseRawExprNode(pCxt, yymsp[-2].minor.yy42), releaseRawExprNode(pCxt, yymsp[0].minor.yy42))); } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 294: /* expression ::= expression NK_STAR expression */ + case 296: /* expression ::= expression NK_STAR expression */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy456); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy456); - yylhsminor.yy456 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MULTI, releaseRawExprNode(pCxt, yymsp[-2].minor.yy456), releaseRawExprNode(pCxt, yymsp[0].minor.yy456))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy42); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy42); + yylhsminor.yy42 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MULTI, releaseRawExprNode(pCxt, yymsp[-2].minor.yy42), releaseRawExprNode(pCxt, yymsp[0].minor.yy42))); } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 295: /* expression ::= expression NK_SLASH expression */ + case 297: /* expression ::= expression NK_SLASH expression */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy456); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy456); - yylhsminor.yy456 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_DIV, releaseRawExprNode(pCxt, yymsp[-2].minor.yy456), releaseRawExprNode(pCxt, yymsp[0].minor.yy456))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy42); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy42); + yylhsminor.yy42 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_DIV, releaseRawExprNode(pCxt, yymsp[-2].minor.yy42), releaseRawExprNode(pCxt, yymsp[0].minor.yy42))); } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 296: /* expression ::= expression NK_REM expression */ + case 298: /* expression ::= expression NK_REM expression */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy456); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy456); - yylhsminor.yy456 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MOD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy456), releaseRawExprNode(pCxt, yymsp[0].minor.yy456))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy42); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy42); + yylhsminor.yy42 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MOD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy42), releaseRawExprNode(pCxt, yymsp[0].minor.yy42))); } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 297: /* expression ::= column_reference NK_ARROW NK_STRING */ + case 299: /* expression ::= column_reference NK_ARROW NK_STRING */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy456); - yylhsminor.yy456 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_JSON_GET_VALUE, releaseRawExprNode(pCxt, yymsp[-2].minor.yy456), createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy42); + yylhsminor.yy42 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_JSON_GET_VALUE, releaseRawExprNode(pCxt, yymsp[-2].minor.yy42), createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0))); } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 298: /* expression_list ::= expression */ -{ yylhsminor.yy632 = createNodeList(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy456)); } - yymsp[0].minor.yy632 = yylhsminor.yy632; + case 300: /* expression_list ::= expression */ +{ yylhsminor.yy244 = createNodeList(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy42)); } + yymsp[0].minor.yy244 = yylhsminor.yy244; break; - case 299: /* expression_list ::= expression_list NK_COMMA expression */ -{ yylhsminor.yy632 = addNodeToList(pCxt, yymsp[-2].minor.yy632, releaseRawExprNode(pCxt, yymsp[0].minor.yy456)); } - yymsp[-2].minor.yy632 = yylhsminor.yy632; + case 301: /* expression_list ::= expression_list NK_COMMA expression */ +{ yylhsminor.yy244 = addNodeToList(pCxt, yymsp[-2].minor.yy244, releaseRawExprNode(pCxt, yymsp[0].minor.yy42)); } + yymsp[-2].minor.yy244 = yylhsminor.yy244; break; - case 300: /* column_reference ::= column_name */ -{ yylhsminor.yy456 = createRawExprNode(pCxt, &yymsp[0].minor.yy537, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy537)); } - yymsp[0].minor.yy456 = yylhsminor.yy456; + case 302: /* column_reference ::= column_name */ +{ yylhsminor.yy42 = createRawExprNode(pCxt, &yymsp[0].minor.yy359, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy359)); } + yymsp[0].minor.yy42 = yylhsminor.yy42; break; - case 301: /* column_reference ::= table_name NK_DOT column_name */ -{ yylhsminor.yy456 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy537, &yymsp[0].minor.yy537, createColumnNode(pCxt, &yymsp[-2].minor.yy537, &yymsp[0].minor.yy537)); } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + case 303: /* column_reference ::= table_name NK_DOT column_name */ +{ yylhsminor.yy42 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy359, &yymsp[0].minor.yy359, createColumnNode(pCxt, &yymsp[-2].minor.yy359, &yymsp[0].minor.yy359)); } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 302: /* pseudo_column ::= ROWTS */ - case 303: /* pseudo_column ::= TBNAME */ yytestcase(yyruleno==303); - case 304: /* pseudo_column ::= QSTARTTS */ yytestcase(yyruleno==304); - case 305: /* pseudo_column ::= QENDTS */ yytestcase(yyruleno==305); - case 306: /* pseudo_column ::= WSTARTTS */ yytestcase(yyruleno==306); - case 307: /* pseudo_column ::= WENDTS */ yytestcase(yyruleno==307); - case 308: /* pseudo_column ::= WDURATION */ yytestcase(yyruleno==308); -{ yylhsminor.yy456 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[0].minor.yy0, NULL)); } - yymsp[0].minor.yy456 = yylhsminor.yy456; + case 304: /* pseudo_column ::= ROWTS */ + case 305: /* pseudo_column ::= TBNAME */ yytestcase(yyruleno==305); + case 306: /* pseudo_column ::= QSTARTTS */ yytestcase(yyruleno==306); + case 307: /* pseudo_column ::= QENDTS */ yytestcase(yyruleno==307); + case 308: /* pseudo_column ::= WSTARTTS */ yytestcase(yyruleno==308); + case 309: /* pseudo_column ::= WENDTS */ yytestcase(yyruleno==309); + case 310: /* pseudo_column ::= WDURATION */ yytestcase(yyruleno==310); +{ yylhsminor.yy42 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[0].minor.yy0, NULL)); } + yymsp[0].minor.yy42 = yylhsminor.yy42; break; - case 309: /* function_expression ::= function_name NK_LP expression_list NK_RP */ - case 310: /* function_expression ::= star_func NK_LP star_func_para_list NK_RP */ yytestcase(yyruleno==310); -{ yylhsminor.yy456 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy537, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-3].minor.yy537, yymsp[-1].minor.yy632)); } - yymsp[-3].minor.yy456 = yylhsminor.yy456; + case 311: /* function_expression ::= function_name NK_LP expression_list NK_RP */ + case 312: /* function_expression ::= star_func NK_LP star_func_para_list NK_RP */ yytestcase(yyruleno==312); +{ yylhsminor.yy42 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy359, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-3].minor.yy359, yymsp[-1].minor.yy244)); } + yymsp[-3].minor.yy42 = yylhsminor.yy42; break; - case 311: /* function_expression ::= CAST NK_LP expression AS type_name NK_RP */ -{ yylhsminor.yy456 = createRawExprNodeExt(pCxt, &yymsp[-5].minor.yy0, &yymsp[0].minor.yy0, createCastFunctionNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy456), yymsp[-1].minor.yy388)); } - yymsp[-5].minor.yy456 = yylhsminor.yy456; + case 313: /* function_expression ::= CAST NK_LP expression AS type_name NK_RP */ +{ yylhsminor.yy42 = createRawExprNodeExt(pCxt, &yymsp[-5].minor.yy0, &yymsp[0].minor.yy0, createCastFunctionNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy42), yymsp[-1].minor.yy314)); } + yymsp[-5].minor.yy42 = yylhsminor.yy42; break; - case 312: /* function_expression ::= noarg_func NK_LP NK_RP */ -{ yylhsminor.yy456 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy537, &yymsp[0].minor.yy0, createFunctionNodeNoArg(pCxt, &yymsp[-2].minor.yy537)); } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + case 314: /* function_expression ::= noarg_func NK_LP NK_RP */ +{ yylhsminor.yy42 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy359, &yymsp[0].minor.yy0, createFunctionNodeNoArg(pCxt, &yymsp[-2].minor.yy359)); } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 320: /* star_func_para_list ::= NK_STAR */ -{ yylhsminor.yy632 = createNodeList(pCxt, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy0)); } - yymsp[0].minor.yy632 = yylhsminor.yy632; + case 322: /* star_func_para_list ::= NK_STAR */ +{ yylhsminor.yy244 = createNodeList(pCxt, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy0)); } + yymsp[0].minor.yy244 = yylhsminor.yy244; break; - case 325: /* star_func_para ::= table_name NK_DOT NK_STAR */ - case 382: /* select_item ::= table_name NK_DOT NK_STAR */ yytestcase(yyruleno==382); -{ yylhsminor.yy456 = createColumnNode(pCxt, &yymsp[-2].minor.yy537, &yymsp[0].minor.yy0); } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + case 327: /* star_func_para ::= table_name NK_DOT NK_STAR */ + case 384: /* select_item ::= table_name NK_DOT NK_STAR */ yytestcase(yyruleno==384); +{ yylhsminor.yy42 = createColumnNode(pCxt, &yymsp[-2].minor.yy359, &yymsp[0].minor.yy0); } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 326: /* predicate ::= expression compare_op expression */ - case 331: /* predicate ::= expression in_op in_predicate_value */ yytestcase(yyruleno==331); + case 328: /* predicate ::= expression compare_op expression */ + case 333: /* predicate ::= expression in_op in_predicate_value */ yytestcase(yyruleno==333); { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy456); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy456); - yylhsminor.yy456 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, yymsp[-1].minor.yy416, releaseRawExprNode(pCxt, yymsp[-2].minor.yy456), releaseRawExprNode(pCxt, yymsp[0].minor.yy456))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy42); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy42); + yylhsminor.yy42 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, yymsp[-1].minor.yy270, releaseRawExprNode(pCxt, yymsp[-2].minor.yy42), releaseRawExprNode(pCxt, yymsp[0].minor.yy42))); } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 327: /* predicate ::= expression BETWEEN expression AND expression */ + case 329: /* predicate ::= expression BETWEEN expression AND expression */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-4].minor.yy456); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy456); - yylhsminor.yy456 = createRawExprNodeExt(pCxt, &s, &e, createBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-4].minor.yy456), releaseRawExprNode(pCxt, yymsp[-2].minor.yy456), releaseRawExprNode(pCxt, yymsp[0].minor.yy456))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-4].minor.yy42); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy42); + yylhsminor.yy42 = createRawExprNodeExt(pCxt, &s, &e, createBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-4].minor.yy42), releaseRawExprNode(pCxt, yymsp[-2].minor.yy42), releaseRawExprNode(pCxt, yymsp[0].minor.yy42))); } - yymsp[-4].minor.yy456 = yylhsminor.yy456; + yymsp[-4].minor.yy42 = yylhsminor.yy42; break; - case 328: /* predicate ::= expression NOT BETWEEN expression AND expression */ + case 330: /* predicate ::= expression NOT BETWEEN expression AND expression */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-5].minor.yy456); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy456); - yylhsminor.yy456 = createRawExprNodeExt(pCxt, &s, &e, createNotBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-5].minor.yy456), releaseRawExprNode(pCxt, yymsp[-2].minor.yy456), releaseRawExprNode(pCxt, yymsp[0].minor.yy456))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-5].minor.yy42); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy42); + yylhsminor.yy42 = createRawExprNodeExt(pCxt, &s, &e, createNotBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-5].minor.yy42), releaseRawExprNode(pCxt, yymsp[-2].minor.yy42), releaseRawExprNode(pCxt, yymsp[0].minor.yy42))); } - yymsp[-5].minor.yy456 = yylhsminor.yy456; + yymsp[-5].minor.yy42 = yylhsminor.yy42; break; - case 329: /* predicate ::= expression IS NULL */ + case 331: /* predicate ::= expression IS NULL */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy456); - yylhsminor.yy456 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NULL, releaseRawExprNode(pCxt, yymsp[-2].minor.yy456), NULL)); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy42); + yylhsminor.yy42 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NULL, releaseRawExprNode(pCxt, yymsp[-2].minor.yy42), NULL)); } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 330: /* predicate ::= expression IS NOT NULL */ + case 332: /* predicate ::= expression IS NOT NULL */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-3].minor.yy456); - yylhsminor.yy456 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NOT_NULL, releaseRawExprNode(pCxt, yymsp[-3].minor.yy456), NULL)); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-3].minor.yy42); + yylhsminor.yy42 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NOT_NULL, releaseRawExprNode(pCxt, yymsp[-3].minor.yy42), NULL)); } - yymsp[-3].minor.yy456 = yylhsminor.yy456; + yymsp[-3].minor.yy42 = yylhsminor.yy42; break; - case 332: /* compare_op ::= NK_LT */ -{ yymsp[0].minor.yy416 = OP_TYPE_LOWER_THAN; } + case 334: /* compare_op ::= NK_LT */ +{ yymsp[0].minor.yy270 = OP_TYPE_LOWER_THAN; } break; - case 333: /* compare_op ::= NK_GT */ -{ yymsp[0].minor.yy416 = OP_TYPE_GREATER_THAN; } + case 335: /* compare_op ::= NK_GT */ +{ yymsp[0].minor.yy270 = OP_TYPE_GREATER_THAN; } break; - case 334: /* compare_op ::= NK_LE */ -{ yymsp[0].minor.yy416 = OP_TYPE_LOWER_EQUAL; } + case 336: /* compare_op ::= NK_LE */ +{ yymsp[0].minor.yy270 = OP_TYPE_LOWER_EQUAL; } break; - case 335: /* compare_op ::= NK_GE */ -{ yymsp[0].minor.yy416 = OP_TYPE_GREATER_EQUAL; } + case 337: /* compare_op ::= NK_GE */ +{ yymsp[0].minor.yy270 = OP_TYPE_GREATER_EQUAL; } break; - case 336: /* compare_op ::= NK_NE */ -{ yymsp[0].minor.yy416 = OP_TYPE_NOT_EQUAL; } + case 338: /* compare_op ::= NK_NE */ +{ yymsp[0].minor.yy270 = OP_TYPE_NOT_EQUAL; } break; - case 337: /* compare_op ::= NK_EQ */ -{ yymsp[0].minor.yy416 = OP_TYPE_EQUAL; } + case 339: /* compare_op ::= NK_EQ */ +{ yymsp[0].minor.yy270 = OP_TYPE_EQUAL; } break; - case 338: /* compare_op ::= LIKE */ -{ yymsp[0].minor.yy416 = OP_TYPE_LIKE; } + case 340: /* compare_op ::= LIKE */ +{ yymsp[0].minor.yy270 = OP_TYPE_LIKE; } break; - case 339: /* compare_op ::= NOT LIKE */ -{ yymsp[-1].minor.yy416 = OP_TYPE_NOT_LIKE; } + case 341: /* compare_op ::= NOT LIKE */ +{ yymsp[-1].minor.yy270 = OP_TYPE_NOT_LIKE; } break; - case 340: /* compare_op ::= MATCH */ -{ yymsp[0].minor.yy416 = OP_TYPE_MATCH; } + case 342: /* compare_op ::= MATCH */ +{ yymsp[0].minor.yy270 = OP_TYPE_MATCH; } break; - case 341: /* compare_op ::= NMATCH */ -{ yymsp[0].minor.yy416 = OP_TYPE_NMATCH; } + case 343: /* compare_op ::= NMATCH */ +{ yymsp[0].minor.yy270 = OP_TYPE_NMATCH; } break; - case 342: /* compare_op ::= CONTAINS */ -{ yymsp[0].minor.yy416 = OP_TYPE_JSON_CONTAINS; } + case 344: /* compare_op ::= CONTAINS */ +{ yymsp[0].minor.yy270 = OP_TYPE_JSON_CONTAINS; } break; - case 343: /* in_op ::= IN */ -{ yymsp[0].minor.yy416 = OP_TYPE_IN; } + case 345: /* in_op ::= IN */ +{ yymsp[0].minor.yy270 = OP_TYPE_IN; } break; - case 344: /* in_op ::= NOT IN */ -{ yymsp[-1].minor.yy416 = OP_TYPE_NOT_IN; } + case 346: /* in_op ::= NOT IN */ +{ yymsp[-1].minor.yy270 = OP_TYPE_NOT_IN; } break; - case 345: /* in_predicate_value ::= NK_LP expression_list NK_RP */ -{ yylhsminor.yy456 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, createNodeListNode(pCxt, yymsp[-1].minor.yy632)); } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + case 347: /* in_predicate_value ::= NK_LP expression_list NK_RP */ +{ yylhsminor.yy42 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, createNodeListNode(pCxt, yymsp[-1].minor.yy244)); } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 347: /* boolean_value_expression ::= NOT boolean_primary */ + case 349: /* boolean_value_expression ::= NOT boolean_primary */ { - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy456); - yylhsminor.yy456 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_NOT, releaseRawExprNode(pCxt, yymsp[0].minor.yy456), NULL)); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy42); + yylhsminor.yy42 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_NOT, releaseRawExprNode(pCxt, yymsp[0].minor.yy42), NULL)); } - yymsp[-1].minor.yy456 = yylhsminor.yy456; + yymsp[-1].minor.yy42 = yylhsminor.yy42; break; - case 348: /* boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */ + case 350: /* boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy456); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy456); - yylhsminor.yy456 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_OR, releaseRawExprNode(pCxt, yymsp[-2].minor.yy456), releaseRawExprNode(pCxt, yymsp[0].minor.yy456))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy42); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy42); + yylhsminor.yy42 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_OR, releaseRawExprNode(pCxt, yymsp[-2].minor.yy42), releaseRawExprNode(pCxt, yymsp[0].minor.yy42))); } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 349: /* boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */ + case 351: /* boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */ { - SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy456); - SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy456); - yylhsminor.yy456 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_AND, releaseRawExprNode(pCxt, yymsp[-2].minor.yy456), releaseRawExprNode(pCxt, yymsp[0].minor.yy456))); + SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy42); + SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy42); + yylhsminor.yy42 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_AND, releaseRawExprNode(pCxt, yymsp[-2].minor.yy42), releaseRawExprNode(pCxt, yymsp[0].minor.yy42))); } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 356: /* table_reference_list ::= table_reference_list NK_COMMA table_reference */ -{ yylhsminor.yy456 = createJoinTableNode(pCxt, JOIN_TYPE_INNER, yymsp[-2].minor.yy456, yymsp[0].minor.yy456, NULL); } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + case 358: /* table_reference_list ::= table_reference_list NK_COMMA table_reference */ +{ yylhsminor.yy42 = createJoinTableNode(pCxt, JOIN_TYPE_INNER, yymsp[-2].minor.yy42, yymsp[0].minor.yy42, NULL); } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 359: /* table_primary ::= table_name alias_opt */ -{ yylhsminor.yy456 = createRealTableNode(pCxt, NULL, &yymsp[-1].minor.yy537, &yymsp[0].minor.yy537); } - yymsp[-1].minor.yy456 = yylhsminor.yy456; + case 361: /* table_primary ::= table_name alias_opt */ +{ yylhsminor.yy42 = createRealTableNode(pCxt, NULL, &yymsp[-1].minor.yy359, &yymsp[0].minor.yy359); } + yymsp[-1].minor.yy42 = yylhsminor.yy42; break; - case 360: /* table_primary ::= db_name NK_DOT table_name alias_opt */ -{ yylhsminor.yy456 = createRealTableNode(pCxt, &yymsp[-3].minor.yy537, &yymsp[-1].minor.yy537, &yymsp[0].minor.yy537); } - yymsp[-3].minor.yy456 = yylhsminor.yy456; + case 362: /* table_primary ::= db_name NK_DOT table_name alias_opt */ +{ yylhsminor.yy42 = createRealTableNode(pCxt, &yymsp[-3].minor.yy359, &yymsp[-1].minor.yy359, &yymsp[0].minor.yy359); } + yymsp[-3].minor.yy42 = yylhsminor.yy42; break; - case 361: /* table_primary ::= subquery alias_opt */ -{ yylhsminor.yy456 = createTempTableNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy456), &yymsp[0].minor.yy537); } - yymsp[-1].minor.yy456 = yylhsminor.yy456; + case 363: /* table_primary ::= subquery alias_opt */ +{ yylhsminor.yy42 = createTempTableNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy42), &yymsp[0].minor.yy359); } + yymsp[-1].minor.yy42 = yylhsminor.yy42; break; - case 363: /* alias_opt ::= */ -{ yymsp[1].minor.yy537 = nil_token; } + case 365: /* alias_opt ::= */ +{ yymsp[1].minor.yy359 = nil_token; } break; - case 364: /* alias_opt ::= table_alias */ -{ yylhsminor.yy537 = yymsp[0].minor.yy537; } - yymsp[0].minor.yy537 = yylhsminor.yy537; + case 366: /* alias_opt ::= table_alias */ +{ yylhsminor.yy359 = yymsp[0].minor.yy359; } + yymsp[0].minor.yy359 = yylhsminor.yy359; break; - case 365: /* alias_opt ::= AS table_alias */ -{ yymsp[-1].minor.yy537 = yymsp[0].minor.yy537; } + case 367: /* alias_opt ::= AS table_alias */ +{ yymsp[-1].minor.yy359 = yymsp[0].minor.yy359; } break; - case 366: /* parenthesized_joined_table ::= NK_LP joined_table NK_RP */ - case 367: /* parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */ yytestcase(yyruleno==367); -{ yymsp[-2].minor.yy456 = yymsp[-1].minor.yy456; } + case 368: /* parenthesized_joined_table ::= NK_LP joined_table NK_RP */ + case 369: /* parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */ yytestcase(yyruleno==369); +{ yymsp[-2].minor.yy42 = yymsp[-1].minor.yy42; } break; - case 368: /* joined_table ::= table_reference join_type JOIN table_reference ON search_condition */ -{ yylhsminor.yy456 = createJoinTableNode(pCxt, yymsp[-4].minor.yy164, yymsp[-5].minor.yy456, yymsp[-2].minor.yy456, yymsp[0].minor.yy456); } - yymsp[-5].minor.yy456 = yylhsminor.yy456; + case 370: /* joined_table ::= table_reference join_type JOIN table_reference ON search_condition */ +{ yylhsminor.yy42 = createJoinTableNode(pCxt, yymsp[-4].minor.yy102, yymsp[-5].minor.yy42, yymsp[-2].minor.yy42, yymsp[0].minor.yy42); } + yymsp[-5].minor.yy42 = yylhsminor.yy42; break; - case 369: /* join_type ::= */ -{ yymsp[1].minor.yy164 = JOIN_TYPE_INNER; } + case 371: /* join_type ::= */ +{ yymsp[1].minor.yy102 = JOIN_TYPE_INNER; } break; - case 370: /* join_type ::= INNER */ -{ yymsp[0].minor.yy164 = JOIN_TYPE_INNER; } + case 372: /* join_type ::= INNER */ +{ yymsp[0].minor.yy102 = JOIN_TYPE_INNER; } break; - case 371: /* query_specification ::= SELECT set_quantifier_opt select_list from_clause where_clause_opt partition_by_clause_opt twindow_clause_opt group_by_clause_opt having_clause_opt */ + case 373: /* query_specification ::= SELECT set_quantifier_opt select_list from_clause where_clause_opt partition_by_clause_opt twindow_clause_opt group_by_clause_opt having_clause_opt */ { - yymsp[-8].minor.yy456 = createSelectStmt(pCxt, yymsp[-7].minor.yy649, yymsp[-6].minor.yy632, yymsp[-5].minor.yy456); - yymsp[-8].minor.yy456 = addWhereClause(pCxt, yymsp[-8].minor.yy456, yymsp[-4].minor.yy456); - yymsp[-8].minor.yy456 = addPartitionByClause(pCxt, yymsp[-8].minor.yy456, yymsp[-3].minor.yy632); - yymsp[-8].minor.yy456 = addWindowClauseClause(pCxt, yymsp[-8].minor.yy456, yymsp[-2].minor.yy456); - yymsp[-8].minor.yy456 = addGroupByClause(pCxt, yymsp[-8].minor.yy456, yymsp[-1].minor.yy632); - yymsp[-8].minor.yy456 = addHavingClause(pCxt, yymsp[-8].minor.yy456, yymsp[0].minor.yy456); + yymsp[-8].minor.yy42 = createSelectStmt(pCxt, yymsp[-7].minor.yy237, yymsp[-6].minor.yy244, yymsp[-5].minor.yy42); + yymsp[-8].minor.yy42 = addWhereClause(pCxt, yymsp[-8].minor.yy42, yymsp[-4].minor.yy42); + yymsp[-8].minor.yy42 = addPartitionByClause(pCxt, yymsp[-8].minor.yy42, yymsp[-3].minor.yy244); + yymsp[-8].minor.yy42 = addWindowClauseClause(pCxt, yymsp[-8].minor.yy42, yymsp[-2].minor.yy42); + yymsp[-8].minor.yy42 = addGroupByClause(pCxt, yymsp[-8].minor.yy42, yymsp[-1].minor.yy244); + yymsp[-8].minor.yy42 = addHavingClause(pCxt, yymsp[-8].minor.yy42, yymsp[0].minor.yy42); } break; - case 374: /* set_quantifier_opt ::= ALL */ -{ yymsp[0].minor.yy649 = false; } + case 376: /* set_quantifier_opt ::= ALL */ +{ yymsp[0].minor.yy237 = false; } break; - case 375: /* select_list ::= NK_STAR */ -{ yymsp[0].minor.yy632 = NULL; } + case 377: /* select_list ::= NK_STAR */ +{ yymsp[0].minor.yy244 = NULL; } break; - case 380: /* select_item ::= common_expression column_alias */ -{ yylhsminor.yy456 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy456), &yymsp[0].minor.yy537); } - yymsp[-1].minor.yy456 = yylhsminor.yy456; + case 382: /* select_item ::= common_expression column_alias */ +{ yylhsminor.yy42 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy42), &yymsp[0].minor.yy359); } + yymsp[-1].minor.yy42 = yylhsminor.yy42; break; - case 381: /* select_item ::= common_expression AS column_alias */ -{ yylhsminor.yy456 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy456), &yymsp[0].minor.yy537); } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + case 383: /* select_item ::= common_expression AS column_alias */ +{ yylhsminor.yy42 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy42), &yymsp[0].minor.yy359); } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 386: /* partition_by_clause_opt ::= PARTITION BY expression_list */ - case 403: /* group_by_clause_opt ::= GROUP BY group_by_list */ yytestcase(yyruleno==403); - case 413: /* order_by_clause_opt ::= ORDER BY sort_specification_list */ yytestcase(yyruleno==413); -{ yymsp[-2].minor.yy632 = yymsp[0].minor.yy632; } + case 388: /* partition_by_clause_opt ::= PARTITION BY expression_list */ + case 405: /* group_by_clause_opt ::= GROUP BY group_by_list */ yytestcase(yyruleno==405); + case 415: /* order_by_clause_opt ::= ORDER BY sort_specification_list */ yytestcase(yyruleno==415); +{ yymsp[-2].minor.yy244 = yymsp[0].minor.yy244; } break; - case 388: /* twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP */ -{ yymsp[-5].minor.yy456 = createSessionWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy456), releaseRawExprNode(pCxt, yymsp[-1].minor.yy456)); } + case 390: /* twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP */ +{ yymsp[-5].minor.yy42 = createSessionWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy42), releaseRawExprNode(pCxt, yymsp[-1].minor.yy42)); } break; - case 389: /* twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP */ -{ yymsp[-3].minor.yy456 = createStateWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy456)); } + case 391: /* twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP */ +{ yymsp[-3].minor.yy42 = createStateWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy42)); } break; - case 390: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */ -{ yymsp[-5].minor.yy456 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy456), NULL, yymsp[-1].minor.yy456, yymsp[0].minor.yy456); } + case 392: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */ +{ yymsp[-5].minor.yy42 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy42), NULL, yymsp[-1].minor.yy42, yymsp[0].minor.yy42); } break; - case 391: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */ -{ yymsp[-7].minor.yy456 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-5].minor.yy456), releaseRawExprNode(pCxt, yymsp[-3].minor.yy456), yymsp[-1].minor.yy456, yymsp[0].minor.yy456); } + case 393: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */ +{ yymsp[-7].minor.yy42 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-5].minor.yy42), releaseRawExprNode(pCxt, yymsp[-3].minor.yy42), yymsp[-1].minor.yy42, yymsp[0].minor.yy42); } break; - case 393: /* sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */ -{ yymsp[-3].minor.yy456 = releaseRawExprNode(pCxt, yymsp[-1].minor.yy456); } + case 395: /* sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */ +{ yymsp[-3].minor.yy42 = releaseRawExprNode(pCxt, yymsp[-1].minor.yy42); } break; - case 395: /* fill_opt ::= FILL NK_LP fill_mode NK_RP */ -{ yymsp[-3].minor.yy456 = createFillNode(pCxt, yymsp[-1].minor.yy646, NULL); } + case 397: /* fill_opt ::= FILL NK_LP fill_mode NK_RP */ +{ yymsp[-3].minor.yy42 = createFillNode(pCxt, yymsp[-1].minor.yy544, NULL); } break; - case 396: /* fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */ -{ yymsp[-5].minor.yy456 = createFillNode(pCxt, FILL_MODE_VALUE, createNodeListNode(pCxt, yymsp[-1].minor.yy632)); } + case 398: /* fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */ +{ yymsp[-5].minor.yy42 = createFillNode(pCxt, FILL_MODE_VALUE, createNodeListNode(pCxt, yymsp[-1].minor.yy244)); } break; - case 397: /* fill_mode ::= NONE */ -{ yymsp[0].minor.yy646 = FILL_MODE_NONE; } + case 399: /* fill_mode ::= NONE */ +{ yymsp[0].minor.yy544 = FILL_MODE_NONE; } break; - case 398: /* fill_mode ::= PREV */ -{ yymsp[0].minor.yy646 = FILL_MODE_PREV; } + case 400: /* fill_mode ::= PREV */ +{ yymsp[0].minor.yy544 = FILL_MODE_PREV; } break; - case 399: /* fill_mode ::= NULL */ -{ yymsp[0].minor.yy646 = FILL_MODE_NULL; } + case 401: /* fill_mode ::= NULL */ +{ yymsp[0].minor.yy544 = FILL_MODE_NULL; } break; - case 400: /* fill_mode ::= LINEAR */ -{ yymsp[0].minor.yy646 = FILL_MODE_LINEAR; } + case 402: /* fill_mode ::= LINEAR */ +{ yymsp[0].minor.yy544 = FILL_MODE_LINEAR; } break; - case 401: /* fill_mode ::= NEXT */ -{ yymsp[0].minor.yy646 = FILL_MODE_NEXT; } + case 403: /* fill_mode ::= NEXT */ +{ yymsp[0].minor.yy544 = FILL_MODE_NEXT; } break; - case 404: /* group_by_list ::= expression */ -{ yylhsminor.yy632 = createNodeList(pCxt, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy456))); } - yymsp[0].minor.yy632 = yylhsminor.yy632; + case 406: /* group_by_list ::= expression */ +{ yylhsminor.yy244 = createNodeList(pCxt, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy42))); } + yymsp[0].minor.yy244 = yylhsminor.yy244; break; - case 405: /* group_by_list ::= group_by_list NK_COMMA expression */ -{ yylhsminor.yy632 = addNodeToList(pCxt, yymsp[-2].minor.yy632, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy456))); } - yymsp[-2].minor.yy632 = yylhsminor.yy632; + case 407: /* group_by_list ::= group_by_list NK_COMMA expression */ +{ yylhsminor.yy244 = addNodeToList(pCxt, yymsp[-2].minor.yy244, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy42))); } + yymsp[-2].minor.yy244 = yylhsminor.yy244; break; - case 408: /* query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */ + case 410: /* query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */ { - yylhsminor.yy456 = addOrderByClause(pCxt, yymsp[-3].minor.yy456, yymsp[-2].minor.yy632); - yylhsminor.yy456 = addSlimitClause(pCxt, yylhsminor.yy456, yymsp[-1].minor.yy456); - yylhsminor.yy456 = addLimitClause(pCxt, yylhsminor.yy456, yymsp[0].minor.yy456); + yylhsminor.yy42 = addOrderByClause(pCxt, yymsp[-3].minor.yy42, yymsp[-2].minor.yy244); + yylhsminor.yy42 = addSlimitClause(pCxt, yylhsminor.yy42, yymsp[-1].minor.yy42); + yylhsminor.yy42 = addLimitClause(pCxt, yylhsminor.yy42, yymsp[0].minor.yy42); } - yymsp[-3].minor.yy456 = yylhsminor.yy456; + yymsp[-3].minor.yy42 = yylhsminor.yy42; break; - case 410: /* query_expression_body ::= query_expression_body UNION ALL query_expression_body */ -{ yylhsminor.yy456 = createSetOperator(pCxt, SET_OP_TYPE_UNION_ALL, yymsp[-3].minor.yy456, yymsp[0].minor.yy456); } - yymsp[-3].minor.yy456 = yylhsminor.yy456; + case 412: /* query_expression_body ::= query_expression_body UNION ALL query_expression_body */ +{ yylhsminor.yy42 = createSetOperator(pCxt, SET_OP_TYPE_UNION_ALL, yymsp[-3].minor.yy42, yymsp[0].minor.yy42); } + yymsp[-3].minor.yy42 = yylhsminor.yy42; break; - case 415: /* slimit_clause_opt ::= SLIMIT NK_INTEGER */ - case 419: /* limit_clause_opt ::= LIMIT NK_INTEGER */ yytestcase(yyruleno==419); -{ yymsp[-1].minor.yy456 = createLimitNode(pCxt, &yymsp[0].minor.yy0, NULL); } + case 417: /* slimit_clause_opt ::= SLIMIT NK_INTEGER */ + case 421: /* limit_clause_opt ::= LIMIT NK_INTEGER */ yytestcase(yyruleno==421); +{ yymsp[-1].minor.yy42 = createLimitNode(pCxt, &yymsp[0].minor.yy0, NULL); } break; - case 416: /* slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */ - case 420: /* limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */ yytestcase(yyruleno==420); -{ yymsp[-3].minor.yy456 = createLimitNode(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); } + case 418: /* slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */ + case 422: /* limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */ yytestcase(yyruleno==422); +{ yymsp[-3].minor.yy42 = createLimitNode(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); } break; - case 417: /* slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */ - case 421: /* limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */ yytestcase(yyruleno==421); -{ yymsp[-3].minor.yy456 = createLimitNode(pCxt, &yymsp[0].minor.yy0, &yymsp[-2].minor.yy0); } + case 419: /* slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */ + case 423: /* limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */ yytestcase(yyruleno==423); +{ yymsp[-3].minor.yy42 = createLimitNode(pCxt, &yymsp[0].minor.yy0, &yymsp[-2].minor.yy0); } break; - case 422: /* subquery ::= NK_LP query_expression NK_RP */ -{ yylhsminor.yy456 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, yymsp[-1].minor.yy456); } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + case 424: /* subquery ::= NK_LP query_expression NK_RP */ +{ yylhsminor.yy42 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, yymsp[-1].minor.yy42); } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 426: /* sort_specification ::= expression ordering_specification_opt null_ordering_opt */ -{ yylhsminor.yy456 = createOrderByExprNode(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy456), yymsp[-1].minor.yy626, yymsp[0].minor.yy209); } - yymsp[-2].minor.yy456 = yylhsminor.yy456; + case 428: /* sort_specification ::= expression ordering_specification_opt null_ordering_opt */ +{ yylhsminor.yy42 = createOrderByExprNode(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy42), yymsp[-1].minor.yy508, yymsp[0].minor.yy197); } + yymsp[-2].minor.yy42 = yylhsminor.yy42; break; - case 427: /* ordering_specification_opt ::= */ -{ yymsp[1].minor.yy626 = ORDER_ASC; } + case 429: /* ordering_specification_opt ::= */ +{ yymsp[1].minor.yy508 = ORDER_ASC; } break; - case 428: /* ordering_specification_opt ::= ASC */ -{ yymsp[0].minor.yy626 = ORDER_ASC; } + case 430: /* ordering_specification_opt ::= ASC */ +{ yymsp[0].minor.yy508 = ORDER_ASC; } break; - case 429: /* ordering_specification_opt ::= DESC */ -{ yymsp[0].minor.yy626 = ORDER_DESC; } + case 431: /* ordering_specification_opt ::= DESC */ +{ yymsp[0].minor.yy508 = ORDER_DESC; } break; - case 430: /* null_ordering_opt ::= */ -{ yymsp[1].minor.yy209 = NULL_ORDER_DEFAULT; } + case 432: /* null_ordering_opt ::= */ +{ yymsp[1].minor.yy197 = NULL_ORDER_DEFAULT; } break; - case 431: /* null_ordering_opt ::= NULLS FIRST */ -{ yymsp[-1].minor.yy209 = NULL_ORDER_FIRST; } + case 433: /* null_ordering_opt ::= NULLS FIRST */ +{ yymsp[-1].minor.yy197 = NULL_ORDER_FIRST; } break; - case 432: /* null_ordering_opt ::= NULLS LAST */ -{ yymsp[-1].minor.yy209 = NULL_ORDER_LAST; } + case 434: /* null_ordering_opt ::= NULLS LAST */ +{ yymsp[-1].minor.yy197 = NULL_ORDER_LAST; } break; default: break; diff --git a/source/libs/scalar/src/sclfunc.c b/source/libs/scalar/src/sclfunc.c index 5e8eb805e3..c49b053c22 100644 --- a/source/libs/scalar/src/sclfunc.c +++ b/source/libs/scalar/src/sclfunc.c @@ -304,7 +304,7 @@ static int32_t doLengthFunction(SScalarParam *pInput, int32_t inputNum, SScalarP continue; } - char *in = pInputData->pData + pInputData->varmeta.offset[i]; + char *in = colDataGetData(pInputData, i); out[i] = lenFn(in, type); } @@ -395,11 +395,8 @@ int32_t concatFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOu int16_t dataLen = 0; for (int32_t i = 0; i < inputNum; ++i) { - if (pInput[i].numOfRows == 1) { - input[i] = pInputData[i]->pData + pInputData[i]->varmeta.offset[0]; - } else { - input[i] = pInputData[i]->pData + pInputData[i]->varmeta.offset[k]; - } + int32_t rowIdx = (pInput[i].numOfRows == 1) ? 0 : k; + input[i] = colDataGetData(pInputData[i], rowIdx); ret = concatCopyHelper(input[i], output, hasNchar, GET_PARAM_TYPE(&pInput[i]), &dataLen); if (ret != TSDB_CODE_SUCCESS) { @@ -473,11 +470,8 @@ int32_t concatWsFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *p break; } - if (pInput[i].numOfRows == 1) { - input[i] = pInputData[i]->pData + pInputData[i]->varmeta.offset[0]; - } else { - input[i] = pInputData[i]->pData + pInputData[i]->varmeta.offset[k]; - } + int32_t rowIdx = (pInput[i].numOfRows == 1) ? 0 : k; + input[i] = colDataGetData(pInputData[i], rowIdx); ret = concatCopyHelper(input[i], output, hasNchar, GET_PARAM_TYPE(&pInput[i]), &dataLen); if (ret != TSDB_CODE_SUCCESS) { @@ -534,7 +528,7 @@ static int32_t doCaseConvFunction(SScalarParam *pInput, int32_t inputNum, SScala continue; } - char *input = pInputData->pData + pInputData->varmeta.offset[i]; + char *input = colDataGetData(pInput[0].columnData, i); int32_t len = varDataLen(input); if (type == TSDB_DATA_TYPE_VARCHAR) { for (int32_t j = 0; j < len; ++j) { @@ -575,8 +569,8 @@ static int32_t doTrimFunction(SScalarParam *pInput, int32_t inputNum, SScalarPar colDataAppendNULL(pOutputData, i); continue; } - char *input = pInputData->pData + pInputData->varmeta.offset[i]; + char *input = colDataGetData(pInput[0].columnData, i); int32_t len = varDataLen(input); int32_t charLen = (type == TSDB_DATA_TYPE_VARCHAR) ? len : len / TSDB_NCHAR_SIZE; trimFn(input, output, type, charLen); @@ -606,7 +600,7 @@ int32_t substrFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOu int32_t subLen = INT16_MAX; if (inputNum == 3) { GET_TYPED_DATA(subLen, int32_t, GET_PARAM_TYPE(&pInput[2]), pInput[2].columnData->pData); - if (subLen < 0) { //subLen cannot be negative + if (subLen < 0 || subLen > INT16_MAX) { //subLen cannot be negative return TSDB_CODE_FAILED; } subLen = (GET_PARAM_TYPE(pInput) == TSDB_DATA_TYPE_VARCHAR) ? subLen : subLen * TSDB_NCHAR_SIZE; @@ -615,19 +609,16 @@ int32_t substrFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOu SColumnInfoData *pInputData = pInput->columnData; SColumnInfoData *pOutputData = pOutput->columnData; - char *input = pInputData->pData + pInputData->varmeta.offset[0]; - char *output = NULL; - int32_t outputLen = pInputData->varmeta.length * pInput->numOfRows; char *outputBuf = taosMemoryCalloc(outputLen, 1); - output = outputBuf; + char *output = outputBuf; for (int32_t i = 0; i < pInput->numOfRows; ++i) { if (colDataIsNull_s(pInputData, i)) { colDataAppendNULL(pOutputData, i); continue; } - + char *input = colDataGetData(pInput[0].columnData, i); int32_t len = varDataLen(input); int32_t startPosBytes; @@ -646,7 +637,6 @@ int32_t substrFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOu varDataSetLen(output, resLen); colDataAppend(pOutputData, i , output, false); - input += varDataTLen(input); output += varDataTLen(output); } @@ -799,13 +789,13 @@ int32_t castFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutp int32_t toISO8601Function(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) { int32_t type = GET_PARAM_TYPE(pInput); - char *input = pInput[0].columnData->pData; for (int32_t i = 0; i < pInput[0].numOfRows; ++i) { if (colDataIsNull_s(pInput[0].columnData, i)) { colDataAppendNULL(pOutput->columnData, i); continue; } + char *input = colDataGetData(pInput[0].columnData, i); char fraction[20] = {0}; bool hasFraction = false; NUM_TO_STRING(type, input, sizeof(fraction), fraction); @@ -822,7 +812,8 @@ int32_t toISO8601Function(SScalarParam *pInput, int32_t inputNum, SScalarParam * } else if (tsDigits == TSDB_TIME_PRECISION_NANO_DIGITS) { timeVal = timeVal / (1000 * 1000 * 1000); } else { - assert(0); + colDataAppendNULL(pOutput->columnData, i); + continue; } hasFraction = true; memmove(fraction, fraction + TSDB_TIME_PRECISION_SEC_DIGITS, TSDB_TIME_PRECISION_SEC_DIGITS); @@ -852,7 +843,6 @@ int32_t toISO8601Function(SScalarParam *pInput, int32_t inputNum, SScalarParam * varDataSetLen(buf, len); colDataAppend(pOutput->columnData, i, buf, false); - input += tDataTypes[type].bytes; } pOutput->numOfRows = pInput->numOfRows; @@ -864,12 +854,12 @@ int32_t toUnixtimestampFunction(SScalarParam *pInput, int32_t inputNum, SScalarP int32_t type = GET_PARAM_TYPE(pInput); int32_t timePrec = GET_PARAM_PRECISON(pInput); - char *input = pInput[0].columnData->pData + pInput[0].columnData->varmeta.offset[0]; for (int32_t i = 0; i < pInput[0].numOfRows; ++i) { if (colDataIsNull_s(pInput[0].columnData, i)) { colDataAppendNULL(pOutput->columnData, i); continue; } + char *input = colDataGetData(pInput[0].columnData, i); int64_t timeVal = 0; int32_t ret = convertStringToTimestamp(type, input, timePrec, &timeVal); @@ -879,7 +869,6 @@ int32_t toUnixtimestampFunction(SScalarParam *pInput, int32_t inputNum, SScalarP } colDataAppend(pOutput->columnData, i, (char *)&timeVal, false); - input += varDataTLen(input); } pOutput->numOfRows = pInput->numOfRows; @@ -897,19 +886,14 @@ int32_t timeTruncateFunction(SScalarParam *pInput, int32_t inputNum, SScalarPara int64_t factor = (timePrec == TSDB_TIME_PRECISION_MILLI) ? 1000 : (timePrec == TSDB_TIME_PRECISION_MICRO ? 1000000 : 1000000000); - char *input = NULL; - if (IS_VAR_DATA_TYPE(type)) { - input = pInput[0].columnData->pData + pInput[0].columnData->varmeta.offset[0]; - } else { - input = pInput[0].columnData->pData; - } - for (int32_t i = 0; i < pInput[0].numOfRows; ++i) { if (colDataIsNull_s(pInput[0].columnData, i)) { colDataAppendNULL(pOutput->columnData, i); continue; } + char *input = colDataGetData(pInput[0].columnData, i); + if (IS_VAR_DATA_TYPE(type)) { /* datetime format strings */ int32_t ret = convertStringToTimestamp(type, input, TSDB_TIME_PRECISION_NANO, &timeVal); if (ret != TSDB_CODE_SUCCESS) { @@ -959,7 +943,8 @@ int32_t timeTruncateFunction(SScalarParam *pInput, int32_t inputNum, SScalarPara } else if (tsDigits <= TSDB_TIME_PRECISION_SEC_DIGITS){ timeVal = timeVal * factor; } else { - assert(0); + colDataAppendNULL(pOutput->columnData, i); + continue; } break; } @@ -973,7 +958,8 @@ int32_t timeTruncateFunction(SScalarParam *pInput, int32_t inputNum, SScalarPara } else if (tsDigits <= TSDB_TIME_PRECISION_SEC_DIGITS) { timeVal = timeVal * factor; } else { - assert(0); + colDataAppendNULL(pOutput->columnData, i); + continue; } break; } @@ -987,7 +973,8 @@ int32_t timeTruncateFunction(SScalarParam *pInput, int32_t inputNum, SScalarPara } else if (tsDigits <= TSDB_TIME_PRECISION_SEC_DIGITS) { timeVal = timeVal * factor / factor / 60 * 60 * factor; } else { - assert(0); + colDataAppendNULL(pOutput->columnData, i); + continue; } break; } @@ -1001,7 +988,8 @@ int32_t timeTruncateFunction(SScalarParam *pInput, int32_t inputNum, SScalarPara } else if (tsDigits <= TSDB_TIME_PRECISION_SEC_DIGITS) { timeVal = timeVal * factor / factor / 3600 * 3600 * factor; } else { - assert(0); + colDataAppendNULL(pOutput->columnData, i); + continue; } break; } @@ -1015,7 +1003,8 @@ int32_t timeTruncateFunction(SScalarParam *pInput, int32_t inputNum, SScalarPara } else if (tsDigits <= TSDB_TIME_PRECISION_SEC_DIGITS) { timeVal = timeVal * factor / factor / 86400* 86400 * factor; } else { - assert(0); + colDataAppendNULL(pOutput->columnData, i); + continue; } break; } @@ -1029,7 +1018,8 @@ int32_t timeTruncateFunction(SScalarParam *pInput, int32_t inputNum, SScalarPara } else if (tsDigits <= TSDB_TIME_PRECISION_SEC_DIGITS) { timeVal = timeVal * factor / factor / 604800 * 604800* factor; } else { - assert(0); + colDataAppendNULL(pOutput->columnData, i); + continue; } break; } @@ -1068,11 +1058,6 @@ int32_t timeTruncateFunction(SScalarParam *pInput, int32_t inputNum, SScalarPara } colDataAppend(pOutput->columnData, i, (char *)&timeVal, false); - if (IS_VAR_DATA_TYPE(type)) { - input += varDataTLen(input); - } else { - input += tDataTypes[type].bytes; - } } pOutput->numOfRows = pInput->numOfRows; @@ -1094,12 +1079,6 @@ int32_t timeDiffFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *p type != TSDB_DATA_TYPE_BINARY && type != TSDB_DATA_TYPE_NCHAR) { return TSDB_CODE_FAILED; } - - if (IS_VAR_DATA_TYPE(type)) { - input[k] = pInput[k].columnData->pData + pInput[k].columnData->varmeta.offset[0]; - } else { - input[k] = pInput[k].columnData->pData; - } } for (int32_t i = 0; i < pInput[0].numOfRows; ++i) { @@ -1109,6 +1088,9 @@ int32_t timeDiffFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *p continue; } + int32_t rowIdx = (pInput[k].numOfRows == 1) ? 0 : i; + input[k] = colDataGetData(pInput[k].columnData, rowIdx); + int32_t type = GET_PARAM_TYPE(&pInput[k]); if (IS_VAR_DATA_TYPE(type)) { /* datetime format strings */ int32_t ret = convertStringToTimestamp(type, input[k], TSDB_TIME_PRECISION_NANO, &timeVal[k]); @@ -1138,14 +1120,9 @@ int32_t timeDiffFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *p timeVal[k] = timeVal[k] * 1000; } else if (tsDigits == TSDB_TIME_PRECISION_NANO_DIGITS) { timeVal[k] = timeVal[k]; - } - } - - if (pInput[k].numOfRows != 1) { - if (IS_VAR_DATA_TYPE(type)) { - input[k] += varDataTLen(input[k]); } else { - input[k] += tDataTypes[type].bytes; + colDataAppendNULL(pOutput->columnData, i); + continue; } } } diff --git a/source/libs/sync/src/syncMain.c b/source/libs/sync/src/syncMain.c index 78e454309a..fe32b136b7 100644 --- a/source/libs/sync/src/syncMain.c +++ b/source/libs/sync/src/syncMain.c @@ -929,4 +929,17 @@ static void syncFreeNode(void* param) { syncNodePrint2((char*)"==syncFreeNode==", pNode); taosMemoryFree(pNode); +} + +const char* syncStr(ESyncState state) { + switch (state) { + case TAOS_SYNC_STATE_FOLLOWER: + return "FOLLOWER"; + case TAOS_SYNC_STATE_CANDIDATE: + return "CANDIDATE"; + case TAOS_SYNC_STATE_LEADER: + return "LEADER"; + default: + return "ERROR"; + } } \ No newline at end of file diff --git a/tests/script/basicSuite.sim b/tests/script/basicSuite.sim deleted file mode 100644 index 5e22e02297..0000000000 --- a/tests/script/basicSuite.sim +++ /dev/null @@ -1,19 +0,0 @@ -run general/cache/new_metrics.sim -run general/compute/interval.sim -run general/http/restful_full.sim -run general/import/commit.sim -run general/import/replica1.sim -run general/parser/auto_create_tb_drop_tb.sim -run general/parser/binary_escapeCharacter.sim -run general/parser/select_from_cache_disk.sim -run general/parser/null_char.sim -run general/parser/alter.sim -run general/stable/vnode3.sim -run general/tag/filter.sim -run general/table/vgroup.sim -run general/user/authority.sim -run general/vector/metrics_mix.sim -run general/vector/table_field.sim -run general/tag/set.sim -run general/table/delete_writing.sim -run general/stable/disk.sim diff --git a/tests/script/bug.sim b/tests/script/bug.sim deleted file mode 100644 index 625b9b0cad..0000000000 --- a/tests/script/bug.sim +++ /dev/null @@ -1,2 +0,0 @@ -run general/parser/projection_limit_offset.sim -run general/parser/limit2.sim \ No newline at end of file diff --git a/tests/script/fullGeneralSuite.sim b/tests/script/fullGeneralSuite.sim deleted file mode 100644 index 188ce14055..0000000000 --- a/tests/script/fullGeneralSuite.sim +++ /dev/null @@ -1,225 +0,0 @@ -#unsupport run general/alter/cached_schema_after_alter.sim -run general/alter/count.sim -run general/alter/import.sim -#unsupport run general/alter/insert1.sim -run general/alter/insert2.sim -run general/alter/metrics.sim -run general/alter/table.sim -run general/cache/new_metrics.sim -run general/cache/restart_metrics.sim -run general/cache/restart_table.sim -run general/connection/connection.sim -run general/column/commit.sim -run general/column/metrics.sim -run general/column/table.sim -run general/compress/commitlog.sim -run general/compress/compress.sim -run general/compress/compress2.sim -run general/compress/uncompress.sim -run general/compute/avg.sim -run general/compute/bottom.sim -run general/compute/count.sim -run general/compute/diff.sim -run general/compute/diff2.sim -run general/compute/first.sim -run general/compute/interval.sim -run general/compute/last.sim -run general/compute/last_row.sim -run general/compute/leastsquare.sim -run general/compute/max.sim -run general/compute/min.sim -run general/compute/null.sim -run general/compute/percentile.sim -run general/compute/stddev.sim -run general/compute/sum.sim -run general/compute/top.sim -run general/compute/block_dist.sim -run general/db/alter_option.sim -run general/db/alter_tables_d2.sim -run general/db/alter_tables_v1.sim -run general/db/alter_tables_v4.sim -run general/db/alter_vgroups.sim -run general/db/basic.sim -run general/db/basic1.sim -run general/db/basic2.sim -run general/db/basic3.sim -run general/db/basic4.sim -run general/db/basic5.sim -run general/db/delete_reuse1.sim -run general/db/delete_reuse2.sim -run general/db/delete_reusevnode.sim -run general/db/delete_reusevnode2.sim -run general/db/delete_writing1.sim -run general/db/delete_writing2.sim -run general/db/delete.sim -run general/db/len.sim -run general/db/repeat.sim -run general/db/tables.sim -run general/db/vnodes.sim -run general/field/2.sim -run general/field/3.sim -run general/field/4.sim -run general/field/5.sim -run general/field/6.sim -run general/field/bigint.sim -run general/field/binary.sim -run general/field/bool.sim -run general/field/single.sim -run general/field/smallint.sim -run general/field/tinyint.sim -run general/http/restful.sim -run general/http/restful_insert.sim -run general/http/restful_limit.sim -run general/http/restful_full.sim -run general/http/prepare.sim -run general/http/telegraf.sim -run general/http/grafana_bug.sim -run general/http/grafana.sim -run general/import/basic.sim -run general/import/commit.sim -run general/import/large.sim -run general/import/replica1.sim -run general/insert/basic.sim -run general/insert/insert_drop.sim -run general/insert/query_block1_memory.sim -run general/insert/query_block2_memory.sim -run general/insert/query_block1_file.sim -run general/insert/query_block2_file.sim -run general/insert/query_file_memory.sim -run general/insert/query_multi_file.sim -run general/insert/tcp.sim -#unsupport run general/parser/alter.sim -run general/parser/alter1.sim -run general/parser/alter_stable.sim -run general/parser/auto_create_tb.sim -run general/parser/auto_create_tb_drop_tb.sim -run general/parser/col_arithmetic_operation.sim -run general/parser/columnValue.sim -run general/parser/commit.sim -run general/parser/create_db.sim -run general/parser/create_mt.sim -run general/parser/create_tb.sim -run general/parser/dbtbnameValidate.sim -run general/parser/import_commit1.sim -run general/parser/import_commit2.sim -run general/parser/import_commit3.sim -run general/parser/insert_tb.sim -run general/parser/first_last.sim -run general/parser/line_insert.sim -#unsupport run general/parser/import_file.sim -run general/parser/lastrow.sim -run general/parser/nchar.sim -#unsupport run general/parser/null_char.sim -run general/parser/single_row_in_tb.sim -run general/parser/select_from_cache_disk.sim -run general/parser/limit.sim -run general/parser/limit1.sim -run general/parser/limit1_tblocks100.sim -run general/parser/mixed_blocks.sim -run general/parser/selectResNum.sim -run general/parser/select_across_vnodes.sim -run general/parser/slimit1.sim -run general/parser/tbnameIn.sim -run general/parser/binary_escapeCharacter.sim -run general/parser/projection_limit_offset.sim -run general/parser/limit2.sim -run general/parser/slimit.sim -run general/parser/fill.sim -run general/parser/fill_stb.sim -run general/parser/interp.sim -run general/parser/where.sim -run general/parser/join.sim -run general/parser/join_multivnode.sim -run general/parser/select_with_tags.sim -run general/parser/groupby.sim -run general/parser/top_groupby.sim -run general/parser/tags_dynamically_specifiy.sim -run general/parser/set_tag_vals.sim -#unsupport run general/parser/repeatAlter.sim -#unsupport run general/parser/slimit_alter_tags.sim -run general/parser/precision_ns.sim -run general/stable/disk.sim -run general/stable/dnode3.sim -run general/stable/metrics.sim -run general/stable/values.sim -run general/stable/vnode3.sim -run general/table/autocreate.sim -run general/table/basic1.sim -run general/table/basic2.sim -run general/table/basic3.sim -run general/table/bigint.sim -run general/table/binary.sim -run general/table/bool.sim -run general/table/column_name.sim -run general/table/column_num.sim -run general/table/column_value.sim -run general/table/column2.sim -run general/table/date.sim -run general/table/db.table.sim -run general/table/delete_reuse1.sim -run general/table/delete_reuse2.sim -run general/table/delete_writing.sim -run general/table/describe.sim -run general/table/double.sim -run general/table/fill.sim -run general/table/float.sim -run general/table/int.sim -run general/table/limit.sim -run general/table/smallint.sim -run general/table/table_len.sim -run general/table/table.sim -run general/table/tinyint.sim -run general/table/vgroup.sim -run general/tag/3.sim -run general/tag/4.sim -run general/tag/5.sim -run general/tag/6.sim -run general/tag/add.sim -run general/tag/bigint.sim -run general/tag/binary_binary.sim -run general/tag/binary.sim -run general/tag/bool_binary.sim -run general/tag/bool_int.sim -run general/tag/bool.sim -run general/tag/change.sim -run general/tag/column.sim -#unsupport run general/tag/commit.sim -run general/tag/create.sim -run general/tag/delete.sim -run general/tag/double.sim -run general/tag/filter.sim -run general/tag/float.sim -run general/tag/int_binary.sim -run general/tag/int_float.sim -run general/tag/int.sim -run general/tag/set.sim -run general/tag/smallint.sim -run general/tag/tinyint.sim -run general/user/authority.sim -run general/user/monitor.sim -run general/user/pass_alter.sim -run general/user/pass_len.sim -run general/user/user_create.sim -run general/user/user_len.sim -run general/vector/metrics_field.sim -run general/vector/metrics_mix.sim -run general/vector/metrics_query.sim -run general/vector/metrics_tag.sim -run general/vector/metrics_time.sim -run general/vector/multi.sim -run general/vector/single.sim -run general/vector/table_field.sim -run general/vector/table_mix.sim -run general/vector/table_query.sim -run general/vector/table_time.sim -run general/stream/restart_stream.sim -run general/stream/stream_3.sim -run general/stream/stream_restart.sim -run general/stream/table_del.sim -run general/stream/metrics_del.sim -run general/stream/table_replica1_vnoden.sim -run general/stream/metrics_replica1_vnoden.sim -run general/db/show_create_db.sim -run general/db/show_create_table.sim -run general/parser/like.sim -run general/parser/regex.sim diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt index 8dc7fb920e..64ea437648 100644 --- a/tests/script/jenkins/basic.txt +++ b/tests/script/jenkins/basic.txt @@ -55,7 +55,7 @@ # ---- tmq ./test.sh -f tsim/tmq/basic.sim -./test.sh -f tsim/tmq/basic1.sim +#./test.sh -f tsim/tmq/basic1.sim #./test.sh -f tsim/tmq/oneTopic.sim #./test.sh -f tsim/tmq/multiTopic.sim diff --git a/tests/script/regressionSuite.sim b/tests/script/regressionSuite.sim deleted file mode 100644 index bada2f6552..0000000000 --- a/tests/script/regressionSuite.sim +++ /dev/null @@ -1,221 +0,0 @@ -##unsupport run general/alter/cached_schema_after_alter.sim -run general/alter/count.sim -run general/alter/import.sim -##unsupport run general/alter/insert1.sim -run general/alter/insert2.sim -run general/alter/metrics.sim -run general/alter/table.sim -run general/cache/new_metrics.sim -run general/cache/restart_metrics.sim -run general/cache/restart_table.sim -run general/connection/connection.sim -run general/column/commit.sim -run general/column/metrics.sim -run general/column/table.sim -run general/compress/commitlog.sim -run general/compress/compress.sim -run general/compress/compress2.sim -run general/compress/uncompress.sim -run general/compute/avg.sim -run general/compute/bottom.sim -run general/compute/count.sim -run general/compute/diff.sim -run general/compute/diff2.sim -run general/compute/first.sim -run general/compute/interval.sim -run general/compute/last.sim -run general/compute/leastsquare.sim -run general/compute/max.sim -run general/compute/min.sim -run general/compute/null.sim -run general/compute/percentile.sim -run general/compute/stddev.sim -run general/compute/sum.sim -run general/compute/top.sim -run general/compute/block_dist.sim -run general/db/alter_option.sim -run general/db/alter_tables_d2.sim -run general/db/alter_tables_v1.sim -run general/db/alter_tables_v4.sim -run general/db/alter_vgroups.sim -run general/db/basic.sim -run general/db/basic1.sim -run general/db/basic2.sim -run general/db/basic3.sim -run general/db/basic4.sim -run general/db/basic5.sim -run general/db/delete_reuse1.sim -run general/db/delete_reuse2.sim -run general/db/delete_reusevnode.sim -run general/db/delete_reusevnode2.sim -run general/db/delete_writing1.sim -run general/db/delete_writing2.sim -run general/db/delete.sim -run general/db/len.sim -run general/db/repeat.sim -run general/db/tables.sim -run general/db/vnodes.sim -run general/field/2.sim -run general/field/3.sim -run general/field/4.sim -run general/field/5.sim -run general/field/6.sim -run general/field/bigint.sim -run general/field/binary.sim -run general/field/bool.sim -run general/field/single.sim -run general/field/smallint.sim -run general/field/tinyint.sim -run general/http/restful.sim -run general/http/restful_insert.sim -run general/http/restful_limit.sim -run general/http/restful_full.sim -run general/http/prepare.sim -run general/http/telegraf.sim -run general/http/grafana_bug.sim -run general/http/grafana.sim -run general/import/basic.sim -run general/import/commit.sim -run general/import/large.sim -run general/import/replica1.sim -run general/insert/basic.sim -run general/insert/insert_drop.sim -run general/insert/query_block1_memory.sim -run general/insert/query_block2_memory.sim -run general/insert/query_block1_file.sim -run general/insert/query_block2_file.sim -run general/insert/query_file_memory.sim -run general/insert/query_multi_file.sim -run general/insert/tcp.sim -run general/parser/alter.sim -run general/parser/alter1.sim -run general/parser/alter_stable.sim -run general/parser/auto_create_tb.sim -run general/parser/auto_create_tb_drop_tb.sim -run general/parser/col_arithmetic_operation.sim -run general/parser/columnValue.sim -run general/parser/commit.sim -run general/parser/create_db.sim -run general/parser/create_mt.sim -run general/parser/create_tb.sim -run general/parser/dbtbnameValidate.sim -run general/parser/import_commit1.sim -run general/parser/import_commit2.sim -run general/parser/import_commit3.sim -run general/parser/insert_tb.sim -run general/parser/first_last.sim -##unsupport run general/parser/import_file.sim -run general/parser/lastrow.sim -run general/parser/nchar.sim -run general/parser/null_char.sim -run general/parser/single_row_in_tb.sim -run general/parser/select_from_cache_disk.sim -run general/parser/limit.sim -run general/parser/limit1.sim -run general/parser/limit1_tblocks100.sim -run general/parser/mixed_blocks.sim -run general/parser/selectResNum.sim -run general/parser/select_across_vnodes.sim -run general/parser/slimit1.sim -run general/parser/tbnameIn.sim -run general/parser/binary_escapeCharacter.sim -run general/parser/projection_limit_offset.sim -run general/parser/limit2.sim -run general/parser/slimit.sim -run general/parser/fill.sim -run general/parser/fill_stb.sim -run general/parser/interp.sim -run general/parser/where.sim -run general/parser/join.sim -run general/parser/join_multivnode.sim -run general/parser/select_with_tags.sim -run general/parser/groupby.sim -run general/parser/bug.sim -run general/parser/tags_dynamically_specifiy.sim -run general/parser/set_tag_vals.sim -run general/parser/repeatAlter.sim -run general/parser/precision_ns.sim -##unsupport run general/parser/slimit_alter_tags.sim -run general/stable/disk.sim -run general/stable/dnode3.sim -run general/stable/metrics.sim -run general/stable/values.sim -run general/stable/vnode3.sim -run general/stable/refcount.sim -run general/stable/show.sim -run general/table/autocreate.sim -run general/table/basic1.sim -run general/table/basic2.sim -run general/table/basic3.sim -run general/table/bigint.sim -run general/table/binary.sim -run general/table/bool.sim -run general/table/column_name.sim -run general/table/column_num.sim -run general/table/column_value.sim -run general/table/column2.sim -run general/table/date.sim -run general/table/db.table.sim -run general/table/delete_reuse1.sim -run general/table/delete_reuse2.sim -run general/table/delete_writing.sim -run general/table/describe.sim -run general/table/double.sim -run general/table/fill.sim -run general/table/float.sim -run general/table/int.sim -run general/table/limit.sim -run general/table/smallint.sim -run general/table/table_len.sim -run general/table/table.sim -run general/table/tinyint.sim -run general/table/vgroup.sim -run general/tag/3.sim -run general/tag/4.sim -run general/tag/5.sim -run general/tag/6.sim -run general/tag/add.sim -run general/tag/bigint.sim -run general/tag/binary_binary.sim -run general/tag/binary.sim -run general/tag/bool_binary.sim -run general/tag/bool_int.sim -run general/tag/bool.sim -run general/tag/change.sim -run general/tag/column.sim -##unsupport run general/tag/commit.sim -run general/tag/create.sim -run general/tag/delete.sim -run general/tag/double.sim -run general/tag/filter.sim -run general/tag/float.sim -run general/tag/int_binary.sim -run general/tag/int_float.sim -run general/tag/int.sim -run general/tag/set.sim -run general/tag/smallint.sim -run general/tag/tinyint.sim -run general/user/authority.sim -run general/user/monitor.sim -run general/user/pass_alter.sim -run general/user/pass_len.sim -run general/user/user_create.sim -run general/user/user_len.sim -run general/vector/metrics_field.sim -run general/vector/metrics_mix.sim -run general/vector/metrics_query.sim -run general/vector/metrics_tag.sim -run general/vector/metrics_time.sim -run general/vector/multi.sim -run general/vector/single.sim -run general/vector/table_field.sim -run general/vector/table_mix.sim -run general/vector/table_query.sim -run general/vector/table_time.sim -run general/stream/restart_stream.sim -run general/stream/stream_3.sim -run general/stream/stream_restart.sim -run general/stream/table_del.sim -run general/stream/metrics_del.sim -run general/stream/table_replica1_vnoden.sim -run general/stream/metrics_replica1_vnoden.sim diff --git a/tests/script/tmp/data.sim b/tests/script/tmp/data.sim index 92fc9dccc9..4e714c01ee 100644 --- a/tests/script/tmp/data.sim +++ b/tests/script/tmp/data.sim @@ -1,9 +1,14 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 +system sh/cfg.sh -n dnode1 -c telemetryReporting -v 1 +system sh/cfg.sh -n dnode1 -c telemetryInterval -v 1 +system sh/cfg.sh -n dnode1 -c telemetryServer -v localhost +system sh/cfg.sh -n dnode1 -c telemetryPort -v 80 + +return system sh/exec.sh -n dnode1 -s start sql connect -return sql create database db sql create table db.tb (ts timestamp, i int) sql insert into db.tb values(now, 1) diff --git a/tests/script/tsim/db/alter_option.sim b/tests/script/tsim/db/alter_option.sim index 525de9c5c4..2b230c3c45 100644 --- a/tests/script/tsim/db/alter_option.sim +++ b/tests/script/tsim/db/alter_option.sim @@ -66,7 +66,7 @@ print ============= create database # | REPLICA value [1 | 3] # | WAL value [1 | 2] -sql create database db BLOCKS 7 CACHE 3 CACHELAST 3 COMP 0 DAYS 345600 FSYNC 1000 MAXROWS 8000 MINROWS 10 KEEP 1440000 PRECISION 'ns' QUORUM 1 REPLICA 3 TTL 7 WAL 2 VGROUPS 6 SINGLE_STABLE 1 STREAM_MODE 1 +sql create database db BLOCKS 7 CACHE 3 CACHELAST 3 COMP 0 DAYS 345600 FSYNC 1000 MAXROWS 8000 MINROWS 10 KEEP 1440000 PRECISION 'ns' REPLICA 3 TTL 7 WAL 2 VGROUPS 6 SINGLE_STABLE 1 STREAM_MODE 1 sql show databases print rows: $rows print $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09 @@ -89,7 +89,7 @@ endi if $data4_db != 3 then # replica return -1 endi -if $data5_db != 1 then # quorum +if $data5_db != nostrict then # strict return -1 endi if $data6_db != 345600 then # days @@ -156,25 +156,25 @@ sql_error alter database db replica 0 # return -1 #endi -print ============== modify quorum -sql alter database db quorum 2 -sql show databases -print quorum $data5_db -if $data5_db != 2 then - return -1 -endi -sql alter database db quorum 1 -sql show databases -print quorum $data5_db -if $data5_db != 1 then - return -1 -endi +#print ============== modify quorum +#sql alter database db quorum 2 +#sql show databases +#print quorum $data5_db +#if $data5_db != 2 then +# return -1 +#endi +#sql alter database db quorum 1 +#sql show databases +#print quorum $data5_db +#if $data5_db != 1 then +# return -1 +#endi -sql_error alter database db quorum -1 -sql_error alter database db quorum 0 -sql_error alter database db quorum 3 -sql_error alter database db quorum 4 -sql_error alter database db quorum 5 +#sql_error alter database db quorum -1 +#sql_error alter database db quorum 0 +#sql_error alter database db quorum 3 +#sql_error alter database db quorum 4 +#sql_error alter database db quorum 5 #print ============== modify days sql_error alter database db days 480 diff --git a/tests/script/tsim/db/create_all_options.sim b/tests/script/tsim/db/create_all_options.sim index 2baba8fb74..cd6a7ee28b 100644 --- a/tests/script/tsim/db/create_all_options.sim +++ b/tests/script/tsim/db/create_all_options.sim @@ -115,7 +115,7 @@ if $data4_db != 1 then # replica print expect 1, actual: $data4_db return -1 endi -if $data5_db != 1 then # quorum +if $data5_db != nostrict then # strict return -1 endi if $data6_db != 14400 then # days @@ -355,16 +355,16 @@ print ====> QUORUM value [1 | 2, default: 1] #endi #sql drop database db -sql create database db QUORUM 1 -sql show databases -print $data0_db $data1_db $data2_db $data3_db $data4_db $data5_db $data6_db $data7_db $data8_db $data9_db $data10_db $data11_db $data12_db $data13_db $data14_db $data15_db $data16_db $data17_db -if $data5_db != 1 then - return -1 -endi -sql drop database db -sql_error create database db QUORUM 3 -sql_error create database db QUORUM 0 -sql_error create database db QUORUM -1 +#sql create database db QUORUM 1 +#sql show databases +#print $data0_db $data1_db $data2_db $data3_db $data4_db $data5_db $data6_db $data7_db $data8_db $data9_db $data10_db $data11_db $data12_db $data13_db $data14_db $data15_db $data16_db $data17_db +#if $data5_db != 1 then +# return -1 +#endi +#sql drop database db +#sql_error create database db QUORUM 3 +#sql_error create database db QUORUM 0 +#sql_error create database db QUORUM -1 print ====> REPLICA value [1 | 3, default: 1] sql create database db REPLICA 3 diff --git a/tests/script/tsim/query/explain.sim b/tests/script/tsim/query/explain.sim index 638109d510..66d3c48f5d 100644 --- a/tests/script/tsim/query/explain.sim +++ b/tests/script/tsim/query/explain.sim @@ -45,7 +45,7 @@ sql explain select * from information_schema.user_stables; sql explain select count(*),sum(f1) from tb1; sql explain select count(*),sum(f1) from st1; sql explain select count(*),sum(f1) from st1 group by f1; -sql explain select count(f1) from tb1 interval(10s, 2s) sliding(3s) fill(prev); +#sql explain select count(f1) from tb1 interval(10s, 2s) sliding(3s) fill(prev); sql explain select min(f1) from st1 interval(1m, 2a) sliding(30s); print ======== step3 @@ -65,7 +65,7 @@ sql explain analyze select * from information_schema.user_stables; sql explain analyze select count(*),sum(f1) from tb1; sql explain analyze select count(*),sum(f1) from st1; sql explain analyze select count(*),sum(f1) from st1 group by f1; -sql explain analyze select count(f1) from tb1 interval(10s, 2s) sliding(3s) fill(prev); +#sql explain analyze select count(f1) from tb1 interval(10s, 2s) sliding(3s) fill(prev); sql explain analyze select min(f1) from st1 interval(3m, 2a) sliding(1m); print ======== step5 @@ -78,7 +78,7 @@ sql explain analyze verbose true select * from information_schema.user_stables; sql explain analyze verbose true select count(*),sum(f1) from tb1; sql explain analyze verbose true select count(*),sum(f1) from st1; sql explain analyze verbose true select count(*),sum(f1) from st1 group by f1; -sql explain analyze verbose true select count(f1) from tb1 interval(10s, 2s) sliding(3s) fill(prev); +#sql explain analyze verbose true select count(f1) from tb1 interval(10s, 2s) sliding(3s) fill(prev); sql explain analyze verbose true select ts from tb1 where f1 > 0; sql explain analyze verbose true select f1 from st1 where f1 > 0 and ts > '2020-10-31 00:00:00' and ts < '2021-10-31 00:00:00'; sql explain analyze verbose true select * from information_schema.user_stables where db_name='db2'; diff --git a/tests/script/tsim/sync/oneReplica1VgElect.sim b/tests/script/tsim/sync/oneReplica1VgElect.sim index 9726c0fdf5..8e99bc4b2e 100644 --- a/tests/script/tsim/sync/oneReplica1VgElect.sim +++ b/tests/script/tsim/sync/oneReplica1VgElect.sim @@ -203,7 +203,6 @@ if $data[0][4] == LEADER then $dnodeId = $data[0][3] elif $data[0][6] == LEADER then $dnodeId = $data[0][5] -endi elif $data[0][8] == LEADER then $dnodeId = $data[0][7] else diff --git a/tests/script/tsim/sync/oneReplica1VgElectWithInsert.sim b/tests/script/tsim/sync/oneReplica1VgElectWithInsert.sim index 972447ba9b..e85d5ea437 100644 --- a/tests/script/tsim/sync/oneReplica1VgElectWithInsert.sim +++ b/tests/script/tsim/sync/oneReplica1VgElectWithInsert.sim @@ -212,7 +212,6 @@ if $data[0][4] == LEADER then $dnodeId = $data[0][3] elif $data[0][6] == LEADER then $dnodeId = $data[0][5] -endi elif $data[0][8] == LEADER then $dnodeId = $data[0][7] else diff --git a/tests/script/tsim/sync/threeReplica1VgElect.sim b/tests/script/tsim/sync/threeReplica1VgElect.sim index f709c72dd7..e06bd86daa 100644 --- a/tests/script/tsim/sync/threeReplica1VgElect.sim +++ b/tests/script/tsim/sync/threeReplica1VgElect.sim @@ -203,7 +203,6 @@ if $data[0][4] == LEADER then $dnodeId = $data[0][3] elif $data[0][6] == LEADER then $dnodeId = $data[0][5] -endi elif $data[0][8] == LEADER then $dnodeId = $data[0][7] else diff --git a/tests/script/tsim/sync/threeReplica1VgElectWihtInsert.sim b/tests/script/tsim/sync/threeReplica1VgElectWihtInsert.sim index d934e82b98..797baea811 100644 --- a/tests/script/tsim/sync/threeReplica1VgElectWihtInsert.sim +++ b/tests/script/tsim/sync/threeReplica1VgElectWihtInsert.sim @@ -212,7 +212,6 @@ if $data[0][4] == LEADER then $dnodeId = $data[0][3] elif $data[0][6] == LEADER then $dnodeId = $data[0][5] -endi elif $data[0][8] == LEADER then $dnodeId = $data[0][7] else diff --git a/tests/script/tsim/testCaseSuite.sim b/tests/script/tsim/testCaseSuite.sim deleted file mode 100644 index c1b8c01767..0000000000 --- a/tests/script/tsim/testCaseSuite.sim +++ /dev/null @@ -1,31 +0,0 @@ - -run tsim/user/basic1.sim - -run tsim/db/alter_option.sim -run tsim/db/basic1.sim -run tsim/db/basic2.sim -run tsim/db/basic3.sim -run tsim/db/basic6.sim -run tsim/db/basic7.sim -run tsim/db/error1.sim - -run tsim/dnode/basic1.sim - -run tsim/insert/basic0.sim -run tsim/insert/basic1.sim -run tsim/insert/backquote.sim -run tsim/insert/null.sim - -#run tsim/parser/groupby-basic.sim -#run tsim/parser/fourArithmetic-basic.sim - -run tsim/query/interval.sim -run tsim/query/interval-offset.sim -#run tsim/query/scalarFunction.sim - -run tsim/show/basic.sim - -run tsim/table/basic1.sim - -run tsim/tmq/basic.sim -run tsim/tmq/basic1.sim diff --git a/tests/script/tsim/tmq/consume.sh b/tests/script/tsim/tmq/consume.sh new file mode 100755 index 0000000000..ac500e6704 --- /dev/null +++ b/tests/script/tsim/tmq/consume.sh @@ -0,0 +1,103 @@ +#!/bin/bash + +################################################## +# +# Do tmq test +# +################################################## + +set +e + +# set default value for parameters +EXEC_OPTON=start +DB_NAME=db +POLL_DELAY=5 +VALGRIND=0 +SIGNAL=SIGINT + +while getopts "d:s:v:y:x:" arg +do + case $arg in + d) + DB_NAME=$OPTARG + ;; + s) + EXEC_OPTON=$OPTARG + ;; + v) + VALGRIND=1 + ;; + y) + POLL_DELAY=$OPTARG + ;; + x) + SIGNAL=$OPTARG + ;; + ?) + echo "unkown argument" + ;; + esac +done + +SCRIPT_DIR=`pwd` + +IN_TDINTERNAL="community" +if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then + cd ../../.. +else + cd ../../ +fi + +TOP_DIR=`pwd` + +if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then + BIN_DIR=`find . -name "tmq_sim"|grep bin|head -n1|cut -d '/' -f 2,3` +else + BIN_DIR=`find . -name "tmq_sim"|grep bin|head -n1|cut -d '/' -f 2` +fi + +declare -x BUILD_DIR=$TOP_DIR/$BIN_DIR + +declare -x SIM_DIR=$TOP_DIR/sim + +PROGRAM=$BUILD_DIR/build/bin/tmq_sim + +PRG_DIR=$SIM_DIR/tsim +CFG_DIR=$PRG_DIR/cfg +LOG_DIR=$PRG_DIR/log + +echo "------------------------------------------------------------------------" +echo "BUILD_DIR: $BUILD_DIR" +echo "SIM_DIR : $SIM_DIR" +echo "CFG_DIR : $CFG_DIR" + + +echo "PROGRAM: $PROGRAM +echo "CFG_DIR: $CFG_DIR +echo "POLL_DELAY: $POLL_DELAY +echo "DB_NAME: $DB_NAME + +echo "------------------------------------------------------------------------" +if [ "$EXEC_OPTON" = "start" ]; then + if [ $VALGRIND -eq 1 ]; then + echo nohup valgrind --tool=memcheck --leak-check=full --show-reachable=no --track-origins=yes --show-leak-kinds=all -v --workaround-gcc296-bugs=yes --log-file=${LOG_DIR}/valgrind-tmq_sim.log $PROGRAM -c $CFG_DIR -d $DB_NAME -y $POLL_DELAY > /dev/null 2>&1 & + nohup valgrind --tool=memcheck --leak-check=full --show-reachable=no --track-origins=yes --show-leak-kinds=all -v --workaround-gcc296-bugs=yes --log-file=${LOG_DIR}/valgrind-tmq_sim.log $PROGRAM -c $CFG_DIR -d $DB_NAME -y $POLL_DELAY > /dev/null 2>&1 & + else + echo "nohup $PROGRAM -c $CFG_DIR -d $DB_NAME -y $POLL_DELAY > /dev/null 2>&1 &" + nohup $PROGRAM -c $CFG_DIR -y $POLL_DELAY -d $DB_NAME > /dev/null 2>&1 & + fi +else + PID=`ps -ef|grep tmq_sim | grep -v grep | awk '{print $2}'` + while [ -n "$PID" ] + do + if [ "$SIGNAL" = "SIGKILL" ]; then + echo try to kill by signal SIGKILL + kill -9 $PID + else + echo try to kill by signal SIGINT + kill -SIGINT $PID + fi + sleep 1 + PID=`ps -ef|grep tmq_sim | grep -v grep | awk '{print $2}'` + done +fi diff --git a/tests/test/c/tmqSim.c b/tests/test/c/tmqSim.c index eaca8f151e..5546e514cc 100644 --- a/tests/test/c/tmqSim.c +++ b/tests/test/c/tmqSim.c @@ -31,44 +31,46 @@ #define NC "\033[0m" #define min(a, b) (((a) < (b)) ? (a) : (b)) -#define MAX_SQL_STR_LEN (1024 * 1024) -#define MAX_ROW_STR_LEN (16 * 1024) +#define MAX_SQL_STR_LEN (1024 * 1024) +#define MAX_ROW_STR_LEN (16 * 1024) +#define MAX_CONSUMER_THREAD_CNT (16) typedef struct { - int32_t expectMsgCnt; - int32_t consumeMsgCnt; - TdThread thread; + TdThread thread; + int32_t consumerId; + + int32_t ifCheckData; + int64_t expectMsgCnt; + + int64_t consumeMsgCnt; + int32_t checkresult; + + char topicString[1024]; + char keyString[1024]; + + int32_t numOfTopic; + char topics[32][64]; + + int32_t numOfKey; + char key[32][64]; + char value[32][64]; + + tmq_t* tmq; + tmq_list_t* topicList; + } SThreadInfo; typedef struct { // input from argvs - char dbName[32]; - char topicString[256]; - char keyString[1024]; - char topicString1[256]; - char keyString1[1024]; - int32_t showMsgFlag; - int32_t consumeDelay; // unit s - int32_t consumeMsgCnt; - int32_t checkMode; - - // save result after parse agrvs - int32_t numOfTopic; - char topics[32][64]; - - int32_t numOfKey; - char key[32][64]; - char value[32][64]; - - int32_t numOfTopic1; - char topics1[32][64]; - - int32_t numOfKey1; - char key1[32][64]; - char value1[32][64]; + char dbName[32]; + int32_t showMsgFlag; + int32_t consumeDelay; // unit s + int32_t numOfThread; + SThreadInfo stThreads[MAX_CONSUMER_THREAD_CNT]; } SConfInfo; static SConfInfo g_stConfInfo; +TdFilePtr g_fp = NULL; // char* g_pRowValue = NULL; // TdFilePtr g_fp = NULL; @@ -81,30 +83,54 @@ static void printHelp() { printf("%s%s%s%s\n", indent, indent, "Configuration directory, default is ", configDir); printf("%s%s\n", indent, "-d"); printf("%s%s%s\n", indent, indent, "The name of the database for cosumer, no default "); - printf("%s%s\n", indent, "-t"); - printf("%s%s%s\n", indent, indent, "The topic string for cosumer, no default "); - printf("%s%s\n", indent, "-k"); - printf("%s%s%s\n", indent, indent, "The key-value string for cosumer, no default "); - printf("%s%s\n", indent, "-t1"); - printf("%s%s%s\n", indent, indent, "The topic1 string for cosumer, no default "); - printf("%s%s\n", indent, "-k1"); - printf("%s%s%s\n", indent, indent, "The key1-value1 string for cosumer, no default "); printf("%s%s\n", indent, "-g"); printf("%s%s%s%d\n", indent, indent, "showMsgFlag, default is ", g_stConfInfo.showMsgFlag); printf("%s%s\n", indent, "-y"); printf("%s%s%s%d\n", indent, indent, "consume delay, default is s", g_stConfInfo.consumeDelay); - printf("%s%s\n", indent, "-m"); - printf("%s%s%s%d\n", indent, indent, "consume msg count, default is s", g_stConfInfo.consumeMsgCnt); - printf("%s%s\n", indent, "-j"); - printf("%s%s%s%d\n", indent, indent, "check mode, default is s", g_stConfInfo.checkMode); exit(EXIT_SUCCESS); } +void initLogFile() { + // FILE *fp = fopen(g_stConfInfo.resultFileName, "a"); + TdFilePtr pFile = taosOpenFile("./tmqlog.txt", TD_FILE_CREATE | TD_FILE_WRITE | TD_FILE_APPEND | TD_FILE_STREAM); + if (NULL == pFile) { + fprintf(stderr, "Failed to open %s for save result\n", "./tmqlog.txt"); + exit -1; + }; + g_fp = pFile; + + time_t tTime = taosGetTimestampSec(); + struct tm tm = *taosLocalTime(&tTime, NULL); + + taosFprintfFile(pFile, "###################################################################\n"); + taosFprintfFile(pFile, "# configDir: %s\n", configDir); + taosFprintfFile(pFile, "# dbName: %s\n", g_stConfInfo.dbName); + taosFprintfFile(pFile, "# showMsgFlag: %d\n", g_stConfInfo.showMsgFlag); + taosFprintfFile(pFile, "# consumeDelay: %d\n", g_stConfInfo.consumeDelay); + + for (int32_t i = 0; i < g_stConfInfo.numOfThread; i++) { + taosFprintfFile(pFile, "# consumer %d info:\n", g_stConfInfo.stThreads[i].consumerId); + taosFprintfFile(pFile, " Topics: "); + for (int i = 0 ; i < g_stConfInfo.stThreads[i].numOfTopic; i++) { + taosFprintfFile(pFile, "%s, ", g_stConfInfo.stThreads[i].topics[i]); + } + taosFprintfFile(pFile, "\n"); + taosFprintfFile(pFile, " Key: "); + for (int i = 0 ; i < g_stConfInfo.stThreads[i].numOfKey; i++) { + taosFprintfFile(pFile, "%s:%s, ", g_stConfInfo.stThreads[i].key[i], g_stConfInfo.stThreads[i].value[i]); + } + taosFprintfFile(pFile, "\n"); + } + + taosFprintfFile(pFile, "# Test time: %d-%02d-%02d %02d:%02d:%02d\n", tm.tm_year + 1900, tm.tm_mon + 1, + tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec); + taosFprintfFile(pFile, "###################################################################\n"); +} + void parseArgument(int32_t argc, char* argv[]) { memset(&g_stConfInfo, 0, sizeof(SConfInfo)); g_stConfInfo.showMsgFlag = 0; - g_stConfInfo.consumeDelay = 8000; - g_stConfInfo.consumeMsgCnt = 0; + g_stConfInfo.consumeDelay = 5; for (int32_t i = 1; i < argc; i++) { if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0) { @@ -114,37 +140,20 @@ void parseArgument(int32_t argc, char* argv[]) { strcpy(g_stConfInfo.dbName, argv[++i]); } else if (strcmp(argv[i], "-c") == 0) { strcpy(configDir, argv[++i]); - } else if (strcmp(argv[i], "-t") == 0) { - strcpy(g_stConfInfo.topicString, argv[++i]); - } else if (strcmp(argv[i], "-k") == 0) { - strcpy(g_stConfInfo.keyString, argv[++i]); - } else if (strcmp(argv[i], "-t1") == 0) { - strcpy(g_stConfInfo.topicString1, argv[++i]); - } else if (strcmp(argv[i], "-k1") == 0) { - strcpy(g_stConfInfo.keyString1, argv[++i]); } else if (strcmp(argv[i], "-g") == 0) { g_stConfInfo.showMsgFlag = atol(argv[++i]); } else if (strcmp(argv[i], "-y") == 0) { g_stConfInfo.consumeDelay = atol(argv[++i]); - } else if (strcmp(argv[i], "-m") == 0) { - g_stConfInfo.consumeMsgCnt = atol(argv[++i]); - } else if (strcmp(argv[i], "-j") == 0) { - g_stConfInfo.checkMode = atol(argv[++i]); } else { printf("%s unknow para: %s %s", GREEN, argv[++i], NC); exit(-1); } } - if (0 == g_stConfInfo.consumeMsgCnt) { - g_stConfInfo.consumeMsgCnt = 0x7fffffff; - } - -#if 0 +#if 1 pPrint("%s configDir:%s %s", GREEN, configDir, NC); pPrint("%s dbName:%s %s", GREEN, g_stConfInfo.dbName, NC); - pPrint("%s topicString:%s %s", GREEN, g_stConfInfo.topicString, NC); - pPrint("%s keyString:%s %s", GREEN, g_stConfInfo.keyString, NC); + pPrint("%s consumeDelay:%d %s", GREEN, g_stConfInfo.consumeDelay, NC); pPrint("%s showMsgFlag:%d %s", GREEN, g_stConfInfo.showMsgFlag, NC); #endif } @@ -171,74 +180,26 @@ void ltrim(char* str) { // return str; } -void parseInputString() { - // printf("topicString: %s\n", g_stConfInfo.topicString); - // printf("keyString: %s\n\n", g_stConfInfo.keyString); +static int running = 1; +static void msg_process(TAOS_RES* msg, int32_t msgIndex, int32_t threadLable) { + char buf[1024]; - char* token; - const char delim[2] = ","; - const char ch = ':'; - - token = strtok(g_stConfInfo.topicString, delim); - while (token != NULL) { - // printf("%s\n", token ); - strcpy(g_stConfInfo.topics[g_stConfInfo.numOfTopic], token); - ltrim(g_stConfInfo.topics[g_stConfInfo.numOfTopic]); - // printf("%s\n", g_stConfInfo.topics[g_stConfInfo.numOfTopic]); - g_stConfInfo.numOfTopic++; - - token = strtok(NULL, delim); - } - - token = strtok(g_stConfInfo.topicString1, delim); - while (token != NULL) { - // printf("%s\n", token ); - strcpy(g_stConfInfo.topics1[g_stConfInfo.numOfTopic1], token); - ltrim(g_stConfInfo.topics1[g_stConfInfo.numOfTopic1]); - // printf("%s\n", g_stConfInfo.topics[g_stConfInfo.numOfTopic]); - g_stConfInfo.numOfTopic1++; - - token = strtok(NULL, delim); - } - - token = strtok(g_stConfInfo.keyString, delim); - while (token != NULL) { - // printf("%s\n", token ); - { - char* pstr = token; - ltrim(pstr); - char* ret = strchr(pstr, ch); - memcpy(g_stConfInfo.key[g_stConfInfo.numOfKey], pstr, ret - pstr); - strcpy(g_stConfInfo.value[g_stConfInfo.numOfKey], ret + 1); - // printf("key: %s, value: %s\n", g_stConfInfo.key[g_stConfInfo.numOfKey], - // g_stConfInfo.value[g_stConfInfo.numOfKey]); - g_stConfInfo.numOfKey++; - } - - token = strtok(NULL, delim); - } - - token = strtok(g_stConfInfo.keyString1, delim); - while (token != NULL) { - // printf("%s\n", token ); - { - char* pstr = token; - ltrim(pstr); - char* ret = strchr(pstr, ch); - memcpy(g_stConfInfo.key1[g_stConfInfo.numOfKey1], pstr, ret - pstr); - strcpy(g_stConfInfo.value1[g_stConfInfo.numOfKey1], ret + 1); - // printf("key: %s, value: %s\n", g_stConfInfo.key[g_stConfInfo.numOfKey], - // g_stConfInfo.value[g_stConfInfo.numOfKey]); - g_stConfInfo.numOfKey1++; - } - - token = strtok(NULL, delim); + //printf("topic: %s\n", tmq_get_topic_name(msg)); + //printf("vg:%d\n", tmq_get_vgroup_id(msg)); + taosFprintfFile(g_fp, "msg index:%d, threadLable: %d\n", msgIndex, threadLable); + taosFprintfFile(g_fp, "topic: %s, vgroupId: %d\n", tmq_get_topic_name(msg), tmq_get_vgroup_id(msg)); + + while (1) { + TAOS_ROW row = taos_fetch_row(msg); + if (row == NULL) break; + TAOS_FIELD* fields = taos_fetch_fields(msg); + int32_t numOfFields = taos_field_count(msg); + //taos_print_row(buf, row, fields, numOfFields); + //printf("%s\n", buf); + //taosFprintfFile(g_fp, "%s\n", buf); } } -static int running = 1; -/*static void msg_process(tmq_message_t* message) { tmqShowMsg(message); }*/ - int queryDB(TAOS* taos, char* command) { TAOS_RES* pRes = taos_query(taos, command); int code = taos_errno(pRes); @@ -252,8 +213,7 @@ int queryDB(TAOS* taos, char* command) { return 0; } -tmq_t* build_consumer() { -#if 0 +void build_consumer(SThreadInfo *pInfo) { char sqlStr[1024] = {0}; TAOS* pConn = taos_connect(NULL, "root", "taosdata", NULL, 0); @@ -267,273 +227,229 @@ tmq_t* build_consumer() { exit(-1); } taos_free_result(pRes); -#endif tmq_conf_t* conf = tmq_conf_new(); // tmq_conf_set(conf, "group.id", "tg2"); - for (int32_t i = 0; i < g_stConfInfo.numOfKey; i++) { - tmq_conf_set(conf, g_stConfInfo.key[i], g_stConfInfo.value[i]); + for (int32_t i = 0; i < pInfo->numOfKey; i++) { + tmq_conf_set(conf, pInfo->key[i], pInfo->value[i]); } - tmq_conf_set(conf, "td.connect.user", "root"); - tmq_conf_set(conf, "td.connect.pass", "taosdata"); - tmq_conf_set(conf, "td.connect.db", g_stConfInfo.dbName); - tmq_t* tmq = tmq_consumer_new1(conf, NULL, 0); - assert(tmq); - tmq_conf_destroy(conf); - return tmq; + pInfo->tmq = tmq_consumer_new(pConn, conf, NULL, 0); + return; } -tmq_list_t* build_topic_list() { - tmq_list_t* topic_list = tmq_list_new(); +void build_topic_list(SThreadInfo *pInfo) { + pInfo->topicList = tmq_list_new(); // tmq_list_append(topic_list, "test_stb_topic_1"); - for (int32_t i = 0; i < g_stConfInfo.numOfTopic; i++) { - tmq_list_append(topic_list, g_stConfInfo.topics[i]); + for (int32_t i = 0; i < pInfo->numOfTopic; i++) { + tmq_list_append(pInfo->topicList, pInfo->topics[i]); } - return topic_list; + return; } -tmq_t* build_consumer_x() { -#if 0 +int32_t saveConsumeResult(SThreadInfo *pInfo) { char sqlStr[1024] = {0}; - + TAOS* pConn = taos_connect(NULL, "root", "taosdata", NULL, 0); assert(pConn != NULL); - - sprintf(sqlStr, "use %s", g_stConfInfo.dbName); + + // schema: ts timestamp, consumerid int, consummsgcnt bigint, checkresult int + sprintf(sqlStr, "insert into %s.consumeresult values (now, %d, %" PRId64 ", %d)", + g_stConfInfo.dbName, + pInfo->consumerId, + pInfo->consumeMsgCnt, + pInfo->checkresult); + TAOS_RES* pRes = taos_query(pConn, sqlStr); if (taos_errno(pRes) != 0) { - printf("error in use db, reason:%s\n", taos_errstr(pRes)); + printf("error in save consumeinfo, reason:%s\n", taos_errstr(pRes)); taos_free_result(pRes); exit(-1); } + taos_free_result(pRes); -#endif - tmq_conf_t* conf = tmq_conf_new(); - // tmq_conf_set(conf, "group.id", "tg2"); - for (int32_t i = 0; i < g_stConfInfo.numOfKey1; i++) { - tmq_conf_set(conf, g_stConfInfo.key1[i], g_stConfInfo.value1[i]); - } - tmq_conf_set(conf, "td.connect.user", "root"); - tmq_conf_set(conf, "td.connect.pass", "taosdata"); - tmq_conf_set(conf, "td.connect.db", g_stConfInfo.dbName); - tmq_t* tmq = tmq_consumer_new1(conf, NULL, 0); - assert(tmq); - tmq_conf_destroy(conf); - return tmq; + return 0; } -tmq_list_t* build_topic_list_x() { - tmq_list_t* topic_list = tmq_list_new(); - // tmq_list_append(topic_list, "test_stb_topic_1"); - for (int32_t i = 0; i < g_stConfInfo.numOfTopic1; i++) { - tmq_list_append(topic_list, g_stConfInfo.topics1[i]); - } - return topic_list; -} - -void loop_consume(tmq_t* tmq) { +void loop_consume(SThreadInfo *pInfo) { tmq_resp_err_t err; + + int64_t totalMsgs = 0; + //int64_t totalRows = 0; - int32_t totalMsgs = 0; - int32_t totalRows = 0; - int32_t skipLogNum = 0; while (running) { - TAOS_RES* tmqMsg = tmq_consumer_poll(tmq, 8000); - if (tmqMsg) { - totalMsgs++; - -#if 0 - TAOS_ROW row; - while (NULL != (row = tmq_get_row(tmqMsg))) { - totalRows++; - } -#endif - - /*skipLogNum += tmqGetSkipLogNum(tmqMsg);*/ + TAOS_RES* tmqMsg = tmq_consumer_poll(pInfo->tmq, g_stConfInfo.consumeDelay * 1000); + if (tmqMsg) { if (0 != g_stConfInfo.showMsgFlag) { - /*msg_process(tmqMsg);*/ + msg_process(tmqMsg, totalMsgs, 0); } + tmq_message_destroy(tmqMsg); - } else { - break; - } - } - - err = tmq_consumer_close(tmq); - if (err) { - printf("tmq_consumer_close() fail, reason: %s\n", tmq_err2str(err)); - exit(-1); - } - - printf("{consume success: %d, %d}", totalMsgs, totalRows); -} - -int32_t parallel_consume(tmq_t* tmq, int threadLable) { - tmq_resp_err_t err; - - int32_t totalMsgs = 0; - int32_t totalRows = 0; - int32_t skipLogNum = 0; - while (running) { - TAOS_RES* tmqMsg = tmq_consumer_poll(tmq, g_stConfInfo.consumeDelay * 1000); - if (tmqMsg) { + totalMsgs++; - - // printf("threadFlag: %d, totalMsgs: %d\n", threadLable, totalMsgs); - -#if 0 - TAOS_ROW row; - while (NULL != (row = tmq_get_row(tmqMsg))) { - totalRows++; - } -#endif - - /*skipLogNum += tmqGetSkipLogNum(tmqMsg);*/ - if (0 != g_stConfInfo.showMsgFlag) { - /*msg_process(tmqMsg);*/ - } - tmq_message_destroy(tmqMsg); - - if (totalMsgs >= g_stConfInfo.consumeMsgCnt) { + + if (totalMsgs >= pInfo->expectMsgCnt) { break; } } else { break; } } - - err = tmq_consumer_close(tmq); + + err = tmq_consumer_close(pInfo->tmq); if (err) { printf("tmq_consumer_close() fail, reason: %s\n", tmq_err2str(err)); exit(-1); } - // printf("%d", totalMsgs); // output to sim for check result - return totalMsgs; + pInfo->consumeMsgCnt = totalMsgs; + } -void* threadFunc(void* param) { +void *consumeThreadFunc(void *param) { int32_t totalMsgs = 0; - SThreadInfo* pInfo = (SThreadInfo*)param; + SThreadInfo *pInfo = (SThreadInfo *)param; - tmq_t* tmq = build_consumer_x(); - tmq_list_t* topic_list = build_topic_list_x(); - if ((NULL == tmq) || (NULL == topic_list)) { + build_consumer(pInfo); + build_topic_list(pInfo); + if ((NULL == pInfo->tmq) || (NULL == pInfo->topicList)){ return NULL; } - - tmq_resp_err_t err = tmq_subscribe(tmq, topic_list); + + tmq_resp_err_t err = tmq_subscribe(pInfo->tmq, pInfo->topicList); if (err) { printf("tmq_subscribe() fail, reason: %s\n", tmq_err2str(err)); exit(-1); } + + loop_consume(pInfo); - // if (0 == g_stConfInfo.consumeMsgCnt) { - // loop_consume(tmq); - // } else { - pInfo->consumeMsgCnt = parallel_consume(tmq, 1); - //} - - err = tmq_unsubscribe(tmq); + err = tmq_unsubscribe(pInfo->tmq); if (err) { printf("tmq_unsubscribe() fail, reason: %s\n", tmq_err2str(err)); - pInfo->consumeMsgCnt = -1; + pInfo->consumeMsgCnt = -1; return NULL; - } + } + + // save consume result into consumeresult table + saveConsumeResult(pInfo); return NULL; } -int main(int32_t argc, char* argv[]) { - parseArgument(argc, argv); - parseInputString(); +void parseConsumeInfo() { + char* token; + const char delim[2] = ","; + const char ch = ':'; - int32_t numOfThreads = 1; - TdThreadAttr thattr; - taosThreadAttrInit(&thattr); - taosThreadAttrSetDetachState(&thattr, PTHREAD_CREATE_JOINABLE); - SThreadInfo* pInfo = (SThreadInfo*)taosMemoryCalloc(numOfThreads, sizeof(SThreadInfo)); - - if (g_stConfInfo.numOfTopic1) { - // pthread_create one thread to consume - for (int32_t i = 0; i < numOfThreads; ++i) { - pInfo[i].expectMsgCnt = 0; - pInfo[i].consumeMsgCnt = 0; - taosThreadCreate(&(pInfo[i].thread), &thattr, threadFunc, (void*)(pInfo + i)); + for (int32_t i = 0; i < g_stConfInfo.numOfThread; i++) { + token = strtok(g_stConfInfo.stThreads[i].topicString, delim); + while (token != NULL) { + // printf("%s\n", token ); + strcpy(g_stConfInfo.stThreads[i].topics[g_stConfInfo.stThreads[i].numOfTopic], token); + ltrim(g_stConfInfo.stThreads[i].topics[g_stConfInfo.stThreads[i].numOfTopic]); + // printf("%s\n", g_stConfInfo.topics[g_stConfInfo.numOfTopic]); + g_stConfInfo.stThreads[i].numOfTopic++; + + token = strtok(NULL, delim); + } + + token = strtok(g_stConfInfo.stThreads[i].keyString, delim); + while (token != NULL) { + // printf("%s\n", token ); + { + char* pstr = token; + ltrim(pstr); + char* ret = strchr(pstr, ch); + memcpy(g_stConfInfo.stThreads[i].key[g_stConfInfo.stThreads[i].numOfKey], pstr, ret - pstr); + strcpy(g_stConfInfo.stThreads[i].value[g_stConfInfo.stThreads[i].numOfKey], ret + 1); + // printf("key: %s, value: %s\n", g_stConfInfo.key[g_stConfInfo.numOfKey], + // g_stConfInfo.value[g_stConfInfo.numOfKey]); + g_stConfInfo.stThreads[i].numOfKey++; + } + + token = strtok(NULL, delim); } } +} - int32_t totalMsgs = 0; - tmq_t* tmq = build_consumer(); - tmq_list_t* topic_list = build_topic_list(); - if ((NULL == tmq) || (NULL == topic_list)) { - return -1; - } - - tmq_resp_err_t err = tmq_subscribe(tmq, topic_list); - if (err) { - printf("tmq_subscribe() fail, reason: %s\n", tmq_err2str(err)); +int32_t getConsumeInfo() { + char sqlStr[1024] = {0}; + + TAOS* pConn = taos_connect(NULL, "root", "taosdata", NULL, 0); + assert(pConn != NULL); + + sprintf(sqlStr, "select * from %s.consumeinfo", g_stConfInfo.dbName); + TAOS_RES* pRes = taos_query(pConn, sqlStr); + if (taos_errno(pRes) != 0) { + printf("error in get consumeinfo, reason:%s\n", taos_errstr(pRes)); + taos_free_result(pRes); exit(-1); - } - - if (0 == g_stConfInfo.numOfTopic1) { - loop_consume(tmq); - } else { - totalMsgs = parallel_consume(tmq, 0); - } - - err = tmq_unsubscribe(tmq); - if (err) { - printf("tmq_unsubscribe() fail, reason: %s\n", tmq_err2str(err)); - exit(-1); - } - - if (g_stConfInfo.numOfTopic1) { - for (int32_t i = 0; i < numOfThreads; i++) { - taosThreadJoin(pInfo[i].thread, NULL); - } - - // printf("consumer: %d, cosumer1: %d\n", totalMsgs, pInfo->consumeMsgCnt); - if (0 == g_stConfInfo.checkMode) { - if ((totalMsgs + pInfo->consumeMsgCnt) == g_stConfInfo.consumeMsgCnt) { - printf("success"); - } else { - printf("fail, consumer msg cnt: %d, %d", totalMsgs, pInfo->consumeMsgCnt); - } - } else if (1 == g_stConfInfo.checkMode) { - if ((totalMsgs == g_stConfInfo.consumeMsgCnt) && (pInfo->consumeMsgCnt == g_stConfInfo.consumeMsgCnt)) { - printf("success"); - } else { - printf("fail, consumer msg cnt: %d, %d", totalMsgs, pInfo->consumeMsgCnt); - } - } else if (2 == g_stConfInfo.checkMode) { - if ((totalMsgs + pInfo->consumeMsgCnt) == 3 * g_stConfInfo.consumeMsgCnt) { - printf("success"); - } else { - printf("fail, consumer msg cnt: %d, %d", totalMsgs, pInfo->consumeMsgCnt); - } - } else if (3 == g_stConfInfo.checkMode) { - if ((totalMsgs == 2 * g_stConfInfo.consumeMsgCnt) && (pInfo->consumeMsgCnt == 2 * g_stConfInfo.consumeMsgCnt)) { - printf("success"); - } else { - printf("fail, consumer msg cnt: %d, %d", totalMsgs, pInfo->consumeMsgCnt); - } - } else if (4 == g_stConfInfo.checkMode) { - if (((totalMsgs == 0) && (pInfo->consumeMsgCnt == 3 * g_stConfInfo.consumeMsgCnt)) || - ((pInfo->consumeMsgCnt == 0) && (totalMsgs == 3 * g_stConfInfo.consumeMsgCnt)) || - ((pInfo->consumeMsgCnt == g_stConfInfo.consumeMsgCnt) && (totalMsgs == 2 * g_stConfInfo.consumeMsgCnt)) || - ((pInfo->consumeMsgCnt == 2 * g_stConfInfo.consumeMsgCnt) && (totalMsgs == g_stConfInfo.consumeMsgCnt))) { - printf("success"); - } else { - printf("fail, consumer msg cnt: %d, %d", totalMsgs, pInfo->consumeMsgCnt); - } - } else { - printf("fail, check mode unknow. consumer msg cnt: %d, %d", totalMsgs, pInfo->consumeMsgCnt); + } + + TAOS_ROW row = NULL; + int num_fields = taos_num_fields(pRes); + TAOS_FIELD* fields = taos_fetch_fields(pRes); + + // schema: ts timestamp, consumerid int, topiclist binary(1024), keylist binary(1024), expectmsgcnt bigint, ifcheckdata int + + int32_t numOfThread = 0; + while ((row = taos_fetch_row(pRes))) { + int32_t* lengths = taos_fetch_lengths(pRes); + + for (int i = 0; i < num_fields; ++i) { + if (row[i] == NULL || 0 == i) { + continue; + } + + if ((1 == i) && (fields[i].type == TSDB_DATA_TYPE_INT)) { + g_stConfInfo.stThreads[numOfThread].consumerId = *((int32_t *)row[i]); + } else if ((2 == i) && (fields[i].type == TSDB_DATA_TYPE_BINARY)) { + memcpy(g_stConfInfo.stThreads[numOfThread].topicString, row[i], lengths[i]); + } else if ((3 == i) && (fields[i].type == TSDB_DATA_TYPE_BINARY)) { + memcpy(g_stConfInfo.stThreads[numOfThread].keyString, row[i], lengths[i]); + } else if ((4 == i) && (fields[i].type == TSDB_DATA_TYPE_BIGINT)) { + g_stConfInfo.stThreads[numOfThread].expectMsgCnt = *((int64_t *)row[i]); + } else if ((5 == i) && (fields[i].type == TSDB_DATA_TYPE_INT)) { + g_stConfInfo.stThreads[numOfThread].ifCheckData = *((int32_t *)row[i]); + } } + numOfThread ++; } + g_stConfInfo.numOfThread = numOfThread; + + taos_free_result(pRes); + + parseConsumeInfo(); return 0; } + +int main(int32_t argc, char* argv[]) { + parseArgument(argc, argv); + getConsumeInfo(); + initLogFile(); + + TdThreadAttr thattr; + taosThreadAttrInit(&thattr); + taosThreadAttrSetDetachState(&thattr, PTHREAD_CREATE_JOINABLE); + + // pthread_create one thread to consume + for (int32_t i = 0; i < g_stConfInfo.numOfThread; ++i) { + taosThreadCreate(&(g_stConfInfo.stThreads[i].thread), &thattr, consumeThreadFunc, (void *)(&(g_stConfInfo.stThreads[i]))); + } + + for (int32_t i = 0; i < g_stConfInfo.numOfThread; i++) { + taosThreadJoin(g_stConfInfo.stThreads[i].thread, NULL); + } + + //printf("consumer: %d, cosumer1: %d\n", totalMsgs, pInfo->consumeMsgCnt); + + taosFprintfFile(g_fp, "\n"); + taosCloseFile(&g_fp); + + return 0; +} + diff --git a/tools/shell/inc/shell.h b/tools/shell/inc/shell.h index 7a16ee9d2c..866cd63bdb 100644 --- a/tools/shell/inc/shell.h +++ b/tools/shell/inc/shell.h @@ -50,6 +50,8 @@ typedef struct SShellArguments { char dir[TSDB_FILENAME_LEN]; int threadNum; int check; + bool status; + bool verbose; char* commands; int abort; int port; @@ -72,7 +74,6 @@ void read_history(); void write_history(); void source_file(TAOS* con, char* fptr); void source_dir(TAOS* con, SShellArguments* args); -void shellCheck(TAOS* con, SShellArguments* args); void get_history_path(char* history); void shellCheck(TAOS* con, SShellArguments* args); void cleanup_handler(void* arg); diff --git a/tools/shell/src/shellMain.c b/tools/shell/src/shellMain.c index 0d397eb80b..1ee42358f6 100644 --- a/tools/shell/src/shellMain.c +++ b/tools/shell/src/shellMain.c @@ -35,6 +35,7 @@ static char args_doc[] = ""; TdThread pid; static tsem_t cancelSem; +extern void taos_init(); static struct argp_option options[] = { {"host", 'h', "HOST", 0, "TDengine server FQDN to connect. The default host is localhost."}, @@ -52,6 +53,8 @@ static struct argp_option options[] = { {"check", 'k', "CHECK", 0, "Check tables."}, {"database", 'd', "DATABASE", 0, "Database to use when connecting to the server."}, {"timezone", 'z', "TIMEZONE", 0, "Time zone of the shell, default is local."}, + {"status", 't', NULL, 0, "Check the service status."}, + {"verbose", 'v', NULL, 0, "Check the details of the service status."}, {"netrole", 'n', "NETROLE", 0, "Net role when network connectivity test, default is startup, options: client|server|rpc|startup|sync|speed|fqdn."}, {"pktlen", 'l', "PKTLEN", 0, "Packet length used for net test, default is 1000 bytes."}, {"pktnum", 'N', "PKTNUM", 0, "Packet numbers used for net test, default is 100."}, @@ -138,6 +141,12 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) { case 'k': arguments->check = atoi(arg); break; + case 't': + arguments->status = true; + break; + case 'v': + arguments->verbose = true; + break; case 'd': arguments->database = arg; break; @@ -522,10 +531,10 @@ void showOnScreen(Command *cmd) { void cleanup_handler(void *arg) { resetTerminalMode(); } void exitShell() { - /*int32_t ret =*/resetTerminalMode(); taos_cleanup(); exit(EXIT_SUCCESS); } + void shellQueryInterruptHandler(int32_t signum, void *sigInfo, void *context) { tsem_post(&cancelSem); } void *cancelHandler(void *arg) { @@ -537,21 +546,9 @@ void *cancelHandler(void *arg) { continue; } -#ifdef LINUX -#if 0 - int64_t rid = atomic_val_compare_exchange_64(&result, result, 0); - SSqlObj* pSql = taosAcquireRef(tscObjRef, rid); - taos_stop_query(pSql); - taosReleaseRef(tscObjRef, rid); -#endif -#else resetTerminalMode(); printf("\nReceive ctrl+c or other signal, quit shell.\n"); - exit(0); -#endif - resetTerminalMode(); - printf("\nReceive ctrl+c or other signal, quit shell.\n"); - exit(0); + exitShell(); } return NULL; @@ -578,93 +575,120 @@ int checkVersion() { } // Global configurations -SShellArguments args = {.host = NULL, +SShellArguments args = { + .host = NULL, + .user = NULL, + .database = NULL, + .timezone = NULL, + .is_raw_time = false, + .is_use_passwd = false, + .dump_config = false, + .file = "\0", + .dir = "\0", + .threadNum = 5, + .commands = NULL, + .pktLen = 1000, + .pktNum = 100, + .pktType = "TCP", + .netTestRole = NULL, #ifndef TD_WINDOWS - .password = NULL, + .password = NULL, #endif - .user = NULL, - .database = NULL, - .timezone = NULL, - .is_raw_time = false, - .is_use_passwd = false, - .dump_config = false, - .file = "\0", - .dir = "\0", - .threadNum = 5, - .commands = NULL, - .pktLen = 1000, - .pktNum = 100, - .pktType = "TCP", - .netTestRole = NULL}; +}; -/* - * Main function. - */ -int main(int argc, char *argv[]) { - /*setlocale(LC_ALL, "en_US.UTF-8"); */ +void shellDumpConfig() { + if (!args.dump_config) return; - if (!checkVersion()) { + SConfig *pCfg = taosGetCfg(); + if (NULL == pCfg) { + printf("TDengine read global config failed!\n"); exit(EXIT_FAILURE); } + cfgDumpCfg(pCfg, 0, 1); + exitShell(); +} - shellParseArgument(argc, argv, &args); - - if (args.dump_config) { - taosInitCfg(configDir, NULL, NULL, NULL, 1); - - SConfig *pCfg = taosGetCfg(); - if (NULL == pCfg) { - printf("TDengine read global config failed!\n"); - exit(EXIT_FAILURE); - } - cfgDumpCfg(pCfg, 0, 1); - exit(0); - } - +void shellTestNetWork() { if (args.netTestRole && args.netTestRole[0] != 0) { - TAOS *con = NULL; - if (args.auth == NULL) { - con = taos_connect(args.host, args.user, args.password, args.database, args.port); - } else { - con = taos_connect_auth(args.host, args.user, args.auth, args.database, args.port); - } - - // if (taos_init()) { - // printf("Failed to init taos"); - // exit(EXIT_FAILURE); - // } - taosNetTest(args.netTestRole, args.host, args.port, args.pktLen, args.pktNum, args.pktType); - taos_close(con); - exit(0); + exitShell(); } +} - /* Initialize the shell */ +void shellCheckServerStatus() { + if (!args.status && !args.verbose) return; + + TSDB_SERVER_STATUS code; + do { + char details[1024] = {0}; + code = taos_check_server_status(args.host, args.port, details, args.verbose ? 1024 : 0); + switch (code) { + case TSDB_SRV_STATUS_UNAVAILABLE: + printf("0: unavailable\n"); + break; + case TSDB_SRV_STATUS_NETWORK_OK: + printf("1: network ok\n"); + break; + case TSDB_SRV_STATUS_SERVICE_OK: + printf("2: service ok\n"); + break; + case TSDB_SRV_STATUS_SERVICE_DEGRADED: + printf("3: service degraded\n"); + break; + case TSDB_SRV_STATUS_EXTING: + printf("4: exiting\n"); + break; + } + if (strlen(details) != 0) { + printf("%s\n\n", details); + } + if (code == TSDB_SRV_STATUS_NETWORK_OK && args.verbose) { + taosMsleep(1000); + } else { + break; + } + } while (1); + + exitShell(); +} + +void shellExecute() { TAOS *con = shellInit(&args); if (con == NULL) { - exit(EXIT_FAILURE); + exitShell(); } if (tsem_init(&cancelSem, 0, 0) != 0) { printf("failed to create cancel semphore\n"); - exit(EXIT_FAILURE); + exitShell(); } TdThread spid; taosThreadCreate(&spid, NULL, cancelHandler, NULL); - /* Interrupt handler. */ taosSetSignal(SIGTERM, shellQueryInterruptHandler); taosSetSignal(SIGINT, shellQueryInterruptHandler); taosSetSignal(SIGHUP, shellQueryInterruptHandler); taosSetSignal(SIGABRT, shellQueryInterruptHandler); - /* Get grant information */ shellGetGrantInfo(con); - /* Loop to query the input. */ while (1) { taosThreadCreate(&pid, NULL, shellLoopQuery, con); taosThreadJoin(pid, NULL); } } + +int main(int argc, char *argv[]) { + if (!checkVersion()) exitShell(); + + shellParseArgument(argc, argv, &args); + + taos_init(); + shellDumpConfig(); + shellCheckServerStatus(); + shellTestNetWork(); + shellExecute(); + + return 0; +} diff --git a/tools/shell/src/tnettest.c b/tools/shell/src/tnettest.c index 9be3412256..04b99ebc75 100644 --- a/tools/shell/src/tnettest.c +++ b/tools/shell/src/tnettest.c @@ -356,187 +356,6 @@ static void taosNetCheckPort(uint32_t hostIp, int32_t startPort, int32_t endPort } } -void *taosNetInitRpc(char *secretEncrypt, char spi) { - SRpcInit rpcInit; - void * pRpcConn = NULL; - - char user[] = "nettestinternal"; - char pass[] = "nettestinternal"; - taosEncryptPass_c((uint8_t *)pass, strlen(pass), secretEncrypt); - - memset(&rpcInit, 0, sizeof(rpcInit)); - rpcInit.localPort = 0; - rpcInit.label = "NT"; - rpcInit.numOfThreads = 1; // every DB connection has only one thread - rpcInit.cfp = NULL; - rpcInit.sessions = 16; - rpcInit.connType = TAOS_CONN_CLIENT; - rpcInit.user = user; - rpcInit.idleTime = 2000; - rpcInit.ckey = "key"; - rpcInit.spi = spi; - rpcInit.secret = secretEncrypt; - - pRpcConn = rpcOpen(&rpcInit); - return pRpcConn; -} - -static int32_t taosNetCheckRpc(const char* serverFqdn, uint16_t port, uint16_t pktLen, char spi, SStartupReq *pStep) { - SEpSet epSet; - SRpcMsg reqMsg; - SRpcMsg rspMsg; - void * pRpcConn; - - char secretEncrypt[TSDB_PASSWORD_LEN + 1] = {0}; - - pRpcConn = taosNetInitRpc(secretEncrypt, spi); - if (NULL == pRpcConn) { - uError("failed to init client rpc"); - return TSDB_CODE_RPC_NETWORK_UNAVAIL; - } - - memset(&epSet, 0, sizeof(SEpSet)); - strcpy(epSet.eps[0].fqdn, serverFqdn); - epSet.eps[0].port = port; - epSet.numOfEps = 1; - - reqMsg.msgType = TDMT_DND_NETWORK_TEST; - reqMsg.pCont = rpcMallocCont(pktLen); - reqMsg.contLen = pktLen; - reqMsg.code = 0; - reqMsg.handle = NULL; // rpc handle returned to app - reqMsg.ahandle = NULL; // app handle set by client - strcpy(reqMsg.pCont, "dnode-nettest"); - - rpcSendRecv(pRpcConn, &epSet, &reqMsg, &rspMsg); - - if ((rspMsg.code != 0) || (rspMsg.msgType != TDMT_DND_NETWORK_TEST + 1)) { - uDebug("ret code 0x%x %s", rspMsg.code, tstrerror(rspMsg.code)); - return rspMsg.code; - } - - int32_t code = 0; - if (pStep != NULL && rspMsg.pCont != NULL && rspMsg.contLen > 0 && rspMsg.contLen <= sizeof(SStartupReq)) { - memcpy(pStep, rspMsg.pCont, rspMsg.contLen); - code = 1; - } - - rpcFreeCont(rspMsg.pCont); - rpcClose(pRpcConn); - return code; -} - -static int32_t taosNetParseStartup(SStartupReq *pCont) { - SStartupReq *pStep = pCont; - uInfo("step:%s desc:%s", pStep->name, pStep->desc); - - if (pStep->finished) { - uInfo("check startup finished"); - } - - return pStep->finished ? 0 : 1; -} - -static void taosNetTestStartup(char *host, int32_t port) { - uInfo("check startup, host:%s port:%d\n", host, port); - - SStartupReq *pStep = taosMemoryMalloc(sizeof(SStartupReq)); - while (1) { - int32_t code = taosNetCheckRpc(host, port, 20, 0, pStep); - if (code > 0) { - code = taosNetParseStartup(pStep); - } - - if (code > 0) { - uDebug("continue check startup step"); - } else { - if (code < 0) { - uError("failed to check startup step, code:0x%x %s", code, tstrerror(code)); - } - break; - } - } - - taosMemoryFree(pStep); -} - -static void taosNetCheckSync(char *host, int32_t port) { - uint32_t ip = taosGetIpv4FromFqdn(host); - if (ip == 0xffffffff) { - uError("failed to get IP address from %s since %s", host, strerror(errno)); - return; - } - - TdSocketPtr pSocket = taosOpenTcpClientSocket(ip, (uint16_t)port, 0); - if (pSocket == NULL) { - uError("failed to create socket while test port:%d since %s", port, strerror(errno)); - return; - } - - SSyncMsg msg; - memset(&msg, 0, sizeof(SSyncMsg)); - SSyncHead *pHead = &msg.head; - pHead->type = TAOS_SMSG_TEST; - pHead->protocol = SYNC_PROTOCOL_VERSION; - pHead->signature = SYNC_SIGNATURE; - pHead->code = 0; - pHead->cId = 0; - pHead->vgId = -1; - pHead->len = sizeof(SSyncMsg) - sizeof(SSyncHead); - taosCalcChecksumAppend(0, (uint8_t *)pHead, sizeof(SSyncHead)); - - if (taosWriteMsg(pSocket, &msg, sizeof(SSyncMsg)) != sizeof(SSyncMsg)) { - uError("failed to test port:%d while send msg since %s", port, strerror(errno)); - return; - } - - if (taosReadMsg(pSocket, &msg, sizeof(SSyncMsg)) != sizeof(SSyncMsg)) { - uError("failed to test port:%d while recv msg since %s", port, strerror(errno)); - } - - uInfo("successed to test TCP port:%d", port); - taosCloseSocket(&pSocket); -} - -static void taosNetTestRpc(char *host, int32_t startPort, int32_t pkgLen) { - char spi = 0; - - uInfo("check rpc, host:%s Port:%d pkgLen:%d\n", host, startPort, pkgLen); - - uint16_t port = startPort; - int32_t sendpkgLen; - if (pkgLen <= tsRpcMaxUdpSize) { - sendpkgLen = tsRpcMaxUdpSize + 1000; - } else { - sendpkgLen = pkgLen; - } - - tsRpcForceTcp = 1; - int32_t ret = taosNetCheckRpc(host, port, sendpkgLen, spi, NULL); - if (ret < 0) { - printf("failed to test TCP port:%d\n", port); - } else { - printf("successed to test TCP port:%d\n", port); - } - - if (pkgLen >= tsRpcMaxUdpSize) { - sendpkgLen = tsRpcMaxUdpSize - 1000; - } else { - sendpkgLen = pkgLen; - } -/* - tsRpcForceTcp = 0; - ret = taosNetCheckRpc(host, port, pkgLen, spi, NULL); - if (ret < 0) { - printf("failed to test UDP port:%d\n", port); - } else { - printf("successed to test UDP port:%d\n", port); - } - */ - - taosNetCheckSync(host, startPort); -} - static void taosNetTestClient(char *host, int32_t startPort, int32_t pkgLen) { uInfo("work as client, host:%s Port:%d pkgLen:%d\n", host, startPort, pkgLen); @@ -586,22 +405,10 @@ static void taosNetTestServer(char *host, int32_t startPort, int32_t pkgLen) { } } -static void taosNetTestFqdn(char *host) { - int code = 0; - uint64_t startTime = taosGetTimestampUs(); - uint32_t ip = taosGetIpv4FromFqdn(host); - if (ip == 0xffffffff) { - uError("failed to get IP address from %s since %s", host, strerror(errno)); - code = -1; - } - uint64_t endTime = taosGetTimestampUs(); - uint64_t el = endTime - startTime; - printf("check convert fqdn spend, status: %d\tcost: %" PRIu64 " us\n", code, el); - return; -} - static void taosNetCheckSpeed(char *host, int32_t port, int32_t pkgLen, int32_t pkgNum, char *pkgType) { +#if 0 + // record config int32_t compressTmp = tsCompressMsgSize; int32_t maxUdpSize = tsRpcMaxUdpSize; @@ -674,19 +481,19 @@ static void taosNetCheckSpeed(char *host, int32_t port, int32_t pkgLen, tsRpcMaxUdpSize = maxUdpSize; tsRpcForceTcp = forceTcp; return; +#endif } -void taosNetTest(char *role, char *host, int32_t port, int32_t pkgLen, - int32_t pkgNum, char *pkgType) { +void taosNetTest(char *role, char *host, int32_t port, int32_t pkgLen, int32_t pkgNum, char *pkgType) { tsLogEmbedded = 1; if (host == NULL) host = tsLocalFqdn; if (port == 0) port = tsServerPort; - if (0 == strcmp("speed", role)){ + if (0 == strcmp("speed", role)) { if (pkgLen <= MIN_SPEED_PKG_LEN) pkgLen = MIN_SPEED_PKG_LEN; if (pkgLen > MAX_SPEED_PKG_LEN) pkgLen = MAX_SPEED_PKG_LEN; if (pkgNum <= MIN_SPEED_PKG_NUM) pkgNum = MIN_SPEED_PKG_NUM; if (pkgNum > MAX_SPEED_PKG_NUM) pkgNum = MAX_SPEED_PKG_NUM; - }else{ + } else { if (pkgLen <= 10) pkgLen = 1000; if (pkgLen > MAX_PKG_LEN) pkgLen = MAX_PKG_LEN; } @@ -695,21 +502,12 @@ void taosNetTest(char *role, char *host, int32_t port, int32_t pkgLen, taosNetTestClient(host, port, pkgLen); } else if (0 == strcmp("server", role)) { taosNetTestServer(host, port, pkgLen); - } else if (0 == strcmp("rpc", role)) { - tsLogEmbedded = 0; - taosNetTestRpc(host, port, pkgLen); - } else if (0 == strcmp("sync", role)) { - taosNetCheckSync(host, port); - } else if (0 == strcmp("startup", role)) { - taosNetTestStartup(host, port); } else if (0 == strcmp("speed", role)) { tsLogEmbedded = 0; char type[10] = {0}; taosNetCheckSpeed(host, port, pkgLen, pkgNum, strtolower(type, pkgType)); - }else if (0 == strcmp("fqdn", role)) { - taosNetTestFqdn(host); } else { - taosNetTestStartup(host, port); + TASSERT(1); } tsLogEmbedded = 0;