other: merge 3.0

tests/pytest/crash_gen/crash_gen_main.py

@@ -809,6 +809,8 @@ class StateEmpty(AnyState):
         ]
 
     def verifyTasksToState(self, tasks, newState):
+        if Config.getConfig().ignore_errors: # if we are asked to ignore certain errors, let's not verify CreateDB success.
+            return
         if (self.hasSuccess(tasks, TaskCreateDb)
                 ):  # at EMPTY, if there's succes in creating DB
             if (not self.hasTask(tasks, TaskDropDb)):  # and no drop_db tasks
@@ -2491,7 +2493,7 @@ class MainExec:
             action='store',
             default=None,
             type=str,
-            help='Ignore error codes, comma separated, 0x supported (default: None)')
+            help='Ignore error codes, comma separated, 0x supported, also suppresses certain transition state checks. (default: None)')
         parser.add_argument(
             '-i',
             '--num-replicas',

tests/pytest/util/common.py

@@ -28,6 +28,7 @@ from util.common import *
 from util.constant import *
 from dataclasses import dataclass,field
 from typing import List
+from datetime import datetime
 
 @dataclass
 class DataSet:

tests/script/jenkins/basic.txt

@@ -27,11 +27,11 @@
 ./test.sh -f tsim/db/delete_writing2.sim
 # unsupport ./test.sh -f tsim/db/dropdnodes.sim
 ./test.sh -f tsim/db/error1.sim
-# jira ./test.sh -f tsim/db/keep.sim
+# TD-17592 ./test.sh -f tsim/db/keep.sim
 ./test.sh -f tsim/db/len.sim
 ./test.sh -f tsim/db/repeat.sim
 ./test.sh -f tsim/db/show_create_db.sim
-# jira ./test.sh -f tsim/db/show_create_table.sim
+./test.sh -f tsim/db/show_create_table.sim
 ./test.sh -f tsim/db/tables.sim
 ./test.sh -f tsim/db/taosdlog.sim
 
@@ -81,78 +81,73 @@
 ./test.sh -f tsim/insert/query_multi_file.sim
 ./test.sh -f tsim/insert/tcp.sim
 ./test.sh -f tsim/insert/update0.sim
+./test.sh -f tsim/insert/update1_sort_merge.sim
 
 # ---- parser
 ./test.sh -f tsim/parser/alter__for_community_version.sim
 ./test.sh -f tsim/parser/alter_column.sim
 ./test.sh -f tsim/parser/alter_stable.sim
 ./test.sh -f tsim/parser/alter.sim
-# jira ./test.sh -f tsim/parser/alter1.sim
+# ./test.sh -f tsim/parser/alter1.sim
 ./test.sh -f tsim/parser/auto_create_tb_drop_tb.sim
-# jira ./test.sh -f tsim/parser/auto_create_tb.sim
+./test.sh -f tsim/parser/auto_create_tb.sim
 ./test.sh -f tsim/parser/between_and.sim
 ./test.sh -f tsim/parser/binary_escapeCharacter.sim
-# jira ./test.sh -f tsim/parser/col_arithmetic_operation.sim     
-# jira ./test.sh -f tsim/parser/columnValue.sim
+# ./test.sh -f tsim/parser/col_arithmetic_operation.sim     
+# ./test.sh -f tsim/parser/columnValue.sim
 ./test.sh -f tsim/parser/commit.sim
-# jira ./test.sh -f tsim/parser/condition.sim
+# TD-17661 ./test.sh -f tsim/parser/condition.sim
 ./test.sh -f tsim/parser/constCol.sim
 ./test.sh -f tsim/parser/create_db.sim
 ./test.sh -f tsim/parser/create_mt.sim
-# jira ./test.sh -f tsim/parser/create_tb_with_tag_name.sim
+# TD-17653 ./test.sh -f tsim/parser/create_tb_with_tag_name.sim
 ./test.sh -f tsim/parser/create_tb.sim
 ./test.sh -f tsim/parser/dbtbnameValidate.sim
 ./test.sh -f tsim/parser/distinct.sim
-# jira ./test.sh -f tsim/parser/fill_stb.sim
+# TD-17623 ./test.sh -f tsim/parser/fill_stb.sim
 ./test.sh -f tsim/parser/fill_us.sim
 ./test.sh -f tsim/parser/fill.sim
 ./test.sh -f tsim/parser/first_last.sim
 ./test.sh -f tsim/parser/fourArithmetic-basic.sim
-# jira ./test.sh -f tsim/parser/function.sim
+# TD-17659 TD-17658 ./test.sh -f tsim/parser/function.sim
 ./test.sh -f tsim/parser/groupby-basic.sim
 # ./test.sh -f tsim/parser/groupby.sim
-# ./test.sh -f tsim/parser/having_child.sim
-## ./test.sh -f tsim/parser/having.sim
+# TD-17622 ./test.sh -f tsim/parser/having_child.sim
+# ./test.sh -f tsim/parser/having.sim
 ./test.sh -f tsim/parser/import_commit1.sim
 ./test.sh -f tsim/parser/import_commit2.sim
 ./test.sh -f tsim/parser/import_commit3.sim
-# jira ./test.sh -f tsim/parser/import_file.sim
+# TD-17663 ./test.sh -f tsim/parser/import_file.sim
 ./test.sh -f tsim/parser/import.sim
 ./test.sh -f tsim/parser/insert_multiTbl.sim
 ./test.sh -f tsim/parser/insert_tb.sim
-# jira ./test.sh -f tsim/parser/interp.sim
-# ./test.sh -f tsim/parser/join.sim
-# ./test.sh -f tsim/parser/join_manyblocks.sim
-## ./test.sh -f tsim/parser/join_multitables.sim
-# ./test.sh -f tsim/parser/join_multivnode.sim
+# ./test.sh -f tsim/parser/interp.sim
+./test.sh -f tsim/parser/join_manyblocks.sim
+# ./test.sh -f tsim/parser/join_multitables.sim
+# TD-17713 ./test.sh -f tsim/parser/join_multivnode.sim
+# TD-17707 ./test.sh -f tsim/parser/join.sim
 ./test.sh -f tsim/parser/last_cache.sim
-## ./test.sh -f tsim/parser/last_groupby.sim
-# jira ./test.sh -f tsim/parser/lastrow.sim
-## ./test.sh -f tsim/parser/like.sim
+./test.sh -f tsim/parser/last_groupby.sim
+# TD-17675 ./test.sh -f tsim/parser/lastrow.sim
+./test.sh -f tsim/parser/like.sim
 # ./test.sh -f tsim/parser/limit.sim
 # ./test.sh -f tsim/parser/limit1.sim
-# ./test.sh -f tsim/parser/limit1_tblocks100.sim
-## ./test.sh -f tsim/parser/limit2.sim
-## ./test.sh -f tsim/parser/limit2_tblocks100.sim
-## ./test.sh -f tsim/parser/limit_stb.sim
-## ./test.sh -f tsim/parser/limit_tb.sim
-## ./test.sh -f tsim/parser/line_insert.sim
-# ./test.sh -f tsim/parser/mixed_blocks.sim
-# ./test.sh -f tsim/parser/nchar.sim
-# ./test.sh -f tsim/parser/nestquery.sim
+# ./test.sh -f tsim/parser/limit2.sim
+./test.sh -f tsim/parser/mixed_blocks.sim
+./test.sh -f tsim/parser/nchar.sim
+# TD-17703 ./test.sh -f tsim/parser/nestquery.sim
 # ./test.sh -f tsim/parser/null_char.sim
-## ./test.sh -f tsim/parser/precision_ns.sim
-# ./test.sh -f tsim/parser/projection_limit_offset.sim
-## ./test.sh -f tsim/parser/regex.sim
-# ./test.sh -f tsim/parser/repeatAlter.sim
-# ./test.sh -f tsim/parser/selectResNum.sim
-# ./test.sh -f tsim/parser/select_across_vnodes.sim
-# ./test.sh -f tsim/parser/select_distinct_tag.sim
-# ./test.sh -f tsim/parser/select_from_cache_disk.sim
+./test.sh -f tsim/parser/precision_ns.sim
+./test.sh -f tsim/parser/projection_limit_offset.sim
+./test.sh -f tsim/parser/regex.sim
+./test.sh -f tsim/parser/select_across_vnodes.sim
+./test.sh -f tsim/parser/select_distinct_tag.sim
+./test.sh -f tsim/parser/select_from_cache_disk.sim
 # ./test.sh -f tsim/parser/select_with_tags.sim
-# ./test.sh -f tsim/parser/set_tag_vals.sim
-# ./test.sh -f tsim/parser/single_row_in_tb.sim
-# ./test.sh -f tsim/parser/sliding.sim
+./test.sh -f tsim/parser/selectResNum.sim
+# TD-17685 ./test.sh -f tsim/parser/set_tag_vals.sim
+./test.sh -f tsim/parser/single_row_in_tb.sim
+# TD-17684 ./test.sh -f tsim/parser/sliding.sim
 # ./test.sh -f tsim/parser/slimit_alter_tags.sim
 # ./test.sh -f tsim/parser/slimit.sim
 # ./test.sh -f tsim/parser/slimit1.sim
@@ -166,7 +161,8 @@
 # ./test.sh -f tsim/parser/udf_dll_stable.sim
 # ./test.sh -f tsim/parser/udf_dll.sim
 # ./test.sh -f tsim/parser/udf.sim
-# ./test.sh -f tsim/parser/union.sim
+./test.sh -f tsim/parser/union.sim
+# TD-17704 ./test.sh -f tsim/parser/union_sysinfo.sim
 # ./test.sh -f tsim/parser/where.sim
 
 # ---- query
@@ -196,7 +192,7 @@
 ./test.sh -f tsim/mnode/basic5.sim
 
 # ---- show
-# jira ./test.sh -f tsim/show/basic.sim
+./test.sh -f tsim/show/basic.sim
 
 # ---- table
 ./test.sh -f tsim/table/autocreate.sim
@@ -328,7 +324,7 @@
 ./test.sh -f tsim/vnode/stable_replica3_vnode3.sim
 
 # --- sync
-# jira ./test.sh -f tsim/sync/3Replica1VgElect.sim
+# ./test.sh -f tsim/sync/3Replica1VgElect.sim
 ./test.sh -f tsim/sync/3Replica5VgElect.sim
 ./test.sh -f tsim/sync/oneReplica1VgElect.sim
 ./test.sh -f tsim/sync/oneReplica5VgElect.sim
@@ -418,7 +414,7 @@
 ./test.sh -f tsim/tag/3.sim
 ./test.sh -f tsim/tag/4.sim
 ./test.sh -f tsim/tag/5.sim
-# jira ./test.sh -f tsim/tag/6.sim
+# TD-17382 ./test.sh -f tsim/tag/6.sim
 ./test.sh -f tsim/tag/add.sim
 ./test.sh -f tsim/tag/bigint.sim
 ./test.sh -f tsim/tag/binary_binary.sim
@@ -430,10 +426,10 @@
 # ./test.sh -f tsim/tag/column.sim
 # ./test.sh -f tsim/tag/commit.sim
 # ./test.sh -f tsim/tag/create.sim
-# ./test.sh -f tsim/tag/delete.sim
-# jira ./test.sh -f tsim/tag/double.sim
+# /test.sh -f tsim/tag/delete.sim
+# ./test.sh -f tsim/tag/double.sim
 # ./test.sh -f tsim/tag/filter.sim
-# jira ./test.sh -f tsim/tag/float.sim
+# TD-17407 ./test.sh -f tsim/tag/float.sim
 ./test.sh -f tsim/tag/int_binary.sim
 ./test.sh -f tsim/tag/int_float.sim
 ./test.sh -f tsim/tag/int.sim

tests/script/tsim/insert/update0.sim

@@ -79,8 +79,8 @@ if $rows != 3 then
   return -1
 endi
 
-if $data01 != 103 then
-  print data01 $data01 != 103
+if $data01 != 303 then
+  print data01 $data01 != 303
   return -1
 endi
 
@@ -89,8 +89,8 @@ if $data11 != 80 then
   return -1
 endi
 
-if $data21 != 40 then
-  print data21 $data21 != 40
+if $data21 != 60 then
+  print data21 $data21 != 60
   return -1
 endi
 
@@ -138,8 +138,8 @@ if $rows != 3 then
   return -1
 endi
 
-if $data01 != 103 then
-  print data01 $data01 != 103
+if $data01 != 303 then
+  print data01 $data01 != 303
   return -1
 endi
 
@@ -148,8 +148,8 @@ if $data11 != 80 then
   return -1
 endi
 
-if $data21 != 40 then
-  print data21 $data21 != 40
+if $data21 != 60 then
+  print data21 $data21 != 60
   return -1
 endi
 
@@ -208,8 +208,8 @@ if $data01 != 10 then
   return -1
 endi
 
-if $data11 != 103 then
-  print data11 $data11 != 103
+if $data11 != 303 then
+  print data11 $data11 != 303
   return -1
 endi
 
@@ -218,8 +218,8 @@ if $data21 != NULL then
   return -1
 endi
 
-if $data31 != 40 then
-  print data31 $data31 != 40
+if $data31 != 60 then
+  print data31 $data31 != 60
   return -1
 endi
 

tests/script/tsim/insert/dupinsert.sim → tests/script/tsim/insert/update1_sort_merge.sim

@@ -3,6 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
+print =============== test case: merge duplicated rows in taosc and taosd
 print =============== create database
 sql drop database if exists d0
 sql create database d0 keep 365000d,365000d,365000d
@@ -68,6 +69,85 @@ print $data30 $data31 $data32 $data33 $data34 $data35
 print $data40 $data41 $data42 $data43 $data44 $data45
 print $data50 $data51 $data52 $data53 $data54 $data55
 
+if $rows != 6 then 
+  print rows $rows != 6
+  return -1
+endi
+
+if $data01 != 30 then
+  print data01 $data01 != 30
+  return -1
+endi
+
+if $data02 != 100.000000000 then
+  print data02 $data02 != 100.000000000
+  return -1
+endi
+
+if $data03 != bin2 then
+  print data03 $data03 != bin2
+  return -1
+endi
+
+if $data04 != nchar4 then
+  print data04 $data04 != nchar4
+  return -1
+endi
+
+if $data05 != 1000.010000000 then
+  print data05 $data05 != 1000.010000000
+  return -1
+endi
+
+if $data11 != 11 then
+  print data11 $data11 != 11
+  return -1
+endi
+
+if $data12 != NULL then
+  print data12 $data12 != NULL
+  return -1
+endi
+
+if $data13 != binary then
+  print data13 $data13 != binary
+  return -1
+endi
+
+if $data14 != nchar then
+  print data14 $data14 != nchar
+  return -1
+endi
+
+if $data15 != NULL then
+  print data15 $data15 != NULL
+  return -1
+endi
+
+if $data51 != 22 then
+  print data51 $data51 != 22
+  return -1
+endi
+
+if $data52 != NULL then
+  print data52 $data52 != NULL
+  return -1
+endi
+
+if $data53 != NULL then
+  print data53 $data53 != NULL
+  return -1
+endi
+
+if $data54 != nchar then
+  print data54 $data54 != nchar
+  return -1
+endi
+
+if $data55 != 220.000000000 then
+  print data55 $data55 != 220.000000000
+  return -1
+endi
 
 
 print =============== step 6 query records of ct2 from memory(taosc and taosd merge)
@@ -79,7 +159,30 @@ if $rows != 1 then
   return -1
 endi
 
+if $data01 != 20 then
+  print data01 $data01 != 20
+  return -1
+endi
 
+if $data02 != 20.000000000 then
+  print data02 $data02 != 20.000000000
+  return -1
+endi
+
+if $data03 != xkl then
+  print data03 $data03 != xkl
+  return -1
+endi
+
+if $data04 != zxc then
+  print data04 $data04 != zxc
+  return -1
+endi
+
+if $data05 != 10.000000000 then
+  print data05 $data05 != 10.000000000
+  return -1
+endi
 
 print =============== step 7 query records of ct3 from memory
 sql select * from ct3;
@@ -103,6 +206,146 @@ if $rows != 14 then
   return -1
 endi
 
+if $data01 != 10 then
+  print data01 $data01 != 10
+  return -1
+endi
+
+if $data11 != 20 then
+  print data11 $data1 != 20
+  return -1
+endi
+
+if $data21 != 50 then
+  print data21 $data21 != 50
+  return -1
+endi
+
+if $data31 != 90 then
+  print data31 $data31 != 90
+  return -1
+endi
+
+if $data41 != 100 then
+  print data41 $data41 != 100
+  return -1
+endi
+
+if $data51 != 130 then
+  print data51 $data51 != 130
+  return -1
+endi
+
+if $data61 != 170 then
+  print data61 $data61 != 170
+  return -1
+endi
+
+if $data71 != 180 then
+  print data71 $data71 != 180
+  return -1
+endi
+
+if $data81 != 210 then
+  print data81 $data81 != 210
+  return -1
+endi
+
+if $data91 != 200 then
+  print data91 $data91 != 200
+  return -1
+endi
+
+if $data[10][1] != 190 then
+  print data[10][1] $data[10][1] != 190
+  return -1
+endi
+
+if $data[11][1] != 220 then
+  print data[11][1] $data[11][1] != 220
+  return -1
+endi
+
+if $data[12][1] != 230 then
+  print data[12][1] $data[12][1] != 230
+  return -1
+endi
+
+if $data[13][1] != 240 then
+  print data[13][1] $data[13][1] != 240
+  return -1
+endi
+
+if $data05 != 10.000000000 then
+  print data05 $data05 != 10.000000000
+  return -1
+endi
+
+if $data15 != 20.000000000 then
+  print data15 $data5 != 20.000000000
+  return -1
+endi
+
+if $data25 != 50.000000000 then
+  print data25 $data25 != 50.000000000
+  return -1
+endi
+
+if $data35 != 90.000000000 then
+  print data35 $data35 != 90.000000000
+  return -1
+endi
+
+if $data45 != 100.000000000 then
+  print data45 $data45 != 100.000000000
+  return -1
+endi
+
+if $data55 != 130.000000000 then
+  print data55 $data55 != 130.000000000
+  return -1
+endi
+
+if $data65 != 170.000000000 then
+  print data65 $data65 != 170.000000000
+  return -1
+endi
+
+if $data75 != 180.000000000 then
+  print data75 $data75 != 180.000000000
+  return -1
+endi
+
+if $data85 != 210.000000000 then
+  print data85 $data85 != 210.000000000
+  return -1
+endi
+
+if $data95 != 200.000000000 then
+  print data95 $data95 != 200.000000000
+  return -1
+endi
+
+if $data[10][5] != 190.000000000 then
+  print data[10][5] $data[10][5] != 190.000000000
+  return -1
+endi
+
+if $data[11][5] != 220.000000000 then
+  print data[11][5] $data[11][5] != 220.000000000
+  return -1
+endi
+
+if $data[12][5] != 230.000000000 then
+  print data[12][5] $data[12][5] != 230.000000000
+  return -1
+endi
+
+if $data[13][5] != 240.000000000 then
+  print data[13][5] $data[13][5] != 240.000000000
+  return -1
+endi
+
 
 print =============== step 8 query records of ct4 from memory
 sql select * from ct4;
@@ -118,12 +361,87 @@ if $rows != 5 then
   return -1
 endi
 
+if $data01 != 10 then
+  print data01 $data01 != 10
+  return -1
+endi
+
+if $data11 != 30 then
+  print data11 $data11 != 30
+  return -1
+endi
+
+if $data21 != 50 then
+  print data21 $data21 != 50
+  return -1
+endi
+
+if $data31 != 90 then
+  print data31 $data31 != 90
+  return -1
+endi
+
+if $data41 != 80 then
+  print data41 $data41 != 80
+  return -1
+endi
+
+if $data03 != b0 then
+  print data03 $data03 != b0
+  return -1
+endi
+
+if $data13 != b2 then
+  print data13 $data13 != b2
+  return -1
+endi
+
+if $data23 != b5 then
+  print data23 $data23 != b5
+  return -1
+endi
+
+if $data33 != b9 then
+  print data33 $data33 != b9
+  return -1
+endi
+
+if $data43 != b8  then
+  print data43 $data43 != b8
+  return -1
+endi
+
+if $data04 != n0 then
+  print data04 $data04 != n0
+  return -1
+endi
+
+if $data14 != n2 then
+  print data14 $data14 != n2
+  return -1
+endi
+
+if $data24 != n5 then
+  print data24 $data24 != n5
+  return -1
+endi
+
+if $data34 != n9 then
+  print data34 $data34 != n9
+  return -1
+endi
+
+if $data44 != n8 then
+  print data44 $data44 != n8
+  return -1
+endi
 
 #==================== reboot to trigger commit data to file
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
 system sh/exec.sh -n dnode1 -s start
 
 
+
 print =============== step 9 query records of ct1 from file
 sql select * from ct1;
 print $data00 $data01 $data02 $data03 $data04 $data05
@@ -138,6 +456,81 @@ if $rows != 6 then
   return -1
 endi
 
+if $data01 != 30 then
+  print data01 $data01 != 30
+  return -1
+endi
+
+if $data02 != 100.000000000 then
+  print data02 $data02 != 100.000000000
+  return -1
+endi
+
+if $data03 != bin2 then
+  print data03 $data03 != bin2
+  return -1
+endi
+
+if $data04 != nchar4 then
+  print data04 $data04 != nchar4
+  return -1
+endi
+
+if $data05 != 1000.010000000 then
+  print data05 $data05 != 1000.010000000
+  return -1
+endi
+
+if $data11 != 11 then
+  print data11 $data11 != 11
+  return -1
+endi
+
+if $data12 != NULL then
+  print data12 $data12 != NULL
+  return -1
+endi
+
+if $data13 != binary then
+  print data13 $data13 != binary
+  return -1
+endi
+
+if $data14 != nchar then
+  print data14 $data14 != nchar
+  return -1
+endi
+
+if $data15 != NULL then
+  print data15 $data15 != NULL
+  return -1
+endi
+
+if $data51 != 22 then
+  print data51 $data51 != 22
+  return -1
+endi
+
+if $data52 != NULL then
+  print data52 $data52 != NULL
+  return -1
+endi
+
+if $data53 != NULL then
+  print data53 $data53 != NULL
+  return -1
+endi
+
+if $data54 != nchar then
+  print data54 $data54 != nchar
+  return -1
+endi
+
+if $data55 != 220.000000000 then
+  print data55 $data55 != 220.000000000
+  return -1
+endi
+
 
 print =============== step 10 query records of ct2 from file
 sql select * from ct2;
@@ -148,6 +541,30 @@ if $rows != 1 then
   return -1
 endi
 
+if $data01 != 20 then
+  print data01 $data01 != 20
+  return -1
+endi
+
+if $data02 != 20.000000000 then
+  print data02 $data02 != 20.000000000
+  return -1
+endi
+
+if $data03 != xkl then
+  print data03 $data03 != xkl
+  return -1
+endi
+
+if $data04 != zxc then
+  print data04 $data04 != zxc
+  return -1
+endi
+
+if $data05 != 10.000000000 then
+  print data05 $data05 != 10.000000000
+  return -1
+endi
 
 print =============== step 11 query records of ct3 from file
 sql select * from ct3;
@@ -166,6 +583,151 @@ print $data[11][0] $data[11][1] $data[11][2] $data[11][3] $data[11][4] $data[11]
 print $data[12][0] $data[12][1] $data[12][2] $data[12][3] $data[12][4] $data[12][5] 
 print $data[13][0] $data[13][1] $data[13][2] $data[13][3] $data[13][4] $data[13][5] 
 
+if $rows != 14 then 
+  print rows $rows != 14
+  return -1
+endi
+
+if $data01 != 10 then
+  print data01 $data01 != 10
+  return -1
+endi
+
+if $data11 != 20 then
+  print data11 $data1 != 20
+  return -1
+endi
+
+if $data21 != 50 then
+  print data21 $data21 != 50
+  return -1
+endi
+
+if $data31 != 90 then
+  print data31 $data31 != 90
+  return -1
+endi
+
+if $data41 != 100 then
+  print data41 $data41 != 100
+  return -1
+endi
+
+if $data51 != 130 then
+  print data51 $data51 != 130
+  return -1
+endi
+
+if $data61 != 170 then
+  print data61 $data61 != 170
+  return -1
+endi
+
+if $data71 != 180 then
+  print data71 $data71 != 180
+  return -1
+endi
+
+if $data81 != 210 then
+  print data81 $data81 != 210
+  return -1
+endi
+
+if $data91 != 200 then
+  print data91 $data91 != 200
+  return -1
+endi
+
+if $data[10][1] != 190 then
+  print data[10][1] $data[10][1] != 190
+  return -1
+endi
+
+if $data[11][1] != 220 then
+  print data[11][1] $data[11][1] != 220
+  return -1
+endi
+
+if $data[12][1] != 230 then
+  print data[12][1] $data[12][1] != 230
+  return -1
+endi
+
+if $data[13][1] != 240 then
+  print data[13][1] $data[13][1] != 240
+  return -1
+endi
+
+if $data05 != 10.000000000 then
+  print data05 $data05 != 10.000000000
+  return -1
+endi
+
+if $data15 != 20.000000000 then
+  print data15 $data5 != 20.000000000
+  return -1
+endi
+
+if $data25 != 50.000000000 then
+  print data25 $data25 != 50.000000000
+  return -1
+endi
+
+if $data35 != 90.000000000 then
+  print data35 $data35 != 90.000000000
+  return -1
+endi
+
+if $data45 != 100.000000000 then
+  print data45 $data45 != 100.000000000
+  return -1
+endi
+
+if $data55 != 130.000000000 then
+  print data55 $data55 != 130.000000000
+  return -1
+endi
+
+if $data65 != 170.000000000 then
+  print data65 $data65 != 170.000000000
+  return -1
+endi
+
+if $data75 != 180.000000000 then
+  print data75 $data75 != 180.000000000
+  return -1
+endi
+
+if $data85 != 210.000000000 then
+  print data85 $data85 != 210.000000000
+  return -1
+endi
+
+if $data95 != 200.000000000 then
+  print data95 $data95 != 200.000000000
+  return -1
+endi
+
+if $data[10][5] != 190.000000000 then
+  print data[10][5] $data[10][5] != 190.000000000
+  return -1
+endi
+
+if $data[11][5] != 220.000000000 then
+  print data[11][5] $data[11][5] != 220.000000000
+  return -1
+endi
+
+if $data[12][5] != 230.000000000 then
+  print data[12][5] $data[12][5] != 230.000000000
+  return -1
+endi
+
+if $data[13][5] != 240.000000000 then
+  print data[13][5] $data[13][5] != 240.000000000
+  return -1
+endi
+
 
 print =============== step 12 query records of ct4 from file
 sql select * from ct4;
@@ -173,4 +735,85 @@ print $data00 $data01 $data02 $data03 $data04 $data05
 print $data10 $data11 $data12 $data13 $data14 $data15
 print $data20 $data21 $data22 $data23 $data24 $data25
 print $data30 $data31 $data32 $data33 $data34 $data35
-print $data40 $data41 $data42 $data43 $data44 $data45
\ No newline at end of file
+print $data40 $data41 $data42 $data43 $data44 $data45
+
+
+if $rows != 5 then 
+  print rows $rows != 5
+  return -1
+endi
+
+if $data01 != 10 then
+  print data01 $data01 != 10
+  return -1
+endi
+
+if $data11 != 30 then
+  print data11 $data11 != 30
+  return -1
+endi
+
+if $data21 != 50 then
+  print data21 $data21 != 50
+  return -1
+endi
+
+if $data31 != 90 then
+  print data31 $data31 != 90
+  return -1
+endi
+
+if $data41 != 80 then
+  print data41 $data41 != 80
+  return -1
+endi
+
+if $data03 != b0 then
+  print data03 $data03 != b0
+  return -1
+endi
+
+if $data13 != b2 then
+  print data13 $data13 != b2
+  return -1
+endi
+
+if $data23 != b5 then
+  print data23 $data23 != b5
+  return -1
+endi
+
+if $data33 != b9 then
+  print data33 $data33 != b9
+  return -1
+endi
+
+if $data43 != b8  then
+  print data43 $data43 != b8
+  return -1
+endi
+
+if $data04 != n0 then
+  print data04 $data04 != n0
+  return -1
+endi
+
+if $data14 != n2 then
+  print data14 $data14 != n2
+  return -1
+endi
+
+if $data24 != n5 then
+  print data24 $data24 != n5
+  return -1
+endi
+
+if $data34 != n9 then
+  print data34 $data34 != n9
+  return -1
+endi
+
+if $data44 != n8 then
+  print data44 $data44 != n8
+  return -1
+endi
\ No newline at end of file

tests/script/tsim/parser/auto_create_tb.sim

@@ -282,7 +282,7 @@ if $rows != 2 then
   return -1
 endi
 
-sql insert into tick_000001 ('ts', 'last_prc', 'volume', 'amount', 'oi', 'bid_prc1', 'ask_prc1') using tick tags (000001, Stocks) VALUES (1546391700000, 0.000000, 0, 0.000000, 0, 0.000000, 10.320000);
+sql insert into tick_000001 (ts, last_prc, volume, amount, oi, bid_prc1, ask_prc1) using tick tags ('000001', 'Stocks') VALUES (1546391700000, 0.000000, 0, 0.000000, 0, 0.000000, 10.320000);
 sql select tbname from tick
 if $rows != 1 then
    return -1

tests/script/tsim/parser/join.sim

@@ -233,14 +233,23 @@ endi
 
 print 1
 #select + where condition + interval query
-sql select count(join_tb1.*) from $tb1 , $tb2 where $ts1 = $ts2 and join_tb1.ts >= 100000 and join_tb0.c7 = true interval(10a) order by join_tb0.ts desc;
+print select count(join_tb1.*) from $tb1 , $tb2 where $ts1 = $ts2 and join_tb1.ts >= 100000 and join_tb0.c7 = true interval(10a) order by _wstart asc;
+sql select count(join_tb1.*) from $tb1 , $tb2 where $ts1 = $ts2 and join_tb1.ts >= 100000 and join_tb0.c7 = true interval(10a) order by _wstart asc;
+$val = 100
+if $rows != $val then
+  return -1
+endi
 
+print select count(join_tb1.*) from $tb1 , $tb2 where $ts1 = $ts2 and join_tb1.ts >= 100000 and join_tb0.c7 = true interval(10a) order by _wstart desc;
+sql select count(join_tb1.*) from $tb1 , $tb2 where $ts1 = $ts2 and join_tb1.ts >= 100000 and join_tb0.c7 = true interval(10a) order by _wstart desc;
 $val = 100
 if $rows != $val then
   return -1
 endi
 
-print 2
+#TODO
+return
+
 #===========================aggregation===================================
 #select + where condition
 sql select count(join_tb1.*), count(join_tb0.*) from $tb1 , $tb2 where $ts1 = $ts2 and join_tb1.ts >= 100000 and join_tb0.c7 = false;

tests/script/tsim/parser/join_manyblocks.sim

@@ -73,8 +73,6 @@ while $i < $tbNum
   $tstart = 100000
 endw
 
-sleep 100
-
 print ===============join_manyblocks.sim
 print ==============> td-3313
 sql select join_mt0.ts,join_mt0.ts,join_mt0.t1 from join_mt0, join_mt1 where join_mt0.ts=join_mt1.ts and join_mt0.t1=join_mt1.t1;

tests/script/tsim/parser/join_multivnode.sim

@@ -3,8 +3,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
-$dbPrefix = join_m_db
-$tbPrefix = join_tb
+$dbPrefix = join_db
 $mtPrefix = join_mt
 $tbNum = 3
 $rowNum = 1000
@@ -14,6 +13,7 @@ print =============== join_multivnode.sim
 $i = 0
 $db = $dbPrefix . $i
 $mt = $mtPrefix . $i
+$tbPrefix = $mt . _tb
 
 $tstart = 100000
 
@@ -54,14 +54,12 @@ while $i < $tbNum
   $tstart = 100000
 endw
 
-sleep 100
-
 $tstart = 100000
-$mt = $mtPrefix . 1 . $i
+$mt = $mtPrefix . 1 
 sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int, t2 binary(12), t3 int)
 
 $i = 0
