scripts

tests/script/general/http/grafana.sim

@@ -157,25 +157,25 @@ endi
 
 system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d '[{"refId":"A","alias":"","sql":"select count(i) from d1.mt group by a"},{"refId":"B","alias":"","sql":"select sum(i) from d1.mt group by b"}]'  127.0.0.1:6020/grafana/query
 print 16-> $system_content
-if $system_content != @[{"refId":"A","target":"1","datapoints":[[5,"-"]]},{"refId":"A","target":"2","datapoints":[[4,"-"]]},{"refId":"A","target":"3","datapoints":[[3,"-"]]},{"refId":"B","target":"a","datapoints":[[5,"-"]]},{"refId":"B","target":"b","datapoints":[[8,"-"]]},{"refId":"B","target":"c","datapoints":[[9,"-"]]}]@ then
+if $system_content != @[{"refId":"A","target":"{a:1,}","datapoints":[[5,"-"]]},{"refId":"A","target":"{a:2,}","datapoints":[[4,"-"]]},{"refId":"A","target":"{a:3,}","datapoints":[[3,"-"]]},{"refId":"B","target":"{b:a}","datapoints":[[5,"-"]]},{"refId":"B","target":"{b:b}","datapoints":[[8,"-"]]},{"refId":"B","target":"{b:c}","datapoints":[[9,"-"]]}]@ then
   return -1
 endi
 
 system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d '[{"refId":"A","alias":"count","sql":"select count(i) from d1.mt group by a"},{"refId":"B","alias":"sum-","sql":"select sum(i) from d1.mt group by b"}]'  127.0.0.1:6020/grafana/query
 print 17-> $system_content
-if $system_content != @[{"refId":"A","target":"count1","datapoints":[[5,"-"]]},{"refId":"A","target":"count2","datapoints":[[4,"-"]]},{"refId":"A","target":"count3","datapoints":[[3,"-"]]},{"refId":"B","target":"sum-a","datapoints":[[5,"-"]]},{"refId":"B","target":"sum-b","datapoints":[[8,"-"]]},{"refId":"B","target":"sum-c","datapoints":[[9,"-"]]}]@ then
+if $system_content != @[{"refId":"A","target":"count{a:1,}","datapoints":[[5,"-"]]},{"refId":"A","target":"count{a:2,}","datapoints":[[4,"-"]]},{"refId":"A","target":"count{a:3,}","datapoints":[[3,"-"]]},{"refId":"B","target":"sum-{b:a}","datapoints":[[5,"-"]]},{"refId":"B","target":"sum-{b:b}","datapoints":[[8,"-"]]},{"refId":"B","target":"sum-{b:c}","datapoints":[[9,"-"]]}]@ then
   return -1
 endi
 
 system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d '[{"refId":"A","alias":"count","sql":"select count(i) from d1.mt interval(1m) group by a "}]'  127.0.0.1:6020/grafana/query
 print 18-> $system_content
-if $system_content != @[{"refId":"A","target":"count1","datapoints":[[1,1514208300000],[1,1514208360000],[1,1514208420000],[1,1514208480000],[1,1514208540000]]},{"refId":"A","target":"count2","datapoints":[[1,1514208300000],[1,1514208360000],[1,1514208420000],[1,1514208480000]]},{"refId":"A","target":"count3","datapoints":[[1,1514208300000],[1,1514208360000],[1,1514208420000]]}]@ then
+if $system_content != @[{"refId":"A","target":"count{a:1,}","datapoints":[[1,1514208300000],[1,1514208360000],[1,1514208420000],[1,1514208480000],[1,1514208540000]]},{"refId":"A","target":"count{a:2,}","datapoints":[[1,1514208300000],[1,1514208360000],[1,1514208420000],[1,1514208480000]]},{"refId":"A","target":"count{a:3,}","datapoints":[[1,1514208300000],[1,1514208360000],[1,1514208420000]]}]@ then
   return -1
 endi
 
 system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d '[{"refId":"A","alias":"","sql":"select sum(v2), count(v1) from d1.m1"},{"refId":"B","alias":"","sql":"select count(v2), sum(v2) from d1.m1"}]'  127.0.0.1:6020/grafana/query
 print 19-> $system_content
