diff --git a/src/plugins/monitor/src/monitorMain.c b/src/plugins/monitor/src/monitorMain.c
index 7800ddec57f1f98bdb832e4b6f91cd9488ec507e..9c94bdc1fa254ff697caa9bdcb24f16aaa071997 100644
--- a/src/plugins/monitor/src/monitorMain.c
+++ b/src/plugins/monitor/src/monitorMain.c
@@ -184,7 +184,7 @@ static void monitorBuildMonitorSql(char *sql, int32_t cmd) {
   if (cmd == MON_CMD_CREATE_DB) {
     snprintf(sql, SQL_LENGTH,
              "create database if not exists %s replica 1 days 10 keep 30 cache %d "
-             "blocks %d maxtables 16 precision 'us'",
+             "blocks %d precision 'us'",
              tsMonitorDbName, TSDB_MIN_CACHE_BLOCK_SIZE, TSDB_MIN_TOTAL_BLOCKS);
   } else if (cmd == MON_CMD_CREATE_MT_DN) {
     snprintf(sql, SQL_LENGTH,
diff --git a/tests/script/general/db/delete_reusevnode.sim b/tests/script/general/db/delete_reusevnode.sim
index 79783d6ddab20c53125a01c6ff38a7dbaf455c72..5cfe7729ed6e698169be5efb70ae9ef490c98edb 100644
--- a/tests/script/general/db/delete_reusevnode.sim
+++ b/tests/script/general/db/delete_reusevnode.sim
@@ -50,7 +50,7 @@ $tbPrefix = t
 $i = 0
 while $i < 10
   $db = db . $i
-  sql create database $db maxTables 4
+  sql create database $db
   sql use $db
 
   sql create table st (ts timestamp, i int) tags(j int);
diff --git a/tests/script/general/db/delete_reusevnode2.sim b/tests/script/general/db/delete_reusevnode2.sim
index e54266e312b090021204b8fe0151f5f6269a114f..9fa196942547b5d36f9d01a669868964003cdf3d 100644
--- a/tests/script/general/db/delete_reusevnode2.sim
+++ b/tests/script/general/db/delete_reusevnode2.sim
@@ -8,7 +8,7 @@ sql connect
 
 print ======== step1
 
-sql create database db maxTables 4;
+sql create database db;
 sql use db
 
 $tbPrefix = t
diff --git a/tests/script/general/db/dropdnodes.sim b/tests/script/general/db/dropdnodes.sim
index be160910c57bf493662a725886ce463b1fe59f4b..884a88490e314750d0ddfe8806e544e44e327ff2 100644
--- a/tests/script/general/db/dropdnodes.sim
+++ b/tests/script/general/db/dropdnodes.sim
@@ -15,7 +15,7 @@ sql connect
 sql create dnode $hostname2
 sleep 2000
 
-sql create database db maxTables 4
+sql create database db
 sql use db
 
 print ==========  step1
diff --git a/tests/script/general/parser/first_last.sim b/tests/script/general/parser/first_last.sim
index fa2d7675d2c6b249f939e897098ac04d4cd18ab0..4598a4735cbba568a633046bf945c6d85092614a 100644
--- a/tests/script/general/parser/first_last.sim
+++ b/tests/script/general/parser/first_last.sim
@@ -22,7 +22,7 @@ $stb = $stbPrefix . $i
 sql drop database $db -x step1
 step1:
 
-sql create database $db maxrows 400 cache 1 maxTables 4
+sql create database $db maxrows 400 cache 1
 
 sql use $db
 sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
diff --git a/tests/script/general/parser/groupby.sim b/tests/script/general/parser/groupby.sim
index 70edf3535b0dd185bb8d9a6c46f14e7d05cf7511..1bd56c44f196649cd418327c1c7bb2bf9baf5784 100644
--- a/tests/script/general/parser/groupby.sim
+++ b/tests/script/general/parser/groupby.sim
@@ -28,7 +28,7 @@ $tstart = 100000
 
 sql drop database if exits $db -x step1
 step1:
-sql create database if not exists $db maxTables 4 keep 36500
+sql create database if not exists $db keep 36500
 sql use $db
 sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int, t2 binary(12))
 
diff --git a/tests/script/general/parser/join.sim b/tests/script/general/parser/join.sim
index f17e28c1da6443321945cdb8804d321e133e648f..7b47c4ff3c23d5b4f4dac7a6173ba5212033ff24 100644
--- a/tests/script/general/parser/join.sim
+++ b/tests/script/general/parser/join.sim
@@ -24,7 +24,7 @@ $tstart = 100000
 
 sql drop database if exits $db -x step1
 step1:
-sql create database if not exists $db maxTables 4 keep 36500
+sql create database if not exists $db keep 36500
 sql use $db
 sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int, t2 binary(12))
 
diff --git a/tests/script/general/parser/join_multivnode.sim b/tests/script/general/parser/join_multivnode.sim
index 4cf1d36672a23f7c1ed6edaca436883de992721b..21ed2e1ab17b4a7260eb86c77ab633af9bbecaae 100644
--- a/tests/script/general/parser/join_multivnode.sim
+++ b/tests/script/general/parser/join_multivnode.sim
@@ -22,7 +22,7 @@ $tstart = 100000
 
 sql drop database if exits $db -x step1
 step1:
-sql create database if not exists $db maxTables 4 keep 36500
+sql create database if not exists $db keep 36500
 sql use $db
 sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int, t2 binary(12))
 
