diff --git a/tests/script/general/parser/col_arithmetic_query.sim b/tests/script/general/parser/col_arithmetic_query.sim
index 61a48e4a800fe38194625c3bb039866c7cc4b05a..95e0ed68d70879de995cb3289096acf175a20612 100644
--- a/tests/script/general/parser/col_arithmetic_query.sim
+++ b/tests/script/general/parser/col_arithmetic_query.sim
@@ -7,12 +7,12 @@ $stbPrefix = ca_stb
 $rowNum = 10000
 
 $i = 0
-$db = $dbPrefix . $i
-
 $db = $dbPrefix . $i
 sql use $db
 
 $tb = $tbPrefix . 0
+$stb = $stbPrefix . $i
+
 ## TBASE-344
 sql select c1*2 from $tb
 if $rows != $rowNum then
@@ -41,7 +41,8 @@ if $data00 != 0.000000000 then
   return -1
 endi
 
-if $data01 != NaN then
+if $data01 != -nan then
+  print expect -nan, actual: $data01
   return -1
 endi
 
@@ -67,6 +68,7 @@ if $rows != 10000 then
 endi
 
 if $data00 != 0.100000000 then
+  print expect 0.100000000, acutal:$data00
   return -1
 endi
 
@@ -92,15 +94,15 @@ if $data10 != 16.000000000 then
   return -1
 endi
 
-if $data21 != 20.250000000 then
+if $data20 != 20.250000000 then
+  print expect 20.250000000, acutal:$data21
   return -1
 endi
 
-if $data31 != 0.000000000 then
+if $data30 != 0.000000000 then
   return -1
 endi
 
-
 # no result return [d.3] ==============================================================
 sql select c1 * 91- 7 from $tb where ts < 1537146000000
 if $rows != 0 then
@@ -120,11 +122,59 @@ endi
 # not available
 
 # multi row result aggregation [d.4]
-sql select top(c1, 1) - bottom(c1, 1) from $tb
-sql select top(c1, 99) - bottom(c1, 99) from $tb
+sql_error select top(c1, 1) - bottom(c1, 1) from $tb
+sql_error select top(c1, 99) - bottom(c1, 99) from $tb
+sql_error select top(c1,1) - 88 from $tb
 
 # all data types [d.6] ================================================================
-sql select c2-c1, c3/c2, c4*c3, c5%c4, c6+99%22, c2-c2 from $tb
+sql select c2-c1*1.1, c3/c2, c4*c3, c5%c4, (c6+c4)%22, c2-c2 from $tb
+if $rows != 10000 then
+ return -1
+endi
+
+if $data00 != 0.000000000 then
+  return -1
+endi
+
+if $data01 != -nan then
+  return -1
+endi
+
+if $data02 != 0.000000000 then
+  return -1
+endi
+
+if $data03 != 0.000000000 then
+  return -1
+endi
+
+if $data04 != 0.000000000 then
+  return -1
+endi
+
+if $data05 != 0.000000000 then
+  return -1
+endi
+
+if $data90 != -0.900000000 then
+  return -1
+endi
+
+if $data91 != 1.000000000 then
+  return -1
+endi
+
+if $data92 != 81.000000000 then
+  return -1
+endi
+
+if $data93 != 0.000000000 then
+  return -1
+endi
+
+if $data94 != 18.000000000 then
+  return -1
+endi
 
 # error case, ts/bool/binary/nchar not support arithmetic expression
 sql_error select ts+ts from $tb
@@ -135,8 +185,6 @@ sql_error select c9+c8 from $tb
 sql_error select c7-c8, c9-c8 from $tb
 sql_error select ts-c9 from $tb
 sql_error select c8+c7, c9+c9+c8+c7/c6 from $tb
-sql_error select c1/0, c2/0, c3/0.0 from $tb
-sql_error select c1/0.00000000001 from $tb
 
 # arithmetic expression in join [d.7]==================================================
 
@@ -162,7 +210,7 @@ if $data00 != 93.000000000 then
   return -1
 endi
 
-if $data90 != 12.000000000 then
+if $data90 != 76.000000000 then
   return -1
 endi
 
@@ -171,27 +219,81 @@ if $rows != 1 then
   return -1
 endi
 
