diff --git a/tests/script/general/db/testSuite.sim b/tests/script/general/db/testSuite.sim index 2cac8b8fa882e10befcb6d6602665373cef1e8f6..87863001a3dfab6bb16a9919910b5e7bedd7863d 100644 --- a/tests/script/general/db/testSuite.sim +++ b/tests/script/general/db/testSuite.sim @@ -1,4 +1,4 @@ -run general//db/basic.sim +run general/db/basic.sim run general/db/basic1.sim run general/db/basic2.sim run general/db/basic3.sim @@ -13,3 +13,4 @@ run general/db/delete_writing2.sim run general/db/len.sim run general/db/repeat.sim run general/db/tables.sim +run general/db/vnodes.sim diff --git a/tests/script/general/db/vnodes.sim b/tests/script/general/db/vnodes.sim new file mode 100644 index 0000000000000000000000000000000000000000..87e821fde3e72bc5c94183322faac6c618ef3f2d --- /dev/null +++ b/tests/script/general/db/vnodes.sim @@ -0,0 +1,45 @@ +system sh/stop_dnodes.sh + +$totalVnodes = 100 +$maxTables = 4 +$totalRows = $totalVnodes * $maxTables + +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 $maxTables +system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v $totalVnodes +system sh/cfg.sh -n dnode1 -c maxVnodeConnections -v 100000 +system sh/cfg.sh -n dnode1 -c maxMeterConnections -v 100000 +system sh/cfg.sh -n dnode1 -c maxShellConns -v 100000 +system sh/cfg.sh -n dnode1 -c maxMgmtConnections -v 100000 + +print ========== prepare data +system sh/exec.sh -n dnode1 -s start +sleep 3000 +sql connect +sql create database db blocks 2 cache 1 maxTables $maxTables +sql use db + +print ========== step1 +sql create table mt (ts timestamp, tbcol int) TAGS(tgcol int) + +$x = 0 +while $x < $totalRows + $tb = t . $x + sql create table $tb using mt tags( $x ) + sql insert into $tb values (now, $x ) + $x = $x + 1 +endw + +print ========== step2 +sql select * from mt +if $rows != $totalRows then + return -1 +endi + +sql select count(*) from mt +if $data00 != $totalRows then + return -1 +endi + +system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt index 44fda21d334df7b8de294da367fef846ae0ae7ae..f73a23f1845809cbb8a1711d948a7e71058a9189 100644 --- a/tests/script/jenkins/basic.txt +++ b/tests/script/jenkins/basic.txt @@ -15,12 +15,12 @@ cd ../../../debug; make #./test.sh -f general/alter/table.sim ./test.sh -f general/cache/new_metrics.sim -#./test.sh -f general/cache/restart_metrics.sim +./test.sh -f general/cache/restart_metrics.sim ./test.sh -f general/cache/restart_table.sim -#./test.sh -f general/column/commit.sim -#./test.sh -f general/column/metrics.sim -#./test.sh -f general/column/table.sim +#hongze ./test.sh -f general/column/commit.sim +#hongze ./test.sh -f general/column/metrics.sim +#hongze ./test.sh -f general/column/table.sim ./test.sh -f general/compress/commitlog.sim ./test.sh -f general/compress/compress.sim @@ -31,11 +31,11 @@ cd ../../../debug; make ./test.sh -f general/compute/bottom.sim ./test.sh -f general/compute/count.sim ./test.sh -f general/compute/diff.sim -#./test.sh -f general/compute/diff2.sim +# liao./test.sh -f general/compute/diff2.sim ./test.sh -f general/compute/first.sim -#./test.sh -f general/compute/interval.sim -#./test.sh -f general/compute/last.sim -#./test.sh -f general/compute/leastsquare.sim +# liao./test.sh -f general/compute/interval.sim +# liao./test.sh -f general/compute/last.sim +# liao./test.sh -f general/compute/leastsquare.sim ./test.sh -f general/compute/max.sim ./test.sh -f general/compute/min.sim ./test.sh -f general/compute/null.sim @@ -57,37 +57,38 @@ cd ../../../debug; make ./test.sh -f general/db/delete_writing1.sim ./test.sh -f general/db/delete_writing2.sim ./test.sh -f general/db/len.sim +#./test.sh -u -f general/db/vnodes.sim ./test.sh -f general/db/repeat.sim ./test.sh -f general/db/tables.sim -#./test.sh -f general/field/2.sim +./test.sh -f general/field/2.sim #./test.sh -f general/field/3.sim #./test.sh -f general/field/4.sim #./test.sh -f general/field/5.sim #./test.sh -f general/field/6.sim -##./test.sh -f general/field/bigint.sim -#./test.sh -f general/field/binary.sim -##./test.sh -f general/field/bool.sim -#./test.sh -f general/field/single.sim -##./test.sh -f general/field/smallint.sim -##./test.sh -f general/field/tinyint.sim - -##./test.sh -f general/http/restful.sim +./test.sh -f general/field/bigint.sim +# liao./test.sh -f general/field/binary.sim +./test.sh -f general/field/bool.sim +./test.sh -f general/field/single.sim +./test.sh -f general/field/smallint.sim +./test.sh -f general/field/tinyint.sim + +# jeff ./test.sh -f general/http/restful.sim ./test.sh -f general/http/restful_insert.sim ./test.sh -f general/http/restful_limit.sim -##./test.sh -f general/http/restful_full.sim +# jeff ./test.sh -f general/http/restful_full.sim ./test.sh -f general/http/prepare.sim ./test.sh -f general/http/telegraf.sim ./test.sh -f general/http/grafana_bug.sim -#./test.sh -f general/http/grafana.sim +# jeff ./test.sh -f general/http/grafana.sim ./test.sh -f general/import/basic.sim ./test.sh -f general/import/commit.sim ./test.sh -f general/import/large.sim -#./test.sh -f general/import/replica1.sim +#hongze ./test.sh -f general/import/replica1.sim ./test.sh -f general/insert/basic.sim -#./test.sh -f general/insert/insert_drop.sim +#hongze ./test.sh -f general/insert/insert_drop.sim ./test.sh -f general/insert/query_block1_memory.sim ./test.sh -f general/insert/query_block2_memory.sim ./test.sh -f general/insert/query_block1_file.sim @@ -96,8 +97,6 @@ cd ../../../debug; make ./test.sh -f general/insert/query_multi_file.sim ./test.sh -f general/insert/tcp.sim -#parser - # ./test.sh -f general/parser/alter.sim # ./test.sh -f general/parser/alter1.sim # ./test.sh -f general/parser/alter_stable.sim @@ -112,8 +111,8 @@ cd ../../../debug; make ./test.sh -f general/parser/columnValue_float.sim ./test.sh -f general/parser/columnValue_int.sim # ./test.sh -f general/parser/col_arithmetic_operation.sim -# ./test.sh -f general/parser/columnValue.sim -# ./test.sh -f general/parser/commit.sim +./test.sh -f general/parser/columnValue.sim +./test.sh -f general/parser/commit.sim # ./test.sh -f general/parser/create_db.sim # ./test.sh -f general/parser/create_mt.sim # ./test.sh -f general/parser/create_tb.sim @@ -121,9 +120,9 @@ cd ../../../debug; make # ./test.sh -f general/parser/fill.sim # ./test.sh -f general/parser/fill_stb.sim # ./test.sh -f general/parser/first_last.sim -# ./test.sh -f general/parser/import_commit1.sim -# ./test.sh -f general/parser/import_commit2.sim -# ./test.sh -f general/parser/import_commit3.sim +./test.sh -f general/parser/import_commit1.sim +./test.sh -f general/parser/import_commit2.sim +./test.sh -f general/parser/import_commit3.sim # ./test.sh -f general/parser/import_file.sim # ./test.sh -f general/parser/insert_tb.sim # ./test.sh -f general/parser/tags_dynamically_specifiy.sim @@ -167,7 +166,7 @@ cd ../../../debug; make ./test.sh -f general/table/autocreate.sim ./test.sh -f general/table/basic1.sim ./test.sh -f general/table/basic2.sim -./test.sh -f general/table/basic3.sim +#hongze ./test.sh -f general/table/basic3.sim ./test.sh -f general/table/bigint.sim ./test.sh -f general/table/binary.sim ./test.sh -f general/table/bool.sim @@ -187,7 +186,7 @@ cd ../../../debug; make ./test.sh -f general/table/int.sim ./test.sh -f general/table/limit.sim ./test.sh -f general/table/smallint.sim -#./test.sh -f general/table/table_len.sim +./test.sh -f general/table/table_len.sim ./test.sh -f general/table/table.sim ./test.sh -f general/table/tinyint.sim ./test.sh -f general/table/vgroup.sim @@ -197,45 +196,45 @@ cd ../../../debug; make #./test.sh -f general/tag/5.sim #./test.sh -f general/tag/6.sim #./test.sh -f general/tag/add.sim -#./test.sh -f general/tag/bigint.sim +./test.sh -f general/tag/bigint.sim #./test.sh -f general/tag/binary_binary.sim #./test.sh -f general/tag/binary.sim #./test.sh -f general/tag/bool_binary.sim #./test.sh -f general/tag/bool_int.sim -#./test.sh -f general/tag/bool.sim +./test.sh -f general/tag/bool.sim #./test.sh -f general/tag/change.sim -#./test.sh -f general/tag/column.sim +#liao ./test.sh -f general/tag/column.sim #./test.sh -f general/tag/commit.sim -#./test.sh -f general/tag/create.sim +#liao ./test.sh -f general/tag/create.sim #./test.sh -f general/tag/delete.sim #./test.sh -f general/tag/double.sim -#./test.sh -f general/tag/filter.sim +./test.sh -f general/tag/filter.sim #./test.sh -f general/tag/float.sim #./test.sh -f general/tag/int_binary.sim #./test.sh -f general/tag/int_float.sim -#./test.sh -f general/tag/int.sim +./test.sh -f general/tag/int.sim #./test.sh -f general/tag/set.sim -#./test.sh -f general/tag/smallint.sim -#./test.sh -f general/tag/tinyint.sim +./test.sh -f general/tag/smallint.sim +./test.sh -f general/tag/tinyint.sim ./test.sh -f general/user/basic1.sim -#./test.sh -f general/user/monitor.sim +./test.sh -f general/user/monitor.sim ./test.sh -f general/user/pass_alter.sim ./test.sh -f general/user/pass_len.sim ./test.sh -f general/user/user_create.sim ./test.sh -f general/user/user_len.sim -#./test.sh -f general/vector/metrics_field.sim -#./test.sh -f general/vector/metrics_mix.sim -#./test.sh -f general/vector/metrics_query.sim -#./test.sh -f general/vector/metrics_tag.sim -#./test.sh -f general/vector/metrics_time.sim -#./test.sh -f general/vector/multi.sim +./test.sh -f general/vector/metrics_field.sim +./test.sh -f general/vector/metrics_mix.sim +./test.sh -f general/vector/metrics_query.sim +./test.sh -f general/vector/metrics_tag.sim +./test.sh -f general/vector/metrics_time.sim +#liao ./test.sh -f general/vector/multi.sim ./test.sh -f general/vector/single.sim -#./test.sh -f general/vector/table_field.sim -#./test.sh -f general/vector/table_mix.sim -#./test.sh -f general/vector/table_query.sim -#./test.sh -f general/vector/table_time.sim +./test.sh -f general/vector/table_field.sim +./test.sh -f general/vector/table_mix.sim +./test.sh -f general/vector/table_query.sim +./test.sh -f general/vector/table_time.sim ################################# diff --git a/tests/script/unique/big/maxvnodes.sim b/tests/script/unique/big/maxvnodes.sim index b0a0119ca791c249e9fc34878a2c457e0aca115c..3015d07b6dfdca7cc67e1621c096d8238b063129 100644 --- a/tests/script/unique/big/maxvnodes.sim +++ b/tests/script/unique/big/maxvnodes.sim @@ -1,9 +1,15 @@ system sh/stop_dnodes.sh +$totalVnodes = 100 +$minVnodes = 48 +$maxVnodes = 52 +$maxTables = 4 +$totalRows = $totalVnodes * $maxTables + 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/cfg.sh -n dnode1 -c numOfTotalVnodes -v 256 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v $maxTables +system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v $totalVnodes system sh/cfg.sh -n dnode1 -c maxVnodeConnections -v 100000 system sh/cfg.sh -n dnode1 -c maxMeterConnections -v 100000 system sh/cfg.sh -n dnode1 -c maxShellConns -v 100000 @@ -13,14 +19,14 @@ print ========== prepare data system sh/exec_up.sh -n dnode1 -s start sleep 3000 sql connect -sql create database db +sql create database db blocks 2 cache 1 maxTables $maxTables sql use db print ========== step1 sql create table mt (ts timestamp, tbcol int) TAGS(tgcol int) $x = 0 -while $x < 25600 +while $x < $totalRows $tb = t . $x sql create table $tb using mt tags( $x ) sql insert into $tb values (now, $x ) @@ -29,16 +35,15 @@ endw print ========== step2 sql select * from mt -if $rows != 25600 then +if $rows != $totalRows then return -1 endi sql select count(*) from mt -if $data00 != 25600 then +if $data00 != $totalRows then return -1 endi - system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c walLevel -v 0 system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 100 @@ -61,23 +66,23 @@ show3: endi sql show dnodes -print dnode1 freeVnodes $data3_192.168.0.1 -print dnode2 freeVnodes $data3_192.168.0.2 -if $data3_192.168.0.1 != 126 then +print dnode1 openvnodes $data2_1 +print dnode2 openvnodes $data2_2 +if $data2_1 != $minVnodes then goto show3 endi -if $data3_192.168.0.2 != 130 then +if $data2_2 != $maxVnodes then goto show3 endi print ========== step4 sql select * from mt -if $rows != 25600 then +if $rows != $totalRows then return -1 endi sql select count(*) from mt -if $data00 != 25600 then +if $data00 != $totalRows then return -1 endi