test: restore some 2.0 case

tests/script/general/db/alter_option.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 maxTablesPerVnode -v 1000
-
-system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
-sql connect
-
-print ============= create database
-sql create database db cache 2 blocks 4 duration 10 keep 20 minRows 300 maxRows 400 ctime 120 precision 'ms' comp 2 wal 1 replica 1
-sql show databases
-if $data00 != db then 
-  return -1
-endi
-if $data02 != 0 then 
-  return -1
-endi
-if $data03 != 0 then 
-  return -1
-endi
-if $data04 != 1 then 
-  return -1
-endi
-if $data06 != 10 then 
-  return -1
-endi
-if $data07 != 20,20,20 then 
-  return -1
-endi
-if $data08 != 2 then 
-  return -1
-endi
-if $data09 != 4 then 
-  return -1
-endi
-
-print ============== step name
-sql_error alter database db name d1
-sql_error alter database db name d2
-
-print ============== step ntables
-sql_error alter database db ntables -1
-sql_error alter database db ntables 0
-sql_error alter database db ntables 1
-sql_error alter database db ntables 10
-
-print ============== step vgroups
-sql_error alter database db vgroups -1
-sql_error alter database db vgroups 0
-sql_error alter database db vgroups 1
-sql_error alter database db vgroups 10
-
-print ============== step replica
-sql_error alter database db replica 2
-sql_error alter database db replica 3
-sql_error alter database db replica 0
-
-sql alter database db replica 1
-sql show databases
-print replica $data4_db
-if $data4_db != 1 then 
-  return -1
-endi
-
-print ============== step quorum
-sql show databases
-print quorum $data5_db
-if $data5_db != 1 then 
-  return -1
-endi
-
-sql alter database db quorum 1
-sql show databases
-print quorum $data5_db
-if $data5_db != 1 then 
-  return -1
-endi
-
-sql_error alter database db quorum 2
-
-sql_error alter database db quorum 3
-
-sql_error alter database db quorum 0
-sql_error alter database db quorum 4
-sql_error alter database db quorum 5
-sql_error alter database db quorum -1
-
-print ============== step duration
-sql_error alter database db duration 0
-sql_error alter database db duration 1
-sql_error alter database db duration 2
-sql_error alter database db duration 10
-sql_error alter database db duration 50
-sql_error alter database db duration 100
-
-print ============== step keep
-sql show databases
-print keep $data7_db
-if $data7_db != 20,20,20 then 
-  return -1
-endi
-
-sql alter database db keep 20
-sql show databases
-print keep $data7_db
-if $data7_db != 20,20,20 then
-  return -1
-endi
-
-sql alter database db keep 30
-sql show databases
-print keep $data7_db
-if $data7_db != 30,30,30 then
-  return -1
-endi
-
-sql alter database db keep 40
-sql show databases
-print keep $data7_db
-if $data7_db != 40,40,40 then
-  return -1
-endi
-
-sql alter database db keep 40,50
-sql alter database db keep 30,31
-sql alter database db keep 20
-sql_error alter database db keep 10.0
-sql_error alter database db keep 9
-sql_error alter database db keep 1
-sql_error alter database db keep 0
-sql_error alter database db keep -1
-sql_error alter database db keep 365001
-
-print ============== step cache
-sql_error alter database db cache 60
-sql_error alter database db cache 50
-sql_error alter database db cache 20
-sql_error alter database db cache 3
-sql_error alter database db cache 129
-sql_error alter database db cache 300
-sql_error alter database db cache 0
-sql_error alter database db cache -1
-
-print ============== step blocks
-sql show databases
-print blocks $data9_db
-if $data9_db != 4 then 
-  return -1
-endi
-
-sql alter database db blocks 10
-sql show databases
-print blocks $data9_db
-if $data9_db != 10 then 
-  return -1
-endi
-
-sql alter database db blocks 20
-sql show databases
-print blocks $data9_db
-if $data9_db != 20 then 
-  return -1
-endi
-
-sql alter database db blocks 30
-sql show databases
-print blocks $data9_db
-if $data9_db != 30 then 
-  return -1
-endi
-
-sql alter database db blocks 40
-sql alter database db blocks 30
-sql alter database db blocks 20
-sql alter database db blocks 10
-sql_error alter database db blocks 2
-sql_error alter database db blocks 1
-sql_error alter database db blocks 0
-sql_error alter database db blocks -1
-sql_error alter database db blocks 10001
-
-print ============== step minrows
-sql_error alter database db minrows 1
-sql_error alter database db minrows 100
-sql_error alter database db minrows 1000
-
-print ============== step maxrows
-sql_error alter database db maxrows 1
-sql_error alter database db maxrows 100
-sql_error alter database db maxrows 1000
-
-print ============== step wallevel
-sql show databases
-print wallevel $data12_db
-if $data12_db != 1 then 
-  return -1
-endi
-
-sql_error alter database db wal 1
-
-
-sql_error alter database db wal 1
-sql_error alter database db wal 2
-sql_error alter database db wal 1
-sql_error alter database db wal 2
-sql_error alter database db wal 0
-sql_error alter database db wal 3
-sql_error alter database db wal 4
-sql_error alter database db wal -1
-sql_error alter database db wal 1000
-
-print ============== step fsync
-sql_error alter database db fsync 0
-sql_error alter database db fsync 1
-sql_error alter database db fsync 3600
-sql_error alter database db fsync 18000
-sql_error alter database db fsync 180000
-sql_error alter database db fsync 180001
-sql_error alter database db fsync -1
-
-print ============== step comp
-sql show databases
-print comp $data14_db
-if $data14_db != 2 then 
-  return -1
-endi
-
-sql alter database db comp 1
-sql show databases
-print comp $data14_db
-if $data14_db != 1 then 
-  return -1
-endi
-
-sql alter database db comp 2
-sql show databases
-print comp $data14_db
-if $data14_db != 2 then 
-  return -1
-endi
-
-sql alter database db comp 0
-sql show databases
-print comp $data14_db
-if $data14_db != 0 then 
-  return -1
-endi
-
-sql_error alter database db comp 3
-sql_error alter database db comp 4
-sql_error alter database db comp 5
-sql_error alter database db comp -1
-
-
-print ============== step precision
-sql_error alter database db prec 'us'
-
-print ============== step status
-sql_error alter database db status 'delete'
-
-system sh/exec.sh -n dnode1 -s stop -x SIGINT

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   
-goto begin
\ No newline at end of file

