diff --git a/tests/script/windows/account/authority.sim b/tests/script/windows/account/authority.sim
deleted file mode 100644
index a352faf23bc9ea2979abcb337c8bae6794b91890..0000000000000000000000000000000000000000
--- a/tests/script/windows/account/authority.sim
+++ /dev/null
@@ -1,317 +0,0 @@
-sql connect
-sleep 3000
-
-print ============= step1
-
-sql create user read pass 'taosdata'
-sql create user write pass 'taosdata'
-sql create user manage pass 'taosdata'
-
-sql create user a PASS 'ade' privilege  -x step11
-  return -1
-step11:
-
-sql create user a PASS 'ade' privilege a -x step12
-  return -1
-step12:
-
-sql create user a PASS 'ade' privilege read -x step13
-  return -1
-step13:
-
-sql show users
-if $rows != 6 then 
-  return -1
-endi
-
-sql alter user read privilege read
-sql alter user write privilege write
-sql alter user manage privilege super
-
-print ============= step2
-sql close
-sql connect write
-sleep 2000
-
-sql create database d1
-sql create database d2
-sql create table d1.t1 (ts timestamp, i int)
-sql create table d2.t2 (ts timestamp, i int)
-sql insert into d1.t1 values(now, 1)
-sql insert into d2.t2 values(now, 1)
-sql insert into d2.t2 values(now+1s, 2)
-
-sql show users
-if $rows != 6 then 
-  return -1
-endi
-sql show databases
-if $rows != 2 then 
-  return -1
-endi
-sql select * from d1.t1
-if $rows != 1 then 
-  return -1
-endi
-sql select * from d2.t2
-if $rows != 2 then 
-  return -1
-endi
-
-sql create account t1 pass 'taosdata' -x step21
-  return -1
-step21:
-
-sql create user t1 pass 'taosdata' -x step22
-  return -1
-step22:
-
-sql alter user read pass 'taosdata' -x step23
-  return -1
-step23:
-
-sql create dnode $hostname2 -x step24
-  return -1
-step24:
-
-sql drop dnode $hostname2 -x step25
-  return -1
-step25:
-
-sql create mnode 192.168.0.2 -x step26
-  return -1
-step26:
-
-sql drop mnode 192.168.0.2 -x step27
-  return -1
-step27:
-
-sql drop account root -x step28
-  return -1 
-step28:
-
-sql alter user write pass 'taosdata'
-
-print ============= step3
-sql close
-sql connect read
-sleep 2000
-
-sql create database d3 -x step31
-  return -1
-step31:
-
-sql create table d1.t3 (ts timestamp, i int) -x step32
-  return -1
-step32:
-
-#sql insert into d1.t1 values(now, 2) -x step33
-#  return -1
-#step33:
-
-sql show accounts
-if $rows != 1 then 
-  return -1
-endi
-sql show users
-if $rows != 6 then 
-  return -1
-endi
-sql show databases
-if $rows != 2 then 
-  return -1
-endi
-sql select * from d1.t1
-if $rows != 1 then 
-  return -1
-endi
-
-sql select * from d2.t2
-if $rows != 2 then 
-  return -1
-endi
-
-sql sql create account t1 pass 'taosdata' -x step34
-  return -1
-step34:
-
-sql sql create user t1 pass 'taosdata' -x step35
-  return -1
-step35:
-
-print ============= step4
-sql close
-sql connect manage
-sleep 2000
-
-sql create database d3
-sql create database d4
-sql create table d3.t3 (ts timestamp, i int)
-sql create table d4.t4 (ts timestamp, i int)
-
-sql show accounts
-if $rows != 1 then 
-  return -1
-endi
-sql show users
-if $rows != 6 then 
-  return -1
-endi
-sql show databases
-if $rows != 4 then 
-  return -1
-endi
-sql select * from d1.t1
-if $rows != 1 then 
-  return -1
-endi
-sql select * from d2.t2
-if $rows != 2 then 
-  return -1
-endi
-
-sql create account other pass 'taosdata'  -x step41
-  return -1
-step41:  
-
-sql close
-sql connect
-sleep 2000
-sql create account other pass 'taosdata'
-
-print ============= step5
-sql close
-sql connect other
-sleep 2000
-sql create user read pass 'taosdata' -x step51
-  return -1
-step51:
-sql create other write pass 'taosdata' -x step52
-  return -1
-step52:
-
-sql create user oread pass 'taosdata'
-sql create user owrite pass 'taosdata'
-sql create user omanage pass 'taosdata' 
-
-sql show users
-print show users $rows
-if $rows != 5 then 
-  return -1
-endi
-
-sql alter user oread privilege read
-sql alter user owrite privilege write
-sql alter user oroot privilege super -x step53
-  return -1
-step53:
-sql alter user read privilege read -x step54
-  return -1
-step54:
-
-print ============= step6
-sql close
-sql connect owrite
-sleep 2000
-
-sql create database d1
-sql create database d3
-sql create table d1.t1 (ts timestamp, i int)
-sql create table d3.t3 (ts timestamp, i int)
-sql insert into d1.t1 values(now, 11)
-sql insert into d3.t3 values(now, 11)
-sql insert into d3.t3 values(now+1s, 12)
-
-sql show databases
-if $rows != 2 then 
-  return -1
-endi
-sql select * from d1.t1
-if $rows != 1 then 
-  return -1
-endi
-sql select * from d2.t2 -x step6
-  return -1
-step6:
-sql select * from d3.t3
-if $rows != 2 then 
-  return -1
-endi
-
-sql sql create user t1 pass 'taosdata' -x step62
-  return -1
-step62:
-
-print ============= step7
-sql close
-sql connect oread
-sleep 2000
-
-sql create database d7 -x step71
-  return -1
-step71:
-
-sql show databases
-if $rows != 2 then 
-  return -1
-endi
-sql select * from d1.t1
-if $rows != 1 then 
-  return -1
-endi
-sql select * from d2.t2 -x step72
-  return -1
-step72:
-sql select * from d3.t3
-if $rows != 2 then 
-  return -1
-endi
-
-sql sql create user t1 pass 'taosdata' -x step74
-  return -1
-step74:
-
-print ============= step8
-sql close
-sql connect omanage
-sleep 2000
-
-sql create database d4
-sql create table d4.t4 (ts timestamp, i int)
-
-sql show databases
-if $rows != 3 then 
-  return -1
-endi
-sql select * from d1.t1
-if $rows != 1 then 
-  return -1
-endi
-sql select * from d2.t2 -x step82
-  return -1
-step82:
-sql select * from d3.t3
-if $rows != 2 then 
-  return -1
-endi
-
-print ============= step9
-sql close
-sql connect
-sleep 2000
-sql show databases
-if $rows != 4 then 
-  return -1
-endi
-
-sql drop user read
-sql drop user manage
-sql drop user write
-
-sql close
-sql connect
-sleep 2000
-sql drop database d1
-sql drop database d2
-sql drop database d3
-sql drop database d4
diff --git a/tests/script/windows/account/user_create.sim b/tests/script/windows/account/user_create.sim
deleted file mode 100644
index 6dc9ab05b3baf7ffa01540b51918cb18715f5eb1..0000000000000000000000000000000000000000
--- a/tests/script/windows/account/user_create.sim
+++ /dev/null
@@ -1,80 +0,0 @@
-sql connect
-sleep 3000
-
-print =============== step1
-sql show users
-if $rows != 3 then 
-  return -1
-endi
-
-sql create user read PASS 'pass123'
-sql create user read PASS 'pass123' -x step1
-	return -1
-step1:
-
-sql show users
-if $rows != 4 then 
-  return -1
-endi
-
-sql alter user read PASS 'taosdata'
-
-print =============== step2
-sql close
-sql connect read
-sleep 2000
-
-sql alter user read PASS 'taosdata'
-
-print =============== step3
-sql drop user read -x step31
-  return -1
-step31:
-sql drop user _root -x step32
-  return -1
-step32:
-sql drop user monitor -x step33
-  return -1
-step33:
-
-print =============== step4
-sql close
-sql connect
-sleep 2000
-
-sql alter user read privilege read
-sql show users
-if $data1_read != read then 
-  return -1
-endi
-
-sql alter user read privilege super
-sql show users
-if $data1_read != super then 
-  return -1
-endi
-
-sql alter user read privilege write
-sql show users
-if $data1_read != write then 
-  return -1
-endi
-
-sql alter user read privilege 1 -x step43
-  return -1
-step43:
-
-sql drop user _root -x step41
-  return -1
-step41:
-
-sql drop user monitor -x step42
-  return -1
-step42:
-
-sql drop user read
-
-
-
-  
-  
diff --git a/tests/script/windows/account/user_len.sim b/tests/script/windows/account/user_len.sim
deleted file mode 100644
index b4a344fe8d9bedf54f307d13fba07976b95d9110..0000000000000000000000000000000000000000
--- a/tests/script/windows/account/user_len.sim
+++ /dev/null
@@ -1,81 +0,0 @@
-sql connect
-sleep 3000
-
-$i = 0
-$dbPrefix = lm_us_db
-$tbPrefix = lm_us_tb
-$db = $dbPrefix . $i
-$tb = $tbPrefix . $i
-
-print =============== step1
-sql drop user ac -x step0
-	return -1
-step0:
-
-sql create user PASS '123' -x step1
-	return -1
-step1:
-
-sql show users
-if $rows != 3 then 
-  return -1
-endi
-
-print =============== step2
-sql drop user a -x step2
-step2:
-sql create user a PASS '123'
-sql show users
-if $rows != 4 then 
-  return -1
-endi
-
-sql drop user a
-sql show users
-if $rows != 3 then 
-  return -1
-endi
-
-print =============== step3
-sql drop user abc01234567890123456789 -x step3
-step3:
-
-sql create user abc01234567890123456789 PASS '123'
-sql show users
-if $rows != 4 then 
-  return -1
-endi
-
-sql drop user abc01234567890123456789
-sql show users
-if $rows != 3 then 
-  return -1
-endi
-
-print =============== step4
-sql create user abcd0123456789012345678901234567890111 PASS '123' -x step4
-	return -1
-step4:
-sql show users
-if $rows != 3 then 
-  return -1
-endi
-
-print =============== step5
-sql drop user 123 -x step5
-step5:
-sql create user 123 PASS '123' -x step61
-  return -1
-step61:
-
-sql create user a123 PASS '123'
-sql show users
-if $rows != 4 then 
-  return -1
-endi
-
-sql drop user a123
-sql show users
-if $rows != 3 then 
-  return -1
-endi
diff --git a/tests/script/windows/alter/metrics.sim b/tests/script/windows/alter/metrics.sim
index 323e150d41410c780680bf41b7e8c7f2c5aaee66..3717d8c1ed766a0a80d22cbb1965af934b570746 100644
--- a/tests/script/windows/alter/metrics.sim
+++ b/tests/script/windows/alter/metrics.sim
@@ -35,7 +35,6 @@ endi
 
 print ======== step2
 sql alter table mt add column b smallint
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -64,7 +63,6 @@ endi
 
 print ======== step3
 sql alter table mt add column c tinyint
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -99,7 +97,6 @@ endi
 
 print ======== step4
 sql alter table mt add column d int
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -140,7 +137,6 @@ endi
 
 print ======== step5
 sql alter table mt add column e bigint
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -187,7 +183,6 @@ endi
 
 print ======== step6
 sql alter table mt add column f float
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -240,7 +235,6 @@ endi
 
 print ======== step7
 sql alter table mt add column g double
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -299,7 +293,6 @@ endi
 
 print ======== step8
 sql alter table mt add column h binary(10)
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -461,7 +454,6 @@ print ======== step11
 
 print ======== step12
 sql alter table mt drop column b
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -523,7 +515,6 @@ endi
 
 print ======== step13
 sql alter table mt drop column c
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -579,7 +570,6 @@ endi
 
 print ======== step14
 sql alter table mt drop column d
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -629,7 +619,6 @@ endi
 
 print ======== step15
 sql alter table mt drop column e
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -673,7 +662,6 @@ endi
 
 print ======== step16
 sql alter table mt drop column f
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -711,7 +699,6 @@ endi
 
 print ======== step17
 sql alter table mt drop column g
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -743,7 +730,6 @@ endi
 
 print ============= step18
 sql alter table mt drop column h
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -763,7 +749,7 @@ endi
 if $data21 != INT then
   return -1
 endi
