From bfb2900c19c7cafeb395a6b877843a460578ecd5 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Thu, 14 Jul 2022 15:24:48 +0800
Subject: [PATCH] test: restore some 2.0 case

---
 tests/script/tsim/table/autocreate.sim   |  1 -
 tests/script/tsim/table/basic2.sim       |  1 -
 tests/script/tsim/table/basic3.sim       |  3 +--
 tests/script/tsim/table/bigint.sim       |  5 +----
 tests/script/tsim/table/binary.sim       |  5 +----
 tests/script/tsim/table/bool.sim         |  5 +----
 tests/script/tsim/table/column2.sim      |  5 +----
 tests/script/tsim/table/column_name.sim  |  5 +----
 tests/script/tsim/table/column_num.sim   |  5 +----
 tests/script/tsim/table/column_value.sim |  5 +----
 tests/script/tsim/table/createmulti.sim  |  1 -
 tests/script/tsim/table/date.sim         |  5 +----
 tests/script/tsim/table/db.table.sim     |  5 +----
 tests/script/tsim/table/describe.sim     |  5 +----
 tests/script/tsim/table/double.sim       |  5 +----
 tests/script/tsim/table/float.sim        |  5 +----
 tests/script/tsim/table/int.sim          |  5 +----
 tests/script/tsim/table/limit.sim        |  7 +-----
 tests/script/tsim/table/smallint.sim     |  5 +----
 tests/script/tsim/table/table.sim        |  5 +----
 tests/script/tsim/table/table_len.sim    |  5 +----
 tests/script/tsim/table/testSuite.sim    | 27 ------------------------
 tests/script/tsim/table/tinyint.sim      |  5 +----
 tests/script/tsim/table/vgroup.sim       |  8 ++-----
 24 files changed, 21 insertions(+), 112 deletions(-)
 delete mode 100644 tests/script/tsim/table/testSuite.sim

diff --git a/tests/script/tsim/table/autocreate.sim b/tests/script/tsim/table/autocreate.sim
index 404c714ab4..70d58483a2 100644
--- a/tests/script/tsim/table/autocreate.sim
+++ b/tests/script/tsim/table/autocreate.sim
@@ -1,7 +1,6 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
-sleep 2000
 sql connect
 
 print =============== create database
diff --git a/tests/script/tsim/table/basic2.sim b/tests/script/tsim/table/basic2.sim
index 4286f9ee4a..737d5a3efe 100644
--- a/tests/script/tsim/table/basic2.sim
+++ b/tests/script/tsim/table/basic2.sim
@@ -1,7 +1,6 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
-sleep 2000
 sql connect
 
 print =============== one table
diff --git a/tests/script/tsim/table/basic3.sim b/tests/script/tsim/table/basic3.sim
index 41c276ae98..21470affa8 100644
--- a/tests/script/tsim/table/basic3.sim
+++ b/tests/script/tsim/table/basic3.sim
@@ -1,7 +1,6 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
-sleep 2000
 sql connect
 
 print =============== create database
@@ -73,7 +72,7 @@ endi
 print =============== drop stable
 sql drop table db.st
 sql show db.stables
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/tsim/table/bigint.sim b/tests/script/tsim/table/bigint.sim
index d75f406d77..4611db112f 100644
--- a/tests/script/tsim/table/bigint.sim
+++ b/tests/script/tsim/table/bigint.sim
@@ -1,9 +1,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/exec.sh -n dnode1 -s start
-
-sleep 2000
 sql connect
 
 $i = 0
@@ -66,7 +63,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/tsim/table/binary.sim b/tests/script/tsim/table/binary.sim
index 47915530ef..a2cfc77796 100644
--- a/tests/script/tsim/table/binary.sim
+++ b/tests/script/tsim/table/binary.sim
@@ -1,9 +1,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/exec.sh -n dnode1 -s start
-
-sleep 2000
 sql connect
 
 $i = 0
@@ -56,7 +53,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/tsim/table/bool.sim b/tests/script/tsim/table/bool.sim
index e49637448f..454bf47d33 100644
--- a/tests/script/tsim/table/bool.sim
+++ b/tests/script/tsim/table/bool.sim
@@ -1,9 +1,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/exec.sh -n dnode1 -s start
-
-sleep 2000
 sql connect
 
 $i = 0
