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

merge with develop branch.

This commit is contained in:
Shuduo Sang 2020-05-08 16:13:25 +08:00
parent c4e7acc3c0 dd1bb6e036
commit ae372d3093
145 changed files with 999 additions and 522 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mnode/src/mgmtDb.c
View File

@ -803,7 +803,7 @@ static SDbCfg mgmtGetAlterDbOption(SDbObj *pDb, SCMAlterDbMsg *pAlter) {
newCfg.daysToKeep2 = daysToKeep2; newCfg.daysToKeep2 = daysToKeep2;
} }
if (compression > 0 && compression != pDb->cfg.compression) { if (compression >= 0 && compression != pDb->cfg.compression) {
mTrace("db:%s, compression:%d change to %d", pDb->name, pDb->cfg.compression, compression); mTrace("db:%s, compression:%d change to %d", pDb->name, pDb->cfg.compression, compression);
newCfg.compression = compression; newCfg.compression = compression;
} }
@ -823,7 +823,7 @@ static SDbCfg mgmtGetAlterDbOption(SDbObj *pDb, SCMAlterDbMsg *pAlter) {
} }
} }
if (walLevel > 0 && (walLevel < TSDB_MIN_WAL_LEVEL || walLevel > TSDB_MAX_WAL_LEVEL)) { if (walLevel >= 0 && (walLevel < TSDB_MIN_WAL_LEVEL || walLevel > TSDB_MAX_WAL_LEVEL)) {
mError("db:%s, wal level %d should be between 0-2, origin:%d", pDb->name, walLevel, pDb->cfg.walLevel); mError("db:%s, wal level %d should be between 0-2, origin:%d", pDb->name, walLevel, pDb->cfg.walLevel);
terrno = TSDB_CODE_INVALID_OPTION; terrno = TSDB_CODE_INVALID_OPTION;
} }

2
tests/script/general/alter/cached_schema_after_alter.sim
View File

@ -117,3 +117,5 @@ endi
if $data12 != 2 then if $data12 != 2 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

1
tests/script/general/alter/count.sim
View File

@ -264,3 +264,4 @@ if $data00 != 31 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/alter/import.sim
View File

@ -47,3 +47,5 @@ sql select count(b) from tb
if $data00 != 5 then if $data00 != 5 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/alter/insert1.sim
View File

@ -1148,3 +1148,5 @@ endi
if $data78 != 11 then if $data78 != 11 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

1
tests/script/general/alter/insert2.sim
View File

@ -681,3 +681,4 @@ if $data62 != NULL then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

1
tests/script/general/alter/metrics.sim
View File

@ -781,3 +781,4 @@ if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

1
tests/script/general/alter/table.sim
View File

@ -684,3 +684,4 @@ if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/alter/testSuite.sim
View File

@ -1,5 +1,5 @@
run general/alter/count.sim
run general/alter/cached_schema_after_alter.sim run general/alter/cached_schema_after_alter.sim
run general/alter/count.sim
run general/alter/import.sim run general/alter/import.sim
run general/alter/insert1.sim run general/alter/insert1.sim
run general/alter/insert2.sim run general/alter/insert2.sim

4
tests/script/general/cache/new_metrics.sim vendored
View File

@ -140,6 +140,4 @@ if $data04 != 10 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

1
tests/script/general/cache/restart_metrics.sim vendored
View File

@ -83,3 +83,4 @@ if $data02 != 3 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/cache/restart_table.sim vendored
View File

@ -56,4 +56,4 @@ if $data01 != 1 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/cache/testSuite.sim vendored
View File

@ -1,3 +1,3 @@
run general/cache/new_metrics.sim
run general/cache/restart_table.sim run general/cache/restart_table.sim
run general/cache/restart_metrics.sim run general/cache/restart_metrics.sim
run general/cache/new_metrics.sim

2
tests/script/general/column/commit.sim
View File

@ -152,3 +152,5 @@ endi
if $data09 != 10 then if $data09 != 10 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/column/metrics.sim
View File

@ -215,3 +215,5 @@ endi
if $data09 != 20 then if $data09 != 20 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/column/table.sim
View File

@ -211,3 +211,5 @@ endi
if $data07 != 2.872281323 then if $data07 != 2.872281323 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

5
tests/script/general/column/testSuite.sim
View File

@ -1,4 +1,3 @@
run general/column/table.sim
run general/column/metrics.sim
run general/column/stream.sim
run general/column/commit.sim run general/column/commit.sim
run general/column/metrics.sim
run general/column/table.sim

9
tests/script/general/compress/commitlog.sim
View File

@ -1,9 +1,8 @@
system sh/stop_dnodes.sh 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 1 system sh/cfg.sh -n dnode1 -c walLevel -v 1
system sh/cfg.sh -n dnode1 -c compression -v 1 system sh/cfg.sh -n dnode1 -c comp -v 1
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
sleep 3000 sleep 3000
@ -88,9 +87,9 @@ endi
print =============== step4 print =============== step4
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 20000 sleep 5000
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
sleep 10000 sleep 3000
print =============== step5 print =============== step5
@ -124,4 +123,4 @@ if $rows != $N then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

9
tests/script/general/compress/compress.sim
View File

