diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index b10b040c7b5c821f6e31270c235b4fd34a90aef7..e49eb6c03464ec2738d1d4163d1cfdf57fef33a4 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 56a677cc73f35d7656daef6fd3062bbc453007ef..e604d2122e56b4b2d87ca6cd87597abcac02672c 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 e19eb0c667d5e667e3a044c9045c0584ec41d4e2..926eb7547694860810e4018d814637c788787e54 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 9fd690a44426f81b89939de864c556cf452bf383..ee9927fb5f1fcfdb9ff5d10814b156a9a085f8b2 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 533fbf48f068d166ff0d7de440117694c4d48a97..4085ef620d26ac7c869d6f2a298022ac2fe19564 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 9c1f0774badf5edf44cc616f085eb06c8a47c120..aeff740a5f790533e26fda99205d3cffc876deb1 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 83751dc6166275d7d61ad9d63b41b0817ecd8a77..d626f4fa74eb3f53a9f9118800494a05320678a7 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 27be5560c5812d3856929d0da7b53a23fda6210c..f330fe4cd94b1cba82ea985b9b4841245753e099 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 72ee2b3844f09af2dc3c15ba6426c9fd51ad832f..47b30acb49111da69c1c0b8b1927fd7f13f0c31c 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 a9f021b20c42c03535fda4df28fbe1eb3c246a11..1e041375de3da7fc2a5c17ae40caa1251b5d9d1b 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 6b4dd07c7981ca141765b41cca3d005874a6583f..e50fc92e28ee498989f8b71d1bc5dd50faa7baa3 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 39223d84e394454b028b40a8dfa3f5457e0e9428..e9ee4fcf98666ddf81816c367927c8e528de3f42 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 36a643c424b9db0bf81f9ab0c7f5d4f093e2183e..13b6a08024206b99b410ac06a913d14078c11bfc 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 682a6cd5dfe42fe0d0411416b76faba15ba88f2c..d1eadfb67a43c027b54c66967d8818454cc81d81 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 22d52c4257f07481e1dcc02119989d277d9e018d..17636dfb74d117187db66f5b66918fdd4ba9500b 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 0597723490f1c6af3ef6518dfa3b0d8aa005d3c4..2c40f0af2bfd3b38a43cefa4501d992dcbcfa661 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 43519d2df4ddee99ea5de3a797d5333b10f48f4a..45ead58ba067be400f60c39a15cc58adb2b75a05 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 ddc5c10362a0743381e3f935a9d078c20be31858..0e7e13b6de0ea5eb40fd0609f9591b839157f5d6 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 79bf65d1475a8f73fb31df35bf5e8e5f31476fca..8208963858721c88262af385fe4d9336012d63e8 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 fa3b4cd057ed0acad2a658dae2ff2c6ab308b590..a92493b7f4a9dfa180836360c7c39b37a4991c83 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 8f18a41d417ce8928dd2a991526641a17fc62d77..20b502447836409ca06c6acaebd7bd55921f7404 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 36a749cc3c4aa46bc2d52dd2352905f68a213c87..3d2cc0b70060ed9124205a00e3ea9922f2ed203b 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 0b8ffd946f2bb052743faf4a732a06e4a68c5aec..92380ace8419c7756975fa4ce19482b845f804bf 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 651f44a3a4dac3437e3c95bd3d8b42b632c58abf..bc9362904163c7abf9d32f517a31e503801fcab4 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 426104c1680c777214c5514ecf8dc251540f75b6..bfb97b52618b7167434680c41d16f23786312fea 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 85cbe51aad166973367c094ac531fe7e58776468..901da4cab226bfaba705f7a0976731f017b8d941 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 1073e0a3cc254dad66436896216411b026354040..ad557e891b0cb0b715da1c494c98e4a16213db8e 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 65ed1ed65d50e96bee1b9185f1ecc5f2e18f376e..2ee5f38ab1b48a485be06376da08612bee9b98e8 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 6e9fe6e795f84dc7b6148b7a70c7b93fe3753faf..0e4718bad0742ad1888061546bd998af60aa83ae 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 57378331e80489e9c3d3eaaaf321730e7e132f55..f5c78d07a1d362ffdd5ebe5c989d88cc35a33e72 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 1f148cbb2cb9a4b9ee4b0eaeffc8dad6e6d576d0..5f9e0ec2083de0ee4acdd3f727189a229e6eaa38 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