scripts

tests/script/general/column/testSuite.sim

-run lite/column/table.sim
-run lite/column/metrics.sim
-run lite/column/stream.sim
-run lite/column/commit.sim
+run general/column/table.sim
+run general/column/metrics.sim
+run general/column/stream.sim
+run general/column/commit.sim

tests/script/general/compress/commitlog.sim

@@ -3,7 +3,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 cacheBlockSize -v 1024
 system sh/cfg.sh -n dnode1 -c compression -v 1
 system sh/exec.sh -n dnode1 -s start
 

tests/script/general/compress/compress.sim

@@ -3,7 +3,6 @@ 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 cacheBlockSize -v 1024
 system sh/cfg.sh -n dnode1 -c compression -v 1
 system sh/exec.sh -n dnode1 -s start
 

tests/script/general/compress/compress2.sim

@@ -3,7 +3,6 @@ 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 cacheBlockSize -v 1024
 system sh/cfg.sh -n dnode1 -c compression -v 2
 system sh/exec.sh -n dnode1 -s start
 

tests/script/general/compress/uncompress.sim

@@ -3,7 +3,6 @@ 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 cacheBlockSize -v 1024
 system sh/cfg.sh -n dnode1 -c compression -v 1
 system sh/exec.sh -n dnode1 -s start
 

tests/script/general/db/back_insert.sim

 sql connect
 $x = 1
 begin:
+  sql reset query cache
+  sleep 1000 
   sql insert into db.tb values(now, $x ) -x begin  
   #print ===> insert successed $x 
   $x = $x + 1   

tests/script/general/db/delete_reuse1.sim

 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
@@ -31,7 +27,6 @@ system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
 sql connect
 
 print ======== step1 
@@ -78,6 +73,8 @@ sql insert into d1.t1 values(now, 2) -x step2
 step2:
 
 print ========= step3
+sql reset query cache
+sleep 1000
 sql create database d1 replica 1
 sql create table d1.t1 (ts timestamp, i int)
 sql insert into d1.t1 values(now, 2)
@@ -97,6 +94,8 @@ while $x < 20
   step4:
   
   sql create database d1 replica 1
+  sql reset query cache
+  sleep 1000
   sql create table d1.t1 (ts timestamp, i int)
   sql insert into d1.t1 values(now, $x )
   sql select * from d1.t1

tests/script/general/db/delete_reuse2.sim

 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
@@ -31,7 +27,6 @@ system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
 sql connect
 
 print ======== step1 
@@ -79,6 +74,8 @@ step2:
 
 print ========= step3
 sql create database db1 replica 1
+sql reset query cache
+sleep 1000  
 sql create table db1.tb1 (ts timestamp, i int)
 sql insert into db1.tb1 values(now, 2)
 sql select * from db1.tb1
@@ -104,6 +101,9 @@ while $x < 20
   $db = db . $x 
   $tb = tb . $x
   
+  sql reset query cache
+  sleep 1000
+  
   sql create database $db replica 1
   sql use $db
   sql create table $tb (ts timestamp, i int)

tests/script/general/db/delete_reusevnode.sim

@@ -5,19 +5,16 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 10
-system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 200
-system sh/cfg.sh -n dnode2 -c cacheBlockSize -v 200
-system sh/cfg.sh -n dnode3 -c cacheBlockSize -v 200
 
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sql connect
 
 print ======== step1 
 
 $tbPrefix = t
 $i = 0
-while $i < 1000
+while $i < 30
   $db = db . $i
   sql create database $db
   sql use $db
@@ -37,38 +34,32 @@ endw
 
 print ======== step2
 sleep 1000
-sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
 endi 
 
-
 system sh/stop_dnodes.sh
+sleep 3000
 
 system sh/deploy.sh -n dnode1 -i 1
-
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 10
-system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 200
-system sh/cfg.sh -n dnode2 -c cacheBlockSize -v 200
-system sh/cfg.sh -n dnode3 -c cacheBlockSize -v 200
-
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sql connect
 
 print ======== step1
 
 $tbPrefix = t
 $i = 0
-while $i < 1000
+while $i < 10
   $db = db . $i
   sql create database $db maxTables 4
   sql use $db
 
-  sql create table st (ts timesetamp, i int) tags(j int);
+  sql create table st (ts timestamp, i int) tags(j int);
   $tb = $tbPrefix . $i
   $tb = $tb . a
 
@@ -114,7 +105,6 @@ endw
 
 print ======== step2
 sleep 1000
-sql drop database $db
 sql show databases
 if $rows != 0 then
   return -1

tests/script/general/db/delete_reusevnode2.sim

@@ -5,26 +5,19 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 10
-system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 200
-system sh/cfg.sh -n dnode2 -c cacheBlockSize -v 200
-system sh/cfg.sh -n dnode3 -c cacheBlockSize -v 200
 
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
-
-sleep 3000
+sql connect
 
 print ======== step1
 