-$tbPrefix = join_1_tb
+$tbPrefix = $mt . _tb
 
 while $i < $tbNum
   $tb = $tbPrefix . $i
@@ -100,20 +98,19 @@ while $i < $tbNum
 endw
 
 print ===============multivnode projection join.sim
-
 sql select join_mt0.ts,join_mt0.ts,join_mt0.t1 from join_mt0, join_mt1 where join_mt0.ts=join_mt1.ts and join_mt0.t1=join_mt1.t1;
-
-print $row
+print ===> rows $row
 if $row != 3000 then
   print expect 3000, actual: $row
   return -1
 endi
 
-print ======= second tags join
+# TODO 
+return
 
+print ======= second tags join
 sql create table m1(ts timestamp, k int) tags(a binary(12), b int);
 sql create table m2(ts timestamp, k int) tags(a binary(12), b int);
-
 sql insert into tm1 using m1 tags('tm1', 1) values(10000000, 1) tm2 using m2 tags('tm2', 1) values(10000000, 99);
 
 sql select * from m1,m2 where m1.ts=m2.ts and m1.b=m2.b;
@@ -122,9 +119,7 @@ if $row != 1 then
 endi
 
 sql select join_mt0.ts, join_mt1.t1 from join_mt0, join_mt1 where join_mt0.ts=join_mt1.ts and join_mt0.t1=join_mt1.t1