@ -1,9 +1,8 @@
system sh/stop_dnodes.sh 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/cfg.sh -n dnode1 -c compression -v 1 system sh/cfg.sh -n dnode1 -c comp -v 1
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
sleep 3000 sleep 3000
@ -83,9 +82,9 @@ endi
print =============== step4 print =============== step4
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 10000 sleep 5000
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
sleep 10000 sleep 3000
print =============== step5 print =============== step5
@ -119,4 +118,4 @@ if $rows != $N then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

9
tests/script/general/compress/compress2.sim
View File

@ -1,9 +1,8 @@
system sh/stop_dnodes.sh 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/cfg.sh -n dnode1 -c compression -v 2 system sh/cfg.sh -n dnode1 -c comp -v 2
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
sleep 3000 sleep 3000
@ -83,9 +82,9 @@ endi
print =============== step4 print =============== step4
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 10000 sleep 5000
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
sleep 10000 sleep 3000
print =============== step5 print =============== step5
@ -119,4 +118,4 @@ if $rows != $N then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

4
tests/script/general/compress/testSuite.sim
View File

@ -1,4 +1,4 @@
run general/compress/compress.sim
run general/compress/uncompress.sim
run general/compress/commitlog.sim run general/compress/commitlog.sim
run general/compress/compress2.sim run general/compress/compress2.sim
run general/compress/compress.sim
run general/compress/uncompress.sim

10
tests/script/general/compress/uncompress.sim
View File

@ -1,9 +1,7 @@
system sh/stop_dnodes.sh 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/cfg.sh -n dnode1 -c compression -v 1 system sh/cfg.sh -n dnode1 -c comp -v 1
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
sleep 3000 sleep 3000
@ -83,9 +81,9 @@ endi
print =============== step4 print =============== step4
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 10000 sleep 5000
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
sleep 10000 sleep 3000
print =============== step5 print =============== step5
@ -119,4 +117,4 @@ if $rows != $N then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/compute/avg.sim
View File

@ -154,3 +154,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/compute/bottom.sim
View File

@ -95,3 +95,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/compute/count.sim
View File

@ -170,3 +170,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/compute/diff.sim
View File

@ -87,3 +87,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/compute/diff2.sim
View File

@ -153,3 +153,5 @@ print =============== clear
#if $rows != 0 then #if $rows != 0 then
# return -1 # return -1
#endi #endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/compute/first.sim
View File

@ -156,3 +156,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/compute/interval.sim
View File

@ -172,3 +172,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/compute/last.sim
View File

@ -155,3 +155,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/compute/leastsquare.sim
View File

@ -96,3 +96,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/compute/max.sim
View File

@ -155,3 +155,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/compute/min.sim
View File

@ -156,3 +156,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/compute/null.sim
View File

@ -223,3 +223,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/compute/percentile.sim
View File

@ -112,3 +112,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/compute/stddev.sim
View File

@ -94,3 +94,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/compute/sum.sim
View File

@ -155,3 +155,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

24
tests/script/general/compute/testSuite.sim
View File

@ -1,16 +1,16 @@
run general/compute/count.sim
run general/compute/avg.sim run general/compute/avg.sim
run general/compute/sum.sim
run general/compute/min.sim
run general/compute/max.sim
run general/compute/first.sim
run general/compute/last.sim
run general/compute/stddev.sim
run general/compute/leastsquare.sim
run general/compute/top.sim
run general/compute/bottom.sim run general/compute/bottom.sim
run general/compute/percentile.sim run general/compute/count.sim
run general/compute/diff.sim run general/compute/diff.sim
run general/compute/interval.sim
run general/compute/null.sim
run general/compute/diff2.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

2
tests/script/general/compute/top.sim
View File

@ -95,3 +95,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/db/testSuite.sim
View File

@ -7,7 +7,7 @@ run general/db/basic5.sim
run general/db/delete_reuse1.sim run general/db/delete_reuse1.sim
run general/db/delete_reuse2.sim run general/db/delete_reuse2.sim
run general/db/delete_reusevnode.sim run general/db/delete_reusevnode.sim
#run general/db/delete_reusevnode2.sim run general/db/delete_reusevnode2.sim
run general/db/delete_writing1.sim run general/db/delete_writing1.sim
run general/db/delete_writing2.sim run general/db/delete_writing2.sim
run general/db/len.sim run general/db/len.sim

12
tests/script/general/field/2.sim
View File

@ -1,6 +1,4 @@
system sh/stop_dnodes.sh 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
@ -9,9 +7,9 @@ sleep 3000
sql connect sql connect
print ======================== dnode1 start print ======================== dnode1 start
$dbPrefix = fi_bt_db $dbPrefix = db
$tbPrefix = fi_bt_tb $tbPrefix = tb
$mtPrefix = fi_bt_mt $mtPrefix = st
$tbNum = 10 $tbNum = 10
$rowNum = 20 $rowNum = 20
$totalNum = 200 $totalNum = 200
@ -233,6 +231,8 @@ if $data00 != 100 then
return -1 return -1
endi endi
print sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol2 = 1
sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol2 = 1 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol2 = 1
print $data00 $data01 $data02 $data03 $data04 $data05 $data06 print $data00 $data01 $data02 $data03 $data04 $data05 $data06
if $data00 != 100 then if $data00 != 100 then
@ -293,3 +293,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

10
tests/script/general/field/3.sim
View File