diff --git a/tests/script/general/parser/lastrow.sim b/tests/script/general/parser/lastrow.sim
index 48f6e65a4fa8d41ac64aa08e529f8704f19f3b45..3eb3ecb24a321ed3b181aac1a91a20870a1cdd44 100644
--- a/tests/script/general/parser/lastrow.sim
+++ b/tests/script/general/parser/lastrow.sim
@@ -21,7 +21,7 @@ $stb = $stbPrefix . $i
 
 sql drop database $db -x step1
 step1:
-sql create database $db maxTables 4
+sql create database $db 
 sql use $db
 sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
 
diff --git a/tests/script/general/parser/mixed_blocks.sim b/tests/script/general/parser/mixed_blocks.sim
index 569decaa14d49a6a3e109a2c4a6ec489eecb7706..b229cd9c89c4a30030361693efba52ee7ce8423b 100644
--- a/tests/script/general/parser/mixed_blocks.sim
+++ b/tests/script/general/parser/mixed_blocks.sim
@@ -22,7 +22,7 @@ sql drop database if exists $db
 $paramRows = 200
 $rowNum = $paramRows * 4
 $rowNum = $rowNum / 5
-sql create database $db maxrows $paramRows maxTables 4
+sql create database $db maxrows $paramRows 
 print ====== create tables
 sql use $db
 sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 bool, c6 binary(10), c7 nchar(10)) tags(t1 int)
diff --git a/tests/script/general/parser/projection_limit_offset.sim b/tests/script/general/parser/projection_limit_offset.sim
index 2b89946ef850cfd8e0b105cd35c8afc6a1d3866b..79ab1800d40dcc92fe6e5d2a2a64f8ac787ab7ac 100644
--- a/tests/script/general/parser/projection_limit_offset.sim
+++ b/tests/script/general/parser/projection_limit_offset.sim
@@ -22,7 +22,7 @@ $tstart = 100000
 
 sql drop database if exits $db -x step1
 step1:
-sql create database if not exists $db maxTables 4 keep 36500
+sql create database if not exists $db keep 36500
 sql use $db
 sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int, t2 binary(12))
 
diff --git a/tests/script/general/parser/select_with_tags.sim b/tests/script/general/parser/select_with_tags.sim
index 9f944a586b8addc26a0b7119bba4eca610567360..b46a9029974b34b7e6918203b4cff8dd4902e63c 100644
--- a/tests/script/general/parser/select_with_tags.sim
+++ b/tests/script/general/parser/select_with_tags.sim
@@ -23,7 +23,7 @@ $tstart = 100000
 
 sql drop database if exists $db -x step1
 step1:
-sql create database if not exists $db maxTables 4 keep 36500
+sql create database if not exists $db  keep 36500
 sql use $db
 sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int, t2 binary(12))
 
diff --git a/tests/script/general/parser/single_row_in_tb.sim b/tests/script/general/parser/single_row_in_tb.sim
index 2313a98b41b0075c8acd6441d9cd7efb6273fea0..8f5c6db553d4a66f5b5565c3d2e4fdf1f5c0832d 100644
--- a/tests/script/general/parser/single_row_in_tb.sim
+++ b/tests/script/general/parser/single_row_in_tb.sim
@@ -15,7 +15,7 @@ $db = $dbPrefix
 $stb = $stbPrefix
 
 sql drop database if exists $db
-sql create database $db maxrows 200 maxTables 4
+sql create database $db maxrows 200 
 print ====== create tables
 sql use $db
 sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 bool, c6 binary(10), c7 nchar(10)) tags(t1 int)
diff --git a/tests/script/general/parser/slimit.sim b/tests/script/general/parser/slimit.sim
index 2ce3d0c2ac20359951954be22551eb7fd423b5ea..fedf3f8da8d1774ea60b66920e1e5ba1b91fd0a3 100644
--- a/tests/script/general/parser/slimit.sim
+++ b/tests/script/general/parser/slimit.sim
@@ -21,7 +21,7 @@ $db = $dbPrefix . $i
 $stb = $stbPrefix . $i
 
 sql drop database if exists $db
-sql create database $db maxrows 200 cache 16 maxTables 4
+sql create database $db maxrows 200 cache 16 
 print ====== create tables
 sql use $db
 sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 binary(15), t2 int, t3 bigint, t4 nchar(10), t5 double, t6 bool)
diff --git a/tests/script/general/parser/timestamp.sim b/tests/script/general/parser/timestamp.sim
index 28bbc9df0ef92aa8106819d2c23a75de626bb60b..a47372bf9d8c97ad2294b2f1599710e9e10849ea 100644
--- a/tests/script/general/parser/timestamp.sim
+++ b/tests/script/general/parser/timestamp.sim
@@ -20,7 +20,7 @@ $db = $dbPrefix . $i
 $stb = $stbPrefix . $i
 
 sql drop database if exists $db
-sql create database $db maxrows 200 maxTables 4
+sql create database $db maxrows 200 
 print ====== create tables
 sql use $db
 sql create table $stb (ts timestamp, c1 timestamp, c2 int) tags(t1 binary(20))
