From 6a70b5d19a2dbad18279284e672ea12648c10940 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Fri, 8 May 2020 15:55:28 +0800
Subject: [PATCH] add general/parser test case to 2.0

[TD-253]
---
 tests/script/basicSuite.sim                   |   1 +
 .../general/parser/auto_create_tb_drop_tb.sim |   2 +-
 tests/script/general/parser/create_db.sim     |  14 +-
 tests/script/general/parser/first_last.sim    |   2 +-
 tests/script/general/parser/mixed_blocks.sim  |   2 +-
 tests/script/general/parser/slimit.sim        |   4 +-
 tests/script/general/parser/slimit1.sim       |   2 +-
 .../general/parser/slimit_alter_tags.sim      |   2 +-
 tests/script/general/parser/testSuite.sim     | 180 ++++++++++--------
 tests/script/general/parser/timestamp.sim     |   2 +-
 10 files changed, 116 insertions(+), 95 deletions(-)

diff --git a/tests/script/basicSuite.sim b/tests/script/basicSuite.sim
index df15c7ebbb..973a88f553 100644
--- a/tests/script/basicSuite.sim
+++ b/tests/script/basicSuite.sim
@@ -42,4 +42,5 @@ run general/compute/diff.sim
 run general/compute/null.sim 
 # run general/compute/diff2.sim
 
+run general/parse/testSuite.sim
 ################################## 
diff --git a/tests/script/general/parser/auto_create_tb_drop_tb.sim b/tests/script/general/parser/auto_create_tb_drop_tb.sim
index 23cad7137e..aa14d2fdfb 100644
--- a/tests/script/general/parser/auto_create_tb_drop_tb.sim
+++ b/tests/script/general/parser/auto_create_tb_drop_tb.sim
@@ -22,7 +22,7 @@ $stb = $stbPrefix . $i
 
 sql drop database $db -x step1
 step1:
-sql create database $db rows 200 cache 2048 maxTables 4
+sql create database $db maxrows 200 cache 2048 maxTables 4
 print ====== create tables
 sql use $db
 
diff --git a/tests/script/general/parser/create_db.sim b/tests/script/general/parser/create_db.sim
index 6e11f9d25b..8048770198 100644
--- a/tests/script/general/parser/create_db.sim
+++ b/tests/script/general/parser/create_db.sim
@@ -108,10 +108,10 @@ $cache = 4096 # 4 kb
 $ablocks = 100 
 $tblocks = 32 # max=512, automatically trimmed when exceeding
 $ctime = 36000 # 10 hours
-$clog = 0 # max=32, automatically trimmed when exceeding
+$wal = 0 # valid value is 0, 1, 2
 $comp = 1 # max=32, automatically trimmed when exceeding
 
-sql create database $db replica $replica days $days keep $keep rows $rows_db cache $cache ablocks $ablocks tblocks $tblocks ctime $ctime clog $clog comp $comp
+sql create database $db replica $replica days $days keep $keep maxrows $rows_db cache $cache ablocks $ablocks tblocks $tblocks ctime $ctime wal $wal comp $comp
 sql show databases
 if $rows != 1 then
   return -1
@@ -156,8 +156,8 @@ sql_error create database $db keep 0
 #sql_error create database $db keep 3651
 
 # rows [200, 10000]
-sql_error create database $db rows 199
-#sql_error create database $db rows 10001
+sql_error create database $db maxrows 199
+#sql_error create database $db maxrows 10001
 
 # cache [100, 10485760]
 sql_error create database $db cache 99
@@ -175,9 +175,9 @@ sql_error create database $db ablocks -1
 sql_error create database $db ctime 29
 sql_error create database $db ctime 40961
 
-# clog {0, 1}
-sql_error create database $db clog -1
-#sql_error create database $db clog 2
+# wal {0, 1}
+sql_error create database $db wal -1
+#sql_error create database $db wal 2
 
 # comp {0, 1, 2}
 sql_error create database $db comp -1
diff --git a/tests/script/general/parser/first_last.sim b/tests/script/general/parser/first_last.sim
index 8bede7573a..b67764dc9b 100644
--- a/tests/script/general/parser/first_last.sim
+++ b/tests/script/general/parser/first_last.sim
@@ -21,7 +21,7 @@ $stb = $stbPrefix . $i
 
 sql drop database $db -x step1
 step1:
-sql create database $db rows 400 cache 4096 maxTables 4
+sql create database $db maxrows 400 cache 4096 maxTables 4
 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 37ba1a8900..77838774df 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 rows $paramRows maxTables 4
+sql create database $db maxrows $paramRows maxTables 4
 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 234e31d261..017e8d4d2e 100644