-if $data30 != NULL then
+if $data30 != null then
   return -1
 endi
 
diff --git a/tests/script/windows/alter/table.sim b/tests/script/windows/alter/table.sim
index e6b5d695510cf66ee4accc0a329fe44597f1cdce..3b811a065ee28bbc9cf8e1a72bd9e9b656139c83 100644
--- a/tests/script/windows/alter/table.sim
+++ b/tests/script/windows/alter/table.sim
@@ -28,7 +28,6 @@ endi
 
 print ======== step2
 sql alter table tb add column b smallint
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -51,7 +50,6 @@ endi
 
 print ======== step3
 sql alter table tb add column c tinyint
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -80,7 +78,6 @@ endi
 
 print ======== step4
 sql alter table tb add column d int
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -115,7 +112,6 @@ endi
 
 print ======== step5
 sql alter table tb add column e bigint
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -156,7 +152,6 @@ endi
 
 print ======== step6
 sql alter table tb add column f float
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -203,7 +198,6 @@ endi
 
 print ======== step7
 sql alter table tb add column g double
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -256,7 +250,6 @@ endi
 
 print ======== step8
 sql alter table tb add column h binary(10)
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -406,7 +399,6 @@ step115:
 
 print ======== step12
 sql alter table tb drop column b
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -462,7 +454,6 @@ endi
 
 print ======== step13
 sql alter table tb drop column c
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -512,7 +503,6 @@ endi
 
 print ======== step14
 sql alter table tb drop column d
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -556,7 +546,6 @@ endi
 
 print ======== step15
 sql alter table tb drop column e
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -594,7 +583,6 @@ endi
 
 print ======== step16
 sql alter table tb drop column f
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -626,7 +614,6 @@ endi
 
 print ======== step17
 sql alter table tb drop column g
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -652,7 +639,6 @@ endi
 
 print ============= step18
 sql alter table tb drop column h
-sleep 2500
 sql describe tb
 if $data00 != ts then
   return -1
@@ -666,7 +652,7 @@ endi
 if $data11 != INT then
   return -1
 endi
-if $data20 != NULL then
+if $data20 != null then
   return -1
 endi
 
diff --git a/tests/script/windows/compute/diff.sim b/tests/script/windows/compute/diff.sim
index e9d76f8c78128f38a9248dcb832628d99a0e0408..6c2829872a02fa1de829df7b5089c6d06bbb581e 100644
--- a/tests/script/windows/compute/diff.sim
+++ b/tests/script/windows/compute/diff.sim
@@ -1,5 +1,5 @@
-sql connect
 sleep 3000
+sql connect
 
 $dbPrefix = m_di_db
 $tbPrefix = m_di_tb
diff --git a/tests/script/windows/compute/first.sim b/tests/script/windows/compute/first.sim
index 7b6a8310045afbcf2c2fda9f6f3e11e1a337581e..9a0c02fe4b972383d9a9247291635a814410cded 100644
--- a/tests/script/windows/compute/first.sim
+++ b/tests/script/windows/compute/first.sim
@@ -1,5 +1,5 @@
-sql connect
 sleep 3000
+sql connect
 
 $dbPrefix = m_fi_db
 $tbPrefix = m_fi_tb
diff --git a/tests/script/windows/compute/interval.sim b/tests/script/windows/compute/interval.sim
index d40c6ad0c9ce98f401e2e144e279e2b48b2b96ea..365c6d9d312ae25539664747ca2410e55cf9e067 100644
--- a/tests/script/windows/compute/interval.sim
+++ b/tests/script/windows/compute/interval.sim
@@ -1,5 +1,5 @@
-sql connect
 sleep 3000
+sql connect
 
 $dbPrefix = m_in_db
 $tbPrefix = m_in_tb
diff --git a/tests/script/windows/compute/last.sim b/tests/script/windows/compute/last.sim
index 4b686766ae547b4b6d7dc99c2a2c714a5aa4934a..aa9699778f4526783a3c425bea2dddf096ba01eb 100644
--- a/tests/script/windows/compute/last.sim
+++ b/tests/script/windows/compute/last.sim
@@ -1,5 +1,5 @@
-sql connect
 sleep 3000
+sql connect
 
 $dbPrefix = m_la_db
 $tbPrefix = m_la_tb
diff --git a/tests/script/windows/compute/leastsquare.sim b/tests/script/windows/compute/leastsquare.sim
index 81f37c32287fdc1a10e15a1856c659564e666056..bb7404edd0eefb06851c24aaf7de6f97e2e9f60f 100644
--- a/tests/script/windows/compute/leastsquare.sim
+++ b/tests/script/windows/compute/leastsquare.sim
@@ -1,5 +1,5 @@
-sql connect
 sleep 3000
