From 2ee22867469de7a2ec4939d4694471af92229bf8 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 4 Feb 2021 11:34:05 +0800
Subject: [PATCH] [TD-225]update the sim

---
 src/client/src/tscServer.c                         |  1 +
 tests/script/general/parser/alter.sim              |  4 ++--
 tests/script/general/parser/auto_create_tb.sim     |  2 +-
 .../general/parser/col_arithmetic_operation.sim    |  2 +-
 tests/script/general/parser/commit.sim             |  2 +-
 tests/script/general/parser/first_last.sim         |  2 +-
 tests/script/general/parser/import.sim             | 12 ++++++------
 tests/script/general/parser/import_commit1.sim     |  2 +-
 tests/script/general/parser/import_commit2.sim     |  2 +-
 tests/script/general/parser/import_commit3.sim     |  4 ++--
 tests/script/general/parser/import_file.sim        |  4 ++--
 tests/script/general/parser/insert_multiTbl.sim    |  2 +-
 tests/script/general/parser/interp.sim             |  2 +-
 tests/script/general/parser/lastrow.sim            |  2 +-
 tests/script/general/parser/limit.sim              |  2 +-
 tests/script/general/parser/limit1.sim             |  2 +-
 tests/script/general/parser/limit1_tblocks100.sim  |  2 +-
 tests/script/general/parser/limit2.sim             |  2 +-
 tests/script/general/parser/mixed_blocks.sim       |  4 ++--
 .../general/parser/projection_limit_offset.sim     |  2 +-
 tests/script/general/parser/selectResNum.sim       |  2 +-
 .../general/parser/select_from_cache_disk.sim      |  2 +-
 tests/script/general/parser/set_tag_vals.sim       |  2 +-
 tests/script/general/parser/single_row_in_tb.sim   |  2 +-
 tests/script/general/parser/slimit.sim             |  2 +-
 tests/script/general/parser/slimit1.sim            |  2 +-
 tests/script/general/parser/slimit_alter_tags.sim  |  4 ++--
 tests/script/general/parser/tbnameIn.sim           |  2 +-
 tests/script/general/parser/testSuite.sim          | 14 +++++++-------
 tests/script/general/parser/topbot.sim             |  2 +-
 tests/script/general/parser/where.sim              |  2 +-
 31 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index b10b040c7b..e49eb6c034 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -770,6 +770,7 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
       char n[TSDB_TABLE_FNAME_LEN] = {0};
       tNameExtractFullName(&pTableMetaInfo->name, n);
 
+
       tscError("%p tid:%d uid:%" PRIu64" id:%s, column index out of range, numOfColumns:%d, index:%d, column name:%s",
           pSql, pTableMeta->id.tid, pTableMeta->id.uid, n, tscGetNumOfColumns(pTableMeta), pCol->colIndex.columnIndex,
                pColSchema->name);
diff --git a/tests/script/general/parser/alter.sim b/tests/script/general/parser/alter.sim
index 56a677cc73..e604d2122e 100644
--- a/tests/script/general/parser/alter.sim
+++ b/tests/script/general/parser/alter.sim
@@ -133,7 +133,7 @@ sleep 100
 #  return -1
 #endi
 #sql alter table tb1 drop column c3
-#sleep 2000
+#sleep 500
 #sql insert into tb1 values (now, 2, 'taos')
 #sleep 30000
 #sql select * from strm
@@ -144,7 +144,7 @@ sleep 100
 #  return -1
 #endi
 #sql alter table tb1 add column c3 int
-#sleep 2000
+#sleep 500
 #sql insert into tb1 values (now, 3, 'taos', 3);
 #sleep 100
 #sql select * from strm
diff --git a/tests/script/general/parser/auto_create_tb.sim b/tests/script/general/parser/auto_create_tb.sim
index e19eb0c667..926eb75476 100644
--- a/tests/script/general/parser/auto_create_tb.sim
+++ b/tests/script/general/parser/auto_create_tb.sim
@@ -208,7 +208,7 @@ endi
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 2000
+sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
diff --git a/tests/script/general/parser/col_arithmetic_operation.sim b/tests/script/general/parser/col_arithmetic_operation.sim
index 9fd690a444..ee9927fb5f 100644
--- a/tests/script/general/parser/col_arithmetic_operation.sim
+++ b/tests/script/general/parser/col_arithmetic_operation.sim
@@ -105,7 +105,7 @@ run general/parser/col_arithmetic_query.sim
 #======================================= all in files query =======================================
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 2000
+sleep 500
 system sh/exec.sh -n dnode1 -s start
 
 print ================== server restart completed