@ -1,6 +1,4 @@
system sh/stop_dnodes.sh 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
@ -9,9 +7,9 @@ sleep 3000
sql connect sql connect
print ======================== dnode1 start print ======================== dnode1 start
$dbPrefix = fi_3_db $dbPrefix = db
$tbPrefix = fi_3_tb $tbPrefix = tb
$mtPrefix = fi_3_mt $mtPrefix = mt
$tbNum = 10 $tbNum = 10
$rowNum = 20 $rowNum = 20
$totalNum = 200 $totalNum = 200
@ -519,3 +517,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

10
tests/script/general/field/4.sim
View File

@ -1,6 +1,4 @@
system sh/stop_dnodes.sh 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
@ -9,9 +7,9 @@ sleep 3000
sql connect sql connect
print ======================== dnode1 start print ======================== dnode1 start
$dbPrefix = fi_4_db $dbPrefix = db
$tbPrefix = fi_4_tb $tbPrefix = tb
$mtPrefix = fi_4_mt $mtPrefix = st
$tbNum = 10 $tbNum = 10
$rowNum = 20 $rowNum = 20
$totalNum = 200 $totalNum = 200
@ -709,3 +707,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

10
tests/script/general/field/5.sim
View File

@ -1,6 +1,4 @@
system sh/stop_dnodes.sh 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
@ -9,9 +7,9 @@ sleep 3000
sql connect sql connect
print ======================== dnode1 start print ======================== dnode1 start
$dbPrefix = fi_5_db $dbPrefix = db
$tbPrefix = fi_5_tb $tbPrefix = tb
$mtPrefix = fi_5_mt $mtPrefix = st
$tbNum = 10 $tbNum = 10
$rowNum = 20 $rowNum = 20
$totalNum = 200 $totalNum = 200
@ -832,3 +830,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

10
tests/script/general/field/6.sim
View File

@ -1,6 +1,4 @@
system sh/stop_dnodes.sh 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
@ -9,9 +7,9 @@ sleep 3000
sql connect sql connect
print ======================== dnode1 start print ======================== dnode1 start
$dbPrefix = fi_6_db $dbPrefix = db
$tbPrefix = fi_6_tb $tbPrefix = tb
$mtPrefix = fi_6_mt $mtPrefix = st
$tbNum = 10 $tbNum = 10
$rowNum = 20 $rowNum = 20
$totalNum = 200 $totalNum = 200
@ -987,3 +985,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

10
tests/script/general/field/bigint.sim
View File

@ -1,6 +1,4 @@
system sh/stop_dnodes.sh 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
@ -9,9 +7,9 @@ sleep 3000
sql connect sql connect
print ======================== dnode1 start print ======================== dnode1 start
$dbPrefix = fi_bi_db $dbPrefix = db
$tbPrefix = fi_bi_tb $tbPrefix = tb
$mtPrefix = fi_bi_mt $mtPrefix = st
$tbNum = 10 $tbNum = 10
$rowNum = 20 $rowNum = 20
$totalNum = 200 $totalNum = 200
@ -158,3 +156,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

10
tests/script/general/field/binary.sim
View File

@ -1,6 +1,4 @@
system sh/stop_dnodes.sh 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
@ -9,9 +7,9 @@ sleep 3000
sql connect sql connect
print ======================== dnode1 start print ======================== dnode1 start
$dbPrefix = fi_by_db $dbPrefix = db
$tbPrefix = fi_by_tb $tbPrefix = tb
$mtPrefix = fi_by_mt $mtPrefix = st
$tbNum = 10 $tbNum = 10
$rowNum = 20 $rowNum = 20
$totalNum = 200 $totalNum = 200
@ -82,3 +80,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

10
tests/script/general/field/bool.sim
View File

@ -1,6 +1,4 @@
system sh/stop_dnodes.sh 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
@ -9,9 +7,9 @@ sleep 3000
sql connect sql connect
print ======================== dnode1 start print ======================== dnode1 start
$dbPrefix = fi_bo_db $dbPrefix = db
$tbPrefix = fi_bo_tb $tbPrefix = tb
$mtPrefix = fi_bo_mt $mtPrefix = st
$tbNum = 10 $tbNum = 10
$rowNum = 20 $rowNum = 20
$totalNum = 200 $totalNum = 200
@ -159,3 +157,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

10
tests/script/general/field/double.sim
View File

@ -1,6 +1,4 @@
system sh/stop_dnodes.sh 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
@ -9,9 +7,9 @@ sleep 3000
sql connect sql connect
print ======================== dnode1 start print ======================== dnode1 start
$dbPrefix = fi_do_db $dbPrefix = db
$tbPrefix = fi_do_tb $tbPrefix = tb
$mtPrefix = fi_do_mt $mtPrefix = st
$tbNum = 10 $tbNum = 10
$rowNum = 20 $rowNum = 20
$totalNum = 200 $totalNum = 200
@ -158,3 +156,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

10
tests/script/general/field/float.sim
View File

@ -1,6 +1,4 @@
system sh/stop_dnodes.sh 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
@ -9,9 +7,9 @@ sleep 3000
sql connect sql connect
print ======================== dnode1 start print ======================== dnode1 start
$dbPrefix = fi_fl_db $dbPrefix = db
$tbPrefix = fi_fl_tb $tbPrefix = tb
$mtPrefix = fi_fl_mt $mtPrefix = st
$tbNum = 10 $tbNum = 10
$rowNum = 20 $rowNum = 20
$totalNum = 200 $totalNum = 200
@ -158,3 +156,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