-if $system_content != @[{"refId":"A","target":"3","datapoints":[[15.299999714,"-"]]},{"refId":"B","target":"15.299999714","datapoints":[[3,"-"]]}]@ then
+if $system_content != @[{"refId":"A","target":"{count(v1):3}","datapoints":[[15.299999714,"-"]]},{"refId":"B","target":"{sum(v2):15.299999714}","datapoints":[[3,"-"]]}]@ then
   return -1
 endi
 

tests/script/general/parser/auto_create_tb.sim

@@ -222,13 +222,13 @@ sql show tables
 if $rows != 3 then
   return -1
 endi
-if $data00 != tb3 then
+if $data00 != tb1 then
   return -1
 endi
 if $data10 != tb2 then
   return -1
 endi
-if $data20 != tb1 then
+if $data20 != tb3 then
   return -1
 endi
 
@@ -301,6 +301,7 @@ sql_error create table txu using tu tags(0) values(now, 1);
 
 #[TBASE-675]
 sql insert into tu values(1565971200000, 1) (1565971200000,2) (1565971200001, 3)(1565971200001, 4)
+sql select * from tu
 if $rows != 2 then
     return -1
 endi

tests/script/general/parser/auto_create_tb_drop_tb.sim

@@ -2,7 +2,7 @@ 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 commitTime -v 30
+system sh/cfg.sh -n dnode1 -c ctime -v 30
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect

tests/script/general/parser/import_commit1.sim

@@ -2,7 +2,7 @@ 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 commitTime -v 30
+system sh/cfg.sh -n dnode1 -c ctime -v 30
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect

tests/script/general/parser/import_commit2.sim

@@ -2,7 +2,7 @@ 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 commitTime -v 30
+system sh/cfg.sh -n dnode1 -c ctime -v 30
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect

tests/script/general/parser/import_commit3.sim

@@ -2,7 +2,7 @@ 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 commitTime -v 30
+system sh/cfg.sh -n dnode1 -c ctime -v 30
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect

tests/script/jenkins/basic.txt

@@ -3,21 +3,21 @@ cd ../../debug; make
 cd ../../../debug; cmake ..
 cd ../../../debug; make
 
-#./test.sh -f general/alter/cached_schema_after_alter.sim
-#./test.sh -f general/alter/count.sim
-#./test.sh -f general/alter/import.sim
-#./test.sh -f general/alter/insert1.sim
-#./test.sh -f general/alter/insert2.sim
-#./test.sh -f general/alter/metrics.sim
-#./test.sh -f general/alter/table.sim
+#unsupport ./test.sh -f general/alter/cached_schema_after_alter.sim
+#unsupport ./test.sh -f general/alter/count.sim
+#unsupport ./test.sh -f general/alter/import.sim
+#unsupport ./test.sh -f general/alter/insert1.sim
+#unsupport ./test.sh -f general/alter/insert2.sim
+#unsupport ./test.sh -f general/alter/metrics.sim
+#unsupport ./test.sh -f general/alter/table.sim
 
 ./test.sh -f general/cache/new_metrics.sim
-./test.sh -f general/cache/restart_metrics.sim
-./test.sh -f general/cache/restart_table.sim
+#jeff ./test.sh -f general/cache/restart_metrics.sim
+#jeff ./test.sh -f general/cache/restart_table.sim
 
 #hongze ./test.sh -f general/column/commit.sim
-#hongze ./test.sh -f general/column/metrics.sim
-#hongze ./test.sh -f general/column/table.sim
+./test.sh -f general/column/metrics.sim
+./test.sh -f general/column/table.sim
 
 ./test.sh -f general/compress/commitlog.sim
 ./test.sh -f general/compress/compress.sim
@@ -28,11 +28,11 @@ cd ../../../debug; make
 ./test.sh -f general/compute/bottom.sim
 ./test.sh -f general/compute/count.sim
 ./test.sh -f general/compute/diff.sim