diff --git a/tests/script/general/parser/commit.sim b/tests/script/general/parser/commit.sim
index 533fbf48f0..4085ef620d 100644
--- a/tests/script/general/parser/commit.sim
+++ b/tests/script/general/parser/commit.sim
@@ -82,7 +82,7 @@ endw
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 2000
+sleep 500
 system sh/exec.sh -n dnode1 -s start
 sleep 100
 print ================== server restart completed
diff --git a/tests/script/general/parser/first_last.sim b/tests/script/general/parser/first_last.sim
index 9c1f0774ba..aeff740a5f 100644
--- a/tests/script/general/parser/first_last.sim
+++ b/tests/script/general/parser/first_last.sim
@@ -77,7 +77,7 @@ 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
-sleep 2000
+sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
diff --git a/tests/script/general/parser/import.sim b/tests/script/general/parser/import.sim
index 83751dc616..d626f4fa74 100644
--- a/tests/script/general/parser/import.sim
+++ b/tests/script/general/parser/import.sim
@@ -25,15 +25,15 @@ sql use $db
 sql create table tb (ts timestamp, c1 int, c2 timestamp)
 sql insert into tb values ('2019-05-05 11:30:00.000', 1, now)
 sql insert into tb values ('2019-05-05 12:00:00.000', 1, now)
-sleep 2000
+sleep 500
 sql import into tb values ('2019-05-05 11:00:00.000', -1, now)
-sleep 2000
+sleep 500
 sql import into tb values ('2019-05-05 11:59:00.000', -1, now)
-sleep 2000
+sleep 500
 sql import into tb values ('2019-05-04 08:00:00.000', -1, now)
-sleep 2000
+sleep 500
 sql import into tb values ('2019-05-04 07:59:00.000', -1, now)
-sleep 2000
+sleep 500
 
 sql select * from tb
 if $rows != 6 then
@@ -60,7 +60,7 @@ endi
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 2000
+sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
diff --git a/tests/script/general/parser/import_commit1.sim b/tests/script/general/parser/import_commit1.sim
index 27be5560c5..f330fe4cd9 100644
--- a/tests/script/general/parser/import_commit1.sim
+++ b/tests/script/general/parser/import_commit1.sim
@@ -40,7 +40,7 @@ while $x < $rowNum
 endw 
 print ====== tables created
 
-sleep 2000
+sleep 500
 
 $ts = $ts0 + $delta
 $ts = $ts + 1
diff --git a/tests/script/general/parser/import_commit2.sim b/tests/script/general/parser/import_commit2.sim
index 72ee2b3844..47b30acb49 100644
--- a/tests/script/general/parser/import_commit2.sim
+++ b/tests/script/general/parser/import_commit2.sim
@@ -39,7 +39,7 @@ while $x < $rowNum
 endw 
 print ====== tables created
 
-sleep 2000
+sleep 500
 
 $ts = $ts0 + $delta
 $ts = $ts + 1
diff --git a/tests/script/general/parser/import_commit3.sim b/tests/script/general/parser/import_commit3.sim
index a9f021b20c..1e041375de 100644
--- a/tests/script/general/parser/import_commit3.sim
+++ b/tests/script/general/parser/import_commit3.sim
@@ -39,7 +39,7 @@ while $x < $rowNum
 endw 
 print ====== tables created
 
-sleep 2000
+sleep 500
 
 $ts = $ts + 1
 sql insert into $tb values ( $ts , -1, -1, -1, -1, -1)
@@ -47,7 +47,7 @@ $ts = $ts0 + $delta
 $ts = $ts + 1
 sql import into $tb values ( $ts , -2, -2, -2, -2, -2)
 
-sleep 2000
+sleep 500
 
 sql show databases
 
diff --git a/tests/script/general/parser/import_file.sim b/tests/script/general/parser/import_file.sim
index 6b4dd07c79..e50fc92e28 100644
--- a/tests/script/general/parser/import_file.sim
+++ b/tests/script/general/parser/import_file.sim
@@ -3,9 +3,9 @@ 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/exec.sh -n dnode1 -s start
-sleep 2000
+sleep 500
 sql connect