-
 sql create database db maxTables 4;
 sql use db
 
-
 $tbPrefix = t
 $i = 0
-while $i < 1000
-
+while $i < 10
 
   sql create table st (ts timestamp, i int) tags(j int);
   $tb = $tbPrefix . $i

tests/script/general/db/delete_writing1.sim

 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
@@ -31,7 +27,6 @@ system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
 sql connect
 
 sql create database db 
@@ -39,7 +34,7 @@ sql create table db.tb (ts timestamp, i int)
 sql insert into db.tb values(now, 1)
 
 print ======== start back
-run_back lite/db/back_insert.sim
+run_back general/db/back_insert.sim
 sleep 1000
 
 print ======== step1 

tests/script/general/db/delete_writing2.sim

 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
 
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
 sql connect
 
 sql create database db 
@@ -27,7 +25,7 @@ sql create table db4.tb4 (ts timestamp, i int)
 sql insert into db4.tb4 values(now, 1)
 
 print ======== start back
-run_back lite/db/back_insert.sim
+run_back general/db/back_insert.sim
 sleep 1000
 
 print ======== step1 

tests/script/general/db/testSuite.sim

@@ -4,10 +4,12 @@ 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/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

tests/script/general/parser/first_last.sim

@@ -69,7 +69,7 @@ sql import into $tb (ts) values ( $ts )
 
 print ====== test data created
 
-run lite/parser/first_last_query.sim
+run general/parser/first_last_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -79,5 +79,5 @@ print ================== server restart completed
 sql connect
 sleep 3000
 
-run lite/parser/first_last_query.sim
+run general/parser/first_last_query.sim
 

tests/script/general/parser/interp.sim

@@ -56,7 +56,7 @@ while $i < $halfNum
 endw 
 print ====== tables created
 
-run lite/parser/interp_test.sim
+run general/parser/interp_test.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -64,4 +64,4 @@ sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-run lite/parser/interp_test.sim
+run general/parser/interp_test.sim

tests/script/general/parser/lastrow.sim

@@ -57,7 +57,7 @@ endw
 
 print ====== test data created
 
-run lite/parser/lastrow_query.sim
+run general/parser/lastrow_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -67,4 +67,4 @@ print ================== server restart completed
 sql connect
 sleep 3000
 
-run lite/parser/lastrow_query.sim
+run general/parser/lastrow_query.sim

tests/script/general/parser/limit.sim

@@ -56,8 +56,8 @@ while $i < $halfNum
 endw 
 print ====== tables created
 
-run lite/parser/limit_tb.sim
-run lite/parser/limit_stb.sim
+run general/parser/limit_tb.sim
+run general/parser/limit_stb.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -67,5 +67,5 @@ print ================== server restart completed
 sql connect
 sleep 3000
 
-run lite/parser/limit_tb.sim
-run lite/parser/limit_stb.sim
+run general/parser/limit_tb.sim
+run general/parser/limit_stb.sim

tests/script/general/parser/limit1.sim

@@ -56,8 +56,8 @@ while $i < $halfNum
 endw 
 print ====== tables created
 
-run lite/parser/limit1_tb.sim
-run lite/parser/limit1_stb.sim
+run general/parser/limit1_tb.sim
+run general/parser/limit1_stb.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -65,5 +65,5 @@ sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-run lite/parser/limit1_tb.sim
-run lite/parser/limit1_stb.sim
+run general/parser/limit1_tb.sim
+run general/parser/limit1_stb.sim

tests/script/general/parser/limit1_tblocks100.sim

@@ -56,8 +56,8 @@ while $i < $halfNum
 endw 
 print ====== tables created
 
-run lite/parser/limit1_tb.sim
-run lite/parser/limit1_stb.sim
+run general/parser/limit1_tb.sim
+run general/parser/limit1_stb.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -65,5 +65,5 @@ sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-run lite/parser/limit1_tb.sim
-run lite/parser/limit1_stb.sim
+run general/parser/limit1_tb.sim
+run general/parser/limit1_stb.sim

tests/script/general/parser/limit2.sim

@@ -65,7 +65,7 @@ while $i < $halfNum
 endw 
 print ====== tables created
 
-#run lite/parser/limit2_query.sim
+#run general/parser/limit2_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -73,4 +73,4 @@ sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-run lite/parser/limit2_query.sim
+run general/parser/limit2_query.sim

tests/script/general/parser/limit2_tblocks100.sim

@@ -65,7 +65,7 @@ while $i < $halfNum
 endw 
 print ====== tables created
 
-#run lite/parser/limit2_query.sim
+#run general/parser/limit2_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -73,4 +73,4 @@ sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-run lite/parser/limit2_query.sim
+run general/parser/limit2_query.sim

tests/script/general/parser/repeatAlter.sim