+sql connect
 
 $dbPrefix = m_le_db
 $tbPrefix = m_le_tb
@@ -15,7 +15,7 @@ $mt = $mtPrefix . $i
 
 sql drop database $db -x step1
 step1:
-sql create database $db
+sql create database $db keep 36500
 sql use $db
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol int)
 
@@ -43,41 +43,41 @@ $tb = $tbPrefix . $i
 
 sql select leastsquares(tbcol, 1, 1) from $tb
 print ===> $data00
-if $data00 != @(1.000000, 1.000000)@ then 
+if $data00 != @{slop:1.000000, intercept:1.000000}@ then
   return -1
 endi
 
 print =============== step3
 sql select leastsquares(tbcol, 1, 1) from $tb where ts < now + 4m
 print ===> $data00
-if $data00 != @(1.000000, 1.000000)@ then 
+if $data00 != @{slop:1.000000, intercept:1.000000}@ then
   return -1
 endi
 
 print =============== step4
 sql select leastsquares(tbcol, 1, 1) as b from $tb
 print ===> $data00
-if $data00 != @(1.000000, 1.000000)@ then 
+if $data00 != @{slop:1.000000, intercept:1.000000}@ then
   return -1
 endi
 
 print =============== step5
 sql select leastsquares(tbcol, 1, 1) as b from $tb interval(1m)
 print ===> $data01 
-if $data01 != @(1.000000, 1.000000)@ then 
+if $data01 != @{slop:1.000000, intercept:1.000000}@ then
   return -1
 endi
 
 sql select leastsquares(tbcol, 1, 1) as b from $tb interval(1d)
 print ===> $data01
-if $data01 != @(1.000000, 1.000000)@ then 
+if $data01 != @{slop:1.000000, intercept:1.000000}@ then
   return -1
 endi
 
 print =============== step6
 sql select leastsquares(tbcol, 1, 1) as b from $tb where ts < now + 4m interval(1m)
 print ===> $data01
-if $data01 != @(1.000000, 1.000000)@ then 
+if $data01 != @{slop:1.000000, intercept:1.000000}@ then
   return -1
 endi
 print ===> $rows
@@ -90,4 +90,4 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
diff --git a/tests/script/windows/compute/max.sim b/tests/script/windows/compute/max.sim
index 60147358b362dd5f39a99002cdaebb71036cc6a3..a19d122ecdbc1344cd62d558b83c0879d88b2d3b 100644
--- a/tests/script/windows/compute/max.sim
+++ b/tests/script/windows/compute/max.sim
@@ -1,5 +1,5 @@
-sql connect
 sleep 3000
+sql connect
 
 $dbPrefix = m_ma_db
 $tbPrefix = m_ma_tb
diff --git a/tests/script/windows/compute/min.sim b/tests/script/windows/compute/min.sim
index 928404babc39201267fc5579b0611be01e1be4b1..216f2061d757ea6388b5c053251c0a0ec29a2721 100644
--- a/tests/script/windows/compute/min.sim
+++ b/tests/script/windows/compute/min.sim
@@ -1,5 +1,5 @@
-sql connect
 sleep 3000
+sql connect
 
 $dbPrefix = m_mi_db
 $tbPrefix = m_mi_tb
diff --git a/tests/script/windows/compute/percentile.sim b/tests/script/windows/compute/percentile.sim
index 6068722b549cb213399aae8bc7c48d100e167993..20b2740d6e19c7b2584a0081d321a0a4baa7e0d8 100644
--- a/tests/script/windows/compute/percentile.sim
+++ b/tests/script/windows/compute/percentile.sim
@@ -1,5 +1,5 @@
-sql connect
 sleep 3000
+sql connect
 
 $dbPrefix = m_pe_db
 $tbPrefix = m_pe_tb
diff --git a/tests/script/windows/compute/stddev.sim b/tests/script/windows/compute/stddev.sim
index b5ba704bef35a4a9f1b4d00f7b6170e4228cac2b..c02b3e4ab36522de224e630f94b27c73ff329f43 100644
--- a/tests/script/windows/compute/stddev.sim
+++ b/tests/script/windows/compute/stddev.sim
@@ -1,5 +1,5 @@
-sql connect
 sleep 3000
+sql connect
 
 $dbPrefix = m_st_db
 $tbPrefix = m_st_tb
diff --git a/tests/script/windows/compute/sum.sim b/tests/script/windows/compute/sum.sim
index 39eb771f34226b3cb54754735aa6381133f5ff3f..04af1d457a4121307618fd6f5950ca04d1f49e83 100644
--- a/tests/script/windows/compute/sum.sim
+++ b/tests/script/windows/compute/sum.sim
@@ -1,5 +1,5 @@
-sql connect
 sleep 3000
+sql connect
 
 $dbPrefix = m_su_db
 $tbPrefix = m_su_tb
diff --git a/tests/script/windows/compute/top.sim b/tests/script/windows/compute/top.sim
index b64c24b03f594e11b73a821c275aecbe1cd3aee1..b3c698c0648e8e6267e340b3930cca0193369569 100644
--- a/tests/script/windows/compute/top.sim
+++ b/tests/script/windows/compute/top.sim
@@ -1,5 +1,5 @@
-sql connect
 sleep 3000
+sql connect
 
 $dbPrefix = m_to_db
 $tbPrefix = m_to_tb
diff --git a/tests/script/windows/db/basic.sim b/tests/script/windows/db/basic.sim
index 4222cfe3b2cda0943e6cdd19ab2f7190d2ffad7e..f1e18d15a54df35dd172bc35413912d95f9e9c24 100644
--- a/tests/script/windows/db/basic.sim
+++ b/tests/script/windows/db/basic.sim
@@ -1,5 +1,6 @@
-sql connect
 sleep 3000
+sql connect
+
 print ============================ dnode1 start
 
 $i = 0
@@ -9,7 +10,7 @@ $db = $dbPrefix . $i
 $tb = $tbPrefix . $i
 
 print =============== step1
-sql create database $db replica 1 days 20 keep 2000
+sql create database $db replica 1 days 20 keep 2000 cache 16
 sql show databases
 print $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07
 if $data00 != $db then 
@@ -24,10 +25,10 @@ endi
 if $data04 != 1 then 
   return -1
 endi
-if $data05 != 20 then 
+if $data06 != 20 then 
   return -1
 endi
-if $data07 != 1000 then 
+if $data08 != 16 then 
   return -1
 endi
  
@@ -46,7 +47,7 @@ if $rows != 0 then
 endi 
 
 print =============== step4
-sql drop database $db
+sql_error drop database $db
 
 print =============== step5
 sql create database $db replica 1 days 15 keep 1500
@@ -64,14 +65,10 @@ endi
 if $data04 != 1 then 
   return -1
 endi
-if $data05 != 15 then 
+if $data06 != 15 then 
   return -1
 endi
 
-if $data07 != 1000 then 
-  return -1
-endi 
-
 print =============== step6
 sql use $db
 sql create table $tb (ts timestamp, speed int)
@@ -95,9 +92,7 @@ $db = $dbPrefix . $i
 $tb = $tbPrefix . $i
 sql create database $db
 sql use $db
-sql create table $tb (ts timestamp, speed int) -x step6
-	return -1
-step6:
+sql create table $tb (ts timestamp, speed int)
 
 print =============== step7
 $i = 0
diff --git a/tests/script/windows/db/len.sim b/tests/script/windows/db/len.sim
index 32f647617792f3f72cdb6ed630f2db7c9b38f296..f922e7e05a6060890448467f5dbb123b81eb5cb2 100644
--- a/tests/script/windows/db/len.sim
+++ b/tests/script/windows/db/len.sim
@@ -1,8 +1,8 @@
-sql connect
 sleep 3000
+sql connect
 
 print =============== step1
-sql drop database dd 
+sql_error drop database dd
 
 sql create database -x step1
 	return -1
@@ -40,7 +40,7 @@ if $rows != 0 then
 endi
 
 print =============== step4
-sql create database a012345678901201234567890120123456789012 -x step4
+sql create database a012345678901201234567890120123456789012a012345678901201234567890120123456789012 -x step4
 	return -1
 step4:
 sql show databases