-sleep 2000
+sleep 500
 
 sql drop database if exists indb
 
diff --git a/tests/script/general/parser/insert_multiTbl.sim b/tests/script/general/parser/insert_multiTbl.sim
index 39223d84e3..e9ee4fcf98 100644
--- a/tests/script/general/parser/insert_multiTbl.sim
+++ b/tests/script/general/parser/insert_multiTbl.sim
@@ -4,7 +4,7 @@ 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/exec.sh -n dnode1 -s start
-sleep 2000
+sleep 500
 sql connect
 sleep 100
 print ======================== dnode1 start
diff --git a/tests/script/general/parser/interp.sim b/tests/script/general/parser/interp.sim
index 36a643c424..13b6a08024 100644
--- a/tests/script/general/parser/interp.sim
+++ b/tests/script/general/parser/interp.sim
@@ -59,7 +59,7 @@ run general/parser/interp_test.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 2000
+sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/lastrow.sim b/tests/script/general/parser/lastrow.sim
index 682a6cd5df..d1eadfb67a 100644
--- a/tests/script/general/parser/lastrow.sim
+++ b/tests/script/general/parser/lastrow.sim
@@ -62,7 +62,7 @@ run general/parser/lastrow_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 2000
+sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
diff --git a/tests/script/general/parser/limit.sim b/tests/script/general/parser/limit.sim
index 22d52c4257..17636dfb74 100644
--- a/tests/script/general/parser/limit.sim
+++ b/tests/script/general/parser/limit.sim
@@ -66,7 +66,7 @@ run general/parser/limit_stb.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 2000
+sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
diff --git a/tests/script/general/parser/limit1.sim b/tests/script/general/parser/limit1.sim
index 0597723490..2c40f0af2b 100644
--- a/tests/script/general/parser/limit1.sim
+++ b/tests/script/general/parser/limit1.sim
@@ -61,7 +61,7 @@ run general/parser/limit1_stb.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 2000
+sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/limit1_tblocks100.sim b/tests/script/general/parser/limit1_tblocks100.sim
index 43519d2df4..45ead58ba0 100644
--- a/tests/script/general/parser/limit1_tblocks100.sim
+++ b/tests/script/general/parser/limit1_tblocks100.sim
@@ -61,7 +61,7 @@ run general/parser/limit1_stb.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 2000
+sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/limit2.sim b/tests/script/general/parser/limit2.sim
index ddc5c10362..0e7e13b6de 100644
--- a/tests/script/general/parser/limit2.sim
+++ b/tests/script/general/parser/limit2.sim
@@ -69,7 +69,7 @@ print ====== tables created
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 2000
+sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/mixed_blocks.sim b/tests/script/general/parser/mixed_blocks.sim
index 79bf65d147..8208963858 100644
--- a/tests/script/general/parser/mixed_blocks.sim
+++ b/tests/script/general/parser/mixed_blocks.sim
@@ -59,7 +59,7 @@ sql show databases
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 2000
+sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
@@ -154,7 +154,7 @@ sql insert into t2 values('2020-1-1 1:5:1', 99);
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 2000
+sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql select ts from m1 where ts='2020-1-1 1:5:1'
diff --git a/tests/script/general/parser/projection_limit_offset.sim b/tests/script/general/parser/projection_limit_offset.sim
index fa3b4cd057..a92493b7f4 100644
--- a/tests/script/general/parser/projection_limit_offset.sim
+++ b/tests/script/general/parser/projection_limit_offset.sim
@@ -412,7 +412,7 @@ sql_error select k, sum(k)+1 from tm0;
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 2000
+sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/selectResNum.sim b/tests/script/general/parser/selectResNum.sim
index 8f18a41d41..20b5024478 100644
--- a/tests/script/general/parser/selectResNum.sim
+++ b/tests/script/general/parser/selectResNum.sim
@@ -118,7 +118,7 @@ endw
 
 print ====== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 2000
+sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ====== server restart completed
 sleep 100