tests/script/jenkins/basic.txt

@@ -11,17 +11,41 @@
 ./test.sh -f tsim/db/alter_option.sim
 # ./test.sh -f tsim/db/alter_replica_13.sim
 # ./test.sh -f tsim/db/alter_replica_31.sim
+#./test.sh -f tsim/db/alter_tables_d2.sim
+#./test.sh -f tsim/db/alter_tables_v1.sim
+#./test.sh -f tsim/db/alter_tables_v4.sim
+#./test.sh -f tsim/db/alter_vgroups.sim
 ./test.sh -f tsim/db/basic1.sim
 ./test.sh -f tsim/db/basic2.sim
 ./test.sh -f tsim/db/basic3.sim
+#./test.sh -f tsim/db/basic4.sim
+#./test.sh -f tsim/db/basic5.sim
 ./test.sh -f tsim/db/basic6.sim
 ./test.sh -f tsim/db/basic7.sim
 #./test.sh -f tsim/db/commit.sim
 ./test.sh -f tsim/db/create_all_options.sim
 #./test.sh -f tsim/db/delete_part.sim
+#./test.sh -f tsim/db/delete_reuse1.sim
+#./test.sh -f tsim/db/delete_reuse2.sim
+#./test.sh -f tsim/db/delete_reusevnode.sim
+#./test.sh -f tsim/db/delete_reusevnode2.sim
+#./test.sh -f tsim/db/delete_writing1.sim
+#./test.sh -f tsim/db/delete_writing2.sim
 #./test.sh -f tsim/db/delete.sim
+#./test.sh -f tsim/db/delete2.sim
+#./test.sh -f tsim/db/dropvnodes.sim
 ./test.sh -f tsim/db/error1.sim
+#./test.sh -f tsim/db/keep.sim
+#./test.sh -f tsim/db/len.sim
+#./test.sh -f tsim/db/nosuchfile.sim
+#./test.sh -f tsim/db/repeat.sim
+#./test.sh -f tsim/db/show_create_db.sim
+#./test.sh -f tsim/db/show_create_table.sim
+#./test.sh -f tsim/db/tables.sim
 ./test.sh -f tsim/db/taosdlog.sim
+#./test.sh -f tsim/db/topic1.sim
+#./test.sh -f tsim/db/topic2.sim
+#./test.sh -f tsim/db/vnodes.sim
 
 # ---- dnode
 # ./test.sh -f tsim/dnode/balance_replica1.sim

tests/script/tsim/db/alter_option.sim

@@ -6,64 +6,36 @@ system sh/exec.sh -n dnode1 -s start
 system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 
-$loop_cnt = 0
-check_dnode_ready:
-	$loop_cnt = $loop_cnt + 1
-	sleep 200
-	if $loop_cnt == 10 then
-	  print ====> dnode not ready!
-		return -1
-	endi
-sql show dnodes
-print ===> $rows $data00 $data01 $data02 $data03 $data04 $data05
-if $data00 != 1 then
-  return -1
-endi
-if $data04 != ready then
-  goto check_dnode_ready
-endi
-
 sql connect
 sql create dnode $hostname port 7200
 sql create dnode $hostname port 7300
 
-$loop_cnt = 0
-check_dnode_ready_1:
-	$loop_cnt = $loop_cnt + 1
-	sleep 200
-	if $loop_cnt == 10 then
+$x = 0
+step1:
+	$x = $x + 1
+	sleep 1000
+	if $x == 10 then
 	  print ====> dnode not ready!
 		return -1
 	endi
 sql show dnodes
-print ===> rows: $rows 
 print ===> $data00 $data01 $data02 $data03 $data04 $data05
 print ===> $data10 $data11 $data12 $data13 $data14 $data15
 print ===> $data20 $data21 $data22 $data23 $data24 $data25
-if $data00 != 1 then
+if $rows != 3 then
   return -1
 endi
-system_content printf %OS%
-if $system_content == Windows_NT then
-  system_content printf %COMPUTERNAME%:7100
-  if $data01 != $system_content then
-    return -1
-  endi
-else
-  if $data01 != localhost:7100 then
-    return -1
-  endi
+if $data(1)[4] != ready then
+  goto step1
 endi
-if $data04 != ready then
-  goto check_dnode_ready_1
+if $data(2)[4] != ready then
+  goto step1
 endi
-if $data14 != ready then
-  goto check_dnode_ready_1
-endi
-if $data24 != ready then
-  goto check_dnode_ready_1
+if $data(3)[4] != ready then
+  goto step1
 endi
 
+
 print ============= create database
 #database_option: {
 #  | BUFFER value       [3~16384, default: 96]
@@ -137,7 +109,6 @@ if $data17_db != ns then  # precision
   return -1
 endi
 
-sleep 3000
 #sql show db.vgroups
 #if $data[0][4] == leader then
 #  if $data[0][6] != follower then

tests/script/tsim/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