test: restore 2.0 case

tests/script/jenkins/basic.txt

@@ -87,18 +87,17 @@
 ./test.sh -f tsim/parser/alter_column.sim
 ./test.sh -f tsim/parser/alter_stable.sim
 ./test.sh -f tsim/parser/alter.sim
-# nojira ./test.sh -f tsim/parser/alter1.sim
+# jira ./test.sh -f tsim/parser/alter1.sim
 ./test.sh -f tsim/parser/auto_create_tb_drop_tb.sim
 # jira ./test.sh -f tsim/parser/auto_create_tb.sim
 ./test.sh -f tsim/parser/between_and.sim
 ./test.sh -f tsim/parser/binary_escapeCharacter.sim
-# nojira ./test.sh -f tsim/parser/col_arithmetic_operation.sim     
-# nojira ./test.sh -f tsim/parser/columnValue.sim
+# jira ./test.sh -f tsim/parser/col_arithmetic_operation.sim     
+# jira ./test.sh -f tsim/parser/columnValue.sim
 ## ./test.sh -f tsim/parser/commit.sim
 ## ./test.sh -f tsim/parser/condition.sim
 ## ./test.sh -f tsim/parser/constCol.sim
-# ./test.sh -f tsim/parser/create_db.sim
-## ./test.sh -f tsim/parser/create_db__for_community_version.sim
+./test.sh -f tsim/parser/create_db.sim
 # ./test.sh -f tsim/parser/create_mt.sim
 # ./test.sh -f tsim/parser/create_tb.sim
 ## ./test.sh -f tsim/parser/create_tb_with_tag_name.sim
@@ -235,15 +234,15 @@
 ./test.sh -f tsim/stream/drop_stream.sim
 ./test.sh -f tsim/stream/distributeInterval0.sim
 ./test.sh -f tsim/stream/distributeIntervalRetrive0.sim
-# ./test.sh -f tsim/stream/distributesession0.sim
+./test.sh -f tsim/stream/distributeSession0.sim
 ./test.sh -f tsim/stream/session0.sim
 ./test.sh -f tsim/stream/session1.sim
 ./test.sh -f tsim/stream/state0.sim
 ./test.sh -f tsim/stream/triggerInterval0.sim
-# ./test.sh -f tsim/stream/triggerSession0.sim
+./test.sh -f tsim/stream/triggerSession0.sim
 ./test.sh -f tsim/stream/partitionby.sim
 ./test.sh -f tsim/stream/partitionby1.sim
-# ./test.sh -f tsim/stream/schedSnode.sim
+# unsupport ./test.sh -f tsim/stream/schedSnode.sim
 ./test.sh -f tsim/stream/windowClose.sim
 ./test.sh -f tsim/stream/ignoreExpiredData.sim
 ./test.sh -f tsim/stream/sliding.sim
@@ -294,12 +293,12 @@
 ./test.sh -f tsim/db/basic3.sim -m
 ./test.sh -f tsim/db/error1.sim -m
 ./test.sh -f tsim/insert/backquote.sim -m
-# nojira ./test.sh -f tsim/parser/fourArithmetic-basic.sim -m
+# unsupport ./test.sh -f tsim/parser/fourArithmetic-basic.sim -m
 ./test.sh -f tsim/query/interval-offset.sim -m
 ./test.sh -f tsim/tmq/basic3.sim -m
 ./test.sh -f tsim/stable/vnode3.sim -m
 ./test.sh -f tsim/qnode/basic1.sim -m
-# nojira ./test.sh -f tsim/mnode/basic1.sim -m
+# unsupport ./test.sh -f tsim/mnode/basic1.sim -m
 
 # --- sma
 ./test.sh -f tsim/sma/drop_sma.sim

tests/script/tsim/parser/create_db.sim

@@ -23,10 +23,10 @@ sql create database $db
 sql use $db
 sql show databases
 
-if $rows != 1 then 
+if $rows != 3 then 
   return -1
 endi