-if $data00 !=
+if $data00 != 0.090796283 then
+  return -1
+endi
 
 # slimit/soffset not support for normal table query. [d.11]============================
 sql_error select sum(c1) from $tb slimit 1 soffset 19;
 
 # fill [d.12]==========================================================================
-sql_error select c2-c2, c3-c4, c5%c6 from $tb fill(value, 12);
+sql_error select c2-c2, c3-c4, c5%c3 from $tb fill(value, 12);
 
 # constant column. [d.13]==============================================================
+sql select c1, c2+c6, 12.9876545678, 1, 1.1 from $tb
+if $rows != 10000 then
+  return -1
+endi
+
+if $data00 != 0 then
+  return -1
+endi
+
+if $data01 != 0.000000000 then
+  return -1
+endi
+
+if $data02 != 12.987654568 then
+  return -1
+endi
 
+if $data03 != 1 then
+  return -1
+endi
+
+if $data04 != 1.100000000 then
+  return -1
+endi
+
+if $data10 != 1 then
+  return -1
+endi
 
 # column value filter [d.14]===========================================================
+sql select c1, c2+c6, 12.9876545678, 1, 1.1 from $tb where c1<2
+if $rows != 2000 then
+  return -1
+endi
 
+if $data00 != 0 then
+  return -1
+endi
+
+if $data01 != 0.000000000 then
+  return -1
+endi
+
+if $data02 != 12.987654568 then
+  return -1
+endi
+
+if $data03 != 1 then
+  return -1
+endi
+
+if $data10 != 1 then
+  return -1
+endi
+
+if $data20 != 0 then
+  return -1
+endi
 
 # tag filter(not support for normal table). [d.15]=====================================
 sql_error select c2+99 from $tb where t1=12;
 
 # multi-field output [d.16]============================================================
-sql select count(*), sum(c1)*avg(c2), avg(c3)*count(c3), sum(c3), sum(c4), first(c7), last(c8), first(c9), first(c7), last(c8) from $tb
-
-sql select c4*1+1/2 from $tb
+sql select c4*1+1/2,c4*1+1/2,c4*1+1/2,c4*1+1/2,c4*1+1/2 from $tb
 if $rows != $rowNum then
   return -1
 endi
@@ -216,15 +318,17 @@ sql_error select c7-c9 from $tb interval(2y)
 # see test cases below
 
 # multiple retrieve [d.20]===============================================================
-sql select c2-c2 from $tb;
+sql select c2-c2, 911 from $tb
 
 #======================================= aggregation function arithmetic query cases ================
 # asc/desc order [d.2]
 sql select first(c1) * ( 2 / 3 ) from $stb order by ts asc;
 sql select (count(c1) * 2) % 7.9 from $stb order by ts desc;
 
+sql select spread(c1 )/44 from $stb order by ts asc;
+
 # all possible function in the arithmetic expressioin
-sql select min(c1) * max(c2) /4, sum(c1) * percentile(c2, 20), apercentile(c4, 33) + 52/9, spread(c5)/min(c2), xxxx, from $stb where ts <  and ts >
+sql select min(c1) * max(c2) /4, sum(c1) * percentile(c2, 20), apercentile(c4, 33) + 52/9, spread(c5)/min(c2) from $stb where ts <  and ts >
 
 # no result return [d.3]
 sql select first(c1) * 91 - 7, last(c3) from $stb where ts < 1537146000000
@@ -291,7 +395,7 @@ sql_error select c2-c2, c3-c4, c5%c6 from $tb fill(value, 12);
 
 
 # tag filter(not support for normal table). [d.15]
-sql_error select c2+99 from $tb where t1=12;
+sql_error select sum(c2)+99 from $tb where t1=12;
 
 # multi-field output [d.16]
 sql select count(*), sum(c1)*avg(c2), avg(c3)*count(c3), sum(c3), sum(c4), first(c7), last(c8), first(c9), first(c7), last(c8) from $tb
@@ -325,5 +429,3 @@ sql select c2-c2 from $tb;
 
 
 sql select first(c1)-last(c1), spread(c2), max(c3) - min(c3), avg(c4)*count(c4) from $tb
-
-