From 24004e7838480a835f3fc0c131a196178fd98115 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Sat, 23 Jul 2022 14:49:41 +0800 Subject: [PATCH] chore: update libtaos ws submodule (#15310) * 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 * fix: tools/remove_client.sh * fix: install script * chore: add libtaosws to tools * chore: update taosws-rs * chore: update taosws-rs * chore: update taosws-rs fix float null * chore: enable websocket build * chore: use seperate build for arm64 * chore: update CMakeLists.txt to allow taosws compile on any platform * ci: build in container to make runtime env same with build env Co-authored-by: tangfangzhi --- Jenkinsfile2 | 13 ++++- src/plugins/CMakeLists.txt | 80 +++++++++++++------------- src/plugins/taosws-rs | 2 +- tests/parallel_test/container_build.sh | 2 +- 4 files changed, 52 insertions(+), 45 deletions(-) diff --git a/Jenkinsfile2 b/Jenkinsfile2 index 257a13e4bf..6f18fc1ef5 100644 --- a/Jenkinsfile2 +++ b/Jenkinsfile2 @@ -134,7 +134,7 @@ def sync_source() { git submodule update --init --recursive ''' } -def pre_test() { +def pre_test_arm64() { sync_source() sh ''' cd ${WK} @@ -148,6 +148,14 @@ def pre_test() { ''' return 1 } +def pre_test() { + sync_source() + sh ''' + cd ${WKC}/tests/parallel_test + ./container_build.sh -w ${WKDIR} -t 8 >/dev/null + ''' + return 1 +} def pre_test_mac() { sync_source() sh ''' @@ -312,6 +320,7 @@ pipeline { agent none options { skipDefaultCheckout() } environment{ + WKDIR = '/var/data/jenkins/workspace' WK = '/var/data/jenkins/workspace/TDinternal' WKC = '/var/data/jenkins/workspace/TDinternal/community' LOGDIR = '/var/data/jenkins/workspace/log' @@ -330,7 +339,7 @@ pipeline { agent {label " worker07_arm64 || worker09_arm64 "} steps { timeout(time: 20, unit: 'MINUTES') { - pre_test() + pre_test_arm64() script { sh ''' echo "arm64 build done" diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index 20c23bb88b..1d4cebd2a5 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -5,48 +5,46 @@ ADD_SUBDIRECTORY(monitor) IF (TD_WEBSOCKET) MESSAGE("${Green} use libtaos-ws${ColourReset}") - IF (TD_LINUX) - IF (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs/target/release/libtaosws.so" OR + IF (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs/target/release/libtaosws.so" OR "${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs/target/release/libtaosws.so" IS_NEWER_THAN "${CMAKE_SOURCE_DIR}/.git/modules/src/plugins/taosws-rs/FETCH_HEAD") - MESSAGE("target is newer than fetch head") - include(ExternalProject) - ExternalProject_Add(taosws-rs - PREFIX "taosws-rs" - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs - BUILD_ALWAYS off - DEPENDS taos - BUILD_IN_SOURCE 1 - CONFIGURE_COMMAND cmake -E echo "taosws-rs no need cmake to config" - PATCH_COMMAND - COMMAND git clean -f -d - BUILD_COMMAND - COMMAND cargo build --release -p taos-ws-sys - COMMAND ./taos-ws-sys/ci/package.sh - INSTALL_COMMAND - COMMAND cmake -E copy target/libtaosws/libtaosws.so ${CMAKE_BINARY_DIR}/build/lib - COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include - COMMAND cmake -E copy target/libtaosws/taosws.h ${CMAKE_BINARY_DIR}/build/include - ) - ELSE () - include(ExternalProject) - ExternalProject_Add(taosws-rs - PREFIX "taosws-rs" - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs - BUILD_ALWAYS on - DEPENDS taos - BUILD_IN_SOURCE 1 - CONFIGURE_COMMAND cmake -E echo "taosws-rs no need cmake to config" - PATCH_COMMAND - COMMAND git clean -f -d - BUILD_COMMAND - COMMAND cargo build --release -p taos-ws-sys - COMMAND ./taos-ws-sys/ci/package.sh - INSTALL_COMMAND - COMMAND cmake -E copy target/libtaosws/libtaosws.so ${CMAKE_BINARY_DIR}/build/lib - COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include - COMMAND cmake -E copy target/libtaosws/taosws.h ${CMAKE_BINARY_DIR}/build/include - ) - ENDIF() + MESSAGE("target is newer than fetch head") + include(ExternalProject) + ExternalProject_Add(taosws-rs + PREFIX "taosws-rs" + SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs + BUILD_ALWAYS off + DEPENDS taos + BUILD_IN_SOURCE 1 + CONFIGURE_COMMAND cmake -E echo "taosws-rs no need cmake to config" + PATCH_COMMAND + COMMAND git clean -f -d + BUILD_COMMAND + COMMAND cargo build --release -p taos-ws-sys + COMMAND ./taos-ws-sys/ci/package.sh + INSTALL_COMMAND + COMMAND cmake -E copy target/libtaosws/libtaosws.so ${CMAKE_BINARY_DIR}/build/lib + COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include + COMMAND cmake -E copy target/libtaosws/taosws.h ${CMAKE_BINARY_DIR}/build/include + ) + ELSE () + include(ExternalProject) + ExternalProject_Add(taosws-rs + PREFIX "taosws-rs" + SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/taosws-rs + BUILD_ALWAYS on + DEPENDS taos + BUILD_IN_SOURCE 1 + CONFIGURE_COMMAND cmake -E echo "taosws-rs no need cmake to config" + PATCH_COMMAND + COMMAND git clean -f -d + BUILD_COMMAND + COMMAND cargo build --release -p taos-ws-sys + COMMAND ./taos-ws-sys/ci/package.sh + INSTALL_COMMAND + COMMAND cmake -E copy target/libtaosws/libtaosws.so ${CMAKE_BINARY_DIR}/build/lib + COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/build/include + COMMAND cmake -E copy target/libtaosws/taosws.h ${CMAKE_BINARY_DIR}/build/include + ) ENDIF() ENDIF () diff --git a/src/plugins/taosws-rs b/src/plugins/taosws-rs index 267a96fb09..9de599dc52 160000 --- a/src/plugins/taosws-rs +++ b/src/plugins/taosws-rs @@ -1 +1 @@ -Subproject commit 267a96fb09fc2ba14acfa47f7d3678def64c29c5 +Subproject commit 9de599dc5293e9c90bc00bc4a03f8b91ba756bc3 diff --git a/tests/parallel_test/container_build.sh b/tests/parallel_test/container_build.sh index 0873f6030b..bf81883311 100755 --- a/tests/parallel_test/container_build.sh +++ b/tests/parallel_test/container_build.sh @@ -45,7 +45,7 @@ INTERNAL_REPDIR=$WORKDIR/TDinternal docker run \ -v $INTERNAL_REPDIR:/home \ - --rm --ulimit core=-1 taos_test:v1.0 sh -c "cd /home/$COMMUNITY;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true;make -j $THREAD_COUNT" + --rm --ulimit core=-1 taos_test:v1.0 sh -c "cd /home/$COMMUNITY;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DWEBSOCKET=true;make -j $THREAD_COUNT;make install" ret=$? exit $ret -- GitLab