diff --git a/tests/script/windows/field/binary.sim b/tests/script/windows/field/binary.sim
index cd75b6381441402f4997400a1803b4a28fd1bd30..8b86c4dbeaaa02a1a8d31b22bf3d112ca87435e2 100644
--- a/tests/script/windows/field/binary.sim
+++ b/tests/script/windows/field/binary.sim
@@ -55,17 +55,10 @@ if $rows != 75 then
   return -1
 endi
 
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = '1' group by tgcol -x step13
-  return -1
-step13:
-
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tbcol = '1' group by tgcol -x step14
-  return -1
-step14:
-
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = '1' interval(1d) group by tgcol -x step15
-  return -1
-step15:
+print select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = '1'
+sql_error select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = '1' group by tgcol 
+sql_error select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tbcol = '1' group by tgcol 
+sql_error select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = '1' interval(1d) group by tgcol 
 
 #can't filter binary fields
 
diff --git a/tests/script/windows/import/basic.sim b/tests/script/windows/import/basic.sim
index 0621721a6b88f3badb46532d1417f185b33cd595..c20378ee88c69c6ded52198339a8fe0bcfc74a9c 100644
--- a/tests/script/windows/import/basic.sim
+++ b/tests/script/windows/import/basic.sim
@@ -6,111 +6,112 @@ sql use ibadb
 sql create table tb(ts timestamp, i int)
 
 print ================= step1
-sql import into tb values(10000, 10000)
+
+sql import into tb values(1564641710000, 10000)
 sql select * from tb;
 if $rows != 1 then 
   return -1
 endi
 
 print ================= step2
-sql insert into tb values(8000, 8000)
+sql insert into tb values(1564641708000, 8000)
 sql select * from tb;
-if $rows != 1 then 
+if $rows != 2 then 
   return -1
 endi
 
 print ================= step3
-sql insert into tb values(20000, 20000)
+sql insert into tb values(1564641720000, 20000)
 sql select * from tb;
-if $rows != 2 then 
+if $rows != 3 then 
   return -1
 endi
 
 print ================= step4
-sql import into tb values(8000, 8000)
-sql import into tb values(15000, 15000)
-sql import into tb values(30000, 30000)
+sql import into tb values(1564641708000, 8000)
+sql import into tb values(1564641715000, 15000)
+sql import into tb values(1564641730000, 30000)
 sql select * from tb;
 if $rows != 5 then 
   return -1
 endi
 
 print ================= step5
-sql insert into tb values(8000, 8000)
-sql insert into tb values(14000, 14000)
-sql insert into tb values(25000, 25000)
-sql insert into tb values(40000, 40000)
+sql insert into tb values(1564641708000, 8000)
+sql insert into tb values(1564641714000, 14000)
+sql insert into tb values(1564641725000, 25000)
+sql insert into tb values(1564641740000, 40000)
 sql select * from tb;
-if $rows != 6 then 
+if $rows != 8 then 
   return -1
 endi
 
 print ================= step6
-sql import into tb values(7000, 7000)
-sql import into tb values(12000, 12000)
-sql import into tb values(23000, 23000)
-sql import into tb values(34000, 34000)
-sql import into tb values(50000, 50000)
+sql import into tb values(1564641707000, 7000)
+sql import into tb values(1564641712000, 12000)
+sql import into tb values(1564641723000, 23000)
+sql import into tb values(1564641734000, 34000)
+sql import into tb values(1564641750000, 50000)
 sql select * from tb;
-if $rows != 11 then 
+if $rows != 13 then 
   return -1
 endi
 
 print ================= step7
-sql import into tb values(7001, 7001)
-sql import into tb values(12001, 12001)
-sql import into tb values(23001, 23001)
-sql import into tb values(34001, 34001)
-sql import into tb values(50001, 50001)
+sql import into tb values(1564641707001, 7001)
+sql import into tb values(1564641712001, 12001)
+sql import into tb values(1564641723001, 23001)
+sql import into tb values(1564641734001, 34001)
+sql import into tb values(1564641750001, 50001)
 sql select * from tb;
-if $rows != 16 then 
+if $rows != 18 then 
   return -1
 endi
 
 print ================= step8
-sql insert into tb values(8002, 8002)
-sql insert into tb values(14002, 14002)
-sql insert into tb values(25002, 25002)
-sql insert into tb values(200000, 60000)
+sql insert into tb values(1564641708002, 8002)
+sql insert into tb values(1564641714002, 14002)
+sql insert into tb values(1564641725002, 25002)
+sql insert into tb values(1564641900000, 200000)
 sql select * from tb;
-if $rows != 17 then 
+if $rows != 22 then 
   return -1
 endi
 
 print ================= step9 only insert last one
-sql import into tb values(5000, 5000)(18000, 18000)(700000, 700000)
+sql import into tb values(1564641705000, 5000)(1564641718000, 18000)(1564642400000, 700000)
 sql select * from tb;
-if $rows != 18 then 
+if $rows != 25 then
   return -1
 endi
 
 print ================= step10
-sql import into tb values(5000, 5000)(18000, 18000)(700000, 70000)
+sql import into tb values(1564641705000, 5000)(1564641718000, 18000)(1564642400000, 70000)
 sql select * from tb;
-if $rows != 19 then 
+if $rows != 25 then
   return -1
 endi
 
 print ================= step11
-sql import into tb values(700000, 700000)
+sql import into tb values(1564642400000, 700000)
 sql select * from tb;
-if $rows != 19 then 
+if $rows != 25 then
   return -1
 endi
 
 print ================= step12
-sql import into tb values(9527, 9527)(9527, 9528) 
+sql import into tb values(1564641709527, 9527)(1564641709527, 9528)
 sql select * from tb;
 print rows=> $rows
-if $rows != 21 then 
+if $rows != 26 then
   return -1
 endi
 
 print ================= step13
-sql import into tb values(9898, 9898)(9897, 9897) 
+sql import into tb values(1564641709898, 9898)(1564641709897, 9897)
 sql select * from tb;
 print rows=> $rows
-if $rows != 23 then 
+if $rows != 28 then
   return -1
 endi
 
diff --git a/tests/script/windows/insert/basic.sim b/tests/script/windows/insert/basic.sim
index 42fdf87098f626cd7cbe215c60b064d0ac53ccad..be0980a2d4a60d8c94152f9fd57e6187cb788198 100644
--- a/tests/script/windows/insert/basic.sim
+++ b/tests/script/windows/insert/basic.sim
@@ -22,20 +22,20 @@ while $x < 10
 endw 
 
 print =============== step 2
-sql insert into $tb values (now - 5m , 10) -x error_insert
-sql insert into $tb values (now - 6m , 10) -x error_insert
-sql insert into $tb values (now - 7m , 10) -x error_insert
-sql insert into $tb values (now - 8m , 10) -x error_insert
-error_insert:
+sql insert into $tb values (now - 5m , 10)
+sql insert into $tb values (now - 6m , 10)
+sql insert into $tb values (now - 7m , 10)
+sql insert into $tb values (now - 8m , 10)
 
 sql select * from $tb
 
 print $rows points data are retrieved
-if $rows != 10 then 
+if $rows != 14 then 
   return -1
 endi
 
 sql drop database $db
+sleep 1000
 sql show databases
 if $rows != 0 then 
   return -1
diff --git a/tests/script/windows/insert/query_multi_file.sim b/tests/script/windows/insert/query_multi_file.sim
index 3170b435824113bb82f150d8dbba9dc8c3486a91..84c091fb213bfe61184de3e765fba04f5b7dadac 100644
--- a/tests/script/windows/insert/query_multi_file.sim
+++ b/tests/script/windows/insert/query_multi_file.sim
@@ -27,7 +27,7 @@ $N = 20000
 $x = 0
 
 while $x < $N
-  $ms = $x . m 
+  $ms = $x . s 
   #print insert into $tb values (now + $ms , $x )
   sql insert into $tb values (now + $ms , $x ) -x error_insert
   $x = $x + 1
diff --git a/tests/script/windows/table/binary.sim b/tests/script/windows/table/binary.sim
index 1f3df987bb9c33ad1cada10f929f16efe819c449..69354ed5c8ec5f4f938f755c29ce22a7e01bdfbd 100644
--- a/tests/script/windows/table/binary.sim
+++ b/tests/script/windows/table/binary.sim
@@ -38,7 +38,8 @@ if $data00 != 23456 then
 endi
 
 print =============== step4
-sql insert into $tb values (now+3a, '345678')
+sql_error insert into $tb values (now+3a, '345678')
+sql insert into $tb values (now+3a, '34567')
 sql select speed from $tb order by ts desc
 if $rows != 3 then 
   return -1
diff --git a/tests/script/windows/table/bool.sim b/tests/script/windows/table/bool.sim
index afaaf46f518dba54e35510212f8df7d41db9b64d..9e434d801a21fe58d05b83b5e52b5d24581bc29f 100644
--- a/tests/script/windows/table/bool.sim
+++ b/tests/script/windows/table/bool.sim
@@ -19,7 +19,7 @@ if $rows != 1 then
   return -1
 endi
 
