Merge remote-tracking branch 'origin/3.0' into fix/tsim

tests/script/tsim/parser/import_file.sim

@@ -14,9 +14,9 @@ system tsim/parser/gendata.sh
 sql create table stbx (ts TIMESTAMP, collect_area NCHAR(12), device_id BINARY(16), imsi BINARY(16),  imei BINARY(16),  mdn BINARY(10), net_type BINARY(4), mno NCHAR(4), province NCHAR(10), city NCHAR(16), alarm BINARY(2)) tags(a int, b binary(12));
 
 sql create table tbx (ts TIMESTAMP, collect_area NCHAR(12), device_id BINARY(16), imsi BINARY(16),  imei BINARY(16),  mdn BINARY(10), net_type BINARY(4), mno NCHAR(4), province NCHAR(10), city NCHAR(16), alarm BINARY(2))
-print ====== create tables success, starting import data
+print ====== create tables success, starting insert data
 
-sql import into tbx file '~/data.sql'
+sql insert into tbx file '~/data.sql'
 sql import into tbx file '~/data.sql'
 
 sql select count(*) from tbx

taosws-rs @ 267a96fb

-Subproject commit fa2d82918353a3b56e40838572120c1a4ece644c
+Subproject commit 267a96fb09fc2ba14acfa47f7d3678def64c29c5