diff --git a/tests/script/general/parser/where.sim b/tests/script/general/parser/where.sim
index 710156a4fff6b21ef72d506398621e810bdfb506..dd3b11c2dcbb90a3c82cf7547733d826c97d0f25 100644
--- a/tests/script/general/parser/where.sim
+++ b/tests/script/general/parser/where.sim
@@ -21,7 +21,7 @@ $mt = $mtPrefix . $i
 
 sql drop database if exits $db -x step1
 step1:
-sql create database if not exists $db maxTables 4
+sql create database if not exists $db 
 sql use $db
 sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int)
 
diff --git a/tests/script/general/stable/dnode3.sim b/tests/script/general/stable/dnode3.sim
index 76652229d2ce71765178c0b1359d918b28a44fcd..2859f644bb883483385fdf2421b0996a4416b9e6 100644
--- a/tests/script/general/stable/dnode3.sim
+++ b/tests/script/general/stable/dnode3.sim
@@ -54,7 +54,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql create database $db maxTables 4
+sql create database $db 
 sql use $db
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
diff --git a/tests/script/unique/arbitrator/dn3_mn1_vnode_change.sim b/tests/script/unique/arbitrator/dn3_mn1_vnode_change.sim
index b18edf067019d8d4142117a6e8347b3ffcb8b95a..4f80c2389ee25d06a9852d38af9df3d40d838c90 100644
--- a/tests/script/unique/arbitrator/dn3_mn1_vnode_change.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_change.sim
@@ -61,7 +61,7 @@ $totalTableNum = 10
 $sleepTimer = 3000
 
 $db = db
-sql create database $db replica 2 maxTables $totalTableNum
+sql create database $db replica 2 
 sql use $db
 
 # create table , insert data
diff --git a/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim b/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim
index 4f737b9c40dd51aad4568e3fc91f1407836f6c68..fb0650b78a6875a812fdbb1cbac4a97e48e88348 100644
--- a/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim
+++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim
@@ -61,7 +61,7 @@ $totalTableNum = 4
 $sleepTimer = 3000
 
 $db = db
-sql create database $db cache 1 replica 2 maxTables $totalTableNum
+sql create database $db cache 1 replica 2 
 sql use $db
 
 # create table , insert data
diff --git a/tests/script/unique/arbitrator/sync_replica3_createTable.sim b/tests/script/unique/arbitrator/sync_replica3_createTable.sim
index 3bf274a3eadf08815b2f9b5981d8231881dd144c..d593577bee4bf2ec6997836905a99c327ba6f443 100644
--- a/tests/script/unique/arbitrator/sync_replica3_createTable.sim
+++ b/tests/script/unique/arbitrator/sync_replica3_createTable.sim
@@ -61,8 +61,8 @@ $totalTableNum = 20
 $sleepTimer = 3000
 
 $db = db
-print create database $db replica 3 maxTables $totalTableNum
-sql create database $db replica 3 maxTables $totalTableNum
+print create database $db replica 3 
+sql create database $db replica 3
 sql use $db
 
 # create table , insert data
diff --git a/tests/script/unique/arbitrator/sync_replica3_dnodeChang_DropAddAlterTableDropDb.sim b/tests/script/unique/arbitrator/sync_replica3_dnodeChang_DropAddAlterTableDropDb.sim
index c8fe96008b243086643e88eb9eeb250b851b18df..1ef499534fe272a32556a4155a4e622a77ad1ecf 100644
--- a/tests/script/unique/arbitrator/sync_replica3_dnodeChang_DropAddAlterTableDropDb.sim
+++ b/tests/script/unique/arbitrator/sync_replica3_dnodeChang_DropAddAlterTableDropDb.sim
@@ -62,8 +62,8 @@ $sleepTimer = 3000
 
 $maxTables = $totalTableNum * 2 
 $db = db
-print create database $db replica 3 maxTables $maxTables
-sql create database $db replica 3 maxTables $maxTables
+print create database $db replica 3 
+sql create database $db replica 3 
 sql use $db
 
 # create table , insert data
diff --git a/tests/script/unique/big/maxvnodes.sim b/tests/script/unique/big/maxvnodes.sim
index eb6e0b3b53c4bfee7b8f11c0f431812fc27c93e8..662d391e475f0b8afccbb37af5bae18fabe76621 100644
--- a/tests/script/unique/big/maxvnodes.sim
+++ b/tests/script/unique/big/maxvnodes.sim
@@ -18,7 +18,7 @@ print ==========  prepare data
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect 
-sql create database db blocks 3 cache 1 maxTables $maxTables
+sql create database db blocks 3 cache 1 
 sql use db
 
 print ==========  step1
diff --git a/tests/script/unique/big/restartSpeed.sim b/tests/script/unique/big/restartSpeed.sim
index 9d490fcb8b15b8eb2b4af1fd48fcd6fa908a2ce6..ea4edefda8f96c94aab12d856914565f8e8115f4 100644
--- a/tests/script/unique/big/restartSpeed.sim
+++ b/tests/script/unique/big/restartSpeed.sim
@@ -16,7 +16,7 @@ print ==========  prepare data
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect 
-sql create database db blocks 3 cache 1 maxTables $maxTables
+sql create database db blocks 3 cache 1 
 sql use db
 
 print ==========  step1