-
 sql select join_mt0.ts, join_mt1.t1, join_mt0.t1, join_mt1.tbname, join_mt0.tbname from join_mt0, join_mt1 where join_mt0.ts=join_mt1.ts and join_mt0.t1=join_mt1.t1
-
 sql select join_mt0.ts, join_mt1.t1, join_mt0.t1, join_mt1.tbname, join_mt0.tbname from join_mt0, join_mt1 where join_mt0.ts=join_mt1.ts and join_mt0.t1=join_mt1.t1 limit 1
 
 #1970-01-01 08:01:40.800 |                    10 |              45.000000000 |         0 |     true |     false |           0 |
@@ -135,63 +130,49 @@ sql select count(join_mt0.c1), sum(join_mt0.c2)/count(*), avg(c2), first(join_mt
 if $rows != 300 then
   return -1
 endi
-
 if $data00 != @70-01-01 08:01:40.990@ then
   print expect 70-01-01 08:01:40.990, actual: $data00
   return -1
 endi
-
 if $data01 != 10 then
   return -1
 endi
-
 if $data02 != 94.500000000 then
   print expect 94.500000000, actual $data02
   return -1
 endi
-
 if $data03 != 94.500000000 then
   return -1
 endi
-
 if $data04 != 90 then
   return -1
 endi
-
 if $data05 != 1 then
   return -1
 endi
-
 if $data06 != 0 then
   return -1
 endi
-
 if $data10 != @70-01-01 08:01:40.980@ then
   print expect 70-01-01 08:01:40.980, actual: $data10
   return -1
 endi
-
 if $data11 != 10 then
   return -1
 endi
-
 if $data12 != 84.500000000 then
   print expect 84.500000000, actual $data12
   return -1
 endi
-
 if $data13 != 84.500000000 then
   return -1
 endi
-
 if $data14 != 80 then
   return -1
 endi
-
 if $data15 != 1 then
   return -1
 endi
-
 if $data16 != 0 then
   return -1
 endi
@@ -264,100 +245,76 @@ sql select m1.ts,m1.tbname,m1.a, m2.ts,m2.tbname,m2.b from m1,m2 where m1.a=m2.b
 if $rows != 4 then
   return -1
 endi
-
 if $data00 != @20-01-01 01:01:01.000@ then
   print expect 20-01-01 01:01:01.000, actual:$data00
   return -1
 endi
-
 if $data01 != @tm0@ then
   return -1
 endi
-
 if $data02 != 0 then
   return -1
 endi
-
 if $data03 != @20-01-01 01:01:01.000@ then
   return -1
 endi
-
 if $data04 != @t0@ then
   return -1
 endi
-
 if $data05  != 0 then
   return -1
 endi
-
 if $data10 != @20-01-01 01:01:01.000@ then
   return -1
 endi
-
 if $data11 != @tm1@ then
   return -1
 endi
-
 if $data12 != 1 then
   return -1
 endi
-
 if $data13 != @20-01-01 01:01:01.000@ then
   return -1
 endi
-
 if $data14 != @t4@ then
   return -1
 endi
-
 if $data15  != 1 then
   return -1
 endi
-
 if $data20 != @20-01-01 01:01:01.000@ then
   return -1
 endi
-
 if $data21 != @tm4@ then
   return -1
 endi
-
 if $data22 != 4 then
   return -1
 endi
-
 if $data23 != @20-01-01 01:01:01.000@ then
   return -1
 endi
-
 if $data24 != @t1@ then
   return -1
 endi
-
 if $data25  != 4 then
   return -1
 endi
-
 if $data30 != @20-01-01 01:01:01.000@ then
   return -1
 endi
-
 if $data31 != @tm5@ then
   return -1
 endi
-
 if $data32 != 5 then
   return -1
 endi
-
 if $data33 != @20-01-01 01:01:01.000@ then
   return -1
 endi
-
 if $data34 != @t5@ then
   return -1
 endi
-
 if $data35 != 5 then
   return -1
 endi

tests/script/tsim/parser/last_groupby.sim

@@ -4,14 +4,11 @@ system sh/exec.sh -n dnode1 -s start
 sql connect
 
 print ======================== dnode1 start
-
 $db = testdb
-
 sql create database $db
 sql use $db
 
 sql create stable st2 (ts timestamp, f1 int, f2 float, f3 double, f4 bigint, f5 smallint, f6 tinyint, f7 bool, f8 binary(10), f9 nchar(10)) tags (id1 int, id2 float, id3 nchar(10), id4 double, id5 smallint, id6 bigint, id7 binary(10))
-
 sql create table tb1 using st2 tags (1,1.0,"1",1.0,1,1,"1");
  
 sql insert into tb1 values (now-200s,1,1.0,1.0,1,1,1,true,"1","1")
@@ -23,16 +20,13 @@ sql insert into tb1 values (now+300s,4,4.0,4.0,4,4,4,true,"4","4")
 sql insert into tb1 values (now+400s,4,4.0,4.0,4,4,4,true,"4","4")
 sql insert into tb1 values (now+500s,4,4.0,4.0,4,4,4,true,"4","4")
 
-sql select f1,last(*) from st2 group by f1;
-
+sql select f1, last(*) from st2 group by f1 order by f1;
 if $rows != 4 then
   return -1
 endi
-
 if $data00 != 1 then 
   return -1
 endi
-
 if $data02 != 1 then 
   print $data02
   return -1
@@ -59,15 +53,13 @@ if $data09 != 1 then
   return -1
 endi
 
-sql select f1,last(f1,st2.*) from st2 group by f1;
+sql select f1, last(f1,st2.*) from st2 group by f1 order by f1;
 if $rows != 4 then
   return -1
 endi
-
 if $data00 != 1 then 
   return -1
 endi
-
 if $data01 != 1 then 
   return -1
 endi

tests/script/tsim/parser/lastrow_query.sim

@@ -66,32 +66,32 @@ if $row != 21600 then
 endi
 
 #regression test case 3
-sql select t1,t1,count(*),t1,t1 from lr_stb0 where ts>'2018-09-24 00:00:00.000' and ts<'2018-09-25 00:00:00.000' partition by t1 interval(1h) fill(NULL) limit 1
+sql select _wstart, t1,t1,count(*),t1,t1 from lr_stb0 where ts>'2018-09-24 00:00:00.000' and ts<'2018-09-25 00:00:00.000' partition by t1 interval(1h) fill(NULL) limit 1
 if $row != 2 then
   return -1
 endi
-#if $data01 != 7 then
-#  return -1
-#endi
-#if $data02 != 7 then
-#  return -1
-#endi
-#if $data03 != 59 then
-#  print expect 59, actual: $data03
-#  return -1
-#endi
-#if $data04 != 7 then
-#  return -1
-#endi
-#if $data11 != 8 then
-#  return -1
-#endi
-#if $data12 != 8 then
-#  return -1
-#endi
-#if  $data13 != NULL then
-#  return -1
-#endi
+if $data01 != NULL then
+  return -1
+endi
+if $data02 != NULL then
+  return -1
+endi
+if  $data03 != NULL then
+  return -1
+endi
+if $data11 != 7 then
+  return -1
+endi
+if $data12 != 7 then
+  return -1
+endi
+if $data13 != 59 then
+  print expect 59, actual: $data03
+  return -1
+endi
+if $data14 != 7 then
+  return -1
+endi
 
 sql select t1,t1,count(*),t1,t1 from lr_stb0 where ts>'2018-09-24 00:00:00.000' and ts<'2018-09-25 00:00:00.000' partition by t1 interval(1h) fill(NULL) limit 9
 if $rows != 18 then

tests/script/tsim/parser/like.sim

@@ -5,7 +5,6 @@ sql connect
 
 print ======================== dnode1 start
 
-
 $db = testdb
 sql drop database if exists $db
 sql create database $db cachemodel 'last_value'
@@ -32,7 +31,6 @@ if $rows != 2 then
   return -1
 endi
 
-
 sql select b from $table1 where b like 'table\_name'
 if $rows != 1 then
   return -1

tests/script/tsim/parser/limit1.sim

@@ -18,7 +18,7 @@ $stb = $stbPrefix . $i
 
 sql drop database $db -x step1
 step1:
-sql create database $db 
+sql create database $db cache 16
 print ====== create tables
 sql use $db
 sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
@@ -57,11 +57,10 @@ run tsim/parser/limit1_stb.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
 run tsim/parser/limit1_tb.sim
 run tsim/parser/limit1_stb.sim
 
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/parser/limit1_stb.sim

-sleep 100
 sql connect
 
 $dbPrefix = lm1_db

tests/script/tsim/parser/limit1_tb.sim

-sleep 100
 sql connect
 
 $dbPrefix = lm1_db

tests/script/tsim/parser/limit1_tblocks100.sim

-system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -i 1
-system sh/exec.sh -n dnode1 -s start
-sql connect
-
-$dbPrefix = lm1_db
-$tbPrefix = lm1_tb
-$stbPrefix = lm1_stb
-$tbNum = 10
-$rowNum = 10000
-$totalNum = $tbNum * $rowNum
-$ts0 = 1537146000000
-$delta = 600000
-print ========== limit1.sim
-$i = 0
-$db = $dbPrefix . $i
-$stb = $stbPrefix . $i
-
-sql drop database $db -x step1
-step1:
-sql create database $db cache 16
-print ====== create tables
-sql use $db
-sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
-
-$i = 0
-$ts = $ts0
-$halfNum = $tbNum / 2
-while $i < $halfNum
-  $tbId = $i + $halfNum
-  $tb = $tbPrefix . $i
-  $tb1 = $tbPrefix . $tbId
-  sql create table $tb using $stb tags( $i )
-  sql create table $tb1 using $stb tags( $tbId )
- 
-  $x = 0
-  while $x < $rowNum
-    $xs = $x * $delta
-    $ts = $ts0 + $xs
-    $c = $x / 10
-    $c = $c * 10
-    $c = $x - $c
-    $binary = 'binary . $c
-    $binary = $binary . '
-    $nchar = 'nchar . $c
-    $nchar = $nchar . '
-    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar )  $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
-    $x = $x + 1
-  endw 
-
-  $i = $i + 1
-endw 
-print ====== tables created
-
-run tsim/parser/limit1_tb.sim
-run tsim/parser/limit1_stb.sim
-
-print ================== restart server to commit data into disk
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 500
-system sh/exec.sh -n dnode1 -s start
-print ================== server restart completed
-
-run tsim/parser/limit1_tb.sim
-run tsim/parser/limit1_stb.sim
-
-system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/parser/limit2.sim

 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c rowsInFileBlock -v 255
 system sh/exec.sh -n dnode1 -s start