-if $data00 != $db then 
+if $data20 != $db then 
   return -1
 endi
 sql drop database $db
@@ -38,10 +38,10 @@ sql CREATE DATABASE $db
 sql use $db
 sql show databases
 
-if $rows != 1 then
+if $rows != 3 then
   return -1
 endi
-if $data00 != $db then 
+if $data20 != $db then 
   return -1
 endi
 sql drop database $db
@@ -87,7 +87,7 @@ print create_db.sim case4: db_already_exists
 sql create database db0
 sql create database db0
 sql show databases
-if $rows != 1 then
+if $rows != 3 then
   return -1
 endi
 sql drop database db0
@@ -107,29 +107,21 @@ $ctime = 36000 # 10 hours
 $wal = 1 # valid value is 1, 2
 $comp = 1 # max=32, automatically trimmed when exceeding
 
-sql create database $db replica $replica duration $duration keep $keep maxrows $rows_db cache $cache blocks 4 ctime $ctime wal $wal comp $comp
+sql create database $db replica $replica duration $duration keep $keep maxrows $rows_db wal $wal comp $comp
 sql show databases
-if $rows != 1 then
+if $rows != 3 then
   return -1
 endi
-if $data00 != $db then 
+if $data20 != $db then 
  return -1
 endi
-if $data04 != $replica then 
+if $data24 != $replica then 
  return -1
 endi
-if $data06 != $duration then 
+if $data26 != 14400m then 
  return -1
 endi
-if $data07 != 365,365,365 then 
- return -1
-endi
-print data08 = $data07
-if $data08 != $cache then
- print expect $cache, actual:$data08
- return -1
-endi
-if $data09 != 4 then
+if $data27 != 525600m,525600m,525600m then 
  return -1
 endi
 
@@ -160,56 +152,56 @@ sql_error create database $db keep 12,11
 sql_error create database $db keep 365001,365001,365001
 sql create database dbk0 keep 19
 sql show databases
-if $rows != 1 then
+if $rows != 3 then
   return -1
 endi
-if $data07 != 19,19,19 then 
+if $data27 != 27360m,27360m,27360m then 
  return -1
 endi
 sql drop database dbk0
 sql create database dbka keep 19,20
 sql show databases
-if $rows != 1 then
+if $rows != 3 then
   return -1
 endi
-if $data07 != 19,20,20 then 
+if $data27 != 27360m,28800m,28800m then 
  return -1
 endi
 sql drop database dbka
 
 sql create database dbk1 keep 11,11,11
 sql show databases
-if $rows != 1 then
+if $rows != 3 then
   return -1
 endi
-if $data07 != 11,11,11 then 
+if $data27 != 15840m,15840m,15840m then 
  return -1
 endi
 sql drop database dbk1
 sql create database dbk2 keep 11,12,13
 sql show databases
-if $rows != 1 then
+if $rows != 3 then
   return -1
 endi
-if $data07 != 11,12,13 then 
+if $data27 !=  15840m,17280m,18720m then 
  return -1
 endi
 sql drop database dbk2
 sql create database dbk3 keep 11,11,13
 sql show databases
-if $rows != 1 then
+if $rows != 3 then
   return -1
 endi
-if $data07 != 11,11,13 then 
+if $data27 != 15840m,15840m,18720m then 
  return -1
 endi
 sql drop database dbk3
 sql create database dbk4 keep 11,13,13
 sql show databases
-if $rows != 1 then
+if $rows != 3 then
   return -1
 endi
-if $data07 != 11,13,13 then 
+if $data27 != 15840m,18720m,18720m then 
  return -1
 endi
 sql drop database dbk4
@@ -233,38 +225,31 @@ sql_error create database $db ctime 29
 sql_error create database $db ctime 40961
 
 # wal {0, 2}
-sql create database testwal wal 0
+sql_error create database testwal wal 0
 sql show databases
-if $rows != 1 then
+if $rows != 2 then
   return -1
 endi
 