10
tests/script/general/field/int.sim
View File

@ -1,6 +1,4 @@
system sh/stop_dnodes.sh 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
@ -9,9 +7,9 @@ sleep 3000
sql connect sql connect
print ======================== dnode1 start print ======================== dnode1 start
$dbPrefix = fi_in_db $dbPrefix = db
$tbPrefix = fi_in_tb $tbPrefix = tb
$mtPrefix = fi_in_mt $mtPrefix = st
$tbNum = 10 $tbNum = 10
$rowNum = 20 $rowNum = 20
$totalNum = 200 $totalNum = 200
@ -158,3 +156,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

10
tests/script/general/field/single.sim
View File

@ -1,6 +1,4 @@
system sh/stop_dnodes.sh 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
@ -9,9 +7,9 @@ sleep 3000
sql connect sql connect
print ======================== dnode1 start print ======================== dnode1 start
$dbPrefix = fi_si_db $dbPrefix = db
$tbPrefix = fi_si_tb $tbPrefix = tb
$mtPrefix = fi_si_mt $mtPrefix = st
$rowNum = 20 $rowNum = 20
print =============== step1 print =============== step1
@ -216,3 +214,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

10
tests/script/general/field/smallint.sim
View File

@ -1,6 +1,4 @@
system sh/stop_dnodes.sh 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
@ -9,9 +7,9 @@ sleep 3000
sql connect sql connect
print ======================== dnode1 start print ======================== dnode1 start
$dbPrefix = fi_sm_db $dbPrefix = db
$tbPrefix = fi_sm_tb $tbPrefix = tb
$mtPrefix = fi_sm_mt $mtPrefix = st
$tbNum = 10 $tbNum = 10
$rowNum = 20 $rowNum = 20
$totalNum = 200 $totalNum = 200
@ -158,3 +156,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

10
tests/script/general/field/tinyint.sim
View File

@ -1,6 +1,4 @@
system sh/stop_dnodes.sh 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
@ -10,9 +8,9 @@ sql connect
print ======================== dnode1 start print ======================== dnode1 start
$dbPrefix = fi_ti_db $dbPrefix = db
$tbPrefix = fi_ti_tb $tbPrefix = tb
$mtPrefix = fi_ti_mt $mtPrefix = st
$tbNum = 10 $tbNum = 10
$rowNum = 20 $rowNum = 20
$totalNum = 200 $totalNum = 200
@ -159,3 +157,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

4
tests/script/general/http/testSuite.sim
View File

@ -4,5 +4,5 @@ run general/http/restful_limit.sim
run general/http/restful_full.sim run general/http/restful_full.sim
run general/http/prepare.sim run general/http/prepare.sim
run general/http/telegraf.sim run general/http/telegraf.sim
#run general/http/grafana_bug.sim run general/http/grafana_bug.sim
#run general/http/grafana.sim run general/http/grafana.sim

37
tests/script/general/import/basic.sim
View File