-sleep 100
 sql connect
 
 $dbPrefix = lm2_db
@@ -69,10 +65,8 @@ print ====== tables created
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 500
+sleep 100
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
 run tsim/parser/limit2_query.sim
-
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file

tests/script/tsim/parser/limit2_query.sim

-sleep 100
 sql connect
 
 $dbPrefix = lm2_db
@@ -24,8 +23,11 @@ sql use $db
 ##### aggregation on stb with 6 tags + where + group by + limit offset
 $val1 = 1
 $val2 = $tbNum - 1
-sql select count(*) from $stb where t1 > $val1 and t1 < $val2 group by t1, t2, t3, t4, t5, t6 order by t1 asc limit 1 offset 0
+print select count(*) from $stb where t1 > $val1 and t1 < $val2 group by t1, t2, t3, t4, t5, t6 order by t1 asc limit 1 offset 0
+sql select count(*), t1, t2, t3, t4, t5, t6 from $stb where t1 > $val1 and t1 < $val2 group by t1, t2, t3, t4, t5, t6 order by t1 asc limit 1 offset 0
 $val = $tbNum - 3
+
+print $rows $val
 if $rows != $val then
   return -1
 endi

tests/script/tsim/parser/limit2_tblocks100.sim

-system sh/stop_dnodes.sh
-
-system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 1
-system sh/cfg.sh -n dnode1 -c rowsInFileBlock -v 255
-system sh/exec.sh -n dnode1 -s start
-sleep 100
-sql connect
-
-$dbPrefix = lm2_db
-$tbPrefix = lm2_tb
-$stbPrefix = lm2_stb
-$tbNum = 10
-$rowNum = 10000
-$totalNum = $tbNum * $rowNum
-$ts0 = 1537146000000
-$delta = 600000
-$tsu = $rowNum * $delta
-$tsu = $tsu - $delta
-$tsu = $tsu + $ts0
-
-print ========== limit2.sim
-$i = 0
-$db = $dbPrefix . $i
-$stb = $stbPrefix . $i
-
-sql drop database $db -x step1
-step1:
-sql create database $db tblocks 100 
-print ====== create tables
-sql use $db
-sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int, t2 nchar(20), t3 binary(20), t4 bigint, t5 smallint, t6 double)
-
-$i = 0
-$ts = $ts0
-$halfNum = $tbNum / 2
-while $i < $halfNum
-  $i1 = $i + $halfNum
-  $tb = $tbPrefix . $i
-  $tb1 = $tbPrefix . $i1
-  $tgstr = 'tb . $i
-  $tgstr = $tgstr . '
-  $tgstr1 = 'tb . $i1
-  $tgstr1 = $tgstr1 . '
-  sql create table $tb using $stb tags( $i , $tgstr , $tgstr , $i , $i , $i )
-  sql create table $tb1 using $stb tags( $i1 , $tgstr1 , $tgstr1 , $i , $i , $i )
- 
-  $x = 0
-  while $x < $rowNum
-    $xs = $x * $delta
-    $ts = $ts0 + $xs
-    $c = $x / 10
-    $c = $c * 10
-    $c = $x - $c
-    $binary = 'binary . $c
-    $binary = $binary . '
-    $nchar = 'nchar . $c
-    $nchar = $nchar . '
-    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) 
-    sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar ) 
-    $x = $x + 1
-  endw 
-
-  $i = $i + 1
-endw 
-print ====== tables created
-
-#run tsim/parser/limit2_query.sim
-
-print ================== restart server to commit data into disk
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 100
-system sh/exec.sh -n dnode1 -s start
-print ================== server restart completed
-
-run tsim/parser/limit2_query.sim

tests/script/tsim/parser/limit_stb.sim

-sleep 100
 sql connect
 
 $dbPrefix = lm_db

tests/script/tsim/parser/limit_tb.sim

-sleep 100
 sql connect
 
 $dbPrefix = lm_db

tests/script/tsim/parser/line_insert.sim

-system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -i 1
-system sh/exec.sh -n dnode1 -s start
-sql connect
-
-print =============== step1
-$db = testlp
-$mte = ste
-$mt = st
-sql drop database $db -x step1
-step1:
-sql create database $db precision 'us'
-sql use $db
-sql create stable $mte (ts timestamp, f int) TAGS(t1 bigint)
-
-line_insert st,t1=3i64,t2=4f64,t3="t3" c1=3i64,c3=L"passit",c2=false,c4=4f64 1626006833639000000ns
-line_insert st,t1=4i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"passitagin",c2=true,c4=5f64,c5=5f64 1626006833640000000ns
-line_insert ste,t2=5f64,t3=L"ste" c1=true,c2=4i64,c3="iam" 1626056811823316532ns
-line_insert stf,t1=4i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"passitagin",c2=true,c4=5f64,c5=5f64,c6=7u64 1626006933640000000ns
-sql select * from st
-if $rows != 2 then
-  return -1
-endi
-
-if $data00 != @21-07-11 20:33:53.639000@ then
-  return -1
-endi
-
-if $data02 != @passit@ then
-  return -1
-endi
-
-sql select * from stf
-if $rows != 1 then
-  return -1
-endi
-
-sql select * from ste
-if $rows != 1 then
-  return -1
-endi
-
-#print =============== clear
-sql drop database $db
-sql show databases
-if $rows != 0 then 
-  return -1
-endi
-
-system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/parser/mixed_blocks.sim

@@ -54,7 +54,6 @@ sql show databases
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
@@ -76,7 +75,7 @@ while $x < $rowNum
 endw 
 
 #### query a STable and using where clause to filter out all the data from tb2 and make the query only return first/last of tb1
-sql select first(ts,c1), last(ts,c1), spread(c1) from $stb where c1 > 0 group by t1
+sql select first(ts,c1), last(ts,c1), spread(c1), t1 from $stb where c1 > 0 group by t1
 if $rows != 1 then
   return -1
 endi
@@ -99,7 +98,7 @@ if $data05 != 1 then
   return -1
 endi
 
-sql select max(c1), min(c1), sum(c1), avg(c1), count(c1) from $stb where c1 > 0 group by t1
+sql select max(c1), min(c1), sum(c1), avg(c1), count(c1), t1 from $stb where c1 > 0 group by t1
 if $rows != 1 then
   return -1
 endi
@@ -149,7 +148,6 @@ 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 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'

tests/script/tsim/parser/nchar.sim

@@ -228,7 +228,8 @@ sql_error select avg(tbcol) from $mt where tbcol1 = 1 group by tgcol
 sql_error select sum(tbcol) from $mt where tbcol1 = 1 group by tgcol 
 sql_error select min(tbcol) from $mt where tbcol1 = 1 group by tgcol 
 sql_error select max(tbcol) from $mt where tbcol1 = 1 group by tgcol  
-sql select first(tbcol) from $mt where tbcol1 = 1 group by tgcol 
+
+sql select first(tbcol), tgcol from $mt where tbcol1 = 1 group by tgcol order by tgcol
 if $rows != 2 then
   return -1
 endi
@@ -244,7 +245,8 @@ endi
 if $data11 != 1 then
   return -1
 endi
-sql select last(tbcol) from $mt where tbcol1 = 1 group by tgcol
+
+sql select last(tbcol), tgcol from $mt where tbcol1 = 1 group by tgcol order by tgcol
 if $rows != 2 then
   return -1
 endi
@@ -265,6 +267,7 @@ sql create table stbb (ts timestamp, c1 nchar(5)) tags (t1 int)
 sql create table tbb1 using stbb tags(1)
 sql insert into tbb1 values ('2018-09-17 09:00:00', '涛思')
 sql insert into tbb1 values ('2018-09-17 09:00:01', 'insrt')
+
 sql select * from tbb1 order by ts asc
 if $rows != 2 then
   return -1

tests/script/tsim/parser/nestquery.sim

@@ -53,8 +53,6 @@ while $i < $half
   $i = $i + 1
 endw
 
-sleep 100
-
 $i = 1
 $tb = $tbPrefix . $i
 
@@ -63,7 +61,6 @@ sql select count(*) from (select count(*) from nest_mt0)
 if $rows != 1 then
  return -1
 endi
-
 if $data00 != 1 then
   return -1
 endi
@@ -72,35 +69,31 @@ sql select count(*) from (select count(*) from nest_mt0 group by tbname)
 if $rows != 1 then
   return -1
 endi
-
 if $data00 != 10 then
   return -1
 endi
 
-sql select count(*) from (select count(*) from nest_mt0 interval(10h) group by tbname)
+sql select count(*) from (select count(*) from nest_mt0 partition by tbname interval(10h) )
 if $rows != 1 then
   return -1
 endi
-
 if $data00 != 170 then
   return -1
 endi
 
-sql select sum(a) from (select count(*) a from nest_mt0 interval(10h) group by tbname)
+sql select sum(a) from (select count(*) a from nest_mt0 partition by tbname interval(10h))
 if $rows != 1 then
   return -1
 endi
-
 if $data00 != 100000 then
   return -1
 endi
 
 print =================> alias name test
-sql select ts from (select count(*) a from nest_tb0 interval(1h))
+sql select ts from (select _wstart as ts, count(*) a from nest_tb0 interval(1h))
 if $rows != 167 then
   return -1
 endi
-
 if $data00 != @20-09-15 00:00:00.000@ then
   return -1
 endi
@@ -109,7 +102,6 @@ sql select count(a) from (select count(*) a from nest_tb0 interval(1h))
 if $rows != 1 then
   return -1
 endi
-
 if $data00 != 167 then
    return -1
 endi
@@ -125,19 +117,16 @@ if $rows != 0 then
   return -1
 endi
 