-sql show databases
-print wallevel $data12_testwal
-if $data12_testwal != 0 then 
-  return -1
-endi
-sql drop database testwal
-
 sql create database testwal wal 1
 sql show databases
-if $rows != 1 then
+if $rows != 3 then
   return -1
 endi
 sql show databases
-print wallevel $data12_testwal
-if $data12_testwal != 1 then 
+print wallevel $data13_testwal
+if $data13_testwal != 1 then 
   return -1
 endi
 sql drop database testwal
 
 sql create database testwal wal 2
 sql show databases
-if $rows != 1 then
+if $rows != 3 then
   return -1
 endi
-print wallevel $data12_testwal
-if $data12_testwal != 2 then 
+print wallevel $data13_testwal
+if $data13_testwal != 2 then 
   return -1
 endi
 sql drop database testwal
@@ -278,7 +263,7 @@ sql_error create database $db comp 3
 
 sql_error drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 

tests/script/tsim/parser/create_db__for_community_version.sim

-system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -i 1
-system sh/exec.sh -n dnode1 -s start
-sql connect
-
-print ======================== dnode1 start
-
-$dbPrefix = fi_in_db
-$tbPrefix = fi_in_tb
-$mtPrefix = fi_in_mt
-$tbNum = 10
-$rowNum = 20
-$totalNum = 200
-
-print excuting test script create_db.sim
-print =============== set up
-$i = 0
-$db = $dbPrefix . $i
-$mt = $mtPrefix . $i
-
-sql_error createdatabase $db
-sql create database $db
-sql use $db
-sql show databases
-
-if $rows != 1 then 
-  return -1
-endi
-if $data00 != $db then 
-  return -1
-endi
-sql drop database $db
-
-# case1: case_insensitivity test
-print =========== create_db.sim case1: case insensitivity test
-sql_error CREATEDATABASE $db
-sql CREATE DATABASE $db
-sql use $db
-sql show databases
-
-if $rows != 1 then
-  return -1
-endi
-if $data00 != $db then 
-  return -1
-endi
-sql drop database $db
-print case_insensitivity test passed
-
-# case2: illegal_db_name test
-print =========== create_db.sim case2: illegal_db_name test
-$illegal_db1 = 1db
-$illegal_db2 = d@b
-
-sql_error create database $illegal_db1
-sql_error create database $illegal_db2
-print illegal_db_name test passed
-
-# case3: chinese_char_in_db_name test
-print ========== create_db.sim case3: chinese_char_in_db_name test
-$CN_db1 = 数据库
-$CN_db2 = 数据库1
-$CN_db3 = db数据库1
-sql_error create database $CN_db1
-sql_error create database $CN_db2
-sql_error create database $CN_db3
-#sql show databases
-#if $rows != 3 then
-#  return -1
-#endi
-#if $data00 != $CN_db1 then
-#  return -1
-#endi
-#if $data10 != $CN_db2 then
-#  return -1
-#endi
-#if $data20 != $CN_db3 then
-#  return -1
-#endi
-#sql drop database $CN_db1
-#sql drop database $CN_db2
-#sql drop database $CN_db3
-print case_chinese_char_in_db_name test passed
-
-# case4: db_already_exists
-print create_db.sim case4: db_already_exists
-sql create database db0
-sql create database db0
-sql show databases
-if $rows != 1 then
-  return -1
-endi
-sql drop database db0
-print db_already_exists test passed
-
-# case5: db_meta_data
-print create_db.sim case5: db_meta_data test
-# cfg params
-$replica = 1 # max=3
-$duration = 10
-$keep = 365
-$rows_db = 1000
-$cache = 16 # 16MB
-$ablocks = 100 
-$tblocks = 32 # max=512, automatically trimmed when exceeding
-$ctime = 36000 # 10 hours
-$wal = 1 # valid value is 1, 2
-$comp = 1 # max=32, automatically trimmed when exceeding
-
-sql create database $db replica $replica duration $duration keep $keep maxrows $rows_db cache $cache blocks 4 ctime $ctime wal $wal comp $comp
-sql show databases
-if $rows != 1 then
-  return -1
-endi
-if $data00 != $db then 
- return -1
-endi
-if $data04 != $replica then 
- return -1
-endi
-if $data06 != $duration then 
- return -1
-endi
-if $data07 != 365 then 
- return -1
-endi
-print data08 = $data07
-if $data08 != $cache then
- print expect $cache, actual:$data08
- return -1
-endi
-if $data09 != 4 then
- return -1
-endi
-
-sql drop database $db
-
-## param range tests
-# replica [1,3]
-#sql_error create database $db replica 0
-sql_error create database $db replica 4
-
-# day [1, 3650]
-sql_error create database $db day 0
-sql_error create database $db day 3651 
-
-# keep [1, infinity]
-sql_error create database $db keep 0
-sql_error create database $db keep 0,0,0
-sql_error create database $db keep 3,3,3
-sql_error create database $db keep 3
-sql_error create database $db keep 11.0
-sql_error create database $db keep 11.0,11.0,11.0
-sql_error create database $db keep "11","11","11"
-sql_error create database $db keep "11"
-sql_error create database $db keep 13,12,11
-sql_error create database $db keep 11,12,11
-sql_error create database $db keep 12,11,12
-sql_error create database $db keep 11,12,13
-sql_error create database $db keep 11,12,13,14
-sql_error create database $db keep 11,11
-sql_error create database $db keep 365001,365001,365001
-sql_error create database $db keep 365001
-sql create database dbk1 keep 11
-sql show databases
-if $rows != 1 then
-  return -1
-endi
-if $data07 != 11 then 
- return -1
-endi
-sql drop database dbk1
-sql create database dbk2 keep 12
-sql show databases
-if $rows != 1 then
-  return -1
-endi
-if $data07 != 12 then 
- return -1
-endi
-sql drop database dbk2
-sql create database dbk3 keep 11
-sql show databases
-if $rows != 1 then
-  return -1
-endi
-if $data07 != 11 then 
- return -1
-endi
-sql drop database dbk3
-sql create database dbk4 keep 13
-sql show databases
-if $rows != 1 then
-  return -1
-endi
-if $data07 != 13 then 
- return -1
-endi
-sql drop database dbk4
-#sql_error create database $db keep 3651
-
-# rows [200, 10000]
-sql_error create database $db maxrows 199
-#sql_error create database $db maxrows 10001
-
-# cache [100, 10485760]
-sql_error create database $db cache 0
-#sql_error create database $db cache 10485761
-
-
-# blocks [32, 4096 overwriten by 4096 if exceeds, Note added:2018-10-24]
-#sql_error create database $db tblocks 31
-#sql_error create database $db tblocks 4097
-
-# ctime [30, 40960]
-sql_error create database $db ctime 29
-sql_error create database $db ctime 40961
-
-# wal {0, 2}
-#sql_error create database $db wal 0
-sql_error create database $db wal -1
-sql_error create database $db wal 3
-
-# comp {0, 1, 2}
-sql_error create database $db comp -1
-sql_error create database $db comp 3
-
-sql_error drop database $db
-sql show databases
-if $rows != 0 then 
-  return -1
-endi
-
-system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/parser/where.sim

@@ -51,8 +51,6 @@ while $i < $half
   $i = $i + 1
 endw
 
-sleep 100
-
 $i = 1
 $tb = $tbPrefix . $i
 
@@ -300,8 +298,6 @@ while $i < 1
 endw
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 500
-
 system sh/exec.sh -n dnode1 -s start
 
 sql_error select * from wh_mt0 where c3 = 'abc' and tbname in ('test_null_filter');
@@ -349,7 +345,6 @@ if $data01 != 2 then
   return -1
 endi
 sql insert into where_ts values(now, 5);
-sleep 10
 sql select * from (select * from where_ts) where ts<now;
 if $rows != 5 then
   return -1