@ -1,10 +1,4 @@
system sh/stop_dnodes.sh system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1 system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode2 -i 2 system sh/deploy.sh -n dnode2 -i 2
system sh/deploy.sh -n dnode3 -i 3 system sh/deploy.sh -n dnode3 -i 3
@ -25,10 +19,10 @@ 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 dnode3 -c maxtablesPerVnode -v 2000
system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000 system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000
system sh/cfg.sh -n dnode1 -c commitlog -v 0 system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode2 -c commitlog -v 0 system sh/cfg.sh -n dnode2 -c walLevel -v 0
system sh/cfg.sh -n dnode3 -c commitlog -v 0 system sh/cfg.sh -n dnode3 -c walLevel -v 0
system sh/cfg.sh -n dnode4 -c commitlog -v 0 system sh/cfg.sh -n dnode4 -c walLevel -v 0
print ========= start dnode1 print ========= start dnode1
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
@ -50,14 +44,14 @@ endi
print ================= step2 print ================= step2
sql insert into tb values(1564641708000, 8000) sql insert into tb values(1564641708000, 8000)
sql select * from tb; sql select * from tb;
if $rows != 1 then if $rows != 2 then
return -1 return -1
endi endi
print ================= step3 print ================= step3
sql insert into tb values(1564641720000, 20000) sql insert into tb values(1564641720000, 20000)
sql select * from tb; sql select * from tb;
if $rows != 2 then if $rows != 3 then
return -1 return -1
endi endi
@ -76,7 +70,7 @@ sql insert into tb values(1564641714000, 14000)
sql insert into tb values(1564641725000, 25000) sql insert into tb values(1564641725000, 25000)
sql insert into tb values(1564641740000, 40000) sql insert into tb values(1564641740000, 40000)
sql select * from tb; sql select * from tb;
if $rows != 6 then if $rows != 8 then
return -1 return -1
endi endi
@ -87,7 +81,7 @@ sql import into tb values(1564641723000, 23000)
sql import into tb values(1564641734000, 34000) sql import into tb values(1564641734000, 34000)
sql import into tb values(1564641750000, 50000) sql import into tb values(1564641750000, 50000)
sql select * from tb; sql select * from tb;
if $rows != 11 then if $rows != 13 then
return -1 return -1
endi endi
@ -98,7 +92,7 @@ sql import into tb values(1564641723001, 23001)
sql import into tb values(1564641734001, 34001) sql import into tb values(1564641734001, 34001)
sql import into tb values(1564641750001, 50001) sql import into tb values(1564641750001, 50001)
sql select * from tb; sql select * from tb;
if $rows != 16 then if $rows != 18 then
return -1 return -1
endi endi
@ -108,28 +102,28 @@ sql insert into tb values(1564641714002, 14002)
sql insert into tb values(1564641725002, 25002) sql insert into tb values(1564641725002, 25002)
sql insert into tb values(1564641900000, 200000) sql insert into tb values(1564641900000, 200000)
sql select * from tb; sql select * from tb;
if $rows != 17 then if $rows != 22 then
return -1 return -1
endi endi
print ================= step9 only insert last one print ================= step9 only insert last one
sql import into tb values(1564641705000, 5000)(1564641718000, 18000)(1564642400000, 700000) sql import into tb values(1564641705000, 5000)(1564641718000, 18000)(1564642400000, 700000)
sql select * from tb; sql select * from tb;
if $rows != 20 then if $rows != 25 then
return -1 return -1
endi endi
print ================= step10 print ================= step10
sql import into tb values(1564641705000, 5000)(1564641718000, 18000)(1564642400000, 70000) sql import into tb values(1564641705000, 5000)(1564641718000, 18000)(1564642400000, 70000)
sql select * from tb; sql select * from tb;
if $rows != 20 then if $rows != 25 then
return -1 return -1
endi endi
print ================= step11 print ================= step11
sql import into tb values(1564642400000, 700000) sql import into tb values(1564642400000, 700000)
sql select * from tb; sql select * from tb;
if $rows != 20 then if $rows != 25 then
return -1 return -1
endi endi
@ -137,7 +131,7 @@ print ================= step12
sql import into tb values(1564641709527, 9527)(1564641709527, 9528) sql import into tb values(1564641709527, 9527)(1564641709527, 9528)
sql select * from tb; sql select * from tb;
print rows=> $rows print rows=> $rows
if $rows != 21 then if $rows != 26 then
return -1 return -1
endi endi
@ -145,7 +139,8 @@ print ================= step13
sql import into tb values(1564641709898, 9898)(1564641709897, 9897) sql import into tb values(1564641709898, 9898)(1564641709897, 9897)
sql select * from tb; sql select * from tb;
print rows=> $rows print rows=> $rows
if $rows != 23 then if $rows != 28 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

18
tests/script/general/import/commit.sim
View File

@ -1,10 +1,4 @@
system sh/stop_dnodes.sh system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1 system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode2 -i 2 system sh/deploy.sh -n dnode2 -i 2
system sh/deploy.sh -n dnode3 -i 3 system sh/deploy.sh -n dnode3 -i 3
@ -25,10 +19,10 @@ 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 dnode3 -c maxtablesPerVnode -v 2000
system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000 system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000
system sh/cfg.sh -n dnode1 -c commitlog -v 0 system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode2 -c commitlog -v 0 system sh/cfg.sh -n dnode2 -c walLevel -v 0
system sh/cfg.sh -n dnode3 -c commitlog -v 0 system sh/cfg.sh -n dnode3 -c walLevel -v 0
system sh/cfg.sh -n dnode4 -c commitlog -v 0 system sh/cfg.sh -n dnode4 -c walLevel -v 0
print ========= start dnode1 print ========= start dnode1
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
@ -93,6 +87,4 @@ if $rows != 12 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

16
tests/script/general/import/large.sim
View File

@ -1,10 +1,4 @@
system sh/stop_dnodes.sh system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1 system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode2 -i 2 system sh/deploy.sh -n dnode2 -i 2
system sh/deploy.sh -n dnode3 -i 3 system sh/deploy.sh -n dnode3 -i 3
@ -25,10 +19,10 @@ 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 dnode3 -c maxtablesPerVnode -v 2000
system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000 system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000
system sh/cfg.sh -n dnode1 -c commitlog -v 0 system sh/cfg.sh -n dnode1 -c walLevel -v 0
system sh/cfg.sh -n dnode2 -c commitlog -v 0 system sh/cfg.sh -n dnode2 -c walLevel -v 0
system sh/cfg.sh -n dnode3 -c commitlog -v 0 system sh/cfg.sh -n dnode3 -c walLevel -v 0
system sh/cfg.sh -n dnode4 -c commitlog -v 0 system sh/cfg.sh -n dnode4 -c walLevel -v 0
print ========= start dnode1 print ========= start dnode1
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
@ -100,3 +94,5 @@ while $i < 1000
endw endw
print ================= step2 print ================= step2
system sh/exec.sh -n dnode1 -s stop -x SIGINT

169
tests/script/general/import/replica1.sim
View File

