Commit Graph

2515 Commits

Author SHA1 Message Date
wangjiaming0909 2b594e02d2 fix tsma name too long 2024-04-16 14:25:20 +08:00
wangjiaming0909 3566cac206 add max tsma num opt 2024-04-16 14:23:26 +08:00
wangjiaming0909 a8e00f7410 drop tb in transaction 2024-04-16 14:23:26 +08:00
wangjiaming0909 cc9550f45e add tsma funcs 2024-04-16 14:20:59 +08:00
wangjiaming0909 98ca847eb8 add tests 2024-04-16 14:18:11 +08:00
wangjiaming0909 c3e73d9168 fix recursive tsma 2024-04-16 14:18:10 +08:00
wangjiaming0909 8e56d9a359 fix tsmas 2024-04-16 14:18:10 +08:00
wangjiaming0909 ef47fd57d6 support tsma catalog cache 2024-04-16 14:14:34 +08:00
wangjiaming0909 5589cf0309 server handle tsma creation 2024-04-16 14:13:10 +08:00
dapan1121 847b25e5f2 fix: task queue quit issue 2024-04-16 13:41:08 +08:00
dapan1121 55d118d17c Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-04-16 09:12:04 +08:00
Yihao Deng ea9385912f Merge branch '3.0' into feat/compress_3.0 2024-04-15 09:06:30 +00:00
kailixu 123090e18a fix: solve conflicts 2024-04-15 16:12:15 +08:00
dm chen 4d660d89c0
Merge branch '3.0' into feat/TD-24834 2024-04-15 15:12:32 +08:00
yihaoDeng 4948bd690d 3.0 merge compress 2024-04-15 11:38:44 +08:00
Minglei Jin 16b65b7311 Merge branch 'feat/TS-4243-3.0' into enh/TD-28945-pk 2024-04-12 10:32:25 +08:00
Minglei Jin 6515d74fa2 Merge branch '3.0' into enh/TD-28945-pk 2024-04-11 16:02:01 +08:00
54liuyao 1d42e927c6 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/TS-4243-3.0 2024-04-11 15:35:42 +08:00
kailixu 3738ce9e10 chore: solve conflicts of sql.c 2024-04-11 11:05:58 +08:00
kailixu bff8226c0f enh: none column for primary key 2024-04-11 08:27:17 +08:00
yihaoDeng a02426fd2f Merge branch '3.0' into feature/compressData 2024-04-10 09:03:50 +00:00
wangjiaming0909 8a5532dd88 add cfg value check 2024-04-10 16:48:02 +08:00
Minglei Jin 0761692b14 Merge branch 'feat/TS-4243-3.0' into enh/TD-28945-pk 2024-04-10 16:30:06 +08:00
Minglei Jin 49a9c5abad Merge branch '3.0' into feat/TS-4243-3.0 2024-04-10 16:24:24 +08:00
dapan1121 b05e7fb34a
Merge pull request #25262 from taosdata/fix/xsren/TD-29197
fix: logFileHandle NULL
2024-04-10 15:09:21 +08:00
factosea a969142c37 fix: create log file thread 2024-04-10 10:21:54 +08:00
Minglei Jin 6eb014e32b Merge branch 'feat/TS-4243-3.0' into enh/TD-28945-pk 2024-04-09 19:11:46 +08:00
54liuyao 53265e9e09 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/ly-TS-4243-3.0 2024-04-08 17:24:09 +08:00
Minglei Jin a407f76165 Merge branch '3.0' into enh/TD-28945 2024-04-08 10:55:47 +08:00
Minglei Jin 44b9785853 cos/multi-write: include headers part 2024-04-08 10:33:02 +08:00
Benguang Zhao ac6846d76c enh: check validity of parallel actions of trans 2024-04-07 15:26:18 +08:00
wangmm0220 6174c3bfd3 fix:disable primary key in schemaless 2024-04-07 14:54:58 +08:00
dapan1121 6d52120bf7 Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-04-07 13:54:39 +08:00
slzhou d4b8460baa fix: change delete condition error message 2024-04-03 15:48:56 +08:00
factosea ad1c474dc6 fix: logFileHandle NULL 2024-04-03 15:29:08 +08:00
kailixu adb6de0595 fix: null value check for target column with pk 2024-04-02 17:33:11 +08:00
Haojun Liao 94e6f96a75 other: merge 3.0 2024-04-02 13:39:26 +08:00
kailixu c4aba0ac37 feat: encryption key optimize and test case adjust 2024-04-01 16:14:55 +08:00
kailixu 6eaa99bb2d feat: encryption algorithm 2024-04-01 13:58:13 +08:00
yihaoDeng ff8b606e37 fix ci error 2024-03-30 14:30:38 +00:00
yihaoDeng 0cce8df6b5 Merge branch '3.0' into feature/compressData 2024-03-30 02:00:24 +00:00
Haojun Liao 55bb6ab341 fix(tsdb): set correct initial value for compare 2024-03-29 18:15:03 +08:00
yihaoDeng b7067e61c8 fix ci error 2024-03-29 08:40:19 +00:00
kailixu 8dce61b68f chore: merge TD-29280-3.0 2024-03-29 11:39:46 +08:00
yihaoDeng 2f10dca544 Merge branch 'feature/compressData' of https://github.com/taosdata/TDengine into feature/compressData 2024-03-29 02:53:02 +00:00
dmchen b9deb71fc5 basic function 2024-03-29 02:48:49 +00:00
factosea 9ddc0b51cb merge 2024-03-29 10:37:59 +08:00
slzhou 6202e1f501 feat: drop pk column and update pk column is not supported for stable 2024-03-29 10:26:09 +08:00
yihaoDeng 209d1d3db3 fix mem leak 2024-03-28 13:03:30 +00:00
yihaoDeng ee81a43f81 refactor code 2024-03-28 11:56:44 +00:00
dapan1121 74cef4ac6b fix: window join filter issue 2024-03-28 13:45:55 +08:00
yihaoDeng 94e2aa2ed5 refactor code 2024-03-28 01:44:04 +00:00
Haojun Liao 2362babbb3
Merge pull request #25199 from taosdata/fix/3_liaohj
fix(stream): fix invalid read.
2024-03-28 09:04:33 +08:00
kailixu d64594932b feat: support database encryption 2024-03-27 20:03:38 +08:00
Haojun Liao 277a009677 fix(test): fix unit test compiler error. 2024-03-27 16:42:32 +08:00
yihaoDeng 6d19283d1f refactor code 2024-03-27 05:49:13 +00:00
yihaoDeng 2c5a5c4f28 refactor code 2024-03-27 02:22:42 +00:00
yihaoDeng a9eb371508 refactor code 2024-03-26 13:38:38 +00:00
yihaoDeng 18986c0ced refactor code 2024-03-26 12:44:53 +00:00
yihaoDeng 02e0e45183 refactor code 2024-03-26 08:50:21 +00:00
yihaoDeng 7aaef32304 refactor code 2024-03-25 09:49:28 +00:00
dapan1121 42b0d00575 enh:support join type 2024-03-25 15:19:16 +08:00
yihaoDeng bba1b8d88a refactor code 2024-03-25 05:53:19 +00:00
yihaoDeng b48a05c081 refactor code 2024-03-24 13:01:19 +00:00
yihaoDeng 2b424e366b refactor code 2024-03-24 12:21:00 +00:00
yihaoDeng e7d3180d93 refactor code 2024-03-24 10:19:18 +00:00
yihaoDeng 54294f6479 refactor code 2024-03-24 09:24:40 +00:00
yihaoDeng 66d9447733 refactor code 2024-03-24 08:15:01 +00:00
yihaoDeng 3ccf9942a9 refactor code 2024-03-24 05:35:07 +00:00
yihaoDeng 18e927f20a add test 2024-03-23 10:38:59 +00:00
yihaoDeng 6147860edb add test 2024-03-22 10:46:50 +00:00
Haojun Liao ef6ea16d64 other: merge 3.0 2024-03-22 17:57:25 +08:00
Haojun Liao 9f492a8962 other: merge 3.0 2024-03-22 17:53:11 +08:00
dapan1121 861a74cc93 Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-03-22 08:47:50 +08:00
dapan1121 3835a5b349 fix: error log and union issue 2024-03-22 08:47:07 +08:00
yihaoDeng 455d9e51fd add test 2024-03-21 13:04:52 +00:00
yihaoDeng 374f8e0462 add test 2024-03-21 13:02:28 +00:00
yihaoDeng 5407ac38db add test 2024-03-21 11:07:01 +00:00
yihaoDeng 2903d568ea add test 2024-03-21 11:06:46 +00:00
yihaoDeng 7d27ba20d6 fix queue log 2024-03-21 03:58:24 +00:00
yihaoDeng 672d189d6f add more compress alg 2024-03-20 08:51:40 +00:00
dapan1121 65c57e88cd Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-03-20 15:48:43 +08:00
yihaoDeng bf808a0bf6 add more compress alg 2024-03-20 03:43:38 +00:00
yihaoDeng ba7342e50c add more compress alg 2024-03-20 03:13:29 +00:00
Cary Xu 861528fb6c
Merge branch '3.0' into enh/TS-4531-3.0 2024-03-19 17:03:41 +08:00
dapan1121 dcc650521a Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-03-19 16:04:15 +08:00
shenglian zhou cee96e2048 feat: begin coding function 2024-03-19 13:57:12 +08:00
Shungang Li 3a656c3595 feat: support 2 replica with arbitrator 2024-03-19 09:30:35 +08:00
yihaoDeng d31c7f40c7 tsdb support compress 2024-03-18 12:12:55 +00:00
kailixu b9d3ac7fce Merge branch '3.0' into enh/TS-4531-3.0 2024-03-18 10:41:31 +08:00
yihaoDeng 4fcd80ad27 tsdb support compress 2024-03-16 13:46:50 +00:00
yihaoDeng f607cd60e3 tsdb support compress 2024-03-15 10:22:57 +00:00
dapan1121 6e674bc1de Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-03-15 18:11:37 +08:00
dapan1121 1c8dcaf46c enh: support timeline functions 2024-03-15 18:10:08 +08:00
facetosea 6678a65dc4 merge ts-4243 2024-03-14 19:06:34 +08:00
kailixu d0f825e1f5 Merge branch '3.0' into fix/TS-4421-3.0 2024-03-14 08:41:55 +08:00
Hongze Cheng d9db5b015c Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/TS-4243-3.0 2024-03-13 13:31:59 +08:00
dapan1121 83356d5917
Merge pull request #24883 from taosdata/fix/xsren/monitorConfigScope
fix: monitor client config
2024-03-13 11:23:13 +08:00
facetosea 08f9974817 Prevent misconfiguration 2024-03-12 10:06:57 +08:00
Hongze Cheng 4b791d67ba more fix 2024-03-12 09:48:28 +08:00
kailixu 433179af0d fix: unify tag value parsing syntax 2024-03-10 22:14:57 +08:00
kailixu 3aa37460c7 enh: logs and show grants 2024-03-10 08:50:05 +08:00
Hongze Cheng 8480fd9181 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/TS-4243-3.0 2024-03-08 17:08:09 +08:00
Haojun Liao 3de1413974 test(stream): add some test cases to inc coverage. 2024-03-08 13:38:51 +08:00
factosea ec5b59c875 fix: add config item 2024-03-08 13:32:52 +08:00
factosea 71e4cb92fd fix: mem leak 2024-03-08 13:32:52 +08:00
factosea c0b8c2f1c0 fix: duplicateConfiguration 2024-03-08 13:32:52 +08:00
factosea 30e52bb71a col compress sql parse 2024-03-07 18:06:15 +08:00
yihaoDeng 63d3671f42 add new msg 2024-03-06 12:06:26 +00:00
dapan1121 7045126aa6 fix: inner join issue 2024-03-06 11:18:57 +08:00
Hongze Cheng c8280e05dd Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/TS-4243-3.0 2024-03-03 16:01:34 +08:00
Hongze Cheng 9b8dec7691 more code 2024-03-03 16:01:12 +08:00
yihaoDeng 9a6a533076 add compress dict 2024-02-29 10:40:59 +00:00
dapan1121 e17518e07f Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-02-29 17:55:17 +08:00
Hongze Cheng 593a10d81d
Merge pull request #24955 from taosdata/fix/TD-28490-3.0
fix/TD-28490
2024-02-29 17:41:10 +08:00
Haojun Liao 2844f4c886
Merge pull request #24940 from taosdata/fix/TD-28863
opt bloom filter
2024-02-29 16:34:06 +08:00
Hongze Cheng a6c7d5fcf4 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/TS-4243-3.0 2024-02-29 15:00:25 +08:00
dmchen f4c4465c0e fix/TD-28490 2024-02-29 06:54:24 +00:00
Haojun Liao 4fb9595744
Merge pull request #24948 from taosdata/fix/nullcheck
fix(util): fix the new size remaining bug.
2024-02-29 13:59:29 +08:00
Haojun Liao b744eabce0 fix(util): fix the new size remaining bug. 2024-02-29 11:34:57 +08:00
54liuyao 00812c8a5c opt bloom filter 2024-02-29 11:17:29 +08:00
54liuyao 9d4bf1edba opt bloom filter 2024-02-29 11:17:29 +08:00
54liuyao 4c47332098 opt bloom filter 2024-02-29 11:17:29 +08:00
54liuyao 6619175fde opt bloom filter 2024-02-29 11:17:29 +08:00
yihaoDeng 3808abf492 add compress dict 2024-02-28 12:16:22 +00:00
yihaoDeng f7142f1b77 add compress dict 2024-02-28 11:34:05 +00:00
yihaoDeng bc98978b33 add compress dict 2024-02-28 07:58:24 +00:00
Hongze Cheng 81d6a1479d more code 2024-02-28 14:34:37 +08:00
dapan1121 521c96913e Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-02-27 18:20:45 +08:00
Haojun Liao 6bc12c8728 refactor: do some internal refactor. 2024-02-27 16:27:59 +08:00
Hongze Cheng 98eeef9d07 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/TS-4243-3.0 2024-02-26 16:40:05 +08:00
Hongze Cheng 2ea5903132
Merge pull request #23373 from taosdata/feat/TD-26529-3.0
TD-26529
2024-02-26 13:22:56 +08:00
Hongze Cheng 8a669d3adc Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/TS-4243-3.0 2024-02-26 10:48:14 +08:00
dapan1121 60804eb8c8
Merge pull request #24847 from taosdata/fix/TD-28698
fix:[TD-28698] error message
2024-02-24 09:40:35 +08:00
chenhaoran ab07900895 Merge branch '3.0' into feat/TD-26529-3.0 2024-02-23 20:54:19 +08:00
Hongze Cheng 57fa96a720 resolve compile error 2024-02-23 15:14:12 +08:00
Hongze Cheng a6423b7816 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/TS-4243-3.0 2024-02-23 14:47:10 +08:00
Hongze Cheng 67f5684151
Merge pull request #24798 from taosdata/feat/TD-27463-3.0
enh: get machine id and tbase58 codec
2024-02-23 14:18:45 +08:00
wangmm0220 b6d28b9b9d fix:[TD-28698] error message 2024-02-23 14:00:54 +08:00
kailixu ef7b38d4f6 enh: code optimization for tbase58 2024-02-23 10:30:47 +08:00
kailixu 31cf877f50 enh: code optimization for tbase58 2024-02-23 10:16:27 +08:00
dapan1121 a745319b81 Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-02-23 08:59:16 +08:00
kailixu 75caea4fbf enh: code optimization for tbase58 2024-02-22 19:04:21 +08:00
dapan1121 807bba9215 fix: window join issues 2024-02-22 18:59:10 +08:00
kailixu 5b0fc1544d enh: unit test and optimization for base58 2024-02-22 18:00:12 +08:00
kailixu 6ac6e8f2bd enh: unit test and optimization for base58 2024-02-22 17:46:36 +08:00
dm chen 271e997438
Merge pull request #24823 from taosdata/3.0
merge 3.0
2024-02-22 12:47:42 +08:00
slzhou 87c8f1aa82 Merge branch '3.0' of github.com:taosdata/TDengine into feat/TS-4243-3.0 2024-02-21 13:09:36 +08:00
dapan1121 98ed2458ea Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-02-20 17:39:51 -08:00
yihaoDeng db03fbd896 add test case 2024-02-20 19:11:21 +08:00
dapan1121 129da0ab5c
Merge pull request #24740 from taosdata/fix/xsren/TD-28551/fileNotExistErrorCode
fix: file not exist on windows
2024-02-19 18:39:15 +08:00
Hongze Cheng bdfba4cad1 more code 2024-02-19 16:42:41 +08:00
dapan1121 b26716f2e8 Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-02-18 22:15:43 -08:00
Hongze Cheng 24eff51382 more code and test 2024-02-18 15:53:47 +08:00
Hongze Cheng 52ed1ec5f7 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/TS-4243-3.0 2024-02-18 09:52:53 +08:00
Hongze Cheng 461a0687ec
Merge pull request #24752 from taosdata/feat/TD-27463-3.0
feat: support uniq grant
2024-02-18 09:13:22 +08:00
Alex Duan 4816290a60 coverage: tsched.c mndTrans.h 2024-02-17 18:25:10 +08:00
Alex Duan f6ecea3ff1 coverage: add indexFstRegex.c osSystem.c tuint.c fullopt.py shellArgument 2024-02-17 16:08:44 +08:00
kailixu f76a61c777 feat: support uniq grant 2024-02-13 23:17:05 +08:00
dm chen 6d2d37d964
Merge pull request #24751 from taosdata/3.0
merge 3.0
2024-02-06 19:16:53 +08:00
dmchen e5dcef0794 forward client directly 2024-02-06 08:29:09 +00:00
xsren f825089488 fix: file not exist on windows 2024-02-05 11:32:34 +08:00
wade zhang 0ebd7d2527
Merge pull request #24737 from taosdata/feat/TD-27463-3.0
feat: support uniq grant
2024-02-05 10:32:34 +08:00
Alex Duan b4621bb37c fix: restore TD_TSZ macro define 2024-02-04 13:57:16 +08:00
Alex Duan 3ae02aaac2 fix: build error1 2024-02-04 13:38:13 +08:00
Alex Duan a386395b20 Merge branch '3.0' into coverage/TD-28559-3.0 2024-02-04 13:24:39 +08:00
Alex Duan b852993b8d remove TD_TSZ macro define 2024-02-04 13:22:39 +08:00
kailixu f53d0bce5d feat: support uniq grant 2024-02-04 00:24:42 +08:00
kailixu 1a6b491405 Merge branch '3.0' into feat/TD-27463-3.0 2024-02-03 12:11:23 +08:00
slzhou 4a6317a047 Merge branch '3.0' of github.com:taosdata/TDengine into feat/TS-4243-3.0 2024-02-02 11:29:04 +08:00
Yihao Deng 5d80d9d41c change error code 2024-02-02 01:45:36 +00:00
kailixu 4d8ba0f60f feat: support uniq grant 2024-02-01 17:02:08 +08:00
wade zhang eeba6a24ad
Merge pull request #24686 from taosdata/feat/TD-27463-3.0
feat: support uniq grant
2024-02-01 09:47:14 +08:00
kailixu 0707a22b4e feat: support uniq grant 2024-02-01 07:36:11 +08:00
kailixu 51a582998e feat: support uniq grant 2024-01-31 17:26:59 +08:00
kailixu 82fd28d1d4 feat: support uniq grant 2024-01-31 17:20:50 +08:00
kailixu 9458b86b41 feat: support uniq grant 2024-01-31 16:09:06 +08:00
Yihao Deng 89bcc8f058 add queue perf msg 2024-01-31 07:10:01 +00:00
Haojun Liao 83950025e5 fix(stream): limit the available threads for stream processing. 2024-01-31 08:58:17 +08:00
kailixu 2b1a0cdbfe feat: support uniq grant 2024-01-31 08:53:45 +08:00
kailixu 5fd10d4049 feat: support uniq grant 2024-01-31 00:40:47 +08:00
kailixu b929bceabd feat: support uniq grant 2024-01-29 18:43:24 +08:00
dapan1121 dc309d67b8 Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-01-29 17:08:41 +08:00
dapan1121 d4a2553ace
Merge pull request #24630 from taosdata/fix/xsren/printSlowLogStackOverflow3.0
fix: printSlowLog heap over flow
2024-01-29 10:11:24 +08:00
dapan1121 b2041fa3ed
Merge pull request #24602 from taosdata/fix/3.0/TD-28398
fix: tcache conn obj ref count not released
2024-01-29 10:10:44 +08:00
kailixu 80b1ad77d6 feat: support uniq grant 2024-01-28 21:24:30 +08:00
kailixu e0d61c40f5 feat: support uniq grant 2024-01-26 19:06:56 +08:00
Hongze Cheng e7177dae57 more code 2024-01-26 17:14:00 +08:00
factosea ca6b9f959a fix: printSlowLog heap over flow 2024-01-25 17:07:46 +08:00
shenglian zhou 618e60cffc feat: primary key to SField and SSchema 2024-01-25 11:00:38 +08:00
kailixu e13e61f4d5 Merge branch '3.0' into feat/TD-27463-3.0 2024-01-24 14:26:17 +08:00
kailixu c97274c5eb feat: support uniq grant 2024-01-24 14:25:36 +08:00
Hongze Cheng 82f3b3a931
Merge pull request #24589 from taosdata/fix/ttlnoretry-3.0
fix: no retry for ttl drop table
2024-01-24 14:03:18 +08:00
wangjiaming0909 cc45d7a6f3 fix: tcache conn obj ref count not released 2024-01-23 15:35:27 +08:00
dapan1121 6640809638 Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-01-23 14:48:12 +08:00
Shungang Li 5bd14b4866 enh: errcode for message has been processed in preprocess 2024-01-23 13:53:51 +08:00
factosea 48bb6c2bbb fix: time pseudo column used illegally 2024-01-22 19:54:28 +08:00
kailixu dbd3c53182 feat: support uniq grant 2024-01-22 13:20:15 +08:00
kailixu 5208829f23 Merge branch '3.0' into feat/TD-27463-3.0 2024-01-22 13:20:00 +08:00
dapan1121 fb20dd51de Merge remote-tracking branch 'origin/3.0' into feat/TD-27337 2024-01-18 17:11:25 +08:00
kailixu 95cb004f80 feat: support uniq active code 2024-01-17 11:24:48 +08:00
factosea 7d70d79963 fix order by ambiguous case 2024-01-17 11:10:13 +08:00
factosea f1a2340288 fix: order by ambiguous 2024-01-16 19:46:57 +08:00
kailixu ddefc5f46a chore: merge 3.0 2024-01-11 20:05:23 +08:00
dapan1121 8d1f5ff479 enh: add asof 2024-01-11 19:25:12 +08:00
wangmm0220 6444af84e4 opti:[TD-28142]memory size if block num is too large 2024-01-09 16:28:58 +08:00
Yihao Deng 1eee7b44e0 fix crash found on 3.1 2024-01-08 07:31:35 +00:00
factosea c5932c9d1c fix: wildcard character in both target and pattern 2024-01-08 01:13:53 +08:00
kailixu 1169fe357a feat: uniq grant 2024-01-05 00:53:38 +08:00
Shungang Li de631e20a5 fix: refactor logdebugs 2024-01-03 19:57:22 +08:00
dapan1121 8448021780
Merge pull request #24232 from taosdata/fix/xsren/TD-28056/wildcard
fix: like wildcard match
2023-12-27 09:58:58 +08:00
wade zhang 1a215daefa
Merge pull request #24176 from taosdata/FIX/TD-27916-3.0
enh: demarcate top and bottom halves of task trans execution
2023-12-26 18:00:41 +08:00
factosea 1aae0e52e3 fix: like wildcard match 2023-12-26 14:48:05 +08:00
wade zhang a4f7ee6fb5
Merge pull request #24158 from taosdata/fix/TD-27977
fix: dynamic cfg resetlog
2023-12-25 11:29:56 +08:00
Shungang Li 212c1ebb3c udpate test case test_hot_refresh_configurations 2023-12-22 16:15:47 +08:00
Benguang Zhao 2de6d6c81d enh: add TSDB_CODE_MND_TRANS_CTX_SWITCH 2023-12-22 16:06:59 +08:00
wangjiaming0909 153221e1d6 fix: cache scan heap overflow and forbid DDD for to_char in windows 2023-12-21 19:46:33 +08:00
kailixu 47fedce263 chore: more code 2023-12-21 12:11:00 +08:00
kailixu 1f5384ad40 feat: support uniq active code 2023-12-19 18:02:53 +08:00
kailixu 9fa90fc953 Merge branch '3.0' into feat/TD-27463-3.0 2023-12-18 14:20:10 +08:00
dmchen 62672b84a2 fix/TD-27902 2023-12-15 11:39:45 +00:00
kailixu fa7a09589e Merge branch '3.0' into feat/TD-27463-3.0 2023-12-14 10:27:48 +08:00
kailixu d7e16bb91d chore: merge 3.0 2023-12-14 10:09:32 +08:00
factosea e2d2ffc00e fix: % wildcard 2023-12-13 16:07:10 +08:00
dapan1121 8528fb7a15
Merge pull request #23963 from taosdata/enh/xsren/TD-22212/taosQueryParam3.0
enh: td-22212 taos query param3.0
2023-12-13 08:24:39 +08:00
kailixu 458c85c0ab chore: tdes code optimization 2023-12-12 15:21:52 +08:00
Alex Duan 400f466f62 case: tarray.c unit case add 2023-12-10 17:25:13 +08:00
Alex Duan 00c9218b32 case: add arrayRemoveDumplicate case 2023-12-10 14:40:38 +08:00
Alex Duan 7adad817c9 case: add arrayTest unit case 2023-12-08 18:27:38 +08:00
kailixu 780f3d9cad Merge branch '3.0' into feat/TD-27463-3.0 2023-12-06 19:14:24 +08:00
factosea f01241f720 Merge branch 'fix/xsren/TD-22212/taosQueryParam3.0' into enh/xsren/TD-22212/taosQueryParam3.0 2023-12-06 17:39:25 +08:00
kailixu e623c9c3c8 feat: support machine id 2023-12-04 11:44:02 +08:00
Haojun Liao 7e63943c4e
Merge pull request #23860 from taosdata/fix/TD-27455
fix:tmqVnodeSplit-column.py failed in arm64 because of rebalance after unsubscribe while split vnode
2023-12-01 14:18:58 +08:00
wangmm0220 4fc19a6343 fix:snode can only be created 1 2023-11-30 15:49:31 +08:00
Cary Xu f96044e09f
Revert "enh: grant and active codes" 2023-11-30 13:39:54 +08:00
Haojun Liao 130614c938
Merge pull request #23831 from taosdata/fix/3_liaohj
enh(stream/tsdb): do multiple optimization and fix some bugs.
2023-11-30 09:20:15 +08:00
Haojun Liao f4cf898af7 fix(util): fix syntax error. 2023-11-28 13:59:13 +08:00
Haojun Liao 2eec29861c fix(util): disable avx2 version decompress timestamp. 2023-11-28 10:06:21 +08:00
Haojun Liao 6111138567 fix(stream): fix error. 2023-11-27 17:23:34 +08:00
Haojun Liao d1193b5a7a refactor: opt simd perf. 2023-11-27 14:59:12 +08:00
Haojun Liao f9d717d0f2 refactor: do some internal refactor. 2023-11-27 14:42:13 +08:00
Haojun Liao 5de59a3547 enh(sys): add check for avx512vl 2023-11-27 10:32:47 +08:00
Haojun Liao 6ab14d39bb fix(test): do some internal refactor. 2023-11-27 09:32:47 +08:00
Haojun Liao de0c20c296 fix(test): add test case. 2023-11-27 00:02:52 +08:00
Haojun Liao 1dd5cd17a0 fix(tsdb): add simd for decompress timestamp. 2023-11-26 23:53:05 +08:00
Haojun Liao 3deab3cfbf fix(stream):set failure for the related fill-history task. 2023-11-24 15:37:30 +08:00
Haojun Liao f28cf740b0 fix(stream): fix status check for stream-scan-history status when drop stream task msg is missing. 2023-11-24 14:44:00 +08:00
Haojun Liao d5e123db78
Merge pull request #23791 from taosdata/fix/3_liaohj
refactor: do some internal refactor.
2023-11-24 14:42:43 +08:00
Hongze Cheng 24932d2d41
Merge pull request #23799 from taosdata/fix/TD-27423
fix(tsdb/skip-row): remove s3 size condition
2023-11-24 10:48:03 +08:00
Minglei Jin 460638d294 enh(tsdb/open-file): new s3 failed to connect error code 2023-11-23 16:09:02 +08:00
Haojun Liao de47ea6c81 other: merge 3.0. 2023-11-23 15:42:40 +08:00
dapan1121 1b6a3c2069
Merge pull request #23771 from taosdata/enh/xsren/TD-27022/windows
Enh/xsren/td 27022/windows
2023-11-22 10:58:39 +08:00
Haojun Liao 785d91c17b
Merge pull request #23661 from taosdata/feat/TD-26060
fix: errors in snode in conditions like fill history/checkpoint/restart
2023-11-21 19:02:38 +08:00
facetosea 0176819461 fix linux build failed 2023-11-21 16:49:19 +08:00
facetosea 845493294d osfile 2023-11-21 16:31:31 +08:00
kailixu 50126e4425 enh: support spread active codes 2023-11-16 19:52:05 +08:00
wangmm0220 a16189d2a9 fix:confilct from 3.0 2023-11-15 19:14:27 +08:00
wangmm0220 8a9ded764d fix:add finish history msg to snode 2023-11-15 11:50:14 +08:00
dapan1121 c65c9c72c4 fix: change query killed error msg 2023-11-14 19:25:54 +08:00
wade zhang ba752adc40
Merge pull request #23677 from taosdata/fix/TD-27210
fix: support float value with unit
2023-11-14 14:20:39 +08:00
Shungang Li 3e6ffec529 fix: support float value with unit 2023-11-14 11:47:42 +08:00
Haojun Liao 436c7871a3
Merge pull request #23673 from taosdata/fix/3_liaohj
fix(stream): fix deadlock and do some internal refactor.
2023-11-14 11:26:54 +08:00
wade zhang 9167a07e89
Merge pull request #23657 from taosdata/enh/TD-27210
enh: add humanStr convert func
2023-11-14 10:04:54 +08:00
wade zhang 2cbce6c442
Merge pull request #23578 from taosdata/FIX/TD-27171-3.0
enh: improve user error of redistribute vgroup
2023-11-14 10:04:33 +08:00
Haojun Liao a1cae2c6cc refactor: fix syntax error. 2023-11-13 23:56:41 +08:00
Haojun Liao b047b7591a fix: fix syntax error. 2023-11-13 23:56:39 +08:00
Haojun Liao 65aef15be6 refactor: do some internal refactor. 2023-11-13 23:56:36 +08:00
Haojun Liao 9914e327d1 refactor: do some internal refactor. 2023-11-13 23:56:35 +08:00
Shungang Li 06c4aa431f enh: add humanStr convert func 2023-11-13 16:28:38 +08:00
Haojun Liao 9ee9174608 other: merge 3.0 2023-11-11 15:48:31 +08:00
Haojun Liao 801b211cd8 refactor:do some internal refactor. 2023-11-11 15:39:45 +08:00
dapan1121 ea93915eaa
Update terror.c 2023-11-10 15:06:04 +08:00
wangjiaming0909 ea5adf5511 report not supported error when DDD but no DD specified 2023-11-09 20:20:00 +08:00
Shungang Li f6bc3971d2 fix: add range check for bool 2023-11-08 16:20:45 +08:00
Benguang Zhao c851774a02 enh: improve user error of redistribute vgroup with TSDB_CODE_MND_REQ_REJECTED 2023-11-07 12:04:42 +08:00
xinsheng Ren da24384f0e
Merge branch '3.0' into fix/xsren/TD-22212/taosQueryParam3.0 2023-11-04 17:41:41 +08:00
Shungang Li c6f5e2a9bd enh: add dynamic configuration 2023-11-03 14:28:02 +08:00
dapan1121 92240d7f95
Merge pull request #23505 from taosdata/fix/3.0/TS-4052
fix: nano seconds database error
2023-11-03 10:27:40 +08:00
Haojun Liao ff5d69352f
Merge pull request #23493 from taosdata/fix/3_liaohj
fix(stream): add unsupport trans.
2023-11-03 09:07:33 +08:00
Haojun Liao 7a32b3a209 fix(stream): not transfer state if state is not appropriate. 2023-11-02 19:12:36 +08:00
Haojun Liao 95efa07e92 fix(stream): add full unsupported event filtering. 2023-11-02 11:02:39 +08:00
wangjiaming0909 b71a013b8d fix: nano seconds database error 2023-11-02 09:36:46 +08:00
Haojun Liao f76417535c
Merge pull request #23451 from taosdata/fix/TD-26685-3.0
fix:print log if assert & check epoch when update epoch
2023-11-01 15:32:25 +08:00
dapan1121 6305353290 Merge remote-tracking branch 'origin/3.0' into feat/TD-25204 2023-11-01 10:38:50 +08:00
Haojun Liao 7359f98eca
Merge pull request #23428 from taosdata/fix/3_liaohj
other: merge refactor into 3.0
2023-11-01 09:44:31 +08:00
wade zhang b7ea04bdf4
Merge pull request #23475 from taosdata/enh/TD-26910
enh: new errcode TSDB_CODE_MND_NO_ENOUGH_VNODES
2023-10-31 20:05:34 +08:00
Shungang Li c98228eff9 enh: new errcode TSDB_CODE_MND_NO_ENOUGH_VNODES 2023-10-31 20:03:52 +08:00
dapan1121 91df56fcf0 Merge remote-tracking branch 'origin/3.0' into feat/TD-25204 2023-10-31 18:44:54 +08:00
Haojun Liao a1aa2380ae other: merge 3.0 2023-10-31 16:42:51 +08:00
dapan1121 9db353f05d enh: optimize permission denied error msg 2023-10-31 13:59:44 +08:00
dapan1121 658ea7c429
Merge pull request #23426 from taosdata/fix/TD-26930/xsren/superTime
fix: interval more than 1000 years
2023-10-30 17:55:53 +08:00
dapan1121 0a97f18d72
Merge pull request #23344 from taosdata/feat/3.0/TS-4052
feat: support to_timestamp/to_char
2023-10-30 14:04:33 +08:00
wangmm0220 770c88200f fix:print log if assert & check epoch when update epoch 2023-10-30 09:19:31 +08:00
dapan1121 972e10a238 Merge remote-tracking branch 'origin/3.0' into feat/TD-25204 2023-10-30 08:45:29 +08:00
Haojun Liao dcca6b0868 other: merge 3.0. 2023-10-27 11:41:28 +08:00
xsren 4186028083 fix: interval more than 1000 years 2023-10-27 11:09:18 +08:00
Haojun Liao efede8669f refactor: do some internal refactor. 2023-10-27 09:55:06 +08:00
Haojun Liao 8729bdac1e fix(stream): fix bugs caused by refactor. 2023-10-27 09:54:57 +08:00
Haojun Liao 4f1a5423cb fix(config): remove the dval from struct SConfigItem. 2023-10-27 09:54:07 +08:00
Haojun Liao 443da287f6 refactor: refactor the global parameters. 2023-10-27 09:54:07 +08:00
xsren 355ec86926 fix error when taos_query_a param is null
c_test missing on linux

