From 5a39ef91367105386d173bd9fd5abc72d79ff29c Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Wed, 12 Jan 2022 13:30:41 +0800 Subject: [PATCH] [TD-12862](taosAdapter): make taosAdapter use TDengine version (#9732) * [TD-12862](taosAdapter): make taosAdapter use TDengine version * [TD-12862](taosAdapter): make taosadapter use same version as TDengine update taosadapter to use large response buffer * [TD-12862](taosAdapter): make taosAdapter use same version with TDengine update taosAdapter to fix json splicing fix system-test/test.py mistake grouping --- src/plugins/CMakeLists.txt | 28 ++++++++++++++++++++++------ src/plugins/taosadapter | 2 +- tests/system-test/test.py | 34 +++++++++++++++++----------------- 3 files changed, 40 insertions(+), 24 deletions(-) diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index 765c7195cb..ef955a5663 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -13,6 +13,22 @@ ELSEIF(TD_BUILD_TAOSA_INTERNAL) ELSE () MESSAGE("") MESSAGE("${Green} use taosadapter as httpd ${ColourReset}") + + EXECUTE_PROCESS( + COMMAND git rev-parse --abbrev-ref HEAD + RESULT_VARIABLE result_taos_version + OUTPUT_VARIABLE taos_version + ) + + STRING(FIND ${taos_version} release is_release_branch) + + IF ("${is_release_branch}" STREQUAL "0") + STRING(SUBSTRING "${taos_version}" 12 -1 taos_version) + STRING(STRIP "${taos_version}" taos_version) + ELSE () + STRING(CONCAT taos_version "branch_" "${taos_version}") + STRING(STRIP "${taos_version}" taos_version) + ENDIF () EXECUTE_PROCESS( COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR}/taosadapter ) @@ -22,12 +38,12 @@ ELSE () OUTPUT_VARIABLE taosadapter_commit_sha1 ) IF ("${taosadapter_commit_sha1}" STREQUAL "") - SET(taosadapter_commit_sha1 "unknown") + SET(taosadapter_commit_sha1 "unknown") ELSE () - STRING(SUBSTRING "${taosadapter_commit_sha1}" 0 7 taosadapter_commit_sha1) - STRING(STRIP "${taosadapter_commit_sha1}" taosadapter_commit_sha1) + STRING(SUBSTRING "${taosadapter_commit_sha1}" 0 7 taosadapter_commit_sha1) + STRING(STRIP "${taosadapter_commit_sha1}" taosadapter_commit_sha1) ENDIF () - MESSAGE("${Green} taosadapter commit: ${taosadapter_commit_sha1} ${ColourReset}") + MESSAGE("${Green} taosAdapter will use ${taos_version} and commit ${taosadapter_commit_sha1} as version ${ColourReset}") EXECUTE_PROCESS( COMMAND cd .. ) @@ -43,7 +59,7 @@ ELSE () CONFIGURE_COMMAND cmake -E echo "taosadapter no need cmake to config" PATCH_COMMAND COMMAND git clean -f -d - BUILD_COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../inc CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib go build -ldflags "-s -w -X github.com/taosdata/taosadapter/version.CommitID=${taosadapter_commit_sha1}" + BUILD_COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../inc CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib go build -ldflags "-s -w -X github.com/taosdata/taosadapter/version.Version=${taos_version} -X github.com/taosdata/taosadapter/version.CommitID=${taosadapter_commit_sha1}" INSTALL_COMMAND COMMAND curl -sL https://github.com/upx/upx/releases/download/v3.96/upx-3.96-amd64_linux.tar.xz -o upx.tar.xz && tar -xvJf upx.tar.xz -C ${CMAKE_BINARY_DIR} --strip-components 1 > /dev/null && ${CMAKE_BINARY_DIR}/upx taosadapter || : COMMAND cmake -E copy taosadapter ${CMAKE_BINARY_DIR}/build/bin @@ -62,7 +78,7 @@ ELSE () CONFIGURE_COMMAND cmake -E echo "taosadapter no need cmake to config" PATCH_COMMAND COMMAND git clean -f -d - BUILD_COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../inc CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib go build -ldflags "-s -w -X github.com/taosdata/taosadapter/version.CommitID=${taosadapter_commit_sha1}" + BUILD_COMMAND CGO_CFLAGS=-I${CMAKE_CURRENT_SOURCE_DIR}/../inc CGO_LDFLAGS=-L${CMAKE_BINARY_DIR}/build/lib go build -ldflags "-s -w -X github.com/taosdata/taosadapter/version.Version=${taos_version} -X github.com/taosdata/taosadapter/version.CommitID=${taosadapter_commit_sha1}" INSTALL_COMMAND COMMAND cmake -E copy taosadapter ${CMAKE_BINARY_DIR}/build/bin COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test/cfg/ diff --git a/src/plugins/taosadapter b/src/plugins/taosadapter index 47fb0b3e62..3014623328 160000 --- a/src/plugins/taosadapter +++ b/src/plugins/taosadapter @@ -1 +1 @@ -Subproject commit 47fb0b3e627ddadf1ca983c1d75b9a4e44cd98fd +Subproject commit 3014623328117744b627582e7beb6352c577a7c5 diff --git a/tests/system-test/test.py b/tests/system-test/test.py index b39b95c903..e66b7b6f30 100644 --- a/tests/system-test/test.py +++ b/tests/system-test/test.py @@ -28,7 +28,7 @@ import taos if __name__ == "__main__": - + fileName = "all" deployPath = "" masterIp = "" @@ -55,7 +55,7 @@ if __name__ == "__main__": tdLog.printNoPrefix('-w taos on windows') sys.exit(0) - if key in ['-r', '--restart']: + if key in ['-r', '--restart']: restart = True if key in ['-f', '--file']: @@ -117,7 +117,7 @@ if __name__ == "__main__": time.sleep(2) tdLog.info('stop All dnodes') - + if masterIp == "": host = '127.0.0.1' else: @@ -129,11 +129,11 @@ if __name__ == "__main__": tdLog.info("Procedures for testing self-deployment") td_clinet = TDSimClient("C:\\TDengine") td_clinet.deploy() - remote_conn = Connection("root@%s"%host) + remote_conn = Connection("root@%s" % host) with remote_conn.cd('/var/lib/jenkins/workspace/TDinternal/community/tests/pytest'): remote_conn.run("python3 ./test.py") conn = taos.connect( - host="%s"%(host), + host="%s" % (host), config=td_clinet.cfgDir) tdCases.runOneWindows(conn, fileName) else: @@ -146,23 +146,21 @@ if __name__ == "__main__": try: if key_word in open(fileName).read(): is_test_framework = 1 - except: + except BaseException: pass if is_test_framework: moduleName = fileName.replace(".py", "").replace("/", ".") uModule = importlib.import_module(moduleName) try: ucase = uModule.TDTestCase() - tdDnodes.deploy(1,ucase.updatecfgDict) - except : - tdDnodes.deploy(1,{}) + tdDnodes.deploy(1, ucase.updatecfgDict) + except BaseException: + tdDnodes.deploy(1, {}) else: pass - tdDnodes.deploy(1,{}) + tdDnodes.deploy(1, {}) tdDnodes.start(1) - - tdCases.logSql(logSql) if testCluster: @@ -179,18 +177,20 @@ if __name__ == "__main__": if fileName == "all": tdCases.runAllLinux(conn) else: - tdCases.runOneWindows(conn, fileName) + tdCases.runOneLinux(conn, fileName) if restart: if fileName == "all": tdLog.info("not need to query ") - else: + else: sp = fileName.rsplit(".", 1) if len(sp) == 2 and sp[1] == "py": tdDnodes.stopAll() tdDnodes.start(1) - time.sleep(1) - conn = taos.connect( host, config=tdDnodes.getSimCfgPath()) - tdLog.info("Procedures for tdengine deployed in %s" % (host)) + time.sleep(1) + conn = taos.connect(host, config=tdDnodes.getSimCfgPath()) + tdLog.info( + "Procedures for tdengine deployed in %s" % + (host)) tdLog.info("query test after taosd restart") tdCases.runOneLinux(conn, sp[0] + "_" + "restart.py") else: -- GitLab