diff --git a/tests/script/unique/cluster/balance1.sim b/tests/script/unique/cluster/balance1.sim
index 44f44e397645020bc75561267698d5cf66a84d21..728ead25fe59e2521444c3fea128cb9a9c15556f 100644
--- a/tests/script/unique/cluster/balance1.sim
+++ b/tests/script/unique/cluster/balance1.sim
@@ -40,7 +40,7 @@ print ========= start dnode1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
-sql create database c_b1_d1 maxTables 4
+sql create database c_b1_d1 
 sql use c_b1_d1
 
 sql create table c_b1_t1 (t timestamp, i int)
@@ -50,7 +50,7 @@ sql insert into c_b1_t1 values(1520000022013, 13)
 sql insert into c_b1_t1 values(1520000023012, 12)
 sql insert into c_b1_t1 values(1520000024011, 11)
 
-sql create database c_b1_d2 maxTables 4
+sql create database c_b1_d2 
 sql use c_b1_d2
 sql create table c_b1_t2 (t timestamp, i int)
 sql insert into c_b1_t2 values(1520000020025, 25)
@@ -107,7 +107,7 @@ print dnode2 ==> $dnode2Role
 
 print ============================== step3
 print ========= add db3
-sql create database c_b1_d3 maxTables 4
+sql create database c_b1_d3 
 sql use c_b1_d3
 sql create table c_b1_t3 (t timestamp, i int)
 sql insert into c_b1_t3 values(1520000020035, 35)
@@ -280,7 +280,7 @@ if $dnode4Role != slave then
 endi
 
 print ============================== step10
-sql create database c_b1_d4 maxTables 4
+sql create database c_b1_d4 
 sql use c_b1_d4
 sql create table c_b1_t4 (t timestamp, i int)
 sql insert into c_b1_t4 values(1520000020045, 45)
@@ -318,7 +318,7 @@ sql use c_b1_d2
 sql insert into c_b1_t2 values(1520000025026, 26)
 
 print ============================== step12
-sql create database c_b1_d5 maxTables 4
+sql create database c_b1_d5 
 sql use c_b1_d5
 sql_error create table c_b1_t5 (t timestamp, i int) -x error3
 
@@ -343,7 +343,7 @@ sql insert into c_b1_t5 values(1520000022053, 53)
 sql insert into c_b1_t5 values(1520000023052, 52)
 sql insert into c_b1_t5 values(1520000024051, 51)
 
-sql create database c_b1_d6 maxTables 4
+sql create database c_b1_d6 
 sql use c_b1_d6
 sql create table c_b1_t6 (t timestamp, i int)
 sql insert into c_b1_t6 values(1520000020065, 65)
@@ -375,7 +375,7 @@ sql create dnode $hostname6
 system sh/exec.sh -n dnode6 -s start
 sleep 15000
 
-sql create database c_b1_d7 maxTables 4
+sql create database c_b1_d7 
 sql use c_b1_d7
 sql create table c_b1_t7 (t timestamp, i int)
 sql insert into c_b1_t7 values(1520000020075, 75)
@@ -384,7 +384,7 @@ sql insert into c_b1_t7 values(1520000022073, 73)
 sql insert into c_b1_t7 values(1520000023072, 72)
 sql insert into c_b1_t7 values(1520000024071, 71)
 
-sql create database c_b1_d8 maxTables 4
+sql create database c_b1_d8 
 sql use c_b1_d8
 sql create table c_b1_t8 (t timestamp, i int)
 sql insert into c_b1_t8 values(1520000020085, 85)
diff --git a/tests/script/unique/cluster/balance2.sim b/tests/script/unique/cluster/balance2.sim
index 0c880d36ff2734423fe536ad147f59551852191d..6d2c4bdad76c3b117035264be6b2a1878aeed536 100644
--- a/tests/script/unique/cluster/balance2.sim
+++ b/tests/script/unique/cluster/balance2.sim
@@ -47,7 +47,7 @@ system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 sleep 4001
 
-sql create database c_b2_d1 replica 2 maxTables 4
+sql create database c_b2_d1 replica 2 
 sql use c_b2_d1
 sql create table c_b2_t1 (t timestamp, i int)
 sql insert into c_b2_t1 values(1520000020015, 15)
@@ -56,7 +56,7 @@ sql insert into c_b2_t1 values(1520000022013, 13)
 sql insert into c_b2_t1 values(1520000023012, 12)
 sql insert into c_b2_t1 values(1520000024011, 11)
 
-sql create database c_b2_d2 replica 2 maxTables 4
+sql create database c_b2_d2 replica 2 
 sql use c_b2_d2
 sql create table c_b2_t2 (t timestamp, i int)
 sql insert into c_b2_t2 values(1520000020025, 25)
@@ -65,7 +65,7 @@ sql insert into c_b2_t2 values(1520000022023, 23)
 sql insert into c_b2_t2 values(1520000023022, 22)
 sql insert into c_b2_t2 values(1520000024021, 21)
 
-sql create database c_b2_d3 replica 2 maxTables 4
+sql create database c_b2_d3 replica 2 
 sql use c_b2_d3
 sql create table c_b2_t3 (t timestamp, i int)
 sql insert into c_b2_t3 values(1520000020035, 35)
