From 25aac41d2ec5b5d27bf0403b48537ea7bc9ff9b1 Mon Sep 17 00:00:00 2001 From: Zhiqiang Wang <1296468573@qq.com> Date: Fri, 14 Jan 2022 15:54:52 +0800 Subject: [PATCH] [TS-991](tools): taos-tools uninstall. (#9739) * [TS-991](tools): taos-tools uninstall. * [TS-991](tools): taos-tools uninstall. * [TS-991](tools): update taosTools * [TS-991](tools): update test case Co-authored-by: Shuduo Sang Co-authored-by: zhaoyanggh --- packaging/tools/makepkg.sh | 9 +++++++++ src/kit/taos-tools | 2 +- .../5-taos-tools/taosbenchmark/commandline.py | 4 ---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/packaging/tools/makepkg.sh b/packaging/tools/makepkg.sh index 166c77571a..e3c1ab269a 100755 --- a/packaging/tools/makepkg.sh +++ b/packaging/tools/makepkg.sh @@ -135,6 +135,15 @@ if [ -n "${taostools_bin_files}" ]; then else echo -e "install-taostools.sh not found" fi + + if [ -f ${top_dir}/src/kit/taos-tools/packaging/tools/uninstall-taostools.sh ]; then + cp ${top_dir}/src/kit/taos-tools/packaging/tools/uninstall-taostools.sh \ + ${taostools_install_dir}/ > /dev/null \ + && chmod a+x ${taostools_install_dir}/uninstall-taostools.sh \ + || echo -e "failed to copy uninstall-taostools.sh" + else + echo -e "uninstall-taostools.sh not found" + fi if [ -f ${build_dir}/lib/libavro.so.23.0.0 ]; then mkdir -p ${taostools_install_dir}/avro/{lib,lib/pkgconfig} || echo -e "failed to create ${taostools_install_dir}/avro" diff --git a/src/kit/taos-tools b/src/kit/taos-tools index da842b77f4..02e4e085f3 160000 --- a/src/kit/taos-tools +++ b/src/kit/taos-tools @@ -1 +1 @@ -Subproject commit da842b77f438e5b4c496918e51f8ea02ba0f2c99 +Subproject commit 02e4e085f3f2ccc9b4a29d865ed2bf8c76d2cada diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/commandline.py b/tests/develop-test/5-taos-tools/taosbenchmark/commandline.py index 51edecdbbf..b859bef981 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/commandline.py +++ b/tests/develop-test/5-taos-tools/taosbenchmark/commandline.py @@ -38,8 +38,6 @@ class TDTestCase: tdSql.execute("use newtest") tdSql.query("select count(*) from newtest.meters") tdSql.checkData(0, 0, 20) - tdSql.query("select distinct(c0) from newtest.meters") - tdSql.checkRows(7) tdSql.query("describe meters") tdSql.checkRows(8) tdSql.checkData(0, 1, "TIMESTAMP") @@ -67,8 +65,6 @@ class TDTestCase: tdSql.checkData(0, 0, 2) tdSql.query("select count(*) from test.meters") tdSql.checkData(0, 0, 20) - tdSql.query("select distinct(c0) from test.meters") - tdSql.checkRows(7) cmd = "taosBenchmark -n 3 -t 3 -B 2 -i 1 -G -y -T 1 2>&1 | grep sleep | wc -l" sleepTimes = subprocess.check_output(cmd, shell=True).decode("utf-8") -- GitLab