-if $data01 != true then 
+if $data01 != 1 then
   return -1
 endi
 
@@ -30,7 +30,7 @@ if $rows != 2 then
   return -1
 endi
 
-if $data01 != true then 
+if $data01 != 1 then
   return -1
 endi
 
@@ -41,7 +41,7 @@ if $rows != 3 then
   return -1
 endi
 
-if $data01 != true then 
+if $data01 != 1 then
   return -1
 endi
 
@@ -52,7 +52,7 @@ if $rows != 4 then
   return -1
 endi
 
-if $data01 != false then 
+if $data01 != 0 then
   return -1
 endi
 
@@ -63,7 +63,7 @@ if $rows != 5 then
   return -1
 endi
 
-if $data01 != true then 
+if $data01 != 1 then
   return -1
 endi
 
@@ -74,7 +74,7 @@ if $rows != 6 then
   return -1
 endi
 
-if $data01 != false then 
+if $data01 != 0 then
   return -1
 endi
 
diff --git a/tests/script/windows/table/column_value.sim b/tests/script/windows/table/column_value.sim
index d3b120d08e8d35a95fbec81875afdc1da6b72b47..9dbaf7ceabef3bfa2d02be8f3cfb004f944d65bd 100644
--- a/tests/script/windows/table/column_value.sim
+++ b/tests/script/windows/table/column_value.sim
@@ -29,13 +29,12 @@ if $rows != 0 then
 endi
 
 print =============== step2
-sql create table  $tb (ts timestamp, speed bigint, v1 binary(1500), v2 binary(1500), v3 binary(1500), v4 binary(500), v5 binary(500)) -x step2
-	return -1
-step2:
+sql create table  $tb (ts timestamp, speed bigint, v1 binary(1500), v2 binary(1500), v3 binary(1500), v4 binary(500), v5 binary(500))
 sql show tables
-if $rows != 0 then 
+if $rows != 1 then 
   return -1
 endi
+sql drop table $tb
 
 print =============== step3
 sql create table $tb (ts timestamp, speed float, v1 binary(100), v2 binary(100), v3 binary(100), v4 binary(100), v5 binary(100)) 
@@ -56,11 +55,9 @@ if $rows != 0 then
 endi
 
 print =============== step4
-sql create table  $tb (ts timestamp, speed double, v1 binary(1500), v2 binary(1500), v3 binary(1500), v4 binary(500), v5 binary(500)) -x step4
-	return -1
-step4:
+sql create table  $tb (ts timestamp, speed double, v1 binary(1500), v2 binary(1500), v3 binary(1500), v4 binary(500), v5 binary(500)) 
 sql show tables
-if $rows != 0 then 
+if $rows != 1 then 
   return -1
 endi
 
diff --git a/tests/script/windows/table/float.sim b/tests/script/windows/table/float.sim
index 4188f62166a4899c18cb963c82cb14079047eb4b..57b626f8659aace50f459f8fd185d2c64be2c0df 100644
--- a/tests/script/windows/table/float.sim
+++ b/tests/script/windows/table/float.sim
@@ -31,7 +31,7 @@ sql select * from $tb order by ts desc
 if $rows != 1 then 
   return -1
 endi
-if $data01 != 2.8500 then 
+if $data01 != 2.85000 then
   return -1
 endi
 
@@ -41,7 +41,7 @@ sql select * from $tb order by ts desc
 if $rows != 2 then 
   return -1
 endi
-if $data01 != 3.4000 then 
+if $data01 != 3.40000 then
   return -1
 endi
 
@@ -54,7 +54,7 @@ sql select * from $tb order by ts desc
 if $rows != 3 then 
   return -1
 endi
-if $data01 != 0.0000 then 
+if $data01 != 0.00000 then
   return -1
 endi
 
@@ -67,7 +67,7 @@ sql select * from $tb order by ts desc
 if $rows != 4 then 
   return -1
 endi
-if $data01 != 2.0000 then 
+if $data01 != 2.00000 then
   return -1
 endi
 
@@ -80,7 +80,7 @@ sql select * from $tb order by ts desc
 if $rows != 5 then 
   return -1
 endi
-if $data01 != 2.0000 then 
+if $data01 != 2.00000 then
   return -1
 endi
 
diff --git a/tests/script/windows/table/table.sim b/tests/script/windows/table/table.sim
index fe93fec6cd82f9eff014dd51b269ef170b889393..55be8af85145cd88f84d2d5194bb41d2a9c6afb1 100644
--- a/tests/script/windows/table/table.sim
+++ b/tests/script/windows/table/table.sim
@@ -58,7 +58,7 @@ sql create table $tb (ts timestamp, val float, val2 float)
 sql insert into $tb values(now, 5, 5)
 sql select * from $tb
 print ==> $data01 $data02
-if $data01 != 5.0000 then 
+if $data01 != 5.00000 then
   return -1
 endi
 
@@ -162,7 +162,7 @@ endi
 sql insert into $tb values(now, 5, 5)
 sql select * from $tb
 print ==> $data01 $data02
-if $data01 != 5.0000 then 
+if $data01 != 5.00000 then
   return -1
 endi
 
diff --git a/tests/script/windows/table/table_len.sim b/tests/script/windows/table/table_len.sim
index b792044b40c1603a1ede5cf72dc20f6dfe2c198b..cdd1f3173137ad881034feb1267bd08883dd4723 100644
--- a/tests/script/windows/table/table_len.sim
+++ b/tests/script/windows/table/table_len.sim
@@ -51,7 +51,7 @@ if $rows != 0 then
 endi
 
 print =============== step4
-sql create table ab01234567890123456789a0123456789a0123456789ab01234567890123456789a0123456789a0123456789 (ts timestamp, speed int)  -x step4
+sql create table ab01234567890123456789a0123456789a0123456789ab01234567890123456789a0123456789a0123456789ab01234567890123456789a0123456789a0123456789ab01234567890123456789a0123456789a0123456789ab01234567890123456789a0123456789a0123456789ab01234567890123456789a0123456789a0123456789 (ts timestamp, speed int)  -x step4
 	return -1
 step4:
 sql show tables
diff --git a/tests/script/windows/tag/add.sim b/tests/script/windows/tag/add.sim
index adcff4f62d8551f287d34e626396a7173f112665..2c72d019551d78e4b3eba710621d36d57bf75b76 100644
--- a/tests/script/windows/tag/add.sim
+++ b/tests/script/windows/tag/add.sim
@@ -30,7 +30,7 @@ endi
 if $data01 != 1 then 
   return -1
 endi
-if $data02 != true then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 2 then 
@@ -40,7 +40,7 @@ endi
 sql alter table $mt drop tag tgcol2
 sql alter table $mt add tag tgcol4 int
 sql reset query cache
-sql alter table $tb set tgcol4 =4 
+sql alter table $tb set tag tgcol4 =4 
 sql reset query cache
 
 sql select * from $mt where tgcol4 = 4
@@ -51,7 +51,7 @@ endi
 if $data01 != 1 then 
   return -1
 endi
-if $data02 != true then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 4 then 
@@ -86,7 +86,7 @@ endi
 sql alter table $mt drop tag tgcol2
 sql alter table $mt add tag tgcol4 tinyint
 sql reset query cache
-sql alter table $tb set tgcol4=4 
+sql alter table $tb set tag tgcol4=4 
 sql reset query cache
 
 sql select * from $mt where tgcol4 = 4
@@ -125,28 +125,29 @@ endi
 if $data02 != 1 then 
   return -1
 endi
-if $data03 != 2.0000 then 
+if $data03 != 2.00000 then
   return -1
 endi
 
 sql describe $tb
+print sql describe $tb
 if $data21 != BIGINT then 
   return -1
 endi
 if $data31 != FLOAT then 
   return -1
 endi
-if $data23 != 1 then 
+if $data23 != TAG then 
   return -1
 endi
-if $data33 != 2.000000 then 
+if $data33 != TAG then 
   return -1
 endi
 
 sql alter table $mt drop tag tgcol2
 sql alter table $mt add tag tgcol4 float
 sql reset query cache
-sql alter table $tb set tgcol4=4 
+sql alter table $tb set tag tgcol4=4 
 sql reset query cache
 
 sql select * from $mt where tgcol4 = 4
@@ -160,7 +161,7 @@ endi
 if $data02 != 1 then 
   return -1
 endi
-if $data03 != 4.0000 then 
+if $data03 != 4.00000 then
   return -1
 endi
 