@@ -85,7 +82,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/tsim/table/column2.sim b/tests/script/tsim/table/column2.sim
index 441766f2d4..e540835c14 100644
--- a/tests/script/tsim/table/column2.sim
+++ b/tests/script/tsim/table/column2.sim
@@ -1,9 +1,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/exec.sh -n dnode1 -s start
-
-sleep 2000
 sql connect
 
 print =============== step1
@@ -19,7 +16,7 @@ endi
 
 sql drop database db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/tsim/table/column_name.sim b/tests/script/tsim/table/column_name.sim
index 47fcfab5a8..bad6c95bb1 100644
--- a/tests/script/tsim/table/column_name.sim
+++ b/tests/script/tsim/table/column_name.sim
@@ -1,9 +1,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/exec.sh -n dnode1 -s start
-
-sleep 2000
 sql connect
 
 $i = 0
@@ -79,7 +76,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/tsim/table/column_num.sim b/tests/script/tsim/table/column_num.sim
index a18173bc8f..0a5d151adf 100644
--- a/tests/script/tsim/table/column_num.sim
+++ b/tests/script/tsim/table/column_num.sim
@@ -1,9 +1,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/exec.sh -n dnode1 -s start
-
-sleep 2000
 sql connect
 
 $i = 0
@@ -78,7 +75,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/tsim/table/column_value.sim b/tests/script/tsim/table/column_value.sim
index 1edf8c2992..861e2f1a8d 100644
--- a/tests/script/tsim/table/column_value.sim
+++ b/tests/script/tsim/table/column_value.sim
@@ -1,9 +1,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/exec.sh -n dnode1 -s start
-
-sleep 2000
 sql connect
 
 $i = 0
@@ -68,7 +65,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/tsim/table/createmulti.sim b/tests/script/tsim/table/createmulti.sim
index 0da1ce96a7..efdb276c94 100644
--- a/tests/script/tsim/table/createmulti.sim
+++ b/tests/script/tsim/table/createmulti.sim
@@ -1,7 +1,6 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
 sql connect
 
 print =============== create database
diff --git a/tests/script/tsim/table/date.sim b/tests/script/tsim/table/date.sim
index 23188e12e0..218049d329 100644
--- a/tests/script/tsim/table/date.sim
+++ b/tests/script/tsim/table/date.sim
@@ -1,9 +1,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/exec.sh -n dnode1 -s start
-
-sleep 2000
 sql connect
 
 $i = 0
@@ -83,7 +80,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/tsim/table/db.table.sim b/tests/script/tsim/table/db.table.sim
index 906396402a..b5d8294b6e 100644
--- a/tests/script/tsim/table/db.table.sim
+++ b/tests/script/tsim/table/db.table.sim
@@ -1,9 +1,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/exec.sh -n dnode1 -s start
-
-sleep 2000
 sql connect
 
 $i = 0
@@ -40,7 +37,7 @@ sql drop table $table
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/tsim/table/describe.sim b/tests/script/tsim/table/describe.sim
index e59371e530..28690e5794 100644
--- a/tests/script/tsim/table/describe.sim
+++ b/tests/script/tsim/table/describe.sim
@@ -1,9 +1,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/exec.sh -n dnode1 -s start
-
-sleep 2000
 sql connect
 
 $i = 0
@@ -42,7 +39,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
  
diff --git a/tests/script/tsim/table/double.sim b/tests/script/tsim/table/double.sim
index ab3f2428bd..08f0dc7663 100644
--- a/tests/script/tsim/table/double.sim
+++ b/tests/script/tsim/table/double.sim
@@ -1,9 +1,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/exec.sh -n dnode1 -s start
-
-sleep 2000
 sql connect
 
 $i = 0
@@ -91,7 +88,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/tsim/table/float.sim b/tests/script/tsim/table/float.sim
index 2d0ea0e5ea..c53b4bb1a4 100644
--- a/tests/script/tsim/table/float.sim
+++ b/tests/script/tsim/table/float.sim
@@ -1,9 +1,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/exec.sh -n dnode1 -s start
-
-sleep 2000
 sql connect
 
 $i = 0