@ -1,10 +1,5 @@
system sh/stop_dnodes.sh system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1 system sh/deploy.sh -n dnode1 -i 1
system sh/deploy.sh -n dnode2 -i 2 system sh/deploy.sh -n dnode2 -i 2
system sh/deploy.sh -n dnode3 -i 3 system sh/deploy.sh -n dnode3 -i 3
@ -25,10 +20,10 @@ 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 dnode3 -c maxtablesPerVnode -v 2000
system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000 system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000
system sh/cfg.sh -n dnode1 -c commitlog -v 0 system sh/cfg.sh -n dnode1 -c walLevel -v 2
system sh/cfg.sh -n dnode2 -c commitlog -v 0 system sh/cfg.sh -n dnode2 -c walLevel -v 2
system sh/cfg.sh -n dnode3 -c commitlog -v 0 system sh/cfg.sh -n dnode3 -c walLevel -v 2
system sh/cfg.sh -n dnode4 -c commitlog -v 0 system sh/cfg.sh -n dnode4 -c walLevel -v 2
print ========= start dnode1 print ========= start dnode1
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
@ -40,53 +35,59 @@ sql use ir1db
sql create table tb(ts timestamp, i int) sql create table tb(ts timestamp, i int)
print ================= step1 print ================= step1
sql import into tb values(now+10000a, 10000) sql import into tb values(1520000010000, 10000)
sql select * from tb; sql select * from tb;
print $rows
if $rows != 1 then if $rows != 1 then
return -1 return -1
endi endi
print ================= step2 print ================= step2
sql insert into tb values(now+8000a, 8000) sql insert into tb values(1520000008000, 8000)
sql select * from tb; print $rows
if $rows != 1 then
return -1
endi
print ================= step3
sql insert into tb values(now+20000a, 20000)
sql select * from tb; sql select * from tb;
if $rows != 2 then if $rows != 2 then
return -1 return -1
endi endi
print ================= step4 print ================= step3
sql import into tb values(now+8000a, 9000) sql insert into tb values(1520000020000, 20000)
sql import into tb values(now+15000a, 15000)
sql import into tb values(now+30000a, 30000)
sql select * from tb; sql select * from tb;
if $rows != 5 then print $rows
if $rows != 3 then
return -1 return -1
endi endi
print ================= step5 print ================= step4
sql insert into tb values(now+8000a, 8000) sql import into tb values(1520000009000, 9000)
sql insert into tb values(now+14000a, 14000) sql import into tb values(1520000015000, 15000)
sql insert into tb values(now+25000a, 25000) sql import into tb values(1520000030000, 30000)
sql insert into tb values(now+40000a, 40000)
sql select * from tb; sql select * from tb;
print $rows
if $rows != 6 then if $rows != 6 then
return -1 return -1
endi endi
print ================= step6 print ================= step5
sql import into tb values(now+7000a, 7000) sql insert into tb values(1520000008000, 8000)
sql import into tb values(now+12000a, 12000) sql insert into tb values(1520000014000, 14000)
sql import into tb values(now+23000a, 23000) sql insert into tb values(1520000025000, 25000)
sql import into tb values(now+34000a, 34000) sql insert into tb values(1520000040000, 40000)
sql import into tb values(now+50000a, 50000)
sql select * from tb; sql select * from tb;
if $rows != 11 then print $rows
if $rows != 9 then
return -1
endi
print ================= step6
sql import into tb values(1520000007000, 7000)
sql import into tb values(1520000012000, 12000)
sql import into tb values(1520000023000, 23000)
sql import into tb values(1520000034000, 34000)
sql import into tb values(1520000050000, 50000)
sql select * from tb;
print $rows
if $rows != 14 then
return -1 return -1
endi endi
@ -98,46 +99,63 @@ sleep 5000
sql use ir1db sql use ir1db
sql select * from tb; sql select * from tb;
if $rows != 11 then if $rows != 14 then
return -1 return -1
endi endi
print ================= step7 print ================= step7
sql import into tb values(now+7001a, 7001) sql import into tb values(1520000007001, 7001)
sql import into tb values(now+12001a, 12001) sql import into tb values(1520000012001, 12001)
sql import into tb values(now+23001a, 23001) sql import into tb values(1520000023001, 23001)
sql import into tb values(now+34001a, 34001) sql import into tb values(1520000034001, 34001)
sql import into tb values(now+50001a, 50001) sql import into tb values(1520000050001, 50001)
sql select * from tb; sql select * from tb;
if $rows != 16 then print $rows
if $rows != 19 then
return -1 return -1
endi endi
print ================= step8 print ================= step8
sql insert into tb values(now+8002a, 8002) sql insert into tb values(1520000008002, 8002)
sql insert into tb values(now+14002a, 14002) sql insert into tb values(1520000014002, 14002)
sql insert into tb values(now+25002a, 25002) sql insert into tb values(1520000025002, 25002)
sql insert into tb values(now+200000a, 60000) sql insert into tb values(1520000060000, 60000)
sql select * from tb; sql select * from tb;
if $rows != 17 then print $rows
if $rows != 24 then
return -1 return -1
endi endi
print ================= step9 print ================= step9
sql import into tb values(now-30d, 7003) #1520000000000
sql import into tb values(now-20d, 34003) #sql import into tb values(now-30d, 7003)
sql import into tb values(now-10d, 34003) #sql import into tb values(now-20d, 34003)
sql import into tb values(now-5d, 34003) #sql import into tb values(now-10d, 34003)
sql import into tb values(now+1m, 50001) #sql import into tb values(now-5d, 34003)
sql import into tb values(now+2m, 50001) #sql import into tb values(now+1d, 50001)
sql import into tb values(now+3m, 50001) #sql import into tb values(now+2d, 50001)
sql import into tb values(now+4m, 50002) #sql import into tb values(now+6d, 50001)
sql import into tb values(now+5m, 50003) #sql import into tb values(now+8d, 50002)
sql import into tb values(now+6m, 50004) #sql import into tb values(now+10d, 50003)
sql import into tb values(now+7m, 50001) #sql import into tb values(now+12d, 50004)
sql import into tb values(now+8m, 500051) #sql import into tb values(now+14d, 50001)
#sql import into tb values(now+16d, 500051)
sql import into tb values(1517408000000, 7003)
sql import into tb values(1518272000000, 34003)
sql import into tb values(1519136000000, 34003)
sql import into tb values(1519568000000, 34003)
sql import into tb values(1519654400000, 50001)
sql import into tb values(1519827200000, 50001)
sql import into tb values(1520345600000, 50001)
sql import into tb values(1520691200000, 50002)
sql import into tb values(1520864000000, 50003)
sql import into tb values(1521900800000, 50004)
sql import into tb values(1523110400000, 50001)
sql import into tb values(1521382400000, 500051)
sql select * from tb; sql select * from tb;
if $rows != 29 then print $rows
if $rows != 36 then
return -1 return -1
endi endi
@ -149,23 +167,44 @@ sleep 5000
sql use ir1db sql use ir1db
sql select * from tb; sql select * from tb;
if $rows != 29 then print $rows
if $rows != 36 then
return -1 return -1
endi endi
print ================= step11 print ================= step11
sql import into tb values(now-50d, 7003) (now-48d, 7003) (now-46d, 7003) (now-44d, 7003) (now-42d, 7003)
#sql import into tb values(now-50d, 7003) (now-48d, 7003) (now-46d, 7003) (now-44d, 7003) (now-42d, 7003)
sql import into tb values(1515680000000, 7003) (1515852800000, 7003) (1516025600000, 7003) (1516198400000, 7003) (1516371200000, 7003)
sql select * from tb; sql select * from tb;
if $rows != 34 then if $rows != 41 then
return -1 return -1
endi endi
sql import into tb values(now-19d, 7003) (now-18d, 7003) (now-17d, 7003) (now-16d, 7003) (now-15d, 7003) (now-14d, 7003) (now-13d, 7003) (now-12d, 7003) (now-11d, 7003) print ================= step12
#1520000000000
#sql import into tb values(now-19d, 7003) (now-18d, 7003) (now-17d, 7003) (now-16d, 7003) (now-15d, 7003) (now-14d, 7003) (now-13d, 7003) (now-12d, 7003) (now-11d, 7003)
sql import into tb values(1518358400000, 7003) (1518444800000, 7003) (1518531200000, 7003) (1518617600000, 7003) (1518704000000, 7003) (1518790400000, 7003) (1518876800000, 7003) (1518963200000, 7003) (1519049600000, 7003)
sql select * from tb; sql select * from tb;
if $rows != 43 then print $rows
if $rows != 50 then
return -1 return -1
endi endi
print ================= step14
#1520000000000
#sql import into tb values(now-48d, 34003)
#sql import into tb values(now-38d, 50001)
#sql import into tb values(now-28d, 50001)
sql import into tb values(1515852800001, 34003)
sql import into tb values(1516716800000, 50001)
sql import into tb values(1517580800000, 50001)
sql select * from tb;
if $rows != 50 then
return -1
endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/import/testSuite.sim
View File