@@ -2,6 +2,6 @@ $i = 1
 $loops = 10
 while $i <= $loops
   print ====== repeat: $i
-  run lite/parser/alter.sim
+  run general/parser/alter.sim
   $i = $i + 1
 endw

tests/script/general/parser/repeatStream.sim

@@ -2,6 +2,6 @@ $i = 1
 $repeats = 5
 while $i <= $repeats
   print ====== repeat: $i
-  run lite/parser/stream.sim
+  run general/parser/stream.sim
   $i = $i + 1
 endw

tests/script/general/parser/single_row_in_tb.sim

@@ -27,7 +27,7 @@ sql create table $tb1 using $stb tags( 1 )
 sql insert into $tb1 values ( $ts0 , 1, 2, 3, 4, true, 'binay10', '涛思nchar10' )
 print ====== tables created
 
-run lite/parser/single_row_in_tb_query.sim
+run general/parser/single_row_in_tb_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -35,4 +35,4 @@ sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-run lite/parser/single_row_in_tb_query.sim
+run general/parser/single_row_in_tb_query.sim

tests/script/general/parser/slimit.sim

@@ -94,7 +94,7 @@ while $i < $tbNum
 endw
 print ====== $db tables created
   
-run lite/parser/slimit_query.sim
+run general/parser/slimit_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -104,4 +104,4 @@ print ================== server restart completed
 sql connect
 sleep 3000
 
-run lite/parser/slimit_query.sim
+run general/parser/slimit_query.sim

tests/script/general/parser/slimit1.sim

@@ -53,7 +53,7 @@ endw
 
 print ================== tables and data created
   
-run lite/parser/slimit1_query.sim
+run general/parser/slimit1_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -63,4 +63,4 @@ print ================== server restart completed
 sql connect
 sleep 3000
 
-run lite/parser/slimit1_query.sim
+run general/parser/slimit1_query.sim

tests/script/general/parser/tbnameIn.sim

@@ -64,7 +64,7 @@ while $i < $halfNum
 endw 
 print ====== tables created
 
-run lite/parser/tbnameIn_query.sim
+run general/parser/tbnameIn_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -72,4 +72,4 @@ sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
-run lite/parser/tbnameIn_query.sim
+run general/parser/tbnameIn_query.sim

tests/script/general/parser/timestamp.sim

@@ -54,7 +54,7 @@ while $i < $tbNum
 endw
 print ====== $db tables created
   
-run lite/parser/timestamp_query.sim
+run general/parser/timestamp_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
@@ -64,4 +64,4 @@ print ================== server restart completed
 sql connect
 sleep 3000
 
-run lite/parser/timestamp_query.sim
+run general/parser/timestamp_query.sim

tests/script/general/stream/metrics_del.sim

@@ -2,9 +2,6 @@ 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 numOfBlocksPerMeter -v 4
-system sh/cfg.sh -n dnode1 -c pointsPerCompBlock -v 100
-system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/stream/stream_3.sim

@@ -109,9 +109,6 @@ print =============== step7
 system sh/exec.sh -n dnode1 -s stop
 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 numOfBlocksPerMeter -v 4
-system sh/cfg.sh -n dnode1 -c pointsPerCompBlock -v 100
-system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024
 system sh/exec.sh -n dnode1 -s start
 
 sleep 4000

tests/script/general/stream/table_del.sim

@@ -2,9 +2,6 @@ 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 numOfBlocksPerMeter -v 4
-system sh/cfg.sh -n dnode1 -c pointsPerCompBlock -v 100
-system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000

tests/script/general/table/delete_writing.sim

@@ -40,7 +40,7 @@ sql create table db.tb (ts timestamp, i int)
 sql insert into db.tb values(now, 1)
 
 print ======== start back
-run_back lite/table/back_insert.sim
+run_back general/table/back_insert.sim
 sleep 1000
 
 print ======== step1 

tests/script/jenkins/basic.txt

@@ -9,16 +9,18 @@ cd ../../../debug; make
 
 #general
 
-./test.sh -f general/db/basic.sim
+./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/delete_reuse1.sim
+./test.sh -f general/db/delete_reuse2.sim
+./test.sh -f general/db/delete_reusevnode.sim
+#./test.sh -f general/db/delete_reusevnode2.sim
+./test.sh -f general/db/delete_writing1.sim
+./test.sh -f general/db/delete_writing2.sim
 ./test.sh -f general/db/len.sim
 ./test.sh -f general/db/repeat.sim
 ./test.sh -f general/db/tables.sim

tests/script/unique/db/delete.sim

@@ -15,9 +15,6 @@ system sh/cfg.sh -n dnode3 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 10
-system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 200
-system sh/cfg.sh -n dnode2 -c cacheBlockSize -v 200
-system sh/cfg.sh -n dnode3 -c cacheBlockSize -v 200
 
 print ========= start dnodes
 system sh/exec_up.sh -n dnode1 -s start