diff --git a/tests/script/unique/cluster/cluster_main.sim b/tests/script/unique/cluster/cluster_main.sim
index 7d4a35c7f2d18a6300fb66e1bb9dd2364d748c58..f0a9b1a2147288fb3f0d2437a507296f9517ce09 100644
--- a/tests/script/unique/cluster/cluster_main.sim
+++ b/tests/script/unique/cluster/cluster_main.sim
@@ -57,7 +57,7 @@ sleep 3000
 print ============== step2: create db1 with replica 3
 $db = db1
 print create database $db replica 3
-#sql create database $db replica 3 maxTables $totalTableNum
+#sql create database $db replica 3 
 sql create database $db replica 3
 sql use $db
 
diff --git a/tests/script/unique/cluster/cluster_main0.sim b/tests/script/unique/cluster/cluster_main0.sim
index ef76f8823f6686a9e47d0d367f4092c1c007e9d5..9f775c0cef183bfe3b8dd231a08f5f829fe2d3ef 100644
--- a/tests/script/unique/cluster/cluster_main0.sim
+++ b/tests/script/unique/cluster/cluster_main0.sim
@@ -57,7 +57,7 @@ sleep 3000
 print ============== step2: create db1 with replica 3
 $db = db1
 print create database $db replica 3
-#sql create database $db replica 3 maxTables $totalTableNum
+#sql create database $db replica 3 
 sql create database $db replica 3
 sql use $db
 
diff --git a/tests/script/unique/cluster/cluster_main1.sim b/tests/script/unique/cluster/cluster_main1.sim
index 4537b09091eed722ae3f78e894f4c62c8afeea0e..7796f1ea00da9d9915aba6a9cbecee0223f99fd4 100644
--- a/tests/script/unique/cluster/cluster_main1.sim
+++ b/tests/script/unique/cluster/cluster_main1.sim
@@ -58,7 +58,7 @@ print ============== step2: create db1 with replica 3
 $replica = 3
 $db = db1
 print create database $db replica $replica
-#sql create database $db replica 3 maxTables $totalTableNum
+#sql create database $db replica 3 
 sql create database $db replica $replica
 sql use $db
 
diff --git a/tests/script/unique/cluster/cluster_main2.sim b/tests/script/unique/cluster/cluster_main2.sim
index 84ea3871efb783fc7a3b41b9d684816766d6e44a..48661546815a1e4c60e2b8d983f0a3e20e232529 100644
--- a/tests/script/unique/cluster/cluster_main2.sim
+++ b/tests/script/unique/cluster/cluster_main2.sim
@@ -58,7 +58,7 @@ print ============== step2: create db1 with replica 3
 $replica = 3
 $db = db1
 print create database $db replica $replica
-#sql create database $db replica 3 maxTables $totalTableNum
+#sql create database $db replica 3 
 sql create database $db replica $replica
 sql use $db
 
diff --git a/tests/script/unique/dnode/alternativeRole.sim b/tests/script/unique/dnode/alternativeRole.sim
index fb9d344d20874c62a7de5b7ba5e47012fe5e3584..ab37c1603a82c120d797cbc1e0fbe53f228e6b1a 100644
--- a/tests/script/unique/dnode/alternativeRole.sim
+++ b/tests/script/unique/dnode/alternativeRole.sim
@@ -56,7 +56,7 @@ if $data2_3 != slave then
 endi
 
 print ========== step2
-sql create database d1 maxTables 4
+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)
diff --git a/tests/script/unique/dnode/balance1.sim b/tests/script/unique/dnode/balance1.sim
index 5b1615dc289f6910a35a01eb74d9e5bf2c081cf3..b2461977424221d57eea4b8cc2f042f45544aed7 100644
--- a/tests/script/unique/dnode/balance1.sim
+++ b/tests/script/unique/dnode/balance1.sim
@@ -30,7 +30,7 @@ system sh/exec.sh -n dnode1 -s start
 sql connect
 sleep 3000
 
-sql create database d1 maxTables 4
+sql create database d1 
 sql create table d1.t1 (t timestamp, i int) 
 sql insert into d1.t1 values(now+1s, 15)
 sql insert into d1.t1 values(now+2s, 14)
@@ -68,7 +68,7 @@ if $data2_2 != 1 then
 endi
 
 print ========== step3
-sql create database d2 maxTables 4
+sql create database d2 
 sql create table d2.t2 (t timestamp, i int) 
 sql insert into d2.t2 values(now+1s, 25)
 sql insert into d2.t2 values(now+2s, 24)
@@ -139,7 +139,7 @@ if $data2_3 != 2 then
 endi
 
 print ========== step6
-sql create database d3 maxTables 4
+sql create database d3 
 sql create table d3.t3 (t timestamp, i int)
 sql insert into d3.t3 values(now+1s, 35)
 sql insert into d3.t3 values(now+2s, 34)
@@ -193,7 +193,7 @@ if $data2_4 != 1 then
 endi
 
 print ========== step8
-sql create database d4 maxTables 4
+sql create database d4 
 sql create table d4.t4 (t timestamp, i int)
 sql insert into d4.t4 values(now+1s, 45)
 sql insert into d4.t4 values(now+2s, 44)