-# liao./test.sh -f general/compute/diff2.sim
+./test.sh -f general/compute/diff2.sim
 ./test.sh -f general/compute/first.sim
-# liao./test.sh -f general/compute/interval.sim
-# liao./test.sh -f general/compute/last.sim
-# liao./test.sh -f general/compute/leastsquare.sim
+# liao ./test.sh -f general/compute/interval.sim
+./test.sh -f general/compute/last.sim
+# liao ./test.sh -f general/compute/leastsquare.sim
 ./test.sh -f general/compute/max.sim
 ./test.sh -f general/compute/min.sim
 ./test.sh -f general/compute/null.sim
@@ -54,30 +54,30 @@ cd ../../../debug; make
 ./test.sh -f general/db/delete_writing1.sim
 ./test.sh -f general/db/delete_writing2.sim
 ./test.sh -f general/db/len.sim
-#./test.sh -u -f general/db/vnodes.sim
+#liao ./test.sh -f general/db/vnodes.sim
 ./test.sh -f general/db/repeat.sim
 ./test.sh -f general/db/tables.sim
 
 ./test.sh -f general/field/2.sim
-#./test.sh -f general/field/3.sim
-#./test.sh -f general/field/4.sim
-#./test.sh -f general/field/5.sim
-#./test.sh -f general/field/6.sim
+#liao ./test.sh -f general/field/3.sim
+#liao? ./test.sh -f general/field/4.sim
+#liao? ./test.sh -f general/field/5.sim
+#liao? ./test.sh -f general/field/6.sim
 ./test.sh -f general/field/bigint.sim
-# liao./test.sh -f general/field/binary.sim
+./test.sh -f general/field/binary.sim
 ./test.sh -f general/field/bool.sim
 ./test.sh -f general/field/single.sim
 ./test.sh -f general/field/smallint.sim
 ./test.sh -f general/field/tinyint.sim
 
-# jeff ./test.sh -f general/http/restful.sim
+./test.sh -f general/http/restful.sim
 ./test.sh -f general/http/restful_insert.sim
 ./test.sh -f general/http/restful_limit.sim
-# jeff ./test.sh -f general/http/restful_full.sim
+./test.sh -f general/http/restful_full.sim
 ./test.sh -f general/http/prepare.sim
 ./test.sh -f general/http/telegraf.sim
 ./test.sh -f general/http/grafana_bug.sim
-# jeff ./test.sh -f general/http/grafana.sim
+./test.sh -f general/http/grafana.sim
 
 ./test.sh -f general/import/basic.sim
 ./test.sh -f general/import/commit.sim
@@ -94,10 +94,10 @@ cd ../../../debug; make
 ./test.sh -f general/insert/query_multi_file.sim
 ./test.sh -f general/insert/tcp.sim
 
-# ./test.sh -f general/parser/alter.sim
-# ./test.sh -f general/parser/alter1.sim
-# ./test.sh -f general/parser/alter_stable.sim
-# ./test.sh -f general/parser/auto_create_tb.sim
+#unsupport ./test.sh -f general/parser/alter.sim
+#unsupport ./test.sh -f general/parser/alter1.sim
+#unsupport ./test.sh -f general/parser/alter_stable.sim
+#rpc error? ./test.sh -f general/parser/auto_create_tb.sim
 # ./test.sh -f general/parser/auto_create_tb_drop_tb.sim
 ./test.sh -f general/parser/binary_escapeCharacter.sim
 #./test.sh -f general/parser/bug.sim
@@ -145,23 +145,23 @@ cd ../../../debug; make
 # ./test.sh -f general/parser/stream.sim
 # ./test.sh -f general/parser/tbnameIn.sim
 # ./test.sh -f general/parser/where.sim