diff --git a/tests/script/general/parser/select_from_cache_disk.sim b/tests/script/general/parser/select_from_cache_disk.sim
index 36a749cc3c..3d2cc0b700 100644
--- a/tests/script/general/parser/select_from_cache_disk.sim
+++ b/tests/script/general/parser/select_from_cache_disk.sim
@@ -35,7 +35,7 @@ sql insert into $tb values ('2018-09-17 09:00:00.030', 3)
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 2000
+sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
diff --git a/tests/script/general/parser/set_tag_vals.sim b/tests/script/general/parser/set_tag_vals.sim
index 0b8ffd946f..92380ace84 100644
--- a/tests/script/general/parser/set_tag_vals.sim
+++ b/tests/script/general/parser/set_tag_vals.sim
@@ -61,7 +61,7 @@ while $i < $tbNum
 endw 
 print ====== tables created
 
-sleep 2000
+sleep 500
 
 sql show tables
 if $rows != $tbNum then
diff --git a/tests/script/general/parser/single_row_in_tb.sim b/tests/script/general/parser/single_row_in_tb.sim
index 651f44a3a4..bc93629041 100644
--- a/tests/script/general/parser/single_row_in_tb.sim
+++ b/tests/script/general/parser/single_row_in_tb.sim
@@ -32,7 +32,7 @@ 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
-sleep 2000
+sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/slimit.sim b/tests/script/general/parser/slimit.sim
index 426104c168..bfb97b5261 100644
--- a/tests/script/general/parser/slimit.sim
+++ b/tests/script/general/parser/slimit.sim
@@ -97,7 +97,7 @@ run general/parser/slimit_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 2000
+sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
diff --git a/tests/script/general/parser/slimit1.sim b/tests/script/general/parser/slimit1.sim
index 85cbe51aad..901da4cab2 100644
--- a/tests/script/general/parser/slimit1.sim
+++ b/tests/script/general/parser/slimit1.sim
@@ -56,7 +56,7 @@ run general/parser/slimit1_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 2000
+sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
diff --git a/tests/script/general/parser/slimit_alter_tags.sim b/tests/script/general/parser/slimit_alter_tags.sim
index 1073e0a3cc..ad557e891b 100644
--- a/tests/script/general/parser/slimit_alter_tags.sim
+++ b/tests/script/general/parser/slimit_alter_tags.sim
@@ -93,7 +93,7 @@ if $data02 != tb0 then
   return -1
 endi
 
-sleep 2000
+sleep 500
 sql reset query cache
 sql select count(*), first(ts) from stb group by tg_added order by tg_added asc slimit 5 soffset 3
 if $rows != 5 then
@@ -171,7 +171,7 @@ endi
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 2000
+sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
diff --git a/tests/script/general/parser/tbnameIn.sim b/tests/script/general/parser/tbnameIn.sim
index 65ed1ed65d..2ee5f38ab1 100644
--- a/tests/script/general/parser/tbnameIn.sim
+++ b/tests/script/general/parser/tbnameIn.sim
@@ -67,7 +67,7 @@ run general/parser/tbnameIn_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 2000
+sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/testSuite.sim b/tests/script/general/parser/testSuite.sim
index 6e9fe6e795..0e4718bad0 100644
--- a/tests/script/general/parser/testSuite.sim
+++ b/tests/script/general/parser/testSuite.sim
@@ -46,13 +46,13 @@
 #sleep 100
 #run general/parser/lastrow.sim
 #sleep 100
-#run general/parser/limit.sim
-#sleep 100
-#run general/parser/limit1.sim
-#sleep 100
-#run general/parser/limit1_tblocks100.sim
-#sleep 100
-#run general/parser/limit2.sim
+run general/parser/limit.sim
+sleep 100
+run general/parser/limit1.sim
+sleep 100
+run general/parser/limit1_tblocks100.sim
+sleep 100
+run general/parser/limit2.sim
 sleep 100
 run general/parser/mixed_blocks.sim
 sleep 100
diff --git a/tests/script/general/parser/topbot.sim b/tests/script/general/parser/topbot.sim
index 57378331e8..f5c78d07a1 100644
--- a/tests/script/general/parser/topbot.sim
+++ b/tests/script/general/parser/topbot.sim
@@ -128,7 +128,7 @@ sql insert into test values(29999, 1)(70000, 2)(80000, 3)
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 2000
+sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
diff --git a/tests/script/general/parser/where.sim b/tests/script/general/parser/where.sim
index 1f148cbb2c..5f9e0ec208 100644
--- a/tests/script/general/parser/where.sim
+++ b/tests/script/general/parser/where.sim
@@ -324,7 +324,7 @@ while $i < 1
 endw
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 2000
+sleep 500
 
 system sh/exec.sh -n dnode1 -s start
 
-- 
GitLab