提交 2ee22867 编写于 作者: H Haojun Liao

[TD-225]update the sim

上级 0070e7f1
...@@ -770,6 +770,7 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) { ...@@ -770,6 +770,7 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
char n[TSDB_TABLE_FNAME_LEN] = {0}; char n[TSDB_TABLE_FNAME_LEN] = {0};
tNameExtractFullName(&pTableMetaInfo->name, n); tNameExtractFullName(&pTableMetaInfo->name, n);
tscError("%p tid:%d uid:%" PRIu64" id:%s, column index out of range, numOfColumns:%d, index:%d, column name:%s", tscError("%p tid:%d uid:%" PRIu64" id:%s, column index out of range, numOfColumns:%d, index:%d, column name:%s",
pSql, pTableMeta->id.tid, pTableMeta->id.uid, n, tscGetNumOfColumns(pTableMeta), pCol->colIndex.columnIndex, pSql, pTableMeta->id.tid, pTableMeta->id.uid, n, tscGetNumOfColumns(pTableMeta), pCol->colIndex.columnIndex,
pColSchema->name); pColSchema->name);
......
...@@ -133,7 +133,7 @@ sleep 100 ...@@ -133,7 +133,7 @@ sleep 100
# return -1 # return -1
#endi #endi
#sql alter table tb1 drop column c3 #sql alter table tb1 drop column c3
#sleep 2000 #sleep 500
#sql insert into tb1 values (now, 2, 'taos') #sql insert into tb1 values (now, 2, 'taos')
#sleep 30000 #sleep 30000
#sql select * from strm #sql select * from strm
...@@ -144,7 +144,7 @@ sleep 100 ...@@ -144,7 +144,7 @@ sleep 100
# return -1 # return -1
#endi #endi
#sql alter table tb1 add column c3 int #sql alter table tb1 add column c3 int
#sleep 2000 #sleep 500
#sql insert into tb1 values (now, 3, 'taos', 3); #sql insert into tb1 values (now, 3, 'taos', 3);
#sleep 100 #sleep 100
#sql select * from strm #sql select * from strm
......
...@@ -208,7 +208,7 @@ endi ...@@ -208,7 +208,7 @@ endi
print ================== restart server to commit data into disk print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 2000 sleep 500
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
print ================== server restart completed print ================== server restart completed
sql connect sql connect
......
...@@ -105,7 +105,7 @@ run general/parser/col_arithmetic_query.sim ...@@ -105,7 +105,7 @@ run general/parser/col_arithmetic_query.sim
#======================================= all in files query ======================================= #======================================= all in files query =======================================
print ================== restart server to commit data into disk print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 2000 sleep 500
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
print ================== server restart completed print ================== server restart completed
......
...@@ -82,7 +82,7 @@ endw ...@@ -82,7 +82,7 @@ endw
print ================== restart server to commit data into disk print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 2000 sleep 500
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
sleep 100 sleep 100
print ================== server restart completed print ================== server restart completed
......
...@@ -77,7 +77,7 @@ run general/parser/first_last_query.sim ...@@ -77,7 +77,7 @@ run general/parser/first_last_query.sim
print ================== restart server to commit data into disk print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 2000 sleep 500
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
print ================== server restart completed print ================== server restart completed
sql connect sql connect
......
...@@ -25,15 +25,15 @@ sql use $db ...@@ -25,15 +25,15 @@ sql use $db
sql create table tb (ts timestamp, c1 int, c2 timestamp) sql create table tb (ts timestamp, c1 int, c2 timestamp)
sql insert into tb values ('2019-05-05 11:30:00.000', 1, now) sql insert into tb values ('2019-05-05 11:30:00.000', 1, now)
sql insert into tb values ('2019-05-05 12:00:00.000', 1, now) sql insert into tb values ('2019-05-05 12:00:00.000', 1, now)
sleep 2000 sleep 500
sql import into tb values ('2019-05-05 11:00:00.000', -1, now) sql import into tb values ('2019-05-05 11:00:00.000', -1, now)
sleep 2000 sleep 500
sql import into tb values ('2019-05-05 11:59:00.000', -1, now) sql import into tb values ('2019-05-05 11:59:00.000', -1, now)
sleep 2000 sleep 500
sql import into tb values ('2019-05-04 08:00:00.000', -1, now) sql import into tb values ('2019-05-04 08:00:00.000', -1, now)
sleep 2000 sleep 500
sql import into tb values ('2019-05-04 07:59:00.000', -1, now) sql import into tb values ('2019-05-04 07:59:00.000', -1, now)
sleep 2000 sleep 500
sql select * from tb sql select * from tb
if $rows != 6 then if $rows != 6 then
...@@ -60,7 +60,7 @@ endi ...@@ -60,7 +60,7 @@ endi
print ================== restart server to commit data into disk print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 2000 sleep 500
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
print ================== server restart completed print ================== server restart completed
sql connect sql connect
......
...@@ -40,7 +40,7 @@ while $x < $rowNum ...@@ -40,7 +40,7 @@ while $x < $rowNum
endw endw
print ====== tables created print ====== tables created
sleep 2000 sleep 500
$ts = $ts0 + $delta $ts = $ts0 + $delta
$ts = $ts + 1 $ts = $ts + 1
......
...@@ -39,7 +39,7 @@ while $x < $rowNum ...@@ -39,7 +39,7 @@ while $x < $rowNum
endw endw
print ====== tables created print ====== tables created
sleep 2000 sleep 500
$ts = $ts0 + $delta $ts = $ts0 + $delta
$ts = $ts + 1 $ts = $ts + 1
......
...@@ -39,7 +39,7 @@ while $x < $rowNum ...@@ -39,7 +39,7 @@ while $x < $rowNum
endw endw
print ====== tables created print ====== tables created
sleep 2000 sleep 500
$ts = $ts + 1 $ts = $ts + 1
sql insert into $tb values ( $ts , -1, -1, -1, -1, -1) sql insert into $tb values ( $ts , -1, -1, -1, -1, -1)
...@@ -47,7 +47,7 @@ $ts = $ts0 + $delta ...@@ -47,7 +47,7 @@ $ts = $ts0 + $delta
$ts = $ts + 1 $ts = $ts + 1
sql import into $tb values ( $ts , -2, -2, -2, -2, -2) sql import into $tb values ( $ts , -2, -2, -2, -2, -2)
sleep 2000 sleep 500
sql show databases sql show databases
......
...@@ -3,9 +3,9 @@ system sh/stop_dnodes.sh ...@@ -3,9 +3,9 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1 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 walLevel -v 0
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
sleep 2000 sleep 500
sql connect sql connect
sleep 2000 sleep 500
sql drop database if exists indb sql drop database if exists indb
......
...@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh ...@@ -4,7 +4,7 @@ system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1 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 walLevel -v 0
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
sleep 2000 sleep 500
sql connect sql connect
sleep 100 sleep 100
print ======================== dnode1 start print ======================== dnode1 start
......
...@@ -59,7 +59,7 @@ run general/parser/interp_test.sim ...@@ -59,7 +59,7 @@ run general/parser/interp_test.sim
print ================== restart server to commit data into disk print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 2000 sleep 500
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
print ================== server restart completed print ================== server restart completed
......
...@@ -62,7 +62,7 @@ run general/parser/lastrow_query.sim ...@@ -62,7 +62,7 @@ run general/parser/lastrow_query.sim
print ================== restart server to commit data into disk print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 2000 sleep 500
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
print ================== server restart completed print ================== server restart completed
sql connect sql connect
......
...@@ -66,7 +66,7 @@ run general/parser/limit_stb.sim ...@@ -66,7 +66,7 @@ run general/parser/limit_stb.sim
print ================== restart server to commit data into disk print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 2000 sleep 500
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
print ================== server restart completed print ================== server restart completed
sql connect sql connect
......
...@@ -61,7 +61,7 @@ run general/parser/limit1_stb.sim ...@@ -61,7 +61,7 @@ run general/parser/limit1_stb.sim
print ================== restart server to commit data into disk print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 2000 sleep 500
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
print ================== server restart completed print ================== server restart completed
......
...@@ -61,7 +61,7 @@ run general/parser/limit1_stb.sim ...@@ -61,7 +61,7 @@ run general/parser/limit1_stb.sim
print ================== restart server to commit data into disk print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 2000 sleep 500
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
print ================== server restart completed print ================== server restart completed
......
...@@ -69,7 +69,7 @@ print ====== tables created ...@@ -69,7 +69,7 @@ print ====== tables created
print ================== restart server to commit data into disk print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 2000 sleep 500
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
print ================== server restart completed print ================== server restart completed
......
...@@ -59,7 +59,7 @@ sql show databases ...@@ -59,7 +59,7 @@ sql show databases
print ================== restart server to commit data into disk print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 2000 sleep 500
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
print ================== server restart completed print ================== server restart completed
...@@ -154,7 +154,7 @@ sql insert into t2 values('2020-1-1 1:5:1', 99); ...@@ -154,7 +154,7 @@ sql insert into t2 values('2020-1-1 1:5:1', 99);
print ================== restart server to commit data into disk print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 2000 sleep 500
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
print ================== server restart completed print ================== server restart completed
sql select ts from m1 where ts='2020-1-1 1:5:1' sql select ts from m1 where ts='2020-1-1 1:5:1'
......
...@@ -412,7 +412,7 @@ sql_error select k, sum(k)+1 from tm0; ...@@ -412,7 +412,7 @@ sql_error select k, sum(k)+1 from tm0;
print ================== restart server to commit data into disk print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 2000 sleep 500
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
print ================== server restart completed print ================== server restart completed
......
...@@ -118,7 +118,7 @@ endw ...@@ -118,7 +118,7 @@ endw
print ====== restart server to commit data into disk print ====== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 2000 sleep 500
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
print ====== server restart completed print ====== server restart completed
sleep 100 sleep 100
......
...@@ -35,7 +35,7 @@ sql insert into $tb values ('2018-09-17 09:00:00.030', 3) ...@@ -35,7 +35,7 @@ sql insert into $tb values ('2018-09-17 09:00:00.030', 3)
print ================== restart server to commit data into disk print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 2000 sleep 500
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
print ================== server restart completed print ================== server restart completed
sql connect sql connect
......
...@@ -61,7 +61,7 @@ while $i < $tbNum ...@@ -61,7 +61,7 @@ while $i < $tbNum
endw endw
print ====== tables created print ====== tables created
sleep 2000 sleep 500
sql show tables sql show tables
if $rows != $tbNum then if $rows != $tbNum then
......
...@@ -32,7 +32,7 @@ run general/parser/single_row_in_tb_query.sim ...@@ -32,7 +32,7 @@ run general/parser/single_row_in_tb_query.sim
print ================== restart server to commit data into disk print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 2000 sleep 500
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
print ================== server restart completed print ================== server restart completed
......
...@@ -97,7 +97,7 @@ run general/parser/slimit_query.sim ...@@ -97,7 +97,7 @@ run general/parser/slimit_query.sim
print ================== restart server to commit data into disk print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 2000 sleep 500
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
print ================== server restart completed print ================== server restart completed
sql connect sql connect
......
...@@ -56,7 +56,7 @@ run general/parser/slimit1_query.sim ...@@ -56,7 +56,7 @@ run general/parser/slimit1_query.sim
print ================== restart server to commit data into disk print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 2000 sleep 500
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
print ================== server restart completed print ================== server restart completed
sql connect sql connect
......
...@@ -93,7 +93,7 @@ if $data02 != tb0 then ...@@ -93,7 +93,7 @@ if $data02 != tb0 then
return -1 return -1
endi endi
sleep 2000 sleep 500
sql reset query cache sql reset query cache
sql select count(*), first(ts) from stb group by tg_added order by tg_added asc slimit 5 soffset 3 sql select count(*), first(ts) from stb group by tg_added order by tg_added asc slimit 5 soffset 3
if $rows != 5 then if $rows != 5 then
...@@ -171,7 +171,7 @@ endi ...@@ -171,7 +171,7 @@ endi
print ================== restart server to commit data into disk print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 2000 sleep 500
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
print ================== server restart completed print ================== server restart completed
sql connect sql connect
......
...@@ -67,7 +67,7 @@ run general/parser/tbnameIn_query.sim ...@@ -67,7 +67,7 @@ run general/parser/tbnameIn_query.sim
print ================== restart server to commit data into disk print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 2000 sleep 500
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
print ================== server restart completed print ================== server restart completed
......
...@@ -46,13 +46,13 @@ ...@@ -46,13 +46,13 @@
#sleep 100 #sleep 100
#run general/parser/lastrow.sim #run general/parser/lastrow.sim
#sleep 100 #sleep 100
#run general/parser/limit.sim run general/parser/limit.sim
#sleep 100 sleep 100
#run general/parser/limit1.sim run general/parser/limit1.sim
#sleep 100 sleep 100
#run general/parser/limit1_tblocks100.sim run general/parser/limit1_tblocks100.sim
#sleep 100 sleep 100
#run general/parser/limit2.sim run general/parser/limit2.sim
sleep 100 sleep 100
run general/parser/mixed_blocks.sim run general/parser/mixed_blocks.sim
sleep 100 sleep 100
......
...@@ -128,7 +128,7 @@ sql insert into test values(29999, 1)(70000, 2)(80000, 3) ...@@ -128,7 +128,7 @@ sql insert into test values(29999, 1)(70000, 2)(80000, 3)
print ================== restart server to commit data into disk print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 2000 sleep 500
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
print ================== server restart completed print ================== server restart completed
sql connect sql connect
......
...@@ -324,7 +324,7 @@ while $i < 1 ...@@ -324,7 +324,7 @@ while $i < 1
endw endw
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 2000 sleep 500
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册