@ -1,4 +1,4 @@
run general/import/basic.sim run general/import/basic.sim
#run general/import/commit.sim run general/import/commit.sim
run general/import/large.sim run general/import/large.sim
run general/import/replica1.sim run general/import/replica1.sim

6
tests/script/general/insert/tcp.sim
View File

@ -28,10 +28,4 @@ endw
sql select * from tb sql select * from tb
sql drop database $db
sql show databases
if $rows != 0 then
return -1
endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/insert/testSuite.sim
View File

@ -1,5 +1,5 @@
run general/insert/basic.sim run general/insert/basic.sim
#run general/insert/insert_drop.sim run general/insert/insert_drop.sim
run general/insert/query_block1_memory.sim run general/insert/query_block1_memory.sim
run general/insert/query_block2_memory.sim run general/insert/query_block2_memory.sim
run general/insert/query_block1_file.sim run general/insert/query_block1_file.sim

2
tests/script/general/metrics/disk.sim
View File

@ -195,3 +195,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

4
tests/script/general/metrics/metrics.sim
View File

@ -1,6 +1,4 @@
system sh/stop_dnodes.sh 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/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
@ -135,3 +133,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

23
tests/script/general/metrics/values.sim
View File

@ -102,25 +102,4 @@ if $rows != 100 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/metrics/vnode3.sim
View File

@ -176,3 +176,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

12
tests/script/general/table/testSuite.sim
View File

@ -11,17 +11,17 @@ run general/table/column_value.sim
run general/table/column2.sim run general/table/column2.sim
run general/table/date.sim run general/table/date.sim
run general/table/db.table.sim run general/table/db.table.sim
#run general/table/delete_reuse1.sim run general/table/delete_reuse1.sim
#run general/table/delete_reuse2.sim run general/table/delete_reuse2.sim
#run general/table/delete_writing.sim run general/table/delete_writing.sim
#run general/table/describe.sim run general/table/describe.sim
run general/table/double.sim run general/table/double.sim
#run general/table/fill.sim run general/table/fill.sim
run general/table/float.sim run general/table/float.sim
run general/table/int.sim run general/table/int.sim
run general/table/limit.sim run general/table/limit.sim
run general/table/smallint.sim run general/table/smallint.sim
#run general/table/table_len.sim run general/table/table_len.sim
run general/table/table.sim run general/table/table.sim
run general/table/tinyint.sim run general/table/tinyint.sim
run general/table/vgroup.sim run general/table/vgroup.sim