diff --git a/tests/script/unique/dnode/balance2.sim b/tests/script/unique/dnode/balance2.sim
index e23562d8b47c122ccba442d0c053a6887f550060..1a80e890a05f1f45ebec9f2e61035f47c117acb3 100644
--- a/tests/script/unique/dnode/balance2.sim
+++ b/tests/script/unique/dnode/balance2.sim
@@ -28,7 +28,7 @@ system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 sleep 3000
 
-sql create database d1 replica 2  maxTables 4
+sql create database d1 replica 2  
 sql create table d1.t1 (t timestamp, i int)
 sql insert into d1.t1 values(now+1s, 15)
 sql insert into d1.t1 values(now+2s, 14)
@@ -36,7 +36,7 @@ sql insert into d1.t1 values(now+3s, 13)
 sql insert into d1.t1 values(now+4s, 12)
 sql insert into d1.t1 values(now+5s, 11)
 
-sql create database d2 replica 2  maxTables 4
+sql create database d2 replica 2  
 sql create table d2.t2 (t timestamp, i int) 
 sql insert into d2.t2 values(now+1s, 25)
 sql insert into d2.t2 values(now+2s, 24)
@@ -117,7 +117,7 @@ if $data2_4 != 2 then
 endi
 
 print ========== step4
-sql create database d3 replica 2 maxTables 4
+sql create database d3 replica 2 
 sql create table d3.t3 (t timestamp, i int)
 sql insert into d3.t3 values(now+1s, 35)
 sql insert into d3.t3 values(now+2s, 34)
diff --git a/tests/script/unique/dnode/balance3.sim b/tests/script/unique/dnode/balance3.sim
index b2adb24dfa6c85ec09e37c6c415160963f8e1378..1f81fde9686a9c7cb2fabebd835bad09b60ab035 100644
--- a/tests/script/unique/dnode/balance3.sim
+++ b/tests/script/unique/dnode/balance3.sim
@@ -33,7 +33,7 @@ system sh/exec.sh -n dnode3 -s start
 system sh/exec.sh -n dnode4 -s start
 sleep 3000
 
-sql create database d1 replica 3  maxTables 4
+sql create database d1 replica 3  
 sql create table d1.t1 (t timestamp, i int) 
 sql insert into d1.t1 values(now+1s, 15) 
 sql insert into d1.t1 values(now+2s, 14)
@@ -41,7 +41,7 @@ sql insert into d1.t1 values(now+3s, 13)
 sql insert into d1.t1 values(now+4s, 12)
 sql insert into d1.t1 values(now+5s, 11)
 
-sql create database d2 replica 3  maxTables 4
+sql create database d2 replica 3  
 sql create table d2.t2 (t timestamp, i int) 
 sql insert into d2.t2 values(now+1s, 25)
 sql insert into d2.t2 values(now+2s, 24)
@@ -136,7 +136,7 @@ if $data2_5 != 2 then
 endi
 
 print ========== step4
-sql create database d3 replica 3 maxTables 4
+sql create database d3 replica 3 
 sql create table d3.t3 (t timestamp, i int) 
 sql insert into d3.t3 values(now+1s, 35)
 sql insert into d3.t3 values(now+2s, 34)
diff --git a/tests/script/unique/dnode/balancex.sim b/tests/script/unique/dnode/balancex.sim
index 0d5da5bbf647c8ebf798745b77e3c15650254718..6f3b7dfb74dbeec1bf9434460551fdb29ebc21e5 100644
--- a/tests/script/unique/dnode/balancex.sim
+++ b/tests/script/unique/dnode/balancex.sim
@@ -20,7 +20,7 @@ system sh/exec.sh -n dnode1 -s start
 sql connect
 sleep 3000
 
-sql create database d1 maxTables 4
+sql create database d1 
 sql create table d1.t1 (t timestamp, i int)
 sql insert into d1.t1 values(now+1s, 15)
 sql insert into d1.t1 values(now+2s, 14)
@@ -28,7 +28,7 @@ sql insert into d1.t1 values(now+3s, 13)
 sql insert into d1.t1 values(now+4s, 12)
 sql insert into d1.t1 values(now+5s, 11)
 
-sql create database d2 maxTables 4
+sql create database d2 
 sql create table d2.t2 (t timestamp, i int)
 sql insert into d2.t2 values(now+1s, 25)
 sql insert into d2.t2 values(now+2s, 24)
@@ -65,7 +65,7 @@ if $data2_2 != 2 then
 endi
 
 print ========== step3
-sql create database d3 replica 2 maxTables 4
+sql create database d3 replica 2 
 sql create table d3.t3 (t timestamp, i int)
 sql insert into d3.t3 values(now+1s, 35)
 sql insert into d3.t3 values(now+2s, 34)
diff --git a/tests/script/unique/dnode/offline2.sim b/tests/script/unique/dnode/offline2.sim
index 6db6ca40137a75916ff1efe80396c64d03e6838c..2d1467ad5964466896c1ade8b51a8e5d6b80bc7b 100644
--- a/tests/script/unique/dnode/offline2.sim
+++ b/tests/script/unique/dnode/offline2.sim
@@ -27,7 +27,7 @@ sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 sleep 3000
 
-sql create database d1 replica 2 maxTables 4
+sql create database d1 replica 2 
 sql create table d1.t1(ts timestamp, i int)
 sql insert into d1.t1 values(1588262400001, 1)
 