-sql select * from (select count(*) a, tbname f1 from nest_mt0 group by tbname) t where t.a>0 and f1 = 'nest_tb0';
+sql select * from (select count(*) a, tbname f1, tbname from nest_mt0 group by tbname) t where t.a>0 and f1 = 'nest_tb0';
 if $rows != 1 then
   return -1
 endi
-
 if $data00 != 10000 then
   return -1
 endi
-
 if $data01 != @nest_tb0@ then
   return -1
 endi
-
 if $data02 != @nest_tb0@ then
   return -1
 endi
@@ -145,37 +134,30 @@ endi
 print ===================> nest query interval
 sql_error select ts, avg(c1) from (select ts, c1 from nest_tb0);
 
-sql select avg(c1) from (select * from nest_tb0) interval(3d)
+sql select _wstart, avg(c1) from (select * from nest_tb0) interval(3d)
 if $rows != 3 then
   return -1
 endi
-
 if $data00 != @20-09-14 00:00:00.000@  then
   return -1
 endi
-
 if $data01 != 49.222222222 then
   return -1
 endi
-
 if $data10 != @20-09-17 00:00:00.000@  then
-  print expect 20-09-17 00:00:00.000, actual: $data10
   return -1
 endi
-
-if $data11 != 49.685185185 then
+if $data11 != 49.581325301 then
   return -1
 endi
-
 if $data20 != @20-09-20 00:00:00.000@  then
   return -1
 endi
-
-if $data21 != 49.500000000 then
+if $data21 != 49.703539823 then
   return -1
 endi
 
-sql_error select stddev(c1) from (select c1 from nest_tb0);
+sql select stddev(c1) from (select c1 from nest_tb0);
 sql_error select percentile(c1, 20) from (select * from nest_tb0);
 sql_error select interp(c1) from (select * from nest_tb0);
 sql_error select derivative(val, 1s, 0) from (select c1 val from nest_tb0);
@@ -184,39 +166,31 @@ sql_error select irate(c1) from (select c1 from nest_tb0);
 sql_error select diff(c1), twa(c1) from (select * from nest_tb0);
 sql_error select irate(c1), interp(c1), twa(c1) from (select * from nest_tb0);
 
-sql select apercentile(c1, 50) from (select * from nest_tb0) interval(1d)
+sql select _wstart, apercentile(c1, 50) from (select * from nest_tb0) interval(1d)
 if $rows != 7 then
   return -1
 endi
-
 if $data00 != @20-09-15 00:00:00.000@ then
   return -1
 endi
-
 if $data01 != 47.571428571 then
   return -1
 endi
-
 if $data10 != @20-09-16 00:00:00.000@ then
   return -1
 endi
-
 if $data11 != 49.666666667 then
   return -1
 endi
-
 if $data20 != @20-09-17 00:00:00.000@ then
   return -1
 endi
-
 if $data21 != 49.000000000 then
   return -1
 endi
-
 if $data30 != @20-09-18 00:00:00.000@ then
   return -1
 endi
-
 if $data31 != 48.333333333 then
   return -1
 endi
@@ -225,7 +199,6 @@ sql select twa(c1) from (select * from nest_tb0);
 if $rows != 1 then
   return -1
 endi
-
 if $data00 != 49.500000000 then
   return -1
 endi
@@ -234,7 +207,6 @@ sql select leastsquares(c1, 1, 1) from (select * from nest_tb0);
 if $rows != 1 then
   return -1
 endi
-
 if $data00 != @{slop:0.000100, intercept:49.000000}@ then
   return -1
 endi
@@ -248,19 +220,15 @@ sql select derivative(c1, 1s, 0) from (select * from nest_tb0);
 if $rows != 9999 then
   return -1
 endi
-
 if $data00 != @20-09-15 00:01:00.000@ then
   return -1
 endi
-
 if $data01 != 0.016666667 then
   return -1
 endi
-
 if $data10 != @20-09-15 00:02:00.000@ then
   return -1
 endi
-
 if $data11 != 0.016666667 then
   return -1
 endi
@@ -274,54 +242,42 @@ sql select avg(c1),sum(c2), max(c3), min(c4), count(*), first(c7), last(c7),spre
 if $rows != 7 then
   return -1
 endi
-
 if $data00 != @20-09-15 00:00:00.000@ then
   return -1
 endi
-
 if $data01 != 48.666666667 then
   print expect 48.666666667, actual: $data01
   return -1
 endi
-
 if $data02 != 70080.000000000 then
   return -1
 endi
-
 if $data03 != 99 then
   return -1
 endi
-
 if $data04 != 0 then
   return -1
 endi
-
 if $data05 != 1440 then
   return -1
 endi
-
 if $data06 != 0 then
   print $data06
   return -1
 endi
-
 if $data07 != 1 then
   return -1
 endi
-
 if $data08 != 99.000000000 then
   print expect 99.000000000, actual: $data08
   return -1
 endi
-
 if $data10 != @20-09-16 00:00:00.000@ then
   return -1
 endi
-
 if $data11 != 49.777777778 then
   return -1
 endi
-
 if $data12 != 71680.000000000 then
   return -1
 endi
@@ -332,39 +288,28 @@ sql select bottom(x, 20) from (select c1 x from nest_tb0)
 
 print ===================> group by + having
 
-
-
 print =========================> ascending order/descending order
 
-
-
-
 print =========================> nest query join
 sql select a.ts,a.k,b.ts from (select count(*) k from nest_tb0 interval(30a)) a, (select count(*) f from nest_tb1 interval(30a)) b where a.ts = b.ts ;
 if $rows != 10000 then
   return -1
 endi
-
 if $data00 != @20-09-15 00:00:00.000@ then
   return -1
 endi
-
 if $data01 != 1 then
   return -1
 endi
-
 if $data02 != @20-09-15 00:00:00.000@ then
   return -1
 endi
-
 if $data10 != @20-09-15 00:01:00.000@ then
   return -1
 endi
-
 if $data11 != 1 then
   return -1
 endi
-
 if $data12 != @20-09-15 00:01:00.000@ then
   return -1
 endi
