diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt index c2c102c241..23f2ff01f8 100644 --- a/tests/script/jenkins/basic.txt +++ b/tests/script/jenkins/basic.txt @@ -9,20 +9,15 @@ # ---- db ./test.sh -f tsim/db/alter_option.sim -# ./test.sh -f tsim/db/alter_replica_13.sim -# ./test.sh -f tsim/db/alter_replica_31.sim -#./test.sh -f tsim/db/alter_tables_d2.sim -#./test.sh -f tsim/db/alter_tables_v1.sim -#./test.sh -f tsim/db/alter_tables_v4.sim -#./test.sh -f tsim/db/alter_vgroups.sim +# unsupport ./test.sh -f tsim/db/alter_replica_13.sim +# unsupport ./test.sh -f tsim/db/alter_replica_31.sim ./test.sh -f tsim/db/basic1.sim ./test.sh -f tsim/db/basic2.sim ./test.sh -f tsim/db/basic3.sim -#./test.sh -f tsim/db/basic4.sim -#./test.sh -f tsim/db/basic5.sim +./test.sh -f tsim/db/basic4.sim +./test.sh -f tsim/db/basic5.sim ./test.sh -f tsim/db/basic6.sim -./test.sh -f tsim/db/basic7.sim -#./test.sh -f tsim/db/commit.sim +# nojira ./test.sh -f tsim/db/commit.sim ./test.sh -f tsim/db/create_all_options.sim #./test.sh -f tsim/db/delete_part.sim #./test.sh -f tsim/db/delete_reuse1.sim @@ -33,41 +28,37 @@ #./test.sh -f tsim/db/delete_writing2.sim #./test.sh -f tsim/db/delete.sim #./test.sh -f tsim/db/delete2.sim -#./test.sh -f tsim/db/dropvnodes.sim +# unsupport ./test.sh -f tsim/db/dropdnodes.sim ./test.sh -f tsim/db/error1.sim -#./test.sh -f tsim/db/keep.sim -#./test.sh -f tsim/db/len.sim -#./test.sh -f tsim/db/nosuchfile.sim -#./test.sh -f tsim/db/repeat.sim -#./test.sh -f tsim/db/show_create_db.sim -#./test.sh -f tsim/db/show_create_table.sim -#./test.sh -f tsim/db/tables.sim +# nojira ./test.sh -f tsim/db/keep.sim +./test.sh -f tsim/db/len.sim +./test.sh -f tsim/db/repeat.sim +./test.sh -f tsim/db/show_create_db.sim +./test.sh -f tsim/db/show_create_table.sim +./test.sh -f tsim/db/tables.sim ./test.sh -f tsim/db/taosdlog.sim -#./test.sh -f tsim/db/topic1.sim -#./test.sh -f tsim/db/topic2.sim -#./test.sh -f tsim/db/vnodes.sim # ---- dnode -# ./test.sh -f tsim/dnode/balance_replica1.sim -# ./test.sh -f tsim/dnode/balance_replica3.sim -# ./test.sh -f tsim/dnode/balance1.sim -# ./test.sh -f tsim/dnode/balance2.sim -# ./test.sh -f tsim/dnode/balance3.sim -# ./test.sh -f tsim/dnode/balancex.sim +# unsupport ./test.sh -f tsim/dnode/balance_replica1.sim +# unsupport ./test.sh -f tsim/dnode/balance_replica3.sim +# unsupport ./test.sh -f tsim/dnode/balance1.sim +# unsupport ./test.sh -f tsim/dnode/balance2.sim +# unsupport ./test.sh -f tsim/dnode/balance3.sim +# unsupport ./test.sh -f tsim/dnode/balancex.sim ./test.sh -f tsim/dnode/create_dnode.sim ./test.sh -f tsim/dnode/drop_dnode_has_mnode.sim -# ./test.sh -f tsim/dnode/drop_dnode_has_qnode_snode.sim -# ./test.sh -f tsim/dnode/drop_dnode_has_vnode_replica1.sim -# ./test.sh -f tsim/dnode/drop_dnode_has_vnode_replica3.sim -# ./test.sh -f tsim/dnode/drop_dnode_has_multi_vnode_replica1.sim -# ./test.sh -f tsim/dnode/drop_dnode_has_multi_vnode_replica3.sim +# unsupport ./test.sh -f tsim/dnode/drop_dnode_has_qnode_snode.sim +# unsupport ./test.sh -f tsim/dnode/drop_dnode_has_vnode_replica1.sim +# unsupport ./test.sh -f tsim/dnode/drop_dnode_has_vnode_replica3.sim +# unsupport ./test.sh -f tsim/dnode/drop_dnode_has_multi_vnode_replica1.sim +# unsupport ./test.sh -f tsim/dnode/drop_dnode_has_multi_vnode_replica3.sim ./test.sh -f tsim/dnode/offline_reason.sim -# ./test.sh -f tsim/dnode/redistribute_vgroup_replica1.sim -# ./test.sh -f tsim/dnode/redistribute_vgroup_replica3_v1_leader.sim -# ./test.sh -f tsim/dnode/redistribute_vgroup_replica3_v1_follower.sim -# ./test.sh -f tsim/dnode/redistribute_vgroup_replica3_v2.sim -# ./test.sh -f tsim/dnode/redistribute_vgroup_replica3_v3.sim -# ./test.sh -f tsim/dnode/vnode_clean.sim +# unsupport ./test.sh -f tsim/dnode/redistribute_vgroup_replica1.sim +# unsupport ./test.sh -f tsim/dnode/redistribute_vgroup_replica3_v1_leader.sim +# unsupport ./test.sh -f tsim/dnode/redistribute_vgroup_replica3_v1_follower.sim +# unsupport ./test.sh -f tsim/dnode/redistribute_vgroup_replica3_v2.sim +# unsupport ./test.sh -f tsim/dnode/redistribute_vgroup_replica3_v3.sim +# unsupport ./test.sh -f tsim/dnode/vnode_clean.sim # ---- import ./test.sh -f tsim/import/basic.sim @@ -394,19 +385,19 @@ # ---- compute ./test.sh -f tsim/compute/avg.sim -#./test.sh -f tsim/compute/block_dist.sim +# jira ./test.sh -f tsim/compute/block_dist.sim ./test.sh -f tsim/compute/bottom.sim ./test.sh -f tsim/compute/count.sim ./test.sh -f tsim/compute/diff.sim ./test.sh -f tsim/compute/diff2.sim ./test.sh -f tsim/compute/first.sim ./test.sh -f tsim/compute/interval.sim -#./test.sh -f tsim/compute/last_row.sim +# jira ./test.sh -f tsim/compute/last_row.sim ./test.sh -f tsim/compute/last.sim ./test.sh -f tsim/compute/leastsquare.sim ./test.sh -f tsim/compute/max.sim ./test.sh -f tsim/compute/min.sim -#./test.sh -f tsim/compute/null.sim +./test.sh -f tsim/compute/null.sim ./test.sh -f tsim/compute/percentile.sim ./test.sh -f tsim/compute/stddev.sim ./test.sh -f tsim/compute/sum.sim @@ -455,8 +446,8 @@ ./test.sh -f tsim/tag/3.sim ./test.sh -f tsim/tag/4.sim ./test.sh -f tsim/tag/5.sim -#./test.sh -f tsim/tag/6.sim -#./test.sh -f tsim/tag/add.sim +# jira ./test.sh -f tsim/tag/6.sim +# jira ./test.sh -f tsim/tag/add.sim ./test.sh -f tsim/tag/bigint.sim ./test.sh -f tsim/tag/binary_binary.sim ./test.sh -f tsim/tag/binary.sim @@ -468,9 +459,9 @@ #./test.sh -f tsim/tag/commit.sim #./test.sh -f tsim/tag/create.sim #./test.sh -f tsim/tag/delete.sim -#./test.sh -f tsim/tag/double.sim +# jira ./test.sh -f tsim/tag/double.sim #./test.sh -f tsim/tag/filter.sim -#./test.sh -f tsim/tag/float.sim +# jira ./test.sh -f tsim/tag/float.sim ./test.sh -f tsim/tag/int_binary.sim ./test.sh -f tsim/tag/int_float.sim ./test.sh -f tsim/tag/int.sim @@ -478,5 +469,4 @@ ./test.sh -f tsim/tag/smallint.sim ./test.sh -f tsim/tag/tinyint.sim - #======================b1-end=============== diff --git a/tests/script/tsim/compute/null.sim b/tests/script/tsim/compute/null.sim index b5647a1e34..48fa70ae7a 100644 --- a/tests/script/tsim/compute/null.sim +++ b/tests/script/tsim/compute/null.sim @@ -113,7 +113,7 @@ sql create table tt using $mt tags( NULL ) #step52: sql select * from $mt where tgcol is NULL -if $rows != 1 then +if $rows != 0 then return -1 endi diff --git a/tests/script/tsim/db/alter_tables_d2.sim b/tests/script/tsim/db/alter_tables_d2.sim deleted file mode 100644 index f74f98d571..0000000000 --- a/tests/script/tsim/db/alter_tables_d2.sim +++ /dev/null @@ -1,570 +0,0 @@ -system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -i 1 -system sh/cfg.sh -n dnode1 -c wallevel -v 2 -system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 4 -system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 5 - -system sh/deploy.sh -n dnode2 -i 2 -system sh/cfg.sh -n dnode2 -c wallevel -v 2 -system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 4 -system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 5 - -system sh/exec.sh -n dnode1 -s start -system sh/exec.sh -n dnode2 -s start -sql connect -sql create dnode $hostname2 - -$x = 0 -step1: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi - -sql show dnodes -print dnode1 $data4_1 -print dnode2 $data4_2 -if $data4_1 != ready then - goto step1 -endi -if $data4_2 != ready then - goto step1 -endi - -print ============================ step1 - -sql create database db -sql create table db.st (ts timestamp, i int) tags(t int) -sql create table db.t000 using db.st tags(0) -sql create table db.t001 using db.st tags(1) -sql create table db.t002 using db.st tags(2) -sql create table db.t003 using db.st tags(3) -sql create table db.t004 using db.st tags(4) -sql create table db.t005 using db.st tags(5) -sql create table db.t006 using db.st tags(6) -sql create table db.t007 using db.st tags(7) -sql create table db.t008 using db.st tags(8) -sql create table db.t009 using db.st tags(9) -sql create table db.t010 using db.st tags(0) -sql create table db.t011 using db.st tags(1) -sql create table db.t012 using db.st tags(2) -sql create table db.t013 using db.st tags(3) -sql create table db.t014 using db.st tags(4) -sql create table db.t015 using db.st tags(5) -sql create table db.t016 using db.st tags(6) -sql create table db.t017 using db.st tags(7) -sql create table db.t018 using db.st tags(8) -sql create table db.t019 using db.st tags(9) - -sql show db.tables -if $rows != 20 then - return -1 -endi - -sql insert into db.t000 values(now, 1) -sql insert into db.t001 values(now, 1) -sql insert into db.t002 values(now, 1) -sql insert into db.t003 values(now, 1) -sql insert into db.t004 values(now, 1) -sql insert into db.t005 values(now, 1) -sql insert into db.t006 values(now, 1) -sql insert into db.t007 values(now, 1) -sql insert into db.t008 values(now, 1) -sql insert into db.t009 values(now, 1) -sql insert into db.t010 values(now, 1) -sql insert into db.t011 values(now, 1) -sql insert into db.t012 values(now, 1) -sql insert into db.t013 values(now, 1) -sql insert into db.t014 values(now, 1) -sql insert into db.t015 values(now, 1) -sql insert into db.t016 values(now, 1) -sql insert into db.t017 values(now, 1) -sql insert into db.t018 values(now, 1) -sql insert into db.t019 values(now, 1) - -print ============================ step2 -sql_error create table db.t100 using db.st tags(10) -sql show db.tables -if $rows != 20 then - return -1 -endi - -print ============================ step3 -system sh/exec.sh -n dnode1 -s stop -x SIGINT -system sh/exec.sh -n dnode2 -s stop -x SIGINT -system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 10 -system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 10 -system sh/exec.sh -n dnode1 -s start -system sh/exec.sh -n dnode2 -s start -$x = 0 -step2: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi - -sql show mnodes -x step1 -print mnode1 $data2_1 -print mnode1 $data2_2 -print mnode1 $data2_3 -if $data2_1 != master then - goto step2 -endi - -sql create table db.t100 using db.st tags(0) -sql create table db.t101 using db.st tags(1) -sql create table db.t102 using db.st tags(2) -sql create table db.t103 using db.st tags(3) -sql create table db.t104 using db.st tags(4) -sql create table db.t105 using db.st tags(5) -sql create table db.t106 using db.st tags(6) -sql create table db.t107 using db.st tags(7) -sql create table db.t108 using db.st tags(8) -sql create table db.t109 using db.st tags(9) -sql create table db.t110 using db.st tags(0) -sql create table db.t111 using db.st tags(1) -sql create table db.t112 using db.st tags(2) -sql create table db.t113 using db.st tags(3) -sql create table db.t114 using db.st tags(4) -sql create table db.t115 using db.st tags(5) -sql create table db.t116 using db.st tags(6) -sql create table db.t117 using db.st tags(7) -sql create table db.t118 using db.st tags(8) -sql create table db.t119 using db.st tags(9) -sql show db.tables -if $rows != 40 then - return -1 -endi - -sql insert into db.t100 values(now, 1) -sql insert into db.t101 values(now, 1) -sql insert into db.t102 values(now, 1) -sql insert into db.t103 values(now, 1) -sql insert into db.t104 values(now, 1) -sql insert into db.t105 values(now, 1) -sql insert into db.t106 values(now, 1) -sql insert into db.t107 values(now, 1) -sql insert into db.t108 values(now, 1) -sql insert into db.t109 values(now, 1) -sql insert into db.t110 values(now, 1) -sql insert into db.t111 values(now, 1) -sql insert into db.t112 values(now, 1) -sql insert into db.t113 values(now, 1) -sql insert into db.t114 values(now, 1) -sql insert into db.t115 values(now, 1) -sql insert into db.t116 values(now, 1) -sql insert into db.t117 values(now, 1) -sql insert into db.t118 values(now, 1) -sql insert into db.t119 values(now, 1) - -print ============================ step4 -sql_error create table db.t200 using db.st tags(10) -sql show db.tables -if $rows != 40 then - return -1 -endi - -print ============================ step5 -system sh/exec.sh -n dnode1 -s stop -x SIGINT -system sh/exec.sh -n dnode2 -s stop -x SIGINT -system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 15 -system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 15 -system sh/exec.sh -n dnode1 -s start -system sh/exec.sh -n dnode2 -s start - -$x = 0 -step3: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi - -sql show mnodes -x step3 -print mnode1 $data2_1 -print mnode1 $data2_2 -print mnode1 $data2_3 -if $data2_1 != master then - goto step3 -endi - -sql create table db.t200 using db.st tags(0) -sql create table db.t201 using db.st tags(1) -sql create table db.t202 using db.st tags(2) -sql create table db.t203 using db.st tags(3) -sql create table db.t204 using db.st tags(4) -sql create table db.t205 using db.st tags(5) -sql create table db.t206 using db.st tags(6) -sql create table db.t207 using db.st tags(7) -sql create table db.t208 using db.st tags(8) -sql create table db.t209 using db.st tags(9) -sql create table db.t210 using db.st tags(0) -sql create table db.t211 using db.st tags(1) -sql create table db.t212 using db.st tags(2) -sql create table db.t213 using db.st tags(3) -sql create table db.t214 using db.st tags(4) -sql create table db.t215 using db.st tags(5) -sql create table db.t216 using db.st tags(6) -sql create table db.t217 using db.st tags(7) -sql create table db.t218 using db.st tags(8) -sql create table db.t219 using db.st tags(9) -sql show db.tables -if $rows != 60 then - return -1 -endi - -sql insert into db.t200 values(now, 1) -sql insert into db.t201 values(now, 1) -sql insert into db.t202 values(now, 1) -sql insert into db.t203 values(now, 1) -sql insert into db.t204 values(now, 1) -sql insert into db.t205 values(now, 1) -sql insert into db.t206 values(now, 1) -sql insert into db.t207 values(now, 1) -sql insert into db.t208 values(now, 1) -sql insert into db.t209 values(now, 1) -sql insert into db.t210 values(now, 1) -sql insert into db.t211 values(now, 1) -sql insert into db.t212 values(now, 1) -sql insert into db.t213 values(now, 1) -sql insert into db.t214 values(now, 1) -sql insert into db.t215 values(now, 1) -sql insert into db.t216 values(now, 1) -sql insert into db.t217 values(now, 1) -sql insert into db.t218 values(now, 1) -sql insert into db.t219 values(now, 1) - -print ============================ step6 - -sql reset query cache -sleep 100 - -sql select * from db.t000 -if $rows != 1 then - return -1 -endi - -sql select * from db.t100 -if $rows != 1 then - return -1 -endi - -sql select * from db.t200 -if $rows != 1 then - return -1 -endi - -sql select * from db.st -if $rows != 60 then - return -1 -endi - -print ============================ step7 -system sh/exec.sh -n dnode1 -s stop -x SIGINT -system sh/exec.sh -n dnode2 -s stop -x SIGINT -sleep 3000 -system sh/exec.sh -n dnode1 -s start -system sh/exec.sh -n dnode2 -s start -sleep 3000 - -sql reset query cache -sleep 1000 - -sql show db.tables -if $rows != 60 then - return -1 -endi - -sql select * from db.t000 -if $rows != 1 then - return -1 -endi - -sql select * from db.t100 -if $rows != 1 then - return -1 -endi - -sql select * from db.t200 -if $rows != 1 then - return -1 -endi - -sql select * from db.st -if $rows != 60 then - return -1 -endi - -print ============================ step8 -sql_error create table db.t300 using db.st tags(10) -sql show db.tables -if $rows != 60 then - return -1 -endi - -print ============================ step9 -system sh/exec.sh -n dnode1 -s stop -x SIGINT -system sh/exec.sh -n dnode2 -s stop -x SIGINT -system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 20 -system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 20 -system sh/exec.sh -n dnode1 -s start -system sh/exec.sh -n dnode2 -s start -$x = 0 -step9: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi - -sql show mnodes -x step9 -print mnode1 $data2_1 -print mnode1 $data2_2 -print mnode1 $data2_3 -if $data2_1 != master then - goto step9 -endi - -sql create table db.t300 using db.st tags(0) -sql create table db.t301 using db.st tags(1) -sql create table db.t302 using db.st tags(2) -sql create table db.t303 using db.st tags(3) -sql create table db.t304 using db.st tags(4) -sql create table db.t305 using db.st tags(5) -sql create table db.t306 using db.st tags(6) -sql create table db.t307 using db.st tags(7) -sql create table db.t308 using db.st tags(8) -sql create table db.t309 using db.st tags(9) -sql create table db.t310 using db.st tags(0) -sql create table db.t311 using db.st tags(1) -sql create table db.t312 using db.st tags(2) -sql create table db.t313 using db.st tags(3) -sql create table db.t314 using db.st tags(4) -sql create table db.t315 using db.st tags(5) -sql create table db.t316 using db.st tags(6) -sql create table db.t317 using db.st tags(7) -sql create table db.t318 using db.st tags(8) -sql create table db.t319 using db.st tags(9) - -sql insert into db.t300 values(now, 1) -sql insert into db.t301 values(now, 1) -sql insert into db.t302 values(now, 1) -sql insert into db.t303 values(now, 1) -sql insert into db.t304 values(now, 1) -sql insert into db.t305 values(now, 1) -sql insert into db.t306 values(now, 1) -sql insert into db.t307 values(now, 1) -sql insert into db.t308 values(now, 1) -sql insert into db.t309 values(now, 1) -sql insert into db.t310 values(now, 1) -sql insert into db.t311 values(now, 1) -sql insert into db.t312 values(now, 1) -sql insert into db.t313 values(now, 1) -sql insert into db.t314 values(now, 1) -sql insert into db.t315 values(now, 1) -sql insert into db.t316 values(now, 1) -sql insert into db.t317 values(now, 1) -sql insert into db.t318 values(now, 1) -sql insert into db.t319 values(now, 1) - -sql show db.tables -if $rows != 80 then - return -1 -endi - -sql reset query cache -sleep 100 - -sql select * from db.t000 -if $rows != 1 then - return -1 -endi - -sql select * from db.t100 -if $rows != 1 then - return -1 -endi - -sql select * from db.t200 -if $rows != 1 then - return -1 -endi - -sql select * from db.t300 -if $rows != 1 then - return -1 -endi - -sql select * from db.st -if $rows != 80 then - return -1 -endi - -print ============================ step10 -system sh/exec.sh -n dnode1 -s stop -x SIGINT -system sh/exec.sh -n dnode2 -s stop -x SIGINT -system sh/exec.sh -n dnode1 -s start -system sh/exec.sh -n dnode2 -s start -$x = 0 -step10: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi - -sql show mnodes -x step10 -print mnode1 $data2_1 -print mnode1 $data2_2 -print mnode1 $data2_3 -if $data2_1 != master then - goto step10 -endi - -sql reset query cache -sleep 100 - -sql show db.tables -if $rows != 80 then - return -1 -endi - -sql select * from db.t000 -if $rows != 1 then - return -1 -endi - -sql select * from db.t100 -if $rows != 1 then - return -1 -endi - -sql select * from db.t200 -if $rows != 1 then - return -1 -endi - -sql select * from db.t300 -if $rows != 1 then - return -1 -endi - -sql select * from db.st -if $rows != 80 then - return -1 -endi - -print ============================ step11 -sql_error create table db.t400 using db.st tags(10) -sql show db.tables -if $rows != 80 then - return -1 -endi - -print ============================ step9 -system sh/exec.sh -n dnode1 -s stop -x SIGINT -system sh/exec.sh -n dnode2 -s stop -x SIGINT -system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 25 -system sh/cfg.sh -n dnode2 -c maxTablesPerVnode -v 25 -system sh/exec.sh -n dnode1 -s start -system sh/exec.sh -n dnode2 -s start -$x = 0 -step1xx: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi - -sql show mnodes -x step1xx -print mnode1 $data2_1 -print mnode1 $data2_2 -print mnode1 $data2_3 -if $data2_1 != master then - goto step1xx -endi - -sql create table db.t400 using db.st tags(0) -sql create table db.t401 using db.st tags(1) -sql create table db.t402 using db.st tags(2) -sql create table db.t403 using db.st tags(3) -sql create table db.t404 using db.st tags(4) -sql create table db.t405 using db.st tags(5) -sql create table db.t406 using db.st tags(6) -sql create table db.t407 using db.st tags(7) -sql create table db.t408 using db.st tags(8) -sql create table db.t409 using db.st tags(9) -sql create table db.t410 using db.st tags(0) -sql create table db.t411 using db.st tags(1) -sql create table db.t412 using db.st tags(2) -sql create table db.t413 using db.st tags(3) -sql create table db.t414 using db.st tags(4) -sql create table db.t415 using db.st tags(5) -sql create table db.t416 using db.st tags(6) -sql create table db.t417 using db.st tags(7) -sql create table db.t418 using db.st tags(8) -sql create table db.t419 using db.st tags(9) - -sql insert into db.t400 values(now, 1) -sql insert into db.t401 values(now, 1) -sql insert into db.t402 values(now, 1) -sql insert into db.t403 values(now, 1) -sql insert into db.t404 values(now, 1) -sql insert into db.t405 values(now, 1) -sql insert into db.t406 values(now, 1) -sql insert into db.t407 values(now, 1) -sql insert into db.t408 values(now, 1) -sql insert into db.t409 values(now, 1) -sql insert into db.t410 values(now, 1) -sql insert into db.t411 values(now, 1) -sql insert into db.t412 values(now, 1) -sql insert into db.t413 values(now, 1) -sql insert into db.t414 values(now, 1) -sql insert into db.t415 values(now, 1) -sql insert into db.t416 values(now, 1) -sql insert into db.t417 values(now, 1) -sql insert into db.t418 values(now, 1) -sql insert into db.t419 values(now, 1) - -sql show db.tables -if $rows != 100 then - return -1 -endi - -sql reset query cache -sleep 100 - -sql select * from db.t000 -if $rows != 1 then - return -1 -endi - -sql select * from db.t100 -if $rows != 1 then - return -1 -endi - -sql select * from db.t200 -if $rows != 1 then - return -1 -endi - -sql select * from db.t300 -if $rows != 1 then - return -1 -endi - -sql select * from db.t400 -if $rows != 1 then - return -1 -endi - -sql select * from db.st -if $rows != 100 then - return -1 -endi - -system sh/exec.sh -n dnode1 -s stop -x SIGINT -system sh/exec.sh -n dnode2 -s stop -x SIGINT \ No newline at end of file diff --git a/tests/script/tsim/db/alter_tables_v1.sim b/tests/script/tsim/db/alter_tables_v1.sim deleted file mode 100644 index 20c4c73363..0000000000 --- a/tests/script/tsim/db/alter_tables_v1.sim +++ /dev/null @@ -1,436 +0,0 @@ -system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -i 1 -system sh/cfg.sh -n dnode1 -c wallevel -v 0 -system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1 -system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 10 - -system sh/exec.sh -n dnode1 -s start -sql connect - -print ============================ step1 - -sql create database db -sql create table db.st (ts timestamp, i int) tags(t int) -sql create table db.t0 using db.st tags(0) -sql create table db.t1 using db.st tags(1) -sql create table db.t2 using db.st tags(2) -sql create table db.t3 using db.st tags(3) -sql create table db.t4 using db.st tags(4) -sql create table db.t5 using db.st tags(5) -sql create table db.t6 using db.st tags(6) -sql create table db.t7 using db.st tags(7) -sql create table db.t8 using db.st tags(8) -sql create table db.t9 using db.st tags(9) - -sql show db.tables -if $rows != 10 then - return -1 -endi - -sql insert into db.t0 values(now, 1) -sql insert into db.t1 values(now, 1) -sql insert into db.t2 values(now, 1) -sql insert into db.t3 values(now, 1) -sql insert into db.t4 values(now, 1) -sql insert into db.t5 values(now, 1) -sql insert into db.t6 values(now, 1) -sql insert into db.t7 values(now, 1) -sql insert into db.t8 values(now, 1) -sql insert into db.t9 values(now, 1) - -print ============================ step2 -sql_error create table db.t10 using db.st tags(10) -sql show db.tables -if $rows != 10 then - return -1 -endi - -print ============================ step3 - -system sh/exec.sh -n dnode1 -s stop -x SIGINT -system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 20 -system sh/exec.sh -n dnode1 -s start -$x = 0 -step2: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi - -sql show mnodes -x step2 -print mnode1 $data2_1 -print mnode1 $data2_2 -print mnode1 $data2_3 -if $data2_1 != master then - goto step2 -endi - -sql create table db.t10 using db.st tags(0) -sql create table db.t11 using db.st tags(1) -sql create table db.t12 using db.st tags(2) -sql create table db.t13 using db.st tags(3) -sql create table db.t14 using db.st tags(4) -sql create table db.t15 using db.st tags(5) -sql create table db.t16 using db.st tags(6) -sql create table db.t17 using db.st tags(7) -sql create table db.t18 using db.st tags(8) -sql create table db.t19 using db.st tags(9) -sql show db.tables -if $rows != 20 then - return -1 -endi - -sql insert into db.t10 values(now, 1) -sql insert into db.t11 values(now, 1) -sql insert into db.t12 values(now, 1) -sql insert into db.t13 values(now, 1) -sql insert into db.t14 values(now, 1) -sql insert into db.t15 values(now, 1) -sql insert into db.t16 values(now, 1) -sql insert into db.t17 values(now, 1) -sql insert into db.t18 values(now, 1) -sql insert into db.t19 values(now, 1) - -print ============================ step4 -sql_error create table db.t20 using db.st tags(10) -sql show db.tables -if $rows != 20 then - return -1 -endi - -print ============================ step5 -system sh/exec.sh -n dnode1 -s stop -x SIGINT -system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 30 -system sh/exec.sh -n dnode1 -s start -$x = 0 -step5: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi - -sql show mnodes -x step5 -print mnode1 $data2_1 -print mnode1 $data2_2 -print mnode1 $data2_3 -if $data2_1 != master then - goto step5 -endi - -sql create table db.t20 using db.st tags(0) -sql create table db.t21 using db.st tags(1) -sql create table db.t22 using db.st tags(2) -sql create table db.t23 using db.st tags(3) -sql create table db.t24 using db.st tags(4) -sql create table db.t25 using db.st tags(5) -sql create table db.t26 using db.st tags(6) -sql create table db.t27 using db.st tags(7) -sql create table db.t28 using db.st tags(8) -sql create table db.t29 using db.st tags(9) -sql show db.tables -if $rows != 30 then - return -1 -endi - -sql insert into db.t20 values(now, 1) -sql insert into db.t21 values(now, 1) -sql insert into db.t22 values(now, 1) -sql insert into db.t23 values(now, 1) -sql insert into db.t24 values(now, 1) -sql insert into db.t25 values(now, 1) -sql insert into db.t26 values(now, 1) -sql insert into db.t27 values(now, 1) -sql insert into db.t28 values(now, 1) -sql insert into db.t29 values(now, 1) - -print ============================ step6 - -sql reset query cache -sleep 100 - -sql select * from db.t0 -if $rows != 1 then - return -1 -endi - -sql select * from db.t10 -if $rows != 1 then - return -1 -endi - -sql select * from db.t20 -if $rows != 1 then - return -1 -endi - -sql select * from db.st -if $rows != 30 then - return -1 -endi - -print ============================ step7 -system sh/exec.sh -n dnode1 -s stop -x SIGINT -system sh/exec.sh -n dnode1 -s start -$x = 0 -step7: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi - -sql show mnodes -x step7 -print mnode1 $data2_1 -print mnode1 $data2_2 -print mnode1 $data2_3 -if $data2_1 != master then - goto step7 -endi - -sql reset query cache -sleep 1000 - -sql show db.tables -if $rows != 30 then - return -1 -endi - -sql select * from db.t0 -if $rows != 1 then - return -1 -endi - -sql select * from db.t10 -if $rows != 1 then - return -1 -endi - -sql select * from db.t20 -if $rows != 1 then - return -1 -endi - -sql select * from db.st -if $rows != 30 then - return -1 -endi - -print ============================ step8 -sql_error create table db.t30 using db.st tags(10) -sql show db.tables -if $rows != 30 then - return -1 -endi - -print ============================ step9 -system sh/exec.sh -n dnode1 -s stop -x SIGINT -system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 40 -system sh/exec.sh -n dnode1 -s start -$x = 0 -step9: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi - -sql show mnodes -x step9 -print mnode1 $data2_1 -print mnode1 $data2_2 -print mnode1 $data2_3 -if $data2_1 != master then - goto step9 -endi - -sql create table db.t30 using db.st tags(0) -sql create table db.t31 using db.st tags(1) -sql create table db.t32 using db.st tags(2) -sql create table db.t33 using db.st tags(3) -sql create table db.t34 using db.st tags(4) -sql create table db.t35 using db.st tags(5) -sql create table db.t36 using db.st tags(6) -sql create table db.t37 using db.st tags(7) -sql create table db.t38 using db.st tags(8) -sql create table db.t39 using db.st tags(9) - -sql insert into db.t30 values(now, 1) -sql insert into db.t31 values(now, 1) -sql insert into db.t32 values(now, 1) -sql insert into db.t33 values(now, 1) -sql insert into db.t34 values(now, 1) -sql insert into db.t35 values(now, 1) -sql insert into db.t36 values(now, 1) -sql insert into db.t37 values(now, 1) -sql insert into db.t38 values(now, 1) -sql insert into db.t39 values(now, 1) - -sql show db.tables -if $rows != 40 then - return -1 -endi - -sql reset query cache -sleep 1000 - -sql select * from db.t0 -if $rows != 1 then - return -1 -endi - -sql select * from db.t10 -if $rows != 1 then - return -1 -endi - -sql select * from db.t20 -if $rows != 1 then - return -1 -endi - -sql select * from db.t30 -if $rows != 1 then - return -1 -endi - -sql select * from db.st -if $rows != 40 then - return -1 -endi - -print ============================ step10 -system sh/exec.sh -n dnode1 -s stop -x SIGINT -system sh/exec.sh -n dnode1 -s start -$x = 0 -step10: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi - -sql show mnodes -x step10 -print mnode1 $data2_1 -print mnode1 $data2_2 -print mnode1 $data2_3 -if $data2_1 != master then - goto step10 -endi - -sql reset query cache -sleep 1000 - -sql show db.tables -if $rows != 40 then - return -1 -endi - -sql select * from db.t0 -if $rows != 1 then - return -1 -endi - -sql select * from db.t10 -if $rows != 1 then - return -1 -endi - -sql select * from db.t20 -if $rows != 1 then - return -1 -endi - -sql select * from db.st -if $rows != 40 then - return -1 -endi - -print ============================ step11 -sql_error create table db.t40 using db.st tags(10) -sql show db.tables -if $rows != 40 then - return -1 -endi - -print ============================ step12 -system sh/exec.sh -n dnode1 -s stop -x SIGINT -system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 50 -system sh/exec.sh -n dnode1 -s start -$x = 0 -step12: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi - -sql show mnodes -x step12 -print mnode1 $data2_1 -print mnode1 $data2_2 -print mnode1 $data2_3 -if $data2_1 != master then - goto step12 -endi - -sql create table db.t40 using db.st tags(0) -sql create table db.t41 using db.st tags(1) -sql create table db.t42 using db.st tags(2) -sql create table db.t43 using db.st tags(3) -sql create table db.t44 using db.st tags(4) -sql create table db.t45 using db.st tags(5) -sql create table db.t46 using db.st tags(6) -sql create table db.t47 using db.st tags(7) -sql create table db.t48 using db.st tags(8) -sql create table db.t49 using db.st tags(9) - -sql insert into db.t40 values(now, 1) -sql insert into db.t41 values(now, 1) -sql insert into db.t42 values(now, 1) -sql insert into db.t43 values(now, 1) -sql insert into db.t44 values(now, 1) -sql insert into db.t45 values(now, 1) -sql insert into db.t46 values(now, 1) -sql insert into db.t47 values(now, 1) -sql insert into db.t48 values(now, 1) -sql insert into db.t49 values(now, 1) - -sql show db.tables -if $rows != 50 then - return -1 -endi - -sql reset query cache -sleep 1000 - -sql select * from db.t0 -if $rows != 1 then - return -1 -endi - -sql select * from db.t10 -if $rows != 1 then - return -1 -endi - -sql select * from db.t20 -if $rows != 1 then - return -1 -endi - -sql select * from db.t30 -if $rows != 1 then - return -1 -endi - -sql select * from db.t40 -if $rows != 1 then - return -1 -endi - -sql select * from db.st -if $rows != 50 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/tsim/db/alter_tables_v4.sim b/tests/script/tsim/db/alter_tables_v4.sim deleted file mode 100644 index 10bb4e108b..0000000000 --- a/tests/script/tsim/db/alter_tables_v4.sim +++ /dev/null @@ -1,529 +0,0 @@ -system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -i 1 -system sh/cfg.sh -n dnode1 -c wallevel -v 0 -system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 4 -system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 5 - -system sh/exec.sh -n dnode1 -s start -sql connect - -print ============================ step1 - -sql create database db -sql create table db.st (ts timestamp, i int) tags(t int) -sql create table db.t000 using db.st tags(0) -sql create table db.t001 using db.st tags(1) -sql create table db.t002 using db.st tags(2) -sql create table db.t003 using db.st tags(3) -sql create table db.t004 using db.st tags(4) -sql create table db.t005 using db.st tags(5) -sql create table db.t006 using db.st tags(6) -sql create table db.t007 using db.st tags(7) -sql create table db.t008 using db.st tags(8) -sql create table db.t009 using db.st tags(9) -sql create table db.t010 using db.st tags(0) -sql create table db.t011 using db.st tags(1) -sql create table db.t012 using db.st tags(2) -sql create table db.t013 using db.st tags(3) -sql create table db.t014 using db.st tags(4) -sql create table db.t015 using db.st tags(5) -sql create table db.t016 using db.st tags(6) -sql create table db.t017 using db.st tags(7) -sql create table db.t018 using db.st tags(8) -sql create table db.t019 using db.st tags(9) - -sql show db.tables -if $rows != 20 then - return -1 -endi - -sql insert into db.t000 values(now, 1) -sql insert into db.t001 values(now, 1) -sql insert into db.t002 values(now, 1) -sql insert into db.t003 values(now, 1) -sql insert into db.t004 values(now, 1) -sql insert into db.t005 values(now, 1) -sql insert into db.t006 values(now, 1) -sql insert into db.t007 values(now, 1) -sql insert into db.t008 values(now, 1) -sql insert into db.t009 values(now, 1) -sql insert into db.t010 values(now, 1) -sql insert into db.t011 values(now, 1) -sql insert into db.t012 values(now, 1) -sql insert into db.t013 values(now, 1) -sql insert into db.t014 values(now, 1) -sql insert into db.t015 values(now, 1) -sql insert into db.t016 values(now, 1) -sql insert into db.t017 values(now, 1) -sql insert into db.t018 values(now, 1) -sql insert into db.t019 values(now, 1) - -print ============================ step2 -sql_error create table db.t100 using db.st tags(10) -sql show db.tables -if $rows != 20 then - return -1 -endi - -print ============================ step3 -system sh/exec.sh -n dnode1 -s stop -x SIGINT -system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 10 -system sh/exec.sh -n dnode1 -s start -$x = 0 -step3: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi - -sql show mnodes -x step3 -print mnode1 $data2_1 -print mnode1 $data2_2 -print mnode1 $data2_3 -if $data2_1 != master then - goto step3 -endi - -sql create table db.t100 using db.st tags(0) -sql create table db.t101 using db.st tags(1) -sql create table db.t102 using db.st tags(2) -sql create table db.t103 using db.st tags(3) -sql create table db.t104 using db.st tags(4) -sql create table db.t105 using db.st tags(5) -sql create table db.t106 using db.st tags(6) -sql create table db.t107 using db.st tags(7) -sql create table db.t108 using db.st tags(8) -sql create table db.t109 using db.st tags(9) -sql create table db.t110 using db.st tags(0) -sql create table db.t111 using db.st tags(1) -sql create table db.t112 using db.st tags(2) -sql create table db.t113 using db.st tags(3) -sql create table db.t114 using db.st tags(4) -sql create table db.t115 using db.st tags(5) -sql create table db.t116 using db.st tags(6) -sql create table db.t117 using db.st tags(7) -sql create table db.t118 using db.st tags(8) -sql create table db.t119 using db.st tags(9) -sql show db.tables -if $rows != 40 then - return -1 -endi - - -sql insert into db.t100 values(now, 1) -sql insert into db.t101 values(now, 1) -sql insert into db.t102 values(now, 1) -sql insert into db.t103 values(now, 1) -sql insert into db.t104 values(now, 1) -sql insert into db.t105 values(now, 1) -sql insert into db.t106 values(now, 1) -sql insert into db.t107 values(now, 1) -sql insert into db.t108 values(now, 1) -sql insert into db.t109 values(now, 1) -sql insert into db.t110 values(now, 1) -sql insert into db.t111 values(now, 1) -sql insert into db.t112 values(now, 1) -sql insert into db.t113 values(now, 1) -sql insert into db.t114 values(now, 1) -sql insert into db.t115 values(now, 1) -sql insert into db.t116 values(now, 1) -sql insert into db.t117 values(now, 1) -sql insert into db.t118 values(now, 1) -sql insert into db.t119 values(now, 1) - -print ============================ step4 -sql_error create table db.t200 using db.st tags(10) -sql show db.tables -if $rows != 40 then - return -1 -endi - -print ============================ step5 -system sh/exec.sh -n dnode1 -s stop -x SIGINT -system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 15 -system sh/exec.sh -n dnode1 -s start -$x = 0 -step5: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi - -sql show mnodes -x step5 -print mnode1 $data2_1 -print mnode1 $data2_2 -print mnode1 $data2_3 -if $data2_1 != master then - goto step5 -endi - -sql create table db.t200 using db.st tags(0) -sql create table db.t201 using db.st tags(1) -sql create table db.t202 using db.st tags(2) -sql create table db.t203 using db.st tags(3) -sql create table db.t204 using db.st tags(4) -sql create table db.t205 using db.st tags(5) -sql create table db.t206 using db.st tags(6) -sql create table db.t207 using db.st tags(7) -sql create table db.t208 using db.st tags(8) -sql create table db.t209 using db.st tags(9) -sql create table db.t210 using db.st tags(0) -sql create table db.t211 using db.st tags(1) -sql create table db.t212 using db.st tags(2) -sql create table db.t213 using db.st tags(3) -sql create table db.t214 using db.st tags(4) -sql create table db.t215 using db.st tags(5) -sql create table db.t216 using db.st tags(6) -sql create table db.t217 using db.st tags(7) -sql create table db.t218 using db.st tags(8) -sql create table db.t219 using db.st tags(9) -sql show db.tables -if $rows != 60 then - return -1 -endi - -sql insert into db.t200 values(now, 1) -sql insert into db.t201 values(now, 1) -sql insert into db.t202 values(now, 1) -sql insert into db.t203 values(now, 1) -sql insert into db.t204 values(now, 1) -sql insert into db.t205 values(now, 1) -sql insert into db.t206 values(now, 1) -sql insert into db.t207 values(now, 1) -sql insert into db.t208 values(now, 1) -sql insert into db.t209 values(now, 1) -sql insert into db.t210 values(now, 1) -sql insert into db.t211 values(now, 1) -sql insert into db.t212 values(now, 1) -sql insert into db.t213 values(now, 1) -sql insert into db.t214 values(now, 1) -sql insert into db.t215 values(now, 1) -sql insert into db.t216 values(now, 1) -sql insert into db.t217 values(now, 1) -sql insert into db.t218 values(now, 1) -sql insert into db.t219 values(now, 1) - -print ============================ step6 - -sql reset query cache -sleep 100 - -sql select * from db.t000 -if $rows != 1 then - return -1 -endi - -sql select * from db.t100 -if $rows != 1 then - return -1 -endi - -sql select * from db.t200 -if $rows != 1 then - return -1 -endi - -sql select * from db.st -if $rows != 60 then - return -1 -endi - -print ============================ step7 -system sh/exec.sh -n dnode1 -s stop -x SIGINT -sleep 3000 -system sh/exec.sh -n dnode1 -s start -sleep 3000 - -sql reset query cache -sleep 1000 - -sql show db.tables -if $rows != 60 then - return -1 -endi - -sql select * from db.t000 -if $rows != 1 then - return -1 -endi - -sql select * from db.t100 -if $rows != 1 then - return -1 -endi - -sql select * from db.t200 -if $rows != 1 then - return -1 -endi - -sql select * from db.st -if $rows != 60 then - return -1 -endi - -print ============================ step8 -sql_error create table db.t300 using db.st tags(10) -sql show db.tables -if $rows != 60 then - return -1 -endi - -print ============================ step9 -system sh/exec.sh -n dnode1 -s stop -x SIGINT -system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 20 -system sh/exec.sh -n dnode1 -s start -$x = 0 -step9: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi - -sql show mnodes -x step9 -print mnode1 $data2_1 -print mnode1 $data2_2 -print mnode1 $data2_3 -if $data2_1 != master then - goto step9 -endi - -sql create table db.t300 using db.st tags(0) -sql create table db.t301 using db.st tags(1) -sql create table db.t302 using db.st tags(2) -sql create table db.t303 using db.st tags(3) -sql create table db.t304 using db.st tags(4) -sql create table db.t305 using db.st tags(5) -sql create table db.t306 using db.st tags(6) -sql create table db.t307 using db.st tags(7) -sql create table db.t308 using db.st tags(8) -sql create table db.t309 using db.st tags(9) -sql create table db.t310 using db.st tags(0) -sql create table db.t311 using db.st tags(1) -sql create table db.t312 using db.st tags(2) -sql create table db.t313 using db.st tags(3) -sql create table db.t314 using db.st tags(4) -sql create table db.t315 using db.st tags(5) -sql create table db.t316 using db.st tags(6) -sql create table db.t317 using db.st tags(7) -sql create table db.t318 using db.st tags(8) -sql create table db.t319 using db.st tags(9) - -sql insert into db.t300 values(now, 1) -sql insert into db.t301 values(now, 1) -sql insert into db.t302 values(now, 1) -sql insert into db.t303 values(now, 1) -sql insert into db.t304 values(now, 1) -sql insert into db.t305 values(now, 1) -sql insert into db.t306 values(now, 1) -sql insert into db.t307 values(now, 1) -sql insert into db.t308 values(now, 1) -sql insert into db.t309 values(now, 1) -sql insert into db.t310 values(now, 1) -sql insert into db.t311 values(now, 1) -sql insert into db.t312 values(now, 1) -sql insert into db.t313 values(now, 1) -sql insert into db.t314 values(now, 1) -sql insert into db.t315 values(now, 1) -sql insert into db.t316 values(now, 1) -sql insert into db.t317 values(now, 1) -sql insert into db.t318 values(now, 1) -sql insert into db.t319 values(now, 1) - -sql show db.tables -if $rows != 80 then - return -1 -endi - -sql reset query cache -sleep 1000 - -sql select * from db.t000 -if $rows != 1 then - return -1 -endi - -sql select * from db.t100 -if $rows != 1 then - return -1 -endi - -sql select * from db.t200 -if $rows != 1 then - return -1 -endi - -sql select * from db.t300 -if $rows != 1 then - return -1 -endi - -sql select * from db.st -if $rows != 80 then - return -1 -endi - -print ============================ step10 -system sh/exec.sh -n dnode1 -s stop -x SIGINT -system sh/exec.sh -n dnode1 -s start -$x = 0 -step10: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi - -sql show mnodes -x step10 -print mnode1 $data2_1 -print mnode1 $data2_2 -print mnode1 $data2_3 -if $data2_1 != master then - goto step10 -endi - -sql reset query cache -sleep 1000 - -sql show db.tables -if $rows != 80 then - return -1 -endi - -sql select * from db.t000 -if $rows != 1 then - return -1 -endi - -sql select * from db.t100 -if $rows != 1 then - return -1 -endi - -sql select * from db.t200 -if $rows != 1 then - return -1 -endi - -sql select * from db.t300 -if $rows != 1 then - return -1 -endi - -sql select * from db.st -if $rows != 80 then - return -1 -endi - -print ============================ step11 -sql_error create table db.t400 using db.st tags(10) -sql show db.tables -if $rows != 80 then - return -1 -endi - -print ============================ step12 -system sh/exec.sh -n dnode1 -s stop -x SIGINT -system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 25 -system sh/exec.sh -n dnode1 -s start -$x = 0 -step12: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi - -sql show mnodes -x step12 -print mnode1 $data2_1 -print mnode1 $data2_2 -print mnode1 $data2_3 -if $data2_1 != master then - goto step12 -endi - - -sql create table db.t400 using db.st tags(0) -sql create table db.t401 using db.st tags(1) -sql create table db.t402 using db.st tags(2) -sql create table db.t403 using db.st tags(3) -sql create table db.t404 using db.st tags(4) -sql create table db.t405 using db.st tags(5) -sql create table db.t406 using db.st tags(6) -sql create table db.t407 using db.st tags(7) -sql create table db.t408 using db.st tags(8) -sql create table db.t409 using db.st tags(9) -sql create table db.t410 using db.st tags(0) -sql create table db.t411 using db.st tags(1) -sql create table db.t412 using db.st tags(2) -sql create table db.t413 using db.st tags(3) -sql create table db.t414 using db.st tags(4) -sql create table db.t415 using db.st tags(5) -sql create table db.t416 using db.st tags(6) -sql create table db.t417 using db.st tags(7) -sql create table db.t418 using db.st tags(8) -sql create table db.t419 using db.st tags(9) - -sql insert into db.t400 values(now, 1) -sql insert into db.t401 values(now, 1) -sql insert into db.t402 values(now, 1) -sql insert into db.t403 values(now, 1) -sql insert into db.t404 values(now, 1) -sql insert into db.t405 values(now, 1) -sql insert into db.t406 values(now, 1) -sql insert into db.t407 values(now, 1) -sql insert into db.t408 values(now, 1) -sql insert into db.t409 values(now, 1) -sql insert into db.t410 values(now, 1) -sql insert into db.t411 values(now, 1) -sql insert into db.t412 values(now, 1) -sql insert into db.t413 values(now, 1) -sql insert into db.t414 values(now, 1) -sql insert into db.t415 values(now, 1) -sql insert into db.t416 values(now, 1) -sql insert into db.t417 values(now, 1) -sql insert into db.t418 values(now, 1) -sql insert into db.t419 values(now, 1) - -sql show db.tables -if $rows != 100 then - return -1 -endi - -sql reset query cache -sleep 1000 - -sql select * from db.t000 -if $rows != 1 then - return -1 -endi - -sql select * from db.t100 -if $rows != 1 then - return -1 -endi - -sql select * from db.t200 -if $rows != 1 then - return -1 -endi - -sql select * from db.t300 -if $rows != 1 then - return -1 -endi - -sql select * from db.t400 -if $rows != 1 then - return -1 -endi - -sql select * from db.st -if $rows != 100 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/tsim/db/alter_vgroups.sim b/tests/script/tsim/db/alter_vgroups.sim deleted file mode 100644 index 81ffc7d443..0000000000 --- a/tests/script/tsim/db/alter_vgroups.sim +++ /dev/null @@ -1,210 +0,0 @@ -system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -i 1 -system sh/cfg.sh -n dnode1 -c wallevel -v 0 -system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 1 -system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 20 - -system sh/exec.sh -n dnode1 -s start - -sleep 2000 -sql connect - -print ============================ step1 - -sql create database db -sql create table db.st (ts timestamp, i int) tags(t int) -sql create table db.t000 using db.st tags(0) -sql create table db.t001 using db.st tags(1) -sql create table db.t002 using db.st tags(2) -sql create table db.t003 using db.st tags(3) -sql create table db.t004 using db.st tags(4) -sql create table db.t005 using db.st tags(5) -sql create table db.t006 using db.st tags(6) -sql create table db.t007 using db.st tags(7) -sql create table db.t008 using db.st tags(8) -sql create table db.t009 using db.st tags(9) -sql create table db.t010 using db.st tags(0) -sql create table db.t011 using db.st tags(1) -sql create table db.t012 using db.st tags(2) -sql create table db.t013 using db.st tags(3) -sql create table db.t014 using db.st tags(4) -sql create table db.t015 using db.st tags(5) -sql create table db.t016 using db.st tags(6) -sql create table db.t017 using db.st tags(7) -sql create table db.t018 using db.st tags(8) -sql create table db.t019 using db.st tags(9) - -sql show db.tables -if $rows != 20 then - return -1 -endi - -sql insert into db.t000 values(now, 1) -sql insert into db.t001 values(now, 1) -sql insert into db.t002 values(now, 1) -sql insert into db.t003 values(now, 1) -sql insert into db.t004 values(now, 1) -sql insert into db.t005 values(now, 1) -sql insert into db.t006 values(now, 1) -sql insert into db.t007 values(now, 1) -sql insert into db.t008 values(now, 1) -sql insert into db.t009 values(now, 1) -sql insert into db.t010 values(now, 1) -sql insert into db.t011 values(now, 1) -sql insert into db.t012 values(now, 1) -sql insert into db.t013 values(now, 1) -sql insert into db.t014 values(now, 1) -sql insert into db.t015 values(now, 1) -sql insert into db.t016 values(now, 1) -sql insert into db.t017 values(now, 1) -sql insert into db.t018 values(now, 1) -sql insert into db.t019 values(now, 1) - -print ============================ step2 -sql_error create table db.t100 using db.st tags(10) -sql show db.tables -if $rows != 20 then - return -1 -endi - -print ============================ step3 -system sh/exec.sh -n dnode1 -s stop -x SIGINT -system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 2 -sleep 3000 -system sh/exec.sh -n dnode1 -s start -sleep 3000 - -sql create table db.t100 using db.st tags(0) -sql create table db.t101 using db.st tags(1) -sql create table db.t102 using db.st tags(2) -sql create table db.t103 using db.st tags(3) -sql create table db.t104 using db.st tags(4) -sql create table db.t105 using db.st tags(5) -sql create table db.t106 using db.st tags(6) -sql create table db.t107 using db.st tags(7) -sql create table db.t108 using db.st tags(8) -sql create table db.t109 using db.st tags(9) -sql create table db.t110 using db.st tags(0) -sql create table db.t111 using db.st tags(1) -sql create table db.t112 using db.st tags(2) -sql create table db.t113 using db.st tags(3) -sql create table db.t114 using db.st tags(4) -sql create table db.t115 using db.st tags(5) -sql create table db.t116 using db.st tags(6) -sql create table db.t117 using db.st tags(7) -sql create table db.t118 using db.st tags(8) -sql create table db.t119 using db.st tags(9) -sql show db.tables -if $rows != 40 then - return -1 -endi - - -sql insert into db.t100 values(now, 1) -sql insert into db.t101 values(now, 1) -sql insert into db.t102 values(now, 1) -sql insert into db.t103 values(now, 1) -sql insert into db.t104 values(now, 1) -sql insert into db.t105 values(now, 1) -sql insert into db.t106 values(now, 1) -sql insert into db.t107 values(now, 1) -sql insert into db.t108 values(now, 1) -sql insert into db.t109 values(now, 1) -sql insert into db.t110 values(now, 1) -sql insert into db.t111 values(now, 1) -sql insert into db.t112 values(now, 1) -sql insert into db.t113 values(now, 1) -sql insert into db.t114 values(now, 1) -sql insert into db.t115 values(now, 1) -sql insert into db.t116 values(now, 1) -sql insert into db.t117 values(now, 1) -sql insert into db.t118 values(now, 1) -sql insert into db.t119 values(now, 1) - -print ============================ step4 -sql_error create table db.t200 using db.st tags(10) -sql show db.tables -if $rows != 40 then - return -1 -endi - -print ============================ step5 - -system sh/exec.sh -n dnode1 -s stop -x SIGINT -system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 3 -sleep 3000 -system sh/exec.sh -n dnode1 -s start -sleep 3000 - -sql create table db.t200 using db.st tags(0) -sql create table db.t201 using db.st tags(1) -sql create table db.t202 using db.st tags(2) -sql create table db.t203 using db.st tags(3) -sql create table db.t204 using db.st tags(4) -sql create table db.t205 using db.st tags(5) -sql create table db.t206 using db.st tags(6) -sql create table db.t207 using db.st tags(7) -sql create table db.t208 using db.st tags(8) -sql create table db.t209 using db.st tags(9) -sql create table db.t210 using db.st tags(0) -sql create table db.t211 using db.st tags(1) -sql create table db.t212 using db.st tags(2) -sql create table db.t213 using db.st tags(3) -sql create table db.t214 using db.st tags(4) -sql create table db.t215 using db.st tags(5) -sql create table db.t216 using db.st tags(6) -sql create table db.t217 using db.st tags(7) -sql create table db.t218 using db.st tags(8) -sql create table db.t219 using db.st tags(9) -sql show db.tables -if $rows != 60 then - return -1 -endi - -sql insert into db.t200 values(now, 1) -sql insert into db.t201 values(now, 1) -sql insert into db.t202 values(now, 1) -sql insert into db.t203 values(now, 1) -sql insert into db.t204 values(now, 1) -sql insert into db.t205 values(now, 1) -sql insert into db.t206 values(now, 1) -sql insert into db.t207 values(now, 1) -sql insert into db.t208 values(now, 1) -sql insert into db.t209 values(now, 1) -sql insert into db.t210 values(now, 1) -sql insert into db.t211 values(now, 1) -sql insert into db.t212 values(now, 1) -sql insert into db.t213 values(now, 1) -sql insert into db.t214 values(now, 1) -sql insert into db.t215 values(now, 1) -sql insert into db.t216 values(now, 1) -sql insert into db.t217 values(now, 1) -sql insert into db.t218 values(now, 1) -sql insert into db.t219 values(now, 1) - -print ============================ step6 - -sql reset query cache -sleep 1000 - -sql select * from db.t000 -if $rows != 1 then - return -1 -endi - -sql select * from db.t100 -if $rows != 1 then - return -1 -endi - -sql select * from db.t200 -if $rows != 1 then - return -1 -endi - -sql select * from db.st -if $rows != 60 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/tsim/db/basic4.sim b/tests/script/tsim/db/basic4.sim index ce6d352d12..0d1db9dd19 100644 --- a/tests/script/tsim/db/basic4.sim +++ b/tests/script/tsim/db/basic4.sim @@ -1,30 +1,29 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start -sleep 2000 sql connect print =============== create database d1 -sql create database d1 +sql create database d1 vgroups 1 sql create table d1.t1 (ts timestamp, i int); sql create table d1.t2 (ts timestamp, i int); sql create table d1.t3 (ts timestamp, i int); sql create table d1.t4 (ts timestamp, i int); sql show databases -if $rows != 1 then +if $rows != 3 then return -1 endi -if $data00 != d1 then +if $data20 != d1 then return -1 endi -if $data02 != 4 then +if $data22 != 1 then return -1 endi -if $data03 != 1 then +if $data24 != 1 then return -1 endi @@ -40,7 +39,7 @@ endi if $data00 != 2 then return -1 endi -if $data01 != 4 then +if $data01 != d1 then return -1 endi @@ -48,19 +47,19 @@ print =============== drop table sql drop table d1.t1 sql show databases -if $rows != 1 then +if $rows != 3 then return -1 endi -if $data00 != d1 then +if $data20 != d1 then return -1 endi -if $data02 != 3 then +if $data22 != 1 then return -1 endi -if $data03 != 1 then +if $data24 != 1 then return -1 endi @@ -76,29 +75,28 @@ endi if $data00 != 2 then return -1 endi -if $data01 != 3 then +if $data01 != d1 then return -1 endi - print =============== drop all table sql drop table d1.t2 sql drop table d1.t3 sql drop table d1.t4 sql show databases -if $rows != 1 then +if $rows != 3 then return -1 endi -if $data00 != d1 then +if $data20 != d1 then return -1 endi -if $data02 != 0 then +if $data22 != 1 then return -1 endi -if $data03 != 0 then +if $data24 != 1 then return -1 endi @@ -108,7 +106,13 @@ if $rows != 0 then endi sql show d1.vgroups -if $rows != 0 then +if $rows != 1 then + return -1 +endi +if $data00 != 2 then + return -1 +endi +if $data01 != d1 then return -1 endi diff --git a/tests/script/tsim/db/basic5.sim b/tests/script/tsim/db/basic5.sim index 08c9db2332..9b809c35f0 100644 --- a/tests/script/tsim/db/basic5.sim +++ b/tests/script/tsim/db/basic5.sim @@ -1,57 +1,47 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start -sleep 2000 sql connect print =============== create database d1 -sql create database d1 -sql create table d1.t1 (ts timestamp, i int); -sql create table d1.t2 (ts timestamp, i int); -sql create table d1.t3 (ts timestamp, i int); -sql create table d1.t4 (ts timestamp, i int); +sql create database db1 vgroups 1; +sql use db1; -sql show databases +print =============== create stable and table +sql create stable st1 (ts timestamp, f1 int) tags(t1 int); +sql create table tb1 using st1 tags(1); +sql insert into tb1 values (now, 1); + +sql show stables +if $rows != 1 then + print $rows + return -1 +endi + +sql show tables if $rows != 1 then return -1 endi -if $data00 != d1 then - return -1 -endi +print =============== drop db +sql drop database db1; -if $data02 != 4 then - return -1 -endi +sql_error show stables +sql_error show tables -if $data03 != 1 then - return -1 -endi +print =============== re-create db and stb +sql create database db1; +sql use db1; +sql create stable st1 (ts timestamp, f1 int) tags(t1 int) -sql show d1.tables -if $rows != 4 then - return -1 -endi - -sql show d1.vgroups +sql show stables if $rows != 1 then return -1 endi -if $data00 != 2 then - return -1 -endi -if $data01 != 4 then - return -1 -endi -print =============== drop database -sql drop database d1 - -sql show databases +sql show tables if $rows != 0 then return -1 endi -sql_error show d1.vgroups - -system sh/exec.sh -n dnode1 -s stop -x SIGINT \ No newline at end of file +system sh/exec.sh -n dnode1 -s stop -x SIGINT diff --git a/tests/script/tsim/db/basic7.sim b/tests/script/tsim/db/basic7.sim deleted file mode 100644 index 9b809c35f0..0000000000 --- a/tests/script/tsim/db/basic7.sim +++ /dev/null @@ -1,47 +0,0 @@ -system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -i 1 -system sh/exec.sh -n dnode1 -s start -sql connect - -print =============== create database d1 -sql create database db1 vgroups 1; -sql use db1; - -print =============== create stable and table -sql create stable st1 (ts timestamp, f1 int) tags(t1 int); -sql create table tb1 using st1 tags(1); -sql insert into tb1 values (now, 1); - -sql show stables -if $rows != 1 then - print $rows - return -1 -endi - -sql show tables -if $rows != 1 then - return -1 -endi - -print =============== drop db -sql drop database db1; - -sql_error show stables -sql_error show tables - -print =============== re-create db and stb -sql create database db1; -sql use db1; -sql create stable st1 (ts timestamp, f1 int) tags(t1 int) - -sql show stables -if $rows != 1 then - return -1 -endi - -sql show tables -if $rows != 0 then - return -1 -endi - -system sh/exec.sh -n dnode1 -s stop -x SIGINT diff --git a/tests/script/tsim/db/keep.sim b/tests/script/tsim/db/keep.sim index 626040e347..027530026c 100644 --- a/tests/script/tsim/db/keep.sim +++ b/tests/script/tsim/db/keep.sim @@ -1,29 +1,39 @@ system sh/stop_dnodes.sh - - - system sh/deploy.sh -n dnode1 -i 1 system sh/deploy.sh -n dnode2 -i 2 system sh/deploy.sh -n dnode3 -i 3 - -system sh/cfg.sh -n dnode1 -c walLevel -v 1 -system sh/cfg.sh -n dnode2 -c walLevel -v 1 -system sh/cfg.sh -n dnode3 -c walLevel -v 1 -system sh/cfg.sh -n dnode1 -c numOfMnodes -v 1 -system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1 -system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1 -system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4 - -print ========= start dnode1 as master +system sh/deploy.sh -n dnode4 -i 4 +system sh/cfg.sh -n dnode1 -c transPullupInterval -v 1 +system sh/cfg.sh -n dnode2 -c transPullupInterval -v 1 +system sh/cfg.sh -n dnode3 -c transPullupInterval -v 1 +system sh/cfg.sh -n dnode4 -c transPullupInterval -v 1 system sh/exec.sh -n dnode1 -s start +system sh/exec.sh -n dnode2 -s start sql connect -print ========= start other dnodes -sql create dnode $hostname2 -system sh/exec.sh -n dnode2 -s start -sleep 2000 +print =============== step1 create dnode2 +sql create dnode $hostname port 7200 + +$x = 0 +step1: + $x = $x + 1 + sleep 1000 + if $x == 10 then + print ====> dnode not ready! + return -1 + endi +sql show dnodes +print ===> $data00 $data01 $data02 $data03 $data04 $data05 +print ===> $data10 $data11 $data12 $data13 $data14 $data15 +if $rows != 2 then + return -1 +endi +if $data(1)[4] != ready then + goto step1 +endi +if $data(2)[4] != ready then + goto step1 +endi print ======== step1 create db sql create database keepdb replica 1 keep 30 duration 7 @@ -33,7 +43,8 @@ sql create table tb (ts timestamp, i int) $x = 1 while $x < 41 $time = $x . d - sql insert into tb values (now + $time , $x ) + sql insert into tb values (now + $time , $x ) -x step2 + step2: $x = $x + 1 endw @@ -41,18 +52,13 @@ sql select * from tb print ===> rows $rows print ===> last $data01 -if $rows != 40 then - return -1 -endi -if $data01 != 40 then +if $rows >= 40 then return -1 endi print ======== step2 stop dnode system sh/exec.sh -n dnode2 -s stop -x SIGINT -sleep 3000 system sh/exec.sh -n dnode2 -s start -sleep 3000 sql select * from tb print ===> rows $rows @@ -64,15 +70,13 @@ endi if $rows <= 20 then return -1 endi -if $data01 != 40 then - return -1 -endi $num1 = $rows + 40 print ======== step3 alter db sql alter database keepdb keep 60 -sleep 1000 +flush database keepdb + sql show databases print $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07 if $data02 != 1 then @@ -112,9 +116,7 @@ endi print ======== step5 stop dnode system sh/exec.sh -n dnode2 -s stop -x SIGINT -sleep 3000 system sh/exec.sh -n dnode2 -s start -sleep 3000 sql select * from tb print ===> rows $rows diff --git a/tests/script/tsim/db/len.sim b/tests/script/tsim/db/len.sim index 8c08d2b09a..212fdfd40d 100644 --- a/tests/script/tsim/db/len.sim +++ b/tests/script/tsim/db/len.sim @@ -1,12 +1,6 @@ system sh/stop_dnodes.sh - - system sh/deploy.sh -n dnode1 -i 1 -system sh/cfg.sh -n dnode1 -c walLevel -v 1 -system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000 - system sh/exec.sh -n dnode1 -s start -sleep 2000 sql connect print =============== step1 @@ -17,33 +11,33 @@ sql create database -x step1 step1: sql show databases -if $rows != 0 then +if $rows != 2 then return -1 endi print =============== step2 sql create database a sql show databases -if $rows != 1 then +if $rows != 3 then return -1 endi sql drop database a sql show databases -if $rows != 0 then +if $rows != 2 then return -1 endi print =============== step3 sql create database a12345678 sql show databases -if $rows != 1 then +if $rows != 3 then return -1 endi sql drop database a12345678 sql show databases -if $rows != 0 then +if $rows != 2 then return -1 endi @@ -52,7 +46,7 @@ sql create database a012345678901201234567890120123456789012a0123456789012012345 return -1 step4: sql show databases -if $rows != 0 then +if $rows != 2 then return -1 endi @@ -60,7 +54,7 @@ print =============== step5 sql create database a;1 sql drop database a sql show databases -if $rows != 0 then +if $rows != 2 then return -1 endi @@ -70,7 +64,7 @@ sql create database a'1 -x step6 step6: sql show databases -if $rows != 0 then +if $rows != 2 then return -1 endi @@ -79,7 +73,7 @@ sql create database (a) -x step7 return -1 step7: sql show databases -if $rows != 0 then +if $rows != 2 then return -1 endi @@ -88,7 +82,7 @@ sql create database a.1 -x step8 return -1 step8: sql show databases -if $rows != 0 then +if $rows != 2 then return -1 endi diff --git a/tests/script/tsim/db/nosuchfile.sim b/tests/script/tsim/db/nosuchfile.sim deleted file mode 100644 index 69db8c0dc5..0000000000 --- a/tests/script/tsim/db/nosuchfile.sim +++ /dev/null @@ -1,66 +0,0 @@ -system sh/stop_dnodes.sh - -system sh/deploy.sh -n dnode1 -i 1 -system sh/cfg.sh -n dnode1 -c wallevel -v 2 - -print ========== step1 -system sh/exec.sh -n dnode1 -s start -sql connect -sleep 2000 - -print ========== step3 -sql create database d1 -sql create table d1.t1 (t timestamp, i int) -sql insert into d1.t1 values(now+1s, 35) -sql insert into d1.t1 values(now+2s, 34) -sql insert into d1.t1 values(now+3s, 33) -sql insert into d1.t1 values(now+4s, 32) -sql insert into d1.t1 values(now+5s, 31) - -print ========== step4 -system sh/exec.sh -n dnode1 -s stop -x SIGINT -system sh/exec.sh -n dnode1 -s start -sleep 2000 - -print ========== step5 -sql select * from d1.t1 order by t desc -print $data01 $data11 $data21 $data31 $data41 -if $data01 != 31 then - return -1 -endi -if $data11 != 32 then - return -1 -endi -if $data21 != 33 then - return -1 -endi -if $data31 != 34 then - return -1 -endi -if $data41 != 35 then - return -1 -endi - -print ========== step6 -system_content rm -rf ../../../sim/dnode1/data/vnode/vnode2/tsdb/data - -print ========== step7 -sql select * from d1.t1 order by t desc -print $data01 $data11 $data21 $data31 $data41 -if $data01 != null then - return -1 -endi -if $data11 != null then - return -1 -endi -if $data21 != null then - return -1 -endi -if $data31 != null then - return -1 -endi -if $data41 != null 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/tsim/db/repeat.sim b/tests/script/tsim/db/repeat.sim index b3bbca2d19..98d66244f5 100644 --- a/tests/script/tsim/db/repeat.sim +++ b/tests/script/tsim/db/repeat.sim @@ -1,12 +1,8 @@ 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/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 - system sh/exec.sh -n dnode1 -s start - -sleep 2000 sql connect + print ============================ dnode1 start sql create database d1 @@ -21,13 +17,10 @@ sql create table d3.t1(ts timestamp, i int) sql create database d4 sql create table d4.t1(ts timestamp, i int) -sleep 2000 - sql drop database d1 sql drop database d2 sql drop database d3 sql drop database d4 -sleep 2000 sql create database d5 sql create table d5.t1(ts timestamp, i int) @@ -41,15 +34,11 @@ sql create table d7.t1(ts timestamp, i int) sql create database d8 sql create table d8.t1(ts timestamp, i int) -sleep 2000 - sql drop database d5 sql drop database d6 sql drop database d7 sql drop database d8 -sleep 2000 - sql create database d9; sql create table d9.t1(ts timestamp, i int) diff --git a/tests/script/tsim/db/show_create_db.sim b/tests/script/tsim/db/show_create_db.sim index f2e8011a0e..45007d01d6 100644 --- a/tests/script/tsim/db/show_create_db.sim +++ b/tests/script/tsim/db/show_create_db.sim @@ -1,10 +1,6 @@ system sh/stop_dnodes.sh - system sh/deploy.sh -n dnode1 -i 1 -system sh/cfg.sh -n dnode1 -c walLevel -v 1 - system sh/exec.sh -n dnode1 -s start -sleep 2000 sql connect print =============== step2 diff --git a/tests/script/tsim/db/show_create_table.sim b/tests/script/tsim/db/show_create_table.sim index 5f2ae61343..44fa09577e 100644 --- a/tests/script/tsim/db/show_create_table.sim +++ b/tests/script/tsim/db/show_create_table.sim @@ -1,10 +1,6 @@ system sh/stop_dnodes.sh - system sh/deploy.sh -n dnode1 -i 1 -system sh/cfg.sh -n dnode1 -c walLevel -v 1 - system sh/exec.sh -n dnode1 -s start -sleep 2000 sql connect print ===============create three type table diff --git a/tests/script/tsim/db/tables.sim b/tests/script/tsim/db/tables.sim index b32fae25e0..23cb0c6163 100644 --- a/tests/script/tsim/db/tables.sim +++ b/tests/script/tsim/db/tables.sim @@ -1,12 +1,6 @@ system sh/stop_dnodes.sh - system sh/deploy.sh -n dnode1 -i 1 -system sh/cfg.sh -n dnode1 -c walLevel -v 1 -system sh/cfg.sh -n dnode2 -c maxVgroupsPerDb -v 4 -system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4 - system sh/exec.sh -n dnode1 -s start -sleep 2000 sql connect print =============== step2 @@ -14,7 +8,7 @@ sql create database db sql show databases print $rows $data07 -if $rows != 1 then +if $rows != 3 then return -1 endi @@ -71,14 +65,13 @@ endi print =============== step6 sql drop database db sql reset query cache -sleep 4000 print =============== step7 sql create database db sql show databases print $rows $data07 -if $rows != 1 then +if $rows != 3 then return -1 endi diff --git a/tests/script/tsim/db/testSuite.sim b/tests/script/tsim/db/testSuite.sim deleted file mode 100644 index 87863001a3..0000000000 --- a/tests/script/tsim/db/testSuite.sim +++ /dev/null @@ -1,16 +0,0 @@ -run general/db/basic.sim -run general/db/basic1.sim -run general/db/basic2.sim -run general/db/basic3.sim -run general/db/basic4.sim -run general/db/basic5.sim -run general/db/delete_reuse1.sim -run general/db/delete_reuse2.sim -run general/db/delete_reusevnode.sim -run general/db/delete_reusevnode2.sim -run general/db/delete_writing1.sim -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/tsim/db/topic1.sim b/tests/script/tsim/db/topic1.sim deleted file mode 100644 index b5058e8f9b..0000000000 --- a/tests/script/tsim/db/topic1.sim +++ /dev/null @@ -1,857 +0,0 @@ -system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -i 1 - -system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 100 -system sh/cfg.sh -n dnode1 -c partitions -v 4 -system sh/exec.sh -n dnode1 -s start - -sleep 2000 -sql connect - -print ====step1 create with default para -sql create topic t1; -sql use t1; - -sql show topics; -if $rows != 1 then - return -1 -endi -if $data00 != t1 then - return -1 -endi -if $data02 != 4 then - return -1 -endi - -sql show databases; -if $rows != 1 then - return -1 -endi -if $data00 != t1 then - return -1 -endi -#tables -if $data02 < 1 then - return -1 -endi -#numofvgroups -if $data03 < 1 then - return -1 -endi - -sql show t1.vgroups; -if $rows < 1 then - return -1 -endi - -sql show t1.stables; -if $rows != 1 then - return -1 -endi -if $data04 < 1 then - return -1 -endi - -sql show t1.tables; -if $rows < 1 then - return -1 -endi - -sql drop topic t1 -sql show topics; -if $rows != 0 then - return -1 -endi -sql show databases; -if $rows != 0 then - return -1 -endi - -sql_error use t1; -sql_error show t1.vgroups; -sql_error show t1.stables; -sql_error show t1.tables; - -print ====step2 create with giving para -sql create topic t1 partitions 6; - -sql show topics; -if $rows != 1 then - return -1 -endi -if $data00 != t1 then - return -1 -endi -if $data02 != 6 then - return -1 -endi - -sql show databases; -if $rows != 1 then - return -1 -endi -if $data00 != t1 then - return -1 -endi -#tables -if $data02 != 6 then - return -1 -endi -#numofvgroups -if $data03 != 6 then - return -1 -endi - -sql show t1.vgroups; -if $rows != 6 then - return -1 -endi - -sql show t1.stables; -if $rows != 1 then - return -1 -endi -if $data00 != ps then - return -1 -endi -if $data04 != 6 then - return -1 -endi - -sql show t1.tables; -if $rows != 6 then - return -1 -endi - -sql describe t1.ps; -if $data00 != off then - return -1 -endi -if $data10 != ts then - return -1 -endi -if $data20 != content then - return -1 -endi -if $data30 != pid then - return -1 -endi - -sql describe t1.p1; -if $data00 != off then - return -1 -endi -if $data10 != ts then - return -1 -endi -if $data20 != content then - return -1 -endi -if $data30 != pid then - return -1 -endi - -sql drop topic t1 -sql show topics; -if $rows != 0 then - return -1 -endi - -sql show databases; -if $rows != 0 then - return -1 -endi - -sql_error show t1.vgroups; -sql_error show t1.stables; -sql_error show t1.tables; - -sql_error create topic t1 partitions -1; -#sql_error create topic t1 partitions 0; -sql_error create topic t1 partitions 10001; - -print =============step3 create with db para -sql create topic db cache 2 blocks 4 duration 10 keep 20 minRows 300 maxRows 400 ctime 120 precision 'ms' comp 2 wal 1 replica 1 -sql show databases -if $data00 != db then - return -1 -endi -if $data02 != 4 then - return -1 -endi -if $data03 != 4 then - return -1 -endi -if $data04 != 1 then - return -1 -endi -if $data06 != 10 then - return -1 -endi -if $data07 != 20,20,20 then - return -1 -endi -if $data08 != 2 then - return -1 -endi -if $data09 != 4 then - return -1 -endi -sql drop topic db; - -sql create topic db cache 2 blocks 4 duration 10 keep 20 minRows 300 maxRows 400 ctime 120 precision 'ms' comp 2 wal 1 replica 1 partitions 7 -sql show databases -if $data00 != db then - return -1 -endi -if $data02 != 7 then - return -1 -endi -if $data03 != 7 then - return -1 -endi -if $data04 != 1 then - return -1 -endi -if $data06 != 10 then - return -1 -endi -if $data07 != 20,20,20 then - return -1 -endi -if $data08 != 2 then - return -1 -endi -if $data09 != 4 then - return -1 -endi - -sql show topics; -if $rows != 1 then - return -1 -endi -if $data00 != db then - return -1 -endi - -sql show databases; -if $rows != 1 then - return -1 -endi -if $data00 != db then - return -1 -endi -#tables -if $data02 != 7 then - return -1 -endi -#numofvgroups -sql show db.vgroups; -if $rows != 7 then - return -1 -endi -sql show db.stables; -if $rows != 1 then - return -1 -endi -sql show db.tables; -if $rows != 7 then - return -1 -endi - -print ============== step name -sql_error alter database db name d1 -sql_error alter database db name d2 -sql_error alter topic db name d1 -sql_error alter topic db name d2 - -print ============== step ntables -sql_error alter database db ntables -1 -sql_error alter database db ntables 0 -sql_error alter database db ntables 1 -sql_error alter database db ntables 10 -sql_error alter topic db ntables -1 -sql_error alter topic db ntables 0 -sql_error alter topic db ntables 1 -sql_error alter topic db ntables 10 - -print ============== step vgroups -sql_error alter database db vgroups -1 -sql_error alter database db vgroups 0 -sql_error alter database db vgroups 1 -sql_error alter database db vgroups 10 -sql_error alter topic db vgroups -1 -sql_error alter topic db vgroups 0 -sql_error alter topic db vgroups 1 -sql_error alter topic db vgroups 10 - -print ============== step replica -sql_error alter database db replica 2 -sql_error alter database db replica 3 -sql_error alter database db replica 0 -sql_error alter topic db replica 2 -sql_error alter topic db replica 3 -sql_error alter topic db replica 0 - -sql alter database db replica 1 -sql show databases -print replica $data4_db -if $data4_db != 1 then - return -1 -endi - -sql show topics -if $rows != 1 then - return -1 -endi - -print ============== step quorum -sql show databases -print quorum $data5_db -if $data5_db != 1 then - return -1 -endi - -sql_error alter topic db quorum 1 -sql alter database db quorum 1 -sql show databases -print quorum $data5_db -if $data5_db != 1 then - return -1 -endi - -sql_error alter database db quorum 2 -sql_error alter database db quorum 3 -sql_error alter topic db quorum 2 -sql_error alter topic db quorum 3 - -sql_error alter database db quorum 0 -sql_error alter database db quorum 4 -sql_error alter database db quorum 5 -sql_error alter database db quorum -1 -sql_error alter topic db quorum 0 -sql_error alter topic db quorum 4 -sql_error alter topic db quorum 5 -sql_error alter topic db quorum -1 - -print ============== step duration -sql_error alter database db duration 0 -sql_error alter database db duration 1 -sql_error alter database db duration 2 -sql_error alter database db duration 10 -sql_error alter database db duration 50 -sql_error alter database db duration 100 -sql_error alter topic db duration 0 -sql_error alter topic db duration 1 -sql_error alter topic db duration 2 -sql_error alter topic db duration 10 -sql_error alter topic db duration 50 -sql_error alter topic db duration 100 - -print ============== step keep -sql show databases -print keep $data7_db -if $data7_db != 20,20,20 then - return -1 -endi - -sql_error topic db keep 20 -sql alter database db keep 20 -sql show databases -print keep $data7_db -if $data7_db != 20,20,20 then - return -1 -endi - -sql_error topic db keep 30 -sql alter database db keep 30 -sql show databases -print keep $data7_db -if $data7_db != 30,30,30 then - return -1 -endi - -sql_error alter topic db keep 40 -sql alter database db keep 40 -sql show databases -print keep $data7_db -if $data7_db != 40,40,40 then - return -1 -endi - -sql alter database db keep 40 -sql alter database db keep 30 -sql alter database db keep 20 -sql_error alter database db keep 10.0 -sql_error alter database db keep 9 -sql_error alter database db keep 1 -sql_error alter database db keep 0 -sql_error alter database db keep -1 -sql_error alter database db keep 365001 - -sql_error alter topic db keep 40 -sql_error alter topic db keep 30 -sql_error alter topic db keep 20 -sql_error alter topic db keep 10 -sql_error alter topic db keep 9 -sql_error alter topic db keep 1 -sql_error alter topic db keep 0 -sql_error alter topic db keep -1 -sql_error alter topic db keep 365001 - -print ============== step cache -sql_error alter database db cache 60 -sql_error alter database db cache 50 -sql_error alter database db cache 20 -sql_error alter database db cache 3 -sql_error alter database db cache 129 -sql_error alter database db cache 300 -sql_error alter database db cache 0 -sql_error alter database db cache -1 - -sql_error alter topic db cache 60 -sql_error alter topic db cache 50 -sql_error alter topic db cache 20 -sql_error alter topic db cache 3 -sql_error alter topic db cache 129 -sql_error alter topic db cache 300 -sql_error alter topic db cache 0 -sql_error alter topic db cache -1 - -print ============== step blocks -sql show databases -print blocks $data9_db -if $data9_db != 4 then - return -1 -endi - -sql_error alter topic db blocks 10 -sql alter database db blocks 10 -sql show databases -print blocks $data9_db -if $data9_db != 10 then - return -1 -endi - -sql_error alter topic db blocks 20 -sql alter database db blocks 20 -sql show databases -print blocks $data9_db -if $data9_db != 20 then - return -1 -endi - -sql_error alter topic db blocks 20 -sql alter database db blocks 30 -sql show databases -print blocks $data9_db -if $data9_db != 30 then - return -1 -endi - -sql alter database db blocks 40 -sql alter database db blocks 30 -sql alter database db blocks 20 -sql alter database db blocks 10 -sql_error alter database db blocks 2 -sql_error alter database db blocks 1 -sql_error alter database db blocks 0 -sql_error alter database db blocks -1 -sql_error alter database db blocks 10001 - -sql_error alter topic db blocks 40 -sql_error alter topic db blocks 30 -sql_error alter topic db blocks 20 -sql_error alter topic db blocks 10 -sql_error alter topic db blocks 2 -sql_error alter topic db blocks 1 -sql_error alter topic db blocks 0 -sql_error alter topic db blocks -1 -sql_error alter topic db blocks 10001 - -print ============== step minrows -sql_error alter database db minrows 1 -sql_error alter database db minrows 100 -sql_error alter database db minrows 1000 - -sql_error alter topic db minrows 1 -sql_error alter topic db minrows 100 -sql_error alter topic db minrows 1000 - -print ============== step maxrows -sql_error alter database db maxrows 1 -sql_error alter database db maxrows 100 -sql_error alter database db maxrows 1000 - -sql_error alter topic db maxrows 1 -sql_error alter topic db maxrows 100 -sql_error alter topic db maxrows 1000 - -print ============== step wallevel -sql show databases -print wallevel $data12_db -if $data12_db != 1 then - return -1 -endi - -sql_error alter topic db wal 1 -sql_error alter database db wal 1 - -sql_error alter database db wal 1 -sql_error alter database db wal 2 -sql_error alter database db wal 1 -sql_error alter database db wal 2 -sql_error alter database db wal 0 -sql_error alter database db wal 3 -sql_error alter database db wal 4 -sql_error alter database db wal -1 -sql_error alter database db wal 1000 - -sql_error alter topic db wal 1 -sql_error alter topic db wal 2 -sql_error alter topic db wal 1 -sql_error alter topic db wal 2 -sql_error alter topic db wal 0 -sql_error alter topic db wal 3 -sql_error alter topic db wal 4 -sql_error alter topic db wal -1 -sql_error alter topic db wal 1000 - -print ============== step fsync -sql_error alter database db fsync 0 -sql_error alter database db fsync 1 -sql_error alter database db fsync 3600 -sql_error alter database db fsync 18000 -sql_error alter database db fsync 180000 -sql_error alter database db fsync 180001 -sql_error alter database db fsync -1 - -sql_error alter topic db fsync 0 -sql_error alter topic db fsync 1 -sql_error alter topic db fsync 3600 -sql_error alter topic db fsync 18000 -sql_error alter topic db fsync 180000 -sql_error alter topic db fsync 180001 -sql_error alter topic db fsync -1 - -print ============== step comp -sql show databases -print comp $data14_db -if $data14_db != 2 then - return -1 -endi - -sql_error alter topic db comp 1 -sql alter database db comp 1 -sql show databases -print comp $data14_db -if $data14_db != 1 then - return -1 -endi - -sql_error alter topic db comp 2 -sql alter database db comp 2 -sql show databases -print comp $data14_db -if $data14_db != 2 then - return -1 -endi - -sql_error alter topic db comp 0 -sql alter database db comp 0 -sql show databases -print comp $data14_db -if $data14_db != 0 then - return -1 -endi - -sql_error alter database db comp 3 -sql_error alter database db comp 4 -sql_error alter database db comp 5 -sql_error alter database db comp -1 - -sql_error alter topic db comp 3 -sql_error alter topic db comp 4 -sql_error alter topic db comp 5 -sql_error alter topic db comp -1 - -print ============== step precision -sql_error alter database db prec 'us' -sql_error alter topic db prec 'us' - -print ============== step status -sql_error alter database db status 'delete' -sql_error alter topic db status 'delete' - -print ============== step drop -sql drop database db -sql show topics; -if $rows != 0 then - return -1 -endi - -sql show databases; -if $rows != 0 then - return -1 -endi - -print ============== step db1 -sql create database d1 -sql_error alter database d1 partitions 2 -sql_error alter topic d1 partitions 2 - -sql show topics; -if $rows != 0 then - return -1 -endi - -sql show databases; -if $rows != 1 then - return -1 -endi - -sql drop database d1 -sql show topics; -if $rows != 0 then - return -1 -endi - -sql show databases; -if $rows != 0 then - return -1 -endi - -print ============== step db2 -sql create topic d1 -sql show topics; -if $rows != 1 then - return -1 -endi - -sql show databases; -if $rows != 1 then - return -1 -endi - -sql drop database d1 -sql show topics; -if $rows != 0 then - return -1 -endi - -sql show databases; -if $rows != 0 then - return -1 -endi - -print ============== step db3 -sql create topic d1 -sql show topics; -if $rows != 1 then - return -1 -endi - -sql show databases; -if $rows != 1 then - return -1 -endi - -sql alter topic d1 partitions 2 -sql show topics; -if $rows != 1 then - return -1 -endi - -sql show databases; -if $rows != 1 then - return -1 -endi - -sql drop database d1 -sql show topics; -if $rows != 0 then - return -1 -endi - -sql show databases; -if $rows != 0 then - return -1 -endi - -print ============== step partitions -sql create topic t1 partitions 5 - -sql_error alter database t1 partitions -1 -sql_error alter database t1 partitions 0 -sql_error alter database t1 partitions 1 -sql_error alter database t1 partitions 2 -sql_error alter database t1 partitions 3 -sql_error alter database t1 partitions 100 -sql_error alter database t1 partitions 1000 -sql_error alter database t1 partitions 10000 - -sql_error alter topic t1 partitions -1 -#sql_error alter topic t1 partitions 0 -sql_error alter database t1 partitions 10000 - -sql alter topic t1 partitions 1 -sql show topics; -if $rows != 1 then - return -1 -endi -if $data00 != t1 then - return -1 -endi -sql show databases; -if $rows != 1 then - return -1 -endi -if $data00 != t1 then - return -1 -endi -#tables -if $data02 != 1 then - return -1 -endi - -sql show t1.stables; -if $rows != 1 then - return -1 -endi -sql show t1.tables; -if $rows != 1 then - return -1 -endi - -sql alter topic t1 partitions 2 -sql show topics; -if $rows != 1 then - return -1 -endi -if $data00 != t1 then - return -1 -endi -sql show databases; -if $rows != 1 then - return -1 -endi -if $data00 != t1 then - return -1 -endi -#tables -if $data02 != 2 then - return -1 -endi - - -sql show t1.stables; -if $rows != 1 then - return -1 -endi -sql show t1.tables; -if $rows != 2 then - return -1 -endi - -sql alter topic t1 partitions 3 -sql show topics; -if $rows != 1 then - return -1 -endi -if $data00 != t1 then - return -1 -endi -sql show databases; -if $rows != 1 then - return -1 -endi -if $data00 != t1 then - return -1 -endi -#tables -if $data02 != 3 then - return -1 -endi - -sql show t1.stables; -if $rows != 1 then - return -1 -endi -sql show t1.tables; -if $rows != 3 then - return -1 -endi - -sql alter topic t1 partitions 10 -sql show topics; -if $rows != 1 then - return -1 -endi -if $data00 != t1 then - return -1 -endi -sql show databases; -if $rows != 1 then - return -1 -endi -if $data00 != t1 then - return -1 -endi -#tables -if $data02 != 10 then - return -1 -endi -#numofvgroups -sql show t1.vgroups; -if $rows != 10 then - return -1 -endi -sql show t1.stables; -if $rows != 1 then - return -1 -endi -sql show t1.tables; -if $rows != 10 then - return -1 -endi - -sql drop topic t1 - -print ============== create same name topic -sql create database d2 -sql create topic t2 - -sql_error create topic d2 -sql_error create topic if not exists d2 -sql_error create topic t2 -sql create topic if not exists t2 -sql_error create topic t2 partitions 5; -sql_error create topic t2 partitions 6; -sql_error create topic t2 partitions 3; - -sql_error alter topic t3 partitions 1 -sql_error alter topic d2 partitions 1 -#sql_error alter topic t2 partitions 0 -sql_error alter topic t2 partitions 10000 - -sql_error drop topic d2 -sql_error drop topic d3 -sql drop database d2 -sql drop database t2 - -print ============== create partitons 0 -sql create topic t2 partitions 0 -sql show t2.stables; -if $rows != 0 then - return -1 -endi -sql show t2.tables; -if $rows != 0 then - return -1 -endi - -sql drop topic t2 -sql_error drop topic abc -sql drop topic if exists abc; - -system sh/exec.sh -n dnode1 -s stop -x SIGINT diff --git a/tests/script/tsim/db/topic2.sim b/tests/script/tsim/db/topic2.sim deleted file mode 100644 index f933f5eee4..0000000000 --- a/tests/script/tsim/db/topic2.sim +++ /dev/null @@ -1,321 +0,0 @@ -system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -i 1 - -system sh/exec.sh -n dnode1 -s start - -sleep 2000 -sql connect - -print ==== step1 -sql create topic t1 partitions 2; -sql show t1.tables -if $rows != 2 then - return -1 -endi -sql show t1.vgroups -if $rows != 2 then - return -1 -endi - -sql insert into t1.p1 values(1, now, '1'); -sql insert into t1.p1 values(1, now, '2'); -sql insert into t1.p1 values(1, now, '3'); -sql insert into t1.p1 values(1, now, '4')(2, now, '5')(3, now, '6')(4, now, '7')(5, now, '8')(6, now, '9'); -sql insert into t1.p1 values(1, now, '10')(2, now, '11')(3, now, '12')(4, now, '13')(5, now, '14')(6, now, '15'); -sql insert into t1.p1 values(1, now, '16')(2, now,'17')(3, now,'18')(4, now,'19')(5, now,'20')(6, now,'21')(7, now,'22')(8, now,'23')(9, now,'24')(10, now,'25')(11, now,'26')(12, now,'27')(13, now,'28')(14, now,'29')(15, now,'30')(16, now,'31')(17, now,'32')(18, now,'33'); - -sql insert into t1.p2 values(1, now, '1'); -sql insert into t1.p2 values(1, now, '2'); -sql insert into t1.p2 values(1, now, '3'); -sql insert into t1.p2 values(1, now, '4')(2, now, '5')(3, now, '6')(4, now, '7')(5, now, '8')(6, now, '9'); -sql insert into t1.p2 values(1, now, '10')(2, now, '11')(3, now, '12')(4, now, '13')(5, now, '14')(6, now, '15'); -sql insert into t1.p2 values(1, now, '16')(2, now,'17')(3, now,'18')(4, now,'19')(5, now,'20')(6, now,'21')(7, now,'22')(8, now,'23')(9, now,'24')(10, now,'25')(11, now,'26')(12, now,'27')(13, now,'28')(14, now,'29')(15, now,'30')(16, now,'31')(17, now,'32')(18, now,'33'); - -sql_error insert into t1.p3 values(1, now, '1'); -sql_error insert into t1.p3 values(1, now, '2'); -sql_error insert into t1.p3 values(1, now, '3'); -sql_error insert into t1.p3 values(1, now, '4')(2, now, '5')(3, now, '6')(4, now, '7')(5, now, '8')(6, now, '9'); -sql_error insert into t1.p3 values(1, now, '10')(2, now, '11')(3, now, '12')(4, now, '13')(5, now, '14')(6, now, '15'); -sql_error insert into t1.p3 values(1, now, '16')(2, now,'17')(3, now,'18')(4, now,'19')(5, now,'20')(6, now,'21')(7, now,'22')(8, now,'23')(9, now,'24')(10, now,'25')(11, now,'26')(12, now,'27')(13, now,'28')(14, now,'29')(15, now,'30')(16, now,'31')(17, now,'32')(18, now,'33'); - -sql select * from t1.p1 order by off asc -if $rows != 33 then - return -1 -endi -if $data02 != 1 then - return -1 -endi -if $data12 != 2 then - return -1 -endi -if $data22 != 3 then - return -1 -endi - -sql select * from t1.p2 order by off asc -if $rows != 33 then - return -1 -endi -if $data02 != 1 then - return -1 -endi -if $data12 != 2 then - return -1 -endi -if $data22 != 3 then - return -1 -endi - -print ==== step2 -sql alter topic t1 partitions 4; -sql show t1.tables -if $rows != 4 then - return -1 -endi -sql show t1.vgroups -if $rows != 4 then - return -1 -endi - -sql insert into t1.p1 values(1, now, '1'); -sql insert into t1.p1 values(1, now, '2'); -sql insert into t1.p1 values(1, now, '3'); -sql insert into t1.p1 values(1, now, '4')(2, now, '5')(3, now, '6')(4, now, '7')(5, now, '8')(6, now, '9'); -sql insert into t1.p1 values(1, now, '10')(2, now, '11')(3, now, '12')(4, now, '13')(5, now, '14')(6, now, '15'); -sql insert into t1.p1 values(1, now, '16')(2, now,'17')(3, now,'18')(4, now,'19')(5, now,'20')(6, now,'21')(7, now,'22')(8, now,'23')(9, now,'24')(10, now,'25')(11, now,'26')(12, now,'27')(13, now,'28')(14, now,'29')(15, now,'30')(16, now,'31')(17, now,'32')(18, now,'33'); - -sql insert into t1.p2 values(1, now, '1'); -sql insert into t1.p2 values(1, now, '2'); -sql insert into t1.p2 values(1, now, '3'); -sql insert into t1.p2 values(1, now, '4')(2, now, '5')(3, now, '6')(4, now, '7')(5, now, '8')(6, now, '9'); -sql insert into t1.p2 values(1, now, '10')(2, now, '11')(3, now, '12')(4, now, '13')(5, now, '14')(6, now, '15'); -sql insert into t1.p2 values(1, now, '16')(2, now,'17')(3, now,'18')(4, now,'19')(5, now,'20')(6, now,'21')(7, now,'22')(8, now,'23')(9, now,'24')(10, now,'25')(11, now,'26')(12, now,'27')(13, now,'28')(14, now,'29')(15, now,'30')(16, now,'31')(17, now,'32')(18, now,'33'); - -sql insert into t1.p3 values(1, now, '1'); -sql insert into t1.p3 values(1, now, '2'); -sql insert into t1.p3 values(1, now, '3'); -sql insert into t1.p3 values(1, now, '4')(2, now, '5')(3, now, '6')(4, now, '7')(5, now, '8')(6, now, '9'); -sql insert into t1.p3 values(1, now, '10')(2, now, '11')(3, now, '12')(4, now, '13')(5, now, '14')(6, now, '15'); -sql insert into t1.p3 values(1, now, '16')(2, now,'17')(3, now,'18')(4, now,'19')(5, now,'20')(6, now,'21')(7, now,'22')(8, now,'23')(9, now,'24')(10, now,'25')(11, now,'26')(12, now,'27')(13, now,'28')(14, now,'29')(15, now,'30')(16, now,'31')(17, now,'32')(18, now,'33'); - -sql insert into t1.p4 values(1, now, '1'); -sql insert into t1.p4 values(1, now, '2'); -sql insert into t1.p4 values(1, now, '3'); -sql insert into t1.p4 values(1, now, '4')(2, now, '5')(3, now, '6')(4, now, '7')(5, now, '8')(6, now, '9'); -sql insert into t1.p4 values(1, now, '10')(2, now, '11')(3, now, '12')(4, now, '13')(5, now, '14')(6, now, '15'); -sql insert into t1.p4 values(1, now, '16')(2, now,'17')(3, now,'18')(4, now,'19')(5, now,'20')(6, now,'21')(7, now,'22')(8, now,'23')(9, now,'24')(10, now,'25')(11, now,'26')(12, now,'27')(13, now,'28')(14, now,'29')(15, now,'30')(16, now,'31')(17, now,'32')(18, now,'33'); - -sql_error insert into t1.p5 values(1, now, '1'); -sql_error insert into t1.p5 values(1, now, '2'); -sql_error insert into t1.p5 values(1, now, '3'); -sql_error insert into t1.p5 values(1, now, '4')(2, now, '5')(3, now, '6')(4, now, '7')(5, now, '8')(6, now, '9'); -sql_error insert into t1.p5 values(1, now, '10')(2, now, '11')(3, now, '12')(4, now, '13')(5, now, '14')(6, now, '15'); -sql_error insert into t1.p5 values(1, now, '16')(2, now,'17')(3, now,'18')(4, now,'19')(5, now,'20')(6, now,'21')(7, now,'22')(8, now,'23')(9, now,'24')(10, now,'25')(11, now,'26')(12, now,'27')(13, now,'28')(14, now,'29')(15, now,'30')(16, now,'31')(17, now,'32')(18, now,'33'); - -sql select * from t1.p1 order by off asc -if $rows != 66 then - return -1 -endi -if $data02 != 1 then - return -1 -endi -if $data12 != 2 then - return -1 -endi -if $data22 != 3 then - return -1 -endi - -sql select * from t1.p2 order by off asc -if $rows != 66 then - return -1 -endi -if $data02 != 1 then - return -1 -endi -if $data12 != 2 then - return -1 -endi -if $data22 != 3 then - return -1 -endi - -sql select * from t1.p3 order by off asc -if $rows != 33 then - return -1 -endi -if $data02 != 1 then - return -1 -endi -if $data12 != 2 then - return -1 -endi -if $data22 != 3 then - return -1 -endi - -sql select * from t1.p4 order by off asc -if $rows != 33 then - return -1 -endi -if $data02 != 1 then - return -1 -endi -if $data12 != 2 then - return -1 -endi -if $data22 != 3 then - return -1 -endi - -print ==== step3 -sql alter topic t1 partitions 1; -sql show t1.tables -if $rows != 1 then - return -1 -endi -sql show t1.vgroups -if $rows != 1 then - return -1 -endi - -sql insert into t1.p1 values(1, now, '1'); -sql insert into t1.p1 values(1, now, '2'); -sql insert into t1.p1 values(1, now, '3'); -sql insert into t1.p1 values(1, now, '4')(2, now, '5')(3, now, '6')(4, now, '7')(5, now, '8')(6, now, '9'); -sql insert into t1.p1 values(1, now, '10')(2, now, '11')(3, now, '12')(4, now, '13')(5, now, '14')(6, now, '15'); -sql insert into t1.p1 values(1, now, '16')(2, now,'17')(3, now,'18')(4, now,'19')(5, now,'20')(6, now,'21')(7, now,'22')(8, now,'23')(9, now,'24')(10, now,'25')(11, now,'26')(12, now,'27')(13, now,'28')(14, now,'29')(15, now,'30')(16, now,'31')(17, now,'32')(18, now,'33'); - -sql_error insert into t1.p2 values(1, now, '1'); -sql_error insert into t1.p2 values(1, now, '2'); -sql_error insert into t1.p2 values(1, now, '3'); -sql_error insert into t1.p2 values(1, now, '4')(2, now, '5')(3, now, '6')(4, now, '7')(5, now, '8')(6, now, '9'); -sql_error insert into t1.p2 values(1, now, '10')(2, now, '11')(3, now, '12')(4, now, '13')(5, now, '14')(6, now, '15'); -sql_error insert into t1.p2 values(1, now, '16')(2, now,'17')(3, now,'18')(4, now,'19')(5, now,'20')(6, now,'21')(7, now,'22')(8, now,'23')(9, now,'24')(10, now,'25')(11, now,'26')(12, now,'27')(13, now,'28')(14, now,'29')(15, now,'30')(16, now,'31')(17, now,'32')(18, now,'33'); - -sql_error insert into t1.p3 values(1, now, '1'); -sql_error insert into t1.p3 values(1, now, '2'); -sql_error insert into t1.p3 values(1, now, '3'); -sql_error insert into t1.p3 values(1, now, '4')(2, now, '5')(3, now, '6')(4, now, '7')(5, now, '8')(6, now, '9'); -sql_error insert into t1.p3 values(1, now, '10')(2, now, '11')(3, now, '12')(4, now, '13')(5, now, '14')(6, now, '15'); -sql_error insert into t1.p3 values(1, now, '16')(2, now,'17')(3, now,'18')(4, now,'19')(5, now,'20')(6, now,'21')(7, now,'22')(8, now,'23')(9, now,'24')(10, now,'25')(11, now,'26')(12, now,'27')(13, now,'28')(14, now,'29')(15, now,'30')(16, now,'31')(17, now,'32')(18, now,'33'); - -sql_error insert into t1.p4 values(1, now, '1'); -sql_error insert into t1.p4 values(1, now, '2'); -sql_error insert into t1.p4 values(1, now, '3'); -sql_error insert into t1.p4 values(1, now, '4')(2, now, '5')(3, now, '6')(4, now, '7')(5, now, '8')(6, now, '9'); -sql_error insert into t1.p4 values(1, now, '10')(2, now, '11')(3, now, '12')(4, now, '13')(5, now, '14')(6, now, '15'); -sql_error insert into t1.p4 values(1, now, '16')(2, now,'17')(3, now,'18')(4, now,'19')(5, now,'20')(6, now,'21')(7, now,'22')(8, now,'23')(9, now,'24')(10, now,'25')(11, now,'26')(12, now,'27')(13, now,'28')(14, now,'29')(15, now,'30')(16, now,'31')(17, now,'32')(18, now,'33'); - -sql_error insert into t1.p5 values(1, now, '1'); -sql_error insert into t1.p5 values(1, now, '2'); -sql_error insert into t1.p5 values(1, now, '3'); -sql_error insert into t1.p5 values(1, now, '4')(2, now, '5')(3, now, '6')(4, now, '7')(5, now, '8')(6, now, '9'); -sql_error insert into t1.p5 values(1, now, '10')(2, now, '11')(3, now, '12')(4, now, '13')(5, now, '14')(6, now, '15'); -sql_error insert into t1.p5 values(1, now, '16')(2, now,'17')(3, now,'18')(4, now,'19')(5, now,'20')(6, now,'21')(7, now,'22')(8, now,'23')(9, now,'24')(10, now,'25')(11, now,'26')(12, now,'27')(13, now,'28')(14, now,'29')(15, now,'30')(16, now,'31')(17, now,'32')(18, now,'33'); - -sql select * from t1.p1 order by off asc -if $rows != 99 then - return -1 -endi -if $data02 != 1 then - return -1 -endi -if $data12 != 2 then - return -1 -endi -if $data22 != 3 then - return -1 -endi - -sql_error select * from t1.p2 order by off asc -sql_error select * from t1.p3 order by off asc -sql_error select * from t1.p4 order by off asc - -print ==== step4 -sql alter topic t1 partitions 3; -sql show t1.tables -if $rows != 3 then - return -1 -endi -sql show t1.vgroups -if $rows != 3 then - return -1 -endi - -sql insert into t1.p1 values(1, now, '1'); -sql insert into t1.p1 values(1, now, '2'); -sql insert into t1.p1 values(1, now, '3'); -sql insert into t1.p1 values(1, now, '4')(2, now, '5')(3, now, '6')(4, now, '7')(5, now, '8')(6, now, '9'); -sql insert into t1.p1 values(1, now, '10')(2, now, '11')(3, now, '12')(4, now, '13')(5, now, '14')(6, now, '15'); -sql insert into t1.p1 values(1, now, '16')(2, now,'17')(3, now,'18')(4, now,'19')(5, now,'20')(6, now,'21')(7, now,'22')(8, now,'23')(9, now,'24')(10, now,'25')(11, now,'26')(12, now,'27')(13, now,'28')(14, now,'29')(15, now,'30')(16, now,'31')(17, now,'32')(18, now,'33'); - -sql insert into t1.p2 values(1, now, '1'); -sql insert into t1.p2 values(1, now, '2'); -sql insert into t1.p2 values(1, now, '3'); -sql insert into t1.p2 values(1, now, '4')(2, now, '5')(3, now, '6')(4, now, '7')(5, now, '8')(6, now, '9'); -sql insert into t1.p2 values(1, now, '10')(2, now, '11')(3, now, '12')(4, now, '13')(5, now, '14')(6, now, '15'); -sql insert into t1.p2 values(1, now, '16')(2, now,'17')(3, now,'18')(4, now,'19')(5, now,'20')(6, now,'21')(7, now,'22')(8, now,'23')(9, now,'24')(10, now,'25')(11, now,'26')(12, now,'27')(13, now,'28')(14, now,'29')(15, now,'30')(16, now,'31')(17, now,'32')(18, now,'33'); - -sql insert into t1.p3 values(1, now, '1'); -sql insert into t1.p3 values(1, now, '2'); -sql insert into t1.p3 values(1, now, '3'); -sql insert into t1.p3 values(1, now, '4')(2, now, '5')(3, now, '6')(4, now, '7')(5, now, '8')(6, now, '9'); -sql insert into t1.p3 values(1, now, '10')(2, now, '11')(3, now, '12')(4, now, '13')(5, now, '14')(6, now, '15'); -sql insert into t1.p3 values(1, now, '16')(2, now,'17')(3, now,'18')(4, now,'19')(5, now,'20')(6, now,'21')(7, now,'22')(8, now,'23')(9, now,'24')(10, now,'25')(11, now,'26')(12, now,'27')(13, now,'28')(14, now,'29')(15, now,'30')(16, now,'31')(17, now,'32')(18, now,'33'); - -sql_error insert into t1.p4 values(1, now, '1'); -sql_error insert into t1.p5 values(1, now, '1'); -sql_error insert into t1.p6 values(1, now, '1'); -sql_error select * from t1.p4 order by off asc -sql_error select * from t1.p5 order by off asc -sql_error select * from t1.p6 order by off asc - -sql select * from t1.p1 order by off asc -if $rows != 132 then - return -1 -endi -if $data02 != 1 then - return -1 -endi -if $data12 != 2 then - return -1 -endi -if $data22 != 3 then - return -1 -endi - -sql select * from t1.p2 order by off asc -if $rows != 33 then - return -1 -endi -if $data02 != 1 then - return -1 -endi -if $data12 != 2 then - return -1 -endi -if $data22 != 3 then - return -1 -endi - -sql select * from t1.p3 order by off asc -if $rows != 33 then - return -1 -endi -if $data02 != 1 then - return -1 -endi -if $data12 != 2 then - return -1 -endi -if $data22 != 3 then - return -1 -endi - -sql select * from t1.ps order by off asc -if $rows != 198 then - return -1 -endi - -system sh/exec.sh -n dnode1 -s stop -x SIGINT diff --git a/tests/script/tsim/db/vnodes.sim b/tests/script/tsim/db/vnodes.sim deleted file mode 100644 index 96f68f1632..0000000000 --- a/tests/script/tsim/db/vnodes.sim +++ /dev/null @@ -1,47 +0,0 @@ -system sh/stop_dnodes.sh - -$totalVnodes = 10 -$maxTables = 4 -$totalRows = $totalVnodes * $maxTables - -system sh/deploy.sh -n dnode1 -i 1 -system sh/cfg.sh -n dnode1 -c walLevel -v 1 -system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v $maxTables -system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -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 2000 -sql connect -sql create database db blocks 3 cache 1 -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 -print $rows -print $totalRows -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