Commit Graph

17036 Commits

Author SHA1 Message Date
yihaoDeng 6416a6153a Merge branch '3.0' into enh/refactorBackend 2023-11-24 16:29:09 +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 d5e123db78
Merge pull request #23791 from taosdata/fix/3_liaohj
refactor: do some internal refactor.
2023-11-24 14:42:43 +08:00
dapan1121 d409ac5ef4
Merge pull request #23789 from taosdata/fix/xsren/TD-27282/paramNumError
param num error
2023-11-24 13:28:26 +08:00
facetosea 6694bf86c6 fix test case 2023-11-24 11:14:24 +08:00
dapan1121 e7fbe0279f
Merge pull request #23807 from taosdata/FIX/TS-4258
Fix bug [4258]: add process ignore/no timezone for timetruncate unit …
2023-11-24 11:13:24 +08:00
yihaoDeng 23ae62d268 Merge branch '3.0' into enh/refactorBackend 2023-11-24 11:10:39 +08:00
dapan1121 9adaf2d270
Merge pull request #23769 from taosdata/szhou/bi-tbname-col-func
enhance: bi mode tbname col to tbname func
2023-11-24 10:05:21 +08:00
dapan1121 26fe05bb30
Merge pull request #23805 from taosdata/fix/slowReport
fix: slow down report when error occurs
2023-11-24 09:18:27 +08:00
yihaoDeng 50f996bbf7 Merge branch '3.0' into enh/refactorBackend 2023-11-23 21:07:58 +08:00
wangmm0220 d249892b2a fix:conflicts from 3.0 2023-11-23 20:29:46 +08:00
wangmm0220 55a4181e5e fix:add O_CLOEXEC for .running lock file to prevent inherited by child processes(rsync) 2023-11-23 20:16:54 +08:00
jiajingbin 9d9a88b3ed set datablock table name 2023-11-23 19:59:15 +08:00
Haojun Liao 7bfc64b8db
Merge pull request #23794 from taosdata/fix/addHttpTest
Fix/add http test
2023-11-23 19:12:07 +08:00
root a3737fe54d Fix bug [4258]: add process ignore/no timezone for timetruncate unit is 1w 2023-11-23 18:08:58 +08:00
Haojun Liao 2e922fefc6 fix(stream): reduce the sink throughput. and fix the bug in status check. 2023-11-23 18:04:09 +08:00
yihaoDeng 6129ebc294 Merge branch '3.0' into enh/refactorBackend 2023-11-23 17:41:37 +08:00
dapan1121 699c14e781 fix: slow down report when error occurs 2023-11-23 16:51:07 +08:00
slzhou 878ab262e6 fix: show compact detail 2023-11-23 16:26:17 +08:00
Haojun Liao 0a90c33b4d fix(stream): drop the related fill-history task & set the task to be ready, if the drop fill-history task msg is missing due to the vnode restarting. 2023-11-23 15:49:07 +08:00
Haojun Liao de47ea6c81 other: merge 3.0. 2023-11-23 15:42:40 +08:00
slzhou c53bd04894 feat: after select compacts 2023-11-23 15:26:21 +08:00
yihaoDeng b22bc3fe62 add http test 2023-11-23 15:19:48 +08:00
Haojun Liao 1a1319908d refactor: do some internal refactor. 2023-11-23 14:25:52 +08:00
xsren 484c045c05 param num error 2023-11-23 14:24:58 +08:00
yihaoDeng 6a0501967d Merge branch '3.0' into fix/fixChkpRespMemleak 2023-11-23 14:06:04 +08:00
yihaoDeng 50922427ff add http test 2023-11-23 13:59:42 +08:00
slzhou 3de91de7f9 fix: bi mode create tbname col error 2023-11-23 11:18:05 +08:00
yihaoDeng 321ef1c758 add http test 2023-11-23 11:08:23 +08:00
slzhou f44ff199f2 Merge branch '3.0' of github.com:taosdata/TDengine into szhou/bi-tbname-col-func 2023-11-23 10:41:34 +08:00
dapan1121 53fe37f4d2
Merge pull request #23739 from taosdata/fix/xsren/TD-27282/invalidOperTips
fix: error msg when invalid operator
2023-11-23 09:54:07 +08:00
Haojun Liao 7b1f586d4f
Merge pull request #23762 from taosdata/fix/3_liaohj
fix(stream): fix error in generating token in bucket.
2023-11-23 09:32:14 +08:00
wangmm0220 15d75a0497 fix:spelling errors 2023-11-23 09:17:54 +08:00
Haojun Liao 4ea49fe285 fix(stream): fix the race condition in dispatching data. 2023-11-22 23:49:16 +08:00
yihaoDeng 557db1c3cc add http test 2023-11-22 20:24:08 +08:00
yihaoDeng 40f6de4fc8 add http fail fast 2023-11-22 20:23:27 +08:00
wangmm0220 cfab06239b Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/TD-26060 2023-11-22 19:37:44 +08:00
facetosea b7342d53df return DEAL_RES_ERROR; 2023-11-22 19:37:08 +08:00
yihaoDeng 8c7dd0a716 Merge branch '3.0' of https://github.com/taosdata/TDengine into 3.0 2023-11-22 17:59:09 +08:00
yihaoDeng aaa202f27b add http test 2023-11-22 17:58:32 +08:00
wangmm0220 9a09e318ca opti:common message process logic in vnode and snode 2023-11-22 16:53:33 +08:00
Haojun Liao 9988720a1e fix(stream): fix the invalid check of trans conflict. 2023-11-22 16:39:29 +08:00
Haojun Liao ebb1993900 fix(stream): fix error in check trans conflict. 2023-11-22 16:20:59 +08:00
Haojun Liao 91e7000433 Merge branch 'enh/refactorBackend' of github.com:taosdata/tdengine into enh/refactorBackend 2023-11-22 15:29:31 +08:00
Haojun Liao c96f7cf182 fix(stream): scheduler the checkpoint generating. 2023-11-22 15:17:21 +08:00
shenglian zhou 9dd306e1ef enhance: duration notification 2023-11-22 13:56:16 +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
yihaoDeng 0eba15b4a4 Merge branch '3.0' into enh/refactorBackend 2023-11-22 10:57:41 +08:00
facetosea 45d7e9f02b fix: goto error 2023-11-22 10:48:08 +08:00
yihaoDeng 0c0d9cdd2c Merge branch '3.0' into fix/fixChkpRespMemleak 2023-11-22 10:42:30 +08:00
slzhou 668e9e0a8b fix: add test cases 2023-11-22 08:59:29 +08:00
slzhou 40a28a6e4b fix: refactor dependency between community and enterprise 2023-11-22 08:47:35 +08:00
Haojun Liao 81d3e5737e fix(stream): fix send msg error. 2023-11-22 08:41:55 +08:00
Haojun Liao c70c54a099 fix(stream): add missing pushed data. 2023-11-22 08:41:35 +08:00
Haojun Liao b712f5e7dc refactor: do some internal refactor. 2023-11-22 08:41:17 +08:00
Haojun Liao d355b78884 fix(stream): fix invalid read. 2023-11-22 08:40:28 +08:00
Haojun Liao 75420bfefb fix(stream): fix the checkpoint msg failure. 2023-11-22 08:40:01 +08:00
yihaoDeng 947775155b fix transfer crash 2023-11-21 20:51:11 +08:00
facetosea 45170a73b3 close file before create in rollback 2023-11-21 19:54:33 +08:00
Hongze Cheng 04e96b6d92
Merge pull request #23753 from taosdata/feat/reverse_tfs_alloc
reverse
2023-11-21 19:50:45 +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
shenglian zhou cc932b5ac9 fix: change compact id to 32-bit int 2023-11-21 17:01:24 +08:00
facetosea 845493294d osfile 2023-11-21 16:31:31 +08:00
yihaoDeng a92602b667 fix mem leak 2023-11-21 15:23:28 +08:00
dapan1121 ebbc8c8f26
Merge pull request #23744 from taosdata/szhou/tms-again
enhance: skip tables pass that reached limit to improve table merge scan performance
2023-11-21 15:20:19 +08:00
slzhou ebbbb3825d enhance: bi mode tbname col to tbname func 2023-11-21 14:33:00 +08:00
shenglian zhou 83c1db07a3 enhance: tbname col to func 2023-11-21 13:53:10 +08:00
yihaoDeng edaa33d28d fix mem leak 2023-11-21 10:18:38 +08:00
slzhou e9ac378d2c fix: in-place update when hash memember is found 2023-11-21 10:14:37 +08:00
Haojun Liao 2b099b11dd refactor: do some internal refactor. 2023-11-21 10:09:59 +08:00
yihaoDeng bb71bd4386 fix mem leak 2023-11-20 21:03:09 +08:00
Bob Liu 146c36b0ad rm unused 2023-11-20 19:25:31 +08:00
yihaoDeng 939aa7a3cc Merge branch '3.0' into enh/refactorBackend 2023-11-20 17:33:30 +08:00
yihaoDeng 0d724244dc Merge branch '3.0' into enh/refactorBackend 2023-11-20 16:55:14 +08:00
Haojun Liao 9f8a63099c fix(stream): fix error in generating token in bucket. 2023-11-20 15:26:50 +08:00
Hongze Cheng 96112fcd25 reverse 2023-11-20 15:24:01 +08:00
Bob Liu ffc952e31e adjust funcNodes init 2023-11-20 14:40:46 +08:00
Haojun Liao 7cfa45e95e enh(stream): add sink_quota/scan-history-idle-duration column for stream tasks. 2023-11-20 11:59:49 +08:00
Bob Liu 6e1e4702a5 adjust 2023-11-20 11:13:09 +08:00
yihaoDeng 734bf07317 Merge branch '3.0' into enh/refactorBackend 2023-11-20 10:48:49 +08:00
facetosea 4c36d1ee11 fix: error msg when invalid operator 2023-11-20 09:21:16 +08:00
Bob Liu 084d0ab367 fix destoryShowCreateTableStmt 2023-11-19 23:56:34 +08:00
Bob Liu 59a8fab0d7 adjust init funcNodes 2023-11-19 17:11:26 +08:00
Bob Liu e453962271 rewrite nodes function 2023-11-19 16:31:47 +08:00
wangmm0220 3241f9bda5 fix:memory leak 2023-11-17 17:26:52 +08:00
yihaoDeng 20de2f3cb5 Merge branch '3.0' into enh/refactorBackend 2023-11-17 17:15:14 +08:00
yihaoDeng e7830bfdfd fix stream backend convert 2023-11-17 16:50:45 +08:00
“happyguoxy” f969579f7f fix: reset wrong variable 2023-11-17 16:18:58 +08:00
yihaoDeng 286413abbb fix stream backend convert 2023-11-17 16:14:51 +08:00
Haojun Liao b12e5050ea fix(stream): remove invalid assert 2023-11-17 15:57:46 +08:00
yihaoDeng ccc74ef558 fix stream backend convert 2023-11-17 15:39:03 +08:00
slzhou fe28af9fa3 Merge branch '3.0' of github.com:taosdata/TDengine into szhou/tms-again 2023-11-17 15:36:58 +08:00
shenglian zhou 88973c7464 feat: skip tables out of limit 2023-11-17 15:32:14 +08:00
yihaoDeng 1dbdb32dd7 fix stream backend convert 2023-11-17 11:56:22 +08:00
yihaoDeng c7c1bdef6e fix stream backend convert 2023-11-17 11:44:21 +08:00
yihaoDeng e455c4799d fix stream backend convert 2023-11-17 10:33:43 +08:00
yihaoDeng b6994413d0 fix stream backend convert 2023-11-17 10:13:39 +08:00
Haojun Liao 27f3723cd3
Merge pull request #23723 from taosdata/fix/3_liaohj
fix(stream): wait for task to be normal and then send data block.
2023-11-16 22:58:50 +08:00
yihaoDeng 52d7a26c10 fix stream backend convert 2023-11-16 21:22:47 +08:00
wangmm0220 a5de1b032b fix:snode upport stream task 2023-11-16 21:19:58 +08:00
Haojun Liao 811d661d83 fix(stream): fix bug in delay send. 2023-11-16 17:34:47 +08:00
Haojun Liao 37d181bb9c fix(stream): fix syntax error. 2023-11-16 17:00:50 +08:00
Haojun Liao c0d3c15528 fix(stream): wait for task to be normal and then send data block. 2023-11-16 16:34:47 +08:00
yihaoDeng f5ef2e727f fix stream backend convert 2023-11-16 14:41:04 +08:00
slzhou 88819ea608 fix: tranform SCompactRsp to a datablock 2023-11-16 14:40:54 +08:00
slzhou 9ad86d7753 commit: add create show stmt support 2023-11-16 11:41:02 +08:00
yihaoDeng cee33ffb95 fix stream backend convert 2023-11-16 11:22:18 +08:00
yihaoDeng 77261068e0 fix stream backend convert 2023-11-16 11:06:55 +08:00
shenglian zhou b51e4b18ce feat: compact return id and kill compact id 2023-11-16 11:03:56 +08:00
wangmm0220 a16189d2a9 fix:confilct from 3.0 2023-11-15 19:14:27 +08:00
Haojun Liao 2ca663ce66
Merge pull request #23593 from taosdata/feat/TD-21898
stream event window
2023-11-15 14:18:07 +08:00
dapan1121 9457cf0b46
Merge pull request #23702 from taosdata/merge/m23
merge: from main to 3.0
2023-11-15 13:54:21 +08:00
dapan1121 dfb3feb5dc Merge remote-tracking branch 'origin/main' into merge/m23 2023-11-15 11:39:18 +08:00
Haojun Liao 614e7c49dc
Merge pull request #23683 from taosdata/fix/ly_test
delete mark
2023-11-15 10:27:35 +08:00
yihaoDeng b74105727d fix mem leak 2023-11-14 20:58:35 +08:00
yihaoDeng 20e1bd9cff fix invalid read/write 2023-11-14 20:46:56 +08:00
dapan1121 c65c9c72c4 fix: change query killed error msg 2023-11-14 19:25:54 +08:00
dapan1121 1fffcfe751
Merge pull request #23666 from taosdata/feat/TD-25100
fix: remove useless scan columns
2023-11-14 18:21:51 +08:00
dapan1121 22a97ee44a
Merge pull request #23672 from taosdata/fix/3.0/TS-4241
fix to_iso8601
2023-11-14 18:17:12 +08:00
yihaoDeng f4d6cf7c74 Merge branch '3.0' into enh/refactorBackend 2023-11-14 18:12:48 +08:00
yihaoDeng aa2c09ef5b rm dup data 2023-11-14 18:09:00 +08:00
yihaoDeng 4476e46a5f rm dup data 2023-11-14 17:43:13 +08:00
liuyao 7e100959bb delete mark 2023-11-14 16:57:32 +08:00
dapan1121 d659bbb272 fix: memory reuse issue 2023-11-14 15:19:04 +08:00
dapan1121 478c8ef87f
Merge pull request #23665 from taosdata/fix/TD-27281-3.0
fix: extend buffer of trace
2023-11-14 13:50:50 +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
Haojun Liao e46a13c788
Merge pull request #23669 from taosdata/enh/stream_delay
opt max delay
2023-11-14 09:31:17 +08:00
dapan1121 537e56c904 fix: scan columns duplicated issue 2023-11-14 08:51:23 +08:00
Haojun Liao f99e22b91f fix(stream): fix deadlock. 2023-11-13 23:56:42 +08:00
Bob Liu 82ad690eb4 rewrite nodesNodeName 2023-11-13 20:20:45 +08:00
dapan1121 dbba1385b3 fix: scan columns issue 2023-11-13 19:51:38 +08:00
yihaoDeng 68b6cc1d9d Merge branch '3.0' into enh/refactorBackend 2023-11-13 19:07:58 +08:00
wangmm0220 56381dea90 fix:conflict from 3.0 2023-11-13 18:42:59 +08:00
dapan1121 c5d621c910 fix: remove usless scan columns 2023-11-13 18:40:55 +08:00
wangmm0220 1cbe568be7 fix:add logic when snode restart 2023-11-13 18:39:42 +08:00
Haojun Liao aad8a2eb87 fix(stream): fix deadlock. 2023-11-13 18:20:30 +08:00
kailixu dd663a7650 fix: extend buffer of trace 2023-11-13 18:16:48 +08:00
yihaoDeng 4104840cea Merge branch '3.0' into enh/refactorBackend 2023-11-13 18:07:38 +08:00
Shungang Li a96e21aabd enh: refactor dynamic config 2023-11-13 16:28:42 +08:00
liuyao 37c102a115 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/TD-21898 2023-11-13 16:06:17 +08:00
yihaoDeng 1786f7077d Merge branch '3.0' into enh/refactorBackend 2023-11-13 14:35:23 +08:00
yihaoDeng de7f2a2d1a Merge branch '3.0' into enh/refactorBackend 2023-11-13 11:11:28 +08:00
yihaoDeng cf3e01e942 Merge branch '3.0' into enh/refactorBackend 2023-11-13 10:34:44 +08:00
dapan1121 a51df86e43
Merge pull request #23636 from taosdata/enh/TD-25601-3.0
enh: support delete msg for rsma
2023-11-13 08:47:42 +08:00
dapan1121 40ab3d7cc6
Merge pull request #23431 from taosdata/szhou/tbname-prune-vgroup
enhance: use tbname equal cond to prune vgroups
2023-11-13 08:34:31 +08:00
Bob Liu ba8a410d6d fix toISO8601Function 2023-11-12 19:15:41 +08:00
dapan1121 fd16b31b4e
Merge pull request #23622 from taosdata/feat/TD-24802
enh: optimize cache last and other functions performance
2023-11-12 17:21:20 +08:00
Haojun Liao 4ff8907b58 fix: fix syntax error. 2023-11-11 23:05:20 +08:00
Haojun Liao 9ee9174608 other: merge 3.0 2023-11-11 15:48:31 +08:00
Haojun Liao 3bacd7516e fix(stream): extact stream nodes list if not initialized. 2023-11-11 15:40:35 +08:00
Haojun Liao 15430f4d50 refactor: 2023-11-11 15:40:33 +08:00
Haojun Liao 5fcef5bd89 refactor:add some logs. 2023-11-11 15:40:32 +08:00
Haojun Liao 7a23df4b1a fix(stream): set the correct updated nodeId. 2023-11-11 15:40:32 +08:00
Haojun Liao 8e5db21c3f fix(test): fix syntax error. 2023-11-11 15:40:13 +08:00
Haojun Liao af08a189c1 fix(stream): disable concurrently restart stream tasks. 2023-11-11 15:40:10 +08:00
Haojun Liao e1de1de421 fix(stream): fix the invalid free. 2023-11-11 15:40:07 +08:00
Haojun Liao 97772e9aab fix(stream): the checkpoint version can only be updated when generating checkpoint. 2023-11-11 15:40:05 +08:00
Haojun Liao 801b211cd8 refactor:do some internal refactor. 2023-11-11 15:39:45 +08:00
Haojun Liao 0463c0d755 refactor: wait for a while when no quota available. 2023-11-11 15:38:41 +08:00
Haojun Liao 22808ce1b7 fix(stream): update the fill-time for quota limitation. 2023-11-11 15:38:32 +08:00
yihaoDeng 1e8d46c405 Merge branch '3.0' into enh/refactorBackend 2023-11-10 18:37:25 +08:00
dapan1121 8bcb7f8741 fix: windows compile error 2023-11-10 17:29:52 +08:00
Haojun Liao 438c303b0d other: merge main. 2023-11-10 17:05:36 +08:00
slzhou 918fadaf00 Merge branch '3.0' of github.com:taosdata/TDengine into szhou/tbname-prune-vgroup 2023-11-10 16:45:13 +08:00
slzhou 9d448c7c6c fix: review comments 2023-11-10 16:30:16 +08:00
Haojun Liao 08a9244230 fix(stream): extact stream nodes list if not initialized. 2023-11-10 16:24:20 +08:00
dapan1121 a8de040af2 fix: remove non sort usage for now 2023-11-10 16:13:23 +08:00
yihaoDeng a3fdb6dd59 Merge branch '3.0' into enh/refactorBackend 2023-11-10 16:06:08 +08:00
kailixu 57f7ff5b9c chore: revert the code change 2023-11-10 15:34:41 +08:00
kailixu d5d8568bad fix: skip delete msg affects 0 row 2023-11-10 15:30:49 +08:00
Haojun Liao d0307e5876 refactor: 2023-11-10 15:30:21 +08:00
dapan1121 c480f71118
Merge pull request #23628 from taosdata/fix/TS-4052
report not supported error when DDD but no DD specified
2023-11-10 15:06:29 +08:00
kailixu 2a14a10d0d Merge branch '3.0' into enh/TD-25601-3.0 2023-11-10 14:45:45 +08:00
kailixu 674e878ffa enh: rsma support delete 2023-11-10 14:44:29 +08:00
Haojun Liao 0b36081158 refactor:add some logs. 2023-11-10 14:36:18 +08:00
wangmm0220 8a05bad899 fix:snode error 2023-11-10 14:14:22 +08:00
Haojun Liao 1f9a58361d fix(stream): set the correct updated nodeId. 2023-11-10 13:36:35 +08:00
Haojun Liao 5824caa8f5
Merge pull request #23631 from taosdata/fix/liaohj
multiple fix
2023-11-10 13:09:40 +08:00
yihaoDeng ad119ea4c0 Merge branch '3.0' into enh/refactorBackend 2023-11-10 12:07:33 +08:00
dapan1121 350fac01a0 Merge remote-tracking branch 'origin/3.0' into feat/TD-24802 2023-11-10 11:48:55 +08:00
dapan1121 e5eeea5b16
Merge pull request #23619 from taosdata/fix/TD-26925
fix: const value replace issue
2023-11-10 10:42:22 +08:00
Haojun Liao ecf6c1c09d fix(test): fix syntax error. 2023-11-10 10:10:38 +08:00
yihaoDeng 54fe42d372 Merge branch '3.0' into enh/refactorBackend 2023-11-10 09:24:40 +08:00
Haojun Liao 9978667c48 fix(stream): disable concurrently restart stream tasks. 2023-11-10 09:24:08 +08:00
liuyao 6d2d5823dc Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/TD-21898 2023-11-10 09:24:05 +08:00
yihaoDeng 3e2314b09b Merge branch '3.0' into enh/refactorBackend 2023-11-10 09:22:16 +08:00
yihaoDeng 0669037de0 fix mem leak 2023-11-09 20:37:08 +08:00
yihaoDeng 4a99bdc2b0 support s3 2023-11-09 20:27:30 +08:00
wangjiaming0909 ea5adf5511 report not supported error when DDD but no DD specified 2023-11-09 20:20:00 +08:00
yihaoDeng 5f9b922a04 support s3 2023-11-09 20:15:08 +08:00
kailixu 572eb691fb enh: support delete msg for rsma 2023-11-09 19:51:01 +08:00
dapan1121 dd0ac98a5f fix: correct no data load 2023-11-09 19:25:44 +08:00
Haojun Liao da83f27124
Merge pull request #23610 from taosdata/fix/TD-27216
change chkp gen way
2023-11-09 18:55:31 +08:00
Haojun Liao e6f3d4edc7
Merge pull request #23611 from taosdata/fix/TD-27216-3
change chkpid gen way
2023-11-09 18:55:17 +08:00
Haojun Liao 7f3a50dfde fix(stream): fix the invalid free. 2023-11-09 18:14:27 +08:00
dapan1121 4f67629ea1
Merge pull request #23621 from taosdata/fix/TS-4122
correct colid in blockinfo
2023-11-09 18:09:09 +08:00
yihaoDeng 757425bff8 Merge branch '3.0' into enh/refactorBackend 2023-11-09 17:58:49 +08:00
yihaoDeng dd2252598e upload by rsync 2023-11-09 17:39:34 +08:00
Yihao Deng 0453991cdf
Merge branch '3.0' into fix/TD-27216-3 2023-11-09 17:12:56 +08:00