diff --git a/tests/script/unique/dnode/remove1.sim b/tests/script/unique/dnode/remove1.sim
index 246808c56cba9527a061e3252b397290bfee88f2..7786b9f9d11abbd8d42e5e0990ef124db41e8bae 100644
--- a/tests/script/unique/dnode/remove1.sim
+++ b/tests/script/unique/dnode/remove1.sim
@@ -20,7 +20,7 @@ system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect
 
-sql create database d1 maxTables 4
+sql create database d1 
 sql create table d1.t1 (t timestamp, i int)
 sql insert into d1.t1 values(now+1s, 15)
 sql insert into d1.t1 values(now+2s, 14)
@@ -28,7 +28,7 @@ sql insert into d1.t1 values(now+3s, 13)
 sql insert into d1.t1 values(now+4s, 12)
 sql insert into d1.t1 values(now+5s, 11)
 
-sql create database d2 maxTables 4
+sql create database d2 
 sql create table d2.t2 (t timestamp, i int)
 sql insert into d2.t2 values(now+1s, 25)
 sql insert into d2.t2 values(now+2s, 24)
@@ -47,7 +47,7 @@ sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 sleep 9000
 
-sql create database d3 replica 2 maxTables 4
+sql create database d3 replica 2 
 sql create table d3.t3 (t timestamp, i int)
 sql insert into d3.t3 values(now+1s, 35)
 sql insert into d3.t3 values(now+2s, 34)
diff --git a/tests/script/unique/dnode/remove2.sim b/tests/script/unique/dnode/remove2.sim
index cf9954c7672099ad97253ca326e05f5bca4d54a5..cd0331235a1c89b55f7560b44a6afb5d0fd4f0eb 100644
--- a/tests/script/unique/dnode/remove2.sim
+++ b/tests/script/unique/dnode/remove2.sim
@@ -20,7 +20,7 @@ system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect
 
-sql create database d1 maxTables 4
+sql create database d1 
 sql create table d1.t1 (t timestamp, i int)
 sql insert into d1.t1 values(1588262400001, 15)
 sql insert into d1.t1 values(1588262400002, 14)
@@ -28,7 +28,7 @@ sql insert into d1.t1 values(1588262400003, 13)
 sql insert into d1.t1 values(1588262400004, 12)
 sql insert into d1.t1 values(1588262400005, 11)
 
-sql create database d2 maxTables 4
+sql create database d2 
 sql create table d2.t2 (t timestamp, i int) 
 sql insert into d2.t2 values(1588262400001, 25)
 sql insert into d2.t2 values(1588262400002, 24)
@@ -47,7 +47,7 @@ sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 sleep 9000
 
-sql create database d3 replica 2 maxTables 4
+sql create database d3 replica 2 
 sql create table d3.t3 (t timestamp, i int)
 sql insert into d3.t3 values(1588262400001, 35)
 sql insert into d3.t3 values(1588262400002, 34)
diff --git a/tests/script/unique/dnode/vnode_clean.sim b/tests/script/unique/dnode/vnode_clean.sim
index e1ee1da2aa7c7291dccc3e674a6eae50165fa358..6df4bf78e81be781780a98bb222767cf5acfbdb5 100644
--- a/tests/script/unique/dnode/vnode_clean.sim
+++ b/tests/script/unique/dnode/vnode_clean.sim
@@ -19,7 +19,7 @@ print ========== step1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
-sql create database d1 maxTables 4
+sql create database d1 
 sql create table d1.t1 (t timestamp, i int)
 sql insert into d1.t1 values(now+1s, 15)
 sql insert into d1.t1 values(now+2s, 14)
@@ -55,7 +55,7 @@ if $data2_2 != 1 then
 endi
 
 print ========== step3
-sql create database d2 maxTables 4
+sql create database d2 
 
 sql create table d2.t2 (t timestamp, i int) 
 sql insert into d2.t2 values(now+1s, 25)
@@ -123,7 +123,7 @@ if $data2_3 != 2 then
 endi
 
 print ========== step6
-sql create database d3 maxTables 4
+sql create database d3 
 sql create table d3.t3 (t timestamp, i int)
 sql insert into d3.t3 values(now+1s, 35)
 sql insert into d3.t3 values(now+2s, 34)
diff --git a/tests/script/unique/stable/balance_replica1.sim b/tests/script/unique/stable/balance_replica1.sim
index 362f8ccf7f297d3d9d48f8d6dd8a8602713f601e..3ea158eb39c0d560900b34d5465fc1ef12a4b42f 100644
--- a/tests/script/unique/stable/balance_replica1.sim
+++ b/tests/script/unique/stable/balance_replica1.sim
@@ -29,7 +29,7 @@ $db = $dbPrefix
 $mt = $mtPrefix
 $st = $stPrefix . $i
 
-sql create database $db maxTables 4
+sql create database $db 
 sql use $db
 sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
 