@@ -192,7 +193,7 @@ endi
 sql alter table $mt drop tag tgcol2
 sql alter table $mt add tag tgcol4 smallint
 sql reset query cache
-sql alter table $tb set tgcol4=4 
+sql alter table $tb set tag tgcol4=4 
 sql reset query cache
 
 sql select * from $mt where tgcol4 = 4
@@ -228,7 +229,7 @@ endi
 if $data01 != 1 then 
   return -1
 endi
-if $data02 != true then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 2 then 
@@ -245,9 +246,9 @@ sql alter table $mt add tag tgcol5 binary(10)
 sql alter table $mt add tag tgcol6 binary(10)
 
 sql reset query cache
-sql alter table $tb set tgcol4=false 
-sql alter table $tb set tgcol5=5 
-sql alter table $tb set tgcol6=6 
+sql alter table $tb set tag tgcol4=false 
+sql alter table $tb set tag tgcol5=5 
+sql alter table $tb set tag tgcol6=6 
 sql reset query cache
 
 sql select * from $mt where tgcol5 = '5'
@@ -258,7 +259,7 @@ endi
 if $data01 != 1 then 
   return -1
 endi
-if $data02 != false then 
+if $data02 != 0 then
   return -1
 endi
 if $data03 != 5 then 
@@ -276,7 +277,7 @@ endi
 if $data01 != 1 then 
   return -1
 endi
-if $data02 != false then 
+if $data02 != 0 then
   return -1
 endi
 if $data03 != 5 then 
@@ -325,9 +326,9 @@ sql alter table $mt add tag tgcol5 bigint
 sql alter table $mt add tag tgcol6 tinyint
 
 sql reset query cache
-sql alter table $tb set tgcol4=4 
-sql alter table $tb set tgcol5=5 
-sql alter table $tb set tgcol6=6 
+sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol5=5 
+sql alter table $tb set tag tgcol6=6 
 sql reset query cache
 
 sql select * from $mt where tgcol6 = 6
@@ -372,7 +373,7 @@ endi
 if $data02 != 1 then 
   return -1
 endi
-if $data03 != 2.0000 then 
+if $data03 != 2.00000 then
   return -1
 endi
 if $data04 != 3 then 
@@ -385,9 +386,9 @@ sql alter table $mt drop tag tgcol3
 sql alter table $mt add tag tgcol5 binary(17)
 sql alter table $mt add tag tgcol6 bool
 sql reset query cache
-sql alter table $tb set tgcol4=4 
-sql alter table $tb set tgcol5=5 
-sql alter table $tb set tgcol6=true
+sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol5=5 
+sql alter table $tb set tag tgcol6=1
 sql reset query cache
 
 sql select * from $mt where tgcol5 = '5'
@@ -405,7 +406,7 @@ endi
 if $data03 != 5 then 
   return -1
 endi
-if $data04 != true then 
+if $data04 != 1 then
   return -1
 endi
 
@@ -447,12 +448,12 @@ sql alter table $mt add tag tgcol5 bool
 sql alter table $mt add tag tgcol6 float
 
 sql reset query cache
-sql alter table $tb set tgcol4=4 
-sql alter table $tb set tgcol5=true
-sql alter table $tb set tgcol6=6
+sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol5=1
+sql alter table $tb set tag tgcol6=6
 sql reset query cache
 
-sql select * from $mt where tgcol5 = true
+sql select * from $mt where tgcol5 = 1
 print $data01 $data02 $data03
 if $rows != 1 then 
   return -1
@@ -463,10 +464,10 @@ endi
 if $data02 != 4.000000000 then 
   return -1
 endi
-if $data03 != true then 
+if $data03 != 1 then
   return -1
 endi
-if $data04 != 6.0000 then 
+if $data04 != 6.00000 then
   return -1
 endi
 
@@ -516,8 +517,8 @@ sql alter table $mt add tag tgcol4 binary(10)
 sql alter table $mt add tag tgcol5 bool
 
 sql reset query cache
-sql alter table $tb set tgcol4=4 
-sql alter table $tb set tgcol5=false
+sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol5=false
 sql reset query cache
 
 sql select * from $mt where tgcol4 = '4'
@@ -534,10 +535,10 @@ endi
 if $data03 != 4 then 
   return -1
 endi
-if $data04 != false then 
+if $data04 != 0 then
   return -1
 endi
-if $data05 != NULL then 
+if $data05 != null then 
   return -1
 endi
 
@@ -562,7 +563,7 @@ endi
 if $data01 != 1 then 
   return -1
 endi
-if $data02 != true then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 2 then 
@@ -571,7 +572,7 @@ endi
 if $data04 != 3 then 
   return -1
 endi
-if $data05 != 4.0000 then 
+if $data05 != 4.00000 then
   return -1
 endi
 if $data06 != 5 then 
@@ -594,11 +595,11 @@ sql alter table $mt add tag tgcol7 bigint
 sql alter table $mt add tag tgcol8 smallint
 
 sql reset query cache
-sql alter table $tb set tgcol4=4 
-sql alter table $tb set tgcol5=5
-sql alter table $tb set tgcol6=6
-sql alter table $tb set tgcol7=7
-sql alter table $tb set tgcol8=8
+sql alter table $tb set tag tgcol4=4 
+sql alter table $tb set tag tgcol5=5
+sql alter table $tb set tag tgcol6=6
+sql alter table $tb set tag tgcol7=7
+sql alter table $tb set tag tgcol8=8
 sql reset query cache
 
 sql select * from $mt where tgcol5 =5
@@ -609,7 +610,7 @@ endi
 if $data01 != 1 then 
   return -1
 endi
-if $data02 != true then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 4 then 
@@ -652,13 +653,13 @@ endi
 if $data01 != 1 then 
   return -1
 endi
-if $data02 != true then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 2 then 
   return -1
 endi
-if $data04 != 3.0000 then 
+if $data04 != 3.00000 then
   return -1
 endi
 if $data05 != 4.000000000 then 
@@ -682,12 +683,12 @@ sql alter table $mt add tag tgcol4 binary(10)
 sql alter table $mt add tag tgcol5 bigint
 
 sql reset query cache
-sql alter table $tb set tgcol1=false 
-sql alter table $tb set tgcol2=5 
-sql alter table $tb set tgcol3=4
-sql alter table $tb set tgcol4=3
-sql alter table $tb set tgcol5=2
-sql alter table $tb set tgcol6=1
+sql alter table $tb set tag tgcol1=false 
+sql alter table $tb set tag tgcol2=5 
+sql alter table $tb set tag tgcol3=4
+sql alter table $tb set tag tgcol4=3
+sql alter table $tb set tag tgcol5=2
+sql alter table $tb set tag tgcol6=1
 sql reset query cache
 
 sql select * from $mt where tgcol4 = '3'
@@ -698,7 +699,7 @@ endi
 if $data01 != 1 then 
   return -1
 endi
-if $data02 != false then 
+if $data02 != 0 then
   return -1
 endi
 if $data03 != 1 then 
@@ -779,12 +780,12 @@ sql alter table $mt add tag tgcol4 int
 sql alter table $mt add tag tgcol6 bigint
 
 sql reset query cache
-sql alter table $tb set tgcol1=7 
-sql alter table $tb set tgcol2=8 
-sql alter table $tb set tgcol3=9
-sql alter table $tb set tgcol4=10
-sql alter table $tb set tgcol5=11
-sql alter table $tb set tgcol6=12
+sql alter table $tb set tag tgcol1=7 
+sql alter table $tb set tag tgcol2=8 
+sql alter table $tb set tag tgcol3=9
+sql alter table $tb set tag tgcol4=10
+sql alter table $tb set tag tgcol5=11
+sql alter table $tb set tag tgcol6=12
 sql reset query cache
 
 sql select * from $mt where tgcol2 = '8'
@@ -826,6 +827,8 @@ sql alter table $mt add tag tgcol3 binary(10)
 sql alter table $mt add tag tgcol4 int
 sql alter table $mt add tag tgcol5 bigint
 sql alter table $mt add tag tgcol6 bigint
+
+return
 sql alter table $mt add tag tgcol7 bigint -x step141
   return -1
 step141:
diff --git a/tests/script/windows/tag/change.sim b/tests/script/windows/tag/change.sim
index 95a767da496b336d65e140203b51850235ec8433..2901842190ba5acfe3dc85ea50cdb89a589263ea 100644
--- a/tests/script/windows/tag/change.sim
+++ b/tests/script/windows/tag/change.sim
@@ -30,7 +30,7 @@ endi
 if $data01 != 1 then 
   return -1
 endi