@@ -91,7 +88,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/tsim/table/int.sim b/tests/script/tsim/table/int.sim
index f30b5b28f5..f84858c7d0 100644
--- a/tests/script/tsim/table/int.sim
+++ b/tests/script/tsim/table/int.sim
@@ -1,9 +1,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/exec.sh -n dnode1 -s start
-
-sleep 2000
 sql connect
 
 $i = 0
@@ -127,7 +124,7 @@ endi
  
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
  
diff --git a/tests/script/tsim/table/limit.sim b/tests/script/tsim/table/limit.sim
index dd38453d0c..0a07ee3efa 100644
--- a/tests/script/tsim/table/limit.sim
+++ b/tests/script/tsim/table/limit.sim
@@ -1,11 +1,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 maxtablesPerVnode -v 129
-system sh/cfg.sh -n dnode1 -c maxVgroupsPerDb -v 8
 system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
 sql connect
 
 print ============================ dnode1 start
@@ -87,7 +82,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/tsim/table/smallint.sim b/tests/script/tsim/table/smallint.sim
index f622ce7853..c81681c316 100644
--- a/tests/script/tsim/table/smallint.sim
+++ b/tests/script/tsim/table/smallint.sim
@@ -1,9 +1,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/exec.sh -n dnode1 -s start
-
-sleep 2000
 sql connect
 
 $i = 0
@@ -98,7 +95,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
  
diff --git a/tests/script/tsim/table/table.sim b/tests/script/tsim/table/table.sim
index c9806c40c6..6a706c979f 100644
--- a/tests/script/tsim/table/table.sim
+++ b/tests/script/tsim/table/table.sim
@@ -1,9 +1,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/exec.sh -n dnode1 -s start
-
-sleep 2000
 sql connect
 
 print ============================ dnode1 start
@@ -217,7 +214,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/tsim/table/table_len.sim b/tests/script/tsim/table/table_len.sim
index d95c9ab0aa..e48c5d419e 100644
--- a/tests/script/tsim/table/table_len.sim
+++ b/tests/script/tsim/table/table_len.sim
@@ -1,9 +1,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/exec.sh -n dnode1 -s start
-
-sleep 2000
 sql connect
 
 $i = 0
@@ -98,7 +95,7 @@ step8:
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/tsim/table/testSuite.sim b/tests/script/tsim/table/testSuite.sim
deleted file mode 100644
index d6cc88b36a..0000000000
--- a/tests/script/tsim/table/testSuite.sim
+++ /dev/null
@@ -1,27 +0,0 @@
-run general/table/autocreate.sim
-run general/table/basic1.sim
-run general/table/basic2.sim
-run general/table/basic3.sim
-run general/table/bigint.sim
-run general/table/binary.sim
-run general/table/bool.sim
-run general/table/column_name.sim
-run general/table/column_num.sim
-run general/table/column_value.sim
-run general/table/column2.sim
-run general/table/date.sim
-run general/table/db.table.sim
-run general/table/delete_reuse1.sim
-run general/table/delete_reuse2.sim
-run general/table/delete_writing.sim
-run general/table/describe.sim
-run general/table/double.sim
-run general/table/fill.sim
-run general/table/float.sim
-run general/table/int.sim
-run general/table/limit.sim
-run general/table/smallint.sim
-run general/table/table_len.sim
-run general/table/table.sim
-run general/table/tinyint.sim
-run general/table/vgroup.sim
diff --git a/tests/script/tsim/table/tinyint.sim b/tests/script/tsim/table/tinyint.sim
index afa931fc79..089fab0bfa 100644
--- a/tests/script/tsim/table/tinyint.sim
+++ b/tests/script/tsim/table/tinyint.sim
@@ -1,9 +1,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/exec.sh -n dnode1 -s start
-
-sleep 2000
 sql connect
 
 $i = 0
@@ -97,7 +94,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 
diff --git a/tests/script/tsim/table/vgroup.sim b/tests/script/tsim/table/vgroup.sim
index d306a4731d..902415400e 100644
--- a/tests/script/tsim/table/vgroup.sim
+++ b/tests/script/tsim/table/vgroup.sim
@@ -1,12 +1,8 @@
 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 maxVgroupsPerDb -v 4
-system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start
-
-sleep 2000
 sql connect
+
 print ============================ dnode1 start
 
 $i = 0
@@ -144,7 +140,7 @@ while $i < 5
   $i = $i + 1
 endw
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi