diff --git a/examples/c/stream_demo.c b/examples/c/stream_demo.c
index 1e9058d628..dd4fbc8d2d 100644
--- a/examples/c/stream_demo.c
+++ b/examples/c/stream_demo.c
@@ -98,10 +98,10 @@ int32_t create_stream() {
/*const char* sql = "select min(k), max(k), sum(k) as sum_of_k from st1";*/
/*const char* sql = "select sum(k) from tu1 interval(10m)";*/
/*pRes = tmq_create_stream(pConn, "stream1", "out1", sql);*/
- pRes = taos_query(
- pConn,
- "create stream stream1 trigger max_delay 10s into outstb as select _wstartts, sum(k) from st1 partition "
- "by tbname session(ts, 10s) ");
+ pRes =
+ taos_query(pConn,
+ "create stream stream1 trigger max_delay 10s into outstb as select _wstart, sum(k) from st1 partition "
+ "by tbname session(ts, 10s) ");
if (taos_errno(pRes) != 0) {
printf("failed to create stream stream1, reason:%s\n", taos_errstr(pRes));
return -1;
diff --git a/include/common/tglobal.h b/include/common/tglobal.h
index 944eaa28bc..96014b1234 100644
--- a/include/common/tglobal.h
+++ b/include/common/tglobal.h
@@ -64,6 +64,7 @@ extern int32_t tsNumOfMnodeQueryThreads;
extern int32_t tsNumOfMnodeFetchThreads;
extern int32_t tsNumOfMnodeReadThreads;
extern int32_t tsNumOfVnodeQueryThreads;
+extern int32_t tsNumOfVnodeStreamThreads;
extern int32_t tsNumOfVnodeFetchThreads;
extern int32_t tsNumOfVnodeWriteThreads;
extern int32_t tsNumOfVnodeSyncThreads;
diff --git a/include/common/tmsgcb.h b/include/common/tmsgcb.h
index b56f755266..c13c50e161 100644
--- a/include/common/tmsgcb.h
+++ b/include/common/tmsgcb.h
@@ -34,6 +34,7 @@ typedef enum {
WRITE_QUEUE,
APPLY_QUEUE,
SYNC_QUEUE,
+ STREAM_QUEUE,
QUEUE_MAX,
} EQueueType;
diff --git a/include/common/ttime.h b/include/common/ttime.h
index cd704bb1f7..de55b016cd 100644
--- a/include/common/ttime.h
+++ b/include/common/ttime.h
@@ -72,6 +72,8 @@ static FORCE_INLINE int64_t taosGetTimestampToday(int32_t precision) {
}
int64_t taosTimeAdd(int64_t t, int64_t duration, char unit, int32_t precision);
+int64_t taosTimeSub(int64_t t, int64_t duration, char unit, int32_t precision);
+
int64_t taosTimeTruncate(int64_t t, const SInterval* pInterval, int32_t precision);
int32_t taosTimeCountInterval(int64_t skey, int64_t ekey, int64_t interval, char unit, int32_t precision);
diff --git a/include/common/ttokendef.h b/include/common/ttokendef.h
index 29dd4daa25..e2089f3023 100644
--- a/include/common/ttokendef.h
+++ b/include/common/ttokendef.h
@@ -213,63 +213,64 @@
#define TK_NK_ARROW 195
#define TK_ROWTS 196
#define TK_TBNAME 197
-#define TK_QSTARTTS 198
-#define TK_QENDTS 199
-#define TK_WSTARTTS 200
-#define TK_WENDTS 201
-#define TK_WDURATION 202
-#define TK_CAST 203
-#define TK_NOW 204
-#define TK_TODAY 205
-#define TK_TIMEZONE 206
-#define TK_CLIENT_VERSION 207
-#define TK_SERVER_VERSION 208
-#define TK_SERVER_STATUS 209
-#define TK_CURRENT_USER 210
-#define TK_COUNT 211
-#define TK_LAST_ROW 212
-#define TK_BETWEEN 213
-#define TK_IS 214
-#define TK_NK_LT 215
-#define TK_NK_GT 216
-#define TK_NK_LE 217
-#define TK_NK_GE 218
-#define TK_NK_NE 219
-#define TK_MATCH 220
-#define TK_NMATCH 221
-#define TK_CONTAINS 222
-#define TK_JOIN 223
-#define TK_INNER 224
-#define TK_SELECT 225
-#define TK_DISTINCT 226
-#define TK_WHERE 227
-#define TK_PARTITION 228
-#define TK_BY 229
-#define TK_SESSION 230
-#define TK_STATE_WINDOW 231
-#define TK_SLIDING 232
-#define TK_FILL 233
-#define TK_VALUE 234
-#define TK_NONE 235
-#define TK_PREV 236
-#define TK_LINEAR 237
-#define TK_NEXT 238
-#define TK_HAVING 239
-#define TK_RANGE 240
-#define TK_EVERY 241
-#define TK_ORDER 242
-#define TK_SLIMIT 243
-#define TK_SOFFSET 244
-#define TK_LIMIT 245
-#define TK_OFFSET 246
-#define TK_ASC 247
-#define TK_NULLS 248
-#define TK_ID 249
-#define TK_NK_BITNOT 250
-#define TK_VALUES 251
-#define TK_IMPORT 252
-#define TK_NK_SEMI 253
-#define TK_FILE 254
+#define TK_QSTART 198
+#define TK_QEND 199
+#define TK_QDURATION 200
+#define TK_WSTART 201
+#define TK_WEND 202
+#define TK_WDURATION 203
+#define TK_CAST 204
+#define TK_NOW 205
+#define TK_TODAY 206
+#define TK_TIMEZONE 207
+#define TK_CLIENT_VERSION 208
+#define TK_SERVER_VERSION 209
+#define TK_SERVER_STATUS 210
+#define TK_CURRENT_USER 211
+#define TK_COUNT 212
+#define TK_LAST_ROW 213
+#define TK_BETWEEN 214
+#define TK_IS 215
+#define TK_NK_LT 216
+#define TK_NK_GT 217
+#define TK_NK_LE 218
+#define TK_NK_GE 219
+#define TK_NK_NE 220
+#define TK_MATCH 221
+#define TK_NMATCH 222
+#define TK_CONTAINS 223
+#define TK_JOIN 224
+#define TK_INNER 225
+#define TK_SELECT 226
+#define TK_DISTINCT 227
+#define TK_WHERE 228
+#define TK_PARTITION 229
+#define TK_BY 230
+#define TK_SESSION 231
+#define TK_STATE_WINDOW 232
+#define TK_SLIDING 233
+#define TK_FILL 234
+#define TK_VALUE 235
+#define TK_NONE 236
+#define TK_PREV 237
+#define TK_LINEAR 238
+#define TK_NEXT 239
+#define TK_HAVING 240
+#define TK_RANGE 241
+#define TK_EVERY 242
+#define TK_ORDER 243
+#define TK_SLIMIT 244
+#define TK_SOFFSET 245
+#define TK_LIMIT 246
+#define TK_OFFSET 247
+#define TK_ASC 248
+#define TK_NULLS 249
+#define TK_ID 250
+#define TK_NK_BITNOT 251
+#define TK_VALUES 252
+#define TK_IMPORT 253
+#define TK_NK_SEMI 254
+#define TK_FILE 255
#define TK_NK_SPACE 300
#define TK_NK_COMMENT 301
diff --git a/include/libs/executor/executor.h b/include/libs/executor/executor.h
index 630e983f81..dd64c5bf71 100644
--- a/include/libs/executor/executor.h
+++ b/include/libs/executor/executor.h
@@ -186,9 +186,12 @@ int32_t qStreamExtractOffset(qTaskInfo_t tinfo, STqOffsetVal* pOffset);
void* qStreamExtractMetaMsg(qTaskInfo_t tinfo);
-void* qExtractReaderFromStreamScanner(void* scanner);
+void* qExtractReaderFromStreamScanner(void* scanner);
+
int32_t qExtractStreamScanner(qTaskInfo_t tinfo, void** scanner);
+int32_t qStreamInput(qTaskInfo_t tinfo, void* pItem);
+
#ifdef __cplusplus
}
#endif
diff --git a/include/libs/function/functionMgt.h b/include/libs/function/functionMgt.h
index 1012161d0e..04825f376f 100644
--- a/include/libs/function/functionMgt.h
+++ b/include/libs/function/functionMgt.h
@@ -34,7 +34,7 @@ typedef enum EFunctionType {
FUNCTION_TYPE_ELAPSED,
FUNCTION_TYPE_IRATE,
FUNCTION_TYPE_LAST_ROW,
- FUNCTION_TYPE_LAST_ROWT, //TODO: removed
+ FUNCTION_TYPE_LAST_ROWT, // TODO: removed
FUNCTION_TYPE_MAX,
FUNCTION_TYPE_MIN,
FUNCTION_TYPE_MODE,
@@ -114,10 +114,11 @@ typedef enum EFunctionType {
// pseudo column function
FUNCTION_TYPE_ROWTS = 3500,
FUNCTION_TYPE_TBNAME,
- FUNCTION_TYPE_QSTARTTS,
- FUNCTION_TYPE_QENDTS,
- FUNCTION_TYPE_WSTARTTS,
- FUNCTION_TYPE_WENDTS,
+ FUNCTION_TYPE_QSTART,
+ FUNCTION_TYPE_QEND,
+ FUNCTION_TYPE_QDURATION,
+ FUNCTION_TYPE_WSTART,
+ FUNCTION_TYPE_WEND,
FUNCTION_TYPE_WDURATION,
// internal function
@@ -197,6 +198,7 @@ bool fmIsInterpFunc(int32_t funcId);
bool fmIsLastRowFunc(int32_t funcId);
bool fmIsSystemInfoFunc(int32_t funcId);
bool fmIsImplicitTsFunc(int32_t funcId);
+bool fmIsClientPseudoColumnFunc(int32_t funcId);
int32_t fmGetDistMethod(const SFunctionNode* pFunc, SFunctionNode** pPartialFunc, SFunctionNode** pMergeFunc);
diff --git a/include/libs/nodes/querynodes.h b/include/libs/nodes/querynodes.h
index bbff34c66f..234b554526 100644
--- a/include/libs/nodes/querynodes.h
+++ b/include/libs/nodes/querynodes.h
@@ -228,7 +228,7 @@ typedef struct SFillNode {
ENodeType type; // QUERY_NODE_FILL
EFillMode mode;
SNode* pValues; // SNodeListNode
- SNode* pWStartTs; // _wstartts pseudo column
+ SNode* pWStartTs; // _wstart pseudo column
STimeWindow timeRange;
} SFillNode;
@@ -248,6 +248,7 @@ typedef struct SSelectStmt {
SNodeList* pOrderByList; // SOrderByExprNode
SLimitNode* pLimit;
SLimitNode* pSlimit;
+ STimeWindow timeRange;
char stmtName[TSDB_TABLE_NAME_LEN];
uint8_t precision;
int32_t selectFuncNum;
diff --git a/include/libs/scalar/scalar.h b/include/libs/scalar/scalar.h
index ab0a4f8529..97c77ef01b 100644
--- a/include/libs/scalar/scalar.h
+++ b/include/libs/scalar/scalar.h
@@ -32,6 +32,7 @@ pNode will be freed in API;
*pRes need to freed in caller
*/
int32_t scalarCalculateConstants(SNode *pNode, SNode **pRes);
+int32_t scalarCalculateConstantsFromDual(SNode *pNode, SNode **pRes);
/*
pDst need to freed in caller
diff --git a/include/libs/stream/tstream.h b/include/libs/stream/tstream.h
index ac9784b91b..a08db7b8f8 100644
--- a/include/libs/stream/tstream.h
+++ b/include/libs/stream/tstream.h
@@ -13,6 +13,7 @@
* along with this program. If not, see .
*/
+#include "executor.h"
#include "os.h"
#include "query.h"
#include "tdatablock.h"
@@ -120,7 +121,6 @@ static FORCE_INLINE void* streamQueueCurItem(SStreamQueue* queue) { return queue
static FORCE_INLINE void* streamQueueNextItem(SStreamQueue* queue) {
int8_t dequeueFlag = atomic_exchange_8(&queue->status, STREAM_QUEUE__PROCESSING);
if (dequeueFlag == STREAM_QUEUE__FAILED) {
- ASSERT(0);
ASSERT(queue->qItem != NULL);
return streamQueueCurItem(queue);
} else {
@@ -307,14 +307,18 @@ static FORCE_INLINE int32_t streamTaskInput(SStreamTask* pTask, SStreamQueueItem
atomic_store_8(&pTask->inputStatus, TASK_INPUT_STATUS__FAILED);
return -1;
}
- qInfo("task %d %p submit enqueue %p %p %p", pTask->taskId, pTask, pItem, pSubmitClone, pSubmitClone->data);
+ qDebug("task %d %p submit enqueue %p %p %p", pTask->taskId, pTask, pItem, pSubmitClone, pSubmitClone->data);
taosWriteQitem(pTask->inputQueue->queue, pSubmitClone);
+ // qStreamInput(pTask->exec.executor, pSubmitClone);
} else if (pItem->type == STREAM_INPUT__DATA_BLOCK || pItem->type == STREAM_INPUT__DATA_RETRIEVE) {
taosWriteQitem(pTask->inputQueue->queue, pItem);
+ // qStreamInput(pTask->exec.executor, pItem);
} else if (pItem->type == STREAM_INPUT__CHECKPOINT) {
taosWriteQitem(pTask->inputQueue->queue, pItem);
+ // qStreamInput(pTask->exec.executor, pItem);
} else if (pItem->type == STREAM_INPUT__TRIGGER) {
taosWriteQitem(pTask->inputQueue->queue, pItem);
+ // qStreamInput(pTask->exec.executor, pItem);
}
if (pItem->type != STREAM_INPUT__TRIGGER && pItem->type != STREAM_INPUT__CHECKPOINT && pTask->triggerParam != 0) {
diff --git a/include/libs/sync/sync.h b/include/libs/sync/sync.h
index bef26cb310..c226d7c8cc 100644
--- a/include/libs/sync/sync.h
+++ b/include/libs/sync/sync.h
@@ -26,6 +26,8 @@ extern "C" {
extern bool gRaftDetailLog;
+#define SYNC_RESP_TTL_MS 5000
+
#define SYNC_MAX_BATCH_SIZE 500
#define SYNC_INDEX_BEGIN 0
#define SYNC_INDEX_INVALID -1
diff --git a/include/util/taoserror.h b/include/util/taoserror.h
index ce434612c3..c057d48875 100644
--- a/include/util/taoserror.h
+++ b/include/util/taoserror.h
@@ -584,7 +584,8 @@ int32_t* taosGetErrno();
#define TSDB_CODE_PAR_INVALID_INTERP_CLAUSE TAOS_DEF_ERROR_CODE(0, 0x265D)
#define TSDB_CODE_PAR_NO_VALID_FUNC_IN_WIN TAOS_DEF_ERROR_CODE(0, 0x265E)
#define TSDB_CODE_PAR_ONLY_SUPPORT_SINGLE_TABLE TAOS_DEF_ERROR_CODE(0, 0x265F)
-#define TSDB_CODE_PAR_INVALID_SMA_INDEX TAOS_DEF_ERROR_CODE(0, 0x265C)
+#define TSDB_CODE_PAR_INVALID_SMA_INDEX TAOS_DEF_ERROR_CODE(0, 0x2660)
+#define TSDB_CODE_PAR_INVALID_SELECTED_EXPR TAOS_DEF_ERROR_CODE(0, 0x2661)
//planner
#define TSDB_CODE_PLAN_INTERNAL_ERROR TAOS_DEF_ERROR_CODE(0, 0x2700)
diff --git a/source/client/inc/clientInt.h b/source/client/inc/clientInt.h
index 700a4d9daf..367e656f06 100644
--- a/source/client/inc/clientInt.h
+++ b/source/client/inc/clientInt.h
@@ -181,6 +181,7 @@ typedef struct SRequestSendRecvBody {
tsem_t rspSem; // not used now
__taos_async_fn_t queryFp;
__taos_async_fn_t fetchFp;
+ EQueryExecMode execMode;
void* param;
SDataBuf requestMsg;
int64_t queryJob; // query job, created according to sql query DAG.
diff --git a/source/client/src/clientImpl.c b/source/client/src/clientImpl.c
index 32c11983c2..d846cb93af 100644
--- a/source/client/src/clientImpl.c
+++ b/source/client/src/clientImpl.c
@@ -153,7 +153,7 @@ int32_t buildRequest(uint64_t connId, const char* sql, int sqlLen, void* param,
*pRequest = createRequest(connId, TSDB_SQL_SELECT);
if (*pRequest == NULL) {
tscError("failed to malloc sqlObj, %s", sql);
- return TSDB_CODE_TSC_OUT_OF_MEMORY;
+ return terrno;
}
(*pRequest)->sqlstr = taosMemoryMalloc(sqlLen + 1);
@@ -933,6 +933,8 @@ SRequestObj* launchQuery(uint64_t connId, const char* sql, int sqlLen, bool vali
void launchAsyncQuery(SRequestObj* pRequest, SQuery* pQuery, SMetaData* pResultMeta) {
int32_t code = 0;
+ pRequest->body.execMode = pQuery->execMode;
+
switch (pQuery->execMode) {
case QUERY_EXEC_MODE_LOCAL:
asyncExecLocalCmd(pRequest, pQuery);
@@ -1149,7 +1151,6 @@ STscObj* taosConnectImpl(const char* user, const char* auth, const char* db, __t
SRequestObj* pRequest = createRequest(pTscObj->id, TDMT_MND_CONNECT);
if (pRequest == NULL) {
destroyTscObj(pTscObj);
- terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;
return NULL;
}
diff --git a/source/client/src/clientMain.c b/source/client/src/clientMain.c
index 73def5b9b1..14a431feab 100644
--- a/source/client/src/clientMain.c
+++ b/source/client/src/clientMain.c
@@ -49,7 +49,7 @@ int taos_options(TSDB_OPTION option, const void *arg, ...) {
}
// this function may be called by user or system, or by both simultaneously.
void taos_cleanup(void) {
- tscInfo("start to cleanup client environment");
+ tscDebug("start to cleanup client environment");
if (atomic_val_compare_exchange_32(&sentinel, TSC_VAR_NOT_RELEASE, TSC_VAR_RELEASED) != TSC_VAR_NOT_RELEASE) {
return;
}
@@ -58,7 +58,10 @@ void taos_cleanup(void) {
clientReqRefPool = -1;
taosCloseRef(id);
- cleanupTaskQueue();
+ hbMgrCleanUp();
+
+ catalogDestroy();
+ schedulerDestroy();
fmFuncMgtDestroy();
qCleanupKeywordsTable();
@@ -67,12 +70,11 @@ void taos_cleanup(void) {
clientConnRefPool = -1;
taosCloseRef(id);
- hbMgrCleanUp();
-
- catalogDestroy();
- schedulerDestroy();
-
rpcCleanup();
+ tscDebug("rpc cleanup");
+
+ cleanupTaskQueue();
+
tscInfo("all local resources released");
taosCleanupCfg();
taosCloseLog();
@@ -852,27 +854,24 @@ void taos_fetch_rows_a(TAOS_RES *res, __taos_async_fn_t fp, void *param) {
}
// all data has returned to App already, no need to try again
- if (pResultInfo->completed && (pRequest->body.queryJob != 0)) {
- pResultInfo->numOfRows = 0;
+ if (pResultInfo->completed) {
+ // it is a local executed query, no need to do async fetch
+ if (QUERY_EXEC_MODE_LOCAL == pRequest->body.execMode) {
+ ASSERT(pResultInfo->numOfRows >= 0);
+ if (pResultInfo->localResultFetched) {
+ pResultInfo->numOfRows = 0;
+ pResultInfo->current = 0;
+ } else {
+ pResultInfo->localResultFetched = true;
+ }
+ } else {
+ pResultInfo->numOfRows = 0;
+ }
+
pRequest->body.fetchFp(param, pRequest, pResultInfo->numOfRows);
return;
}
- // it is a local executed query, no need to do async fetch
- if (pRequest->body.queryJob == 0) {
- ASSERT(pResultInfo->completed && pResultInfo->numOfRows >= 0);
- if (pResultInfo->localResultFetched) {
- pResultInfo->numOfRows = 0;
- pResultInfo->current = 0;
- pRequest->body.fetchFp(param, pRequest, pResultInfo->numOfRows);
- } else {
- pResultInfo->localResultFetched = true;
- pRequest->body.fetchFp(param, pRequest, pResultInfo->numOfRows);
- }
- return;
- }
-
-
SSchedulerReq req = {
.syncReq = false,
.fetchFp = fetchCallback,
diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index 9b65e08d29..f51023189d 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -1174,8 +1174,6 @@ int32_t colInfoDataEnsureCapacity(SColumnInfoData* pColumn, uint32_t numOfRows)
int32_t blockDataEnsureCapacity(SSDataBlock* pDataBlock, uint32_t numOfRows) {
int32_t code = 0;
- // ASSERT(numOfRows > 0);
-
if (numOfRows == 0) {
return TSDB_CODE_SUCCESS;
}
diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c
index 974146302c..e4032118c6 100644
--- a/source/common/src/tglobal.c
+++ b/source/common/src/tglobal.c
@@ -55,6 +55,7 @@ int32_t tsNumOfMnodeQueryThreads = 2;
int32_t tsNumOfMnodeFetchThreads = 1;
int32_t tsNumOfMnodeReadThreads = 1;
int32_t tsNumOfVnodeQueryThreads = 2;
+int32_t tsNumOfVnodeStreamThreads = 2;
int32_t tsNumOfVnodeFetchThreads = 4;
int32_t tsNumOfVnodeWriteThreads = 2;
int32_t tsNumOfVnodeSyncThreads = 2;
@@ -412,6 +413,10 @@ static int32_t taosAddServerCfg(SConfig *pCfg) {
tsNumOfVnodeQueryThreads = TMAX(tsNumOfVnodeQueryThreads, 2);
if (cfgAddInt32(pCfg, "numOfVnodeQueryThreads", tsNumOfVnodeQueryThreads, 1, 1024, 0) != 0) return -1;
+ tsNumOfVnodeStreamThreads = tsNumOfCores / 4;
+ tsNumOfVnodeStreamThreads = TMAX(tsNumOfVnodeStreamThreads, 4);
+ if (cfgAddInt32(pCfg, "numOfVnodeStreamThreads", tsNumOfVnodeStreamThreads, 1, 1024, 0) != 0) return -1;
+
tsNumOfVnodeFetchThreads = tsNumOfCores / 4;
tsNumOfVnodeFetchThreads = TMAX(tsNumOfVnodeFetchThreads, 4);
if (cfgAddInt32(pCfg, "numOfVnodeFetchThreads", tsNumOfVnodeFetchThreads, 1, 1024, 0) != 0) return -1;
@@ -587,6 +592,7 @@ static int32_t taosSetServerCfg(SConfig *pCfg) {
tsNumOfMnodeQueryThreads = cfgGetItem(pCfg, "numOfMnodeQueryThreads")->i32;
tsNumOfMnodeReadThreads = cfgGetItem(pCfg, "numOfMnodeReadThreads")->i32;
tsNumOfVnodeQueryThreads = cfgGetItem(pCfg, "numOfVnodeQueryThreads")->i32;
+ tsNumOfVnodeStreamThreads = cfgGetItem(pCfg, "numOfVnodeStreamThreads")->i32;
tsNumOfVnodeFetchThreads = cfgGetItem(pCfg, "numOfVnodeFetchThreads")->i32;
tsNumOfVnodeWriteThreads = cfgGetItem(pCfg, "numOfVnodeWriteThreads")->i32;
tsNumOfVnodeSyncThreads = cfgGetItem(pCfg, "numOfVnodeSyncThreads")->i32;
diff --git a/source/common/src/ttime.c b/source/common/src/ttime.c
index befb0abac8..d728bbe49e 100644
--- a/source/common/src/ttime.c
+++ b/source/common/src/ttime.c
@@ -710,6 +710,32 @@ int64_t taosTimeAdd(int64_t t, int64_t duration, char unit, int32_t precision) {
return (int64_t)(taosMktime(&tm) * TSDB_TICK_PER_SECOND(precision));
}
+int64_t taosTimeSub(int64_t t, int64_t duration, char unit, int32_t precision) {
+ if (duration == 0) {
+ return t;
+ }
+
+ if (unit != 'n' && unit != 'y') {
+ return t - duration;
+ }
+
+ // The following code handles the y/n time duration
+ int64_t numOfMonth = duration;
+ if (unit == 'y') {
+ numOfMonth *= 12;
+ }
+
+ struct tm tm;
+ time_t tt = (time_t)(t / TSDB_TICK_PER_SECOND(precision));
+ taosLocalTime(&tt, &tm);
+ int32_t mon = tm.tm_year * 12 + tm.tm_mon - (int32_t)numOfMonth;
+ tm.tm_year = mon / 12;
+ tm.tm_mon = mon % 12;
+
+ return (int64_t)(taosMktime(&tm) * TSDB_TICK_PER_SECOND(precision));
+}
+
+
int32_t taosTimeCountInterval(int64_t skey, int64_t ekey, int64_t interval, char unit, int32_t precision) {
if (ekey < skey) {
int64_t tmp = ekey;
diff --git a/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h b/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h
index 6fc0ab4e5d..ebbb9fa5d4 100644
--- a/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h
+++ b/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h
@@ -31,6 +31,7 @@ typedef struct SVnodeMgmt {
const char *path;
const char *name;
SQWorkerPool queryPool;
+ SQWorkerPool streamPool;
SWWorkerPool fetchPool;
SWWorkerPool syncPool;
SWWorkerPool writePool;
@@ -61,6 +62,7 @@ typedef struct {
STaosQueue *pSyncQ;
STaosQueue *pApplyQ;
STaosQueue *pQueryQ;
+ STaosQueue *pStreamQ;
STaosQueue *pFetchQ;
} SVnodeObj;
@@ -105,6 +107,7 @@ int32_t vmPutMsgToWriteQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg);
int32_t vmPutMsgToSyncQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg);
int32_t vmPutMsgToQueryQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg);
int32_t vmPutMsgToFetchQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg);
+int32_t vmPutMsgToStreamQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg);
int32_t vmPutMsgToMergeQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg);
int32_t vmPutMsgToMgmtQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg);
int32_t vmPutMsgToMonitorQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg);
diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
index 7e7139ba53..9571a83116 100644
--- a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
@@ -357,16 +357,16 @@ SArray *vmGetMsgHandles() {
if (dmSetMgmtHandle(pArray, TDMT_VND_COMMIT, vmPutMsgToWriteQueue, 0) == NULL) goto _OVER;
if (dmSetMgmtHandle(pArray, TDMT_SCH_QUERY_HEARTBEAT, vmPutMsgToFetchQueue, 0) == NULL) goto _OVER;
- if (dmSetMgmtHandle(pArray, TDMT_VND_STREAM_TRIGGER, vmPutMsgToFetchQueue, 0) == NULL) goto _OVER;
+ if (dmSetMgmtHandle(pArray, TDMT_VND_STREAM_TRIGGER, vmPutMsgToStreamQueue, 0) == NULL) goto _OVER;
if (dmSetMgmtHandle(pArray, TDMT_STREAM_TASK_DROP, vmPutMsgToWriteQueue, 0) == NULL) goto _OVER;
if (dmSetMgmtHandle(pArray, TDMT_STREAM_TASK_DEPLOY, vmPutMsgToWriteQueue, 0) == NULL) goto _OVER;
- if (dmSetMgmtHandle(pArray, TDMT_STREAM_TASK_RUN, vmPutMsgToFetchQueue, 0) == NULL) goto _OVER;
- if (dmSetMgmtHandle(pArray, TDMT_STREAM_TASK_DISPATCH, vmPutMsgToFetchQueue, 0) == NULL) goto _OVER;
- if (dmSetMgmtHandle(pArray, TDMT_STREAM_TASK_DISPATCH_RSP, vmPutMsgToFetchQueue, 0) == NULL) goto _OVER;
- if (dmSetMgmtHandle(pArray, TDMT_STREAM_TASK_RECOVER, vmPutMsgToFetchQueue, 0) == NULL) goto _OVER;
- if (dmSetMgmtHandle(pArray, TDMT_STREAM_TASK_RECOVER_RSP, vmPutMsgToFetchQueue, 0) == NULL) goto _OVER;
- if (dmSetMgmtHandle(pArray, TDMT_STREAM_RETRIEVE, vmPutMsgToFetchQueue, 0) == NULL) goto _OVER;
- if (dmSetMgmtHandle(pArray, TDMT_STREAM_RETRIEVE_RSP, vmPutMsgToFetchQueue, 0) == NULL) goto _OVER;
+ if (dmSetMgmtHandle(pArray, TDMT_STREAM_TASK_RUN, vmPutMsgToStreamQueue, 0) == NULL) goto _OVER;
+ if (dmSetMgmtHandle(pArray, TDMT_STREAM_TASK_DISPATCH, vmPutMsgToStreamQueue, 0) == NULL) goto _OVER;
+ if (dmSetMgmtHandle(pArray, TDMT_STREAM_TASK_DISPATCH_RSP, vmPutMsgToStreamQueue, 0) == NULL) goto _OVER;
+ if (dmSetMgmtHandle(pArray, TDMT_STREAM_TASK_RECOVER, vmPutMsgToStreamQueue, 0) == NULL) goto _OVER;
+ if (dmSetMgmtHandle(pArray, TDMT_STREAM_TASK_RECOVER_RSP, vmPutMsgToStreamQueue, 0) == NULL) goto _OVER;
+ if (dmSetMgmtHandle(pArray, TDMT_STREAM_RETRIEVE, vmPutMsgToStreamQueue, 0) == NULL) goto _OVER;
+ if (dmSetMgmtHandle(pArray, TDMT_STREAM_RETRIEVE_RSP, vmPutMsgToStreamQueue, 0) == NULL) goto _OVER;
if (dmSetMgmtHandle(pArray, TDMT_VND_ALTER_REPLICA, vmPutMsgToWriteQueue, 0) == NULL) goto _OVER;
if (dmSetMgmtHandle(pArray, TDMT_VND_ALTER_CONFIG, vmPutMsgToWriteQueue, 0) == NULL) goto _OVER;
diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c
index 36f6fab699..1f981cc9e0 100644
--- a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c
@@ -92,6 +92,7 @@ void vmCloseVnode(SVnodeMgmt *pMgmt, SVnodeObj *pVnode) {
while (!taosQueueEmpty(pVnode->pApplyQ)) taosMsleep(10);
while (!taosQueueEmpty(pVnode->pQueryQ)) taosMsleep(10);
while (!taosQueueEmpty(pVnode->pFetchQ)) taosMsleep(10);
+ while (!taosQueueEmpty(pVnode->pStreamQ)) taosMsleep(10);
dTrace("vgId:%d, vnode queue is empty", pVnode->vgId);
vmFreeQueue(pMgmt, pVnode);
diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c b/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c
index 93f93b1ab7..4a60dbfe0f 100644
--- a/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c
@@ -81,6 +81,23 @@ static void vmProcessQueryQueue(SQueueInfo *pInfo, SRpcMsg *pMsg) {
taosFreeQitem(pMsg);
}
+static void vmProcessStreamQueue(SQueueInfo *pInfo, SRpcMsg *pMsg) {
+ SVnodeObj *pVnode = pInfo->ahandle;
+ const STraceId *trace = &pMsg->info.traceId;
+
+ dGTrace("vgId:%d, msg:%p get from vnode-stream queue", pVnode->vgId, pMsg);
+ int32_t code = vnodeProcessFetchMsg(pVnode->pImpl, pMsg, pInfo);
+ if (code != 0) {
+ if (terrno != 0) code = terrno;
+ dGError("vgId:%d, msg:%p failed to stream since %s", pVnode->vgId, pMsg, terrstr());
+ vmSendRsp(pMsg, code);
+ }
+
+ dGTrace("vgId:%d, msg:%p is freed, code:0x%x", pVnode->vgId, pMsg, code);
+ rpcFreeCont(pMsg->pCont);
+ taosFreeQitem(pMsg);
+}
+
static void vmProcessFetchQueue(SQueueInfo *pInfo, STaosQall *qall, int32_t numOfMsgs) {
SVnodeObj *pVnode = pInfo->ahandle;
SRpcMsg *pMsg = NULL;
@@ -140,6 +157,10 @@ static int32_t vmPutMsgToQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg, EQueueType qtyp
dGTrace("vgId:%d, msg:%p put into vnode-query queue", pVnode->vgId, pMsg);
taosWriteQitem(pVnode->pQueryQ, pMsg);
break;
+ case STREAM_QUEUE:
+ dGTrace("vgId:%d, msg:%p put into vnode-stream queue", pVnode->vgId, pMsg);
+ taosWriteQitem(pVnode->pStreamQ, pMsg);
+ break;
case FETCH_QUEUE:
dGTrace("vgId:%d, msg:%p put into vnode-fetch queue", pVnode->vgId, pMsg);
taosWriteQitem(pVnode->pFetchQ, pMsg);
@@ -174,6 +195,8 @@ int32_t vmPutMsgToQueryQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg) { return vmPutMsg
int32_t vmPutMsgToFetchQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg) { return vmPutMsgToQueue(pMgmt, pMsg, FETCH_QUEUE); }
+int32_t vmPutMsgToStreamQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg) { return vmPutMsgToQueue(pMgmt, pMsg, STREAM_QUEUE); }
+
int32_t vmPutMsgToMgmtQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg) {
const STraceId *trace = &pMsg->info.traceId;
dGTrace("msg:%p, put into vnode-mgmt queue", pMsg);
@@ -234,6 +257,9 @@ int32_t vmGetQueueSize(SVnodeMgmt *pMgmt, int32_t vgId, EQueueType qtype) {
case FETCH_QUEUE:
size = taosQueueItemSize(pVnode->pFetchQ);
break;
+ case STREAM_QUEUE:
+ size = taosQueueItemSize(pVnode->pStreamQ);
+ break;
default:
break;
}
@@ -247,10 +273,11 @@ int32_t vmAllocQueue(SVnodeMgmt *pMgmt, SVnodeObj *pVnode) {
pVnode->pSyncQ = tWWorkerAllocQueue(&pMgmt->syncPool, pVnode, (FItems)vmProcessSyncQueue);
pVnode->pApplyQ = tWWorkerAllocQueue(&pMgmt->applyPool, pVnode->pImpl, (FItems)vnodeApplyWriteMsg);
pVnode->pQueryQ = tQWorkerAllocQueue(&pMgmt->queryPool, pVnode, (FItem)vmProcessQueryQueue);
+ pVnode->pStreamQ = tQWorkerAllocQueue(&pMgmt->streamPool, pVnode, (FItem)vmProcessStreamQueue);
pVnode->pFetchQ = tWWorkerAllocQueue(&pMgmt->fetchPool, pVnode, (FItems)vmProcessFetchQueue);
if (pVnode->pWriteQ == NULL || pVnode->pSyncQ == NULL || pVnode->pApplyQ == NULL || pVnode->pQueryQ == NULL ||
- pVnode->pFetchQ == NULL) {
+ pVnode->pStreamQ == NULL || pVnode->pFetchQ == NULL) {
terrno = TSDB_CODE_OUT_OF_MEMORY;
return -1;
}
@@ -259,6 +286,7 @@ int32_t vmAllocQueue(SVnodeMgmt *pMgmt, SVnodeObj *pVnode) {
dDebug("vgId:%d, sync-queue:%p is alloced", pVnode->vgId, pVnode->pSyncQ);
dDebug("vgId:%d, apply-queue:%p is alloced", pVnode->vgId, pVnode->pApplyQ);
dDebug("vgId:%d, query-queue:%p is alloced", pVnode->vgId, pVnode->pQueryQ);
+ dDebug("vgId:%d, stream-queue:%p is alloced", pVnode->vgId, pVnode->pStreamQ);
dDebug("vgId:%d, fetch-queue:%p is alloced", pVnode->vgId, pVnode->pFetchQ);
return 0;
}
@@ -268,11 +296,13 @@ void vmFreeQueue(SVnodeMgmt *pMgmt, SVnodeObj *pVnode) {
tWWorkerFreeQueue(&pMgmt->applyPool, pVnode->pApplyQ);
tWWorkerFreeQueue(&pMgmt->syncPool, pVnode->pSyncQ);
tQWorkerFreeQueue(&pMgmt->queryPool, pVnode->pQueryQ);
+ tQWorkerFreeQueue(&pMgmt->streamPool, pVnode->pStreamQ);
tWWorkerFreeQueue(&pMgmt->fetchPool, pVnode->pFetchQ);
pVnode->pWriteQ = NULL;
pVnode->pSyncQ = NULL;
pVnode->pApplyQ = NULL;
pVnode->pQueryQ = NULL;
+ pVnode->pStreamQ = NULL;
pVnode->pFetchQ = NULL;
dDebug("vgId:%d, queue is freed", pVnode->vgId);
}
@@ -284,6 +314,12 @@ int32_t vmStartWorker(SVnodeMgmt *pMgmt) {
pQPool->max = tsNumOfVnodeQueryThreads;
if (tQWorkerInit(pQPool) != 0) return -1;
+ SQWorkerPool *pStreamPool = &pMgmt->streamPool;
+ pStreamPool->name = "vnode-stream";
+ pStreamPool->min = tsNumOfVnodeStreamThreads;
+ pStreamPool->max = tsNumOfVnodeStreamThreads;
+ if (tQWorkerInit(pStreamPool) != 0) return -1;
+
SWWorkerPool *pFPool = &pMgmt->fetchPool;
pFPool->name = "vnode-fetch";
pFPool->max = tsNumOfVnodeFetchThreads;
@@ -333,6 +369,7 @@ void vmStopWorker(SVnodeMgmt *pMgmt) {
tWWorkerCleanup(&pMgmt->applyPool);
tWWorkerCleanup(&pMgmt->syncPool);
tQWorkerCleanup(&pMgmt->queryPool);
+ tQWorkerCleanup(&pMgmt->streamPool);
tWWorkerCleanup(&pMgmt->fetchPool);
dDebug("vnode workers are closed");
}
diff --git a/source/dnode/mnode/impl/src/mndMnode.c b/source/dnode/mnode/impl/src/mndMnode.c
index c03951b1d8..d7eaa72202 100644
--- a/source/dnode/mnode/impl/src/mndMnode.c
+++ b/source/dnode/mnode/impl/src/mndMnode.c
@@ -218,6 +218,7 @@ bool mndIsMnode(SMnode *pMnode, int32_t dnodeId) {
}
void mndGetMnodeEpSet(SMnode *pMnode, SEpSet *pEpSet) {
+#if 0
SSdb *pSdb = pMnode->pSdb;
int32_t totalMnodes = sdbGetSize(pSdb, SDB_MNODE);
void *pIter = NULL;
@@ -237,6 +238,9 @@ void mndGetMnodeEpSet(SMnode *pMnode, SEpSet *pEpSet) {
addEpIntoEpSet(pEpSet, pObj->pDnode->fqdn, pObj->pDnode->port);
sdbRelease(pSdb, pObj);
}
+#else
+ syncGetRetryEpSet(pMnode->syncMgmt.sync, pEpSet);
+#endif
}
static int32_t mndSetCreateMnodeRedoLogs(SMnode *pMnode, STrans *pTrans, SMnodeObj *pObj) {
diff --git a/source/dnode/vnode/inc/vnode.h b/source/dnode/vnode/inc/vnode.h
index 9f32964fa9..f0a6b6505d 100644
--- a/source/dnode/vnode/inc/vnode.h
+++ b/source/dnode/vnode/inc/vnode.h
@@ -138,7 +138,7 @@ void *tsdbGetIdx(SMeta *pMeta);
void *tsdbGetIvtIdx(SMeta *pMeta);
int32_t tsdbLastRowReaderOpen(void *pVnode, int32_t type, SArray *pTableIdList, int32_t numOfCols, void **pReader);
-int32_t tsdbRetrieveLastRow(void *pReader, SSDataBlock *pResBlock, const int32_t *slotIds);
+int32_t tsdbRetrieveLastRow(void *pReader, SSDataBlock *pResBlock, const int32_t *slotIds, SArray* pTableUids);
int32_t tsdbLastrowReaderClose(void *pReader);
int32_t tsdbGetTableSchema(SVnode *pVnode, int64_t uid, STSchema **pSchema, int64_t *suid);
diff --git a/source/dnode/vnode/src/tsdb/tsdbCacheRead.c b/source/dnode/vnode/src/tsdb/tsdbCacheRead.c
index 5c09c7663f..5d3cfee592 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCacheRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCacheRead.c
@@ -22,11 +22,11 @@ typedef struct SLastrowReader {
SVnode* pVnode;
STSchema* pSchema;
uint64_t uid;
- char** transferBuf; // todo remove it soon
- int32_t numOfCols;
- int32_t type;
- int32_t tableIndex; // currently returned result tables
- SArray* pTableList; // table id list
+ char** transferBuf; // todo remove it soon
+ int32_t numOfCols;
+ int32_t type;
+ int32_t tableIndex; // currently returned result tables
+ SArray* pTableList; // table id list
} SLastrowReader;
static void saveOneRow(STSRow* pRow, SSDataBlock* pBlock, SLastrowReader* pReader, const int32_t* slotIds) {
@@ -94,17 +94,20 @@ int32_t tsdbLastRowReaderOpen(void* pVnode, int32_t type, SArray* pTableIdList,
int32_t tsdbLastrowReaderClose(void* pReader) {
SLastrowReader* p = pReader;
- for (int32_t i = 0; i < p->pSchema->numOfCols; ++i) {
- taosMemoryFreeClear(p->transferBuf[i]);
+ if (p->pSchema != NULL) {
+ for (int32_t i = 0; i < p->pSchema->numOfCols; ++i) {
+ taosMemoryFreeClear(p->transferBuf[i]);
+ }
+
+ taosMemoryFree(p->transferBuf);
+ taosMemoryFree(p->pSchema);
}
- taosMemoryFree(p->pSchema);
- taosMemoryFree(p->transferBuf);
taosMemoryFree(pReader);
return TSDB_CODE_SUCCESS;
}
-int32_t tsdbRetrieveLastRow(void* pReader, SSDataBlock* pResBlock, const int32_t* slotIds) {
+int32_t tsdbRetrieveLastRow(void* pReader, SSDataBlock* pResBlock, const int32_t* slotIds, SArray* pTableUidList) {
if (pReader == NULL || pResBlock == NULL) {
return TSDB_CODE_INVALID_PARA;
}
@@ -141,14 +144,15 @@ int32_t tsdbRetrieveLastRow(void* pReader, SSDataBlock* pResBlock, const int32_t
// appended or not.
if (internalResult) {
pResBlock->info.rows -= 1;
+ taosArrayClear(pTableUidList);
}
saveOneRow(pRow, pResBlock, pr, slotIds);
+ taosArrayPush(pTableUidList, &pKeyInfo->uid);
internalResult = true;
lastKey = pRow->ts;
}
- // taosMemoryFree(pRow);
tsdbCacheRelease(lruCache, h);
}
} else if (pr->type == LASTROW_RETRIEVE_TYPE_ALL) {
@@ -171,6 +175,7 @@ int32_t tsdbRetrieveLastRow(void* pReader, SSDataBlock* pResBlock, const int32_t
// tsdbCacheLastArray2Row(pLast, &pRow, pr->pSchema);
saveOneRow(pRow, pResBlock, pr, slotIds);
+ taosArrayPush(pTableUidList, &pKeyInfo->uid);
// taosMemoryFree(pRow);
tsdbCacheRelease(lruCache, h);
diff --git a/source/dnode/vnode/src/tsdb/tsdbRead.c b/source/dnode/vnode/src/tsdb/tsdbRead.c
index e86a14a30f..4aaa80d3ae 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead.c
@@ -234,6 +234,7 @@ static void destroyBlockScanInfo(SHashObj* pTableMap) {
}
taosArrayDestroy(p->delSkyline);
+ taosArrayDestroy(p->pBlockList);
p->delSkyline = NULL;
}
@@ -302,9 +303,9 @@ static bool filesetIteratorNext(SFilesetIter* pIter, STsdbReader* pReader) {
STimeWindow win = {0};
while (1) {
-// if (pReader->pFileReader != NULL) {
-// tsdbDataFReaderClose(&pReader->pFileReader);
-// }
+ if (pReader->pFileReader != NULL) {
+ tsdbDataFReaderClose(&pReader->pFileReader);
+ }
pReader->status.pCurrentFileset = (SDFileSet*)taosArrayGet(pIter->pFileList, pIter->index);
@@ -696,12 +697,14 @@ static int32_t doLoadFileBlock(STsdbReader* pReader, SArray* pIndexList, uint32_
void* p = taosArrayPush(pScanInfo->pBlockList, &block);
if (p == NULL) {
+ tMapDataClear(&mapData);
return TSDB_CODE_OUT_OF_MEMORY;
}
(*numOfBlocks) += 1;
}
+ tMapDataClear(&mapData);
if (pScanInfo->pBlockList != NULL && taosArrayGetSize(pScanInfo->pBlockList) > 0) {
(*numOfValidTables) += 1;
}
@@ -1308,6 +1311,8 @@ static int32_t initBlockIterator(STsdbReader* pReader, SDataBlockIter* pBlockIte
pReader->idStr);
pBlockIter->index = asc ? 0 : (numOfBlocks - 1);
+
+ cleanupBlockOrderSupporter(&sup);
return TSDB_CODE_SUCCESS;
}
@@ -1990,6 +1995,7 @@ static TSDBKEY getCurrentKeyInBuf(SDataBlockIter* pBlockIter, STsdbReader* pRead
static int32_t moveToNextFile(STsdbReader* pReader, int32_t* numOfBlocks) {
SReaderStatus* pStatus = &pReader->status;
+ SArray* pIndexList = taosArrayInit(4, sizeof(SBlockIdx));
while (1) {
bool hasNext = filesetIteratorNext(&pStatus->fileIter, pReader);
@@ -1997,9 +2003,10 @@ static int32_t moveToNextFile(STsdbReader* pReader, int32_t* numOfBlocks) {
break;
}
- SArray* pIndexList = taosArrayInit(4, sizeof(SBlockIdx));
+ taosArrayClear(pIndexList);
int32_t code = doLoadBlockIndex(pReader, pReader->pFileReader, pIndexList);
if (code != TSDB_CODE_SUCCESS) {
+ taosArrayDestroy(pIndexList);
return code;
}
@@ -2007,6 +2014,7 @@ static int32_t moveToNextFile(STsdbReader* pReader, int32_t* numOfBlocks) {
uint32_t numOfValidTable = 0;
code = doLoadFileBlock(pReader, pIndexList, &numOfValidTable, numOfBlocks);
if (code != TSDB_CODE_SUCCESS) {
+ taosArrayDestroy(pIndexList);
return code;
}
@@ -2014,10 +2022,10 @@ static int32_t moveToNextFile(STsdbReader* pReader, int32_t* numOfBlocks) {
break;
}
}
-
// no blocks in current file, try next files
}
+ taosArrayDestroy(pIndexList);
return TSDB_CODE_SUCCESS;
}
@@ -3081,10 +3089,13 @@ int32_t tsdbGetFileBlocksDistInfo(STsdbReader* pReader, STableBlockDistInfo* pTa
SDataBlockIter* pBlockIter = &pStatus->blockIter;
pTableBlockInfo->numOfFiles += pStatus->fileIter.numOfFiles;
- pTableBlockInfo->numOfBlocks += pBlockIter->numOfBlocks;
+
+ if (pBlockIter->numOfBlocks > 0) {
+ pTableBlockInfo->numOfBlocks += pBlockIter->numOfBlocks;
+ }
pTableBlockInfo->numOfTables = numOfTables;
- bool hasNext = true;
+ bool hasNext = (pBlockIter->numOfBlocks > 0);
while (true) {
if (hasNext) {
diff --git a/source/dnode/vnode/src/vnd/vnodeSync.c b/source/dnode/vnode/src/vnd/vnodeSync.c
index bdcfe208d6..87148a8450 100644
--- a/source/dnode/vnode/src/vnd/vnodeSync.c
+++ b/source/dnode/vnode/src/vnd/vnodeSync.c
@@ -427,13 +427,22 @@ static void vnodeSyncCommitMsg(SSyncFSM *pFsm, const SRpcMsg *pMsg, SFsmCbMeta c
syncGetVgId(pVnode->sync), pFsm, cbMeta.index, cbMeta.isWeak, cbMeta.code, cbMeta.state,
syncUtilState2String(cbMeta.state), pMsg->msgType, TMSG_INFO(pMsg->msgType));
- SRpcMsg rpcMsg = {.msgType = pMsg->msgType, .contLen = pMsg->contLen};
- rpcMsg.pCont = rpcMallocCont(rpcMsg.contLen);
- memcpy(rpcMsg.pCont, pMsg->pCont, pMsg->contLen);
- syncGetAndDelRespRpc(pVnode->sync, cbMeta.seqNum, &rpcMsg.info);
- rpcMsg.info.conn.applyIndex = cbMeta.index;
- rpcMsg.info.conn.applyTerm = cbMeta.term;
- tmsgPutToQueue(&pVnode->msgCb, APPLY_QUEUE, &rpcMsg);
+ if (cbMeta.code == 0) {
+ SRpcMsg rpcMsg = {.msgType = pMsg->msgType, .contLen = pMsg->contLen};
+ rpcMsg.pCont = rpcMallocCont(rpcMsg.contLen);
+ memcpy(rpcMsg.pCont, pMsg->pCont, pMsg->contLen);
+ syncGetAndDelRespRpc(pVnode->sync, cbMeta.seqNum, &rpcMsg.info);
+ rpcMsg.info.conn.applyIndex = cbMeta.index;
+ rpcMsg.info.conn.applyTerm = cbMeta.term;
+ tmsgPutToQueue(&pVnode->msgCb, APPLY_QUEUE, &rpcMsg);
+ } else {
+ SRpcMsg rsp = {.code = cbMeta.code, .info = pMsg->info};
+ vError("vgId:%d, sync commit error, msgtype:%d,%s, error:0x%X, errmsg:%s", syncGetVgId(pVnode->sync), pMsg->msgType,
+ TMSG_INFO(pMsg->msgType), cbMeta.code, tstrerror(cbMeta.code));
+ if (rsp.info.handle != NULL) {
+ tmsgSendRsp(&rsp);
+ }
+ }
}
static void vnodeSyncPreCommitMsg(SSyncFSM *pFsm, const SRpcMsg *pMsg, SFsmCbMeta cbMeta) {
diff --git a/source/libs/catalog/src/catalog.c b/source/libs/catalog/src/catalog.c
index ca50702894..1b7f53ae67 100644
--- a/source/libs/catalog/src/catalog.c
+++ b/source/libs/catalog/src/catalog.c
@@ -1293,7 +1293,7 @@ void catalogDestroy(void) {
if (!taosCheckCurrentInDll()) {
ctgClearCacheEnqueue(NULL, true, true, true);
- taosThreadJoin(gCtgMgmt.updateThread, NULL);
+ taosThreadJoin(gCtgMgmt.updateThread, NULL);
}
taosHashCleanup(gCtgMgmt.pCluster);
diff --git a/source/libs/command/src/command.c b/source/libs/command/src/command.c
index a2816209a9..034778e5bf 100644
--- a/source/libs/command/src/command.c
+++ b/source/libs/command/src/command.c
@@ -570,10 +570,14 @@ int32_t buildSelectResultDataBlock(SNodeList* pProjects, SSDataBlock* pBlock) {
int32_t index = 0;
SNode* pProj = NULL;
FOREACH(pProj, pProjects) {
- if (((SValueNode*)pProj)->isNull) {
- colDataAppend(taosArrayGet(pBlock->pDataBlock, index++), 0, NULL, true);
+ if (QUERY_NODE_VALUE != nodeType(pProj)) {
+ return TSDB_CODE_PAR_INVALID_SELECTED_EXPR;
} else {
- colDataAppend(taosArrayGet(pBlock->pDataBlock, index++), 0, nodesGetValueFromNode((SValueNode*)pProj), false);
+ if (((SValueNode*)pProj)->isNull) {
+ colDataAppend(taosArrayGet(pBlock->pDataBlock, index++), 0, NULL, true);
+ } else {
+ colDataAppend(taosArrayGet(pBlock->pDataBlock, index++), 0, nodesGetValueFromNode((SValueNode*)pProj), false);
+ }
}
}
diff --git a/source/libs/executor/CMakeLists.txt b/source/libs/executor/CMakeLists.txt
index ed15aeb038..89d08b3078 100644
--- a/source/libs/executor/CMakeLists.txt
+++ b/source/libs/executor/CMakeLists.txt
@@ -8,7 +8,7 @@ add_library(executor STATIC ${EXECUTOR_SRC})
# )
target_link_libraries(executor
- PRIVATE os util common function parser planner qcom vnode scalar nodes index
+ PRIVATE os util common function parser planner qcom vnode scalar nodes index stream
)
target_include_directories(
diff --git a/source/libs/executor/inc/executorimpl.h b/source/libs/executor/inc/executorimpl.h
index aab2f51421..74bb80eed1 100644
--- a/source/libs/executor/inc/executorimpl.h
+++ b/source/libs/executor/inc/executorimpl.h
@@ -39,6 +39,7 @@ extern "C" {
#include "tmsg.h"
#include "tpagedbuf.h"
#include "tstreamUpdate.h"
+#include "tstream.h"
#include "vnode.h"
#include "executorInt.h"
@@ -139,12 +140,14 @@ typedef struct STaskIdInfo {
} STaskIdInfo;
typedef struct {
+ //TODO remove prepareStatus
STqOffsetVal prepareStatus; // for tmq
STqOffsetVal lastStatus; // for tmq
void* metaBlk; // for tmq fetching meta
SSDataBlock* pullOverBlk; // for streaming
SWalFilterCond cond;
int64_t lastScanUid;
+ SStreamQueue* inputQueue;
} SStreamTaskInfo;
typedef struct SExecTaskInfo {
@@ -319,6 +322,7 @@ typedef struct SLastrowScanInfo {
void *pLastrowReader;
SArray *pColMatchInfo;
int32_t *pSlotIds;
+ SExprSupp pseudoExprSup;
} SLastrowScanInfo;
typedef enum EStreamScanMode {
@@ -787,6 +791,8 @@ int32_t getBufferPgSize(int32_t rowSize, uint32_t* defaultPgsz, uint32_t* defaul
void doSetOperatorCompleted(SOperatorInfo* pOperator);
void doFilter(const SNode* pFilterNode, SSDataBlock* pBlock);
+int32_t addTagPseudoColumnData(SReadHandle* pHandle, SExprInfo* pPseudoExpr, int32_t numOfPseudoExpr,
+ SSDataBlock* pBlock, const char* idStr);
void cleanupAggSup(SAggSupporter* pAggSup);
void destroyBasicOperatorInfo(void* param, int32_t numOfOutput);
diff --git a/source/libs/executor/src/cachescanoperator.c b/source/libs/executor/src/cachescanoperator.c
index 7b1351a024..0f6817cd6b 100644
--- a/source/libs/executor/src/cachescanoperator.c
+++ b/source/libs/executor/src/cachescanoperator.c
@@ -45,20 +45,20 @@ SOperatorInfo* createLastrowScanOperator(SLastRowScanPhysiNode* pScanNode, SRead
int32_t numOfCols = 0;
pInfo->pColMatchInfo = extractColMatchInfo(pScanNode->pScanCols, pScanNode->node.pOutputDataBlockDesc, &numOfCols,
COL_MATCH_FROM_COL_ID);
- int32_t* pCols = taosMemoryMalloc(numOfCols * sizeof(int32_t));
- for (int32_t i = 0; i < taosArrayGetSize(pInfo->pColMatchInfo); ++i) {
- SColMatchInfo* pColMatch = taosArrayGet(pInfo->pColMatchInfo, i);
- pCols[i] = pColMatch->colId;
- }
-
int32_t code = extractTargetSlotId(pInfo->pColMatchInfo, pTaskInfo, &pInfo->pSlotIds);
if (code != TSDB_CODE_SUCCESS) {
goto _error;
}
- tsdbLastRowReaderOpen(readHandle->vnode, LASTROW_RETRIEVE_TYPE_ALL, pTableList, taosArrayGetSize(pInfo->pColMatchInfo),
+ tsdbLastRowReaderOpen(readHandle->vnode, LASTROW_RETRIEVE_TYPE_SINGLE, pTableList, taosArrayGetSize(pInfo->pColMatchInfo),
&pInfo->pLastrowReader);
- taosMemoryFree(pCols);
+
+ if (pScanNode->pScanPseudoCols != NULL) {
+ SExprSupp* pPseudoExpr = &pInfo->pseudoExprSup;
+
+ pPseudoExpr->pExprInfo = createExprInfo(pScanNode->pScanPseudoCols, NULL, &pPseudoExpr->numOfExprs);
+ pPseudoExpr->pCtx = createSqlFunctionCtx(pPseudoExpr->pExprInfo, pPseudoExpr->numOfExprs, &pPseudoExpr->rowEntryInfoOffset);
+ }
pOperator->name = "LastrowScanOperator";
pOperator->operatorType = QUERY_NODE_PHYSICAL_PLAN_LAST_ROW_SCAN;
@@ -100,7 +100,20 @@ SSDataBlock* doScanLastrow(SOperatorInfo* pOperator) {
// check if it is a group by tbname
if (size == taosArrayGetSize(pInfo->pTableList)) {
blockDataCleanup(pInfo->pRes);
- tsdbRetrieveLastRow(pInfo->pLastrowReader, pInfo->pRes, pInfo->pSlotIds);
+ SArray* pUidList = taosArrayInit(1, sizeof(tb_uid_t));
+ int32_t code = tsdbRetrieveLastRow(pInfo->pLastrowReader, pInfo->pRes, pInfo->pSlotIds, pUidList);
+ if (code != TSDB_CODE_SUCCESS) {
+ longjmp(pTaskInfo->env, code);
+ }
+
+ // check for tag values
+ if (pInfo->pRes->info.rows > 0 && pInfo->pseudoExprSup.numOfExprs > 0) {
+ SExprSupp* pSup = &pInfo->pseudoExprSup;
+ pInfo->pRes->info.uid = *(tb_uid_t*) taosArrayGet(pUidList, 0);
+ addTagPseudoColumnData(&pInfo->readHandle, pSup->pExprInfo, pSup->numOfExprs, pInfo->pRes, GET_TASKID(pTaskInfo));
+ }
+
+ doSetOperatorCompleted(pOperator);
return (pInfo->pRes->info.rows == 0) ? NULL : pInfo->pRes;
} else {
// todo fetch the result for each group
diff --git a/source/libs/executor/src/executor.c b/source/libs/executor/src/executor.c
index 6e4f02527f..f2008ed97a 100644
--- a/source/libs/executor/src/executor.c
+++ b/source/libs/executor/src/executor.c
@@ -60,8 +60,6 @@ static int32_t doSetStreamBlock(SOperatorInfo* pOperator, void* input, size_t nu
taosArrayAddAll(p->pDataBlock, pDataBlock->pDataBlock);
taosArrayPush(pInfo->pBlockLists, &p);
}
- /*} else if (type == STREAM_INPUT__TABLE_SCAN) {*/
- /*ASSERT(pInfo->blockType == STREAM_INPUT__TABLE_SCAN);*/
} else {
ASSERT(0);
}
diff --git a/source/libs/executor/src/executorMain.c b/source/libs/executor/src/executorMain.c
index 5d9fea523c..6381d20255 100644
--- a/source/libs/executor/src/executorMain.c
+++ b/source/libs/executor/src/executorMain.c
@@ -44,6 +44,13 @@ int32_t qCreateExecTask(SReadHandle* readHandle, int32_t vgId, uint64_t taskId,
goto _error;
}
+ if (model == OPTR_EXEC_MODEL_STREAM) {
+ (*pTask)->streamInfo.inputQueue = streamQueueOpen();
+ if ((*pTask)->streamInfo.inputQueue == NULL) {
+ goto _error;
+ }
+ }
+
SDataSinkMgtCfg cfg = {.maxDataBlockNum = 1000, .maxDataBlockNumPerQuery = 100};
code = dsDataSinkMgtInit(&cfg);
if (code != TSDB_CODE_SUCCESS) {
@@ -252,6 +259,13 @@ int32_t qExtractStreamScanner(qTaskInfo_t tinfo, void** scanner) {
}
}
+int32_t qStreamInput(qTaskInfo_t tinfo, void* pItem) {
+ SExecTaskInfo* pTaskInfo = (SExecTaskInfo*)tinfo;
+ ASSERT(pTaskInfo->execModel == OPTR_EXEC_MODEL_STREAM);
+ taosWriteQitem(pTaskInfo->streamInfo.inputQueue->queue, pItem);
+ return 0;
+}
+
void* qExtractReaderFromStreamScanner(void* scanner) {
SStreamScanInfo* pInfo = scanner;
return (void*)pInfo->tqReader;
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index 6f4a6b805d..674bbfef0b 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -1483,8 +1483,8 @@ int32_t finalizeResultRowIntoResultDataBlock(SDiskbasedBuf* pBuf, SResultRowPosi
} else if (strcmp(pCtx[j].pExpr->pExpr->_function.functionName, "_select_value") == 0) {
// do nothing, todo refactor
} else {
- // expand the result into multiple rows. E.g., _wstartts, top(k, 20)
- // the _wstartts needs to copy to 20 following rows, since the results of top-k expands to 20 different rows.
+ // expand the result into multiple rows. E.g., _wstart, top(k, 20)
+ // the _wstart needs to copy to 20 following rows, since the results of top-k expands to 20 different rows.
SColumnInfoData* pColInfoData = taosArrayGet(pBlock->pDataBlock, slotId);
char* in = GET_ROWCELL_INTERBUF(pCtx[j].resultInfo);
for (int32_t k = 0; k < pRow->numOfRows; ++k) {
@@ -1555,8 +1555,8 @@ int32_t doCopyToSDataBlock(SExecTaskInfo* pTaskInfo, SSDataBlock* pBlock, SExprI
} else if (strcmp(pCtx[j].pExpr->pExpr->_function.functionName, "_select_value") == 0) {
// do nothing, todo refactor
} else {
- // expand the result into multiple rows. E.g., _wstartts, top(k, 20)
- // the _wstartts needs to copy to 20 following rows, since the results of top-k expands to 20 different rows.
+ // expand the result into multiple rows. E.g., _wstart, top(k, 20)
+ // the _wstart needs to copy to 20 following rows, since the results of top-k expands to 20 different rows.
SColumnInfoData* pColInfoData = taosArrayGet(pBlock->pDataBlock, slotId);
char* in = GET_ROWCELL_INTERBUF(pCtx[j].resultInfo);
if (pCtx[j].increase) {
@@ -3475,9 +3475,12 @@ static SSDataBlock* doFill(SOperatorInfo* pOperator) {
static void destroyExprInfo(SExprInfo* pExpr, int32_t numOfExprs) {
for (int32_t i = 0; i < numOfExprs; ++i) {
SExprInfo* pExprInfo = &pExpr[i];
- if (pExprInfo->pExpr->nodeType == QUERY_NODE_COLUMN) {
- taosMemoryFree(pExprInfo->base.pParam[0].pCol);
+ for(int32_t j = 0; j < pExprInfo->base.numOfParams; ++j) {
+ if (pExprInfo->base.pParam[j].type == FUNC_PARAM_TYPE_COLUMN) {
+ taosMemoryFreeClear(pExprInfo->base.pParam[j].pCol);
+ }
}
+
taosMemoryFree(pExprInfo->base.pParam);
taosMemoryFree(pExprInfo->pExpr);
}
@@ -3685,10 +3688,20 @@ void destroyBasicOperatorInfo(void* param, int32_t numOfOutput) {
taosMemoryFreeClear(param);
}
+
+static void freeItem(void* pItem) {
+ void** p = pItem;
+ if (*p != NULL) {
+ taosMemoryFreeClear(*p);
+ }
+}
+
void destroyAggOperatorInfo(void* param, int32_t numOfOutput) {
SAggOperatorInfo* pInfo = (SAggOperatorInfo*)param;
cleanupBasicInfo(&pInfo->binfo);
+ cleanupAggSup(&pInfo->aggSup);
+ taosArrayDestroyEx(pInfo->groupResInfo.pRows, freeItem);
taosMemoryFreeClear(param);
}
@@ -4334,6 +4347,7 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
pTaskInfo->code = code;
return NULL;
}
+
code = extractTableSchemaInfo(pHandle, pTableScanNode->scan.uid, pTaskInfo);
if (code) {
pTaskInfo->code = terrno;
@@ -4349,7 +4363,6 @@ SOperatorInfo* createOperatorTree(SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo
} else if (QUERY_NODE_PHYSICAL_PLAN_EXCHANGE == type) {
return createExchangeOperatorInfo(pHandle->pMsgCb->clientRpc, (SExchangePhysiNode*)pPhyNode, pTaskInfo);
-
} else if (QUERY_NODE_PHYSICAL_PLAN_STREAM_SCAN == type) {
STableScanPhysiNode* pTableScanNode = (STableScanPhysiNode*)pPhyNode;
STimeWindowAggSupp twSup = {
diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index 64c740decf..4df8150140 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -39,8 +39,6 @@ static int32_t buildSysDbTableInfo(const SSysTableScanInfo* pInfo, int32_t capac
static int32_t buildDbTableInfoBlock(const SSDataBlock* p, const SSysTableMeta* pSysDbTableMeta, size_t size,
const char* dbName);
-static int32_t addTagPseudoColumnData(SReadHandle* pHandle, SExprInfo* pPseudoExpr, int32_t numOfPseudoExpr,
- SSDataBlock* pBlock, const char* idStr);
static bool processBlockWithProbability(const SSampleExecInfo* pInfo);
bool processBlockWithProbability(const SSampleExecInfo* pInfo) {
@@ -198,12 +196,6 @@ static int32_t loadDataBlock(SOperatorInfo* pOperator, STableScanInfo* pTableSca
pBlockInfo->window.skey, pBlockInfo->window.ekey, pBlockInfo->rows);
pCost->skipBlocks += 1;
- // clear all data in pBlock that are set when handing the previous block
- for (int32_t i = 0; i < taosArrayGetSize(pBlock->pDataBlock); ++i) {
- SColumnInfoData* pcol = taosArrayGet(pBlock->pDataBlock, i);
- pcol->pData = NULL;
- }
-
return TSDB_CODE_SUCCESS;
} else if (*status == FUNC_DATA_REQUIRED_STATIS_LOAD) {
pCost->loadBlockStatis += 1;
@@ -320,8 +312,6 @@ int32_t addTagPseudoColumnData(SReadHandle* pHandle, SExprInfo* pPseudoExpr, int
int32_t dstSlotId = pExpr->base.resSchema.slotId;
SColumnInfoData* pColInfoData = taosArrayGet(pBlock->pDataBlock, dstSlotId);
-
- colInfoDataEnsureCapacity(pColInfoData, pBlock->info.rows);
colInfoDataCleanup(pColInfoData, pBlock->info.rows);
int32_t functionId = pExpr->pExpr->_function.functionId;
@@ -1157,10 +1147,11 @@ static int32_t setBlockIntoRes(SStreamScanInfo* pInfo, const SSDataBlock* pBlock
SOperatorInfo* pOperator = pInfo->pStreamScanOp;
SExecTaskInfo* pTaskInfo = pInfo->pStreamScanOp->pTaskInfo;
+ blockDataEnsureCapacity(pInfo->pRes, pBlock->info.rows);
+
pInfo->pRes->info.rows = pBlock->info.rows;
pInfo->pRes->info.uid = pBlock->info.uid;
pInfo->pRes->info.type = STREAM_NORMAL;
- pInfo->pRes->info.capacity = pBlock->info.rows;
uint64_t* groupIdPre = taosHashGet(pOperator->pTaskInfo->tableqinfoList.map, &pBlock->info.uid, sizeof(int64_t));
if (groupIdPre) {
@@ -1186,7 +1177,10 @@ static int32_t setBlockIntoRes(SStreamScanInfo* pInfo, const SSDataBlock* pBlock
for (int32_t j = 0; j < blockDataGetNumOfCols(pBlock); ++j) {
SColumnInfoData* pResCol = bdGetColumnInfoData(pBlock, j);
if (pResCol->info.colId == pColMatchInfo->colId) {
- taosArraySet(pInfo->pRes->pDataBlock, pColMatchInfo->targetSlotId, pResCol);
+
+ SColumnInfoData* pDst = taosArrayGet(pInfo->pRes->pDataBlock, pColMatchInfo->targetSlotId);
+ colDataAssign(pDst, pResCol, pBlock->info.rows, &pInfo->pRes->info);
+// taosArraySet(pInfo->pRes->pDataBlock, pColMatchInfo->targetSlotId, pResCol);
colExists = true;
break;
}
@@ -1202,15 +1196,6 @@ static int32_t setBlockIntoRes(SStreamScanInfo* pInfo, const SSDataBlock* pBlock
taosArrayDestroy(pBlock->pDataBlock);
ASSERT(pInfo->pRes->pDataBlock != NULL);
-#if 0
- if (pInfo->pRes->pDataBlock == NULL) {
- // TODO add log
- updateInfoDestoryColseWinSBF(pInfo->pUpdateInfo);
- pOperator->status = OP_EXEC_DONE;
- pTaskInfo->code = terrno;
- return -1;
- }
-#endif
// currently only the tbname pseudo column
if (pInfo->numOfPseudoExpr > 0) {
@@ -1231,11 +1216,6 @@ static SSDataBlock* doStreamScan(SOperatorInfo* pOperator) {
SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo;
SStreamScanInfo* pInfo = pOperator->info;
- /*pTaskInfo->code = pOperator->fpSet._openFn(pOperator);*/
- /*if (pTaskInfo->code != TSDB_CODE_SUCCESS || pOperator->status == OP_EXEC_DONE) {*/
- /*return NULL;*/
- /*}*/
-
qDebug("stream scan called");
if (pTaskInfo->streamInfo.prepareStatus.type == TMQ_OFFSET__LOG) {
while (1) {
@@ -1425,15 +1405,6 @@ static SSDataBlock* doStreamScan(SOperatorInfo* pOperator) {
qDebug("scan rows: %d", pBlockInfo->rows);
return (pBlockInfo->rows == 0) ? NULL : pInfo->pRes;
-#if 0
- } else if (pInfo->blockType == STREAM_INPUT__TABLE_SCAN) {
- ASSERT(0);
- // check reader last status
- // if not match, reset status
- SSDataBlock* pResult = doTableScan(pInfo->pTableScanOp);
- return pResult && pResult->info.rows > 0 ? pResult : NULL;
-#endif
-
} else {
ASSERT(0);
return NULL;
@@ -2419,6 +2390,7 @@ int32_t createScanTableListInfo(STableScanPhysiNode* pTableScanNode, SReadHandle
qDebug("no table qualified for query, TID:0x%" PRIx64 ", QID:0x%" PRIx64, taskId, queryId);
return TSDB_CODE_SUCCESS;
}
+
pTableListInfo->needSortTableByGroupId = pTableScanNode->groupSort;
code = generateGroupIdMap(pTableListInfo, pHandle, pTableScanNode->pGroupTags);
if (code != TSDB_CODE_SUCCESS) {
@@ -2592,9 +2564,11 @@ static SSDataBlock* getTableDataBlock(void* param) {
SDataBlockInfo binfo = pBlock->info;
tsdbRetrieveDataBlockInfo(reader, &binfo);
- binfo.capacity = binfo.rows;
- blockDataEnsureCapacity(pBlock, binfo.capacity);
- pBlock->info = binfo;
+ blockDataEnsureCapacity(pBlock, binfo.rows);
+ pBlock->info.type = binfo.type;
+ pBlock->info.uid = binfo.uid;
+ pBlock->info.window = binfo.window;
+ pBlock->info.rows = binfo.rows;
uint32_t status = 0;
int32_t code = loadDataBlockFromOneTable(pOperator, pTableScanInfo, readerIdx, pBlock, &status);
@@ -2621,11 +2595,19 @@ static SSDataBlock* getTableDataBlock(void* param) {
return NULL;
}
-SArray* generateSortByTsInfo(int32_t order) {
+SArray* generateSortByTsInfo(SArray* colMatchInfo, int32_t order) {
+ int32_t tsTargetSlotId = 0;
+ for (int32_t i = 0; i < taosArrayGetSize(colMatchInfo); ++i) {
+ SColMatchInfo* colInfo = taosArrayGet(colMatchInfo, i);
+ if (colInfo->colId == PRIMARYKEY_TIMESTAMP_COL_ID) {
+ tsTargetSlotId = colInfo->targetSlotId;
+ }
+ }
+
SArray* pList = taosArrayInit(1, sizeof(SBlockOrderInfo));
SBlockOrderInfo bi = {0};
bi.order = order;
- bi.slotId = 0;
+ bi.slotId = tsTargetSlotId;
bi.nullFirst = NULL_ORDER_FIRST;
taosArrayPush(pList, &bi);
@@ -2874,7 +2856,7 @@ SOperatorInfo* createTableMergeScanOperatorInfo(STableScanPhysiNode* pTableScanN
pInfo->sortSourceParams = taosArrayInit(64, sizeof(STableMergeScanSortSourceParam));
- pInfo->pSortInfo = generateSortByTsInfo(pInfo->cond.order);
+ pInfo->pSortInfo = generateSortByTsInfo(pInfo->pColMatchInfo, pInfo->cond.order);
pInfo->pSortInputBlock = createOneDataBlock(pInfo->pResBlock, false);
int32_t rowSize = pInfo->pResBlock->info.rowSize;
diff --git a/source/libs/executor/src/sortoperator.c b/source/libs/executor/src/sortoperator.c
index 8d9cac3614..9795907404 100644
--- a/source/libs/executor/src/sortoperator.c
+++ b/source/libs/executor/src/sortoperator.c
@@ -621,7 +621,9 @@ SSDataBlock* getMultiwaySortedBlockData(SSortHandle* pHandle, SSDataBlock* pData
break;
}
}
-
+ if (pInfo->groupSort) {
+ pInfo->hasGroupId = false;
+ }
if (p->info.rows > 0) { // todo extract method
blockDataEnsureCapacity(pDataBlock, p->info.rows);
int32_t numOfCols = taosArrayGetSize(pColMatchInfo);
diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c
index 773484a9b3..74b5a3dab2 100644
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
@@ -1341,9 +1341,9 @@ static int32_t closeIntervalWindow(SHashObj* pHashMap, STimeWindowAggSupp* pSup,
uint64_t groupId = *(uint64_t*)key;
ASSERT(keyLen == GET_RES_WINDOW_KEY_LEN(sizeof(TSKEY)));
TSKEY ts = *(int64_t*)((char*)key + sizeof(uint64_t));
- SResultRowInfo dumyInfo;
- dumyInfo.cur.pageId = -1;
- STimeWindow win = getActiveTimeWindow(NULL, &dumyInfo, ts, pInterval, TSDB_ORDER_ASC);
+ STimeWindow win;
+ win.skey = ts;
+ win.ekey = taosTimeAdd(win.skey, pInterval->interval, pInterval->intervalUnit, pInterval->precision) - 1;
SWinRes winRe = {
.ts = win.skey,
.groupId = groupId,
@@ -1600,7 +1600,7 @@ static bool timeWindowinterpNeeded(SqlFunctionCtx* pCtx, int32_t numOfCols, SInt
}
void increaseTs(SqlFunctionCtx* pCtx) {
- if (pCtx[0].pExpr->pExpr->_function.pFunctNode->funcType == FUNCTION_TYPE_WSTARTTS) {
+ if (pCtx[0].pExpr->pExpr->_function.pFunctNode->funcType == FUNCTION_TYPE_WSTART) {
pCtx[0].increase = true;
}
}
@@ -4507,13 +4507,14 @@ static SSDataBlock* doMergeAlignedIntervalAgg(SOperatorInfo* pOperator) {
setInputDataBlock(pOperator, pSup->pCtx, pBlock, iaInfo->order, scanFlag, true);
doMergeAlignedIntervalAggImpl(pOperator, &iaInfo->binfo.resultRowInfo, pBlock, scanFlag, pRes);
doFilter(miaInfo->pCondition, pRes);
- if (pRes->info.rows > 0) {
+ if (pRes->info.rows >= pOperator->resultInfo.capacity) {
break;
}
}
pRes->info.groupId = miaInfo->groupId;
}
+ miaInfo->hasGroupId = false;
if (miaInfo->inputBlocksFinished) {
doSetOperatorCompleted(pOperator);
diff --git a/source/libs/function/inc/functionMgtInt.h b/source/libs/function/inc/functionMgtInt.h
index 2fcddce5eb..da5dd0433d 100644
--- a/source/libs/function/inc/functionMgtInt.h
+++ b/source/libs/function/inc/functionMgtInt.h
@@ -47,6 +47,7 @@ extern "C" {
#define FUNC_MGT_FORBID_WINDOW_FUNC FUNC_MGT_FUNC_CLASSIFICATION_MASK(18)
#define FUNC_MGT_FORBID_GROUP_BY_FUNC FUNC_MGT_FUNC_CLASSIFICATION_MASK(19)
#define FUNC_MGT_SYSTEM_INFO_FUNC FUNC_MGT_FUNC_CLASSIFICATION_MASK(20)
+#define FUNC_MGT_CLIENT_PC_FUNC FUNC_MGT_FUNC_CLASSIFICATION_MASK(21)
#define FUNC_MGT_TEST_MASK(val, mask) (((val) & (mask)) != 0)
diff --git a/source/libs/function/src/builtins.c b/source/libs/function/src/builtins.c
index e7795dcddc..001261767d 100644
--- a/source/libs/function/src/builtins.c
+++ b/source/libs/function/src/builtins.c
@@ -2788,28 +2788,38 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
.finalizeFunc = NULL
},
{
- .name = "_qstartts",
- .type = FUNCTION_TYPE_QSTARTTS,
- .classification = FUNC_MGT_PSEUDO_COLUMN_FUNC | FUNC_MGT_WINDOW_PC_FUNC,
+ .name = "_qstart",
+ .type = FUNCTION_TYPE_QSTART,
+ .classification = FUNC_MGT_PSEUDO_COLUMN_FUNC | FUNC_MGT_CLIENT_PC_FUNC,
.translateFunc = translateTimePseudoColumn,
- .getEnvFunc = getTimePseudoFuncEnv,
+ .getEnvFunc = NULL,
.initFunc = NULL,
- .sprocessFunc = qStartTsFunction,
+ .sprocessFunc = NULL,
.finalizeFunc = NULL
},
{
- .name = "_qendts",
- .type = FUNCTION_TYPE_QENDTS,
- .classification = FUNC_MGT_PSEUDO_COLUMN_FUNC | FUNC_MGT_WINDOW_PC_FUNC,
+ .name = "_qend",
+ .type = FUNCTION_TYPE_QEND,
+ .classification = FUNC_MGT_PSEUDO_COLUMN_FUNC | FUNC_MGT_CLIENT_PC_FUNC,
.translateFunc = translateTimePseudoColumn,
- .getEnvFunc = getTimePseudoFuncEnv,
+ .getEnvFunc = NULL,
.initFunc = NULL,
- .sprocessFunc = qEndTsFunction,
+ .sprocessFunc = NULL,
.finalizeFunc = NULL
},
{
- .name = "_wstartts",
- .type = FUNCTION_TYPE_WSTARTTS,
+ .name = "_qduration",
+ .type = FUNCTION_TYPE_QDURATION,
+ .classification = FUNC_MGT_PSEUDO_COLUMN_FUNC | FUNC_MGT_CLIENT_PC_FUNC,
+ .translateFunc = translateWduration,
+ .getEnvFunc = NULL,
+ .initFunc = NULL,
+ .sprocessFunc = NULL,
+ .finalizeFunc = NULL
+ },
+ {
+ .name = "_wstart",
+ .type = FUNCTION_TYPE_WSTART,
.classification = FUNC_MGT_PSEUDO_COLUMN_FUNC | FUNC_MGT_WINDOW_PC_FUNC,
.translateFunc = translateTimePseudoColumn,
.getEnvFunc = getTimePseudoFuncEnv,
@@ -2818,8 +2828,8 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
.finalizeFunc = NULL
},
{
- .name = "_wendts",
- .type = FUNCTION_TYPE_WENDTS,
+ .name = "_wend",
+ .type = FUNCTION_TYPE_WEND,
.classification = FUNC_MGT_PSEUDO_COLUMN_FUNC | FUNC_MGT_WINDOW_PC_FUNC,
.translateFunc = translateTimePseudoColumn,
.getEnvFunc = getTimePseudoFuncEnv,
diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c
index ccf28bfd78..e622c0c1af 100644
--- a/source/libs/function/src/builtinsimpl.c
+++ b/source/libs/function/src/builtinsimpl.c
@@ -80,11 +80,12 @@ typedef struct STopBotRes {
} STopBotRes;
typedef struct SFirstLastRes {
- bool hasResult;
+ bool hasResult;
// used for last_row function only, isNullRes in SResultRowEntry can not be passed to downstream.So,
// this attribute is required
- bool isNull;
+ bool isNull;
int32_t bytes;
+ int64_t ts;
char buf[];
} SFirstLastRes;
@@ -2951,6 +2952,7 @@ int32_t firstLastFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
SFirstLastRes* pRes = GET_ROWCELL_INTERBUF(pResInfo);
colDataAppend(pCol, pBlock->info.rows, pRes->buf, pRes->isNull||pResInfo->isNullRes);
+
// handle selectivity
STuplePos* pTuplePos = (STuplePos*)(pRes->buf + pRes->bytes + sizeof(TSKEY));
setSelectivityValue(pCtx, pBlock, pTuplePos, pBlock->info.rows);
@@ -5557,6 +5559,10 @@ int32_t blockDistFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
SColumnInfoData* pColInfo = taosArrayGet(pBlock->pDataBlock, 0);
+ if (pData->totalRows == 0) {
+ pData->minRows = 0;
+ }
+
int32_t row = 0;
char st[256] = {0};
double totalRawSize = pData->totalRows * pData->rowSize;
@@ -5568,10 +5574,14 @@ int32_t blockDistFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
varDataSetLen(st, len);
colDataAppend(pColInfo, row++, st, false);
+ int64_t avgRows = 0;
+ if (pData->numOfBlocks > 0) {
+ avgRows = pData->totalRows / pData->numOfBlocks;
+ }
+
len = sprintf(st + VARSTR_HEADER_SIZE,
"Total_Rows=[%" PRId64 "] Inmem_Rows=[%d] MinRows=[%d] MaxRows=[%d] Average_Rows=[%" PRId64 "]",
- pData->totalRows, pData->numOfInmemRows, pData->minRows, pData->maxRows,
- pData->totalRows / pData->numOfBlocks);
+ pData->totalRows, pData->numOfInmemRows, pData->minRows, pData->maxRows, avgRows);
varDataSetLen(st, len);
colDataAppend(pColInfo, row++, st, false);
@@ -5988,7 +5998,7 @@ int32_t lastrowFunction(SqlFunctionCtx* pCtx) {
SInputColumnInfoData* pInput = &pCtx->input;
SColumnInfoData* pInputCol = pInput->pData[0];
- int32_t type = pInputCol->info.type;
+ int32_t type = pInputCol->info.type;
int32_t bytes = pInputCol->info.bytes;
pInfo->bytes = bytes;
@@ -5999,7 +6009,7 @@ int32_t lastrowFunction(SqlFunctionCtx* pCtx) {
char* data = colDataGetData(pInputCol, i);
TSKEY cts = getRowPTs(pInput->pPTS, i);
- if (pResInfo->numOfRes == 0 || *(TSKEY*)(pInfo->buf + bytes) < cts) {
+ if (pResInfo->numOfRes == 0 || pInfo->ts < cts) {
if (colDataIsNull_s(pInputCol, i)) {
pInfo->isNull = true;
@@ -6012,8 +6022,7 @@ int32_t lastrowFunction(SqlFunctionCtx* pCtx) {
memcpy(pInfo->buf, data, bytes);
}
- *(TSKEY*)(pInfo->buf + bytes) = cts;
-
+ pInfo->ts = cts;
pInfo->hasResult = true;
pResInfo->numOfRes = 1;
diff --git a/source/libs/function/src/functionMgt.c b/source/libs/function/src/functionMgt.c
index ed82654f77..f73a61fa60 100644
--- a/source/libs/function/src/functionMgt.c
+++ b/source/libs/function/src/functionMgt.c
@@ -183,6 +183,8 @@ bool fmIsSystemInfoFunc(int32_t funcId) { return isSpecificClassifyFunc(funcId,
bool fmIsImplicitTsFunc(int32_t funcId) { return isSpecificClassifyFunc(funcId, FUNC_MGT_IMPLICIT_TS_FUNC); }
+bool fmIsClientPseudoColumnFunc(int32_t funcId) { return isSpecificClassifyFunc(funcId, FUNC_MGT_CLIENT_PC_FUNC); }
+
bool fmIsInterpFunc(int32_t funcId) {
if (funcId < 0 || funcId >= funcMgtBuiltinsNum) {
return false;
@@ -227,8 +229,8 @@ bool fmIsInvertible(int32_t funcId) {
case FUNCTION_TYPE_SUM:
case FUNCTION_TYPE_STDDEV:
case FUNCTION_TYPE_AVG:
- case FUNCTION_TYPE_WSTARTTS:
- case FUNCTION_TYPE_WENDTS:
+ case FUNCTION_TYPE_WSTART:
+ case FUNCTION_TYPE_WEND:
case FUNCTION_TYPE_WDURATION:
res = true;
break;
diff --git a/source/libs/nodes/src/nodesCloneFuncs.c b/source/libs/nodes/src/nodesCloneFuncs.c
index 6c0717e845..e7109b5a87 100644
--- a/source/libs/nodes/src/nodesCloneFuncs.c
+++ b/source/libs/nodes/src/nodesCloneFuncs.c
@@ -127,6 +127,7 @@ static int32_t valueNodeCopy(const SValueNode* pSrc, SValueNode* pDst) {
COPY_SCALAR_FIELD(isDuration);
COPY_SCALAR_FIELD(translate);
COPY_SCALAR_FIELD(notReserved);
+ COPY_SCALAR_FIELD(isNull);
COPY_SCALAR_FIELD(placeholderNo);
COPY_SCALAR_FIELD(typeData);
COPY_SCALAR_FIELD(unit);
diff --git a/source/libs/nodes/src/nodesCodeFuncs.c b/source/libs/nodes/src/nodesCodeFuncs.c
index 3c285cc7f1..a50df01d44 100644
--- a/source/libs/nodes/src/nodesCodeFuncs.c
+++ b/source/libs/nodes/src/nodesCodeFuncs.c
@@ -225,6 +225,8 @@ const char* nodesNodeName(ENodeType type) {
return "PhysiBlockDistScan";
case QUERY_NODE_PHYSICAL_PLAN_LAST_ROW_SCAN:
return "PhysiLastRowScan";
+ case QUERY_NODE_PHYSICAL_PLAN_TABLE_MERGE_SCAN:
+ return "PhysiTableMergeScan";
case QUERY_NODE_PHYSICAL_PLAN_PROJECT:
return "PhysiProject";
case QUERY_NODE_PHYSICAL_PLAN_MERGE_JOIN:
@@ -2712,6 +2714,7 @@ static const char* jkValueLiteral = "Literal";
static const char* jkValueDuration = "Duration";
static const char* jkValueTranslate = "Translate";
static const char* jkValueNotReserved = "NotReserved";
+static const char* jkValueIsNull = "IsNull";
static const char* jkValueDatum = "Datum";
static int32_t datumToJson(const void* pObj, SJson* pJson) {
@@ -2798,6 +2801,9 @@ static int32_t valueNodeToJson(const void* pObj, SJson* pJson) {
if (TSDB_CODE_SUCCESS == code) {
code = tjsonAddBoolToObject(pJson, jkValueNotReserved, pNode->notReserved);
}
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonAddBoolToObject(pJson, jkValueIsNull, pNode->isNull);
+ }
if (TSDB_CODE_SUCCESS == code && pNode->translate) {
code = datumToJson(pNode, pJson);
}
@@ -2945,6 +2951,9 @@ static int32_t jsonToValueNode(const SJson* pJson, void* pObj) {
if (TSDB_CODE_SUCCESS == code) {
code = tjsonGetBoolValue(pJson, jkValueNotReserved, &pNode->notReserved);
}
+ if (TSDB_CODE_SUCCESS == code) {
+ code = tjsonGetBoolValue(pJson, jkValueIsNull, &pNode->isNull);
+ }
if (TSDB_CODE_SUCCESS == code && pNode->translate) {
code = jsonToDatum(pJson, pNode);
}
diff --git a/source/libs/nodes/src/nodesUtilFuncs.c b/source/libs/nodes/src/nodesUtilFuncs.c
index 4abb8f5c2c..b00b08a66d 100644
--- a/source/libs/nodes/src/nodesUtilFuncs.c
+++ b/source/libs/nodes/src/nodesUtilFuncs.c
@@ -956,7 +956,6 @@ void nodesDestroyNode(SNode* pNode) {
}
case QUERY_NODE_PHYSICAL_SUBPLAN: {
SSubplan* pSubplan = (SSubplan*)pNode;
- // nodesDestroyList(pSubplan->pChildren);
nodesClearList(pSubplan->pChildren);
nodesDestroyNode((SNode*)pSubplan->pNode);
nodesDestroyNode((SNode*)pSubplan->pDataSink);
@@ -965,25 +964,9 @@ void nodesDestroyNode(SNode* pNode) {
nodesClearList(pSubplan->pParents);
break;
}
- case QUERY_NODE_PHYSICAL_PLAN: {
- SQueryPlan* pPlan = (SQueryPlan*)pNode;
- if (NULL != pPlan->pSubplans) {
- // only need to destroy the top-level subplans, because they will recurse to all the subplans below
- bool first = true;
- SNode* pElement = NULL;
- FOREACH(pElement, pPlan->pSubplans) {
- if (first) {
- // first = false;
- nodesDestroyNode(pElement);
- } else {
- nodesClearList(((SNodeListNode*)pElement)->pNodeList);
- taosMemoryFreeClear(pElement);
- }
- }
- nodesClearList(pPlan->pSubplans);
- }
+ case QUERY_NODE_PHYSICAL_PLAN:
+ nodesDestroyList(((SQueryPlan*)pNode)->pSubplans);
break;
- }
default:
break;
}
@@ -1709,6 +1692,11 @@ int32_t nodesGetOutputNumFromSlotList(SNodeList* pSlots) {
}
void nodesValueNodeToVariant(const SValueNode* pNode, SVariant* pVal) {
+ if (pNode->isNull) {
+ pVal->nType = TSDB_DATA_TYPE_NULL;
+ pVal->nLen = tDataTypes[TSDB_DATA_TYPE_NULL].bytes;
+ return;
+ }
pVal->nType = pNode->node.resType.type;
pVal->nLen = pNode->node.resType.bytes;
switch (pNode->node.resType.type) {
@@ -1789,7 +1777,7 @@ static EDealRes classifyConditionImpl(SNode* pNode, void* pContext) {
SClassifyConditionCxt* pCxt = (SClassifyConditionCxt*)pContext;
if (QUERY_NODE_COLUMN == nodeType(pNode)) {
SColumnNode* pCol = (SColumnNode*)pNode;
- if (PRIMARYKEY_TIMESTAMP_COL_ID == pCol->colId) {
+ if (PRIMARYKEY_TIMESTAMP_COL_ID == pCol->colId && TSDB_SYSTEM_TABLE != pCol->tableType) {
pCxt->hasPrimaryKey = true;
} else if (pCol->hasIndex) {
pCxt->hasTagIndexCol = true;
diff --git a/source/libs/parser/inc/sql.y b/source/libs/parser/inc/sql.y
index 606d35a65b..ddde20e8e9 100644
--- a/source/libs/parser/inc/sql.y
+++ b/source/libs/parser/inc/sql.y
@@ -520,7 +520,9 @@ cmd ::= DELETE FROM full_table_name(A) where_clause_opt(B).
cmd ::= query_expression(A). { pCxt->pRootNode = A; }
/************************************************ insert **************************************************************/
-cmd ::= INSERT INTO full_table_name(A) specific_cols_opt(B) query_expression(C). { pCxt->pRootNode = createInsertStmt(pCxt, A, B, C); }
+cmd ::= INSERT INTO full_table_name(A)
+ NK_LP col_name_list(B) NK_RP query_expression(C). { pCxt->pRootNode = createInsertStmt(pCxt, A, B, C); }
+cmd ::= INSERT INTO full_table_name(A) query_expression(B). { pCxt->pRootNode = createInsertStmt(pCxt, A, NULL, B); }
/************************************************ literal *************************************************************/
literal(A) ::= NK_INTEGER(B). { A = createRawExprNode(pCxt, &B, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &B)); }
@@ -675,10 +677,11 @@ column_reference(A) ::= table_name(B) NK_DOT column_name(C).
pseudo_column(A) ::= ROWTS(B). { A = createRawExprNode(pCxt, &B, createFunctionNode(pCxt, &B, NULL)); }
pseudo_column(A) ::= TBNAME(B). { A = createRawExprNode(pCxt, &B, createFunctionNode(pCxt, &B, NULL)); }
pseudo_column(A) ::= table_name(B) NK_DOT TBNAME(C). { A = createRawExprNodeExt(pCxt, &B, &C, createFunctionNode(pCxt, &C, createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &B)))); }
-pseudo_column(A) ::= QSTARTTS(B). { A = createRawExprNode(pCxt, &B, createFunctionNode(pCxt, &B, NULL)); }
-pseudo_column(A) ::= QENDTS(B). { A = createRawExprNode(pCxt, &B, createFunctionNode(pCxt, &B, NULL)); }
-pseudo_column(A) ::= WSTARTTS(B). { A = createRawExprNode(pCxt, &B, createFunctionNode(pCxt, &B, NULL)); }
-pseudo_column(A) ::= WENDTS(B). { A = createRawExprNode(pCxt, &B, createFunctionNode(pCxt, &B, NULL)); }
+pseudo_column(A) ::= QSTART(B). { A = createRawExprNode(pCxt, &B, createFunctionNode(pCxt, &B, NULL)); }
+pseudo_column(A) ::= QEND(B). { A = createRawExprNode(pCxt, &B, createFunctionNode(pCxt, &B, NULL)); }
+pseudo_column(A) ::= QDURATION(B). { A = createRawExprNode(pCxt, &B, createFunctionNode(pCxt, &B, NULL)); }
+pseudo_column(A) ::= WSTART(B). { A = createRawExprNode(pCxt, &B, createFunctionNode(pCxt, &B, NULL)); }
+pseudo_column(A) ::= WEND(B). { A = createRawExprNode(pCxt, &B, createFunctionNode(pCxt, &B, NULL)); }
pseudo_column(A) ::= WDURATION(B). { A = createRawExprNode(pCxt, &B, createFunctionNode(pCxt, &B, NULL)); }
function_expression(A) ::= function_name(B) NK_LP expression_list(C) NK_RP(D). { A = createRawExprNodeExt(pCxt, &B, &D, createFunctionNode(pCxt, &B, C)); }
diff --git a/source/libs/parser/src/parAstCreater.c b/source/libs/parser/src/parAstCreater.c
index c60e5541e0..a7806f5e34 100644
--- a/source/libs/parser/src/parAstCreater.c
+++ b/source/libs/parser/src/parAstCreater.c
@@ -598,7 +598,7 @@ SNode* createFillNode(SAstCreateContext* pCxt, EFillMode mode, SNode* pValues) {
nodesDestroyNode((SNode*)fill);
CHECK_OUT_OF_MEM(fill->pWStartTs);
}
- strcpy(((SFunctionNode*)fill->pWStartTs)->functionName, "_wstartts");
+ strcpy(((SFunctionNode*)fill->pWStartTs)->functionName, "_wstart");
return (SNode*)fill;
}
@@ -740,6 +740,7 @@ SNode* createSelectStmt(SAstCreateContext* pCxt, bool isDistinct, SNodeList* pPr
select->pFromTable = pTable;
sprintf(select->stmtName, "%p", select);
select->isTimeLineResult = true;
+ select->timeRange = TSWINDOW_INITIALIZER;
return (SNode*)select;
}
diff --git a/source/libs/parser/src/parCalcConst.c b/source/libs/parser/src/parCalcConst.c
index b799ae5fb1..68a60e0b35 100644
--- a/source/libs/parser/src/parCalcConst.c
+++ b/source/libs/parser/src/parCalcConst.c
@@ -166,7 +166,7 @@ static int32_t calcConstStmtCondition(SCalcConstContext* pCxt, SNode** pCond, bo
return code;
}
-static int32_t calcConstProject(SNode* pProject, SNode** pNew) {
+static int32_t calcConstProject(SNode* pProject, bool dual, SNode** pNew) {
SArray* pAssociation = NULL;
if (NULL != ((SExprNode*)pProject)->pAssociation) {
pAssociation = taosArrayDup(((SExprNode*)pProject)->pAssociation);
@@ -177,7 +177,12 @@ static int32_t calcConstProject(SNode* pProject, SNode** pNew) {
char aliasName[TSDB_COL_NAME_LEN] = {0};
strcpy(aliasName, ((SExprNode*)pProject)->aliasName);
- int32_t code = scalarCalculateConstants(pProject, pNew);
+ int32_t code = TSDB_CODE_SUCCESS;
+ if (dual) {
+ code = scalarCalculateConstantsFromDual(pProject, pNew);
+ } else {
+ code = scalarCalculateConstants(pProject, pNew);
+ }
if (TSDB_CODE_SUCCESS == code && QUERY_NODE_VALUE == nodeType(*pNew) && NULL != pAssociation) {
strcpy(((SExprNode*)*pNew)->aliasName, aliasName);
int32_t size = taosArrayGetSize(pAssociation);
@@ -223,7 +228,7 @@ static int32_t calcConstProjections(SCalcConstContext* pCxt, SSelectStmt* pSelec
continue;
}
SNode* pNew = NULL;
- int32_t code = calcConstProject(pProj, &pNew);
+ int32_t code = calcConstProject(pProj, (NULL == pSelect->pFromTable), &pNew);
if (TSDB_CODE_SUCCESS == code) {
REPLACE_NODE(pNew);
} else {
diff --git a/source/libs/parser/src/parTokenizer.c b/source/libs/parser/src/parTokenizer.c
index 58f6354402..0d176cef09 100644
--- a/source/libs/parser/src/parTokenizer.c
+++ b/source/libs/parser/src/parTokenizer.c
@@ -240,12 +240,13 @@ static SKeyword keywordTable[] = {
{"WITH", TK_WITH},
{"WRITE", TK_WRITE},
{"_C0", TK_ROWTS},
- {"_QENDTS", TK_QENDTS},
- {"_QSTARTTS", TK_QSTARTTS},
+ {"_QDURATION", TK_QDURATION},
+ {"_QEND", TK_QEND},
+ {"_QSTART", TK_QSTART},
{"_ROWTS", TK_ROWTS},
{"_WDURATION", TK_WDURATION},
- {"_WENDTS", TK_WENDTS},
- {"_WSTARTTS", TK_WSTARTTS},
+ {"_WEND", TK_WEND},
+ {"_WSTART", TK_WSTART},
// {"ID", TK_ID},
// {"STRING", TK_STRING},
// {"EQ", TK_EQ},
diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index ca000fcf2d..d12f1cfe7c 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -496,7 +496,7 @@ static bool isPrimaryKeyImpl(SNode* pExpr) {
SFunctionNode* pFunc = (SFunctionNode*)pExpr;
if (FUNCTION_TYPE_SELECT_VALUE == pFunc->funcType) {
return isPrimaryKeyImpl(nodesListGetNode(pFunc->pParameterList, 0));
- } else if (FUNCTION_TYPE_WSTARTTS == pFunc->funcType || FUNCTION_TYPE_WENDTS == pFunc->funcType) {
+ } else if (FUNCTION_TYPE_WSTART == pFunc->funcType || FUNCTION_TYPE_WEND == pFunc->funcType) {
return true;
}
}
@@ -916,8 +916,6 @@ static EDealRes translateValueImpl(STranslateContext* pCxt, SValueNode* pVal, SD
}
if (TSDB_DATA_TYPE_NULL == pVal->node.resType.type) {
- // TODO
- // pVal->node.resType = targetDt;
pVal->translate = true;
pVal->isNull = true;
return DEAL_RES_CONTINUE;
@@ -932,6 +930,7 @@ static EDealRes translateValueImpl(STranslateContext* pCxt, SValueNode* pVal, SD
res = translateNormalValue(pCxt, pVal, targetDt, strict);
}
pVal->node.resType = targetDt;
+ pVal->node.resType.scale = pVal->unit;
pVal->translate = true;
return res;
}
@@ -1198,7 +1197,7 @@ static void setFuncClassification(SNode* pCurrStmt, SFunctionNode* pFunc) {
}
}
-static int32_t rewriteSystemInfoFuncImpl(STranslateContext* pCxt, char* pLiteral, SNode** pNode) {
+static int32_t rewriteFuncToValue(STranslateContext* pCxt, char* pLiteral, SNode** pNode) {
SValueNode* pVal = (SValueNode*)nodesMakeNode(QUERY_NODE_VALUE);
if (NULL == pVal) {
return TSDB_CODE_OUT_OF_MEMORY;
@@ -1229,7 +1228,7 @@ static int32_t rewriteDatabaseFunc(STranslateContext* pCxt, SNode** pNode) {
return TSDB_CODE_OUT_OF_MEMORY;
}
}
- return rewriteSystemInfoFuncImpl(pCxt, pCurrDb, pNode);
+ return rewriteFuncToValue(pCxt, pCurrDb, pNode);
}
static int32_t rewriteClentVersionFunc(STranslateContext* pCxt, SNode** pNode) {
@@ -1237,7 +1236,7 @@ static int32_t rewriteClentVersionFunc(STranslateContext* pCxt, SNode** pNode) {
if (NULL == pVer) {
return TSDB_CODE_OUT_OF_MEMORY;
}
- return rewriteSystemInfoFuncImpl(pCxt, pVer, pNode);
+ return rewriteFuncToValue(pCxt, pVer, pNode);
}
static int32_t rewriteServerVersionFunc(STranslateContext* pCxt, SNode** pNode) {
@@ -1245,7 +1244,7 @@ static int32_t rewriteServerVersionFunc(STranslateContext* pCxt, SNode** pNode)
if (NULL == pVer) {
return TSDB_CODE_OUT_OF_MEMORY;
}
- return rewriteSystemInfoFuncImpl(pCxt, pVer, pNode);
+ return rewriteFuncToValue(pCxt, pVer, pNode);
}
static int32_t rewriteServerStatusFunc(STranslateContext* pCxt, SNode** pNode) {
@@ -1253,7 +1252,7 @@ static int32_t rewriteServerStatusFunc(STranslateContext* pCxt, SNode** pNode) {
return TSDB_CODE_RPC_NETWORK_UNAVAIL;
}
char* pStatus = taosMemoryStrDup((void*)"1");
- return rewriteSystemInfoFuncImpl(pCxt, pStatus, pNode);
+ return rewriteFuncToValue(pCxt, pStatus, pNode);
}
static int32_t rewriteUserFunc(STranslateContext* pCxt, SNode** pNode) {
@@ -1264,7 +1263,7 @@ static int32_t rewriteUserFunc(STranslateContext* pCxt, SNode** pNode) {
if (NULL == pUserConn) {
return TSDB_CODE_OUT_OF_MEMORY;
}
- return rewriteSystemInfoFuncImpl(pCxt, pUserConn, pNode);
+ return rewriteFuncToValue(pCxt, pUserConn, pNode);
}
static int32_t rewriteSystemInfoFunc(STranslateContext* pCxt, SNode** pNode) {
@@ -1318,10 +1317,60 @@ static int32_t translateNoramlFunction(STranslateContext* pCxt, SFunctionNode* p
return code;
}
+static int32_t rewriteQueryTimeFunc(STranslateContext* pCxt, int64_t val, SNode** pNode) {
+ if (INT64_MIN == val || INT64_MAX == val) {
+ return rewriteFuncToValue(pCxt, NULL, pNode);
+ }
+
+ char* pStr = taosMemoryCalloc(1, 20);
+ if (NULL == pStr) {
+ return TSDB_CODE_OUT_OF_MEMORY;
+ }
+ snprintf(pStr, 20, "%" PRId64 "", val);
+ return rewriteFuncToValue(pCxt, pStr, pNode);
+}
+
+static int32_t rewriteQstartFunc(STranslateContext* pCxt, SNode** pNode) {
+ return rewriteQueryTimeFunc(pCxt, ((SSelectStmt*)pCxt->pCurrStmt)->timeRange.skey, pNode);
+}
+
+static int32_t rewriteQendFunc(STranslateContext* pCxt, SNode** pNode) {
+ return rewriteQueryTimeFunc(pCxt, ((SSelectStmt*)pCxt->pCurrStmt)->timeRange.ekey, pNode);
+}
+
+static int32_t rewriteQdurationFunc(STranslateContext* pCxt, SNode** pNode) {
+ STimeWindow range = ((SSelectStmt*)pCxt->pCurrStmt)->timeRange;
+ if (INT64_MIN == range.skey || INT64_MAX == range.ekey) {
+ return rewriteQueryTimeFunc(pCxt, INT64_MIN, pNode);
+ }
+ return rewriteQueryTimeFunc(pCxt, range.ekey - range.skey + 1, pNode);
+}
+
+static int32_t rewriteClientPseudoColumnFunc(STranslateContext* pCxt, SNode** pNode) {
+ if (NULL == pCxt->pCurrStmt || QUERY_NODE_SELECT_STMT != nodeType(pCxt->pCurrStmt) ||
+ pCxt->currClause <= SQL_CLAUSE_WHERE) {
+ return generateSyntaxErrMsgExt(&pCxt->msgBuf, TSDB_CODE_PAR_NOT_ALLOWED_FUNC, "Illegal pseudo column");
+ }
+ switch (((SFunctionNode*)*pNode)->funcType) {
+ case FUNCTION_TYPE_QSTART:
+ return rewriteQstartFunc(pCxt, pNode);
+ case FUNCTION_TYPE_QEND:
+ return rewriteQendFunc(pCxt, pNode);
+ case FUNCTION_TYPE_QDURATION:
+ return rewriteQdurationFunc(pCxt, pNode);
+ default:
+ break;
+ }
+ return TSDB_CODE_PAR_INTERNAL_ERROR;
+}
+
static int32_t translateFunctionImpl(STranslateContext* pCxt, SFunctionNode** pFunc) {
if (fmIsSystemInfoFunc((*pFunc)->funcId)) {
return rewriteSystemInfoFunc(pCxt, (SNode**)pFunc);
}
+ if (fmIsClientPseudoColumnFunc((*pFunc)->funcId)) {
+ return rewriteClientPseudoColumnFunc(pCxt, (SNode**)pFunc);
+ }
return translateNoramlFunction(pCxt, *pFunc);
}
@@ -2078,7 +2127,7 @@ static int32_t getTimeRange(SNode** pPrimaryKeyCond, STimeWindow* pTimeRange, bo
return code;
}
-static int32_t getFillTimeRange(STranslateContext* pCxt, SNode* pWhere, STimeWindow* pTimeRange) {
+static int32_t getQueryTimeRange(STranslateContext* pCxt, SNode* pWhere, STimeWindow* pTimeRange) {
if (NULL == pWhere) {
*pTimeRange = TSWINDOW_INITIALIZER;
return TSDB_CODE_SUCCESS;
@@ -2139,16 +2188,13 @@ static int32_t checkFill(STranslateContext* pCxt, SFillNode* pFill, SValueNode*
return TSDB_CODE_SUCCESS;
}
-static int32_t translateFill(STranslateContext* pCxt, SNode* pWhere, SIntervalWindowNode* pInterval) {
+static int32_t translateFill(STranslateContext* pCxt, SSelectStmt* pSelect, SIntervalWindowNode* pInterval) {
if (NULL == pInterval->pFill) {
return TSDB_CODE_SUCCESS;
}
- int32_t code = getFillTimeRange(pCxt, pWhere, &(((SFillNode*)pInterval->pFill)->timeRange));
- if (TSDB_CODE_SUCCESS == code) {
- code = checkFill(pCxt, (SFillNode*)pInterval->pFill, (SValueNode*)pInterval->pInterval);
- }
- return code;
+ ((SFillNode*)pInterval->pFill)->timeRange = pSelect->timeRange;
+ return checkFill(pCxt, (SFillNode*)pInterval->pFill, (SValueNode*)pInterval->pInterval);
}
static int64_t getMonthsFromTimeVal(int64_t val, int32_t fromPrecision, char unit) {
@@ -2235,7 +2281,7 @@ static int32_t checkIntervalWindow(STranslateContext* pCxt, SIntervalWindowNode*
static int32_t translateIntervalWindow(STranslateContext* pCxt, SSelectStmt* pSelect, SIntervalWindowNode* pInterval) {
int32_t code = checkIntervalWindow(pCxt, pInterval);
if (TSDB_CODE_SUCCESS == code) {
- code = translateFill(pCxt, pSelect->pWhere, pInterval);
+ code = translateFill(pCxt, pSelect, pInterval);
}
return code;
}
@@ -2330,7 +2376,7 @@ static int32_t translateInterpFill(STranslateContext* pCxt, SSelectStmt* pSelect
code = translateExpr(pCxt, &pSelect->pFill);
}
if (TSDB_CODE_SUCCESS == code) {
- code = getFillTimeRange(pCxt, pSelect->pRange, &(((SFillNode*)pSelect->pFill)->timeRange));
+ code = getQueryTimeRange(pCxt, pSelect->pRange, &(((SFillNode*)pSelect->pFill)->timeRange));
}
if (TSDB_CODE_SUCCESS == code) {
code = checkFill(pCxt, (SFillNode*)pSelect->pFill, (SValueNode*)pSelect->pEvery);
@@ -2362,9 +2408,13 @@ static int32_t translatePartitionBy(STranslateContext* pCxt, SNodeList* pPartiti
return translateExprList(pCxt, pPartitionByList);
}
-static int32_t translateWhere(STranslateContext* pCxt, SNode** pWhere) {
+static int32_t translateWhere(STranslateContext* pCxt, SSelectStmt* pSelect) {
pCxt->currClause = SQL_CLAUSE_WHERE;
- return translateExpr(pCxt, pWhere);
+ int32_t code = translateExpr(pCxt, &pSelect->pWhere);
+ if (TSDB_CODE_SUCCESS == code) {
+ code = getQueryTimeRange(pCxt, pSelect->pWhere, &pSelect->timeRange);
+ }
+ return code;
}
static int32_t translateFrom(STranslateContext* pCxt, SNode* pTable) {
@@ -2495,7 +2545,7 @@ static int32_t translateSelectFrom(STranslateContext* pCxt, SSelectStmt* pSelect
int32_t code = translateFrom(pCxt, pSelect->pFromTable);
if (TSDB_CODE_SUCCESS == code) {
pSelect->precision = ((STableNode*)pSelect->pFromTable)->precision;
- code = translateWhere(pCxt, &pSelect->pWhere);
+ code = translateWhere(pCxt, pSelect);
}
if (TSDB_CODE_SUCCESS == code) {
code = translatePartitionBy(pCxt, pSelect->pPartitionByList);
@@ -2681,7 +2731,8 @@ static int32_t partitionDeleteWhere(STranslateContext* pCxt, SDeleteStmt* pDelet
}
static int32_t translateDeleteWhere(STranslateContext* pCxt, SDeleteStmt* pDelete) {
- int32_t code = translateWhere(pCxt, &pDelete->pWhere);
+ pCxt->currClause = SQL_CLAUSE_WHERE;
+ int32_t code = translateExpr(pCxt, &pDelete->pWhere);
if (TSDB_CODE_SUCCESS == code) {
code = partitionDeleteWhere(pCxt, pDelete);
}
@@ -3508,7 +3559,7 @@ static int32_t buildSampleAst(STranslateContext* pCxt, SSampleAstInfo* pInfo, ch
nodesDestroyNode((SNode*)pSelect);
return TSDB_CODE_OUT_OF_MEMORY;
}
- strcpy(pFunc->functionName, "_wstartts");
+ strcpy(pFunc->functionName, "_wstart");
nodesListPushFront(pSelect->pProjectionList, (SNode*)pFunc);
SNode* pProject = NULL;
FOREACH(pProject, pSelect->pProjectionList) { sprintf(((SExprNode*)pProject)->aliasName, "#%p", pProject); }
@@ -4334,14 +4385,14 @@ static int32_t addWstartTsToCreateStreamQuery(SNode* pStmt) {
SSelectStmt* pSelect = (SSelectStmt*)pStmt;
SNode* pProj = nodesListGetNode(pSelect->pProjectionList, 0);
if (NULL == pSelect->pWindow ||
- (QUERY_NODE_FUNCTION == nodeType(pProj) && 0 == strcmp("_wstartts", ((SFunctionNode*)pProj)->functionName))) {
+ (QUERY_NODE_FUNCTION == nodeType(pProj) && 0 == strcmp("_wstart", ((SFunctionNode*)pProj)->functionName))) {
return TSDB_CODE_SUCCESS;
}
SFunctionNode* pFunc = (SFunctionNode*)nodesMakeNode(QUERY_NODE_FUNCTION);
if (NULL == pFunc) {
return TSDB_CODE_OUT_OF_MEMORY;
}
- strcpy(pFunc->functionName, "_wstartts");
+ strcpy(pFunc->functionName, "_wstart");
strcpy(pFunc->node.aliasName, pFunc->functionName);
int32_t code = nodesListPushFront(pSelect->pProjectionList, (SNode*)pFunc);
if (TSDB_CODE_SUCCESS != code) {
diff --git a/source/libs/parser/src/parUtil.c b/source/libs/parser/src/parUtil.c
index dedd9cabfc..3484fa61c7 100644
--- a/source/libs/parser/src/parUtil.c
+++ b/source/libs/parser/src/parUtil.c
@@ -187,7 +187,7 @@ static char* getSyntaxErrFormat(int32_t errCode) {
case TSDB_CODE_PAR_FILL_NOT_ALLOWED_FUNC:
return "%s function is not supported in fill query";
case TSDB_CODE_PAR_INVALID_WINDOW_PC:
- return "_WSTARTTS, _WENDTS and _WDURATION can only be used in window query";
+ return "_WSTART, _WEND and _WDURATION can only be used in window query";
case TSDB_CODE_PAR_WINDOW_NOT_ALLOWED_FUNC:
return "%s function is not supported in time window query";
case TSDB_CODE_PAR_STREAM_NOT_ALLOWED_FUNC:
diff --git a/source/libs/parser/src/sql.c b/source/libs/parser/src/sql.c
index d01050ceeb..2200b43db1 100644
--- a/source/libs/parser/src/sql.c
+++ b/source/libs/parser/src/sql.c
@@ -104,26 +104,26 @@
#endif
/************* Begin control #defines *****************************************/
#define YYCODETYPE unsigned short int
-#define YYNOCODE 378
+#define YYNOCODE 379
#define YYACTIONTYPE unsigned short int
#define ParseTOKENTYPE SToken
typedef union {
int yyinit;
ParseTOKENTYPE yy0;
- EFillMode yy18;
- EJoinType yy36;
- ENullOrder yy109;
- EOperatorType yy128;
- bool yy173;
- SDataType yy196;
- EOrder yy218;
- SAlterOption yy389;
- int32_t yy424;
- SToken yy533;
- SNode* yy560;
- int64_t yy585;
- SNodeList* yy712;
- int8_t yy719;
+ EOrder yy58;
+ bool yy151;
+ int8_t yy285;
+ SNodeList* yy356;
+ SToken yy361;
+ SAlterOption yy409;
+ int64_t yy457;
+ EFillMode yy494;
+ EJoinType yy504;
+ EOperatorType yy526;
+ SDataType yy600;
+ ENullOrder yy613;
+ SNode* yy616;
+ int32_t yy734;
} YYMINORTYPE;
#ifndef YYSTACKDEPTH
#define YYSTACKDEPTH 100
@@ -139,17 +139,17 @@ typedef union {
#define ParseCTX_FETCH
#define ParseCTX_STORE
#define YYFALLBACK 1
-#define YYNSTATE 666
-#define YYNRULE 489
-#define YYNTOKEN 255
-#define YY_MAX_SHIFT 665
-#define YY_MIN_SHIFTREDUCE 970
-#define YY_MAX_SHIFTREDUCE 1458
-#define YY_ERROR_ACTION 1459
-#define YY_ACCEPT_ACTION 1460
-#define YY_NO_ACTION 1461
-#define YY_MIN_REDUCE 1462
-#define YY_MAX_REDUCE 1950
+#define YYNSTATE 669
+#define YYNRULE 491
+#define YYNTOKEN 256
+#define YY_MAX_SHIFT 668
+#define YY_MIN_SHIFTREDUCE 974
+#define YY_MAX_SHIFTREDUCE 1464
+#define YY_ERROR_ACTION 1465
+#define YY_ACCEPT_ACTION 1466
+#define YY_NO_ACTION 1467
+#define YY_MIN_REDUCE 1468
+#define YY_MAX_REDUCE 1958
/************* End control #defines *******************************************/
#define YY_NLOOKAHEAD ((int)(sizeof(yy_lookahead)/sizeof(yy_lookahead[0])))
@@ -216,648 +216,694 @@ typedef union {
** yy_default[] Default action for each state.
**
*********** Begin parsing tables **********************************************/
-#define YY_ACTTAB_COUNT (2318)
+#define YY_ACTTAB_COUNT (2547)
static const YYACTIONTYPE yy_action[] = {
- /* 0 */ 529, 1700, 433, 552, 434, 1497, 441, 1589, 434, 1497,
- /* 10 */ 1772, 113, 39, 37, 386, 62, 517, 1585, 471, 380,
- /* 20 */ 338, 1768, 1259, 1003, 324, 79, 1785, 1697, 1600, 30,
- /* 30 */ 260, 122, 143, 1335, 103, 1257, 1556, 102, 101, 100,
- /* 40 */ 99, 98, 97, 96, 95, 94, 1593, 1764, 1770, 327,
- /* 50 */ 71, 302, 557, 1928, 1803, 555, 1330, 1514, 1285, 574,
- /* 60 */ 1928, 14, 581, 1007, 1008, 500, 1927, 1754, 1265, 580,
- /* 70 */ 1925, 120, 1596, 159, 39, 37, 1398, 1925, 498, 487,
- /* 80 */ 496, 529, 338, 557, 1259, 1, 250, 1870, 551, 1020,
- /* 90 */ 550, 1019, 164, 1928, 1816, 1335, 61, 1257, 89, 1786,
- /* 100 */ 583, 1788, 1789, 579, 469, 574, 161, 662, 1862, 1600,
- /* 110 */ 1925, 343, 305, 1858, 1645, 1647, 71, 61, 1330, 1021,
- /* 120 */ 43, 1337, 1338, 14, 1928, 1463, 1928, 33, 32, 117,
- /* 130 */ 1265, 40, 38, 36, 35, 34, 475, 161, 1595, 160,
- /* 140 */ 142, 1925, 1474, 1925, 1485, 1785, 103, 2, 214, 102,
- /* 150 */ 101, 100, 99, 98, 97, 96, 95, 94, 474, 1156,
- /* 160 */ 1157, 486, 485, 484, 170, 1928, 1260, 483, 1258, 662,
- /* 170 */ 118, 480, 325, 1803, 479, 478, 477, 1460, 1926, 74,
- /* 180 */ 140, 556, 1925, 1337, 1338, 1754, 1754, 555, 580, 1602,
- /* 190 */ 1646, 1647, 69, 1263, 1264, 68, 1313, 1314, 1316, 1317,
- /* 200 */ 1318, 1319, 1320, 576, 572, 1328, 1329, 1331, 1332, 1333,
- /* 210 */ 1334, 1336, 1339, 1816, 36, 35, 34, 90, 1786, 583,
- /* 220 */ 1788, 1789, 579, 529, 574, 162, 371, 1862, 1260, 555,
- /* 230 */ 1258, 329, 1858, 154, 113, 419, 162, 350, 1484, 33,
- /* 240 */ 32, 476, 450, 40, 38, 36, 35, 34, 373, 369,
- /* 250 */ 1285, 1600, 552, 1889, 1395, 1263, 1264, 162, 1313, 1314,
- /* 260 */ 1316, 1317, 1318, 1319, 1320, 576, 572, 1328, 1329, 1331,
- /* 270 */ 1332, 1333, 1334, 1336, 1339, 39, 37, 1455, 1928, 1754,
- /* 280 */ 122, 174, 173, 338, 220, 1259, 40, 38, 36, 35,
- /* 290 */ 34, 159, 306, 61, 42, 1925, 1335, 1741, 1257, 1114,
- /* 300 */ 605, 604, 603, 1118, 602, 1120, 1121, 601, 1123, 598,
- /* 310 */ 1803, 1129, 595, 1131, 1132, 592, 589, 1298, 545, 1330,
- /* 320 */ 120, 1785, 33, 32, 14, 1357, 40, 38, 36, 35,
- /* 330 */ 34, 1265, 39, 37, 554, 155, 1870, 1871, 86, 1875,
- /* 340 */ 338, 552, 1259, 1772, 359, 1652, 1239, 1240, 2, 1803,
- /* 350 */ 341, 119, 326, 1335, 1768, 1257, 544, 581, 140, 1592,
- /* 360 */ 344, 1650, 1754, 529, 580, 1402, 1454, 1602, 140, 122,
- /* 370 */ 662, 1284, 1284, 379, 165, 378, 1330, 1602, 557, 1358,
- /* 380 */ 1764, 1770, 333, 1578, 1337, 1338, 1462, 432, 1265, 1816,
- /* 390 */ 436, 1600, 574, 89, 1786, 583, 1788, 1789, 579, 1483,
- /* 400 */ 574, 440, 1363, 1862, 436, 8, 215, 305, 1858, 120,
- /* 410 */ 112, 111, 110, 109, 108, 107, 106, 105, 104, 1928,
- /* 420 */ 482, 481, 632, 630, 156, 1870, 1871, 662, 1875, 1260,
- /* 430 */ 208, 1258, 159, 162, 162, 61, 1925, 75, 516, 1482,
- /* 440 */ 1754, 1337, 1338, 450, 29, 336, 1352, 1353, 1354, 1355,
- /* 450 */ 1356, 1360, 1361, 1362, 1481, 315, 1263, 1264, 546, 1313,
- /* 460 */ 1314, 1316, 1317, 1318, 1319, 1320, 576, 572, 1328, 1329,
- /* 470 */ 1331, 1332, 1333, 1334, 1336, 1339, 1394, 33, 32, 1928,
- /* 480 */ 1754, 40, 38, 36, 35, 34, 1260, 1359, 1258, 73,
- /* 490 */ 304, 1652, 159, 519, 541, 1754, 1925, 33, 32, 348,
- /* 500 */ 1286, 40, 38, 36, 35, 34, 316, 1651, 314, 313,
- /* 510 */ 1364, 473, 616, 1263, 1264, 475, 1313, 1314, 1316, 1317,
- /* 520 */ 1318, 1319, 1320, 576, 572, 1328, 1329, 1331, 1332, 1333,
- /* 530 */ 1334, 1336, 1339, 39, 37, 1340, 438, 474, 1007, 1008,
- /* 540 */ 1928, 338, 1282, 1259, 1785, 162, 1877, 1480, 1315, 1020,
- /* 550 */ 306, 1019, 27, 159, 1335, 1429, 1257, 1925, 1591, 33,
- /* 560 */ 32, 221, 222, 40, 38, 36, 35, 34, 1287, 1768,
- /* 570 */ 1874, 552, 1803, 547, 542, 162, 1576, 1330, 1283, 1021,
- /* 580 */ 556, 529, 529, 1357, 153, 1754, 1479, 580, 1754, 1265,
- /* 590 */ 39, 37, 384, 385, 22, 1764, 1770, 1639, 338, 122,
- /* 600 */ 1259, 1524, 1076, 11, 10, 140, 9, 574, 1652, 1600,
- /* 610 */ 1600, 1335, 1816, 1257, 1603, 342, 90, 1786, 583, 1788,
- /* 620 */ 1789, 579, 304, 574, 1650, 519, 1862, 1754, 662, 529,
- /* 630 */ 329, 1858, 154, 252, 1330, 1078, 616, 1358, 1877, 120,
- /* 640 */ 389, 1557, 1337, 1338, 158, 1345, 1265, 1696, 1690, 299,
- /* 650 */ 517, 1284, 1888, 1265, 157, 1870, 1871, 1600, 1875, 172,
- /* 660 */ 1363, 1698, 1873, 9, 639, 638, 637, 636, 346, 1587,
- /* 670 */ 635, 634, 633, 123, 628, 627, 626, 625, 624, 623,
- /* 680 */ 622, 621, 133, 617, 1527, 662, 1284, 1260, 1371, 1258,
- /* 690 */ 33, 32, 1877, 1478, 40, 38, 36, 35, 34, 1337,
- /* 700 */ 1338, 232, 29, 336, 1352, 1353, 1354, 1355, 1356, 1360,
- /* 710 */ 1361, 1362, 7, 1477, 1263, 1264, 1872, 1313, 1314, 1316,
- /* 720 */ 1317, 1318, 1319, 1320, 576, 572, 1328, 1329, 1331, 1332,
- /* 730 */ 1333, 1334, 1336, 1339, 1754, 33, 32, 1882, 1391, 40,
- /* 740 */ 38, 36, 35, 34, 1260, 561, 1258, 486, 485, 484,
- /* 750 */ 44, 4, 1259, 483, 1754, 272, 118, 480, 1630, 608,
- /* 760 */ 479, 478, 477, 1476, 619, 1257, 1419, 1695, 1409, 299,
- /* 770 */ 612, 1263, 1264, 1643, 1313, 1314, 1316, 1317, 1318, 1319,
- /* 780 */ 1320, 576, 572, 1328, 1329, 1331, 1332, 1333, 1334, 1336,
- /* 790 */ 1339, 39, 37, 301, 613, 1282, 614, 1643, 1265, 338,
- /* 800 */ 1583, 1259, 412, 1785, 1754, 424, 1268, 538, 1417, 1418,
- /* 810 */ 1420, 1421, 1335, 1298, 1257, 131, 130, 611, 610, 609,
- /* 820 */ 11, 10, 397, 529, 425, 211, 399, 631, 1315, 529,
- /* 830 */ 529, 1803, 529, 1473, 404, 1330, 620, 662, 1572, 581,
- /* 840 */ 405, 449, 26, 1597, 1754, 59, 580, 1265, 33, 32,
- /* 850 */ 1509, 1600, 40, 38, 36, 35, 34, 1600, 1600, 390,
- /* 860 */ 1600, 33, 32, 1315, 2, 40, 38, 36, 35, 34,
- /* 870 */ 374, 1816, 489, 570, 1754, 91, 1786, 583, 1788, 1789,
- /* 880 */ 579, 28, 574, 1457, 1458, 1862, 662, 33, 32, 1861,
- /* 890 */ 1858, 40, 38, 36, 35, 34, 1260, 1391, 1258, 423,
- /* 900 */ 1337, 1338, 418, 417, 416, 415, 414, 411, 410, 409,
- /* 910 */ 408, 407, 403, 402, 401, 400, 394, 393, 392, 391,
- /* 920 */ 575, 388, 387, 1263, 1264, 529, 564, 529, 1507, 141,
- /* 930 */ 1472, 529, 199, 529, 278, 197, 1729, 201, 510, 1271,
- /* 940 */ 200, 1047, 514, 194, 527, 1260, 562, 1258, 276, 58,
- /* 950 */ 492, 203, 57, 1600, 202, 1600, 607, 146, 502, 1600,
- /* 960 */ 509, 1600, 467, 463, 459, 455, 193, 1785, 177, 429,
- /* 970 */ 427, 1754, 1263, 1264, 1048, 1313, 1314, 1316, 1317, 1318,
- /* 980 */ 1319, 1320, 576, 572, 1328, 1329, 1331, 1332, 1333, 1334,
- /* 990 */ 1336, 1339, 335, 334, 72, 1803, 61, 191, 529, 1928,
- /* 1000 */ 529, 205, 1273, 581, 204, 1349, 139, 1475, 1754, 528,
- /* 1010 */ 580, 261, 159, 1335, 1773, 1266, 1925, 52, 513, 529,
- /* 1020 */ 255, 539, 85, 468, 1471, 1768, 1600, 1470, 1600, 1267,
- /* 1030 */ 345, 1469, 82, 41, 88, 1816, 1330, 1577, 1468, 90,
- /* 1040 */ 1786, 583, 1788, 1789, 579, 1785, 574, 1600, 1265, 1862,
- /* 1050 */ 1467, 1764, 1770, 329, 1858, 1941, 1503, 503, 244, 190,
- /* 1060 */ 183, 1575, 188, 574, 1896, 1754, 446, 1466, 1754, 66,
- /* 1070 */ 65, 383, 1754, 1803, 169, 1465, 1207, 1804, 347, 1754,
- /* 1080 */ 377, 581, 219, 125, 559, 181, 1754, 569, 580, 1775,
- /* 1090 */ 1498, 1754, 1640, 300, 128, 129, 367, 50, 365, 361,
- /* 1100 */ 357, 166, 352, 349, 657, 1892, 236, 50, 1754, 41,
- /* 1110 */ 249, 553, 254, 1816, 257, 259, 1754, 90, 1786, 583,
- /* 1120 */ 1788, 1789, 579, 1785, 574, 223, 522, 1862, 1777, 565,
- /* 1130 */ 80, 329, 1858, 1941, 614, 3, 162, 229, 1107, 41,
- /* 1140 */ 1416, 53, 1919, 5, 351, 1282, 1274, 354, 1269, 239,
- /* 1150 */ 1365, 1803, 1321, 131, 130, 611, 610, 609, 614, 581,
- /* 1160 */ 587, 128, 1270, 358, 1754, 1785, 580, 311, 1076, 129,
- /* 1170 */ 114, 128, 312, 1277, 1279, 1223, 268, 131, 130, 611,
- /* 1180 */ 610, 609, 271, 406, 572, 1328, 1329, 1331, 1332, 1333,
- /* 1190 */ 1334, 1816, 1692, 1803, 171, 90, 1786, 583, 1788, 1789,
- /* 1200 */ 579, 581, 574, 1135, 1139, 1862, 1754, 413, 580, 329,
- /* 1210 */ 1858, 1941, 1146, 1144, 132, 421, 426, 420, 422, 428,
- /* 1220 */ 1881, 430, 557, 1288, 431, 439, 1785, 180, 1291, 442,
- /* 1230 */ 443, 182, 1290, 1816, 444, 1292, 1785, 285, 1786, 583,
- /* 1240 */ 1788, 1789, 579, 445, 574, 491, 185, 447, 1289, 187,
- /* 1250 */ 448, 189, 70, 451, 1803, 192, 470, 472, 1590, 196,
- /* 1260 */ 501, 1586, 581, 1928, 1803, 303, 1734, 1754, 93, 580,
- /* 1270 */ 198, 209, 581, 269, 207, 134, 161, 1754, 135, 580,
- /* 1280 */ 1925, 1588, 504, 557, 1584, 136, 137, 508, 494, 505,
- /* 1290 */ 212, 511, 488, 1785, 1816, 515, 216, 206, 285, 1786,
- /* 1300 */ 583, 1788, 1789, 579, 1816, 574, 537, 1785, 91, 1786,
- /* 1310 */ 583, 1788, 1789, 579, 126, 574, 518, 1733, 1862, 1702,
- /* 1320 */ 321, 1803, 568, 1858, 1928, 56, 520, 523, 55, 578,
- /* 1330 */ 323, 127, 524, 525, 1754, 1803, 580, 159, 225, 227,
- /* 1340 */ 270, 1925, 1601, 581, 78, 1287, 533, 540, 1754, 535,
- /* 1350 */ 580, 234, 1893, 1903, 536, 1902, 238, 1785, 328, 543,
- /* 1360 */ 6, 1816, 1884, 549, 534, 293, 1786, 583, 1788, 1789,
- /* 1370 */ 579, 577, 574, 571, 1834, 1816, 243, 1785, 148, 144,
- /* 1380 */ 1786, 583, 1788, 1789, 579, 1803, 574, 532, 531, 248,
- /* 1390 */ 1391, 245, 246, 581, 121, 247, 1286, 1878, 1754, 566,
- /* 1400 */ 580, 563, 48, 330, 253, 1803, 1924, 1573, 1644, 273,
- /* 1410 */ 322, 658, 585, 581, 560, 1944, 1843, 264, 1754, 661,
- /* 1420 */ 580, 51, 659, 558, 1942, 1816, 147, 277, 256, 91,
- /* 1430 */ 1786, 583, 1788, 1789, 579, 1748, 574, 286, 275, 1862,
- /* 1440 */ 567, 258, 296, 1785, 1859, 1816, 63, 295, 1747, 294,
- /* 1450 */ 1786, 583, 1788, 1789, 579, 1785, 574, 1746, 64, 1745,
- /* 1460 */ 353, 1742, 355, 1251, 356, 1785, 1252, 167, 360, 1740,
- /* 1470 */ 364, 1803, 362, 363, 1739, 366, 530, 1738, 368, 581,
- /* 1480 */ 1737, 1736, 370, 1803, 1754, 1719, 580, 372, 168, 375,
- /* 1490 */ 376, 581, 1226, 1803, 1225, 1713, 1754, 1712, 580, 381,
- /* 1500 */ 382, 581, 1711, 1710, 1195, 1685, 1754, 1684, 580, 1683,
- /* 1510 */ 67, 1816, 1682, 1681, 1680, 294, 1786, 583, 1788, 1789,
- /* 1520 */ 579, 1785, 574, 1816, 1679, 1678, 396, 289, 1786, 583,
- /* 1530 */ 1788, 1789, 579, 1816, 574, 1785, 395, 144, 1786, 583,
- /* 1540 */ 1788, 1789, 579, 1677, 574, 398, 1676, 1675, 1674, 1803,
- /* 1550 */ 124, 1662, 1661, 1660, 1659, 1658, 1657, 578, 1673, 1672,
- /* 1560 */ 1671, 1670, 1754, 1803, 580, 548, 1669, 1668, 337, 1667,
- /* 1570 */ 1666, 581, 1665, 1664, 1663, 1656, 1754, 1655, 580, 1197,
- /* 1580 */ 1654, 1653, 1943, 1529, 175, 1528, 176, 1526, 1785, 1816,
- /* 1590 */ 1494, 178, 1010, 293, 1786, 583, 1788, 1789, 579, 1493,
- /* 1600 */ 574, 115, 1835, 1816, 179, 1009, 152, 294, 1786, 583,
- /* 1610 */ 1788, 1789, 579, 665, 574, 453, 1803, 435, 116, 1727,
- /* 1620 */ 1721, 339, 437, 1709, 581, 184, 1708, 267, 186, 1754,
- /* 1630 */ 1785, 580, 1694, 1579, 1525, 1523, 452, 454, 1521, 456,
- /* 1640 */ 457, 151, 1519, 460, 1785, 458, 655, 651, 647, 643,
- /* 1650 */ 265, 1040, 461, 462, 1517, 466, 1816, 464, 1803, 465,
- /* 1660 */ 294, 1786, 583, 1788, 1789, 579, 581, 574, 1506, 1505,
- /* 1670 */ 1490, 1754, 1803, 580, 1581, 1150, 49, 1149, 87, 1580,
- /* 1680 */ 581, 230, 1075, 1074, 195, 1754, 1073, 580, 1072, 629,
- /* 1690 */ 1515, 1069, 631, 1068, 1067, 1066, 1510, 317, 1816, 318,
- /* 1700 */ 1508, 490, 279, 1786, 583, 1788, 1789, 579, 1785, 574,
- /* 1710 */ 319, 493, 1816, 1489, 526, 495, 280, 1786, 583, 1788,
- /* 1720 */ 1789, 579, 1488, 574, 497, 1487, 499, 92, 1726, 1233,
- /* 1730 */ 1785, 1720, 506, 1707, 1705, 1706, 1803, 54, 1704, 1703,
- /* 1740 */ 1701, 1693, 226, 231, 581, 82, 217, 213, 507, 1754,
- /* 1750 */ 1785, 580, 218, 320, 41, 16, 15, 512, 1803, 1431,
- /* 1760 */ 138, 521, 228, 224, 47, 242, 581, 1231, 76, 210,
- /* 1770 */ 77, 1754, 23, 580, 17, 241, 1816, 1243, 1803, 235,
- /* 1780 */ 281, 1786, 583, 1788, 1789, 579, 581, 574, 1413, 1775,
- /* 1790 */ 233, 1754, 1785, 580, 237, 25, 251, 145, 1816, 46,
- /* 1800 */ 1415, 240, 288, 1786, 583, 1788, 1789, 579, 1785, 574,
- /* 1810 */ 1408, 24, 81, 1774, 149, 1388, 1387, 18, 1816, 1443,
- /* 1820 */ 1803, 1442, 290, 1786, 583, 1788, 1789, 579, 581, 574,
- /* 1830 */ 45, 1448, 1437, 1754, 331, 580, 1803, 1447, 13, 1446,
- /* 1840 */ 332, 10, 1275, 19, 581, 1819, 1306, 1325, 573, 1754,
- /* 1850 */ 1323, 580, 1322, 150, 1350, 31, 12, 20, 163, 582,
- /* 1860 */ 1816, 1785, 21, 586, 282, 1786, 583, 1788, 1789, 579,
- /* 1870 */ 340, 574, 584, 1785, 1136, 588, 1816, 1133, 590, 591,
- /* 1880 */ 291, 1786, 583, 1788, 1789, 579, 593, 574, 594, 1803,
- /* 1890 */ 596, 599, 1130, 1113, 1124, 597, 600, 581, 1128, 1122,
- /* 1900 */ 83, 1803, 1754, 84, 580, 1127, 1126, 1125, 1145, 581,
- /* 1910 */ 262, 606, 60, 1141, 1754, 1785, 580, 1063, 1082, 1038,
- /* 1920 */ 615, 618, 263, 1061, 1060, 1785, 1056, 1059, 1058, 1816,
- /* 1930 */ 1057, 1055, 1054, 283, 1786, 583, 1788, 1789, 579, 1785,
- /* 1940 */ 574, 1816, 1079, 1803, 1077, 292, 1786, 583, 1788, 1789,
- /* 1950 */ 579, 581, 574, 1803, 1051, 1050, 1754, 1049, 580, 1046,
- /* 1960 */ 1045, 581, 1044, 1043, 1522, 640, 1754, 1803, 580, 1520,
- /* 1970 */ 641, 642, 644, 645, 646, 581, 1518, 648, 649, 1516,
- /* 1980 */ 1754, 652, 580, 1816, 650, 653, 654, 284, 1786, 583,
- /* 1990 */ 1788, 1789, 579, 1816, 574, 1785, 1504, 297, 1786, 583,
- /* 2000 */ 1788, 1789, 579, 656, 574, 1785, 1000, 1816, 1486, 266,
- /* 2010 */ 660, 298, 1786, 583, 1788, 1789, 579, 1785, 574, 1261,
- /* 2020 */ 274, 663, 664, 1803, 1461, 1461, 1461, 1461, 1461, 1461,
- /* 2030 */ 1461, 581, 1461, 1803, 1461, 1461, 1754, 1461, 580, 1461,
- /* 2040 */ 1461, 581, 1461, 1461, 1461, 1803, 1754, 1461, 580, 1461,
- /* 2050 */ 1461, 1461, 1461, 581, 1461, 1461, 1461, 1461, 1754, 1461,
- /* 2060 */ 580, 1461, 1461, 1816, 1461, 1461, 1461, 1797, 1786, 583,
- /* 2070 */ 1788, 1789, 579, 1816, 574, 1461, 1461, 1796, 1786, 583,
- /* 2080 */ 1788, 1789, 579, 1785, 574, 1816, 1461, 1461, 1461, 1795,
- /* 2090 */ 1786, 583, 1788, 1789, 579, 1785, 574, 1461, 1461, 1461,
- /* 2100 */ 1461, 1461, 1461, 1461, 1461, 1461, 1461, 1461, 1461, 1461,
- /* 2110 */ 1461, 1803, 1461, 1461, 1461, 1461, 1461, 1461, 1461, 581,
- /* 2120 */ 1461, 1461, 1461, 1803, 1754, 1461, 580, 1461, 1461, 1461,
- /* 2130 */ 1461, 581, 1461, 1461, 1461, 1461, 1754, 1461, 580, 1461,
- /* 2140 */ 1461, 1461, 1461, 1461, 1461, 1461, 1461, 1461, 1785, 1461,
- /* 2150 */ 1461, 1816, 1461, 1461, 1461, 309, 1786, 583, 1788, 1789,
- /* 2160 */ 579, 1461, 574, 1816, 1461, 1461, 1461, 308, 1786, 583,
- /* 2170 */ 1788, 1789, 579, 1461, 574, 1461, 1803, 1461, 1461, 1461,
- /* 2180 */ 1461, 1461, 1461, 1461, 581, 1461, 1461, 1461, 1461, 1754,
- /* 2190 */ 1461, 580, 1461, 1461, 1461, 1461, 1461, 1461, 1785, 1461,
- /* 2200 */ 1461, 1461, 1461, 1461, 1461, 1461, 1461, 1461, 1785, 1461,
- /* 2210 */ 552, 1461, 1461, 1461, 1461, 1461, 1816, 1461, 1461, 1461,
- /* 2220 */ 310, 1786, 583, 1788, 1789, 579, 1803, 574, 1461, 1461,
- /* 2230 */ 1461, 1461, 1461, 1461, 581, 1461, 1803, 1461, 122, 1754,
- /* 2240 */ 1461, 580, 1461, 1461, 581, 1461, 1461, 1461, 1461, 1754,
- /* 2250 */ 1461, 580, 1461, 1461, 1461, 1461, 1461, 1461, 1461, 557,
- /* 2260 */ 1461, 1461, 1461, 1461, 1461, 1461, 1816, 1461, 1461, 1461,
- /* 2270 */ 307, 1786, 583, 1788, 1789, 579, 1816, 574, 120, 1461,
- /* 2280 */ 287, 1786, 583, 1788, 1789, 579, 1461, 574, 1461, 1461,
- /* 2290 */ 1461, 1461, 1461, 250, 1870, 551, 1461, 550, 1461, 1461,
- /* 2300 */ 1928, 1461, 1461, 1461, 1461, 1461, 1461, 1461, 1461, 1461,
- /* 2310 */ 1461, 1461, 1461, 159, 1461, 1461, 1461, 1925,
+ /* 0 */ 532, 73, 1466, 436, 555, 437, 1503, 327, 520, 73,
+ /* 10 */ 1658, 115, 39, 37, 119, 142, 326, 312, 474, 1703,
+ /* 20 */ 340, 1469, 1264, 1601, 1608, 145, 1656, 555, 1606, 1562,
+ /* 30 */ 1810, 1602, 124, 1341, 444, 1262, 437, 1503, 548, 558,
+ /* 40 */ 345, 389, 105, 1651, 1653, 104, 103, 102, 101, 100,
+ /* 50 */ 99, 98, 97, 96, 81, 124, 1336, 1491, 1792, 33,
+ /* 60 */ 32, 14, 353, 40, 38, 36, 35, 34, 1270, 39,
+ /* 70 */ 37, 1404, 122, 558, 558, 1599, 547, 340, 303, 1264,
+ /* 80 */ 1936, 1290, 144, 1936, 1480, 1, 1810, 158, 1878, 1879,
+ /* 90 */ 1341, 1883, 1262, 162, 584, 122, 1935, 1933, 1761, 1761,
+ /* 100 */ 1933, 583, 435, 1936, 64, 439, 1289, 665, 532, 557,
+ /* 110 */ 157, 1878, 1879, 1336, 1883, 560, 161, 1290, 14, 55,
+ /* 120 */ 1933, 1343, 1344, 30, 261, 1270, 1824, 131, 155, 221,
+ /* 130 */ 91, 1793, 586, 1795, 1796, 582, 1606, 577, 43, 42,
+ /* 140 */ 1870, 1645, 2, 105, 306, 1866, 104, 103, 102, 101,
+ /* 150 */ 100, 99, 98, 97, 96, 343, 1936, 40, 38, 36,
+ /* 160 */ 35, 34, 1080, 142, 665, 63, 1265, 195, 1263, 163,
+ /* 170 */ 54, 63, 1608, 1933, 383, 519, 351, 443, 1343, 1344,
+ /* 180 */ 439, 148, 1160, 1161, 1401, 63, 470, 466, 462, 458,
+ /* 190 */ 194, 1243, 1244, 1268, 1269, 1082, 1318, 1319, 1321, 1322,
+ /* 200 */ 1323, 1324, 1325, 1326, 579, 575, 1334, 1335, 1337, 1338,
+ /* 210 */ 1339, 1340, 1342, 1345, 1936, 1936, 1936, 1936, 74, 1652,
+ /* 220 */ 1653, 192, 1024, 1265, 1023, 1263, 164, 162, 161, 161,
+ /* 230 */ 161, 1933, 1933, 1933, 1933, 33, 32, 350, 63, 40,
+ /* 240 */ 38, 36, 35, 34, 1490, 382, 171, 381, 555, 564,
+ /* 250 */ 1268, 1269, 1025, 1318, 1319, 1321, 1322, 1323, 1324, 1325,
+ /* 260 */ 1326, 579, 575, 1334, 1335, 1337, 1338, 1339, 1340, 1342,
+ /* 270 */ 1345, 39, 37, 1468, 71, 1289, 124, 70, 1936, 340,
+ /* 280 */ 164, 1264, 1792, 191, 184, 1761, 189, 1584, 307, 49,
+ /* 290 */ 449, 161, 1341, 453, 1262, 1933, 532, 114, 113, 112,
+ /* 300 */ 111, 110, 109, 108, 107, 106, 164, 115, 1289, 182,
+ /* 310 */ 1810, 1489, 164, 1303, 479, 1336, 122, 1936, 559, 505,
+ /* 320 */ 14, 1363, 1488, 1761, 1606, 583, 164, 1270, 39, 37,
+ /* 330 */ 1934, 159, 1878, 1879, 1933, 1883, 340, 532, 1264, 1530,
+ /* 340 */ 317, 485, 484, 1425, 2, 478, 1658, 453, 166, 1341,
+ /* 350 */ 1824, 1262, 1761, 328, 92, 1793, 586, 1795, 1796, 582,
+ /* 360 */ 1936, 577, 1656, 1761, 1870, 1606, 665, 477, 331, 1866,
+ /* 370 */ 156, 1582, 1336, 161, 549, 1364, 1658, 1933, 1291, 164,
+ /* 380 */ 1343, 1344, 160, 344, 1270, 541, 1423, 1424, 1426, 1427,
+ /* 390 */ 1896, 318, 1656, 316, 315, 1702, 476, 300, 1369, 1706,
+ /* 400 */ 478, 8, 642, 641, 640, 639, 348, 1400, 638, 637,
+ /* 410 */ 636, 125, 631, 630, 629, 628, 627, 626, 625, 624,
+ /* 420 */ 135, 620, 477, 665, 1024, 1265, 1023, 1263, 33, 32,
+ /* 430 */ 164, 619, 40, 38, 36, 35, 34, 1343, 1344, 472,
+ /* 440 */ 1007, 29, 338, 1358, 1359, 1360, 1361, 1362, 1366, 1367,
+ /* 450 */ 1368, 565, 1268, 1269, 1025, 1318, 1319, 1321, 1322, 1323,
+ /* 460 */ 1324, 1325, 1326, 579, 575, 1334, 1335, 1337, 1338, 1339,
+ /* 470 */ 1340, 1342, 1345, 1583, 216, 222, 223, 489, 488, 487,
+ /* 480 */ 1011, 1012, 1265, 486, 1263, 1320, 120, 483, 635, 633,
+ /* 490 */ 482, 481, 480, 33, 32, 1533, 1779, 40, 38, 36,
+ /* 500 */ 35, 34, 209, 63, 619, 77, 1487, 1775, 422, 1268,
+ /* 510 */ 1269, 253, 1318, 1319, 1321, 1322, 1323, 1324, 1325, 1326,
+ /* 520 */ 579, 575, 1334, 1335, 1337, 1338, 1339, 1340, 1342, 1345,
+ /* 530 */ 39, 37, 1346, 1771, 1777, 329, 305, 441, 340, 522,
+ /* 540 */ 1264, 1792, 164, 1287, 215, 577, 307, 1761, 1701, 346,
+ /* 550 */ 300, 1341, 532, 1262, 175, 174, 1509, 142, 489, 488,
+ /* 560 */ 487, 75, 305, 387, 486, 522, 1608, 120, 483, 1810,
+ /* 570 */ 617, 482, 481, 480, 1336, 76, 1365, 559, 1461, 1363,
+ /* 580 */ 1606, 544, 1761, 494, 583, 1658, 1270, 39, 37, 133,
+ /* 590 */ 132, 614, 613, 612, 532, 340, 532, 1264, 504, 1370,
+ /* 600 */ 1696, 1657, 567, 9, 660, 388, 503, 392, 1341, 1824,
+ /* 610 */ 1262, 173, 208, 92, 1793, 586, 1795, 1796, 582, 501,
+ /* 620 */ 577, 499, 1606, 1870, 1606, 665, 497, 331, 1866, 156,
+ /* 630 */ 491, 1336, 374, 1364, 1597, 207, 532, 532, 1288, 1343,
+ /* 640 */ 1344, 1779, 27, 1270, 164, 1775, 88, 407, 408, 1897,
+ /* 650 */ 1595, 1408, 1775, 1486, 376, 372, 1369, 1289, 1270, 121,
+ /* 660 */ 9, 550, 545, 58, 1606, 1606, 57, 1598, 1460, 33,
+ /* 670 */ 32, 1771, 1777, 40, 38, 36, 35, 34, 1771, 1777,
+ /* 680 */ 335, 520, 665, 577, 1265, 1351, 1263, 36, 35, 34,
+ /* 690 */ 577, 1289, 1704, 1485, 1761, 611, 1343, 1344, 1581, 29,
+ /* 700 */ 338, 1358, 1359, 1360, 1361, 1362, 1366, 1367, 1368, 11,
+ /* 710 */ 10, 1268, 1269, 61, 1318, 1319, 1321, 1322, 1323, 1324,
+ /* 720 */ 1325, 1326, 579, 575, 1334, 1335, 1337, 1338, 1339, 1340,
+ /* 730 */ 1342, 1345, 33, 32, 1761, 1885, 40, 38, 36, 35,
+ /* 740 */ 34, 1265, 615, 1263, 623, 1649, 1578, 1435, 1118, 608,
+ /* 750 */ 607, 606, 1122, 605, 1124, 1125, 604, 1127, 601, 1882,
+ /* 760 */ 1133, 598, 1135, 1136, 595, 592, 1484, 22, 1268, 1269,
+ /* 770 */ 1483, 1318, 1319, 1321, 1322, 1323, 1324, 1325, 1326, 579,
+ /* 780 */ 575, 1334, 1335, 1337, 1338, 1339, 1340, 1342, 1345, 39,
+ /* 790 */ 37, 302, 1051, 1287, 1377, 617, 142, 340, 532, 1264,
+ /* 800 */ 415, 1792, 532, 427, 622, 1609, 568, 1761, 532, 452,
+ /* 810 */ 1341, 1761, 1262, 1603, 133, 132, 614, 613, 612, 1735,
+ /* 820 */ 400, 532, 428, 1747, 402, 1052, 1606, 532, 532, 1810,
+ /* 830 */ 1606, 1292, 513, 1336, 1320, 7, 1606, 584, 517, 530,
+ /* 840 */ 1482, 1479, 1761, 634, 583, 1270, 33, 32, 87, 1606,
+ /* 850 */ 40, 38, 36, 35, 34, 1606, 1606, 393, 84, 33,
+ /* 860 */ 32, 532, 2, 40, 38, 36, 35, 34, 1320, 1824,
+ /* 870 */ 362, 617, 531, 93, 1793, 586, 1795, 1796, 582, 1591,
+ /* 880 */ 577, 1761, 1761, 1870, 665, 1478, 377, 1869, 1866, 1606,
+ /* 890 */ 133, 132, 614, 613, 612, 44, 4, 426, 1343, 1344,
+ /* 900 */ 421, 420, 419, 418, 417, 414, 413, 412, 411, 410,
+ /* 910 */ 406, 405, 404, 403, 397, 396, 395, 394, 1885, 391,
+ /* 920 */ 390, 1593, 1477, 26, 1415, 1885, 1761, 143, 1589, 33,
+ /* 930 */ 32, 1476, 279, 40, 38, 36, 35, 34, 1011, 1012,
+ /* 940 */ 1273, 532, 1881, 1265, 212, 1263, 277, 60, 28, 1880,
+ /* 950 */ 59, 512, 262, 562, 33, 32, 1475, 41, 40, 38,
+ /* 960 */ 36, 35, 34, 1761, 233, 1792, 178, 432, 430, 1606,
+ /* 970 */ 1268, 1269, 1761, 1318, 1319, 1321, 1322, 1323, 1324, 1325,
+ /* 980 */ 1326, 579, 575, 1334, 1335, 1337, 1338, 1339, 1340, 1342,
+ /* 990 */ 1345, 668, 532, 1810, 63, 273, 616, 1761, 1636, 1649,
+ /* 1000 */ 1211, 584, 578, 347, 141, 268, 1761, 1474, 583, 1473,
+ /* 1010 */ 33, 32, 1472, 1471, 40, 38, 36, 35, 34, 153,
+ /* 1020 */ 1606, 1397, 560, 1520, 658, 654, 650, 646, 266, 1272,
+ /* 1030 */ 1890, 1397, 90, 1824, 53, 516, 1782, 91, 1793, 586,
+ /* 1040 */ 1795, 1796, 582, 220, 577, 490, 1792, 1870, 1761, 1515,
+ /* 1050 */ 1761, 306, 1866, 1761, 1761, 200, 89, 1513, 198, 231,
+ /* 1060 */ 337, 336, 202, 1936, 127, 201, 573, 68, 67, 386,
+ /* 1070 */ 1278, 492, 170, 1276, 1810, 1784, 161, 610, 380, 495,
+ /* 1080 */ 1933, 1341, 584, 1271, 130, 1481, 224, 1761, 1303, 583,
+ /* 1090 */ 1563, 301, 529, 256, 370, 131, 368, 364, 360, 167,
+ /* 1100 */ 355, 352, 1780, 204, 1336, 206, 203, 525, 205, 51,
+ /* 1110 */ 41, 237, 542, 1775, 1824, 51, 1270, 41, 92, 1793,
+ /* 1120 */ 586, 1795, 1796, 582, 218, 577, 590, 230, 1870, 11,
+ /* 1130 */ 10, 471, 331, 1866, 1949, 164, 1792, 1811, 1111, 1771,
+ /* 1140 */ 1777, 1463, 1464, 1904, 130, 1235, 131, 211, 116, 506,
+ /* 1150 */ 130, 577, 1422, 1327, 240, 572, 245, 349, 1371, 1504,
+ /* 1160 */ 272, 1646, 1275, 1900, 1810, 556, 250, 3, 255, 1139,
+ /* 1170 */ 258, 5, 584, 260, 354, 1287, 361, 1761, 357, 583,
+ /* 1180 */ 313, 1080, 1227, 314, 269, 409, 1698, 1143, 424, 1150,
+ /* 1190 */ 172, 1148, 1792, 134, 416, 423, 425, 429, 1355, 431,
+ /* 1200 */ 434, 433, 1293, 442, 1824, 1296, 445, 181, 93, 1793,
+ /* 1210 */ 586, 1795, 1796, 582, 1279, 577, 1274, 446, 1870, 183,
+ /* 1220 */ 1810, 1295, 571, 1866, 1297, 448, 186, 447, 584, 188,
+ /* 1230 */ 1294, 450, 451, 1761, 1792, 583, 190, 454, 72, 193,
+ /* 1240 */ 473, 1282, 1284, 475, 1596, 95, 197, 1592, 199, 136,
+ /* 1250 */ 137, 1594, 304, 575, 1334, 1335, 1337, 1338, 1339, 1340,
+ /* 1260 */ 1824, 1590, 1810, 138, 92, 1793, 586, 1795, 1796, 582,
+ /* 1270 */ 584, 577, 139, 270, 1870, 1761, 210, 583, 331, 1866,
+ /* 1280 */ 1949, 1740, 507, 540, 511, 526, 213, 1792, 217, 1927,
+ /* 1290 */ 508, 514, 518, 521, 128, 323, 1739, 1792, 1708, 523,
+ /* 1300 */ 129, 325, 1824, 226, 527, 528, 92, 1793, 586, 1795,
+ /* 1310 */ 1796, 582, 228, 577, 271, 1810, 1870, 1607, 1292, 543,
+ /* 1320 */ 331, 1866, 1949, 584, 80, 1810, 536, 538, 1761, 539,
+ /* 1330 */ 583, 1889, 1264, 584, 1901, 330, 546, 6, 1761, 534,
+ /* 1340 */ 583, 235, 244, 239, 552, 1262, 537, 1792, 1397, 1911,
+ /* 1350 */ 1910, 150, 535, 123, 560, 1824, 1291, 1792, 1892, 280,
+ /* 1360 */ 1793, 586, 1795, 1796, 582, 1824, 577, 249, 246, 286,
+ /* 1370 */ 1793, 586, 1795, 1796, 582, 1810, 577, 569, 1270, 332,
+ /* 1380 */ 1886, 566, 1932, 584, 254, 1810, 563, 257, 1761, 1952,
+ /* 1390 */ 583, 48, 82, 581, 247, 1936, 1650, 248, 1761, 1579,
+ /* 1400 */ 583, 274, 265, 1851, 560, 588, 661, 570, 163, 662,
+ /* 1410 */ 664, 259, 1933, 52, 149, 1824, 278, 665, 1755, 286,
+ /* 1420 */ 1793, 586, 1795, 1796, 582, 1824, 577, 276, 1754, 294,
+ /* 1430 */ 1793, 586, 1795, 1796, 582, 580, 577, 574, 1842, 1792,
+ /* 1440 */ 555, 287, 297, 296, 65, 1936, 1753, 1752, 66, 1751,
+ /* 1450 */ 356, 1748, 358, 359, 1255, 1256, 168, 363, 161, 1746,
+ /* 1460 */ 365, 366, 1933, 367, 1745, 369, 1744, 1810, 124, 1743,
+ /* 1470 */ 371, 1742, 373, 375, 1725, 584, 1265, 169, 1263, 378,
+ /* 1480 */ 1761, 379, 583, 1230, 1229, 1719, 1718, 384, 385, 560,
+ /* 1490 */ 1717, 1716, 1691, 1792, 1199, 1690, 1689, 69, 1688, 1687,
+ /* 1500 */ 1686, 1685, 1684, 1268, 1269, 398, 1683, 1824, 122, 401,
+ /* 1510 */ 399, 146, 1793, 586, 1795, 1796, 582, 1792, 577, 1682,
+ /* 1520 */ 1681, 1810, 126, 251, 1878, 554, 1680, 553, 1679, 584,
+ /* 1530 */ 1936, 1678, 1677, 1676, 1761, 1675, 583, 1674, 1673, 1672,
+ /* 1540 */ 1671, 1670, 1669, 163, 1668, 1810, 1667, 1933, 1666, 1665,
+ /* 1550 */ 324, 1664, 1663, 584, 117, 561, 1950, 1662, 1761, 1661,
+ /* 1560 */ 583, 1824, 1660, 1659, 1535, 93, 1793, 586, 1795, 1796,
+ /* 1570 */ 582, 1792, 577, 176, 1534, 1870, 1201, 177, 1532, 1500,
+ /* 1580 */ 1867, 1792, 1014, 1013, 1499, 1824, 154, 179, 1733, 295,
+ /* 1590 */ 1793, 586, 1795, 1796, 582, 1727, 577, 1715, 180, 1810,
+ /* 1600 */ 118, 438, 440, 1714, 533, 185, 1700, 584, 1585, 1810,
+ /* 1610 */ 187, 1531, 1761, 1529, 583, 1044, 455, 584, 456, 457,
+ /* 1620 */ 1527, 459, 1761, 460, 583, 1525, 461, 1523, 463, 465,
+ /* 1630 */ 464, 1792, 468, 467, 1512, 469, 1511, 1496, 1587, 1824,
+ /* 1640 */ 1154, 50, 196, 295, 1793, 586, 1795, 1796, 582, 1824,
+ /* 1650 */ 577, 1153, 1586, 290, 1793, 586, 1795, 1796, 582, 1810,
+ /* 1660 */ 577, 1079, 632, 1078, 634, 1077, 1076, 584, 1073, 1521,
+ /* 1670 */ 1072, 319, 1761, 320, 583, 1071, 1070, 1516, 1514, 321,
+ /* 1680 */ 496, 1792, 1495, 498, 1494, 500, 1493, 502, 493, 1732,
+ /* 1690 */ 94, 551, 15, 1792, 1237, 1726, 140, 509, 1713, 1824,
+ /* 1700 */ 1711, 1712, 1710, 146, 1793, 586, 1795, 1796, 582, 1810,
+ /* 1710 */ 577, 1709, 1707, 56, 1699, 1247, 229, 581, 510, 227,
+ /* 1720 */ 214, 1810, 1761, 16, 583, 232, 339, 225, 322, 584,
+ /* 1730 */ 219, 78, 515, 41, 1761, 17, 583, 47, 79, 23,
+ /* 1740 */ 524, 1437, 84, 234, 13, 243, 236, 1419, 1951, 1824,
+ /* 1750 */ 1421, 238, 147, 294, 1793, 586, 1795, 1796, 582, 241,
+ /* 1760 */ 577, 1824, 1843, 242, 1782, 295, 1793, 586, 1795, 1796,
+ /* 1770 */ 582, 1792, 577, 24, 25, 252, 46, 1414, 83, 18,
+ /* 1780 */ 1781, 1792, 1394, 1393, 151, 1449, 1448, 333, 1453, 1454,
+ /* 1790 */ 1443, 1452, 334, 10, 1280, 1356, 1331, 45, 19, 1810,
+ /* 1800 */ 1827, 576, 1311, 1329, 341, 1328, 31, 584, 152, 1810,
+ /* 1810 */ 12, 20, 1761, 165, 583, 21, 589, 584, 585, 587,
+ /* 1820 */ 342, 1140, 1761, 1137, 583, 591, 594, 593, 1134, 596,
+ /* 1830 */ 597, 1792, 1128, 599, 600, 602, 1132, 1131, 1117, 1824,
+ /* 1840 */ 609, 1792, 1149, 295, 1793, 586, 1795, 1796, 582, 1824,
+ /* 1850 */ 577, 1792, 1126, 281, 1793, 586, 1795, 1796, 582, 1810,
+ /* 1860 */ 577, 603, 85, 86, 62, 263, 1145, 584, 1130, 1810,
+ /* 1870 */ 1129, 1042, 1761, 618, 583, 264, 1067, 584, 1086, 1810,
+ /* 1880 */ 621, 1065, 1761, 1064, 583, 1063, 1062, 584, 1061, 1060,
+ /* 1890 */ 1059, 1058, 1761, 1083, 583, 1081, 1055, 1054, 1053, 1824,
+ /* 1900 */ 1050, 1049, 1528, 282, 1793, 586, 1795, 1796, 582, 1824,
+ /* 1910 */ 577, 1048, 1047, 289, 1793, 586, 1795, 1796, 582, 1824,
+ /* 1920 */ 577, 643, 644, 291, 1793, 586, 1795, 1796, 582, 645,
+ /* 1930 */ 577, 1526, 1792, 647, 648, 649, 1524, 1522, 651, 652,
+ /* 1940 */ 653, 655, 656, 657, 1510, 659, 1004, 1492, 267, 663,
+ /* 1950 */ 666, 1792, 1266, 667, 275, 1467, 1467, 1467, 1467, 1467,
+ /* 1960 */ 1810, 1467, 1467, 1467, 1467, 1467, 1467, 1467, 584, 1467,
+ /* 1970 */ 1467, 1467, 1467, 1761, 1467, 583, 1467, 1467, 1467, 1810,
+ /* 1980 */ 1467, 1467, 1467, 1467, 1467, 1467, 1467, 584, 1467, 1467,
+ /* 1990 */ 1467, 1467, 1761, 1467, 583, 1467, 1467, 1467, 1467, 1467,
+ /* 2000 */ 1824, 1467, 1467, 1467, 283, 1793, 586, 1795, 1796, 582,
+ /* 2010 */ 1467, 577, 1467, 1792, 1467, 1467, 1467, 1467, 1467, 1824,
+ /* 2020 */ 1467, 1467, 1467, 292, 1793, 586, 1795, 1796, 582, 1792,
+ /* 2030 */ 577, 1467, 1467, 1467, 1467, 1467, 1467, 1467, 1467, 1467,
+ /* 2040 */ 1467, 1810, 1467, 1467, 1467, 1467, 1467, 1467, 1467, 584,
+ /* 2050 */ 1467, 1467, 1467, 1467, 1761, 1467, 583, 1810, 1467, 1467,
+ /* 2060 */ 1467, 1467, 1467, 1467, 1467, 584, 1467, 1467, 1467, 1467,
+ /* 2070 */ 1761, 1467, 583, 1467, 1467, 1467, 1467, 1467, 1467, 1467,
+ /* 2080 */ 1467, 1824, 1792, 1467, 1467, 284, 1793, 586, 1795, 1796,
+ /* 2090 */ 582, 1467, 577, 1467, 1467, 1467, 1467, 1824, 1467, 1792,
+ /* 2100 */ 1467, 293, 1793, 586, 1795, 1796, 582, 1467, 577, 1467,
+ /* 2110 */ 1810, 1467, 1467, 1467, 1467, 1467, 1467, 1467, 584, 1467,
+ /* 2120 */ 1467, 1467, 1467, 1761, 1467, 583, 1467, 1810, 1467, 1467,
+ /* 2130 */ 1467, 1467, 1467, 1467, 1467, 584, 1467, 1467, 1467, 1467,
+ /* 2140 */ 1761, 1467, 583, 1467, 1467, 1467, 1467, 1467, 1467, 1467,
+ /* 2150 */ 1824, 1467, 1792, 1467, 285, 1793, 586, 1795, 1796, 582,
+ /* 2160 */ 1467, 577, 1467, 1467, 1792, 1467, 1467, 1824, 1467, 1467,
+ /* 2170 */ 1467, 298, 1793, 586, 1795, 1796, 582, 1467, 577, 1467,
+ /* 2180 */ 1810, 1467, 1467, 1467, 1467, 1467, 1467, 1467, 584, 1467,
+ /* 2190 */ 1467, 1467, 1810, 1761, 1467, 583, 1467, 1467, 1467, 1467,
+ /* 2200 */ 584, 1467, 1467, 1467, 1467, 1761, 1467, 583, 1467, 1467,
+ /* 2210 */ 1467, 1467, 1467, 1467, 1467, 1467, 1467, 1467, 1467, 1467,
+ /* 2220 */ 1824, 1467, 1467, 1467, 299, 1793, 586, 1795, 1796, 582,
+ /* 2230 */ 1467, 577, 1824, 1792, 1467, 1467, 1804, 1793, 586, 1795,
+ /* 2240 */ 1796, 582, 1467, 577, 1467, 1467, 1467, 1792, 1467, 1467,
+ /* 2250 */ 1467, 1467, 1467, 1467, 1467, 1467, 1467, 1467, 1467, 1467,
+ /* 2260 */ 1467, 1810, 1467, 1467, 1467, 1467, 1467, 1467, 1467, 584,
+ /* 2270 */ 1467, 1467, 1467, 1467, 1761, 1810, 583, 1467, 1467, 1467,
+ /* 2280 */ 1467, 1467, 1467, 584, 1467, 1467, 1467, 1467, 1761, 1792,
+ /* 2290 */ 583, 1467, 1467, 1467, 1467, 1467, 1467, 1467, 1467, 1467,
+ /* 2300 */ 1467, 1824, 1467, 1467, 1467, 1803, 1793, 586, 1795, 1796,
+ /* 2310 */ 582, 1467, 577, 1467, 1467, 1824, 1467, 1810, 1467, 1802,
+ /* 2320 */ 1793, 586, 1795, 1796, 582, 584, 577, 1467, 1467, 1467,
+ /* 2330 */ 1761, 1467, 583, 1467, 1467, 1467, 1467, 1467, 1467, 1467,
+ /* 2340 */ 1467, 1792, 1467, 1467, 1467, 1467, 1467, 1467, 1467, 1467,
+ /* 2350 */ 1467, 1467, 1467, 1467, 1467, 1467, 1467, 1824, 1467, 1792,
+ /* 2360 */ 1467, 310, 1793, 586, 1795, 1796, 582, 1467, 577, 1810,
+ /* 2370 */ 1467, 1467, 1467, 1467, 1467, 1467, 1467, 584, 1467, 1467,
+ /* 2380 */ 1467, 1467, 1761, 1792, 583, 1467, 1467, 1810, 1467, 1467,
+ /* 2390 */ 1467, 1467, 1467, 1467, 1467, 584, 1467, 1467, 1467, 1467,
+ /* 2400 */ 1761, 1467, 583, 1467, 1467, 1467, 1467, 1467, 1467, 1824,
+ /* 2410 */ 1467, 1810, 1467, 309, 1793, 586, 1795, 1796, 582, 584,
+ /* 2420 */ 577, 1467, 1467, 1467, 1761, 1467, 583, 1824, 1467, 1467,
+ /* 2430 */ 1467, 311, 1793, 586, 1795, 1796, 582, 1467, 577, 555,
+ /* 2440 */ 1792, 1467, 1467, 1467, 1467, 1467, 1467, 1467, 1467, 1467,
+ /* 2450 */ 1467, 1824, 1467, 1467, 1467, 308, 1793, 586, 1795, 1796,
+ /* 2460 */ 582, 1467, 577, 1467, 1467, 1467, 1467, 124, 1810, 1467,
+ /* 2470 */ 1467, 1467, 1467, 1467, 1467, 1467, 584, 1467, 1467, 1467,
+ /* 2480 */ 1467, 1761, 1467, 583, 1467, 1467, 1467, 1467, 560, 1467,
+ /* 2490 */ 1467, 1467, 1467, 1467, 1467, 1467, 1467, 1467, 1467, 1467,
+ /* 2500 */ 1467, 1467, 1467, 1467, 1467, 1467, 1467, 122, 1824, 1467,
+ /* 2510 */ 1467, 1467, 288, 1793, 586, 1795, 1796, 582, 1467, 577,
+ /* 2520 */ 1467, 1467, 251, 1878, 554, 1467, 553, 1467, 1467, 1936,
+ /* 2530 */ 1467, 1467, 1467, 1467, 1467, 1467, 1467, 1467, 1467, 1467,
+ /* 2540 */ 1467, 1467, 161, 1467, 1467, 1467, 1933,
};
static const YYCODETYPE yy_lookahead[] = {
- /* 0 */ 266, 0, 262, 266, 264, 265, 262, 287, 264, 265,
- /* 10 */ 288, 277, 12, 13, 266, 4, 301, 287, 284, 315,
- /* 20 */ 20, 299, 22, 4, 309, 268, 258, 312, 294, 341,
- /* 30 */ 342, 294, 271, 33, 21, 35, 275, 24, 25, 26,
- /* 40 */ 27, 28, 29, 30, 31, 32, 289, 325, 326, 327,
- /* 50 */ 270, 303, 315, 356, 286, 20, 56, 0, 20, 337,
- /* 60 */ 356, 61, 294, 44, 45, 21, 369, 299, 68, 301,
- /* 70 */ 373, 334, 292, 369, 12, 13, 14, 373, 34, 22,
- /* 80 */ 36, 266, 20, 315, 22, 85, 349, 350, 351, 20,
- /* 90 */ 353, 22, 277, 356, 326, 33, 85, 35, 330, 331,
- /* 100 */ 332, 333, 334, 335, 35, 337, 369, 107, 340, 294,
- /* 110 */ 373, 297, 344, 345, 300, 301, 270, 85, 56, 50,
- /* 120 */ 85, 121, 122, 61, 356, 0, 356, 8, 9, 283,
- /* 130 */ 68, 12, 13, 14, 15, 16, 97, 369, 292, 369,
- /* 140 */ 257, 373, 259, 373, 258, 258, 21, 85, 56, 24,
- /* 150 */ 25, 26, 27, 28, 29, 30, 31, 32, 119, 121,
- /* 160 */ 122, 63, 64, 65, 56, 356, 166, 69, 168, 107,
- /* 170 */ 72, 73, 278, 286, 76, 77, 78, 255, 369, 87,
- /* 180 */ 286, 294, 373, 121, 122, 299, 299, 20, 301, 295,
- /* 190 */ 300, 301, 84, 193, 194, 87, 196, 197, 198, 199,
+ /* 0 */ 267, 271, 256, 263, 267, 265, 266, 279, 302, 271,
+ /* 10 */ 287, 278, 12, 13, 284, 287, 310, 294, 285, 313,
+ /* 20 */ 20, 0, 22, 293, 296, 272, 303, 267, 295, 276,
+ /* 30 */ 287, 293, 295, 33, 263, 35, 265, 266, 295, 20,
+ /* 40 */ 298, 267, 21, 301, 302, 24, 25, 26, 27, 28,
+ /* 50 */ 29, 30, 31, 32, 269, 295, 56, 259, 259, 8,
+ /* 60 */ 9, 61, 316, 12, 13, 14, 15, 16, 68, 12,
+ /* 70 */ 13, 14, 335, 20, 20, 290, 333, 20, 304, 22,
+ /* 80 */ 357, 20, 258, 357, 260, 85, 287, 350, 351, 352,
+ /* 90 */ 33, 354, 35, 370, 295, 335, 370, 374, 300, 300,
+ /* 100 */ 374, 302, 264, 357, 4, 267, 20, 107, 267, 349,
+ /* 110 */ 350, 351, 352, 56, 354, 316, 370, 20, 61, 278,
+ /* 120 */ 374, 121, 122, 342, 343, 68, 327, 43, 286, 116,
+ /* 130 */ 331, 332, 333, 334, 335, 336, 295, 338, 85, 85,
+ /* 140 */ 341, 299, 85, 21, 345, 346, 24, 25, 26, 27,
+ /* 150 */ 28, 29, 30, 31, 32, 279, 357, 12, 13, 14,
+ /* 160 */ 15, 16, 35, 287, 107, 85, 166, 33, 168, 370,
+ /* 170 */ 86, 85, 296, 374, 316, 316, 316, 264, 121, 122,
+ /* 180 */ 267, 47, 121, 122, 4, 85, 52, 53, 54, 55,
+ /* 190 */ 56, 178, 179, 193, 194, 68, 196, 197, 198, 199,
/* 200 */ 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
- /* 210 */ 210, 211, 212, 326, 14, 15, 16, 330, 331, 332,
- /* 220 */ 333, 334, 335, 266, 337, 225, 161, 340, 166, 20,
- /* 230 */ 168, 344, 345, 346, 277, 79, 225, 315, 258, 8,
- /* 240 */ 9, 284, 60, 12, 13, 14, 15, 16, 183, 184,
- /* 250 */ 20, 294, 266, 366, 4, 193, 194, 225, 196, 197,
- /* 260 */ 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
- /* 270 */ 208, 209, 210, 211, 212, 12, 13, 158, 356, 299,
- /* 280 */ 294, 125, 126, 20, 116, 22, 12, 13, 14, 15,
- /* 290 */ 16, 369, 61, 85, 85, 373, 33, 0, 35, 98,
- /* 300 */ 99, 100, 101, 102, 103, 104, 105, 106, 107, 108,
- /* 310 */ 286, 110, 111, 112, 113, 114, 115, 86, 294, 56,
- /* 320 */ 334, 258, 8, 9, 61, 94, 12, 13, 14, 15,
- /* 330 */ 16, 68, 12, 13, 348, 349, 350, 351, 268, 353,
- /* 340 */ 20, 266, 22, 288, 47, 286, 178, 179, 85, 286,
- /* 350 */ 278, 281, 293, 33, 299, 35, 332, 294, 286, 289,
- /* 360 */ 278, 302, 299, 266, 301, 14, 247, 295, 286, 294,
- /* 370 */ 107, 20, 20, 165, 277, 167, 56, 295, 315, 148,
- /* 380 */ 325, 326, 327, 0, 121, 122, 0, 263, 68, 326,
- /* 390 */ 266, 294, 337, 330, 331, 332, 333, 334, 335, 258,
- /* 400 */ 337, 263, 171, 340, 266, 85, 56, 344, 345, 334,
- /* 410 */ 24, 25, 26, 27, 28, 29, 30, 31, 32, 356,
- /* 420 */ 272, 273, 272, 273, 349, 350, 351, 107, 353, 166,
- /* 430 */ 117, 168, 369, 225, 225, 85, 373, 87, 315, 258,
- /* 440 */ 299, 121, 122, 60, 213, 214, 215, 216, 217, 218,
- /* 450 */ 219, 220, 221, 222, 258, 37, 193, 194, 20, 196,
- /* 460 */ 197, 198, 199, 200, 201, 202, 203, 204, 205, 206,
- /* 470 */ 207, 208, 209, 210, 211, 212, 226, 8, 9, 356,
- /* 480 */ 299, 12, 13, 14, 15, 16, 166, 148, 168, 176,
- /* 490 */ 177, 286, 369, 180, 151, 299, 373, 8, 9, 315,
- /* 500 */ 20, 12, 13, 14, 15, 16, 88, 302, 90, 91,
- /* 510 */ 171, 93, 60, 193, 194, 97, 196, 197, 198, 199,
- /* 520 */ 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
- /* 530 */ 210, 211, 212, 12, 13, 14, 14, 119, 44, 45,
- /* 540 */ 356, 20, 20, 22, 258, 225, 328, 258, 197, 20,
- /* 550 */ 61, 22, 213, 369, 33, 86, 35, 373, 288, 8,
- /* 560 */ 9, 116, 117, 12, 13, 14, 15, 16, 20, 299,
- /* 570 */ 352, 266, 286, 230, 231, 225, 0, 56, 20, 50,
- /* 580 */ 294, 266, 266, 94, 285, 299, 258, 301, 299, 68,
- /* 590 */ 12, 13, 277, 277, 43, 325, 326, 298, 20, 294,
- /* 600 */ 22, 0, 35, 1, 2, 286, 85, 337, 286, 294,
- /* 610 */ 294, 33, 326, 35, 295, 293, 330, 331, 332, 333,
- /* 620 */ 334, 335, 177, 337, 302, 180, 340, 299, 107, 266,
- /* 630 */ 344, 345, 346, 153, 56, 68, 60, 148, 328, 334,
- /* 640 */ 277, 275, 121, 122, 358, 14, 68, 311, 294, 313,
- /* 650 */ 301, 20, 366, 68, 349, 350, 351, 294, 353, 305,
- /* 660 */ 171, 312, 352, 85, 63, 64, 65, 66, 67, 287,
- /* 670 */ 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
- /* 680 */ 79, 80, 81, 82, 0, 107, 20, 166, 86, 168,
- /* 690 */ 8, 9, 328, 258, 12, 13, 14, 15, 16, 121,
- /* 700 */ 122, 153, 213, 214, 215, 216, 217, 218, 219, 220,
- /* 710 */ 221, 222, 39, 258, 193, 194, 352, 196, 197, 198,
- /* 720 */ 199, 200, 201, 202, 203, 204, 205, 206, 207, 208,
- /* 730 */ 209, 210, 211, 212, 299, 8, 9, 223, 224, 12,
- /* 740 */ 13, 14, 15, 16, 166, 43, 168, 63, 64, 65,
- /* 750 */ 42, 43, 22, 69, 299, 279, 72, 73, 282, 96,
- /* 760 */ 76, 77, 78, 258, 68, 35, 193, 311, 86, 313,
- /* 770 */ 296, 193, 194, 299, 196, 197, 198, 199, 200, 201,
- /* 780 */ 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
- /* 790 */ 212, 12, 13, 18, 296, 20, 97, 299, 68, 20,
- /* 800 */ 287, 22, 27, 258, 299, 30, 35, 234, 235, 236,
- /* 810 */ 237, 238, 33, 86, 35, 116, 117, 118, 119, 120,
- /* 820 */ 1, 2, 47, 266, 49, 287, 51, 43, 197, 266,
- /* 830 */ 266, 286, 266, 258, 277, 56, 274, 107, 276, 294,
- /* 840 */ 277, 277, 2, 277, 299, 3, 301, 68, 8, 9,
- /* 850 */ 0, 294, 12, 13, 14, 15, 16, 294, 294, 84,
- /* 860 */ 294, 8, 9, 197, 85, 12, 13, 14, 15, 16,
- /* 870 */ 86, 326, 22, 61, 299, 330, 331, 332, 333, 334,
- /* 880 */ 335, 2, 337, 121, 122, 340, 107, 8, 9, 344,
- /* 890 */ 345, 12, 13, 14, 15, 16, 166, 224, 168, 124,
- /* 900 */ 121, 122, 127, 128, 129, 130, 131, 132, 133, 134,
- /* 910 */ 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- /* 920 */ 287, 146, 147, 193, 194, 266, 43, 266, 0, 18,
- /* 930 */ 258, 266, 89, 266, 23, 92, 277, 89, 277, 168,
- /* 940 */ 92, 35, 277, 33, 277, 166, 244, 168, 37, 38,
- /* 950 */ 22, 89, 41, 294, 92, 294, 287, 47, 315, 294,
- /* 960 */ 319, 294, 52, 53, 54, 55, 56, 258, 57, 58,
- /* 970 */ 59, 299, 193, 194, 68, 196, 197, 198, 199, 200,
- /* 980 */ 201, 202, 203, 204, 205, 206, 207, 208, 209, 210,
- /* 990 */ 211, 212, 12, 13, 84, 286, 85, 87, 266, 356,
- /* 1000 */ 266, 89, 22, 294, 92, 193, 153, 259, 299, 277,
- /* 1010 */ 301, 277, 369, 33, 288, 35, 373, 153, 154, 266,
- /* 1020 */ 376, 367, 85, 267, 258, 299, 294, 258, 294, 35,
- /* 1030 */ 277, 258, 95, 43, 123, 326, 56, 0, 258, 330,
- /* 1040 */ 331, 332, 333, 334, 335, 258, 337, 294, 68, 340,
- /* 1050 */ 258, 325, 326, 344, 345, 346, 0, 322, 363, 149,
- /* 1060 */ 150, 0, 152, 337, 355, 299, 156, 258, 299, 158,
- /* 1070 */ 159, 160, 299, 286, 163, 258, 86, 286, 267, 299,
- /* 1080 */ 169, 294, 43, 43, 242, 175, 299, 107, 301, 46,
- /* 1090 */ 265, 299, 298, 182, 43, 43, 185, 43, 187, 188,
- /* 1100 */ 189, 190, 191, 192, 48, 329, 43, 43, 299, 43,
- /* 1110 */ 347, 354, 370, 326, 370, 370, 299, 330, 331, 332,
- /* 1120 */ 333, 334, 335, 258, 337, 86, 86, 340, 85, 246,
- /* 1130 */ 85, 344, 345, 346, 97, 357, 225, 86, 86, 43,
- /* 1140 */ 86, 290, 355, 227, 324, 20, 166, 266, 168, 86,
- /* 1150 */ 86, 286, 86, 116, 117, 118, 119, 120, 97, 294,
- /* 1160 */ 43, 43, 168, 47, 299, 258, 301, 323, 35, 43,
- /* 1170 */ 43, 43, 272, 193, 194, 164, 317, 116, 117, 118,
- /* 1180 */ 119, 120, 86, 266, 204, 205, 206, 207, 208, 209,
- /* 1190 */ 210, 326, 266, 286, 42, 330, 331, 332, 333, 334,
- /* 1200 */ 335, 294, 337, 86, 86, 340, 299, 306, 301, 344,
- /* 1210 */ 345, 346, 86, 86, 86, 148, 266, 304, 304, 266,
- /* 1220 */ 355, 266, 315, 20, 260, 260, 258, 270, 20, 321,
- /* 1230 */ 301, 270, 20, 326, 314, 20, 258, 330, 331, 332,
- /* 1240 */ 333, 334, 335, 316, 337, 4, 270, 314, 20, 270,
- /* 1250 */ 307, 270, 270, 266, 286, 270, 260, 286, 286, 286,
- /* 1260 */ 19, 286, 294, 356, 286, 260, 299, 299, 266, 301,
- /* 1270 */ 286, 268, 294, 321, 33, 286, 369, 299, 286, 301,
- /* 1280 */ 373, 286, 174, 315, 286, 286, 286, 301, 47, 320,
- /* 1290 */ 268, 266, 51, 258, 326, 266, 268, 56, 330, 331,
- /* 1300 */ 332, 333, 334, 335, 326, 337, 232, 258, 330, 331,
- /* 1310 */ 332, 333, 334, 335, 310, 337, 299, 299, 340, 299,
- /* 1320 */ 314, 286, 344, 345, 356, 84, 299, 150, 87, 294,
- /* 1330 */ 299, 310, 308, 307, 299, 286, 301, 369, 294, 268,
- /* 1340 */ 282, 373, 294, 294, 268, 20, 299, 233, 299, 299,
- /* 1350 */ 301, 310, 329, 362, 299, 362, 310, 258, 299, 299,
- /* 1360 */ 239, 326, 365, 157, 241, 330, 331, 332, 333, 334,
- /* 1370 */ 335, 336, 337, 338, 339, 326, 364, 258, 362, 330,
- /* 1380 */ 331, 332, 333, 334, 335, 286, 337, 240, 228, 324,
- /* 1390 */ 224, 361, 360, 294, 294, 359, 20, 328, 299, 245,
- /* 1400 */ 301, 243, 85, 248, 371, 286, 372, 276, 299, 266,
- /* 1410 */ 291, 36, 290, 294, 372, 377, 343, 268, 299, 260,
- /* 1420 */ 301, 318, 261, 374, 375, 326, 313, 256, 371, 330,
- /* 1430 */ 331, 332, 333, 334, 335, 0, 337, 280, 269, 340,
- /* 1440 */ 372, 371, 280, 258, 345, 326, 176, 280, 0, 330,
- /* 1450 */ 331, 332, 333, 334, 335, 258, 337, 0, 42, 0,
- /* 1460 */ 76, 0, 35, 35, 186, 258, 35, 35, 186, 0,
- /* 1470 */ 186, 286, 35, 35, 0, 186, 291, 0, 35, 294,
- /* 1480 */ 0, 0, 22, 286, 299, 0, 301, 35, 85, 171,
- /* 1490 */ 170, 294, 168, 286, 166, 0, 299, 0, 301, 162,
- /* 1500 */ 161, 294, 0, 0, 46, 0, 299, 0, 301, 0,
- /* 1510 */ 145, 326, 0, 0, 0, 330, 331, 332, 333, 334,
- /* 1520 */ 335, 258, 337, 326, 0, 0, 35, 330, 331, 332,
- /* 1530 */ 333, 334, 335, 326, 337, 258, 140, 330, 331, 332,
- /* 1540 */ 333, 334, 335, 0, 337, 140, 0, 0, 0, 286,
- /* 1550 */ 42, 0, 0, 0, 0, 0, 0, 294, 0, 0,
- /* 1560 */ 0, 0, 299, 286, 301, 368, 0, 0, 291, 0,
- /* 1570 */ 0, 294, 0, 0, 0, 0, 299, 0, 301, 22,
- /* 1580 */ 0, 0, 375, 0, 56, 0, 56, 0, 258, 326,
- /* 1590 */ 0, 42, 14, 330, 331, 332, 333, 334, 335, 0,
- /* 1600 */ 337, 39, 339, 326, 40, 14, 43, 330, 331, 332,
- /* 1610 */ 333, 334, 335, 19, 337, 47, 286, 46, 39, 0,
- /* 1620 */ 0, 291, 46, 0, 294, 39, 0, 33, 157, 299,
- /* 1630 */ 258, 301, 0, 0, 0, 0, 35, 39, 0, 35,
- /* 1640 */ 47, 47, 0, 35, 258, 39, 52, 53, 54, 55,
- /* 1650 */ 56, 62, 47, 39, 0, 39, 326, 35, 286, 47,
- /* 1660 */ 330, 331, 332, 333, 334, 335, 294, 337, 0, 0,
- /* 1670 */ 0, 299, 286, 301, 0, 35, 94, 22, 84, 0,
- /* 1680 */ 294, 87, 35, 35, 92, 299, 35, 301, 35, 43,
- /* 1690 */ 0, 35, 43, 35, 35, 35, 0, 22, 326, 22,
- /* 1700 */ 0, 49, 330, 331, 332, 333, 334, 335, 258, 337,
- /* 1710 */ 22, 35, 326, 0, 120, 35, 330, 331, 332, 333,
- /* 1720 */ 334, 335, 0, 337, 35, 0, 22, 20, 0, 35,
- /* 1730 */ 258, 0, 22, 0, 0, 0, 286, 153, 0, 0,
- /* 1740 */ 0, 0, 39, 46, 294, 95, 152, 150, 153, 299,
- /* 1750 */ 258, 301, 86, 153, 43, 229, 85, 155, 286, 86,
- /* 1760 */ 172, 151, 149, 85, 43, 46, 294, 173, 85, 175,
- /* 1770 */ 85, 299, 85, 301, 229, 43, 326, 181, 286, 86,
- /* 1780 */ 330, 331, 332, 333, 334, 335, 294, 337, 86, 46,
- /* 1790 */ 85, 299, 258, 301, 85, 43, 46, 85, 326, 43,
- /* 1800 */ 86, 85, 330, 331, 332, 333, 334, 335, 258, 337,
- /* 1810 */ 86, 85, 85, 46, 46, 86, 86, 43, 326, 35,
- /* 1820 */ 286, 35, 330, 331, 332, 333, 334, 335, 294, 337,
- /* 1830 */ 223, 86, 86, 299, 35, 301, 286, 35, 229, 35,
- /* 1840 */ 35, 2, 22, 43, 294, 85, 22, 86, 85, 299,
- /* 1850 */ 86, 301, 86, 46, 193, 85, 85, 85, 46, 195,
- /* 1860 */ 326, 258, 85, 35, 330, 331, 332, 333, 334, 335,
- /* 1870 */ 35, 337, 96, 258, 86, 85, 326, 86, 35, 85,
- /* 1880 */ 330, 331, 332, 333, 334, 335, 35, 337, 85, 286,
- /* 1890 */ 35, 35, 86, 22, 86, 85, 85, 294, 109, 86,
- /* 1900 */ 85, 286, 299, 85, 301, 109, 109, 109, 35, 294,
- /* 1910 */ 43, 97, 85, 22, 299, 258, 301, 35, 68, 62,
- /* 1920 */ 61, 83, 43, 35, 35, 258, 22, 35, 35, 326,
- /* 1930 */ 35, 35, 35, 330, 331, 332, 333, 334, 335, 258,
- /* 1940 */ 337, 326, 68, 286, 35, 330, 331, 332, 333, 334,
- /* 1950 */ 335, 294, 337, 286, 35, 35, 299, 35, 301, 35,
- /* 1960 */ 35, 294, 35, 35, 0, 35, 299, 286, 301, 0,
- /* 1970 */ 47, 39, 35, 47, 39, 294, 0, 35, 47, 0,
- /* 1980 */ 299, 35, 301, 326, 39, 47, 39, 330, 331, 332,
- /* 1990 */ 333, 334, 335, 326, 337, 258, 0, 330, 331, 332,
- /* 2000 */ 333, 334, 335, 35, 337, 258, 35, 326, 0, 22,
- /* 2010 */ 21, 330, 331, 332, 333, 334, 335, 258, 337, 22,
- /* 2020 */ 22, 21, 20, 286, 378, 378, 378, 378, 378, 378,
- /* 2030 */ 378, 294, 378, 286, 378, 378, 299, 378, 301, 378,
- /* 2040 */ 378, 294, 378, 378, 378, 286, 299, 378, 301, 378,
- /* 2050 */ 378, 378, 378, 294, 378, 378, 378, 378, 299, 378,
- /* 2060 */ 301, 378, 378, 326, 378, 378, 378, 330, 331, 332,
- /* 2070 */ 333, 334, 335, 326, 337, 378, 378, 330, 331, 332,
- /* 2080 */ 333, 334, 335, 258, 337, 326, 378, 378, 378, 330,
- /* 2090 */ 331, 332, 333, 334, 335, 258, 337, 378, 378, 378,
- /* 2100 */ 378, 378, 378, 378, 378, 378, 378, 378, 378, 378,
- /* 2110 */ 378, 286, 378, 378, 378, 378, 378, 378, 378, 294,
- /* 2120 */ 378, 378, 378, 286, 299, 378, 301, 378, 378, 378,
- /* 2130 */ 378, 294, 378, 378, 378, 378, 299, 378, 301, 378,
- /* 2140 */ 378, 378, 378, 378, 378, 378, 378, 378, 258, 378,
- /* 2150 */ 378, 326, 378, 378, 378, 330, 331, 332, 333, 334,
- /* 2160 */ 335, 378, 337, 326, 378, 378, 378, 330, 331, 332,
- /* 2170 */ 333, 334, 335, 378, 337, 378, 286, 378, 378, 378,
- /* 2180 */ 378, 378, 378, 378, 294, 378, 378, 378, 378, 299,
- /* 2190 */ 378, 301, 378, 378, 378, 378, 378, 378, 258, 378,
- /* 2200 */ 378, 378, 378, 378, 378, 378, 378, 378, 258, 378,
- /* 2210 */ 266, 378, 378, 378, 378, 378, 326, 378, 378, 378,
- /* 2220 */ 330, 331, 332, 333, 334, 335, 286, 337, 378, 378,
- /* 2230 */ 378, 378, 378, 378, 294, 378, 286, 378, 294, 299,
- /* 2240 */ 378, 301, 378, 378, 294, 378, 378, 378, 378, 299,
- /* 2250 */ 378, 301, 378, 378, 378, 378, 378, 378, 378, 315,
- /* 2260 */ 378, 378, 378, 378, 378, 378, 326, 378, 378, 378,
- /* 2270 */ 330, 331, 332, 333, 334, 335, 326, 337, 334, 378,
- /* 2280 */ 330, 331, 332, 333, 334, 335, 378, 337, 378, 378,
- /* 2290 */ 378, 378, 378, 349, 350, 351, 378, 353, 378, 378,
- /* 2300 */ 356, 378, 378, 378, 378, 378, 378, 378, 378, 378,
- /* 2310 */ 378, 378, 378, 369, 378, 378, 378, 373,
+ /* 210 */ 210, 211, 212, 213, 357, 357, 357, 357, 84, 301,
+ /* 220 */ 302, 87, 20, 166, 22, 168, 226, 370, 370, 370,
+ /* 230 */ 370, 374, 374, 374, 374, 8, 9, 316, 85, 12,
+ /* 240 */ 13, 14, 15, 16, 259, 165, 56, 167, 267, 43,
+ /* 250 */ 193, 194, 50, 196, 197, 198, 199, 200, 201, 202,
+ /* 260 */ 203, 204, 205, 206, 207, 208, 209, 210, 211, 212,
+ /* 270 */ 213, 12, 13, 0, 84, 20, 295, 87, 357, 20,
+ /* 280 */ 226, 22, 259, 149, 150, 300, 152, 0, 61, 85,
+ /* 290 */ 156, 370, 33, 60, 35, 374, 267, 24, 25, 26,
+ /* 300 */ 27, 28, 29, 30, 31, 32, 226, 278, 20, 175,
+ /* 310 */ 287, 259, 226, 86, 285, 56, 335, 357, 295, 316,
+ /* 320 */ 61, 94, 259, 300, 295, 302, 226, 68, 12, 13,
+ /* 330 */ 370, 350, 351, 352, 374, 354, 20, 267, 22, 0,
+ /* 340 */ 37, 273, 274, 193, 85, 97, 287, 60, 278, 33,
+ /* 350 */ 327, 35, 300, 294, 331, 332, 333, 334, 335, 336,
+ /* 360 */ 357, 338, 303, 300, 341, 295, 107, 119, 345, 346,
+ /* 370 */ 347, 0, 56, 370, 20, 148, 287, 374, 20, 226,
+ /* 380 */ 121, 122, 359, 294, 68, 235, 236, 237, 238, 239,
+ /* 390 */ 367, 88, 303, 90, 91, 312, 93, 314, 171, 0,
+ /* 400 */ 97, 85, 63, 64, 65, 66, 67, 227, 69, 70,
+ /* 410 */ 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
+ /* 420 */ 81, 82, 119, 107, 20, 166, 22, 168, 8, 9,
+ /* 430 */ 226, 60, 12, 13, 14, 15, 16, 121, 122, 35,
+ /* 440 */ 4, 214, 215, 216, 217, 218, 219, 220, 221, 222,
+ /* 450 */ 223, 245, 193, 194, 50, 196, 197, 198, 199, 200,
+ /* 460 */ 201, 202, 203, 204, 205, 206, 207, 208, 209, 210,
+ /* 470 */ 211, 212, 213, 0, 56, 116, 117, 63, 64, 65,
+ /* 480 */ 44, 45, 166, 69, 168, 197, 72, 73, 273, 274,
+ /* 490 */ 76, 77, 78, 8, 9, 0, 289, 12, 13, 14,
+ /* 500 */ 15, 16, 117, 85, 60, 87, 259, 300, 79, 193,
+ /* 510 */ 194, 153, 196, 197, 198, 199, 200, 201, 202, 203,
+ /* 520 */ 204, 205, 206, 207, 208, 209, 210, 211, 212, 213,
+ /* 530 */ 12, 13, 14, 326, 327, 328, 177, 14, 20, 180,
+ /* 540 */ 22, 259, 226, 20, 56, 338, 61, 300, 312, 279,
+ /* 550 */ 314, 33, 267, 35, 125, 126, 0, 287, 63, 64,
+ /* 560 */ 65, 176, 177, 278, 69, 180, 296, 72, 73, 287,
+ /* 570 */ 97, 76, 77, 78, 56, 87, 148, 295, 158, 94,
+ /* 580 */ 295, 151, 300, 4, 302, 287, 68, 12, 13, 116,
+ /* 590 */ 117, 118, 119, 120, 267, 20, 267, 22, 19, 171,
+ /* 600 */ 295, 303, 43, 85, 48, 278, 21, 278, 33, 327,
+ /* 610 */ 35, 306, 33, 331, 332, 333, 334, 335, 336, 34,
+ /* 620 */ 338, 36, 295, 341, 295, 107, 47, 345, 346, 347,
+ /* 630 */ 51, 56, 161, 148, 289, 56, 267, 267, 20, 121,
+ /* 640 */ 122, 289, 214, 68, 226, 300, 269, 278, 278, 367,
+ /* 650 */ 288, 14, 300, 259, 183, 184, 171, 20, 68, 282,
+ /* 660 */ 85, 231, 232, 84, 295, 295, 87, 290, 248, 8,
+ /* 670 */ 9, 326, 327, 12, 13, 14, 15, 16, 326, 327,
+ /* 680 */ 328, 302, 107, 338, 166, 14, 168, 14, 15, 16,
+ /* 690 */ 338, 20, 313, 259, 300, 96, 121, 122, 0, 214,
+ /* 700 */ 215, 216, 217, 218, 219, 220, 221, 222, 223, 1,
+ /* 710 */ 2, 193, 194, 3, 196, 197, 198, 199, 200, 201,
+ /* 720 */ 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
+ /* 730 */ 212, 213, 8, 9, 300, 329, 12, 13, 14, 15,
+ /* 740 */ 16, 166, 297, 168, 275, 300, 277, 86, 98, 99,
+ /* 750 */ 100, 101, 102, 103, 104, 105, 106, 107, 108, 353,
+ /* 760 */ 110, 111, 112, 113, 114, 115, 259, 43, 193, 194,
+ /* 770 */ 259, 196, 197, 198, 199, 200, 201, 202, 203, 204,
+ /* 780 */ 205, 206, 207, 208, 209, 210, 211, 212, 213, 12,
+ /* 790 */ 13, 18, 35, 20, 86, 97, 287, 20, 267, 22,
+ /* 800 */ 27, 259, 267, 30, 68, 296, 247, 300, 267, 278,
+ /* 810 */ 33, 300, 35, 278, 116, 117, 118, 119, 120, 278,
+ /* 820 */ 47, 267, 49, 0, 51, 68, 295, 267, 267, 287,
+ /* 830 */ 295, 20, 278, 56, 197, 39, 295, 295, 278, 278,
+ /* 840 */ 259, 259, 300, 43, 302, 68, 8, 9, 85, 295,
+ /* 850 */ 12, 13, 14, 15, 16, 295, 295, 84, 95, 8,
+ /* 860 */ 9, 267, 85, 12, 13, 14, 15, 16, 197, 327,
+ /* 870 */ 47, 97, 278, 331, 332, 333, 334, 335, 336, 288,
+ /* 880 */ 338, 300, 300, 341, 107, 259, 86, 345, 346, 295,
+ /* 890 */ 116, 117, 118, 119, 120, 42, 43, 124, 121, 122,
+ /* 900 */ 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
+ /* 910 */ 137, 138, 139, 140, 141, 142, 143, 144, 329, 146,
+ /* 920 */ 147, 288, 259, 2, 86, 329, 300, 18, 288, 8,
+ /* 930 */ 9, 259, 23, 12, 13, 14, 15, 16, 44, 45,
+ /* 940 */ 35, 267, 353, 166, 288, 168, 37, 38, 2, 353,
+ /* 950 */ 41, 320, 278, 243, 8, 9, 259, 43, 12, 13,
+ /* 960 */ 14, 15, 16, 300, 153, 259, 57, 58, 59, 295,
+ /* 970 */ 193, 194, 300, 196, 197, 198, 199, 200, 201, 202,
+ /* 980 */ 203, 204, 205, 206, 207, 208, 209, 210, 211, 212,
+ /* 990 */ 213, 19, 267, 287, 85, 280, 297, 300, 283, 300,
+ /* 1000 */ 86, 295, 288, 278, 153, 33, 300, 259, 302, 259,
+ /* 1010 */ 8, 9, 259, 259, 12, 13, 14, 15, 16, 47,
+ /* 1020 */ 295, 225, 316, 0, 52, 53, 54, 55, 56, 35,
+ /* 1030 */ 224, 225, 123, 327, 153, 154, 46, 331, 332, 333,
+ /* 1040 */ 334, 335, 336, 43, 338, 22, 259, 341, 300, 0,
+ /* 1050 */ 300, 345, 346, 300, 300, 89, 84, 0, 92, 87,
+ /* 1060 */ 12, 13, 89, 357, 43, 92, 61, 158, 159, 160,
+ /* 1070 */ 22, 22, 163, 168, 287, 85, 370, 288, 169, 22,
+ /* 1080 */ 374, 33, 295, 35, 43, 260, 86, 300, 86, 302,
+ /* 1090 */ 276, 182, 120, 377, 185, 43, 187, 188, 189, 190,
+ /* 1100 */ 191, 192, 289, 89, 56, 89, 92, 86, 92, 43,
+ /* 1110 */ 43, 43, 368, 300, 327, 43, 68, 43, 331, 332,
+ /* 1120 */ 333, 334, 335, 336, 152, 338, 43, 86, 341, 1,
+ /* 1130 */ 2, 268, 345, 346, 347, 226, 259, 287, 86, 326,
+ /* 1140 */ 327, 121, 122, 356, 43, 173, 43, 175, 43, 323,
+ /* 1150 */ 43, 338, 86, 86, 86, 107, 364, 268, 86, 266,
+ /* 1160 */ 86, 299, 168, 330, 287, 355, 348, 358, 371, 86,
+ /* 1170 */ 371, 228, 295, 371, 325, 20, 47, 300, 267, 302,
+ /* 1180 */ 324, 35, 164, 273, 318, 267, 267, 86, 148, 86,
+ /* 1190 */ 42, 86, 259, 86, 307, 305, 305, 267, 193, 267,
+ /* 1200 */ 261, 267, 20, 261, 327, 20, 322, 271, 331, 332,
+ /* 1210 */ 333, 334, 335, 336, 166, 338, 168, 302, 341, 271,
+ /* 1220 */ 287, 20, 345, 346, 20, 317, 271, 315, 295, 271,
+ /* 1230 */ 20, 315, 308, 300, 259, 302, 271, 267, 271, 271,
+ /* 1240 */ 261, 193, 194, 287, 287, 267, 287, 287, 287, 287,
+ /* 1250 */ 287, 287, 261, 205, 206, 207, 208, 209, 210, 211,
+ /* 1260 */ 327, 287, 287, 287, 331, 332, 333, 334, 335, 336,
+ /* 1270 */ 295, 338, 287, 322, 341, 300, 269, 302, 345, 346,
+ /* 1280 */ 347, 300, 174, 233, 302, 150, 269, 259, 269, 356,
+ /* 1290 */ 321, 267, 267, 300, 311, 315, 300, 259, 300, 300,
+ /* 1300 */ 311, 300, 327, 295, 309, 308, 331, 332, 333, 334,
+ /* 1310 */ 335, 336, 269, 338, 283, 287, 341, 295, 20, 234,
+ /* 1320 */ 345, 346, 347, 295, 269, 287, 300, 300, 300, 300,
+ /* 1330 */ 302, 356, 22, 295, 330, 300, 300, 240, 300, 229,
+ /* 1340 */ 302, 311, 365, 311, 157, 35, 242, 259, 225, 363,
+ /* 1350 */ 363, 363, 241, 295, 316, 327, 20, 259, 366, 331,
+ /* 1360 */ 332, 333, 334, 335, 336, 327, 338, 325, 362, 331,
+ /* 1370 */ 332, 333, 334, 335, 336, 287, 338, 246, 68, 249,
+ /* 1380 */ 329, 244, 373, 295, 372, 287, 373, 372, 300, 378,
+ /* 1390 */ 302, 85, 85, 295, 361, 357, 300, 360, 300, 277,
+ /* 1400 */ 302, 267, 269, 344, 316, 291, 36, 373, 370, 262,
+ /* 1410 */ 261, 372, 374, 319, 314, 327, 257, 107, 0, 331,
+ /* 1420 */ 332, 333, 334, 335, 336, 327, 338, 270, 0, 331,
+ /* 1430 */ 332, 333, 334, 335, 336, 337, 338, 339, 340, 259,
+ /* 1440 */ 267, 281, 281, 281, 176, 357, 0, 0, 42, 0,
+ /* 1450 */ 76, 0, 35, 186, 35, 35, 35, 186, 370, 0,
+ /* 1460 */ 35, 35, 374, 186, 0, 186, 0, 287, 295, 0,
+ /* 1470 */ 35, 0, 22, 35, 0, 295, 166, 85, 168, 171,
+ /* 1480 */ 300, 170, 302, 168, 166, 0, 0, 162, 161, 316,
+ /* 1490 */ 0, 0, 0, 259, 46, 0, 0, 145, 0, 0,
+ /* 1500 */ 0, 0, 0, 193, 194, 140, 0, 327, 335, 140,
+ /* 1510 */ 35, 331, 332, 333, 334, 335, 336, 259, 338, 0,
+ /* 1520 */ 0, 287, 42, 350, 351, 352, 0, 354, 0, 295,
+ /* 1530 */ 357, 0, 0, 0, 300, 0, 302, 0, 0, 0,
+ /* 1540 */ 0, 0, 0, 370, 0, 287, 0, 374, 0, 0,
+ /* 1550 */ 292, 0, 0, 295, 39, 375, 376, 0, 300, 0,
+ /* 1560 */ 302, 327, 0, 0, 0, 331, 332, 333, 334, 335,
+ /* 1570 */ 336, 259, 338, 56, 0, 341, 22, 56, 0, 0,
+ /* 1580 */ 346, 259, 14, 14, 0, 327, 43, 42, 0, 331,
+ /* 1590 */ 332, 333, 334, 335, 336, 0, 338, 0, 40, 287,
+ /* 1600 */ 39, 46, 46, 0, 292, 39, 0, 295, 0, 287,
+ /* 1610 */ 157, 0, 300, 0, 302, 62, 35, 295, 47, 39,
+ /* 1620 */ 0, 35, 300, 47, 302, 0, 39, 0, 35, 39,
+ /* 1630 */ 47, 259, 47, 35, 0, 39, 0, 0, 0, 327,
+ /* 1640 */ 35, 94, 92, 331, 332, 333, 334, 335, 336, 327,
+ /* 1650 */ 338, 22, 0, 331, 332, 333, 334, 335, 336, 287,
+ /* 1660 */ 338, 35, 43, 35, 43, 35, 35, 295, 35, 0,
+ /* 1670 */ 35, 22, 300, 22, 302, 35, 35, 0, 0, 22,
+ /* 1680 */ 35, 259, 0, 35, 0, 35, 0, 22, 49, 0,
+ /* 1690 */ 20, 369, 85, 259, 35, 0, 172, 22, 0, 327,
+ /* 1700 */ 0, 0, 0, 331, 332, 333, 334, 335, 336, 287,
+ /* 1710 */ 338, 0, 0, 153, 0, 181, 149, 295, 153, 39,
+ /* 1720 */ 150, 287, 300, 230, 302, 46, 292, 85, 153, 295,
+ /* 1730 */ 86, 85, 155, 43, 300, 230, 302, 43, 85, 85,
+ /* 1740 */ 151, 86, 95, 85, 230, 46, 86, 86, 376, 327,
+ /* 1750 */ 86, 85, 85, 331, 332, 333, 334, 335, 336, 85,
+ /* 1760 */ 338, 327, 340, 43, 46, 331, 332, 333, 334, 335,
+ /* 1770 */ 336, 259, 338, 85, 43, 46, 43, 86, 85, 43,
+ /* 1780 */ 46, 259, 86, 86, 46, 35, 35, 35, 35, 86,
+ /* 1790 */ 86, 35, 35, 2, 22, 193, 86, 224, 43, 287,
+ /* 1800 */ 85, 85, 22, 86, 292, 86, 85, 295, 46, 287,
+ /* 1810 */ 85, 85, 300, 46, 302, 85, 35, 295, 195, 96,
+ /* 1820 */ 35, 86, 300, 86, 302, 85, 85, 35, 86, 35,
+ /* 1830 */ 85, 259, 86, 35, 85, 35, 109, 109, 22, 327,
+ /* 1840 */ 97, 259, 35, 331, 332, 333, 334, 335, 336, 327,
+ /* 1850 */ 338, 259, 86, 331, 332, 333, 334, 335, 336, 287,
+ /* 1860 */ 338, 85, 85, 85, 85, 43, 22, 295, 109, 287,
+ /* 1870 */ 109, 62, 300, 61, 302, 43, 35, 295, 68, 287,
+ /* 1880 */ 83, 35, 300, 35, 302, 35, 35, 295, 35, 22,
+ /* 1890 */ 35, 35, 300, 68, 302, 35, 35, 35, 35, 327,
+ /* 1900 */ 35, 35, 0, 331, 332, 333, 334, 335, 336, 327,
+ /* 1910 */ 338, 35, 35, 331, 332, 333, 334, 335, 336, 327,
+ /* 1920 */ 338, 35, 47, 331, 332, 333, 334, 335, 336, 39,
+ /* 1930 */ 338, 0, 259, 35, 47, 39, 0, 0, 35, 47,
+ /* 1940 */ 39, 35, 47, 39, 0, 35, 35, 0, 22, 21,
+ /* 1950 */ 21, 259, 22, 20, 22, 379, 379, 379, 379, 379,
+ /* 1960 */ 287, 379, 379, 379, 379, 379, 379, 379, 295, 379,
+ /* 1970 */ 379, 379, 379, 300, 379, 302, 379, 379, 379, 287,
+ /* 1980 */ 379, 379, 379, 379, 379, 379, 379, 295, 379, 379,
+ /* 1990 */ 379, 379, 300, 379, 302, 379, 379, 379, 379, 379,
+ /* 2000 */ 327, 379, 379, 379, 331, 332, 333, 334, 335, 336,
+ /* 2010 */ 379, 338, 379, 259, 379, 379, 379, 379, 379, 327,
+ /* 2020 */ 379, 379, 379, 331, 332, 333, 334, 335, 336, 259,
+ /* 2030 */ 338, 379, 379, 379, 379, 379, 379, 379, 379, 379,
+ /* 2040 */ 379, 287, 379, 379, 379, 379, 379, 379, 379, 295,
+ /* 2050 */ 379, 379, 379, 379, 300, 379, 302, 287, 379, 379,
+ /* 2060 */ 379, 379, 379, 379, 379, 295, 379, 379, 379, 379,
+ /* 2070 */ 300, 379, 302, 379, 379, 379, 379, 379, 379, 379,
+ /* 2080 */ 379, 327, 259, 379, 379, 331, 332, 333, 334, 335,
+ /* 2090 */ 336, 379, 338, 379, 379, 379, 379, 327, 379, 259,
+ /* 2100 */ 379, 331, 332, 333, 334, 335, 336, 379, 338, 379,
+ /* 2110 */ 287, 379, 379, 379, 379, 379, 379, 379, 295, 379,
+ /* 2120 */ 379, 379, 379, 300, 379, 302, 379, 287, 379, 379,
+ /* 2130 */ 379, 379, 379, 379, 379, 295, 379, 379, 379, 379,
+ /* 2140 */ 300, 379, 302, 379, 379, 379, 379, 379, 379, 379,
+ /* 2150 */ 327, 379, 259, 379, 331, 332, 333, 334, 335, 336,
+ /* 2160 */ 379, 338, 379, 379, 259, 379, 379, 327, 379, 379,
+ /* 2170 */ 379, 331, 332, 333, 334, 335, 336, 379, 338, 379,
+ /* 2180 */ 287, 379, 379, 379, 379, 379, 379, 379, 295, 379,
+ /* 2190 */ 379, 379, 287, 300, 379, 302, 379, 379, 379, 379,
+ /* 2200 */ 295, 379, 379, 379, 379, 300, 379, 302, 379, 379,
+ /* 2210 */ 379, 379, 379, 379, 379, 379, 379, 379, 379, 379,
+ /* 2220 */ 327, 379, 379, 379, 331, 332, 333, 334, 335, 336,
+ /* 2230 */ 379, 338, 327, 259, 379, 379, 331, 332, 333, 334,
+ /* 2240 */ 335, 336, 379, 338, 379, 379, 379, 259, 379, 379,
+ /* 2250 */ 379, 379, 379, 379, 379, 379, 379, 379, 379, 379,
+ /* 2260 */ 379, 287, 379, 379, 379, 379, 379, 379, 379, 295,
+ /* 2270 */ 379, 379, 379, 379, 300, 287, 302, 379, 379, 379,
+ /* 2280 */ 379, 379, 379, 295, 379, 379, 379, 379, 300, 259,
+ /* 2290 */ 302, 379, 379, 379, 379, 379, 379, 379, 379, 379,
+ /* 2300 */ 379, 327, 379, 379, 379, 331, 332, 333, 334, 335,
+ /* 2310 */ 336, 379, 338, 379, 379, 327, 379, 287, 379, 331,
+ /* 2320 */ 332, 333, 334, 335, 336, 295, 338, 379, 379, 379,
+ /* 2330 */ 300, 379, 302, 379, 379, 379, 379, 379, 379, 379,
+ /* 2340 */ 379, 259, 379, 379, 379, 379, 379, 379, 379, 379,
+ /* 2350 */ 379, 379, 379, 379, 379, 379, 379, 327, 379, 259,
+ /* 2360 */ 379, 331, 332, 333, 334, 335, 336, 379, 338, 287,
+ /* 2370 */ 379, 379, 379, 379, 379, 379, 379, 295, 379, 379,
+ /* 2380 */ 379, 379, 300, 259, 302, 379, 379, 287, 379, 379,
+ /* 2390 */ 379, 379, 379, 379, 379, 295, 379, 379, 379, 379,
+ /* 2400 */ 300, 379, 302, 379, 379, 379, 379, 379, 379, 327,
+ /* 2410 */ 379, 287, 379, 331, 332, 333, 334, 335, 336, 295,
+ /* 2420 */ 338, 379, 379, 379, 300, 379, 302, 327, 379, 379,
+ /* 2430 */ 379, 331, 332, 333, 334, 335, 336, 379, 338, 267,
+ /* 2440 */ 259, 379, 379, 379, 379, 379, 379, 379, 379, 379,
+ /* 2450 */ 379, 327, 379, 379, 379, 331, 332, 333, 334, 335,
+ /* 2460 */ 336, 379, 338, 379, 379, 379, 379, 295, 287, 379,
+ /* 2470 */ 379, 379, 379, 379, 379, 379, 295, 379, 379, 379,
+ /* 2480 */ 379, 300, 379, 302, 379, 379, 379, 379, 316, 379,
+ /* 2490 */ 379, 379, 379, 379, 379, 379, 379, 379, 379, 379,
+ /* 2500 */ 379, 379, 379, 379, 379, 379, 379, 335, 327, 379,
+ /* 2510 */ 379, 379, 331, 332, 333, 334, 335, 336, 379, 338,
+ /* 2520 */ 379, 379, 350, 351, 352, 379, 354, 379, 379, 357,
+ /* 2530 */ 379, 379, 379, 379, 379, 379, 379, 379, 379, 379,
+ /* 2540 */ 379, 379, 370, 379, 379, 379, 374,
};
-#define YY_SHIFT_COUNT (665)
+#define YY_SHIFT_COUNT (668)
#define YY_SHIFT_MIN (0)
-#define YY_SHIFT_MAX (2008)
+#define YY_SHIFT_MAX (1947)
static const unsigned short int yy_shift_ofst[] = {
- /* 0 */ 911, 0, 0, 62, 62, 263, 263, 263, 320, 320,
- /* 10 */ 263, 263, 521, 578, 779, 578, 578, 578, 578, 578,
- /* 20 */ 578, 578, 578, 578, 578, 578, 578, 578, 578, 578,
- /* 30 */ 578, 578, 578, 578, 578, 578, 578, 578, 578, 578,
- /* 40 */ 578, 578, 209, 209, 35, 35, 35, 980, 980, 980,
- /* 50 */ 980, 208, 350, 32, 32, 167, 167, 19, 19, 11,
- /* 60 */ 38, 32, 32, 167, 167, 167, 167, 167, 167, 167,
- /* 70 */ 167, 167, 182, 167, 167, 167, 230, 352, 167, 167,
- /* 80 */ 352, 438, 167, 352, 352, 352, 167, 452, 775, 231,
- /* 90 */ 489, 489, 13, 98, 730, 730, 730, 730, 730, 730,
- /* 100 */ 730, 730, 730, 730, 730, 730, 730, 730, 730, 730,
- /* 110 */ 730, 730, 730, 418, 38, 522, 522, 383, 567, 576,
- /* 120 */ 480, 480, 480, 567, 558, 230, 1, 1, 352, 352,
- /* 130 */ 585, 585, 663, 696, 201, 201, 201, 201, 201, 201,
- /* 140 */ 201, 1594, 125, 684, 119, 573, 69, 313, 343, 351,
- /* 150 */ 631, 529, 494, 39, 548, 514, 673, 514, 708, 842,
- /* 160 */ 842, 842, 250, 666, 1045, 916, 1125, 1116, 1133, 1011,
- /* 170 */ 1125, 1125, 1152, 1067, 1067, 1125, 1125, 1125, 1203, 1203,
- /* 180 */ 1208, 182, 230, 182, 1212, 1215, 182, 1212, 182, 1228,
- /* 190 */ 182, 182, 1125, 182, 1203, 352, 352, 352, 352, 352,
- /* 200 */ 352, 352, 352, 352, 352, 352, 1125, 1203, 585, 1208,
- /* 210 */ 452, 1108, 230, 452, 1125, 1125, 1212, 452, 1074, 585,
- /* 220 */ 585, 585, 585, 1074, 585, 1177, 558, 1228, 452, 663,
- /* 230 */ 452, 558, 1325, 585, 1114, 1074, 585, 585, 1114, 1074,
- /* 240 */ 585, 585, 352, 1121, 1206, 1114, 1123, 1147, 1160, 916,
- /* 250 */ 1166, 558, 1376, 1154, 1158, 1155, 1154, 1158, 1154, 1158,
- /* 260 */ 1317, 1045, 585, 696, 1125, 452, 1375, 1203, 2318, 2318,
- /* 270 */ 2318, 2318, 2318, 2318, 2318, 601, 910, 386, 1241, 469,
- /* 280 */ 551, 682, 840, 879, 853, 727, 1037, 314, 314, 314,
- /* 290 */ 314, 314, 314, 314, 314, 1061, 699, 274, 274, 445,
- /* 300 */ 65, 108, 156, 44, 168, 602, 339, 200, 200, 200,
- /* 310 */ 200, 297, 784, 843, 848, 862, 912, 57, 850, 928,
- /* 320 */ 92, 864, 990, 1039, 1040, 1051, 1052, 1054, 1063, 819,
- /* 330 */ 762, 702, 883, 1064, 771, 994, 812, 1066, 1043, 1096,
- /* 340 */ 1117, 1118, 1126, 1127, 1128, 937, 906, 1056, 1435, 1270,
- /* 350 */ 1448, 1457, 1416, 1459, 1384, 1461, 1427, 1278, 1428, 1431,
- /* 360 */ 1432, 1282, 1469, 1437, 1438, 1284, 1474, 1289, 1477, 1443,
- /* 370 */ 1480, 1460, 1481, 1452, 1485, 1403, 1318, 1320, 1324, 1328,
- /* 380 */ 1495, 1497, 1337, 1339, 1502, 1503, 1458, 1505, 1507, 1509,
- /* 390 */ 1365, 1512, 1513, 1514, 1524, 1525, 1396, 1491, 1543, 1405,
- /* 400 */ 1546, 1547, 1548, 1558, 1559, 1560, 1561, 1566, 1567, 1569,
- /* 410 */ 1570, 1572, 1573, 1574, 1508, 1551, 1552, 1553, 1554, 1555,
- /* 420 */ 1556, 1557, 1575, 1577, 1580, 1581, 1583, 1528, 1585, 1530,
- /* 430 */ 1587, 1590, 1549, 1562, 1563, 1578, 1571, 1591, 1576, 1599,
- /* 440 */ 1564, 1579, 1619, 1620, 1623, 1586, 1471, 1626, 1632, 1633,
- /* 450 */ 1589, 1634, 1635, 1601, 1568, 1598, 1638, 1604, 1593, 1606,
- /* 460 */ 1642, 1608, 1605, 1614, 1654, 1622, 1612, 1616, 1668, 1669,
- /* 470 */ 1670, 1674, 1582, 1592, 1640, 1655, 1679, 1647, 1648, 1651,
- /* 480 */ 1653, 1646, 1649, 1656, 1658, 1659, 1660, 1690, 1675, 1696,
- /* 490 */ 1677, 1652, 1700, 1688, 1676, 1713, 1680, 1722, 1689, 1725,
- /* 500 */ 1704, 1707, 1728, 1584, 1694, 1731, 1588, 1710, 1595, 1597,
- /* 510 */ 1733, 1734, 1600, 1602, 1735, 1738, 1739, 1671, 1666, 1596,
- /* 520 */ 1740, 1678, 1610, 1683, 1741, 1703, 1613, 1685, 1650, 1697,
- /* 530 */ 1711, 1526, 1687, 1673, 1705, 1693, 1702, 1709, 1721, 1714,
- /* 540 */ 1712, 1716, 1726, 1724, 1732, 1719, 1743, 1727, 1752, 1545,
- /* 550 */ 1729, 1730, 1750, 1607, 1756, 1767, 1768, 1745, 1774, 1609,
- /* 560 */ 1746, 1784, 1786, 1799, 1802, 1804, 1805, 1746, 1839, 1820,
- /* 570 */ 1661, 1800, 1760, 1761, 1763, 1764, 1770, 1766, 1807, 1771,
- /* 580 */ 1772, 1812, 1824, 1664, 1777, 1776, 1788, 1828, 1835, 1790,
- /* 590 */ 1791, 1843, 1794, 1806, 1851, 1803, 1808, 1855, 1810, 1813,
- /* 600 */ 1856, 1811, 1789, 1796, 1797, 1798, 1871, 1814, 1815, 1818,
- /* 610 */ 1873, 1827, 1867, 1867, 1891, 1857, 1859, 1882, 1850, 1838,
- /* 620 */ 1879, 1888, 1889, 1892, 1893, 1895, 1904, 1896, 1897, 1874,
- /* 630 */ 1646, 1909, 1649, 1919, 1920, 1922, 1924, 1925, 1927, 1928,
- /* 640 */ 1964, 1930, 1923, 1932, 1969, 1937, 1926, 1935, 1976, 1942,
- /* 650 */ 1931, 1945, 1979, 1946, 1938, 1947, 1996, 1968, 1971, 2008,
- /* 660 */ 1987, 1989, 1997, 1998, 2000, 2002,
+ /* 0 */ 909, 0, 0, 57, 57, 259, 259, 259, 316, 316,
+ /* 10 */ 259, 259, 518, 575, 777, 575, 575, 575, 575, 575,
+ /* 20 */ 575, 575, 575, 575, 575, 575, 575, 575, 575, 575,
+ /* 30 */ 575, 575, 575, 575, 575, 575, 575, 575, 575, 575,
+ /* 40 */ 575, 575, 54, 54, 53, 53, 53, 1048, 1048, 86,
+ /* 50 */ 1048, 1048, 80, 418, 153, 204, 153, 19, 19, 436,
+ /* 60 */ 436, 100, 61, 153, 153, 19, 19, 19, 19, 19,
+ /* 70 */ 19, 19, 19, 19, 233, 19, 19, 19, 97, 255,
+ /* 80 */ 19, 19, 255, 354, 19, 255, 255, 255, 19, 444,
+ /* 90 */ 773, 227, 485, 485, 122, 414, 1310, 1310, 1310, 1310,
+ /* 100 */ 1310, 1310, 1310, 1310, 1310, 1310, 1310, 1310, 1310, 1310,
+ /* 110 */ 1310, 1310, 1310, 1310, 1310, 303, 61, 523, 523, 287,
+ /* 120 */ 127, 371, 358, 358, 358, 127, 618, 97, 399, 399,
+ /* 130 */ 255, 255, 590, 590, 599, 736, 650, 650, 650, 650,
+ /* 140 */ 650, 650, 650, 972, 21, 495, 420, 150, 404, 385,
+ /* 150 */ 430, 637, 671, 202, 894, 248, 811, 806, 796, 806,
+ /* 160 */ 853, 710, 710, 710, 180, 288, 943, 1155, 1129, 1146,
+ /* 170 */ 1018, 1155, 1155, 1148, 1040, 1040, 1155, 1155, 1155, 1182,
+ /* 180 */ 1182, 1185, 233, 97, 233, 1201, 1204, 233, 1201, 233,
+ /* 190 */ 1210, 233, 233, 1155, 233, 1182, 255, 255, 255, 255,
+ /* 200 */ 255, 255, 255, 255, 255, 255, 255, 1155, 1182, 590,
+ /* 210 */ 1185, 444, 1108, 97, 444, 1155, 1155, 1201, 444, 1050,
+ /* 220 */ 590, 590, 590, 590, 1050, 590, 1135, 618, 1210, 444,
+ /* 230 */ 599, 444, 618, 1298, 590, 1085, 1050, 590, 590, 1085,
+ /* 240 */ 1050, 590, 590, 255, 1097, 1187, 1085, 1104, 1111, 1110,
+ /* 250 */ 943, 1123, 618, 1336, 1131, 1137, 1130, 1131, 1137, 1131,
+ /* 260 */ 1137, 1306, 1307, 590, 736, 1155, 444, 1370, 1182, 2547,
+ /* 270 */ 2547, 2547, 2547, 2547, 2547, 2547, 339, 134, 273, 579,
+ /* 280 */ 661, 724, 838, 921, 946, 851, 1002, 473, 51, 51,
+ /* 290 */ 51, 51, 51, 51, 51, 51, 698, 774, 145, 145,
+ /* 300 */ 359, 471, 190, 429, 585, 13, 708, 428, 673, 673,
+ /* 310 */ 673, 673, 84, 823, 800, 966, 973, 1014, 1016, 1023,
+ /* 320 */ 1049, 1057, 488, 881, 914, 1000, 1021, 1041, 1052, 1066,
+ /* 330 */ 1068, 1128, 1020, 206, 559, 1072, 905, 994, 1005, 1067,
+ /* 340 */ 990, 1074, 1083, 1101, 1103, 1105, 1107, 763, 757, 556,
+ /* 350 */ 1418, 1428, 1268, 1446, 1447, 1406, 1449, 1374, 1451, 1417,
+ /* 360 */ 1267, 1419, 1420, 1421, 1271, 1459, 1425, 1426, 1277, 1464,
+ /* 370 */ 1279, 1466, 1435, 1469, 1450, 1471, 1438, 1474, 1392, 1308,
+ /* 380 */ 1311, 1315, 1318, 1485, 1486, 1325, 1327, 1490, 1491, 1448,
+ /* 390 */ 1492, 1495, 1496, 1352, 1498, 1499, 1500, 1501, 1502, 1365,
+ /* 400 */ 1475, 1506, 1369, 1519, 1520, 1526, 1528, 1531, 1532, 1533,
+ /* 410 */ 1535, 1537, 1538, 1539, 1540, 1541, 1542, 1480, 1544, 1546,
+ /* 420 */ 1548, 1549, 1551, 1552, 1554, 1557, 1559, 1562, 1563, 1564,
+ /* 430 */ 1517, 1574, 1521, 1578, 1579, 1545, 1515, 1543, 1568, 1555,
+ /* 440 */ 1569, 1556, 1584, 1558, 1561, 1588, 1595, 1597, 1566, 1453,
+ /* 450 */ 1603, 1606, 1608, 1553, 1611, 1613, 1581, 1571, 1580, 1620,
+ /* 460 */ 1586, 1576, 1587, 1625, 1593, 1583, 1590, 1627, 1598, 1585,
+ /* 470 */ 1596, 1634, 1636, 1637, 1638, 1547, 1550, 1605, 1629, 1652,
+ /* 480 */ 1626, 1628, 1630, 1631, 1619, 1621, 1633, 1635, 1640, 1641,
+ /* 490 */ 1669, 1649, 1677, 1651, 1639, 1678, 1657, 1645, 1682, 1648,
+ /* 500 */ 1684, 1650, 1686, 1665, 1670, 1689, 1560, 1659, 1695, 1524,
+ /* 510 */ 1675, 1565, 1570, 1698, 1700, 1575, 1577, 1701, 1702, 1711,
+ /* 520 */ 1607, 1644, 1534, 1712, 1642, 1589, 1646, 1714, 1680, 1567,
+ /* 530 */ 1653, 1647, 1679, 1690, 1493, 1654, 1655, 1658, 1660, 1661,
+ /* 540 */ 1666, 1694, 1664, 1667, 1674, 1688, 1691, 1720, 1699, 1718,
+ /* 550 */ 1693, 1731, 1505, 1696, 1697, 1729, 1573, 1733, 1734, 1738,
+ /* 560 */ 1703, 1736, 1514, 1704, 1750, 1751, 1752, 1753, 1756, 1757,
+ /* 570 */ 1704, 1791, 1772, 1602, 1755, 1715, 1710, 1716, 1717, 1721,
+ /* 580 */ 1719, 1762, 1725, 1726, 1767, 1780, 1623, 1730, 1723, 1735,
+ /* 590 */ 1781, 1785, 1740, 1737, 1792, 1741, 1742, 1794, 1745, 1746,
+ /* 600 */ 1798, 1749, 1766, 1800, 1776, 1727, 1728, 1759, 1761, 1816,
+ /* 610 */ 1743, 1777, 1778, 1807, 1779, 1822, 1822, 1844, 1809, 1812,
+ /* 620 */ 1841, 1810, 1797, 1832, 1846, 1848, 1850, 1851, 1853, 1867,
+ /* 630 */ 1855, 1856, 1825, 1619, 1860, 1621, 1861, 1862, 1863, 1865,
+ /* 640 */ 1866, 1876, 1877, 1902, 1886, 1875, 1890, 1931, 1898, 1887,
+ /* 650 */ 1896, 1936, 1903, 1892, 1901, 1937, 1906, 1895, 1904, 1944,
+ /* 660 */ 1910, 1911, 1947, 1926, 1928, 1930, 1932, 1929, 1933,
};
-#define YY_REDUCE_COUNT (274)
-#define YY_REDUCE_MIN (-312)
-#define YY_REDUCE_MAX (1950)
+#define YY_REDUCE_COUNT (275)
+#define YY_REDUCE_MIN (-294)
+#define YY_REDUCE_MAX (2181)
static const short yy_reduce_ofst[] = {
- /* 0 */ -78, -232, 63, 286, -113, 709, 787, 865, 907, 968,
- /* 10 */ 545, 978, 1035, 1049, 1099, 1119, 1185, 1197, 1207, 1263,
- /* 20 */ 1277, 1330, 1372, 1386, 1450, 1472, 1492, 1534, 1550, 1603,
- /* 30 */ 1615, 1657, 1667, 1681, 1737, 1747, 1759, 1825, 1837, 1890,
- /* 40 */ 1940, 1950, -263, 1944, -14, 75, 305, -278, 55, 270,
- /* 50 */ 726, -296, 123, 184, 643, -266, -43, -260, -256, -303,
- /* 60 */ -186, -230, -191, -185, 97, 315, 316, 363, 557, 563,
- /* 70 */ 564, 566, -154, 659, 661, 665, -285, -106, 667, 732,
- /* 80 */ 59, 24, 734, 72, 322, 82, 753, 70, -252, -312,
- /* 90 */ -312, -312, -117, -239, -114, -20, 141, 181, 196, 289,
- /* 100 */ 328, 435, 455, 505, 575, 672, 766, 769, 773, 780,
- /* 110 */ 792, 809, 817, 299, -110, 124, 138, -220, 148, -243,
- /* 120 */ 218, 310, 364, 150, 354, 349, 336, 456, 319, 205,
- /* 130 */ 474, 498, 476, 562, -280, -270, 382, 513, 538, 633,
- /* 140 */ 669, 641, 748, 366, 644, 654, 756, 735, 695, 791,
- /* 150 */ 791, 811, 825, 794, 776, 757, 757, 757, 763, 742,
- /* 160 */ 744, 745, 778, 791, 851, 820, 881, 844, 900, 859,
- /* 170 */ 917, 926, 901, 913, 914, 950, 953, 955, 964, 965,
- /* 180 */ 908, 957, 929, 961, 920, 927, 976, 933, 979, 943,
- /* 190 */ 981, 982, 987, 985, 996, 971, 972, 973, 975, 984,
- /* 200 */ 989, 992, 995, 998, 999, 1000, 1002, 1005, 967, 952,
- /* 210 */ 1003, 969, 986, 1022, 1025, 1029, 1006, 1028, 1004, 1017,
- /* 220 */ 1018, 1020, 1027, 1021, 1031, 1024, 1044, 1026, 1071, 1058,
- /* 230 */ 1076, 1048, 1023, 1047, 991, 1041, 1050, 1055, 993, 1046,
- /* 240 */ 1059, 1060, 791, 997, 1012, 1016, 1030, 1032, 1036, 1065,
- /* 250 */ 757, 1100, 1069, 1034, 1033, 1038, 1042, 1057, 1068, 1070,
- /* 260 */ 1073, 1122, 1109, 1131, 1143, 1149, 1161, 1159, 1103, 1113,
- /* 270 */ 1157, 1162, 1167, 1169, 1171,
+ /* 0 */ -254, -201, 706, 23, 282, 787, 933, 975, 1038, 1088,
+ /* 10 */ 542, 877, 1098, 1180, 1234, 1258, 1312, 1322, 1372, 1422,
+ /* 20 */ 1434, 1512, 1028, 1522, 1572, 1582, 1592, 1673, 1692, 1754,
+ /* 30 */ 1770, 1823, 1840, 1893, 1905, 1974, 1988, 2030, 2082, 2100,
+ /* 40 */ 2124, 2181, 1173, 2172, -240, -263, -19, 207, 352, -277,
+ /* 50 */ 345, 813, -142, -141, -140, -79, 3, -267, 29, -260,
+ /* 60 */ -229, -274, -258, -143, -40, -159, 70, 285, 327, 329,
+ /* 70 */ 369, 370, 531, 535, -270, 541, 554, 560, -294, -272,
+ /* 80 */ 561, 594, 59, -257, 674, -124, 89, 270, 725, 377,
+ /* 90 */ -226, -219, -219, -219, -176, -247, -202, -15, 52, 63,
+ /* 100 */ 247, 394, 434, 507, 511, 581, 582, 626, 663, 672,
+ /* 110 */ 697, 748, 750, 753, 754, -158, -82, -162, -87, -262,
+ /* 120 */ 68, -215, 406, 589, 596, 215, 305, 379, 83, 236,
+ /* 130 */ 509, 298, 445, 699, 715, 469, 362, 591, 633, 640,
+ /* 140 */ 656, 714, 789, 631, 825, 814, 716, 744, 863, 826,
+ /* 150 */ 792, 850, 850, 889, 893, 862, 833, 810, 810, 810,
+ /* 160 */ 818, 797, 799, 802, 809, 850, 849, 911, 856, 910,
+ /* 170 */ 866, 918, 919, 887, 890, 891, 930, 932, 934, 939,
+ /* 180 */ 942, 884, 936, 915, 948, 912, 908, 955, 916, 958,
+ /* 190 */ 924, 965, 967, 970, 968, 979, 956, 957, 959, 960,
+ /* 200 */ 961, 962, 963, 964, 974, 976, 985, 978, 991, 981,
+ /* 210 */ 951, 1007, 969, 982, 1017, 1024, 1025, 980, 1019, 983,
+ /* 220 */ 993, 996, 998, 999, 989, 1001, 995, 1008, 997, 1043,
+ /* 230 */ 1031, 1055, 1022, 1004, 1026, 986, 1030, 1027, 1029, 987,
+ /* 240 */ 1032, 1035, 1036, 850, 992, 977, 988, 1006, 1033, 1037,
+ /* 250 */ 1042, 810, 1058, 1051, 1009, 1012, 1011, 1013, 1015, 1034,
+ /* 260 */ 1039, 1059, 1114, 1096, 1122, 1134, 1133, 1147, 1149, 1094,
+ /* 270 */ 1100, 1160, 1161, 1162, 1157, 1159,
};
static const YYACTIONTYPE yy_default[] = {
- /* 0 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 10 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 20 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 30 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 40 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 50 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 60 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 70 */ 1459, 1459, 1533, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 80 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1531, 1686, 1459,
- /* 90 */ 1864, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 100 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 110 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1533, 1459, 1531,
- /* 120 */ 1876, 1876, 1876, 1459, 1459, 1459, 1730, 1730, 1459, 1459,
- /* 130 */ 1459, 1459, 1629, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 140 */ 1459, 1722, 1459, 1459, 1945, 1459, 1459, 1728, 1899, 1459,
- /* 150 */ 1459, 1459, 1459, 1582, 1891, 1868, 1882, 1869, 1866, 1930,
- /* 160 */ 1930, 1930, 1885, 1459, 1598, 1895, 1459, 1459, 1459, 1714,
- /* 170 */ 1459, 1459, 1691, 1688, 1688, 1459, 1459, 1459, 1459, 1459,
- /* 180 */ 1459, 1533, 1459, 1533, 1459, 1459, 1533, 1459, 1533, 1459,
- /* 190 */ 1533, 1533, 1459, 1533, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 200 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 210 */ 1531, 1724, 1459, 1531, 1459, 1459, 1459, 1531, 1904, 1459,
- /* 220 */ 1459, 1459, 1459, 1904, 1459, 1459, 1459, 1459, 1531, 1459,
- /* 230 */ 1531, 1459, 1459, 1459, 1906, 1904, 1459, 1459, 1906, 1904,
- /* 240 */ 1459, 1459, 1459, 1918, 1914, 1906, 1922, 1920, 1897, 1895,
- /* 250 */ 1882, 1459, 1459, 1936, 1932, 1948, 1936, 1932, 1936, 1932,
- /* 260 */ 1459, 1598, 1459, 1459, 1459, 1531, 1491, 1459, 1716, 1730,
- /* 270 */ 1632, 1632, 1632, 1534, 1464, 1459, 1459, 1459, 1459, 1459,
- /* 280 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1802, 1917, 1916,
- /* 290 */ 1840, 1839, 1838, 1836, 1801, 1459, 1594, 1800, 1799, 1459,
- /* 300 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1793, 1794, 1792,
- /* 310 */ 1791, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 320 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1865,
- /* 330 */ 1459, 1933, 1937, 1459, 1459, 1459, 1459, 1459, 1776, 1459,
- /* 340 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 350 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 360 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 370 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 380 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 390 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 400 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 410 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 420 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 430 */ 1459, 1459, 1459, 1459, 1496, 1459, 1459, 1459, 1459, 1459,
- /* 440 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 450 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 460 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 470 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 480 */ 1459, 1563, 1562, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 490 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 500 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 510 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 520 */ 1734, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 530 */ 1898, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 540 */ 1459, 1459, 1459, 1459, 1459, 1459, 1776, 1459, 1915, 1459,
- /* 550 */ 1875, 1871, 1459, 1459, 1867, 1775, 1459, 1459, 1931, 1459,
- /* 560 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1860, 1459,
- /* 570 */ 1459, 1833, 1818, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 580 */ 1459, 1459, 1459, 1787, 1459, 1459, 1459, 1459, 1459, 1626,
- /* 590 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 600 */ 1459, 1459, 1611, 1609, 1608, 1607, 1459, 1604, 1459, 1459,
- /* 610 */ 1459, 1459, 1635, 1634, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 620 */ 1554, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 630 */ 1545, 1459, 1544, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 640 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 650 */ 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459,
- /* 660 */ 1459, 1459, 1459, 1459, 1459, 1459,
+ /* 0 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 10 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 20 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 30 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 40 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 50 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 60 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 70 */ 1465, 1465, 1465, 1465, 1539, 1465, 1465, 1465, 1465, 1465,
+ /* 80 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1537,
+ /* 90 */ 1692, 1465, 1872, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 100 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 110 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1539,
+ /* 120 */ 1465, 1537, 1884, 1884, 1884, 1465, 1465, 1465, 1736, 1736,
+ /* 130 */ 1465, 1465, 1465, 1465, 1635, 1465, 1465, 1465, 1465, 1465,
+ /* 140 */ 1465, 1465, 1465, 1728, 1465, 1465, 1953, 1465, 1465, 1734,
+ /* 150 */ 1907, 1465, 1465, 1465, 1465, 1588, 1899, 1876, 1890, 1877,
+ /* 160 */ 1874, 1938, 1938, 1938, 1893, 1465, 1903, 1465, 1465, 1465,
+ /* 170 */ 1720, 1465, 1465, 1697, 1694, 1694, 1465, 1465, 1465, 1465,
+ /* 180 */ 1465, 1465, 1539, 1465, 1539, 1465, 1465, 1539, 1465, 1539,
+ /* 190 */ 1465, 1539, 1539, 1465, 1539, 1465, 1465, 1465, 1465, 1465,
+ /* 200 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 210 */ 1465, 1537, 1730, 1465, 1537, 1465, 1465, 1465, 1537, 1912,
+ /* 220 */ 1465, 1465, 1465, 1465, 1912, 1465, 1465, 1465, 1465, 1537,
+ /* 230 */ 1465, 1537, 1465, 1465, 1465, 1914, 1912, 1465, 1465, 1914,
+ /* 240 */ 1912, 1465, 1465, 1465, 1926, 1922, 1914, 1930, 1928, 1905,
+ /* 250 */ 1903, 1890, 1465, 1465, 1944, 1940, 1956, 1944, 1940, 1944,
+ /* 260 */ 1940, 1465, 1604, 1465, 1465, 1465, 1537, 1497, 1465, 1722,
+ /* 270 */ 1736, 1638, 1638, 1638, 1540, 1470, 1465, 1465, 1465, 1465,
+ /* 280 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1809, 1925,
+ /* 290 */ 1924, 1848, 1847, 1846, 1844, 1808, 1465, 1600, 1807, 1806,
+ /* 300 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1800, 1801,
+ /* 310 */ 1799, 1798, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 320 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 330 */ 1465, 1873, 1465, 1941, 1945, 1465, 1465, 1465, 1465, 1465,
+ /* 340 */ 1783, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 350 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 360 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 370 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 380 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 390 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 400 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 410 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 420 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 430 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1502, 1465, 1465,
+ /* 440 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 450 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 460 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 470 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 480 */ 1465, 1465, 1465, 1465, 1569, 1568, 1465, 1465, 1465, 1465,
+ /* 490 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 500 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 510 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 520 */ 1465, 1465, 1465, 1740, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 530 */ 1465, 1465, 1465, 1906, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 540 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1783,
+ /* 550 */ 1465, 1923, 1465, 1883, 1879, 1465, 1465, 1875, 1782, 1465,
+ /* 560 */ 1465, 1939, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 570 */ 1465, 1868, 1465, 1465, 1841, 1826, 1465, 1465, 1465, 1465,
+ /* 580 */ 1465, 1465, 1465, 1465, 1465, 1465, 1794, 1465, 1465, 1465,
+ /* 590 */ 1465, 1465, 1632, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 600 */ 1465, 1465, 1465, 1465, 1465, 1617, 1615, 1614, 1613, 1465,
+ /* 610 */ 1610, 1465, 1465, 1465, 1465, 1641, 1640, 1465, 1465, 1465,
+ /* 620 */ 1465, 1465, 1465, 1560, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 630 */ 1465, 1465, 1465, 1551, 1465, 1550, 1465, 1465, 1465, 1465,
+ /* 640 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 650 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
+ /* 660 */ 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465, 1465,
};
/********** End of lemon-generated parsing tables *****************************/
@@ -1075,10 +1121,11 @@ static const YYCODETYPE yyFallback[] = {
0, /* NK_ARROW => nothing */
0, /* ROWTS => nothing */
0, /* TBNAME => nothing */
- 0, /* QSTARTTS => nothing */
- 0, /* QENDTS => nothing */
- 0, /* WSTARTTS => nothing */
- 0, /* WENDTS => nothing */
+ 0, /* QSTART => nothing */
+ 0, /* QEND => nothing */
+ 0, /* QDURATION => nothing */
+ 0, /* WSTART => nothing */
+ 0, /* WEND => nothing */
0, /* WDURATION => nothing */
0, /* CAST => nothing */
0, /* NOW => nothing */
@@ -1127,11 +1174,11 @@ static const YYCODETYPE yyFallback[] = {
0, /* ASC => nothing */
0, /* NULLS => nothing */
0, /* ID => nothing */
- 249, /* NK_BITNOT => ID */
- 249, /* VALUES => ID */
- 249, /* IMPORT => ID */
- 249, /* NK_SEMI => ID */
- 249, /* FILE => ID */
+ 250, /* NK_BITNOT => ID */
+ 250, /* VALUES => ID */
+ 250, /* IMPORT => ID */
+ 250, /* NK_SEMI => ID */
+ 250, /* FILE => ID */
};
#endif /* YYFALLBACK */
@@ -1417,186 +1464,187 @@ static const char *const yyTokenName[] = {
/* 195 */ "NK_ARROW",
/* 196 */ "ROWTS",
/* 197 */ "TBNAME",
- /* 198 */ "QSTARTTS",
- /* 199 */ "QENDTS",
- /* 200 */ "WSTARTTS",
- /* 201 */ "WENDTS",
- /* 202 */ "WDURATION",
- /* 203 */ "CAST",
- /* 204 */ "NOW",
- /* 205 */ "TODAY",
- /* 206 */ "TIMEZONE",
- /* 207 */ "CLIENT_VERSION",
- /* 208 */ "SERVER_VERSION",
- /* 209 */ "SERVER_STATUS",
- /* 210 */ "CURRENT_USER",
- /* 211 */ "COUNT",
- /* 212 */ "LAST_ROW",
- /* 213 */ "BETWEEN",
- /* 214 */ "IS",
- /* 215 */ "NK_LT",
- /* 216 */ "NK_GT",
- /* 217 */ "NK_LE",
- /* 218 */ "NK_GE",
- /* 219 */ "NK_NE",
- /* 220 */ "MATCH",
- /* 221 */ "NMATCH",
- /* 222 */ "CONTAINS",
- /* 223 */ "JOIN",
- /* 224 */ "INNER",
- /* 225 */ "SELECT",
- /* 226 */ "DISTINCT",
- /* 227 */ "WHERE",
- /* 228 */ "PARTITION",
- /* 229 */ "BY",
- /* 230 */ "SESSION",
- /* 231 */ "STATE_WINDOW",
- /* 232 */ "SLIDING",
- /* 233 */ "FILL",
- /* 234 */ "VALUE",
- /* 235 */ "NONE",
- /* 236 */ "PREV",
- /* 237 */ "LINEAR",
- /* 238 */ "NEXT",
- /* 239 */ "HAVING",
- /* 240 */ "RANGE",
- /* 241 */ "EVERY",
- /* 242 */ "ORDER",
- /* 243 */ "SLIMIT",
- /* 244 */ "SOFFSET",
- /* 245 */ "LIMIT",
- /* 246 */ "OFFSET",
- /* 247 */ "ASC",
- /* 248 */ "NULLS",
- /* 249 */ "ID",
- /* 250 */ "NK_BITNOT",
- /* 251 */ "VALUES",
- /* 252 */ "IMPORT",
- /* 253 */ "NK_SEMI",
- /* 254 */ "FILE",
- /* 255 */ "cmd",
- /* 256 */ "account_options",
- /* 257 */ "alter_account_options",
- /* 258 */ "literal",
- /* 259 */ "alter_account_option",
- /* 260 */ "user_name",
- /* 261 */ "sysinfo_opt",
- /* 262 */ "privileges",
- /* 263 */ "priv_level",
- /* 264 */ "priv_type_list",
- /* 265 */ "priv_type",
- /* 266 */ "db_name",
- /* 267 */ "dnode_endpoint",
- /* 268 */ "not_exists_opt",
- /* 269 */ "db_options",
- /* 270 */ "exists_opt",
- /* 271 */ "alter_db_options",
- /* 272 */ "integer_list",
- /* 273 */ "variable_list",
- /* 274 */ "retention_list",
- /* 275 */ "alter_db_option",
- /* 276 */ "retention",
- /* 277 */ "full_table_name",
- /* 278 */ "column_def_list",
- /* 279 */ "tags_def_opt",
- /* 280 */ "table_options",
- /* 281 */ "multi_create_clause",
- /* 282 */ "tags_def",
- /* 283 */ "multi_drop_clause",
- /* 284 */ "alter_table_clause",
- /* 285 */ "alter_table_options",
- /* 286 */ "column_name",
- /* 287 */ "type_name",
- /* 288 */ "signed_literal",
- /* 289 */ "create_subtable_clause",
- /* 290 */ "specific_cols_opt",
- /* 291 */ "expression_list",
- /* 292 */ "drop_table_clause",
- /* 293 */ "col_name_list",
- /* 294 */ "table_name",
- /* 295 */ "column_def",
- /* 296 */ "duration_list",
- /* 297 */ "rollup_func_list",
- /* 298 */ "alter_table_option",
- /* 299 */ "duration_literal",
- /* 300 */ "rollup_func_name",
- /* 301 */ "function_name",
- /* 302 */ "col_name",
- /* 303 */ "db_name_cond_opt",
- /* 304 */ "like_pattern_opt",
- /* 305 */ "table_name_cond",
- /* 306 */ "from_db_opt",
- /* 307 */ "index_name",
- /* 308 */ "index_options",
- /* 309 */ "func_list",
- /* 310 */ "sliding_opt",
- /* 311 */ "sma_stream_opt",
- /* 312 */ "func",
- /* 313 */ "stream_options",
- /* 314 */ "topic_name",
- /* 315 */ "query_expression",
- /* 316 */ "cgroup_name",
- /* 317 */ "analyze_opt",
- /* 318 */ "explain_options",
- /* 319 */ "agg_func_opt",
- /* 320 */ "bufsize_opt",
- /* 321 */ "stream_name",
- /* 322 */ "into_opt",
- /* 323 */ "dnode_list",
- /* 324 */ "where_clause_opt",
- /* 325 */ "signed",
- /* 326 */ "literal_func",
- /* 327 */ "literal_list",
- /* 328 */ "table_alias",
- /* 329 */ "column_alias",
- /* 330 */ "expression",
- /* 331 */ "pseudo_column",
- /* 332 */ "column_reference",
- /* 333 */ "function_expression",
- /* 334 */ "subquery",
- /* 335 */ "star_func",
- /* 336 */ "star_func_para_list",
- /* 337 */ "noarg_func",
- /* 338 */ "other_para_list",
- /* 339 */ "star_func_para",
- /* 340 */ "predicate",
- /* 341 */ "compare_op",
- /* 342 */ "in_op",
- /* 343 */ "in_predicate_value",
- /* 344 */ "boolean_value_expression",
- /* 345 */ "boolean_primary",
- /* 346 */ "common_expression",
- /* 347 */ "from_clause_opt",
- /* 348 */ "table_reference_list",
- /* 349 */ "table_reference",
- /* 350 */ "table_primary",
- /* 351 */ "joined_table",
- /* 352 */ "alias_opt",
- /* 353 */ "parenthesized_joined_table",
- /* 354 */ "join_type",
- /* 355 */ "search_condition",
- /* 356 */ "query_specification",
- /* 357 */ "set_quantifier_opt",
- /* 358 */ "select_list",
- /* 359 */ "partition_by_clause_opt",
- /* 360 */ "range_opt",
- /* 361 */ "every_opt",
- /* 362 */ "fill_opt",
- /* 363 */ "twindow_clause_opt",
- /* 364 */ "group_by_clause_opt",
- /* 365 */ "having_clause_opt",
- /* 366 */ "select_item",
- /* 367 */ "fill_mode",
- /* 368 */ "group_by_list",
- /* 369 */ "query_expression_body",
- /* 370 */ "order_by_clause_opt",
- /* 371 */ "slimit_clause_opt",
- /* 372 */ "limit_clause_opt",
- /* 373 */ "query_primary",
- /* 374 */ "sort_specification_list",
- /* 375 */ "sort_specification",
- /* 376 */ "ordering_specification_opt",
- /* 377 */ "null_ordering_opt",
+ /* 198 */ "QSTART",
+ /* 199 */ "QEND",
+ /* 200 */ "QDURATION",
+ /* 201 */ "WSTART",
+ /* 202 */ "WEND",
+ /* 203 */ "WDURATION",
+ /* 204 */ "CAST",
+ /* 205 */ "NOW",
+ /* 206 */ "TODAY",
+ /* 207 */ "TIMEZONE",
+ /* 208 */ "CLIENT_VERSION",
+ /* 209 */ "SERVER_VERSION",
+ /* 210 */ "SERVER_STATUS",
+ /* 211 */ "CURRENT_USER",
+ /* 212 */ "COUNT",
+ /* 213 */ "LAST_ROW",
+ /* 214 */ "BETWEEN",
+ /* 215 */ "IS",
+ /* 216 */ "NK_LT",
+ /* 217 */ "NK_GT",
+ /* 218 */ "NK_LE",
+ /* 219 */ "NK_GE",
+ /* 220 */ "NK_NE",
+ /* 221 */ "MATCH",
+ /* 222 */ "NMATCH",
+ /* 223 */ "CONTAINS",
+ /* 224 */ "JOIN",
+ /* 225 */ "INNER",
+ /* 226 */ "SELECT",
+ /* 227 */ "DISTINCT",
+ /* 228 */ "WHERE",
+ /* 229 */ "PARTITION",
+ /* 230 */ "BY",
+ /* 231 */ "SESSION",
+ /* 232 */ "STATE_WINDOW",
+ /* 233 */ "SLIDING",
+ /* 234 */ "FILL",
+ /* 235 */ "VALUE",
+ /* 236 */ "NONE",
+ /* 237 */ "PREV",
+ /* 238 */ "LINEAR",
+ /* 239 */ "NEXT",
+ /* 240 */ "HAVING",
+ /* 241 */ "RANGE",
+ /* 242 */ "EVERY",
+ /* 243 */ "ORDER",
+ /* 244 */ "SLIMIT",
+ /* 245 */ "SOFFSET",
+ /* 246 */ "LIMIT",
+ /* 247 */ "OFFSET",
+ /* 248 */ "ASC",
+ /* 249 */ "NULLS",
+ /* 250 */ "ID",
+ /* 251 */ "NK_BITNOT",
+ /* 252 */ "VALUES",
+ /* 253 */ "IMPORT",
+ /* 254 */ "NK_SEMI",
+ /* 255 */ "FILE",
+ /* 256 */ "cmd",
+ /* 257 */ "account_options",
+ /* 258 */ "alter_account_options",
+ /* 259 */ "literal",
+ /* 260 */ "alter_account_option",
+ /* 261 */ "user_name",
+ /* 262 */ "sysinfo_opt",
+ /* 263 */ "privileges",
+ /* 264 */ "priv_level",
+ /* 265 */ "priv_type_list",
+ /* 266 */ "priv_type",
+ /* 267 */ "db_name",
+ /* 268 */ "dnode_endpoint",
+ /* 269 */ "not_exists_opt",
+ /* 270 */ "db_options",
+ /* 271 */ "exists_opt",
+ /* 272 */ "alter_db_options",
+ /* 273 */ "integer_list",
+ /* 274 */ "variable_list",
+ /* 275 */ "retention_list",
+ /* 276 */ "alter_db_option",
+ /* 277 */ "retention",
+ /* 278 */ "full_table_name",
+ /* 279 */ "column_def_list",
+ /* 280 */ "tags_def_opt",
+ /* 281 */ "table_options",
+ /* 282 */ "multi_create_clause",
+ /* 283 */ "tags_def",
+ /* 284 */ "multi_drop_clause",
+ /* 285 */ "alter_table_clause",
+ /* 286 */ "alter_table_options",
+ /* 287 */ "column_name",
+ /* 288 */ "type_name",
+ /* 289 */ "signed_literal",
+ /* 290 */ "create_subtable_clause",
+ /* 291 */ "specific_cols_opt",
+ /* 292 */ "expression_list",
+ /* 293 */ "drop_table_clause",
+ /* 294 */ "col_name_list",
+ /* 295 */ "table_name",
+ /* 296 */ "column_def",
+ /* 297 */ "duration_list",
+ /* 298 */ "rollup_func_list",
+ /* 299 */ "alter_table_option",
+ /* 300 */ "duration_literal",
+ /* 301 */ "rollup_func_name",
+ /* 302 */ "function_name",
+ /* 303 */ "col_name",
+ /* 304 */ "db_name_cond_opt",
+ /* 305 */ "like_pattern_opt",
+ /* 306 */ "table_name_cond",
+ /* 307 */ "from_db_opt",
+ /* 308 */ "index_name",
+ /* 309 */ "index_options",
+ /* 310 */ "func_list",
+ /* 311 */ "sliding_opt",
+ /* 312 */ "sma_stream_opt",
+ /* 313 */ "func",
+ /* 314 */ "stream_options",
+ /* 315 */ "topic_name",
+ /* 316 */ "query_expression",
+ /* 317 */ "cgroup_name",
+ /* 318 */ "analyze_opt",
+ /* 319 */ "explain_options",
+ /* 320 */ "agg_func_opt",
+ /* 321 */ "bufsize_opt",
+ /* 322 */ "stream_name",
+ /* 323 */ "into_opt",
+ /* 324 */ "dnode_list",
+ /* 325 */ "where_clause_opt",
+ /* 326 */ "signed",
+ /* 327 */ "literal_func",
+ /* 328 */ "literal_list",
+ /* 329 */ "table_alias",
+ /* 330 */ "column_alias",
+ /* 331 */ "expression",
+ /* 332 */ "pseudo_column",
+ /* 333 */ "column_reference",
+ /* 334 */ "function_expression",
+ /* 335 */ "subquery",
+ /* 336 */ "star_func",
+ /* 337 */ "star_func_para_list",
+ /* 338 */ "noarg_func",
+ /* 339 */ "other_para_list",
+ /* 340 */ "star_func_para",
+ /* 341 */ "predicate",
+ /* 342 */ "compare_op",
+ /* 343 */ "in_op",
+ /* 344 */ "in_predicate_value",
+ /* 345 */ "boolean_value_expression",
+ /* 346 */ "boolean_primary",
+ /* 347 */ "common_expression",
+ /* 348 */ "from_clause_opt",
+ /* 349 */ "table_reference_list",
+ /* 350 */ "table_reference",
+ /* 351 */ "table_primary",
+ /* 352 */ "joined_table",
+ /* 353 */ "alias_opt",
+ /* 354 */ "parenthesized_joined_table",
+ /* 355 */ "join_type",
+ /* 356 */ "search_condition",
+ /* 357 */ "query_specification",
+ /* 358 */ "set_quantifier_opt",
+ /* 359 */ "select_list",
+ /* 360 */ "partition_by_clause_opt",
+ /* 361 */ "range_opt",
+ /* 362 */ "every_opt",
+ /* 363 */ "fill_opt",
+ /* 364 */ "twindow_clause_opt",
+ /* 365 */ "group_by_clause_opt",
+ /* 366 */ "having_clause_opt",
+ /* 367 */ "select_item",
+ /* 368 */ "fill_mode",
+ /* 369 */ "group_by_list",
+ /* 370 */ "query_expression_body",
+ /* 371 */ "order_by_clause_opt",
+ /* 372 */ "slimit_clause_opt",
+ /* 373 */ "limit_clause_opt",
+ /* 374 */ "query_primary",
+ /* 375 */ "sort_specification_list",
+ /* 376 */ "sort_specification",
+ /* 377 */ "ordering_specification_opt",
+ /* 378 */ "null_ordering_opt",
};
#endif /* defined(YYCOVERAGE) || !defined(NDEBUG) */
@@ -1890,209 +1938,211 @@ static const char *const yyRuleName[] = {
/* 283 */ "cmd ::= SYNCDB db_name REPLICA",
/* 284 */ "cmd ::= DELETE FROM full_table_name where_clause_opt",
/* 285 */ "cmd ::= query_expression",
- /* 286 */ "cmd ::= INSERT INTO full_table_name specific_cols_opt query_expression",
- /* 287 */ "literal ::= NK_INTEGER",
- /* 288 */ "literal ::= NK_FLOAT",
- /* 289 */ "literal ::= NK_STRING",
- /* 290 */ "literal ::= NK_BOOL",
- /* 291 */ "literal ::= TIMESTAMP NK_STRING",
- /* 292 */ "literal ::= duration_literal",
- /* 293 */ "literal ::= NULL",
- /* 294 */ "literal ::= NK_QUESTION",
- /* 295 */ "duration_literal ::= NK_VARIABLE",
- /* 296 */ "signed ::= NK_INTEGER",
- /* 297 */ "signed ::= NK_PLUS NK_INTEGER",
- /* 298 */ "signed ::= NK_MINUS NK_INTEGER",
- /* 299 */ "signed ::= NK_FLOAT",
- /* 300 */ "signed ::= NK_PLUS NK_FLOAT",
- /* 301 */ "signed ::= NK_MINUS NK_FLOAT",
- /* 302 */ "signed_literal ::= signed",
- /* 303 */ "signed_literal ::= NK_STRING",
- /* 304 */ "signed_literal ::= NK_BOOL",
- /* 305 */ "signed_literal ::= TIMESTAMP NK_STRING",
- /* 306 */ "signed_literal ::= duration_literal",
- /* 307 */ "signed_literal ::= NULL",
- /* 308 */ "signed_literal ::= literal_func",
- /* 309 */ "signed_literal ::= NK_QUESTION",
- /* 310 */ "literal_list ::= signed_literal",
- /* 311 */ "literal_list ::= literal_list NK_COMMA signed_literal",
- /* 312 */ "db_name ::= NK_ID",
- /* 313 */ "table_name ::= NK_ID",
- /* 314 */ "column_name ::= NK_ID",
- /* 315 */ "function_name ::= NK_ID",
- /* 316 */ "table_alias ::= NK_ID",
- /* 317 */ "column_alias ::= NK_ID",
- /* 318 */ "user_name ::= NK_ID",
- /* 319 */ "index_name ::= NK_ID",
- /* 320 */ "topic_name ::= NK_ID",
- /* 321 */ "stream_name ::= NK_ID",
- /* 322 */ "cgroup_name ::= NK_ID",
- /* 323 */ "expression ::= literal",
- /* 324 */ "expression ::= pseudo_column",
- /* 325 */ "expression ::= column_reference",
- /* 326 */ "expression ::= function_expression",
- /* 327 */ "expression ::= subquery",
- /* 328 */ "expression ::= NK_LP expression NK_RP",
- /* 329 */ "expression ::= NK_PLUS expression",
- /* 330 */ "expression ::= NK_MINUS expression",
- /* 331 */ "expression ::= expression NK_PLUS expression",
- /* 332 */ "expression ::= expression NK_MINUS expression",
- /* 333 */ "expression ::= expression NK_STAR expression",
- /* 334 */ "expression ::= expression NK_SLASH expression",
- /* 335 */ "expression ::= expression NK_REM expression",
- /* 336 */ "expression ::= column_reference NK_ARROW NK_STRING",
- /* 337 */ "expression ::= expression NK_BITAND expression",
- /* 338 */ "expression ::= expression NK_BITOR expression",
- /* 339 */ "expression_list ::= expression",
- /* 340 */ "expression_list ::= expression_list NK_COMMA expression",
- /* 341 */ "column_reference ::= column_name",
- /* 342 */ "column_reference ::= table_name NK_DOT column_name",
- /* 343 */ "pseudo_column ::= ROWTS",
- /* 344 */ "pseudo_column ::= TBNAME",
- /* 345 */ "pseudo_column ::= table_name NK_DOT TBNAME",
- /* 346 */ "pseudo_column ::= QSTARTTS",
- /* 347 */ "pseudo_column ::= QENDTS",
- /* 348 */ "pseudo_column ::= WSTARTTS",
- /* 349 */ "pseudo_column ::= WENDTS",
- /* 350 */ "pseudo_column ::= WDURATION",
- /* 351 */ "function_expression ::= function_name NK_LP expression_list NK_RP",
- /* 352 */ "function_expression ::= star_func NK_LP star_func_para_list NK_RP",
- /* 353 */ "function_expression ::= CAST NK_LP expression AS type_name NK_RP",
- /* 354 */ "function_expression ::= literal_func",
- /* 355 */ "literal_func ::= noarg_func NK_LP NK_RP",
- /* 356 */ "literal_func ::= NOW",
- /* 357 */ "noarg_func ::= NOW",
- /* 358 */ "noarg_func ::= TODAY",
- /* 359 */ "noarg_func ::= TIMEZONE",
- /* 360 */ "noarg_func ::= DATABASE",
- /* 361 */ "noarg_func ::= CLIENT_VERSION",
- /* 362 */ "noarg_func ::= SERVER_VERSION",
- /* 363 */ "noarg_func ::= SERVER_STATUS",
- /* 364 */ "noarg_func ::= CURRENT_USER",
- /* 365 */ "noarg_func ::= USER",
- /* 366 */ "star_func ::= COUNT",
- /* 367 */ "star_func ::= FIRST",
- /* 368 */ "star_func ::= LAST",
- /* 369 */ "star_func ::= LAST_ROW",
- /* 370 */ "star_func_para_list ::= NK_STAR",
- /* 371 */ "star_func_para_list ::= other_para_list",
- /* 372 */ "other_para_list ::= star_func_para",
- /* 373 */ "other_para_list ::= other_para_list NK_COMMA star_func_para",
- /* 374 */ "star_func_para ::= expression",
- /* 375 */ "star_func_para ::= table_name NK_DOT NK_STAR",
- /* 376 */ "predicate ::= expression compare_op expression",
- /* 377 */ "predicate ::= expression BETWEEN expression AND expression",
- /* 378 */ "predicate ::= expression NOT BETWEEN expression AND expression",
- /* 379 */ "predicate ::= expression IS NULL",
- /* 380 */ "predicate ::= expression IS NOT NULL",
- /* 381 */ "predicate ::= expression in_op in_predicate_value",
- /* 382 */ "compare_op ::= NK_LT",
- /* 383 */ "compare_op ::= NK_GT",
- /* 384 */ "compare_op ::= NK_LE",
- /* 385 */ "compare_op ::= NK_GE",
- /* 386 */ "compare_op ::= NK_NE",
- /* 387 */ "compare_op ::= NK_EQ",
- /* 388 */ "compare_op ::= LIKE",
- /* 389 */ "compare_op ::= NOT LIKE",
- /* 390 */ "compare_op ::= MATCH",
- /* 391 */ "compare_op ::= NMATCH",
- /* 392 */ "compare_op ::= CONTAINS",
- /* 393 */ "in_op ::= IN",
- /* 394 */ "in_op ::= NOT IN",
- /* 395 */ "in_predicate_value ::= NK_LP literal_list NK_RP",
- /* 396 */ "boolean_value_expression ::= boolean_primary",
- /* 397 */ "boolean_value_expression ::= NOT boolean_primary",
- /* 398 */ "boolean_value_expression ::= boolean_value_expression OR boolean_value_expression",
- /* 399 */ "boolean_value_expression ::= boolean_value_expression AND boolean_value_expression",
- /* 400 */ "boolean_primary ::= predicate",
- /* 401 */ "boolean_primary ::= NK_LP boolean_value_expression NK_RP",
- /* 402 */ "common_expression ::= expression",
- /* 403 */ "common_expression ::= boolean_value_expression",
- /* 404 */ "from_clause_opt ::=",
- /* 405 */ "from_clause_opt ::= FROM table_reference_list",
- /* 406 */ "table_reference_list ::= table_reference",
- /* 407 */ "table_reference_list ::= table_reference_list NK_COMMA table_reference",
- /* 408 */ "table_reference ::= table_primary",
- /* 409 */ "table_reference ::= joined_table",
- /* 410 */ "table_primary ::= table_name alias_opt",
- /* 411 */ "table_primary ::= db_name NK_DOT table_name alias_opt",
- /* 412 */ "table_primary ::= subquery alias_opt",
- /* 413 */ "table_primary ::= parenthesized_joined_table",
- /* 414 */ "alias_opt ::=",
- /* 415 */ "alias_opt ::= table_alias",
- /* 416 */ "alias_opt ::= AS table_alias",
- /* 417 */ "parenthesized_joined_table ::= NK_LP joined_table NK_RP",
- /* 418 */ "parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP",
- /* 419 */ "joined_table ::= table_reference join_type JOIN table_reference ON search_condition",
- /* 420 */ "join_type ::=",
- /* 421 */ "join_type ::= INNER",
- /* 422 */ "query_specification ::= SELECT set_quantifier_opt select_list from_clause_opt where_clause_opt partition_by_clause_opt range_opt every_opt fill_opt twindow_clause_opt group_by_clause_opt having_clause_opt",
- /* 423 */ "set_quantifier_opt ::=",
- /* 424 */ "set_quantifier_opt ::= DISTINCT",
- /* 425 */ "set_quantifier_opt ::= ALL",
- /* 426 */ "select_list ::= select_item",
- /* 427 */ "select_list ::= select_list NK_COMMA select_item",
- /* 428 */ "select_item ::= NK_STAR",
- /* 429 */ "select_item ::= common_expression",
- /* 430 */ "select_item ::= common_expression column_alias",
- /* 431 */ "select_item ::= common_expression AS column_alias",
- /* 432 */ "select_item ::= table_name NK_DOT NK_STAR",
- /* 433 */ "where_clause_opt ::=",
- /* 434 */ "where_clause_opt ::= WHERE search_condition",
- /* 435 */ "partition_by_clause_opt ::=",
- /* 436 */ "partition_by_clause_opt ::= PARTITION BY expression_list",
- /* 437 */ "twindow_clause_opt ::=",
- /* 438 */ "twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP",
- /* 439 */ "twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP",
- /* 440 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt",
- /* 441 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt",
- /* 442 */ "sliding_opt ::=",
- /* 443 */ "sliding_opt ::= SLIDING NK_LP duration_literal NK_RP",
- /* 444 */ "fill_opt ::=",
- /* 445 */ "fill_opt ::= FILL NK_LP fill_mode NK_RP",
- /* 446 */ "fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP",
- /* 447 */ "fill_mode ::= NONE",
- /* 448 */ "fill_mode ::= PREV",
- /* 449 */ "fill_mode ::= NULL",
- /* 450 */ "fill_mode ::= LINEAR",
- /* 451 */ "fill_mode ::= NEXT",
- /* 452 */ "group_by_clause_opt ::=",
- /* 453 */ "group_by_clause_opt ::= GROUP BY group_by_list",
- /* 454 */ "group_by_list ::= expression",
- /* 455 */ "group_by_list ::= group_by_list NK_COMMA expression",
- /* 456 */ "having_clause_opt ::=",
- /* 457 */ "having_clause_opt ::= HAVING search_condition",
- /* 458 */ "range_opt ::=",
- /* 459 */ "range_opt ::= RANGE NK_LP expression NK_COMMA expression NK_RP",
- /* 460 */ "every_opt ::=",
- /* 461 */ "every_opt ::= EVERY NK_LP duration_literal NK_RP",
- /* 462 */ "query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt",
- /* 463 */ "query_expression_body ::= query_primary",
- /* 464 */ "query_expression_body ::= query_expression_body UNION ALL query_expression_body",
- /* 465 */ "query_expression_body ::= query_expression_body UNION query_expression_body",
- /* 466 */ "query_primary ::= query_specification",
- /* 467 */ "query_primary ::= NK_LP query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt NK_RP",
- /* 468 */ "order_by_clause_opt ::=",
- /* 469 */ "order_by_clause_opt ::= ORDER BY sort_specification_list",
- /* 470 */ "slimit_clause_opt ::=",
- /* 471 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER",
- /* 472 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER",
- /* 473 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER",
- /* 474 */ "limit_clause_opt ::=",
- /* 475 */ "limit_clause_opt ::= LIMIT NK_INTEGER",
- /* 476 */ "limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER",
- /* 477 */ "limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER",
- /* 478 */ "subquery ::= NK_LP query_expression NK_RP",
- /* 479 */ "search_condition ::= common_expression",
- /* 480 */ "sort_specification_list ::= sort_specification",
- /* 481 */ "sort_specification_list ::= sort_specification_list NK_COMMA sort_specification",
- /* 482 */ "sort_specification ::= expression ordering_specification_opt null_ordering_opt",
- /* 483 */ "ordering_specification_opt ::=",
- /* 484 */ "ordering_specification_opt ::= ASC",
- /* 485 */ "ordering_specification_opt ::= DESC",
- /* 486 */ "null_ordering_opt ::=",
- /* 487 */ "null_ordering_opt ::= NULLS FIRST",
- /* 488 */ "null_ordering_opt ::= NULLS LAST",
+ /* 286 */ "cmd ::= INSERT INTO full_table_name NK_LP col_name_list NK_RP query_expression",
+ /* 287 */ "cmd ::= INSERT INTO full_table_name query_expression",
+ /* 288 */ "literal ::= NK_INTEGER",
+ /* 289 */ "literal ::= NK_FLOAT",
+ /* 290 */ "literal ::= NK_STRING",
+ /* 291 */ "literal ::= NK_BOOL",
+ /* 292 */ "literal ::= TIMESTAMP NK_STRING",
+ /* 293 */ "literal ::= duration_literal",
+ /* 294 */ "literal ::= NULL",
+ /* 295 */ "literal ::= NK_QUESTION",
+ /* 296 */ "duration_literal ::= NK_VARIABLE",
+ /* 297 */ "signed ::= NK_INTEGER",
+ /* 298 */ "signed ::= NK_PLUS NK_INTEGER",
+ /* 299 */ "signed ::= NK_MINUS NK_INTEGER",
+ /* 300 */ "signed ::= NK_FLOAT",
+ /* 301 */ "signed ::= NK_PLUS NK_FLOAT",
+ /* 302 */ "signed ::= NK_MINUS NK_FLOAT",
+ /* 303 */ "signed_literal ::= signed",
+ /* 304 */ "signed_literal ::= NK_STRING",
+ /* 305 */ "signed_literal ::= NK_BOOL",
+ /* 306 */ "signed_literal ::= TIMESTAMP NK_STRING",
+ /* 307 */ "signed_literal ::= duration_literal",
+ /* 308 */ "signed_literal ::= NULL",
+ /* 309 */ "signed_literal ::= literal_func",
+ /* 310 */ "signed_literal ::= NK_QUESTION",
+ /* 311 */ "literal_list ::= signed_literal",
+ /* 312 */ "literal_list ::= literal_list NK_COMMA signed_literal",
+ /* 313 */ "db_name ::= NK_ID",
+ /* 314 */ "table_name ::= NK_ID",
+ /* 315 */ "column_name ::= NK_ID",
+ /* 316 */ "function_name ::= NK_ID",
+ /* 317 */ "table_alias ::= NK_ID",
+ /* 318 */ "column_alias ::= NK_ID",
+ /* 319 */ "user_name ::= NK_ID",
+ /* 320 */ "index_name ::= NK_ID",
+ /* 321 */ "topic_name ::= NK_ID",
+ /* 322 */ "stream_name ::= NK_ID",
+ /* 323 */ "cgroup_name ::= NK_ID",
+ /* 324 */ "expression ::= literal",
+ /* 325 */ "expression ::= pseudo_column",
+ /* 326 */ "expression ::= column_reference",
+ /* 327 */ "expression ::= function_expression",
+ /* 328 */ "expression ::= subquery",
+ /* 329 */ "expression ::= NK_LP expression NK_RP",
+ /* 330 */ "expression ::= NK_PLUS expression",
+ /* 331 */ "expression ::= NK_MINUS expression",
+ /* 332 */ "expression ::= expression NK_PLUS expression",
+ /* 333 */ "expression ::= expression NK_MINUS expression",
+ /* 334 */ "expression ::= expression NK_STAR expression",
+ /* 335 */ "expression ::= expression NK_SLASH expression",
+ /* 336 */ "expression ::= expression NK_REM expression",
+ /* 337 */ "expression ::= column_reference NK_ARROW NK_STRING",
+ /* 338 */ "expression ::= expression NK_BITAND expression",
+ /* 339 */ "expression ::= expression NK_BITOR expression",
+ /* 340 */ "expression_list ::= expression",
+ /* 341 */ "expression_list ::= expression_list NK_COMMA expression",
+ /* 342 */ "column_reference ::= column_name",
+ /* 343 */ "column_reference ::= table_name NK_DOT column_name",
+ /* 344 */ "pseudo_column ::= ROWTS",
+ /* 345 */ "pseudo_column ::= TBNAME",
+ /* 346 */ "pseudo_column ::= table_name NK_DOT TBNAME",
+ /* 347 */ "pseudo_column ::= QSTART",
+ /* 348 */ "pseudo_column ::= QEND",
+ /* 349 */ "pseudo_column ::= QDURATION",
+ /* 350 */ "pseudo_column ::= WSTART",
+ /* 351 */ "pseudo_column ::= WEND",
+ /* 352 */ "pseudo_column ::= WDURATION",
+ /* 353 */ "function_expression ::= function_name NK_LP expression_list NK_RP",
+ /* 354 */ "function_expression ::= star_func NK_LP star_func_para_list NK_RP",
+ /* 355 */ "function_expression ::= CAST NK_LP expression AS type_name NK_RP",
+ /* 356 */ "function_expression ::= literal_func",
+ /* 357 */ "literal_func ::= noarg_func NK_LP NK_RP",
+ /* 358 */ "literal_func ::= NOW",
+ /* 359 */ "noarg_func ::= NOW",
+ /* 360 */ "noarg_func ::= TODAY",
+ /* 361 */ "noarg_func ::= TIMEZONE",
+ /* 362 */ "noarg_func ::= DATABASE",
+ /* 363 */ "noarg_func ::= CLIENT_VERSION",
+ /* 364 */ "noarg_func ::= SERVER_VERSION",
+ /* 365 */ "noarg_func ::= SERVER_STATUS",
+ /* 366 */ "noarg_func ::= CURRENT_USER",
+ /* 367 */ "noarg_func ::= USER",
+ /* 368 */ "star_func ::= COUNT",
+ /* 369 */ "star_func ::= FIRST",
+ /* 370 */ "star_func ::= LAST",
+ /* 371 */ "star_func ::= LAST_ROW",
+ /* 372 */ "star_func_para_list ::= NK_STAR",
+ /* 373 */ "star_func_para_list ::= other_para_list",
+ /* 374 */ "other_para_list ::= star_func_para",
+ /* 375 */ "other_para_list ::= other_para_list NK_COMMA star_func_para",
+ /* 376 */ "star_func_para ::= expression",
+ /* 377 */ "star_func_para ::= table_name NK_DOT NK_STAR",
+ /* 378 */ "predicate ::= expression compare_op expression",
+ /* 379 */ "predicate ::= expression BETWEEN expression AND expression",
+ /* 380 */ "predicate ::= expression NOT BETWEEN expression AND expression",
+ /* 381 */ "predicate ::= expression IS NULL",
+ /* 382 */ "predicate ::= expression IS NOT NULL",
+ /* 383 */ "predicate ::= expression in_op in_predicate_value",
+ /* 384 */ "compare_op ::= NK_LT",
+ /* 385 */ "compare_op ::= NK_GT",
+ /* 386 */ "compare_op ::= NK_LE",
+ /* 387 */ "compare_op ::= NK_GE",
+ /* 388 */ "compare_op ::= NK_NE",
+ /* 389 */ "compare_op ::= NK_EQ",
+ /* 390 */ "compare_op ::= LIKE",
+ /* 391 */ "compare_op ::= NOT LIKE",
+ /* 392 */ "compare_op ::= MATCH",
+ /* 393 */ "compare_op ::= NMATCH",
+ /* 394 */ "compare_op ::= CONTAINS",
+ /* 395 */ "in_op ::= IN",
+ /* 396 */ "in_op ::= NOT IN",
+ /* 397 */ "in_predicate_value ::= NK_LP literal_list NK_RP",
+ /* 398 */ "boolean_value_expression ::= boolean_primary",
+ /* 399 */ "boolean_value_expression ::= NOT boolean_primary",
+ /* 400 */ "boolean_value_expression ::= boolean_value_expression OR boolean_value_expression",
+ /* 401 */ "boolean_value_expression ::= boolean_value_expression AND boolean_value_expression",
+ /* 402 */ "boolean_primary ::= predicate",
+ /* 403 */ "boolean_primary ::= NK_LP boolean_value_expression NK_RP",
+ /* 404 */ "common_expression ::= expression",
+ /* 405 */ "common_expression ::= boolean_value_expression",
+ /* 406 */ "from_clause_opt ::=",
+ /* 407 */ "from_clause_opt ::= FROM table_reference_list",
+ /* 408 */ "table_reference_list ::= table_reference",
+ /* 409 */ "table_reference_list ::= table_reference_list NK_COMMA table_reference",
+ /* 410 */ "table_reference ::= table_primary",
+ /* 411 */ "table_reference ::= joined_table",
+ /* 412 */ "table_primary ::= table_name alias_opt",
+ /* 413 */ "table_primary ::= db_name NK_DOT table_name alias_opt",
+ /* 414 */ "table_primary ::= subquery alias_opt",
+ /* 415 */ "table_primary ::= parenthesized_joined_table",
+ /* 416 */ "alias_opt ::=",
+ /* 417 */ "alias_opt ::= table_alias",
+ /* 418 */ "alias_opt ::= AS table_alias",
+ /* 419 */ "parenthesized_joined_table ::= NK_LP joined_table NK_RP",
+ /* 420 */ "parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP",
+ /* 421 */ "joined_table ::= table_reference join_type JOIN table_reference ON search_condition",
+ /* 422 */ "join_type ::=",
+ /* 423 */ "join_type ::= INNER",
+ /* 424 */ "query_specification ::= SELECT set_quantifier_opt select_list from_clause_opt where_clause_opt partition_by_clause_opt range_opt every_opt fill_opt twindow_clause_opt group_by_clause_opt having_clause_opt",
+ /* 425 */ "set_quantifier_opt ::=",
+ /* 426 */ "set_quantifier_opt ::= DISTINCT",
+ /* 427 */ "set_quantifier_opt ::= ALL",
+ /* 428 */ "select_list ::= select_item",
+ /* 429 */ "select_list ::= select_list NK_COMMA select_item",
+ /* 430 */ "select_item ::= NK_STAR",
+ /* 431 */ "select_item ::= common_expression",
+ /* 432 */ "select_item ::= common_expression column_alias",
+ /* 433 */ "select_item ::= common_expression AS column_alias",
+ /* 434 */ "select_item ::= table_name NK_DOT NK_STAR",
+ /* 435 */ "where_clause_opt ::=",
+ /* 436 */ "where_clause_opt ::= WHERE search_condition",
+ /* 437 */ "partition_by_clause_opt ::=",
+ /* 438 */ "partition_by_clause_opt ::= PARTITION BY expression_list",
+ /* 439 */ "twindow_clause_opt ::=",
+ /* 440 */ "twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP",
+ /* 441 */ "twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP",
+ /* 442 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt",
+ /* 443 */ "twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt",
+ /* 444 */ "sliding_opt ::=",
+ /* 445 */ "sliding_opt ::= SLIDING NK_LP duration_literal NK_RP",
+ /* 446 */ "fill_opt ::=",
+ /* 447 */ "fill_opt ::= FILL NK_LP fill_mode NK_RP",
+ /* 448 */ "fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP",
+ /* 449 */ "fill_mode ::= NONE",
+ /* 450 */ "fill_mode ::= PREV",
+ /* 451 */ "fill_mode ::= NULL",
+ /* 452 */ "fill_mode ::= LINEAR",
+ /* 453 */ "fill_mode ::= NEXT",
+ /* 454 */ "group_by_clause_opt ::=",
+ /* 455 */ "group_by_clause_opt ::= GROUP BY group_by_list",
+ /* 456 */ "group_by_list ::= expression",
+ /* 457 */ "group_by_list ::= group_by_list NK_COMMA expression",
+ /* 458 */ "having_clause_opt ::=",
+ /* 459 */ "having_clause_opt ::= HAVING search_condition",
+ /* 460 */ "range_opt ::=",
+ /* 461 */ "range_opt ::= RANGE NK_LP expression NK_COMMA expression NK_RP",
+ /* 462 */ "every_opt ::=",
+ /* 463 */ "every_opt ::= EVERY NK_LP duration_literal NK_RP",
+ /* 464 */ "query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt",
+ /* 465 */ "query_expression_body ::= query_primary",
+ /* 466 */ "query_expression_body ::= query_expression_body UNION ALL query_expression_body",
+ /* 467 */ "query_expression_body ::= query_expression_body UNION query_expression_body",
+ /* 468 */ "query_primary ::= query_specification",
+ /* 469 */ "query_primary ::= NK_LP query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt NK_RP",
+ /* 470 */ "order_by_clause_opt ::=",
+ /* 471 */ "order_by_clause_opt ::= ORDER BY sort_specification_list",
+ /* 472 */ "slimit_clause_opt ::=",
+ /* 473 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER",
+ /* 474 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER",
+ /* 475 */ "slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER",
+ /* 476 */ "limit_clause_opt ::=",
+ /* 477 */ "limit_clause_opt ::= LIMIT NK_INTEGER",
+ /* 478 */ "limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER",
+ /* 479 */ "limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER",
+ /* 480 */ "subquery ::= NK_LP query_expression NK_RP",
+ /* 481 */ "search_condition ::= common_expression",
+ /* 482 */ "sort_specification_list ::= sort_specification",
+ /* 483 */ "sort_specification_list ::= sort_specification_list NK_COMMA sort_specification",
+ /* 484 */ "sort_specification ::= expression ordering_specification_opt null_ordering_opt",
+ /* 485 */ "ordering_specification_opt ::=",
+ /* 486 */ "ordering_specification_opt ::= ASC",
+ /* 487 */ "ordering_specification_opt ::= DESC",
+ /* 488 */ "null_ordering_opt ::=",
+ /* 489 */ "null_ordering_opt ::= NULLS FIRST",
+ /* 490 */ "null_ordering_opt ::= NULLS LAST",
};
#endif /* NDEBUG */
@@ -2219,181 +2269,181 @@ static void yy_destructor(
*/
/********* Begin destructor definitions ***************************************/
/* Default NON-TERMINAL Destructor */
- case 255: /* cmd */
- case 258: /* literal */
- case 269: /* db_options */
- case 271: /* alter_db_options */
- case 276: /* retention */
- case 277: /* full_table_name */
- case 280: /* table_options */
- case 284: /* alter_table_clause */
- case 285: /* alter_table_options */
- case 288: /* signed_literal */
- case 289: /* create_subtable_clause */
- case 292: /* drop_table_clause */
- case 295: /* column_def */
- case 299: /* duration_literal */
- case 300: /* rollup_func_name */
- case 302: /* col_name */
- case 303: /* db_name_cond_opt */
- case 304: /* like_pattern_opt */
- case 305: /* table_name_cond */
- case 306: /* from_db_opt */
- case 308: /* index_options */
- case 310: /* sliding_opt */
- case 311: /* sma_stream_opt */
- case 312: /* func */
- case 313: /* stream_options */
- case 315: /* query_expression */
- case 318: /* explain_options */
- case 322: /* into_opt */
- case 324: /* where_clause_opt */
- case 325: /* signed */
- case 326: /* literal_func */
- case 330: /* expression */
- case 331: /* pseudo_column */
- case 332: /* column_reference */
- case 333: /* function_expression */
- case 334: /* subquery */
- case 339: /* star_func_para */
- case 340: /* predicate */
- case 343: /* in_predicate_value */
- case 344: /* boolean_value_expression */
- case 345: /* boolean_primary */
- case 346: /* common_expression */
- case 347: /* from_clause_opt */
- case 348: /* table_reference_list */
- case 349: /* table_reference */
- case 350: /* table_primary */
- case 351: /* joined_table */
- case 353: /* parenthesized_joined_table */
- case 355: /* search_condition */
- case 356: /* query_specification */
- case 360: /* range_opt */
- case 361: /* every_opt */
- case 362: /* fill_opt */
- case 363: /* twindow_clause_opt */
- case 365: /* having_clause_opt */
- case 366: /* select_item */
- case 369: /* query_expression_body */
- case 371: /* slimit_clause_opt */
- case 372: /* limit_clause_opt */
- case 373: /* query_primary */
- case 375: /* sort_specification */
+ case 256: /* cmd */
+ case 259: /* literal */
+ case 270: /* db_options */
+ case 272: /* alter_db_options */
+ case 277: /* retention */
+ case 278: /* full_table_name */
+ case 281: /* table_options */
+ case 285: /* alter_table_clause */
+ case 286: /* alter_table_options */
+ case 289: /* signed_literal */
+ case 290: /* create_subtable_clause */
+ case 293: /* drop_table_clause */
+ case 296: /* column_def */
+ case 300: /* duration_literal */
+ case 301: /* rollup_func_name */
+ case 303: /* col_name */
+ case 304: /* db_name_cond_opt */
+ case 305: /* like_pattern_opt */
+ case 306: /* table_name_cond */
+ case 307: /* from_db_opt */
+ case 309: /* index_options */
+ case 311: /* sliding_opt */
+ case 312: /* sma_stream_opt */
+ case 313: /* func */
+ case 314: /* stream_options */
+ case 316: /* query_expression */
+ case 319: /* explain_options */
+ case 323: /* into_opt */
+ case 325: /* where_clause_opt */
+ case 326: /* signed */
+ case 327: /* literal_func */
+ case 331: /* expression */
+ case 332: /* pseudo_column */
+ case 333: /* column_reference */
+ case 334: /* function_expression */
+ case 335: /* subquery */
+ case 340: /* star_func_para */
+ case 341: /* predicate */
+ case 344: /* in_predicate_value */
+ case 345: /* boolean_value_expression */
+ case 346: /* boolean_primary */
+ case 347: /* common_expression */
+ case 348: /* from_clause_opt */
+ case 349: /* table_reference_list */
+ case 350: /* table_reference */
+ case 351: /* table_primary */
+ case 352: /* joined_table */
+ case 354: /* parenthesized_joined_table */
+ case 356: /* search_condition */
+ case 357: /* query_specification */
+ case 361: /* range_opt */
+ case 362: /* every_opt */
+ case 363: /* fill_opt */
+ case 364: /* twindow_clause_opt */
+ case 366: /* having_clause_opt */
+ case 367: /* select_item */
+ case 370: /* query_expression_body */
+ case 372: /* slimit_clause_opt */
+ case 373: /* limit_clause_opt */
+ case 374: /* query_primary */
+ case 376: /* sort_specification */
{
- nodesDestroyNode((yypminor->yy560));
+ nodesDestroyNode((yypminor->yy616));
}
break;
- case 256: /* account_options */
- case 257: /* alter_account_options */
- case 259: /* alter_account_option */
- case 320: /* bufsize_opt */
+ case 257: /* account_options */
+ case 258: /* alter_account_options */
+ case 260: /* alter_account_option */
+ case 321: /* bufsize_opt */
{
}
break;
- case 260: /* user_name */
- case 263: /* priv_level */
- case 266: /* db_name */
- case 267: /* dnode_endpoint */
- case 286: /* column_name */
- case 294: /* table_name */
- case 301: /* function_name */
- case 307: /* index_name */
- case 314: /* topic_name */
- case 316: /* cgroup_name */
- case 321: /* stream_name */
- case 328: /* table_alias */
- case 329: /* column_alias */
- case 335: /* star_func */
- case 337: /* noarg_func */
- case 352: /* alias_opt */
+ case 261: /* user_name */
+ case 264: /* priv_level */
+ case 267: /* db_name */
+ case 268: /* dnode_endpoint */
+ case 287: /* column_name */
+ case 295: /* table_name */
+ case 302: /* function_name */
+ case 308: /* index_name */
+ case 315: /* topic_name */
+ case 317: /* cgroup_name */
+ case 322: /* stream_name */
+ case 329: /* table_alias */
+ case 330: /* column_alias */
+ case 336: /* star_func */
+ case 338: /* noarg_func */
+ case 353: /* alias_opt */
{
}
break;
- case 261: /* sysinfo_opt */
+ case 262: /* sysinfo_opt */
{
}
break;
- case 262: /* privileges */
- case 264: /* priv_type_list */
- case 265: /* priv_type */
+ case 263: /* privileges */
+ case 265: /* priv_type_list */
+ case 266: /* priv_type */
{
}
break;
- case 268: /* not_exists_opt */
- case 270: /* exists_opt */
- case 317: /* analyze_opt */
- case 319: /* agg_func_opt */
- case 357: /* set_quantifier_opt */
+ case 269: /* not_exists_opt */
+ case 271: /* exists_opt */
+ case 318: /* analyze_opt */
+ case 320: /* agg_func_opt */
+ case 358: /* set_quantifier_opt */
{
}
break;
- case 272: /* integer_list */
- case 273: /* variable_list */
- case 274: /* retention_list */
- case 278: /* column_def_list */
- case 279: /* tags_def_opt */
- case 281: /* multi_create_clause */
- case 282: /* tags_def */
- case 283: /* multi_drop_clause */
- case 290: /* specific_cols_opt */
- case 291: /* expression_list */
- case 293: /* col_name_list */
- case 296: /* duration_list */
- case 297: /* rollup_func_list */
- case 309: /* func_list */
- case 323: /* dnode_list */
- case 327: /* literal_list */
- case 336: /* star_func_para_list */
- case 338: /* other_para_list */
- case 358: /* select_list */
- case 359: /* partition_by_clause_opt */
- case 364: /* group_by_clause_opt */
- case 368: /* group_by_list */
- case 370: /* order_by_clause_opt */
- case 374: /* sort_specification_list */
+ case 273: /* integer_list */
+ case 274: /* variable_list */
+ case 275: /* retention_list */
+ case 279: /* column_def_list */
+ case 280: /* tags_def_opt */
+ case 282: /* multi_create_clause */
+ case 283: /* tags_def */
+ case 284: /* multi_drop_clause */
+ case 291: /* specific_cols_opt */
+ case 292: /* expression_list */
+ case 294: /* col_name_list */
+ case 297: /* duration_list */
+ case 298: /* rollup_func_list */
+ case 310: /* func_list */
+ case 324: /* dnode_list */
+ case 328: /* literal_list */
+ case 337: /* star_func_para_list */
+ case 339: /* other_para_list */
+ case 359: /* select_list */
+ case 360: /* partition_by_clause_opt */
+ case 365: /* group_by_clause_opt */
+ case 369: /* group_by_list */
+ case 371: /* order_by_clause_opt */
+ case 375: /* sort_specification_list */
{
- nodesDestroyList((yypminor->yy712));
+ nodesDestroyList((yypminor->yy356));
}
break;
- case 275: /* alter_db_option */
- case 298: /* alter_table_option */
+ case 276: /* alter_db_option */
+ case 299: /* alter_table_option */
{
}
break;
- case 287: /* type_name */
+ case 288: /* type_name */
{
}
break;
- case 341: /* compare_op */
- case 342: /* in_op */
+ case 342: /* compare_op */
+ case 343: /* in_op */
{
}
break;
- case 354: /* join_type */
+ case 355: /* join_type */
{
}
break;
- case 367: /* fill_mode */
+ case 368: /* fill_mode */
{
}
break;
- case 376: /* ordering_specification_opt */
+ case 377: /* ordering_specification_opt */
{
}
break;
- case 377: /* null_ordering_opt */
+ case 378: /* null_ordering_opt */
{
}
@@ -2692,495 +2742,497 @@ 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[] = {
- { 255, -6 }, /* (0) cmd ::= CREATE ACCOUNT NK_ID PASS NK_STRING account_options */
- { 255, -4 }, /* (1) cmd ::= ALTER ACCOUNT NK_ID alter_account_options */
- { 256, 0 }, /* (2) account_options ::= */
- { 256, -3 }, /* (3) account_options ::= account_options PPS literal */
- { 256, -3 }, /* (4) account_options ::= account_options TSERIES literal */
- { 256, -3 }, /* (5) account_options ::= account_options STORAGE literal */
- { 256, -3 }, /* (6) account_options ::= account_options STREAMS literal */
- { 256, -3 }, /* (7) account_options ::= account_options QTIME literal */
- { 256, -3 }, /* (8) account_options ::= account_options DBS literal */
- { 256, -3 }, /* (9) account_options ::= account_options USERS literal */
- { 256, -3 }, /* (10) account_options ::= account_options CONNS literal */
- { 256, -3 }, /* (11) account_options ::= account_options STATE literal */
- { 257, -1 }, /* (12) alter_account_options ::= alter_account_option */
- { 257, -2 }, /* (13) alter_account_options ::= alter_account_options alter_account_option */
- { 259, -2 }, /* (14) alter_account_option ::= PASS literal */
- { 259, -2 }, /* (15) alter_account_option ::= PPS literal */
- { 259, -2 }, /* (16) alter_account_option ::= TSERIES literal */
- { 259, -2 }, /* (17) alter_account_option ::= STORAGE literal */
- { 259, -2 }, /* (18) alter_account_option ::= STREAMS literal */
- { 259, -2 }, /* (19) alter_account_option ::= QTIME literal */
- { 259, -2 }, /* (20) alter_account_option ::= DBS literal */
- { 259, -2 }, /* (21) alter_account_option ::= USERS literal */
- { 259, -2 }, /* (22) alter_account_option ::= CONNS literal */
- { 259, -2 }, /* (23) alter_account_option ::= STATE literal */
- { 255, -6 }, /* (24) cmd ::= CREATE USER user_name PASS NK_STRING sysinfo_opt */
- { 255, -5 }, /* (25) cmd ::= ALTER USER user_name PASS NK_STRING */
- { 255, -5 }, /* (26) cmd ::= ALTER USER user_name ENABLE NK_INTEGER */
- { 255, -5 }, /* (27) cmd ::= ALTER USER user_name SYSINFO NK_INTEGER */
- { 255, -3 }, /* (28) cmd ::= DROP USER user_name */
- { 261, 0 }, /* (29) sysinfo_opt ::= */
- { 261, -2 }, /* (30) sysinfo_opt ::= SYSINFO NK_INTEGER */
- { 255, -6 }, /* (31) cmd ::= GRANT privileges ON priv_level TO user_name */
- { 255, -6 }, /* (32) cmd ::= REVOKE privileges ON priv_level FROM user_name */
- { 262, -1 }, /* (33) privileges ::= ALL */
- { 262, -1 }, /* (34) privileges ::= priv_type_list */
- { 264, -1 }, /* (35) priv_type_list ::= priv_type */
- { 264, -3 }, /* (36) priv_type_list ::= priv_type_list NK_COMMA priv_type */
- { 265, -1 }, /* (37) priv_type ::= READ */
- { 265, -1 }, /* (38) priv_type ::= WRITE */
- { 263, -3 }, /* (39) priv_level ::= NK_STAR NK_DOT NK_STAR */
- { 263, -3 }, /* (40) priv_level ::= db_name NK_DOT NK_STAR */
- { 255, -3 }, /* (41) cmd ::= CREATE DNODE dnode_endpoint */
- { 255, -5 }, /* (42) cmd ::= CREATE DNODE dnode_endpoint PORT NK_INTEGER */
- { 255, -3 }, /* (43) cmd ::= DROP DNODE NK_INTEGER */
- { 255, -3 }, /* (44) cmd ::= DROP DNODE dnode_endpoint */
- { 255, -4 }, /* (45) cmd ::= ALTER DNODE NK_INTEGER NK_STRING */
- { 255, -5 }, /* (46) cmd ::= ALTER DNODE NK_INTEGER NK_STRING NK_STRING */
- { 255, -4 }, /* (47) cmd ::= ALTER ALL DNODES NK_STRING */
- { 255, -5 }, /* (48) cmd ::= ALTER ALL DNODES NK_STRING NK_STRING */
- { 267, -1 }, /* (49) dnode_endpoint ::= NK_STRING */
- { 267, -1 }, /* (50) dnode_endpoint ::= NK_ID */
- { 267, -1 }, /* (51) dnode_endpoint ::= NK_IPTOKEN */
- { 255, -3 }, /* (52) cmd ::= ALTER LOCAL NK_STRING */
- { 255, -4 }, /* (53) cmd ::= ALTER LOCAL NK_STRING NK_STRING */
- { 255, -5 }, /* (54) cmd ::= CREATE QNODE ON DNODE NK_INTEGER */
- { 255, -5 }, /* (55) cmd ::= DROP QNODE ON DNODE NK_INTEGER */
- { 255, -5 }, /* (56) cmd ::= CREATE BNODE ON DNODE NK_INTEGER */
- { 255, -5 }, /* (57) cmd ::= DROP BNODE ON DNODE NK_INTEGER */
- { 255, -5 }, /* (58) cmd ::= CREATE SNODE ON DNODE NK_INTEGER */
- { 255, -5 }, /* (59) cmd ::= DROP SNODE ON DNODE NK_INTEGER */
- { 255, -5 }, /* (60) cmd ::= CREATE MNODE ON DNODE NK_INTEGER */
- { 255, -5 }, /* (61) cmd ::= DROP MNODE ON DNODE NK_INTEGER */
- { 255, -5 }, /* (62) cmd ::= CREATE DATABASE not_exists_opt db_name db_options */
- { 255, -4 }, /* (63) cmd ::= DROP DATABASE exists_opt db_name */
- { 255, -2 }, /* (64) cmd ::= USE db_name */
- { 255, -4 }, /* (65) cmd ::= ALTER DATABASE db_name alter_db_options */
- { 255, -3 }, /* (66) cmd ::= FLUSH DATABASE db_name */
- { 255, -3 }, /* (67) cmd ::= TRIM DATABASE db_name */
- { 268, -3 }, /* (68) not_exists_opt ::= IF NOT EXISTS */
- { 268, 0 }, /* (69) not_exists_opt ::= */
- { 270, -2 }, /* (70) exists_opt ::= IF EXISTS */
- { 270, 0 }, /* (71) exists_opt ::= */
- { 269, 0 }, /* (72) db_options ::= */
- { 269, -3 }, /* (73) db_options ::= db_options BUFFER NK_INTEGER */
- { 269, -3 }, /* (74) db_options ::= db_options CACHELAST NK_INTEGER */
- { 269, -3 }, /* (75) db_options ::= db_options CACHELASTSIZE NK_INTEGER */
- { 269, -3 }, /* (76) db_options ::= db_options COMP NK_INTEGER */
- { 269, -3 }, /* (77) db_options ::= db_options DURATION NK_INTEGER */
- { 269, -3 }, /* (78) db_options ::= db_options DURATION NK_VARIABLE */
- { 269, -3 }, /* (79) db_options ::= db_options FSYNC NK_INTEGER */
- { 269, -3 }, /* (80) db_options ::= db_options MAXROWS NK_INTEGER */
- { 269, -3 }, /* (81) db_options ::= db_options MINROWS NK_INTEGER */
- { 269, -3 }, /* (82) db_options ::= db_options KEEP integer_list */
- { 269, -3 }, /* (83) db_options ::= db_options KEEP variable_list */
- { 269, -3 }, /* (84) db_options ::= db_options PAGES NK_INTEGER */
- { 269, -3 }, /* (85) db_options ::= db_options PAGESIZE NK_INTEGER */
- { 269, -3 }, /* (86) db_options ::= db_options PRECISION NK_STRING */
- { 269, -3 }, /* (87) db_options ::= db_options REPLICA NK_INTEGER */
- { 269, -3 }, /* (88) db_options ::= db_options STRICT NK_INTEGER */
- { 269, -3 }, /* (89) db_options ::= db_options WAL NK_INTEGER */
- { 269, -3 }, /* (90) db_options ::= db_options VGROUPS NK_INTEGER */
- { 269, -3 }, /* (91) db_options ::= db_options SINGLE_STABLE NK_INTEGER */
- { 269, -3 }, /* (92) db_options ::= db_options RETENTIONS retention_list */
- { 269, -3 }, /* (93) db_options ::= db_options SCHEMALESS NK_INTEGER */
- { 271, -1 }, /* (94) alter_db_options ::= alter_db_option */
- { 271, -2 }, /* (95) alter_db_options ::= alter_db_options alter_db_option */
- { 275, -2 }, /* (96) alter_db_option ::= BUFFER NK_INTEGER */
- { 275, -2 }, /* (97) alter_db_option ::= CACHELAST NK_INTEGER */
- { 275, -2 }, /* (98) alter_db_option ::= CACHELASTSIZE NK_INTEGER */
- { 275, -2 }, /* (99) alter_db_option ::= FSYNC NK_INTEGER */
- { 275, -2 }, /* (100) alter_db_option ::= KEEP integer_list */
- { 275, -2 }, /* (101) alter_db_option ::= KEEP variable_list */
- { 275, -2 }, /* (102) alter_db_option ::= PAGES NK_INTEGER */
- { 275, -2 }, /* (103) alter_db_option ::= REPLICA NK_INTEGER */
- { 275, -2 }, /* (104) alter_db_option ::= STRICT NK_INTEGER */
- { 275, -2 }, /* (105) alter_db_option ::= WAL NK_INTEGER */
- { 272, -1 }, /* (106) integer_list ::= NK_INTEGER */
- { 272, -3 }, /* (107) integer_list ::= integer_list NK_COMMA NK_INTEGER */
- { 273, -1 }, /* (108) variable_list ::= NK_VARIABLE */
- { 273, -3 }, /* (109) variable_list ::= variable_list NK_COMMA NK_VARIABLE */
- { 274, -1 }, /* (110) retention_list ::= retention */
- { 274, -3 }, /* (111) retention_list ::= retention_list NK_COMMA retention */
- { 276, -3 }, /* (112) retention ::= NK_VARIABLE NK_COLON NK_VARIABLE */
- { 255, -9 }, /* (113) cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options */
- { 255, -3 }, /* (114) cmd ::= CREATE TABLE multi_create_clause */
- { 255, -9 }, /* (115) cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options */
- { 255, -3 }, /* (116) cmd ::= DROP TABLE multi_drop_clause */
- { 255, -4 }, /* (117) cmd ::= DROP STABLE exists_opt full_table_name */
- { 255, -3 }, /* (118) cmd ::= ALTER TABLE alter_table_clause */
- { 255, -3 }, /* (119) cmd ::= ALTER STABLE alter_table_clause */
- { 284, -2 }, /* (120) alter_table_clause ::= full_table_name alter_table_options */
- { 284, -5 }, /* (121) alter_table_clause ::= full_table_name ADD COLUMN column_name type_name */
- { 284, -4 }, /* (122) alter_table_clause ::= full_table_name DROP COLUMN column_name */
- { 284, -5 }, /* (123) alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name */
- { 284, -5 }, /* (124) alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name */
- { 284, -5 }, /* (125) alter_table_clause ::= full_table_name ADD TAG column_name type_name */
- { 284, -4 }, /* (126) alter_table_clause ::= full_table_name DROP TAG column_name */
- { 284, -5 }, /* (127) alter_table_clause ::= full_table_name MODIFY TAG column_name type_name */
- { 284, -5 }, /* (128) alter_table_clause ::= full_table_name RENAME TAG column_name column_name */
- { 284, -6 }, /* (129) alter_table_clause ::= full_table_name SET TAG column_name NK_EQ signed_literal */
- { 281, -1 }, /* (130) multi_create_clause ::= create_subtable_clause */
- { 281, -2 }, /* (131) multi_create_clause ::= multi_create_clause create_subtable_clause */
- { 289, -10 }, /* (132) create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_cols_opt TAGS NK_LP expression_list NK_RP table_options */
- { 283, -1 }, /* (133) multi_drop_clause ::= drop_table_clause */
- { 283, -2 }, /* (134) multi_drop_clause ::= multi_drop_clause drop_table_clause */
- { 292, -2 }, /* (135) drop_table_clause ::= exists_opt full_table_name */
- { 290, 0 }, /* (136) specific_cols_opt ::= */
- { 290, -3 }, /* (137) specific_cols_opt ::= NK_LP col_name_list NK_RP */
- { 277, -1 }, /* (138) full_table_name ::= table_name */
- { 277, -3 }, /* (139) full_table_name ::= db_name NK_DOT table_name */
- { 278, -1 }, /* (140) column_def_list ::= column_def */
- { 278, -3 }, /* (141) column_def_list ::= column_def_list NK_COMMA column_def */
- { 295, -2 }, /* (142) column_def ::= column_name type_name */
- { 295, -4 }, /* (143) column_def ::= column_name type_name COMMENT NK_STRING */
- { 287, -1 }, /* (144) type_name ::= BOOL */
- { 287, -1 }, /* (145) type_name ::= TINYINT */
- { 287, -1 }, /* (146) type_name ::= SMALLINT */
- { 287, -1 }, /* (147) type_name ::= INT */
- { 287, -1 }, /* (148) type_name ::= INTEGER */
- { 287, -1 }, /* (149) type_name ::= BIGINT */
- { 287, -1 }, /* (150) type_name ::= FLOAT */
- { 287, -1 }, /* (151) type_name ::= DOUBLE */
- { 287, -4 }, /* (152) type_name ::= BINARY NK_LP NK_INTEGER NK_RP */
- { 287, -1 }, /* (153) type_name ::= TIMESTAMP */
- { 287, -4 }, /* (154) type_name ::= NCHAR NK_LP NK_INTEGER NK_RP */
- { 287, -2 }, /* (155) type_name ::= TINYINT UNSIGNED */
- { 287, -2 }, /* (156) type_name ::= SMALLINT UNSIGNED */
- { 287, -2 }, /* (157) type_name ::= INT UNSIGNED */
- { 287, -2 }, /* (158) type_name ::= BIGINT UNSIGNED */
- { 287, -1 }, /* (159) type_name ::= JSON */
- { 287, -4 }, /* (160) type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP */
- { 287, -1 }, /* (161) type_name ::= MEDIUMBLOB */
- { 287, -1 }, /* (162) type_name ::= BLOB */
- { 287, -4 }, /* (163) type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP */
- { 287, -1 }, /* (164) type_name ::= DECIMAL */
- { 287, -4 }, /* (165) type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP */
- { 287, -6 }, /* (166) type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */
- { 279, 0 }, /* (167) tags_def_opt ::= */
- { 279, -1 }, /* (168) tags_def_opt ::= tags_def */
- { 282, -4 }, /* (169) tags_def ::= TAGS NK_LP column_def_list NK_RP */
- { 280, 0 }, /* (170) table_options ::= */
- { 280, -3 }, /* (171) table_options ::= table_options COMMENT NK_STRING */
- { 280, -3 }, /* (172) table_options ::= table_options MAX_DELAY duration_list */
- { 280, -3 }, /* (173) table_options ::= table_options WATERMARK duration_list */
- { 280, -5 }, /* (174) table_options ::= table_options ROLLUP NK_LP rollup_func_list NK_RP */
- { 280, -3 }, /* (175) table_options ::= table_options TTL NK_INTEGER */
- { 280, -5 }, /* (176) table_options ::= table_options SMA NK_LP col_name_list NK_RP */
- { 285, -1 }, /* (177) alter_table_options ::= alter_table_option */
- { 285, -2 }, /* (178) alter_table_options ::= alter_table_options alter_table_option */
- { 298, -2 }, /* (179) alter_table_option ::= COMMENT NK_STRING */
- { 298, -2 }, /* (180) alter_table_option ::= TTL NK_INTEGER */
- { 296, -1 }, /* (181) duration_list ::= duration_literal */
- { 296, -3 }, /* (182) duration_list ::= duration_list NK_COMMA duration_literal */
- { 297, -1 }, /* (183) rollup_func_list ::= rollup_func_name */
- { 297, -3 }, /* (184) rollup_func_list ::= rollup_func_list NK_COMMA rollup_func_name */
- { 300, -1 }, /* (185) rollup_func_name ::= function_name */
- { 300, -1 }, /* (186) rollup_func_name ::= FIRST */
- { 300, -1 }, /* (187) rollup_func_name ::= LAST */
- { 293, -1 }, /* (188) col_name_list ::= col_name */
- { 293, -3 }, /* (189) col_name_list ::= col_name_list NK_COMMA col_name */
- { 302, -1 }, /* (190) col_name ::= column_name */
- { 255, -2 }, /* (191) cmd ::= SHOW DNODES */
- { 255, -2 }, /* (192) cmd ::= SHOW USERS */
- { 255, -2 }, /* (193) cmd ::= SHOW DATABASES */
- { 255, -4 }, /* (194) cmd ::= SHOW db_name_cond_opt TABLES like_pattern_opt */
- { 255, -4 }, /* (195) cmd ::= SHOW db_name_cond_opt STABLES like_pattern_opt */
- { 255, -3 }, /* (196) cmd ::= SHOW db_name_cond_opt VGROUPS */
- { 255, -2 }, /* (197) cmd ::= SHOW MNODES */
- { 255, -2 }, /* (198) cmd ::= SHOW MODULES */
- { 255, -2 }, /* (199) cmd ::= SHOW QNODES */
- { 255, -2 }, /* (200) cmd ::= SHOW FUNCTIONS */
- { 255, -5 }, /* (201) cmd ::= SHOW INDEXES FROM table_name_cond from_db_opt */
- { 255, -2 }, /* (202) cmd ::= SHOW STREAMS */
- { 255, -2 }, /* (203) cmd ::= SHOW ACCOUNTS */
- { 255, -2 }, /* (204) cmd ::= SHOW APPS */
- { 255, -2 }, /* (205) cmd ::= SHOW CONNECTIONS */
- { 255, -2 }, /* (206) cmd ::= SHOW LICENCE */
- { 255, -2 }, /* (207) cmd ::= SHOW GRANTS */
- { 255, -4 }, /* (208) cmd ::= SHOW CREATE DATABASE db_name */
- { 255, -4 }, /* (209) cmd ::= SHOW CREATE TABLE full_table_name */
- { 255, -4 }, /* (210) cmd ::= SHOW CREATE STABLE full_table_name */
- { 255, -2 }, /* (211) cmd ::= SHOW QUERIES */
- { 255, -2 }, /* (212) cmd ::= SHOW SCORES */
- { 255, -2 }, /* (213) cmd ::= SHOW TOPICS */
- { 255, -2 }, /* (214) cmd ::= SHOW VARIABLES */
- { 255, -3 }, /* (215) cmd ::= SHOW LOCAL VARIABLES */
- { 255, -4 }, /* (216) cmd ::= SHOW DNODE NK_INTEGER VARIABLES */
- { 255, -2 }, /* (217) cmd ::= SHOW BNODES */
- { 255, -2 }, /* (218) cmd ::= SHOW SNODES */
- { 255, -2 }, /* (219) cmd ::= SHOW CLUSTER */
- { 255, -2 }, /* (220) cmd ::= SHOW TRANSACTIONS */
- { 255, -4 }, /* (221) cmd ::= SHOW TABLE DISTRIBUTED full_table_name */
- { 255, -2 }, /* (222) cmd ::= SHOW CONSUMERS */
- { 255, -2 }, /* (223) cmd ::= SHOW SUBSCRIPTIONS */
- { 303, 0 }, /* (224) db_name_cond_opt ::= */
- { 303, -2 }, /* (225) db_name_cond_opt ::= db_name NK_DOT */
- { 304, 0 }, /* (226) like_pattern_opt ::= */
- { 304, -2 }, /* (227) like_pattern_opt ::= LIKE NK_STRING */
- { 305, -1 }, /* (228) table_name_cond ::= table_name */
- { 306, 0 }, /* (229) from_db_opt ::= */
- { 306, -2 }, /* (230) from_db_opt ::= FROM db_name */
- { 255, -8 }, /* (231) cmd ::= CREATE SMA INDEX not_exists_opt index_name ON table_name index_options */
- { 255, -4 }, /* (232) cmd ::= DROP INDEX exists_opt index_name */
- { 308, -10 }, /* (233) index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt sma_stream_opt */
- { 308, -12 }, /* (234) index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt sma_stream_opt */
- { 309, -1 }, /* (235) func_list ::= func */
- { 309, -3 }, /* (236) func_list ::= func_list NK_COMMA func */
- { 312, -4 }, /* (237) func ::= function_name NK_LP expression_list NK_RP */
- { 311, 0 }, /* (238) sma_stream_opt ::= */
- { 311, -3 }, /* (239) sma_stream_opt ::= stream_options WATERMARK duration_literal */
- { 311, -3 }, /* (240) sma_stream_opt ::= stream_options MAX_DELAY duration_literal */
- { 255, -6 }, /* (241) cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression */
- { 255, -7 }, /* (242) cmd ::= CREATE TOPIC not_exists_opt topic_name AS DATABASE db_name */
- { 255, -9 }, /* (243) cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS DATABASE db_name */
- { 255, -7 }, /* (244) cmd ::= CREATE TOPIC not_exists_opt topic_name AS STABLE full_table_name */
- { 255, -9 }, /* (245) cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS STABLE full_table_name */
- { 255, -4 }, /* (246) cmd ::= DROP TOPIC exists_opt topic_name */
- { 255, -7 }, /* (247) cmd ::= DROP CONSUMER GROUP exists_opt cgroup_name ON topic_name */
- { 255, -2 }, /* (248) cmd ::= DESC full_table_name */
- { 255, -2 }, /* (249) cmd ::= DESCRIBE full_table_name */
- { 255, -3 }, /* (250) cmd ::= RESET QUERY CACHE */
- { 255, -4 }, /* (251) cmd ::= EXPLAIN analyze_opt explain_options query_expression */
- { 317, 0 }, /* (252) analyze_opt ::= */
- { 317, -1 }, /* (253) analyze_opt ::= ANALYZE */
- { 318, 0 }, /* (254) explain_options ::= */
- { 318, -3 }, /* (255) explain_options ::= explain_options VERBOSE NK_BOOL */
- { 318, -3 }, /* (256) explain_options ::= explain_options RATIO NK_FLOAT */
- { 255, -6 }, /* (257) cmd ::= COMPACT VNODES IN NK_LP integer_list NK_RP */
- { 255, -10 }, /* (258) cmd ::= CREATE agg_func_opt FUNCTION not_exists_opt function_name AS NK_STRING OUTPUTTYPE type_name bufsize_opt */
- { 255, -4 }, /* (259) cmd ::= DROP FUNCTION exists_opt function_name */
- { 319, 0 }, /* (260) agg_func_opt ::= */
- { 319, -1 }, /* (261) agg_func_opt ::= AGGREGATE */
- { 320, 0 }, /* (262) bufsize_opt ::= */
- { 320, -2 }, /* (263) bufsize_opt ::= BUFSIZE NK_INTEGER */
- { 255, -8 }, /* (264) cmd ::= CREATE STREAM not_exists_opt stream_name stream_options into_opt AS query_expression */
- { 255, -4 }, /* (265) cmd ::= DROP STREAM exists_opt stream_name */
- { 322, 0 }, /* (266) into_opt ::= */
- { 322, -2 }, /* (267) into_opt ::= INTO full_table_name */
- { 313, 0 }, /* (268) stream_options ::= */
- { 313, -3 }, /* (269) stream_options ::= stream_options TRIGGER AT_ONCE */
- { 313, -3 }, /* (270) stream_options ::= stream_options TRIGGER WINDOW_CLOSE */
- { 313, -4 }, /* (271) stream_options ::= stream_options TRIGGER MAX_DELAY duration_literal */
- { 313, -3 }, /* (272) stream_options ::= stream_options WATERMARK duration_literal */
- { 313, -3 }, /* (273) stream_options ::= stream_options IGNORE EXPIRED */
- { 255, -3 }, /* (274) cmd ::= KILL CONNECTION NK_INTEGER */
- { 255, -3 }, /* (275) cmd ::= KILL QUERY NK_STRING */
- { 255, -3 }, /* (276) cmd ::= KILL TRANSACTION NK_INTEGER */
- { 255, -2 }, /* (277) cmd ::= BALANCE VGROUP */
- { 255, -4 }, /* (278) cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER */
- { 255, -4 }, /* (279) cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list */
- { 255, -3 }, /* (280) cmd ::= SPLIT VGROUP NK_INTEGER */
- { 323, -2 }, /* (281) dnode_list ::= DNODE NK_INTEGER */
- { 323, -3 }, /* (282) dnode_list ::= dnode_list DNODE NK_INTEGER */
- { 255, -3 }, /* (283) cmd ::= SYNCDB db_name REPLICA */
- { 255, -4 }, /* (284) cmd ::= DELETE FROM full_table_name where_clause_opt */
- { 255, -1 }, /* (285) cmd ::= query_expression */
- { 255, -5 }, /* (286) cmd ::= INSERT INTO full_table_name specific_cols_opt query_expression */
- { 258, -1 }, /* (287) literal ::= NK_INTEGER */
- { 258, -1 }, /* (288) literal ::= NK_FLOAT */
- { 258, -1 }, /* (289) literal ::= NK_STRING */
- { 258, -1 }, /* (290) literal ::= NK_BOOL */
- { 258, -2 }, /* (291) literal ::= TIMESTAMP NK_STRING */
- { 258, -1 }, /* (292) literal ::= duration_literal */
- { 258, -1 }, /* (293) literal ::= NULL */
- { 258, -1 }, /* (294) literal ::= NK_QUESTION */
- { 299, -1 }, /* (295) duration_literal ::= NK_VARIABLE */
- { 325, -1 }, /* (296) signed ::= NK_INTEGER */
- { 325, -2 }, /* (297) signed ::= NK_PLUS NK_INTEGER */
- { 325, -2 }, /* (298) signed ::= NK_MINUS NK_INTEGER */
- { 325, -1 }, /* (299) signed ::= NK_FLOAT */
- { 325, -2 }, /* (300) signed ::= NK_PLUS NK_FLOAT */
- { 325, -2 }, /* (301) signed ::= NK_MINUS NK_FLOAT */
- { 288, -1 }, /* (302) signed_literal ::= signed */
- { 288, -1 }, /* (303) signed_literal ::= NK_STRING */
- { 288, -1 }, /* (304) signed_literal ::= NK_BOOL */
- { 288, -2 }, /* (305) signed_literal ::= TIMESTAMP NK_STRING */
- { 288, -1 }, /* (306) signed_literal ::= duration_literal */
- { 288, -1 }, /* (307) signed_literal ::= NULL */
- { 288, -1 }, /* (308) signed_literal ::= literal_func */
- { 288, -1 }, /* (309) signed_literal ::= NK_QUESTION */
- { 327, -1 }, /* (310) literal_list ::= signed_literal */
- { 327, -3 }, /* (311) literal_list ::= literal_list NK_COMMA signed_literal */
- { 266, -1 }, /* (312) db_name ::= NK_ID */
- { 294, -1 }, /* (313) table_name ::= NK_ID */
- { 286, -1 }, /* (314) column_name ::= NK_ID */
- { 301, -1 }, /* (315) function_name ::= NK_ID */
- { 328, -1 }, /* (316) table_alias ::= NK_ID */
- { 329, -1 }, /* (317) column_alias ::= NK_ID */
- { 260, -1 }, /* (318) user_name ::= NK_ID */
- { 307, -1 }, /* (319) index_name ::= NK_ID */
- { 314, -1 }, /* (320) topic_name ::= NK_ID */
- { 321, -1 }, /* (321) stream_name ::= NK_ID */
- { 316, -1 }, /* (322) cgroup_name ::= NK_ID */
- { 330, -1 }, /* (323) expression ::= literal */
- { 330, -1 }, /* (324) expression ::= pseudo_column */
- { 330, -1 }, /* (325) expression ::= column_reference */
- { 330, -1 }, /* (326) expression ::= function_expression */
- { 330, -1 }, /* (327) expression ::= subquery */
- { 330, -3 }, /* (328) expression ::= NK_LP expression NK_RP */
- { 330, -2 }, /* (329) expression ::= NK_PLUS expression */
- { 330, -2 }, /* (330) expression ::= NK_MINUS expression */
- { 330, -3 }, /* (331) expression ::= expression NK_PLUS expression */
- { 330, -3 }, /* (332) expression ::= expression NK_MINUS expression */
- { 330, -3 }, /* (333) expression ::= expression NK_STAR expression */
- { 330, -3 }, /* (334) expression ::= expression NK_SLASH expression */
- { 330, -3 }, /* (335) expression ::= expression NK_REM expression */
- { 330, -3 }, /* (336) expression ::= column_reference NK_ARROW NK_STRING */
- { 330, -3 }, /* (337) expression ::= expression NK_BITAND expression */
- { 330, -3 }, /* (338) expression ::= expression NK_BITOR expression */
- { 291, -1 }, /* (339) expression_list ::= expression */
- { 291, -3 }, /* (340) expression_list ::= expression_list NK_COMMA expression */
- { 332, -1 }, /* (341) column_reference ::= column_name */
- { 332, -3 }, /* (342) column_reference ::= table_name NK_DOT column_name */
- { 331, -1 }, /* (343) pseudo_column ::= ROWTS */
- { 331, -1 }, /* (344) pseudo_column ::= TBNAME */
- { 331, -3 }, /* (345) pseudo_column ::= table_name NK_DOT TBNAME */
- { 331, -1 }, /* (346) pseudo_column ::= QSTARTTS */
- { 331, -1 }, /* (347) pseudo_column ::= QENDTS */
- { 331, -1 }, /* (348) pseudo_column ::= WSTARTTS */
- { 331, -1 }, /* (349) pseudo_column ::= WENDTS */
- { 331, -1 }, /* (350) pseudo_column ::= WDURATION */
- { 333, -4 }, /* (351) function_expression ::= function_name NK_LP expression_list NK_RP */
- { 333, -4 }, /* (352) function_expression ::= star_func NK_LP star_func_para_list NK_RP */
- { 333, -6 }, /* (353) function_expression ::= CAST NK_LP expression AS type_name NK_RP */
- { 333, -1 }, /* (354) function_expression ::= literal_func */
- { 326, -3 }, /* (355) literal_func ::= noarg_func NK_LP NK_RP */
- { 326, -1 }, /* (356) literal_func ::= NOW */
- { 337, -1 }, /* (357) noarg_func ::= NOW */
- { 337, -1 }, /* (358) noarg_func ::= TODAY */
- { 337, -1 }, /* (359) noarg_func ::= TIMEZONE */
- { 337, -1 }, /* (360) noarg_func ::= DATABASE */
- { 337, -1 }, /* (361) noarg_func ::= CLIENT_VERSION */
- { 337, -1 }, /* (362) noarg_func ::= SERVER_VERSION */
- { 337, -1 }, /* (363) noarg_func ::= SERVER_STATUS */
- { 337, -1 }, /* (364) noarg_func ::= CURRENT_USER */
- { 337, -1 }, /* (365) noarg_func ::= USER */
- { 335, -1 }, /* (366) star_func ::= COUNT */
- { 335, -1 }, /* (367) star_func ::= FIRST */
- { 335, -1 }, /* (368) star_func ::= LAST */
- { 335, -1 }, /* (369) star_func ::= LAST_ROW */
- { 336, -1 }, /* (370) star_func_para_list ::= NK_STAR */
- { 336, -1 }, /* (371) star_func_para_list ::= other_para_list */
- { 338, -1 }, /* (372) other_para_list ::= star_func_para */
- { 338, -3 }, /* (373) other_para_list ::= other_para_list NK_COMMA star_func_para */
- { 339, -1 }, /* (374) star_func_para ::= expression */
- { 339, -3 }, /* (375) star_func_para ::= table_name NK_DOT NK_STAR */
- { 340, -3 }, /* (376) predicate ::= expression compare_op expression */
- { 340, -5 }, /* (377) predicate ::= expression BETWEEN expression AND expression */
- { 340, -6 }, /* (378) predicate ::= expression NOT BETWEEN expression AND expression */
- { 340, -3 }, /* (379) predicate ::= expression IS NULL */
- { 340, -4 }, /* (380) predicate ::= expression IS NOT NULL */
- { 340, -3 }, /* (381) predicate ::= expression in_op in_predicate_value */
- { 341, -1 }, /* (382) compare_op ::= NK_LT */
- { 341, -1 }, /* (383) compare_op ::= NK_GT */
- { 341, -1 }, /* (384) compare_op ::= NK_LE */
- { 341, -1 }, /* (385) compare_op ::= NK_GE */
- { 341, -1 }, /* (386) compare_op ::= NK_NE */
- { 341, -1 }, /* (387) compare_op ::= NK_EQ */
- { 341, -1 }, /* (388) compare_op ::= LIKE */
- { 341, -2 }, /* (389) compare_op ::= NOT LIKE */
- { 341, -1 }, /* (390) compare_op ::= MATCH */
- { 341, -1 }, /* (391) compare_op ::= NMATCH */
- { 341, -1 }, /* (392) compare_op ::= CONTAINS */
- { 342, -1 }, /* (393) in_op ::= IN */
- { 342, -2 }, /* (394) in_op ::= NOT IN */
- { 343, -3 }, /* (395) in_predicate_value ::= NK_LP literal_list NK_RP */
- { 344, -1 }, /* (396) boolean_value_expression ::= boolean_primary */
- { 344, -2 }, /* (397) boolean_value_expression ::= NOT boolean_primary */
- { 344, -3 }, /* (398) boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
- { 344, -3 }, /* (399) boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
- { 345, -1 }, /* (400) boolean_primary ::= predicate */
- { 345, -3 }, /* (401) boolean_primary ::= NK_LP boolean_value_expression NK_RP */
- { 346, -1 }, /* (402) common_expression ::= expression */
- { 346, -1 }, /* (403) common_expression ::= boolean_value_expression */
- { 347, 0 }, /* (404) from_clause_opt ::= */
- { 347, -2 }, /* (405) from_clause_opt ::= FROM table_reference_list */
- { 348, -1 }, /* (406) table_reference_list ::= table_reference */
- { 348, -3 }, /* (407) table_reference_list ::= table_reference_list NK_COMMA table_reference */
- { 349, -1 }, /* (408) table_reference ::= table_primary */
- { 349, -1 }, /* (409) table_reference ::= joined_table */
- { 350, -2 }, /* (410) table_primary ::= table_name alias_opt */
- { 350, -4 }, /* (411) table_primary ::= db_name NK_DOT table_name alias_opt */
- { 350, -2 }, /* (412) table_primary ::= subquery alias_opt */
- { 350, -1 }, /* (413) table_primary ::= parenthesized_joined_table */
- { 352, 0 }, /* (414) alias_opt ::= */
- { 352, -1 }, /* (415) alias_opt ::= table_alias */
- { 352, -2 }, /* (416) alias_opt ::= AS table_alias */
- { 353, -3 }, /* (417) parenthesized_joined_table ::= NK_LP joined_table NK_RP */
- { 353, -3 }, /* (418) parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */
- { 351, -6 }, /* (419) joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
- { 354, 0 }, /* (420) join_type ::= */
- { 354, -1 }, /* (421) join_type ::= INNER */
- { 356, -12 }, /* (422) query_specification ::= SELECT set_quantifier_opt select_list from_clause_opt where_clause_opt partition_by_clause_opt range_opt every_opt fill_opt twindow_clause_opt group_by_clause_opt having_clause_opt */
- { 357, 0 }, /* (423) set_quantifier_opt ::= */
- { 357, -1 }, /* (424) set_quantifier_opt ::= DISTINCT */
- { 357, -1 }, /* (425) set_quantifier_opt ::= ALL */
- { 358, -1 }, /* (426) select_list ::= select_item */
- { 358, -3 }, /* (427) select_list ::= select_list NK_COMMA select_item */
- { 366, -1 }, /* (428) select_item ::= NK_STAR */
- { 366, -1 }, /* (429) select_item ::= common_expression */
- { 366, -2 }, /* (430) select_item ::= common_expression column_alias */
- { 366, -3 }, /* (431) select_item ::= common_expression AS column_alias */
- { 366, -3 }, /* (432) select_item ::= table_name NK_DOT NK_STAR */
- { 324, 0 }, /* (433) where_clause_opt ::= */
- { 324, -2 }, /* (434) where_clause_opt ::= WHERE search_condition */
- { 359, 0 }, /* (435) partition_by_clause_opt ::= */
- { 359, -3 }, /* (436) partition_by_clause_opt ::= PARTITION BY expression_list */
- { 363, 0 }, /* (437) twindow_clause_opt ::= */
- { 363, -6 }, /* (438) twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP */
- { 363, -4 }, /* (439) twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP */
- { 363, -6 }, /* (440) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */
- { 363, -8 }, /* (441) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */
- { 310, 0 }, /* (442) sliding_opt ::= */
- { 310, -4 }, /* (443) sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */
- { 362, 0 }, /* (444) fill_opt ::= */
- { 362, -4 }, /* (445) fill_opt ::= FILL NK_LP fill_mode NK_RP */
- { 362, -6 }, /* (446) fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */
- { 367, -1 }, /* (447) fill_mode ::= NONE */
- { 367, -1 }, /* (448) fill_mode ::= PREV */
- { 367, -1 }, /* (449) fill_mode ::= NULL */
- { 367, -1 }, /* (450) fill_mode ::= LINEAR */
- { 367, -1 }, /* (451) fill_mode ::= NEXT */
- { 364, 0 }, /* (452) group_by_clause_opt ::= */
- { 364, -3 }, /* (453) group_by_clause_opt ::= GROUP BY group_by_list */
- { 368, -1 }, /* (454) group_by_list ::= expression */
- { 368, -3 }, /* (455) group_by_list ::= group_by_list NK_COMMA expression */
- { 365, 0 }, /* (456) having_clause_opt ::= */
- { 365, -2 }, /* (457) having_clause_opt ::= HAVING search_condition */
- { 360, 0 }, /* (458) range_opt ::= */
- { 360, -6 }, /* (459) range_opt ::= RANGE NK_LP expression NK_COMMA expression NK_RP */
- { 361, 0 }, /* (460) every_opt ::= */
- { 361, -4 }, /* (461) every_opt ::= EVERY NK_LP duration_literal NK_RP */
- { 315, -4 }, /* (462) query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */
- { 369, -1 }, /* (463) query_expression_body ::= query_primary */
- { 369, -4 }, /* (464) query_expression_body ::= query_expression_body UNION ALL query_expression_body */
- { 369, -3 }, /* (465) query_expression_body ::= query_expression_body UNION query_expression_body */
- { 373, -1 }, /* (466) query_primary ::= query_specification */
- { 373, -6 }, /* (467) query_primary ::= NK_LP query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt NK_RP */
- { 370, 0 }, /* (468) order_by_clause_opt ::= */
- { 370, -3 }, /* (469) order_by_clause_opt ::= ORDER BY sort_specification_list */
- { 371, 0 }, /* (470) slimit_clause_opt ::= */
- { 371, -2 }, /* (471) slimit_clause_opt ::= SLIMIT NK_INTEGER */
- { 371, -4 }, /* (472) slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
- { 371, -4 }, /* (473) slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
- { 372, 0 }, /* (474) limit_clause_opt ::= */
- { 372, -2 }, /* (475) limit_clause_opt ::= LIMIT NK_INTEGER */
- { 372, -4 }, /* (476) limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */
- { 372, -4 }, /* (477) limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */
- { 334, -3 }, /* (478) subquery ::= NK_LP query_expression NK_RP */
- { 355, -1 }, /* (479) search_condition ::= common_expression */
- { 374, -1 }, /* (480) sort_specification_list ::= sort_specification */
- { 374, -3 }, /* (481) sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */
- { 375, -3 }, /* (482) sort_specification ::= expression ordering_specification_opt null_ordering_opt */
- { 376, 0 }, /* (483) ordering_specification_opt ::= */
- { 376, -1 }, /* (484) ordering_specification_opt ::= ASC */
- { 376, -1 }, /* (485) ordering_specification_opt ::= DESC */
- { 377, 0 }, /* (486) null_ordering_opt ::= */
- { 377, -2 }, /* (487) null_ordering_opt ::= NULLS FIRST */
- { 377, -2 }, /* (488) null_ordering_opt ::= NULLS LAST */
+ { 256, -6 }, /* (0) cmd ::= CREATE ACCOUNT NK_ID PASS NK_STRING account_options */
+ { 256, -4 }, /* (1) cmd ::= ALTER ACCOUNT NK_ID alter_account_options */
+ { 257, 0 }, /* (2) account_options ::= */
+ { 257, -3 }, /* (3) account_options ::= account_options PPS literal */
+ { 257, -3 }, /* (4) account_options ::= account_options TSERIES literal */
+ { 257, -3 }, /* (5) account_options ::= account_options STORAGE literal */
+ { 257, -3 }, /* (6) account_options ::= account_options STREAMS literal */
+ { 257, -3 }, /* (7) account_options ::= account_options QTIME literal */
+ { 257, -3 }, /* (8) account_options ::= account_options DBS literal */
+ { 257, -3 }, /* (9) account_options ::= account_options USERS literal */
+ { 257, -3 }, /* (10) account_options ::= account_options CONNS literal */
+ { 257, -3 }, /* (11) account_options ::= account_options STATE literal */
+ { 258, -1 }, /* (12) alter_account_options ::= alter_account_option */
+ { 258, -2 }, /* (13) alter_account_options ::= alter_account_options alter_account_option */
+ { 260, -2 }, /* (14) alter_account_option ::= PASS literal */
+ { 260, -2 }, /* (15) alter_account_option ::= PPS literal */
+ { 260, -2 }, /* (16) alter_account_option ::= TSERIES literal */
+ { 260, -2 }, /* (17) alter_account_option ::= STORAGE literal */
+ { 260, -2 }, /* (18) alter_account_option ::= STREAMS literal */
+ { 260, -2 }, /* (19) alter_account_option ::= QTIME literal */
+ { 260, -2 }, /* (20) alter_account_option ::= DBS literal */
+ { 260, -2 }, /* (21) alter_account_option ::= USERS literal */
+ { 260, -2 }, /* (22) alter_account_option ::= CONNS literal */
+ { 260, -2 }, /* (23) alter_account_option ::= STATE literal */
+ { 256, -6 }, /* (24) cmd ::= CREATE USER user_name PASS NK_STRING sysinfo_opt */
+ { 256, -5 }, /* (25) cmd ::= ALTER USER user_name PASS NK_STRING */
+ { 256, -5 }, /* (26) cmd ::= ALTER USER user_name ENABLE NK_INTEGER */
+ { 256, -5 }, /* (27) cmd ::= ALTER USER user_name SYSINFO NK_INTEGER */
+ { 256, -3 }, /* (28) cmd ::= DROP USER user_name */
+ { 262, 0 }, /* (29) sysinfo_opt ::= */
+ { 262, -2 }, /* (30) sysinfo_opt ::= SYSINFO NK_INTEGER */
+ { 256, -6 }, /* (31) cmd ::= GRANT privileges ON priv_level TO user_name */
+ { 256, -6 }, /* (32) cmd ::= REVOKE privileges ON priv_level FROM user_name */
+ { 263, -1 }, /* (33) privileges ::= ALL */
+ { 263, -1 }, /* (34) privileges ::= priv_type_list */
+ { 265, -1 }, /* (35) priv_type_list ::= priv_type */
+ { 265, -3 }, /* (36) priv_type_list ::= priv_type_list NK_COMMA priv_type */
+ { 266, -1 }, /* (37) priv_type ::= READ */
+ { 266, -1 }, /* (38) priv_type ::= WRITE */
+ { 264, -3 }, /* (39) priv_level ::= NK_STAR NK_DOT NK_STAR */
+ { 264, -3 }, /* (40) priv_level ::= db_name NK_DOT NK_STAR */
+ { 256, -3 }, /* (41) cmd ::= CREATE DNODE dnode_endpoint */
+ { 256, -5 }, /* (42) cmd ::= CREATE DNODE dnode_endpoint PORT NK_INTEGER */
+ { 256, -3 }, /* (43) cmd ::= DROP DNODE NK_INTEGER */
+ { 256, -3 }, /* (44) cmd ::= DROP DNODE dnode_endpoint */
+ { 256, -4 }, /* (45) cmd ::= ALTER DNODE NK_INTEGER NK_STRING */
+ { 256, -5 }, /* (46) cmd ::= ALTER DNODE NK_INTEGER NK_STRING NK_STRING */
+ { 256, -4 }, /* (47) cmd ::= ALTER ALL DNODES NK_STRING */
+ { 256, -5 }, /* (48) cmd ::= ALTER ALL DNODES NK_STRING NK_STRING */
+ { 268, -1 }, /* (49) dnode_endpoint ::= NK_STRING */
+ { 268, -1 }, /* (50) dnode_endpoint ::= NK_ID */
+ { 268, -1 }, /* (51) dnode_endpoint ::= NK_IPTOKEN */
+ { 256, -3 }, /* (52) cmd ::= ALTER LOCAL NK_STRING */
+ { 256, -4 }, /* (53) cmd ::= ALTER LOCAL NK_STRING NK_STRING */
+ { 256, -5 }, /* (54) cmd ::= CREATE QNODE ON DNODE NK_INTEGER */
+ { 256, -5 }, /* (55) cmd ::= DROP QNODE ON DNODE NK_INTEGER */
+ { 256, -5 }, /* (56) cmd ::= CREATE BNODE ON DNODE NK_INTEGER */
+ { 256, -5 }, /* (57) cmd ::= DROP BNODE ON DNODE NK_INTEGER */
+ { 256, -5 }, /* (58) cmd ::= CREATE SNODE ON DNODE NK_INTEGER */
+ { 256, -5 }, /* (59) cmd ::= DROP SNODE ON DNODE NK_INTEGER */
+ { 256, -5 }, /* (60) cmd ::= CREATE MNODE ON DNODE NK_INTEGER */
+ { 256, -5 }, /* (61) cmd ::= DROP MNODE ON DNODE NK_INTEGER */
+ { 256, -5 }, /* (62) cmd ::= CREATE DATABASE not_exists_opt db_name db_options */
+ { 256, -4 }, /* (63) cmd ::= DROP DATABASE exists_opt db_name */
+ { 256, -2 }, /* (64) cmd ::= USE db_name */
+ { 256, -4 }, /* (65) cmd ::= ALTER DATABASE db_name alter_db_options */
+ { 256, -3 }, /* (66) cmd ::= FLUSH DATABASE db_name */
+ { 256, -3 }, /* (67) cmd ::= TRIM DATABASE db_name */
+ { 269, -3 }, /* (68) not_exists_opt ::= IF NOT EXISTS */
+ { 269, 0 }, /* (69) not_exists_opt ::= */
+ { 271, -2 }, /* (70) exists_opt ::= IF EXISTS */
+ { 271, 0 }, /* (71) exists_opt ::= */
+ { 270, 0 }, /* (72) db_options ::= */
+ { 270, -3 }, /* (73) db_options ::= db_options BUFFER NK_INTEGER */
+ { 270, -3 }, /* (74) db_options ::= db_options CACHELAST NK_INTEGER */
+ { 270, -3 }, /* (75) db_options ::= db_options CACHELASTSIZE NK_INTEGER */
+ { 270, -3 }, /* (76) db_options ::= db_options COMP NK_INTEGER */
+ { 270, -3 }, /* (77) db_options ::= db_options DURATION NK_INTEGER */
+ { 270, -3 }, /* (78) db_options ::= db_options DURATION NK_VARIABLE */
+ { 270, -3 }, /* (79) db_options ::= db_options FSYNC NK_INTEGER */
+ { 270, -3 }, /* (80) db_options ::= db_options MAXROWS NK_INTEGER */
+ { 270, -3 }, /* (81) db_options ::= db_options MINROWS NK_INTEGER */
+ { 270, -3 }, /* (82) db_options ::= db_options KEEP integer_list */
+ { 270, -3 }, /* (83) db_options ::= db_options KEEP variable_list */
+ { 270, -3 }, /* (84) db_options ::= db_options PAGES NK_INTEGER */
+ { 270, -3 }, /* (85) db_options ::= db_options PAGESIZE NK_INTEGER */
+ { 270, -3 }, /* (86) db_options ::= db_options PRECISION NK_STRING */
+ { 270, -3 }, /* (87) db_options ::= db_options REPLICA NK_INTEGER */
+ { 270, -3 }, /* (88) db_options ::= db_options STRICT NK_INTEGER */
+ { 270, -3 }, /* (89) db_options ::= db_options WAL NK_INTEGER */
+ { 270, -3 }, /* (90) db_options ::= db_options VGROUPS NK_INTEGER */
+ { 270, -3 }, /* (91) db_options ::= db_options SINGLE_STABLE NK_INTEGER */
+ { 270, -3 }, /* (92) db_options ::= db_options RETENTIONS retention_list */
+ { 270, -3 }, /* (93) db_options ::= db_options SCHEMALESS NK_INTEGER */
+ { 272, -1 }, /* (94) alter_db_options ::= alter_db_option */
+ { 272, -2 }, /* (95) alter_db_options ::= alter_db_options alter_db_option */
+ { 276, -2 }, /* (96) alter_db_option ::= BUFFER NK_INTEGER */
+ { 276, -2 }, /* (97) alter_db_option ::= CACHELAST NK_INTEGER */
+ { 276, -2 }, /* (98) alter_db_option ::= CACHELASTSIZE NK_INTEGER */
+ { 276, -2 }, /* (99) alter_db_option ::= FSYNC NK_INTEGER */
+ { 276, -2 }, /* (100) alter_db_option ::= KEEP integer_list */
+ { 276, -2 }, /* (101) alter_db_option ::= KEEP variable_list */
+ { 276, -2 }, /* (102) alter_db_option ::= PAGES NK_INTEGER */
+ { 276, -2 }, /* (103) alter_db_option ::= REPLICA NK_INTEGER */
+ { 276, -2 }, /* (104) alter_db_option ::= STRICT NK_INTEGER */
+ { 276, -2 }, /* (105) alter_db_option ::= WAL NK_INTEGER */
+ { 273, -1 }, /* (106) integer_list ::= NK_INTEGER */
+ { 273, -3 }, /* (107) integer_list ::= integer_list NK_COMMA NK_INTEGER */
+ { 274, -1 }, /* (108) variable_list ::= NK_VARIABLE */
+ { 274, -3 }, /* (109) variable_list ::= variable_list NK_COMMA NK_VARIABLE */
+ { 275, -1 }, /* (110) retention_list ::= retention */
+ { 275, -3 }, /* (111) retention_list ::= retention_list NK_COMMA retention */
+ { 277, -3 }, /* (112) retention ::= NK_VARIABLE NK_COLON NK_VARIABLE */
+ { 256, -9 }, /* (113) cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options */
+ { 256, -3 }, /* (114) cmd ::= CREATE TABLE multi_create_clause */
+ { 256, -9 }, /* (115) cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options */
+ { 256, -3 }, /* (116) cmd ::= DROP TABLE multi_drop_clause */
+ { 256, -4 }, /* (117) cmd ::= DROP STABLE exists_opt full_table_name */
+ { 256, -3 }, /* (118) cmd ::= ALTER TABLE alter_table_clause */
+ { 256, -3 }, /* (119) cmd ::= ALTER STABLE alter_table_clause */
+ { 285, -2 }, /* (120) alter_table_clause ::= full_table_name alter_table_options */
+ { 285, -5 }, /* (121) alter_table_clause ::= full_table_name ADD COLUMN column_name type_name */
+ { 285, -4 }, /* (122) alter_table_clause ::= full_table_name DROP COLUMN column_name */
+ { 285, -5 }, /* (123) alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name */
+ { 285, -5 }, /* (124) alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name */
+ { 285, -5 }, /* (125) alter_table_clause ::= full_table_name ADD TAG column_name type_name */
+ { 285, -4 }, /* (126) alter_table_clause ::= full_table_name DROP TAG column_name */
+ { 285, -5 }, /* (127) alter_table_clause ::= full_table_name MODIFY TAG column_name type_name */
+ { 285, -5 }, /* (128) alter_table_clause ::= full_table_name RENAME TAG column_name column_name */
+ { 285, -6 }, /* (129) alter_table_clause ::= full_table_name SET TAG column_name NK_EQ signed_literal */
+ { 282, -1 }, /* (130) multi_create_clause ::= create_subtable_clause */
+ { 282, -2 }, /* (131) multi_create_clause ::= multi_create_clause create_subtable_clause */
+ { 290, -10 }, /* (132) create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_cols_opt TAGS NK_LP expression_list NK_RP table_options */
+ { 284, -1 }, /* (133) multi_drop_clause ::= drop_table_clause */
+ { 284, -2 }, /* (134) multi_drop_clause ::= multi_drop_clause drop_table_clause */
+ { 293, -2 }, /* (135) drop_table_clause ::= exists_opt full_table_name */
+ { 291, 0 }, /* (136) specific_cols_opt ::= */
+ { 291, -3 }, /* (137) specific_cols_opt ::= NK_LP col_name_list NK_RP */
+ { 278, -1 }, /* (138) full_table_name ::= table_name */
+ { 278, -3 }, /* (139) full_table_name ::= db_name NK_DOT table_name */
+ { 279, -1 }, /* (140) column_def_list ::= column_def */
+ { 279, -3 }, /* (141) column_def_list ::= column_def_list NK_COMMA column_def */
+ { 296, -2 }, /* (142) column_def ::= column_name type_name */
+ { 296, -4 }, /* (143) column_def ::= column_name type_name COMMENT NK_STRING */
+ { 288, -1 }, /* (144) type_name ::= BOOL */
+ { 288, -1 }, /* (145) type_name ::= TINYINT */
+ { 288, -1 }, /* (146) type_name ::= SMALLINT */
+ { 288, -1 }, /* (147) type_name ::= INT */
+ { 288, -1 }, /* (148) type_name ::= INTEGER */
+ { 288, -1 }, /* (149) type_name ::= BIGINT */
+ { 288, -1 }, /* (150) type_name ::= FLOAT */
+ { 288, -1 }, /* (151) type_name ::= DOUBLE */
+ { 288, -4 }, /* (152) type_name ::= BINARY NK_LP NK_INTEGER NK_RP */
+ { 288, -1 }, /* (153) type_name ::= TIMESTAMP */
+ { 288, -4 }, /* (154) type_name ::= NCHAR NK_LP NK_INTEGER NK_RP */
+ { 288, -2 }, /* (155) type_name ::= TINYINT UNSIGNED */
+ { 288, -2 }, /* (156) type_name ::= SMALLINT UNSIGNED */
+ { 288, -2 }, /* (157) type_name ::= INT UNSIGNED */
+ { 288, -2 }, /* (158) type_name ::= BIGINT UNSIGNED */
+ { 288, -1 }, /* (159) type_name ::= JSON */
+ { 288, -4 }, /* (160) type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP */
+ { 288, -1 }, /* (161) type_name ::= MEDIUMBLOB */
+ { 288, -1 }, /* (162) type_name ::= BLOB */
+ { 288, -4 }, /* (163) type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP */
+ { 288, -1 }, /* (164) type_name ::= DECIMAL */
+ { 288, -4 }, /* (165) type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP */
+ { 288, -6 }, /* (166) type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */
+ { 280, 0 }, /* (167) tags_def_opt ::= */
+ { 280, -1 }, /* (168) tags_def_opt ::= tags_def */
+ { 283, -4 }, /* (169) tags_def ::= TAGS NK_LP column_def_list NK_RP */
+ { 281, 0 }, /* (170) table_options ::= */
+ { 281, -3 }, /* (171) table_options ::= table_options COMMENT NK_STRING */
+ { 281, -3 }, /* (172) table_options ::= table_options MAX_DELAY duration_list */
+ { 281, -3 }, /* (173) table_options ::= table_options WATERMARK duration_list */
+ { 281, -5 }, /* (174) table_options ::= table_options ROLLUP NK_LP rollup_func_list NK_RP */
+ { 281, -3 }, /* (175) table_options ::= table_options TTL NK_INTEGER */
+ { 281, -5 }, /* (176) table_options ::= table_options SMA NK_LP col_name_list NK_RP */
+ { 286, -1 }, /* (177) alter_table_options ::= alter_table_option */
+ { 286, -2 }, /* (178) alter_table_options ::= alter_table_options alter_table_option */
+ { 299, -2 }, /* (179) alter_table_option ::= COMMENT NK_STRING */
+ { 299, -2 }, /* (180) alter_table_option ::= TTL NK_INTEGER */
+ { 297, -1 }, /* (181) duration_list ::= duration_literal */
+ { 297, -3 }, /* (182) duration_list ::= duration_list NK_COMMA duration_literal */
+ { 298, -1 }, /* (183) rollup_func_list ::= rollup_func_name */
+ { 298, -3 }, /* (184) rollup_func_list ::= rollup_func_list NK_COMMA rollup_func_name */
+ { 301, -1 }, /* (185) rollup_func_name ::= function_name */
+ { 301, -1 }, /* (186) rollup_func_name ::= FIRST */
+ { 301, -1 }, /* (187) rollup_func_name ::= LAST */
+ { 294, -1 }, /* (188) col_name_list ::= col_name */
+ { 294, -3 }, /* (189) col_name_list ::= col_name_list NK_COMMA col_name */
+ { 303, -1 }, /* (190) col_name ::= column_name */
+ { 256, -2 }, /* (191) cmd ::= SHOW DNODES */
+ { 256, -2 }, /* (192) cmd ::= SHOW USERS */
+ { 256, -2 }, /* (193) cmd ::= SHOW DATABASES */
+ { 256, -4 }, /* (194) cmd ::= SHOW db_name_cond_opt TABLES like_pattern_opt */
+ { 256, -4 }, /* (195) cmd ::= SHOW db_name_cond_opt STABLES like_pattern_opt */
+ { 256, -3 }, /* (196) cmd ::= SHOW db_name_cond_opt VGROUPS */
+ { 256, -2 }, /* (197) cmd ::= SHOW MNODES */
+ { 256, -2 }, /* (198) cmd ::= SHOW MODULES */
+ { 256, -2 }, /* (199) cmd ::= SHOW QNODES */
+ { 256, -2 }, /* (200) cmd ::= SHOW FUNCTIONS */
+ { 256, -5 }, /* (201) cmd ::= SHOW INDEXES FROM table_name_cond from_db_opt */
+ { 256, -2 }, /* (202) cmd ::= SHOW STREAMS */
+ { 256, -2 }, /* (203) cmd ::= SHOW ACCOUNTS */
+ { 256, -2 }, /* (204) cmd ::= SHOW APPS */
+ { 256, -2 }, /* (205) cmd ::= SHOW CONNECTIONS */
+ { 256, -2 }, /* (206) cmd ::= SHOW LICENCE */
+ { 256, -2 }, /* (207) cmd ::= SHOW GRANTS */
+ { 256, -4 }, /* (208) cmd ::= SHOW CREATE DATABASE db_name */
+ { 256, -4 }, /* (209) cmd ::= SHOW CREATE TABLE full_table_name */
+ { 256, -4 }, /* (210) cmd ::= SHOW CREATE STABLE full_table_name */
+ { 256, -2 }, /* (211) cmd ::= SHOW QUERIES */
+ { 256, -2 }, /* (212) cmd ::= SHOW SCORES */
+ { 256, -2 }, /* (213) cmd ::= SHOW TOPICS */
+ { 256, -2 }, /* (214) cmd ::= SHOW VARIABLES */
+ { 256, -3 }, /* (215) cmd ::= SHOW LOCAL VARIABLES */
+ { 256, -4 }, /* (216) cmd ::= SHOW DNODE NK_INTEGER VARIABLES */
+ { 256, -2 }, /* (217) cmd ::= SHOW BNODES */
+ { 256, -2 }, /* (218) cmd ::= SHOW SNODES */
+ { 256, -2 }, /* (219) cmd ::= SHOW CLUSTER */
+ { 256, -2 }, /* (220) cmd ::= SHOW TRANSACTIONS */
+ { 256, -4 }, /* (221) cmd ::= SHOW TABLE DISTRIBUTED full_table_name */
+ { 256, -2 }, /* (222) cmd ::= SHOW CONSUMERS */
+ { 256, -2 }, /* (223) cmd ::= SHOW SUBSCRIPTIONS */
+ { 304, 0 }, /* (224) db_name_cond_opt ::= */
+ { 304, -2 }, /* (225) db_name_cond_opt ::= db_name NK_DOT */
+ { 305, 0 }, /* (226) like_pattern_opt ::= */
+ { 305, -2 }, /* (227) like_pattern_opt ::= LIKE NK_STRING */
+ { 306, -1 }, /* (228) table_name_cond ::= table_name */
+ { 307, 0 }, /* (229) from_db_opt ::= */
+ { 307, -2 }, /* (230) from_db_opt ::= FROM db_name */
+ { 256, -8 }, /* (231) cmd ::= CREATE SMA INDEX not_exists_opt index_name ON table_name index_options */
+ { 256, -4 }, /* (232) cmd ::= DROP INDEX exists_opt index_name */
+ { 309, -10 }, /* (233) index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt sma_stream_opt */
+ { 309, -12 }, /* (234) index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt sma_stream_opt */
+ { 310, -1 }, /* (235) func_list ::= func */
+ { 310, -3 }, /* (236) func_list ::= func_list NK_COMMA func */
+ { 313, -4 }, /* (237) func ::= function_name NK_LP expression_list NK_RP */
+ { 312, 0 }, /* (238) sma_stream_opt ::= */
+ { 312, -3 }, /* (239) sma_stream_opt ::= stream_options WATERMARK duration_literal */
+ { 312, -3 }, /* (240) sma_stream_opt ::= stream_options MAX_DELAY duration_literal */
+ { 256, -6 }, /* (241) cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression */
+ { 256, -7 }, /* (242) cmd ::= CREATE TOPIC not_exists_opt topic_name AS DATABASE db_name */
+ { 256, -9 }, /* (243) cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS DATABASE db_name */
+ { 256, -7 }, /* (244) cmd ::= CREATE TOPIC not_exists_opt topic_name AS STABLE full_table_name */
+ { 256, -9 }, /* (245) cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS STABLE full_table_name */
+ { 256, -4 }, /* (246) cmd ::= DROP TOPIC exists_opt topic_name */
+ { 256, -7 }, /* (247) cmd ::= DROP CONSUMER GROUP exists_opt cgroup_name ON topic_name */
+ { 256, -2 }, /* (248) cmd ::= DESC full_table_name */
+ { 256, -2 }, /* (249) cmd ::= DESCRIBE full_table_name */
+ { 256, -3 }, /* (250) cmd ::= RESET QUERY CACHE */
+ { 256, -4 }, /* (251) cmd ::= EXPLAIN analyze_opt explain_options query_expression */
+ { 318, 0 }, /* (252) analyze_opt ::= */
+ { 318, -1 }, /* (253) analyze_opt ::= ANALYZE */
+ { 319, 0 }, /* (254) explain_options ::= */
+ { 319, -3 }, /* (255) explain_options ::= explain_options VERBOSE NK_BOOL */
+ { 319, -3 }, /* (256) explain_options ::= explain_options RATIO NK_FLOAT */
+ { 256, -6 }, /* (257) cmd ::= COMPACT VNODES IN NK_LP integer_list NK_RP */
+ { 256, -10 }, /* (258) cmd ::= CREATE agg_func_opt FUNCTION not_exists_opt function_name AS NK_STRING OUTPUTTYPE type_name bufsize_opt */
+ { 256, -4 }, /* (259) cmd ::= DROP FUNCTION exists_opt function_name */
+ { 320, 0 }, /* (260) agg_func_opt ::= */
+ { 320, -1 }, /* (261) agg_func_opt ::= AGGREGATE */
+ { 321, 0 }, /* (262) bufsize_opt ::= */
+ { 321, -2 }, /* (263) bufsize_opt ::= BUFSIZE NK_INTEGER */
+ { 256, -8 }, /* (264) cmd ::= CREATE STREAM not_exists_opt stream_name stream_options into_opt AS query_expression */
+ { 256, -4 }, /* (265) cmd ::= DROP STREAM exists_opt stream_name */
+ { 323, 0 }, /* (266) into_opt ::= */
+ { 323, -2 }, /* (267) into_opt ::= INTO full_table_name */
+ { 314, 0 }, /* (268) stream_options ::= */
+ { 314, -3 }, /* (269) stream_options ::= stream_options TRIGGER AT_ONCE */
+ { 314, -3 }, /* (270) stream_options ::= stream_options TRIGGER WINDOW_CLOSE */
+ { 314, -4 }, /* (271) stream_options ::= stream_options TRIGGER MAX_DELAY duration_literal */
+ { 314, -3 }, /* (272) stream_options ::= stream_options WATERMARK duration_literal */
+ { 314, -3 }, /* (273) stream_options ::= stream_options IGNORE EXPIRED */
+ { 256, -3 }, /* (274) cmd ::= KILL CONNECTION NK_INTEGER */
+ { 256, -3 }, /* (275) cmd ::= KILL QUERY NK_STRING */
+ { 256, -3 }, /* (276) cmd ::= KILL TRANSACTION NK_INTEGER */
+ { 256, -2 }, /* (277) cmd ::= BALANCE VGROUP */
+ { 256, -4 }, /* (278) cmd ::= MERGE VGROUP NK_INTEGER NK_INTEGER */
+ { 256, -4 }, /* (279) cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list */
+ { 256, -3 }, /* (280) cmd ::= SPLIT VGROUP NK_INTEGER */
+ { 324, -2 }, /* (281) dnode_list ::= DNODE NK_INTEGER */
+ { 324, -3 }, /* (282) dnode_list ::= dnode_list DNODE NK_INTEGER */
+ { 256, -3 }, /* (283) cmd ::= SYNCDB db_name REPLICA */
+ { 256, -4 }, /* (284) cmd ::= DELETE FROM full_table_name where_clause_opt */
+ { 256, -1 }, /* (285) cmd ::= query_expression */
+ { 256, -7 }, /* (286) cmd ::= INSERT INTO full_table_name NK_LP col_name_list NK_RP query_expression */
+ { 256, -4 }, /* (287) cmd ::= INSERT INTO full_table_name query_expression */
+ { 259, -1 }, /* (288) literal ::= NK_INTEGER */
+ { 259, -1 }, /* (289) literal ::= NK_FLOAT */
+ { 259, -1 }, /* (290) literal ::= NK_STRING */
+ { 259, -1 }, /* (291) literal ::= NK_BOOL */
+ { 259, -2 }, /* (292) literal ::= TIMESTAMP NK_STRING */
+ { 259, -1 }, /* (293) literal ::= duration_literal */
+ { 259, -1 }, /* (294) literal ::= NULL */
+ { 259, -1 }, /* (295) literal ::= NK_QUESTION */
+ { 300, -1 }, /* (296) duration_literal ::= NK_VARIABLE */
+ { 326, -1 }, /* (297) signed ::= NK_INTEGER */
+ { 326, -2 }, /* (298) signed ::= NK_PLUS NK_INTEGER */
+ { 326, -2 }, /* (299) signed ::= NK_MINUS NK_INTEGER */
+ { 326, -1 }, /* (300) signed ::= NK_FLOAT */
+ { 326, -2 }, /* (301) signed ::= NK_PLUS NK_FLOAT */
+ { 326, -2 }, /* (302) signed ::= NK_MINUS NK_FLOAT */
+ { 289, -1 }, /* (303) signed_literal ::= signed */
+ { 289, -1 }, /* (304) signed_literal ::= NK_STRING */
+ { 289, -1 }, /* (305) signed_literal ::= NK_BOOL */
+ { 289, -2 }, /* (306) signed_literal ::= TIMESTAMP NK_STRING */
+ { 289, -1 }, /* (307) signed_literal ::= duration_literal */
+ { 289, -1 }, /* (308) signed_literal ::= NULL */
+ { 289, -1 }, /* (309) signed_literal ::= literal_func */
+ { 289, -1 }, /* (310) signed_literal ::= NK_QUESTION */
+ { 328, -1 }, /* (311) literal_list ::= signed_literal */
+ { 328, -3 }, /* (312) literal_list ::= literal_list NK_COMMA signed_literal */
+ { 267, -1 }, /* (313) db_name ::= NK_ID */
+ { 295, -1 }, /* (314) table_name ::= NK_ID */
+ { 287, -1 }, /* (315) column_name ::= NK_ID */
+ { 302, -1 }, /* (316) function_name ::= NK_ID */
+ { 329, -1 }, /* (317) table_alias ::= NK_ID */
+ { 330, -1 }, /* (318) column_alias ::= NK_ID */
+ { 261, -1 }, /* (319) user_name ::= NK_ID */
+ { 308, -1 }, /* (320) index_name ::= NK_ID */
+ { 315, -1 }, /* (321) topic_name ::= NK_ID */
+ { 322, -1 }, /* (322) stream_name ::= NK_ID */
+ { 317, -1 }, /* (323) cgroup_name ::= NK_ID */
+ { 331, -1 }, /* (324) expression ::= literal */
+ { 331, -1 }, /* (325) expression ::= pseudo_column */
+ { 331, -1 }, /* (326) expression ::= column_reference */
+ { 331, -1 }, /* (327) expression ::= function_expression */
+ { 331, -1 }, /* (328) expression ::= subquery */
+ { 331, -3 }, /* (329) expression ::= NK_LP expression NK_RP */
+ { 331, -2 }, /* (330) expression ::= NK_PLUS expression */
+ { 331, -2 }, /* (331) expression ::= NK_MINUS expression */
+ { 331, -3 }, /* (332) expression ::= expression NK_PLUS expression */
+ { 331, -3 }, /* (333) expression ::= expression NK_MINUS expression */
+ { 331, -3 }, /* (334) expression ::= expression NK_STAR expression */
+ { 331, -3 }, /* (335) expression ::= expression NK_SLASH expression */
+ { 331, -3 }, /* (336) expression ::= expression NK_REM expression */
+ { 331, -3 }, /* (337) expression ::= column_reference NK_ARROW NK_STRING */
+ { 331, -3 }, /* (338) expression ::= expression NK_BITAND expression */
+ { 331, -3 }, /* (339) expression ::= expression NK_BITOR expression */
+ { 292, -1 }, /* (340) expression_list ::= expression */
+ { 292, -3 }, /* (341) expression_list ::= expression_list NK_COMMA expression */
+ { 333, -1 }, /* (342) column_reference ::= column_name */
+ { 333, -3 }, /* (343) column_reference ::= table_name NK_DOT column_name */
+ { 332, -1 }, /* (344) pseudo_column ::= ROWTS */
+ { 332, -1 }, /* (345) pseudo_column ::= TBNAME */
+ { 332, -3 }, /* (346) pseudo_column ::= table_name NK_DOT TBNAME */
+ { 332, -1 }, /* (347) pseudo_column ::= QSTART */
+ { 332, -1 }, /* (348) pseudo_column ::= QEND */
+ { 332, -1 }, /* (349) pseudo_column ::= QDURATION */
+ { 332, -1 }, /* (350) pseudo_column ::= WSTART */
+ { 332, -1 }, /* (351) pseudo_column ::= WEND */
+ { 332, -1 }, /* (352) pseudo_column ::= WDURATION */
+ { 334, -4 }, /* (353) function_expression ::= function_name NK_LP expression_list NK_RP */
+ { 334, -4 }, /* (354) function_expression ::= star_func NK_LP star_func_para_list NK_RP */
+ { 334, -6 }, /* (355) function_expression ::= CAST NK_LP expression AS type_name NK_RP */
+ { 334, -1 }, /* (356) function_expression ::= literal_func */
+ { 327, -3 }, /* (357) literal_func ::= noarg_func NK_LP NK_RP */
+ { 327, -1 }, /* (358) literal_func ::= NOW */
+ { 338, -1 }, /* (359) noarg_func ::= NOW */
+ { 338, -1 }, /* (360) noarg_func ::= TODAY */
+ { 338, -1 }, /* (361) noarg_func ::= TIMEZONE */
+ { 338, -1 }, /* (362) noarg_func ::= DATABASE */
+ { 338, -1 }, /* (363) noarg_func ::= CLIENT_VERSION */
+ { 338, -1 }, /* (364) noarg_func ::= SERVER_VERSION */
+ { 338, -1 }, /* (365) noarg_func ::= SERVER_STATUS */
+ { 338, -1 }, /* (366) noarg_func ::= CURRENT_USER */
+ { 338, -1 }, /* (367) noarg_func ::= USER */
+ { 336, -1 }, /* (368) star_func ::= COUNT */
+ { 336, -1 }, /* (369) star_func ::= FIRST */
+ { 336, -1 }, /* (370) star_func ::= LAST */
+ { 336, -1 }, /* (371) star_func ::= LAST_ROW */
+ { 337, -1 }, /* (372) star_func_para_list ::= NK_STAR */
+ { 337, -1 }, /* (373) star_func_para_list ::= other_para_list */
+ { 339, -1 }, /* (374) other_para_list ::= star_func_para */
+ { 339, -3 }, /* (375) other_para_list ::= other_para_list NK_COMMA star_func_para */
+ { 340, -1 }, /* (376) star_func_para ::= expression */
+ { 340, -3 }, /* (377) star_func_para ::= table_name NK_DOT NK_STAR */
+ { 341, -3 }, /* (378) predicate ::= expression compare_op expression */
+ { 341, -5 }, /* (379) predicate ::= expression BETWEEN expression AND expression */
+ { 341, -6 }, /* (380) predicate ::= expression NOT BETWEEN expression AND expression */
+ { 341, -3 }, /* (381) predicate ::= expression IS NULL */
+ { 341, -4 }, /* (382) predicate ::= expression IS NOT NULL */
+ { 341, -3 }, /* (383) predicate ::= expression in_op in_predicate_value */
+ { 342, -1 }, /* (384) compare_op ::= NK_LT */
+ { 342, -1 }, /* (385) compare_op ::= NK_GT */
+ { 342, -1 }, /* (386) compare_op ::= NK_LE */
+ { 342, -1 }, /* (387) compare_op ::= NK_GE */
+ { 342, -1 }, /* (388) compare_op ::= NK_NE */
+ { 342, -1 }, /* (389) compare_op ::= NK_EQ */
+ { 342, -1 }, /* (390) compare_op ::= LIKE */
+ { 342, -2 }, /* (391) compare_op ::= NOT LIKE */
+ { 342, -1 }, /* (392) compare_op ::= MATCH */
+ { 342, -1 }, /* (393) compare_op ::= NMATCH */
+ { 342, -1 }, /* (394) compare_op ::= CONTAINS */
+ { 343, -1 }, /* (395) in_op ::= IN */
+ { 343, -2 }, /* (396) in_op ::= NOT IN */
+ { 344, -3 }, /* (397) in_predicate_value ::= NK_LP literal_list NK_RP */
+ { 345, -1 }, /* (398) boolean_value_expression ::= boolean_primary */
+ { 345, -2 }, /* (399) boolean_value_expression ::= NOT boolean_primary */
+ { 345, -3 }, /* (400) boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
+ { 345, -3 }, /* (401) boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
+ { 346, -1 }, /* (402) boolean_primary ::= predicate */
+ { 346, -3 }, /* (403) boolean_primary ::= NK_LP boolean_value_expression NK_RP */
+ { 347, -1 }, /* (404) common_expression ::= expression */
+ { 347, -1 }, /* (405) common_expression ::= boolean_value_expression */
+ { 348, 0 }, /* (406) from_clause_opt ::= */
+ { 348, -2 }, /* (407) from_clause_opt ::= FROM table_reference_list */
+ { 349, -1 }, /* (408) table_reference_list ::= table_reference */
+ { 349, -3 }, /* (409) table_reference_list ::= table_reference_list NK_COMMA table_reference */
+ { 350, -1 }, /* (410) table_reference ::= table_primary */
+ { 350, -1 }, /* (411) table_reference ::= joined_table */
+ { 351, -2 }, /* (412) table_primary ::= table_name alias_opt */
+ { 351, -4 }, /* (413) table_primary ::= db_name NK_DOT table_name alias_opt */
+ { 351, -2 }, /* (414) table_primary ::= subquery alias_opt */
+ { 351, -1 }, /* (415) table_primary ::= parenthesized_joined_table */
+ { 353, 0 }, /* (416) alias_opt ::= */
+ { 353, -1 }, /* (417) alias_opt ::= table_alias */
+ { 353, -2 }, /* (418) alias_opt ::= AS table_alias */
+ { 354, -3 }, /* (419) parenthesized_joined_table ::= NK_LP joined_table NK_RP */
+ { 354, -3 }, /* (420) parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */
+ { 352, -6 }, /* (421) joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
+ { 355, 0 }, /* (422) join_type ::= */
+ { 355, -1 }, /* (423) join_type ::= INNER */
+ { 357, -12 }, /* (424) query_specification ::= SELECT set_quantifier_opt select_list from_clause_opt where_clause_opt partition_by_clause_opt range_opt every_opt fill_opt twindow_clause_opt group_by_clause_opt having_clause_opt */
+ { 358, 0 }, /* (425) set_quantifier_opt ::= */
+ { 358, -1 }, /* (426) set_quantifier_opt ::= DISTINCT */
+ { 358, -1 }, /* (427) set_quantifier_opt ::= ALL */
+ { 359, -1 }, /* (428) select_list ::= select_item */
+ { 359, -3 }, /* (429) select_list ::= select_list NK_COMMA select_item */
+ { 367, -1 }, /* (430) select_item ::= NK_STAR */
+ { 367, -1 }, /* (431) select_item ::= common_expression */
+ { 367, -2 }, /* (432) select_item ::= common_expression column_alias */
+ { 367, -3 }, /* (433) select_item ::= common_expression AS column_alias */
+ { 367, -3 }, /* (434) select_item ::= table_name NK_DOT NK_STAR */
+ { 325, 0 }, /* (435) where_clause_opt ::= */
+ { 325, -2 }, /* (436) where_clause_opt ::= WHERE search_condition */
+ { 360, 0 }, /* (437) partition_by_clause_opt ::= */
+ { 360, -3 }, /* (438) partition_by_clause_opt ::= PARTITION BY expression_list */
+ { 364, 0 }, /* (439) twindow_clause_opt ::= */
+ { 364, -6 }, /* (440) twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP */
+ { 364, -4 }, /* (441) twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP */
+ { 364, -6 }, /* (442) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */
+ { 364, -8 }, /* (443) twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */
+ { 311, 0 }, /* (444) sliding_opt ::= */
+ { 311, -4 }, /* (445) sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */
+ { 363, 0 }, /* (446) fill_opt ::= */
+ { 363, -4 }, /* (447) fill_opt ::= FILL NK_LP fill_mode NK_RP */
+ { 363, -6 }, /* (448) fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */
+ { 368, -1 }, /* (449) fill_mode ::= NONE */
+ { 368, -1 }, /* (450) fill_mode ::= PREV */
+ { 368, -1 }, /* (451) fill_mode ::= NULL */
+ { 368, -1 }, /* (452) fill_mode ::= LINEAR */
+ { 368, -1 }, /* (453) fill_mode ::= NEXT */
+ { 365, 0 }, /* (454) group_by_clause_opt ::= */
+ { 365, -3 }, /* (455) group_by_clause_opt ::= GROUP BY group_by_list */
+ { 369, -1 }, /* (456) group_by_list ::= expression */
+ { 369, -3 }, /* (457) group_by_list ::= group_by_list NK_COMMA expression */
+ { 366, 0 }, /* (458) having_clause_opt ::= */
+ { 366, -2 }, /* (459) having_clause_opt ::= HAVING search_condition */
+ { 361, 0 }, /* (460) range_opt ::= */
+ { 361, -6 }, /* (461) range_opt ::= RANGE NK_LP expression NK_COMMA expression NK_RP */
+ { 362, 0 }, /* (462) every_opt ::= */
+ { 362, -4 }, /* (463) every_opt ::= EVERY NK_LP duration_literal NK_RP */
+ { 316, -4 }, /* (464) query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */
+ { 370, -1 }, /* (465) query_expression_body ::= query_primary */
+ { 370, -4 }, /* (466) query_expression_body ::= query_expression_body UNION ALL query_expression_body */
+ { 370, -3 }, /* (467) query_expression_body ::= query_expression_body UNION query_expression_body */
+ { 374, -1 }, /* (468) query_primary ::= query_specification */
+ { 374, -6 }, /* (469) query_primary ::= NK_LP query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt NK_RP */
+ { 371, 0 }, /* (470) order_by_clause_opt ::= */
+ { 371, -3 }, /* (471) order_by_clause_opt ::= ORDER BY sort_specification_list */
+ { 372, 0 }, /* (472) slimit_clause_opt ::= */
+ { 372, -2 }, /* (473) slimit_clause_opt ::= SLIMIT NK_INTEGER */
+ { 372, -4 }, /* (474) slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
+ { 372, -4 }, /* (475) slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
+ { 373, 0 }, /* (476) limit_clause_opt ::= */
+ { 373, -2 }, /* (477) limit_clause_opt ::= LIMIT NK_INTEGER */
+ { 373, -4 }, /* (478) limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */
+ { 373, -4 }, /* (479) limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */
+ { 335, -3 }, /* (480) subquery ::= NK_LP query_expression NK_RP */
+ { 356, -1 }, /* (481) search_condition ::= common_expression */
+ { 375, -1 }, /* (482) sort_specification_list ::= sort_specification */
+ { 375, -3 }, /* (483) sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */
+ { 376, -3 }, /* (484) sort_specification ::= expression ordering_specification_opt null_ordering_opt */
+ { 377, 0 }, /* (485) ordering_specification_opt ::= */
+ { 377, -1 }, /* (486) ordering_specification_opt ::= ASC */
+ { 377, -1 }, /* (487) ordering_specification_opt ::= DESC */
+ { 378, 0 }, /* (488) null_ordering_opt ::= */
+ { 378, -2 }, /* (489) null_ordering_opt ::= NULLS FIRST */
+ { 378, -2 }, /* (490) null_ordering_opt ::= NULLS LAST */
};
static void yy_accept(yyParser*); /* Forward Declaration */
@@ -3269,11 +3321,11 @@ static YYACTIONTYPE yy_reduce(
YYMINORTYPE yylhsminor;
case 0: /* cmd ::= CREATE ACCOUNT NK_ID PASS NK_STRING account_options */
{ pCxt->errCode = generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_EXPRIE_STATEMENT); }
- yy_destructor(yypParser,256,&yymsp[0].minor);
+ yy_destructor(yypParser,257,&yymsp[0].minor);
break;
case 1: /* cmd ::= ALTER ACCOUNT NK_ID alter_account_options */
{ pCxt->errCode = generateSyntaxErrMsg(&pCxt->msgBuf, TSDB_CODE_PAR_EXPRIE_STATEMENT); }
- yy_destructor(yypParser,257,&yymsp[0].minor);
+ yy_destructor(yypParser,258,&yymsp[0].minor);
break;
case 2: /* account_options ::= */
{ }
@@ -3287,20 +3339,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,256,&yymsp[-2].minor);
+{ yy_destructor(yypParser,257,&yymsp[-2].minor);
{ }
- yy_destructor(yypParser,258,&yymsp[0].minor);
+ yy_destructor(yypParser,259,&yymsp[0].minor);
}
break;
case 12: /* alter_account_options ::= alter_account_option */
-{ yy_destructor(yypParser,259,&yymsp[0].minor);
+{ yy_destructor(yypParser,260,&yymsp[0].minor);
{ }
}
break;
case 13: /* alter_account_options ::= alter_account_options alter_account_option */
-{ yy_destructor(yypParser,257,&yymsp[-1].minor);
+{ yy_destructor(yypParser,258,&yymsp[-1].minor);
{ }
- yy_destructor(yypParser,259,&yymsp[0].minor);
+ yy_destructor(yypParser,260,&yymsp[0].minor);
}
break;
case 14: /* alter_account_option ::= PASS literal */
@@ -3314,72 +3366,72 @@ 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,258,&yymsp[0].minor);
+ yy_destructor(yypParser,259,&yymsp[0].minor);
break;
case 24: /* cmd ::= CREATE USER user_name PASS NK_STRING sysinfo_opt */
-{ pCxt->pRootNode = createCreateUserStmt(pCxt, &yymsp[-3].minor.yy533, &yymsp[-1].minor.yy0, yymsp[0].minor.yy719); }
+{ pCxt->pRootNode = createCreateUserStmt(pCxt, &yymsp[-3].minor.yy361, &yymsp[-1].minor.yy0, yymsp[0].minor.yy285); }
break;
case 25: /* cmd ::= ALTER USER user_name PASS NK_STRING */
-{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy533, TSDB_ALTER_USER_PASSWD, &yymsp[0].minor.yy0); }
+{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy361, TSDB_ALTER_USER_PASSWD, &yymsp[0].minor.yy0); }
break;
case 26: /* cmd ::= ALTER USER user_name ENABLE NK_INTEGER */
-{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy533, TSDB_ALTER_USER_ENABLE, &yymsp[0].minor.yy0); }
+{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy361, TSDB_ALTER_USER_ENABLE, &yymsp[0].minor.yy0); }
break;
case 27: /* cmd ::= ALTER USER user_name SYSINFO NK_INTEGER */
-{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy533, TSDB_ALTER_USER_SYSINFO, &yymsp[0].minor.yy0); }
+{ pCxt->pRootNode = createAlterUserStmt(pCxt, &yymsp[-2].minor.yy361, TSDB_ALTER_USER_SYSINFO, &yymsp[0].minor.yy0); }
break;
case 28: /* cmd ::= DROP USER user_name */
-{ pCxt->pRootNode = createDropUserStmt(pCxt, &yymsp[0].minor.yy533); }
+{ pCxt->pRootNode = createDropUserStmt(pCxt, &yymsp[0].minor.yy361); }
break;
case 29: /* sysinfo_opt ::= */
-{ yymsp[1].minor.yy719 = 1; }
+{ yymsp[1].minor.yy285 = 1; }
break;
case 30: /* sysinfo_opt ::= SYSINFO NK_INTEGER */
-{ yymsp[-1].minor.yy719 = taosStr2Int8(yymsp[0].minor.yy0.z, NULL, 10); }
+{ yymsp[-1].minor.yy285 = taosStr2Int8(yymsp[0].minor.yy0.z, NULL, 10); }
break;
case 31: /* cmd ::= GRANT privileges ON priv_level TO user_name */
-{ pCxt->pRootNode = createGrantStmt(pCxt, yymsp[-4].minor.yy585, &yymsp[-2].minor.yy533, &yymsp[0].minor.yy533); }
+{ pCxt->pRootNode = createGrantStmt(pCxt, yymsp[-4].minor.yy457, &yymsp[-2].minor.yy361, &yymsp[0].minor.yy361); }
break;
case 32: /* cmd ::= REVOKE privileges ON priv_level FROM user_name */
-{ pCxt->pRootNode = createRevokeStmt(pCxt, yymsp[-4].minor.yy585, &yymsp[-2].minor.yy533, &yymsp[0].minor.yy533); }
+{ pCxt->pRootNode = createRevokeStmt(pCxt, yymsp[-4].minor.yy457, &yymsp[-2].minor.yy361, &yymsp[0].minor.yy361); }
break;
case 33: /* privileges ::= ALL */
-{ yymsp[0].minor.yy585 = PRIVILEGE_TYPE_ALL; }
+{ yymsp[0].minor.yy457 = PRIVILEGE_TYPE_ALL; }
break;
case 34: /* privileges ::= priv_type_list */
case 35: /* priv_type_list ::= priv_type */ yytestcase(yyruleno==35);
-{ yylhsminor.yy585 = yymsp[0].minor.yy585; }
- yymsp[0].minor.yy585 = yylhsminor.yy585;
+{ yylhsminor.yy457 = yymsp[0].minor.yy457; }
+ yymsp[0].minor.yy457 = yylhsminor.yy457;
break;
case 36: /* priv_type_list ::= priv_type_list NK_COMMA priv_type */
-{ yylhsminor.yy585 = yymsp[-2].minor.yy585 | yymsp[0].minor.yy585; }
- yymsp[-2].minor.yy585 = yylhsminor.yy585;
+{ yylhsminor.yy457 = yymsp[-2].minor.yy457 | yymsp[0].minor.yy457; }
+ yymsp[-2].minor.yy457 = yylhsminor.yy457;
break;
case 37: /* priv_type ::= READ */
-{ yymsp[0].minor.yy585 = PRIVILEGE_TYPE_READ; }
+{ yymsp[0].minor.yy457 = PRIVILEGE_TYPE_READ; }
break;
case 38: /* priv_type ::= WRITE */
-{ yymsp[0].minor.yy585 = PRIVILEGE_TYPE_WRITE; }
+{ yymsp[0].minor.yy457 = PRIVILEGE_TYPE_WRITE; }
break;
case 39: /* priv_level ::= NK_STAR NK_DOT NK_STAR */
-{ yylhsminor.yy533 = yymsp[-2].minor.yy0; }
- yymsp[-2].minor.yy533 = yylhsminor.yy533;
+{ yylhsminor.yy361 = yymsp[-2].minor.yy0; }
+ yymsp[-2].minor.yy361 = yylhsminor.yy361;
break;
case 40: /* priv_level ::= db_name NK_DOT NK_STAR */
-{ yylhsminor.yy533 = yymsp[-2].minor.yy533; }
- yymsp[-2].minor.yy533 = yylhsminor.yy533;
+{ yylhsminor.yy361 = yymsp[-2].minor.yy361; }
+ yymsp[-2].minor.yy361 = yylhsminor.yy361;
break;
case 41: /* cmd ::= CREATE DNODE dnode_endpoint */
-{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[0].minor.yy533, NULL); }
+{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[0].minor.yy361, NULL); }
break;
case 42: /* cmd ::= CREATE DNODE dnode_endpoint PORT NK_INTEGER */
-{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[-2].minor.yy533, &yymsp[0].minor.yy0); }
+{ pCxt->pRootNode = createCreateDnodeStmt(pCxt, &yymsp[-2].minor.yy361, &yymsp[0].minor.yy0); }
break;
case 43: /* cmd ::= DROP DNODE NK_INTEGER */
{ pCxt->pRootNode = createDropDnodeStmt(pCxt, &yymsp[0].minor.yy0); }
break;
case 44: /* cmd ::= DROP DNODE dnode_endpoint */
-{ pCxt->pRootNode = createDropDnodeStmt(pCxt, &yymsp[0].minor.yy533); }
+{ pCxt->pRootNode = createDropDnodeStmt(pCxt, &yymsp[0].minor.yy361); }
break;
case 45: /* cmd ::= ALTER DNODE NK_INTEGER NK_STRING */
{ pCxt->pRootNode = createAlterDnodeStmt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0, NULL); }
@@ -3396,32 +3448,32 @@ static YYACTIONTYPE yy_reduce(
case 49: /* dnode_endpoint ::= NK_STRING */
case 50: /* dnode_endpoint ::= NK_ID */ yytestcase(yyruleno==50);
case 51: /* dnode_endpoint ::= NK_IPTOKEN */ yytestcase(yyruleno==51);
- case 312: /* db_name ::= NK_ID */ yytestcase(yyruleno==312);
- case 313: /* table_name ::= NK_ID */ yytestcase(yyruleno==313);
- case 314: /* column_name ::= NK_ID */ yytestcase(yyruleno==314);
- case 315: /* function_name ::= NK_ID */ yytestcase(yyruleno==315);
- case 316: /* table_alias ::= NK_ID */ yytestcase(yyruleno==316);
- case 317: /* column_alias ::= NK_ID */ yytestcase(yyruleno==317);
- case 318: /* user_name ::= NK_ID */ yytestcase(yyruleno==318);
- case 319: /* index_name ::= NK_ID */ yytestcase(yyruleno==319);
- case 320: /* topic_name ::= NK_ID */ yytestcase(yyruleno==320);
- case 321: /* stream_name ::= NK_ID */ yytestcase(yyruleno==321);
- case 322: /* cgroup_name ::= NK_ID */ yytestcase(yyruleno==322);
- case 357: /* noarg_func ::= NOW */ yytestcase(yyruleno==357);
- case 358: /* noarg_func ::= TODAY */ yytestcase(yyruleno==358);
- case 359: /* noarg_func ::= TIMEZONE */ yytestcase(yyruleno==359);
- case 360: /* noarg_func ::= DATABASE */ yytestcase(yyruleno==360);
- case 361: /* noarg_func ::= CLIENT_VERSION */ yytestcase(yyruleno==361);
- case 362: /* noarg_func ::= SERVER_VERSION */ yytestcase(yyruleno==362);
- case 363: /* noarg_func ::= SERVER_STATUS */ yytestcase(yyruleno==363);
- case 364: /* noarg_func ::= CURRENT_USER */ yytestcase(yyruleno==364);
- case 365: /* noarg_func ::= USER */ yytestcase(yyruleno==365);
- case 366: /* star_func ::= COUNT */ yytestcase(yyruleno==366);
- case 367: /* star_func ::= FIRST */ yytestcase(yyruleno==367);
- case 368: /* star_func ::= LAST */ yytestcase(yyruleno==368);
- case 369: /* star_func ::= LAST_ROW */ yytestcase(yyruleno==369);
-{ yylhsminor.yy533 = yymsp[0].minor.yy0; }
- yymsp[0].minor.yy533 = yylhsminor.yy533;
+ case 313: /* db_name ::= NK_ID */ yytestcase(yyruleno==313);
+ case 314: /* table_name ::= NK_ID */ yytestcase(yyruleno==314);
+ case 315: /* column_name ::= NK_ID */ yytestcase(yyruleno==315);
+ case 316: /* function_name ::= NK_ID */ yytestcase(yyruleno==316);
+ case 317: /* table_alias ::= NK_ID */ yytestcase(yyruleno==317);
+ case 318: /* column_alias ::= NK_ID */ yytestcase(yyruleno==318);
+ case 319: /* user_name ::= NK_ID */ yytestcase(yyruleno==319);
+ case 320: /* index_name ::= NK_ID */ yytestcase(yyruleno==320);
+ case 321: /* topic_name ::= NK_ID */ yytestcase(yyruleno==321);
+ case 322: /* stream_name ::= NK_ID */ yytestcase(yyruleno==322);
+ case 323: /* cgroup_name ::= NK_ID */ yytestcase(yyruleno==323);
+ case 359: /* noarg_func ::= NOW */ yytestcase(yyruleno==359);
+ case 360: /* noarg_func ::= TODAY */ yytestcase(yyruleno==360);
+ case 361: /* noarg_func ::= TIMEZONE */ yytestcase(yyruleno==361);
+ case 362: /* noarg_func ::= DATABASE */ yytestcase(yyruleno==362);
+ case 363: /* noarg_func ::= CLIENT_VERSION */ yytestcase(yyruleno==363);
+ case 364: /* noarg_func ::= SERVER_VERSION */ yytestcase(yyruleno==364);
+ case 365: /* noarg_func ::= SERVER_STATUS */ yytestcase(yyruleno==365);
+ case 366: /* noarg_func ::= CURRENT_USER */ yytestcase(yyruleno==366);
+ case 367: /* noarg_func ::= USER */ yytestcase(yyruleno==367);
+ case 368: /* star_func ::= COUNT */ yytestcase(yyruleno==368);
+ case 369: /* star_func ::= FIRST */ yytestcase(yyruleno==369);
+ case 370: /* star_func ::= LAST */ yytestcase(yyruleno==370);
+ case 371: /* star_func ::= LAST_ROW */ yytestcase(yyruleno==371);
+{ yylhsminor.yy361 = yymsp[0].minor.yy0; }
+ yymsp[0].minor.yy361 = yylhsminor.yy361;
break;
case 52: /* cmd ::= ALTER LOCAL NK_STRING */
{ pCxt->pRootNode = createAlterLocalStmt(pCxt, &yymsp[0].minor.yy0, NULL); }
@@ -3454,169 +3506,169 @@ static YYACTIONTYPE yy_reduce(
{ pCxt->pRootNode = createDropComponentNodeStmt(pCxt, QUERY_NODE_DROP_MNODE_STMT, &yymsp[0].minor.yy0); }
break;
case 62: /* cmd ::= CREATE DATABASE not_exists_opt db_name db_options */
-{ pCxt->pRootNode = createCreateDatabaseStmt(pCxt, yymsp[-2].minor.yy173, &yymsp[-1].minor.yy533, yymsp[0].minor.yy560); }
+{ pCxt->pRootNode = createCreateDatabaseStmt(pCxt, yymsp[-2].minor.yy151, &yymsp[-1].minor.yy361, yymsp[0].minor.yy616); }
break;
case 63: /* cmd ::= DROP DATABASE exists_opt db_name */
-{ pCxt->pRootNode = createDropDatabaseStmt(pCxt, yymsp[-1].minor.yy173, &yymsp[0].minor.yy533); }
+{ pCxt->pRootNode = createDropDatabaseStmt(pCxt, yymsp[-1].minor.yy151, &yymsp[0].minor.yy361); }
break;
case 64: /* cmd ::= USE db_name */
-{ pCxt->pRootNode = createUseDatabaseStmt(pCxt, &yymsp[0].minor.yy533); }
+{ pCxt->pRootNode = createUseDatabaseStmt(pCxt, &yymsp[0].minor.yy361); }
break;
case 65: /* cmd ::= ALTER DATABASE db_name alter_db_options */
-{ pCxt->pRootNode = createAlterDatabaseStmt(pCxt, &yymsp[-1].minor.yy533, yymsp[0].minor.yy560); }
+{ pCxt->pRootNode = createAlterDatabaseStmt(pCxt, &yymsp[-1].minor.yy361, yymsp[0].minor.yy616); }
break;
case 66: /* cmd ::= FLUSH DATABASE db_name */
-{ pCxt->pRootNode = createFlushDatabaseStmt(pCxt, &yymsp[0].minor.yy533); }
+{ pCxt->pRootNode = createFlushDatabaseStmt(pCxt, &yymsp[0].minor.yy361); }
break;
case 67: /* cmd ::= TRIM DATABASE db_name */
-{ pCxt->pRootNode = createTrimDatabaseStmt(pCxt, &yymsp[0].minor.yy533); }
+{ pCxt->pRootNode = createTrimDatabaseStmt(pCxt, &yymsp[0].minor.yy361); }
break;
case 68: /* not_exists_opt ::= IF NOT EXISTS */
-{ yymsp[-2].minor.yy173 = true; }
+{ yymsp[-2].minor.yy151 = true; }
break;
case 69: /* not_exists_opt ::= */
case 71: /* exists_opt ::= */ yytestcase(yyruleno==71);
case 252: /* analyze_opt ::= */ yytestcase(yyruleno==252);
case 260: /* agg_func_opt ::= */ yytestcase(yyruleno==260);
- case 423: /* set_quantifier_opt ::= */ yytestcase(yyruleno==423);
-{ yymsp[1].minor.yy173 = false; }
+ case 425: /* set_quantifier_opt ::= */ yytestcase(yyruleno==425);
+{ yymsp[1].minor.yy151 = false; }
break;
case 70: /* exists_opt ::= IF EXISTS */
-{ yymsp[-1].minor.yy173 = true; }
+{ yymsp[-1].minor.yy151 = true; }
break;
case 72: /* db_options ::= */
-{ yymsp[1].minor.yy560 = createDefaultDatabaseOptions(pCxt); }
+{ yymsp[1].minor.yy616 = createDefaultDatabaseOptions(pCxt); }
break;
case 73: /* db_options ::= db_options BUFFER NK_INTEGER */
-{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_BUFFER, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = setDatabaseOption(pCxt, yymsp[-2].minor.yy616, DB_OPTION_BUFFER, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 74: /* db_options ::= db_options CACHELAST NK_INTEGER */
-{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_CACHELAST, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = setDatabaseOption(pCxt, yymsp[-2].minor.yy616, DB_OPTION_CACHELAST, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 75: /* db_options ::= db_options CACHELASTSIZE NK_INTEGER */
-{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_CACHELASTSIZE, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = setDatabaseOption(pCxt, yymsp[-2].minor.yy616, DB_OPTION_CACHELASTSIZE, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 76: /* db_options ::= db_options COMP NK_INTEGER */
-{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_COMP, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = setDatabaseOption(pCxt, yymsp[-2].minor.yy616, DB_OPTION_COMP, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 77: /* db_options ::= db_options DURATION NK_INTEGER */
case 78: /* db_options ::= db_options DURATION NK_VARIABLE */ yytestcase(yyruleno==78);
-{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_DAYS, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = setDatabaseOption(pCxt, yymsp[-2].minor.yy616, DB_OPTION_DAYS, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 79: /* db_options ::= db_options FSYNC NK_INTEGER */
-{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_FSYNC, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = setDatabaseOption(pCxt, yymsp[-2].minor.yy616, DB_OPTION_FSYNC, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 80: /* db_options ::= db_options MAXROWS NK_INTEGER */
-{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_MAXROWS, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = setDatabaseOption(pCxt, yymsp[-2].minor.yy616, DB_OPTION_MAXROWS, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 81: /* db_options ::= db_options MINROWS NK_INTEGER */
-{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_MINROWS, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = setDatabaseOption(pCxt, yymsp[-2].minor.yy616, DB_OPTION_MINROWS, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 82: /* db_options ::= db_options KEEP integer_list */
case 83: /* db_options ::= db_options KEEP variable_list */ yytestcase(yyruleno==83);
-{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_KEEP, yymsp[0].minor.yy712); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = setDatabaseOption(pCxt, yymsp[-2].minor.yy616, DB_OPTION_KEEP, yymsp[0].minor.yy356); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 84: /* db_options ::= db_options PAGES NK_INTEGER */
-{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_PAGES, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = setDatabaseOption(pCxt, yymsp[-2].minor.yy616, DB_OPTION_PAGES, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 85: /* db_options ::= db_options PAGESIZE NK_INTEGER */
-{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_PAGESIZE, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = setDatabaseOption(pCxt, yymsp[-2].minor.yy616, DB_OPTION_PAGESIZE, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 86: /* db_options ::= db_options PRECISION NK_STRING */
-{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_PRECISION, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = setDatabaseOption(pCxt, yymsp[-2].minor.yy616, DB_OPTION_PRECISION, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 87: /* db_options ::= db_options REPLICA NK_INTEGER */
-{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_REPLICA, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = setDatabaseOption(pCxt, yymsp[-2].minor.yy616, DB_OPTION_REPLICA, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 88: /* db_options ::= db_options STRICT NK_INTEGER */
-{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_STRICT, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = setDatabaseOption(pCxt, yymsp[-2].minor.yy616, DB_OPTION_STRICT, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 89: /* db_options ::= db_options WAL NK_INTEGER */
-{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_WAL, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = setDatabaseOption(pCxt, yymsp[-2].minor.yy616, DB_OPTION_WAL, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 90: /* db_options ::= db_options VGROUPS NK_INTEGER */
-{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_VGROUPS, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = setDatabaseOption(pCxt, yymsp[-2].minor.yy616, DB_OPTION_VGROUPS, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 91: /* db_options ::= db_options SINGLE_STABLE NK_INTEGER */
-{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_SINGLE_STABLE, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = setDatabaseOption(pCxt, yymsp[-2].minor.yy616, DB_OPTION_SINGLE_STABLE, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 92: /* db_options ::= db_options RETENTIONS retention_list */
-{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_RETENTIONS, yymsp[0].minor.yy712); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = setDatabaseOption(pCxt, yymsp[-2].minor.yy616, DB_OPTION_RETENTIONS, yymsp[0].minor.yy356); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 93: /* db_options ::= db_options SCHEMALESS NK_INTEGER */
-{ yylhsminor.yy560 = setDatabaseOption(pCxt, yymsp[-2].minor.yy560, DB_OPTION_SCHEMALESS, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = setDatabaseOption(pCxt, yymsp[-2].minor.yy616, DB_OPTION_SCHEMALESS, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 94: /* alter_db_options ::= alter_db_option */
-{ yylhsminor.yy560 = createAlterDatabaseOptions(pCxt); yylhsminor.yy560 = setAlterDatabaseOption(pCxt, yylhsminor.yy560, &yymsp[0].minor.yy389); }
- yymsp[0].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = createAlterDatabaseOptions(pCxt); yylhsminor.yy616 = setAlterDatabaseOption(pCxt, yylhsminor.yy616, &yymsp[0].minor.yy409); }
+ yymsp[0].minor.yy616 = yylhsminor.yy616;
break;
case 95: /* alter_db_options ::= alter_db_options alter_db_option */
-{ yylhsminor.yy560 = setAlterDatabaseOption(pCxt, yymsp[-1].minor.yy560, &yymsp[0].minor.yy389); }
- yymsp[-1].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = setAlterDatabaseOption(pCxt, yymsp[-1].minor.yy616, &yymsp[0].minor.yy409); }
+ yymsp[-1].minor.yy616 = yylhsminor.yy616;
break;
case 96: /* alter_db_option ::= BUFFER NK_INTEGER */
-{ yymsp[-1].minor.yy389.type = DB_OPTION_BUFFER; yymsp[-1].minor.yy389.val = yymsp[0].minor.yy0; }
+{ yymsp[-1].minor.yy409.type = DB_OPTION_BUFFER; yymsp[-1].minor.yy409.val = yymsp[0].minor.yy0; }
break;
case 97: /* alter_db_option ::= CACHELAST NK_INTEGER */
-{ yymsp[-1].minor.yy389.type = DB_OPTION_CACHELAST; yymsp[-1].minor.yy389.val = yymsp[0].minor.yy0; }
+{ yymsp[-1].minor.yy409.type = DB_OPTION_CACHELAST; yymsp[-1].minor.yy409.val = yymsp[0].minor.yy0; }
break;
case 98: /* alter_db_option ::= CACHELASTSIZE NK_INTEGER */
-{ yymsp[-1].minor.yy389.type = DB_OPTION_CACHELASTSIZE; yymsp[-1].minor.yy389.val = yymsp[0].minor.yy0; }
+{ yymsp[-1].minor.yy409.type = DB_OPTION_CACHELASTSIZE; yymsp[-1].minor.yy409.val = yymsp[0].minor.yy0; }
break;
case 99: /* alter_db_option ::= FSYNC NK_INTEGER */
-{ yymsp[-1].minor.yy389.type = DB_OPTION_FSYNC; yymsp[-1].minor.yy389.val = yymsp[0].minor.yy0; }
+{ yymsp[-1].minor.yy409.type = DB_OPTION_FSYNC; yymsp[-1].minor.yy409.val = yymsp[0].minor.yy0; }
break;
case 100: /* alter_db_option ::= KEEP integer_list */
case 101: /* alter_db_option ::= KEEP variable_list */ yytestcase(yyruleno==101);
-{ yymsp[-1].minor.yy389.type = DB_OPTION_KEEP; yymsp[-1].minor.yy389.pList = yymsp[0].minor.yy712; }
+{ yymsp[-1].minor.yy409.type = DB_OPTION_KEEP; yymsp[-1].minor.yy409.pList = yymsp[0].minor.yy356; }
break;
case 102: /* alter_db_option ::= PAGES NK_INTEGER */
-{ yymsp[-1].minor.yy389.type = DB_OPTION_PAGES; yymsp[-1].minor.yy389.val = yymsp[0].minor.yy0; }
+{ yymsp[-1].minor.yy409.type = DB_OPTION_PAGES; yymsp[-1].minor.yy409.val = yymsp[0].minor.yy0; }
break;
case 103: /* alter_db_option ::= REPLICA NK_INTEGER */
-{ yymsp[-1].minor.yy389.type = DB_OPTION_REPLICA; yymsp[-1].minor.yy389.val = yymsp[0].minor.yy0; }
+{ yymsp[-1].minor.yy409.type = DB_OPTION_REPLICA; yymsp[-1].minor.yy409.val = yymsp[0].minor.yy0; }
break;
case 104: /* alter_db_option ::= STRICT NK_INTEGER */
-{ yymsp[-1].minor.yy389.type = DB_OPTION_STRICT; yymsp[-1].minor.yy389.val = yymsp[0].minor.yy0; }
+{ yymsp[-1].minor.yy409.type = DB_OPTION_STRICT; yymsp[-1].minor.yy409.val = yymsp[0].minor.yy0; }
break;
case 105: /* alter_db_option ::= WAL NK_INTEGER */
-{ yymsp[-1].minor.yy389.type = DB_OPTION_WAL; yymsp[-1].minor.yy389.val = yymsp[0].minor.yy0; }
+{ yymsp[-1].minor.yy409.type = DB_OPTION_WAL; yymsp[-1].minor.yy409.val = yymsp[0].minor.yy0; }
break;
case 106: /* integer_list ::= NK_INTEGER */
-{ yylhsminor.yy712 = createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
- yymsp[0].minor.yy712 = yylhsminor.yy712;
+{ yylhsminor.yy356 = createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
+ yymsp[0].minor.yy356 = yylhsminor.yy356;
break;
case 107: /* integer_list ::= integer_list NK_COMMA NK_INTEGER */
case 282: /* dnode_list ::= dnode_list DNODE NK_INTEGER */ yytestcase(yyruleno==282);
-{ yylhsminor.yy712 = addNodeToList(pCxt, yymsp[-2].minor.yy712, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
- yymsp[-2].minor.yy712 = yylhsminor.yy712;
+{ yylhsminor.yy356 = addNodeToList(pCxt, yymsp[-2].minor.yy356, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
+ yymsp[-2].minor.yy356 = yylhsminor.yy356;
break;
case 108: /* variable_list ::= NK_VARIABLE */
-{ yylhsminor.yy712 = createNodeList(pCxt, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
- yymsp[0].minor.yy712 = yylhsminor.yy712;
+{ yylhsminor.yy356 = createNodeList(pCxt, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
+ yymsp[0].minor.yy356 = yylhsminor.yy356;
break;
case 109: /* variable_list ::= variable_list NK_COMMA NK_VARIABLE */
-{ yylhsminor.yy712 = addNodeToList(pCxt, yymsp[-2].minor.yy712, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
- yymsp[-2].minor.yy712 = yylhsminor.yy712;
+{ yylhsminor.yy356 = addNodeToList(pCxt, yymsp[-2].minor.yy356, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
+ yymsp[-2].minor.yy356 = yylhsminor.yy356;
break;
case 110: /* retention_list ::= retention */
case 130: /* multi_create_clause ::= create_subtable_clause */ yytestcase(yyruleno==130);
@@ -3625,266 +3677,266 @@ static YYACTIONTYPE yy_reduce(
case 183: /* rollup_func_list ::= rollup_func_name */ yytestcase(yyruleno==183);
case 188: /* col_name_list ::= col_name */ yytestcase(yyruleno==188);
case 235: /* func_list ::= func */ yytestcase(yyruleno==235);
- case 310: /* literal_list ::= signed_literal */ yytestcase(yyruleno==310);
- case 372: /* other_para_list ::= star_func_para */ yytestcase(yyruleno==372);
- case 426: /* select_list ::= select_item */ yytestcase(yyruleno==426);
- case 480: /* sort_specification_list ::= sort_specification */ yytestcase(yyruleno==480);
-{ yylhsminor.yy712 = createNodeList(pCxt, yymsp[0].minor.yy560); }
- yymsp[0].minor.yy712 = yylhsminor.yy712;
+ case 311: /* literal_list ::= signed_literal */ yytestcase(yyruleno==311);
+ case 374: /* other_para_list ::= star_func_para */ yytestcase(yyruleno==374);
+ case 428: /* select_list ::= select_item */ yytestcase(yyruleno==428);
+ case 482: /* sort_specification_list ::= sort_specification */ yytestcase(yyruleno==482);
+{ yylhsminor.yy356 = createNodeList(pCxt, yymsp[0].minor.yy616); }
+ yymsp[0].minor.yy356 = yylhsminor.yy356;
break;
case 111: /* retention_list ::= retention_list NK_COMMA retention */
case 141: /* column_def_list ::= column_def_list NK_COMMA column_def */ yytestcase(yyruleno==141);
case 184: /* rollup_func_list ::= rollup_func_list NK_COMMA rollup_func_name */ yytestcase(yyruleno==184);
case 189: /* col_name_list ::= col_name_list NK_COMMA col_name */ yytestcase(yyruleno==189);
case 236: /* func_list ::= func_list NK_COMMA func */ yytestcase(yyruleno==236);
- case 311: /* literal_list ::= literal_list NK_COMMA signed_literal */ yytestcase(yyruleno==311);
- case 373: /* other_para_list ::= other_para_list NK_COMMA star_func_para */ yytestcase(yyruleno==373);
- case 427: /* select_list ::= select_list NK_COMMA select_item */ yytestcase(yyruleno==427);
- case 481: /* sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */ yytestcase(yyruleno==481);
-{ yylhsminor.yy712 = addNodeToList(pCxt, yymsp[-2].minor.yy712, yymsp[0].minor.yy560); }
- yymsp[-2].minor.yy712 = yylhsminor.yy712;
+ case 312: /* literal_list ::= literal_list NK_COMMA signed_literal */ yytestcase(yyruleno==312);
+ case 375: /* other_para_list ::= other_para_list NK_COMMA star_func_para */ yytestcase(yyruleno==375);
+ case 429: /* select_list ::= select_list NK_COMMA select_item */ yytestcase(yyruleno==429);
+ case 483: /* sort_specification_list ::= sort_specification_list NK_COMMA sort_specification */ yytestcase(yyruleno==483);
+{ yylhsminor.yy356 = addNodeToList(pCxt, yymsp[-2].minor.yy356, yymsp[0].minor.yy616); }
+ yymsp[-2].minor.yy356 = yylhsminor.yy356;
break;
case 112: /* retention ::= NK_VARIABLE NK_COLON NK_VARIABLE */
-{ yylhsminor.yy560 = createNodeListNodeEx(pCxt, createDurationValueNode(pCxt, &yymsp[-2].minor.yy0), createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = createNodeListNodeEx(pCxt, createDurationValueNode(pCxt, &yymsp[-2].minor.yy0), createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 113: /* cmd ::= CREATE TABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def_opt table_options */
case 115: /* cmd ::= CREATE STABLE not_exists_opt full_table_name NK_LP column_def_list NK_RP tags_def table_options */ yytestcase(yyruleno==115);
-{ pCxt->pRootNode = createCreateTableStmt(pCxt, yymsp[-6].minor.yy173, yymsp[-5].minor.yy560, yymsp[-3].minor.yy712, yymsp[-1].minor.yy712, yymsp[0].minor.yy560); }
+{ pCxt->pRootNode = createCreateTableStmt(pCxt, yymsp[-6].minor.yy151, yymsp[-5].minor.yy616, yymsp[-3].minor.yy356, yymsp[-1].minor.yy356, yymsp[0].minor.yy616); }
break;
case 114: /* cmd ::= CREATE TABLE multi_create_clause */
-{ pCxt->pRootNode = createCreateMultiTableStmt(pCxt, yymsp[0].minor.yy712); }
+{ pCxt->pRootNode = createCreateMultiTableStmt(pCxt, yymsp[0].minor.yy356); }
break;
case 116: /* cmd ::= DROP TABLE multi_drop_clause */
-{ pCxt->pRootNode = createDropTableStmt(pCxt, yymsp[0].minor.yy712); }
+{ pCxt->pRootNode = createDropTableStmt(pCxt, yymsp[0].minor.yy356); }
break;
case 117: /* cmd ::= DROP STABLE exists_opt full_table_name */
-{ pCxt->pRootNode = createDropSuperTableStmt(pCxt, yymsp[-1].minor.yy173, yymsp[0].minor.yy560); }
+{ pCxt->pRootNode = createDropSuperTableStmt(pCxt, yymsp[-1].minor.yy151, yymsp[0].minor.yy616); }
break;
case 118: /* cmd ::= ALTER TABLE alter_table_clause */
case 285: /* cmd ::= query_expression */ yytestcase(yyruleno==285);
-{ pCxt->pRootNode = yymsp[0].minor.yy560; }
+{ pCxt->pRootNode = yymsp[0].minor.yy616; }
break;
case 119: /* cmd ::= ALTER STABLE alter_table_clause */
-{ pCxt->pRootNode = setAlterSuperTableType(yymsp[0].minor.yy560); }
+{ pCxt->pRootNode = setAlterSuperTableType(yymsp[0].minor.yy616); }
break;
case 120: /* alter_table_clause ::= full_table_name alter_table_options */
-{ yylhsminor.yy560 = createAlterTableModifyOptions(pCxt, yymsp[-1].minor.yy560, yymsp[0].minor.yy560); }
- yymsp[-1].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = createAlterTableModifyOptions(pCxt, yymsp[-1].minor.yy616, yymsp[0].minor.yy616); }
+ yymsp[-1].minor.yy616 = yylhsminor.yy616;
break;
case 121: /* alter_table_clause ::= full_table_name ADD COLUMN column_name type_name */
-{ yylhsminor.yy560 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy560, TSDB_ALTER_TABLE_ADD_COLUMN, &yymsp[-1].minor.yy533, yymsp[0].minor.yy196); }
- yymsp[-4].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy616, TSDB_ALTER_TABLE_ADD_COLUMN, &yymsp[-1].minor.yy361, yymsp[0].minor.yy600); }
+ yymsp[-4].minor.yy616 = yylhsminor.yy616;
break;
case 122: /* alter_table_clause ::= full_table_name DROP COLUMN column_name */
-{ yylhsminor.yy560 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy560, TSDB_ALTER_TABLE_DROP_COLUMN, &yymsp[0].minor.yy533); }
- yymsp[-3].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy616, TSDB_ALTER_TABLE_DROP_COLUMN, &yymsp[0].minor.yy361); }
+ yymsp[-3].minor.yy616 = yylhsminor.yy616;
break;
case 123: /* alter_table_clause ::= full_table_name MODIFY COLUMN column_name type_name */
-{ yylhsminor.yy560 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy560, TSDB_ALTER_TABLE_UPDATE_COLUMN_BYTES, &yymsp[-1].minor.yy533, yymsp[0].minor.yy196); }
- yymsp[-4].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy616, TSDB_ALTER_TABLE_UPDATE_COLUMN_BYTES, &yymsp[-1].minor.yy361, yymsp[0].minor.yy600); }
+ yymsp[-4].minor.yy616 = yylhsminor.yy616;
break;
case 124: /* alter_table_clause ::= full_table_name RENAME COLUMN column_name column_name */
-{ yylhsminor.yy560 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy560, TSDB_ALTER_TABLE_UPDATE_COLUMN_NAME, &yymsp[-1].minor.yy533, &yymsp[0].minor.yy533); }
- yymsp[-4].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy616, TSDB_ALTER_TABLE_UPDATE_COLUMN_NAME, &yymsp[-1].minor.yy361, &yymsp[0].minor.yy361); }
+ yymsp[-4].minor.yy616 = yylhsminor.yy616;
break;
case 125: /* alter_table_clause ::= full_table_name ADD TAG column_name type_name */
-{ yylhsminor.yy560 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy560, TSDB_ALTER_TABLE_ADD_TAG, &yymsp[-1].minor.yy533, yymsp[0].minor.yy196); }
- yymsp[-4].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy616, TSDB_ALTER_TABLE_ADD_TAG, &yymsp[-1].minor.yy361, yymsp[0].minor.yy600); }
+ yymsp[-4].minor.yy616 = yylhsminor.yy616;
break;
case 126: /* alter_table_clause ::= full_table_name DROP TAG column_name */
-{ yylhsminor.yy560 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy560, TSDB_ALTER_TABLE_DROP_TAG, &yymsp[0].minor.yy533); }
- yymsp[-3].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = createAlterTableDropCol(pCxt, yymsp[-3].minor.yy616, TSDB_ALTER_TABLE_DROP_TAG, &yymsp[0].minor.yy361); }
+ yymsp[-3].minor.yy616 = yylhsminor.yy616;
break;
case 127: /* alter_table_clause ::= full_table_name MODIFY TAG column_name type_name */
-{ yylhsminor.yy560 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy560, TSDB_ALTER_TABLE_UPDATE_TAG_BYTES, &yymsp[-1].minor.yy533, yymsp[0].minor.yy196); }
- yymsp[-4].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = createAlterTableAddModifyCol(pCxt, yymsp[-4].minor.yy616, TSDB_ALTER_TABLE_UPDATE_TAG_BYTES, &yymsp[-1].minor.yy361, yymsp[0].minor.yy600); }
+ yymsp[-4].minor.yy616 = yylhsminor.yy616;
break;
case 128: /* alter_table_clause ::= full_table_name RENAME TAG column_name column_name */
-{ yylhsminor.yy560 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy560, TSDB_ALTER_TABLE_UPDATE_TAG_NAME, &yymsp[-1].minor.yy533, &yymsp[0].minor.yy533); }
- yymsp[-4].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = createAlterTableRenameCol(pCxt, yymsp[-4].minor.yy616, TSDB_ALTER_TABLE_UPDATE_TAG_NAME, &yymsp[-1].minor.yy361, &yymsp[0].minor.yy361); }
+ yymsp[-4].minor.yy616 = yylhsminor.yy616;
break;
case 129: /* alter_table_clause ::= full_table_name SET TAG column_name NK_EQ signed_literal */
-{ yylhsminor.yy560 = createAlterTableSetTag(pCxt, yymsp[-5].minor.yy560, &yymsp[-2].minor.yy533, yymsp[0].minor.yy560); }
- yymsp[-5].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = createAlterTableSetTag(pCxt, yymsp[-5].minor.yy616, &yymsp[-2].minor.yy361, yymsp[0].minor.yy616); }
+ yymsp[-5].minor.yy616 = yylhsminor.yy616;
break;
case 131: /* multi_create_clause ::= multi_create_clause create_subtable_clause */
case 134: /* multi_drop_clause ::= multi_drop_clause drop_table_clause */ yytestcase(yyruleno==134);
-{ yylhsminor.yy712 = addNodeToList(pCxt, yymsp[-1].minor.yy712, yymsp[0].minor.yy560); }
- yymsp[-1].minor.yy712 = yylhsminor.yy712;
+{ yylhsminor.yy356 = addNodeToList(pCxt, yymsp[-1].minor.yy356, yymsp[0].minor.yy616); }
+ yymsp[-1].minor.yy356 = yylhsminor.yy356;
break;
case 132: /* create_subtable_clause ::= not_exists_opt full_table_name USING full_table_name specific_cols_opt TAGS NK_LP expression_list NK_RP table_options */
-{ yylhsminor.yy560 = createCreateSubTableClause(pCxt, yymsp[-9].minor.yy173, yymsp[-8].minor.yy560, yymsp[-6].minor.yy560, yymsp[-5].minor.yy712, yymsp[-2].minor.yy712, yymsp[0].minor.yy560); }
- yymsp[-9].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = createCreateSubTableClause(pCxt, yymsp[-9].minor.yy151, yymsp[-8].minor.yy616, yymsp[-6].minor.yy616, yymsp[-5].minor.yy356, yymsp[-2].minor.yy356, yymsp[0].minor.yy616); }
+ yymsp[-9].minor.yy616 = yylhsminor.yy616;
break;
case 135: /* drop_table_clause ::= exists_opt full_table_name */
-{ yylhsminor.yy560 = createDropTableClause(pCxt, yymsp[-1].minor.yy173, yymsp[0].minor.yy560); }
- yymsp[-1].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = createDropTableClause(pCxt, yymsp[-1].minor.yy151, yymsp[0].minor.yy616); }
+ yymsp[-1].minor.yy616 = yylhsminor.yy616;
break;
case 136: /* specific_cols_opt ::= */
case 167: /* tags_def_opt ::= */ yytestcase(yyruleno==167);
- case 435: /* partition_by_clause_opt ::= */ yytestcase(yyruleno==435);
- case 452: /* group_by_clause_opt ::= */ yytestcase(yyruleno==452);
- case 468: /* order_by_clause_opt ::= */ yytestcase(yyruleno==468);
-{ yymsp[1].minor.yy712 = NULL; }
+ case 437: /* partition_by_clause_opt ::= */ yytestcase(yyruleno==437);
+ case 454: /* group_by_clause_opt ::= */ yytestcase(yyruleno==454);
+ case 470: /* order_by_clause_opt ::= */ yytestcase(yyruleno==470);
+{ yymsp[1].minor.yy356 = NULL; }
break;
case 137: /* specific_cols_opt ::= NK_LP col_name_list NK_RP */
-{ yymsp[-2].minor.yy712 = yymsp[-1].minor.yy712; }
+{ yymsp[-2].minor.yy356 = yymsp[-1].minor.yy356; }
break;
case 138: /* full_table_name ::= table_name */
-{ yylhsminor.yy560 = createRealTableNode(pCxt, NULL, &yymsp[0].minor.yy533, NULL); }
- yymsp[0].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = createRealTableNode(pCxt, NULL, &yymsp[0].minor.yy361, NULL); }
+ yymsp[0].minor.yy616 = yylhsminor.yy616;
break;
case 139: /* full_table_name ::= db_name NK_DOT table_name */
-{ yylhsminor.yy560 = createRealTableNode(pCxt, &yymsp[-2].minor.yy533, &yymsp[0].minor.yy533, NULL); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = createRealTableNode(pCxt, &yymsp[-2].minor.yy361, &yymsp[0].minor.yy361, NULL); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 142: /* column_def ::= column_name type_name */
-{ yylhsminor.yy560 = createColumnDefNode(pCxt, &yymsp[-1].minor.yy533, yymsp[0].minor.yy196, NULL); }
- yymsp[-1].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = createColumnDefNode(pCxt, &yymsp[-1].minor.yy361, yymsp[0].minor.yy600, NULL); }
+ yymsp[-1].minor.yy616 = yylhsminor.yy616;
break;
case 143: /* column_def ::= column_name type_name COMMENT NK_STRING */
-{ yylhsminor.yy560 = createColumnDefNode(pCxt, &yymsp[-3].minor.yy533, yymsp[-2].minor.yy196, &yymsp[0].minor.yy0); }
- yymsp[-3].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = createColumnDefNode(pCxt, &yymsp[-3].minor.yy361, yymsp[-2].minor.yy600, &yymsp[0].minor.yy0); }
+ yymsp[-3].minor.yy616 = yylhsminor.yy616;
break;
case 144: /* type_name ::= BOOL */
-{ yymsp[0].minor.yy196 = createDataType(TSDB_DATA_TYPE_BOOL); }
+{ yymsp[0].minor.yy600 = createDataType(TSDB_DATA_TYPE_BOOL); }
break;
case 145: /* type_name ::= TINYINT */
-{ yymsp[0].minor.yy196 = createDataType(TSDB_DATA_TYPE_TINYINT); }
+{ yymsp[0].minor.yy600 = createDataType(TSDB_DATA_TYPE_TINYINT); }
break;
case 146: /* type_name ::= SMALLINT */
-{ yymsp[0].minor.yy196 = createDataType(TSDB_DATA_TYPE_SMALLINT); }
+{ yymsp[0].minor.yy600 = createDataType(TSDB_DATA_TYPE_SMALLINT); }
break;
case 147: /* type_name ::= INT */
case 148: /* type_name ::= INTEGER */ yytestcase(yyruleno==148);
-{ yymsp[0].minor.yy196 = createDataType(TSDB_DATA_TYPE_INT); }
+{ yymsp[0].minor.yy600 = createDataType(TSDB_DATA_TYPE_INT); }
break;
case 149: /* type_name ::= BIGINT */
-{ yymsp[0].minor.yy196 = createDataType(TSDB_DATA_TYPE_BIGINT); }
+{ yymsp[0].minor.yy600 = createDataType(TSDB_DATA_TYPE_BIGINT); }
break;
case 150: /* type_name ::= FLOAT */
-{ yymsp[0].minor.yy196 = createDataType(TSDB_DATA_TYPE_FLOAT); }
+{ yymsp[0].minor.yy600 = createDataType(TSDB_DATA_TYPE_FLOAT); }
break;
case 151: /* type_name ::= DOUBLE */
-{ yymsp[0].minor.yy196 = createDataType(TSDB_DATA_TYPE_DOUBLE); }
+{ yymsp[0].minor.yy600 = createDataType(TSDB_DATA_TYPE_DOUBLE); }
break;
case 152: /* type_name ::= BINARY NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy196 = createVarLenDataType(TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy0); }
+{ yymsp[-3].minor.yy600 = createVarLenDataType(TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy0); }
break;
case 153: /* type_name ::= TIMESTAMP */
-{ yymsp[0].minor.yy196 = createDataType(TSDB_DATA_TYPE_TIMESTAMP); }
+{ yymsp[0].minor.yy600 = createDataType(TSDB_DATA_TYPE_TIMESTAMP); }
break;
case 154: /* type_name ::= NCHAR NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy196 = createVarLenDataType(TSDB_DATA_TYPE_NCHAR, &yymsp[-1].minor.yy0); }
+{ yymsp[-3].minor.yy600 = createVarLenDataType(TSDB_DATA_TYPE_NCHAR, &yymsp[-1].minor.yy0); }
break;
case 155: /* type_name ::= TINYINT UNSIGNED */
-{ yymsp[-1].minor.yy196 = createDataType(TSDB_DATA_TYPE_UTINYINT); }
+{ yymsp[-1].minor.yy600 = createDataType(TSDB_DATA_TYPE_UTINYINT); }
break;
case 156: /* type_name ::= SMALLINT UNSIGNED */
-{ yymsp[-1].minor.yy196 = createDataType(TSDB_DATA_TYPE_USMALLINT); }
+{ yymsp[-1].minor.yy600 = createDataType(TSDB_DATA_TYPE_USMALLINT); }
break;
case 157: /* type_name ::= INT UNSIGNED */
-{ yymsp[-1].minor.yy196 = createDataType(TSDB_DATA_TYPE_UINT); }
+{ yymsp[-1].minor.yy600 = createDataType(TSDB_DATA_TYPE_UINT); }
break;
case 158: /* type_name ::= BIGINT UNSIGNED */
-{ yymsp[-1].minor.yy196 = createDataType(TSDB_DATA_TYPE_UBIGINT); }
+{ yymsp[-1].minor.yy600 = createDataType(TSDB_DATA_TYPE_UBIGINT); }
break;
case 159: /* type_name ::= JSON */
-{ yymsp[0].minor.yy196 = createDataType(TSDB_DATA_TYPE_JSON); }
+{ yymsp[0].minor.yy600 = createDataType(TSDB_DATA_TYPE_JSON); }
break;
case 160: /* type_name ::= VARCHAR NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy196 = createVarLenDataType(TSDB_DATA_TYPE_VARCHAR, &yymsp[-1].minor.yy0); }
+{ yymsp[-3].minor.yy600 = createVarLenDataType(TSDB_DATA_TYPE_VARCHAR, &yymsp[-1].minor.yy0); }
break;
case 161: /* type_name ::= MEDIUMBLOB */
-{ yymsp[0].minor.yy196 = createDataType(TSDB_DATA_TYPE_MEDIUMBLOB); }
+{ yymsp[0].minor.yy600 = createDataType(TSDB_DATA_TYPE_MEDIUMBLOB); }
break;
case 162: /* type_name ::= BLOB */
-{ yymsp[0].minor.yy196 = createDataType(TSDB_DATA_TYPE_BLOB); }
+{ yymsp[0].minor.yy600 = createDataType(TSDB_DATA_TYPE_BLOB); }
break;
case 163: /* type_name ::= VARBINARY NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy196 = createVarLenDataType(TSDB_DATA_TYPE_VARBINARY, &yymsp[-1].minor.yy0); }
+{ yymsp[-3].minor.yy600 = createVarLenDataType(TSDB_DATA_TYPE_VARBINARY, &yymsp[-1].minor.yy0); }
break;
case 164: /* type_name ::= DECIMAL */
-{ yymsp[0].minor.yy196 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
+{ yymsp[0].minor.yy600 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
break;
case 165: /* type_name ::= DECIMAL NK_LP NK_INTEGER NK_RP */
-{ yymsp[-3].minor.yy196 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
+{ yymsp[-3].minor.yy600 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
break;
case 166: /* type_name ::= DECIMAL NK_LP NK_INTEGER NK_COMMA NK_INTEGER NK_RP */
-{ yymsp[-5].minor.yy196 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
+{ yymsp[-5].minor.yy600 = createDataType(TSDB_DATA_TYPE_DECIMAL); }
break;
case 168: /* tags_def_opt ::= tags_def */
- case 371: /* star_func_para_list ::= other_para_list */ yytestcase(yyruleno==371);
-{ yylhsminor.yy712 = yymsp[0].minor.yy712; }
- yymsp[0].minor.yy712 = yylhsminor.yy712;
+ case 373: /* star_func_para_list ::= other_para_list */ yytestcase(yyruleno==373);
+{ yylhsminor.yy356 = yymsp[0].minor.yy356; }
+ yymsp[0].minor.yy356 = yylhsminor.yy356;
break;
case 169: /* tags_def ::= TAGS NK_LP column_def_list NK_RP */
-{ yymsp[-3].minor.yy712 = yymsp[-1].minor.yy712; }
+{ yymsp[-3].minor.yy356 = yymsp[-1].minor.yy356; }
break;
case 170: /* table_options ::= */
-{ yymsp[1].minor.yy560 = createDefaultTableOptions(pCxt); }
+{ yymsp[1].minor.yy616 = createDefaultTableOptions(pCxt); }
break;
case 171: /* table_options ::= table_options COMMENT NK_STRING */
-{ yylhsminor.yy560 = setTableOption(pCxt, yymsp[-2].minor.yy560, TABLE_OPTION_COMMENT, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = setTableOption(pCxt, yymsp[-2].minor.yy616, TABLE_OPTION_COMMENT, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 172: /* table_options ::= table_options MAX_DELAY duration_list */
-{ yylhsminor.yy560 = setTableOption(pCxt, yymsp[-2].minor.yy560, TABLE_OPTION_MAXDELAY, yymsp[0].minor.yy712); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = setTableOption(pCxt, yymsp[-2].minor.yy616, TABLE_OPTION_MAXDELAY, yymsp[0].minor.yy356); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 173: /* table_options ::= table_options WATERMARK duration_list */
-{ yylhsminor.yy560 = setTableOption(pCxt, yymsp[-2].minor.yy560, TABLE_OPTION_WATERMARK, yymsp[0].minor.yy712); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = setTableOption(pCxt, yymsp[-2].minor.yy616, TABLE_OPTION_WATERMARK, yymsp[0].minor.yy356); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 174: /* table_options ::= table_options ROLLUP NK_LP rollup_func_list NK_RP */
-{ yylhsminor.yy560 = setTableOption(pCxt, yymsp[-4].minor.yy560, TABLE_OPTION_ROLLUP, yymsp[-1].minor.yy712); }
- yymsp[-4].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = setTableOption(pCxt, yymsp[-4].minor.yy616, TABLE_OPTION_ROLLUP, yymsp[-1].minor.yy356); }
+ yymsp[-4].minor.yy616 = yylhsminor.yy616;
break;
case 175: /* table_options ::= table_options TTL NK_INTEGER */
-{ yylhsminor.yy560 = setTableOption(pCxt, yymsp[-2].minor.yy560, TABLE_OPTION_TTL, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = setTableOption(pCxt, yymsp[-2].minor.yy616, TABLE_OPTION_TTL, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 176: /* table_options ::= table_options SMA NK_LP col_name_list NK_RP */
-{ yylhsminor.yy560 = setTableOption(pCxt, yymsp[-4].minor.yy560, TABLE_OPTION_SMA, yymsp[-1].minor.yy712); }
- yymsp[-4].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = setTableOption(pCxt, yymsp[-4].minor.yy616, TABLE_OPTION_SMA, yymsp[-1].minor.yy356); }
+ yymsp[-4].minor.yy616 = yylhsminor.yy616;
break;
case 177: /* alter_table_options ::= alter_table_option */
-{ yylhsminor.yy560 = createAlterTableOptions(pCxt); yylhsminor.yy560 = setTableOption(pCxt, yylhsminor.yy560, yymsp[0].minor.yy389.type, &yymsp[0].minor.yy389.val); }
- yymsp[0].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = createAlterTableOptions(pCxt); yylhsminor.yy616 = setTableOption(pCxt, yylhsminor.yy616, yymsp[0].minor.yy409.type, &yymsp[0].minor.yy409.val); }
+ yymsp[0].minor.yy616 = yylhsminor.yy616;
break;
case 178: /* alter_table_options ::= alter_table_options alter_table_option */
-{ yylhsminor.yy560 = setTableOption(pCxt, yymsp[-1].minor.yy560, yymsp[0].minor.yy389.type, &yymsp[0].minor.yy389.val); }
- yymsp[-1].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = setTableOption(pCxt, yymsp[-1].minor.yy616, yymsp[0].minor.yy409.type, &yymsp[0].minor.yy409.val); }
+ yymsp[-1].minor.yy616 = yylhsminor.yy616;
break;
case 179: /* alter_table_option ::= COMMENT NK_STRING */
-{ yymsp[-1].minor.yy389.type = TABLE_OPTION_COMMENT; yymsp[-1].minor.yy389.val = yymsp[0].minor.yy0; }
+{ yymsp[-1].minor.yy409.type = TABLE_OPTION_COMMENT; yymsp[-1].minor.yy409.val = yymsp[0].minor.yy0; }
break;
case 180: /* alter_table_option ::= TTL NK_INTEGER */
-{ yymsp[-1].minor.yy389.type = TABLE_OPTION_TTL; yymsp[-1].minor.yy389.val = yymsp[0].minor.yy0; }
+{ yymsp[-1].minor.yy409.type = TABLE_OPTION_TTL; yymsp[-1].minor.yy409.val = yymsp[0].minor.yy0; }
break;
case 181: /* duration_list ::= duration_literal */
- case 339: /* expression_list ::= expression */ yytestcase(yyruleno==339);
-{ yylhsminor.yy712 = createNodeList(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy560)); }
- yymsp[0].minor.yy712 = yylhsminor.yy712;
+ case 340: /* expression_list ::= expression */ yytestcase(yyruleno==340);
+{ yylhsminor.yy356 = createNodeList(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy616)); }
+ yymsp[0].minor.yy356 = yylhsminor.yy356;
break;
case 182: /* duration_list ::= duration_list NK_COMMA duration_literal */
- case 340: /* expression_list ::= expression_list NK_COMMA expression */ yytestcase(yyruleno==340);
-{ yylhsminor.yy712 = addNodeToList(pCxt, yymsp[-2].minor.yy712, releaseRawExprNode(pCxt, yymsp[0].minor.yy560)); }
- yymsp[-2].minor.yy712 = yylhsminor.yy712;
+ case 341: /* expression_list ::= expression_list NK_COMMA expression */ yytestcase(yyruleno==341);
+{ yylhsminor.yy356 = addNodeToList(pCxt, yymsp[-2].minor.yy356, releaseRawExprNode(pCxt, yymsp[0].minor.yy616)); }
+ yymsp[-2].minor.yy356 = yylhsminor.yy356;
break;
case 185: /* rollup_func_name ::= function_name */
-{ yylhsminor.yy560 = createFunctionNode(pCxt, &yymsp[0].minor.yy533, NULL); }
- yymsp[0].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = createFunctionNode(pCxt, &yymsp[0].minor.yy361, NULL); }
+ yymsp[0].minor.yy616 = yylhsminor.yy616;
break;
case 186: /* rollup_func_name ::= FIRST */
case 187: /* rollup_func_name ::= LAST */ yytestcase(yyruleno==187);
-{ yylhsminor.yy560 = createFunctionNode(pCxt, &yymsp[0].minor.yy0, NULL); }
- yymsp[0].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = createFunctionNode(pCxt, &yymsp[0].minor.yy0, NULL); }
+ yymsp[0].minor.yy616 = yylhsminor.yy616;
break;
case 190: /* col_name ::= column_name */
-{ yylhsminor.yy560 = createColumnNode(pCxt, NULL, &yymsp[0].minor.yy533); }
- yymsp[0].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = createColumnNode(pCxt, NULL, &yymsp[0].minor.yy361); }
+ yymsp[0].minor.yy616 = yylhsminor.yy616;
break;
case 191: /* cmd ::= SHOW DNODES */
{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_DNODES_STMT); }
@@ -3896,13 +3948,13 @@ static YYACTIONTYPE yy_reduce(
{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_DATABASES_STMT); }
break;
case 194: /* cmd ::= SHOW db_name_cond_opt TABLES like_pattern_opt */
-{ pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_TABLES_STMT, yymsp[-2].minor.yy560, yymsp[0].minor.yy560, OP_TYPE_LIKE); }
+{ pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_TABLES_STMT, yymsp[-2].minor.yy616, yymsp[0].minor.yy616, OP_TYPE_LIKE); }
break;
case 195: /* cmd ::= SHOW db_name_cond_opt STABLES like_pattern_opt */
-{ pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_STABLES_STMT, yymsp[-2].minor.yy560, yymsp[0].minor.yy560, OP_TYPE_LIKE); }
+{ pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_STABLES_STMT, yymsp[-2].minor.yy616, yymsp[0].minor.yy616, OP_TYPE_LIKE); }
break;
case 196: /* cmd ::= SHOW db_name_cond_opt VGROUPS */
-{ pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_VGROUPS_STMT, yymsp[-1].minor.yy560, NULL, OP_TYPE_LIKE); }
+{ pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_VGROUPS_STMT, yymsp[-1].minor.yy616, NULL, OP_TYPE_LIKE); }
break;
case 197: /* cmd ::= SHOW MNODES */
{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_MNODES_STMT); }
@@ -3917,7 +3969,7 @@ static YYACTIONTYPE yy_reduce(
{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_FUNCTIONS_STMT); }
break;
case 201: /* cmd ::= SHOW INDEXES FROM table_name_cond from_db_opt */
-{ pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_INDEXES_STMT, yymsp[0].minor.yy560, yymsp[-1].minor.yy560, OP_TYPE_EQUAL); }
+{ pCxt->pRootNode = createShowStmtWithCond(pCxt, QUERY_NODE_SHOW_INDEXES_STMT, yymsp[0].minor.yy616, yymsp[-1].minor.yy616, OP_TYPE_EQUAL); }
break;
case 202: /* cmd ::= SHOW STREAMS */
{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_STREAMS_STMT); }
@@ -3936,13 +3988,13 @@ static YYACTIONTYPE yy_reduce(
{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_LICENCE_STMT); }
break;
case 208: /* cmd ::= SHOW CREATE DATABASE db_name */
-{ pCxt->pRootNode = createShowCreateDatabaseStmt(pCxt, &yymsp[0].minor.yy533); }
+{ pCxt->pRootNode = createShowCreateDatabaseStmt(pCxt, &yymsp[0].minor.yy361); }
break;
case 209: /* cmd ::= SHOW CREATE TABLE full_table_name */
-{ pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_TABLE_STMT, yymsp[0].minor.yy560); }
+{ pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_TABLE_STMT, yymsp[0].minor.yy616); }
break;
case 210: /* cmd ::= SHOW CREATE STABLE full_table_name */
-{ pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_STABLE_STMT, yymsp[0].minor.yy560); }
+{ pCxt->pRootNode = createShowCreateTableStmt(pCxt, QUERY_NODE_SHOW_CREATE_STABLE_STMT, yymsp[0].minor.yy616); }
break;
case 211: /* cmd ::= SHOW QUERIES */
{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_QUERIES_STMT); }
@@ -3975,7 +4027,7 @@ static YYACTIONTYPE yy_reduce(
{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_TRANSACTIONS_STMT); }
break;
case 221: /* cmd ::= SHOW TABLE DISTRIBUTED full_table_name */
-{ pCxt->pRootNode = createShowTableDistributedStmt(pCxt, yymsp[0].minor.yy560); }
+{ pCxt->pRootNode = createShowTableDistributedStmt(pCxt, yymsp[0].minor.yy616); }
break;
case 222: /* cmd ::= SHOW CONSUMERS */
{ pCxt->pRootNode = createShowStmt(pCxt, QUERY_NODE_SHOW_CONSUMERS_STMT); }
@@ -3985,154 +4037,154 @@ static YYACTIONTYPE yy_reduce(
break;
case 224: /* db_name_cond_opt ::= */
case 229: /* from_db_opt ::= */ yytestcase(yyruleno==229);
-{ yymsp[1].minor.yy560 = createDefaultDatabaseCondValue(pCxt); }
+{ yymsp[1].minor.yy616 = createDefaultDatabaseCondValue(pCxt); }
break;
case 225: /* db_name_cond_opt ::= db_name NK_DOT */
-{ yylhsminor.yy560 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy533); }
- yymsp[-1].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[-1].minor.yy361); }
+ yymsp[-1].minor.yy616 = yylhsminor.yy616;
break;
case 226: /* like_pattern_opt ::= */
case 266: /* into_opt ::= */ yytestcase(yyruleno==266);
- case 404: /* from_clause_opt ::= */ yytestcase(yyruleno==404);
- case 433: /* where_clause_opt ::= */ yytestcase(yyruleno==433);
- case 437: /* twindow_clause_opt ::= */ yytestcase(yyruleno==437);
- case 442: /* sliding_opt ::= */ yytestcase(yyruleno==442);
- case 444: /* fill_opt ::= */ yytestcase(yyruleno==444);
- case 456: /* having_clause_opt ::= */ yytestcase(yyruleno==456);
- case 458: /* range_opt ::= */ yytestcase(yyruleno==458);
- case 460: /* every_opt ::= */ yytestcase(yyruleno==460);
- case 470: /* slimit_clause_opt ::= */ yytestcase(yyruleno==470);
- case 474: /* limit_clause_opt ::= */ yytestcase(yyruleno==474);
-{ yymsp[1].minor.yy560 = NULL; }
+ case 406: /* from_clause_opt ::= */ yytestcase(yyruleno==406);
+ case 435: /* where_clause_opt ::= */ yytestcase(yyruleno==435);
+ case 439: /* twindow_clause_opt ::= */ yytestcase(yyruleno==439);
+ case 444: /* sliding_opt ::= */ yytestcase(yyruleno==444);
+ case 446: /* fill_opt ::= */ yytestcase(yyruleno==446);
+ case 458: /* having_clause_opt ::= */ yytestcase(yyruleno==458);
+ case 460: /* range_opt ::= */ yytestcase(yyruleno==460);
+ case 462: /* every_opt ::= */ yytestcase(yyruleno==462);
+ case 472: /* slimit_clause_opt ::= */ yytestcase(yyruleno==472);
+ case 476: /* limit_clause_opt ::= */ yytestcase(yyruleno==476);
+{ yymsp[1].minor.yy616 = NULL; }
break;
case 227: /* like_pattern_opt ::= LIKE NK_STRING */
-{ yymsp[-1].minor.yy560 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); }
+{ yymsp[-1].minor.yy616 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); }
break;
case 228: /* table_name_cond ::= table_name */
-{ yylhsminor.yy560 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy533); }
- yymsp[0].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy361); }
+ yymsp[0].minor.yy616 = yylhsminor.yy616;
break;
case 230: /* from_db_opt ::= FROM db_name */
-{ yymsp[-1].minor.yy560 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy533); }
+{ yymsp[-1].minor.yy616 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy361); }
break;
case 231: /* cmd ::= CREATE SMA INDEX not_exists_opt index_name ON table_name index_options */
-{ pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_SMA, yymsp[-4].minor.yy173, &yymsp[-3].minor.yy533, &yymsp[-1].minor.yy533, NULL, yymsp[0].minor.yy560); }
+{ pCxt->pRootNode = createCreateIndexStmt(pCxt, INDEX_TYPE_SMA, yymsp[-4].minor.yy151, &yymsp[-3].minor.yy361, &yymsp[-1].minor.yy361, NULL, yymsp[0].minor.yy616); }
break;
case 232: /* cmd ::= DROP INDEX exists_opt index_name */
-{ pCxt->pRootNode = createDropIndexStmt(pCxt, yymsp[-1].minor.yy173, &yymsp[0].minor.yy533); }
+{ pCxt->pRootNode = createDropIndexStmt(pCxt, yymsp[-1].minor.yy151, &yymsp[0].minor.yy361); }
break;
case 233: /* index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_RP sliding_opt sma_stream_opt */
-{ yymsp[-9].minor.yy560 = createIndexOption(pCxt, yymsp[-7].minor.yy712, releaseRawExprNode(pCxt, yymsp[-3].minor.yy560), NULL, yymsp[-1].minor.yy560, yymsp[0].minor.yy560); }
+{ yymsp[-9].minor.yy616 = createIndexOption(pCxt, yymsp[-7].minor.yy356, releaseRawExprNode(pCxt, yymsp[-3].minor.yy616), NULL, yymsp[-1].minor.yy616, yymsp[0].minor.yy616); }
break;
case 234: /* index_options ::= FUNCTION NK_LP func_list NK_RP INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt sma_stream_opt */
-{ yymsp[-11].minor.yy560 = createIndexOption(pCxt, yymsp[-9].minor.yy712, releaseRawExprNode(pCxt, yymsp[-5].minor.yy560), releaseRawExprNode(pCxt, yymsp[-3].minor.yy560), yymsp[-1].minor.yy560, yymsp[0].minor.yy560); }
+{ yymsp[-11].minor.yy616 = createIndexOption(pCxt, yymsp[-9].minor.yy356, releaseRawExprNode(pCxt, yymsp[-5].minor.yy616), releaseRawExprNode(pCxt, yymsp[-3].minor.yy616), yymsp[-1].minor.yy616, yymsp[0].minor.yy616); }
break;
case 237: /* func ::= function_name NK_LP expression_list NK_RP */
-{ yylhsminor.yy560 = createFunctionNode(pCxt, &yymsp[-3].minor.yy533, yymsp[-1].minor.yy712); }
- yymsp[-3].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = createFunctionNode(pCxt, &yymsp[-3].minor.yy361, yymsp[-1].minor.yy356); }
+ yymsp[-3].minor.yy616 = yylhsminor.yy616;
break;
case 238: /* sma_stream_opt ::= */
case 268: /* stream_options ::= */ yytestcase(yyruleno==268);
-{ yymsp[1].minor.yy560 = createStreamOptions(pCxt); }
+{ yymsp[1].minor.yy616 = createStreamOptions(pCxt); }
break;
case 239: /* sma_stream_opt ::= stream_options WATERMARK duration_literal */
case 272: /* stream_options ::= stream_options WATERMARK duration_literal */ yytestcase(yyruleno==272);
-{ ((SStreamOptions*)yymsp[-2].minor.yy560)->pWatermark = releaseRawExprNode(pCxt, yymsp[0].minor.yy560); yylhsminor.yy560 = yymsp[-2].minor.yy560; }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ ((SStreamOptions*)yymsp[-2].minor.yy616)->pWatermark = releaseRawExprNode(pCxt, yymsp[0].minor.yy616); yylhsminor.yy616 = yymsp[-2].minor.yy616; }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 240: /* sma_stream_opt ::= stream_options MAX_DELAY duration_literal */
-{ ((SStreamOptions*)yymsp[-2].minor.yy560)->pDelay = releaseRawExprNode(pCxt, yymsp[0].minor.yy560); yylhsminor.yy560 = yymsp[-2].minor.yy560; }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ ((SStreamOptions*)yymsp[-2].minor.yy616)->pDelay = releaseRawExprNode(pCxt, yymsp[0].minor.yy616); yylhsminor.yy616 = yymsp[-2].minor.yy616; }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 241: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS query_expression */
-{ pCxt->pRootNode = createCreateTopicStmtUseQuery(pCxt, yymsp[-3].minor.yy173, &yymsp[-2].minor.yy533, yymsp[0].minor.yy560); }
+{ pCxt->pRootNode = createCreateTopicStmtUseQuery(pCxt, yymsp[-3].minor.yy151, &yymsp[-2].minor.yy361, yymsp[0].minor.yy616); }
break;
case 242: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS DATABASE db_name */
-{ pCxt->pRootNode = createCreateTopicStmtUseDb(pCxt, yymsp[-4].minor.yy173, &yymsp[-3].minor.yy533, &yymsp[0].minor.yy533, false); }
+{ pCxt->pRootNode = createCreateTopicStmtUseDb(pCxt, yymsp[-4].minor.yy151, &yymsp[-3].minor.yy361, &yymsp[0].minor.yy361, false); }
break;
case 243: /* cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS DATABASE db_name */
-{ pCxt->pRootNode = createCreateTopicStmtUseDb(pCxt, yymsp[-6].minor.yy173, &yymsp[-5].minor.yy533, &yymsp[0].minor.yy533, true); }
+{ pCxt->pRootNode = createCreateTopicStmtUseDb(pCxt, yymsp[-6].minor.yy151, &yymsp[-5].minor.yy361, &yymsp[0].minor.yy361, true); }
break;
case 244: /* cmd ::= CREATE TOPIC not_exists_opt topic_name AS STABLE full_table_name */
-{ pCxt->pRootNode = createCreateTopicStmtUseTable(pCxt, yymsp[-4].minor.yy173, &yymsp[-3].minor.yy533, yymsp[0].minor.yy560, false); }
+{ pCxt->pRootNode = createCreateTopicStmtUseTable(pCxt, yymsp[-4].minor.yy151, &yymsp[-3].minor.yy361, yymsp[0].minor.yy616, false); }
break;
case 245: /* cmd ::= CREATE TOPIC not_exists_opt topic_name WITH META AS STABLE full_table_name */
-{ pCxt->pRootNode = createCreateTopicStmtUseTable(pCxt, yymsp[-6].minor.yy173, &yymsp[-5].minor.yy533, yymsp[0].minor.yy560, true); }
+{ pCxt->pRootNode = createCreateTopicStmtUseTable(pCxt, yymsp[-6].minor.yy151, &yymsp[-5].minor.yy361, yymsp[0].minor.yy616, true); }
break;
case 246: /* cmd ::= DROP TOPIC exists_opt topic_name */
-{ pCxt->pRootNode = createDropTopicStmt(pCxt, yymsp[-1].minor.yy173, &yymsp[0].minor.yy533); }
+{ pCxt->pRootNode = createDropTopicStmt(pCxt, yymsp[-1].minor.yy151, &yymsp[0].minor.yy361); }
break;
case 247: /* cmd ::= DROP CONSUMER GROUP exists_opt cgroup_name ON topic_name */
-{ pCxt->pRootNode = createDropCGroupStmt(pCxt, yymsp[-3].minor.yy173, &yymsp[-2].minor.yy533, &yymsp[0].minor.yy533); }
+{ pCxt->pRootNode = createDropCGroupStmt(pCxt, yymsp[-3].minor.yy151, &yymsp[-2].minor.yy361, &yymsp[0].minor.yy361); }
break;
case 248: /* cmd ::= DESC full_table_name */
case 249: /* cmd ::= DESCRIBE full_table_name */ yytestcase(yyruleno==249);
-{ pCxt->pRootNode = createDescribeStmt(pCxt, yymsp[0].minor.yy560); }
+{ pCxt->pRootNode = createDescribeStmt(pCxt, yymsp[0].minor.yy616); }
break;
case 250: /* cmd ::= RESET QUERY CACHE */
{ pCxt->pRootNode = createResetQueryCacheStmt(pCxt); }
break;
case 251: /* cmd ::= EXPLAIN analyze_opt explain_options query_expression */
-{ pCxt->pRootNode = createExplainStmt(pCxt, yymsp[-2].minor.yy173, yymsp[-1].minor.yy560, yymsp[0].minor.yy560); }
+{ pCxt->pRootNode = createExplainStmt(pCxt, yymsp[-2].minor.yy151, yymsp[-1].minor.yy616, yymsp[0].minor.yy616); }
break;
case 253: /* analyze_opt ::= ANALYZE */
case 261: /* agg_func_opt ::= AGGREGATE */ yytestcase(yyruleno==261);
- case 424: /* set_quantifier_opt ::= DISTINCT */ yytestcase(yyruleno==424);
-{ yymsp[0].minor.yy173 = true; }
+ case 426: /* set_quantifier_opt ::= DISTINCT */ yytestcase(yyruleno==426);
+{ yymsp[0].minor.yy151 = true; }
break;
case 254: /* explain_options ::= */
-{ yymsp[1].minor.yy560 = createDefaultExplainOptions(pCxt); }
+{ yymsp[1].minor.yy616 = createDefaultExplainOptions(pCxt); }
break;
case 255: /* explain_options ::= explain_options VERBOSE NK_BOOL */
-{ yylhsminor.yy560 = setExplainVerbose(pCxt, yymsp[-2].minor.yy560, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = setExplainVerbose(pCxt, yymsp[-2].minor.yy616, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 256: /* explain_options ::= explain_options RATIO NK_FLOAT */
-{ yylhsminor.yy560 = setExplainRatio(pCxt, yymsp[-2].minor.yy560, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ yylhsminor.yy616 = setExplainRatio(pCxt, yymsp[-2].minor.yy616, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 257: /* cmd ::= COMPACT VNODES IN NK_LP integer_list NK_RP */
-{ pCxt->pRootNode = createCompactStmt(pCxt, yymsp[-1].minor.yy712); }
+{ pCxt->pRootNode = createCompactStmt(pCxt, yymsp[-1].minor.yy356); }
break;
case 258: /* cmd ::= CREATE agg_func_opt FUNCTION not_exists_opt function_name AS NK_STRING OUTPUTTYPE type_name bufsize_opt */
-{ pCxt->pRootNode = createCreateFunctionStmt(pCxt, yymsp[-6].minor.yy173, yymsp[-8].minor.yy173, &yymsp[-5].minor.yy533, &yymsp[-3].minor.yy0, yymsp[-1].minor.yy196, yymsp[0].minor.yy424); }
+{ pCxt->pRootNode = createCreateFunctionStmt(pCxt, yymsp[-6].minor.yy151, yymsp[-8].minor.yy151, &yymsp[-5].minor.yy361, &yymsp[-3].minor.yy0, yymsp[-1].minor.yy600, yymsp[0].minor.yy734); }
break;
case 259: /* cmd ::= DROP FUNCTION exists_opt function_name */
-{ pCxt->pRootNode = createDropFunctionStmt(pCxt, yymsp[-1].minor.yy173, &yymsp[0].minor.yy533); }
+{ pCxt->pRootNode = createDropFunctionStmt(pCxt, yymsp[-1].minor.yy151, &yymsp[0].minor.yy361); }
break;
case 262: /* bufsize_opt ::= */
-{ yymsp[1].minor.yy424 = 0; }
+{ yymsp[1].minor.yy734 = 0; }
break;
case 263: /* bufsize_opt ::= BUFSIZE NK_INTEGER */
-{ yymsp[-1].minor.yy424 = taosStr2Int32(yymsp[0].minor.yy0.z, NULL, 10); }
+{ yymsp[-1].minor.yy734 = taosStr2Int32(yymsp[0].minor.yy0.z, NULL, 10); }
break;
case 264: /* cmd ::= CREATE STREAM not_exists_opt stream_name stream_options into_opt AS query_expression */
-{ pCxt->pRootNode = createCreateStreamStmt(pCxt, yymsp[-5].minor.yy173, &yymsp[-4].minor.yy533, yymsp[-2].minor.yy560, yymsp[-3].minor.yy560, yymsp[0].minor.yy560); }
+{ pCxt->pRootNode = createCreateStreamStmt(pCxt, yymsp[-5].minor.yy151, &yymsp[-4].minor.yy361, yymsp[-2].minor.yy616, yymsp[-3].minor.yy616, yymsp[0].minor.yy616); }
break;
case 265: /* cmd ::= DROP STREAM exists_opt stream_name */
-{ pCxt->pRootNode = createDropStreamStmt(pCxt, yymsp[-1].minor.yy173, &yymsp[0].minor.yy533); }
+{ pCxt->pRootNode = createDropStreamStmt(pCxt, yymsp[-1].minor.yy151, &yymsp[0].minor.yy361); }
break;
case 267: /* into_opt ::= INTO full_table_name */
- case 405: /* from_clause_opt ::= FROM table_reference_list */ yytestcase(yyruleno==405);
- case 434: /* where_clause_opt ::= WHERE search_condition */ yytestcase(yyruleno==434);
- case 457: /* having_clause_opt ::= HAVING search_condition */ yytestcase(yyruleno==457);
-{ yymsp[-1].minor.yy560 = yymsp[0].minor.yy560; }
+ case 407: /* from_clause_opt ::= FROM table_reference_list */ yytestcase(yyruleno==407);
+ case 436: /* where_clause_opt ::= WHERE search_condition */ yytestcase(yyruleno==436);
+ case 459: /* having_clause_opt ::= HAVING search_condition */ yytestcase(yyruleno==459);
+{ yymsp[-1].minor.yy616 = yymsp[0].minor.yy616; }
break;
case 269: /* stream_options ::= stream_options TRIGGER AT_ONCE */
-{ ((SStreamOptions*)yymsp[-2].minor.yy560)->triggerType = STREAM_TRIGGER_AT_ONCE; yylhsminor.yy560 = yymsp[-2].minor.yy560; }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ ((SStreamOptions*)yymsp[-2].minor.yy616)->triggerType = STREAM_TRIGGER_AT_ONCE; yylhsminor.yy616 = yymsp[-2].minor.yy616; }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 270: /* stream_options ::= stream_options TRIGGER WINDOW_CLOSE */
-{ ((SStreamOptions*)yymsp[-2].minor.yy560)->triggerType = STREAM_TRIGGER_WINDOW_CLOSE; yylhsminor.yy560 = yymsp[-2].minor.yy560; }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ ((SStreamOptions*)yymsp[-2].minor.yy616)->triggerType = STREAM_TRIGGER_WINDOW_CLOSE; yylhsminor.yy616 = yymsp[-2].minor.yy616; }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 271: /* stream_options ::= stream_options TRIGGER MAX_DELAY duration_literal */
-{ ((SStreamOptions*)yymsp[-3].minor.yy560)->triggerType = STREAM_TRIGGER_MAX_DELAY; ((SStreamOptions*)yymsp[-3].minor.yy560)->pDelay = releaseRawExprNode(pCxt, yymsp[0].minor.yy560); yylhsminor.yy560 = yymsp[-3].minor.yy560; }
- yymsp[-3].minor.yy560 = yylhsminor.yy560;
+{ ((SStreamOptions*)yymsp[-3].minor.yy616)->triggerType = STREAM_TRIGGER_MAX_DELAY; ((SStreamOptions*)yymsp[-3].minor.yy616)->pDelay = releaseRawExprNode(pCxt, yymsp[0].minor.yy616); yylhsminor.yy616 = yymsp[-3].minor.yy616; }
+ yymsp[-3].minor.yy616 = yylhsminor.yy616;
break;
case 273: /* stream_options ::= stream_options IGNORE EXPIRED */
-{ ((SStreamOptions*)yymsp[-2].minor.yy560)->ignoreExpired = true; yylhsminor.yy560 = yymsp[-2].minor.yy560; }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+{ ((SStreamOptions*)yymsp[-2].minor.yy616)->ignoreExpired = true; yylhsminor.yy616 = yymsp[-2].minor.yy616; }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
case 274: /* cmd ::= KILL CONNECTION NK_INTEGER */
{ pCxt->pRootNode = createKillStmt(pCxt, QUERY_NODE_KILL_CONNECTION_STMT, &yymsp[0].minor.yy0); }
@@ -4150,546 +4202,550 @@ static YYACTIONTYPE yy_reduce(
{ pCxt->pRootNode = createMergeVgroupStmt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0); }
break;
case 279: /* cmd ::= REDISTRIBUTE VGROUP NK_INTEGER dnode_list */
-{ pCxt->pRootNode = createRedistributeVgroupStmt(pCxt, &yymsp[-1].minor.yy0, yymsp[0].minor.yy712); }
+{ pCxt->pRootNode = createRedistributeVgroupStmt(pCxt, &yymsp[-1].minor.yy0, yymsp[0].minor.yy356); }
break;
case 280: /* cmd ::= SPLIT VGROUP NK_INTEGER */
{ pCxt->pRootNode = createSplitVgroupStmt(pCxt, &yymsp[0].minor.yy0); }
break;
case 281: /* dnode_list ::= DNODE NK_INTEGER */
-{ yymsp[-1].minor.yy712 = createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
+{ yymsp[-1].minor.yy356 = createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
break;
case 283: /* cmd ::= SYNCDB db_name REPLICA */
-{ pCxt->pRootNode = createSyncdbStmt(pCxt, &yymsp[-1].minor.yy533); }
+{ pCxt->pRootNode = createSyncdbStmt(pCxt, &yymsp[-1].minor.yy361); }
break;
case 284: /* cmd ::= DELETE FROM full_table_name where_clause_opt */
-{ pCxt->pRootNode = createDeleteStmt(pCxt, yymsp[-1].minor.yy560, yymsp[0].minor.yy560); }
+{ pCxt->pRootNode = createDeleteStmt(pCxt, yymsp[-1].minor.yy616, yymsp[0].minor.yy616); }
break;
- case 286: /* cmd ::= INSERT INTO full_table_name specific_cols_opt query_expression */
-{ pCxt->pRootNode = createInsertStmt(pCxt, yymsp[-2].minor.yy560, yymsp[-1].minor.yy712, yymsp[0].minor.yy560); }
+ case 286: /* cmd ::= INSERT INTO full_table_name NK_LP col_name_list NK_RP query_expression */
+{ pCxt->pRootNode = createInsertStmt(pCxt, yymsp[-4].minor.yy616, yymsp[-2].minor.yy356, yymsp[0].minor.yy616); }
break;
- case 287: /* literal ::= NK_INTEGER */
-{ yylhsminor.yy560 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
- yymsp[0].minor.yy560 = yylhsminor.yy560;
+ case 287: /* cmd ::= INSERT INTO full_table_name query_expression */
+{ pCxt->pRootNode = createInsertStmt(pCxt, yymsp[-1].minor.yy616, NULL, yymsp[0].minor.yy616); }
break;
- case 288: /* literal ::= NK_FLOAT */
-{ yylhsminor.yy560 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0)); }
- yymsp[0].minor.yy560 = yylhsminor.yy560;
+ case 288: /* literal ::= NK_INTEGER */
+{ yylhsminor.yy616 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0)); }
+ yymsp[0].minor.yy616 = yylhsminor.yy616;
break;
- case 289: /* literal ::= NK_STRING */
-{ yylhsminor.yy560 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0)); }
- yymsp[0].minor.yy560 = yylhsminor.yy560;
+ case 289: /* literal ::= NK_FLOAT */
+{ yylhsminor.yy616 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0)); }
+ yymsp[0].minor.yy616 = yylhsminor.yy616;
break;
- case 290: /* literal ::= NK_BOOL */
-{ yylhsminor.yy560 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0)); }
- yymsp[0].minor.yy560 = yylhsminor.yy560;
+ case 290: /* literal ::= NK_STRING */
+{ yylhsminor.yy616 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0)); }
+ yymsp[0].minor.yy616 = yylhsminor.yy616;
break;
- case 291: /* literal ::= TIMESTAMP NK_STRING */
-{ yylhsminor.yy560 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0)); }
- yymsp[-1].minor.yy560 = yylhsminor.yy560;
+ case 291: /* literal ::= NK_BOOL */
+{ yylhsminor.yy616 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0)); }
+ yymsp[0].minor.yy616 = yylhsminor.yy616;
break;
- case 292: /* literal ::= duration_literal */
- case 302: /* signed_literal ::= signed */ yytestcase(yyruleno==302);
- case 323: /* expression ::= literal */ yytestcase(yyruleno==323);
- case 324: /* expression ::= pseudo_column */ yytestcase(yyruleno==324);
- case 325: /* expression ::= column_reference */ yytestcase(yyruleno==325);
- case 326: /* expression ::= function_expression */ yytestcase(yyruleno==326);
- case 327: /* expression ::= subquery */ yytestcase(yyruleno==327);
- case 354: /* function_expression ::= literal_func */ yytestcase(yyruleno==354);
- case 396: /* boolean_value_expression ::= boolean_primary */ yytestcase(yyruleno==396);
- case 400: /* boolean_primary ::= predicate */ yytestcase(yyruleno==400);
- case 402: /* common_expression ::= expression */ yytestcase(yyruleno==402);
- case 403: /* common_expression ::= boolean_value_expression */ yytestcase(yyruleno==403);
- case 406: /* table_reference_list ::= table_reference */ yytestcase(yyruleno==406);
- case 408: /* table_reference ::= table_primary */ yytestcase(yyruleno==408);
- case 409: /* table_reference ::= joined_table */ yytestcase(yyruleno==409);
- case 413: /* table_primary ::= parenthesized_joined_table */ yytestcase(yyruleno==413);
- case 463: /* query_expression_body ::= query_primary */ yytestcase(yyruleno==463);
- case 466: /* query_primary ::= query_specification */ yytestcase(yyruleno==466);
-{ yylhsminor.yy560 = yymsp[0].minor.yy560; }
- yymsp[0].minor.yy560 = yylhsminor.yy560;
+ case 292: /* literal ::= TIMESTAMP NK_STRING */
+{ yylhsminor.yy616 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0)); }
+ yymsp[-1].minor.yy616 = yylhsminor.yy616;
break;
- case 293: /* literal ::= NULL */
-{ yylhsminor.yy560 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_NULL, &yymsp[0].minor.yy0)); }
- yymsp[0].minor.yy560 = yylhsminor.yy560;
+ case 293: /* literal ::= duration_literal */
+ case 303: /* signed_literal ::= signed */ yytestcase(yyruleno==303);
+ case 324: /* expression ::= literal */ yytestcase(yyruleno==324);
+ case 325: /* expression ::= pseudo_column */ yytestcase(yyruleno==325);
+ case 326: /* expression ::= column_reference */ yytestcase(yyruleno==326);
+ case 327: /* expression ::= function_expression */ yytestcase(yyruleno==327);
+ case 328: /* expression ::= subquery */ yytestcase(yyruleno==328);
+ case 356: /* function_expression ::= literal_func */ yytestcase(yyruleno==356);
+ case 398: /* boolean_value_expression ::= boolean_primary */ yytestcase(yyruleno==398);
+ case 402: /* boolean_primary ::= predicate */ yytestcase(yyruleno==402);
+ case 404: /* common_expression ::= expression */ yytestcase(yyruleno==404);
+ case 405: /* common_expression ::= boolean_value_expression */ yytestcase(yyruleno==405);
+ case 408: /* table_reference_list ::= table_reference */ yytestcase(yyruleno==408);
+ case 410: /* table_reference ::= table_primary */ yytestcase(yyruleno==410);
+ case 411: /* table_reference ::= joined_table */ yytestcase(yyruleno==411);
+ case 415: /* table_primary ::= parenthesized_joined_table */ yytestcase(yyruleno==415);
+ case 465: /* query_expression_body ::= query_primary */ yytestcase(yyruleno==465);
+ case 468: /* query_primary ::= query_specification */ yytestcase(yyruleno==468);
+{ yylhsminor.yy616 = yymsp[0].minor.yy616; }
+ yymsp[0].minor.yy616 = yylhsminor.yy616;
break;
- case 294: /* literal ::= NK_QUESTION */
-{ yylhsminor.yy560 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createPlaceholderValueNode(pCxt, &yymsp[0].minor.yy0)); }
- yymsp[0].minor.yy560 = yylhsminor.yy560;
+ case 294: /* literal ::= NULL */
+{ yylhsminor.yy616 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createValueNode(pCxt, TSDB_DATA_TYPE_NULL, &yymsp[0].minor.yy0)); }
+ yymsp[0].minor.yy616 = yylhsminor.yy616;
break;
- case 295: /* duration_literal ::= NK_VARIABLE */
-{ yylhsminor.yy560 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
- yymsp[0].minor.yy560 = yylhsminor.yy560;
+ case 295: /* literal ::= NK_QUESTION */
+{ yylhsminor.yy616 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createPlaceholderValueNode(pCxt, &yymsp[0].minor.yy0)); }
+ yymsp[0].minor.yy616 = yylhsminor.yy616;
break;
- case 296: /* signed ::= NK_INTEGER */
-{ yylhsminor.yy560 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
- yymsp[0].minor.yy560 = yylhsminor.yy560;
+ case 296: /* duration_literal ::= NK_VARIABLE */
+{ yylhsminor.yy616 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createDurationValueNode(pCxt, &yymsp[0].minor.yy0)); }
+ yymsp[0].minor.yy616 = yylhsminor.yy616;
break;
- case 297: /* signed ::= NK_PLUS NK_INTEGER */
-{ yymsp[-1].minor.yy560 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
+ case 297: /* signed ::= NK_INTEGER */
+{ yylhsminor.yy616 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
+ yymsp[0].minor.yy616 = yylhsminor.yy616;
break;
- case 298: /* signed ::= NK_MINUS NK_INTEGER */
+ case 298: /* signed ::= NK_PLUS NK_INTEGER */
+{ yymsp[-1].minor.yy616 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &yymsp[0].minor.yy0); }
+ break;
+ case 299: /* 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.yy560 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &t);
+ yylhsminor.yy616 = createValueNode(pCxt, TSDB_DATA_TYPE_BIGINT, &t);
}
- yymsp[-1].minor.yy560 = yylhsminor.yy560;
+ yymsp[-1].minor.yy616 = yylhsminor.yy616;
break;
- case 299: /* signed ::= NK_FLOAT */
-{ yylhsminor.yy560 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); }
- yymsp[0].minor.yy560 = yylhsminor.yy560;
+ case 300: /* signed ::= NK_FLOAT */
+{ yylhsminor.yy616 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); }
+ yymsp[0].minor.yy616 = yylhsminor.yy616;
break;
- case 300: /* signed ::= NK_PLUS NK_FLOAT */
-{ yymsp[-1].minor.yy560 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); }
+ case 301: /* signed ::= NK_PLUS NK_FLOAT */
+{ yymsp[-1].minor.yy616 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &yymsp[0].minor.yy0); }
break;
- case 301: /* signed ::= NK_MINUS NK_FLOAT */
+ case 302: /* 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.yy560 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &t);
+ yylhsminor.yy616 = createValueNode(pCxt, TSDB_DATA_TYPE_DOUBLE, &t);
}
- yymsp[-1].minor.yy560 = yylhsminor.yy560;
+ yymsp[-1].minor.yy616 = yylhsminor.yy616;
break;
- case 303: /* signed_literal ::= NK_STRING */
-{ yylhsminor.yy560 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); }
- yymsp[0].minor.yy560 = yylhsminor.yy560;
+ case 304: /* signed_literal ::= NK_STRING */
+{ yylhsminor.yy616 = createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0); }
+ yymsp[0].minor.yy616 = yylhsminor.yy616;
break;
- case 304: /* signed_literal ::= NK_BOOL */
-{ yylhsminor.yy560 = createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0); }
- yymsp[0].minor.yy560 = yylhsminor.yy560;
+ case 305: /* signed_literal ::= NK_BOOL */
+{ yylhsminor.yy616 = createValueNode(pCxt, TSDB_DATA_TYPE_BOOL, &yymsp[0].minor.yy0); }
+ yymsp[0].minor.yy616 = yylhsminor.yy616;
break;
- case 305: /* signed_literal ::= TIMESTAMP NK_STRING */
-{ yymsp[-1].minor.yy560 = createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0); }
+ case 306: /* signed_literal ::= TIMESTAMP NK_STRING */
+{ yymsp[-1].minor.yy616 = createValueNode(pCxt, TSDB_DATA_TYPE_TIMESTAMP, &yymsp[0].minor.yy0); }
break;
- case 306: /* signed_literal ::= duration_literal */
- case 308: /* signed_literal ::= literal_func */ yytestcase(yyruleno==308);
- case 374: /* star_func_para ::= expression */ yytestcase(yyruleno==374);
- case 429: /* select_item ::= common_expression */ yytestcase(yyruleno==429);
- case 479: /* search_condition ::= common_expression */ yytestcase(yyruleno==479);
-{ yylhsminor.yy560 = releaseRawExprNode(pCxt, yymsp[0].minor.yy560); }
- yymsp[0].minor.yy560 = yylhsminor.yy560;
+ case 307: /* signed_literal ::= duration_literal */
+ case 309: /* signed_literal ::= literal_func */ yytestcase(yyruleno==309);
+ case 376: /* star_func_para ::= expression */ yytestcase(yyruleno==376);
+ case 431: /* select_item ::= common_expression */ yytestcase(yyruleno==431);
+ case 481: /* search_condition ::= common_expression */ yytestcase(yyruleno==481);
+{ yylhsminor.yy616 = releaseRawExprNode(pCxt, yymsp[0].minor.yy616); }
+ yymsp[0].minor.yy616 = yylhsminor.yy616;
break;
- case 307: /* signed_literal ::= NULL */
-{ yylhsminor.yy560 = createValueNode(pCxt, TSDB_DATA_TYPE_NULL, &yymsp[0].minor.yy0); }
- yymsp[0].minor.yy560 = yylhsminor.yy560;
+ case 308: /* signed_literal ::= NULL */
+{ yylhsminor.yy616 = createValueNode(pCxt, TSDB_DATA_TYPE_NULL, &yymsp[0].minor.yy0); }
+ yymsp[0].minor.yy616 = yylhsminor.yy616;
break;
- case 309: /* signed_literal ::= NK_QUESTION */
-{ yylhsminor.yy560 = createPlaceholderValueNode(pCxt, &yymsp[0].minor.yy0); }
- yymsp[0].minor.yy560 = yylhsminor.yy560;
+ case 310: /* signed_literal ::= NK_QUESTION */
+{ yylhsminor.yy616 = createPlaceholderValueNode(pCxt, &yymsp[0].minor.yy0); }
+ yymsp[0].minor.yy616 = yylhsminor.yy616;
break;
- case 328: /* expression ::= NK_LP expression NK_RP */
- case 401: /* boolean_primary ::= NK_LP boolean_value_expression NK_RP */ yytestcase(yyruleno==401);
-{ yylhsminor.yy560 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, releaseRawExprNode(pCxt, yymsp[-1].minor.yy560)); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+ case 329: /* expression ::= NK_LP expression NK_RP */
+ case 403: /* boolean_primary ::= NK_LP boolean_value_expression NK_RP */ yytestcase(yyruleno==403);
+{ yylhsminor.yy616 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, releaseRawExprNode(pCxt, yymsp[-1].minor.yy616)); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
- case 329: /* expression ::= NK_PLUS expression */
+ case 330: /* expression ::= NK_PLUS expression */
{
- SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560);
- yylhsminor.yy560 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, releaseRawExprNode(pCxt, yymsp[0].minor.yy560));
+ SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy616);
+ yylhsminor.yy616 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, releaseRawExprNode(pCxt, yymsp[0].minor.yy616));
}
- yymsp[-1].minor.yy560 = yylhsminor.yy560;
+ yymsp[-1].minor.yy616 = yylhsminor.yy616;
break;
- case 330: /* expression ::= NK_MINUS expression */
+ case 331: /* expression ::= NK_MINUS expression */
{
- SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560);
- yylhsminor.yy560 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, createOperatorNode(pCxt, OP_TYPE_MINUS, releaseRawExprNode(pCxt, yymsp[0].minor.yy560), NULL));
+ SToken t = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy616);
+ yylhsminor.yy616 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &t, createOperatorNode(pCxt, OP_TYPE_MINUS, releaseRawExprNode(pCxt, yymsp[0].minor.yy616), NULL));
}
- yymsp[-1].minor.yy560 = yylhsminor.yy560;
+ yymsp[-1].minor.yy616 = yylhsminor.yy616;
break;
- case 331: /* expression ::= expression NK_PLUS expression */
+ case 332: /* expression ::= expression NK_PLUS expression */
{
- SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy560);
- SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560);
- yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_ADD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), releaseRawExprNode(pCxt, yymsp[0].minor.yy560)));
+ SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy616);
+ SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy616);
+ yylhsminor.yy616 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_ADD, releaseRawExprNode(pCxt, yymsp[-2].minor.yy616), releaseRawExprNode(pCxt, yymsp[0].minor.yy616)));
}
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
- case 332: /* expression ::= expression NK_MINUS expression */
+ case 333: /* expression ::= expression NK_MINUS expression */
{
- SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy560);
- SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560);
- yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_SUB, releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), releaseRawExprNode(pCxt, yymsp[0].minor.yy560)));
+ SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy616);
+ SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy616);
+ yylhsminor.yy616 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_SUB, releaseRawExprNode(pCxt, yymsp[-2].minor.yy616), releaseRawExprNode(pCxt, yymsp[0].minor.yy616)));
}
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
- case 333: /* expression ::= expression NK_STAR expression */
+ case 334: /* expression ::= expression NK_STAR expression */
{
- SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy560);
- SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560);
- yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MULTI, releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), releaseRawExprNode(pCxt, yymsp[0].minor.yy560)));
+ SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy616);
+ SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy616);
+ yylhsminor.yy616 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_MULTI, releaseRawExprNode(pCxt, yymsp[-2].minor.yy616), releaseRawExprNode(pCxt, yymsp[0].minor.yy616)));
}
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
- case 334: /* expression ::= expression NK_SLASH expression */
+ case 335: /* expression ::= expression NK_SLASH expression */
{
- SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy560);
- SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560);
- yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_DIV, releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), releaseRawExprNode(pCxt, yymsp[0].minor.yy560)));
+ SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy616);
+ SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy616);
+ yylhsminor.yy616 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_DIV, releaseRawExprNode(pCxt, yymsp[-2].minor.yy616), releaseRawExprNode(pCxt, yymsp[0].minor.yy616)));
}
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
- case 335: /* expression ::= expression NK_REM expression */
+ case 336: /* expression ::= expression NK_REM expression */
{
- SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy560);
- SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560);
- yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_REM, releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), releaseRawExprNode(pCxt, yymsp[0].minor.yy560)));
+ SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy616);
+ SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy616);
+ yylhsminor.yy616 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_REM, releaseRawExprNode(pCxt, yymsp[-2].minor.yy616), releaseRawExprNode(pCxt, yymsp[0].minor.yy616)));
}
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
- case 336: /* expression ::= column_reference NK_ARROW NK_STRING */
+ case 337: /* expression ::= column_reference NK_ARROW NK_STRING */
{
- SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy560);
- yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_JSON_GET_VALUE, releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0)));
+ SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy616);
+ yylhsminor.yy616 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_JSON_GET_VALUE, releaseRawExprNode(pCxt, yymsp[-2].minor.yy616), createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[0].minor.yy0)));
}
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
- case 337: /* expression ::= expression NK_BITAND expression */
+ case 338: /* expression ::= expression NK_BITAND expression */
{
- SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy560);
- SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560);
- yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_BIT_AND, releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), releaseRawExprNode(pCxt, yymsp[0].minor.yy560)));
+ SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy616);
+ SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy616);
+ yylhsminor.yy616 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_BIT_AND, releaseRawExprNode(pCxt, yymsp[-2].minor.yy616), releaseRawExprNode(pCxt, yymsp[0].minor.yy616)));
}
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
- case 338: /* expression ::= expression NK_BITOR expression */
+ case 339: /* expression ::= expression NK_BITOR expression */
{
- SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy560);
- SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560);
- yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_BIT_OR, releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), releaseRawExprNode(pCxt, yymsp[0].minor.yy560)));
+ SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy616);
+ SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy616);
+ yylhsminor.yy616 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, OP_TYPE_BIT_OR, releaseRawExprNode(pCxt, yymsp[-2].minor.yy616), releaseRawExprNode(pCxt, yymsp[0].minor.yy616)));
}
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
- case 341: /* column_reference ::= column_name */
-{ yylhsminor.yy560 = createRawExprNode(pCxt, &yymsp[0].minor.yy533, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy533)); }
- yymsp[0].minor.yy560 = yylhsminor.yy560;
+ case 342: /* column_reference ::= column_name */
+{ yylhsminor.yy616 = createRawExprNode(pCxt, &yymsp[0].minor.yy361, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy361)); }
+ yymsp[0].minor.yy616 = yylhsminor.yy616;
break;
- case 342: /* column_reference ::= table_name NK_DOT column_name */
-{ yylhsminor.yy560 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy533, &yymsp[0].minor.yy533, createColumnNode(pCxt, &yymsp[-2].minor.yy533, &yymsp[0].minor.yy533)); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+ case 343: /* column_reference ::= table_name NK_DOT column_name */
+{ yylhsminor.yy616 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy361, &yymsp[0].minor.yy361, createColumnNode(pCxt, &yymsp[-2].minor.yy361, &yymsp[0].minor.yy361)); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
- case 343: /* pseudo_column ::= ROWTS */
- case 344: /* pseudo_column ::= TBNAME */ yytestcase(yyruleno==344);
- case 346: /* pseudo_column ::= QSTARTTS */ yytestcase(yyruleno==346);
- case 347: /* pseudo_column ::= QENDTS */ yytestcase(yyruleno==347);
- case 348: /* pseudo_column ::= WSTARTTS */ yytestcase(yyruleno==348);
- case 349: /* pseudo_column ::= WENDTS */ yytestcase(yyruleno==349);
- case 350: /* pseudo_column ::= WDURATION */ yytestcase(yyruleno==350);
- case 356: /* literal_func ::= NOW */ yytestcase(yyruleno==356);
-{ yylhsminor.yy560 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[0].minor.yy0, NULL)); }
- yymsp[0].minor.yy560 = yylhsminor.yy560;
+ case 344: /* pseudo_column ::= ROWTS */
+ case 345: /* pseudo_column ::= TBNAME */ yytestcase(yyruleno==345);
+ case 347: /* pseudo_column ::= QSTART */ yytestcase(yyruleno==347);
+ case 348: /* pseudo_column ::= QEND */ yytestcase(yyruleno==348);
+ case 349: /* pseudo_column ::= QDURATION */ yytestcase(yyruleno==349);
+ case 350: /* pseudo_column ::= WSTART */ yytestcase(yyruleno==350);
+ case 351: /* pseudo_column ::= WEND */ yytestcase(yyruleno==351);
+ case 352: /* pseudo_column ::= WDURATION */ yytestcase(yyruleno==352);
+ case 358: /* literal_func ::= NOW */ yytestcase(yyruleno==358);
+{ yylhsminor.yy616 = createRawExprNode(pCxt, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[0].minor.yy0, NULL)); }
+ yymsp[0].minor.yy616 = yylhsminor.yy616;
break;
- case 345: /* pseudo_column ::= table_name NK_DOT TBNAME */
-{ yylhsminor.yy560 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy533, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[0].minor.yy0, createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[-2].minor.yy533)))); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+ case 346: /* pseudo_column ::= table_name NK_DOT TBNAME */
+{ yylhsminor.yy616 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy361, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[0].minor.yy0, createNodeList(pCxt, createValueNode(pCxt, TSDB_DATA_TYPE_BINARY, &yymsp[-2].minor.yy361)))); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
- case 351: /* function_expression ::= function_name NK_LP expression_list NK_RP */
- case 352: /* function_expression ::= star_func NK_LP star_func_para_list NK_RP */ yytestcase(yyruleno==352);
-{ yylhsminor.yy560 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy533, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-3].minor.yy533, yymsp[-1].minor.yy712)); }
- yymsp[-3].minor.yy560 = yylhsminor.yy560;
+ case 353: /* function_expression ::= function_name NK_LP expression_list NK_RP */
+ case 354: /* function_expression ::= star_func NK_LP star_func_para_list NK_RP */ yytestcase(yyruleno==354);
+{ yylhsminor.yy616 = createRawExprNodeExt(pCxt, &yymsp[-3].minor.yy361, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-3].minor.yy361, yymsp[-1].minor.yy356)); }
+ yymsp[-3].minor.yy616 = yylhsminor.yy616;
break;
- case 353: /* function_expression ::= CAST NK_LP expression AS type_name NK_RP */
-{ yylhsminor.yy560 = createRawExprNodeExt(pCxt, &yymsp[-5].minor.yy0, &yymsp[0].minor.yy0, createCastFunctionNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy560), yymsp[-1].minor.yy196)); }
- yymsp[-5].minor.yy560 = yylhsminor.yy560;
+ case 355: /* function_expression ::= CAST NK_LP expression AS type_name NK_RP */
+{ yylhsminor.yy616 = createRawExprNodeExt(pCxt, &yymsp[-5].minor.yy0, &yymsp[0].minor.yy0, createCastFunctionNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy616), yymsp[-1].minor.yy600)); }
+ yymsp[-5].minor.yy616 = yylhsminor.yy616;
break;
- case 355: /* literal_func ::= noarg_func NK_LP NK_RP */
-{ yylhsminor.yy560 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy533, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-2].minor.yy533, NULL)); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+ case 357: /* literal_func ::= noarg_func NK_LP NK_RP */
+{ yylhsminor.yy616 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy361, &yymsp[0].minor.yy0, createFunctionNode(pCxt, &yymsp[-2].minor.yy361, NULL)); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
- case 370: /* star_func_para_list ::= NK_STAR */
-{ yylhsminor.yy712 = createNodeList(pCxt, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy0)); }
- yymsp[0].minor.yy712 = yylhsminor.yy712;
+ case 372: /* star_func_para_list ::= NK_STAR */
+{ yylhsminor.yy356 = createNodeList(pCxt, createColumnNode(pCxt, NULL, &yymsp[0].minor.yy0)); }
+ yymsp[0].minor.yy356 = yylhsminor.yy356;
break;
- case 375: /* star_func_para ::= table_name NK_DOT NK_STAR */
- case 432: /* select_item ::= table_name NK_DOT NK_STAR */ yytestcase(yyruleno==432);
-{ yylhsminor.yy560 = createColumnNode(pCxt, &yymsp[-2].minor.yy533, &yymsp[0].minor.yy0); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+ case 377: /* star_func_para ::= table_name NK_DOT NK_STAR */
+ case 434: /* select_item ::= table_name NK_DOT NK_STAR */ yytestcase(yyruleno==434);
+{ yylhsminor.yy616 = createColumnNode(pCxt, &yymsp[-2].minor.yy361, &yymsp[0].minor.yy0); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
- case 376: /* predicate ::= expression compare_op expression */
- case 381: /* predicate ::= expression in_op in_predicate_value */ yytestcase(yyruleno==381);
+ case 378: /* predicate ::= expression compare_op expression */
+ case 383: /* predicate ::= expression in_op in_predicate_value */ yytestcase(yyruleno==383);
{
- SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy560);
- SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560);
- yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, yymsp[-1].minor.yy128, releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), releaseRawExprNode(pCxt, yymsp[0].minor.yy560)));
+ SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy616);
+ SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy616);
+ yylhsminor.yy616 = createRawExprNodeExt(pCxt, &s, &e, createOperatorNode(pCxt, yymsp[-1].minor.yy526, releaseRawExprNode(pCxt, yymsp[-2].minor.yy616), releaseRawExprNode(pCxt, yymsp[0].minor.yy616)));
}
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
- case 377: /* predicate ::= expression BETWEEN expression AND expression */
+ case 379: /* predicate ::= expression BETWEEN expression AND expression */
{
- SToken s = getTokenFromRawExprNode(pCxt, yymsp[-4].minor.yy560);
- SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560);
- yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &e, createBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-4].minor.yy560), releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), releaseRawExprNode(pCxt, yymsp[0].minor.yy560)));
+ SToken s = getTokenFromRawExprNode(pCxt, yymsp[-4].minor.yy616);
+ SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy616);
+ yylhsminor.yy616 = createRawExprNodeExt(pCxt, &s, &e, createBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-4].minor.yy616), releaseRawExprNode(pCxt, yymsp[-2].minor.yy616), releaseRawExprNode(pCxt, yymsp[0].minor.yy616)));
}
- yymsp[-4].minor.yy560 = yylhsminor.yy560;
+ yymsp[-4].minor.yy616 = yylhsminor.yy616;
break;
- case 378: /* predicate ::= expression NOT BETWEEN expression AND expression */
+ case 380: /* predicate ::= expression NOT BETWEEN expression AND expression */
{
- SToken s = getTokenFromRawExprNode(pCxt, yymsp[-5].minor.yy560);
- SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560);
- yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &e, createNotBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-5].minor.yy560), releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), releaseRawExprNode(pCxt, yymsp[0].minor.yy560)));
+ SToken s = getTokenFromRawExprNode(pCxt, yymsp[-5].minor.yy616);
+ SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy616);
+ yylhsminor.yy616 = createRawExprNodeExt(pCxt, &s, &e, createNotBetweenAnd(pCxt, releaseRawExprNode(pCxt, yymsp[-5].minor.yy616), releaseRawExprNode(pCxt, yymsp[-2].minor.yy616), releaseRawExprNode(pCxt, yymsp[0].minor.yy616)));
}
- yymsp[-5].minor.yy560 = yylhsminor.yy560;
+ yymsp[-5].minor.yy616 = yylhsminor.yy616;
break;
- case 379: /* predicate ::= expression IS NULL */
+ case 381: /* predicate ::= expression IS NULL */
{
- SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy560);
- yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NULL, releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), NULL));
+ SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy616);
+ yylhsminor.yy616 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NULL, releaseRawExprNode(pCxt, yymsp[-2].minor.yy616), NULL));
}
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
- case 380: /* predicate ::= expression IS NOT NULL */
+ case 382: /* predicate ::= expression IS NOT NULL */
{
- SToken s = getTokenFromRawExprNode(pCxt, yymsp[-3].minor.yy560);
- yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NOT_NULL, releaseRawExprNode(pCxt, yymsp[-3].minor.yy560), NULL));
+ SToken s = getTokenFromRawExprNode(pCxt, yymsp[-3].minor.yy616);
+ yylhsminor.yy616 = createRawExprNodeExt(pCxt, &s, &yymsp[0].minor.yy0, createOperatorNode(pCxt, OP_TYPE_IS_NOT_NULL, releaseRawExprNode(pCxt, yymsp[-3].minor.yy616), NULL));
}
- yymsp[-3].minor.yy560 = yylhsminor.yy560;
+ yymsp[-3].minor.yy616 = yylhsminor.yy616;
break;
- case 382: /* compare_op ::= NK_LT */
-{ yymsp[0].minor.yy128 = OP_TYPE_LOWER_THAN; }
+ case 384: /* compare_op ::= NK_LT */
+{ yymsp[0].minor.yy526 = OP_TYPE_LOWER_THAN; }
break;
- case 383: /* compare_op ::= NK_GT */
-{ yymsp[0].minor.yy128 = OP_TYPE_GREATER_THAN; }
+ case 385: /* compare_op ::= NK_GT */
+{ yymsp[0].minor.yy526 = OP_TYPE_GREATER_THAN; }
break;
- case 384: /* compare_op ::= NK_LE */
-{ yymsp[0].minor.yy128 = OP_TYPE_LOWER_EQUAL; }
+ case 386: /* compare_op ::= NK_LE */
+{ yymsp[0].minor.yy526 = OP_TYPE_LOWER_EQUAL; }
break;
- case 385: /* compare_op ::= NK_GE */
-{ yymsp[0].minor.yy128 = OP_TYPE_GREATER_EQUAL; }
+ case 387: /* compare_op ::= NK_GE */
+{ yymsp[0].minor.yy526 = OP_TYPE_GREATER_EQUAL; }
break;
- case 386: /* compare_op ::= NK_NE */
-{ yymsp[0].minor.yy128 = OP_TYPE_NOT_EQUAL; }
+ case 388: /* compare_op ::= NK_NE */
+{ yymsp[0].minor.yy526 = OP_TYPE_NOT_EQUAL; }
break;
- case 387: /* compare_op ::= NK_EQ */
-{ yymsp[0].minor.yy128 = OP_TYPE_EQUAL; }
+ case 389: /* compare_op ::= NK_EQ */
+{ yymsp[0].minor.yy526 = OP_TYPE_EQUAL; }
break;
- case 388: /* compare_op ::= LIKE */
-{ yymsp[0].minor.yy128 = OP_TYPE_LIKE; }
+ case 390: /* compare_op ::= LIKE */
+{ yymsp[0].minor.yy526 = OP_TYPE_LIKE; }
break;
- case 389: /* compare_op ::= NOT LIKE */
-{ yymsp[-1].minor.yy128 = OP_TYPE_NOT_LIKE; }
+ case 391: /* compare_op ::= NOT LIKE */
+{ yymsp[-1].minor.yy526 = OP_TYPE_NOT_LIKE; }
break;
- case 390: /* compare_op ::= MATCH */
-{ yymsp[0].minor.yy128 = OP_TYPE_MATCH; }
+ case 392: /* compare_op ::= MATCH */
+{ yymsp[0].minor.yy526 = OP_TYPE_MATCH; }
break;
- case 391: /* compare_op ::= NMATCH */
-{ yymsp[0].minor.yy128 = OP_TYPE_NMATCH; }
+ case 393: /* compare_op ::= NMATCH */
+{ yymsp[0].minor.yy526 = OP_TYPE_NMATCH; }
break;
- case 392: /* compare_op ::= CONTAINS */
-{ yymsp[0].minor.yy128 = OP_TYPE_JSON_CONTAINS; }
+ case 394: /* compare_op ::= CONTAINS */
+{ yymsp[0].minor.yy526 = OP_TYPE_JSON_CONTAINS; }
break;
- case 393: /* in_op ::= IN */
-{ yymsp[0].minor.yy128 = OP_TYPE_IN; }
+ case 395: /* in_op ::= IN */
+{ yymsp[0].minor.yy526 = OP_TYPE_IN; }
break;
- case 394: /* in_op ::= NOT IN */
-{ yymsp[-1].minor.yy128 = OP_TYPE_NOT_IN; }
+ case 396: /* in_op ::= NOT IN */
+{ yymsp[-1].minor.yy526 = OP_TYPE_NOT_IN; }
break;
- case 395: /* in_predicate_value ::= NK_LP literal_list NK_RP */
-{ yylhsminor.yy560 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, createNodeListNode(pCxt, yymsp[-1].minor.yy712)); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+ case 397: /* in_predicate_value ::= NK_LP literal_list NK_RP */
+{ yylhsminor.yy616 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, createNodeListNode(pCxt, yymsp[-1].minor.yy356)); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
- case 397: /* boolean_value_expression ::= NOT boolean_primary */
+ case 399: /* boolean_value_expression ::= NOT boolean_primary */
{
- SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560);
- yylhsminor.yy560 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_NOT, releaseRawExprNode(pCxt, yymsp[0].minor.yy560), NULL));
+ SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy616);
+ yylhsminor.yy616 = createRawExprNodeExt(pCxt, &yymsp[-1].minor.yy0, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_NOT, releaseRawExprNode(pCxt, yymsp[0].minor.yy616), NULL));
}
- yymsp[-1].minor.yy560 = yylhsminor.yy560;
+ yymsp[-1].minor.yy616 = yylhsminor.yy616;
break;
- case 398: /* boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
+ case 400: /* boolean_value_expression ::= boolean_value_expression OR boolean_value_expression */
{
- SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy560);
- SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560);
- yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_OR, releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), releaseRawExprNode(pCxt, yymsp[0].minor.yy560)));
+ SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy616);
+ SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy616);
+ yylhsminor.yy616 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_OR, releaseRawExprNode(pCxt, yymsp[-2].minor.yy616), releaseRawExprNode(pCxt, yymsp[0].minor.yy616)));
}
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
- case 399: /* boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
+ case 401: /* boolean_value_expression ::= boolean_value_expression AND boolean_value_expression */
{
- SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy560);
- SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy560);
- yylhsminor.yy560 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_AND, releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), releaseRawExprNode(pCxt, yymsp[0].minor.yy560)));
+ SToken s = getTokenFromRawExprNode(pCxt, yymsp[-2].minor.yy616);
+ SToken e = getTokenFromRawExprNode(pCxt, yymsp[0].minor.yy616);
+ yylhsminor.yy616 = createRawExprNodeExt(pCxt, &s, &e, createLogicConditionNode(pCxt, LOGIC_COND_TYPE_AND, releaseRawExprNode(pCxt, yymsp[-2].minor.yy616), releaseRawExprNode(pCxt, yymsp[0].minor.yy616)));
}
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
- case 407: /* table_reference_list ::= table_reference_list NK_COMMA table_reference */
-{ yylhsminor.yy560 = createJoinTableNode(pCxt, JOIN_TYPE_INNER, yymsp[-2].minor.yy560, yymsp[0].minor.yy560, NULL); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+ case 409: /* table_reference_list ::= table_reference_list NK_COMMA table_reference */
+{ yylhsminor.yy616 = createJoinTableNode(pCxt, JOIN_TYPE_INNER, yymsp[-2].minor.yy616, yymsp[0].minor.yy616, NULL); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
- case 410: /* table_primary ::= table_name alias_opt */
-{ yylhsminor.yy560 = createRealTableNode(pCxt, NULL, &yymsp[-1].minor.yy533, &yymsp[0].minor.yy533); }
- yymsp[-1].minor.yy560 = yylhsminor.yy560;
+ case 412: /* table_primary ::= table_name alias_opt */
+{ yylhsminor.yy616 = createRealTableNode(pCxt, NULL, &yymsp[-1].minor.yy361, &yymsp[0].minor.yy361); }
+ yymsp[-1].minor.yy616 = yylhsminor.yy616;
break;
- case 411: /* table_primary ::= db_name NK_DOT table_name alias_opt */
-{ yylhsminor.yy560 = createRealTableNode(pCxt, &yymsp[-3].minor.yy533, &yymsp[-1].minor.yy533, &yymsp[0].minor.yy533); }
- yymsp[-3].minor.yy560 = yylhsminor.yy560;
+ case 413: /* table_primary ::= db_name NK_DOT table_name alias_opt */
+{ yylhsminor.yy616 = createRealTableNode(pCxt, &yymsp[-3].minor.yy361, &yymsp[-1].minor.yy361, &yymsp[0].minor.yy361); }
+ yymsp[-3].minor.yy616 = yylhsminor.yy616;
break;
- case 412: /* table_primary ::= subquery alias_opt */
-{ yylhsminor.yy560 = createTempTableNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy560), &yymsp[0].minor.yy533); }
- yymsp[-1].minor.yy560 = yylhsminor.yy560;
+ case 414: /* table_primary ::= subquery alias_opt */
+{ yylhsminor.yy616 = createTempTableNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy616), &yymsp[0].minor.yy361); }
+ yymsp[-1].minor.yy616 = yylhsminor.yy616;
break;
- case 414: /* alias_opt ::= */
-{ yymsp[1].minor.yy533 = nil_token; }
+ case 416: /* alias_opt ::= */
+{ yymsp[1].minor.yy361 = nil_token; }
break;
- case 415: /* alias_opt ::= table_alias */
-{ yylhsminor.yy533 = yymsp[0].minor.yy533; }
- yymsp[0].minor.yy533 = yylhsminor.yy533;
+ case 417: /* alias_opt ::= table_alias */
+{ yylhsminor.yy361 = yymsp[0].minor.yy361; }
+ yymsp[0].minor.yy361 = yylhsminor.yy361;
break;
- case 416: /* alias_opt ::= AS table_alias */
-{ yymsp[-1].minor.yy533 = yymsp[0].minor.yy533; }
+ case 418: /* alias_opt ::= AS table_alias */
+{ yymsp[-1].minor.yy361 = yymsp[0].minor.yy361; }
break;
- case 417: /* parenthesized_joined_table ::= NK_LP joined_table NK_RP */
- case 418: /* parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */ yytestcase(yyruleno==418);
-{ yymsp[-2].minor.yy560 = yymsp[-1].minor.yy560; }
+ case 419: /* parenthesized_joined_table ::= NK_LP joined_table NK_RP */
+ case 420: /* parenthesized_joined_table ::= NK_LP parenthesized_joined_table NK_RP */ yytestcase(yyruleno==420);
+{ yymsp[-2].minor.yy616 = yymsp[-1].minor.yy616; }
break;
- case 419: /* joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
-{ yylhsminor.yy560 = createJoinTableNode(pCxt, yymsp[-4].minor.yy36, yymsp[-5].minor.yy560, yymsp[-2].minor.yy560, yymsp[0].minor.yy560); }
- yymsp[-5].minor.yy560 = yylhsminor.yy560;
+ case 421: /* joined_table ::= table_reference join_type JOIN table_reference ON search_condition */
+{ yylhsminor.yy616 = createJoinTableNode(pCxt, yymsp[-4].minor.yy504, yymsp[-5].minor.yy616, yymsp[-2].minor.yy616, yymsp[0].minor.yy616); }
+ yymsp[-5].minor.yy616 = yylhsminor.yy616;
break;
- case 420: /* join_type ::= */
-{ yymsp[1].minor.yy36 = JOIN_TYPE_INNER; }
+ case 422: /* join_type ::= */
+{ yymsp[1].minor.yy504 = JOIN_TYPE_INNER; }
break;
- case 421: /* join_type ::= INNER */
-{ yymsp[0].minor.yy36 = JOIN_TYPE_INNER; }
+ case 423: /* join_type ::= INNER */
+{ yymsp[0].minor.yy504 = JOIN_TYPE_INNER; }
break;
- case 422: /* query_specification ::= SELECT set_quantifier_opt select_list from_clause_opt where_clause_opt partition_by_clause_opt range_opt every_opt fill_opt twindow_clause_opt group_by_clause_opt having_clause_opt */
+ case 424: /* query_specification ::= SELECT set_quantifier_opt select_list from_clause_opt where_clause_opt partition_by_clause_opt range_opt every_opt fill_opt twindow_clause_opt group_by_clause_opt having_clause_opt */
{
- yymsp[-11].minor.yy560 = createSelectStmt(pCxt, yymsp[-10].minor.yy173, yymsp[-9].minor.yy712, yymsp[-8].minor.yy560);
- yymsp[-11].minor.yy560 = addWhereClause(pCxt, yymsp[-11].minor.yy560, yymsp[-7].minor.yy560);
- yymsp[-11].minor.yy560 = addPartitionByClause(pCxt, yymsp[-11].minor.yy560, yymsp[-6].minor.yy712);
- yymsp[-11].minor.yy560 = addWindowClauseClause(pCxt, yymsp[-11].minor.yy560, yymsp[-2].minor.yy560);
- yymsp[-11].minor.yy560 = addGroupByClause(pCxt, yymsp[-11].minor.yy560, yymsp[-1].minor.yy712);
- yymsp[-11].minor.yy560 = addHavingClause(pCxt, yymsp[-11].minor.yy560, yymsp[0].minor.yy560);
- yymsp[-11].minor.yy560 = addRangeClause(pCxt, yymsp[-11].minor.yy560, yymsp[-5].minor.yy560);
- yymsp[-11].minor.yy560 = addEveryClause(pCxt, yymsp[-11].minor.yy560, yymsp[-4].minor.yy560);
- yymsp[-11].minor.yy560 = addFillClause(pCxt, yymsp[-11].minor.yy560, yymsp[-3].minor.yy560);
+ yymsp[-11].minor.yy616 = createSelectStmt(pCxt, yymsp[-10].minor.yy151, yymsp[-9].minor.yy356, yymsp[-8].minor.yy616);
+ yymsp[-11].minor.yy616 = addWhereClause(pCxt, yymsp[-11].minor.yy616, yymsp[-7].minor.yy616);
+ yymsp[-11].minor.yy616 = addPartitionByClause(pCxt, yymsp[-11].minor.yy616, yymsp[-6].minor.yy356);
+ yymsp[-11].minor.yy616 = addWindowClauseClause(pCxt, yymsp[-11].minor.yy616, yymsp[-2].minor.yy616);
+ yymsp[-11].minor.yy616 = addGroupByClause(pCxt, yymsp[-11].minor.yy616, yymsp[-1].minor.yy356);
+ yymsp[-11].minor.yy616 = addHavingClause(pCxt, yymsp[-11].minor.yy616, yymsp[0].minor.yy616);
+ yymsp[-11].minor.yy616 = addRangeClause(pCxt, yymsp[-11].minor.yy616, yymsp[-5].minor.yy616);
+ yymsp[-11].minor.yy616 = addEveryClause(pCxt, yymsp[-11].minor.yy616, yymsp[-4].minor.yy616);
+ yymsp[-11].minor.yy616 = addFillClause(pCxt, yymsp[-11].minor.yy616, yymsp[-3].minor.yy616);
}
break;
- case 425: /* set_quantifier_opt ::= ALL */
-{ yymsp[0].minor.yy173 = false; }
+ case 427: /* set_quantifier_opt ::= ALL */
+{ yymsp[0].minor.yy151 = false; }
break;
- case 428: /* select_item ::= NK_STAR */
-{ yylhsminor.yy560 = createColumnNode(pCxt, NULL, &yymsp[0].minor.yy0); }
- yymsp[0].minor.yy560 = yylhsminor.yy560;
+ case 430: /* select_item ::= NK_STAR */
+{ yylhsminor.yy616 = createColumnNode(pCxt, NULL, &yymsp[0].minor.yy0); }
+ yymsp[0].minor.yy616 = yylhsminor.yy616;
break;
- case 430: /* select_item ::= common_expression column_alias */
-{ yylhsminor.yy560 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy560), &yymsp[0].minor.yy533); }
- yymsp[-1].minor.yy560 = yylhsminor.yy560;
+ case 432: /* select_item ::= common_expression column_alias */
+{ yylhsminor.yy616 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy616), &yymsp[0].minor.yy361); }
+ yymsp[-1].minor.yy616 = yylhsminor.yy616;
break;
- case 431: /* select_item ::= common_expression AS column_alias */
-{ yylhsminor.yy560 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), &yymsp[0].minor.yy533); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+ case 433: /* select_item ::= common_expression AS column_alias */
+{ yylhsminor.yy616 = setProjectionAlias(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy616), &yymsp[0].minor.yy361); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
- case 436: /* partition_by_clause_opt ::= PARTITION BY expression_list */
- case 453: /* group_by_clause_opt ::= GROUP BY group_by_list */ yytestcase(yyruleno==453);
- case 469: /* order_by_clause_opt ::= ORDER BY sort_specification_list */ yytestcase(yyruleno==469);
-{ yymsp[-2].minor.yy712 = yymsp[0].minor.yy712; }
+ case 438: /* partition_by_clause_opt ::= PARTITION BY expression_list */
+ case 455: /* group_by_clause_opt ::= GROUP BY group_by_list */ yytestcase(yyruleno==455);
+ case 471: /* order_by_clause_opt ::= ORDER BY sort_specification_list */ yytestcase(yyruleno==471);
+{ yymsp[-2].minor.yy356 = yymsp[0].minor.yy356; }
break;
- case 438: /* twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP */
-{ yymsp[-5].minor.yy560 = createSessionWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy560), releaseRawExprNode(pCxt, yymsp[-1].minor.yy560)); }
+ case 440: /* twindow_clause_opt ::= SESSION NK_LP column_reference NK_COMMA duration_literal NK_RP */
+{ yymsp[-5].minor.yy616 = createSessionWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy616), releaseRawExprNode(pCxt, yymsp[-1].minor.yy616)); }
break;
- case 439: /* twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP */
-{ yymsp[-3].minor.yy560 = createStateWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy560)); }
+ case 441: /* twindow_clause_opt ::= STATE_WINDOW NK_LP expression NK_RP */
+{ yymsp[-3].minor.yy616 = createStateWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-1].minor.yy616)); }
break;
- case 440: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */
-{ yymsp[-5].minor.yy560 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy560), NULL, yymsp[-1].minor.yy560, yymsp[0].minor.yy560); }
+ case 442: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_RP sliding_opt fill_opt */
+{ yymsp[-5].minor.yy616 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy616), NULL, yymsp[-1].minor.yy616, yymsp[0].minor.yy616); }
break;
- case 441: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */
-{ yymsp[-7].minor.yy560 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-5].minor.yy560), releaseRawExprNode(pCxt, yymsp[-3].minor.yy560), yymsp[-1].minor.yy560, yymsp[0].minor.yy560); }
+ case 443: /* twindow_clause_opt ::= INTERVAL NK_LP duration_literal NK_COMMA duration_literal NK_RP sliding_opt fill_opt */
+{ yymsp[-7].minor.yy616 = createIntervalWindowNode(pCxt, releaseRawExprNode(pCxt, yymsp[-5].minor.yy616), releaseRawExprNode(pCxt, yymsp[-3].minor.yy616), yymsp[-1].minor.yy616, yymsp[0].minor.yy616); }
break;
- case 443: /* sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */
- case 461: /* every_opt ::= EVERY NK_LP duration_literal NK_RP */ yytestcase(yyruleno==461);
-{ yymsp[-3].minor.yy560 = releaseRawExprNode(pCxt, yymsp[-1].minor.yy560); }
+ case 445: /* sliding_opt ::= SLIDING NK_LP duration_literal NK_RP */
+ case 463: /* every_opt ::= EVERY NK_LP duration_literal NK_RP */ yytestcase(yyruleno==463);
+{ yymsp[-3].minor.yy616 = releaseRawExprNode(pCxt, yymsp[-1].minor.yy616); }
break;
- case 445: /* fill_opt ::= FILL NK_LP fill_mode NK_RP */
-{ yymsp[-3].minor.yy560 = createFillNode(pCxt, yymsp[-1].minor.yy18, NULL); }
+ case 447: /* fill_opt ::= FILL NK_LP fill_mode NK_RP */
+{ yymsp[-3].minor.yy616 = createFillNode(pCxt, yymsp[-1].minor.yy494, NULL); }
break;
- case 446: /* fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */
-{ yymsp[-5].minor.yy560 = createFillNode(pCxt, FILL_MODE_VALUE, createNodeListNode(pCxt, yymsp[-1].minor.yy712)); }
+ case 448: /* fill_opt ::= FILL NK_LP VALUE NK_COMMA literal_list NK_RP */
+{ yymsp[-5].minor.yy616 = createFillNode(pCxt, FILL_MODE_VALUE, createNodeListNode(pCxt, yymsp[-1].minor.yy356)); }
break;
- case 447: /* fill_mode ::= NONE */
-{ yymsp[0].minor.yy18 = FILL_MODE_NONE; }
+ case 449: /* fill_mode ::= NONE */
+{ yymsp[0].minor.yy494 = FILL_MODE_NONE; }
break;
- case 448: /* fill_mode ::= PREV */
-{ yymsp[0].minor.yy18 = FILL_MODE_PREV; }
+ case 450: /* fill_mode ::= PREV */
+{ yymsp[0].minor.yy494 = FILL_MODE_PREV; }
break;
- case 449: /* fill_mode ::= NULL */
-{ yymsp[0].minor.yy18 = FILL_MODE_NULL; }
+ case 451: /* fill_mode ::= NULL */
+{ yymsp[0].minor.yy494 = FILL_MODE_NULL; }
break;
- case 450: /* fill_mode ::= LINEAR */
-{ yymsp[0].minor.yy18 = FILL_MODE_LINEAR; }
+ case 452: /* fill_mode ::= LINEAR */
+{ yymsp[0].minor.yy494 = FILL_MODE_LINEAR; }
break;
- case 451: /* fill_mode ::= NEXT */
-{ yymsp[0].minor.yy18 = FILL_MODE_NEXT; }
+ case 453: /* fill_mode ::= NEXT */
+{ yymsp[0].minor.yy494 = FILL_MODE_NEXT; }
break;
- case 454: /* group_by_list ::= expression */
-{ yylhsminor.yy712 = createNodeList(pCxt, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy560))); }
- yymsp[0].minor.yy712 = yylhsminor.yy712;
+ case 456: /* group_by_list ::= expression */
+{ yylhsminor.yy356 = createNodeList(pCxt, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy616))); }
+ yymsp[0].minor.yy356 = yylhsminor.yy356;
break;
- case 455: /* group_by_list ::= group_by_list NK_COMMA expression */
-{ yylhsminor.yy712 = addNodeToList(pCxt, yymsp[-2].minor.yy712, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy560))); }
- yymsp[-2].minor.yy712 = yylhsminor.yy712;
+ case 457: /* group_by_list ::= group_by_list NK_COMMA expression */
+{ yylhsminor.yy356 = addNodeToList(pCxt, yymsp[-2].minor.yy356, createGroupingSetNode(pCxt, releaseRawExprNode(pCxt, yymsp[0].minor.yy616))); }
+ yymsp[-2].minor.yy356 = yylhsminor.yy356;
break;
- case 459: /* range_opt ::= RANGE NK_LP expression NK_COMMA expression NK_RP */
-{ yymsp[-5].minor.yy560 = createInterpTimeRange(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy560), releaseRawExprNode(pCxt, yymsp[-1].minor.yy560)); }
+ case 461: /* range_opt ::= RANGE NK_LP expression NK_COMMA expression NK_RP */
+{ yymsp[-5].minor.yy616 = createInterpTimeRange(pCxt, releaseRawExprNode(pCxt, yymsp[-3].minor.yy616), releaseRawExprNode(pCxt, yymsp[-1].minor.yy616)); }
break;
- case 462: /* query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */
+ case 464: /* query_expression ::= query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt */
{
- yylhsminor.yy560 = addOrderByClause(pCxt, yymsp[-3].minor.yy560, yymsp[-2].minor.yy712);
- yylhsminor.yy560 = addSlimitClause(pCxt, yylhsminor.yy560, yymsp[-1].minor.yy560);
- yylhsminor.yy560 = addLimitClause(pCxt, yylhsminor.yy560, yymsp[0].minor.yy560);
+ yylhsminor.yy616 = addOrderByClause(pCxt, yymsp[-3].minor.yy616, yymsp[-2].minor.yy356);
+ yylhsminor.yy616 = addSlimitClause(pCxt, yylhsminor.yy616, yymsp[-1].minor.yy616);
+ yylhsminor.yy616 = addLimitClause(pCxt, yylhsminor.yy616, yymsp[0].minor.yy616);
}
- yymsp[-3].minor.yy560 = yylhsminor.yy560;
+ yymsp[-3].minor.yy616 = yylhsminor.yy616;
break;
- case 464: /* query_expression_body ::= query_expression_body UNION ALL query_expression_body */
-{ yylhsminor.yy560 = createSetOperator(pCxt, SET_OP_TYPE_UNION_ALL, yymsp[-3].minor.yy560, yymsp[0].minor.yy560); }
- yymsp[-3].minor.yy560 = yylhsminor.yy560;
+ case 466: /* query_expression_body ::= query_expression_body UNION ALL query_expression_body */
+{ yylhsminor.yy616 = createSetOperator(pCxt, SET_OP_TYPE_UNION_ALL, yymsp[-3].minor.yy616, yymsp[0].minor.yy616); }
+ yymsp[-3].minor.yy616 = yylhsminor.yy616;
break;
- case 465: /* query_expression_body ::= query_expression_body UNION query_expression_body */
-{ yylhsminor.yy560 = createSetOperator(pCxt, SET_OP_TYPE_UNION, yymsp[-2].minor.yy560, yymsp[0].minor.yy560); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+ case 467: /* query_expression_body ::= query_expression_body UNION query_expression_body */
+{ yylhsminor.yy616 = createSetOperator(pCxt, SET_OP_TYPE_UNION, yymsp[-2].minor.yy616, yymsp[0].minor.yy616); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
- case 467: /* query_primary ::= NK_LP query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt NK_RP */
+ case 469: /* query_primary ::= NK_LP query_expression_body order_by_clause_opt slimit_clause_opt limit_clause_opt NK_RP */
{
- yymsp[-5].minor.yy560 = addOrderByClause(pCxt, yymsp[-4].minor.yy560, yymsp[-3].minor.yy712);
- yymsp[-5].minor.yy560 = addSlimitClause(pCxt, yymsp[-5].minor.yy560, yymsp[-2].minor.yy560);
- yymsp[-5].minor.yy560 = addLimitClause(pCxt, yymsp[-5].minor.yy560, yymsp[-1].minor.yy560);
+ yymsp[-5].minor.yy616 = addOrderByClause(pCxt, yymsp[-4].minor.yy616, yymsp[-3].minor.yy356);
+ yymsp[-5].minor.yy616 = addSlimitClause(pCxt, yymsp[-5].minor.yy616, yymsp[-2].minor.yy616);
+ yymsp[-5].minor.yy616 = addLimitClause(pCxt, yymsp[-5].minor.yy616, yymsp[-1].minor.yy616);
}
break;
- case 471: /* slimit_clause_opt ::= SLIMIT NK_INTEGER */
- case 475: /* limit_clause_opt ::= LIMIT NK_INTEGER */ yytestcase(yyruleno==475);
-{ yymsp[-1].minor.yy560 = createLimitNode(pCxt, &yymsp[0].minor.yy0, NULL); }
+ case 473: /* slimit_clause_opt ::= SLIMIT NK_INTEGER */
+ case 477: /* limit_clause_opt ::= LIMIT NK_INTEGER */ yytestcase(yyruleno==477);
+{ yymsp[-1].minor.yy616 = createLimitNode(pCxt, &yymsp[0].minor.yy0, NULL); }
break;
- case 472: /* slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
- case 476: /* limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */ yytestcase(yyruleno==476);
-{ yymsp[-3].minor.yy560 = createLimitNode(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); }
+ case 474: /* slimit_clause_opt ::= SLIMIT NK_INTEGER SOFFSET NK_INTEGER */
+ case 478: /* limit_clause_opt ::= LIMIT NK_INTEGER OFFSET NK_INTEGER */ yytestcase(yyruleno==478);
+{ yymsp[-3].minor.yy616 = createLimitNode(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0); }
break;
- case 473: /* slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
- case 477: /* limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */ yytestcase(yyruleno==477);
-{ yymsp[-3].minor.yy560 = createLimitNode(pCxt, &yymsp[0].minor.yy0, &yymsp[-2].minor.yy0); }
+ case 475: /* slimit_clause_opt ::= SLIMIT NK_INTEGER NK_COMMA NK_INTEGER */
+ case 479: /* limit_clause_opt ::= LIMIT NK_INTEGER NK_COMMA NK_INTEGER */ yytestcase(yyruleno==479);
+{ yymsp[-3].minor.yy616 = createLimitNode(pCxt, &yymsp[0].minor.yy0, &yymsp[-2].minor.yy0); }
break;
- case 478: /* subquery ::= NK_LP query_expression NK_RP */
-{ yylhsminor.yy560 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, yymsp[-1].minor.yy560); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+ case 480: /* subquery ::= NK_LP query_expression NK_RP */
+{ yylhsminor.yy616 = createRawExprNodeExt(pCxt, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, yymsp[-1].minor.yy616); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
- case 482: /* sort_specification ::= expression ordering_specification_opt null_ordering_opt */
-{ yylhsminor.yy560 = createOrderByExprNode(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy560), yymsp[-1].minor.yy218, yymsp[0].minor.yy109); }
- yymsp[-2].minor.yy560 = yylhsminor.yy560;
+ case 484: /* sort_specification ::= expression ordering_specification_opt null_ordering_opt */
+{ yylhsminor.yy616 = createOrderByExprNode(pCxt, releaseRawExprNode(pCxt, yymsp[-2].minor.yy616), yymsp[-1].minor.yy58, yymsp[0].minor.yy613); }
+ yymsp[-2].minor.yy616 = yylhsminor.yy616;
break;
- case 483: /* ordering_specification_opt ::= */
-{ yymsp[1].minor.yy218 = ORDER_ASC; }
+ case 485: /* ordering_specification_opt ::= */
+{ yymsp[1].minor.yy58 = ORDER_ASC; }
break;
- case 484: /* ordering_specification_opt ::= ASC */
-{ yymsp[0].minor.yy218 = ORDER_ASC; }
+ case 486: /* ordering_specification_opt ::= ASC */
+{ yymsp[0].minor.yy58 = ORDER_ASC; }
break;
- case 485: /* ordering_specification_opt ::= DESC */
-{ yymsp[0].minor.yy218 = ORDER_DESC; }
+ case 487: /* ordering_specification_opt ::= DESC */
+{ yymsp[0].minor.yy58 = ORDER_DESC; }
break;
- case 486: /* null_ordering_opt ::= */
-{ yymsp[1].minor.yy109 = NULL_ORDER_DEFAULT; }
+ case 488: /* null_ordering_opt ::= */
+{ yymsp[1].minor.yy613 = NULL_ORDER_DEFAULT; }
break;
- case 487: /* null_ordering_opt ::= NULLS FIRST */
-{ yymsp[-1].minor.yy109 = NULL_ORDER_FIRST; }
+ case 489: /* null_ordering_opt ::= NULLS FIRST */
+{ yymsp[-1].minor.yy613 = NULL_ORDER_FIRST; }
break;
- case 488: /* null_ordering_opt ::= NULLS LAST */
-{ yymsp[-1].minor.yy109 = NULL_ORDER_LAST; }
+ case 490: /* null_ordering_opt ::= NULLS LAST */
+{ yymsp[-1].minor.yy613 = NULL_ORDER_LAST; }
break;
default:
break;
diff --git a/source/libs/parser/test/parSelectTest.cpp b/source/libs/parser/test/parSelectTest.cpp
index 0aa1773c28..e682059793 100644
--- a/source/libs/parser/test/parSelectTest.cpp
+++ b/source/libs/parser/test/parSelectTest.cpp
@@ -75,7 +75,7 @@ TEST_F(ParserSelectTest, condition) {
TEST_F(ParserSelectTest, pseudoColumn) {
useDb("root", "test");
- run("SELECT _WSTARTTS, _WENDTS, COUNT(*) FROM t1 INTERVAL(10s)");
+ run("SELECT _WSTART, _WEND, COUNT(*) FROM t1 INTERVAL(10s)");
}
TEST_F(ParserSelectTest, pseudoColumnSemanticCheck) {
@@ -286,7 +286,7 @@ TEST_F(ParserSelectTest, intervalSemanticCheck) {
run("SELECT HISTOGRAM(c1, 'log_bin', '{\"start\": -33,\"factor\": 55,\"count\": 5,\"infinity\": false}', 1) FROM t1 "
"WHERE ts > TIMESTAMP '2022-04-01 00:00:00' and ts < TIMESTAMP '2022-04-30 23:59:59' INTERVAL(10s) FILL(NULL)",
TSDB_CODE_PAR_FILL_NOT_ALLOWED_FUNC);
- run("SELECT _WSTARTTS, _WENDTS, _WDURATION, sum(c1) FROM t1", TSDB_CODE_PAR_INVALID_WINDOW_PC);
+ run("SELECT _WSTART, _WEND, _WDURATION, sum(c1) FROM t1", TSDB_CODE_PAR_INVALID_WINDOW_PC);
}
TEST_F(ParserSelectTest, interp) {
@@ -310,11 +310,11 @@ TEST_F(ParserSelectTest, subquery) {
run("SELECT SUM(a) FROM (SELECT MAX(c1) a, ts FROM st1s1 INTERVAL(1m)) INTERVAL(1n)");
- run("SELECT SUM(a) FROM (SELECT MAX(c1) a, _wstartts FROM st1s1 INTERVAL(1m)) INTERVAL(1n)");
+ run("SELECT SUM(a) FROM (SELECT MAX(c1) a, _wstart FROM st1s1 INTERVAL(1m)) INTERVAL(1n)");
run("SELECT SUM(a) FROM (SELECT MAX(c1) a, ts FROM st1s1 PARTITION BY TBNAME INTERVAL(1m)) INTERVAL(1n)");
- run("SELECT SUM(a) FROM (SELECT MAX(c1) a, _wstartts FROM st1s1 PARTITION BY TBNAME INTERVAL(1m)) INTERVAL(1n)");
+ run("SELECT SUM(a) FROM (SELECT MAX(c1) a, _wstart FROM st1s1 PARTITION BY TBNAME INTERVAL(1m)) INTERVAL(1n)");
run("SELECT _C0 FROM (SELECT _ROWTS, ts FROM st1s1)");
diff --git a/source/libs/planner/src/planLogicCreater.c b/source/libs/planner/src/planLogicCreater.c
index 4d4756c3ac..190ec3a1f6 100644
--- a/source/libs/planner/src/planLogicCreater.c
+++ b/source/libs/planner/src/planLogicCreater.c
@@ -59,7 +59,7 @@ static EDealRes doRewriteExpr(SNode** pNode, void* pContext) {
strcpy(pCol->node.aliasName, pToBeRewrittenExpr->aliasName);
strcpy(pCol->colName, ((SExprNode*)pExpr)->aliasName);
if (QUERY_NODE_FUNCTION == nodeType(pExpr)) {
- if (FUNCTION_TYPE_WSTARTTS == ((SFunctionNode*)pExpr)->funcType) {
+ if (FUNCTION_TYPE_WSTART == ((SFunctionNode*)pExpr)->funcType) {
pCol->colId = PRIMARYKEY_TIMESTAMP_COL_ID;
} else if (FUNCTION_TYPE_TBNAME == ((SFunctionNode*)pExpr)->funcType) {
pCol->colType = COLUMN_TYPE_TBNAME;
diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c
index 855427f26e..7915f4a138 100644
--- a/source/libs/planner/src/planOptimizer.c
+++ b/source/libs/planner/src/planOptimizer.c
@@ -124,12 +124,15 @@ static bool scanPathOptMayBeOptimized(SLogicNode* pNode) {
QUERY_NODE_LOGIC_PLAN_PARTITION != nodeType(pNode->pParent))) {
return false;
}
- if (QUERY_NODE_LOGIC_PLAN_WINDOW == nodeType(pNode->pParent) ||
+ if ((QUERY_NODE_LOGIC_PLAN_WINDOW == nodeType(pNode->pParent) && WINDOW_TYPE_INTERVAL == ((SWindowLogicNode*)pNode->pParent)->winType) ||
(QUERY_NODE_LOGIC_PLAN_PARTITION == nodeType(pNode->pParent) && pNode->pParent->pParent &&
- QUERY_NODE_LOGIC_PLAN_WINDOW == nodeType(pNode->pParent->pParent))) {
+ QUERY_NODE_LOGIC_PLAN_WINDOW == nodeType(pNode->pParent->pParent) && WINDOW_TYPE_INTERVAL == ((SWindowLogicNode*)pNode->pParent)->winType)) {
return true;
}
- return !scanPathOptHaveNormalCol(((SAggLogicNode*)pNode->pParent)->pGroupKeys);
+ if (QUERY_NODE_LOGIC_PLAN_AGG == nodeType(pNode->pParent)) {
+ return !scanPathOptHaveNormalCol(((SAggLogicNode*)pNode->pParent)->pGroupKeys);
+ }
+ return false;
}
static SNodeList* scanPathOptGetAllFuncs(SLogicNode* pNode) {
@@ -792,15 +795,15 @@ static EDealRes rewriteAggGroupKeyCondForPushDownImpl(SNode** pNode, void* pCont
if (0 == strcmp(((SExprNode*)pGroup)->aliasName, ((SColumnNode*)(*pNode))->colName)) {
SNode* pExpr = nodesCloneNode(pGroup);
if (pExpr == NULL) {
- pCxt->errCode = terrno;
+ pCxt->errCode = TSDB_CODE_OUT_OF_MEMORY;
return DEAL_RES_ERROR;
}
nodesDestroyNode(*pNode);
*pNode = pExpr;
+ return DEAL_RES_IGNORE_CHILD;
}
}
}
- return DEAL_RES_IGNORE_CHILD;
}
return DEAL_RES_CONTINUE;
}
@@ -861,16 +864,16 @@ static EDealRes rewriteProjectCondForPushDownImpl(SNode** ppNode, void* pContext
if (0 == strcmp(((SExprNode*)pProjection)->aliasName, ((SColumnNode*)(*ppNode))->colName)) {
SNode* pExpr = nodesCloneNode(pProjection);
if (pExpr == NULL) {
- pCxt->errCode = terrno;
+ pCxt->errCode = TSDB_CODE_OUT_OF_MEMORY;
return DEAL_RES_ERROR;
}
nodesDestroyNode(*ppNode);
*ppNode = pExpr;
+ return DEAL_RES_IGNORE_CHILD;
} // end if expr alias name equal column name
} // end for each project
} // end if target node equals cond column node
} // end for each targets
- return DEAL_RES_IGNORE_CHILD;
}
return DEAL_RES_CONTINUE;
}
@@ -1208,7 +1211,7 @@ static int32_t smaIndexOptCreateSmaCols(SNodeList* pFuncs, uint64_t tableId, SNo
int32_t smaFuncIndex = -1;
*pWStrartIndex = -1;
FOREACH(pFunc, pFuncs) {
- if (FUNCTION_TYPE_WSTARTTS == ((SFunctionNode*)pFunc)->funcType) {
+ if (FUNCTION_TYPE_WSTART == ((SFunctionNode*)pFunc)->funcType) {
*pWStrartIndex = index;
}
smaFuncIndex = smaIndexOptFindSmaFunc(pFunc, pSmaFuncs);
@@ -1252,7 +1255,7 @@ static SNode* smaIndexOptCreateWStartTs() {
if (NULL == pWStart) {
return NULL;
}
- strcpy(pWStart->functionName, "_wstartts");
+ strcpy(pWStart->functionName, "_wstart");
snprintf(pWStart->node.aliasName, sizeof(pWStart->node.aliasName), "%s.%p", pWStart->functionName, pWStart);
if (TSDB_CODE_SUCCESS != fmGetFuncInfo(pWStart, NULL, 0)) {
nodesDestroyNode((SNode*)pWStart);
@@ -2054,11 +2057,11 @@ static EDealRes mergeProjectionsExpr(SNode** pNode, void* pContext) {
((SExprNode*)*pNode)->aliasName);
nodesDestroyNode(*pNode);
*pNode = pExpr;
+ return DEAL_RES_IGNORE_CHILD;
}
}
}
}
- return DEAL_RES_IGNORE_CHILD;
}
return DEAL_RES_CONTINUE;
}
@@ -2100,11 +2103,12 @@ static bool tagScanMayBeOptimized(SLogicNode* pNode) {
if (QUERY_NODE_LOGIC_PLAN_SCAN != nodeType(pNode) || (SCAN_TYPE_TAG == ((SScanLogicNode*)pNode)->scanType)) {
return false;
}
- SScanLogicNode *pScan = (SScanLogicNode*)pNode;
+ SScanLogicNode* pScan = (SScanLogicNode*)pNode;
if (NULL != pScan->pScanCols) {
return false;
}
- if (NULL == pNode->pParent || QUERY_NODE_LOGIC_PLAN_AGG != nodeType(pNode->pParent) || 1 != LIST_LENGTH(pNode->pParent->pChildren)) {
+ if (NULL == pNode->pParent || QUERY_NODE_LOGIC_PLAN_AGG != nodeType(pNode->pParent) ||
+ 1 != LIST_LENGTH(pNode->pParent->pChildren)) {
return false;
}
diff --git a/source/libs/planner/src/planSpliter.c b/source/libs/planner/src/planSpliter.c
index 987da0dd17..7b9d553501 100644
--- a/source/libs/planner/src/planSpliter.c
+++ b/source/libs/planner/src/planSpliter.c
@@ -308,7 +308,7 @@ static int32_t stbSplAppendWStart(SNodeList* pFuncs, int32_t* pIndex) {
int32_t index = 0;
SNode* pFunc = NULL;
FOREACH(pFunc, pFuncs) {
- if (FUNCTION_TYPE_WSTARTTS == ((SFunctionNode*)pFunc)->funcType) {
+ if (FUNCTION_TYPE_WSTART == ((SFunctionNode*)pFunc)->funcType) {
*pIndex = index;
return TSDB_CODE_SUCCESS;
}
@@ -319,7 +319,7 @@ static int32_t stbSplAppendWStart(SNodeList* pFuncs, int32_t* pIndex) {
if (NULL == pWStart) {
return TSDB_CODE_OUT_OF_MEMORY;
}
- strcpy(pWStart->functionName, "_wstartts");
+ strcpy(pWStart->functionName, "_wstart");
snprintf(pWStart->node.aliasName, sizeof(pWStart->node.aliasName), "%s.%p", pWStart->functionName, pWStart);
int32_t code = fmGetFuncInfo(pWStart, NULL, 0);
if (TSDB_CODE_SUCCESS == code) {
@@ -333,7 +333,7 @@ static int32_t stbSplAppendWEnd(SWindowLogicNode* pWin, int32_t* pIndex) {
int32_t index = 0;
SNode* pFunc = NULL;
FOREACH(pFunc, pWin->pFuncs) {
- if (FUNCTION_TYPE_WENDTS == ((SFunctionNode*)pFunc)->funcType) {
+ if (FUNCTION_TYPE_WEND == ((SFunctionNode*)pFunc)->funcType) {
*pIndex = index;
return TSDB_CODE_SUCCESS;
}
@@ -344,7 +344,7 @@ static int32_t stbSplAppendWEnd(SWindowLogicNode* pWin, int32_t* pIndex) {
if (NULL == pWEnd) {
return TSDB_CODE_OUT_OF_MEMORY;
}
- strcpy(pWEnd->functionName, "_wendts");
+ strcpy(pWEnd->functionName, "_wend");
snprintf(pWEnd->node.aliasName, sizeof(pWEnd->node.aliasName), "%s.%p", pWEnd->functionName, pWEnd);
int32_t code = fmGetFuncInfo(pWEnd, NULL, 0);
if (TSDB_CODE_SUCCESS == code) {
diff --git a/source/libs/planner/test/planBasicTest.cpp b/source/libs/planner/test/planBasicTest.cpp
index c99e4ea866..0d6bab145a 100644
--- a/source/libs/planner/test/planBasicTest.cpp
+++ b/source/libs/planner/test/planBasicTest.cpp
@@ -137,6 +137,17 @@ TEST_F(PlanBasicTest, sampleFunc) {
run("SELECT SAMPLE(c1, 10) FROM st1 PARTITION BY TBNAME");
}
+TEST_F(PlanBasicTest, pseudoColumn) {
+ useDb("root", "test");
+
+ run("SELECT _QSTART, _QEND, _QDURATION FROM t1");
+
+ run("SELECT _QSTART, _QEND, _QDURATION FROM t1 WHERE ts BETWEEN '2017-7-14 18:00:00' AND '2017-7-14 19:00:00'");
+
+ run("SELECT _QSTART, _QEND, _QDURATION, _WSTART, _WEND, _WDURATION, COUNT(*) FROM t1 "
+ "WHERE ts BETWEEN '2017-7-14 18:00:00' AND '2017-7-14 19:00:00' INTERVAL(10S)");
+}
+
TEST_F(PlanBasicTest, withoutFrom) {
useDb("root", "test");
diff --git a/source/libs/planner/test/planIntervalTest.cpp b/source/libs/planner/test/planIntervalTest.cpp
index 73fa898bf8..9f34ead6ff 100644
--- a/source/libs/planner/test/planIntervalTest.cpp
+++ b/source/libs/planner/test/planIntervalTest.cpp
@@ -29,7 +29,7 @@ TEST_F(PlanIntervalTest, basic) {
TEST_F(PlanIntervalTest, pseudoCol) {
useDb("root", "test");
- run("SELECT _WSTARTTS, _WDURATION, _WENDTS, COUNT(*) FROM t1 INTERVAL(10s)");
+ run("SELECT _WSTART, _WDURATION, _WEND, COUNT(*) FROM t1 INTERVAL(10s)");
}
TEST_F(PlanIntervalTest, fill) {
@@ -59,9 +59,9 @@ TEST_F(PlanIntervalTest, stable) {
run("SELECT COUNT(*) FROM st1 INTERVAL(10s)");
- run("SELECT _WSTARTTS, COUNT(*) FROM st1 INTERVAL(10s)");
+ run("SELECT _WSTART, COUNT(*) FROM st1 INTERVAL(10s)");
- run("SELECT _WSTARTTS, COUNT(*) FROM st1 PARTITION BY TBNAME INTERVAL(10s)");
+ run("SELECT _WSTART, COUNT(*) FROM st1 PARTITION BY TBNAME INTERVAL(10s)");
run("SELECT TBNAME, COUNT(*) FROM st1 PARTITION BY TBNAME INTERVAL(10s)");
}
diff --git a/source/libs/planner/test/planOptimizeTest.cpp b/source/libs/planner/test/planOptimizeTest.cpp
index 316148df27..75b4aa0dc1 100644
--- a/source/libs/planner/test/planOptimizeTest.cpp
+++ b/source/libs/planner/test/planOptimizeTest.cpp
@@ -55,7 +55,7 @@ TEST_F(PlanOptimizeTest, sortPrimaryKey) {
run("SELECT c1 FROM t1 ORDER BY ts DESC");
- run("SELECT COUNT(*) FROM t1 INTERVAL(10S) ORDER BY _WSTARTTS DESC");
+ run("SELECT COUNT(*) FROM t1 INTERVAL(10S) ORDER BY _WSTART DESC");
}
TEST_F(PlanOptimizeTest, PartitionTags) {
diff --git a/source/libs/planner/test/planOtherTest.cpp b/source/libs/planner/test/planOtherTest.cpp
index 6add1cf630..7107f8b3c9 100644
--- a/source/libs/planner/test/planOtherTest.cpp
+++ b/source/libs/planner/test/planOtherTest.cpp
@@ -49,7 +49,7 @@ TEST_F(PlanOtherTest, createSmaIndex) {
run("SELECT SUM(c4) FROM t1 INTERVAL(10s)");
- run("SELECT _WSTARTTS, MIN(c3 + 10) FROM t1 "
+ run("SELECT _WSTART, MIN(c3 + 10) FROM t1 "
"WHERE ts BETWEEN TIMESTAMP '2022-04-01 00:00:00' AND TIMESTAMP '2022-04-30 23:59:59.999' INTERVAL(10s)");
run("SELECT SUM(c4), MAX(c3) FROM t1 INTERVAL(10s)");
diff --git a/source/libs/qworker/CMakeLists.txt b/source/libs/qworker/CMakeLists.txt
index 306753808b..92ccde3163 100644
--- a/source/libs/qworker/CMakeLists.txt
+++ b/source/libs/qworker/CMakeLists.txt
@@ -13,4 +13,4 @@ target_link_libraries(qworker
if(${BUILD_TEST})
ADD_SUBDIRECTORY(test)
-endif(${BUILD_TEST})
\ No newline at end of file
+endif(${BUILD_TEST})
diff --git a/source/libs/scalar/inc/sclInt.h b/source/libs/scalar/inc/sclInt.h
index 4422da1b81..d423b92da7 100644
--- a/source/libs/scalar/inc/sclInt.h
+++ b/source/libs/scalar/inc/sclInt.h
@@ -30,6 +30,7 @@ typedef struct SOperatorValueType {
typedef struct SScalarCtx {
int32_t code;
+ bool dual;
SArray *pBlockList; /* element is SSDataBlock* */
SHashObj *pRes; /* element is SScalarParam */
void *param; // additional parameter (meta actually) for acquire value such as tbname/tags values
diff --git a/source/libs/scalar/src/scalar.c b/source/libs/scalar/src/scalar.c
index fd4fe20dcf..b3bd989eb4 100644
--- a/source/libs/scalar/src/scalar.c
+++ b/source/libs/scalar/src/scalar.c
@@ -1011,13 +1011,14 @@ int32_t sclExtendResRows(SScalarParam *pDst, SScalarParam *pSrc, SArray *pBlockL
return TSDB_CODE_SUCCESS;
}
-int32_t scalarCalculateConstants(SNode *pNode, SNode **pRes) {
+int32_t sclCalcConstants(SNode *pNode, bool dual, SNode **pRes) {
if (NULL == pNode) {
SCL_ERR_RET(TSDB_CODE_QRY_INVALID_INPUT);
}
int32_t code = 0;
SScalarCtx ctx = {0};
+ ctx.dual = dual;
ctx.pRes = taosHashInit(SCL_DEFAULT_OP_NUM, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_NO_LOCK);
if (NULL == ctx.pRes) {
sclError("taosHashInit failed, num:%d", SCL_DEFAULT_OP_NUM);
@@ -1029,10 +1030,88 @@ int32_t scalarCalculateConstants(SNode *pNode, SNode **pRes) {
*pRes = pNode;
_return:
+
sclFreeRes(ctx.pRes);
return code;
}
+static int32_t sclGetMinusOperatorResType(SOperatorNode* pOp) {
+ if (!IS_MATHABLE_TYPE(((SExprNode*)(pOp->pLeft))->resType.type)) {
+ return TSDB_CODE_TSC_INVALID_OPERATION;
+ }
+ pOp->node.resType.type = TSDB_DATA_TYPE_DOUBLE;
+ pOp->node.resType.bytes = tDataTypes[TSDB_DATA_TYPE_DOUBLE].bytes;
+ return TSDB_CODE_SUCCESS;
+}
+
+static int32_t sclGetMathOperatorResType(SOperatorNode* pOp) {
+ SDataType ldt = ((SExprNode*)(pOp->pLeft))->resType;
+ SDataType rdt = ((SExprNode*)(pOp->pRight))->resType;
+ if ((TSDB_DATA_TYPE_TIMESTAMP == ldt.type && TSDB_DATA_TYPE_TIMESTAMP == rdt.type) ||
+ (TSDB_DATA_TYPE_TIMESTAMP == ldt.type && (IS_VAR_DATA_TYPE(rdt.type) || IS_FLOAT_TYPE(rdt.type))) ||
+ (TSDB_DATA_TYPE_TIMESTAMP == rdt.type && (IS_VAR_DATA_TYPE(ldt.type) || IS_FLOAT_TYPE(ldt.type)))) {
+ return TSDB_CODE_TSC_INVALID_OPERATION;
+ }
+
+ if ((TSDB_DATA_TYPE_TIMESTAMP == ldt.type && IS_INTEGER_TYPE(rdt.type)) ||
+ (TSDB_DATA_TYPE_TIMESTAMP == rdt.type && IS_INTEGER_TYPE(ldt.type)) ||
+ (TSDB_DATA_TYPE_TIMESTAMP == ldt.type && TSDB_DATA_TYPE_BOOL == rdt.type) ||
+ (TSDB_DATA_TYPE_TIMESTAMP == rdt.type && TSDB_DATA_TYPE_BOOL == ldt.type)) {
+ pOp->node.resType.type = TSDB_DATA_TYPE_TIMESTAMP;
+ pOp->node.resType.bytes = tDataTypes[TSDB_DATA_TYPE_TIMESTAMP].bytes;
+ } else {
+ pOp->node.resType.type = TSDB_DATA_TYPE_DOUBLE;
+ pOp->node.resType.bytes = tDataTypes[TSDB_DATA_TYPE_DOUBLE].bytes;
+ }
+ return TSDB_CODE_SUCCESS;
+}
+
+static int32_t sclGetCompOperatorResType(SOperatorNode* pOp) {
+ SDataType ldt = ((SExprNode*)(pOp->pLeft))->resType;
+ if (OP_TYPE_IN == pOp->opType || OP_TYPE_NOT_IN == pOp->opType) {
+ ((SExprNode*)(pOp->pRight))->resType = ldt;
+ } else if (nodesIsRegularOp(pOp)) {
+ SDataType rdt = ((SExprNode*)(pOp->pRight))->resType;
+ if (!IS_VAR_DATA_TYPE(ldt.type) || QUERY_NODE_VALUE != nodeType(pOp->pRight) ||
+ (!IS_STR_DATA_TYPE(rdt.type) && (rdt.type != TSDB_DATA_TYPE_NULL))) {
+ return TSDB_CODE_TSC_INVALID_OPERATION;
+ }
+ }
+ pOp->node.resType.type = TSDB_DATA_TYPE_BOOL;
+ pOp->node.resType.bytes = tDataTypes[TSDB_DATA_TYPE_BOOL].bytes;
+ return TSDB_CODE_SUCCESS;
+}
+
+static int32_t sclGetJsonOperatorResType(SOperatorNode* pOp) {
+ SDataType ldt = ((SExprNode*)(pOp->pLeft))->resType;
+ SDataType rdt = ((SExprNode*)(pOp->pRight))->resType;
+ if (TSDB_DATA_TYPE_JSON != ldt.type || !IS_STR_DATA_TYPE(rdt.type)) {
+ return TSDB_CODE_TSC_INVALID_OPERATION;
+ }
+ if (pOp->opType == OP_TYPE_JSON_GET_VALUE) {
+ pOp->node.resType.type = TSDB_DATA_TYPE_JSON;
+ } else if (pOp->opType == OP_TYPE_JSON_CONTAINS) {
+ pOp->node.resType.type = TSDB_DATA_TYPE_BOOL;
+ }
+ pOp->node.resType.bytes = tDataTypes[pOp->node.resType.type].bytes;
+ return TSDB_CODE_SUCCESS;
+}
+
+static int32_t sclGetBitwiseOperatorResType(SOperatorNode* pOp) {
+ pOp->node.resType.type = TSDB_DATA_TYPE_BIGINT;
+ pOp->node.resType.bytes = tDataTypes[TSDB_DATA_TYPE_BIGINT].bytes;
+ return TSDB_CODE_SUCCESS;
+}
+
+
+int32_t scalarCalculateConstants(SNode *pNode, SNode **pRes) {
+ return sclCalcConstants(pNode, false, pRes);
+}
+
+int32_t scalarCalculateConstantsFromDual(SNode *pNode, SNode **pRes) {
+ return sclCalcConstants(pNode, true, pRes);
+}
+
int32_t scalarCalculate(SNode *pNode, SArray *pBlockList, SScalarParam *pDst) {
if (NULL == pNode || NULL == pBlockList) {
SCL_ERR_RET(TSDB_CODE_QRY_INVALID_INPUT);
@@ -1076,74 +1155,6 @@ _return:
return code;
}
-static int32_t getMinusOperatorResultType(SOperatorNode* pOp) {
- if (!IS_MATHABLE_TYPE(((SExprNode*)(pOp->pLeft))->resType.type)) {
- return TSDB_CODE_TSC_INVALID_OPERATION;
- }
- pOp->node.resType.type = TSDB_DATA_TYPE_DOUBLE;
- pOp->node.resType.bytes = tDataTypes[TSDB_DATA_TYPE_DOUBLE].bytes;
- return TSDB_CODE_SUCCESS;
-}
-
-static int32_t getArithmeticOperatorResultType(SOperatorNode* pOp) {
- SDataType ldt = ((SExprNode*)(pOp->pLeft))->resType;
- SDataType rdt = ((SExprNode*)(pOp->pRight))->resType;
- if ((TSDB_DATA_TYPE_TIMESTAMP == ldt.type && TSDB_DATA_TYPE_TIMESTAMP == rdt.type) ||
- (TSDB_DATA_TYPE_TIMESTAMP == ldt.type && (IS_VAR_DATA_TYPE(rdt.type) || IS_FLOAT_TYPE(rdt.type))) ||
- (TSDB_DATA_TYPE_TIMESTAMP == rdt.type && (IS_VAR_DATA_TYPE(ldt.type) || IS_FLOAT_TYPE(ldt.type)))) {
- return TSDB_CODE_TSC_INVALID_OPERATION;
- }
-
- if ((TSDB_DATA_TYPE_TIMESTAMP == ldt.type && IS_INTEGER_TYPE(rdt.type)) ||
- (TSDB_DATA_TYPE_TIMESTAMP == rdt.type && IS_INTEGER_TYPE(ldt.type)) ||
- (TSDB_DATA_TYPE_TIMESTAMP == ldt.type && TSDB_DATA_TYPE_BOOL == rdt.type) ||
- (TSDB_DATA_TYPE_TIMESTAMP == rdt.type && TSDB_DATA_TYPE_BOOL == ldt.type)) {
- pOp->node.resType.type = TSDB_DATA_TYPE_TIMESTAMP;
- pOp->node.resType.bytes = tDataTypes[TSDB_DATA_TYPE_TIMESTAMP].bytes;
- } else {
- pOp->node.resType.type = TSDB_DATA_TYPE_DOUBLE;
- pOp->node.resType.bytes = tDataTypes[TSDB_DATA_TYPE_DOUBLE].bytes;
- }
- return TSDB_CODE_SUCCESS;
-}
-
-static int32_t getComparisonOperatorResultType(SOperatorNode* pOp) {
- SDataType ldt = ((SExprNode*)(pOp->pLeft))->resType;
- if (OP_TYPE_IN == pOp->opType || OP_TYPE_NOT_IN == pOp->opType) {
- ((SExprNode*)(pOp->pRight))->resType = ldt;
- } else if (nodesIsRegularOp(pOp)) {
- SDataType rdt = ((SExprNode*)(pOp->pRight))->resType;
- if (!IS_VAR_DATA_TYPE(ldt.type) || QUERY_NODE_VALUE != nodeType(pOp->pRight) ||
- (!IS_STR_DATA_TYPE(rdt.type) && (rdt.type != TSDB_DATA_TYPE_NULL))) {
- return TSDB_CODE_TSC_INVALID_OPERATION;
- }
- }
- pOp->node.resType.type = TSDB_DATA_TYPE_BOOL;
- pOp->node.resType.bytes = tDataTypes[TSDB_DATA_TYPE_BOOL].bytes;
- return TSDB_CODE_SUCCESS;
-}
-
-static int32_t getJsonOperatorResultType(SOperatorNode* pOp) {
- SDataType ldt = ((SExprNode*)(pOp->pLeft))->resType;
- SDataType rdt = ((SExprNode*)(pOp->pRight))->resType;
- if (TSDB_DATA_TYPE_JSON != ldt.type || !IS_STR_DATA_TYPE(rdt.type)) {
- return TSDB_CODE_TSC_INVALID_OPERATION;
- }
- if (pOp->opType == OP_TYPE_JSON_GET_VALUE) {
- pOp->node.resType.type = TSDB_DATA_TYPE_JSON;
- } else if (pOp->opType == OP_TYPE_JSON_CONTAINS) {
- pOp->node.resType.type = TSDB_DATA_TYPE_BOOL;
- }
- pOp->node.resType.bytes = tDataTypes[pOp->node.resType.type].bytes;
- return TSDB_CODE_SUCCESS;
-}
-
-static int32_t getBitwiseOperatorResultType(SOperatorNode* pOp) {
- pOp->node.resType.type = TSDB_DATA_TYPE_BIGINT;
- pOp->node.resType.bytes = tDataTypes[TSDB_DATA_TYPE_BIGINT].bytes;
- return TSDB_CODE_SUCCESS;
-}
-
int32_t scalarGetOperatorResultType(SOperatorNode* pOp) {
if (TSDB_DATA_TYPE_BLOB == ((SExprNode*)(pOp->pLeft))->resType.type ||
(NULL != pOp->pRight && TSDB_DATA_TYPE_BLOB == ((SExprNode*)(pOp->pRight))->resType.type)) {
@@ -1156,15 +1167,15 @@ int32_t scalarGetOperatorResultType(SOperatorNode* pOp) {
case OP_TYPE_MULTI:
case OP_TYPE_DIV:
case OP_TYPE_REM:
- return getArithmeticOperatorResultType(pOp);
+ return sclGetMathOperatorResType(pOp);
case OP_TYPE_MINUS:
- return getMinusOperatorResultType(pOp);
+ return sclGetMinusOperatorResType(pOp);
case OP_TYPE_ASSIGN:
pOp->node.resType = ((SExprNode*)(pOp->pLeft))->resType;
break;
case OP_TYPE_BIT_AND:
case OP_TYPE_BIT_OR:
- return getBitwiseOperatorResultType(pOp);
+ return sclGetBitwiseOperatorResType(pOp);
case OP_TYPE_GREATER_THAN:
case OP_TYPE_GREATER_EQUAL:
case OP_TYPE_LOWER_THAN:
@@ -1185,10 +1196,10 @@ int32_t scalarGetOperatorResultType(SOperatorNode* pOp) {
case OP_TYPE_NMATCH:
case OP_TYPE_IN:
case OP_TYPE_NOT_IN:
- return getComparisonOperatorResultType(pOp);
+ return sclGetCompOperatorResType(pOp);
case OP_TYPE_JSON_GET_VALUE:
case OP_TYPE_JSON_CONTAINS:
- return getJsonOperatorResultType(pOp);
+ return sclGetJsonOperatorResType(pOp);
default:
break;
}
diff --git a/source/libs/scalar/src/sclvector.c b/source/libs/scalar/src/sclvector.c
index bf457d07eb..39b2f04f3e 100644
--- a/source/libs/scalar/src/sclvector.c
+++ b/source/libs/scalar/src/sclvector.c
@@ -1055,7 +1055,7 @@ static void vectorMathAddHelper(SColumnInfoData* pLeftCol, SColumnInfoData* pRig
}
}
-static void vectorMathBigintAddHelper(SColumnInfoData* pLeftCol, SColumnInfoData* pRightCol, SColumnInfoData* pOutputCol, int32_t numOfRows, int32_t step, int32_t i) {
+static void vectorMathTsAddHelper(SColumnInfoData* pLeftCol, SColumnInfoData* pRightCol, SColumnInfoData* pOutputCol, int32_t numOfRows, int32_t step, int32_t i) {
_getBigintValue_fn_t getVectorBigintValueFnLeft = getVectorBigintValueFn(pLeftCol->info.type);
_getBigintValue_fn_t getVectorBigintValueFnRight = getVectorBigintValueFn(pRightCol->info.type);
@@ -1069,7 +1069,8 @@ static void vectorMathBigintAddHelper(SColumnInfoData* pLeftCol, SColumnInfoData
colDataAppendNULL(pOutputCol, i);
continue; // TODO set null or ignore
}
- *output = getVectorBigintValueFnLeft(pLeftCol->pData, i) + getVectorBigintValueFnRight(pRightCol->pData, 0);
+ *output = taosTimeAdd(getVectorBigintValueFnLeft(pLeftCol->pData, i), getVectorBigintValueFnRight(pRightCol->pData, 0),
+ pRightCol->info.scale, pRightCol->info.precision);
}
}
}
@@ -1116,7 +1117,17 @@ void vectorMathAdd(SScalarParam* pLeft, SScalarParam* pRight, SScalarParam *pOut
_getBigintValue_fn_t getVectorBigintValueFnLeft = getVectorBigintValueFn(pLeftCol->info.type);
_getBigintValue_fn_t getVectorBigintValueFnRight = getVectorBigintValueFn(pRightCol->info.type);
- if (pLeft->numOfRows == pRight->numOfRows) {
+ if (pLeft->numOfRows == 1 && pRight->numOfRows == 1) {
+ if (GET_PARAM_TYPE(pLeft) == TSDB_DATA_TYPE_TIMESTAMP) {
+ vectorMathTsAddHelper(pLeftCol, pRightCol, pOutputCol, pRight->numOfRows, step, i);
+ } else {
+ vectorMathTsAddHelper(pRightCol, pLeftCol, pOutputCol, pRight->numOfRows, step, i);
+ }
+ } else if (pLeft->numOfRows == 1) {
+ vectorMathTsAddHelper(pRightCol, pLeftCol, pOutputCol, pRight->numOfRows, step, i);
+ } else if (pRight->numOfRows == 1) {
+ vectorMathTsAddHelper(pLeftCol, pRightCol, pOutputCol, pLeft->numOfRows, step, i);
+ } else if (pLeft->numOfRows == pRight->numOfRows) {
for (; i < pRight->numOfRows && i >= 0; i += step, output += 1) {
if (IS_NULL) {
colDataAppendNULL(pOutputCol, i);
@@ -1124,11 +1135,7 @@ void vectorMathAdd(SScalarParam* pLeft, SScalarParam* pRight, SScalarParam *pOut
}
*output = getVectorBigintValueFnLeft(pLeftCol->pData, i) + getVectorBigintValueFnRight(pRightCol->pData, i);
}
- } else if (pLeft->numOfRows == 1) {
- vectorMathBigintAddHelper(pRightCol, pLeftCol, pOutputCol, pRight->numOfRows, step, i);
- } else if (pRight->numOfRows == 1) {
- vectorMathBigintAddHelper(pLeftCol, pRightCol, pOutputCol, pLeft->numOfRows, step, i);
- }
+ }
} else {
double *output = (double *)pOutputCol->pData;
_getDoubleValue_fn_t getVectorDoubleValueFnLeft = getVectorDoubleValueFn(pLeftCol->info.type);
@@ -1174,7 +1181,7 @@ static void vectorMathSubHelper(SColumnInfoData* pLeftCol, SColumnInfoData* pRig
}
}
-static void vectorMathBigintSubHelper(SColumnInfoData* pLeftCol, SColumnInfoData* pRightCol, SColumnInfoData* pOutputCol, int32_t numOfRows, int32_t step, int32_t factor, int32_t i) {
+static void vectorMathTsSubHelper(SColumnInfoData* pLeftCol, SColumnInfoData* pRightCol, SColumnInfoData* pOutputCol, int32_t numOfRows, int32_t step, int32_t factor, int32_t i) {
_getBigintValue_fn_t getVectorBigintValueFnLeft = getVectorBigintValueFn(pLeftCol->info.type);
_getBigintValue_fn_t getVectorBigintValueFnRight = getVectorBigintValueFn(pRightCol->info.type);
@@ -1188,7 +1195,9 @@ static void vectorMathBigintSubHelper(SColumnInfoData* pLeftCol, SColumnInfoData
colDataAppendNULL(pOutputCol, i);
continue; // TODO set null or ignore
}
- *output = (getVectorBigintValueFnLeft(pLeftCol->pData, i) - getVectorBigintValueFnRight(pRightCol->pData, 0)) * factor;
+ *output = taosTimeSub(getVectorBigintValueFnLeft(pLeftCol->pData, i), getVectorBigintValueFnRight(pRightCol->pData, 0),
+ pRightCol->info.scale, pRightCol->info.precision);
+
}
}
}
@@ -1211,7 +1220,13 @@ void vectorMathSub(SScalarParam* pLeft, SScalarParam* pRight, SScalarParam *pOut
_getBigintValue_fn_t getVectorBigintValueFnLeft = getVectorBigintValueFn(pLeftCol->info.type);
_getBigintValue_fn_t getVectorBigintValueFnRight = getVectorBigintValueFn(pRightCol->info.type);
- if (pLeft->numOfRows == pRight->numOfRows) {
+ if (pLeft->numOfRows == 1 && pRight->numOfRows == 1) {
+ vectorMathTsSubHelper(pLeftCol, pRightCol, pOutputCol, pLeft->numOfRows, step, 1, i);
+ } else if (pLeft->numOfRows == 1) {
+ vectorMathTsSubHelper(pRightCol, pLeftCol, pOutputCol, pRight->numOfRows, step, -1, i);
+ } else if (pRight->numOfRows == 1) {
+ vectorMathTsSubHelper(pLeftCol, pRightCol, pOutputCol, pLeft->numOfRows, step, 1, i);
+ } else if (pLeft->numOfRows == pRight->numOfRows) {
for (; i < pRight->numOfRows && i >= 0; i += step, output += 1) {
if (IS_NULL) {
colDataAppendNULL(pOutputCol, i);
@@ -1219,10 +1234,6 @@ void vectorMathSub(SScalarParam* pLeft, SScalarParam* pRight, SScalarParam *pOut
}
*output = getVectorBigintValueFnLeft(pLeftCol->pData, i) - getVectorBigintValueFnRight(pRightCol->pData, i);
}
- } else if (pLeft->numOfRows == 1) {
- vectorMathBigintSubHelper(pRightCol, pLeftCol, pOutputCol, pRight->numOfRows, step, -1, i);
- } else if (pRight->numOfRows == 1) {
- vectorMathBigintSubHelper(pLeftCol, pRightCol, pOutputCol, pLeft->numOfRows, step, 1, i);
}
} else {
double *output = (double *)pOutputCol->pData;
diff --git a/source/libs/scheduler/inc/schInt.h b/source/libs/scheduler/inc/schInt.h
index 0a0d319025..b6b17cb106 100644
--- a/source/libs/scheduler/inc/schInt.h
+++ b/source/libs/scheduler/inc/schInt.h
@@ -223,6 +223,7 @@ typedef struct SSchJobAttr {
typedef struct {
int32_t op;
+ SRWLatch lock;
bool syncReq;
} SSchOpStatus;
@@ -473,6 +474,7 @@ int32_t schGetTaskFromList(SHashObj *pTaskList, uint64_t taskId, SSchTask **pTas
int32_t schInitTask(SSchJob *pJob, SSchTask *pTask, SSubplan *pPlan, SSchLevel *pLevel, int32_t levelNum);
int32_t schSwitchTaskCandidateAddr(SSchJob *pJob, SSchTask *pTask);
void schDirectPostJobRes(SSchedulerReq* pReq, int32_t errCode);
+bool schChkCurrentOp(SSchJob *pJob, int32_t op, bool sync);
extern SSchDebug gSCHDebug;
diff --git a/source/libs/scheduler/src/schJob.c b/source/libs/scheduler/src/schJob.c
index e482814ee7..19bb93249f 100644
--- a/source/libs/scheduler/src/schJob.c
+++ b/source/libs/scheduler/src/schJob.c
@@ -443,25 +443,37 @@ int32_t schNotifyUserFetchRes(SSchJob* pJob) {
}
void schPostJobRes(SSchJob *pJob, SCH_OP_TYPE op) {
+ SCH_LOCK(SCH_WRITE, &pJob->opStatus.lock);
+
if (SCH_OP_NULL == pJob->opStatus.op) {
SCH_JOB_DLOG("job not in any operation, no need to post job res, status:%s", jobTaskStatusStr(pJob->status));
- return;
+ goto _return;
}
if (op && pJob->opStatus.op != op) {
SCH_JOB_ELOG("job in operation %s mis-match with expected %s", schGetOpStr(pJob->opStatus.op), schGetOpStr(op));
- return;
+ goto _return;
}
if (SCH_JOB_IN_SYNC_OP(pJob)) {
+ SCH_UNLOCK(SCH_WRITE, &pJob->opStatus.lock);
tsem_post(&pJob->rspSem);
} else if (SCH_JOB_IN_ASYNC_EXEC_OP(pJob)) {
+ SCH_UNLOCK(SCH_WRITE, &pJob->opStatus.lock);
schNotifyUserExecRes(pJob);
} else if (SCH_JOB_IN_ASYNC_FETCH_OP(pJob)) {
+ SCH_UNLOCK(SCH_WRITE, &pJob->opStatus.lock);
schNotifyUserFetchRes(pJob);
} else {
+ SCH_UNLOCK(SCH_WRITE, &pJob->opStatus.lock);
SCH_JOB_ELOG("job not in any operation, status:%s", jobTaskStatusStr(pJob->status));
}
+
+ return;
+
+_return:
+
+ SCH_UNLOCK(SCH_WRITE, &pJob->opStatus.lock);
}
int32_t schProcessOnJobFailureImpl(SSchJob *pJob, int32_t status, int32_t errCode) {
@@ -658,13 +670,13 @@ int32_t schJobFetchRows(SSchJob *pJob) {
if (!(pJob->attr.explainMode == EXPLAIN_MODE_STATIC)) {
SCH_ERR_RET(schLaunchFetchTask(pJob));
- if (pJob->opStatus.syncReq) {
+ if (schChkCurrentOp(pJob, SCH_OP_FETCH, true)) {
SCH_JOB_DLOG("sync wait for rsp now, job status:%s", SCH_GET_JOB_STATUS_STR(pJob));
tsem_wait(&pJob->rspSem);
SCH_RET(schDumpJobFetchRes(pJob, pJob->userRes.fetchRes));
}
} else {
- if (pJob->opStatus.syncReq) {
+ if (schChkCurrentOp(pJob, SCH_OP_FETCH, true)) {
SCH_RET(schDumpJobFetchRes(pJob, pJob->userRes.fetchRes));
} else {
schPostJobRes(pJob, SCH_OP_FETCH);
@@ -775,25 +787,37 @@ void schDirectPostJobRes(SSchedulerReq* pReq, int32_t errCode) {
}
}
+bool schChkCurrentOp(SSchJob *pJob, int32_t op, bool sync) {
+ SCH_LOCK(SCH_READ, &pJob->opStatus.lock);
+ bool r = (pJob->opStatus.op == op) && (pJob->opStatus.syncReq == sync);
+ SCH_UNLOCK(SCH_READ, &pJob->opStatus.lock);
+
+ return r;
+}
+
void schProcessOnOpEnd(SSchJob *pJob, SCH_OP_TYPE type, SSchedulerReq* pReq, int32_t errCode) {
int32_t op = 0;
switch (type) {
case SCH_OP_EXEC:
if (pReq && pReq->syncReq) {
+ SCH_LOCK(SCH_WRITE, &pJob->opStatus.lock);
op = atomic_val_compare_exchange_32(&pJob->opStatus.op, type, SCH_OP_NULL);
if (SCH_OP_NULL == op || op != type) {
SCH_JOB_ELOG("job not in %s operation, op:%s, status:%s", schGetOpStr(type), schGetOpStr(op), jobTaskStatusStr(pJob->status));
}
+ SCH_UNLOCK(SCH_WRITE, &pJob->opStatus.lock);
schDumpJobExecRes(pJob, pReq->pExecRes);
}
break;
case SCH_OP_FETCH:
if (pReq && pReq->syncReq) {
+ SCH_LOCK(SCH_WRITE, &pJob->opStatus.lock);
op = atomic_val_compare_exchange_32(&pJob->opStatus.op, type, SCH_OP_NULL);
if (SCH_OP_NULL == op || op != type) {
SCH_JOB_ELOG("job not in %s operation, op:%s, status:%s", schGetOpStr(type), schGetOpStr(op), jobTaskStatusStr(pJob->status));
}
+ SCH_UNLOCK(SCH_WRITE, &pJob->opStatus.lock);
}
break;
case SCH_OP_GET_STATUS:
@@ -816,8 +840,10 @@ int32_t schProcessOnOpBegin(SSchJob* pJob, SCH_OP_TYPE type, SSchedulerReq* pReq
switch (type) {
case SCH_OP_EXEC:
+ SCH_LOCK(SCH_WRITE, &pJob->opStatus.lock);
if (SCH_OP_NULL != atomic_val_compare_exchange_32(&pJob->opStatus.op, SCH_OP_NULL, type)) {
SCH_JOB_ELOG("job already in %s operation", schGetOpStr(pJob->opStatus.op));
+ SCH_UNLOCK(SCH_WRITE, &pJob->opStatus.lock);
schDirectPostJobRes(pReq, TSDB_CODE_TSC_APP_ERROR);
SCH_ERR_RET(TSDB_CODE_TSC_APP_ERROR);
}
@@ -825,10 +851,13 @@ int32_t schProcessOnOpBegin(SSchJob* pJob, SCH_OP_TYPE type, SSchedulerReq* pReq
SCH_JOB_DLOG("job start %s operation", schGetOpStr(pJob->opStatus.op));
pJob->opStatus.syncReq = pReq->syncReq;
+ SCH_UNLOCK(SCH_WRITE, &pJob->opStatus.lock);
break;
case SCH_OP_FETCH:
+ SCH_LOCK(SCH_WRITE, &pJob->opStatus.lock);
if (SCH_OP_NULL != atomic_val_compare_exchange_32(&pJob->opStatus.op, SCH_OP_NULL, type)) {
SCH_JOB_ELOG("job already in %s operation", schGetOpStr(pJob->opStatus.op));
+ SCH_UNLOCK(SCH_WRITE, &pJob->opStatus.lock);
schDirectPostJobRes(pReq, TSDB_CODE_TSC_APP_ERROR);
SCH_ERR_RET(TSDB_CODE_TSC_APP_ERROR);
}
@@ -840,6 +869,7 @@ int32_t schProcessOnOpBegin(SSchJob* pJob, SCH_OP_TYPE type, SSchedulerReq* pReq
pJob->userRes.cbParam = pReq->cbParam;
pJob->opStatus.syncReq = pReq->syncReq;
+ SCH_UNLOCK(SCH_WRITE, &pJob->opStatus.lock);
if (!SCH_JOB_NEED_FETCH(pJob)) {
SCH_JOB_ELOG("no need to fetch data, status:%s", SCH_GET_JOB_STATUS_STR(pJob));
diff --git a/source/libs/scheduler/src/schTask.c b/source/libs/scheduler/src/schTask.c
index 71d123b799..236257666b 100644
--- a/source/libs/scheduler/src/schTask.c
+++ b/source/libs/scheduler/src/schTask.c
@@ -505,6 +505,7 @@ int32_t schTaskCheckSetRetry(SSchJob *pJob, SSchTask *pTask, int32_t errCode, bo
return TSDB_CODE_SUCCESS;
}
+/*
if (SCH_IS_DATA_BIND_TASK(pTask)) {
if ((pTask->execId + 1) >= SCH_TASK_NUM_OF_EPS(&pTask->plan->execNode)) {
*needRetry = false;
@@ -522,6 +523,7 @@ int32_t schTaskCheckSetRetry(SSchJob *pJob, SSchTask *pTask, int32_t errCode, bo
return TSDB_CODE_SUCCESS;
}
}
+*/
*needRetry = true;
SCH_TASK_DLOG("task need the %dth retry, errCode:%x - %s", pTask->execId + 1, errCode, tstrerror(errCode));
diff --git a/source/libs/stream/inc/streamInc.h b/source/libs/stream/inc/streamInc.h
index 1629c863d5..f9f4e62774 100644
--- a/source/libs/stream/inc/streamInc.h
+++ b/source/libs/stream/inc/streamInc.h
@@ -42,6 +42,9 @@ int32_t streamBroadcastToChildren(SStreamTask* pTask, const SSDataBlock* pBlock)
int32_t tEncodeStreamRetrieveReq(SEncoder* pEncoder, const SStreamRetrieveReq* pReq);
+int32_t streamAppendQueueItem(SStreamQueueItem* dst, SStreamQueueItem* elem);
+void streamFreeQitem(SStreamQueueItem* data);
+
#ifdef __cplusplus
}
#endif
diff --git a/source/libs/stream/src/stream.c b/source/libs/stream/src/stream.c
index becfac0cac..566d9209a8 100644
--- a/source/libs/stream/src/stream.c
+++ b/source/libs/stream/src/stream.c
@@ -97,7 +97,7 @@ int32_t streamLaunchByWrite(SStreamTask* pTask, int32_t vgId) {
.pCont = pRunReq,
.contLen = sizeof(SStreamTaskRunReq),
};
- tmsgPutToQueue(pTask->pMsgCb, FETCH_QUEUE, &msg);
+ tmsgPutToQueue(pTask->pMsgCb, STREAM_QUEUE, &msg);
}
return 0;
}
diff --git a/source/libs/stream/src/streamData.c b/source/libs/stream/src/streamData.c
index 529615d4fd..2b3307b7f5 100644
--- a/source/libs/stream/src/streamData.c
+++ b/source/libs/stream/src/streamData.c
@@ -97,3 +97,29 @@ void streamDataSubmitRefDec(SStreamDataSubmit* pDataSubmit) {
taosMemoryFree(pDataSubmit->dataRef);
}
}
+
+int32_t streamAppendQueueItem(SStreamQueueItem* dst, SStreamQueueItem* elem) {
+ ASSERT(elem);
+ if (dst->type == elem->type && dst->type == STREAM_INPUT__DATA_BLOCK) {
+ SStreamDataBlock* pBlock = (SStreamDataBlock*)dst;
+ SStreamDataBlock* pBlockSrc = (SStreamDataBlock*)elem;
+ taosArrayAddAll(pBlock->blocks, pBlockSrc->blocks);
+ return 0;
+ } else {
+ return -1;
+ }
+}
+
+void streamFreeQitem(SStreamQueueItem* data) {
+ int8_t type = data->type;
+ if (type == STREAM_INPUT__TRIGGER) {
+ blockDataDestroy(((SStreamTrigger*)data)->pBlock);
+ taosFreeQitem(data);
+ } else if (type == STREAM_INPUT__DATA_BLOCK || type == STREAM_INPUT__DATA_RETRIEVE) {
+ taosArrayDestroyEx(((SStreamDataBlock*)data)->blocks, (FDelete)tDeleteSSDataBlock);
+ taosFreeQitem(data);
+ } else if (type == STREAM_INPUT__DATA_SUBMIT) {
+ streamDataSubmitRefDec((SStreamDataSubmit*)data);
+ taosFreeQitem(data);
+ }
+}
diff --git a/source/libs/stream/src/streamDispatch.c b/source/libs/stream/src/streamDispatch.c
index 98b0874b00..05efce8bc2 100644
--- a/source/libs/stream/src/streamDispatch.c
+++ b/source/libs/stream/src/streamDispatch.c
@@ -251,8 +251,8 @@ int32_t streamBuildDispatchMsg(SStreamTask* pTask, const SStreamDataBlock* data,
ASSERT(vgId > 0 || vgId == SNODE_HANDLE);
req.taskId = downstreamTaskId;
- qInfo("dispatch from task %d (child id %d) to down stream task %d in vnode %d", pTask->taskId, pTask->selfChildId,
- downstreamTaskId, vgId);
+ qDebug("dispatch from task %d (child id %d) to down stream task %d in vnode %d", pTask->taskId, pTask->selfChildId,
+ downstreamTaskId, vgId);
// serialize
int32_t tlen;
@@ -298,6 +298,7 @@ int32_t streamDispatch(SStreamTask* pTask, SMsgCb* pMsgCb) {
SStreamDataBlock* pBlock = streamQueueNextItem(pTask->outputQueue);
if (pBlock == NULL) {
+ qDebug("stream stop dispatching since no output: task %d", pTask->taskId);
atomic_store_8(&pTask->outputStatus, TASK_OUTPUT_STATUS__NORMAL);
return 0;
}
diff --git a/source/libs/stream/src/streamExec.c b/source/libs/stream/src/streamExec.c
index 36885e73c0..d0d81e3343 100644
--- a/source/libs/stream/src/streamExec.c
+++ b/source/libs/stream/src/streamExec.c
@@ -75,10 +75,35 @@ static int32_t streamTaskExecImpl(SStreamTask* pTask, void* data, SArray* pRes)
static SArray* streamExecForQall(SStreamTask* pTask, SArray* pRes) {
while (1) {
- void* data = streamQueueNextItem(pTask->inputQueue);
+ int32_t cnt = 0;
+ void* data = NULL;
+ while (1) {
+ SStreamQueueItem* qItem = streamQueueNextItem(pTask->inputQueue);
+ if (qItem == NULL) {
+ qDebug("stream exec over, queue empty");
+ break;
+ }
+ if (data == NULL) {
+ data = qItem;
+ streamQueueProcessSuccess(pTask->inputQueue);
+ continue;
+ } else {
+ if (streamAppendQueueItem(data, qItem) < 0) {
+ streamQueueProcessFail(pTask->inputQueue);
+ break;
+ } else {
+ cnt++;
+ streamQueueProcessSuccess(pTask->inputQueue);
+ taosArrayDestroy(((SStreamDataBlock*)qItem)->blocks);
+ taosFreeQitem(qItem);
+ }
+ }
+ }
if (data == NULL) break;
+ qDebug("stream task %d exec begin, batch msg: %d", pTask->taskId, cnt);
streamTaskExecImpl(pTask, data, pRes);
+ qDebug("stream task %d exec end", pTask->taskId);
if (pTask->taskStatus == TASK_STATUS__DROPPING) {
taosArrayDestroyEx(pRes, (FDelete)tDeleteSSDataBlock);
@@ -95,27 +120,16 @@ static SArray* streamExecForQall(SStreamTask* pTask, SArray* pRes) {
qRes->type = STREAM_INPUT__DATA_BLOCK;
qRes->blocks = pRes;
if (streamTaskOutput(pTask, qRes) < 0) {
- streamQueueProcessFail(pTask->inputQueue);
+ /*streamQueueProcessFail(pTask->inputQueue);*/
taosArrayDestroyEx(pRes, (FDelete)tDeleteSSDataBlock);
taosFreeQitem(qRes);
return NULL;
}
- streamQueueProcessSuccess(pTask->inputQueue);
+ /*streamQueueProcessSuccess(pTask->inputQueue);*/
pRes = taosArrayInit(0, sizeof(SSDataBlock));
}
- int8_t type = ((SStreamQueueItem*)data)->type;
- if (type == STREAM_INPUT__TRIGGER) {
- blockDataDestroy(((SStreamTrigger*)data)->pBlock);
- taosFreeQitem(data);
- } else if (type == STREAM_INPUT__DATA_BLOCK || type == STREAM_INPUT__DATA_RETRIEVE) {
- taosArrayDestroyEx(((SStreamDataBlock*)data)->blocks, (FDelete)tDeleteSSDataBlock);
- taosFreeQitem(data);
- } else if (type == STREAM_INPUT__DATA_SUBMIT) {
- ASSERT(pTask->isDataScan);
- streamDataSubmitRefDec((SStreamDataSubmit*)data);
- taosFreeQitem(data);
- }
+ streamFreeQitem(data);
}
return pRes;
}
@@ -129,6 +143,7 @@ int32_t streamExec(SStreamTask* pTask, SMsgCb* pMsgCb) {
atomic_val_compare_exchange_8(&pTask->execStatus, TASK_EXEC_STATUS__IDLE, TASK_EXEC_STATUS__EXECUTING);
if (execStatus == TASK_EXEC_STATUS__IDLE) {
// first run
+ qDebug("stream exec, enter exec status");
pRes = streamExecForQall(pTask, pRes);
if (pRes == NULL) goto FAIL;
@@ -136,11 +151,13 @@ int32_t streamExec(SStreamTask* pTask, SMsgCb* pMsgCb) {
atomic_store_8(&pTask->execStatus, TASK_EXEC_STATUS__CLOSING);
// second run, make sure inputQ and qall are cleared
+ qDebug("stream exec, enter closing status");
pRes = streamExecForQall(pTask, pRes);
if (pRes == NULL) goto FAIL;
taosArrayDestroyEx(pRes, (FDelete)tDeleteSSDataBlock);
atomic_store_8(&pTask->execStatus, TASK_EXEC_STATUS__IDLE);
+ qDebug("stream exec, return result");
return 0;
} else if (execStatus == TASK_EXEC_STATUS__CLOSING) {
continue;
diff --git a/source/libs/sync/inc/syncRaftEntry.h b/source/libs/sync/inc/syncRaftEntry.h
index 82d5c0a6ea..fdfabf12a3 100644
--- a/source/libs/sync/inc/syncRaftEntry.h
+++ b/source/libs/sync/inc/syncRaftEntry.h
@@ -26,6 +26,7 @@ extern "C" {
#include "syncInt.h"
#include "syncMessage.h"
#include "taosdef.h"
+#include "tskiplist.h"
typedef struct SSyncRaftEntry {
uint32_t bytes;
@@ -58,29 +59,52 @@ void syncEntryLog(const SSyncRaftEntry* pObj);
void syncEntryLog2(char* s, const SSyncRaftEntry* pObj);
//-----------------------------------
-typedef struct SRaftEntryCache {
+typedef struct SRaftEntryHashCache {
SHashObj* pEntryHash;
int32_t maxCount;
int32_t currentCount;
TdThreadMutex mutex;
SSyncNode* pSyncNode;
+} SRaftEntryHashCache;
+
+SRaftEntryHashCache* raftCacheCreate(SSyncNode* pSyncNode, int32_t maxCount);
+void raftCacheDestroy(SRaftEntryHashCache* pCache);
+int32_t raftCachePutEntry(struct SRaftEntryHashCache* pCache, SSyncRaftEntry* pEntry);
+int32_t raftCacheGetEntry(struct SRaftEntryHashCache* pCache, SyncIndex index, SSyncRaftEntry** ppEntry);
+int32_t raftCacheGetEntryP(struct SRaftEntryHashCache* pCache, SyncIndex index, SSyncRaftEntry** ppEntry);
+int32_t raftCacheDelEntry(struct SRaftEntryHashCache* pCache, SyncIndex index);
+int32_t raftCacheGetAndDel(struct SRaftEntryHashCache* pCache, SyncIndex index, SSyncRaftEntry** ppEntry);
+int32_t raftCacheClear(struct SRaftEntryHashCache* pCache);
+
+cJSON* raftCache2Json(SRaftEntryHashCache* pObj);
+char* raftCache2Str(SRaftEntryHashCache* pObj);
+void raftCachePrint(SRaftEntryHashCache* pObj);
+void raftCachePrint2(char* s, SRaftEntryHashCache* pObj);
+void raftCacheLog(SRaftEntryHashCache* pObj);
+void raftCacheLog2(char* s, SRaftEntryHashCache* pObj);
+
+//-----------------------------------
+typedef struct SRaftEntryCache {
+ SSkipList* pSkipList;
+ int32_t maxCount;
+ int32_t currentCount;
+ TdThreadMutex mutex;
+ SSyncNode* pSyncNode;
} SRaftEntryCache;
-SRaftEntryCache* raftCacheCreate(SSyncNode* pSyncNode, int32_t maxCount);
-void raftCacheDestroy(SRaftEntryCache* pCache);
-int32_t raftCachePutEntry(struct SRaftEntryCache* pCache, SSyncRaftEntry* pEntry);
-int32_t raftCacheGetEntry(struct SRaftEntryCache* pCache, SyncIndex index, SSyncRaftEntry** ppEntry);
-int32_t raftCacheGetEntryP(struct SRaftEntryCache* pCache, SyncIndex index, SSyncRaftEntry** ppEntry);
-int32_t raftCacheDelEntry(struct SRaftEntryCache* pCache, SyncIndex index);
-int32_t raftCacheGetAndDel(struct SRaftEntryCache* pCache, SyncIndex index, SSyncRaftEntry** ppEntry);
-int32_t raftCacheClear(struct SRaftEntryCache* pCache);
+SRaftEntryCache* raftEntryCacheCreate(SSyncNode* pSyncNode, int32_t maxCount);
+void raftEntryCacheDestroy(SRaftEntryCache* pCache);
+int32_t raftEntryCachePutEntry(struct SRaftEntryCache* pCache, SSyncRaftEntry* pEntry);
+int32_t raftEntryCacheGetEntry(struct SRaftEntryCache* pCache, SyncIndex index, SSyncRaftEntry** ppEntry);
+int32_t raftEntryCacheGetEntryP(struct SRaftEntryCache* pCache, SyncIndex index, SSyncRaftEntry** ppEntry);
+int32_t raftEntryCacheClear(struct SRaftEntryCache* pCache, int32_t count);
-cJSON* raftCache2Json(SRaftEntryCache* pObj);
-char* raftCache2Str(SRaftEntryCache* pObj);
-void raftCachePrint(SRaftEntryCache* pObj);
-void raftCachePrint2(char* s, SRaftEntryCache* pObj);
-void raftCacheLog(SRaftEntryCache* pObj);
-void raftCacheLog2(char* s, SRaftEntryCache* pObj);
+cJSON* raftEntryCache2Json(SRaftEntryCache* pObj);
+char* raftEntryCache2Str(SRaftEntryCache* pObj);
+void raftEntryCachePrint(SRaftEntryCache* pObj);
+void raftEntryCachePrint2(char* s, SRaftEntryCache* pObj);
+void raftEntryCacheLog(SRaftEntryCache* pObj);
+void raftEntryCacheLog2(char* s, SRaftEntryCache* pObj);
#ifdef __cplusplus
}
diff --git a/source/libs/sync/src/syncMain.c b/source/libs/sync/src/syncMain.c
index bab64b6f11..b7e6c1e142 100644
--- a/source/libs/sync/src/syncMain.c
+++ b/source/libs/sync/src/syncMain.c
@@ -1055,19 +1055,12 @@ SSyncNode* syncNodeOpen(const SSyncInfo* pOldSyncInfo) {
}
// tools
- pSyncNode->pSyncRespMgr = syncRespMgrCreate(pSyncNode, 0);
+ pSyncNode->pSyncRespMgr = syncRespMgrCreate(pSyncNode, SYNC_RESP_TTL_MS);
ASSERT(pSyncNode->pSyncRespMgr != NULL);
// restore state
pSyncNode->restoreFinish = false;
- // pSyncNode->pSnapshot = NULL;
- // if (pSyncNode->pFsm->FpGetSnapshotInfo != NULL) {
- // pSyncNode->pSnapshot = taosMemoryMalloc(sizeof(SSnapshot));
- // pSyncNode->pFsm->FpGetSnapshotInfo(pSyncNode->pFsm, pSyncNode->pSnapshot);
- // }
- // tsem_init(&(pSyncNode->restoreSem), 0, 0);
-
// snapshot senders
for (int i = 0; i < TSDB_MAX_REPLICA; ++i) {
SSyncSnapshotSender* pSender = snapshotSenderCreate(pSyncNode, i);
diff --git a/source/libs/sync/src/syncRaftEntry.c b/source/libs/sync/src/syncRaftEntry.c
index 465584a40f..89e67fab28 100644
--- a/source/libs/sync/src/syncRaftEntry.c
+++ b/source/libs/sync/src/syncRaftEntry.c
@@ -198,8 +198,8 @@ void syncEntryLog2(char* s, const SSyncRaftEntry* pObj) {
}
//-----------------------------------
-SRaftEntryCache* raftCacheCreate(SSyncNode* pSyncNode, int32_t maxCount) {
- SRaftEntryCache* pCache = taosMemoryMalloc(sizeof(SRaftEntryCache));
+SRaftEntryHashCache* raftCacheCreate(SSyncNode* pSyncNode, int32_t maxCount) {
+ SRaftEntryHashCache* pCache = taosMemoryMalloc(sizeof(SRaftEntryHashCache));
if (pCache == NULL) {
sError("vgId:%d raft cache create error", pSyncNode->vgId);
return NULL;
@@ -220,7 +220,7 @@ SRaftEntryCache* raftCacheCreate(SSyncNode* pSyncNode, int32_t maxCount) {
return pCache;
}
-void raftCacheDestroy(SRaftEntryCache* pCache) {
+void raftCacheDestroy(SRaftEntryHashCache* pCache) {
if (pCache != NULL) {
taosThreadMutexLock(&(pCache->mutex));
taosHashCleanup(pCache->pEntryHash);
@@ -233,7 +233,7 @@ void raftCacheDestroy(SRaftEntryCache* pCache) {
// success, return 1
// max count, return 0
// error, return -1
-int32_t raftCachePutEntry(struct SRaftEntryCache* pCache, SSyncRaftEntry* pEntry) {
+int32_t raftCachePutEntry(struct SRaftEntryHashCache* pCache, SSyncRaftEntry* pEntry) {
taosThreadMutexLock(&(pCache->mutex));
if (pCache->currentCount >= pCache->maxCount) {
@@ -259,7 +259,7 @@ int32_t raftCachePutEntry(struct SRaftEntryCache* pCache, SSyncRaftEntry* pEntry
// success, return 0
// error, return -1
// not exist, return -1, terrno = TSDB_CODE_WAL_LOG_NOT_EXIST
-int32_t raftCacheGetEntry(struct SRaftEntryCache* pCache, SyncIndex index, SSyncRaftEntry** ppEntry) {
+int32_t raftCacheGetEntry(struct SRaftEntryHashCache* pCache, SyncIndex index, SSyncRaftEntry** ppEntry) {
if (ppEntry == NULL) {
return -1;
}
@@ -292,7 +292,7 @@ int32_t raftCacheGetEntry(struct SRaftEntryCache* pCache, SyncIndex index, SSync
// success, return 0
// error, return -1
// not exist, return -1, terrno = TSDB_CODE_WAL_LOG_NOT_EXIST
-int32_t raftCacheGetEntryP(struct SRaftEntryCache* pCache, SyncIndex index, SSyncRaftEntry** ppEntry) {
+int32_t raftCacheGetEntryP(struct SRaftEntryHashCache* pCache, SyncIndex index, SSyncRaftEntry** ppEntry) {
if (ppEntry == NULL) {
return -1;
}
@@ -321,7 +321,7 @@ int32_t raftCacheGetEntryP(struct SRaftEntryCache* pCache, SyncIndex index, SSyn
return -1;
}
-int32_t raftCacheDelEntry(struct SRaftEntryCache* pCache, SyncIndex index) {
+int32_t raftCacheDelEntry(struct SRaftEntryHashCache* pCache, SyncIndex index) {
taosThreadMutexLock(&(pCache->mutex));
taosHashRemove(pCache->pEntryHash, &index, sizeof(index));
--(pCache->currentCount);
@@ -329,7 +329,7 @@ int32_t raftCacheDelEntry(struct SRaftEntryCache* pCache, SyncIndex index) {
return 0;
}
-int32_t raftCacheGetAndDel(struct SRaftEntryCache* pCache, SyncIndex index, SSyncRaftEntry** ppEntry) {
+int32_t raftCacheGetAndDel(struct SRaftEntryHashCache* pCache, SyncIndex index, SSyncRaftEntry** ppEntry) {
if (ppEntry == NULL) {
return -1;
}
@@ -362,7 +362,7 @@ int32_t raftCacheGetAndDel(struct SRaftEntryCache* pCache, SyncIndex index, SSyn
return -1;
}
-int32_t raftCacheClear(struct SRaftEntryCache* pCache) {
+int32_t raftCacheClear(struct SRaftEntryHashCache* pCache) {
taosThreadMutexLock(&(pCache->mutex));
taosHashClear(pCache->pEntryHash);
pCache->currentCount = 0;
@@ -371,7 +371,7 @@ int32_t raftCacheClear(struct SRaftEntryCache* pCache) {
}
//-----------------------------------
-cJSON* raftCache2Json(SRaftEntryCache* pCache) {
+cJSON* raftCache2Json(SRaftEntryHashCache* pCache) {
char u64buf[128] = {0};
cJSON* pRoot = cJSON_CreateObject();
@@ -402,41 +402,283 @@ cJSON* raftCache2Json(SRaftEntryCache* pCache) {
}
cJSON* pJson = cJSON_CreateObject();
- cJSON_AddItemToObject(pJson, "SRaftEntryCache", pRoot);
+ cJSON_AddItemToObject(pJson, "SRaftEntryHashCache", pRoot);
return pJson;
}
-char* raftCache2Str(SRaftEntryCache* pCache) {
+char* raftCache2Str(SRaftEntryHashCache* pCache) {
cJSON* pJson = raftCache2Json(pCache);
char* serialized = cJSON_Print(pJson);
cJSON_Delete(pJson);
return serialized;
}
-void raftCachePrint(SRaftEntryCache* pCache) {
+void raftCachePrint(SRaftEntryHashCache* pCache) {
char* serialized = raftCache2Str(pCache);
printf("raftCachePrint | len:%" PRIu64 " | %s \n", strlen(serialized), serialized);
fflush(NULL);
taosMemoryFree(serialized);
}
-void raftCachePrint2(char* s, SRaftEntryCache* pCache) {
+void raftCachePrint2(char* s, SRaftEntryHashCache* pCache) {
char* serialized = raftCache2Str(pCache);
printf("raftCachePrint2 | len:%" PRIu64 " | %s | %s \n", strlen(serialized), s, serialized);
fflush(NULL);
taosMemoryFree(serialized);
}
-void raftCacheLog(SRaftEntryCache* pCache) {
+void raftCacheLog(SRaftEntryHashCache* pCache) {
char* serialized = raftCache2Str(pCache);
sTrace("raftCacheLog | len:%" PRIu64 " | %s", strlen(serialized), serialized);
taosMemoryFree(serialized);
}
-void raftCacheLog2(char* s, SRaftEntryCache* pCache) {
+void raftCacheLog2(char* s, SRaftEntryHashCache* pCache) {
if (gRaftDetailLog) {
char* serialized = raftCache2Str(pCache);
sTraceLong("raftCacheLog2 | len:%" PRIu64 " | %s | %s", strlen(serialized), s, serialized);
taosMemoryFree(serialized);
}
+}
+
+//-----------------------------------
+static char* keyFn(const void* pData) {
+ SSyncRaftEntry* pEntry = (SSyncRaftEntry*)pData;
+ return (char*)(&(pEntry->index));
+}
+
+static int cmpFn(const void* p1, const void* p2) { return memcmp(p1, p2, sizeof(SyncIndex)); }
+
+SRaftEntryCache* raftEntryCacheCreate(SSyncNode* pSyncNode, int32_t maxCount) {
+ SRaftEntryCache* pCache = taosMemoryMalloc(sizeof(SRaftEntryCache));
+ if (pCache == NULL) {
+ sError("vgId:%d raft cache create error", pSyncNode->vgId);
+ return NULL;
+ }
+
+ pCache->pSkipList =
+ tSkipListCreate(MAX_SKIP_LIST_LEVEL, TSDB_DATA_TYPE_BINARY, sizeof(SyncIndex), cmpFn, SL_ALLOW_DUP_KEY, keyFn);
+ if (pCache->pSkipList == NULL) {
+ sError("vgId:%d raft cache create hash error", pSyncNode->vgId);
+ return NULL;
+ }
+
+ taosThreadMutexInit(&(pCache->mutex), NULL);
+ pCache->maxCount = maxCount;
+ pCache->currentCount = 0;
+ pCache->pSyncNode = pSyncNode;
+
+ return pCache;
+}
+
+void raftEntryCacheDestroy(SRaftEntryCache* pCache) {
+ if (pCache != NULL) {
+ taosThreadMutexLock(&(pCache->mutex));
+ tSkipListDestroy(pCache->pSkipList);
+ taosThreadMutexUnlock(&(pCache->mutex));
+ taosThreadMutexDestroy(&(pCache->mutex));
+ taosMemoryFree(pCache);
+ }
+}
+
+// success, return 1
+// max count, return 0
+// error, return -1
+int32_t raftEntryCachePutEntry(struct SRaftEntryCache* pCache, SSyncRaftEntry* pEntry) {
+ taosThreadMutexLock(&(pCache->mutex));
+
+ if (pCache->currentCount >= pCache->maxCount) {
+ taosThreadMutexUnlock(&(pCache->mutex));
+ return 0;
+ }
+
+ SSkipListNode* pSkipListNode = tSkipListPut(pCache->pSkipList, pEntry);
+ ASSERT(pSkipListNode != NULL);
+ ++(pCache->currentCount);
+
+ do {
+ char eventLog[128];
+ snprintf(eventLog, sizeof(eventLog), "raft cache add, type:%s,%d, type2:%s,%d, index:%" PRId64 ", bytes:%d",
+ TMSG_INFO(pEntry->msgType), pEntry->msgType, TMSG_INFO(pEntry->originalRpcType), pEntry->originalRpcType,
+ pEntry->index, pEntry->bytes);
+ syncNodeEventLog(pCache->pSyncNode, eventLog);
+ } while (0);
+
+ taosThreadMutexUnlock(&(pCache->mutex));
+ return 1;
+}
+
+// find one, return 1
+// not found, return 0
+// error, return -1
+int32_t raftEntryCacheGetEntry(struct SRaftEntryCache* pCache, SyncIndex index, SSyncRaftEntry** ppEntry) {
+ ASSERT(ppEntry != NULL);
+ SSyncRaftEntry* pEntry = NULL;
+ int32_t code = raftEntryCacheGetEntryP(pCache, index, &pEntry);
+ if (code == 1) {
+ *ppEntry = taosMemoryMalloc(pEntry->bytes);
+ memcpy(*ppEntry, pEntry, pEntry->bytes);
+ } else {
+ *ppEntry = NULL;
+ }
+ return code;
+}
+
+// find one, return 1
+// not found, return 0
+// error, return -1
+int32_t raftEntryCacheGetEntryP(struct SRaftEntryCache* pCache, SyncIndex index, SSyncRaftEntry** ppEntry) {
+ taosThreadMutexLock(&(pCache->mutex));
+
+ SyncIndex index2 = index;
+ int32_t code = 0;
+
+ SArray* entryPArray = tSkipListGet(pCache->pSkipList, (char*)(&index2));
+ int32_t arraySize = taosArrayGetSize(entryPArray);
+ if (arraySize == 1) {
+ SSkipListNode** ppNode = (SSkipListNode**)taosArrayGet(entryPArray, 0);
+ ASSERT(*ppNode != NULL);
+ *ppEntry = (SSyncRaftEntry*)SL_GET_NODE_DATA(*ppNode);
+ code = 1;
+
+ } else if (arraySize == 0) {
+ code = 0;
+
+ } else {
+ ASSERT(0);
+
+ code = -1;
+ }
+ taosArrayDestroy(entryPArray);
+
+ taosThreadMutexUnlock(&(pCache->mutex));
+ return code;
+}
+
+// count = -1, clear all
+// count >= 0, clear count
+// return -1, error
+// return delete count
+int32_t raftEntryCacheClear(struct SRaftEntryCache* pCache, int32_t count) {
+ taosThreadMutexLock(&(pCache->mutex));
+ int32_t returnCnt = 0;
+
+ if (count == -1) {
+ // clear all
+ SSkipListIterator* pIter = tSkipListCreateIter(pCache->pSkipList);
+ while (tSkipListIterNext(pIter)) {
+ SSkipListNode* pNode = tSkipListIterGet(pIter);
+ ASSERT(pNode != NULL);
+ SSyncRaftEntry* pEntry = (SSyncRaftEntry*)SL_GET_NODE_DATA(pNode);
+ syncEntryDestory(pEntry);
+ ++returnCnt;
+ }
+ tSkipListDestroyIter(pIter);
+
+ tSkipListDestroy(pCache->pSkipList);
+ pCache->pSkipList =
+ tSkipListCreate(MAX_SKIP_LIST_LEVEL, TSDB_DATA_TYPE_BINARY, sizeof(SyncIndex), cmpFn, SL_ALLOW_DUP_KEY, keyFn);
+ ASSERT(pCache->pSkipList != NULL);
+
+ } else {
+ // clear count
+ int i = 0;
+ SSkipListIterator* pIter = tSkipListCreateIter(pCache->pSkipList);
+ SArray* delNodeArray = taosArrayInit(0, sizeof(SSkipListNode*));
+
+ // free entry
+ while (tSkipListIterNext(pIter)) {
+ SSkipListNode* pNode = tSkipListIterGet(pIter);
+ ASSERT(pNode != NULL);
+ if (i++ >= count) {
+ break;
+ }
+
+ // sDebug("push pNode:%p", pNode);
+ taosArrayPush(delNodeArray, &pNode);
+ ++returnCnt;
+ SSyncRaftEntry* pEntry = (SSyncRaftEntry*)SL_GET_NODE_DATA(pNode);
+ syncEntryDestory(pEntry);
+ }
+ tSkipListDestroyIter(pIter);
+
+ // delete skiplist node
+ int32_t arraySize = taosArrayGetSize(delNodeArray);
+ for (int32_t i = 0; i < arraySize; ++i) {
+ SSkipListNode** ppNode = taosArrayGet(delNodeArray, i);
+ // sDebug("get pNode:%p", *ppNode);
+ tSkipListRemoveNode(pCache->pSkipList, *ppNode);
+ }
+ taosArrayDestroy(delNodeArray);
+ }
+
+ pCache->currentCount -= returnCnt;
+ taosThreadMutexUnlock(&(pCache->mutex));
+ return returnCnt;
+}
+
+cJSON* raftEntryCache2Json(SRaftEntryCache* pCache) {
+ char u64buf[128] = {0};
+ cJSON* pRoot = cJSON_CreateObject();
+
+ if (pCache != NULL) {
+ taosThreadMutexLock(&(pCache->mutex));
+
+ snprintf(u64buf, sizeof(u64buf), "%p", pCache->pSyncNode);
+ cJSON_AddStringToObject(pRoot, "pSyncNode", u64buf);
+ cJSON_AddNumberToObject(pRoot, "currentCount", pCache->currentCount);
+ cJSON_AddNumberToObject(pRoot, "maxCount", pCache->maxCount);
+ cJSON* pEntries = cJSON_CreateArray();
+ cJSON_AddItemToObject(pRoot, "entries", pEntries);
+
+ SSkipListIterator* pIter = tSkipListCreateIter(pCache->pSkipList);
+ while (tSkipListIterNext(pIter)) {
+ SSkipListNode* pNode = tSkipListIterGet(pIter);
+ ASSERT(pNode != NULL);
+ SSyncRaftEntry* pEntry = (SSyncRaftEntry*)SL_GET_NODE_DATA(pNode);
+ cJSON_AddItemToArray(pEntries, syncEntry2Json(pEntry));
+ }
+ tSkipListDestroyIter(pIter);
+
+ taosThreadMutexUnlock(&(pCache->mutex));
+ }
+
+ cJSON* pJson = cJSON_CreateObject();
+ cJSON_AddItemToObject(pJson, "SRaftEntryCache", pRoot);
+ return pJson;
+}
+
+char* raftEntryCache2Str(SRaftEntryCache* pObj) {
+ cJSON* pJson = raftEntryCache2Json(pObj);
+ char* serialized = cJSON_Print(pJson);
+ cJSON_Delete(pJson);
+ return serialized;
+}
+
+void raftEntryCachePrint(SRaftEntryCache* pObj) {
+ char* serialized = raftEntryCache2Str(pObj);
+ printf("raftEntryCachePrint | len:%" PRIu64 " | %s \n", strlen(serialized), serialized);
+ fflush(NULL);
+ taosMemoryFree(serialized);
+}
+
+void raftEntryCachePrint2(char* s, SRaftEntryCache* pObj) {
+ char* serialized = raftEntryCache2Str(pObj);
+ printf("raftEntryCachePrint2 | len:%" PRIu64 " | %s | %s \n", strlen(serialized), s, serialized);
+ fflush(NULL);
+ taosMemoryFree(serialized);
+}
+
+void raftEntryCacheLog(SRaftEntryCache* pObj) {
+ char* serialized = raftEntryCache2Str(pObj);
+ sTrace("raftEntryCacheLog | len:%" PRIu64 " | %s", strlen(serialized), serialized);
+ taosMemoryFree(serialized);
+}
+
+void raftEntryCacheLog2(char* s, SRaftEntryCache* pObj) {
+ if (gRaftDetailLog) {
+ char* serialized = raftEntryCache2Str(pObj);
+ sTraceLong("raftEntryCacheLog2 | len:%" PRIu64 " | %s | %s", strlen(serialized), s, serialized);
+ taosMemoryFree(serialized);
+ }
}
\ No newline at end of file
diff --git a/source/libs/sync/src/syncRespMgr.c b/source/libs/sync/src/syncRespMgr.c
index eaeadd3991..97e5816038 100644
--- a/source/libs/sync/src/syncRespMgr.c
+++ b/source/libs/sync/src/syncRespMgr.c
@@ -122,54 +122,45 @@ void syncRespCleanByTTL(SSyncRespMgr *pObj, int64_t ttl) {
int cnt = 0;
SSyncNode *pSyncNode = pObj->data;
- SArray *delIndexArray = taosArrayInit(0, sizeof(SyncIndex));
+ SArray *delIndexArray = taosArrayInit(0, sizeof(uint64_t));
ASSERT(delIndexArray != NULL);
while (pStub) {
- size_t len;
- void * key = taosHashGetKey(pStub, &len);
- SyncIndex *pIndex = (SyncIndex *)key;
+ size_t len;
+ void * key = taosHashGetKey(pStub, &len);
+ uint64_t *pSeqNum = (uint64_t *)key;
int64_t nowMS = taosGetTimestampMs();
if (nowMS - pStub->createTime > ttl) {
- taosArrayPush(delIndexArray, pIndex);
+ taosArrayPush(delIndexArray, pSeqNum);
cnt++;
- SSyncRaftEntry *pEntry = NULL;
- int32_t code = 0;
- if (pSyncNode->pLogStore != NULL) {
- code = pSyncNode->pLogStore->syncLogGetEntry(pSyncNode->pLogStore, *pIndex, &pEntry);
- if (code == 0 && pEntry != NULL) {
- SFsmCbMeta cbMeta = {0};
- cbMeta.index = pEntry->index;
- cbMeta.lastConfigIndex = syncNodeGetSnapshotConfigIndex(pSyncNode, cbMeta.index);
- cbMeta.isWeak = pEntry->isWeak;
- cbMeta.code = TSDB_CODE_SYN_TIMEOUT;
- cbMeta.state = pSyncNode->state;
- cbMeta.seqNum = pEntry->seqNum;
- cbMeta.term = pEntry->term;
- cbMeta.currentTerm = pSyncNode->pRaftStore->currentTerm;
- cbMeta.flag = 0;
+ SFsmCbMeta cbMeta = {0};
+ cbMeta.index = SYNC_INDEX_INVALID;
+ cbMeta.lastConfigIndex = SYNC_INDEX_INVALID;
+ cbMeta.isWeak = false;
+ cbMeta.code = TSDB_CODE_SYN_TIMEOUT;
+ cbMeta.state = pSyncNode->state;
+ cbMeta.seqNum = *pSeqNum;
+ cbMeta.term = SYNC_TERM_INVALID;
+ cbMeta.currentTerm = pSyncNode->pRaftStore->currentTerm;
+ cbMeta.flag = 0;
- SRpcMsg rpcMsg = pStub->rpcMsg;
- rpcMsg.pCont = rpcMallocCont(pEntry->dataLen);
- memcpy(rpcMsg.pCont, pEntry->data, pEntry->dataLen);
- pSyncNode->pFsm->FpCommitCb(pSyncNode->pFsm, &rpcMsg, cbMeta);
-
- syncEntryDestory(pEntry);
- }
- }
+ pStub->rpcMsg.pCont = NULL;
+ pStub->rpcMsg.contLen = 0;
+ pSyncNode->pFsm->FpCommitCb(pSyncNode->pFsm, &(pStub->rpcMsg), cbMeta);
}
pStub = (SRespStub *)taosHashIterate(pObj->pRespHash, pStub);
}
int32_t arraySize = taosArrayGetSize(delIndexArray);
- sDebug("vgId:%d, resp clean by ttl, cnt:%d, array-size:%d", pSyncNode->vgId, cnt, arraySize);
+ sDebug("vgId:%d, resp mgr clean by ttl, cnt:%d, array-size:%d", pSyncNode->vgId, cnt, arraySize);
for (int32_t i = 0; i < arraySize; ++i) {
- SyncIndex *pIndex = taosArrayGet(delIndexArray, i);
- taosHashRemove(pObj->pRespHash, pIndex, sizeof(SyncIndex));
+ uint64_t *pSeqNum = taosArrayGet(delIndexArray, i);
+ taosHashRemove(pObj->pRespHash, pSeqNum, sizeof(uint64_t));
+ sDebug("vgId:%d, resp mgr clean by ttl, seq:%d", pSyncNode->vgId, *pSeqNum);
}
taosArrayDestroy(delIndexArray);
}
diff --git a/source/libs/sync/src/syncTimeout.c b/source/libs/sync/src/syncTimeout.c
index 52181a3da8..ad5f82900c 100644
--- a/source/libs/sync/src/syncTimeout.c
+++ b/source/libs/sync/src/syncTimeout.c
@@ -16,9 +16,14 @@
#include "syncTimeout.h"
#include "syncElection.h"
#include "syncReplication.h"
+#include "syncRespMgr.h"
int32_t syncNodeTimerRoutine(SSyncNode* ths) {
syncNodeEventLog(ths, "timer routines ... ");
+
+ if (ths->vgId != 1) {
+ syncRespClean(ths->pSyncRespMgr);
+ }
return 0;
}
diff --git a/source/libs/sync/test/CMakeLists.txt b/source/libs/sync/test/CMakeLists.txt
index e1f3a2b2fc..e787080795 100644
--- a/source/libs/sync/test/CMakeLists.txt
+++ b/source/libs/sync/test/CMakeLists.txt
@@ -18,6 +18,7 @@ add_executable(syncIndexMgrTest "")
add_executable(syncLogStoreTest "")
add_executable(syncEntryTest "")
add_executable(syncEntryCacheTest "")
+add_executable(syncHashCacheTest "")
add_executable(syncRequestVoteTest "")
add_executable(syncRequestVoteReplyTest "")
add_executable(syncAppendEntriesTest "")
@@ -137,6 +138,10 @@ target_sources(syncEntryCacheTest
PRIVATE
"syncEntryCacheTest.cpp"
)
+target_sources(syncHashCacheTest
+ PRIVATE
+ "syncHashCacheTest.cpp"
+)
target_sources(syncRequestVoteTest
PRIVATE
"syncRequestVoteTest.cpp"
@@ -387,6 +392,11 @@ target_include_directories(syncEntryCacheTest
"${TD_SOURCE_DIR}/include/libs/sync"
"${CMAKE_CURRENT_SOURCE_DIR}/../inc"
)
+target_include_directories(syncHashCacheTest
+ PUBLIC
+ "${TD_SOURCE_DIR}/include/libs/sync"
+ "${CMAKE_CURRENT_SOURCE_DIR}/../inc"
+)
target_include_directories(syncRequestVoteTest
PUBLIC
"${TD_SOURCE_DIR}/include/libs/sync"
@@ -654,6 +664,10 @@ target_link_libraries(syncEntryCacheTest
sync
gtest_main
)
+target_link_libraries(syncHashCacheTest
+ sync
+ gtest_main
+)
target_link_libraries(syncRequestVoteTest
sync
gtest_main
diff --git a/source/libs/sync/test/syncEntryCacheTest.cpp b/source/libs/sync/test/syncEntryCacheTest.cpp
index 6250181b25..66b93563e7 100644
--- a/source/libs/sync/test/syncEntryCacheTest.cpp
+++ b/source/libs/sync/test/syncEntryCacheTest.cpp
@@ -43,222 +43,82 @@ SRaftEntryCache* createCache(int maxCount) {
SSyncNode* pSyncNode = createFakeNode();
ASSERT(pSyncNode != NULL);
- SRaftEntryCache* pCache = raftCacheCreate(pSyncNode, maxCount);
+ SRaftEntryCache* pCache = raftEntryCacheCreate(pSyncNode, maxCount);
ASSERT(pCache != NULL);
return pCache;
}
void test1() {
- int32_t code = 0;
+ int32_t code = 0;
SRaftEntryCache* pCache = createCache(5);
- for (int i = 0; i < 5; ++i) {
+ for (int i = 0; i < 10; ++i) {
SSyncRaftEntry* pEntry = createEntry(i);
- code = raftCachePutEntry(pCache, pEntry);
- ASSERT(code == 1);
- syncEntryDestory(pEntry);
+ code = raftEntryCachePutEntry(pCache, pEntry);
+ sTrace("put entry code:%d, pEntry:%p", code, pEntry);
}
- raftCacheLog2((char*)"==test1 write 5 entries==", pCache);
+ raftEntryCacheLog2((char*)"==test1 write 5 entries==", pCache);
- SyncIndex index;
- index = 1;
- code = raftCacheDelEntry(pCache, index);
- ASSERT(code == 0);
- index = 3;
- code = raftCacheDelEntry(pCache, index);
- ASSERT(code == 0);
- raftCacheLog2((char*)"==test1 delete 1,3==", pCache);
+ raftEntryCacheClear(pCache, 3);
+ raftEntryCacheLog2((char*)"==test1 evict 3 entries==", pCache);
- code = raftCacheClear(pCache);
- ASSERT(code == 0);
- raftCacheLog2((char*)"==clear all==", pCache);
+ raftEntryCacheClear(pCache, -1);
+ raftEntryCacheLog2((char*)"==test1 evict -1(all) entries==", pCache);
}
void test2() {
- int32_t code = 0;
+ int32_t code = 0;
SRaftEntryCache* pCache = createCache(5);
- for (int i = 0; i < 5; ++i) {
+ for (int i = 0; i < 10; ++i) {
SSyncRaftEntry* pEntry = createEntry(i);
- code = raftCachePutEntry(pCache, pEntry);
- ASSERT(code == 1);
- syncEntryDestory(pEntry);
+ code = raftEntryCachePutEntry(pCache, pEntry);
+ sTrace("put entry code:%d, pEntry:%p", code, pEntry);
}
- raftCacheLog2((char*)"==test2 write 5 entries==", pCache);
+ raftEntryCacheLog2((char*)"==test1 write 5 entries==", pCache);
- SyncIndex index;
- index = 1;
- SSyncRaftEntry* pEntry;
- code = raftCacheGetEntry(pCache, index, &pEntry);
- ASSERT(code == 0);
- syncEntryDestory(pEntry);
- syncEntryLog2((char*)"==test2 get entry 1==", pEntry);
+ SyncIndex index = 2;
+ SSyncRaftEntry* pEntry = NULL;
- index = 2;
- code = raftCacheGetEntryP(pCache, index, &pEntry);
- ASSERT(code == 0);
+ code = raftEntryCacheGetEntryP(pCache, index, &pEntry);
+ ASSERT(code == 1 && index == pEntry->index);
+ sTrace("get entry:%p for %ld", pEntry, index);
syncEntryLog2((char*)"==test2 get entry pointer 2==", pEntry);
+ code = raftEntryCacheGetEntry(pCache, index, &pEntry);
+ ASSERT(code == 1 && index == pEntry->index);
+ sTrace("get entry:%p for %ld", pEntry, index);
+ syncEntryLog2((char*)"==test2 get entry 2==", pEntry);
+ syncEntryDestory(pEntry);
+
// not found
index = 8;
- code = raftCacheGetEntry(pCache, index, &pEntry);
- ASSERT(code == -1 && terrno == TSDB_CODE_WAL_LOG_NOT_EXIST);
+ code = raftEntryCacheGetEntry(pCache, index, &pEntry);
+ ASSERT(code == 0);
+ sTrace("get entry:%p for %ld", pEntry, index);
sTrace("==test2 get entry 8 not found==");
// not found
index = 9;
- code = raftCacheGetEntryP(pCache, index, &pEntry);
- ASSERT(code == -1 && terrno == TSDB_CODE_WAL_LOG_NOT_EXIST);
- sTrace("==test2 get entry pointer 9 not found==");
+ code = raftEntryCacheGetEntry(pCache, index, &pEntry);
+ ASSERT(code == 0);
+ sTrace("get entry:%p for %ld", pEntry, index);
+ sTrace("==test2 get entry 9 not found==");
}
void test3() {
- int32_t code = 0;
- SRaftEntryCache* pCache = createCache(5);
- for (int i = 0; i < 5; ++i) {
+ int32_t code = 0;
+ SRaftEntryCache* pCache = createCache(20);
+ for (int i = 0; i <= 4; ++i) {
SSyncRaftEntry* pEntry = createEntry(i);
- code = raftCachePutEntry(pCache, pEntry);
- ASSERT(code == 1);
- syncEntryDestory(pEntry);
+ code = raftEntryCachePutEntry(pCache, pEntry);
+ sTrace("put entry code:%d, pEntry:%p", code, pEntry);
}
- for (int i = 6; i < 10; ++i) {
- SSyncRaftEntry* pEntry = createEntry(i);
- code = raftCachePutEntry(pCache, pEntry);
- ASSERT(code == 0);
- syncEntryDestory(pEntry);
- }
- raftCacheLog2((char*)"==test3 write 10 entries, max count is 5==", pCache);
-}
-
-void test4() {
- int32_t code = 0;
- SRaftEntryCache* pCache = createCache(5);
- for (int i = 0; i < 5; ++i) {
- SSyncRaftEntry* pEntry = createEntry(i);
- code = raftCachePutEntry(pCache, pEntry);
- ASSERT(code == 1);
- syncEntryDestory(pEntry);
- }
- raftCacheLog2((char*)"==test4 write 5 entries==", pCache);
-
- SyncIndex index;
- index = 3;
- SSyncRaftEntry* pEntry;
- code = raftCacheGetAndDel(pCache, index, &pEntry);
- ASSERT(code == 0);
- syncEntryLog2((char*)"==test4 get-and-del entry 3==", pEntry);
- raftCacheLog2((char*)"==test4 after get-and-del entry 3==", pCache);
-}
-
-static char* keyFn(const void* pData) {
- SSyncRaftEntry* pEntry = (SSyncRaftEntry*)pData;
- return (char*)(&(pEntry->index));
-}
-
-static int cmpFn(const void* p1, const void* p2) { return memcmp(p1, p2, sizeof(SyncIndex)); }
-
-void printSkipList(SSkipList* pSkipList) {
- ASSERT(pSkipList != NULL);
-
- SSkipListIterator* pIter = tSkipListCreateIter(pSkipList);
- while (tSkipListIterNext(pIter)) {
- SSkipListNode* pNode = tSkipListIterGet(pIter);
- ASSERT(pNode != NULL);
- SSyncRaftEntry* pEntry = (SSyncRaftEntry*)SL_GET_NODE_DATA(pNode);
- syncEntryPrint2((char*)"", pEntry);
- }
-}
-
-void delSkipListFirst(SSkipList* pSkipList, int n) {
- ASSERT(pSkipList != NULL);
-
- sTrace("delete first %d -------------", n);
- SSkipListIterator* pIter = tSkipListCreateIter(pSkipList);
- for (int i = 0; i < n; ++i) {
- tSkipListIterNext(pIter);
- SSkipListNode* pNode = tSkipListIterGet(pIter);
- tSkipListRemoveNode(pSkipList, pNode);
- }
-}
-
-
-SSyncRaftEntry* getLogEntry2(SSkipList* pSkipList, SyncIndex index) {
- SyncIndex index2 = index;
- SSyncRaftEntry *pEntry = NULL;
- int arraySize = 0;
-
- SArray* entryPArray = tSkipListGet(pSkipList, (char*)(&index2));
- arraySize = taosArrayGetSize(entryPArray);
- if (arraySize > 0) {
- SSkipListNode** ppNode = (SSkipListNode**)taosArrayGet(entryPArray, 0);
- ASSERT(*ppNode != NULL);
- pEntry = (SSyncRaftEntry*)SL_GET_NODE_DATA(*ppNode);
- }
- taosArrayDestroy(entryPArray);
-
- sTrace("get index2: %ld, arraySize:%d -------------", index, arraySize);
- syncEntryLog2((char*)"getLogEntry2", pEntry);
- return pEntry;
-}
-
-
-SSyncRaftEntry* getLogEntry(SSkipList* pSkipList, SyncIndex index) {
- sTrace("get index: %ld -------------", index);
- SyncIndex index2 = index;
- SSyncRaftEntry *pEntry = NULL;
- SSkipListIterator* pIter = tSkipListCreateIterFromVal(pSkipList, (const char *)&index2, TSDB_DATA_TYPE_BINARY, TSDB_ORDER_ASC);
- if (tSkipListIterNext(pIter)) {
- SSkipListNode* pNode = tSkipListIterGet(pIter);
- ASSERT(pNode != NULL);
- pEntry = (SSyncRaftEntry*)SL_GET_NODE_DATA(pNode);
- }
-
- syncEntryLog2((char*)"getLogEntry", pEntry);
- return pEntry;
-}
-
-void test5() {
- SSkipList* pSkipList =
- tSkipListCreate(MAX_SKIP_LIST_LEVEL, TSDB_DATA_TYPE_BINARY, sizeof(SyncIndex), cmpFn, SL_ALLOW_DUP_KEY, keyFn);
- ASSERT(pSkipList != NULL);
-
- sTrace("insert 9 - 5");
for (int i = 9; i >= 5; --i) {
SSyncRaftEntry* pEntry = createEntry(i);
- SSkipListNode* pSkipListNode = tSkipListPut(pSkipList, pEntry);
+ code = raftEntryCachePutEntry(pCache, pEntry);
+ sTrace("put entry code:%d, pEntry:%p", code, pEntry);
}
-
- sTrace("insert 0 - 4");
- for (int i = 0; i <= 4; ++i) {
- SSyncRaftEntry* pEntry = createEntry(i);
- SSkipListNode* pSkipListNode = tSkipListPut(pSkipList, pEntry);
- }
-
- sTrace("insert 7 7 7 7 7");
- for (int i = 0; i <= 4; ++i) {
- SSyncRaftEntry* pEntry = createEntry(7);
- SSkipListNode* pSkipListNode = tSkipListPut(pSkipList, pEntry);
- }
-
- sTrace("print: -------------");
- printSkipList(pSkipList);
-
- delSkipListFirst(pSkipList, 3);
-
- sTrace("print: -------------");
- printSkipList(pSkipList);
-
- getLogEntry(pSkipList, 2);
- getLogEntry(pSkipList, 5);
- getLogEntry(pSkipList, 7);
- getLogEntry(pSkipList, 7);
-
- getLogEntry2(pSkipList, 2);
- getLogEntry2(pSkipList, 5);
- getLogEntry2(pSkipList, 7);
- getLogEntry2(pSkipList, 7);
-
-
- tSkipListDestroy(pSkipList);
+ raftEntryCacheLog2((char*)"==test3 write 10 entries==", pCache);
}
int main(int argc, char** argv) {
@@ -266,14 +126,9 @@ int main(int argc, char** argv) {
tsAsyncLog = 0;
sDebugFlag = DEBUG_TRACE + DEBUG_SCREEN + DEBUG_FILE + DEBUG_DEBUG;
- /*
- test1();
- test2();
- test3();
- test4();
- */
-
- test5();
+ test1();
+ test2();
+ test3();
return 0;
}
diff --git a/source/libs/sync/test/syncHashCacheTest.cpp b/source/libs/sync/test/syncHashCacheTest.cpp
new file mode 100644
index 0000000000..f155bd834f
--- /dev/null
+++ b/source/libs/sync/test/syncHashCacheTest.cpp
@@ -0,0 +1,277 @@
+#include
+#include "syncEnv.h"
+#include "syncIO.h"
+#include "syncInt.h"
+#include "syncRaftLog.h"
+#include "syncRaftStore.h"
+#include "syncUtil.h"
+#include "tskiplist.h"
+
+void logTest() {
+ sTrace("--- sync log test: trace");
+ sDebug("--- sync log test: debug");
+ sInfo("--- sync log test: info");
+ sWarn("--- sync log test: warn");
+ sError("--- sync log test: error");
+ sFatal("--- sync log test: fatal");
+}
+
+SSyncRaftEntry* createEntry(int i) {
+ int32_t dataLen = 20;
+ SSyncRaftEntry* pEntry = syncEntryBuild(dataLen);
+ assert(pEntry != NULL);
+ pEntry->msgType = 88;
+ pEntry->originalRpcType = 99;
+ pEntry->seqNum = 3;
+ pEntry->isWeak = true;
+ pEntry->term = 100 + i;
+ pEntry->index = i;
+ snprintf(pEntry->data, dataLen, "value%d", i);
+
+ return pEntry;
+}
+
+SSyncNode* createFakeNode() {
+ SSyncNode* pSyncNode = (SSyncNode*)taosMemoryMalloc(sizeof(SSyncNode));
+ ASSERT(pSyncNode != NULL);
+ memset(pSyncNode, 0, sizeof(SSyncNode));
+
+ return pSyncNode;
+}
+
+SRaftEntryHashCache* createCache(int maxCount) {
+ SSyncNode* pSyncNode = createFakeNode();
+ ASSERT(pSyncNode != NULL);
+
+ SRaftEntryHashCache* pCache = raftCacheCreate(pSyncNode, maxCount);
+ ASSERT(pCache != NULL);
+
+ return pCache;
+}
+
+void test1() {
+ int32_t code = 0;
+ SRaftEntryHashCache* pCache = createCache(5);
+ for (int i = 0; i < 5; ++i) {
+ SSyncRaftEntry* pEntry = createEntry(i);
+ code = raftCachePutEntry(pCache, pEntry);
+ ASSERT(code == 1);
+ syncEntryDestory(pEntry);
+ }
+ raftCacheLog2((char*)"==test1 write 5 entries==", pCache);
+
+ SyncIndex index;
+ index = 1;
+ code = raftCacheDelEntry(pCache, index);
+ ASSERT(code == 0);
+ index = 3;
+ code = raftCacheDelEntry(pCache, index);
+ ASSERT(code == 0);
+ raftCacheLog2((char*)"==test1 delete 1,3==", pCache);
+
+ code = raftCacheClear(pCache);
+ ASSERT(code == 0);
+ raftCacheLog2((char*)"==clear all==", pCache);
+}
+
+void test2() {
+ int32_t code = 0;
+ SRaftEntryHashCache* pCache = createCache(5);
+ for (int i = 0; i < 5; ++i) {
+ SSyncRaftEntry* pEntry = createEntry(i);
+ code = raftCachePutEntry(pCache, pEntry);
+ ASSERT(code == 1);
+ syncEntryDestory(pEntry);
+ }
+ raftCacheLog2((char*)"==test2 write 5 entries==", pCache);
+
+ SyncIndex index;
+ index = 1;
+ SSyncRaftEntry* pEntry;
+ code = raftCacheGetEntry(pCache, index, &pEntry);
+ ASSERT(code == 0);
+ syncEntryDestory(pEntry);
+ syncEntryLog2((char*)"==test2 get entry 1==", pEntry);
+
+ index = 2;
+ code = raftCacheGetEntryP(pCache, index, &pEntry);
+ ASSERT(code == 0);
+ syncEntryLog2((char*)"==test2 get entry pointer 2==", pEntry);
+
+ // not found
+ index = 8;
+ code = raftCacheGetEntry(pCache, index, &pEntry);
+ ASSERT(code == -1 && terrno == TSDB_CODE_WAL_LOG_NOT_EXIST);
+ sTrace("==test2 get entry 8 not found==");
+
+ // not found
+ index = 9;
+ code = raftCacheGetEntryP(pCache, index, &pEntry);
+ ASSERT(code == -1 && terrno == TSDB_CODE_WAL_LOG_NOT_EXIST);
+ sTrace("==test2 get entry pointer 9 not found==");
+}
+
+void test3() {
+ int32_t code = 0;
+ SRaftEntryHashCache* pCache = createCache(5);
+ for (int i = 0; i < 5; ++i) {
+ SSyncRaftEntry* pEntry = createEntry(i);
+ code = raftCachePutEntry(pCache, pEntry);
+ ASSERT(code == 1);
+ syncEntryDestory(pEntry);
+ }
+ for (int i = 6; i < 10; ++i) {
+ SSyncRaftEntry* pEntry = createEntry(i);
+ code = raftCachePutEntry(pCache, pEntry);
+ ASSERT(code == 0);
+ syncEntryDestory(pEntry);
+ }
+ raftCacheLog2((char*)"==test3 write 10 entries, max count is 5==", pCache);
+}
+
+void test4() {
+ int32_t code = 0;
+ SRaftEntryHashCache* pCache = createCache(5);
+ for (int i = 0; i < 5; ++i) {
+ SSyncRaftEntry* pEntry = createEntry(i);
+ code = raftCachePutEntry(pCache, pEntry);
+ ASSERT(code == 1);
+ syncEntryDestory(pEntry);
+ }
+ raftCacheLog2((char*)"==test4 write 5 entries==", pCache);
+
+ SyncIndex index;
+ index = 3;
+ SSyncRaftEntry* pEntry;
+ code = raftCacheGetAndDel(pCache, index, &pEntry);
+ ASSERT(code == 0);
+ syncEntryLog2((char*)"==test4 get-and-del entry 3==", pEntry);
+ raftCacheLog2((char*)"==test4 after get-and-del entry 3==", pCache);
+}
+
+static char* keyFn(const void* pData) {
+ SSyncRaftEntry* pEntry = (SSyncRaftEntry*)pData;
+ return (char*)(&(pEntry->index));
+}
+
+static int cmpFn(const void* p1, const void* p2) { return memcmp(p1, p2, sizeof(SyncIndex)); }
+
+void printSkipList(SSkipList* pSkipList) {
+ ASSERT(pSkipList != NULL);
+
+ SSkipListIterator* pIter = tSkipListCreateIter(pSkipList);
+ while (tSkipListIterNext(pIter)) {
+ SSkipListNode* pNode = tSkipListIterGet(pIter);
+ ASSERT(pNode != NULL);
+ SSyncRaftEntry* pEntry = (SSyncRaftEntry*)SL_GET_NODE_DATA(pNode);
+ syncEntryPrint2((char*)"", pEntry);
+ }
+}
+
+void delSkipListFirst(SSkipList* pSkipList, int n) {
+ ASSERT(pSkipList != NULL);
+
+ sTrace("delete first %d -------------", n);
+ SSkipListIterator* pIter = tSkipListCreateIter(pSkipList);
+ for (int i = 0; i < n; ++i) {
+ tSkipListIterNext(pIter);
+ SSkipListNode* pNode = tSkipListIterGet(pIter);
+ tSkipListRemoveNode(pSkipList, pNode);
+ }
+}
+
+SSyncRaftEntry* getLogEntry2(SSkipList* pSkipList, SyncIndex index) {
+ SyncIndex index2 = index;
+ SSyncRaftEntry* pEntry = NULL;
+ int arraySize = 0;
+
+ SArray* entryPArray = tSkipListGet(pSkipList, (char*)(&index2));
+ arraySize = taosArrayGetSize(entryPArray);
+ if (arraySize > 0) {
+ SSkipListNode** ppNode = (SSkipListNode**)taosArrayGet(entryPArray, 0);
+ ASSERT(*ppNode != NULL);
+ pEntry = (SSyncRaftEntry*)SL_GET_NODE_DATA(*ppNode);
+ }
+ taosArrayDestroy(entryPArray);
+
+ sTrace("get index2: %ld, arraySize:%d -------------", index, arraySize);
+ syncEntryLog2((char*)"getLogEntry2", pEntry);
+ return pEntry;
+}
+
+SSyncRaftEntry* getLogEntry(SSkipList* pSkipList, SyncIndex index) {
+ sTrace("get index: %ld -------------", index);
+ SyncIndex index2 = index;
+ SSyncRaftEntry* pEntry = NULL;
+ SSkipListIterator* pIter =
+ tSkipListCreateIterFromVal(pSkipList, (const char*)&index2, TSDB_DATA_TYPE_BINARY, TSDB_ORDER_ASC);
+ if (tSkipListIterNext(pIter)) {
+ SSkipListNode* pNode = tSkipListIterGet(pIter);
+ ASSERT(pNode != NULL);
+ pEntry = (SSyncRaftEntry*)SL_GET_NODE_DATA(pNode);
+ }
+
+ syncEntryLog2((char*)"getLogEntry", pEntry);
+ return pEntry;
+}
+
+void test5() {
+ SSkipList* pSkipList =
+ tSkipListCreate(MAX_SKIP_LIST_LEVEL, TSDB_DATA_TYPE_BINARY, sizeof(SyncIndex), cmpFn, SL_ALLOW_DUP_KEY, keyFn);
+ ASSERT(pSkipList != NULL);
+
+ sTrace("insert 9 - 5");
+ for (int i = 9; i >= 5; --i) {
+ SSyncRaftEntry* pEntry = createEntry(i);
+ SSkipListNode* pSkipListNode = tSkipListPut(pSkipList, pEntry);
+ }
+
+ sTrace("insert 0 - 4");
+ for (int i = 0; i <= 4; ++i) {
+ SSyncRaftEntry* pEntry = createEntry(i);
+ SSkipListNode* pSkipListNode = tSkipListPut(pSkipList, pEntry);
+ }
+
+ sTrace("insert 7 7 7 7 7");
+ for (int i = 0; i <= 4; ++i) {
+ SSyncRaftEntry* pEntry = createEntry(7);
+ SSkipListNode* pSkipListNode = tSkipListPut(pSkipList, pEntry);
+ }
+
+ sTrace("print: -------------");
+ printSkipList(pSkipList);
+
+ delSkipListFirst(pSkipList, 3);
+
+ sTrace("print: -------------");
+ printSkipList(pSkipList);
+
+ getLogEntry(pSkipList, 2);
+ getLogEntry(pSkipList, 5);
+ getLogEntry(pSkipList, 7);
+ getLogEntry(pSkipList, 7);
+
+ getLogEntry2(pSkipList, 2);
+ getLogEntry2(pSkipList, 5);
+ getLogEntry2(pSkipList, 7);
+ getLogEntry2(pSkipList, 7);
+
+ tSkipListDestroy(pSkipList);
+}
+
+int main(int argc, char** argv) {
+ gRaftDetailLog = true;
+ tsAsyncLog = 0;
+ sDebugFlag = DEBUG_TRACE + DEBUG_SCREEN + DEBUG_FILE + DEBUG_DEBUG;
+
+ /*
+ test1();
+ test2();
+ test3();
+ test4();
+ */
+
+ test5();
+
+ return 0;
+}
diff --git a/source/util/src/terror.c b/source/util/src/terror.c
index ef6697b3b5..2364c53a9a 100644
--- a/source/util/src/terror.c
+++ b/source/util/src/terror.c
@@ -561,6 +561,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_COL_JSON, "Only tag can be jso
TAOS_DEFINE_ERROR(TSDB_CODE_PAR_VALUE_TOO_LONG, "Value too long for column/tag")
TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_DELETE_WHERE, "The DELETE statement must have a definite time window range")
TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_REDISTRIBUTE_VG, "The REDISTRIBUTE VGROUP statement only support 1 to 3 dnodes")
+TAOS_DEFINE_ERROR(TSDB_CODE_PAR_INVALID_SELECTED_EXPR, "Invalid SELECTed expression")
//planner
TAOS_DEFINE_ERROR(TSDB_CODE_PLAN_INTERNAL_ERROR, "Planner internal error")
diff --git a/source/util/src/tref.c b/source/util/src/tref.c
index 2e4c33bc87..9cd849b9be 100644
--- a/source/util/src/tref.c
+++ b/source/util/src/tref.c
@@ -431,7 +431,7 @@ static int32_t taosDecRefCount(int32_t rsetId, int64_t rid, int32_t remove) {
}
released = 1;
} else {
- uTrace("rsetId:%d p:%p rid:%" PRId64 " is released", rsetId, pNode->p, rid);
+ uTrace("rsetId:%d p:%p rid:%" PRId64 " is released, remain count %d", rsetId, pNode->p, rid, pNode->count);
}
} else {
uTrace("rsetId:%d rid:%" PRId64 " is not there, failed to release/remove", rsetId, rid);
diff --git a/source/util/src/tsched.c b/source/util/src/tsched.c
index 691a0d34d4..9abce966f5 100644
--- a/source/util/src/tsched.c
+++ b/source/util/src/tsched.c
@@ -129,7 +129,7 @@ void *taosProcessSchedQueue(void *scheduler) {
while (1) {
if ((ret = tsem_wait(&pSched->fullSem)) != 0) {
uFatal("wait %s fullSem failed(%s)", pSched->label, strerror(errno));
- exit(ret);
+ ASSERT(0);
}
if (pSched->stop) {
break;
@@ -137,7 +137,7 @@ void *taosProcessSchedQueue(void *scheduler) {
if ((ret = taosThreadMutexLock(&pSched->queueMutex)) != 0) {
uFatal("lock %s queueMutex failed(%s)", pSched->label, strerror(errno));
- exit(ret);
+ ASSERT(0);
}
msg = pSched->queue[pSched->fullSlot];
@@ -146,12 +146,12 @@ void *taosProcessSchedQueue(void *scheduler) {
if ((ret = taosThreadMutexUnlock(&pSched->queueMutex)) != 0) {
uFatal("unlock %s queueMutex failed(%s)", pSched->label, strerror(errno));
- exit(ret);
+ ASSERT(0);
}
if ((ret = tsem_post(&pSched->emptySem)) != 0) {
uFatal("post %s emptySem failed(%s)", pSched->label, strerror(errno));
- exit(ret);
+ ASSERT(0);
}
if (msg.fp)
@@ -174,12 +174,12 @@ void taosScheduleTask(void *queueScheduler, SSchedMsg *pMsg) {
if ((ret = tsem_wait(&pSched->emptySem)) != 0) {
uFatal("wait %s emptySem failed(%s)", pSched->label, strerror(errno));
- exit(ret);
+ ASSERT(0);
}
if ((ret = taosThreadMutexLock(&pSched->queueMutex)) != 0) {
uFatal("lock %s queueMutex failed(%s)", pSched->label, strerror(errno));
- exit(ret);
+ ASSERT(0);
}
pSched->queue[pSched->emptySlot] = *pMsg;
@@ -187,12 +187,12 @@ void taosScheduleTask(void *queueScheduler, SSchedMsg *pMsg) {
if ((ret = taosThreadMutexUnlock(&pSched->queueMutex)) != 0) {
uFatal("unlock %s queueMutex failed(%s)", pSched->label, strerror(errno));
- exit(ret);
+ ASSERT(0);
}
if ((ret = tsem_post(&pSched->fullSem)) != 0) {
uFatal("post %s fullSem failed(%s)", pSched->label, strerror(errno));
- exit(ret);
+ ASSERT(0);
}
}
@@ -200,6 +200,8 @@ void taosCleanUpScheduler(void *param) {
SSchedQueue *pSched = (SSchedQueue *)param;
if (pSched == NULL) return;
+ uDebug("start to cleanup %s schedQsueue", pSched->label);
+
pSched->stop = true;
for (int32_t i = 0; i < pSched->numOfThreads; ++i) {
if (taosCheckPthreadValid(pSched->qthread[i])) {
diff --git a/tests/parallel_test/run_case.sh b/tests/parallel_test/run_case.sh
index 9705c024b8..52a5627e34 100755
--- a/tests/parallel_test/run_case.sh
+++ b/tests/parallel_test/run_case.sh
@@ -65,6 +65,7 @@ ulimit -c unlimited
$TIMEOUT_CMD $cmd
RET=$?
+echo "cmd exit code: $RET"
if [ $RET -ne 0 ]; then
pwd
diff --git a/tests/pytest/stream/test1.py b/tests/pytest/stream/test1.py
index d3439a7bdb..31e70c21d2 100644
--- a/tests/pytest/stream/test1.py
+++ b/tests/pytest/stream/test1.py
@@ -18,7 +18,7 @@ class TDTestCase:
tdSql.execute('create table ownsampling_ct1 using downsampling_stb tags(10, 10.1, "beijing", True);')
tdSql.execute('create table if not exists scalar_stb (ts timestamp, c1 int, c2 double, c3 binary(20)) tags (t1 int);')
tdSql.execute('create table scalar_ct1 using scalar_stb tags(10);')
- tdSql.execute('create stream downsampling_stream into output_downsampling_stb as select _wstartts AS start, min(c1), max(c2), sum(c1) from downsampling_stb interval(10m);')
+ tdSql.execute('create stream downsampling_stream into output_downsampling_stb as select _wstart AS start, min(c1), max(c2), sum(c1) from downsampling_stb interval(10m);')
tdSql.execute('create stream scalar_stream into output_scalar_stb as select ts, abs(c1) a1 , abs(c2) a2 from scalar_stb;')
tdSql.execute('insert into scalar_ct1 values (1653471881952, 100, 100.1, "beijing");')
tdSql.execute('insert into scalar_ct1 values (1653471881952+1s, -50, -50.1, "tianjin");')
diff --git a/tests/pytest/stream/test2.py b/tests/pytest/stream/test2.py
index a441174722..e6044662e9 100644
--- a/tests/pytest/stream/test2.py
+++ b/tests/pytest/stream/test2.py
@@ -22,23 +22,23 @@ class TDTestCase:
tdSql.execute('create table downsampling_ct1 using downsampling_stb tags(10, 10.1, "Beijing", True);')
tdSql.execute('create table if not exists scalar_stb (ts timestamp, c1 int, c2 double, c3 binary(20), c4 nchar(20), c5 nchar(20)) tags (t1 int);')
tdSql.execute('create table scalar_ct1 using scalar_stb tags(10);')
- tdSql.execute('create stream downsampling_stream into output_downsampling_stb as select _wstartts AS start, min(c1), max(c2), sum(c1) from downsampling_stb interval(10m);')
+ tdSql.execute('create stream downsampling_stream into output_downsampling_stb as select _wstart AS start, min(c1), max(c2), sum(c1) from downsampling_stb interval(10m);')
tdSql.execute('insert into downsampling_ct1 values (1653547828591, 100, 100.1, "Beijing", True);')
tdSql.execute('insert into downsampling_ct1 values (1653547828591+1s, -100, -100.1, "Tianjin", False);')
tdSql.execute('insert into downsampling_ct1 values (1653547828591+2s, 50, 50.3, "HeBei", False);')
tdSql.execute('select * from output_downsampling_stb;')
tdSql.execute('select start, `min(c1)`, `max(c2)`, `sum(c1)` from output_downsampling_stb;')
- tdSql.execute('select _wstartts AS start, min(c1), max(c2), sum(c1) from downsampling_stb interval(10m);')
+ tdSql.execute('select _wstart AS start, min(c1), max(c2), sum(c1) from downsampling_stb interval(10m);')
tdSql.execute('insert into downsampling_ct1 values (1653547828591+10m, 60, 60.3, "heilongjiang", True);')
tdSql.execute('insert into downsampling_ct1 values (1653547828591+11m, 70, 70.3, "JiLin", True);')
tdSql.execute('select * from output_downsampling_stb;')
tdSql.execute('select start, `min(c1)`, `max(c2)`, `sum(c1)` from output_downsampling_stb;')
- tdSql.execute('select _wstartts AS start, min(c1), max(c2), sum(c1) from downsampling_stb interval(10m);')
+ tdSql.execute('select _wstart AS start, min(c1), max(c2), sum(c1) from downsampling_stb interval(10m);')
tdSql.execute('insert into downsampling_ct1 values (1653547828591+21m, 70, 70.3, "JiLin", True);')
tdSql.execute('select * from output_downsampling_stb;')
tdSql.execute('select * from output_downsampling_stb;')
tdSql.execute('select start, `min(c1)`, `max(c2)`, `sum(c1)` from output_downsampling_stb;')
- tdSql.execute('select _wstartts AS start, min(c1), max(c2), sum(c1) from downsampling_stb interval(10m);')
+ tdSql.execute('select _wstart AS start, min(c1), max(c2), sum(c1) from downsampling_stb interval(10m);')
tdSql.execute('create stream abs_stream into output_abs_stb as select ts, abs(c1), abs(c2), c3 from scalar_stb;')
tdSql.query('describe output_abs_stb')
tdSql.execute('create stream acos_stream into output_acos_stb as select ts, acos(c1), acos(c2), c3 from scalar_stb;')
diff --git a/tests/pytest/util/sqlset.py b/tests/pytest/util/sqlset.py
index bccd49a209..3c1b6cd7f7 100644
--- a/tests/pytest/util/sqlset.py
+++ b/tests/pytest/util/sqlset.py
@@ -41,7 +41,7 @@ class TDSetSql:
create_stb_sql = f'create table {stbname} ({column_sql[:-1]}) tags({tag_sql[:-1]})'
return create_stb_sql
- def set_insertsql(self,column_dict,tbname,binary_str,nchar_str):
+ def set_insertsql(self,column_dict,tbname,binary_str=None,nchar_str=None):
sql = ''
for k, v in column_dict.items():
if v.lower() == 'timestamp' or v.lower() == 'tinyint' or v.lower() == 'smallint' or v.lower() == 'int' or v.lower() == 'bigint' or \
diff --git a/tests/script/api/stopquery.c b/tests/script/api/stopquery.c
index 0f27fdf9f9..082d987a22 100644
--- a/tests/script/api/stopquery.c
+++ b/tests/script/api/stopquery.c
@@ -36,7 +36,7 @@ int64_t st, et;
char hostName[128];
char dbName[128];
char tbName[128];
-int32_t runTimes = 10000;
+int32_t runTimes = 1000;
typedef struct {
int id;
@@ -85,9 +85,12 @@ static void sqExecSQLE(TAOS *taos, char *command) {
taos_free_result(pSql);
}
+void sqError(char* prefix, const char* errMsg) {
+ fprintf(stderr, "%s error: %s\n", prefix, errMsg);
+}
void sqExit(char* prefix, const char* errMsg) {
- fprintf(stderr, "%s error: %s\n", prefix, errMsg);
+ sqError(prefix, errMsg);
exit(1);
}
@@ -141,16 +144,20 @@ void sqCloseFetchCb(void *param, TAOS_RES *pRes, int numOfRows) {
taos_close(qParam->taos);
*qParam->end = 1;
+
+ taos_free_result(pRes);
}
void sqCloseQueryCb(void *param, TAOS_RES *pRes, int code) {
SSP_CB_PARAM *qParam = (SSP_CB_PARAM *)param;
if (code == 0 && pRes) {
if (qParam->fetch) {
- taos_fetch_rows_a(pRes, sqFreeFetchCb, param);
+ taos_fetch_rows_a(pRes, sqCloseFetchCb, param);
} else {
taos_close(qParam->taos);
*qParam->end = 1;
+
+ taos_free_result(pRes);
}
} else {
sqExit("select", taos_errstr(pRes));
@@ -203,7 +210,9 @@ void sqAsyncQueryCb(void *param, TAOS_RES *pRes, int code) {
*qParam->end = 1;
}
} else {
- sqExit("select", taos_errstr(pRes));
+ sqError("select", taos_errstr(pRes));
+ *qParam->end = 1;
+ taos_free_result(pRes);
}
}
@@ -358,6 +367,7 @@ int sqCloseSyncQuery(bool fetch) {
}
taos_close(taos);
+ taos_free_result(pRes);
}
CASE_LEAVE();
}
@@ -382,7 +392,7 @@ int sqCloseAsyncQuery(bool fetch) {
SSP_CB_PARAM param = {0};
param.fetch = fetch;
param.end = &qEnd;
- taos_query_a(taos, sql, sqFreeQueryCb, ¶m);
+ taos_query_a(taos, sql, sqCloseQueryCb, ¶m);
while (0 == qEnd) {
usleep(5000);
}
@@ -457,8 +467,6 @@ void *closeThreadFp(void *arg) {
}
}
-
-
void *killThreadFp(void *arg) {
SSP_CB_PARAM* qParam = (SSP_CB_PARAM*)arg;
while (true) {
@@ -471,6 +479,19 @@ void *killThreadFp(void *arg) {
}
}
+void *cleanupThreadFp(void *arg) {
+ SSP_CB_PARAM* qParam = (SSP_CB_PARAM*)arg;
+ while (true) {
+ if (qParam->taos) {
+ usleep(rand() % 10000);
+ taos_cleanup();
+ break;
+ }
+ usleep(1);
+ }
+}
+
+
int sqConCloseSyncQuery(bool fetch) {
@@ -578,6 +599,8 @@ int sqConKillSyncQuery(bool fetch) {
pthread_join(qid, NULL);
pthread_join(cid, NULL);
+
+ taos_close(param.taos);
}
CASE_LEAVE();
}
@@ -593,6 +616,40 @@ int sqConKillAsyncQuery(bool fetch) {
pthread_join(qid, NULL);
pthread_join(cid, NULL);
+
+ taos_close(param.taos);
+ }
+ CASE_LEAVE();
+}
+
+int sqConCleanupSyncQuery(bool fetch) {
+ CASE_ENTER();
+ pthread_t qid, cid;
+ for (int32_t i = 0; i < runTimes; ++i) {
+ SSP_CB_PARAM param = {0};
+ param.fetch = fetch;
+ pthread_create(&qid, NULL, syncQueryThreadFp, (void*)¶m);
+ pthread_create(&cid, NULL, cleanupThreadFp, (void*)¶m);
+
+ pthread_join(qid, NULL);
+ pthread_join(cid, NULL);
+ break;
+ }
+ CASE_LEAVE();
+}
+
+int sqConCleanupAsyncQuery(bool fetch) {
+ CASE_ENTER();
+ pthread_t qid, cid;
+ for (int32_t i = 0; i < runTimes; ++i) {
+ SSP_CB_PARAM param = {0};
+ param.fetch = fetch;
+ pthread_create(&qid, NULL, asyncQueryThreadFp, (void*)¶m);
+ pthread_create(&cid, NULL, cleanupThreadFp, (void*)¶m);
+
+ pthread_join(qid, NULL);
+ pthread_join(cid, NULL);
+ break;
}
CASE_LEAVE();
}
@@ -600,7 +657,7 @@ int sqConKillAsyncQuery(bool fetch) {
void sqRunAllCase(void) {
-/*
+#if 1
sqStopSyncQuery(false);
sqStopSyncQuery(true);
sqStopAsyncQuery(false);
@@ -620,23 +677,26 @@ void sqRunAllCase(void) {
sqConCloseSyncQuery(true);
sqConCloseAsyncQuery(false);
sqConCloseAsyncQuery(true);
-*/
-#if 0
sqKillSyncQuery(false);
sqKillSyncQuery(true);
sqKillAsyncQuery(false);
sqKillAsyncQuery(true);
-#endif
- //sqConKillSyncQuery(false);
+ sqConKillSyncQuery(false);
sqConKillSyncQuery(true);
-#if 0
sqConKillAsyncQuery(false);
sqConKillAsyncQuery(true);
#endif
+ /*
+ sqConCleanupSyncQuery(false);
+ sqConCleanupSyncQuery(true);
+ sqConCleanupAsyncQuery(false);
+ sqConCleanupAsyncQuery(true);
+ */
+
int32_t l = 5;
while (l) {
printf("%d\n", l--);
diff --git a/tests/script/general/cache/testSuite.sim b/tests/script/general/cache/testSuite.sim
deleted file mode 100644
index f09ece89b6..0000000000
--- a/tests/script/general/cache/testSuite.sim
+++ /dev/null
@@ -1,3 +0,0 @@
-run general/cache/new_metrics.sim
-run general/cache/restart_table.sim
-run general/cache/restart_metrics.sim
diff --git a/tests/script/general/column/testSuite.sim b/tests/script/general/column/testSuite.sim
deleted file mode 100644
index f60d197e95..0000000000
--- a/tests/script/general/column/testSuite.sim
+++ /dev/null
@@ -1,3 +0,0 @@
-run general/column/commit.sim
-run general/column/metrics.sim
-run general/column/table.sim
diff --git a/tests/script/general/compress/testSuite.sim b/tests/script/general/compress/testSuite.sim
deleted file mode 100644
index 3573985c8a..0000000000
--- a/tests/script/general/compress/testSuite.sim
+++ /dev/null
@@ -1,4 +0,0 @@
-run general/compress/commitlog.sim
-run general/compress/compress2.sim
-run general/compress/compress.sim
-run general/compress/uncompress.sim
diff --git a/tests/script/general/compute/testSuite.sim b/tests/script/general/compute/testSuite.sim
deleted file mode 100644
index 91bf4bf0cd..0000000000
--- a/tests/script/general/compute/testSuite.sim
+++ /dev/null
@@ -1,17 +0,0 @@
-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
diff --git a/tests/script/general/field/testSuite.sim b/tests/script/general/field/testSuite.sim
deleted file mode 100644
index d12f0ebbd4..0000000000
--- a/tests/script/general/field/testSuite.sim
+++ /dev/null
@@ -1,14 +0,0 @@
-# run general/field/single.sim
-run general/field/bool.sim
-run general/field/smallint.sim
-run general/field/tinyint.sim
-run general/field/int.sim
-run general/field/bigint.sim
-run general/field/float.sim
-run general/field/double.sim
-# run general/field/binary.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
diff --git a/tests/script/general/import/testSuite.sim b/tests/script/general/import/testSuite.sim
deleted file mode 100644
index 9157410ea5..0000000000
--- a/tests/script/general/import/testSuite.sim
+++ /dev/null
@@ -1,4 +0,0 @@
-run general/import/basic.sim
-run general/import/commit.sim
-run general/import/large.sim
-run general/import/replica1.sim
diff --git a/tests/script/general/stream/agg_stream.sim b/tests/script/general/stream/agg_stream.sim
deleted file mode 100644
index 548f59cab7..0000000000
--- a/tests/script/general/stream/agg_stream.sim
+++ /dev/null
@@ -1,316 +0,0 @@
-system sh/stop_dnodes.sh
-
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c wallevel -v 0
-
-print ========== step1
-system sh/cfg.sh -n dnode1 -c monitor -v 1
-system sh/cfg.sh -n dnode1 -c monitorInterval -v 1
-system sh/cfg.sh -n dnode1 -c maxVnodeConnections -v 30000
-system sh/cfg.sh -n dnode1 -c maxMgmtConnections -v 30000
-system sh/cfg.sh -n dnode1 -c maxMeterConnections -v 30000
-system sh/cfg.sh -n dnode1 -c maxShellConns -v 30000
-system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
-sql connect
-
-print =============== step2
-sql create database d4 precision 'us'
-sql use d4
-sql create table t1 (ts timestamp, i int)
-sql insert into d4.t1 values(1626739200000, 1)
-
-sql create table d4.s001 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s002 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s003 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s004 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s005 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s006 as select count(req_http), count(req_insert), avg(req_select), sum(req_insert), max(req_select), min(req_insert) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s007 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
-sql create table d4.s008 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
-sql create table d4.s009 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
-sql create table d4.s000 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
-
-sql create table d4.s011 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s012 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s013 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s014 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s015 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s016 as select count(req_http), count(req_insert), avg(req_select), sum(req_insert), max(req_select), min(req_insert) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s017 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
-sql create table d4.s018 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
-sql create table d4.s019 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
-sql create table d4.s010 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
-
-sql create table d4.s021 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s022 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s023 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s024 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s025 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s026 as select count(req_http), count(req_insert), avg(req_select), sum(req_insert), max(req_select), min(req_insert) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s027 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
-sql create table d4.s028 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
-sql create table d4.s029 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
-sql create table d4.s020 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
-
-sql create table d4.s031 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s032 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s033 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s034 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s035 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s036 as select count(req_http), count(req_insert), avg(req_select), sum(req_insert), max(req_select), min(req_insert) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s037 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
-sql create table d4.s038 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
-sql create table d4.s039 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
-sql create table d4.s030 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
-
-sql create table d4.s041 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s042 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s043 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s044 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s045 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s046 as select count(req_http), count(req_insert), avg(req_select), sum(req_insert), max(req_select), min(req_insert) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s047 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
-sql create table d4.s048 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
-sql create table d4.s049 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
-sql create table d4.s040 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
-
-sql create table d4.s051 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s052 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s053 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s054 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s055 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s056 as select count(req_http), count(req_insert), avg(req_select), sum(req_insert), max(req_select), min(req_insert) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s057 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
-sql create table d4.s058 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
-sql create table d4.s059 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
-sql create table d4.s050 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
-
-sql create table d4.s061 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s062 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s063 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s064 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s065 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s066 as select count(req_http), count(req_insert), avg(req_select), sum(req_insert), max(req_select), min(req_insert) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s067 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
-sql create table d4.s068 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
-sql create table d4.s069 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
-sql create table d4.s060 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
-
-sql create table d4.s071 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s072 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s073 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s074 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s075 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s076 as select count(req_http), count(req_insert), avg(req_select), sum(req_insert), max(req_select), min(req_insert) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s077 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
-sql create table d4.s078 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
-sql create table d4.s079 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
-sql create table d4.s070 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
-
-sql create table d4.s081 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s082 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s083 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s084 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s085 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s086 as select count(req_http), count(req_insert), avg(req_select), sum(req_insert), max(req_select), min(req_insert) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s087 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
-sql create table d4.s088 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
-sql create table d4.s089 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
-sql create table d4.s080 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
-
-sql create table d4.s091 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s092 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s093 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s094 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s095 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s096 as select count(req_http), count(req_insert) , sum(req_insert), max(req_select), min(req_insert) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s097 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
-sql create table d4.s098 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
-sql create table d4.s099 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
-sql create table d4.s090 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
-
-print =============== step21
-
-sql create table d4.s101 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s102 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s103 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s104 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s105 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s106 as select count(req_http), count(req_insert) , sum(req_insert), max(req_select), min(req_insert) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s107 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
-sql create table d4.s108 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
-sql create table d4.s109 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
-sql create table d4.s100 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
-
-sql create table d4.s111 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s112 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s113 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s114 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s115 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s116 as select count(req_http), count(req_insert) , sum(req_insert), max(req_select), min(req_insert) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s117 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
-sql create table d4.s118 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
-sql create table d4.s119 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
-sql create table d4.s110 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
-
-sql create table d4.s121 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s122 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s123 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s124 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s125 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s126 as select count(req_http), count(req_insert) , sum(req_insert), max(req_select), min(req_insert) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s127 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
-sql create table d4.s128 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
-sql create table d4.s129 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
-sql create table d4.s120 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
-
-sql create table d4.s131 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s132 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s133 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s134 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s135 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s136 as select count(req_http), count(req_insert) , sum(req_insert), max(req_select), min(req_insert) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s137 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
-sql create table d4.s138 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
-sql create table d4.s139 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
-sql create table d4.s130 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
-
-sql create table d4.s141 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s142 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s143 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s144 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s145 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s146 as select count(req_http), count(req_insert) , sum(req_insert), max(req_select), min(req_insert) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s147 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
-sql create table d4.s148 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
-sql create table d4.s149 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
-sql create table d4.s140 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
-
-sql create table d4.s151 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s152 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s153 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s154 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s155 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s156 as select count(req_http), count(req_insert) , sum(req_insert), max(req_select), min(req_insert) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s157 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
-sql create table d4.s158 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
-sql create table d4.s159 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
-sql create table d4.s150 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
-
-sql create table d4.s161 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s162 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s163 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s164 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s165 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s166 as select count(req_http), count(req_insert) , sum(req_insert), max(req_select), min(req_insert) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s167 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
-sql create table d4.s168 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
-sql create table d4.s169 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
-sql create table d4.s160 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
-
-sql create table d4.s171 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s172 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s173 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s174 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s175 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s176 as select count(req_http), count(req_insert) , sum(req_insert), max(req_select), min(req_insert) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s177 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
-sql create table d4.s178 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
-sql create table d4.s179 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
-sql create table d4.s170 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
-
-sql create table d4.s181 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s182 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s183 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s184 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s185 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s186 as select count(req_http), count(req_insert) , sum(req_insert), max(req_select), min(req_insert) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s187 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
-sql create table d4.s188 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
-sql create table d4.s189 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
-sql create table d4.s180 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
-
-sql create table d4.s191 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s192 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s193 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s194 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s195 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s196 as select count(req_http), count(req_insert) , sum(req_insert), max(req_select), min(req_insert) from log.dn_192_168_0_1 interval(5s)
-sql create table d4.s197 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd) from log.dn interval(5s)
-sql create table d4.s198 as select count(mem_taosd), count(mem_system), avg(mem_taosd), avg(mem_system), sum(mem_taosd), max(mem_taosd), min(mem_taosd) from log.dn interval(5s)
-sql create table d4.s199 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used) from log.dn interval(5s)
-sql create table d4.s190 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read) from log.dn interval(5s)
-
-
-print =============== step3
-print sleep 22 seconds
-sleep 50000
-
-sql select * from d4.s001
-$s1 = $rows
-print select * from d4.s001 ==> $s1
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s002
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s003
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s004
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s005
-$s5 = $rows
-print select * from d4.s005 ==> $s5
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s006
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s007
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s008
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s009
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s010
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s101
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s102
-$s12 = $rows
-print select * from d4.s102 ==> $s12
-if $rows <= 0 then
- return -1
-endi
diff --git a/tests/script/general/stream/column_stream.sim b/tests/script/general/stream/column_stream.sim
deleted file mode 100644
index 59a65f0969..0000000000
--- a/tests/script/general/stream/column_stream.sim
+++ /dev/null
@@ -1,200 +0,0 @@
-system sh/stop_dnodes.sh
-
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c wallevel -v 0
-
-print ========== step1
-system sh/cfg.sh -n dnode1 -c monitor -v 1
-system sh/cfg.sh -n dnode1 -c monitorInterval -v 1
-system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
-sql connect
-
-print =============== step1
-sleep 2000
-sql select * from log.dn
-if $rows == 0 then
- return -1
-endi
-
-print =============== step2
-sql create database d4 precision 'us'
-sql use d4
-sql create table t1 (ts timestamp, i int)
-sql insert into d4.t1 values(1626739200000, 1)
-
-sql create table d4.s1 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd), stddev(cpu_taosd), count(*) as c1, count(*) as c2, count(*) as c3, count(*) as c4, count(*) as c5, count(*) as c6, count(*) as c7, count(*) as c8, count(*) as c9, count(*) as c10, count(*) as c11, count(*) as c12, count(*) as c13, count(*) as c14, count(*) as c15, count(*) as c16, count(*) as c17, count(*) as c18, count(*) as c19, count(*) as c20, count(*) as c21, count(*) as c22, count(*) as c23, count(*) as c24, count(*) as c25, count(*) as c26, count(*) as c27, count(*) as c28, count(*) as c29, count(*) as c30 from log.dn_192_168_0_1 interval(5s)
-
-sql create table d4.s2 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd), stddev(cpu_taosd), count(*) as c1, count(*) as c2, count(*) as c3, count(*) as c4, count(*) as c5, count(*) as c6, count(*) as c7, count(*) as c8, count(*) as c9, count(*) as c10, count(*) as c11, count(*) as c12, count(*) as c13, count(*) as c14, count(*) as c15, count(*) as c16, count(*) as c17, count(*) as c18, count(*) as c19, count(*) as c20, count(*) as c21, count(*) as c22, count(*) as c23, count(*) as c24, count(*) as c25, count(*) as c26, count(*) as c27, count(*) as c28, count(*) as c29, count(*) as c30 from log.dn_192_168_0_1 interval(5s)
-
-sql create table d4.s3 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used), stddev(disk_used), count(*) as c1, count(*) as c2, count(*) as c3, count(*) as c4, count(*) as c5, count(*) as c6, count(*) as c7, count(*) as c8, count(*) as c9, count(*) as c10, count(*) as c11, count(*) as c12, count(*) as c13, count(*) as c14, count(*) as c15, count(*) as c16, count(*) as c17, count(*) as c18, count(*) as c19, count(*) as c20, count(*) as c21, count(*) as c22, count(*) as c23, count(*) as c24, count(*) as c25, count(*) as c26, count(*) as c27, count(*) as c28, count(*) as c29, count(*) as c30 from log.dn_192_168_0_1 interval(5s)
-
-sql create table d4.s4 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read), stddev(io_write), count(*) as c1, count(*) as c2, count(*) as c3, count(*) as c4, count(*) as c5, count(*) as c6, count(*) as c7, count(*) as c8, count(*) as c9, count(*) as c10, count(*) as c11, count(*) as c12, count(*) as c13, count(*) as c14, count(*) as c15, count(*) as c16, count(*) as c17, count(*) as c18, count(*) as c19, count(*) as c20, count(*) as c21, count(*) as c22, count(*) as c23, count(*) as c24, count(*) as c25, count(*) as c26, count(*) as c27, count(*) as c28, count(*) as c29, count(*) as c30 from log.dn_192_168_0_1 interval(5s)
-
-sql create table d4.s5 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed), stddev(band_speed), count(*) as c1, count(*) as c2, count(*) as c3, count(*) as c4, count(*) as c5, count(*) as c6, count(*) as c7, count(*) as c8, count(*) as c9, count(*) as c10, count(*) as c11, count(*) as c12, count(*) as c13, count(*) as c14, count(*) as c15, count(*) as c16, count(*) as c17, count(*) as c18, count(*) as c19, count(*) as c20, count(*) as c21, count(*) as c22, count(*) as c23, count(*) as c24, count(*) as c25, count(*) as c26, count(*) as c27, count(*) as c28, count(*) as c29, count(*) as c30 from log.dn_192_168_0_1 interval(5s)
-
-sql create table d4.s6 as select count(req_http), count(req_insert), avg(req_http), avg(req_select), sum(req_insert), max(req_select), min(req_insert), stddev(req_select), count(*) as c1, count(*) as c2, count(*) as c3, count(*) as c4, count(*) as c5, count(*) as c6, count(*) as c7, count(*) as c8, count(*) as c9, count(*) as c10, count(*) as c11, count(*) as c12, count(*) as c13, count(*) as c14, count(*) as c15, count(*) as c16, count(*) as c17, count(*) as c18, count(*) as c19, count(*) as c20, count(*) as c21, count(*) as c22, count(*) as c23, count(*) as c24, count(*) as c25, count(*) as c26, count(*) as c27, count(*) as c28, count(*) as c29, count(*) as c30 from log.dn_192_168_0_1 interval(5s)
-
-sql create table d4.s7 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd), count(*) as c1, count(*) as c2, count(*) as c3, count(*) as c4, count(*) as c5, count(*) as c6, count(*) as c7, count(*) as c8, count(*) as c9, count(*) as c10, count(*) as c11, count(*) as c12, count(*) as c13, count(*) as c14, count(*) as c15, count(*) as c16, count(*) as c17, count(*) as c18, count(*) as c19, count(*) as c20, count(*) as c21, count(*) as c22, count(*) as c23, count(*) as c24, count(*) as c25, count(*) as c26, count(*) as c27, count(*) as c28, count(*) as c29, count(*) as c30 from log.dn interval(5s)
-
-sql create table d4.s8 as select count(cpu_taosd), count(cpu_system), avg(cpu_taosd), avg(cpu_system), sum(cpu_taosd), max(cpu_taosd), min(cpu_taosd), count(*) as c1, count(*) as c2, count(*) as c3, count(*) as c4, count(*) as c5, count(*) as c6, count(*) as c7, count(*) as c8, count(*) as c9, count(*) as c10, count(*) as c11, count(*) as c12, count(*) as c13, count(*) as c14, count(*) as c15, count(*) as c16, count(*) as c17, count(*) as c18, count(*) as c19, count(*) as c20, count(*) as c21, count(*) as c22, count(*) as c23, count(*) as c24, count(*) as c25, count(*) as c26, count(*) as c27, count(*) as c28, count(*) as c29, count(*) as c30 from log.dn interval(5s)
-
-sql create table d4.s9 as select count(disk_used), count(disk_total), avg(disk_used), avg(disk_total), sum(disk_used), max(disk_used), min(disk_used), count(*) as c1, count(*) as c2, count(*) as c3, count(*) as c4, count(*) as c5, count(*) as c6, count(*) as c7, count(*) as c8, count(*) as c9, count(*) as c10, count(*) as c11, count(*) as c12, count(*) as c13, count(*) as c14, count(*) as c15, count(*) as c16, count(*) as c17, count(*) as c18, count(*) as c19, count(*) as c20, count(*) as c21, count(*) as c22, count(*) as c23, count(*) as c24, count(*) as c25, count(*) as c26, count(*) as c27, count(*) as c28, count(*) as c29, count(*) as c30 from log.dn interval(5s)
-
-sql create table d4.s10 as select count(io_read), count(io_write), avg(io_read), avg(io_write), sum(io_read), max(io_write), min(io_read), count(*) as c1, count(*) as c2, count(*) as c3, count(*) as c4, count(*) as c5, count(*) as c6, count(*) as c7, count(*) as c8, count(*) as c9, count(*) as c10, count(*) as c11, count(*) as c12, count(*) as c13, count(*) as c14, count(*) as c15, count(*) as c16, count(*) as c17, count(*) as c18, count(*) as c19, count(*) as c20, count(*) as c21, count(*) as c22, count(*) as c23, count(*) as c24, count(*) as c25, count(*) as c26, count(*) as c27, count(*) as c28, count(*) as c29, count(*) as c30 from log.dn interval(5s)
-
-sql create table d4.s11 as select count(band_speed), avg(band_speed), sum(band_speed), max(band_speed), min(band_speed), count(*) as c1, count(*) as c2, count(*) as c3, count(*) as c4, count(*) as c5, count(*) as c6, count(*) as c7, count(*) as c8, count(*) as c9, count(*) as c10, count(*) as c11, count(*) as c12, count(*) as c13, count(*) as c14, count(*) as c15, count(*) as c16, count(*) as c17, count(*) as c18, count(*) as c19, count(*) as c20, count(*) as c21, count(*) as c22, count(*) as c23, count(*) as c24, count(*) as c25, count(*) as c26, count(*) as c27, count(*) as c28, count(*) as c29, count(*) as c30 from log.dn interval(5s)
-
-sql create table d4.s12 as select count(req_http), count(req_insert), avg(req_select), avg(req_insert), sum(req_insert), max(req_select), min(req_insert), count(*) as c1, count(*) as c2, count(*) as c3, count(*) as c4, count(*) as c5, count(*) as c6, count(*) as c7, count(*) as c8, count(*) as c9, count(*) as c10, count(*) as c11, count(*) as c12, count(*) as c13, count(*) as c14, count(*) as c15, count(*) as c16, count(*) as c17, count(*) as c18, count(*) as c19, count(*) as c20, count(*) as c21, count(*) as c22, count(*) as c23, count(*) as c24, count(*) as c25, count(*) as c26, count(*) as c27, count(*) as c28, count(*) as c29, count(*) as c30 from log.dn interval(5s)
-
-print =============== step3
-print sleep 22 seconds
-sleep 22000
-
-sql select * from d4.s1
-$s1 = $rows
-print select * from d4.s1 ==> $s1
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s2
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s3
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s4
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s5
-$s5 = $rows
-print select * from d4.s5 ==> $s5
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s6
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s7
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s8
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s9
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s10
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s11
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s12
-$s12 = $rows
-print select * from d4.s12 ==> $s12
-if $rows <= 0 then
- return -1
-endi
-
-print =============== step4
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
-system sh/exec.sh -n dnode1 -s start
-print sleep 22 seconds
-sleep 22000
-
-sql select * from d4.s1
-print select * from d4.s1 ==> $rows $s1
-if $rows <= 0 then
- return -1
-endi
-if $rows <= $s1 then
- return -1
-endi
-
-sql select * from d4.s2
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s3
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s4
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s5
-print select * from d4.s5 ==> $rows $s5
-if $rows <= 0 then
- return -1
-endi
-if $rows <= $s5 then
- return -1
-endi
-
-
-sql select * from d4.s6
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s7
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s8
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s9
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s10
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s11
-if $rows <= 0 then
- return -1
-endi
-
-sql select * from d4.s12
-print select * from d4.s12 ==> $rows $s12
-if $rows <= 0 then
- return -1
-endi
-if $rows <= $s12 then
- return -1
-endi
\ No newline at end of file
diff --git a/tests/script/general/stream/metrics_del.sim b/tests/script/general/stream/metrics_del.sim
deleted file mode 100644
index 6cc3da71e9..0000000000
--- a/tests/script/general/stream/metrics_del.sim
+++ /dev/null
@@ -1,95 +0,0 @@
-system sh/stop_dnodes.sh
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
-sql connect
-
-print ======================== dnode1 start
-
-$dbPrefix = md_db
-$tbPrefix = md_tb
-$mtPrefix = md_mt
-$stPrefix = md_st
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step1
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-
-sql drop databae $db -x step1
-step1:
-sql create database $db
-sql use $db
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
- $tb = $tbPrefix . $i
- sql create table $tb using $mt tags( $i )
-
- $x = 0
- $y = 0
- while $y < $rowNum
- $ts = 1626710400000 + $x
- sql insert into $tb values ($ts , $y , $y )
- $x = $x + 1
- $y = $y + 1
- endw
-
- $i = $i + 1
-endw
-
-sleep 100
-
-print =============== step2 c3
-
-sql select count(*), count(tbcol), count(tbcol2) from $mt interval(1d)
-print select count(*), count(tbcol), count(tbcol2) from $mt interval(1d) ===> $data00 $data01 $data02, $data03
-if $data01 != 200 then
- return -1
-endi
-if $data02 != 200 then
- return -1
-endi
-if $data03 != 200 then
- return -1
-endi
-
-$st = $stPrefix . c3
-sql create table $st as select count(*), count(tbcol), count(tbcol2) from $mt interval(1d)
-
-print =============== step3
-
-$i = 0
-while $i < $tbNum
- $tb = $tbPrefix . $i
- sql drop table $tb
- $i = $i + 1
-endw
-sql drop table $mt
-
-print =============== step4
-print sleep 120 seconds
-sleep 120000
-
-print =============== step5
-$st = $stPrefix . c3
-sql select * from $st
-print ===> select * from $st
-print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
-if $data01 != null then
- return -1
-endi
-if $data02 != null then
- return -1
-endi
-if $data03 != null then
- return -1
-endi
diff --git a/tests/script/general/stream/metrics_replica1_vnoden.sim b/tests/script/general/stream/metrics_replica1_vnoden.sim
deleted file mode 100644
index db1044a597..0000000000
--- a/tests/script/general/stream/metrics_replica1_vnoden.sim
+++ /dev/null
@@ -1,245 +0,0 @@
-system sh/stop_dnodes.sh
-
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 1000
-system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 3
-system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
-sql connect
-
-print ======================== dnode1 start
-
-$dbPrefix = m1v_db
-$tbPrefix = m1v_tb
-$mtPrefix = m1v_mt
-$stPrefix = m1v_st
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step1
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-
-sql drop databae $db -x step1
-step1:
-sql create database $db
-sql use $db
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
- $tb = $tbPrefix . $i
- sql create table $tb using $mt tags( $i )
-
- $x = -400
- $y = 0
- while $y < $rowNum
- $ms = $x . m
- sql insert into $tb values (1626739200000 $ms , $y , $y )
- $x = $x + 1
- $y = $y + 1
- endw
-
- $i = $i + 1
-endw
-
-sleep 100
-
-print =============== step2 c1
-
-sql select count(*) from $mt interval(1d)
-print select count(*) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 200 then
- return -1
-endi
-
-$st = $stPrefix . c1
-sql create table $st as select count(*) from $mt interval(1d)
-
-print =============== step3 c2
-sql select count(tbcol) from $mt interval(1d)
-print select count(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 200 then
- return -1
-endi
-
-$st = $stPrefix . c2
-sql create table $st as select count(tbcol) from $mt interval(1d)
-
-print =============== step4 c3
-sql select count(tbcol2) from $mt interval(1d)
-print select count(tbcol2) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 200 then
- return -1
-endi
-
-$st = $stPrefix . c3
-sql create table $st as select count(tbcol2) from $mt interval(1d)
-
-print =============== step5 avg
-sql select avg(tbcol) from $mt interval(1d)
-print select avg(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 9.500000000 then
- return -1
-endi
-
-$st = $stPrefix . av
-sql create table $st as select avg(tbcol) from $mt interval(1d)
-
-print =============== step6 su
-sql select sum(tbcol) from $mt interval(1d)
-print select sum(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 1900 then
- return -1
-endi
-
-$st = $stPrefix . su
-sql create table $st as select sum(tbcol) from $mt interval(1d)
-
-print =============== step7 mi
-sql select min(tbcol) from $mt interval(1d)
-print select min(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 0 then
- return -1
-endi
-
-$st = $stPrefix . mi
-sql create table $st as select min(tbcol) from $mt interval(1d)
-
-print =============== step8 ma
-sql select max(tbcol) from $mt interval(1d)
-print select max(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 19 then
- return -1
-endi
-
-$st = $stPrefix . ma
-sql create table $st as select max(tbcol) from $mt interval(1d)
-
-print =============== step9 fi
-sql select first(tbcol) from $mt interval(1d)
-print select first(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 0 then
- return -1
-endi
-
-$st = $stPrefix . fi
-sql create table $st as select first(tbcol) from $mt interval(1d)
-
-print =============== step10 la
-sql select last(tbcol) from $mt interval(1d)
-print select last(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 19 then
- return -1
-endi
-
-$st = $stPrefix . la
-sql create table $st as select last(tbcol) from $mt interval(1d)
-
-print =============== step11 wh
-sql select count(tbcol) from $mt where ts < 1626739440001 interval(1d)
-print select count(tbcol) from $mt where ts < 1626739440000 interval(1d) ===> $data00 $data01
-if $data01 != 200 then
- return -1
-endi
-
-$st = $stPrefix . wh
-#sql create table $st as select count(tbcol) from $mt where ts < 1626739200000 + 4m interval(1d)
-
-print =============== step12 as
-sql select count(tbcol) from $mt interval(1d)
-print select count(tbcol) from $mt interval(1d) ===> $data00 $data01
-if $data01 != 200 then
- return -1
-endi
-
-$st = $stPrefix . as
-sql create table $st as select count(tbcol) as c from $mt interval(1d)
-
-print =============== step13
-print sleep 120 seconds
-sleep 120000
-
-print =============== step14
-$st = $stPrefix . c1
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 200 then
- return -1
-endi
-
-$st = $stPrefix . c2
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 200 then
- return -1
-endi
-
-$st = $stPrefix . c3
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 200 then
- return -1
-endi
-
-$st = $stPrefix . av
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 9.500000000 then
- return -1
-endi
-
-$st = $stPrefix . su
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 1900 then
- return -1
-endi
-
-$st = $stPrefix . mi
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0 then
- return -1
-endi
-
-$st = $stPrefix . ma
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 19 then
- return -1
-endi
-
-$st = $stPrefix . fi
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0 then
- return -1
-endi
-
-$st = $stPrefix . la
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 19 then
- return -1
-endi
-
-$st = $stPrefix . wh
-#sql select * from $st
-#print ===> select * from $st ===> $data00 $data01
-#if $data01 != 200 then
-# return -1
-#endi
-
-$st = $stPrefix . as
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 200 then
- return -1
-endi
diff --git a/tests/script/general/stream/restart_stream.sim b/tests/script/general/stream/restart_stream.sim
deleted file mode 100644
index 62e47f9b3a..0000000000
--- a/tests/script/general/stream/restart_stream.sim
+++ /dev/null
@@ -1,176 +0,0 @@
-system sh/stop_dnodes.sh
-
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
-sql connect
-print ======================== dnode1 start
-
-$i = 0
-$dbPrefix = rs_db
-$tbPrefix = rs_tb
-$mtPrefix = rs_mt
-$stPrefix = rs_st
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-$db = $dbPrefix
-$tb = $tbPrefix . $i
-$mt = $mtPrefix
-$stm = $stPrefix . m
-$stt = $stPrefix . t
-
-print =============== step1
-sql create database $db
-sql use $db
-
-sql create table $mt (ts timestamp, tbcol int, tbcol2 int ) TAGS(tgcol bool)
-$i = 0
-while $i < 10
- $tb = $tbPrefix . $i
- sql create table $tb using $mt tags( 0 )
-
- $x = -400
- $y = 0
- while $y < $rowNum
- $ms = $x . m
- sql insert into $tb values (1626739200000 $ms , $y , $y )
- $x = $x + 1
- $y = $y + 1
- endw
-
- $i = $i + 1
-endw
-
-print =============== step2
-$i = 0
-$tb = $tbPrefix . $i
-
-sql select count(*) from $tb interval(1d)
-print ===>rows $rows, data $data01
-if $rows != 1 then
- return -1
-endi
-if $data01 != 20 then
- return -1
-endi
-
-sql select count(*) from $mt interval(1d)
-print ===>rows $rows, data $data01
-if $rows != 1 then
- return -1
-endi
-if $data01 != 200 then
- return -1
-endi
-
-print =============== step3
-sql create table $stt as select count(*) from $tb interval(1d)
-sql create table $stm as select count(*) from $mt interval(1d)
-
-print sleep 120 seconds
-sleep 120000
-
-sql select * from $stt
-print select count(*) from $stt ===> $data00 $data01
-if $rows != 1 then
- return -1
-endi
-if $data01 != 20 then
- return -1
-endi
-
-sql select * from $stm
-print select * from $stm ===> $data00 $data01
-if $rows != 1 then
- return -1
-endi
-if $data01 != 200 then
- return -1
-endi
-
-print =============== step4
-system sh/exec.sh -n dnode1 -s stop
-system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/exec.sh -n dnode1 -s start
-
-print =============== step5
-print ==> renew cache
-sql reset query cache
-sleep 1000
-
-
-print =============== step6
-sql create database $db
-sql use $db
-sql create table $mt (ts timestamp, tbcol bigint, tbcol2 bigint ) TAGS(tgcol int)
-$i = 0
-while $i < 5
- $tb = $tbPrefix . $i
- sql create table $tb using $mt tags( 0 )
-
- $x = -400
- $y = 0
- while $y < $rowNum
- $ms = $x . m
- sql insert into $tb values (1626739200000 $ms , $y , $y )
- $x = $x + 1
- $y = $y + 1
- endw
-
- $i = $i + 1
-endw
-
-
-print =============== step7
-
-sql select count(*) from $tb interval(1d)
-print ===>rows $rows, data $data01
-if $rows != 1 then
- return -1
-endi
-if $data01 != 20 then
- return -1
-endi
-
-sql select count(*) from $mt interval(1d)
-print ===>rows $rows, data $data01
-if $rows != 1 then
- return -1
-endi
-if $data01 != 100 then
- return -1
-endi
-
-print =============== step8
-sql create table $stt as select count(*) from $tb interval(1d)
-sql create table $stm as select count(*) from $mt interval(1d)
-
-print sleep 120 seconds
-sleep 120000
-
-sql select * from $stt
-sleep 1000
-print ===>rows $rows, data $data01
-if $rows != 1 then
- return -1
-endi
-if $data01 != 20 then
- return -1
-endi
-
-sql select * from $stm
-print ===>rows $rows, data $data01
-if $rows != 1 then
- return -1
-endi
-if $data01 != 100 then
- return -1
-endi
-
-
diff --git a/tests/script/general/stream/stream_1970.sim b/tests/script/general/stream/stream_1970.sim
deleted file mode 100644
index 30a733c08f..0000000000
--- a/tests/script/general/stream/stream_1970.sim
+++ /dev/null
@@ -1,73 +0,0 @@
-system sh/stop_dnodes.sh
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
-sql connect
-
-print ======================== dnode1 start
-
-$dbPrefix = s3_db
-$tbPrefix = s3_tb
-$mtPrefix = s3_mt
-$stPrefix = s3_st
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step1
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-
-sql drop databae $db -x step1
-step1:
-sql create database $db keep 36500
-sql use $db
-sql create stable $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-
-sql create table cq1 as select count(*) from $mt interval(10s);
-
-sleep 1000
-
-sql create table $st using $mt tags(1);
-
-sql insert into $st values (-50000, 1, 1.0);
-sql insert into $st values (-10000, 1, 1.0);
-sql insert into $st values (10000, 1, 1.0);
-
-
-$i = 0
-while $i < 12
- sql select * from cq1;
-
- if $rows != 3 then
- sleep 10000
- else
- if $data00 != @70-01-01 07:59:10.000@ then
- return -1
- endi
- if $data01 != 1 then
- return -1
- endi
- if $data10 != @70-01-01 07:59:50.000@ then
- return -1
- endi
- if $data11 != 1 then
- return -1
- endi
- if $data20 != @70-01-01 08:00:10.000@ then
- return -1
- endi
- if $data21 != 1 then
- return -1
- endi
- $i = 12
- endi
-
- $i = $i + 1
-endw
-
diff --git a/tests/script/general/stream/stream_3.sim b/tests/script/general/stream/stream_3.sim
deleted file mode 100644
index b043993814..0000000000
--- a/tests/script/general/stream/stream_3.sim
+++ /dev/null
@@ -1,201 +0,0 @@
-system sh/stop_dnodes.sh
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
-sql connect
-
-print ======================== dnode1 start
-
-$dbPrefix = s3_db
-$tbPrefix = s3_tb
-$mtPrefix = s3_mt
-$stPrefix = s3_st
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step1
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-
-sql drop databae $db -x step1
-step1:
-sql create database $db
-sql use $db
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
- $tb = $tbPrefix . $i
- sql create table $tb using $mt tags( $i )
-
- $x = -400
- $y = 0
- while $y < $rowNum
- $ms = $x . m
- sql insert into $tb values (1626739200000 $ms , $y , $y )
- $x = $x + 1
- $y = $y + 1
- endw
-
- $i = $i + 1
-endw
-
-sleep 100
-
-print =============== step2 c1
-$i = 1
-$tb = $tbPrefix . $i
-
-sql select count(*) from $tb interval(1d)
-if $data01 != $rowNum then
- return -1
-endi
-
-$st = $stPrefix . c1
-sql create table $st as select count(*) from $tb interval(1d)
-
-print =============== step3 c2
-sql select count(tbcol) from $tb interval(1d)
-if $data01 != $rowNum then
- return -1
-endi
-
-$st = $stPrefix . c2
-sql create table $st as select count(tbcol) from $tb interval(1d)
-
-print =============== step4 c3
-sql select count(tbcol2) from $tb interval(1d)
-if $data01 != $rowNum then
- return -1
-endi
-
-$st = $stPrefix . c3
-sql create table $st as select count(tbcol2) from $tb interval(1d)
-
-print =============== step5
-print sleep 120 seconds
-sleep 120000
-
-print =============== step6
-$st = $stPrefix . c1
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != $rowNum then
- return -1
-endi
-
-$st = $stPrefix . c2
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != $rowNum then
- return -1
-endi
-
-$st = $stPrefix . c3
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != $rowNum then
- return -1
-endi
-
-print =============== step7
-
-system sh/exec.sh -n dnode1 -s stop
-system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/exec.sh -n dnode1 -s start
-
-sleep 4000
-print ======================== dnode1 start
-
-$dbPrefix = stst3db
-$tbPrefix = stst3tb
-$mtPrefix = stst3mt
-$stPrefix = stst3st
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step8
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-
-sql drop databae $db -x step8
-step8:
-sql create database $db
-sql use $db
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
- $tb = $tbPrefix . $i
- sql create table $tb using $mt tags( $i )
-
- $x = -400
- $y = 0
- while $y < $rowNum
- $ms = $x . m
- sql insert into $tb values (1626739200000 $ms , $y , $y )
- $x = $x + 1
- $y = $y + 1
- endw
-
- $i = $i + 1
-endw
-
-sleep 100
-
-print =============== step9 c3
-$i = 1
-$tb = $tbPrefix . $i
-
-sql select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
-print select count(*), count(tbcol), count(tbcol2) from $tb interval(1d) ===> $data00 $data01 $data02, $data03
-if $data01 != $rowNum then
- return -1
-endi
-if $data02 != $rowNum then
- return -1
-endi
-if $data03 != $rowNum then
- return -1
-endi
-
-$st = $stPrefix . c3
-sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
-
-print =============== step10
-print sleep 120 seconds
-sleep 120000
-
-print =============== step11
-#$st = $stPrefix . c3
-#sql select * from $st -x step11
-# print ===> select * from $st first time should be error
-# return -1
-#step11:
-
-print =============== step12
-$st = $stPrefix . c3
-sql select * from $st
-print ===> select * from $st
-print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
-if $data01 != $rowNum then
- return -1
-endi
-if $data02 != $rowNum then
- return -1
-endi
-if $data03 != $rowNum then
- return -1
-endi
-
-
diff --git a/tests/script/general/stream/stream_restart.sim b/tests/script/general/stream/stream_restart.sim
deleted file mode 100644
index 54a60a0081..0000000000
--- a/tests/script/general/stream/stream_restart.sim
+++ /dev/null
@@ -1,142 +0,0 @@
-system sh/stop_dnodes.sh
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
-sql connect
-
-print ======================== dnode1 start
-
-$dbPrefix = sr_db
-$tbPrefix = sr_tb
-$mtPrefix = sr_mt
-$stPrefix = sr_st
-$tbNum = 10
-$rowNum = 200
-$totalNum = 200
-
-print =============== step1
-
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-
-sql create database $db
-sql use $db
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
- $tb = $tbPrefix . $i
- sql create table $tb using $mt tags( $i )
-
- $x = 0
- $y = 0
- while $y < $rowNum
- $ms = $x . s
- sql insert into $tb values (1626739200000 + $ms , $y , $y )
- $x = $x + 1
- $y = $y + 1
- endw
-
- $i = $i + 1
-endw
-
-sleep 100
-
-print =============== step2
-
-$i = 1
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
-sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(10s)
-
-$i = 5
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
-sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(10s)
-
-$i = 8
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
-sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(10s)
-
-sql show tables
-if $rows != 13 then
- return -1
-endi
-
-print =============== step3
-sleep 2000
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 1000
-system sh/exec.sh -n dnode1 -s start
-
-print =============== step4
-print sleep 120 seconds
-sleep 120000
-
-print =============== step5
-$i = 1
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select * from $tb
-print $tb ==> $rows $data00 $data01
-if $rows != $rowNum then
- return -1
-endi
-
-$i = 5
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select * from $tb
-print $tb ==> $rows $data00 $data01
-if $rows != $rowNum then
- return -1
-endi
-
-$i = 8
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select * from $tb
-print $tb ==> $rows $data00 $data01
-if $rows != $rowNum then
- return -1
-endi
-
-print =============== step6
-
-$i = 1
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select * from $st
-print $st ==> $rows $data00 $data01
-if $rows <= 1 then
- return -1
-endi
-
-$i = 5
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select * from $st
-print $st ==> $rows $data00 $data01
-if $rows <= 1 then
- return -1
-endi
-
-$i = 8
-$tb = $tbPrefix . $i
-$st = $stPrefix . $i
-sql select * from $st
-print $st ==> $rows $data00 $data01
-if $rows <= 1 then
- return -1
-endi
-
-
diff --git a/tests/script/general/stream/table_del.sim b/tests/script/general/stream/table_del.sim
deleted file mode 100644
index 34673605d6..0000000000
--- a/tests/script/general/stream/table_del.sim
+++ /dev/null
@@ -1,90 +0,0 @@
-system sh/stop_dnodes.sh
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
-sql connect
-
-print ======================== dnode1 start
-
-$dbPrefix = td_db
-$tbPrefix = td_tb
-$mtPrefix = td_mt
-$stPrefix = td_st
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step1
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-
-sql drop databae $db -x step1
-step1:
-sql create database $db
-sql use $db
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
- $tb = $tbPrefix . $i
- sql create table $tb using $mt tags( $i )
-
- $x = -400
- $y = 0
- while $y < $rowNum
- $ms = $x . m
- sql insert into $tb values (1626739200000 $ms , $y , $y )
- $x = $x + 1
- $y = $y + 1
- endw
-
- $i = $i + 1
-endw
-
-sleep 100
-
-print =============== step2 c3
-$i = 1
-$tb = $tbPrefix . $i
-
-sql select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
-print select count(*), count(tbcol), count(tbcol2) from $tb interval(1d) ===> $data00 $data01 $data02, $data03
-if $data01 != $rowNum then
- return -1
-endi
-if $data02 != $rowNum then
- return -1
-endi
-if $data03 != $rowNum then
- return -1
-endi
-
-$st = $stPrefix . c3
-sql create table $st as select count(*), count(tbcol), count(tbcol2) from $tb interval(1d)
-
-print =============== step3
-sql drop table $tb
-
-print =============== step4
-print sleep 120 seconds
-sleep 120000
-
-print =============== step5
-$st = $stPrefix . c3
-sql select * from $st
-print ===> select * from $st
-print ===> $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
-if $data01 != null then
- return -1
-endi
-if $data02 != null then
- return -1
-endi
-if $data03 != null then
- return -1
-endi
diff --git a/tests/script/general/stream/table_replica1_vnoden.sim b/tests/script/general/stream/table_replica1_vnoden.sim
deleted file mode 100644
index 4a6c4fe046..0000000000
--- a/tests/script/general/stream/table_replica1_vnoden.sim
+++ /dev/null
@@ -1,299 +0,0 @@
-system sh/stop_dnodes.sh
-
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 1000
-system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 3
-system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
-sql connect
-
-print ======================== dnode1 start
-
-$dbPrefix = t1v_db
-$tbPrefix = t1v_tb
-$mtPrefix = t1v_mt
-$stPrefix = t1v_st
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print =============== step1
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-$st = $stPrefix . $i
-
-sql drop databae $db -x step1
-step1:
-sql create database $db
-sql use $db
-sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
-
-$i = 0
-while $i < $tbNum
- $tb = $tbPrefix . $i
- sql create table $tb using $mt tags( $i )
-
- $x = -400
- $y = 0
- while $y < $rowNum
- $ms = $x . m
- sql insert into $tb values (1626739200000 $ms , $y , $y )
- $x = $x + 1
- $y = $y + 1
- endw
-
- $i = $i + 1
-endw
-
-sleep 100
-
-print =============== step2 c1
-$i = 1
-$tb = $tbPrefix . $i
-
-sql select count(*) from $tb interval(1d)
-print select count(*) from $tb interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then
- return -1
-endi
-
-$st = $stPrefix . c1
-sql create table $st as select count(*) from $tb interval(1d)
-
-print =============== step3 c2
-sql select count(tbcol) from $tb interval(1d)
-print select count(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then
- return -1
-endi
-
-$st = $stPrefix . c2
-sql create table $st as select count(tbcol) from $tb interval(1d)
-
-print =============== step4 c3
-sql select count(tbcol2) from $tb interval(1d)
-print select count(tbcol2) from $tb interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then
- return -1
-endi
-
-$st = $stPrefix . c3
-sql create table $st as select count(tbcol2) from $tb interval(1d)
-
-print =============== step5 avg
-sql select avg(tbcol) from $tb interval(1d)
-print select avg(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 9.500000000 then
- return -1
-endi
-
-$st = $stPrefix . av
-sql create table $st as select avg(tbcol) from $tb interval(1d)
-
-print =============== step6 su
-sql select sum(tbcol) from $tb interval(1d)
-print select sum(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 190 then
- return -1
-endi
-
-$st = $stPrefix . su
-sql create table $st as select sum(tbcol) from $tb interval(1d)
-
-print =============== step7 mi
-sql select min(tbcol) from $tb interval(1d)
-print select min(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 0 then
- return -1
-endi
-
-$st = $stPrefix . mi
-sql create table $st as select min(tbcol) from $tb interval(1d)
-
-print =============== step8 ma
-sql select max(tbcol) from $tb interval(1d)
-print select max(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 19 then
- return -1
-endi
-
-$st = $stPrefix . ma
-sql create table $st as select max(tbcol) from $tb interval(1d)
-
-print =============== step9 fi
-sql select first(tbcol) from $tb interval(1d)
-print select first(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 0 then
- return -1
-endi
-
-$st = $stPrefix . fi
-sql create table $st as select first(tbcol) from $tb interval(1d)
-
-print =============== step10 la
-sql select last(tbcol) from $tb interval(1d)
-print select last(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 19 then
- return -1
-endi
-
-$st = $stPrefix . la
-sql create table $st as select last(tbcol) from $tb interval(1d)
-
-print =============== step11 st
-sql select stddev(tbcol) from $tb interval(1d)
-print select stddev(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 5.766281297 then
- return -1
-endi
-
-$st = $stPrefix . st
-sql create table $st as select stddev(tbcol) from $tb interval(1d)
-
-print =============== step12 le
-sql select leastsquares(tbcol, 1, 1) from $tb interval(1d)
-print select leastsquares(tbcol, 1, 1) from $tb interval(1d) ===> $data00 $data01
-#if $data01 != @(0.000017, -25362055.126740)@ then
-# return -1
-#endi
-
-$st = $stPrefix . le
-sql create table $st as select leastsquares(tbcol, 1, 1) from $tb interval(1d)
-
-print =============== step13 pe
-
-sql select percentile(tbcol, 1) from $tb interval(1d)
-print select percentile(tbcol, 1) from $tb interval(1d) ===> $data00 $data01
-if $data01 != 0.190000000 then
- return -1
-endi
-
-$st = $stPrefix . pe
-sql create table $st as select percentile(tbcol, 1) from $tb interval(1d)
-
-print =============== step14 wh
-sql select count(tbcol) from $tb where ts < 1626739440001 interval(1d)
-print select count(tbcol) from $tb where ts < 1626739440001 interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then
- return -1
-endi
-
-$st = $stPrefix . wh
-#sql create table $st as select count(tbcol) from $tb where ts < 1626739200000 + 4m interval(1d)
-
-print =============== step15 as
-sql select count(tbcol) from $tb interval(1d)
-print select count(tbcol) from $tb interval(1d) ===> $data00 $data01
-if $data01 != $rowNum then
- return -1
-endi
-
-$st = $stPrefix . as
-sql create table $st as select count(tbcol) as c from $tb interval(1d)
-
-print =============== step16
-print sleep 120 seconds
-sleep 120000
-
-print =============== step17
-$st = $stPrefix . c1
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != $rowNum then
- return -1
-endi
-
-$st = $stPrefix . c2
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != $rowNum then
- return -1
-endi
-
-$st = $stPrefix . c3
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != $rowNum then
- return -1
-endi
-
-$st = $stPrefix . av
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 9.500000000 then
- return -1
-endi
-
-$st = $stPrefix . su
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 190 then
- return -1
-endi
-
-$st = $stPrefix . mi
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0 then
- return -1
-endi
-
-$st = $stPrefix . ma
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 19 then
- return -1
-endi
-
-$st = $stPrefix . fi
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0 then
- return -1
-endi
-
-$st = $stPrefix . la
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 19 then
- return -1
-endi
-
-$st = $stPrefix . st
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 5.766281297 then
- return -1
-endi
-
-$st = $stPrefix . le
-sql select * from $st
-#print ===> select * from $st ===> $data00 $data01
-#if $data01 != @(0.000017, -25270086.331047)@ then
-# return -1
-#endi
-
-$st = $stPrefix . pe
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != 0.190000000 then
- return -1
-endi
-
-$st = $stPrefix . wh
-#sql select * from $st
-#print ===> select * from $st ===> $data00 $data01
-#if $data01 != $rowNum then
-# return -1
-#endi
-
-$st = $stPrefix . as
-sql select * from $st
-print ===> select * from $st ===> $data00 $data01
-if $data01 != $rowNum then
- return -1
-endi
diff --git a/tests/script/general/stream/testSuite.sim b/tests/script/general/stream/testSuite.sim
deleted file mode 100644
index 4a9912b848..0000000000
--- a/tests/script/general/stream/testSuite.sim
+++ /dev/null
@@ -1,6 +0,0 @@
-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
\ No newline at end of file
diff --git a/tests/script/general/vector/testSuite.sim b/tests/script/general/vector/testSuite.sim
deleted file mode 100644
index f0b9fef991..0000000000
--- a/tests/script/general/vector/testSuite.sim
+++ /dev/null
@@ -1,11 +0,0 @@
-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
diff --git a/tests/script/general/wal/maxtables.sim b/tests/script/general/wal/maxtables.sim
deleted file mode 100644
index acd6af1d1a..0000000000
--- a/tests/script/general/wal/maxtables.sim
+++ /dev/null
@@ -1,46 +0,0 @@
-system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 100
-system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
-system sh/cfg.sh -n dnode1 -c tableIncStepPerVnode -v 2
-
-
-print ============== deploy
-system sh/exec.sh -n dnode1 -s start
-sleep 3001
-sql connect
-
-sql create database d1
-sql use d1
-sql create table st (ts timestamp, tbcol int) TAGS(tgcol int)
-
-$i = 0
-while $i < 100
- $tb = t . $i
- sql create table $tb using st tags( $i )
- sql insert into $tb values (now , $i )
- $i = $i + 1
-endw
-
-sql_error sql create table tt (ts timestamp, i int)
-
-print =============== step3
-sql select * from st;
-if $rows != 100 then
- return -1
-endi
-
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
-system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
-sleep 2000
-
-print =============== step4
-system sh/exec.sh -n dnode1 -s start
-sleep 2000
-
-sql select * from st;
-if $rows != 100 then
- return -1
-endi
-
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/general/wal/sync.sim b/tests/script/general/wal/sync.sim
deleted file mode 100644
index 3a89523918..0000000000
--- a/tests/script/general/wal/sync.sim
+++ /dev/null
@@ -1,146 +0,0 @@
-system sh/stop_dnodes.sh
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/deploy.sh -n dnode3 -i 3
-
-system sh/cfg.sh -n dnode1 -c numOfMnodes -v 3
-system sh/cfg.sh -n dnode2 -c numOfMnodes -v 3
-system sh/cfg.sh -n dnode3 -c numOfMnodes -v 3
-
-system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
-
-system sh/cfg.sh -n dnode1 -c http -v 1
-system sh/cfg.sh -n dnode2 -c http -v 1
-system sh/cfg.sh -n dnode3 -c http -v 1
-
-system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 20000
-system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 20000
-system sh/cfg.sh -n dnode3 -c maxTablesPerVnode -v 20000
-
-system sh/cfg.sh -n dnode1 -c replica -v 3
-system sh/cfg.sh -n dnode2 -c replica -v 3
-system sh/cfg.sh -n dnode3 -c replica -v 3
-
-system sh/cfg.sh -n dnode1 -c maxSQLLength -v 940032
-system sh/cfg.sh -n dnode2 -c maxSQLLength -v 940032
-system sh/cfg.sh -n dnode3 -c maxSQLLength -v 940032
-
-print ============== deploy
-
-system sh/exec.sh -n dnode1 -s start
-sql connect
-
-sql create dnode $hostname2
-sql create dnode $hostname3
-system sh/exec.sh -n dnode2 -s start
-system sh/exec.sh -n dnode3 -s start
-
-print =============== step1
-$x = 0
-show1:
- $x = $x + 1
- sleep 1000
- if $x == 10 then
- return -1
- endi
-sql show mnodes -x show1
-$mnode1Role = $data2_1
-print mnode1Role $mnode1Role
-$mnode2Role = $data2_2
-print mnode2Role $mnode2Role
-$mnode3Role = $data2_3
-print mnode3Role $mnode3Role
-
-if $mnode1Role != master then
- goto show1
-endi
-if $mnode2Role != slave then
- goto show1
-endi
-if $mnode3Role != slave then
- goto show1
-endi
-
-print =============== step2
-sql create database d1 replica 3
-sql use d1
-
-sql create table table_rest (ts timestamp, i int)
-print sql length is 870KB
-restful d1 table_rest 1591072800 30000
-restful d1 table_rest 1591172800 30000
-restful d1 table_rest 1591272800 30000
-restful d1 table_rest 1591372800 30000
-restful d1 table_rest 1591472800 30000
-restful d1 table_rest 1591572800 30000
-restful d1 table_rest 1591672800 30000
-restful d1 table_rest 1591772800 30000
-restful d1 table_rest 1591872800 30000
-restful d1 table_rest 1591972800 30000
-
-sleep 100
-sql select * from table_rest;
-print rows: $rows
-if $rows != 300000 then
- return -1
-endi
-
-print =============== step3
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sql select * from table_rest;
-print rows: $rows
-if $rows != 300000 then
- return -1
-endi
-system sh/exec.sh -n dnode1 -s start -x SIGINT
-
-$x = 0
-a1:
- $x = $x + 1
- sleep 1000
- if $x == 40 then
- return -1
- endi
-
-sql show vgroups
-print online vnodes $data03
-if $data03 != 3 then
- goto a1
-endi
-
-print =============== step4
-system sh/exec.sh -n dnode2 -s stop -x SIGINT
-sql select * from table_rest;
-print rows: $rows
-if $rows != 300000 then
- return -1
-endi
-system sh/exec.sh -n dnode2 -s start -x SIGINT
-$x = 0
-a2:
- $x = $x + 1
- sleep 1000
- if $x == 40 then
- return -1
- endi
-
-sql show vgroups
-print online vnodes $data03
-if $data03 != 3 then
- goto a2
-endi
-
-print =============== step5
-system sh/exec.sh -n dnode3 -s stop -x SIGINT
-sql select * from table_rest;
-print rows: $rows
-if $rows != 300000 then
- return -1
-endi
-
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
-system sh/exec.sh -n dnode2 -s stop -x SIGINT
-system sh/exec.sh -n dnode3 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index 13a28aa527..dad4dbbe29 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -1,18 +1,13 @@
#======================b1-start===============
-# ---- alter
-./test.sh -f tsim/alter/cached_schema_after_alter.sim
-./test.sh -f tsim/alter/dnode.sim
-#./test.sh -f tsim/alter/table.sim
-
# ---- user
./test.sh -f tsim/user/basic.sim
./test.sh -f tsim/user/password.sim
./test.sh -f tsim/user/privilege_db.sim
./test.sh -f tsim/user/privilege_sysinfo.sim
-## ---- db
+# ---- db
./test.sh -f tsim/db/alter_option.sim
# ./test.sh -f tsim/db/alter_replica_13.sim
# ./test.sh -f tsim/db/alter_replica_31.sim
@@ -50,6 +45,12 @@
# ./test.sh -f tsim/dnode/redistribute_vgroup_replica3_v3.sim
# ./test.sh -f tsim/dnode/vnode_clean.sim
+# ---- import
+./test.sh -f tsim/import/basic.sim
+./test.sh -f tsim/import/commit.sim
+./test.sh -f tsim/import/large.sim
+./test.sh -f tsim/import/replica1.sim
+
# ---- insert
./test.sh -f tsim/insert/basic0.sim
./test.sh -f tsim/insert/basic1.sim
@@ -86,7 +87,7 @@
./test.sh -f tsim/mnode/basic1.sim
./test.sh -f tsim/mnode/basic2.sim
./test.sh -f tsim/mnode/basic3.sim
-#./test.sh -f tsim/mnode/basic4.sim
+./test.sh -f tsim/mnode/basic4.sim
./test.sh -f tsim/mnode/basic5.sim
# ---- show
@@ -202,5 +203,80 @@
# --- scalar
./test.sh -f tsim/scalar/in.sim
+./test.sh -f tsim/scalar/scalar.sim
+
+# ---- alter
+./test.sh -f tsim/alter/cached_schema_after_alter.sim
+./test.sh -f tsim/alter/dnode.sim
+#./test.sh -f tsim/alter/table.sim
+
+# ---- cache
+./test.sh -f tsim/cache/new_metrics.sim
+./test.sh -f tsim/cache/restart_table.sim
+./test.sh -f tsim/cache/restart_metrics.sim
+
+# ---- column
+./test.sh -f tsim/column/commit.sim
+./test.sh -f tsim/column/metrics.sim
+./test.sh -f tsim/column/table.sim
+
+# ---- compress
+./test.sh -f tsim/compress/commitlog.sim
+./test.sh -f tsim/compress/compress2.sim
+./test.sh -f tsim/compress/compress.sim
+./test.sh -f tsim/compress/uncompress.sim
+
+# ---- compute
+#./test.sh -f tsim/compute/avg.sim
+#./test.sh -f tsim/compute/block_dist.sim
+#./test.sh -f tsim/compute/bottom.sim
+#./test.sh -f tsim/compute/count.sim
+#./test.sh -f tsim/compute/diff.sim
+#./test.sh -f tsim/compute/diff2.sim
+#./test.sh -f tsim/compute/first.sim
+#./test.sh -f tsim/compute/interval.sim
+#./test.sh -f tsim/compute/last_row.sim
+#./test.sh -f tsim/compute/last.sim
+#./test.sh -f tsim/compute/leastsquare.sim
+#./test.sh -f tsim/compute/max.sim
+#./test.sh -f tsim/compute/min.sim
+#./test.sh -f tsim/compute/null.sim
+./test.sh -f tsim/compute/percentile.sim
+./test.sh -f tsim/compute/stddev.sim
+#./test.sh -f tsim/compute/sum.sim
+./test.sh -f tsim/compute/top.sim
+
+# ---- field
+./test.sh -f tsim/field/2.sim
+./test.sh -f tsim/field/3.sim
+./test.sh -f tsim/field/4.sim
+./test.sh -f tsim/field/5.sim
+./test.sh -f tsim/field/6.sim
+./test.sh -f tsim/field/binary.sim
+./test.sh -f tsim/field/bigint.sim
+./test.sh -f tsim/field/bool.sim
+./test.sh -f tsim/field/double.sim
+./test.sh -f tsim/field/float.sim
+./test.sh -f tsim/field/int.sim
+./test.sh -f tsim/field/single.sim
+./test.sh -f tsim/field/smallint.sim
+./test.sh -f tsim/field/tinyint.sim
+./test.sh -f tsim/field/unsigined_bigint.sim
+
+# ---- vector
+./test.sh -f tsim/vector/metrics_field.sim
+./test.sh -f tsim/vector/metrics_mix.sim
+./test.sh -f tsim/vector/metrics_query.sim
+./test.sh -f tsim/vector/metrics_tag.sim
+./test.sh -f tsim/vector/metrics_time.sim
+./test.sh -f tsim/vector/multi.sim
+./test.sh -f tsim/vector/single.sim
+./test.sh -f tsim/vector/table_field.sim
+./test.sh -f tsim/vector/table_mix.sim
+./test.sh -f tsim/vector/table_query.sim
+./test.sh -f tsim/vector/table_time.sim
+
+# ---- wal
+./test.sh -f tsim/wal/kill.sim
#======================b1-end===============
diff --git a/tests/script/general/cache/new_metrics.sim b/tests/script/tsim/cache/new_metrics.sim
similarity index 94%
rename from tests/script/general/cache/new_metrics.sim
rename to tests/script/tsim/cache/new_metrics.sim
index eb9b042483..af7db90070 100644
--- a/tests/script/general/cache/new_metrics.sim
+++ b/tests/script/tsim/cache/new_metrics.sim
@@ -1,11 +1,6 @@
system sh/stop_dnodes.sh
-
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
$i = 0
@@ -38,7 +33,6 @@ while $i < 5
endw
print =============== step2
-
sql select * from $tb order by ts desc
print ===>rows $rows, data $data01
if $rows != 20 then
@@ -67,7 +61,6 @@ if $data00 != 100 then
endi
print =============== step3
-
sql show stables
if $rows != 1 then
return -1
@@ -75,12 +68,8 @@ endi
if $data00 != $mt then
return -1
endi
-if $data04 != 5 then
- return -1
-endi
print =============== step4
-
while $i < 10
$tb = $tbPrefix . $i
sql create table $tb using $mt tags( 1 )
@@ -99,7 +88,6 @@ sql reset query cache
sleep 1000
print =============== step5
-
sql select * from $tb order by ts desc
print ===>rows $rows, data $data01
if $rows != 20 then
@@ -128,7 +116,6 @@ if $data00 != 200 then
endi
print =============== step6
-
sql show stables
if $rows != 1 then
return -1
@@ -136,8 +123,5 @@ endi
if $data00 != $mt then
return -1
endi
-if $data04 != 10 then
- return -1
-endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/general/cache/restart_metrics.sim b/tests/script/tsim/cache/restart_metrics.sim
similarity index 93%
rename from tests/script/general/cache/restart_metrics.sim
rename to tests/script/tsim/cache/restart_metrics.sim
index a1b2365b2a..e144a49bf7 100644
--- a/tests/script/general/cache/restart_metrics.sim
+++ b/tests/script/tsim/cache/restart_metrics.sim
@@ -1,14 +1,9 @@
system sh/stop_dnodes.sh
-
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
-print ======================== dnode1 start
+print ======================== dnode1 start
$i = 0
$dbPrefix = ca_rm_db
$tbPrefix = ca_rm_tb
@@ -49,9 +44,7 @@ endi
print =============== step2
system sh/exec.sh -n dnode1 -s stop
-sleep 3000
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
print =============== step3
diff --git a/tests/script/general/cache/restart_table.sim b/tests/script/tsim/cache/restart_table.sim
similarity index 90%
rename from tests/script/general/cache/restart_table.sim
rename to tests/script/tsim/cache/restart_table.sim
index 1f7d982a28..b450f6c654 100644
--- a/tests/script/general/cache/restart_table.sim
+++ b/tests/script/tsim/cache/restart_table.sim
@@ -1,14 +1,9 @@
system sh/stop_dnodes.sh
-
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
-print ======================== dnode1 start
+print ======================== dnode1 start
$i = 0
$dbPrefix = ca_rt_db
$tbPrefix = ca_rt_tb
@@ -33,9 +28,7 @@ endi
print =============== step2
system sh/exec.sh -n dnode1 -s stop
-sleep 3000
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
print =============== step3
diff --git a/tests/script/general/column/commit.sim b/tests/script/tsim/column/commit.sim
similarity index 99%
rename from tests/script/general/column/commit.sim
rename to tests/script/tsim/column/commit.sim
index 008bec3bf9..43aebb4902 100644
--- a/tests/script/general/column/commit.sim
+++ b/tests/script/tsim/column/commit.sim
@@ -1,11 +1,6 @@
system sh/stop_dnodes.sh
-
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
print =============== step1
@@ -25,7 +20,6 @@ if $rows != 1 then
endi
print =============== step2
-
sql insert into d3.t1 values (now -300d,0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 );
sql insert into d3.t1 values (now-200d,1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 );
sql insert into d3.t1 values (now-150d,2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 );
@@ -38,7 +32,6 @@ sql insert into d3.t1 values (now,8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8
sql insert into d3.t1 values (now+1d,9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 );
print =============== step3
-
sql select * from d3.mt
if $rows != 10 then
return -1
@@ -89,12 +82,9 @@ endi
print =============== step4
system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
system sh/exec.sh -n dnode1 -s start
-sleep 3000
print =============== step5
-
sql select * from d3.mt
if $rows != 10 then
return -1
diff --git a/tests/script/general/column/metrics.sim b/tests/script/tsim/column/metrics.sim
similarity index 99%
rename from tests/script/general/column/metrics.sim
rename to tests/script/tsim/column/metrics.sim
index 580e2320cd..a492f5a2f9 100644
--- a/tests/script/general/column/metrics.sim
+++ b/tests/script/tsim/column/metrics.sim
@@ -1,11 +1,6 @@
system sh/stop_dnodes.sh
-
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
print =============== step1
@@ -26,7 +21,6 @@ if $rows != 1 then
endi
print =============== step2
-
sql insert into d2.t1 values (now,0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 )
sql insert into d2.t1 values (now+1m,1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 )
sql insert into d2.t1 values (now+2m,2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 )
@@ -58,7 +52,6 @@ sql insert into d2.t2 values (now+8m,8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 ,
sql insert into d2.t2 values (now+9m,9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 )
print =============== step3
-
sql select * from d2.mt
if $rows != 20 then
return -1
@@ -157,12 +150,9 @@ endi
print =============== step4
system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
system sh/exec.sh -n dnode1 -s start
-sleep 3000
print =============== step5
-
sql select * from d2.mt
if $rows != 20 then
return -1
diff --git a/tests/script/general/column/table.sim b/tests/script/tsim/column/table.sim
similarity index 99%
rename from tests/script/general/column/table.sim
rename to tests/script/tsim/column/table.sim
index 46d5de1e82..07948ebce3 100644
--- a/tests/script/general/column/table.sim
+++ b/tests/script/tsim/column/table.sim
@@ -1,11 +1,6 @@
system sh/stop_dnodes.sh
-
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
print =============== step1
@@ -19,7 +14,6 @@ if $rows != 1 then
endi
print =============== step2
-
sql insert into d1.t1 values (now,0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 )
sql insert into d1.t1 values (now+1m,1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 , 1 )
sql insert into d1.t1 values (now+2m,2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 )
@@ -36,7 +30,6 @@ sql insert into d1.t1 values (now+8m,8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 , 8 ,
sql insert into d1.t1 values (now+9m,9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 , 9 )
print ======= step3
-
sql select * from d1.t1
print select * from d1.t1 => rows $rows
if $rows != 10 then
@@ -129,9 +122,7 @@ endi
print =============== step4
system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
system sh/exec.sh -n dnode1 -s start
-sleep 3000
print ============== step5
diff --git a/tests/script/general/compress/commitlog.sim b/tests/script/tsim/compress/commitlog.sim
similarity index 95%
rename from tests/script/general/compress/commitlog.sim
rename to tests/script/tsim/compress/commitlog.sim
index e8eab6ed0c..d90780bd6c 100644
--- a/tests/script/general/compress/commitlog.sim
+++ b/tests/script/tsim/compress/commitlog.sim
@@ -1,14 +1,9 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c comp -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
-print ============================ dnode1 start
+print ============================ dnode1 start
$i = 0
$dbPrefix = db
$tbPrefix = tb
@@ -18,7 +13,6 @@ $tb = $tbPrefix . $i
$N = 2000
print =============== step1
-
sql create database $db
sql use $db
sql create table $tb (ts timestamp, b bool, t tinyint, s smallint, i int, big bigint, str binary(256))
@@ -87,9 +81,7 @@ endi
print =============== step4
system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
system sh/exec.sh -n dnode1 -s start
-sleep 3000
print =============== step5
diff --git a/tests/script/general/compress/compress.sim b/tests/script/tsim/compress/compress.sim
similarity index 94%
rename from tests/script/general/compress/compress.sim
rename to tests/script/tsim/compress/compress.sim
index cecfe61229..766f97450c 100644
--- a/tests/script/general/compress/compress.sim
+++ b/tests/script/tsim/compress/compress.sim
@@ -1,15 +1,9 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c comp -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
print ============================ dnode1 start
-
$i = 0
$dbPrefix = db
$tbPrefix = tb
@@ -19,7 +13,6 @@ $tb = $tbPrefix . $i
$N = 2000
print =============== step1
-
sql create database $db
sql use $db
sql create table $tb (ts timestamp, b bool, t tinyint, s smallint, i int, big bigint, str binary(256))
@@ -82,9 +75,7 @@ endi
print =============== step4
system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
system sh/exec.sh -n dnode1 -s start
-sleep 3000
print =============== step5
diff --git a/tests/script/general/compress/compress2.sim b/tests/script/tsim/compress/compress2.sim
similarity index 94%
rename from tests/script/general/compress/compress2.sim
rename to tests/script/tsim/compress/compress2.sim
index 1e6868eaa6..87e50cce5b 100644
--- a/tests/script/general/compress/compress2.sim
+++ b/tests/script/tsim/compress/compress2.sim
@@ -1,15 +1,9 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c comp -v 2
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
print ============================ dnode1 start
-
$i = 0
$dbPrefix = db
$tbPrefix = tb
@@ -82,9 +76,7 @@ endi
print =============== step4
system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
system sh/exec.sh -n dnode1 -s start
-sleep 3000
print =============== step5
diff --git a/tests/script/general/compress/uncompress.sim b/tests/script/tsim/compress/uncompress.sim
similarity index 94%
rename from tests/script/general/compress/uncompress.sim
rename to tests/script/tsim/compress/uncompress.sim
index 49945dcb79..ccd5db4b0c 100644
--- a/tests/script/general/compress/uncompress.sim
+++ b/tests/script/tsim/compress/uncompress.sim
@@ -1,13 +1,9 @@
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c comp -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
-print ============================ dnode1 start
+print ============================ dnode1 start
$i = 0
$dbPrefix = cp_cp_db
$tbPrefix = cp_cp_tb
@@ -17,7 +13,6 @@ $tb = $tbPrefix . $i
$N = 2000
print =============== step1
-
sql create database $db
sql use $db
@@ -81,12 +76,9 @@ endi
print =============== step4
system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
system sh/exec.sh -n dnode1 -s start
-sleep 2000
print =============== step5
-
$i = 0
$db = $dbPrefix . $i
$tb = $tbPrefix . $i
diff --git a/tests/script/general/compute/avg.sim b/tests/script/tsim/compute/avg.sim
similarity index 97%
rename from tests/script/general/compute/avg.sim
rename to tests/script/tsim/compute/avg.sim
index db452b0344..2805b65fff 100644
--- a/tests/script/general/compute/avg.sim
+++ b/tests/script/tsim/compute/avg.sim
@@ -1,9 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-sleep 2000
sql connect
$dbPrefix = m_av_db
@@ -163,7 +160,7 @@ endi
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/compute/block_dist.sim b/tests/script/tsim/compute/block_dist.sim
similarity index 95%
rename from tests/script/general/compute/block_dist.sim
rename to tests/script/tsim/compute/block_dist.sim
index 5343c1db28..201d222af7 100644
--- a/tests/script/general/compute/block_dist.sim
+++ b/tests/script/tsim/compute/block_dist.sim
@@ -1,9 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-sleep 2000
sql connect
$dbPrefix = m_di_db
@@ -91,7 +88,7 @@ sql_error select _block_dist() from (select * from $mt)
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/compute/bottom.sim b/tests/script/tsim/compute/bottom.sim
similarity index 95%
rename from tests/script/general/compute/bottom.sim
rename to tests/script/tsim/compute/bottom.sim
index 7af67ecbf0..cfac02d6d5 100644
--- a/tests/script/general/compute/bottom.sim
+++ b/tests/script/tsim/compute/bottom.sim
@@ -1,9 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-sleep 2000
sql connect
$dbPrefix = m_bo_db
@@ -98,7 +95,7 @@ step6:
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/compute/count.sim b/tests/script/tsim/compute/count.sim
similarity index 97%
rename from tests/script/general/compute/count.sim
rename to tests/script/tsim/compute/count.sim
index cf84918f5b..0a6ce93077 100644
--- a/tests/script/general/compute/count.sim
+++ b/tests/script/tsim/compute/count.sim
@@ -1,9 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-sleep 2000
sql connect
$dbPrefix = m_co_db
@@ -192,7 +189,7 @@ endi
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/compute/diff.sim b/tests/script/tsim/compute/diff.sim
similarity index 95%
rename from tests/script/general/compute/diff.sim
rename to tests/script/tsim/compute/diff.sim
index bc303a9ca5..ba4b32ddbb 100644
--- a/tests/script/general/compute/diff.sim
+++ b/tests/script/tsim/compute/diff.sim
@@ -1,9 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-sleep 2000
sql connect
$dbPrefix = m_di_db
@@ -91,7 +88,7 @@ step6:
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/compute/diff2.sim b/tests/script/tsim/compute/diff2.sim
similarity index 97%
rename from tests/script/general/compute/diff2.sim
rename to tests/script/tsim/compute/diff2.sim
index 55fa1daa95..08b52cb37b 100644
--- a/tests/script/general/compute/diff2.sim
+++ b/tests/script/tsim/compute/diff2.sim
@@ -1,9 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-sleep 2000
sql connect
$dbPrefix = m_di_db
@@ -152,7 +149,7 @@ step6:
print =============== clear
#sql drop database $db
#sql show databases
-#if $rows != 0 then
+#if $rows != 2 then
# return -1
#endi
diff --git a/tests/script/general/compute/first.sim b/tests/script/tsim/compute/first.sim
similarity index 97%
rename from tests/script/general/compute/first.sim
rename to tests/script/tsim/compute/first.sim
index fce334167b..cf1160dbdb 100644
--- a/tests/script/general/compute/first.sim
+++ b/tests/script/tsim/compute/first.sim
@@ -1,9 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-sleep 2000
sql connect
$dbPrefix = m_fi_db
@@ -165,7 +162,7 @@ endi
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/compute/interval.sim b/tests/script/tsim/compute/interval.sim
similarity index 98%
rename from tests/script/general/compute/interval.sim
rename to tests/script/tsim/compute/interval.sim
index c21003a646..a8539701c7 100644
--- a/tests/script/general/compute/interval.sim
+++ b/tests/script/tsim/compute/interval.sim
@@ -1,9 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-sleep 2000
sql connect
$dbPrefix = m_in_db
@@ -199,7 +196,7 @@ endi
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/compute/last.sim b/tests/script/tsim/compute/last.sim
similarity index 97%
rename from tests/script/general/compute/last.sim
rename to tests/script/tsim/compute/last.sim
index 9f20f8c5aa..aa9b041ca9 100644
--- a/tests/script/general/compute/last.sim
+++ b/tests/script/tsim/compute/last.sim
@@ -1,9 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-sleep 2000
sql connect
$dbPrefix = m_la_db
@@ -169,7 +166,7 @@ endi
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/compute/last_row.sim b/tests/script/tsim/compute/last_row.sim
similarity index 98%
rename from tests/script/general/compute/last_row.sim
rename to tests/script/tsim/compute/last_row.sim
index 3b28b0baa5..867f64fa2e 100644
--- a/tests/script/general/compute/last_row.sim
+++ b/tests/script/tsim/compute/last_row.sim
@@ -1,9 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-sleep 2000
sql connect
$dbPrefix = m_la_db
@@ -217,7 +214,7 @@ endi
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/compute/leastsquare.sim b/tests/script/tsim/compute/leastsquare.sim
similarity index 96%
rename from tests/script/general/compute/leastsquare.sim
rename to tests/script/tsim/compute/leastsquare.sim
index 1c8af7fe7f..aa83a4e14e 100644
--- a/tests/script/general/compute/leastsquare.sim
+++ b/tests/script/tsim/compute/leastsquare.sim
@@ -1,9 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-sleep 2000
sql connect
$dbPrefix = m_le_db
@@ -93,7 +90,7 @@ endi
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/compute/max.sim b/tests/script/tsim/compute/max.sim
similarity index 97%
rename from tests/script/general/compute/max.sim
rename to tests/script/tsim/compute/max.sim
index f9665a823d..1b3fac5820 100644
--- a/tests/script/general/compute/max.sim
+++ b/tests/script/tsim/compute/max.sim
@@ -1,9 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-sleep 2000
sql connect
$dbPrefix = m_ma_db
@@ -169,7 +166,7 @@ endi
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/compute/min.sim b/tests/script/tsim/compute/min.sim
similarity index 87%
rename from tests/script/general/compute/min.sim
rename to tests/script/tsim/compute/min.sim
index 4a9904e065..33e9eb0f3e 100644
--- a/tests/script/general/compute/min.sim
+++ b/tests/script/tsim/compute/min.sim
@@ -1,10 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
$dbPrefix = m_mi_db
@@ -73,14 +69,14 @@ endi
print =============== step5
sql select min(tbcol) as b from $tb interval(1m)
-print ===> $data11
-if $data11 != 1 then
+print ===> $data10
+if $data10 != 1 then
return -1
endi
sql select min(tbcol) as b from $tb interval(1d)
-print ===> $data01
-if $data01 != 0 then
+print ===> $data00
+if $data00 != 0 then
return -1
endi
@@ -90,8 +86,8 @@ $ms = 1601481600000 + $cc
sql select min(tbcol) as b from $tb where ts <= $ms interval(1m)
print select min(tbcol) as b from $tb where ts <= $ms interval(1m)
-print ===> $data11
-if $data11 != 1 then
+print ===> $data10
+if $data10 != 1 then
return -1
endi
if $rows != 5 then
@@ -130,14 +126,14 @@ endi
print =============== step9
sql select min(tbcol) as b from $mt interval(1m)
-print ===> $data11
-if $data11 != 1 then
+print ===> $data10
+if $data10 != 1 then
return -1
endi
sql select min(tbcol) as b from $mt interval(1d)
-print ===> $data01
-if $data01 != 0 then
+print ===> $data00
+if $data00 != 0 then
return -1
endi
@@ -155,9 +151,9 @@ endi
print =============== step11
$cc = 4 * 60000
$ms = 1601481600000 + $cc
-sql select min(tbcol) as b from $mt where ts <= $ms interval(1m) group by tgcol
-print ===> $data11
-if $data11 != 1 then
+sql select min(tbcol) as b from $mt where ts <= $ms partition by tgcol interval(1m)
+print ===> $data10
+if $data10 != 1 then
return -1
endi
print ===> $rows
@@ -168,7 +164,7 @@ endi
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/compute/null.sim b/tests/script/tsim/compute/null.sim
similarity index 93%
rename from tests/script/general/compute/null.sim
rename to tests/script/tsim/compute/null.sim
index cd00b7a69d..30860da48b 100644
--- a/tests/script/general/compute/null.sim
+++ b/tests/script/tsim/compute/null.sim
@@ -1,9 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-sleep 2000
sql connect
$dbPrefix = db
@@ -98,22 +95,26 @@ if $data02 != 19 then
return -1
endi
-sql select * from $tb where tbcol = NULL -x step3
+sql select * from $tb where tbcol is NULL
+if $rows != 1 then
return -1
-step3:
+endi
+
+sql_error select * from $tb where tbcol = NULL
+
+return
print =============== step5
-sql create table $tb using $mt tags( NULL )
-# return -1
-#step51:
+sql create table tt using $mt tags( NULL )
#sql alter table $tb set tgcol=NULL -x step52
# return -1
#step52:
-sql select * from $mt where tgcol = NULL -x step5
+sql select * from $mt where tgcol is NULL
+if $rows != 1 then
return -1
-step5:
+endi
print =============== step6
sql select count(tbcol), count(tbcol2), avg(tbcol), avg(tbcol2), sum(tbcol), sum(tbcol2) from $mt
@@ -222,7 +223,7 @@ endi
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/compute/percentile.sim b/tests/script/tsim/compute/percentile.sim
similarity index 96%
rename from tests/script/general/compute/percentile.sim
rename to tests/script/tsim/compute/percentile.sim
index b0f4fff8d7..5cba3ad856 100644
--- a/tests/script/general/compute/percentile.sim
+++ b/tests/script/tsim/compute/percentile.sim
@@ -1,9 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-sleep 2000
sql connect
$dbPrefix = m_pe_db
@@ -125,11 +122,10 @@ if $data00 != 5.000000000 then
return -1
endi
-
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/compute/stddev.sim b/tests/script/tsim/compute/stddev.sim
similarity index 88%
rename from tests/script/general/compute/stddev.sim
rename to tests/script/tsim/compute/stddev.sim
index 772ec8386a..7048399112 100644
--- a/tests/script/general/compute/stddev.sim
+++ b/tests/script/tsim/compute/stddev.sim
@@ -1,9 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-sleep 2000
sql connect
$dbPrefix = m_st_db
@@ -72,14 +69,14 @@ endi
print =============== step5
sql select stddev(tbcol) as b from $tb interval(1m)
-print ===> $data01
-if $data01 != 0.000000000 then
+print ===> $data00
+if $data00 != 0.000000000 then
return -1
endi
sql select stddev(tbcol) as b from $tb interval(1d)
-print ===> $data01
-if $data01 != 5.766281297 then
+print ===> $data00
+if $data00 != 5.766281297 then
return -1
endi
@@ -88,8 +85,8 @@ $cc = 4 * 60000
$ms = 1601481600000 + $cc
sql select stddev(tbcol) as b from $tb where ts <= $ms interval(1m)
-print ===> $data01
-if $data01 != 0.000000000 then
+print ===> $data00
+if $data00 != 0.000000000 then
return -1
endi
if $rows != 5 then
@@ -99,7 +96,7 @@ endi
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/compute/sum.sim b/tests/script/tsim/compute/sum.sim
similarity index 84%
rename from tests/script/general/compute/sum.sim
rename to tests/script/tsim/compute/sum.sim
index 8fad992750..c53568f98f 100644
--- a/tests/script/general/compute/sum.sim
+++ b/tests/script/tsim/compute/sum.sim
@@ -1,9 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-sleep 2000
sql connect
$dbPrefix = m_su_db
@@ -72,14 +69,14 @@ endi
print =============== step5
sql select sum(tbcol) as b from $tb interval(1m)
-print ===> $data11
-if $data11 != 1 then
+print ===> $data10
+if $data10 != 1 then
return -1
endi
sql select sum(tbcol) as b from $tb interval(1d)
-print ===> $data01
-if $data01 != 190 then
+print ===> $data00
+if $data00 != 190 then
return -1
endi
@@ -88,8 +85,8 @@ $cc = 4 * 60000
$ms = 1601481600000 + $cc
sql select sum(tbcol) as b from $tb where ts <= $ms interval(1m)
-print ===> $data11
-if $data11 != 1 then
+print ===> $data10
+if $data10 != 1 then
return -1
endi
if $rows != 5 then
@@ -130,14 +127,14 @@ endi
print =============== step9
sql select sum(tbcol) as b from $mt interval(1m)
-print ===> $data11
-if $data11 < 5 then
+print ===> $data10
+if $data10 < 5 then
return -1
endi
sql select sum(tbcol) as b from $mt interval(1d)
-print ===> $data01
-if $data01 != 1900 then
+print ===> $data00
+if $data00 != 1900 then
return -1
endi
@@ -156,10 +153,10 @@ print =============== step11
$cc = 4 * 60000
$ms = 1601481600000 + $cc
-sql select sum(tbcol) as b from $mt where ts <= $ms interval(1d) group by tgcol
-print select sum(tbcol) as b from $mt where ts <= $ms interval(1d) group by tgcol
-print ===> $data01
-if $data01 != 10 then
+sql select sum(tbcol) as b from $mt where ts <= $ms partition by tgcol interval(1d)
+print select sum(tbcol) as b from $mt where ts <= $ms partition by tgcol interval(1d)
+print ===> $data00 $rows
+if $data00 != 10 then
return -1
endi
if $rows != 10 then
@@ -169,7 +166,7 @@ endi
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/compute/top.sim b/tests/script/tsim/compute/top.sim
similarity index 81%
rename from tests/script/general/compute/top.sim
rename to tests/script/tsim/compute/top.sim
index 1e9d302b7c..9899a8a9ea 100644
--- a/tests/script/general/compute/top.sim
+++ b/tests/script/tsim/compute/top.sim
@@ -1,9 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-sleep 2000
sql connect
$dbPrefix = m_to_db
@@ -48,8 +45,8 @@ $i = 1
$tb = $tbPrefix . $i
sql select top(tbcol, 1) from $tb
-print ===> $data01
-if $data01 != 19 then
+print ===> $data00
+if $data00 != 19 then
return -1
endi
@@ -58,25 +55,25 @@ $cc = 4 * 60000
$ms = 1601481600000 + $cc
sql select top(tbcol, 1) from $tb where ts <= $ms
-print ===> $data01
-if $data01 != 4 then
+print ===> $data00
+if $data00 != 4 then
return -1
endi
print =============== step4
sql select top(tbcol, 1) as b from $tb
-print ===> $data01
-if $data01 != 19 then
+print ===> $data00
+if $data00 != 19 then
return -1
endi
print =============== step5
sql select top(tbcol, 2) as b from $tb
-print ===> $data01 $data11
-if $data01 != 18 then
+print ===> $data00 $data10
+if $data00 != 18 then
return -1
endi
-if $data11 != 19 then
+if $data10 != 19 then
return -1
endi
@@ -85,11 +82,11 @@ $cc = 4 * 60000
$ms = 1601481600000 + $cc
sql select top(tbcol, 2) as b from $tb where ts <= $ms
-print ===> $data01 $data11
-if $data01 != 3 then
+print ===> $data00 $data10
+if $data00 != 3 then
return -1
endi
-if $data11 != 4 then
+if $data10 != 4 then
return -1
endi
@@ -100,7 +97,7 @@ step6:
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/field/2.sim b/tests/script/tsim/field/2.sim
similarity index 96%
rename from tests/script/general/field/2.sim
rename to tests/script/tsim/field/2.sim
index cc6889fd75..3161f02097 100644
--- a/tests/script/general/field/2.sim
+++ b/tests/script/tsim/field/2.sim
@@ -1,10 +1,8 @@
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
+
print ======================== dnode1 start
$dbPrefix = db
@@ -280,18 +278,18 @@ if $data00 != 25 then
endi
print =============== step12
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol2 = 1 interval(1d) group by tgcol order by tgcol desc
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol2 = 1 partition by tgcol interval(1d) order by tgcol desc
print $db
-print select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol2 = 1 interval(1d) group by tgcol
+print select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol2 = 1 partition by tgcol interval(1d)
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data01 != 100 then
+if $data00 != 100 then
return -1
endi
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/field/3.sim b/tests/script/tsim/field/3.sim
similarity index 97%
rename from tests/script/general/field/3.sim
rename to tests/script/tsim/field/3.sim
index cb3c6621ac..72b65c7406 100644
--- a/tests/script/general/field/3.sim
+++ b/tests/script/tsim/field/3.sim
@@ -1,10 +1,8 @@
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
+
print ======================== dnode1 start
$dbPrefix = db
@@ -493,28 +491,28 @@ if $data00 != 25 then
endi
print =============== step19
-sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol1 order by tgcol1 desc
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 partition by tgcol1 interval(1d) order by tgcol1 desc
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data01 != 100 then
+if $data00 != 100 then
return -1
endi
-sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol2 order by tgcol2 desc
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 partition by tgcol2 interval(1d) order by tgcol2 desc
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data01 != 100 then
+if $data00 != 100 then
return -1
endi
-sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol3 order by tgcol3 desc
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 partition by tgcol3 interval(1d) order by tgcol3 desc
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data01 != 100 then
+if $data00 != 100 then
return -1
endi
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/field/4.sim b/tests/script/tsim/field/4.sim
similarity index 97%
rename from tests/script/general/field/4.sim
rename to tests/script/tsim/field/4.sim
index 2d893da777..d37c05173c 100644
--- a/tests/script/general/field/4.sim
+++ b/tests/script/tsim/field/4.sim
@@ -1,10 +1,8 @@
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
+
print ======================== dnode1 start
$dbPrefix = db
@@ -677,34 +675,34 @@ if $data00 != 25 then
endi
print =============== step24
-sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol1 order by tgcol1 desc
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 partition by tgcol1 interval(1d) order by tgcol1 desc
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data01 != 100 then
+if $data00 != 100 then
return -1
endi
-sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol2 order by tgcol2 desc
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 partition by tgcol2 interval(1d) order by tgcol2 desc
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data01 != 100 then
+if $data00 != 100 then
return -1
endi
-sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol3 order by tgcol3 desc
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 partition by tgcol3 interval(1d) order by tgcol3 desc
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data01 != 100 then
+if $data00 != 100 then
return -1
endi
-sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 interval(1d) group by tgcol4 order by tgcol4 desc
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 partition by tgcol4 interval(1d) order by tgcol4 desc
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data01 != 100 then
+if $data00 != 100 then
return -1
endi
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/field/5.sim b/tests/script/tsim/field/5.sim
similarity index 97%
rename from tests/script/general/field/5.sim
rename to tests/script/tsim/field/5.sim
index e1421bdb4f..127dcd2683 100644
--- a/tests/script/general/field/5.sim
+++ b/tests/script/tsim/field/5.sim
@@ -1,10 +1,8 @@
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
+
print ======================== dnode1 start
$dbPrefix = db
@@ -794,40 +792,40 @@ endi
print =============== step27
-sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol1 order by tgcol1 desc
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 partition by tgcol1 interval(1d) order by tgcol1 desc
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data01 != 100 then
+if $data00 != 100 then
return -1
endi
-sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol2 order by tgcol2 desc
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 partition by tgcol2 interval(1d) order by tgcol2 desc
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data01 != 100 then
+if $data00 != 100 then
return -1
endi
-sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol3 order by tgcol3 desc
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 partition by tgcol3 interval(1d) order by tgcol3 desc
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data01 != 100 then
+if $data00 != 100 then
return -1
endi
-sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 interval(1d) group by tgcol4 order by tgcol4 desc
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 partition by tgcol4 interval(1d) order by tgcol4 desc
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data01 != 100 then
+if $data00 != 100 then
return -1
endi
-sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 and tbcol5 = 1 interval(1d) group by tgcol5 order by tgcol5 desc
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 and tbcol5 = 1 partition by tgcol5 interval(1d) order by tgcol5 desc
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data01 != 100 then
+if $data00 != 100 then
return -1
endi
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/field/6.sim b/tests/script/tsim/field/6.sim
similarity index 97%
rename from tests/script/general/field/6.sim
rename to tests/script/tsim/field/6.sim
index 27475d591f..474582fcae 100644
--- a/tests/script/general/field/6.sim
+++ b/tests/script/tsim/field/6.sim
@@ -1,10 +1,8 @@
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
+
print ======================== dnode1 start
$dbPrefix = db
@@ -943,46 +941,46 @@ if $data00 != 25 then
endi
print =============== step31
-sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol1 order by tgcol1 desc
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 partition by tgcol1 interval(1d) order by tgcol1 desc
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data01 != 100 then
+if $data00 != 100 then
return -1
endi
-sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol2 order by tgcol2 desc
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 partition by tgcol2 interval(1d) order by tgcol2 desc
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data01 != 100 then
+if $data00 != 100 then
return -1
endi
-sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 interval(1d) group by tgcol3 order by tgcol3 desc
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 partition by tgcol3 interval(1d) order by tgcol3 desc
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data01 != 100 then
+if $data00 != 100 then
return -1
endi
-sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 interval(1d) group by tgcol4 order by tgcol4 desc
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 partition by tgcol4 interval(1d) order by tgcol4 desc
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data01 != 100 then
+if $data00 != 100 then
return -1
endi
-sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 and tbcol5 = 1 interval(1d) group by tgcol5 order by tgcol5 desc
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 and tbcol5 = 1 partition by tgcol5 interval(1d) order by tgcol5 desc
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data01 != 100 then
+if $data00 != 100 then
return -1
endi
-sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 and tbcol5 = 1 and tbcol6 = 1 interval(1d) group by tgcol6 order by tgcol6 desc
+sql select count(tbcol1), avg(tbcol1), sum(tbcol1), min(tbcol1), max(tbcol1), first(tbcol1), last(tbcol1) from $mt where tbcol1 = 1 and tbcol2 = 1 and tbcol3 = 1 and tbcol4 = 1 and tbcol5 = 1 and tbcol6 = 1 partition by tgcol6 interval(1d) order by tgcol6 desc
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data01 != 100 then
+if $data00 != 100 then
return -1
endi
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/field/bigint.sim b/tests/script/tsim/field/bigint.sim
similarity index 94%
rename from tests/script/general/field/bigint.sim
rename to tests/script/tsim/field/bigint.sim
index cfe8c561f0..d9401ed88f 100644
--- a/tests/script/general/field/bigint.sim
+++ b/tests/script/tsim/field/bigint.sim
@@ -1,9 +1,6 @@
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
print ======================== dnode1 start
@@ -146,16 +143,16 @@ if $data00 != 25 then
endi
print =============== step8
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 interval(1d) group by tgcol order by tgcol desc
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 partition by tgcol interval(1d) order by tgcol desc
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data01 != 100 then
+if $data00 != 100 then
return -1
endi
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/field/binary.sim b/tests/script/tsim/field/binary.sim
similarity index 96%
rename from tests/script/general/field/binary.sim
rename to tests/script/tsim/field/binary.sim
index 821dbc9a82..59005e1ef1 100644
--- a/tests/script/general/field/binary.sim
+++ b/tests/script/tsim/field/binary.sim
@@ -1,9 +1,6 @@
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
print ======================== dnode1 start
@@ -47,7 +44,6 @@ while $i < 10
$i = $i + 1
endw
-
print =============== step2
sql select * from $mt where tbcol = '0'
@@ -70,7 +66,7 @@ sql_error select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), f
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/field/bool.sim b/tests/script/tsim/field/bool.sim
similarity index 94%
rename from tests/script/general/field/bool.sim
rename to tests/script/tsim/field/bool.sim
index d94071b328..04cd48ab2d 100644
--- a/tests/script/general/field/bool.sim
+++ b/tests/script/tsim/field/bool.sim
@@ -1,9 +1,6 @@
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
print ======================== dnode1 start
@@ -144,17 +141,17 @@ if $data00 != 25 then
endi
print =============== step8
-sql select count(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = true interval(1d) group by tgcol order by tgcol desc
-print select count(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = true interval(1d) group by tgcol order by tgcol desc
+sql select count(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = true partition by tgcol interval(1d) order by tgcol desc
+print select count(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = true partition by tgcol interval(1d) order by tgcol desc
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data01 != 100 then
+if $data00 != 100 then
return -1
endi
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/field/double.sim b/tests/script/tsim/field/double.sim
similarity index 94%
rename from tests/script/general/field/double.sim
rename to tests/script/tsim/field/double.sim
index 0c9c23e304..c7b26add65 100644
--- a/tests/script/general/field/double.sim
+++ b/tests/script/tsim/field/double.sim
@@ -1,9 +1,6 @@
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
print ======================== dnode1 start
@@ -144,16 +141,16 @@ if $data00 != 25 then
endi
print =============== step8
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 interval(1d) group by tgcol order by tgcol desc
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 partition by tgcol interval(1d) order by tgcol desc
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data01 != 100 then
+if $data00 != 100 then
return -1
endi
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/field/float.sim b/tests/script/tsim/field/float.sim
similarity index 94%
rename from tests/script/general/field/float.sim
rename to tests/script/tsim/field/float.sim
index 00423c00b8..1e11eed3be 100644
--- a/tests/script/general/field/float.sim
+++ b/tests/script/tsim/field/float.sim
@@ -1,10 +1,8 @@
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
+
print ======================== dnode1 start
$dbPrefix = db
@@ -144,16 +142,16 @@ if $data00 != 25 then
endi
print =============== step8
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 interval(1d) group by tgcol order by tgcol desc
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 partition by tgcol interval(1d) order by tgcol desc
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data01 != 100 then
+if $data00 != 100 then
return -1
endi
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/field/int.sim b/tests/script/tsim/field/int.sim
similarity index 94%
rename from tests/script/general/field/int.sim
rename to tests/script/tsim/field/int.sim
index 0e322e4f12..484272631b 100644
--- a/tests/script/general/field/int.sim
+++ b/tests/script/tsim/field/int.sim
@@ -1,10 +1,8 @@
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
+
print ======================== dnode1 start
$dbPrefix = db
@@ -144,16 +142,16 @@ if $data00 != 25 then
endi
print =============== step8
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 interval(1d) group by tgcol order by tgcol desc
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 partition by tgcol interval(1d) order by tgcol desc
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data01 != 100 then
+if $data00 != 100 then
return -1
endi
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/field/single.sim b/tests/script/tsim/field/single.sim
similarity index 98%
rename from tests/script/general/field/single.sim
rename to tests/script/tsim/field/single.sim
index 3f6bf4309f..115e76ffeb 100644
--- a/tests/script/general/field/single.sim
+++ b/tests/script/tsim/field/single.sim
@@ -1,10 +1,8 @@
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
+
print ======================== dnode1 start
$dbPrefix = db
@@ -211,7 +209,7 @@ endi
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/field/smallint.sim b/tests/script/tsim/field/smallint.sim
similarity index 94%
rename from tests/script/general/field/smallint.sim
rename to tests/script/tsim/field/smallint.sim
index 78b2b998cf..326186f6c2 100644
--- a/tests/script/general/field/smallint.sim
+++ b/tests/script/tsim/field/smallint.sim
@@ -1,10 +1,8 @@
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
+
print ======================== dnode1 start
$dbPrefix = db
@@ -144,16 +142,16 @@ if $data00 != 25 then
endi
print =============== step8
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 interval(1d) group by tgcol order by tgcol desc
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 partition by tgcol interval(1d) order by tgcol desc
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data01 != 100 then
+if $data00 != 100 then
return -1
endi
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/field/tinyint.sim b/tests/script/tsim/field/tinyint.sim
similarity index 94%
rename from tests/script/general/field/tinyint.sim
rename to tests/script/tsim/field/tinyint.sim
index 7e1a0c6e80..cba4ac504d 100644
--- a/tests/script/general/field/tinyint.sim
+++ b/tests/script/tsim/field/tinyint.sim
@@ -1,9 +1,6 @@
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
print ======================== dnode1 start
@@ -145,16 +142,16 @@ if $data00 != 25 then
endi
print =============== step8
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 interval(1d) group by tgcol order by tgcol desc
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 partition by tgcol interval(1d) order by tgcol desc
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data01 != 100 then
+if $data00 != 100 then
return -1
endi
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/field/unsigined_bigint.sim b/tests/script/tsim/field/unsigined_bigint.sim
similarity index 94%
rename from tests/script/general/field/unsigined_bigint.sim
rename to tests/script/tsim/field/unsigined_bigint.sim
index 260128b5c2..0a492ae44c 100644
--- a/tests/script/general/field/unsigined_bigint.sim
+++ b/tests/script/tsim/field/unsigined_bigint.sim
@@ -1,12 +1,9 @@
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
-print ======================== dnode1 start
+print ======================== dnode1 start
$dbPrefix = db
$tbPrefix = tb
$mtPrefix = st
@@ -27,7 +24,7 @@ $i = 0
while $i < 5
$tb = $tbPrefix . $i
sql create table $tb using $mt tags( 0 )
- sql create table $tb using $mt tags( -111 )
+ sql_error create table $tb using $mt tags( -111 )
$x = 0
while $x < $rowNum
$ms = $x . m
@@ -150,16 +147,16 @@ if $data00 != 25 then
endi
print =============== step8
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 interval(1d) group by tgcol order by tgcol desc
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = 1 partition by tgcol interval(1d) order by tgcol desc
print $data00 $data01 $data02 $data03 $data04 $data05 $data06
-if $data01 != 100 then
+if $data00 != 100 then
return -1
endi
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/import/basic.sim b/tests/script/tsim/import/basic.sim
similarity index 75%
rename from tests/script/general/import/basic.sim
rename to tests/script/tsim/import/basic.sim
index f72d132ca3..cb1b525120 100644
--- a/tests/script/general/import/basic.sim
+++ b/tests/script/tsim/import/basic.sim
@@ -1,32 +1,6 @@
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/deploy.sh -n dnode3 -i 3
-system sh/deploy.sh -n dnode4 -i 4
-
-system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
-system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
-system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
-system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
-
-system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 10
-system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 10
-system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 10
-system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 10
-
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000
-system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000
-system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000
-system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000
-
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode2 -c walLevel -v 1
-system sh/cfg.sh -n dnode3 -c walLevel -v 1
-system sh/cfg.sh -n dnode4 -c walLevel -v 1
-
-print ========= start dnode1
system sh/exec.sh -n dnode1 -s start
-sleep 2000
sql connect
sql create database ibadb
diff --git a/tests/script/general/import/commit.sim b/tests/script/tsim/import/commit.sim
similarity index 66%
rename from tests/script/general/import/commit.sim
rename to tests/script/tsim/import/commit.sim
index aefc724fdb..e7f0440f5e 100644
--- a/tests/script/general/import/commit.sim
+++ b/tests/script/tsim/import/commit.sim
@@ -1,32 +1,6 @@
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/deploy.sh -n dnode3 -i 3
-system sh/deploy.sh -n dnode4 -i 4
-
-system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
-system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
-system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
-system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
-
-system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 10
-system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 10
-system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 10
-system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 10
-
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000
-system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000
-system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000
-system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000
-
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode2 -c walLevel -v 1
-system sh/cfg.sh -n dnode3 -c walLevel -v 1
-system sh/cfg.sh -n dnode4 -c walLevel -v 1
-
-print ========= start dnode1
system sh/exec.sh -n dnode1 -s start
-sleep 2000
sql connect
print ========= step1
@@ -72,9 +46,7 @@ endi
print ========= step3
system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
system sh/exec.sh -n dnode1 -s start
-sleep 3000
print ========= step4
sql select * from ic2db.tb;
diff --git a/tests/script/general/import/large.sim b/tests/script/tsim/import/large.sim
similarity index 63%
rename from tests/script/general/import/large.sim
rename to tests/script/tsim/import/large.sim
index 23fbcc75ea..f694502e2a 100644
--- a/tests/script/general/import/large.sim
+++ b/tests/script/tsim/import/large.sim
@@ -1,32 +1,6 @@
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/deploy.sh -n dnode3 -i 3
-system sh/deploy.sh -n dnode4 -i 4
-
-system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
-system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
-system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
-system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
-
-system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 10
-system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 10
-system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 10
-system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 10
-
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000
-system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000
-system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000
-system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000
-
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode2 -c walLevel -v 1
-system sh/cfg.sh -n dnode3 -c walLevel -v 1
-system sh/cfg.sh -n dnode4 -c walLevel -v 1
-
-print ========= start dnode1
system sh/exec.sh -n dnode1 -s start
-sleep 2000
sql connect
sql create database db
diff --git a/tests/script/general/import/replica1.sim b/tests/script/tsim/import/replica1.sim
similarity index 84%
rename from tests/script/general/import/replica1.sim
rename to tests/script/tsim/import/replica1.sim
index 1e8eabb798..3a4b4a2876 100644
--- a/tests/script/general/import/replica1.sim
+++ b/tests/script/tsim/import/replica1.sim
@@ -1,33 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/deploy.sh -n dnode2 -i 2
-system sh/deploy.sh -n dnode3 -i 3
-system sh/deploy.sh -n dnode4 -i 4
-
-system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1
-system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
-system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
-system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
-
-system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 10
-system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 10
-system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 10
-system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 10
-
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000
-system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000
-system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000
-system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000
-
-system sh/cfg.sh -n dnode1 -c walLevel -v 2
-system sh/cfg.sh -n dnode2 -c walLevel -v 2
-system sh/cfg.sh -n dnode3 -c walLevel -v 2
-system sh/cfg.sh -n dnode4 -c walLevel -v 2
-
-print ========= start dnode1
system sh/exec.sh -n dnode1 -s start
-sleep 2000
sql connect
sql create database ir1db duration 7
@@ -93,9 +66,7 @@ endi
print ================== dnode restart
system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
system sh/exec.sh -n dnode1 -s start
-sleep 3000
sql use ir1db
sql select * from tb;
@@ -162,9 +133,7 @@ endi
print ================= step10
system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
system sh/exec.sh -n dnode1 -s start
-sleep 3000
sql use ir1db
sql select * from tb;
diff --git a/tests/script/tsim/query/interval-offset.sim b/tests/script/tsim/query/interval-offset.sim
index ab6ee79d6e..b6dffb5fe3 100644
--- a/tests/script/tsim/query/interval-offset.sim
+++ b/tests/script/tsim/query/interval-offset.sim
@@ -68,8 +68,8 @@ sql insert into ct4 values ( '2022-12-01 01:01:30.000', 8 )
sql insert into ct4 values ( '2022-12-31 01:01:36.000', 9 )
print ================ start query ======================
-sql select _wstartts, _wendts, _wduration, _qstartts, _qendts, count(*) from ct1 interval(10s, 2s)
-print ===> select _wstartts, _wendts, _wduration, _qstartts, _qendts, count(*) from ct1 interval(10s, 2s)
+sql select _wstart, _wend, _wduration, _qstart, _qend, count(*) from ct1 interval(10s, 2s)
+print ===> select _wstart, _wend, _wduration, _qstart, _qend, count(*) from ct1 interval(10s, 2s)
print ===> rows: $rows
print ===> rows0: $data00 $data01 $data02 $data05
print ===> rows1: $data10 $data11 $data12 $data15
@@ -89,8 +89,8 @@ if $data45 != 1 then
return -1
endi
-sql select _wstartts, _wendts, _wduration, _qstartts, _qendts, count(*) from ct1 interval(10s, 2s) sliding(10s)
-print ===> select _wstartts, _wendts, _wduration, _qstartts, _qendts, count(*) from ct1 interval(10s, 2s) sliding(10s)
+sql select _wstart, _wend, _wduration, _qstart, _qend, count(*) from ct1 interval(10s, 2s) sliding(10s)
+print ===> select _wstart, _wend, _wduration, _qstart, _qend, count(*) from ct1 interval(10s, 2s) sliding(10s)
print ===> rows: $rows
print ===> rows0: $data00 $data01 $data02 $data05
print ===> rows1: $data10 $data11 $data12 $data15
@@ -177,7 +177,7 @@ if $data70 != 1 then
return -1
endi
-sql select _wstartts, count(tbcol), _wduration, _wstartts, count(*) from ct3 interval(1n, 1w)
+sql select _wstart, count(tbcol), _wduration, _wstart, count(*) from ct3 interval(1n, 1w)
print ===> select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(*) from ct3 interval(1n, 1w)
print ===> rows: $rows
print ===> rows0: $data00 $data01 $data02 $data03 $data04
@@ -200,11 +200,11 @@ if $data02 != 2678400000 then
return -1
endi
-sql_error select _wstartts, count(tbcol), _wduration, _wstartts, count(*) from ct3 interval(1n, 1w) sliding(2w)
-sql_error select _wstartts, count(tbcol), _wduration, _wstartts, count(*) from ct3 interval(1n, 1w) sliding(4w)
+sql_error select _wstart, count(tbcol), _wduration, _wstart, count(*) from ct3 interval(1n, 1w) sliding(2w)
+sql_error select _wstart, count(tbcol), _wduration, _wstart, count(*) from ct3 interval(1n, 1w) sliding(4w)
-sql select _wstartts, count(tbcol), _wduration, _wstartts, count(*) from ct4 interval(1y, 6n)
-print ===> select _wstartts, count(tbcol), _wduration, _wstartts, count(*) from ct4 interval(1y, 6n)
+sql select _wstart, count(tbcol), _wduration, _wstart, count(*) from ct4 interval(1y, 6n)
+print ===> select _wstart, count(tbcol), _wduration, _wstart, count(*) from ct4 interval(1y, 6n)
print ===> rows: $rows
print ===> rows0: $data00 $data01 $data02 $data03 $data04
print ===> rows1: $data10 $data11 $data12 $data13 $data14
@@ -220,7 +220,7 @@ if $data04 != 2 then
endi
sql_error select count(tbcol), sum(tbcol), max(tbcol), min(tbcol), count(*) from ct4 interval(1y, 6n) sliding(6n)
-sql_error select _wstartts, count(tbcol), _wduration, _wstartts, count(*) from ct4 interval(1y, 6n) sliding(12n)
+sql_error select _wstart, count(tbcol), _wduration, _wstart, count(*) from ct4 interval(1y, 6n) sliding(12n)
#=================================================
print =============== stop and restart taosd
diff --git a/tests/script/tsim/query/interval.sim b/tests/script/tsim/query/interval.sim
index 9d7104c3de..280a66de00 100644
--- a/tests/script/tsim/query/interval.sim
+++ b/tests/script/tsim/query/interval.sim
@@ -82,8 +82,8 @@ print =============== step4
#$cc = 1 * 60000
#$ms2 = 1601481600000 - $cc
-sql select _wstartts, _wendts, _wduration, _qstartts, _qendts, count(tbcol) from $tb interval(1m)
-print ===> select _wstartts, _wendts, _wduration, _qstartts, _qendts, count(tbcol) from $tb interval(1m)
+sql select _wstart, _wend, _wduration, _qstart, _qend, count(tbcol) from $tb interval(1m)
+print ===> select _wstart, _wend, _wduration, _qstart, _qend, count(tbcol) from $tb interval(1m)
print ===> $rows $data01 $data05
if $rows != $rowNum then
return -1
diff --git a/tests/script/tsim/query/session.sim b/tests/script/tsim/query/session.sim
index c39956c0df..29559fdee5 100644
--- a/tests/script/tsim/query/session.sim
+++ b/tests/script/tsim/query/session.sim
@@ -81,7 +81,7 @@ sql use $dbNamme
# session(ts,5a)
print ====> select count(*) from dev_001 session(ts,5a)
-sql select _wstartts, count(*) from dev_001 session(ts,5a)
+sql select _wstart, count(*) from dev_001 session(ts,5a)
print ====> rows: $rows
print ====> $data00 $data01 $data02 $data03 $data04 $data05
print ====> $data10 $data11 $data12 $data13 $data14 $data15
@@ -102,7 +102,7 @@ endi
#
#print ====> select count(*) from (select * from dev_001) session(ts,5a)
-#sql select _wstartts, count(*) from (select * from dev_001) session(ts,5a)
+#sql select _wstart, count(*) from (select * from dev_001) session(ts,5a)
#if $rows != 15 then
# return -1
#endi
@@ -111,7 +111,7 @@ endi
#endi
print ====> select count(*) from dev_001 session(ts,1s)
-sql select _wstartts, count(*) from dev_001 session(ts,1s)
+sql select _wstart, count(*) from dev_001 session(ts,1s)
if $rows != 12 then
return -1
endi
@@ -120,7 +120,7 @@ if $data01 != 5 then
endi
#print ====> select count(*) from (select * from dev_001) session(ts,1s)
-#sql select _wstartts, count(*) from (select * from dev_001) session(ts,1s)
+#sql select _wstart, count(*) from (select * from dev_001) session(ts,1s)
#if $rows != 12 then
# return -1
#endi
@@ -129,7 +129,7 @@ endi
#endi
print ====> select count(*) from dev_001 session(ts,1000a)
-sql select _wstartts, count(*) from dev_001 session(ts,1000a)
+sql select _wstart, count(*) from dev_001 session(ts,1000a)
if $rows != 12 then
return -1
endi
@@ -138,7 +138,7 @@ if $data01 != 5 then
endi
#print ====> select count(*) from (select * from dev_001) session(ts,1000a)
-#sql select _wstartts, count(*) from (select * from dev_001) session(ts,1000a)
+#sql select _wstart, count(*) from (select * from dev_001) session(ts,1000a)
#if $rows != 12 then
# return -1
#endi
@@ -147,7 +147,7 @@ endi
#endi
print ====> select count(*) from dev_001 session(ts,1m)
-sql select _wstartts, count(*) from dev_001 session(ts,1m)
+sql select _wstart, count(*) from dev_001 session(ts,1m)
if $rows != 9 then
return -1
endi
@@ -156,7 +156,7 @@ if $data01 != 8 then
endi
#print ====> select count(*) from (select * from dev_001) session(ts,1m)
-#sql select _wstartts, count(*) from (select * from dev_001) session(ts,1m)
+#sql select _wstart, count(*) from (select * from dev_001) session(ts,1m)
#if $rows != 9 then
# return -1
#endi
@@ -165,7 +165,7 @@ endi
#endi
print ====> select count(*) from dev_001 session(ts,1h)
-sql select _wstartts, count(*) from dev_001 session(ts,1h)
+sql select _wstart, count(*) from dev_001 session(ts,1h)
if $rows != 6 then
return -1
endi
@@ -174,7 +174,7 @@ if $data01 != 11 then
endi
#print ====> select count(*) from (select * from dev_001) session(ts,1h)
-#sql select _wstartts, count(*) from (select * from dev_001) session(ts,1h)
+#sql select _wstart, count(*) from (select * from dev_001) session(ts,1h)
#if $rows != 6 then
# return -1
#endi
@@ -183,7 +183,7 @@ endi
#endi
print ====> select count(*) from dev_001 session(ts,1d)
-sql select _wstartts, count(*) from dev_001 session(ts,1d)
+sql select _wstart, count(*) from dev_001 session(ts,1d)
if $rows != 4 then
return -1
endi
@@ -192,7 +192,7 @@ if $data01 != 13 then
endi
#print ====> select count(*) from (select * from dev_001) session(ts,1d)
-#sql select _wstartts, count(*) from (select * from dev_001) session(ts,1d)
+#sql select _wstart, count(*) from (select * from dev_001) session(ts,1d)
#if $rows != 4 then
# return -1
#endi
@@ -201,7 +201,7 @@ endi
#endi
print ====> select count(*) from dev_001 session(ts,1w)
-sql select _wstartts, count(*) from dev_001 session(ts,1w)
+sql select _wstart, count(*) from dev_001 session(ts,1w)
if $rows != 2 then
return -1
endi
@@ -210,7 +210,7 @@ if $data01 != 15 then
endi
#print ====> select count(*) from (select * from dev_001) session(ts,1w)
-#sql select _wstartts, count(*) from (select * from dev_001) session(ts,1w)
+#sql select _wstart, count(*) from (select * from dev_001) session(ts,1w)
#if $rows != 2 then
# return -1
#endi
@@ -298,7 +298,7 @@ sql_error select count(*) from dev_001 session(i,1y)
sql_error select count(*) from dev_001 session(ts,1d) where ts <'2020-05-20 0:0:0'
#print ====> select count(*) from dev_001 session(ts,1u)
-#sql select _wstartts, count(*) from dev_001 session(ts,1u)
+#sql select _wstart, count(*) from dev_001 session(ts,1u)
#print rows: $rows
#print $data00 $data01 $data02 $data03
#print $data10 $data11 $data12 $data13
diff --git a/tests/script/tsim/query/stddev.sim b/tests/script/tsim/query/stddev.sim
index 74bc444da2..15041623bc 100644
--- a/tests/script/tsim/query/stddev.sim
+++ b/tests/script/tsim/query/stddev.sim
@@ -103,29 +103,29 @@ if $rows != 1 then
return -1
endi
-print =====sql : select _wstartts, stddev(c1) as b from ct4 interval(1y)
-sql select _wstartts, stddev(c1) as b from ct4 interval(1y)
+print =====sql : select _wstart, stddev(c1) as b from ct4 interval(1y)
+sql select _wstart, stddev(c1) as b from ct4 interval(1y)
print ===> $rows
if $rows != 4 then
return -1
endi
-print =====sql : select _wstartts, stddev(c1) as b from t1 interval(1y)
-sql select _wstartts, stddev(c1) as b from t1 interval(1y)
+print =====sql : select _wstart, stddev(c1) as b from t1 interval(1y)
+sql select _wstart, stddev(c1) as b from t1 interval(1y)
print ===> $rows
if $rows != 3 then
return -1
endi
-print =====select _wstartts, stddev(c1) as b from ct4 where c1 <= 6 interval(180d)
-sql select _wstartts, stddev(c1) as b from ct4 where c1 <= 6 interval(180d)
+print =====select _wstart, stddev(c1) as b from ct4 where c1 <= 6 interval(180d)
+sql select _wstart, stddev(c1) as b from ct4 where c1 <= 6 interval(180d)
# print ===> $rows
# if $rows != 3 then
# return -1
# endi
-print =====select _wstartts, stddev(c1) as b from t1 where c1 <= 6 interval(180d)
-sql select _wstartts, stddev(c1) as b from t1 where c1 <= 6 interval(180d)
+print =====select _wstart, stddev(c1) as b from t1 where c1 <= 6 interval(180d)
+sql select _wstart, stddev(c1) as b from t1 where c1 <= 6 interval(180d)
# print ===> $rows
# if $rows != 3 then
# return -1
@@ -281,29 +281,29 @@ if $rows != 1 then
return -1
endi
-print =====sql : select _wstartts, stddev(c1) as b from ct4 interval(1y)
-sql select _wstartts, stddev(c1) as b from ct4 interval(1y)
+print =====sql : select _wstart, stddev(c1) as b from ct4 interval(1y)
+sql select _wstart, stddev(c1) as b from ct4 interval(1y)
print ===> $rows
if $rows != 4 then
return -1
endi
-print =====sql : select _wstartts, stddev(c1) as b from t1 interval(1y)
-sql select _wstartts, stddev(c1) as b from t1 interval(1y)
+print =====sql : select _wstart, stddev(c1) as b from t1 interval(1y)
+sql select _wstart, stddev(c1) as b from t1 interval(1y)
print ===> $rows
if $rows != 3 then
return -1
endi
-print =====select _wstartts, stddev(c1) as b from ct4 where c1 <= 6 interval(180d)
-sql select _wstartts, stddev(c1) as b from ct4 where c1 <= 6 interval(180d)
+print =====select _wstart, stddev(c1) as b from ct4 where c1 <= 6 interval(180d)
+sql select _wstart, stddev(c1) as b from ct4 where c1 <= 6 interval(180d)
print ===> $rows
if $rows != 3 then
return -1
endi
-print =====select _wstartts, stddev(c1) as b from t1 where c1 <= 6 interval(180d)
-sql select _wstartts, stddev(c1) as b from t1 where c1 <= 6 interval(180d)
+print =====select _wstart, stddev(c1) as b from t1 where c1 <= 6 interval(180d)
+sql select _wstart, stddev(c1) as b from t1 where c1 <= 6 interval(180d)
print ===> $rows
if $rows != 3 then
return -1
diff --git a/tests/script/tsim/scalar/scalar.sim b/tests/script/tsim/scalar/scalar.sim
new file mode 100644
index 0000000000..32224e33ba
--- /dev/null
+++ b/tests/script/tsim/scalar/scalar.sim
@@ -0,0 +1,67 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+print ======== step1
+sql drop database if exists db1;
+sql create database db1 vgroups 3;
+sql use db1;
+sql create stable st1 (fts timestamp, fbool bool, ftiny tinyint, fsmall smallint, fint int, fbig bigint, futiny tinyint unsigned, fusmall smallint unsigned, fuint int unsigned, fubig bigint unsigned, ffloat float, fdouble double, fbin binary(10), fnchar nchar(10)) tags(tts timestamp, tbool bool, ttiny tinyint, tsmall smallint, tint int, tbig bigint, tutiny tinyint unsigned, tusmall smallint unsigned, tuint int unsigned, tubig bigint unsigned, tfloat float, tdouble double, tbin binary(10), tnchar nchar(10));
+sql create table tb1 using st1 tags('2022-07-10 16:31:00', true, 1, 1, 1, 1, 1, 1, 1, 1, 1.0, 1.0, 'a', 'a');
+sql create table tb2 using st1 tags('2022-07-10 16:32:00', false, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b');
+sql create table tb3 using st1 tags('2022-07-10 16:33:00', true, 3, 3, 3, 3, 3, 3, 3, 3, 3.0, 3.0, 'c', 'c');
+
+sql insert into tb1 values ('2022-07-10 16:31:01', false, 1, 1, 1, 1, 1, 1, 1, 1, 1.0, 1.0, 'a', 'a');
+sql insert into tb1 values ('2022-07-10 16:31:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b');
+sql insert into tb1 values ('2022-07-10 16:31:03', false, 3, 3, 3, 3, 3, 3, 3, 3, 3.0, 3.0, 'c', 'c');
+sql insert into tb1 values ('2022-07-10 16:31:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd');
+sql insert into tb1 values ('2022-07-10 16:31:05', false, 5, 5, 5, 5, 5, 5, 5, 5, 5.0, 5.0, 'e', 'e');
+
+sql insert into tb2 values ('2022-07-10 16:32:01', false, 1, 1, 1, 1, 1, 1, 1, 1, 1.0, 1.0, 'a', 'a');
+sql insert into tb2 values ('2022-07-10 16:32:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b');
+sql insert into tb2 values ('2022-07-10 16:32:03', false, 3, 3, 3, 3, 3, 3, 3, 3, 3.0, 3.0, 'c', 'c');
+sql insert into tb2 values ('2022-07-10 16:32:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd');
+sql insert into tb2 values ('2022-07-10 16:32:05', false, 5, 5, 5, 5, 5, 5, 5, 5, 5.0, 5.0, 'e', 'e');
+
+sql insert into tb3 values ('2022-07-10 16:33:01', false, 1, 1, 1, 1, 1, 1, 1, 1, 1.0, 1.0, 'a', 'a');
+sql insert into tb3 values ('2022-07-10 16:33:02', true, 2, 2, 2, 2, 2, 2, 2, 2, 2.0, 2.0, 'b', 'b');
+sql insert into tb3 values ('2022-07-10 16:33:03', false, 3, 3, 3, 3, 3, 3, 3, 3, 3.0, 3.0, 'c', 'c');
+sql insert into tb3 values ('2022-07-10 16:33:04', true, 4, 4, 4, 4, 4, 4, 4, 4, 4.0, 4.0, 'd', 'd');
+sql insert into tb3 values ('2022-07-10 16:33:05', false, 5, 5, 5, 5, 5, 5, 5, 5, 5.0, 5.0, 'e', 'e');
+
+sql select 1+1n;
+if $rows != 1 then
+ return -1
+endi
+if $data00 != 2.000000000 then
+ return -1
+endi
+
+
+sql select cast(1 as timestamp)+1n;
+if $rows != 1 then
+ return -1
+endi
+if $data00 != @70-02-01 08:00:00.000@ then
+ return -1
+endi
+
+sql select 1-1n;
+if $rows != 1 then
+ return -1
+endi
+
+sql select cast(1 as timestamp)-1y;
+if $rows != 1 then
+ return -1
+endi
+if $data00 != @69-01-01 08:00:00.000@ then
+ return -1
+endi
+
+sql select 1n-now();
+sql select 1n+now();
+#sql select avg(4n);
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
diff --git a/tests/script/tsim/sma/tsmaCreateInsertQuery.sim b/tests/script/tsim/sma/tsmaCreateInsertQuery.sim
index 3a1ed62a72..6cca47423a 100644
--- a/tests/script/tsim/sma/tsmaCreateInsertQuery.sim
+++ b/tests/script/tsim/sma/tsmaCreateInsertQuery.sim
@@ -58,7 +58,7 @@ if $rows != 5 then
endi
print =============== select * from stb from memory in designated vgroup
-sql select _wstartts, _wendts, min(c1),max(c2),max(c1) from stb interval(5m,10s) sliding(5m);
+sql select _wstart, _wend, min(c1),max(c2),max(c1) from stb interval(5m,10s) sliding(5m);
print $data00 $data01 $data02 $data03 $data04
if $rows != 1 then
print rows $rows != 1
@@ -81,7 +81,7 @@ if $data04 != 20 then
endi
print =============== select * from stb from memory in common vgroups
-sql select _wstartts, _wendts, min(c1),max(c2),max(c1),max(c3) from stb interval(5m,10s) sliding(5m);
+sql select _wstart, _wend, min(c1),max(c2),max(c1),max(c3) from stb interval(5m,10s) sliding(5m);
print $data00 $data01 $data02 $data03 $data04 $data05
if $rows != 1 then
print rows $rows != 1
@@ -128,7 +128,7 @@ if $rows != 5 then
endi
print =============== select * from stb from file in designated vgroup
-sql select _wstartts, _wendts, min(c1),max(c2),max(c1) from stb interval(5m,10s) sliding(5m);
+sql select _wstart, _wend, min(c1),max(c2),max(c1) from stb interval(5m,10s) sliding(5m);
print $data00 $data01 $data02 $data03 $data04
if $rows != 1 then
print rows $rows != 1
@@ -151,7 +151,7 @@ if $data04 != 20 then
endi
print =============== select * from stb from file in common vgroups
-sql select _wstartts, _wendts, min(c1),max(c2),max(c1),max(c3) from stb interval(5m,10s) sliding(5m);
+sql select _wstart, _wend, min(c1),max(c2),max(c1),max(c3) from stb interval(5m,10s) sliding(5m);
print $data00 $data01 $data02 $data03 $data04 $data05
if $rows != 1 then
print rows $rows != 1
diff --git a/tests/script/tsim/stream/basic0.sim b/tests/script/tsim/stream/basic0.sim
index 29775a5ef1..61f7a57dcf 100644
--- a/tests/script/tsim/stream/basic0.sim
+++ b/tests/script/tsim/stream/basic0.sim
@@ -33,7 +33,7 @@ if $rows != 3 then
return -1
endi
-sql create stream s1 trigger at_once into outstb as select _wstartts, min(k), max(k), sum(k) as sum_alias from ct1 interval(10m)
+sql create stream s1 trigger at_once into outstb as select _wstart, min(k), max(k), sum(k) as sum_alias from ct1 interval(10m)
sql show stables
if $rows != 2 then
@@ -48,7 +48,7 @@ sleep 100
#===================================================================
print =============== query data from child table
-sql select `_wstartts`,`min(k)`,`max(k)`,sum_alias from outstb
+sql select `_wstart`,`min(k)`,`max(k)`,sum_alias from outstb
print rows: $rows
print $data00 $data01 $data02 $data03
if $rows != 1 then
@@ -77,7 +77,7 @@ sleep 100
#===================================================================
print =============== query data from child table
-sql select `_wstartts`,`min(k)`,`max(k)`,sum_alias from outstb
+sql select `_wstart`,`min(k)`,`max(k)`,sum_alias from outstb
print rows: $rows
print $data00 $data01 $data02 $data03
if $rows != 1 then
@@ -105,7 +105,7 @@ sleep 100
#===================================================================
print =============== query data from child table
-sql select `_wstartts`,`min(k)`,`max(k)`,sum_alias from outstb
+sql select `_wstart`,`min(k)`,`max(k)`,sum_alias from outstb
print rows: $rows
print $data00 $data01 $data02 $data03
print $data10 $data11 $data12 $data13
diff --git a/tests/script/tsim/stream/basic1.sim b/tests/script/tsim/stream/basic1.sim
index 8e6391eb0b..2a6d64bcaf 100644
--- a/tests/script/tsim/stream/basic1.sim
+++ b/tests/script/tsim/stream/basic1.sim
@@ -17,14 +17,14 @@ sql use test
sql create table t1(ts timestamp, a int, b int , c int, d double);
-sql create stream streams1 trigger at_once into streamt as select _wstartts, count(*) c1, count(d) c2 , sum(a) c3 , max(b) c4, min(c) c5 from t1 interval(10s);
+sql create stream streams1 trigger at_once into streamt as select _wstart, count(*) c1, count(d) c2 , sum(a) c3 , max(b) c4, min(c) c5 from t1 interval(10s);
sql insert into t1 values(1648791213000,1,2,3,1.0);
sql insert into t1 values(1648791223001,2,2,3,1.1);
sql insert into t1 values(1648791233002,3,2,3,2.1);
sql insert into t1 values(1648791243003,4,2,3,3.1);
sql insert into t1 values(1648791213004,4,2,3,4.1);
sleep 1000
-sql select `_wstartts`, c1, c2 ,c3 ,c4, c5 from streamt;
+sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
if $rows != 4 then
print ======$rows
@@ -254,7 +254,7 @@ endi
sql insert into t1 values(1648791223002,12,14,13,11.1);
sleep 100
-sql select `_wstartts`, c1, c2 ,c3 ,c4, c5 from streamt;
+sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
# row 1
if $data11 != 2 then
@@ -284,7 +284,7 @@ endi
sql insert into t1 values(1648791223003,12,14,13,11.1);
sleep 100
-sql select `_wstartts`, c1, c2 ,c3 ,c4, c5 from streamt;
+sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
# row 1
if $data11 != 3 then
@@ -316,7 +316,7 @@ sql insert into t1 values(1648791223001,1,1,1,1.1);
sql insert into t1 values(1648791223002,2,2,2,2.1);
sql insert into t1 values(1648791223003,3,3,3,3.1);
sleep 100
-sql select `_wstartts`, c1, c2 ,c3 ,c4, c5 from streamt;
+sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
# row 1
if $data11 != 3 then
@@ -348,7 +348,7 @@ sql insert into t1 values(1648791233003,3,2,3,2.1);
sql insert into t1 values(1648791233002,5,6,7,8.1);
sql insert into t1 values(1648791233002,3,2,3,2.1);
sleep 100
-sql select `_wstartts`, c1, c2 ,c3 ,c4, c5 from streamt;
+sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
# row 2
if $data21 != 2 then
@@ -378,7 +378,7 @@ endi
sql insert into t1 values(1648791213004,4,2,3,4.1) (1648791213006,5,4,7,9.1) (1648791213004,40,20,30,40.1) (1648791213005,4,2,3,4.1);
sleep 100
-sql select `_wstartts`, c1, c2 ,c3 ,c4, c5 from streamt;
+sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
# row 0
if $data01 != 4 then
@@ -408,7 +408,7 @@ endi
sql insert into t1 values(1648791223004,4,2,3,4.1) (1648791233006,5,4,7,9.1) (1648791223004,40,20,30,40.1) (1648791233005,4,2,3,4.1);
sleep 100
-sql select `_wstartts`, c1, c2 ,c3 ,c4, c5 from streamt;
+sql select `_wstart`, c1, c2 ,c3 ,c4, c5 from streamt;
# row 1
if $data11 != 4 then
diff --git a/tests/script/tsim/stream/basic2.sim b/tests/script/tsim/stream/basic2.sim
index 247d8f62ee..1a6c7c5c25 100644
--- a/tests/script/tsim/stream/basic2.sim
+++ b/tests/script/tsim/stream/basic2.sim
@@ -33,7 +33,7 @@ if $rows != 3 then
return -1
endi
-sql create stream s1 trigger at_once into outstb as select _wstartts, min(k), max(k), sum(k) as sum_alias from ct1 interval(10m)
+sql create stream s1 trigger at_once into outstb as select _wstart, min(k), max(k), sum(k) as sum_alias from ct1 interval(10m)
sql show stables
if $rows != 2 then
@@ -48,7 +48,7 @@ sleep 100
#===================================================================
print =============== query data from child table
-sql select `_wstartts`,`min(k)`,`max(k)`,sum_alias from outstb
+sql select `_wstart`,`min(k)`,`max(k)`,sum_alias from outstb
print rows: $rows
print $data00 $data01 $data02 $data03
if $rows != 1 then
@@ -77,7 +77,7 @@ sleep 100
#===================================================================
print =============== query data from child table
-sql select `_wstartts`,`min(k)`,`max(k)`,sum_alias from outstb
+sql select `_wstart`,`min(k)`,`max(k)`,sum_alias from outstb
print rows: $rows
print $data00 $data01 $data02 $data03
print $data10 $data11 $data12 $data13
diff --git a/tests/script/tsim/stream/distributeInterval0.sim b/tests/script/tsim/stream/distributeInterval0.sim
index ab2ca92c86..1ee72527e9 100644
--- a/tests/script/tsim/stream/distributeInterval0.sim
+++ b/tests/script/tsim/stream/distributeInterval0.sim
@@ -41,7 +41,7 @@ sql create table ts1 using st tags(1,1,1);
sql create table ts2 using st tags(2,2,2);
sql create table ts3 using st tags(3,2,2);
sql create table ts4 using st tags(4,2,2);
-sql create stream stream_t1 trigger at_once watermark 1d into streamtST1 as select _wstartts, count(*) c1, count(d) c2 , sum(a) c3 , max(b) c4, min(c) c5 from st interval(10s);
+sql create stream stream_t1 trigger at_once watermark 1d into streamtST1 as select _wstart, count(*) c1, count(d) c2 , sum(a) c3 , max(b) c4, min(c) c5 from st interval(10s);
sleep 1000
@@ -195,7 +195,7 @@ if $data35 != 3 then
return -1
endi
-sql select _wstartts, count(*) c1, count(d) c2 , sum(a) c3 , max(b) c4, min(c) c5, avg(d) from st interval(10s);
+sql select _wstart, count(*) c1, count(d) c2 , sum(a) c3 , max(b) c4, min(c) c5, avg(d) from st interval(10s);
sql create database test1 vgroups 1;
@@ -203,7 +203,7 @@ sql use test1;
sql create stable st(ts timestamp, a int, b int , c int) tags(ta int,tb int,tc int);
sql create table ts1 using st tags(1,1,1);
sql create table ts2 using st tags(2,2,2);
-sql create stream stream_t2 trigger at_once watermark 20s into streamtST1 as select _wstartts, count(*) c1, count(a) c2 , sum(a) c3 , max(b) c5, min(c) c6 from st interval(10s) ;
+sql create stream stream_t2 trigger at_once watermark 20s into streamtST1 as select _wstart, count(*) c1, count(a) c2 , sum(a) c3 , max(b) c5, min(c) c6 from st interval(10s) ;
sql insert into ts1 values(1648791211000,1,2,3);
sql insert into ts1 values(1648791222001,2,2,3);
diff --git a/tests/script/tsim/stream/distributeIntervalRetrive0.sim b/tests/script/tsim/stream/distributeIntervalRetrive0.sim
index 32170e3c41..927301c3c8 100644
--- a/tests/script/tsim/stream/distributeIntervalRetrive0.sim
+++ b/tests/script/tsim/stream/distributeIntervalRetrive0.sim
@@ -41,7 +41,7 @@ sql create table ts1 using st tags(1,1,1);
sql create table ts2 using st tags(2,2,2);
sql create table ts3 using st tags(3,2,2);
sql create table ts4 using st tags(4,2,2);
-sql create stream stream_t1 trigger at_once into streamtST1 as select _wstartts, count(*) c1, sum(a) c3 , max(b) c4, min(c) c5 from st interval(10s);
+sql create stream stream_t1 trigger at_once into streamtST1 as select _wstart, count(*) c1, sum(a) c3 , max(b) c4, min(c) c5 from st interval(10s);
sleep 1000
diff --git a/tests/script/tsim/stream/distributeSession0.sim b/tests/script/tsim/stream/distributeSession0.sim
index 30c3c641d4..190304ff19 100644
--- a/tests/script/tsim/stream/distributeSession0.sim
+++ b/tests/script/tsim/stream/distributeSession0.sim
@@ -39,7 +39,7 @@ sql use test;
sql create stable st(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
sql create table ts1 using st tags(1,1,1);
sql create table ts2 using st tags(2,2,2);
-sql create stream stream_t1 trigger at_once into streamtST as select _wstartts, count(*) c1, sum(a) c2 , max(b) c3 from st session(ts, 10s) ;
+sql create stream stream_t1 trigger at_once into streamtST as select _wstart, count(*) c1, sum(a) c2 , max(b) c3 from st session(ts, 10s) ;
sleep 1000
diff --git a/tests/script/tsim/stream/ignoreExpiredData.sim b/tests/script/tsim/stream/ignoreExpiredData.sim
index c6b708d1e8..a3b14c4f7a 100644
--- a/tests/script/tsim/stream/ignoreExpiredData.sim
+++ b/tests/script/tsim/stream/ignoreExpiredData.sim
@@ -45,9 +45,9 @@ print $data00 $data01 $data02
sql use test
sql create table t1(ts timestamp, a int, b int , c int, d double);
-sql create stream streams1 trigger at_once IGNORE EXPIRED into streamt1 as select _wstartts, count(*) c1, sum(a) c3 from t1 interval(10s);
-sql create stream streams2 trigger at_once IGNORE EXPIRED into streamt2 as select _wstartts, count(*) c1, sum(a) c3 from t1 session(ts,10s);
-sql create stream streams3 trigger at_once IGNORE EXPIRED into streamt3 as select _wstartts, count(*) c1, sum(a) c3 from t1 state_window(a);
+sql create stream streams1 trigger at_once IGNORE EXPIRED into streamt1 as select _wstart, count(*) c1, sum(a) c3 from t1 interval(10s);
+sql create stream streams2 trigger at_once IGNORE EXPIRED into streamt2 as select _wstart, count(*) c1, sum(a) c3 from t1 session(ts,10s);
+sql create stream streams3 trigger at_once IGNORE EXPIRED into streamt3 as select _wstart, count(*) c1, sum(a) c3 from t1 state_window(a);
sql insert into t1 values(1648791213000,1,2,3,1.0);
sql insert into t1 values(1648791223001,1,2,3,1.1);
sql insert into t1 values(1648791233002,2,2,3,2.1);
@@ -111,8 +111,8 @@ sql use test1
sql create stable st(ts timestamp,a int,b int,c int) tags(ta int,tb int,tc int);
sql create table ts1 using st tags(1,1,1);
sql create table ts2 using st tags(2,2,2);
-sql create stream stream_t1 trigger at_once IGNORE EXPIRED into streamtST1 as select _wstartts, count(*) c1, count(a) c2 , sum(a) c3 , max(b) c5, min(c) c6 from st interval(10s) ;
-sql create stream stream_t2 trigger at_once IGNORE EXPIRED into streamtST2 as select _wstartts, count(*) c1, count(a) c2 , sum(a) c3 , max(b) c5, min(c) c6 from st session(ts, 10s) ;
+sql create stream stream_t1 trigger at_once IGNORE EXPIRED into streamtST1 as select _wstart, count(*) c1, count(a) c2 , sum(a) c3 , max(b) c5, min(c) c6 from st interval(10s) ;
+sql create stream stream_t2 trigger at_once IGNORE EXPIRED into streamtST2 as select _wstart, count(*) c1, count(a) c2 , sum(a) c3 , max(b) c5, min(c) c6 from st session(ts, 10s) ;
sql insert into ts1 values(1648791211000,1,2,3);
sql insert into ts1 values(1648791222001,2,2,3);
sql insert into ts2 values(1648791211000,1,2,3);
diff --git a/tests/script/tsim/stream/partitionby.sim b/tests/script/tsim/stream/partitionby.sim
index c634ad85ee..e5e02c3873 100644
--- a/tests/script/tsim/stream/partitionby.sim
+++ b/tests/script/tsim/stream/partitionby.sim
@@ -11,7 +11,7 @@ sql create table ts1 using st tags(1,1,1);
sql create table ts2 using st tags(2,2,2);
sql create table ts3 using st tags(3,2,2);
sql create table ts4 using st tags(4,2,2);
-sql create stream stream_t1 trigger at_once into streamtST1 as select _wstartts, count(*) c1, count(d) c2 , sum(a) c3 , max(b) c4, min(c) c5 from st partition by ta,tb,tc interval(10s);
+sql create stream stream_t1 trigger at_once into streamtST1 as select _wstart, count(*) c1, count(d) c2 , sum(a) c3 , max(b) c4, min(c) c5 from st partition by ta,tb,tc interval(10s);
sql insert into ts1 values(1648791213001,1,12,3,1.0);
sql insert into ts2 values(1648791213001,1,12,3,1.0);
@@ -43,7 +43,7 @@ sql create table ts1 using st tags(1,2,3);
sql create table ts2 using st tags(1,3,4);
sql create table ts3 using st tags(1,4,5);
-sql create stream streams1 trigger at_once into streamt as select _wstartts, count(*) c1, count(a) c2 from st partition by ta,tb,tc interval(10s);
+sql create stream streams1 trigger at_once into streamt as select _wstart, count(*) c1, count(a) c2 from st partition by ta,tb,tc interval(10s);
sql insert into ts1 values(1648791211000,1,2,3);
@@ -74,7 +74,7 @@ sql create stable st(ts timestamp,a int,b int,c int,id int) tags(ta int,tb int,t
sql create table ts1 using st tags(1,1,1);
sql create table ts2 using st tags(2,2,2);
-sql create stream stream_t2 trigger at_once watermark 20s into streamtST as select _wstartts, count(*) c1, count(a) c2 , sum(a) c3 , max(b) c5, min(c) c6, max(id) c7 from st partition by ta interval(10s) ;
+sql create stream stream_t2 trigger at_once watermark 20s into streamtST as select _wstart, count(*) c1, count(a) c2 , sum(a) c3 , max(b) c5, min(c) c6, max(id) c7 from st partition by ta interval(10s) ;
sql insert into ts1 values(1648791211000,1,2,3,1);
sql insert into ts1 values(1648791222001,2,2,3,2);
sql insert into ts2 values(1648791211000,1,2,3,3);
diff --git a/tests/script/tsim/stream/partitionby1.sim b/tests/script/tsim/stream/partitionby1.sim
index 3e823b05d6..b29666cad7 100644
--- a/tests/script/tsim/stream/partitionby1.sim
+++ b/tests/script/tsim/stream/partitionby1.sim
@@ -11,7 +11,7 @@ sql create table ts1 using st tags(1,1,1);
sql create table ts2 using st tags(2,2,2);
sql create table ts3 using st tags(3,2,2);
sql create table ts4 using st tags(4,2,2);
-sql create stream stream_t1 trigger at_once into streamtST1 as select _wstartts, count(*) c1, count(d) c2 , sum(a) c3 , max(b) c4, min(c) c5 from st partition by tbname interval(10s);
+sql create stream stream_t1 trigger at_once into streamtST1 as select _wstart, count(*) c1, count(d) c2 , sum(a) c3 , max(b) c4, min(c) c5 from st partition by tbname interval(10s);
sql insert into ts1 values(1648791213001,1,12,3,1.0);
sql insert into ts2 values(1648791213001,1,12,3,1.0);
@@ -43,7 +43,7 @@ sql create table ts1 using st tags(1,2,3);
sql create table ts2 using st tags(1,3,4);
sql create table ts3 using st tags(1,4,5);
-sql create stream streams1 trigger at_once into streamt as select _wstartts, count(*) c1, count(a) c2 from st partition by tbname interval(10s);
+sql create stream streams1 trigger at_once into streamt as select _wstart, count(*) c1, count(a) c2 from st partition by tbname interval(10s);
sql insert into ts1 values(1648791211000,1,2,3);
@@ -74,7 +74,7 @@ sql create stable st(ts timestamp,a int,b int,c int,id int) tags(ta int,tb int,t
sql create table ts1 using st tags(1,1,1);
sql create table ts2 using st tags(2,2,2);
-sql create stream stream_t2 trigger at_once into streamtST as select _wstartts, count(*) c1, count(a) c2 , sum(a) c3 , max(b) c5, min(c) c6, max(id) c7 from st partition by tbname interval(10s) ;
+sql create stream stream_t2 trigger at_once into streamtST as select _wstart, count(*) c1, count(a) c2 , sum(a) c3 , max(b) c5, min(c) c6, max(id) c7 from st partition by tbname interval(10s) ;
sql insert into ts1 values(1648791211000,1,2,3,1);
sql insert into ts1 values(1648791222001,2,2,3,2);
sql insert into ts2 values(1648791211000,1,2,3,3);
diff --git a/tests/script/tsim/stream/schedSnode.sim b/tests/script/tsim/stream/schedSnode.sim
index dbdaaf65d0..61f01baf39 100644
--- a/tests/script/tsim/stream/schedSnode.sim
+++ b/tests/script/tsim/stream/schedSnode.sim
@@ -16,7 +16,7 @@ sql create table ts1 using st tags(1,1,1);
sql create table ts2 using st tags(2,2,2);
sql create table ts3 using st tags(3,2,2);
sql create table ts4 using st tags(4,2,2);
-sql create stream stream_t1 trigger at_once into target.streamtST1 as select _wstartts, count(*) c1, count(d) c2 , sum(a) c3 , max(b) c4, min(c) c5 from st interval(10s);
+sql create stream stream_t1 trigger at_once into target.streamtST1 as select _wstart, count(*) c1, count(d) c2 , sum(a) c3 , max(b) c4, min(c) c5 from st interval(10s);
sleep 1000
@@ -170,4 +170,4 @@ if $data35 != 3 then
return -1
endi
-sql select _wstartts, count(*) c1, count(d) c2 , sum(a) c3 , max(b) c4, min(c) c5, avg(d) from st interval(10s);
+sql select _wstart, count(*) c1, count(d) c2 , sum(a) c3 , max(b) c4, min(c) c5, avg(d) from st interval(10s);
diff --git a/tests/script/tsim/stream/session0.sim b/tests/script/tsim/stream/session0.sim
index eb440d78c4..16a53d49f3 100644
--- a/tests/script/tsim/stream/session0.sim
+++ b/tests/script/tsim/stream/session0.sim
@@ -17,7 +17,7 @@ sql use test
sql create table t1(ts timestamp, a int, b int , c int, d double,id int);
-sql create stream streams1 trigger at_once into streamt as select _wstartts, count(*) c1, sum(a), max(a), min(d), stddev(a), last(a), first(d), max(id) s from t1 session(ts,10s);
+sql create stream streams1 trigger at_once into streamt as select _wstart, count(*) c1, sum(a), max(a), min(d), stddev(a), last(a), first(d), max(id) s from t1 session(ts,10s);
sql insert into t1 values(1648791213000,NULL,NULL,NULL,NULL,1);
sql insert into t1 values(1648791223001,10,2,3,1.1,2);
sql insert into t1 values(1648791233002,3,2,3,2.1,3);
@@ -179,7 +179,7 @@ endi
sql create database test2 vgroups 1;
sql use test2;
sql create table t2(ts timestamp, a int, b int , c int, d double, id int);
-sql create stream streams2 trigger at_once watermark 1d into streamt2 as select _wstartts,apercentile(a,30) c1, apercentile(a,70), apercentile(a,20,"t-digest") c2, apercentile(a,60,"t-digest") c3, max(id) c4 from t2 session(ts,10s);
+sql create stream streams2 trigger at_once watermark 1d into streamt2 as select _wstart,apercentile(a,30) c1, apercentile(a,70), apercentile(a,20,"t-digest") c2, apercentile(a,60,"t-digest") c3, max(id) c4 from t2 session(ts,10s);
sql insert into t2 values(1648791213001,1,1,3,1.0,1);
sql insert into t2 values(1648791213002,2,2,6,3.4,2);
sql insert into t2 values(1648791213003,4,9,3,4.8,3);
@@ -229,13 +229,13 @@ endi
sql create database test3 vgroups 1;
sql use test3;
sql create table t1(ts timestamp, a int, b int , c int, d double);
-sql create stream streams3 trigger at_once watermark 1d into streamt3 as select _wstartts, min(b), a,c from t1 session(ts,10s);
-sql create stream streams4 trigger at_once watermark 1d into streamt4 as select _wstartts, max(b), a,c from t1 session(ts,10s);
-# sql create stream streams5 trigger at_once watermark 1d into streamt5 as select _wstartts, top(b,3), a,c from t1 session(ts,10s);
-# sql create stream streams6 trigger at_once watermark 1d into streamt6 as select _wstartts, bottom(b,3), a,c from t1 session(ts,10s);
-# sql create stream streams7 trigger at_once watermark 1d into streamt7 as select _wstartts, spread(a), elapsed(ts), hyperloglog(a) from t1 session(ts,10s);
-sql create stream streams7 trigger at_once watermark 1d into streamt7 as select _wstartts, spread(a), hyperloglog(a) from t1 session(ts,10s);
-# sql create stream streams8 trigger at_once watermark 1d into streamt8 as select _wstartts, histogram(a,"user_input", "[1,3,5,7]", 1), histogram(a,"user_input", "[1,3,5,7]", 0) from t1 session(ts,10s);
+sql create stream streams3 trigger at_once watermark 1d into streamt3 as select _wstart, min(b), a,c from t1 session(ts,10s);
+sql create stream streams4 trigger at_once watermark 1d into streamt4 as select _wstart, max(b), a,c from t1 session(ts,10s);
+# sql create stream streams5 trigger at_once watermark 1d into streamt5 as select _wstart, top(b,3), a,c from t1 session(ts,10s);
+# sql create stream streams6 trigger at_once watermark 1d into streamt6 as select _wstart, bottom(b,3), a,c from t1 session(ts,10s);
+# sql create stream streams7 trigger at_once watermark 1d into streamt7 as select _wstart, spread(a), elapsed(ts), hyperloglog(a) from t1 session(ts,10s);
+sql create stream streams7 trigger at_once watermark 1d into streamt7 as select _wstart, spread(a), hyperloglog(a) from t1 session(ts,10s);
+# sql create stream streams8 trigger at_once watermark 1d into streamt8 as select _wstart, histogram(a,"user_input", "[1,3,5,7]", 1), histogram(a,"user_input", "[1,3,5,7]", 0) from t1 session(ts,10s);
sql insert into t1 values(1648791213001,1,1,1,1.0);
sql insert into t1 values(1648791213002,2,3,2,3.4);
sql insert into t1 values(1648791213003,4,9,3,4.8);
diff --git a/tests/script/tsim/stream/session1.sim b/tests/script/tsim/stream/session1.sim
index 347eda9bf6..12ff2a6199 100644
--- a/tests/script/tsim/stream/session1.sim
+++ b/tests/script/tsim/stream/session1.sim
@@ -17,7 +17,7 @@ sql use test
sql create table t1(ts timestamp, a int, b int , c int, d double,id int);
-sql create stream streams2 trigger at_once into streamt as select _wstartts, count(*) c1, sum(a), min(b), max(id) s from t1 session(ts,10s);
+sql create stream streams2 trigger at_once into streamt as select _wstart, count(*) c1, sum(a), min(b), max(id) s from t1 session(ts,10s);
sql insert into t1 values(1648791210000,1,1,1,1.1,1);
sql insert into t1 values(1648791220000,2,2,2,2.1,2);
sql insert into t1 values(1648791230000,3,3,3,3.1,3);
diff --git a/tests/script/tsim/stream/sliding.sim b/tests/script/tsim/stream/sliding.sim
new file mode 100644
index 0000000000..750be7cb49
--- /dev/null
+++ b/tests/script/tsim/stream/sliding.sim
@@ -0,0 +1,243 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sleep 50
+sql connect
+
+print =============== create database
+sql create database test vgroups 1
+sql show databases
+if $rows != 3 then
+ return -1
+endi
+
+print $data00 $data01 $data02
+
+sql use test
+sql create stable st(ts timestamp, a int, b int, c int, d double) tags(ta int,tb int,tc int);
+sql create table t1 using st tags(1,1,1);
+sql create table t2 using st tags(2,2,2);
+sql create stream streams1 trigger at_once into streamt as select _wstartts, count(*) c1, sum(a) c3 , max(b) c4, min(c) c5 from t1 interval(10s) sliding (5s);
+sql create stream streams2 trigger at_once watermark 1d into streamt2 as select _wstartts, count(*) c1, sum(a) c3 , max(b) c4, min(c) c5 from t1 interval(10s) sliding (5s);
+sql create stream stream_t1 trigger at_once into streamtST as select _wstartts, count(*) c1, sum(a) c3 , max(b) c4, min(c) c5 from st interval(10s) sliding (5s);
+sql create stream stream_t2 trigger at_once watermark 1d into streamtST2 as select _wstartts, count(*) c1, sum(a) c3 , max(b) c4, min(c) c5 from st interval(10s) sliding (5s);
+
+sql insert into t1 values(1648791210000,1,2,3,1.0);
+sql insert into t1 values(1648791216000,2,2,3,1.1);
+sql insert into t1 values(1648791220000,3,2,3,2.1);
+
+sql insert into t1 values(1648791210000,1,2,3,1.0);
+sql insert into t1 values(1648791216000,2,2,3,1.1);
+sql insert into t1 values(1648791220000,3,2,3,2.1);
+
+sql insert into t2 values(1648791210000,1,2,3,1.0);
+sql insert into t2 values(1648791216000,2,2,3,1.1);
+sql insert into t2 values(1648791220000,3,2,3,2.1);
+
+sql insert into t2 values(1648791210000,1,2,3,1.0);
+sql insert into t2 values(1648791216000,2,2,3,1.1);
+sql insert into t2 values(1648791220000,3,2,3,2.1);
+
+$loop_count = 0
+
+loop0:
+sleep 300
+
+$loop_count = $loop_count + 1
+if $loop_count == 10 then
+ return -1
+endi
+
+
+sql select * from streamt
+
+# row 0
+if $data01 != 1 then
+ print =====data01=$data01
+ goto loop0
+endi
+
+if $data02 != 1 then
+ print =====data02=$data02
+ goto loop0
+endi
+
+# row 1
+if $data11 != 2 then
+ print =====data11=$data11
+ goto loop0
+endi
+
+if $data12 != 3 then
+ print =====data12=$data12
+ goto loop0
+endi
+
+# row 2
+if $data21 != 2 then
+ print =====data21=$data21
+ goto loop0
+endi
+
+if $data22 != 5 then
+ print =====data22=$data22
+ goto loop0
+endi
+
+# row 3
+if $data31 != 1 then
+ print =====data31=$data31
+ goto loop0
+endi
+
+if $data32 != 3 then
+ print =====data32=$data32
+ goto loop0
+endi
+
+print step 1
+
+sql select * from streamt2
+
+# row 0
+if $data01 != 1 then
+ print =====data01=$data01
+ goto loop0
+endi
+
+if $data02 != 1 then
+ print =====data02=$data02
+ goto loop0
+endi
+
+# row 1
+if $data11 != 2 then
+ print =====data11=$data11
+ goto loop0
+endi
+
+if $data12 != 3 then
+ print =====data12=$data12
+ goto loop0
+endi
+
+# row 2
+if $data21 != 2 then
+ print =====data21=$data21
+ goto loop0
+endi
+
+if $data22 != 5 then
+ print =====data22=$data22
+ goto loop0
+endi
+
+# row 3
+if $data31 != 1 then
+ print =====data31=$data31
+ goto loop0
+endi
+
+if $data32 != 3 then
+ print =====data32=$data32
+ goto loop0
+endi
+
+print step 2
+
+sql select * from streamtST
+
+# row 0
+if $data01 != 2 then
+ print =====data01=$data01
+ goto loop0
+endi
+
+if $data02 != 2 then
+ print =====data02=$data02
+ goto loop0
+endi
+
+# row 1
+if $data11 != 4 then
+ print =====data11=$data11
+ goto loop0
+endi
+
+if $data12 != 6 then
+ print =====data12=$data12
+ goto loop0
+endi
+
+# row 2
+if $data21 != 4 then
+ print =====data21=$data21
+ goto loop0
+endi
+
+if $data22 != 10 then
+ print =====data22=$data22
+ goto loop0
+endi
+
+# row 3
+if $data31 != 2 then
+ print =====data31=$data31
+ goto loop0
+endi
+
+if $data32 != 6 then
+ print =====data32=$data32
+ goto loop0
+endi
+
+print step 3
+
+sql select * from streamtST2
+
+# row 0
+if $data01 != 2 then
+ print =====data01=$data01
+ goto loop0
+endi
+
+if $data02 != 2 then
+ print =====data02=$data02
+ goto loop0
+endi
+
+# row 1
+if $data11 != 4 then
+ print =====data11=$data11
+ goto loop0
+endi
+
+if $data12 != 6 then
+ print =====data12=$data12
+ goto loop0
+endi
+
+# row 2
+if $data21 != 4 then
+ print =====data21=$data21
+ goto loop0
+endi
+
+if $data22 != 10 then
+ print =====data22=$data22
+ goto loop0
+endi
+
+# row 3
+if $data31 != 2 then
+ print =====data31=$data31
+ goto loop0
+endi
+
+if $data32 != 6 then
+ print =====data32=$data32
+ goto loop0
+endi
+
+
+system sh/stop_dnodes.sh
\ No newline at end of file
diff --git a/tests/script/tsim/stream/state0.sim b/tests/script/tsim/stream/state0.sim
index f98e356540..a0535cf93d 100644
--- a/tests/script/tsim/stream/state0.sim
+++ b/tests/script/tsim/stream/state0.sim
@@ -16,7 +16,7 @@ print $data00 $data01 $data02
sql use test
sql create table t1(ts timestamp, a int, b int , c int, d double, id int);
-sql create stream streams1 trigger at_once into streamt1 as select _wstartts, count(*) c1, count(d) c2 , sum(a) c3 , max(a) c4, min(c) c5, max(id) c from t1 state_window(a);
+sql create stream streams1 trigger at_once into streamt1 as select _wstart, count(*) c1, count(d) c2 , sum(a) c3 , max(a) c4, min(c) c5, max(id) c from t1 state_window(a);
sql insert into t1 values(1648791213000,1,2,3,1.0,1);
sql insert into t1 values(1648791213000,1,2,3,1.0,2);
@@ -54,7 +54,7 @@ sql insert into t1 values(1648791213000,1,2,3,1.0,5);
sql insert into t1 values(1648791214000,1,2,3,1.0,6);
$loop_count = 0
loop1:
-sql select * from streamt1 where c >=4 order by `_wstartts`;
+sql select * from streamt1 where c >=4 order by `_wstart`;
sleep 300
$loop_count = $loop_count + 1
if $loop_count == 10 then
@@ -163,7 +163,7 @@ sql insert into t1 values(1648791213011,1,2,3,1.0,7);
$loop_count = 0
loop2:
-sql select * from streamt1 where c in (5,4,7) order by `_wstartts`;
+sql select * from streamt1 where c in (5,4,7) order by `_wstart`;
sleep 300
$loop_count = $loop_count + 1
if $loop_count == 10 then
@@ -207,7 +207,7 @@ sql insert into t1 values(1648791213011,1,2,3,1.0,8);
$loop_count = 0
loop21:
-sql select * from streamt1 where c in (5,4,8) order by `_wstartts`;
+sql select * from streamt1 where c in (5,4,8) order by `_wstart`;
sleep 300
$loop_count = $loop_count + 1
if $loop_count == 10 then
@@ -227,7 +227,7 @@ sql insert into t1 values(1648791213011,10,20,10,10.0,12);
$loop_count = 0
loop3:
-sql select * from streamt1 where c in (5,4,10,11,12) order by `_wstartts`;
+sql select * from streamt1 where c in (5,4,10,11,12) order by `_wstart`;
sleep 300
$loop_count = $loop_count + 1
if $loop_count == 10 then
@@ -339,7 +339,7 @@ sql insert into t1 values(1648791213030,3,14,14,14.0,15) (1648791214020,15,15,15
$loop_count = 0
loop4:
-sql select * from streamt1 where c in (14,15,16) order by `_wstartts`;
+sql select * from streamt1 where c in (14,15,16) order by `_wstart`;
sleep 300
$loop_count = $loop_count + 1
@@ -457,7 +457,7 @@ print $data00 $data01 $data02
sql use test1
sql create table t1(ts timestamp, a int, b int , c int, d double, id int);
-sql create stream streams2 trigger at_once into streamt1 as select _wstartts, count(*) c1, count(d) c2 , sum(a) c3 , max(a) c4, min(c) c5, max(id) c from t1 state_window(a);
+sql create stream streams2 trigger at_once into streamt1 as select _wstart, count(*) c1, count(d) c2 , sum(a) c3 , max(a) c4, min(c) c5, max(id) c from t1 state_window(a);
sql insert into t1 values(1648791212000,2,2,3,1.0,1);
sql insert into t1 values(1648791213000,1,2,3,1.0,1);
diff --git a/tests/script/tsim/stream/triggerInterval0.sim b/tests/script/tsim/stream/triggerInterval0.sim
index 756f591f3f..db6f27ed51 100644
--- a/tests/script/tsim/stream/triggerInterval0.sim
+++ b/tests/script/tsim/stream/triggerInterval0.sim
@@ -15,7 +15,7 @@ print $data00 $data01 $data02
sql use test
sql create table t1(ts timestamp, a int, b int , c int, d double);
-sql create stream streams1 trigger window_close into streamt as select _wstartts, count(*) c1, count(d) c2 , sum(a) c3 , max(b) c4, min(c) c5 from t1 interval(10s);
+sql create stream streams1 trigger window_close into streamt as select _wstart, count(*) c1, count(d) c2 , sum(a) c3 , max(b) c4, min(c) c5 from t1 interval(10s);
sql insert into t1 values(1648791213001,1,2,3,1.0);
sleep 300
diff --git a/tests/script/tsim/stream/triggerSession0.sim b/tests/script/tsim/stream/triggerSession0.sim
index 48827a64a2..b15083ab1b 100644
--- a/tests/script/tsim/stream/triggerSession0.sim
+++ b/tests/script/tsim/stream/triggerSession0.sim
@@ -15,7 +15,7 @@ print $data00 $data01 $data02
sql use test
sql create table t2(ts timestamp, a int, b int , c int, d double);
-sql create stream streams2 trigger window_close into streamt2 as select _wstartts, count(*) c1, count(d) c2 , sum(a) c3 , max(b) c4, min(c) c5 from t2 session(ts, 10s);
+sql create stream streams2 trigger window_close into streamt2 as select _wstart, count(*) c1, count(d) c2 , sum(a) c3 , max(b) c4, min(c) c5 from t2 session(ts, 10s);
sql insert into t2 values(1648791213000,1,2,3,1.0);
sql insert into t2 values(1648791222999,1,2,3,1.0);
diff --git a/tests/script/tsim/stream/windowClose.sim b/tests/script/tsim/stream/windowClose.sim
index 695d5749fa..1f024b9836 100644
--- a/tests/script/tsim/stream/windowClose.sim
+++ b/tests/script/tsim/stream/windowClose.sim
@@ -18,7 +18,7 @@ sql create stable st(ts timestamp, a int) tags(t int);
sql create table tu1 using st tags(1);
sql create table tu2 using st tags(2);
-sql create stream stream1 trigger window_close into streamt as select _wstartts, sum(a) from st interval(10s);
+sql create stream stream1 trigger window_close into streamt as select _wstart, sum(a) from st interval(10s);
sql insert into tu1 values(now, 1);
diff --git a/tests/script/general/vector/metrics_field.sim b/tests/script/tsim/vector/metrics_field.sim
similarity index 97%
rename from tests/script/general/vector/metrics_field.sim
rename to tests/script/tsim/vector/metrics_field.sim
index 2719805c63..4d0f9e19fc 100644
--- a/tests/script/general/vector/metrics_field.sim
+++ b/tests/script/tsim/vector/metrics_field.sim
@@ -1,10 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
$dbPrefix = m_mf_db
@@ -99,17 +95,9 @@ if $data00 != 0.000000000 then
return -1
endi
-sql select g - f from $mt where a = 5 -x step21
- return -1
-step21:
-
-sql select h - f from $mt where a = 5 -x step22
- return -1
-step22:
-
-sql select ts - f from $mt where a = 5 -x step23
- return -1
-step23:
+sql select g - f from $mt where a = 5
+sql select h - f from $mt where a = 5
+sql select ts - f from $mt where a = 5
sql select a - e from $mt where a = 5
print ===> $data00
@@ -616,7 +604,7 @@ step63:
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/vector/metrics_mix.sim b/tests/script/tsim/vector/metrics_mix.sim
similarity index 98%
rename from tests/script/general/vector/metrics_mix.sim
rename to tests/script/tsim/vector/metrics_mix.sim
index 7c9bb3b668..fd36a62332 100644
--- a/tests/script/general/vector/metrics_mix.sim
+++ b/tests/script/tsim/vector/metrics_mix.sim
@@ -1,10 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
$dbPrefix = m_mx_db
@@ -99,17 +95,11 @@ if $data00 != 0.000000000 then
return -1
endi
-sql select g - f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m -x step21
- return -1
-step21:
+sql select g - f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
-sql select h - f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m -x step22
- return -1
-step22:
+sql select h - f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
-sql select ts - f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m -x step23
- return -1
-step23:
+sql select ts - f from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
sql select a - e from $mt where a = 5 and tgcol = 5 and ts > now + 4m and ts < now + 6m
print ===> $data00
@@ -616,7 +606,7 @@ step63:
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/vector/metrics_query.sim b/tests/script/tsim/vector/metrics_query.sim
similarity index 97%
rename from tests/script/general/vector/metrics_query.sim
rename to tests/script/tsim/vector/metrics_query.sim
index fd635a3104..8a334acef2 100644
--- a/tests/script/general/vector/metrics_query.sim
+++ b/tests/script/tsim/vector/metrics_query.sim
@@ -1,10 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
$dbPrefix = m_mq_db
@@ -95,17 +91,9 @@ if $data00 != 0.000000000 then
return -1
endi
-sql select g - f from $mt -x step21
- return -1
-step21:
-
-sql select h - f from $mt -x step22
- return -1
-step22:
-
-sql select ts - f from $mt -x step23
- return -1
-step23:
+sql select g - f from $mt
+sql select h - f from $mt
+sql select ts - f from $mt
sql select a - e from $mt
print ===> $data00
@@ -612,7 +600,7 @@ step63:
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/vector/metrics_tag.sim b/tests/script/tsim/vector/metrics_tag.sim
similarity index 97%
rename from tests/script/general/vector/metrics_tag.sim
rename to tests/script/tsim/vector/metrics_tag.sim
index 1d412d35d3..0b275336f9 100644
--- a/tests/script/general/vector/metrics_tag.sim
+++ b/tests/script/tsim/vector/metrics_tag.sim
@@ -1,10 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
$dbPrefix = m_mtg_db
@@ -95,17 +91,11 @@ if $data00 != 0.000000000 then
return -1
endi
-sql select g - f from $mt where tgcol = 5 -x step21
- return -1
-step21:
+sql select g - f from $mt where tgcol = 5
-sql select h - f from $mt where tgcol = 5 -x step22
- return -1
-step22:
+sql select h - f from $mt where tgcol = 5
-sql select ts - f from $mt where tgcol = 5 -x step23
- return -1
-step23:
+sql select ts - f from $mt where tgcol = 5
sql select a - e from $mt where tgcol = 5
print ===> $data00
@@ -612,7 +602,7 @@ step63:
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/vector/metrics_time.sim b/tests/script/tsim/vector/metrics_time.sim
similarity index 98%
rename from tests/script/general/vector/metrics_time.sim
rename to tests/script/tsim/vector/metrics_time.sim
index d0152439bf..bcd93cb582 100644
--- a/tests/script/general/vector/metrics_time.sim
+++ b/tests/script/tsim/vector/metrics_time.sim
@@ -1,10 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
$dbPrefix = m_mt_db
@@ -95,17 +91,11 @@ if $data00 != 0.000000000 then
return -1
endi
-sql select g - f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m -x step21
- return -1
-step21:
+sql select g - f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
-sql select h - f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m -x step22
- return -1
-step22:
+sql select h - f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
-sql select ts - f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m -x step23
- return -1
-step23:
+sql select ts - f from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
sql select a - e from $mt where tgcol = 5 and ts > now + 4m and ts < now + 6m
print ===> $data00
@@ -612,7 +602,7 @@ step63:
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/vector/multi.sim b/tests/script/tsim/vector/multi.sim
similarity index 90%
rename from tests/script/general/vector/multi.sim
rename to tests/script/tsim/vector/multi.sim
index 1101b0b0db..dcedbe73c9 100644
--- a/tests/script/general/vector/multi.sim
+++ b/tests/script/tsim/vector/multi.sim
@@ -1,10 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
$dbPrefix = m_mu_db
@@ -71,9 +67,7 @@ sql select a + a from $tb where ts > now + 4m order by ts desc
sql select a + c from $tb where ts < now + 4m order by ts asc
-sql select a + f from $tb where ts > now + 4m order by ts asc -x step24
- return -1
-step24:
+sql select a + f from $tb where ts > now + 4m order by ts asc
print =============== step3
$i = 1
@@ -150,17 +144,11 @@ endi
print =============== step6
$i = 1
$tb = $tbPrefix . $i
-sql select a + ts from $tb -x step61
- return -1
-step61:
+sql select a + ts from $tb
-sql select a + f from $tb -x step62
- return -1
-step62:
+sql select a + f from $tb
-sql select a + g from $tb -x step63
- return -1
-step63:
+sql select a + g from $tb
print =============== step7
$i = 1
@@ -202,14 +190,12 @@ sql select a + a from $tb where e = 2 and ts > now + 4m order by ts desc
sql select a + c from $tb where f = 2 and ts < now + 4m order by ts asc
-sql select a + f from $tb where g = 2 and ts > now + 4m order by ts asc -x step74
- return -1
-step74:
+sql select a + f from $tb where g = 2 and ts > now + 4m order by ts asc
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/vector/single.sim b/tests/script/tsim/vector/single.sim
similarity index 96%
rename from tests/script/general/vector/single.sim
rename to tests/script/tsim/vector/single.sim
index e979a0ffb7..c9d794456c 100644
--- a/tests/script/general/vector/single.sim
+++ b/tests/script/tsim/vector/single.sim
@@ -1,10 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
$dbPrefix = m_si_db
@@ -150,9 +146,7 @@ $i = 11
$tb = $tbPrefix . $i
sql create table $tb (ts timestamp, tbcol bool)
sql insert into $tb values(now, 0)
-sql select tbcol + 2 from $tb -x step6
- return -1
-step6:
+sql select tbcol + 2 from $tb
print =============== step7
$i = $i + 1
@@ -289,14 +283,12 @@ $i = $i + 1
$tb = $tbPrefix . $i
sql create table $tb (ts timestamp, tbcol binary(100))
sql insert into $tb values(now, '0');
-sql select tbcol + 2 from $tb -x step12
- return -1
-step12:
+sql select tbcol + 2 from $tb
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/vector/table_field.sim b/tests/script/tsim/vector/table_field.sim
similarity index 97%
rename from tests/script/general/vector/table_field.sim
rename to tests/script/tsim/vector/table_field.sim
index d86eb99331..5ad60b2a35 100644
--- a/tests/script/general/vector/table_field.sim
+++ b/tests/script/tsim/vector/table_field.sim
@@ -1,10 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
$dbPrefix = m_tf_db
@@ -95,17 +91,11 @@ if $data00 != 0.000000000 then
return -1
endi
-sql select g - f from $tb where a = 5 -x step21
- return -1
-step21:
+sql select g - f from $tb where a = 5
-sql select h - f from $tb where a = 5 -x step22
- return -1
-step22:
+sql select h - f from $tb where a = 5
-sql select ts - f from $tb where a = 5 -x step23
- return -1
-step23:
+sql select ts - f from $tb where a = 5
sql select a - e from $tb where a = 5
print ===> $data00
@@ -612,7 +602,7 @@ step63:
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/vector/table_mix.sim b/tests/script/tsim/vector/table_mix.sim
similarity index 98%
rename from tests/script/general/vector/table_mix.sim
rename to tests/script/tsim/vector/table_mix.sim
index 5c4fb52888..358d6cf87f 100644
--- a/tests/script/general/vector/table_mix.sim
+++ b/tests/script/tsim/vector/table_mix.sim
@@ -1,10 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
$dbPrefix = m_tm_db
@@ -95,17 +91,11 @@ if $data00 != 0.000000000 then
return -1
endi
-sql select g - f from $tb where a = 5 and ts > now + 4m and ts < now + 6m -x step21
- return -1
-step21:
+sql select g - f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
-sql select h - f from $tb where a = 5 and ts > now + 4m and ts < now + 6m -x step22
- return -1
-step22:
+sql select h - f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
-sql select ts - f from $tb where a = 5 and ts > now + 4m and ts < now + 6m -x step23
- return -1
-step23:
+sql select ts - f from $tb where a = 5 and ts > now + 4m and ts < now + 6m
sql select a - e from $tb where a = 5 and ts > now + 4m and ts < now + 6m
print ===> $data00
@@ -612,7 +602,7 @@ step63:
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/vector/table_query.sim b/tests/script/tsim/vector/table_query.sim
similarity index 97%
rename from tests/script/general/vector/table_query.sim
rename to tests/script/tsim/vector/table_query.sim
index 9ef18255a9..0e4562716e 100644
--- a/tests/script/general/vector/table_query.sim
+++ b/tests/script/tsim/vector/table_query.sim
@@ -1,10 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
$dbPrefix = m_tq_db
@@ -95,17 +91,11 @@ if $data00 != 0.000000000 then
return -1
endi
-sql select g - f from $tb -x step21
- return -1
-step21:
+sql select g - f from $tb
-sql select h - f from $tb -x step22
- return -1
-step22:
+sql select h - f from $tb
-sql select ts - f from $tb -x step23
- return -1
-step23:
+sql select ts - f from $tb
sql select a - e from $tb
print ===> $data00
@@ -612,7 +602,7 @@ step63:
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/general/vector/table_time.sim b/tests/script/tsim/vector/table_time.sim
similarity index 97%
rename from tests/script/general/vector/table_time.sim
rename to tests/script/tsim/vector/table_time.sim
index c38546b117..1e6bdb2cde 100644
--- a/tests/script/general/vector/table_time.sim
+++ b/tests/script/tsim/vector/table_time.sim
@@ -1,10 +1,6 @@
system sh/stop_dnodes.sh
-
system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
sql connect
$dbPrefix = m_tt_db
@@ -95,17 +91,11 @@ if $data00 != 0.000000000 then
return -1
endi
-sql select g - f from $tb where ts > now + 4m and ts < now + 6m -x step21
- return -1
-step21:
+sql select g - f from $tb where ts > now + 4m and ts < now + 6m
-sql select h - f from $tb where ts > now + 4m and ts < now + 6m -x step22
- return -1
-step22:
+sql select h - f from $tb where ts > now + 4m and ts < now + 6m
-sql select ts - f from $tb where ts > now + 4m and ts < now + 6m -x step23
- return -1
-step23:
+sql select ts - f from $tb where ts > now + 4m and ts < now + 6m
sql select a - e from $tb where ts > now + 4m and ts < now + 6m
print ===> $data00
@@ -612,7 +602,7 @@ step63:
print =============== clear
sql drop database $db
sql show databases
-if $rows != 0 then
+if $rows != 2 then
return -1
endi
diff --git a/tests/script/tsim/vnode/stable_dnode2.sim b/tests/script/tsim/vnode/stable_dnode2.sim
index c29d960706..99047086c4 100644
--- a/tests/script/tsim/vnode/stable_dnode2.sim
+++ b/tests/script/tsim/vnode/stable_dnode2.sim
@@ -109,20 +109,20 @@ if $data00 != $rowNum then
endi
print =============== step5
-sql select _wstartts, count(tbcol) as b from $tb interval(1m)
+sql select _wstart, count(tbcol) as b from $tb interval(1m)
print ===> $data01
if $data01 != 1 then
return -1
endi
-sql select _wstartts, count(tbcol) as b from $tb interval(1d)
+sql select _wstart, count(tbcol) as b from $tb interval(1d)
print ===> $data01
if $data01 != $rowNum then
return -1
endi
print =============== step6
-sql select _wstartts, count(tbcol) as b from $tb where ts <= 1519833840000 interval(1m)
+sql select _wstart, count(tbcol) as b from $tb where ts <= 1519833840000 interval(1m)
print ===> $data01
if $data01 != 1 then
return -1
@@ -164,13 +164,13 @@ if $data00 != 25 then
endi
print =============== step9
-sql select _wstartts, count(tbcol) as b from $mt interval(1m)
+sql select _wstart, count(tbcol) as b from $mt interval(1m)
print ===> $data01
if $data01 != 10 then
return -1
endi
-sql select _wstartts, count(tbcol) as b from $mt interval(1d)
+sql select _wstart, count(tbcol) as b from $mt interval(1d)
print ===> $data01
if $data01 != 200 then
return -1
diff --git a/tests/script/tsim/vnode/stable_dnode2_stop.sim b/tests/script/tsim/vnode/stable_dnode2_stop.sim
index 113cf27e17..87972a15f9 100644
--- a/tests/script/tsim/vnode/stable_dnode2_stop.sim
+++ b/tests/script/tsim/vnode/stable_dnode2_stop.sim
@@ -138,13 +138,13 @@ if $data00 != 25 then
endi
print =============== step4
-sql select _wstartts, count(tbcol) as b from $mt interval(1m)
+sql select _wstart, count(tbcol) as b from $mt interval(1m)
print ===> $data01
if $data01 != 10 then
return -1
endi
-sql select _wstartts, count(tbcol) as b from $mt interval(1d)
+sql select _wstart, count(tbcol) as b from $mt interval(1d)
print ===> $data01
if $data01 != 200 then
return -1
diff --git a/tests/script/tsim/vnode/stable_dnode3.sim b/tests/script/tsim/vnode/stable_dnode3.sim
index ae777b9942..279fb3b441 100644
--- a/tests/script/tsim/vnode/stable_dnode3.sim
+++ b/tests/script/tsim/vnode/stable_dnode3.sim
@@ -111,20 +111,20 @@ if $data00 != $rowNum then
endi
print =============== step5
-sql select _wstartts, count(tbcol) as b from $tb interval(1m)
+sql select _wstart, count(tbcol) as b from $tb interval(1m)
print ===> $data01
if $data01 != 1 then
return -1
endi
-sql select _wstartts, count(tbcol) as b from $tb interval(1d)
+sql select _wstart, count(tbcol) as b from $tb interval(1d)
print ===> $data01
if $data01 != $rowNum then
return -1
endi
print =============== step6
-sql select _wstartts, count(tbcol) as b from $tb where ts <= 1519833840000 interval(1m)
+sql select _wstart, count(tbcol) as b from $tb where ts <= 1519833840000 interval(1m)
print ===> $data01
if $data01 != 1 then
return -1
@@ -166,13 +166,13 @@ if $data00 != 25 then
endi
print =============== step9
-sql select _wstartts, count(tbcol) as b from $mt interval(1m)
+sql select _wstart, count(tbcol) as b from $mt interval(1m)
print ===> $data01
if $data01 != 10 then
return -1
endi
-sql select _wstartts, count(tbcol) as b from $mt interval(1d)
+sql select _wstart, count(tbcol) as b from $mt interval(1d)
print ===> $data01
if $data01 != 200 then
return -1
diff --git a/tests/script/tsim/vnode/stable_replica3_dnode6.sim b/tests/script/tsim/vnode/stable_replica3_dnode6.sim
index aea5b88fed..e5c677ccbc 100644
--- a/tests/script/tsim/vnode/stable_replica3_dnode6.sim
+++ b/tests/script/tsim/vnode/stable_replica3_dnode6.sim
@@ -140,20 +140,20 @@ if $data00 != $rowNum then
endi
print =============== step5
-sql select _wstartts, count(tbcol) as b from $tb interval(1m)
+sql select _wstart, count(tbcol) as b from $tb interval(1m)
print ===> $data01
if $data01 != 1 then
return -1
endi
-sql select _wstartts, count(tbcol) as b from $tb interval(1d)
+sql select _wstart, count(tbcol) as b from $tb interval(1d)
print ===> $data01
if $data01 != $rowNum then
return -1
endi
print =============== step6
-sql select _wstartts, count(tbcol) as b from $tb where ts <= 1519833840000 interval(1m)
+sql select _wstart, count(tbcol) as b from $tb where ts <= 1519833840000 interval(1m)
print ===> $data01
if $data01 != 1 then
return -1
@@ -195,13 +195,13 @@ if $data00 != 25 then
endi
print =============== step9
-#sql select _wstartts, count(tbcol) as b from $mt interval(1m)
+#sql select _wstart, count(tbcol) as b from $mt interval(1m)
#print ===> $data01
#if $data01 != 10 then
# return -1
#endi
-sql select _wstartts, count(tbcol) as b from $mt interval(1d)
+sql select _wstart, count(tbcol) as b from $mt interval(1d)
print ===> $data01
if $data01 != 200 then
return -1
diff --git a/tests/script/tsim/vnode/stable_replica3_vnode3.sim b/tests/script/tsim/vnode/stable_replica3_vnode3.sim
index 8137b087f5..ca26b2fd10 100644
--- a/tests/script/tsim/vnode/stable_replica3_vnode3.sim
+++ b/tests/script/tsim/vnode/stable_replica3_vnode3.sim
@@ -124,20 +124,20 @@ if $data00 != $rowNum then
endi
print =============== step5
-sql select _wstartts, count(tbcol) as b from $tb interval(1m)
+sql select _wstart, count(tbcol) as b from $tb interval(1m)
print ===> $data01
if $data01 != 1 then
return -1
endi
-sql select _wstartts, count(tbcol) as b from $tb interval(1d)
+sql select _wstart, count(tbcol) as b from $tb interval(1d)
print ===> $data01
if $data01 != $rowNum then
return -1
endi
print =============== step6
-sql select _wstartts, count(tbcol) as b from $tb where ts <= 1519833840000 interval(1m)
+sql select _wstart, count(tbcol) as b from $tb where ts <= 1519833840000 interval(1m)
print ===> $data01
if $data01 != 1 then
return -1
@@ -180,13 +180,13 @@ if $data00 != 25 then
endi
print =============== step9
-sql select _wstartts, count(tbcol) as b from $mt interval(1m)
+sql select _wstart, count(tbcol) as b from $mt interval(1m)
print ===> $data01
if $data01 != 10 then
return -1
endi
-sql select _wstartts, count(tbcol) as b from $mt interval(1d)
+sql select _wstart, count(tbcol) as b from $mt interval(1d)
print ===> $data01
if $data01 != 200 then
return -1
diff --git a/tests/script/general/wal/kill.sim b/tests/script/tsim/wal/kill.sim
similarity index 73%
rename from tests/script/general/wal/kill.sim
rename to tests/script/tsim/wal/kill.sim
index 94a35b636e..f8a732f59f 100644
--- a/tests/script/general/wal/kill.sim
+++ b/tests/script/tsim/wal/kill.sim
@@ -2,8 +2,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
print ============== deploy
-system sh/exec.sh -n dnode1 -s start
-sleep 3001
+system sh/exec.sh -n dnode1 -s start ]
sql connect
sql create database d1
@@ -13,65 +12,55 @@ sql create table t1 (ts timestamp, i int)
sql insert into t1 values(now, 1);
print =============== step3
-sleep 2000
sql select * from t1;
print rows: $rows
if $rows != 1 then
return -1
endi
system sh/exec.sh -n dnode1 -s stop -x SIGKILL
-sleep 2000
print =============== step4
-system sh/exec.sh -n dnode1 -s start -x SIGKILL
-sleep 2000
+system sh/exec.sh -n dnode1 -s start
sql select * from t1;
print rows: $rows
if $rows != 1 then
return -1
endi
system sh/exec.sh -n dnode1 -s stop -x SIGKILL
-sleep 2000
print =============== step5
-system sh/exec.sh -n dnode1 -s start -x SIGKILL
-sleep 2000
+system sh/exec.sh -n dnode1 -s start
sql select * from t1;
print rows: $rows
if $rows != 1 then
return -1
endi
system sh/exec.sh -n dnode1 -s stop -x SIGKILL
-sleep 2000
print =============== step6
-system sh/exec.sh -n dnode1 -s start -x SIGKILL
-sleep 2000
+system sh/exec.sh -n dnode1 -s start
sql select * from t1;
print rows: $rows
if $rows != 1 then
return -1
endi
system sh/exec.sh -n dnode1 -s stop -x SIGKILL
-sleep 2000
print =============== step7
-system sh/exec.sh -n dnode1 -s start -x SIGKILL
-sleep 2000
+system sh/exec.sh -n dnode1 -s start
sql select * from t1;
print rows: $rows
if $rows != 1 then
return -1
endi
system sh/exec.sh -n dnode1 -s stop -x SIGKILL
-sleep 2000
print =============== step8
-system sh/exec.sh -n dnode1 -s start -x SIGKILL
-sleep 2000
+system sh/exec.sh -n dnode1 -s start
sql select * from t1;
print rows: $rows
if $rows != 1 then
return -1
endi
+
system sh/exec.sh -n dnode1 -s stop -x SIGKILL
diff --git a/tests/system-test/0-others/sysinfo.py b/tests/system-test/0-others/sysinfo.py
new file mode 100644
index 0000000000..d74c4f6db9
--- /dev/null
+++ b/tests/system-test/0-others/sysinfo.py
@@ -0,0 +1,59 @@
+###################################################################
+# Copyright (c) 2016 by TAOS Technologies, Inc.
+# All rights reserved.
+#
+# This file is proprietary and confidential to TAOS Technologies.
+# No part of this file may be reproduced, stored, transmitted,
+# disclosed or used in any form or by any means other than as
+# expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+
+from util.log import *
+from util.cases import *
+from util.sql import *
+import subprocess
+from util.common import *
+
+
+class TDTestCase:
+ def init(self, conn, logSql):
+ tdLog.debug("start to execute %s" % __file__)
+ tdSql.init(conn.cursor())
+ self.dbname = 'db'
+ def get_database_info(self):
+ tdSql.query('select database()')
+ tdSql.checkData(0,0,None)
+ tdSql.execute(f'create database if not exists {self.dbname}')
+ tdSql.execute(f'use {self.dbname}')
+ tdSql.query('select database()')
+ tdSql.checkData(0,0,self.dbname)
+ tdSql.execute(f'drop database {self.dbname}')
+
+ def check_version(self):
+ taos_list = ['server','client']
+ for i in taos_list:
+ tdSql.query(f'select {i}_version()')
+ version_info = str(subprocess.run('cat ../../source/util/src/version.c |grep "char version"', shell=True,capture_output=True).stdout.decode('utf8')).split('"')[1]
+ tdSql.checkData(0,0,version_info)
+
+ def get_server_status(self):
+ tdSql.query('select server_status()')
+ tdSql.checkData(0,0,1)
+ tdDnodes.stoptaosd(1)
+
+ tdSql.query('select server_status()')
+ print(tdSql.queryResult)
+ def run(self):
+ self.get_database_info()
+ self.check_version()
+ # self.get_server_status()
+ def stop(self):
+ tdSql.close()
+ tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
\ No newline at end of file
diff --git a/tests/system-test/2-query/count.py b/tests/system-test/2-query/count.py
index c4c1d19898..c83ff43c51 100644
--- a/tests/system-test/2-query/count.py
+++ b/tests/system-test/2-query/count.py
@@ -1,192 +1,121 @@
from util.log import *
from util.sql import *
from util.cases import *
-
+from util.sqlset import *
class TDTestCase:
def init(self, conn, logSql):
tdLog.debug("start to execute %s" % __file__)
- tdSql.init(conn.cursor())
-
+ tdSql.init(conn.cursor(),logSql)
+ self.setsql = TDSetSql()
self.rowNum = 10
self.ts = 1537146000000
- def run(self):
+ self.ntbname = 'ntb'
+ self.stbname = 'stb'
+ self.column_dict = {
+ 'ts':'timestamp',
+ 'c1':'int',
+ 'c2':'float',
+ 'c3':'double',
+ 'c4':'timestamp'
+ }
+ self.tag_dict = {
+ 't0':'int'
+ }
+ # The number of tag_values should be same as tbnum
+ self.tbnum = 2
+ self.tag_values = [
+ f'10',
+ f'100'
+ ]
+ def query_stb(self,k,stbname,tbnum,rownum):
+ tdSql.query(f'select count({k}) from {stbname}')
+ tdSql.checkEqual(tdSql.queryResult[0][0],tbnum*rownum)
+ tdSql.query(f'select count({k}) from {stbname} where ts <={self.ts+self.rowNum-1}')
+ tdSql.checkEqual(tdSql.queryResult[0][0],tbnum*rownum)
+ tdSql.query(f'select count({k}) from {stbname} where ts <={self.ts+self.rowNum-2}')
+ tdSql.checkEqual(tdSql.queryResult[0][0],tbnum*(rownum-1))
+ def query_ctb(self,k,i,stbname,rownum):
+ tdSql.query(f'select count({k}) from {stbname}_{i}')
+ tdSql.checkEqual(tdSql.queryResult[0][0],rownum)
+ tdSql.query(f'select count({k}) from {stbname}_{i} where ts <={self.ts+self.rowNum-1}')
+ tdSql.checkEqual(tdSql.queryResult[0][0],rownum)
+ tdSql.query(f'select count({k}) from {stbname}_{i} where ts <={self.ts+self.rowNum-2}')
+ tdSql.checkEqual(tdSql.queryResult[0][0],rownum-1)
+ def query_ntb(self,k,ntbname,rownum):
+ tdSql.query(f'select count({k}) from {ntbname}')
+ tdSql.checkEqual(tdSql.queryResult[0][0],rownum)
+ tdSql.query(f'select count({k}) from {ntbname} where ts <={self.ts+self.rowNum-1}')
+ tdSql.checkEqual(tdSql.queryResult[0][0],rownum)
+ tdSql.query(f'select count({k}) from {ntbname} where ts <={self.ts+self.rowNum-2}')
+ tdSql.checkEqual(tdSql.queryResult[0][0],rownum-1)
+ def count_query_stb(self,column_dict,tag_dict,stbname,tbnum,rownum):
+ tdSql.query(f'select count(tbname) from {stbname}')
+ tdSql.checkEqual(tdSql.queryResult[0][0],tbnum*rownum)
+ tdSql.query(f'SELECT count(*) from (select distinct tbname from {stbname})')
+ tdSql.checkEqual(tdSql.queryResult[0][0],tbnum)
+ for k in column_dict.keys():
+ self.query_stb(k,stbname,tbnum,rownum)
+ for k in tag_dict.keys():
+ self.query_stb(k,stbname,tbnum,rownum)
+ def count_query_ctb(self,column_dict,tag_dict,stbname,tbnum,rownum):
+ for i in range(tbnum):
+ tdSql.query(f'select count(tbname) from {stbname}_{i}')
+ tdSql.checkEqual(tdSql.queryResult[0][0],rownum)
+ for k in column_dict.keys():
+ self.query_ctb(k,i,stbname,rownum)
+ for k in tag_dict.keys():
+ self.query_ctb(k,i,stbname,rownum)
+ def count_query_ntb(self,column_dict,ntbname,rownum):
+ tdSql.query(f'select count(tbname) from {ntbname}')
+ tdSql.checkEqual(tdSql.queryResult[0][0],rownum)
+ for k in column_dict.keys():
+ self.query_ntb(k,ntbname,rownum)
+ def insert_data(self,column_dict,tbname,row_num):
+ insert_sql = self.setsql.set_insertsql(column_dict,tbname)
+ for i in range(row_num):
+ insert_list = []
+ self.setsql.insert_values(column_dict,i,insert_sql,insert_list,self.ts)
+ def check_ntb(self):
tdSql.prepare()
-
- tdSql.execute('''create table stb(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double,
- col7 bool, col8 binary(20), col9 nchar(20), col11 tinyint unsigned, col12 smallint unsigned, col13 int unsigned, col14 bigint unsigned) tags(loc nchar(20))''')
- tdSql.execute("create table stb_1 using stb tags('beijing')")
- tdSql.execute("create table stb_2 using stb tags('shanghai')")
-
- tdSql.execute('''create table ntb(ts timestamp, col1 tinyint, col2 smallint, col3 int, col4 bigint, col5 float, col6 double,
- col7 bool, col8 binary(20), col9 nchar(20), col11 tinyint unsigned, col12 smallint unsigned, col13 int unsigned, col14 bigint unsigned)''')
-
- for i in range(self.rowNum):
- tdSql.execute("insert into stb_1 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d', %d, %d, %d, %d)"
- % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1))
- tdSql.execute("insert into stb_2 values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d', %d, %d, %d, %d)"
- % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1))
-
- for i in range(self.rowNum):
- tdSql.execute("insert into ntb values(%d, %d, %d, %d, %d, %f, %f, %d, 'taosdata%d', '涛思数据%d', %d, %d, %d, %d)"
- % (self.ts + i, i + 1, i + 1, i + 1, i + 1, i + 0.1, i + 0.1, i % 2, i + 1, i + 1, i + 1, i + 1, i + 1, i + 1))
-
- tdSql.query("select count(*) from stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(*) from db.stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(ts) from stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(ts) from db.stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(col1) from stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(col1) from db.stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(col2) from stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(col2) from db.stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(col3) from stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(col3) from db.stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(col4) from stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(col4) from db.stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(col5) from stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(col5) from db.stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(col6) from stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(col6) from db.stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(col7) from stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(col7) from db.stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(col8) from stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(col8) from db.stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(col9) from stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(col9) from db.stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(col11) from stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(col11) from db.stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(col12) from stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(col12) from db.stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(col13) from stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(col13) from db.stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(col14) from stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(col14) from db.stb")
- tdSql.checkData(0,0,20)
-
-
-
- tdSql.query("select count(ts) from db.stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(ts) from db.stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(col1) from stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(col1) from db.stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(col2) from stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(col2) from db.stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(col3) from stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(col3) from db.stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(col4) from stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(col4) from db.stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(col5) from stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(col5) from db.stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(col6) from stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(col6) from db.stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(col7) from stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(col7) from db.stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(col8) from stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(col8) from db.stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(col9) from stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(col9) from db.stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(col11) from stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(col11) from db.stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(col12) from stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(col12) from db.stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(col13) from stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(col13) from db.stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(col14) from stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(col14) from db.stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(col1) from stb_1 group by col7")
- tdSql.checkRows(2)
-
- tdSql.execute("insert into stb_1 values(now,null,null,null,null,null,null,null,null,null,null,null,null,null)")
- tdSql.query("select count(col1) from stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(col1),count(ts) from stb_1")
- tdSql.checkData(0,0,10)
- tdSql.checkData(0,1,11)
-
- tdSql.query("select count(col1) from db.stb_1")
- tdSql.checkData(0,0,10)
- tdSql.query("select count(col1),count(ts) from db.stb_1")
- tdSql.checkData(0,0,10)
- tdSql.checkData(0,1,11)
-
- tdSql.query("select count(col1) from stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(col1),count(ts) from stb")
- tdSql.checkData(0,0,20)
- tdSql.checkData(0,1,21)
-
- tdSql.query("select count(col1) from db.stb")
- tdSql.checkData(0,0,20)
- tdSql.query("select count(col1),count(ts) from db.stb")
- tdSql.checkData(0,0,20)
- tdSql.checkData(0,1,21)
- tdSql.query("select count(col1) from stb_1 group by col7")
- tdSql.checkRows(3)
- tdSql.query("select count(col1) from stb_2 group by col7")
- tdSql.checkRows(2)
- tdSql.query("select count(col1) from stb group by col7")
- tdSql.checkRows(3)
-
-
-
-
+ tdSql.execute(self.setsql.set_create_normaltable_sql(self.ntbname,self.column_dict))
+ tdSql.query(f'select count(tbname) from {self.ntbname}')
+ tdSql.checkRows(0)
+ tdSql.execute('flush database db')
+ tdSql.query(f'select count(tbname) from {self.ntbname}')
+ tdSql.checkRows(0)
+ self.insert_data(self.column_dict,self.ntbname,self.rowNum)
+ self.count_query_ntb(self.column_dict,self.ntbname,self.rowNum)
+ tdSql.execute('flush database db')
+ self.count_query_ntb(self.column_dict,self.ntbname,self.rowNum)
+ tdSql.execute('drop database db')
+ def check_stb(self):
+ tdSql.prepare()
+ tdSql.execute(self.setsql.set_create_stable_sql(self.stbname,self.column_dict,self.tag_dict))
+ for i in range(self.tbnum):
+ tdSql.execute(f'create table {self.stbname}_{i} using {self.stbname} tags({self.tag_values[i]})')
+ #!TODO
+ # tdSql.query(f'SELECT count(*) from (select distinct tbname from {self.stbname})')
+ # tdSql.checkEqual(tdSql.queryResult[0][0],self.tbnum)
+ tdSql.query(f'select count(tbname) from {self.stbname}')
+ tdSql.checkRows(0)
+ tdSql.execute('flush database db')
+ tdSql.query(f'select count(tbname) from {self.stbname}')
+ tdSql.checkRows(0)
+ #!TODO
+ # tdSql.query(f'SELECT count(*) from (select distinct tbname from {self.stbname})')
+ # tdSql.checkEqual(tdSql.queryResult[0][0],self.tbnum)
+ for i in range(self.tbnum):
+ self.insert_data(self.column_dict,f'{self.stbname}_{i}',self.rowNum)
+ self.count_query_stb(self.column_dict,self.tag_dict,self.stbname,self.tbnum,self.rowNum)
+ self.count_query_ctb(self.column_dict,self.tag_dict,self.stbname,self.tbnum,self.rowNum)
+ tdSql.execute('flush database db')
+ self.count_query_stb(self.column_dict,self.tag_dict,self.stbname,self.tbnum,self.rowNum)
+ self.count_query_ctb(self.column_dict,self.tag_dict,self.stbname,self.tbnum,self.rowNum)
+ tdSql.execute('drop database db')
+ def run(self):
+ self.check_stb()
+ self.check_ntb()
def stop(self):
tdSql.close()
tdLog.success("%s successfully executed" % __file__)
diff --git a/tests/system-test/7-tmq/tmqUpdate-1ctb.py b/tests/system-test/7-tmq/tmqUpdate-1ctb.py
index 3cb364f91d..8513092be9 100644
--- a/tests/system-test/7-tmq/tmqUpdate-1ctb.py
+++ b/tests/system-test/7-tmq/tmqUpdate-1ctb.py
@@ -19,7 +19,7 @@ class TDTestCase:
self.snapshot = 0
self.vgroups = 4
self.ctbNum = 1
- self.rowsPerTbl = 100000
+ self.rowsPerTbl = 10000
def init(self, conn, logSql):
tdLog.debug(f"start to excute {__file__}")
diff --git a/tests/system-test/7-tmq/tmqUpdate1.py b/tests/system-test/7-tmq/tmqUpdate1.py
deleted file mode 100644
index 5f11090385..0000000000
--- a/tests/system-test/7-tmq/tmqUpdate1.py
+++ /dev/null
@@ -1,175 +0,0 @@
-
-import taos
-import sys
-import time
-import socket
-import os
-import threading
-from enum import Enum
-
-from util.log import *
-from util.sql import *
-from util.cases import *
-from util.dnodes import *
-sys.path.append("./7-tmq")
-from tmqCommon import *
-
-class TDTestCase:
- def __init__(self):
- self.vgroups = 4
- self.ctbNum = 1000
- self.rowsPerTbl = 1000
-
- def init(self, conn, logSql):
- tdLog.debug(f"start to excute {__file__}")
- tdSql.init(conn.cursor(), False)
-
- def prepareTestEnv(self):
- tdLog.printNoPrefix("======== prepare test env include database, stable, ctables, and insert data: ")
- paraDict = {'dbName': 'dbt',
- 'dropFlag': 1,
- 'event': '',
- 'vgroups': 4,
- 'stbName': 'stb',
- 'colPrefix': 'c',
- 'tagPrefix': 't',
- 'colSchema': [{'type': 'INT', 'count':1},{'type': 'BIGINT', 'count':1},{'type': 'DOUBLE', 'count':1},{'type': 'BINARY', 'len':32, 'count':1},{'type': 'NCHAR', 'len':32, 'count':1},{'type': 'TIMESTAMP', 'count':1}],
- 'tagSchema': [{'type': 'INT', 'count':1},{'type': 'BIGINT', 'count':1},{'type': 'DOUBLE', 'count':1},{'type': 'BINARY', 'len':32, 'count':1},{'type': 'NCHAR', 'len':32, 'count':1}],
- 'ctbPrefix': 'ctb',
- 'ctbStartIdx': 0,
- 'ctbNum': 1000,
- 'rowsPerTbl': 1000,
- 'batchNum': 400,
- 'startTs': 1640966400000, # 2022-01-01 00:00:00.000
- 'pollDelay': 3,
- 'showMsg': 1,
- 'showRow': 1,
- 'snapshot': 0}
-
- paraDict['vgroups'] = self.vgroups
- paraDict['ctbNum'] = self.ctbNum
- paraDict['rowsPerTbl'] = self.rowsPerTbl
-
- tmqCom.initConsumerTable()
- tdCom.create_database(tdSql, paraDict["dbName"],paraDict["dropFlag"], vgroups=paraDict["vgroups"],replica=1)
- tdLog.info("create stb")
- tmqCom.create_stable(tdSql, dbName=paraDict["dbName"],stbName=paraDict["stbName"])
- tdLog.info("create ctb")
- tmqCom.create_ctable(tdSql, dbName=paraDict["dbName"],stbName=paraDict["stbName"],ctbPrefix=paraDict['ctbPrefix'],
- ctbNum=paraDict["ctbNum"],ctbStartIdx=paraDict['ctbStartIdx'])
- tdLog.info("insert data")
- paraDict['ctbNum'] = int(self.ctbNum / 2)
- tmqCom.insert_data_interlaceByMultiTbl(tsql=tdSql,dbName=paraDict["dbName"],ctbPrefix=paraDict["ctbPrefix"],
- ctbNum=paraDict["ctbNum"],rowsPerTbl=paraDict["rowsPerTbl"],batchNum=paraDict["batchNum"],
- startTs=paraDict["startTs"],ctbStartIdx=paraDict['ctbStartIdx'])
- tmqCom.insert_data_with_autoCreateTbl(tsql=tdSql,dbName=paraDict["dbName"],stbName=paraDict["stbName"],ctbPrefix="ctbx",
- ctbNum=paraDict["ctbNum"],rowsPerTbl=paraDict["rowsPerTbl"],batchNum=paraDict["batchNum"],
- startTs=paraDict["startTs"],ctbStartIdx=paraDict['ctbStartIdx'])
-
- # tdLog.info("restart taosd to ensure that the data falls into the disk")
- # tdSql.query("flush database %s"%(paraDict['dbName']))
- return
-
- def tmqCase1(self):
- tdLog.printNoPrefix("======== test case 1: ")
- paraDict = {'dbName': 'dbt',
- 'dropFlag': 1,
- 'event': '',
- 'vgroups': 4,
- 'stbName': 'stb',
- 'colPrefix': 'c',
- 'tagPrefix': 't',
- 'colSchema': [{'type': 'INT', 'count':1},{'type': 'BIGINT', 'count':1},{'type': 'DOUBLE', 'count':1},{'type': 'BINARY', 'len':32, 'count':1},{'type': 'NCHAR', 'len':32, 'count':1},{'type': 'TIMESTAMP', 'count':1}],
- 'tagSchema': [{'type': 'INT', 'count':1},{'type': 'BIGINT', 'count':1},{'type': 'DOUBLE', 'count':1},{'type': 'BINARY', 'len':32, 'count':1},{'type': 'NCHAR', 'len':32, 'count':1}],
- 'ctbPrefix': 'ctb',
- 'ctbStartIdx': 0,
- 'ctbNum': 1000,
- 'rowsPerTbl': 1000,
- 'batchNum': 1000,
- 'startTs': 1640966400000, # 2022-01-01 00:00:00.000
- 'pollDelay': 5,
- 'showMsg': 1,
- 'showRow': 1,
- 'snapshot': 1}
-
- paraDict['vgroups'] = self.vgroups
- paraDict['ctbNum'] = self.ctbNum
- paraDict['rowsPerTbl'] = self.rowsPerTbl
-
- tdLog.info("restart taosd to ensure that the data falls into the disk")
- tdSql.query("flush database %s"%(paraDict['dbName']))
-
- # update to half tables
- paraDict['ctbNum'] = int(self.ctbNum / 4)
- tmqCom.insert_data_with_autoCreateTbl(tsql=tdSql,dbName=paraDict["dbName"],stbName=paraDict["stbName"],ctbPrefix="ctbx",
- ctbNum=paraDict["ctbNum"],rowsPerTbl=paraDict["rowsPerTbl"],batchNum=paraDict["batchNum"],
- startTs=paraDict["startTs"],ctbStartIdx=paraDict['ctbStartIdx']+paraDict['ctbNum'])
- tmqCom.insert_data_interlaceByMultiTbl(tsql=tdSql,dbName=paraDict["dbName"],ctbPrefix=paraDict["ctbPrefix"],
- ctbNum=paraDict["ctbNum"],rowsPerTbl=paraDict["rowsPerTbl"],batchNum=paraDict["batchNum"],
- startTs=paraDict["startTs"],ctbStartIdx=paraDict['ctbStartIdx']+paraDict['ctbNum'])
-
- tmqCom.initConsumerTable()
- tdLog.info("create topics from stb1")
- topicFromStb1 = 'topic_stb1'
- queryString = "select ts, c1, c2 from %s.%s"%(paraDict['dbName'], paraDict['stbName'])
- sqlString = "create topic %s as %s" %(topicFromStb1, queryString)
- tdLog.info("create topic sql: %s"%sqlString)
- tdSql.execute(sqlString)
-
- paraDict['ctbNum'] = self.ctbNum
- consumerId = 0
- expectrowcnt = paraDict["rowsPerTbl"] * paraDict["ctbNum"] * (1 + 1)
- topicList = topicFromStb1
- ifcheckdata = 0
- ifManualCommit = 0
- keyList = 'group.id:cgrp1,\
- enable.auto.commit:true,\
- auto.commit.interval.ms:1000,\
- auto.offset.reset:earliest'
- tmqCom.insertConsumerInfo(consumerId, expectrowcnt + paraDict["rowsPerTbl"] * paraDict["ctbNum"],topicList,keyList,ifcheckdata,ifManualCommit)
-
- tdLog.info("start consume processor")
- tmqCom.startTmqSimProcess(pollDelay=paraDict['pollDelay'],dbName=paraDict["dbName"],showMsg=paraDict['showMsg'], showRow=paraDict['showRow'],snapshot=paraDict['snapshot'])
-
- paraDict['ctbNum'] = int(self.ctbNum / 2)
- paraDict['ctbStartIdx'] += paraDict['ctbNum']
- _ = tmqCom.asyncInsertDataByInterlace(paraDict)
- time.sleep(3)
- pthread = tmqCom.asyncInsertDataByInterlace(paraDict)
- pthread.join()
-
- tdLog.info("insert process end, and start to check consume result")
- expectRows = 1
- resultList = tmqCom.selectConsumeResult(expectRows)
- totalConsumeRows = 0
- for i in range(expectRows):
- totalConsumeRows += resultList[i]
-
- tdSql.query(queryString)
- totalRowsInserted = tdSql.getRows()
-
- tdLog.info("act consume rows: %d, act insert rows: %d, expect consume rows: %d, "%(totalConsumeRows, totalRowsInserted, expectrowcnt))
-
- if totalConsumeRows <= totalRowsInserted or totalConsumeRows != expectrowcnt:
- tdLog.exit("tmq consume rows error!")
-
- tdSql.query("drop topic %s"%topicFromStb1)
-
- tdLog.printNoPrefix("======== test case 1 end ...... ")
-
-
- def run(self):
- tdSql.prepare()
- self.prepareTestEnv()
- self.tmqCase1()
- # self.tmqCase2()
-
-
- def stop(self):
- tdSql.close()
- tdLog.success(f"{__file__} successfully executed")
-
-event = threading.Event()
-
-tdCases.addLinux(__file__, TDTestCase())
-tdCases.addWindows(__file__, TDTestCase())
diff --git a/tests/system-test/fulltest.sh b/tests/system-test/fulltest.sh
index 07c84220f1..2c116113bc 100755
--- a/tests/system-test/fulltest.sh
+++ b/tests/system-test/fulltest.sh
@@ -11,7 +11,7 @@ python3 ./test.py -f 0-others/udfTest.py
python3 ./test.py -f 0-others/udf_create.py
python3 ./test.py -f 0-others/udf_restart_taosd.py
python3 ./test.py -f 0-others/cachelast.py
-
+python3 ./test.py -f 0-others/sysinfo.py
python3 ./test.py -f 0-others/user_control.py
python3 ./test.py -f 0-others/fsync.py
@@ -148,7 +148,7 @@ python3 ./test.py -f 7-tmq/subscribeDb2.py
python3 ./test.py -f 7-tmq/subscribeDb3.py
#python3 ./test.py -f 7-tmq/subscribeDb4.py
python3 ./test.py -f 7-tmq/subscribeStb.py
-#python3 ./test.py -f 7-tmq/subscribeStb0.py
+python3 ./test.py -f 7-tmq/subscribeStb0.py
python3 ./test.py -f 7-tmq/subscribeStb1.py
python3 ./test.py -f 7-tmq/subscribeStb2.py
python3 ./test.py -f 7-tmq/subscribeStb3.py
diff --git a/tests/system-test/test.py b/tests/system-test/test.py
index 0a891759d0..fd0979745e 100644
--- a/tests/system-test/test.py
+++ b/tests/system-test/test.py
@@ -370,3 +370,4 @@ if __name__ == "__main__":
tdLog.info("not need to query")
if conn is not None:
conn.close()
+ sys.exit(0)
diff --git a/tools/taos-tools b/tools/taos-tools
index 3f42d428eb..bd496f76b6 160000
--- a/tools/taos-tools
+++ b/tools/taos-tools
@@ -1 +1 @@
-Subproject commit 3f42d428eb6b90dea2651f4ccea66e44705c831b
+Subproject commit bd496f76b64931c66da2f8b0f24143a98a881cde