From bd7122e894faf892fdd1256ab0f69744bf8b0ea0 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Thu, 21 Jul 2022 13:41:16 +0800 Subject: [PATCH 1/2] chore: libtaos ws submodule for3.0 (#15232) * chore: add libtaos-ws for 3.0 * chore: update taosws-rs * chore: add libtaosws to install/remove script * chore: update taosws-rs * chore: update taosws-rs * chore: update taos-tools, taosws-rs for 3.0 * fix: packaging/tools/make_install.sh for 3.0 * chore: update taos-tools * chore: fix release script for 3.0 * chore: update taosws-rs for 3.0 * chore: add taows-rs submodule for 3.0 * chore: update taosws-rs for 3.0 * fix: install script support taosws for 3.0 * fix: script error handle for 3.0 * chore: update taosws-rs for 3.0 fix segfault * chore: change container_build for websocket build * fix: install script for taosws * fix: . * chore: update taosws-rs for 3.0 * chore: update taosws-rs for 3.0 --- tools/taosws-rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/taosws-rs b/tools/taosws-rs index fa2d829183..267a96fb09 160000 --- a/tools/taosws-rs +++ b/tools/taosws-rs @@ -1 +1 @@ -Subproject commit fa2d82918353a3b56e40838572120c1a4ece644c +Subproject commit 267a96fb09fc2ba14acfa47f7d3678def64c29c5 From 3ae378e0c5597dab304f5d9bedc9ff19f4f4ad50 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Thu, 21 Jul 2022 13:49:53 +0800 Subject: [PATCH 2/2] test: restore 2.0 case --- tests/script/tsim/parser/import_file.sim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/script/tsim/parser/import_file.sim b/tests/script/tsim/parser/import_file.sim index 35b656eb87..5c778a5875 100644 --- a/tests/script/tsim/parser/import_file.sim +++ b/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