From 23fa9c32b249964a5a0be01220e130c3684e229a Mon Sep 17 00:00:00 2001 From: slguan Date: Thu, 7 May 2020 17:14:25 +0800 Subject: [PATCH] scripts --- tests/script/general/db/len.sim | 2 +- tests/script/general/db/tables.sim | 37 +++++++++++++------ tests/script/general/db/testSuite.sim | 10 ++--- tests/script/general/import/basic.sim | 8 ++-- tests/script/general/import/commit.sim | 8 ++-- tests/script/general/import/large.sim | 8 ++-- tests/script/general/import/replica1.sim | 8 ++-- tests/script/general/insert/insert_drop.sim | 2 +- tests/script/general/metrics/disk.sim | 2 +- tests/script/general/metrics/metrics.sim | 2 +- tests/script/general/metrics/values.sim | 2 +- tests/script/general/metrics/vnode3.sim | 2 +- .../script/general/parser/auto_create_tb.sim | 2 +- tests/script/general/parser/create_db.sim | 2 +- .../general/parser/select_across_vnodes.sim | 2 +- .../general/parser/select_from_cache_disk.sim | 2 +- tests/script/general/parser/slimit.sim | 2 +- tests/script/general/parser/slimit1.sim | 2 +- .../general/parser/slimit_alter_tags.sim | 2 +- .../stream/metrics_replica1_vnoden.sim | 2 +- .../general/stream/table_replica1_vnoden.sim | 2 +- tests/script/general/table/limit.sim | 4 +- tests/script/general/user/monitor.sim | 2 +- tests/script/jenkins/basic.txt | 8 ++++ tests/script/unique/big/maxvnodes.sim | 8 ++-- tests/script/unique/big/tcp.sim | 2 +- tests/script/unique/db/delete.sim | 2 +- tests/script/unique/import/replica2.sim | 8 ++-- tests/script/unique/import/replica3.sim | 8 ++-- .../unique/metrics/balance_replica1.sim | 4 +- tests/script/unique/metrics/dnode2.sim | 4 +- tests/script/unique/metrics/dnode2_stop.sim | 4 +- tests/script/unique/metrics/dnode3.sim | 6 +-- .../script/unique/metrics/replica2_dnode4.sim | 8 ++-- .../script/unique/metrics/replica2_vnode3.sim | 4 +- .../script/unique/metrics/replica3_dnode6.sim | 12 +++--- .../script/unique/metrics/replica3_vnode3.sim | 8 ++-- .../script/unique/stream/metrics_balance.sim | 4 +- .../unique/stream/metrics_replica1_dnode2.sim | 4 +- .../stream/metrics_replica2_dnode2_vnoden.sim | 4 +- .../unique/stream/metrics_replica2_dnode3.sim | 6 +-- .../unique/stream/metrics_replica3_dnode4.sim | 8 ++-- tests/script/unique/stream/table_balance.sim | 4 +- tests/script/unique/stream/table_move.sim | 8 ++-- .../unique/stream/table_replica1_dnode2.sim | 4 +- .../stream/table_replica2_dnode2_vnoden.sim | 4 +- .../unique/stream/table_replica2_dnode3.sim | 6 +-- .../unique/stream/table_replica3_dnode4.sim | 8 ++-- tests/script/unique/table/delete_part.sim | 8 ++-- tests/script/unique/vnode/replica3_vgroup.sim | 2 +- 50 files changed, 146 insertions(+), 125 deletions(-) diff --git a/tests/script/general/db/len.sim b/tests/script/general/db/len.sim index 4ec97c8368..d8c0e9363f 100644 --- a/tests/script/general/db/len.sim +++ b/tests/script/general/db/len.sim @@ -4,7 +4,7 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c walLevel -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2000 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/db/tables.sim b/tests/script/general/db/tables.sim index 3be2eec729..590c6fc442 100644 --- a/tests/script/general/db/tables.sim +++ b/tests/script/general/db/tables.sim @@ -1,17 +1,16 @@ 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 numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2000 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000 system sh/exec.sh -n dnode1 -s start sleep 3000 sql connect print =============== step2 -sql create database db tables 2 +sql create database db maxtables 4 sql show databases print $rows $data07 @@ -19,7 +18,7 @@ if $rows != 1 then return -1 endi -if $data07 != 2 then +if $data07 != 4 then return -1 endi @@ -30,9 +29,17 @@ sql create table t2 (ts timestamp, i int) sql create table t3 (ts timestamp, i int) sql create table t4 (ts timestamp, i int) sql create table t11 (ts timestamp, i int) +sql create table t12 (ts timestamp, i int) +sql create table t13 (ts timestamp, i int) +sql create table t14 (ts timestamp, i int) +sql create table t21 (ts timestamp, i int) sql create table t22 (ts timestamp, i int) +sql create table t23 (ts timestamp, i int) +sql create table t24 (ts timestamp, i int) +sql create table t31 (ts timestamp, i int) +sql create table t32 (ts timestamp, i int) sql create table t33 (ts timestamp, i int) -sql create table t44 (ts timestamp, i int) +sql create table t34 (ts timestamp, i int) print =============== step4 sql insert into t1 values(now, 1) @@ -42,7 +49,7 @@ sql insert into t4 values(now, 4) sql insert into t11 values(now, 1) sql insert into t22 values(now, 2) sql insert into t33 values(now, 3) -sql insert into t44 values(now, 4) +sql insert into t34 values(now, 4) print =============== step5 sql select * from t1 @@ -68,10 +75,10 @@ endi print =============== step6 sql drop database db sql reset query cache -sleep 20000 +sleep 4000 print =============== step7 -sql create database db tables 2 +sql create database db maxtables 4 sql show databases print $rows $data07 @@ -79,7 +86,7 @@ if $rows != 1 then return -1 endi -if $data07 != 2 then +if $data07 != 4 then return -1 endi @@ -90,9 +97,17 @@ sql create table t2 (ts timestamp, i int) sql create table t3 (ts timestamp, i int) sql create table t4 (ts timestamp, i int) sql create table t11 (ts timestamp, i int) +sql create table t12 (ts timestamp, i int) +sql create table t13 (ts timestamp, i int) +sql create table t14 (ts timestamp, i int) +sql create table t21 (ts timestamp, i int) sql create table t22 (ts timestamp, i int) +sql create table t23 (ts timestamp, i int) +sql create table t24 (ts timestamp, i int) +sql create table t31 (ts timestamp, i int) +sql create table t32 (ts timestamp, i int) sql create table t33 (ts timestamp, i int) -sql create table t44 (ts timestamp, i int) +sql create table t34 (ts timestamp, i int) print =============== step9 sql insert into t1 values(now, 1) @@ -102,7 +117,7 @@ sql insert into t4 values(now, 4) sql insert into t11 values(now, 1) sql insert into t22 values(now, 2) sql insert into t33 values(now, 3) -sql insert into t44 values(now, 4) +sql insert into t34 values(now, 4) print =============== step10 sql select * from t1 diff --git a/tests/script/general/db/testSuite.sim b/tests/script/general/db/testSuite.sim index c5a4d1e530..082dc4020a 100644 --- a/tests/script/general/db/testSuite.sim +++ b/tests/script/general/db/testSuite.sim @@ -1,15 +1,13 @@ -#run general//db/basic.sim +run general//db/basic.sim run general/db/basic1.sim run general/db/basic2.sim run general/db/basic3.sim 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_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/len.sim +run general/db/repeat.sim +run general/db/tables.sim diff --git a/tests/script/general/import/basic.sim b/tests/script/general/import/basic.sim index 5037014728..0623405c2f 100644 --- a/tests/script/general/import/basic.sim +++ b/tests/script/general/import/basic.sim @@ -20,10 +20,10 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 10 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 10 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 10 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2000 -system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 2000 -system sh/cfg.sh -n dnode3 -c sessionsPerVnode -v 2000 -system sh/cfg.sh -n dnode4 -c sessionsPerVnode -v 2000 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000 +system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000 +system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000 +system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000 system sh/cfg.sh -n dnode1 -c commitlog -v 0 system sh/cfg.sh -n dnode2 -c commitlog -v 0 diff --git a/tests/script/general/import/commit.sim b/tests/script/general/import/commit.sim index 2197c1d39d..ce52b9496f 100644 --- a/tests/script/general/import/commit.sim +++ b/tests/script/general/import/commit.sim @@ -20,10 +20,10 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 10 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 10 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 10 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2000 -system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 2000 -system sh/cfg.sh -n dnode3 -c sessionsPerVnode -v 2000 -system sh/cfg.sh -n dnode4 -c sessionsPerVnode -v 2000 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000 +system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000 +system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000 +system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000 system sh/cfg.sh -n dnode1 -c commitlog -v 0 system sh/cfg.sh -n dnode2 -c commitlog -v 0 diff --git a/tests/script/general/import/large.sim b/tests/script/general/import/large.sim index 77a47a1049..6a0bbf28d2 100644 --- a/tests/script/general/import/large.sim +++ b/tests/script/general/import/large.sim @@ -20,10 +20,10 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 10 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 10 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 10 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2000 -system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 2000 -system sh/cfg.sh -n dnode3 -c sessionsPerVnode -v 2000 -system sh/cfg.sh -n dnode4 -c sessionsPerVnode -v 2000 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000 +system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000 +system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000 +system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000 system sh/cfg.sh -n dnode1 -c commitlog -v 0 system sh/cfg.sh -n dnode2 -c commitlog -v 0 diff --git a/tests/script/general/import/replica1.sim b/tests/script/general/import/replica1.sim index 193082097c..14e27ffa50 100644 --- a/tests/script/general/import/replica1.sim +++ b/tests/script/general/import/replica1.sim @@ -20,10 +20,10 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 10 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 10 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 10 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2000 -system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 2000 -system sh/cfg.sh -n dnode3 -c sessionsPerVnode -v 2000 -system sh/cfg.sh -n dnode4 -c sessionsPerVnode -v 2000 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000 +system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000 +system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000 +system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000 system sh/cfg.sh -n dnode1 -c commitlog -v 0 system sh/cfg.sh -n dnode2 -c commitlog -v 0 diff --git a/tests/script/general/insert/insert_drop.sim b/tests/script/general/insert/insert_drop.sim index e59c1504c4..04f9415e2f 100644 --- a/tests/script/general/insert/insert_drop.sim +++ b/tests/script/general/insert/insert_drop.sim @@ -19,7 +19,7 @@ $stb = stb sql drop database $db -x step1 step1: -sql create database $db tables 10 ctime 30 +sql create database $db maxtables 10 ctime 30 print ====== create tables sql use $db sql create table $stb (ts timestamp, c1 int) tags(t1 int) diff --git a/tests/script/general/metrics/disk.sim b/tests/script/general/metrics/disk.sim index 1a14b5f00f..a23a117ac2 100644 --- a/tests/script/general/metrics/disk.sim +++ b/tests/script/general/metrics/disk.sim @@ -4,7 +4,7 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c walLevel -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/metrics/metrics.sim b/tests/script/general/metrics/metrics.sim index 143e460dff..52448a4002 100644 --- a/tests/script/general/metrics/metrics.sim +++ b/tests/script/general/metrics/metrics.sim @@ -4,7 +4,7 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c walLevel -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/metrics/values.sim b/tests/script/general/metrics/values.sim index 07a31a686b..efabc67722 100644 --- a/tests/script/general/metrics/values.sim +++ b/tests/script/general/metrics/values.sim @@ -4,7 +4,7 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c walLevel -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/metrics/vnode3.sim b/tests/script/general/metrics/vnode3.sim index b70253c5cd..5d4a9f7f5b 100644 --- a/tests/script/general/metrics/vnode3.sim +++ b/tests/script/general/metrics/vnode3.sim @@ -4,7 +4,7 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c walLevel -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/auto_create_tb.sim b/tests/script/general/parser/auto_create_tb.sim index 3c8db5ea8f..8fb0ddae54 100644 --- a/tests/script/general/parser/auto_create_tb.sim +++ b/tests/script/general/parser/auto_create_tb.sim @@ -3,7 +3,7 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c walLevel -v 0 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/create_db.sim b/tests/script/general/parser/create_db.sim index 48b17eed4f..6e11f9d25b 100644 --- a/tests/script/general/parser/create_db.sim +++ b/tests/script/general/parser/create_db.sim @@ -163,7 +163,7 @@ sql_error create database $db rows 199 sql_error create database $db cache 99 #sql_error create database $db cache 10485761 -# ablocks [overwriten by 4*sessionsPerVnode, 409600] +# ablocks [overwriten by 4*maxtablesPerVnode, 409600] sql_error create database $db ablocks -1 #sql_error create database $db ablocks 409601 diff --git a/tests/script/general/parser/select_across_vnodes.sim b/tests/script/general/parser/select_across_vnodes.sim index 98dd7993ff..883d4d59cd 100644 --- a/tests/script/general/parser/select_across_vnodes.sim +++ b/tests/script/general/parser/select_across_vnodes.sim @@ -2,7 +2,7 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c walLevel -v 0 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 5 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 5 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/select_from_cache_disk.sim b/tests/script/general/parser/select_from_cache_disk.sim index 84798cdd64..04cc68c310 100644 --- a/tests/script/general/parser/select_from_cache_disk.sim +++ b/tests/script/general/parser/select_from_cache_disk.sim @@ -2,7 +2,7 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c walLevel -v 0 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/slimit.sim b/tests/script/general/parser/slimit.sim index 18b8babf32..13cec611a3 100644 --- a/tests/script/general/parser/slimit.sim +++ b/tests/script/general/parser/slimit.sim @@ -2,7 +2,7 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c walLevel -v 0 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/slimit1.sim b/tests/script/general/parser/slimit1.sim index ce5b278ca6..63f9ae6499 100644 --- a/tests/script/general/parser/slimit1.sim +++ b/tests/script/general/parser/slimit1.sim @@ -2,7 +2,7 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c walLevel -v 0 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/slimit_alter_tags.sim b/tests/script/general/parser/slimit_alter_tags.sim index c507abcf0d..630855260c 100644 --- a/tests/script/general/parser/slimit_alter_tags.sim +++ b/tests/script/general/parser/slimit_alter_tags.sim @@ -2,7 +2,7 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c walLevel -v 0 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/stream/metrics_replica1_vnoden.sim b/tests/script/general/stream/metrics_replica1_vnoden.sim index b4a22b4d6d..13cd18adf3 100644 --- a/tests/script/general/stream/metrics_replica1_vnoden.sim +++ b/tests/script/general/stream/metrics_replica1_vnoden.sim @@ -4,7 +4,7 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c walLevel -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/stream/table_replica1_vnoden.sim b/tests/script/general/stream/table_replica1_vnoden.sim index 8195c2c725..44d4008dbd 100644 --- a/tests/script/general/stream/table_replica1_vnoden.sim +++ b/tests/script/general/stream/table_replica1_vnoden.sim @@ -4,7 +4,7 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c walLevel -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/table/limit.sim b/tests/script/general/table/limit.sim index e22f81271b..97541580a8 100644 --- a/tests/script/general/table/limit.sim +++ b/tests/script/general/table/limit.sim @@ -4,7 +4,7 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c walLevel -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 129 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 129 system sh/exec.sh -n dnode1 -s start sleep 3000 @@ -19,7 +19,7 @@ $db = $dbPrefix . $i $tb = $tbPrefix . $i print =================== step 0 -sql create database $db tables 129 +sql create database $db maxtables 129 sql use $db sql show vgroups if $rows != 0 then diff --git a/tests/script/general/user/monitor.sim b/tests/script/general/user/monitor.sim index 987cb84357..3c578ec73c 100644 --- a/tests/script/general/user/monitor.sim +++ b/tests/script/general/user/monitor.sim @@ -4,7 +4,7 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 print ========== step1 -system sh/cfg.sh -n dnode1 -c clog -v 0 +system sh/cfg.sh -n dnode1 -c walLevel -v 0 system sh/cfg.sh -n dnode1 -c monitor -v 1 system sh/cfg.sh -n dnode1 -c monitorInterval -v 1 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt index 4c150b63bc..795d8e080b 100644 --- a/tests/script/jenkins/basic.txt +++ b/tests/script/jenkins/basic.txt @@ -9,11 +9,19 @@ cd ../../../debug; make #general +./test.sh -f general/db/basic.sim ./test.sh -f general/db/basic1.sim ./test.sh -f general/db/basic2.sim ./test.sh -f general/db/basic3.sim ./test.sh -f general/db/basic4.sim ./test.sh -f general/db/basic5.sim +#run general/db/delete_reuse1.sim +#run general/db/delete_reuse2.sim +#run general/db/delete_writing1.sim +#run general/db/delete_writing2.sim +./test.sh -f general/db/len.sim +./test.sh -f general/db/repeat.sim +./test.sh -f general/db/tables.sim ./test.sh -f general/table/autocreate.sim ./test.sh -f general/table/basic1.sim diff --git a/tests/script/unique/big/maxvnodes.sim b/tests/script/unique/big/maxvnodes.sim index 12affc72c5..738fd0704d 100644 --- a/tests/script/unique/big/maxvnodes.sim +++ b/tests/script/unique/big/maxvnodes.sim @@ -1,8 +1,8 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 -system sh/cfg.sh -n dnode1 -c clog -v 0 -system sh/cfg.sh -n dnode1 -c tables -v 100 +system sh/cfg.sh -n dnode1 -c walLevel -v 0 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 100 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 256 system sh/cfg.sh -n dnode1 -c maxVnodeConnections -v 100000 system sh/cfg.sh -n dnode1 -c maxMeterConnections -v 100000 @@ -39,8 +39,8 @@ endi system sh/deploy.sh -n dnode2 -i 2 -system sh/cfg.sh -n dnode2 -c clog -v 0 -system sh/cfg.sh -n dnode2 -c tables -v 100 +system sh/cfg.sh -n dnode2 -c walLevel -v 0 +system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 100 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 256 system sh/cfg.sh -n dnode2 -c maxVnodeConnections -v 100000 system sh/cfg.sh -n dnode2 -c maxMeterConnections -v 100000 diff --git a/tests/script/unique/big/tcp.sim b/tests/script/unique/big/tcp.sim index a4ca80c75c..7957449617 100644 --- a/tests/script/unique/big/tcp.sim +++ b/tests/script/unique/big/tcp.sim @@ -2,7 +2,7 @@ system sh/stop_dnodes.sh system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c walLevel -v 0 -system sh/cfg.sh -n dnode1 -c tables -v 30000 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 30000 system sh/cfg.sh -n dnode1 -c dDebugFlag -v 131 system sh/cfg.sh -n dnode1 -c mDebugFlag -v 131 diff --git a/tests/script/unique/db/delete.sim b/tests/script/unique/db/delete.sim index f499b71727..f508b7e874 100644 --- a/tests/script/unique/db/delete.sim +++ b/tests/script/unique/db/delete.sim @@ -29,7 +29,7 @@ system sh/exec_up.sh -n dnode3 -s start sleep 3000 print ======== step1 -sql create database db replica 3 ablocks 2 tblocks 5 tables 10000 +sql create database db replica 3 ablocks 2 tblocks 5 maxtables 10000 sql create table db.mt (ts timestamp, tbcol int) TAGS(tgcol int) $tbPrefix = db.t diff --git a/tests/script/unique/import/replica2.sim b/tests/script/unique/import/replica2.sim index 52afbd93cb..bab04bd211 100644 --- a/tests/script/unique/import/replica2.sim +++ b/tests/script/unique/import/replica2.sim @@ -15,10 +15,10 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 10 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 10 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 10 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2000 -system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 2000 -system sh/cfg.sh -n dnode3 -c sessionsPerVnode -v 2000 -system sh/cfg.sh -n dnode4 -c sessionsPerVnode -v 2000 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000 +system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000 +system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000 +system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000 system sh/cfg.sh -n dnode1 -c commitlog -v 0 system sh/cfg.sh -n dnode2 -c commitlog -v 0 diff --git a/tests/script/unique/import/replica3.sim b/tests/script/unique/import/replica3.sim index 8b8602df66..c10f2da2f1 100644 --- a/tests/script/unique/import/replica3.sim +++ b/tests/script/unique/import/replica3.sim @@ -15,10 +15,10 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 10 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 10 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 10 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2000 -system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 2000 -system sh/cfg.sh -n dnode3 -c sessionsPerVnode -v 2000 -system sh/cfg.sh -n dnode4 -c sessionsPerVnode -v 2000 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2000 +system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 2000 +system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 2000 +system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 2000 system sh/cfg.sh -n dnode1 -c commitlog -v 0 system sh/cfg.sh -n dnode2 -c commitlog -v 0 diff --git a/tests/script/unique/metrics/balance_replica1.sim b/tests/script/unique/metrics/balance_replica1.sim index f819a87e8c..eb50276260 100644 --- a/tests/script/unique/metrics/balance_replica1.sim +++ b/tests/script/unique/metrics/balance_replica1.sim @@ -14,8 +14,8 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0 system sh/cfg.sh -n dnode2 -c walLevel -v 0 system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 0 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 0 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4 $dbPrefix = br1_db $tbPrefix = br1_tb diff --git a/tests/script/unique/metrics/dnode2.sim b/tests/script/unique/metrics/dnode2.sim index dfcead7dbe..03a881ea49 100644 --- a/tests/script/unique/metrics/dnode2.sim +++ b/tests/script/unique/metrics/dnode2.sim @@ -8,8 +8,8 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0 system sh/cfg.sh -n dnode2 -c walLevel -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/unique/metrics/dnode2_stop.sim b/tests/script/unique/metrics/dnode2_stop.sim index eaa73253ea..58a46f9be9 100644 --- a/tests/script/unique/metrics/dnode2_stop.sim +++ b/tests/script/unique/metrics/dnode2_stop.sim @@ -8,8 +8,8 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0 system sh/cfg.sh -n dnode2 -c walLevel -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/unique/metrics/dnode3.sim b/tests/script/unique/metrics/dnode3.sim index 9b5bf4cba9..503ce6c47a 100644 --- a/tests/script/unique/metrics/dnode3.sim +++ b/tests/script/unique/metrics/dnode3.sim @@ -12,9 +12,9 @@ system sh/cfg.sh -n dnode3 -c walLevel -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode3 -c sessionsPerVnode -v 4 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/unique/metrics/replica2_dnode4.sim b/tests/script/unique/metrics/replica2_dnode4.sim index 7fbf89d767..7672b19ad9 100644 --- a/tests/script/unique/metrics/replica2_dnode4.sim +++ b/tests/script/unique/metrics/replica2_dnode4.sim @@ -16,10 +16,10 @@ system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode3 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode4 -c sessionsPerVnode -v 4 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/unique/metrics/replica2_vnode3.sim b/tests/script/unique/metrics/replica2_vnode3.sim index 37f0db05f9..e7163e826d 100644 --- a/tests/script/unique/metrics/replica2_vnode3.sim +++ b/tests/script/unique/metrics/replica2_vnode3.sim @@ -8,8 +8,8 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0 system sh/cfg.sh -n dnode2 -c walLevel -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/unique/metrics/replica3_dnode6.sim b/tests/script/unique/metrics/replica3_dnode6.sim index f023ab1c72..ef70bf5cc3 100644 --- a/tests/script/unique/metrics/replica3_dnode6.sim +++ b/tests/script/unique/metrics/replica3_dnode6.sim @@ -28,12 +28,12 @@ system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode6 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode3 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode4 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode5 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode6 -c sessionsPerVnode -v 4 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode6 -c maxtablesPerVnode -v 4 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/unique/metrics/replica3_vnode3.sim b/tests/script/unique/metrics/replica3_vnode3.sim index 549500439b..50ad6d7584 100644 --- a/tests/script/unique/metrics/replica3_vnode3.sim +++ b/tests/script/unique/metrics/replica3_vnode3.sim @@ -16,10 +16,10 @@ system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode3 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode4 -c sessionsPerVnode -v 4 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/unique/stream/metrics_balance.sim b/tests/script/unique/stream/metrics_balance.sim index d3da7b43d1..628476cffe 100644 --- a/tests/script/unique/stream/metrics_balance.sim +++ b/tests/script/unique/stream/metrics_balance.sim @@ -14,8 +14,8 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0 system sh/cfg.sh -n dnode2 -c walLevel -v 0 system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 0 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 0 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 5 system sh/cfg.sh -n dnode2 -c meterMetaKeepTimer -v 5 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 5 diff --git a/tests/script/unique/stream/metrics_replica1_dnode2.sim b/tests/script/unique/stream/metrics_replica1_dnode2.sim index 45fb7d269d..78b9165681 100644 --- a/tests/script/unique/stream/metrics_replica1_dnode2.sim +++ b/tests/script/unique/stream/metrics_replica1_dnode2.sim @@ -8,8 +8,8 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0 system sh/cfg.sh -n dnode2 -c walLevel -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 8 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim b/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim index 1c89d18917..47454501c6 100644 --- a/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim +++ b/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim @@ -8,8 +8,8 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0 system sh/cfg.sh -n dnode2 -c walLevel -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 8 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/unique/stream/metrics_replica2_dnode3.sim b/tests/script/unique/stream/metrics_replica2_dnode3.sim index d0ef994f29..a8c986cce9 100644 --- a/tests/script/unique/stream/metrics_replica2_dnode3.sim +++ b/tests/script/unique/stream/metrics_replica2_dnode3.sim @@ -12,9 +12,9 @@ system sh/cfg.sh -n dnode3 -c walLevel -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 8 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 8 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode3 -c sessionsPerVnode -v 4 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/unique/stream/metrics_replica3_dnode4.sim b/tests/script/unique/stream/metrics_replica3_dnode4.sim index e2b2c3d6cc..8ff7a3738e 100644 --- a/tests/script/unique/stream/metrics_replica3_dnode4.sim +++ b/tests/script/unique/stream/metrics_replica3_dnode4.sim @@ -16,10 +16,10 @@ system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 8 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 8 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 8 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode3 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode4 -c sessionsPerVnode -v 4 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/unique/stream/table_balance.sim b/tests/script/unique/stream/table_balance.sim index a0a83c7cef..015f9f1f17 100644 --- a/tests/script/unique/stream/table_balance.sim +++ b/tests/script/unique/stream/table_balance.sim @@ -14,8 +14,8 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0 system sh/cfg.sh -n dnode2 -c walLevel -v 0 system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 0 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 0 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2 diff --git a/tests/script/unique/stream/table_move.sim b/tests/script/unique/stream/table_move.sim index eb99b93932..6589ed941e 100644 --- a/tests/script/unique/stream/table_move.sim +++ b/tests/script/unique/stream/table_move.sim @@ -35,10 +35,10 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 0 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 0 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 0 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode3 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode4 -c sessionsPerVnode -v 4 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 diff --git a/tests/script/unique/stream/table_replica1_dnode2.sim b/tests/script/unique/stream/table_replica1_dnode2.sim index a36d9ec99d..3d88493f40 100644 --- a/tests/script/unique/stream/table_replica1_dnode2.sim +++ b/tests/script/unique/stream/table_replica1_dnode2.sim @@ -8,8 +8,8 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0 system sh/cfg.sh -n dnode2 -c walLevel -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 8 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim b/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim index c84d73933f..809627432b 100644 --- a/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim +++ b/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim @@ -8,8 +8,8 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0 system sh/cfg.sh -n dnode2 -c walLevel -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 8 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/unique/stream/table_replica2_dnode3.sim b/tests/script/unique/stream/table_replica2_dnode3.sim index 5e9ef14c01..abee70d048 100644 --- a/tests/script/unique/stream/table_replica2_dnode3.sim +++ b/tests/script/unique/stream/table_replica2_dnode3.sim @@ -12,9 +12,9 @@ system sh/cfg.sh -n dnode3 -c walLevel -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 8 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 8 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode3 -c sessionsPerVnode -v 4 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/unique/stream/table_replica3_dnode4.sim b/tests/script/unique/stream/table_replica3_dnode4.sim index 7547f77963..effdd38c2e 100644 --- a/tests/script/unique/stream/table_replica3_dnode4.sim +++ b/tests/script/unique/stream/table_replica3_dnode4.sim @@ -16,10 +16,10 @@ system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 8 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 8 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 8 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode3 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode4 -c sessionsPerVnode -v 4 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/unique/table/delete_part.sim b/tests/script/unique/table/delete_part.sim index 826df7f04c..f4a7b6fce4 100644 --- a/tests/script/unique/table/delete_part.sim +++ b/tests/script/unique/table/delete_part.sim @@ -29,10 +29,10 @@ system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode3 -c sessionsPerVnode -v 4 -system sh/cfg.sh -n dnode4 -c sessionsPerVnode -v 4 +system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4 +system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4 print ========= start dnodes system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/unique/vnode/replica3_vgroup.sim b/tests/script/unique/vnode/replica3_vgroup.sim index 077c1e2e49..2763ed7c67 100644 --- a/tests/script/unique/vnode/replica3_vgroup.sim +++ b/tests/script/unique/vnode/replica3_vgroup.sim @@ -26,7 +26,7 @@ sleep 3000 print =================== step 1 -sql create database $db replica 3 tables 100 +sql create database $db replica 3 maxtables 100 sql use $db sql create table st (ts timestamp, speed int) tags (t1 int) sleep 3001 -- GitLab