mem leak

wal_test  pageBufferTest on linux

tfsTest on linux
2023-10-26 16:50:45 +08:00
dapan1121 533711a7f2
Merge pull request #23387 from taosdata/fix/3.0/TS-4090
fix: disable life extending of conn cache obj when show queries/conns
2023-10-25 09:48:13 +08:00
wangjiaming0909 be7791f9cd fix: disable life extending of conn cache obj when show queries/conns 2023-10-24 13:58:30 +08:00
wangjiaming0909 f299a28109 feat: support to_timestamp/to_char 2023-10-23 19:36:03 +08:00
kailixu f809797999 enh: taosd build info 2023-10-23 16:04:45 +08:00
dapan1121 ab98f7623c Merge remote-tracking branch 'origin/3.0' into feat/TD-25204 2023-10-23 08:44:46 +08:00
wade zhang 628667f22c
Merge pull request #23231 from taosdata/FEAT/TS-3816-3.0
feat: support restoring vnodes on replaced disks as needed
2023-10-20 09:02:25 +08:00
dapan1121 42f440b0fb Merge remote-tracking branch 'origin/3.0' into feat/TD-25204 2023-10-20 08:46:32 +08:00
Haojun Liao 614bdd9fb9
Merge pull request #23220 from taosdata/feat/TD-26644
opt bloom filter
2023-10-19 15:34:43 +08:00
Benguang Zhao eb4e2aa58f feat: restore incomplete fsm state with maxVerValid via snapshot replication 2023-10-19 11:04:36 +08:00
wangmm0220 473142fab7 fix:conflicts from 3.0 2023-10-16 11:35:56 +08:00
dapan1121 a0699d758c Merge remote-tracking branch 'origin/3.0' into feat/TD-25204 2023-10-13 16:51:38 +08:00
Haojun Liao eb4449999f other: merge 3.0 2023-10-12 10:33:48 +08:00
liuyao e9fc079d26 opt bloom filter 2023-10-11 10:14:11 +08:00
dapan1121 d229492616 Merge remote-tracking branch 'origin/3.0' into feat/TD-25204 2023-10-09 18:34:08 +08:00
wangmm0220 b04d57fcc3 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/TD-26056 2023-10-08 16:15:19 +08:00
wangmm0220 3f2d890560 feat:[TD-26056] add replay logic 2023-10-08 16:06:15 +08:00
kailixu 5067eb8cc5 chore: more code for check active code 2023-09-30 16:00:14 +08:00
kailixu e677e41573 fix: support check and merge activeCode 2023-09-30 12:29:44 +08:00
dapan1121 0a0f512023 feat: add view meta processing 2023-09-28 11:44:38 +08:00
Alex Duan c9af9eb15b
Merge pull request #22915 from lx1zhong/3.0
add TSZ and ADT-FSE algorithm
2023-09-25 15:48:30 +08:00
Haojun Liao dbc53069db
Merge branch 'main' into fix/liaohj 2023-09-25 10:41:18 +08:00
Alex Duan 293840d707 fix: compatible for open and close TSZ 2023-09-23 14:34:23 +08:00
Alex Duan 6fa4bfb492 fix: cfgAddDouble set to fval is error 2023-09-23 11:22:22 +08:00
dapan1121 a61d90f672 enh: remove column list 2023-09-22 11:36:53 +08:00
dapan1121 a67b0c99fc feat: support create/drop view 2023-09-21 19:28:07 +08:00
Haojun Liao 6633fb971b fix(stream): update logs. 2023-09-20 18:18:31 +08:00
kailixu 97c87bdbdc enh: mutex/rwlock/pread/pwrite adaption for windows 2023-09-20 15:35:38 +08:00
Alex Duan 09d91cc116 fix: windows build error 2023-09-20 09:26:59 +08:00
Alex Duan 2fdc06e62d fix: windows build error 2023-09-19 18:08:53 +08:00
Alex Duan 8066c68b2d fix: window and arm platform build 2023-09-19 16:07:15 +08:00
dapan1121 b9d554275c Merge remote-tracking branch 'origin/3.0' into feat/TD-25204 2023-09-19 14:21:00 +08:00
dapan1121 14e8db289d feat: support view 2023-09-19 14:19:54 +08:00
Alex Duan 20cded7d6e fix: build error 2023-09-19 12:57:18 +08:00
Alex Duan 4a4e778a6a fix: remove depends from util to common 2023-09-19 10:46:52 +08:00
Alex Duan 88c091e575
Update CMakeLists.txt
add common on util cmakefile.txt
2023-09-18 21:09:04 +08:00
Alex Duan 570ac79a79
Merge branch 'taosdata:3.0' into 3.0 2023-09-18 14:28:00 +08:00
xsren 83d8e3a524 mem exception handle 2023-09-18 13:48:09 +08:00
Haojun Liao de04090f04
Merge pull request #22940 from taosdata/fix/avoidConflictOfIdxName
reduce the confliction of first tag index name
2023-09-18 09:47:58 +08:00
lx1zhong 5f730fda4e fix compile error 2023-09-17 18:13:20 +08:00
xsren 98cbb92ad9 merge stable sort intead of qsort as insert unordered data 2023-09-15 17:53:31 +08:00
yihaoDeng a66145a494 reduce the possible of first tag index name 2023-09-15 17:41:04 +08:00
lx1zhong ffa9560b43 fix compile error: add libraries link 2023-09-15 17:38:46 +08:00
lx1zhong abee7c0b80 fix compile error 2023-09-15 15:32:55 +08:00
lx1zhong 6da4088012 add TSZ and ADT-FSE algorithm 2023-09-15 14:30:23 +08:00
yihaoDeng 2d1d74d4e8 Merge branch 'enh/ipWhiteList' of https://github.com/taosdata/TDengine into enh/ipWhiteList 2023-09-14 16:52:23 +08:00
yihaoDeng 2002ed8709 add more error code 2023-09-14 15:34:28 +08:00
Yihao Deng fa302ac6b9
Merge branch '3.0' into enh/ipWhiteList 2023-09-13 10:14:08 +08:00
Haojun Liao 60f5056ab7 other: merge 3.0 2023-09-12 22:00:40 +08:00
yihaoDeng 7ce8f694dc Merge branch 'enh/dev3New' into enh/ipWhiteList 2023-09-12 15:54:06 +08:00
Haojun Liao 93159729f6 fix(stream):check error when vnode is closing. 2023-09-12 11:45:51 +08:00
yihaoDeng 8ea284f914 add rpc update interface 2023-09-10 14:53:08 +08:00
yihaoDeng 25bc0b226b add rpc update interface 2023-09-10 14:09:36 +08:00
wangmm0220 ef87b9c571 fix:conflicts from 3.0 2023-09-05 16:19:04 +08:00
wangmm0220 f0fbe08e1d fix:core dump if tmq is null 2023-09-01 16:45:46 +08:00
yihaoDeng 8b146f793d Merge branch '3.0' into szhou/ip-whitelist 2023-09-01 10:51:24 +08:00
wade zhang f9aaf42cd0
Merge pull request #22657 from taosdata/feat/TD-18789
fix:modify error tips
2023-08-31 11:05:29 +08:00
wangmm0220 be893c1bb0 fix:modify error tips 2023-08-30 18:21:37 +08:00
shenglian zhou b8205f23bf enhance: ip whitelist before debug 2023-08-30 14:32:46 +08:00
yihaoDeng 20b037d9cc Merge branch 'enh/3.0' into enh/triggerCheckPoint2 2023-08-28 10:46:00 +08:00
Haojun Liao 88f6596965
Merge pull request #22464 from taosdata/feat/TD-18789
feat:support varbinary type
2023-08-28 09:45:57 +08:00
Haojun Liao 60d1df0e25
Merge branch '3.0' into enh/triggerCheckPoint2 2023-08-25 15:49:28 +08:00
wangmm0220 26e025d78d feat:[TD-18789]support varbinary type 2023-08-25 15:43:45 +08:00
dapan1121 c126538f4f
Merge pull request #22549 from taosdata/fix/TD-25901-3.0
fix: taoslog file num limit on windows
2023-08-25 11:24:13 +08:00
yihaoDeng 9310d138a6 Merge branch 'enh/3.0' into enh/triggerCheckPoint2 2023-08-24 17:30:35 +08:00
kailixu f36cff8d7d fix: taoslog file num limit on windows 2023-08-24 13:33:02 +08:00
Hongze Cheng 6a20420f07 feat: add minDiskFreeSize cfg 2023-08-23 16:41:29 +08:00
yihaoDeng 6fe649c458 Merge branch 'enh/3.0' into enh/triggerCheckPoint2 2023-08-21 09:12:40 +08:00
yihaoDeng d9700f6cf7 add trace log 2023-08-18 13:36:33 +08:00
dapan1121 adcd1a2df2 fix: join error msg 2023-08-17 19:20:09 +08:00
Haojun Liao 6746339609 Merge remote-tracking branch 'origin/enh/triggerCheckPoint2' into enh/triggerCheckPoint2
# Conflicts:
#	source/libs/stream/src/streamSnapshot.c
2023-08-17 00:08:44 +08:00
wangmm0220 b3f945c4c5 fix:conflict 2023-08-16 19:35:05 +08:00
wangmm0220 f266d51764 feat:support varbinary type 2023-08-16 19:05:07 +08:00
dapan1121 143c657571 Merge remote-tracking branch 'origin/3.0' into feat/TD-24700 2023-08-16 14:50:31 +08:00
dapan1121 39ae880597
Merge pull request #22445 from taosdata/enh/TD-25708-3.0
enh: disable stream/udf on windows
2023-08-16 13:20:01 +08:00
kailixu 242bf77f4c chore: code optimization 2023-08-15 16:13:51 +08:00
wangmm0220 7441801e9d feat:support varbinary type 2023-08-15 13:57:05 +08:00
kailixu f7a5bef17d enh: disable stream/udf on windows 2023-08-15 13:02:32 +08:00
yihaoDeng ba4ce9db02 Merge branch 'enh/triggerCheckPoint2' into enh/chkpTransfer 2023-08-11 02:15:07 +00:00
yihaoDeng bbcfa9ab03 support reopen stream state 2023-08-09 06:10:40 +00:00
Minglei Jin fac7e521e9 s3/evict: fetch atime from stat file 2023-08-07 15:59:37 +08:00
dapan1121 0546bdceb2 Merge remote-tracking branch 'origin/3.0' into feat/TD-24700 2023-08-07 11:23:15 +08:00
wade zhang bae028d65c
Merge pull request #22230 from taosdata/mark/tmq
fix:semaphore always wait in tmq commit logic
2023-07-31 09:10:13 +08:00
dapan1121 b7126b9cc6 Merge remote-tracking branch 'origin/3.0' into feat/TD-24700 2023-07-28 18:01:11 +08:00
wangmm0220 6e673072cd fix:conflicts 2023-07-28 14:57:13 +08:00
Haojun Liao b145771a1b other: merge 3.0 2023-07-27 16:38:57 +08:00
Haojun Liao 3d403dca5a other: merge main. 2023-07-27 16:23:41 +08:00
wangmm0220 5fa580960e fix:semaphore always wait in tmq commit logic 2023-07-27 13:53:42 +08:00
dapan1121 4e5fbb52ee Merge remote-tracking branch 'origin/3.0' into feat/TD-24700 2023-07-26 13:56:46 +08:00
wangmm0220 be4e47e9a7 fix:add macro ASSERT_NOT_CORE to control ASSERT not core in release version 2023-07-25 16:15:33 +08:00
Benguang Zhao 01f45b2a99 enh: compatibility between getFileNamePrefix and tsdbTFileName 2023-07-25 11:35:35 +08:00
dapan1121 4f75eb5655 Merge remote-tracking branch 'origin/3.0' into feat/TD-24700 2023-07-24 11:43:15 +08:00
wade zhang 7b1e809d98
Merge pull request #21794 from taosdata/enh/tsdb_optimize
for test purpose
2023-07-21 14:18:32 +08:00
dapan1121 cbe03ef212
Merge pull request #22069 from taosdata/enh/TS-2288
enh: add scope for show xx variables
2023-07-19 18:01:11 +08:00
wangmm0220 5cb35f2fa6 feat:add committed & position & commite_offset interface 2023-07-19 17:29:39 +08:00
Minglei Jin 4b96bc7147
Merge branch '3.0' into enh/tsdb_optimize 2023-07-19 11:15:57 +08:00
wangmm0220 e812a659a8 fix:add tmq_position() interface & optimize commit logic 2023-07-18 19:30:40 +08:00
Benguang Zhao 02f4613154 enh: report VND_INIT_FAILED on vnodes open failure in vmOpenVnodes 2023-07-18 15:44:51 +08:00
Ganlin Zhao 0a5439e3c9 fix test case 2023-07-18 11:38:40 +08:00
Ganlin Zhao 929db3d647 Merge branch '3.0' into enh/TS-2288 2023-07-17 16:09:07 +08:00