diff --git a/tests/script/unique/stable/dnode2.sim b/tests/script/unique/stable/dnode2.sim
index 441323ff3cb79fe8dc44791755e6e9e76e7fa1ef..5c227f8cece29d31232ba1e030dbd30b3698096d 100644
--- a/tests/script/unique/stable/dnode2.sim
+++ b/tests/script/unique/stable/dnode2.sim
@@ -38,7 +38,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql create database $db maxTables 4
+sql create database $db 
 sql use $db
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
diff --git a/tests/script/unique/stable/dnode2_stop.sim b/tests/script/unique/stable/dnode2_stop.sim
index d25c68cbbaf1dc81ce921996c22dd1ef6dcb630b..19c6de33b3882633acce74ca6c8f9bdbccbf7b1c 100644
--- a/tests/script/unique/stable/dnode2_stop.sim
+++ b/tests/script/unique/stable/dnode2_stop.sim
@@ -43,7 +43,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql create database $db maxTables 4
+sql create database $db 
 sql use $db
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
diff --git a/tests/script/unique/stable/dnode3.sim b/tests/script/unique/stable/dnode3.sim
index 712ec04b8c5d23172f171f458b7403deb3eba94d..5fe37faa7146c70ce219788a2b2d56a1a88a8dcf 100644
--- a/tests/script/unique/stable/dnode3.sim
+++ b/tests/script/unique/stable/dnode3.sim
@@ -47,7 +47,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql create database $db maxTables 4
+sql create database $db 
 sql use $db
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
diff --git a/tests/script/unique/stable/replica2_dnode4.sim b/tests/script/unique/stable/replica2_dnode4.sim
index c7a9767fcc5a543b2b0a81332d111a80871ada95..4f8211d5d4b7ec5cbee3bee8104d0842346978d6 100644
--- a/tests/script/unique/stable/replica2_dnode4.sim
+++ b/tests/script/unique/stable/replica2_dnode4.sim
@@ -54,7 +54,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql create database $db replica 2 maxTables 4
+sql create database $db replica 2 
 sql use $db
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
diff --git a/tests/script/unique/stable/replica2_vnode3.sim b/tests/script/unique/stable/replica2_vnode3.sim
index 84af380106690d0aa44e491fdd0f2ce4dd58951d..47d45c3d3d7d7a4e32cf94fd8cf4d7dcb0b53477 100644
--- a/tests/script/unique/stable/replica2_vnode3.sim
+++ b/tests/script/unique/stable/replica2_vnode3.sim
@@ -37,7 +37,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql create database $db replica 2 maxTables 4
+sql create database $db replica 2 
 sql use $db
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
diff --git a/tests/script/unique/stable/replica3_dnode6.sim b/tests/script/unique/stable/replica3_dnode6.sim
index 83ef334301712347bda31873cfd90042287a1207..eeffb86cdbeefaeaf351ec5be3743e53136692ec 100644
--- a/tests/script/unique/stable/replica3_dnode6.sim
+++ b/tests/script/unique/stable/replica3_dnode6.sim
@@ -78,7 +78,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql create database $db replica 3 maxTables 4
+sql create database $db replica 3 
 sql use $db
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
diff --git a/tests/script/unique/stable/replica3_vnode3.sim b/tests/script/unique/stable/replica3_vnode3.sim
index 3cd7b92477aa2c2ded4f2aa0ad4feb210bba954f..bc700b7dda1cf95c96f16907fa207cd0c47819d1 100644
--- a/tests/script/unique/stable/replica3_vnode3.sim
+++ b/tests/script/unique/stable/replica3_vnode3.sim
@@ -54,7 +54,7 @@ $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 
-sql create database $db replica 3 maxTables 4
+sql create database $db replica 3 
 sql use $db
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
diff --git a/tests/script/unique/stream/metrics_balance.sim b/tests/script/unique/stream/metrics_balance.sim
index c04304449949f49abce52d05ca8c16912115c56d..36086fe4b85b0a6cbf9710af6104d697c1bb59dc 100644
--- a/tests/script/unique/stream/metrics_balance.sim
+++ b/tests/script/unique/stream/metrics_balance.sim
@@ -32,7 +32,7 @@ sql connect
 
 print ============== step1
 $db = $dbPrefix
-sql create database $db maxTables 4
+sql create database $db 
 sql use $db
 
 $i = 0
diff --git a/tests/script/unique/stream/table_balance.sim b/tests/script/unique/stream/table_balance.sim
index 6c8958aa48b1efdc3e3fc0a2b127faae0e72570c..facb7df45900eff83c18e2a5ee8344d4d426cf9b 100644
--- a/tests/script/unique/stream/table_balance.sim
+++ b/tests/script/unique/stream/table_balance.sim
@@ -34,7 +34,7 @@ $db = $dbPrefix
 $mt = $mtPrefix
 $st = $stPrefix . $i
 
-sql create database $db maxTables 4
+sql create database $db 
 sql use $db
 sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)
 
diff --git a/tests/script/unique/stream/table_move.sim b/tests/script/unique/stream/table_move.sim
index d3ea375e1fa466e9eca515a8235e36db09c80c51..d2437e49205448fdf656fac89391dbb5fe849b9f 100644
--- a/tests/script/unique/stream/table_move.sim
+++ b/tests/script/unique/stream/table_move.sim
@@ -65,7 +65,7 @@ $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
 $st = $stPrefix . $i
 
-sql create database $db maxTables 4
+sql create database $db 
 sql use $db
 sql create table $mt (ts timestamp, tbcol int, tbcol2 float) TAGS(tgcol int)