--- a/tests/script/general/parser/slimit.sim
+++ b/tests/script/general/parser/slimit.sim
@@ -22,7 +22,7 @@ $db = $dbPrefix . $i
 $stb = $stbPrefix . $i
 
 sql drop database if exists $db
-sql create database $db rows 200 cache 1024 tblocks 200 maxTables 4
+sql create database $db maxrows 200 cache 1024 tblocks 200 maxTables 4
 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)
@@ -64,7 +64,7 @@ print ====== $db tables created
 
 $db = $dbPrefix . 1
 sql drop database if exists $db
-sql create database $db rows 200 cache 1024
+sql create database $db maxrows 200 cache 1024
 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/slimit1.sim b/tests/script/general/parser/slimit1.sim
index 7020cc8bb7..3dbe9f0a06 100644
--- a/tests/script/general/parser/slimit1.sim
+++ b/tests/script/general/parser/slimit1.sim
@@ -18,7 +18,7 @@ $delta = 600000
 $db = $dbPrefix
 
 sql drop database if exists $db
-sql create database $db rows 200
+sql create database $db maxrows 200
 sql use $db
 
 sql create table stb (ts timestamp, c1 int, c2 bigint, c3 double) tags(t1 int, t2 int)
diff --git a/tests/script/general/parser/slimit_alter_tags.sim b/tests/script/general/parser/slimit_alter_tags.sim
index 630855260c..5c62482802 100644
--- a/tests/script/general/parser/slimit_alter_tags.sim
+++ b/tests/script/general/parser/slimit_alter_tags.sim
@@ -18,7 +18,7 @@ $delta = 600000
 $db = $dbPrefix
 
 sql drop database if exists $db
-sql create database $db rows 200
+sql create database $db maxrows 200
 sql use $db
 
 sql create table stb (ts timestamp, c1 int, c2 bigint, c3 double) tags(t1 int, t2 int)
diff --git a/tests/script/general/parser/testSuite.sim b/tests/script/general/parser/testSuite.sim
index d1228f5820..aaf8979337 100644
--- a/tests/script/general/parser/testSuite.sim
+++ b/tests/script/general/parser/testSuite.sim
@@ -1,93 +1,113 @@
-#run general/parser/alter.sim
-#sleep 2000
-#run general/parser/alter1.sim
-#sleep 2000
-#run general/parser/alter_stable.sim
-#sleep 2000
-#run general/parser/auto_create_tb.sim
-#sleep 2000
-#run general/parser/auto_create_tb_drop_tb.sim
+# run general/parser/alter.sim
+# sleep 2000
+# run general/parser/alter1.sim
+# sleep 2000
+# run general/parser/alter_stable.sim
+# sleep 2000
+# run general/parser/auto_create_tb.sim
+# sleep 2000
+# run general/parser/auto_create_tb_drop_tb.sim
+# sleep 2000
 
+run general/parser/binary_escapeCharacter.sim
 sleep 2000
-run general/parser/col_arithmetic_operation.sim
-sleep 2000
-run general/parser/columnValue.sim
-sleep 2000
-run general/parser/commit.sim
-run general/parser/create_db.sim
-sleep 2000
-run general/parser/create_mt.sim
-sleep 2000
-run general/parser/create_tb.sim
-sleep 2000
-run general/parser/dbtbnameValidate.sim
-sleep 2000
-run general/parser/fill.sim
-sleep 2000
-run general/parser/fill_stb.sim
-sleep 2000
-run general/parser/first_last.sim
-sleep 2000
-run general/parser/import_commit1.sim
-sleep 2000
-run general/parser/import_commit2.sim
-sleep 2000
-run general/parser/import_commit3.sim
-sleep 2000
-run general/parser/import_file.sim
-sleep 2000
-run general/parser/insert_tb.sim
-sleep 2000
-run general/parser/tags_dynamically_specifiy.sim
-sleep 2000
-run general/parser/interp.sim
-run general/parser/lastrow.sim
+run general/parser/bug.sim
 sleep 2000
-run general/parser/limit.sim
-sleep 2000
-run general/parser/limit1.sim
-sleep 2000
-run general/parser/limit1_tblocks100.sim
-sleep 2000
-run general/parser/limit2.sim
+run general/parser/col_arithmetic_operation.sim
 sleep 2000
-run general/parser/mixed_blocks.sim
+run general/parser/columnValue_bigint.sim
 sleep 2000
-run general/parser/nchar.sim
+run general/parser/columnValue_bool.sim
 sleep 2000
-run general/parser/null_char.sim
+run general/parser/columnValue_double.sim
 sleep 2000
