Commit graph

834 commits

Author SHA1 Message Date
Jinqing Kuang
968eeeeb0b Merge branch '3.0' into feat/TS-6100-3.0-merge 2025-07-07 18:04:02 +08:00
Simon Guan
fc2fec02c7
merge: from main to 3.0 branch (#31562) 2025-07-03 09:15:59 +08:00
zelv01
fd24e18743 Merge branch 'feat/TS-6100-3.0' of github.com:taosdata/TDengine into feat/TS-6100-3.0 2025-06-24 14:17:20 +08:00
Jinqing Kuang
85fad8e178 Merge branch '3.0' into temp 2025-06-23 18:08:09 +08:00
chenhaoran
50ea3fd4bf fix: update adapter configuration to replace log and config directory paths 2025-06-19 20:45:04 +08:00
chenhaoran
54a47e41d5 fix: update adapter configuration to replace taosConfigDir path in install_spec.sh 2025-06-19 20:35:09 +08:00
chenhaoran
c79f804fe6 fix: update keeper configuration to replace localhost IP and set log directory path 2025-06-19 20:26:54 +08:00
chenhaoran
01fb7989c2 refactor: clean up install_spec.sh by removing unused functions and adjusting default install directory 2025-06-19 19:51:24 +08:00
huohong
9e9318a1da
Update install.sh 2025-06-13 11:22:11 +08:00
WANG Xu
e0690fe19c
Merge pull request #31298 from cockroach888/patch-5
fix: 修正因DISABLE_EXPLORER定义未使用,导致无法控制taos-explorer启动与否。
2025-06-10 16:29:41 +08:00
WANG Xu
516eb1eb90
refactor: remove sleep 3 2025-06-10 16:28:01 +08:00
huohong
292e70d9cd
Update remove.sh (#31307) 2025-06-06 19:07:55 +08:00
蟑螂·魂
45bffe11f4
fix: 修正因DISABLE_EXPLORER定义未使用,导致无法控制taos-explorer启动与否。
fix: 修正因DISABLE_EXPLORER定义未使用,导致无法控制taos-explorer启动与否。
2025-06-06 14:08:02 +08:00
huohong
32061bad97
Update install.sh (#31281) 2025-06-05 14:33:09 +08:00
Jinqing Kuang
5f3d1df1fa Merge branch '3.0' into feat/TS-6100-3.0 2025-05-27 19:31:36 +08:00
Jinqing Kuang
18566df281 Merge branch '3.0' into kjq-merge 2025-05-24 14:56:21 +08:00
蟑螂·魂
02433a95e6
fix: 修正LD_LIBRARY_PATH定义时存在空路径问题。 (#31156)
style: 调整apt-get为apt方式;还有就是bin目录下的entrypoint.sh脚本文件,换行符目前是Windows的,建议调整为Unix(LF)格式。
2025-05-23 13:49:10 +08:00
蟑螂·魂
1f3c9d712a
fix: 修正变量DATA_DIR的大小写使用问题。 (#31157) 2025-05-23 13:46:42 +08:00
Simon Guan
08b8673ac5
merge: from main to 3.0 branch (#31161) 2025-05-22 09:13:14 +08:00
haoranchen
492ab1fd1a
fix: update library file paths in makeclient.sh to remove version suffixes for consistency (#31128)
* fix: update library file paths in makepkg.sh for consistency

* fix: update library file paths in makeclient.sh to remove version suffixes for consistency
2025-05-18 14:21:40 +08:00
haoranchen
92e1983b03
fix: update library file paths in makepkg.sh for consistency (#31124) 2025-05-17 17:49:58 +08:00
haoranchen
d68dd417da
fix: update library file paths in makepkg.sh for consistency across platforms (#31122)
* fix: update symbolic links for libtaosws to support versioned files

* fix: update library file names in packaging scripts to include versioning

* fix: update library file handling in makepkg.sh for versioning consistency

* fix: refactor driver file copy commands for improved readability

* fix: update library file paths in makepkg.sh for consistency across platforms
2025-05-17 16:06:26 +08:00
haoranchen
30579f7b91
fix: update symbolic links for libtaosws to support versioned files (#31118)
* fix: update symbolic links for libtaosws to support versioned files

* fix: update library file names in packaging scripts to include versioning

* fix: update library file handling in makepkg.sh for versioning consistency

* fix: refactor driver file copy commands for improved readability
2025-05-17 14:44:06 +08:00
haoranchen
258baeb974
fix: update symbolic links for libtaosws to support versioned files (#31111)
* fix: update symbolic links for libtaosws to support versioned files

* fix: update library file names in packaging scripts to include versioning
2025-05-17 11:16:44 +08:00
haoranchen
a723424b50
fix: update symbolic links for libtaosws to support versioned files (#31107) 2025-05-16 20:30:37 +08:00
Simon Guan
90d8f69d71
enh: update the method for generating driver version numbers (#31098) 2025-05-16 12:00:39 +08:00
wangjiaming0909
ef7d67efe0 new-stream: runner notification 2025-05-14 09:55:07 +00:00
Linhe Huo
bcf55deb00
feat(docker): support initialization scripts [ci skip] (#31062) 2025-05-13 11:03:55 +08:00
WANG Xu
929b67a396
Merge pull request #31049 from taosdata/cd/main/TD-34726
Add tdsvc.sh script for managing TAOS components
2025-05-12 09:13:41 +08:00
WANG Xu
5b8627cd54
Merge pull request #31016 from taosdata/fix/main/TD-34626
fix: standardize shell shebangs and improve code formatting in scripts
2025-05-12 09:08:11 +08:00
chenhaoran
9e838bd386 fix: correct configuration file paths in install_spec.sh 2025-05-10 23:07:45 +08:00
chenhaoran
19679fbb6e Add tdsvc.sh script for managing TAOS components
- Introduced a new script `tdsvc.sh` to facilitate starting and stopping TAOS components.
- Implemented functions to start and stop individual components as well as all components at once.
- Added error handling for missing configuration directories and unknown components.
- The script supports running components in the background and includes a mechanism to forcefully stop unresponsive components.
2025-05-10 22:59:38 +08:00
jiajingbin
eb4a84c16b fix: fix seq for JAVA_PATH and enh apt install 2025-05-08 15:36:46 +08:00
chenhaoran
8c5c584c2f fix: standardize shell shebangs and improve code formatting in scripts 2025-05-08 15:14:55 +08:00
guichuan zhang
e6afe17382
fix(packaging): update docker entrypoint DATA_DIR,FQDN,FIRSET_EP,SERVER_PORT (#31004) 2025-05-08 11:25:28 +08:00
huohong
e1427c064a
Update make_install.bat
fix taosws.h unpackage issue
2025-05-07 15:57:53 +08:00
chenhaoran
4d5d1d8649 fix: correct AppId syntax in tdengine.iss 2025-04-30 17:01:52 +08:00
chenhaoran
992115b3d6 fix: update .gitignore to include test files and correct DLL path in tdengine.iss 2025-04-29 17:46:34 +08:00
Linhe Huo
6c377e7dbd
fix: release build error and make install sudo lost (#30928)
Close [TD-34660](https://jira.taosdata.com:18080/browse/TD-34660)
2025-04-28 15:43:25 +08:00
freemine
6267763e85
Freemine.cmake.3.0 (#30663)
* chore(ci): with cmake verbose, temporarily

* chore(cmake): prefer Threads::Threads

* fix(cmake): debug building gtest on ubuntu 20.04 for the moment

* fix(cmake): try adding Threads::Threads

* fix(cmake): debug building gtest on ubuntu 20.04 for the moment

* fix(cmake): revert taosd-ci-build.yml

* fix(cmake): debug building on ubuntu 20.04 for the moment

* fix(cmake): debug building on ubuntu 20.04 for the moment

* fix(cmake): debug building on ubuntu 20.04 for the moment, adding dl right after DEP_ext_libuv

* fix(cmake): debug building on ubuntu 20.04 for the moment, try full run

* fix(cmake): fix building on ubuntu 20.04

* fix(cmake): dl is only valid in non-windows platform

* fix(cmake): dl order

* refactor(cmake): adjust option/cache variables for external dependencies

* refactor(cmake): mv patch files from contrib/ to cmake/

* refactor(cmake): typo

* refactor(cmake): adding cache on ci

* refactor(cmake):
1. ext_lzma2 is only used by Linux
2. fix bug in taosd-ci-build.yml

* enh: adding functionalities of build.sh

* fix(ci): `cmake -B` shall maintain consistency

* refactor(cmake): LOCAL_REPO/LOCAL_URL as cache variable

* refactor(cmake): taosadapter to be built in main build directory rather than .externals

* refactor(cmake): adding rpath for taosadapter, linux now

* refactor(cmake): adding rpath for taosadapter, macos now

* chore(cmake): remove some comments

* debug(ci): bypass TD_EXTERNALS_USE_ONLY

* debug(ci): bypass .externals caching for the moment

* fix(cmake): temporarily use taosadapter/main branch because this branch(freemine.cmake.3.0) has not include taos_fetch_fields_e from upstream

* refactor(cmake): clean GIT_TAG/GIT_SHALLOW pairs

* enh(ci): use build.sh rather than hard-coded in taosd-ci-build.yml, linux for now

* debug(ci): undefined __isoc23_strtoull

* debug(ci): benchmarkTest

* debug(ci): what if use_only = off

* debug(ci): remove .externals to make a refresh build

* debug(ci): back to cache, and ls files of gtest

* debug(ci): remove find coz {} not escaped

* debug(ci): cache key seems missing "matrix.os"

* refactor(ci): fixed cache key and reopen macos/windows

* chore(ci): literally -j4

* chore(ci): Trigger GitHub Actions re-run

* chore(ci): Trigger GitHub Actions re-run

* fix(ci): typo

* chore(ci): JOBS calculated by build.sh itself

* refactor(ci): enable WEBSOCKET in build.sh by default

* refactor(ci): enable WEBSOCKET in build.sh by default, macOS

* chore(cmake): remove obsoletes

* refactor(ci): stop service before running taosd

* chore(ci): `./build.sh install` just install TDengine, you will have to start taosd by `./build.sh start`

* refactor(cmake): adding source code found on http://emfisis.physics.uiowa.edu/Software/C/libargp/

* refactor(cmake): moving jansson/snappy/avro to .externals, and porting BUILD_TEST/WEBSOCKET on Windows

* refactor(cmake): porting linux

* refactor(cmake): porting macos
1. check argp.h
2. re-enable building taosdump

* refactor(cmake): porting linux
1. adjust CMAKE_C/CXX_FLAGS

* refactor(cmake): porting windows, adjust CMAKE_C/CXX_FLAGS

* refactor(cmake): use cmake_parse_arguments in macro INIT_EXT

* refactor(cmake): format ci cache directives

* refactor(cmake): adding comments for ci externals-cache directives

* refactor(cmake): adding check_env.cmake to checking libraries installed on the system

* refactor(cmake): porting linux, make homebrew-installed-libs available

* refactor(cmake): remove BYPRODUCTS from INIT_EXT macro

* refactor(cmake): INC_DIR is oneValueArg

* refactor(cmake): taosdump depends on ext_xz(LZMA)

* refactor(cmake): add copy_pthreadVC3 target on windows

* refactor(cmake): mv taosd-ci-build.yml to tdengine-build.yml

* chore(ci): try to fix yml syntax error

* refactor(cmake): use brew --prefix to get HomeBrew's install path

* refactor(cmake): typo

* debug(ci): build and cache externals first

* debug(ci): adding -Wno-stringop-overread for the moment

* debug(ci): make Threads::Threads public from os target

* debug(ci): make os public

* debug(ci): re-enable start and test

* debug(ci): let it go even if taosBenchmark failed

* debug(ci): copy logic from TDengine/main

* debug(ci): try ./build.sh start/test

* debug(ci): revert to original simple test logic in ci, taosBenchark/taos

* chore(cmake): code-convention and ci-logic

* debug(ci): show versions

* debug(ci): forcefully use specific GIT_TAG by commit-id for taos-connector-rust.git and taosadapter.git

* refactor(cmake): remove empty lines

* debug(ci): typo

* debug(ci): set supportVnodes to 256 before starting taosd

* debug(ci): fix: sudo and pipe

* debug(ci): cat /etc/taos/taos.cfg to check if supportVnodes effective

* debug(ci): cat forceReadConfig to taos.cfg

* debug(ci): adding taos -s "show dnodes"

* debug(ci): print more info

* debug(ci):
1. git log .... in an independant step
2. sleep 3 deliberately

* build: release ver-3.3.6.0

* chore(ci): comment and remove unnecessary code

* refactor(ci): cleanup tools/CMakeLists.txt
1. remove unnecessary or uneffective codes
2. better approach to pass compile flags to go

* chore(cmake): remove unnecessary code

* merge(cmake): porting linux

* merge(cmake): porting macOS

* merge(cmake): porting windows

* merge(cmake): pitfall fix: use literal format string instead

* merge(cmake): ver-3.3.6.0 for both taosadatper and taosws

* merge(cmake): adjust ci for debug purposes

* merge(cmake): add dependenices to make sure native built

* merge(main): link os

* merge(main): revert to main

* chore(cmake): remove freemine'd comments

* chore(cmake): make github ci to run with empty change

* refactor(cmake): remove unnecessaries

* refactor(cmake): remove unnecessaries

* chore(cmake):
1. remove taosudf in build.sh::do_purge
2. packaging taosBenchmark

* chore(cmake):
1. typo corrections
2. add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to bypass compatibility check imposed by latest cmake since 4.0

* chore(cmake): show cmake version

* chore(cmake): add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to bypass compatibility check imposed by latest cmake since 4.0

* chore(cmake): typo

* chore(cmake): remove unnecessaries

* cmake: debug enterprise compilation

* refactor: preparatory work before merging the freemin PR

* refactor(cmake): revert to d91205594a

* refactor(cmake): optimize by adjusting cache key

* chore(cmake): make github ci to run with empty change

* refactor(cmake): move libs3 and azure to external.cmake

* refactor(cmake): porting macOS

* refactor(cmake): move cos to external.cmake

* refactor(cmake): bypass s3/azure/cos on windows for the moment

* refactor(cmake): try find_package(Threads)

* refactor(cmake): add dl/pthread in libs3

* refactor(cmake): enable s3/azure for the moment, hard-coded

* refactor(cmake): adjust BUILD_WITH_ANALYSIS option

* refactor(cmake):
1. enum AVROTYPE => enum enAVROTYPE
2. remove INSTALL(CODE ...) from tools/taos-tools/CMakeLists.txt

* refactor(cmake): portint macOS and typo

* refactor(cmake): ticking external cache key to force refresh external building

* refactor(cmake): remove obsoletes

* refactor(cmake): remove obsoletes

* refactor(cmake): remove obsoletes, contrib/deps-download related

* refactor(cmake): adding build.bat, and use build.bat in .github/workflows/tdengine-build.yml

* refactor(cmake):
1. call .\build.bat
2. remove POST_BUILD which is not valid in this signature of add_custom_command

* refactor(ci): use 'NMake Makefiles JOM'

* refactor(ci): typo

* refactor(ci): debug

* refactor(ci): debug

* refactor(ci): debug

* refactor(ci): use call on windows

* refactor(cmake): move utils/TSZ to contrib/TSZ

* chore(cmake): make github ci to run with empty change

* refactor(cmake): mv cmake.* -> *.cmake and related in CMakeLists.txt

* refactor(cmake): debugging integrating community

* refactor(cmake): debugging integrating community

* chore(cmake): make github ci to run with empty change

* refactor(cmake): revert geos.git back to 3.12.0

* refactor(cmake): revert doc/** to main branch

* refactor(cmake): revert tests/** to main branch, except tests/taosc_test/CMakeLists.txt

* refactor(cmake): revert test/cases/** to main branch

* refactor(cmake): revert test/docs/** to main branch

* refactor(cmake): revert tools/taos-tools/deps/{avro,jansson,libargp,snappy,zlib-1.2.13} to main branch, which need to be removed later

* refactor(ci): revert .github/workflows/{deploy-case-docs.yml,tdengine-doc-build.yml} to main branch

* refactor(cmake): revert tcommon.h and related to main branch

* refactor(cmake): revert test/* stuffs back to main branch

* refactor(cmake): revert libuv.git back to v1.49.2

* refactor(cmake): revert .h/.c and related to main branch

* refactor(cmake): typo format string

* refactor(cmake): typo correction, incorrect use of macro `assert`

* refactor(cmake): adding /wd4028 to bypass thttp.c under enterprise build for the moment

* refactor(cmake):
1. adding some rules to .gitignore for the last resort to save
2. adding source files manually to source/libs/parser/CMakeLists.txt to exclude potential sql.c generated by old build system

* refactor(cmake): add -Wno-unused-result for the moment

* refactor(cmake): adjust target dependencies

* refactor(cmake): tweaking building of mxml

* refactor(cmake): adjust externals CMAKE_ARGS to save compilation time

* refactor(cmake): temporarily use tomchon-patch-3

* refactor(cmake): temporarily adding dumpbin directives

* refactor(cmake): adding NODEFAULTLIB temporarily for debugging purpose

* refactor(cmake): adding NODEFAULTLIB:libcpmt temporarily for debugging purpose

* refactor(cmake): adding NODEFAULTLIB:cpmt temporarily for debugging purpose

* chore(cmake): make github ci to run with empty change

* chore(cmake): make github ci to run with empty change

* refactor(ci): use freemine.debug branch for the moment

* refactor(ci): revert back to use run-tests-on-windows.yml of tomchon-patch-3 branch

* chore(cmake): make github ci to run with empty change

* refactor(cmake): remove temporary debug directives

* refactor(cmake): move cmake_policy(..CMP0135..) to the root of this project

* refactor(cmake): Remove temporary debugging conditional and restore original logic

* chore(cmake): adding -B in army tests

* chore(cmake): make github ci to run with empty change

* chore(cmake): revert: adding -B in army tests

* refactor(cmake):
1. use ver-3.3.6.3 of taosadapter
2. pitfall fix: do not link with taosws for taos shell

* refactor(cmake): revert taosadapter to ver-3.3.6.0

* chore(cmake): adding logging message in more detail

* chore(cmake): adding logging message in more detail

* chore(ci): debugging by using ls -l

* chore(ci): typo

* chore(ci): typo

* refactor(cmake): revert to remove debug code, and taosadapter to ver-3.3.6.3

* refactor(cmake): remove DEP_ext_taosws

* chore(cmake): make github ci to run with empty change

* chore(cmake): make github ci to run with empty change

* chore(cmake): make github ci to run with empty change

* chore(cmake): make github ci to run with empty change

* chore(cmake): typo correction: utils/test/c/sml_test.c

* debug(cmake): test cases debug

* chore(cmake): make github ci to run with empty change

* chore(ci): using tomchon-patch-3 branch for run-tests-on-linux for the moment

* chore(cmake): make github ci to run with empty change

* debug(test): revert utils/test/c/sml_test.c back to tdengine/main branch

* debug(test): adding VERBOSE=1 and gcc --version

* debug(test): revert tests/parallel_test/cases.task back to tdengine/main branch

* debug: add log in run_case.sh

* fix: test log

* fix: docker run privileged

* tes: add debug test in  cases.task

* refactor(cmake): remove ref to \contrib\<dep-name> and ~/.cos-local-{1,2} from CMakeLists.txt(s)

* refactor(cmake): make taosudf link with libtaos.so

* chore(cmake): fix compiler warning as error problem

* refactor(cmake): revert 7d7f03832d

* chore(cmake): only udf.sim and udfpy.sim for the moment

* debug(ci): debug udf.sim for the moment

* debug(ci): debug udf.sim for the moment

* debug(ci): debug udf.sim for the moment

* debug(ci): debug only udf.sim for the moment

* debug(ci): debug only udf.sim for the moment, using tee

* debug(ci): debug only udf.sim for the moment, revert using tee

* debug(ci): debug only udf.sim for the moment, adding TAOS_LIB again

* debug(cmake): adding -rdynamic for the moment

* debug(cmake): re-adding udfpy.sim

* debug(cmake): do NOT run with Sanitizer for udfpy.sim for the moment

* chore(cmake): revert cases.task, and remove ubuntu-20.04 from tdengine-build.yml

* refactor(cmake): using ENABLE_EXPORTS to export symbols in taosudf

* chore(cmake): make github ci to run with empty change

* chore(cmake): remove stuffs for debug purpose and revert

---------

Co-authored-by: support-platform <it@taosdata.com>
Co-authored-by: Simon Guan <slguan@taosdata.com>
Co-authored-by: Simon Guan <guanshengliang@qq.com>
Co-authored-by: haoranchen <haoran920c@163.com>
2025-04-19 14:03:29 +08:00
haoranchen
f7c1757da2
fix: add ThrottleInterval key to plist for taosd in mac (#30771) 2025-04-13 09:26:45 +08:00
WANG Xu
9c194d1b2a
Merge pull request #30745 from taosdata/fix/TD-34510
fix: fix taosadapter.toml lose on Mac
2025-04-11 14:50:55 +08:00
huohong
2046a697dc
Update make_install.sh 2025-04-11 14:10:49 +08:00
huohong
e28e54b066
fix: fix taosadapter.toml lose on Mac 2025-04-10 18:01:56 +08:00
huohong
08264207df
fix: Update remove.sh 2025-04-10 09:08:22 +08:00
jiajingbin
6d537e4405 feat: add uv to setup_env.sh 2025-04-09 14:41:38 +08:00
jiajingbin
9600f94412 feat: add uv to setup_env.sh 2025-04-09 14:06:16 +08:00
huohong
1a697d34ed
feat: fix install.sh taosudf name (#30703) 2025-04-09 11:02:56 +08:00
chenhaoran
41ba65c43f fix: improve process killing logic in remove.sh to avoid grep false positives for mac 2025-04-07 18:01:04 +08:00
jiajingbin
0c8dc093c5 enh: add a condition 2025-04-05 00:29:44 +08:00