-if $data02 != true then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 2 then 
@@ -43,9 +43,9 @@ step21:
 sql alter table $mt change tag tgcol1 tgcol2 -x step22
   return -1
 step22:
-sql alter table $mt change tag tgcol1 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -x step20
-  return -1
-step20:
+#sql alter table $mt change tag tgcol1 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -x step20
+#  return -1
+#step20:
 
 sql alter table $mt change tag tgcol1 tgcol3
 sql alter table $mt change tag tgcol2 tgcol4
@@ -94,7 +94,7 @@ endi
 if $data02 != 1 then 
   return -1
 endi
-if $data03 != 2.0000 then 
+if $data03 != 2.00000 then
   return -1
 endi
 
@@ -191,7 +191,7 @@ endi
 if $data01 != 1 then 
   return -1
 endi
-if $data02 != true then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 2 then 
@@ -206,7 +206,7 @@ endi
 if $data01 != 1 then 
   return -1
 endi
-if $data02 != true then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 2 then 
@@ -278,22 +278,22 @@ endi
 if $data02 != 1 then 
   return -1
 endi
-if $data03 != 2.0000 then 
+if $data03 != 2.00000 then
   return -1
 endi
 
 sql select * from $mt where tgcol4 = 2
 print $data01 $data02 $data03
-if $rows != 1 then 
+if $rows != 1 then
   return -1
 endi
-if $data01 != 1 then 
+if $data01 != 1 then
   return -1
 endi
-if $data02 != 1 then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 2.0000 then 
+if $data03 != 2.00000 then
   return -1
 endi
   
@@ -386,7 +386,7 @@ endi
 if $data06 != 6 then 
   return -1
 endi
-if $data07 != NULL then 
+if $data07 != null then 
   return -1
 endi
 
@@ -413,7 +413,7 @@ endi
 if $data06 != 6 then 
   return -1
 endi
-if $data07 != NULL then 
+if $data07 != null then 
   return -1
 endi
 
@@ -440,7 +440,7 @@ endi
 if $data06 != 6 then 
   return -1
 endi
-if $data07 != NULL then 
+if $data07 != null then 
   return -1
 endi
 
@@ -467,7 +467,7 @@ endi
 if $data06 != 6 then 
   return -1
 endi
-if $data07 != NULL then 
+if $data07 != null then 
   return -1
 endi
 
@@ -494,7 +494,7 @@ endi
 if $data06 != 6 then 
   return -1
 endi
-if $data07 != NULL then 
+if $data07 != null then 
   return -1
 endi
 
@@ -503,4 +503,4 @@ sql drop database $db
 sql show databases
 if $rows != 0 then 
   return -1
-endi
\ No newline at end of file
+endi
diff --git a/tests/script/windows/tag/create.sim b/tests/script/windows/tag/create.sim
index e7f716316019efc7796ade5dbc3f7d66178b75a5..5beba21727ebf842269aca8b9b760e68bb2470b4 100644
--- a/tests/script/windows/tag/create.sim
+++ b/tests/script/windows/tag/create.sim
@@ -126,7 +126,8 @@ if $data01 != 1 then
   return -1
 endi
 sql select * from $mt where tgcol = 0
-if $rows != 0 then 
+if $rows != 0 then
+  print expect 0, actual: $rows
   return -1
 endi
   
@@ -176,7 +177,8 @@ sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol bool, tgcol2 bool)
 sql create table $tb using $mt tags( 1, 2 )
 sql insert into $tb values(now, 1)  
 sql select * from $mt where tgcol2 = 2
-if $rows != 1 then 
+if $rows != 1 then
+  print expect 1, actual: $rows
   return -1
 endi
 if $data01 != 1 then 
@@ -569,7 +571,7 @@ $i = 30
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(250), tgcol2 binary(250), tgcol3 binary(30)) -x step30
-  return -1
+#  return -1
 step30: 
 
 print =============== step31
@@ -577,7 +579,8 @@ $i = 31
 $mt = $mtPrefix . $i
 $tb = $tbPrefix . $i
 sql create table $mt (ts timestamp, tbcol int) TAGS(tgcol binary(5))
-sql create table $tb using $mt tags('1234567')
+sql_error create table $tb using $mt tags('1234567')
+sql create table $tb using $mt tags('12345')
 sql insert into $tb values(now, 1) 
 sql select * from $mt 
 print sql select * from $mt
diff --git a/tests/script/windows/tag/delete.sim b/tests/script/windows/tag/delete.sim
index 75702fe9eee4eb22a0dc90b17805f01ae182fd8e..e2395c8f976aca6309bf32a273d20f44eb4951b0 100644
--- a/tests/script/windows/tag/delete.sim
+++ b/tests/script/windows/tag/delete.sim
@@ -30,7 +30,7 @@ endi
 if $data01 != 1 then 
   return -1
 endi
-if $data02 != true then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 2 then 
@@ -79,7 +79,7 @@ endi
 if $data02 != 1 then 
   return -1
 endi
-if $data03 != 2.0000 then 
+if $data03 != 2.00000 then
   return -1
 endi
 
@@ -90,7 +90,7 @@ endi
 if $data31 != FLOAT then 
   return -1
 endi
-if $data23 != 1 then 
+if $data23 != TAG then 
   return -1
 endi
 
@@ -139,7 +139,7 @@ endi
 if $data01 != 1 then 
   return -1
 endi
-if $data02 != true then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 2 then 
@@ -195,13 +195,13 @@ endi
 if $data42 != 10 then 
   return -1
 endi
-if $data23 != 1 then 
+if $data23 != TAG then 
   return -1
 endi
-if $data33 != 2 then 
+if $data33 != TAG then 
   return -1
 endi
-if $data43 != 3 then 
+if $data43 != TAG then 
   return -1
 endi
 
@@ -225,7 +225,7 @@ endi
 if $data02 != 1 then 
   return -1
 endi
-if $data03 != 2.0000 then 
+if $data03 != 2.00000 then
   return -1
 endi
 if $data04 != 3 then 
@@ -307,7 +307,7 @@ endi
 if $data01 != 1 then 
   return -1
 endi
-if $data02 != true then 
+if $data02 != 1 then 
   return -1
 endi
 if $data03 != 2 then 
@@ -316,7 +316,7 @@ endi
 if $data04 != 3 then 
   return -1
 endi
-if $data05 != 4.0000 then 
+if $data05 != 4.00000 then
   return -1
 endi
 if $data06 != 5 then 
@@ -341,13 +341,13 @@ endi
 if $data01 != 1 then 
   return -1
 endi
-if $data02 != true then 
+if $data02 != 1 then 
   return -1
 endi
 if $data03 != 2 then 
   return -1
 endi
-if $data04 != 3.0000 then 
+if $data04 != 3.00000 then
   return -1
 endi
 if $data05 != 4.000000000 then 
@@ -417,10 +417,10 @@ endi
 if $data01 != 1 then 
   return -1
 endi
-if $data02 != true then 
+if $data02 != 1 then 
   return -1
 endi
-if $data03 != NULL then 
+if $data03 != null then 
   return -1
 endi
 
@@ -444,7 +444,7 @@ endi
 if $data02 != 1 then 
   return -1
 endi
-if $data03 != NULL then 
+if $data03 != null then 
   return -1
 endi
 
@@ -468,7 +468,7 @@ endi
 if $data02 != 1 then 
   return -1
 endi
-if $data03 != NULL then 
+if $data03 != null then 
   return -1
 endi
 
@@ -492,7 +492,7 @@ endi
 if $data02 != 1.000000000 then 
   return -1
 endi
-if $data03 != NULL then 
+if $data03 != null then 
   return -1
 endi
 
@@ -513,13 +513,13 @@ endi
 if $data01 != 1 then 
   return -1
 endi
-if $data02 != true then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != NULL then 
+if $data03 != null then 
   return -1
 endi
-if $data04 != NULL then 
+if $data04 != null then 
   return -1
 endi
 
@@ -546,10 +546,10 @@ endi
 if $data02 != 1 then 
   return -1
 endi
-if $data03 != NULL then 
+if $data03 != null then 
   return -1
 endi
-if $data04 != NULL then 
+if $data04 != null then 
   return -1
 endi
 
@@ -576,10 +576,10 @@ endi
 if $data02 != 1 then 
   return -1
 endi
-if $data03 != NULL then 
+if $data03 != null then 
   return -1
 endi
-if $data04 != NULL then 
+if $data04 != null then 
   return -1
 endi
 
@@ -606,10 +606,10 @@ endi
 if $data02 != 1.000000000 then 
   return -1
 endi