-# #./test.sh -f general/parser/repeatAlter.sim
-# #./test.sh -f general/parser/repeatStream.sim
+# ./test.sh -f general/parser/repeatAlter.sim
+# ./test.sh -f general/parser/repeatStream.sim
 # ./test.sh -f general/parser/join.sim
 # ./test.sh -f general/parser/join_multivnode.sim
 # ./test.sh -f general/parser/projection_limit_offset.sim
 # ./test.sh -f general/parser/select_with_tags.sim
 # ./test.sh -f general/parser/groupby.sim
 
-#./test.sh -f general/stable/disk.sim
-#./test.sh -f general/stable/metrics.sim
-#./test.sh -f general/stable/values.sim
+./test.sh -f general/stable/disk.sim
+./test.sh -f general/stable/metrics.sim
+#liao? ./test.sh -f general/stable/values.sim
 ./test.sh -f general/stable/vnode3.sim
 
 ./test.sh -f general/table/autocreate.sim
 ./test.sh -f general/table/basic1.sim
 ./test.sh -f general/table/basic2.sim
-#hongze ./test.sh -f general/table/basic3.sim
+./test.sh -f general/table/basic3.sim
 ./test.sh -f general/table/bigint.sim
 ./test.sh -f general/table/binary.sim
 ./test.sh -f general/table/bool.sim
@@ -186,29 +186,29 @@ cd ../../../debug; make
 ./test.sh -f general/table/tinyint.sim
 ./test.sh -f general/table/vgroup.sim
 
-#./test.sh -f general/tag/3.sim
-#./test.sh -f general/tag/4.sim
-#./test.sh -f general/tag/5.sim
-#./test.sh -f general/tag/6.sim
-#./test.sh -f general/tag/add.sim
+#liao ./test.sh -f general/tag/3.sim
+#liao? ./test.sh -f general/tag/4.sim
+#liao? ./test.sh -f general/tag/5.sim
+#liao? ./test.sh -f general/tag/6.sim
+#unsupport ./test.sh -f general/tag/add.sim
 ./test.sh -f general/tag/bigint.sim
-#./test.sh -f general/tag/binary_binary.sim
-#./test.sh -f general/tag/binary.sim
-#./test.sh -f general/tag/bool_binary.sim
-#./test.sh -f general/tag/bool_int.sim
+./test.sh -f general/tag/binary_binary.sim
+./test.sh -f general/tag/binary.sim
+./test.sh -f general/tag/bool_binary.sim
+./test.sh -f general/tag/bool_int.sim
 ./test.sh -f general/tag/bool.sim
-#./test.sh -f general/tag/change.sim
-#liao ./test.sh -f general/tag/column.sim
-#./test.sh -f general/tag/commit.sim
-#liao ./test.sh -f general/tag/create.sim
-#./test.sh -f general/tag/delete.sim
+#unsupport ./test.sh -f general/tag/change.sim
+./test.sh -f general/tag/column.sim
+#unsupport ./test.sh -f general/tag/commit.sim
+./test.sh -f general/tag/create.sim
+#unsupport ./test.sh -f general/tag/delete.sim
 #./test.sh -f general/tag/double.sim
 ./test.sh -f general/tag/filter.sim
-#./test.sh -f general/tag/float.sim
-#./test.sh -f general/tag/int_binary.sim
-#./test.sh -f general/tag/int_float.sim
+#liao? ./test.sh -f general/tag/float.sim
+#liao? ./test.sh -f general/tag/int_binary.sim
+./test.sh -f general/tag/int_float.sim
 ./test.sh -f general/tag/int.sim
-#./test.sh -f general/tag/set.sim
+#unsupport ./test.sh -f general/tag/set.sim
 ./test.sh -f general/tag/smallint.sim
 ./test.sh -f general/tag/tinyint.sim
 
@@ -224,7 +224,7 @@ cd ../../../debug; make
 ./test.sh -f general/vector/metrics_query.sim
 ./test.sh -f general/vector/metrics_tag.sim
 ./test.sh -f general/vector/metrics_time.sim
-#liao ./test.sh -f general/vector/multi.sim
+./test.sh -f general/vector/multi.sim
 ./test.sh -f general/vector/single.sim
 ./test.sh -f general/vector/table_field.sim
 ./test.sh -f general/vector/table_mix.sim