From 14b6f048ec244cade21a71342c28ed1b2c0483a6 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Tue, 19 Jul 2022 20:01:42 +0800 Subject: [PATCH] chore: libtaos ws submodule (#15123) * chore: add taosws-rs as plugin * chore: update taosws-rs * chore: add taosws install/remove in scripts * chore: update taosws-rs * chore: update taosws-rs * fix: _smartly_ build ws lib * chore: enhance CMakeLists.txt * fix: packaging/tools/make_install.sh * chore: update taos-tools * docs: modify readme * fix: tools/*.sh * chore: update taosws-rs * test: fix tools/taosdumpTest3.py * chore: use feat/ws-stmt branch of taosws-rs * chore: update taosws-rs * chore: update taosws-rs * chore: update taosws-rs * chore: update taosws-rs * chore: update taosws-rs * fix: install script support libtaosws * fix: install script support libtaosws * fix: script error handle * chore: update taosws-rs fix segfault * chore: update jenkins file to support websocket build * chore: revert jenkinsfile2 --- packaging/tools/install_client.sh | 6 +++--- packaging/tools/make_install.sh | 4 ++-- packaging/tools/post.sh | 10 +++++----- src/plugins/taosws-rs | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packaging/tools/install_client.sh b/packaging/tools/install_client.sh index 4e2a77213e..3eb07a36ca 100755 --- a/packaging/tools/install_client.sh +++ b/packaging/tools/install_client.sh @@ -135,7 +135,7 @@ function install_lib() { ${csudo}ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1 ${csudo}ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so - [ -f ${install_main_dir}/driver/libtaosws.so ] && ${csudo}ln -s ${install_main_dir}/driver/libtaosws.so ${lib_link_dir}/libtaosws.so + [ -f ${install_main_dir}/driver/libtaosws.so ] && ${csudo}ln -s ${install_main_dir}/driver/libtaosws.so ${lib_link_dir}/libtaosws.so ||: if [ -d "${lib64_link_dir}" ]; then ${csudo}ln -s ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1 || : @@ -147,7 +147,7 @@ function install_lib() { ${csudo}ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.1.dylib ${csudo}ln -s ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib - [ -f ${install_main_dir}/driver/libtaosws.dylib ] && ${csudo}ln -s ${install_main_dir}/driver/libtaosws.dylib ${lib_link_dir}/libtaosws.dylib + [ -f ${install_main_dir}/driver/libtaosws.dylib ] && ${csudo}ln -s ${install_main_dir}/driver/libtaosws.dylib ${lib_link_dir}/libtaosws.dylib ||: fi if [ "$osType" != "Darwin" ]; then @@ -164,7 +164,7 @@ function install_header() { ${csudo}ln -s ${install_main_dir}/include/taosdef.h ${inc_link_dir}/taosdef.h ${csudo}ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h - [ -f ${install_main_dir}/include/taosws.h ] && ${csudo}ln -s ${install_main_dir}/include/taosws.h ${inc_link_dir}/taos.h + [ -f ${install_main_dir}/include/taosws.h ] && ${csudo}ln -s ${install_main_dir}/include/taosws.h ${inc_link_dir}/taosws.h ||: } function install_jemalloc() { diff --git a/packaging/tools/make_install.sh b/packaging/tools/make_install.sh index 628ced29a6..a0769cb6c1 100755 --- a/packaging/tools/make_install.sh +++ b/packaging/tools/make_install.sh @@ -313,7 +313,7 @@ function install_lib() { if [ -f ${binary_dir}/build/lib/libtaosws.so ]; then ${csudo}cp ${binary_dir}/build/lib/libtaosws.so \ ${install_main_dir}/driver && - ${csudo}chmod 777 ${install_main_dir}/driver/libtaosws.so + ${csudo}chmod 777 ${install_main_dir}/driver/libtaosws.so ||: ${csudo}ln -sf ${install_main_dir}/driver/libtaosws.so ${lib_link_dir}/libtaosws.so || : if [ -d "${lib64_link_dir}" ]; then ${csudo}ln -sf ${lib64_link_dir}/libtaosws.so ${lib64_link_dir}/libtaosws.so || : @@ -364,7 +364,7 @@ function install_header() { ${install_main_dir}/include && ${csudo}chmod 644 ${install_main_dir}/include/* if [ -f ${binary_dir}/build/include/taosws.h ]; then - ${csudo}cp -f ${binary_dir}/build/include/taosws.h ${install_main_dir}/include && ${csudo}chmod 644 ${install_main_dir}/include/taosws.h + ${csudo}cp -f ${binary_dir}/build/include/taosws.h ${install_main_dir}/include && ${csudo}chmod 644 ${install_main_dir}/include/taosws.h ||: ${csudo}ln -s ${install_main_dir}/include/taosws.h ${inc_link_dir}/taosws.h ||: fi diff --git a/packaging/tools/post.sh b/packaging/tools/post.sh index 5bad6d6736..441ca02ddb 100755 --- a/packaging/tools/post.sh +++ b/packaging/tools/post.sh @@ -81,14 +81,14 @@ function kill_taosd() { } function install_include() { - ${csudo}rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h|| : - ${csudo}rm -f ${inc_link_dir}/taosws.h + ${csudo}rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h ||: + ${csudo}rm -f ${inc_link_dir}/taosws.h ||: ${csudo}ln -s ${inc_dir}/taos.h ${inc_link_dir}/taos.h ${csudo}ln -s ${inc_dir}/taosdef.h ${inc_link_dir}/taosdef.h ${csudo}ln -s ${inc_dir}/taoserror.h ${inc_link_dir}/taoserror.h - [ -f ${inc_dir}/taosws.h ] && ${csudo}ln -s ${inc_dir}/taosudf.h ${inc_link_dir}/taosudf.h ||: + [ -f ${inc_dir}/taosws.h ] && ${csudo}ln -s ${inc_dir}/taosws.h ${inc_link_dir}/taosws.h ||: } function install_lib() { @@ -101,13 +101,13 @@ function install_lib() { ${csudo}ln -s ${lib_dir}/libtaos.* ${lib_link_dir}/libtaos.so.1 ${csudo}ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so - [ -f ${lib_dir}/libtaosws.so ]${csudo}ln -s ${lib_dir}/libtaosws.so ${lib_link_dir}/libtaosws.so + [ -f ${lib_dir}/libtaosws.so ]${csudo}ln -s ${lib_dir}/libtaosws.so ${lib_link_dir}/libtaosws.so ||: if [[ -d ${lib64_link_dir} && ! -e ${lib64_link_dir}/libtaos.so ]]; then ${csudo}ln -s ${lib_dir}/libtaos.* ${lib64_link_dir}/libtaos.so.1 || : ${csudo}ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so || : - [ -ff ${lib_dir}/libtaosws.so ] && ${csudo}ln -s ${lib_dir}/libtaosws.so ${lib64_link_dir}/libtaosws.so || : + [ -f ${lib_dir}/libtaosws.so ] && ${csudo}ln -s ${lib_dir}/libtaosws.so ${lib64_link_dir}/libtaosws.so || : fi ${csudo}ldconfig diff --git a/src/plugins/taosws-rs b/src/plugins/taosws-rs index 4afe6f4bcf..d8cf0e7e06 160000 --- a/src/plugins/taosws-rs +++ b/src/plugins/taosws-rs @@ -1 +1 @@ -Subproject commit 4afe6f4bcf5ac6eca48e0f41ec73a0aea2940335 +Subproject commit d8cf0e7e067d193cfaf3e920b6ec6cbb9b9f4165 -- GitLab