-if $data03 != NULL then 
+if $data03 != null then 
   return -1
 endi
-if $data04 != NULL then 
+if $data04 != null then 
   return -1
 endi
 
@@ -636,13 +636,13 @@ endi
 if $data02 != 1 then 
   return -1
 endi
-if $data03 != NULL then 
+if $data03 != null then 
   return -1
 endi
-if $data04 != NULL then 
+if $data04 != null then 
   return -1
 endi
-if $data05 != NULL then 
+if $data05 != null then 
   return -1
 endi
 
@@ -669,19 +669,19 @@ endi
 if $data01 != 1 then 
   return -1
 endi
-if $data02 != true then 
+if $data02 != 1 then
   return -1
 endi
-if $data03 != 4.0000 then 
+if $data03 != 4.00000 then
   return -1
 endi
-if $data04 != NULL then 
+if $data04 != null then 
   return -1
 endi
-if $data05 != NULL then 
+if $data05 != null then 
   return -1
 endi
-if $data06 != NULL then 
+if $data06 != null then 
   return -1
 endi
 
@@ -708,22 +708,22 @@ endi
 if $data01 != 1 then 
   return -1
 endi
-if $data02 != true then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 4.000000000 then 
   return -1
 endi
-if $data04 != NULL then 
+if $data04 != null then 
   return -1
 endi
-if $data05 != NULL then 
+if $data05 != null then 
   return -1
 endi
-if $data06 != NULL then 
+if $data06 != null then 
   return -1
 endi
-if $data07 != NULL then 
+if $data07 != null then 
   return -1
 endi
 
@@ -763,13 +763,13 @@ endi
 if $data04 != 5.000000000 then 
   return -1
 endi
-if $data05 != NULL then 
+if $data05 != null then 
   return -1
 endi
-if $data06 != NULL then 
+if $data06 != null then 
   return -1
 endi
-if $data07 != NULL then 
+if $data07 != null then 
   return -1
 endi
 
diff --git a/tests/script/windows/tag/filter.sim b/tests/script/windows/tag/filter.sim
index 72a8e39dc8e91e8cb095a600ba8fe4a87d130188..b70e56fdb6cd45b7c1e4e0c20acdf337ba1d320a 100644
--- a/tests/script/windows/tag/filter.sim
+++ b/tests/script/windows/tag/filter.sim
@@ -85,9 +85,7 @@ sql select count(tgcol), avg(tgcol), sum(tgcol), min(tgcol), max(tgcol), first(t
 step7:
 
 print =============== step8
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tbcol -x step8
-  return -1
-step8:
+sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by tbcol
 
 print =============== step9
 sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt group by noexist  -x step9
@@ -102,9 +100,7 @@ if $data00 != 100 then
 endi
 
 print =============== step11
-sql select count(tbcol) as c from $mt group by tbcol -x step11
-  return -1
-step11:
+sql select count(tbcol) as c from $mt group by tbcol
 
 print =============== step12
 sql select count(tbcol) as c from $mt group by noexist -x step12
@@ -121,7 +117,8 @@ endi
 print =============== step14
 sql select count(tbcol) as c from $mt where ts > 1000 group by tgcol
 print $data00 $data01 $data02 $data03 $data04 $data05 $data06 
-if $data00 != 100 then 
+if $data00 != 100 then
+  print expect 100, actual $data00
   return -1
 endi
 
diff --git a/tests/script/windows/tag/set.sim b/tests/script/windows/tag/set.sim
index b264164604cf09f37938c51d3186b5f79e9a49f4..580f91cb4945df5952f205e50520345b277d5a86 100644
--- a/tests/script/windows/tag/set.sim
+++ b/tests/script/windows/tag/set.sim
@@ -30,7 +30,7 @@ endi
 if $data01 != 1 then 
   return -1
 endi
-if $data02 != true then 
+if $data02 != 1 then
   return -1
 endi
 if $data03 != 2 then 
@@ -40,8 +40,8 @@ endi
 sql alter table $tb set tag tagcx 1 -x step21
   return -1
 step21:
-sql alter table $tb set tgcol1=false
-sql alter table $tb set tgcol2=4
+sql alter table $tb set tag tgcol1=false
+sql alter table $tb set tag tgcol2=4
 
 sql reset query cache
 
@@ -53,7 +53,7 @@ endi
 if $data01 != 1 then 
   return -1
 endi
-if $data02 != false then 
+if $data02 != 0 then
   return -1
 endi
 if $data03 != 4 then 
@@ -68,7 +68,7 @@ endi
 if $data01 != 1 then 
   return -1
 endi
-if $data02 != false then 
+if $data02 != 0 then
   return -1
 endi
 if $data03 != 4 then 
@@ -83,10 +83,10 @@ endi
 if $data31 != INT then 
   return -1
 endi
-if $data23 != false then 
+if $data23 != TAG then
   return -1
 endi
-if $data33 != 4 then 
+if $data33 != TAG then 
   return -1
 endi
 
@@ -111,8 +111,8 @@ if $data03 != 2 then
   return -1
 endi
 
-sql alter table $tb set tgcol1=3
-sql alter table $tb set tgcol2=4
+sql alter table $tb set tag tgcol1=3
+sql alter table $tb set tag tgcol2=4
 
 sql reset query cache
 
@@ -169,12 +169,12 @@ endi
 if $data02 != 1 then 
   return -1
 endi
-if $data03 != 2.0000 then 
+if $data03 != 2.00000 then 
   return -1
 endi
 
-sql alter table $tb set tgcol1=3
-sql alter table $tb set tgcol2=4
+sql alter table $tb set tag tgcol1=3
+sql alter table $tb set tag tgcol2=4
 
 sql reset query cache
 
@@ -189,7 +189,7 @@ endi
 if $data02 != 3 then 
   return -1
 endi
-if $data03 != 4.0000 then 
+if $data03 != 4.00000 then 
   return -1
 endi
 
@@ -204,7 +204,7 @@ endi
 if $data02 != 3 then 
   return -1
 endi
-if $data03 != 4.0000 then 
+if $data03 != 4.00000 then 
   return -1
 endi
   
@@ -230,8 +230,8 @@ if $data03 != 2 then
   return -1
 endi
 
-sql alter table $tb set tgcol1=3
-sql alter table $tb set tgcol2='4'
+sql alter table $tb set tag tgcol1=3
+sql alter table $tb set tag tgcol2='4'
 
 sql reset query cache
 
@@ -299,11 +299,11 @@ if $data07 != 6 then
 endi
 
 sql alter table $mt drop tag tgcol3
-sql alter table $tb set tgcol1='7'
-sql alter table $tb set tgcol2=8
-sql alter table $tb set tgcol4='9'
-sql alter table $tb set tgcol5=10
-sql alter table $tb set tgcol6='11'
+sql alter table $tb set tag tgcol1='7'
+sql alter table $tb set tag tgcol2=8
+sql alter table $tb set tag tgcol4='9'
+sql alter table $tb set tag tgcol5=10
+sql alter table $tb set tag tgcol6='11'
 
 sql reset query cache
   
@@ -330,7 +330,7 @@ endi
 if $data06 != 11 then 
   return -1
 endi
-if $data07 != NULL then 
+if $data07 != null then 
   return -1
 endi
 
@@ -357,7 +357,7 @@ endi
 if $data06 != 11 then 
   return -1
 endi
-if $data07 != NULL then 
+if $data07 != null then 
   return -1
 endi
 
@@ -384,7 +384,7 @@ endi
 if $data06 != 11 then 
   return -1
 endi
-if $data07 != NULL then 
+if $data07 != null then 
   return -1
 endi
 
@@ -411,7 +411,7 @@ endi
 if $data06 != 11 then 
   return -1
 endi
-if $data07 != NULL then 
+if $data07 != null then 
   return -1
 endi
 
@@ -438,7 +438,7 @@ endi
 if $data06 != 11 then 
   return -1
 endi
-if $data07 != NULL then 
+if $data07 != null then 
   return -1
 endi
 
diff --git a/tests/script/windows/vector/multi.sim b/tests/script/windows/vector/multi.sim
index 969ba5aa19cdf9e3fbc4ce125efc652310eb9266..adcc94db3be4976580e6a7c607d8ebcb613db88c 100644
--- a/tests/script/windows/vector/multi.sim
+++ b/tests/script/windows/vector/multi.sim
@@ -200,7 +200,6 @@ sql select a + f from $tb where g = 2 and ts > now + 4m order by ts asc  -x step
   return -1
 step74:
 
-
 print =============== clear
 sql drop database $db
 sql show databases