diff --git a/tests/script/unique/arbitrator/dn3_mn1_replica_change.sim b/tests/script/unique/arbitrator/dn3_mn1_replica_change.sim index 09654ca8a9e6fe3f126052c9ba51294b32d376ab..1652470346ec747cc325b7a3923e6afa344fdb53 100644 --- a/tests/script/unique/arbitrator/dn3_mn1_replica_change.sim +++ b/tests/script/unique/arbitrator/dn3_mn1_replica_change.sim @@ -51,7 +51,7 @@ system sh/exec.sh -n dnode2 -s start sql create dnode $hostname2 sleep 3000 -$totalTableNum = 10000 +$totalTableNum = 10 $sleepTimer = 10000 $db = db @@ -192,7 +192,7 @@ if $data00 != $totalRows then endi -print ============== step4: stop dnode2 for checking if sync success +print ============== step4: stop dnode2 for checking if sync ok system sh/exec.sh -n dnode2 -s stop sleep $sleepTimer diff --git a/tests/script/unique/arbitrator/dn3_mn1_replica_change_dropDnod.sim b/tests/script/unique/arbitrator/dn3_mn1_replica_change_dropDnod.sim index 4f29989aff04b5684f7a66ca87f724e1599d9e32..b870d07c1d261af47207bcba21c7bdef33016bd7 100644 --- a/tests/script/unique/arbitrator/dn3_mn1_replica_change_dropDnod.sim +++ b/tests/script/unique/arbitrator/dn3_mn1_replica_change_dropDnod.sim @@ -55,7 +55,7 @@ sql create dnode $hostname3 sql create dnode $hostname4 sleep 3000 -$totalTableNum = 1000 +$totalTableNum = 10 $sleepTimer = 10000 $db = db diff --git a/tests/script/unique/arbitrator/dn3_mn1_stopDnode_timeout.sim b/tests/script/unique/arbitrator/dn3_mn1_stopDnode_timeout.sim index 04933ea6e992b05936830b594732c05d7c8eb021..1b0a184690f7bbcaf0a49b1473451dd90043981a 100644 --- a/tests/script/unique/arbitrator/dn3_mn1_stopDnode_timeout.sim +++ b/tests/script/unique/arbitrator/dn3_mn1_stopDnode_timeout.sim @@ -173,7 +173,7 @@ if $rows != 3 then return -1 endi -print ============== step5: remove dnode4 director, then recreate dnode4 into cluster, result should success +print ============== step5: remove dnode4 director, then recreate dnode4 into cluster, result should ok system sh/exec.sh -n dnode4 -s stop system rm -rf ../../../sim/dnode4 diff --git a/tests/script/unique/arbitrator/dn3_mn1_vnode_change.sim b/tests/script/unique/arbitrator/dn3_mn1_vnode_change.sim index c156d7d55cc84cb924d4e7939166f345a4a3e289..fda850d2c9941cd9c1baecd07c621b0e99d6f8d7 100644 --- a/tests/script/unique/arbitrator/dn3_mn1_vnode_change.sim +++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_change.sim @@ -55,7 +55,7 @@ sql create dnode $hostname3 sql create dnode $hostname4 sleep 3000 -$totalTableNum = 100 +$totalTableNum = 10 $sleepTimer = 3000 $db = db diff --git a/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim b/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim index be4c321c364028faf752b190cd39275d69820176..d556976a43790ec9ba12152c8da7685ee310980f 100644 --- a/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim +++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_offline.sim @@ -55,7 +55,7 @@ sql create dnode $hostname3 #sql create dnode $hostname4 sleep 3000 -$totalTableNum = 100 +$totalTableNum = 10 $sleepTimer = 3000 $db = db @@ -177,7 +177,7 @@ if $data00 != $totalRows then return -1 endi -print ============== step5: stop dnode2, and check if dnode3 sync success +print ============== step5: stop dnode2, and check if dnode3 sync ok system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep $sleepTimer wait_dnode2_offline_0: 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 1345bac4f8b510932ea955362cb8367d0f8bb880..968a93156e67bb5e1b07fb22c4eb6cb9c83f4d56 100644 --- a/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim +++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_corruptFile_online.sim @@ -55,7 +55,7 @@ sql create dnode $hostname3 #sql create dnode $hostname4 sleep 3000 -$totalTableNum = 100 +$totalTableNum = 10 $sleepTimer = 3000 $db = db @@ -105,7 +105,7 @@ if $data00 != $totalRows then return -1 endi -print ============== step5: stop dnode2, and check if dnode3 sync success +print ============== step5: stop dnode2, and check if dnode3 sync ok system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep $sleepTimer wait_dnode2_offline_0: diff --git a/tests/script/unique/arbitrator/dn3_mn1_vnode_delDir.sim b/tests/script/unique/arbitrator/dn3_mn1_vnode_delDir.sim index 46b4023aa2ebae2a70ce81465ba9c435e8d8556a..82f2aad07b79858379e4b3d9e8355b1ad693f1d1 100644 --- a/tests/script/unique/arbitrator/dn3_mn1_vnode_delDir.sim +++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_delDir.sim @@ -55,7 +55,7 @@ sql create dnode $hostname3 sql create dnode $hostname4 sleep 3000 -$totalTableNum = 100 +$totalTableNum = 10 $sleepTimer = 3000 $db = db diff --git a/tests/script/unique/arbitrator/dn3_mn1_vnode_nomaster.sim b/tests/script/unique/arbitrator/dn3_mn1_vnode_nomaster.sim index b6a2b7e1d5ff836d3a256d7722cb19d5697373a4..4e9afbf31ae32fe2dacb43a4d367a94212f711c3 100644 --- a/tests/script/unique/arbitrator/dn3_mn1_vnode_nomaster.sim +++ b/tests/script/unique/arbitrator/dn3_mn1_vnode_nomaster.sim @@ -55,7 +55,7 @@ sql create dnode $hostname3 sql create dnode $hostname4 sleep 3000 -$totalTableNum = 100 +$totalTableNum = 10 $sleepTimer = 3000 $db = db @@ -152,7 +152,7 @@ print ============== step4: restart dnode2, then create database with replica 2, system sh/exec.sh -n dnode2 -s start sleep 3000 -$totalTableNum = 100 +$totalTableNum = 10 $sleepTimer = 3000 $db = db1 diff --git a/tests/script/unique/arbitrator/offline_replica2_alterTable_online.sim b/tests/script/unique/arbitrator/offline_replica2_alterTable_online.sim index bcbb7e81a58ca8cd3c883cd3678ea2d31034742b..26a6359a5c526a88ea8e84ae2cb6f1c43fefac41 100644 --- a/tests/script/unique/arbitrator/offline_replica2_alterTable_online.sim +++ b/tests/script/unique/arbitrator/offline_replica2_alterTable_online.sim @@ -56,7 +56,7 @@ sql create dnode $hostname2 sql create dnode $hostname4 sleep 3000 -$totalTableNum = 100 +$totalTableNum = 10 $sleepTimer = 3000 $db = db diff --git a/tests/script/unique/arbitrator/offline_replica2_alterTag_online.sim b/tests/script/unique/arbitrator/offline_replica2_alterTag_online.sim index 54e5c6a81f5fde0e3ae1786b6d785589f6dea523..b883f077c2d1821a104efb579bdda866d7940b33 100644 --- a/tests/script/unique/arbitrator/offline_replica2_alterTag_online.sim +++ b/tests/script/unique/arbitrator/offline_replica2_alterTag_online.sim @@ -67,7 +67,7 @@ sql use $db # create table , insert data $stb = stb -sql create table $stb (ts timestamp, c1 int, c2 int) tags(t1 int) +sql create table $stb (ts timestamp, c1 int, c2 int) tags(t0 int, t1 int) $rowNum = 500 $tblNum = $totalTableNum $totalRows = 0 @@ -77,7 +77,7 @@ $tsEnd = 0 $i = 0 while $i < $tblNum $tb = tb . $i - sql create table $tb using $stb tags( $i ) + sql create table $tb using $stb tags( $i , $i ) $x = 0 while $x < $rowNum @@ -164,7 +164,7 @@ $totalRows = 0 $i = 0 while $i < $tblNum $tb = tb . $i - sql create table $tb using $stb tags( $i , $i ) + sql create table $tb using $stb tags( $i , $i , $i ) $x = 0 while $x < $rowNum diff --git a/tests/script/unique/arbitrator/offline_replica2_createTable_online.sim b/tests/script/unique/arbitrator/offline_replica2_createTable_online.sim index e9b5e484eb0d4a5aaf9968c1d509dfa858f5f462..e7b2c70c782a6ffd260c5c4b12dfc94ba6331def 100644 --- a/tests/script/unique/arbitrator/offline_replica2_createTable_online.sim +++ b/tests/script/unique/arbitrator/offline_replica2_createTable_online.sim @@ -56,7 +56,7 @@ sql create dnode $hostname2 sql create dnode $hostname4 sleep 3000 -$totalTableNum = 100 +$totalTableNum = 10 $sleepTimer = 3000 $maxTables = $totalTableNum * 2 diff --git a/tests/script/unique/arbitrator/offline_replica2_dropDb_online.sim b/tests/script/unique/arbitrator/offline_replica2_dropDb_online.sim index e2ffc2ab1d85451a94b617b4ca139113ed58f714..20c575d382e71a9340240ba2fc7a142ee8927b0f 100644 --- a/tests/script/unique/arbitrator/offline_replica2_dropDb_online.sim +++ b/tests/script/unique/arbitrator/offline_replica2_dropDb_online.sim @@ -56,7 +56,7 @@ sql create dnode $hostname2 sql create dnode $hostname4 sleep 3000 -$totalTableNum = 100 +$totalTableNum = 10 $sleepTimer = 3000 $db = db diff --git a/tests/script/unique/arbitrator/offline_replica2_dropTable_online.sim b/tests/script/unique/arbitrator/offline_replica2_dropTable_online.sim index ba8b1cd3b52c102046f513c06de9f8b80d9ae0cf..9f72cde440ac53cc7e5c246905022c0f51e5ee7b 100644 --- a/tests/script/unique/arbitrator/offline_replica2_dropTable_online.sim +++ b/tests/script/unique/arbitrator/offline_replica2_dropTable_online.sim @@ -56,7 +56,7 @@ sql create dnode $hostname2 sql create dnode $hostname4 sleep 3000 -$totalTableNum = 100 +$totalTableNum = 10 $sleepTimer = 3000 $db = db @@ -146,14 +146,14 @@ endi print ============== step4: drop some tables $i = 1 -$dropTblNum = 21 +$dropTblNum = 6 while $i < $dropTblNum $tb = tb . $i sql drop table if exists $tb $i = $i + 1 endw -$tblNum = $tblNum - 20 +$tblNum = $tblNum - 5 print ============== step5: restart dnode4, waiting dnode4 synced system sh/exec.sh -n dnode4 -s start diff --git a/tests/script/unique/arbitrator/offline_replica3_alterTable_online.sim b/tests/script/unique/arbitrator/offline_replica3_alterTable_online.sim index c7f02fdc511e928ec56b93bb800e285c23526558..43f9dfff144d3622ff738db6c5bdb61215bee357 100644 --- a/tests/script/unique/arbitrator/offline_replica3_alterTable_online.sim +++ b/tests/script/unique/arbitrator/offline_replica3_alterTable_online.sim @@ -56,7 +56,7 @@ sql create dnode $hostname3 sql create dnode $hostname4 sleep 3000 -$totalTableNum = 100 +$totalTableNum = 10 $sleepTimer = 3000 $db = db diff --git a/tests/script/unique/arbitrator/offline_replica3_alterTag_online.sim b/tests/script/unique/arbitrator/offline_replica3_alterTag_online.sim index 97a8a0d6e06e760ad3acb386589ceae91fa63e9b..e27bbafba7a6d6cc01f83f2a594f9f25b1f8a5d8 100644 --- a/tests/script/unique/arbitrator/offline_replica3_alterTag_online.sim +++ b/tests/script/unique/arbitrator/offline_replica3_alterTag_online.sim @@ -67,7 +67,7 @@ sql use $db # create table , insert data $stb = stb -sql create table $stb (ts timestamp, c1 int, c2 int) tags(t1 int) +sql create table $stb (ts timestamp, c1 int, c2 int) tags(t0 int, t1 int) $rowNum = 500 $tblNum = $totalTableNum $totalRows = 0 @@ -77,7 +77,7 @@ $tsEnd = 0 $i = 0 while $i < $tblNum $tb = tb . $i - sql create table $tb using $stb tags( $i ) + sql create table $tb using $stb tags( $i , $i ) $x = 0 while $x < $rowNum @@ -164,7 +164,7 @@ $totalRows = 0 $i = 0 while $i < $tblNum $tb = tb . $i - sql create table $tb using $stb tags( $i , $i ) + sql create table $tb using $stb tags( $i , $i , $i ) $x = 0 while $x < $rowNum diff --git a/tests/script/unique/arbitrator/offline_replica3_createTable_online.sim b/tests/script/unique/arbitrator/offline_replica3_createTable_online.sim index 113d322d8556938555105f7adefe7adccd6e6fe3..1e47157975e5f9183787f7874f7461b6d7492598 100644 --- a/tests/script/unique/arbitrator/offline_replica3_createTable_online.sim +++ b/tests/script/unique/arbitrator/offline_replica3_createTable_online.sim @@ -56,7 +56,7 @@ sql create dnode $hostname3 sql create dnode $hostname4 sleep 3000 -$totalTableNum = 100 +$totalTableNum = 10 $sleepTimer = 3000 $maxTables = $totalTableNum * 2 diff --git a/tests/script/unique/arbitrator/offline_replica3_dropDb_online.sim b/tests/script/unique/arbitrator/offline_replica3_dropDb_online.sim index 0c7211d9e57428f56c8cd36bc16cc8f85d58bd4a..c9fc91527d27a2e66d17b2d385b097b9f837b7de 100644 --- a/tests/script/unique/arbitrator/offline_replica3_dropDb_online.sim +++ b/tests/script/unique/arbitrator/offline_replica3_dropDb_online.sim @@ -56,7 +56,7 @@ sql create dnode $hostname3 sql create dnode $hostname4 sleep 3000 -$totalTableNum = 100 +$totalTableNum = 10 $sleepTimer = 3000 $db = db diff --git a/tests/script/unique/arbitrator/offline_replica3_dropTable_online.sim b/tests/script/unique/arbitrator/offline_replica3_dropTable_online.sim index 8e59acc23430104890560197770de6f3591dfeff..aecf41b892ea2eabd428a88b803d9a81c8be830c 100644 --- a/tests/script/unique/arbitrator/offline_replica3_dropTable_online.sim +++ b/tests/script/unique/arbitrator/offline_replica3_dropTable_online.sim @@ -56,7 +56,7 @@ sql create dnode $hostname3 sql create dnode $hostname4 sleep 3000 -$totalTableNum = 100 +$totalTableNum = 10 $sleepTimer = 3000 $db = db @@ -146,14 +146,14 @@ endi print ============== step4: drop some tables $i = 1 -$dropTblNum = 21 +$dropTblNum = 6 while $i < $dropTblNum $tb = tb . $i sql drop table if exists $tb $i = $i + 1 endw -$tblNum = $tblNum - 20 +$tblNum = $tblNum - 5 print ============== step5: restart dnode4, waiting dnode4 synced system sh/exec.sh -n dnode4 -s start