5
tests/script/general/tag/3.sim
View File

@ -1,13 +1,10 @@
system sh/stop_dnodes.sh 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 3000 sleep 3000
sql connect sql connect
sql reset query cache
print ======================== dnode1 start print ======================== dnode1 start
@ -521,3 +518,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/tag/4.sim
View File

@ -711,3 +711,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/tag/5.sim
View File

@ -834,3 +834,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/tag/6.sim
View File

@ -989,3 +989,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/tag/add.sim
View File

@ -852,3 +852,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/tag/bigint.sim
View File

@ -240,3 +240,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/tag/binary.sim
View File

@ -240,3 +240,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/tag/binary_binary.sim
View File

@ -307,3 +307,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/tag/bool.sim
View File

@ -237,3 +237,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/tag/bool_binary.sim
View File

@ -307,3 +307,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/tag/bool_int.sim
View File

@ -323,3 +323,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/tag/change.sim
View File

@ -512,3 +512,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/tag/column.sim
View File

@ -92,3 +92,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/tag/commit.sim
View File

@ -1181,3 +1181,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/tag/create.sim
View File

@ -598,3 +598,5 @@ print $data00 $data01 $data02
if $data02 != 12345 then if $data02 != 12345 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/tag/delete.sim
View File

@ -824,3 +824,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/tag/double.sim
View File

@ -240,3 +240,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

4
tests/script/general/tag/filter.sim
View File

@ -1,6 +1,4 @@
system sh/stop_dnodes.sh system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -i 1 system sh/deploy.sh -n dnode1 -i 1
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
@ -146,3 +144,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/tag/float.sim
View File

@ -240,3 +240,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/tag/int.sim
View File

@ -240,3 +240,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/tag/int_binary.sim
View File

@ -307,3 +307,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/tag/int_float.sim
View File

@ -323,3 +323,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/tag/set.sim
View File

@ -456,3 +456,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/tag/smallint.sim
View File

@ -240,3 +240,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

36
tests/script/general/tag/testSuite.sim
View File

@ -1,25 +1,25 @@
run general/tag/filter.sim
run general/tag/column.sim
run general/tag/bool.sim
run general/tag/smallint.sim
run general/tag/tinyint.sim
run general/tag/int.sim
run general/tag/bigint.sim
run general/tag/float.sim
run general/tag/double.sim
run general/tag/binary.sim
run general/tag/bool_int.sim
run general/tag/bool_binary.sim
run general/tag/int_float.sim
run general/tag/int_binary.sim
run general/tag/binary_binary.sim
run general/tag/3.sim run general/tag/3.sim
run general/tag/4.sim run general/tag/4.sim
run general/tag/5.sim run general/tag/5.sim
run general/tag/6.sim run general/tag/6.sim
run general/tag/add.sim
run general/tag/bigint.sim
run general/tag/binary_binary.sim
run general/tag/binary.sim
run general/tag/bool_binary.sim
run general/tag/bool_int.sim
run general/tag/bool.sim
run general/tag/change.sim
run general/tag/column.sim
run general/tag/commit.sim
run general/tag/create.sim run general/tag/create.sim
run general/tag/delete.sim run general/tag/delete.sim
run general/tag/change.sim run general/tag/double.sim
run general/tag/filter.sim
run general/tag/float.sim
run general/tag/int_binary.sim
run general/tag/int_float.sim
run general/tag/int.sim
run general/tag/set.sim run general/tag/set.sim
run general/tag/add.sim run general/tag/smallint.sim
run general/tag/commit.sim run general/tag/tinyint.sim

2
tests/script/general/tag/tinyint.sim
View File

@ -240,3 +240,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/user/testSuite.sim
View File

@ -1,5 +1,5 @@
run general/user/basic1.sim run general/user/basic1.sim
#run general/user/monitor.sim run general/user/monitor.sim
run general/user/pass_alter.sim run general/user/pass_alter.sim
run general/user/pass_len.sim run general/user/pass_len.sim
run general/user/user_create.sim run general/user/user_create.sim

2
tests/script/general/vector/metrics_field.sim
View File

@ -619,3 +619,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/vector/metrics_mix.sim
View File

@ -619,3 +619,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/vector/metrics_query.sim
View File

@ -615,3 +615,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/vector/metrics_tag.sim
View File

@ -615,3 +615,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

2
tests/script/general/vector/metrics_time.sim
View File

@ -615,3 +615,5 @@ sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

3
tests/script/general/vector/multi.sim
View File

@ -206,10 +206,11 @@ sql select a + f from $tb where g = 2 and ts > now + 4m order by ts asc -x step
return -1 return -1
step74: step74:
print =============== clear print =============== clear
sql drop database $db sql drop database $db
sql show databases sql show databases
if $rows != 0 then if $rows != 0 then
return -1 return -1
endi endi
system sh/exec.sh -n dnode1 -s stop -x SIGINT

Some files were not shown because too many files have changed in this diff Show More