xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #4288 from taosdata/feature/query 

Feature/query
This commit is contained in:
haojun Liao 2020-11-19 14:19:50 +08:00 committed by GitHub
parent 36bf5b1235 af8f4bb236
commit a08429e958
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
85 changed files with 271 additions and 325 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/client/inc/tsclient.h
View File

@ -293,33 +293,32 @@ typedef struct SResRec {
} SResRec;
typedef struct {
int64_t numOfRows; // num of results in current retrieved
int64_t numOfRowsGroup; // num of results of current group
int64_t numOfTotal; // num of total results
int64_t numOfClauseTotal; // num of total result in current subclause
char * pRsp;
int32_t rspType;
int32_t rspLen;
uint64_t qhandle;
int64_t uid;
int64_t useconds;
int64_t offset; // offset value from vnode during projection query of stable
int32_t row;
int16_t numOfCols;
int16_t precision;
bool completed;
int32_t code;
int32_t numOfGroups;
SResRec * pGroupRec;
char * data;
TAOS_ROW tsrow;
TAOS_ROW urow;
int32_t* length; // length for each field for current row
char ** buffer; // Buffer used to put multibytes encoded using unicode (wchar_t)
SColumnIndex * pColumnIndex;
int32_t numOfRows; // num of results in current retrieval
int64_t numOfRowsGroup; // num of results of current group
int64_t numOfTotal; // num of total results
int64_t numOfClauseTotal; // num of total result in current subclause
char * pRsp;
int32_t rspType;
int32_t rspLen;
uint64_t qhandle;
int64_t useconds;
int64_t offset; // offset value from vnode during projection query of stable
int32_t row;
int16_t numOfCols;
int16_t precision;
bool completed;
int32_t code;
int32_t numOfGroups;
SResRec * pGroupRec;
char * data;
TAOS_ROW tsrow;
TAOS_ROW urow;
int32_t* length; // length for each field for current row
char ** buffer; // Buffer used to put multibytes encoded using unicode (wchar_t)
SColumnIndex* pColumnIndex;
SArithmeticSupport* pArithSup; // support the arithmetic expression calculation on agg functions
struct SLocalReducer *pLocalReducer;
struct SLocalReducer* pLocalReducer;
} SSqlRes;
typedef struct STscObj {

8
src/client/src/tscLocalMerge.c
View File

@ -884,17 +884,17 @@ static void genFinalResWithoutFill(SSqlRes* pRes, SLocalReducer *pLocalReducer,
tFilePage * pBeforeFillData = pLocalReducer->pResultBuf;
pRes->data = pLocalReducer->pFinalRes;
pRes->numOfRows = pBeforeFillData->num;
pRes->numOfRows = (int32_t) pBeforeFillData->num;
if (pQueryInfo->limit.offset > 0) {
if (pQueryInfo->limit.offset < pRes->numOfRows) {
int32_t prevSize = (int32_t)pBeforeFillData->num;
int32_t prevSize = (int32_t) pBeforeFillData->num;
tColModelErase(pLocalReducer->finalModel, pBeforeFillData, prevSize, 0, (int32_t)pQueryInfo->limit.offset - 1);
/* remove the hole in column model */
tColModelCompact(pLocalReducer->finalModel, pBeforeFillData, prevSize);
pRes->numOfRows -= pQueryInfo->limit.offset;
pRes->numOfRows -= (int32_t) pQueryInfo->limit.offset;
pQueryInfo->limit.offset = 0;
} else {
pQueryInfo->limit.offset -= pRes->numOfRows;
@ -962,7 +962,7 @@ static void doFillResult(SSqlObj *pSql, SLocalReducer *pLocalReducer, bool doneO
}
pRes->data = pLocalReducer->pFinalRes;
pRes->numOfRows = newRows;
pRes->numOfRows = (int32_t) newRows;
pQueryInfo->limit.offset = 0;
break;

5
src/client/src/tscServer.c
View File

@ -789,8 +789,7 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
size_t output = tscNumOfFields(pQueryInfo);
if ((tscIsSecondStageQuery(pQueryInfo) || UTIL_TABLE_IS_NORMAL_TABLE(pTableMetaInfo) ||
UTIL_TABLE_IS_CHILD_TABLE(pTableMetaInfo))) {
if (tscIsSecondStageQuery(pQueryInfo)) {
pQueryMsg->secondStageOutput = htonl((int32_t) output);
SSqlFuncMsg *pSqlFuncExpr1 = (SSqlFuncMsg *)pMsg;
@ -2219,7 +2218,7 @@ int tscProcessRetrieveRspFromNode(SSqlObj *pSql) {
}
pRes->row = 0;
tscDebug("%p numOfRows:%" PRId64 ", offset:%" PRId64 ", complete:%d", pSql, pRes->numOfRows, pRes->offset, pRes->completed);
tscDebug("%p numOfRows:%d, offset:%" PRId64 ", complete:%d", pSql, pRes->numOfRows, pRes->offset, pRes->completed);
return 0;
}

47
src/client/src/tscSql.c
View File

@ -394,7 +394,7 @@ int taos_affected_rows(TAOS_RES *tres) {
SSqlObj* pSql = (SSqlObj*) tres;
if (pSql == NULL || pSql->signature != pSql) return 0;
return (int)(pSql->res.numOfRows);
return pSql->res.numOfRows;
}
TAOS_FIELD *taos_fetch_fields(TAOS_RES *res) {
@ -440,53 +440,12 @@ int taos_retrieve(TAOS_RES *res) {
tscResetForNextRetrieve(pRes);
if (pCmd->command < TSDB_SQL_LOCAL) {
pCmd->command = (pCmd->command > TSDB_SQL_MGMT) ? TSDB_SQL_RETRIEVE : TSDB_SQL_FETCH;
}
tscProcessSql(pSql);
return (int)pRes->numOfRows;
}
int taos_fetch_block_impl(TAOS_RES *res, TAOS_ROW *rows) {
SSqlObj *pSql = (SSqlObj *)res;
SSqlCmd *pCmd = &pSql->cmd;
SSqlRes *pRes = &pSql->res;
if (pRes->qhandle == 0 || pSql->signature != pSql) {
*rows = NULL;
return 0;
}
// Retrieve new block
tscResetForNextRetrieve(pRes);
if (pCmd->command < TSDB_SQL_LOCAL) {
pCmd->command = (pCmd->command > TSDB_SQL_MGMT) ? TSDB_SQL_RETRIEVE : TSDB_SQL_FETCH;
}
tscProcessSql(pSql);
if (pRes->numOfRows == 0) {
*rows = NULL;
return 0;
}
// secondary merge has handle this situation
if (pCmd->command != TSDB_SQL_RETRIEVE_LOCALMERGE) {
pRes->numOfClauseTotal += pRes->numOfRows;
}
SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
if (pQueryInfo == NULL)
return 0;
assert(0);
for (int i = 0; i < pQueryInfo->fieldsInfo.numOfOutput; ++i) {
tscGetResultColumnChr(pRes, &pQueryInfo->fieldsInfo, i, 0);
}
*rows = pRes->tsrow;
return (int)((pQueryInfo->order.order == TSDB_ORDER_DESC) ? pRes->numOfRows : -pRes->numOfRows);
return pRes->numOfRows;
}
static bool needToFetchNewBlock(SSqlObj* pSql) {
@ -573,7 +532,7 @@ int taos_fetch_block(TAOS_RES *res, TAOS_ROW *rows) {
*rows = pRes->urow;
tscClearSqlOwner(pSql);
return (int32_t) pRes->numOfRows;
return pRes->numOfRows;
}
int taos_select_db(TAOS *taos, const char *db) {

14
src/client/src/tscSubquery.c
View File

@ -948,7 +948,7 @@ static void tsCompRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow
if (!pRes->completed) {
taosGetTmpfilePath("ts-join", pSupporter->path);
pSupporter->f = fopen(pSupporter->path, "w");
pRes->row = (int32_t)pRes->numOfRows;
pRes->row = pRes->numOfRows;
taos_fetch_rows_a(tres, tsCompRetrieveCallback, param);
return;
@ -974,7 +974,7 @@ static void tsCompRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow
// TODO check for failure
pSupporter->f = fopen(pSupporter->path, "w");
pRes->row = (int32_t)pRes->numOfRows;
pRes->row = pRes->numOfRows;
// set the callback function
pSql->fp = tscJoinQueryCallback;
@ -1085,7 +1085,7 @@ static void joinRetrieveFinalResCallback(void* param, TAOS_RES* tres, int numOfR
SSqlRes* pRes1 = &pParentSql->pSubs[i]->res;
if (pRes1->row > 0 && pRes1->numOfRows > 0) {
tscDebug("%p sub:%p index:%d numOfRows:%"PRId64" total:%"PRId64 " (not retrieve)", pParentSql, pParentSql->pSubs[i], i,
tscDebug("%p sub:%p index:%d numOfRows:%d total:%"PRId64 " (not retrieve)", pParentSql, pParentSql->pSubs[i], i,
pRes1->numOfRows, pRes1->numOfTotal);
assert(pRes1->row < pRes1->numOfRows);
} else {
@ -1093,7 +1093,7 @@ static void joinRetrieveFinalResCallback(void* param, TAOS_RES* tres, int numOfR
pRes1->numOfClauseTotal += pRes1->numOfRows;
}
tscDebug("%p sub:%p index:%d numOfRows:%"PRId64" total:%"PRId64, pParentSql, pParentSql->pSubs[i], i,
tscDebug("%p sub:%p index:%d numOfRows:%d total:%"PRId64, pParentSql, pParentSql->pSubs[i], i,
pRes1->numOfRows, pRes1->numOfTotal);
}
}
@ -2032,7 +2032,7 @@ static void tscRetrieveFromDnodeCallBack(void *param, TAOS_RES *tres, int numOfR
assert(pRes->numOfRows == numOfRows);
int64_t num = atomic_add_fetch_64(&pState->numOfRetrievedRows, numOfRows);
tscDebug("%p sub:%p retrieve numOfRows:%" PRId64 " totalNumOfRows:%" PRIu64 " from ep:%s, orderOfSub:%d", pParentSql, pSql,
tscDebug("%p sub:%p retrieve numOfRows:%d totalNumOfRows:%" PRIu64 " from ep:%s, orderOfSub:%d", pParentSql, pSql,
pRes->numOfRows, pState->numOfRetrievedRows, pSql->epSet.fqdn[pSql->epSet.inUse], idx);
if (num > tsMaxNumOfOrderedResults && tscIsProjectionQueryOnSTable(pQueryInfo, 0)) {
@ -2059,7 +2059,7 @@ static void tscRetrieveFromDnodeCallBack(void *param, TAOS_RES *tres, int numOfR
}
int32_t ret = saveToBuffer(trsupport->pExtMemBuffer[idx], pDesc, trsupport->localBuffer, pRes->data,
(int32_t)pRes->numOfRows, pQueryInfo->groupbyExpr.orderType);
pRes->numOfRows, pQueryInfo->groupbyExpr.orderType);
if (ret != 0) { // set no disk space error info, and abort retry
tscAbortFurtherRetryRetrieval(trsupport, tres, TSDB_CODE_TSC_NO_DISKSPACE);
} else if (pRes->completed) {
@ -2171,7 +2171,7 @@ static void multiVnodeInsertFinalize(void* param, TAOS_RES* tres, int numOfRows)
return;
}
tscDebug("%p Async insertion completed, total inserted:%" PRId64, pParentObj, pParentObj->res.numOfRows);
tscDebug("%p Async insertion completed, total inserted:%d", pParentObj, pParentObj->res.numOfRows);
// restore user defined fp
pParentObj->fp = pParentObj->fetchFp;

5
src/client/src/tscUtil.c
View File

@ -220,11 +220,6 @@ bool tscIsPointInterpQuery(SQueryInfo* pQueryInfo) {
}
bool tscIsSecondStageQuery(SQueryInfo* pQueryInfo) {
STableMetaInfo* pTableMetaInfo = pQueryInfo->pTableMetaInfo[0];
if (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
return false;
}
if (tscIsProjectionQuery(pQueryInfo)) {
return false;
}

4
src/query/src/qExecutor.c
View File

@ -853,9 +853,9 @@ static int32_t getNextQualifiedWindow(SQueryRuntimeEnv *pRuntimeEnv, STimeWindow
int32_t factor = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
startPos = prevPosition + factor;
} else {
if (startKey < pDataBlockInfo->window.skey && QUERY_IS_ASC_QUERY(pQuery)) {
if (startKey <= pDataBlockInfo->window.skey && QUERY_IS_ASC_QUERY(pQuery)) {
startPos = 0;
} else if (startKey > pDataBlockInfo->window.ekey && !QUERY_IS_ASC_QUERY(pQuery)) {
} else if (startKey >= pDataBlockInfo->window.ekey && !QUERY_IS_ASC_QUERY(pQuery)) {
startPos = pDataBlockInfo->rows - 1;
} else {
startPos = searchFn((char *)primaryKeys, pDataBlockInfo->rows, startKey, pQuery->order.order);

3
src/query/src/qParserImpl.c
View File

@ -225,7 +225,8 @@ tSQLExpr *tSQLExprCreate(tSQLExpr *pLeft, tSQLExpr *pRight, int32_t optrType) {
tSQLExprDestroy(pLeft);
tSQLExprDestroy(pRight);
} else if ((pLeft->nSQLOptr == TK_FLOAT && pRight->nSQLOptr == TK_INTEGER) || (pLeft->nSQLOptr == TK_INTEGER && pRight->nSQLOptr == TK_FLOAT)) {
} else if ((pLeft->nSQLOptr == TK_FLOAT && pRight->nSQLOptr == TK_INTEGER) || (pLeft->nSQLOptr == TK_INTEGER && pRight->nSQLOptr == TK_FLOAT) ||
(pLeft->nSQLOptr == TK_FLOAT && pRight->nSQLOptr == TK_FLOAT)) {
pExpr->val.nType = TSDB_DATA_TYPE_DOUBLE;
pExpr->nSQLOptr = TK_FLOAT;

12
tests/script/general/parser/alter.sim
View File

@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c tableMetaKeepTimer -v 3
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = m_alt_db
@ -114,7 +114,7 @@ endi
sql drop table tb
sql drop table mt
sleep 1000
sleep 500
### ALTER TABLE WHILE STREAMING [TBASE271]
#sql create table tb1 (ts timestamp, c1 int, c2 nchar(5), c3 int)
#sql create table strm as select count(*), avg(c1), first(c2), sum(c3) from tb1 interval(2s)
@ -134,7 +134,7 @@ sleep 1000
# return -1
#endi
#sql alter table tb1 drop column c3
#sleep 6000
#sleep 3000
#sql insert into tb1 values (now, 2, 'taos')
#sleep 30000
#sql select * from strm
@ -145,9 +145,9 @@ sleep 1000
# return -1
#endi
#sql alter table tb1 add column c3 int
#sleep 6000
#sleep 3000
#sql insert into tb1 values (now, 3, 'taos', 3);
#sleep 1000
#sleep 500
#sql select * from strm
#if $rows != 3 then
# return -1
@ -186,7 +186,7 @@ sql create database $db
sql use $db
sql create table mt (ts timestamp, c1 int, c2 nchar(7), c3 int) tags (t1 int)
sql create table tb using mt tags(1)
sleep 1000
sleep 500
sql insert into tb values ('2018-11-01 16:30:00.000', 1, 'insert', 1)
sql alter table mt drop column c3

4
tests/script/general/parser/alter1.sim
View File

@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
sql reset query cache
@ -87,7 +87,7 @@ if $data13 != NULL then
return -1
endi
sleep 1000
sleep 500
print ================== insert values into table
sql insert into car1 values (now, 1, 1,1 ) (now +1s, 2,2,2,) car2 values (now, 1,3,3)

2
tests/script/general/parser/alter_stable.sim
View File

@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c tableMetaKeepTimer -v 3
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
print ========== alter_stable.sim

8
tests/script/general/parser/auto_create_tb.sim
View File

@ -4,7 +4,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
print ======================== dnode1 start
@ -208,11 +208,11 @@ endi
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 5000
sleep 3000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
sleep 1000
sleep 500
sql use $db
#### auto create multiple tables
@ -298,7 +298,7 @@ endi
sql create table tu(ts timestamp, k int);
sql_error create table txu using tu tags(0) values(now, 1);
#[TBASE-675]
print =================> [TBASE-675]
sql insert into tu values(1565971200000, 1) (1565971200000,2) (1565971200001, 3)(1565971200001, 4)
sql select * from tu
if $rows != 2 then

8
tests/script/general/parser/auto_create_tb_drop_tb.sim
View File

@ -4,7 +4,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
system sh/cfg.sh -n dnode1 -c ctime -v 30
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = db
@ -49,7 +49,7 @@ while $t < $tbNum
endw
print ====== tables created
sleep 60000
sleep 500
sql drop table tb2
$x = 0
@ -59,9 +59,7 @@ while $x < $rowNum
$t1 = $t1 . '
sql insert into tb1 using $stb tags( $t1 ) values ( $ts , $x )
$x = $x + 1
endw
sleep 6000
endw
$ts = $ts0 + $delta
$ts = $ts + 1

2
tests/script/general/parser/binary_escapeCharacter.sim
View File

@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c tableMetaKeepTimer -v 3
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
sql drop database if exists ecdb

7
tests/script/general/parser/col_arithmetic_operation.sim
View File

@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = ca_db
@ -34,7 +34,7 @@ while $i < $halfTbNum
$tb1 = $tbPrefix . $tbId
sql create table $tb using $stb tags( $i )
sql create table $tb1 using $stb tags( $tbId )
$x = 0
while $x < $rowNum
$xs = $x * $delta
@ -46,8 +46,7 @@ while $i < $halfTbNum
$binary = $binary . '
$nchar = 'nchar . $c
$nchar = $nchar . '
sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar )
sql insert into $tb1 values ( $ts , NULL , $c , NULL , $c , NULL , $c , NULL, NULL , $nchar )
sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) $tb1 values ( $ts , NULL , $c , NULL , $c , NULL , $c , NULL, NULL , $nchar )
$x = $x + 1
endw
$i = $i + 1

2
tests/script/general/parser/columnValue.sim
View File

@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c tableMetaKeepTimer -v 3
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
print ========== columnValues.sim

2
tests/script/general/parser/columnValue_bigint.sim
View File

@ -1,4 +1,4 @@
sleep 1000
sleep 500
sql connect
sql create database if not exists db
sql use db

2
tests/script/general/parser/columnValue_bool.sim
View File

@ -1,4 +1,4 @@
sleep 1000
sleep 500
sql connect
sql create database if not exists db
sql use db

2
tests/script/general/parser/columnValue_double.sim
View File

@ -1,5 +1,5 @@
####
sleep 1000
sleep 500
sql connect
sql create database if not exists db
sql use db

2
tests/script/general/parser/columnValue_float.sim
View File

@ -1,5 +1,5 @@
####
sleep 1000
sleep 500
sql connect
sql create database if not exists db
sql use db

2
tests/script/general/parser/columnValue_int.sim
View File

@ -1,4 +1,4 @@
sleep 1000
sleep 500
sql connect
sql create database if not exists db
sql use db

2
tests/script/general/parser/columnValue_smallint.sim
View File

@ -1,4 +1,4 @@
sleep 1000
sleep 500
sql connect
sql create database if not exists db
sql use db

2
tests/script/general/parser/columnValue_tinyint.sim
View File

@ -1,4 +1,4 @@
sleep 1000
sleep 500
sql connect
sql create database if not exists db
sql use db

11
tests/script/general/parser/commit.sim
View File

@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxTablesperVnode -v 100
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = sc_db
@ -50,8 +50,7 @@ while $i < $halfNum
$binary = $binary . '
$nchar = 'nchar . $c
$nchar = $nchar . '
sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar )
sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
$x = $x + 1
endw
@ -83,12 +82,12 @@ endw
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 5000
sleep 3000
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
print ================== server restart completed
sql connect
sleep 1000
sleep 500
print ====== select from table and check num of rows returned
sql use $db

4
tests/script/general/parser/constCol.sim
View File

@ -353,8 +353,8 @@ if $rows != 3 then
endi
print =============================> td-2036
if $data00 != 0.3000000 then
print expect: 0.3000000, actual:$data00
if $data00 != 0.300000000 then
print expect: 0.300000000, actual:$data00
return -1
endi

2
tests/script/general/parser/create_db.sim
View File

@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
print ======================== dnode1 start

2
tests/script/general/parser/create_mt.sim
View File

@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
print ======================== dnode1 start

2
tests/script/general/parser/create_tb.sim
View File

@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
print ======================== dnode1 start

2
tests/script/general/parser/dbtbnameValidate.sim
View File

@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
print ========== db name and table name check in create and drop, describe

2
tests/script/general/parser/fill.sim
View File

@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = m_fl_db

2
tests/script/general/parser/fill_stb.sim
View File

@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = fl1_db

2
tests/script/general/parser/fill_us.sim
View File

@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = m_fl_db

6
tests/script/general/parser/first_last.sim
View File

@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxTablespervnode -v 4
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = first_db
@ -76,11 +76,11 @@ run general/parser/first_last_query.sim
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 5000
sleep 3000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
sleep 1000
sleep 500
run general/parser/first_last_query.sim

2
tests/script/general/parser/first_last_query.sim
View File

@ -1,4 +1,4 @@
sleep 1000
sleep 500
sql connect
$dbPrefix = first_db

2
tests/script/general/parser/groupby.sim
View File

@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = group_db

4
tests/script/general/parser/import.sim
View File

@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = impt_db
@ -64,7 +64,7 @@ sleep 2000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
sleep 1000
sleep 500
sql use $db
sql select * from tb

4
tests/script/general/parser/import_commit1.sim
View File

@ -4,7 +4,7 @@ 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 ctime -v 30
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = ic_db
@ -40,7 +40,7 @@ while $x < $rowNum
endw
print ====== tables created
sleep 6000
sleep 3000
$ts = $ts0 + $delta
$ts = $ts + 1

4
tests/script/general/parser/import_commit2.sim
View File

@ -4,7 +4,7 @@ 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 ctime -v 30
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = ic_db
@ -39,7 +39,7 @@ while $x < $rowNum
endw
print ====== tables created
sleep 6000
sleep 3000
$ts = $ts0 + $delta
$ts = $ts + 1

6
tests/script/general/parser/import_commit3.sim
View File

@ -4,7 +4,7 @@ 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 ctime -v 30
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = ic_db
@ -39,7 +39,7 @@ while $x < $rowNum
endw
print ====== tables created
sleep 6000
sleep 3000
$ts = $ts + 1
sql insert into $tb values ( $ts , -1, -1, -1, -1, -1)
@ -47,7 +47,7 @@ $ts = $ts0 + $delta
$ts = $ts + 1
sql import into $tb values ( $ts , -2, -2, -2, -2, -2)
sleep 6000
sleep 3000
sql show databases

2
tests/script/general/parser/insert_multiTbl.sim
View File

@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/exec.sh -n dnode1 -s start
sleep 2000
sql connect
sleep 1000
sleep 500
print ======================== dnode1 start
sql create database mul_db

6
tests/script/general/parser/insert_tb.sim
View File

@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
print ======================== dnode1 start
@ -103,7 +103,7 @@ if $rows != 1 then
endi
sql drop database $db
sleep 1000
sleep 500
sql create database $db
sql use $db
sql create table stb1 (ts timestamp, c1 int) tags(t1 int)
@ -136,7 +136,7 @@ if $data21 != 1.000000000 then
endi
sql drop database $db
sleep 1000
sleep 500
sql create database $db
sql use $db
sql create table stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 nchar(10), c6 binary(20)) tags(t1 int, t2 bigint, t3 double, t4 float, t5 nchar(10))

4
tests/script/general/parser/interp.sim
View File

@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = intp_db
@ -60,7 +60,7 @@ run general/parser/interp_test.sim
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 5000
sleep 3000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed

2
tests/script/general/parser/interp_test.sim
View File

@ -1,4 +1,4 @@
sleep 1000
sleep 500
sql connect
$dbPrefix = intp_db

2
tests/script/general/parser/join.sim
View File

@ -7,7 +7,7 @@ system sh/cfg.sh -n dnode1 -c rpcDebugFlag -v 135
system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = join_db

2
tests/script/general/parser/join_multivnode.sim
View File

@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
system sh/exec.sh -n dnode1 -s start
sql connect
sleep 1000
sleep 500
$dbPrefix = join_m_db
$tbPrefix = join_tb

6
tests/script/general/parser/lastrow.sim
View File

@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = lr_db
@ -62,11 +62,11 @@ run general/parser/lastrow_query.sim
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 5000
sleep 3000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
sleep 1000
sleep 500
run general/parser/lastrow_query.sim

2
tests/script/general/parser/lastrow_query.sim
View File

@ -1,4 +1,4 @@
sleep 1000
sleep 500
sql connect
$dbPrefix = lr_db

6
tests/script/general/parser/limit.sim
View File

@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = lm_db
@ -62,11 +62,11 @@ run general/parser/limit_stb.sim
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 5000
sleep 3000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
sleep 1000
sleep 500
run general/parser/limit_tb.sim
run general/parser/limit_stb.sim

7
tests/script/general/parser/limit1.sim
View File

@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = lm1_db
@ -48,8 +48,7 @@ while $i < $halfNum
$binary = $binary . '
$nchar = 'nchar . $c
$nchar = $nchar . '
sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar )
sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
$x = $x + 1
endw
@ -62,7 +61,7 @@ run general/parser/limit1_stb.sim
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 5000
sleep 3000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed

2
tests/script/general/parser/limit1_stb.sim
View File

@ -1,4 +1,4 @@
sleep 1000
sleep 500
sql connect
$dbPrefix = lm1_db

2
tests/script/general/parser/limit1_tb.sim
View File

@ -1,4 +1,4 @@
sleep 1000
sleep 500
sql connect
$dbPrefix = lm1_db

7
tests/script/general/parser/limit1_tblocks100.sim
View File

@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = lm1_db
@ -48,8 +48,7 @@ while $i < $halfNum
$binary = $binary . '
$nchar = 'nchar . $c
$nchar = $nchar . '
sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar )
sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
$x = $x + 1
endw
@ -62,7 +61,7 @@ run general/parser/limit1_stb.sim
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 5000
sleep 3000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed

4
tests/script/general/parser/limit2.sim
View File

@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c rowsInFileBlock -v 255
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = lm2_db
@ -69,7 +69,7 @@ print ====== tables created
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 5000
sleep 3000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed

2
tests/script/general/parser/limit2_query.sim
View File

@ -1,4 +1,4 @@
sleep 1000
sleep 500
sql connect
$dbPrefix = lm2_db

4
tests/script/general/parser/limit2_tblocks100.sim
View File

@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c rowsInFileBlock -v 255
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = lm2_db
@ -69,7 +69,7 @@ print ====== tables created
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 1000
sleep 500
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed

2
tests/script/general/parser/limit_stb.sim
View File

@ -1,4 +1,4 @@
sleep 1000
sleep 500
sql connect
$dbPrefix = lm_db

2
tests/script/general/parser/limit_tb.sim
View File

@ -1,4 +1,4 @@
sleep 1000
sleep 500
sql connect
$dbPrefix = lm_db

2
tests/script/general/parser/mixed_blocks.sim
View File

@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = mb_db

2
tests/script/general/parser/nchar.sim
View File

@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
print ======================== dnode1 start

4
tests/script/general/parser/null_char.sim
View File

@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c tableMetaKeepTimer -v 3
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
print ========== NULL_char.sim
@ -251,7 +251,7 @@ endi
################### nchar
sql alter table st41 set tag tag_nchar = "<22><>˼<EFBFBD><CBBC><EFBFBD><EFBFBD>"
sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from st41
#sleep 1000
#sleep 500
#if $data01 != <20><>˼<EFBFBD><CBBC><EFBFBD><EFBFBD> then
# print ==== expect <20><>˼<EFBFBD><CBBC><EFBFBD><EFBFBD>, actually $data01
# return -1

4
tests/script/general/parser/projection_limit_offset.sim
View File

@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = group_db
@ -402,7 +402,7 @@ sql_error select k, sum(k)+1 from tm0;
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 5000
sleep 3000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed

11
tests/script/general/parser/selectResNum.sim
View File

@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 200
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = sc_db
@ -50,8 +50,7 @@ while $i < $halfNum
$binary = $binary . '
$nchar = 'nchar . $c
$nchar = $nchar . '
sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar )
sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
$x = $x + 1
endw
@ -119,12 +118,12 @@ endw
print ====== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 6000
sleep 3000
system sh/exec.sh -n dnode1 -s start
print ====== server restart completed
sleep 1000
sleep 500
sql connect
sleep 1000
sleep 500
sql use $db
##### repeat test after server restart

2
tests/script/general/parser/select_across_vnodes.sim
View File

@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 5
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = sav_db

6
tests/script/general/parser/select_from_cache_disk.sim
View File

@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = scd_db
@ -35,11 +35,11 @@ sql insert into $tb values ('2018-09-17 09:00:00.030', 3)
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 5000
sleep 3000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
sleep 1000
sleep 500
sql use $db
# generate some data in cache

2
tests/script/general/parser/select_with_tags.sim
View File

@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = select_tags_db

2
tests/script/general/parser/set_tag_vals.sim
View File

@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = db

4
tests/script/general/parser/single_row_in_tb.sim
View File

@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = sr_db
@ -32,7 +32,7 @@ run general/parser/single_row_in_tb_query.sim
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 5000
sleep 3000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed

2
tests/script/general/parser/single_row_in_tb_query.sim
View File

@ -1,4 +1,4 @@
sleep 1000
sleep 500
sql connect
$dbPrefix = sr_db

2
tests/script/general/parser/sliding.sim
View File

@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode1 -c debugFlag -v 135
system sh/cfg.sh -n dnode1 -c rpcDebugFlag -v 135
system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = sliding_db

6
tests/script/general/parser/slimit.sim
View File

@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = slm_db
@ -97,11 +97,11 @@ run general/parser/slimit_query.sim
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 5000
sleep 3000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
sleep 1000
sleep 500
run general/parser/slimit_query.sim

6
tests/script/general/parser/slimit1.sim
View File

@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = slm_alt_tg_db
@ -56,11 +56,11 @@ run general/parser/slimit1_query.sim
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 5000
sleep 3000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
sleep 1000
sleep 500
run general/parser/slimit1_query.sim

2
tests/script/general/parser/slimit1_query.sim
View File

@ -1,4 +1,4 @@
sleep 1000
sleep 500
sql connect
$dbPrefix = slm_alt_tg_db

6
tests/script/general/parser/slimit_alter_tags.sim
View File

@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = slm_alt_tg_db
@ -171,11 +171,11 @@ endi
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 5000
sleep 3000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
sleep 1000
sleep 500
sql use $db
### repeat above queries

2
tests/script/general/parser/slimit_query.sim
View File

@ -1,4 +1,4 @@
sleep 1000
sleep 500
sql connect
$dbPrefix = slm_db

2
tests/script/general/parser/stream_on_sys.sim
View File

@ -6,7 +6,7 @@ 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 1000
sleep 500
sql connect
print ======================== stream_on_sys.sim

4
tests/script/general/parser/tags_dynamically_specifiy.sim
View File

@ -3,9 +3,9 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
sleep 1000
sleep 500
$db = dytag_db
$tbNum = 10

2
tests/script/general/parser/tags_filter.sim
View File

@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$db = tf_db

4
tests/script/general/parser/tbnameIn.sim
View File

@ -3,7 +3,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1
system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = ti_db
@ -68,7 +68,7 @@ run general/parser/tbnameIn_query.sim
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 5000
sleep 3000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed

2
tests/script/general/parser/tbnameIn_query.sim
View File

@ -1,4 +1,4 @@
sleep 1000
sleep 500
sql connect
$dbPrefix = ti_db

176
tests/script/general/parser/testSuite.sim
View File

@ -1,113 +1,113 @@
sleep 1000
run general/parser/alter.sim
sleep 1000
run general/parser/alter1.sim
sleep 1000
run general/parser/alter_stable.sim
sleep 1000
run general/parser/auto_create_tb.sim
sleep 1000
run general/parser/auto_create_tb_drop_tb.sim
sleep 1000
run general/parser/col_arithmetic_operation.sim
sleep 1000
run general/parser/columnValue.sim
sleep 1000
run general/parser/commit.sim
sleep 1000
run general/parser/create_db.sim
sleep 1000
run general/parser/create_mt.sim
sleep 1000
run general/parser/create_tb.sim
sleep 1000
run general/parser/dbtbnameValidate.sim
sleep 1000
run general/parser/fill.sim
sleep 1000
run general/parser/fill_stb.sim
sleep 1000
#run general/parser/fill_us.sim #
sleep 1000
run general/parser/first_last.sim
sleep 1000
run general/parser/import_commit1.sim
sleep 1000
run general/parser/import_commit2.sim
sleep 1000
run general/parser/import_commit3.sim
sleep 1000
#run general/parser/import_file.sim
sleep 1000
run general/parser/insert_tb.sim
sleep 1000
run general/parser/tags_dynamically_specifiy.sim
sleep 1000
run general/parser/interp.sim
sleep 1000
run general/parser/lastrow.sim
sleep 1000
run general/parser/limit.sim
sleep 1000
run general/parser/limit1.sim
sleep 1000
run general/parser/limit1_tblocks100.sim
sleep 1000
run general/parser/limit2.sim
sleep 1000
run general/parser/mixed_blocks.sim
sleep 1000
run general/parser/nchar.sim
sleep 1000
run general/parser/null_char.sim
sleep 1000
run general/parser/selectResNum.sim
sleep 1000
#sleep 500
#run general/parser/alter.sim
#sleep 500
#run general/parser/alter1.sim
#sleep 500
#run general/parser/alter_stable.sim
#sleep 500
#run general/parser/auto_create_tb.sim
#sleep 500
#run general/parser/auto_create_tb_drop_tb.sim
#sleep 500
#run general/parser/col_arithmetic_operation.sim
#sleep 500
#run general/parser/columnValue.sim
#sleep 500
#run general/parser/commit.sim
#sleep 500
#run general/parser/create_db.sim
#sleep 500
#run general/parser/create_mt.sim
#sleep 500
#run general/parser/create_tb.sim
#sleep 500
#run general/parser/dbtbnameValidate.sim
#sleep 500
#run general/parser/fill.sim
#sleep 500
#run general/parser/fill_stb.sim
#sleep 500
##run general/parser/fill_us.sim #
#sleep 500
#run general/parser/first_last.sim
#sleep 500
#run general/parser/import_commit1.sim
#sleep 500
#run general/parser/import_commit2.sim
#sleep 500
#run general/parser/import_commit3.sim
#sleep 500
##run general/parser/import_file.sim
#sleep 500
#run general/parser/insert_tb.sim
#sleep 500
#run general/parser/tags_dynamically_specifiy.sim
#sleep 500
#run general/parser/interp.sim
#sleep 500
#run general/parser/lastrow.sim
#sleep 500
#run general/parser/limit.sim
#sleep 500
#run general/parser/limit1.sim
#sleep 500
#run general/parser/limit1_tblocks100.sim
#sleep 500
#run general/parser/limit2.sim
#sleep 500
#run general/parser/mixed_blocks.sim
#sleep 500
#run general/parser/nchar.sim
#sleep 500
#run general/parser/null_char.sim
#sleep 500
#run general/parser/selectResNum.sim
sleep 500
run general/parser/select_across_vnodes.sim
sleep 1000
sleep 500
run general/parser/select_from_cache_disk.sim
sleep 1000
sleep 500
run general/parser/set_tag_vals.sim
sleep 1000
sleep 500
run general/parser/single_row_in_tb.sim
sleep 1000
sleep 500
run general/parser/slimit.sim
sleep 1000
sleep 500
run general/parser/slimit1.sim
sleep 1000
sleep 500
run general/parser/slimit_alter_tags.sim
sleep 1000
sleep 500
run general/parser/tbnameIn.sim
sleep 1000
sleep 500
run general/parser/slimit_alter_tags.sim # persistent failed
sleep 1000
sleep 500
run general/parser/join.sim
sleep 1000
sleep 500
run general/parser/join_multivnode.sim
sleep 1000
sleep 500
run general/parser/projection_limit_offset.sim
sleep 1000
sleep 500
run general/parser/select_with_tags.sim
sleep 1000
sleep 500
run general/parser/groupby.sim
sleep 1000
sleep 500
run general/parser/tags_filter.sim
sleep 1000
sleep 500
run general/parser/topbot.sim
sleep 1000
sleep 500
run general/parser/union.sim
sleep 1000
sleep 500
run general/parser/constCol.sim
sleep 1000
sleep 500
run general/parser/where.sim
sleep 1000
sleep 500
run general/parser/timestamp.sim
sleep 1000
sleep 500
run general/parser/sliding.sim
#sleep 1000
#sleep 500
#run general/parser/repeatStream.sim
#sleep 1000
#sleep 500
#run general/parser/stream_on_sys.sim
#sleep 1000
#sleep 500
#run general/parser/stream.sim

6
tests/script/general/parser/timestamp.sim
View File

@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = ts_db
@ -59,10 +59,10 @@ run general/parser/timestamp_query.sim
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 1000
sleep 500
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
sleep 1000
sleep 500
run general/parser/timestamp_query.sim

2
tests/script/general/parser/timestamp_query.sim
View File

@ -1,4 +1,4 @@
sleep 1000
sleep 500
sql connect
$dbPrefix = ts_db

10
tests/script/general/parser/topbot.sim
View File

@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 200
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = tb_db
@ -128,11 +128,11 @@ sql insert into test values(29999, 1)(70000, 2)(80000, 3)
print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 5000
sleep 3000
system sh/exec.sh -n dnode1 -s start
print ================== server restart completed
sql connect
sleep 1000
sleep 500
sql select count(*) from t1.test where ts>10000 and ts<90000 interval(5000a)
if $rows != 3 then
@ -169,7 +169,7 @@ endw
system sh/exec.sh -n dnode1 -s stop -x SIGINT
system sh/exec.sh -n dnode1 -s start
sql connect
sleep 1000
sleep 500
sql use db;
$ts = 1000
@ -221,7 +221,7 @@ sql insert into t2 values('2020-2-2 1:1:1', 1);
system sh/exec.sh -n dnode1 -s stop -x SIGINT
system sh/exec.sh -n dnode1 -s start
sql connect
sleep 1000
sleep 500
sql use db
sql select count(*), first(ts), last(ts) from t2 interval(1d);

4
tests/script/general/parser/union.sim
View File

@ -7,7 +7,7 @@ system sh/cfg.sh -n dnode1 -c rpcDebugFlag -v 135
system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = union_db
@ -96,7 +96,7 @@ while $i < $tbNum
endw
print sleep 1sec.
sleep 1000
sleep 500
$i = 1
$tb = $tbPrefix . $i

2
tests/script/general/parser/where.sim
View File

@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
system sh/exec.sh -n dnode1 -s start
sleep 1000
sleep 500
sql connect
$dbPrefix = wh_db