-run general/parser/selectResNum.sim
+run general/parser/columnValue_float.sim
 sleep 2000
-run general/parser/select_across_vnodes.sim
+run general/parser/columnValue_int.sim
 sleep 2000
+
+# sleep 2000
+# run general/parser/col_arithmetic_operation.sim
+# sleep 2000
+# run general/parser/columnValue.sim
+# sleep 2000
+# run general/parser/commit.sim
+# run general/parser/create_db.sim
+# sleep 2000
+# run general/parser/create_mt.sim
+# sleep 2000
+# run general/parser/create_tb.sim
+# sleep 2000
+# run general/parser/dbtbnameValidate.sim
+# sleep 2000
+# run general/parser/fill.sim
+# sleep 2000
+# run general/parser/fill_stb.sim
+# sleep 2000
+# run general/parser/first_last.sim
+# sleep 2000
+# run general/parser/import_commit1.sim
+# sleep 2000
+# run general/parser/import_commit2.sim
+# sleep 2000
+# run general/parser/import_commit3.sim
+# sleep 2000
+# run general/parser/import_file.sim
+# sleep 2000
+# run general/parser/insert_tb.sim
+# sleep 2000
+# run general/parser/tags_dynamically_specifiy.sim
+# sleep 2000
+# run general/parser/interp.sim
+# run general/parser/lastrow.sim
+# sleep 2000
+# run general/parser/limit.sim
+# sleep 2000
+# run general/parser/limit1.sim
+# sleep 2000
+# run general/parser/limit1_tblocks100.sim
+# sleep 2000
+# run general/parser/limit2.sim
+# sleep 2000
+# run general/parser/mixed_blocks.sim
+# sleep 2000
+# run general/parser/nchar.sim
+# sleep 2000
+# run general/parser/null_char.sim
+# sleep 2000
+# run general/parser/selectResNum.sim
+# sleep 2000
+# run general/parser/select_across_vnodes.sim
+# sleep 2000
 run general/parser/select_from_cache_disk.sim
 sleep 2000
-run general/parser/set_tag_vals.sim
-sleep 2000
-run general/parser/single_row_in_tb.sim
-sleep 2000
-run general/parser/slimit.sim
-sleep 2000
+# run general/parser/set_tag_vals.sim
+# sleep 2000
+# run general/parser/single_row_in_tb.sim
+# sleep 2000
+# run general/parser/slimit.sim
+# sleep 2000
 run general/parser/slimit1.sim
 sleep 2000
-run general/parser/slimit_alter_tags.sim
-sleep 2000
-run general/parser/stream_on_sys.sim
-sleep 2000
-run general/parser/stream.sim
-sleep 2000
-run general/parser/tbnameIn.sim
-sleep 2000
-run general/parser/where.sim
-sleep 2000
-#run general/parser/repeatAlter.sim
-sleep 2000
-#run general/parser/repeatStream.sim
-sleep 2000
-run general/parser/join.sim
-run general/parser/join_multivnode.sim
-run general/parser/projection_limit_offset.sim
-sleep 2000
-run general/parser/select_with_tags.sim
-run general/parser/groupby.sim
+run general/parser/slimit1_query.sim
+sleep 2000
+# run general/parser/slimit_alter_tags.sim
+# sleep 2000
+# run general/parser/stream_on_sys.sim
+# sleep 2000
+# run general/parser/stream.sim
+# sleep 2000
+# run general/parser/tbnameIn.sim
+# sleep 2000
+# run general/parser/where.sim
+# sleep 2000
+# #run general/parser/repeatAlter.sim
+# sleep 2000
+# #run general/parser/repeatStream.sim
+# sleep 2000
+# run general/parser/join.sim
+# run general/parser/join_multivnode.sim
+# run general/parser/projection_limit_offset.sim
+# sleep 2000
+# run general/parser/select_with_tags.sim
+# run general/parser/groupby.sim
diff --git a/tests/script/general/parser/timestamp.sim b/tests/script/general/parser/timestamp.sim
index 9a1c793909..fbe0f24a47 100644
--- a/tests/script/general/parser/timestamp.sim
+++ b/tests/script/general/parser/timestamp.sim
@@ -21,7 +21,7 @@ $db = $dbPrefix . $i
 $stb = $stbPrefix . $i
 
 sql drop database if exists $db
-sql create database $db rows 200 cache 1024 tblocks 200 maxTables 4
+sql create database $db maxrows 200 cache 1024 tblocks 200 maxTables 4
 print ====== create tables
 sql use $db
 sql create table $stb (ts timestamp, c1 timestamp, c2 int) tags(t1 binary(20))
-- 
GitLab