@@ -373,11 +318,9 @@ sql select sum(a.k), sum(b.f) from (select count(*) k from nest_tb0 interval(30a
 if $rows != 1 then
   return -1
 endi
-
 if $data00 != 10000 then
   return -1
 endi
-
 if $data01 != 10000 then
   return -1
 endi
@@ -386,19 +329,15 @@ sql select a.ts,a.k,b.ts,c.ts,c.ts,c.x from (select count(*) k from nest_tb0 int
 if $rows != 10000 then
   return -1
 endi
-
 if $data00 != @20-09-15 00:00:00.000@ then
   return -1
 endi
-
 if $data01 != 1 then
   return -1
 endi
-
 if $data02 != @20-09-15 00:00:00.000@ then
   return -1
 endi
-
 if $data03 != @20-09-15 00:00:00.000@ then
   return -1
 endi
@@ -407,11 +346,9 @@ sql select diff(val) from (select c1 val from nest_tb0);
 if $rows != 9999 then
   return -1
 endi
-
 if $data00 != @70-01-01 08:00:00.000@ then
   return -1
 endi
-
 if $data01 != 1 then
   return -1
 endi
@@ -425,19 +362,15 @@ sql select count(*),c1 from (select * from nest_tb0) where c1 < 2 group by c1;
 if $rows != 2 then
   return -1
 endi
-
 if $data00 != 100 then
   return -1
 endi
-
 if $data01 != 0 then
   return -1
 endi
-
 if $data10 != 100 then
   return -1
 endi
-
 if $data11 != 1 then
   return -1
 endi
@@ -447,11 +380,9 @@ sql select twa(c1) from nest_tb1 interval(19a);
 if $rows != 10000 then
   return -1
 endi
-
 if $data00 != @20-09-14 23:59:59.992@ then
   return -1
 endi
-
 if $data01 != 0.000083333 then
   return -1
 endi
@@ -461,19 +392,15 @@ sql select min(val),max(val),first(val),last(val),count(val),sum(val),avg(val) f
 if $rows != 1 then
   return -1
 endi
-
 if $data00 != 10000 then
   return -1
 endi
-
 if $data01 != 10000 then
   return -1
 endi
-
 if $data04 != 10 then
   return -1
 endi
-
 if $data05 != 100000 then
   return -1
 endi
@@ -487,19 +414,15 @@ sql select avg(k) from (select avg(k) k from t1 interval(1s)) interval(1m);
 if $rows != 2 then
   return -1
 endi
-
 if $data00 != @20-01-01 01:01:00.000000@ then
   return -1
 endi
-
 if $data01 != 1.000000000 then
   return -1
 endi
-
 if $data10 != @20-01-01 01:02:00.000000@ then
   return -1
 endi
-
 if $data11 != 2.000000000 then
   return -1
 endi

tests/script/tsim/parser/null_char.sim

@@ -78,6 +78,8 @@ endi
 #### case 1: tag NULL, or 'NULL'
 sql create table mt2 (ts timestamp, col1 int, col3 float, col5 binary(8), col6 bool, col9 nchar(8)) tags (tag1 binary(8), tag2 nchar(8), tag3 int, tag5 bool)
 sql create table st2 using mt2 tags (NULL, 'NULL', 102, 'true')
+sql insert into st2 (ts, col1) values(now, 1)
+
 sql select tag1, tag2, tag3, tag5 from st2
 if $rows != 1 then
   return -1
@@ -115,6 +117,7 @@ if $rows != 0 then
 endi
 
 sql create table st3 using mt2 tags (NULL, 'ABC', 103, 'FALSE')
+sql insert into st3 (ts, col1) values(now, 1)
 sql select tag1, tag2, tag3, tag5 from st3
 if $rows != 1 then
   return -1
@@ -134,9 +137,10 @@ if $data03 != 0 then
 endi
 
 ### bool:
-sql_error create table stx using mt2 tags ('NULL', '123aBc', 104, '123')
-sql_error create table sty using mt2 tags ('NULL', '123aBc', 104, 'xtz')
+sql create table stx using mt2 tags ('NULL', '123aBc', 104, '123')
+sql create table sty using mt2 tags ('NULL', '123aBc', 104, 'xtz')
 sql create table st4 using mt2 tags ('NULL', '123aBc', 104, 'NULL')
+sql insert into st4 (ts, col1) values(now, 1)
 sql select tag1,tag2,tag3,tag5 from st4
 if $rows != 1 then
   return -1
@@ -150,12 +154,13 @@ endi
 if $data02 != 104 then
   return -1
 endi
-if $data03 != NULL then
+if $data03 != 0 then
   print ==6== expect: NULL, actually: $data03
   return -1
 endi
 
 sql create table st5 using mt2 tags ('NULL', '123aBc', 105, NULL)
+sql insert into st5 (ts, col1) values(now, 1)
 sql select tag1,tag2,tag3,tag5 from st5
 if $rows != 1 then
   return -1
@@ -173,8 +178,6 @@ if $data03 != NULL then
   return -1
 endi
 
-
-
 #### case 2: dynamic create table using super table when insert into
 sql create table mt3 (ts timestamp, col1 int, col3 float, col5 binary(8), col6 bool, col9 nchar(8)) tags (tag1 binary(8), tag2 nchar(8), tag3 int, tag5 bool)
 sql_error insert into st31 using mt3 tags (NULL, 'NULL', 102, 'true')     values (now+1s, 31, 31, 'bin_31', '123', 'nchar_31')
@@ -182,10 +185,10 @@ sql_error insert into st32 using mt3 tags (NULL, 'ABC', 103, 'FALSE')     values
 sql_error insert into st33 using mt3 tags ('NULL', '123aBc', 104, 'NULL') values (now+3s, 33, 33, 'bin_33', 'false123', 'nchar_33')
 sql_error insert into st34 using mt3 tags ('NULL', '123aBc', 105, NULL)   values (now+4s, 34, 34.12345, 'bin_34', 'true123', 'nchar_34')
 
-
 #### case 3: set tag value
 sql create table mt4 (ts timestamp, c1 int) tags (tag_binary binary(16), tag_nchar nchar(16), tag_int int, tag_bool bool, tag_float float, tag_double double)
 sql create table st41 using mt4 tags ("beijing", 'nchar_tag', 100, false, 9.12345, 7.123456789)
+sql insert into st41 (ts, c1) values(now, 1)
 sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from st41
 if $rows != 1 then
   return -1
@@ -245,7 +248,7 @@ endi
 ################### nchar
 sql alter table st41 set tag tag_nchar = "��˼����"
 sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
-#sleep 100
+
 #if $data01 != ��˼���� then
 #  print ==== expect ��˼����, actually $data01
 #  return -1

tests/script/tsim/parser/precision_ns.sim

@@ -48,8 +48,6 @@ while $x < $rowNum
     $x = $x + 1  
 endw
 
-sleep 100
-
 print =============== step2: select count(*) from tables
 $i = 0
 $tb = $tbPrefix . $i
@@ -103,7 +101,7 @@ sql select count(*) from $mt interval(100000000b) sliding(100000000b)
 print =============== clear
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 

tests/script/tsim/parser/projection_limit_offset.sim

@@ -271,14 +271,14 @@ endi
 
 #[tbase-695]
 sql select ts,tbname from group_mt0 where ts>='1970-01-01 8:1:40' and ts<'1970-1-1 8:1:45' and c1<99999999 limit 100000 offset 5000
+print ===> $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
+print ===> $data10 $data11 $data12 $data13 $data14 $data15 $data16 $data17 $data18 $data19
+print ===> $data20 $data21 $data22 $data23 $data24 $data25 $data26 $data27 $data28 $data29
+print ===> $data30 $data31 $data32 $data33 $data34 $data35 $data36 $data37 $data38 $data39
 if $row != 35000 then
    return -1
 endi
 
-if $data00 != @70-01-01 08:01:40.000@ then
-   return -1
-endi
-
 #=================================parse error sql==========================================
 sql_error select ts,tbname from group_mt0 order by ts desc limit 100 offset -1;
 sql_error select ts,tbname from group_mt0 order by c1 asc limit 100 offset -1;
@@ -287,13 +287,13 @@ sql_error select ts,tbname from group_mt0 order by ts desc slimit -1, 100;
 sql_error select ts,tbname from group_mt0 order by ts desc slimit 1 soffset 1;
 
 #================================functions applys to sql===================================
-sql_error select first(t1) from group_mt0;
-sql_error select last(t1) from group_mt0;
-sql_error select min(t1) from group_mt0;
-sql_error select max(t1) from group_mt0;
-sql_error select top(t1, 20) from group_mt0;
-sql_error select bottom(t1, 20) from group_mt0;
-sql_error select avg(t1) from group_mt0;
+sql select first(t1) from group_mt0;
+sql select last(t1) from group_mt0;
+sql select min(t1) from group_mt0;
+sql select max(t1) from group_mt0;
+sql select top(t1, 20) from group_mt0;
+sql select bottom(t1, 20) from group_mt0;
+sql select avg(t1) from group_mt0;
 sql_error select percentile(t1, 50) from group_mt0;
 sql_error select percentile(t1, 50) from group_mt0;
 sql_error select percentile(t1, 50) from group_mt0;
@@ -309,7 +309,7 @@ endi
 
 #====================================tbase-716==============================================
 print tbase-716
-sql_error select count(*) from group_tb0 where ts in ('2016-1-1 12:12:12');
+sql select count(*) from group_tb0 where ts in ('2016-1-1 12:12:12');
 sql_error select count(*) from group_tb0 where ts < '12:12:12';
 
 #===============================sql for twa==========================================
@@ -345,7 +345,7 @@ if $rows != 0 then
   return -1
 endi
 
-sql select count(*),first(k),last(k) from m1 where tbname in ('tm0') interval(1s) order by ts desc;
+sql select _wstart, count(*),first(k),last(k) from m1 where tbname in ('tm0') interval(1s) order by _wstart desc;
 if $row != 5 then
     return -1
 endi
@@ -374,6 +374,7 @@ if $data13 != NULL then
    return -1
 endi
 
+
 print =============tbase-1324
 sql select a, k-k from m1
 if $row != 8 then
@@ -384,8 +385,7 @@ sql select diff(k) from tm0
 if $row != 3 then
    return -1
 endi
-
-if $data21 != -1 then
+if $data20 != -1 then
    return -1
 endi
 
@@ -395,20 +395,19 @@ sql_error select * from 1;
 sql_error select k+k;
 sql_error select k+1;
 sql_error select abc();
-sql_error select 1 where 1=2;
-sql_error select 1 limit 1;
-sql_error select 1 slimit 1;
-sql_error select 1 interval(1h);
+sql select 1 where 1=2;
+sql select 1 limit 1;
+sql select 1 slimit 1;
+sql select 1 interval(1h);
 sql_error select count(*);
 sql_error select sum(k);
-sql_error select 'abc';
+sql select 'abc';
 sql_error select k+1,sum(k) from tm0;
 sql_error select k, sum(k) from tm0;
 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 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 

tests/script/tsim/parser/regex.sim

@@ -18,12 +18,15 @@ sql create table $ct1_name using $st_name tags('taosdata1')
 sql create table $ct2_name using $st_name tags('taosdata2')
 sql create table not_match using $st_name tags('NOTMATCH')
 
+sql insert into $ct1_name values(now, 'this is engine')
+sql insert into $ct2_name values(now, 'this is app egnine')
+sql insert into not_match values (now + 1s, '1234')
+
 sql select tbname from $st_name where tbname match '.*'
 if $rows != 3 then
   return -1
 endi
 
-
 sql select tbname from $st_name where tbname match '^ct[[:digit:]]'
 if $rows != 2 then
   return -1
@@ -54,9 +57,6 @@ if $rows != 1 then
   return -1
 endi
 
-sql insert into $ct1_name values(now, 'this is engine')
-sql insert into $ct2_name values(now, 'this is app egnine')
-
 sql select c1b from $st_name where c1b match 'engine'
 if $data00 != @this is engine@ then
   return -1
@@ -66,12 +66,11 @@ if $rows != 1 then
   return -1
 endi  
 
-sql select c1b from $st_name where c1b nmatch 'engine'
+sql select c1b from $st_name where c1b nmatch 'engine' order by ts
 if $data00 != @this is app egnine@ then
   return -1
 endi
-
-if $rows != 1 then
+if $rows != 2 then
   return -1
 endi  
 
@@ -96,8 +95,8 @@ sql_error select * from wrong_type where c5 match '.*'
 sql_error select * from wrong_type where c5 nmatch '.*'
 sql_error select * from wrong_type where c6 match '.*'
 sql_error select * from wrong_type where c6 nmatch '.*'
-sql_error select * from wrong_type where c7 match '.*'
-sql_error select * from wrong_type where c7 nmatch '.*'
+sql select * from wrong_type where c7 match '.*'
+sql select * from wrong_type where c7 nmatch '.*'
 sql_error select * from wrong_type where t1 match '.*'
 sql_error select * from wrong_type where t1 nmatch '.*'
 sql_error select * from wrong_type where t2 match '.*'
@@ -110,9 +109,7 @@ sql_error select * from wrong_type where t5 match '.*'
 sql_error select * from wrong_type where t5 nmatch '.*'
 sql_error select * from wrong_type where t6 match '.*'
 sql_error select * from wrong_type where t6 nmatch '.*'
-sql_error select * from wrong_type where t7 match '.*'
-sql_error select * from wrong_type where t7 nmatch '.*'
+sql select * from wrong_type where t7 match '.*'
+sql select * from wrong_type where t7 nmatch '.*'
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-
-

tests/script/tsim/parser/selectResNum.sim

@@ -20,7 +20,7 @@ $stb = $stbPrefix . $i
 
 sql drop database $db -x step1
 step1:
-sql create database $db cache 16
+sql create database $db 
 print ====== create tables
 sql use $db
 sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
@@ -114,12 +114,8 @@ endw
 
 print ====== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ====== server restart completed
-sleep 100
-sql connect
-sleep 100
 sql use $db
 
 ##### repeat test after server restart

tests/script/tsim/parser/select_across_vnodes.sim

@@ -17,7 +17,7 @@ $db = $dbPrefix
 $stb = $stbPrefix
 
 sql drop database if exists $db
-sql create database $db
+sql create database $db vgroups 10
 sql use $db
 print ====== create tables
 sql create table $stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 smallint, c6 tinyint, c7 bool, c8 binary(10), c9 nchar(10)) tags(t1 int)
@@ -72,7 +72,7 @@ endi
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 

tests/script/tsim/parser/select_distinct_tag.sim

@@ -27,6 +27,7 @@ $ts = $ts0
 while $i < $tbNum
   $tb = $tbPrefix . $i
   sql create table $tb using $stb tags( $i , 0 )
+  sql insert into $tb (ts, c1) values (now, 1);
   $i = $i + 1
 endw 
 
@@ -50,7 +51,7 @@ sql_error select distinct t1, t2 from &stb
 
 sql drop database $db
 sql show databases
-if $rows != 0 then 
+if $rows != 2 then 
   return -1
 endi
 

tests/script/tsim/parser/select_from_cache_disk.sim

@@ -31,17 +31,13 @@ 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 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
-sql connect
-sleep 100
-sql use $db
 
 # generate some data in cache
 sql insert into $tb values ('2018-09-17 09:00:04.000', 4)
 sql insert into $tb values ('2018-09-17 09:00:04.010', 5)
-sql select count(*) from $stb interval(1s) group by t1
+sql select _wstart, count(*), t1 from $stb partition by t1 interval(1s) order by _wstart
 if $rows != 2 then
   return -1
 endi

tests/script/tsim/parser/select_with_tags.sim

@@ -62,9 +62,6 @@ while $i < $tbNum
 
 endw
 
-sleep 100
-
-
 #======================= only check first table tag, TD-4827
 sql select count(*) from $mt where t1 in (0)  
 if $rows != 1 then 
@@ -178,15 +175,15 @@ if $data03 != @abc15@ then
 endi
 
 sql select top(c6, 3) from select_tags_mt0 interval(10a)
-sql select top(c3,10) from select_tags_mt0 interval(10a) group by tbname,t1,t2
-sql select top(c6, 3) from select_tags_mt0 interval(10a) group by tbname;
+sql select top(c3,10) from select_tags_mt0 partition by tbname,t1,t2 interval(10a)
+sql select top(c6, 3) from select_tags_mt0 partition by tbname interval(10a)
 
 sql select top(c6, 10) from select_tags_mt0 interval(10a);
 if $rows != 12800 then
   return -1
 endi
 
-sql select top(c1, 80), tbname, t1, t2 from select_tags_mt0;
+sql select _rowts, top(c1, 80), tbname, t1, t2 from select_tags_mt0;
 if $rows != 80 then
    return -1
 endi

tests/script/tsim/parser/set_tag_vals.sim

@@ -55,10 +55,8 @@ while $i < $tbNum
 
   $i = $i + 1
 endw 
-print ====== tables created
-
-sleep 500
 
+print ====== tables created
 sql show tables
 if $rows != $tbNum then
   return -1
@@ -74,12 +72,16 @@ while $i < $tbNum
   sql insert into $tb (ts, c1) values (now-100a, $i )
   sql alter table $tb set tag t3 = $i
   sql insert into $tb (ts, c1) values (now, $i )
-  sql alter table $tb set tag t4 = $i
+
+  $name = ' . $i
+  $name = $name . '
+  sql alter table $tb set tag t4 = $name
   $i = $i + 1
 endw
 
 print ================== all tags have been changed!
-sql_error select tbname from $stb where t3 = 'NULL'
+sql reset query cache
+sql select tbname from $stb where t3 = 'NULL'
 
 print ================== set tag to NULL
 sql create table stb1_tg (ts timestamp, c1 int) tags(t1 int,t2 bigint,t3 double,t4 float,t5 smallint,t6 tinyint)
@@ -142,7 +144,9 @@ sql alter table tb1_tg2 set tag t1 = false
 sql alter table tb1_tg2 set tag t2 = 'binary2'
 sql alter table tb1_tg2 set tag t3 = '涛思'
 sql reset query cache
+
 sql select * from stb1_tg
+print ===> $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
 if $rows != 1 then
   return -1
 endi
@@ -164,7 +168,9 @@ endi
 if $data07 != -6 then
   return -1
 endi
+
 sql select * from stb2_tg
+print ===> $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
 if $data02 != 0 then
   return -1
 endi
@@ -185,7 +191,9 @@ sql alter table tb1_tg2 set tag t1 = NULL
 sql alter table tb1_tg2 set tag t2 = NULL
 sql alter table tb1_tg2 set tag t3 = NULL
 sql reset query cache
+
 sql select * from stb1_tg
+print ===> $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
 if $rows != 1 then
   return -1
 endi
@@ -207,12 +215,12 @@ endi
 if $data07 != NULL then
   return -1
 endi
+
 sql select * from stb2_tg
+print ===> $data00 $data01 $data02 $data03 $data04 $data05 $data06 $data07 $data08 $data09
 if $data02 != NULL then
   return -1
 endi
-
-print $data03
 if $data03 != NULL then
   return -1
 endi

tests/script/tsim/parser/single_row_in_tb_query.sim

-sleep 100
 sql connect
 
 $dbPrefix = sr_db
@@ -113,7 +112,7 @@ if $data02 != 2 then
 endi
 
 #### query a STable and using where clause
-sql select first(ts,c1), last(ts,c1), spread(c1) from $stb where ts >= $ts0 and ts < '2018-09-20 00:00:00.000' group by t1
+sql select first(ts,c1), last(ts,c1), spread(c1), t1 from $stb where ts >= $ts0 and ts < '2018-09-20 00:00:00.000' group by t1
 if $rows != 1 then
   return -1
 endi
@@ -137,7 +136,7 @@ if $data05 != 1 then
   return -1
 endi
 
-sql select first(c1), last(c1) from $stb where ts >= $ts0 and ts < '2018-09-20 00:00:00.000' interval(1d) group by t1
+sql select _wstart, first(c1), last(c1) from sr_stb where ts >= 1537146000000 and ts < '2018-09-20 00:00:00.000' partition by t1 interval(1d)
 if $rows != 1 then
   return -1
 endi
@@ -151,7 +150,7 @@ if $data02 != 1 then
   return -1
 endi
 
-sql select max(c1), min(c1), sum(c1), avg(c1), count(c1) from $stb where c1 > 0 group by t1
+sql select max(c1), min(c1), sum(c1), avg(c1), count(c1), t1 from $stb where c1 > 0 group by t1
 if $rows != 1 then
   return -1
 endi
@@ -174,7 +173,7 @@ if $data05 != 1 then
   return -1
 endi
 
-sql select first(ts,c1), last(ts,c1) from $tb1 where ts >= $ts0 and ts < '2018-09-20 00:00:00.000' interval(1d)
+sql select _wstart, first(ts,c1), last(ts,c1) from $tb1 where ts >= $ts0 and ts < '2018-09-20 00:00:00.000' interval(1d)
 if $rows != 1 then
   return -1
 endi

tests/script/tsim/parser/sliding.sim

@@ -58,8 +58,6 @@ while $i < $tbNum
   $tstart = 946656000000
 endw
 
-sleep 100
-
 $i1 = 1
 $i2 = 0
 
@@ -76,425 +74,358 @@ $ts1 = $tb1 . .ts
 $ts2 = $tb2 . .ts
 
 print ===============================interval_sliding query
-sql select count(*) from sliding_tb0 interval(30s) sliding(30s);
+sql select _wstart, count(*) from sliding_tb0 interval(30s) sliding(30s);
 if $row != 10 then
  return -1
 endi
-
 if $data00 != @00-01-01 00:00:00.000@ then
  return -1
 endi
-
 if $data01 != 1000 then
  return -1
 endi
-
 if $data10 != @00-01-01 00:00:30.000@ then
  return -1
 endi
-
 if $data11 != 1000 then
  return -1
 endi
 
-sql select stddev(c1) from sliding_tb0 interval(10a) sliding(10a)
+sql select _wstart, stddev(c1) from sliding_tb0 interval(10a) sliding(10a);
 if $row != 10000 then
   return -1
 endi
-
 if $data00 != @00-01-01 00:00:00.000@ then
   return -1
 endi
-
 if $data01 != 0.000000000 then
    return -1
 endi
-
 if $data90 != @00-01-01 00:00:00.270@ then
   return -1
 endi
-
 if $data91 != 0.000000000 then
   return -1
 endi
 
-sql select stddev(c1),count(c2),first(c3),last(c4) from sliding_tb0 interval(10a) sliding(10a) order by ts desc;
+sql select _wstart, stddev(c1),count(c2),first(c3),last(c4) from sliding_tb0 interval(10a) sliding(10a) order by _wstart desc;
 if $row != 10000 then
   return -1
 endi
-
 if $data00 != @00-01-01 00:04:59.970@ then
  return -1
 endi
-
 if $data01 != 0.000000000 then
   return -1
 endi
-
 if $data02 != 1 then
   return -1
 endi
-
 if $data03 != 99 then
   return -1
 endi
-
 if $data04 != 99 then
   return -1
 endi
-
 if $data90 != @00-01-01 00:04:59.700@ then
   return -1
 endi
-
 if $data91 != 0.000000000 then
   return -1
 endi
-
 if $data92 != 1 then
   return -1
 endi
-
 if $data93 != 90 then
   return -1
 endi
-
 if $data94 != 90 then
   return -1
 endi
 
-sql select count(c2),last(c4) from sliding_tb0 interval(30s) sliding(10s) order by ts asc;
+sql select _wstart, count(c2),last(c4) from sliding_tb0 interval(30s) sliding(10s) order by _wstart asc;
 if $row != 32 then
   return -1
 endi
-
 if $data00 != @99-12-31 23:59:40.000@ then
   print expect 12-31 23:59:40.000, actual: $data00
   return -1
 endi
-
 if $data01 != 334 then
   return -1
 endi
-
 if $data02 != 33 then
   return -1
 endi
 
-sql select count(c2),stddev(c3),first(c4),last(c4) from sliding_tb0 where ts>'2000-01-01 0:0:0' and ts<'2000-1-1 0:0:31' interval(30s) sliding(30s) order by ts asc;
+sql select _wstart, count(c2),stddev(c3),first(c4),last(c4) from sliding_tb0 where ts>'2000-01-01 0:0:0' and ts<'2000-1-1 0:0:31' interval(30s) sliding(30s) order by _wstart asc;
 if $row != 2 then
   return -1
 endi
-
 if $data04 != 99 then
   return -1
 endi
-
 if $data01 != 999 then
   return -1
 endi
-
 if $data02 != 28.837977152 then
   return -1
 endi
 
 #interval offset + limit
-sql select count(c2), first(c3),stddev(c4) from sliding_tb0 interval(10a) sliding(10a) order by ts desc limit 10 offset 990;
+sql select _wstart, count(c2), first(c3),stddev(c4) from sliding_tb0 interval(10a) sliding(10a) order by _wstart desc limit 10 offset 990;
 if $row != 10 then
   return -1
 endi
-
 if $data00 != @00-01-01 00:04:30.270@ then
   return -1
 endi
-
 if $data01 != 1 then
   return -1
 endi
-
 if $data02 != 9 then
   return -1
 endi
-
 if $data03 != 0.000000000 then
   return -1
 endi
-
 if $data90 != @00-01-01 00:04:30.000@ then
   return -1
 endi
-
 if $data91 != 1 then
   return -1
 endi
-
 if $data92 != 0 then
   return -1
 endi
-
 if $data93 != 0.000000000 then
   return -1
 endi
 
 #interval offset test
-sql select count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(30s) order by ts asc limit 1000 offset 1;
+sql select _wstart, count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(30s) order by _wstart asc limit 1000 offset 1;
 if $row != 9 then
   return -1
 endi
-
 if $data00 != @00-01-01 00:00:30.000@ then
   return -1
 endi
-
 if $data01 != 1000 then
   return -1
 endi
-
 if $data02 != 99 then
   return -1
 endi
-
 if $data80 != @00-01-01 00:04:30.000@ then
   return -1
 endi
-
 if $data81 != 1000 then
   return -1
 endi
 
-sql select count(c2),last(c4),stddev(c3) from sliding_tb0 where ts>'2000-1-1 0:0:0' and ts<'2000-1-1 0:0:31' interval(30s) sliding(30s) order by ts asc limit 1000 offset 0;
+sql select _wstart, count(c2),last(c4),stddev(c3) from sliding_tb0 where ts>'2000-1-1 0:0:0' and ts<'2000-1-1 0:0:31' interval(30s) sliding(30s) order by _wstart asc limit 1000 offset 0;
 if $row != 2 then
  return -1
 endi
-
 if $data00 != @00-01-01 00:00:00.000@ then
  return -1
 endi
-
 if $data01 != 999 then
  return -1
 endi
-
 if $data02 != 99 then
  return -1
 endi
-
 if $data03 != 28.837977152 then
  return -1
 endi
-
 if $data10 != @00-01-01 00:00:30.000@ then
  return -1
 endi
-
 if $data11 != 34 then
  return -1
 endi
-
 if $data12 != 33 then
  return -1
 endi
-
 if $data13 != 9.810708435 then
  return -1
 endi
 
-sql select count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(20s) order by ts asc limit 100 offset 1;
+sql select _wstart, count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(20s) order by _wstart asc limit 100 offset 1;
 if $row != 15 then
  return -1
 endi
-
 if $data00 != @00-01-01 00:00:00.000@ then
  return -1
 endi
-
 if $data01 != 1000 then
  return -1
 endi
-
 if $data02 != 99 then
  return -1
 endi
-
 if $data03 != 28.866070048 then
  return -1
 endi
-
 if $data90 != @00-01-01 00:03:00.000@ then
  return -1
 endi
-
 if $data91 != 1000 then
  return -1
 endi
-
 if $data92 != 99 then
  return -1
 endi
 
-sql select count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(20s) order by ts asc limit 100 offset 5;
+sql select count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(20s) order by _wstart asc limit 100 offset 5;
 if $row != 11 then
  return -1
 endi
 
-sql select count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(20s) order by ts asc limit 100 offset 6;
+sql select count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(20s) order by _wstart asc limit 100 offset 6;
 if $row != 10 then
  return -1
 endi
 
-sql select count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(20s) order by ts asc limit 100 offset 7;
+sql select count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(20s) order by _wstart asc limit 100 offset 7;
 if $row != 9 then
  return -1
 endi
 
-sql select count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(20s) order by ts asc limit 100 offset 8;
+sql select count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(20s) order by _wstart asc limit 100 offset 8;
 if $row != 8 then
  return -1
 endi
 
-sql select count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(20s) order by ts asc limit 100 offset 9;
+sql select count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(20s) order by _wstart asc limit 100 offset 9;
 if $row != 7 then
  return -1
 endi
 
-sql select count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(20s) order by ts asc limit 100 offset 10;
+sql select count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(20s) order by _wstart asc limit 100 offset 10;
 if $row != 6 then
  return -1
 endi
 
-sql select count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(20s) order by ts asc limit 100 offset 11;
+sql select count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(20s) order by _wstart asc limit 100 offset 11;
 if $row != 5 then
  return -1
 endi
 
-sql select count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(20s) order by ts asc limit 100 offset 12;
+sql select count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(20s) order by _wstart asc limit 100 offset 12;
 if $row != 4 then
  return -1
 endi
 
-sql select count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(20s) order by ts asc limit 100 offset 13;
+sql select count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(20s) order by _wstart asc limit 100 offset 13;
 if $row != 3 then
  return -1
 endi
 
-sql select count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(20s) order by ts asc limit 100 offset 14;
+sql select count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(20s) order by _wstart asc limit 100 offset 14;
 if $row != 2 then
  return -1
 endi
 
-sql select count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(20s) order by ts asc limit 100 offset 15;
+sql select count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(20s) order by _wstart asc limit 100 offset 15;
 if $row != 1 then
  return -1
 endi
 
-sql select count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(20s) order by ts asc limit 100 offset 16;
+sql select count(c2),last(c4),stddev(c3) from sliding_tb0 interval(30s) sliding(20s) order by _wstart asc limit 100 offset 16;
 if $row != 0 then
  return -1
 endi
 
-sql select count(c2),last(c4),stddev(c3),spread(c3) from sliding_tb0 where c2 = 0 interval(30s) order by ts desc;
+sql select _wstart, count(c2),last(c4),stddev(c3),spread(c3) from sliding_tb0 where c2 = 0 interval(30s) order by _wstart desc;
 if $row != 10 then
  return -1
 endi
-
 #00-01-01 00:04:30.000|                   10|       0|              0.000000000|              0.000000000|
 if $data00 != @00-01-01 00:04:30.000@ then
  return -1
 endi
-
 if $data01 != 10 then
  return -1
 endi
-
 if $data02 != 0 then
  return -1
 endi
-
 if $data03 != 0.000000000 then
  return -1
 endi
 
-sql select count(c2),last(c4),stddev(c3),spread(c3) from sliding_tb0 where c2 = 0 interval(30s) sliding(20s) order by ts desc limit 1 offset 15;
+#TODO
+return
+
+sql select count(c2),last(c4),stddev(c3),spread(c3) from sliding_tb0 where c2 = 0 interval(30s) sliding(20s) order by _wstart desc limit 1 offset 15;
 if $row != 1 then
  return -1
 endi
 
-sql select count(c2),last(c4),stddev(c3),spread(c3) from sliding_tb0 where c2 = 0 interval(30s) sliding(20s) order by ts desc limit 1 offset 16;
+sql select count(c2),last(c4),stddev(c3),spread(c3) from sliding_tb0 where c2 = 0 interval(30s) sliding(20s) order by _wstart desc limit 1 offset 16;
 if $row != 0 then
  return -1
 endi
 
-sql select count(c2), first(c3),stddev(c4) from sliding_tb0 interval(10a) order by ts desc limit 10 offset 2;
+sql select _wstart, count(c2), first(c3),stddev(c4) from sliding_tb0 interval(10a) order by _wstart desc limit 10 offset 2;
 if $data00 != @00-01-01 00:04:59.910@ then
   return -1
 endi
 
-sql select count(*),stddev(c1),count(c1),first(c2),last(c3) from sliding_tb0 where ts>'2000-1-1 00:00:00' and ts<'2000-1-1 00:00:01.002' and c2 >= 0 interval(30s) sliding(10s) order by ts asc limit 1000;
+sql select _wstart, count(*),stddev(c1),count(c1),first(c2),last(c3) from sliding_tb0 where ts>'2000-1-1 00:00:00' and ts<'2000-1-1 00:00:01.002' and c2 >= 0 interval(30s) sliding(10s) order by _wstart asc limit 1000;
 if $row != 3 then
  return -1
 endi
-
 if $data00 != @99-12-31 23:59:40.000@ then
  return -1
 endi
-
 if $data02 != 9.521904571 then
  return -1
 endi
-
 if $data05 != 33 then
  return -1
 endi
-
 if $data10 != @99-12-31 23:59:50.000@ then
  return -1
 endi
-
 if $data12 != 9.521904571 then
  return -1
 endi
-
 if $data15 != 33 then
  return -1
 endi
-
 if $data25 != 33 then
  return -1
 endi
 
-sql select count(*),stddev(c1),count(c1),first(c2),last(c3) from sliding_tb0 where ts>'2000-1-1 00:00:00' and ts<'2000-1-1 00:00:01.002' and c2 >= 0 interval(30s) sliding(10s) order by ts desc limit 1000;
+sql select _wstart, count(*),stddev(c1),count(c1),first(c2),last(c3) from sliding_tb0 where ts>'2000-1-1 00:00:00' and ts<'2000-1-1 00:00:01.002' and c2 >= 0 interval(30s) sliding(10s) order by _wstart desc limit 1000;
 if $row != 3 then
  return -1
 endi
-
 if $data00 != @00-01-01 00:00:00.000@ then
  print expect 00-01-01 00:00:00.000, actual: $data00
  return -1
 endi
-
 if $data01 != 33 then
  return -1
 endi
-
 if $data02 != 9.521904571 then
  return -1
 endi
-
 if $data03 != 33 then
  return -1
 endi
-
 if $data10 != @99-12-31 23:59:50.000@ then
  return -1
 endi
-
 if $data11 != 33 then
  return -1
 endi
 if $data12 != 9.521904571 then
  return -1
 endi
-
 if $data20 != @99-12-31 23:59:40.000@ then
  return -1
 endi

tests/script/tsim/parser/union.sim

@@ -102,11 +102,11 @@ $i = 1
 $tb = $tbPrefix . $i
 
 ## column type not identical
-sql_error select count(*) as a from union_mt0 union all select avg(c1) as a from union_mt0
-sql_error select count(*) as a from union_mt0 union all select spread(c1) as a from union_mt0;
+sql select count(*) as a from union_mt0 union all select avg(c1) as a from union_mt0
+sql select count(*) as a from union_mt0 union all select spread(c1) as a from union_mt0;
 
 ## union not supported
-sql_error (select count(*) from union_mt0) union (select count(*) from union_mt0);
+sql (select count(*) from union_mt0) union (select count(*) from union_mt0);
 
 ## column type not identical
 sql_error select c1 from union_mt0 limit 10 union all select c2 from union_tb1 limit 20;
@@ -123,145 +123,114 @@ sql (((select c1 from union_tb0)))
 if $rows != 10000 then
   return -1
 endi
-
 if $data00 != 0 then
   return -1
 endi
-
 if $data10 != 1 then
   return -1
 endi
 
-sql select 'ab' as options from union_tb1 limit 1 union all select 'dd' as options from union_tb0 limit 1;
+sql (select 'ab' as options from union_tb1 limit 1) union all (select 'dd' as options from union_tb0 limit 1) order by options;
 if $rows != 2 then
   return -1
 endi
-
 if $data00 != @ab@ then
   return -1
 endi
-
 if $data10 != @dd@ then
   return -1
 endi
 
-
-sql select 'ab' as options from union_tb1 limit 1 union all select '1234567' as options from union_tb0 limit 1;
+sql (select 'ab12345' as options from union_tb1 limit 1) union all (select '1234567' as options from union_tb0 limit 1) order by options desc;
 if $rows != 2 then
   return -1
 endi
-
-if $data00 != @ab@ then
+if $data00 != @ab12345@ then
   return -1
 endi
-
 if $data10 != @1234567@ then
   return -1
 endi
 
-
 # mixed order
-sql select ts, c1 from union_tb1 order by ts asc limit 10 union all select ts, c1 from union_tb0 order by ts desc limit 2 union all select ts, c1 from union_tb2 order by ts asc limit 10
+sql (select ts, c1 from union_tb1 order by ts asc limit 10) union all (select ts, c1 from union_tb0 order by ts desc limit 2) union all (select ts, c1 from union_tb2 order by ts asc limit 10) order by ts
 if $rows != 22 then
   return -1
 endi
-
 if $data00 != @20-01-05 13:51:24.000@ then
   return -1
 endi
-
 if $data01 != 0 then
   return -1
 endi
-
-if $data10 != @20-01-05 13:52:24.000@ then
+if $data10 != @20-01-05 13:51:24.000@ then
   return -1
 endi
-
-if $data11 != 1 then
+if $data11 != 0 then
   return -1
 endi
-
-if $data90 != @20-01-05 14:00:24.000@ then
+print $data90 $data91
+if $data90 != @20-01-05 13:55:24.000@ then
   return -1
 endi
-
-if $data91 != 9 then
+if $data91 != 4 then
   return -1
 endi
 
 # different sort order
 
 # super table & normal table mixed up
-sql select c3 from union_tb0 limit 2 union all select sum(c1) as c3 from union_mt0;
+sql (select c3 from union_tb0 limit 2) union all (select sum(c1) as c3 from union_mt0) order by c3;
 if $rows != 3 then
   return -1
 endi
-
 if $data00 != 0 then
   return -1
 endi
-
 if $data10 != 1 then
   return -1
 endi
-
 if $data20 != 4950000 then
   return -1
 endi
 
 # type compatible
-sql select c3 from union_tb0 limit 2 union all select sum(c1) as c3 from union_tb1;
+sql (select c3 from union_tb0 limit 2) union all (select sum(c1) as c3 from union_tb1) order by c3;
 if $rows != 3 then
  return -1
 endi
-
 if $data00 != 0 then
    return -1
 endi
-
 if $data10 != 1 then
   return -1
 endi
-
 if $data20 != 495000 then
   return -1
 endi
 
 # two join subclause
-sql select count(*) as c from union_tb0, union_tb1 where union_tb0.ts=union_tb1.ts union all select union_tb0.c3 as c from union_tb0, union_tb1 where union_tb0.ts=union_tb1.ts limit 10
+sql (select count(*) as c from union_tb0, union_tb1 where union_tb0.ts=union_tb1.ts) union all (select union_tb0.c3 as c from union_tb0, union_tb1 where union_tb0.ts=union_tb1.ts limit 10) order by c desc
 if $rows != 11 then
   return -1
 endi
-
 if $data00 != 10000 then
   return -1
 endi
-
-if $data10 != 0 then
+if $data10 != 9 then
   return -1
 endi
-
-if $data20 != 1 then
+if $data20 != 8 then
   return -1
 endi
-
-if $data90 != 8 then
+if $data90 != 1 then
  return -1
 endi
 
 print ===========================================tags union
 # two super table tag union, limit is not active during retrieve tags query
-sql select t1 from union_mt0 union all select t1 from union_mt0
-if $rows != 20 then
-  return -1
-endi
-
-if $data00 != 0 then
-  return -1
-endi
-
-if $data90 != 9 then
+sql (select t1 from union_mt0) union all (select t1 from union_mt0)
+if $rows != 200000 then
   return -1
 endi
 
@@ -271,39 +240,35 @@ endi
 #endi
 #========================================== two super table join subclause
 print ================two super table join subclause
-sql select avg(union_mt0.c1) as c from union_mt0 interval(1h) limit 10 union all select union_mt1.ts, union_mt1.c1/1.0 as c from union_mt0, union_mt1 where union_mt1.ts=union_mt0.ts and union_mt1.t1=union_mt0.t1 limit 5;
+sql (select _wstart as ts, avg(union_mt0.c1) as c from union_mt0 interval(1h) limit 10) union all (select union_mt1.ts, union_mt1.c1/1.0 as c from union_mt0, union_mt1 where union_mt1.ts=union_mt0.ts and union_mt1.t1=union_mt0.t1 limit 5);
 print the rows value is: $rows
-
 if $rows != 15 then
   return -1
 endi
 
 # first subclause are empty
-sql select count(*) as c from union_tb0 where ts > now + 3650d union all select sum(c1) as c from union_tb1;
+sql (select count(*) as c from union_tb0 where ts > now + 3650d) union all (select sum(c1) as c from union_tb1);
 if $rows != 1 then
   return -1
 endi
-
 if $data00 != 495000 then
   return -1
 endi
 
 # all subclause are empty
-sql select c1 from union_tb0 limit 0 union all select c1 from union_tb1 where ts>'2021-1-1 0:0:0'
+sql (select c1 from union_tb0 limit 0) union all (select c1 from union_tb1 where ts>'2021-1-1 0:0:0')
 if $rows != 0 then
   return -1
 endi
 
 # middle subclause empty
-sql select c1 from union_tb0 limit 1 union all select c1 from union_tb1 where ts>'2030-1-1 0:0:0' union all select last(c1) as c1 from union_tb1;
+sql (select c1 from union_tb0 limit 1) union all (select c1 from union_tb1 where ts>'2030-1-1 0:0:0' union all select last(c1) as c1 from union_tb1) order by c1;
 if $rows != 2 then
   return -1
 endi
-
 if $data00 != 0 then
   return -1
 endi
-
 if $data10 != 99 then
   return -1
 endi
@@ -319,141 +284,90 @@ sql (select ts, c1 from union_mt0 limit 1) union all (select ts, c1 from union_m
 if $rows != 2 then
   return -1
 endi
-
 if $data00 != @20-01-05 13:51:24.000@ then
   return -1
 endi
-
 if $data01 != 0 then
   return -1
 endi
-
 if $data10 != @20-01-05 13:51:24.000@ then
   return -1
 endi
-
 if $data11 != 0 then
   return -1
 endi
 
 # two aggregated functions for super tables
-sql select sum(c1) as a from union_mt0 interval(1s) limit 9 union all select ts, max(c3) as a from union_mt0 limit 2;
+sql (select _wstart as ts, sum(c1) as a from union_mt0 interval(1s) limit 9) union all (select ts, max(c3) as a from union_mt0 limit 2) order by ts;
 if $rows != 10 then
   return -1
 endi
-
 if $data00 != @20-01-05 13:51:24.000@ then
   return -1
 endi
-
 if $data01 != 0 then
   return -1
 endi
-
 if $data10 != @20-01-05 13:52:24.000@ then
   return -1
 endi
-
 if $data11 != 10 then
   return -1
 endi
-
 if $data20 != @20-01-05 13:53:24.000@ then
   return -1
 endi
-
 if $data21 != 20 then
   return -1
 endi
-
 if $data90 != @20-01-05 15:30:24.000@ then
   return -1
 endi
-
 if $data91 != 99 then
   return -1
 endi
 
 #=================================================================================================
 # two aggregated functions for normal tables
-sql select sum(c1) as a from union_tb0 limit 1 union all select sum(c3) as a from union_tb1 limit 2;
+sql (select sum(c1) as a from union_tb0 limit 1) union all (select sum(c3) as a from union_tb1 limit 2);
 if $rows != 2 then
   return -1
 endi
-
 if $data00 != 495000 then
   return -1
 endi
-
 if $data10 != 495000 then
   return -1
 endi
 
 # two super table query + interval + limit
-sql select ts, first(c3) as a from union_mt0 limit 1 union all select sum(c3) as a from union_mt0 interval(1h) limit 1;
+sql (select ts, first(c3) as a from union_mt0 limit 1) union all (select _wstart as ts, sum(c3) as a from union_mt0 interval(1h) limit 1) order by ts desc;
 if $rows != 2 then
   return -1
 endi
-
 if $data00 != @20-01-05 13:51:24.000@ then
  return -1
 endi
-
 if $data01 != 0 then
   return -1
 endi
-
 if $data10 != @20-01-05 13:00:00.000@ then
  return -1
 endi
-
 if $data11 != 360 then
   return -1
 endi
 
-sql select server_status() union all select server_status()
-if $rows != 2 then
-  return -1
-endi
-
-if $data00 != 1 then
-  return -1
-endi
-
-if $data10 != 1 then
-  return -1
-endi
-
-sql select client_version() union all select server_version()
-if $rows != 2 then
-  return -1
-endi
-
-sql select database() union all select database()
-if $rows != 2 then
-  return -1
-endi
-
-if $data00 != @union_db0@ then
-  return -1
-endi
-
-if $data10 != @union_db0@ then
-  return -1
-endi
-
-sql select 'aaa' as option from union_tb1 where c1 < 0 limit 1 union all select 'bbb' as option from union_tb0 limit 1
+sql (select 'aaa' as option from union_tb1 where c1 < 0 limit 1) union all (select 'bbb' as option from union_tb0 limit 1)
 if $rows != 1 then
   return -1
 endi
-
 if $data00 != @bbb@ then
   return -1
 endi
 
-
-sql_error show tables union all show tables
-sql_error show stables union all show stables
-sql_error show databases union all show databases
+sql_error (show tables) union all (show tables)
+sql_error (show stables) union all (show stables)
+sql_error (show databases) union all (show databases)
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/parser/union_sysinfo.sim

+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/exec.sh -n dnode1 -s start
+sql connect
+
+sql (select server_status()) union all (select server_status())
+if $rows != 2 then
+  return -1
+endi
+
+if $data00 != 1 then
+  return -1
+endi
+
+if $data10 != 1 then
+  return -1
+endi
+
+sql (select client_version()) union all (select server_version())
+if $rows != 2 then
+  return -1
+endi
+
+sql (select database()) union all (select database())
+if $rows != 2 then
+  return -1
+endi
+if $data00 != @union_db0@ then
+  return -1
+endi
+if $data10 != @union_db0@ then
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/tsim/stream/basic1.sim

@@ -391,13 +391,13 @@ if $data02 != 4 then
   return -1
 endi
 
-if $data03 != 14 then
-  print ======$data03
+if $data03 != 50 then
+  print ======$data03 != 50
   return -1
 endi
 
-if $data04 != 4 then
-  print ======$data04
+if $data04 != 20 then
+  print ======$data04 != 20
   return -1
 endi
 
@@ -421,13 +421,13 @@ if $data12 != 4 then
   return -1
 endi
 
-if $data13 != 10 then
-  print ======$data13
+if $data13 != 46 then
+  print ======$data13 != 46
   return -1
 endi
 
-if $data14 != 3 then
-  print ======$data14
+if $data14 != 20 then
+  print ======$data14 != 20
   return -1
 endi
 

tests/script/tsim/tag/commit.sim

@@ -241,7 +241,7 @@ if $data04 != 3 then
   return -1
 endi
 
-sql alter table $mt change tag tgcol1 tgcol4
+sql alter table $mt rename tag tgcol1 tgcol4
 sql alter table $mt drop tag tgcol2 
 sql alter table $mt drop tag tgcol3
 sql alter table $mt add tag tgcol5 binary(10)

tests/script/tsim/valgrind/checkError5.sim

@@ -95,6 +95,16 @@ sql select * from tb
 sql insert into db.ctb values(now+3s, 2, 3, 4)
 sql select * from db.stb
 
+sql alter table db.stb add tag t4 bigint
+sql select * from db.stb
+sql select * from db.stb
+sql_error create table db.ctb2 using db.stb tags(101, "102")
+sql create table db.ctb2 using db.stb tags(101, 102, "103", 104)
+sql insert into db.ctb2 values(now, 1, 2, 3)
+
+print =============== step6: query data
+sql select * from db.stb where tbname = 'ctb2';
+
 _OVER:
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
 print =============== check