Commit Graph

13865 Commits

Author SHA1 Message Date
liuyao 8224d49702 fix:after restarting taosd, stream does not work. 2023-05-09 17:24:11 +08:00
cadem 843d606058 feat/restore dnode 2023-05-09 17:15:37 +08:00
dapan1121 52fd6a84ac enh: support db cfg cache update 2023-05-09 17:04:20 +08:00
yihaoDeng 55014aa003 Merge branch 'enh/rocksdbSstate' into enh/rocksdbSstateMerge 2023-05-09 08:58:51 +00:00
wangjiaming0909 479bb157e0 fix: select _block_dist() from t; set the unit of Size to KB 2023-05-09 15:19:21 +08:00
Ganlin Zhao e1140d4c15 optimize duplicate timestamp check 2023-05-09 15:05:41 +08:00
yihaoDeng b5fdaa327d avoid deadlock 2023-05-09 07:00:29 +00:00
shenglian zhou 50feb64748 fix: add check nchar/varchar column length for normal table 2023-05-09 14:29:09 +08:00
Ganlin Zhao 4693c22970 optimize group key storage 2023-05-09 14:06:09 +08:00
wade zhang ebdc1a3234
Merge pull request #20996 from taosdata/fix/TD-23623
enh(cache/rocks): base for rocks put/get
2023-05-09 13:27:33 +08:00
dapan1121 a1eefd25ea fix: count wrong group number issue 2023-05-09 11:33:47 +08:00
Ganlin Zhao 3b10ac29ce use functionType instead of functionName 2023-05-09 11:09:29 +08:00
dapan1121 f4f3b886fc
Merge pull request #21213 from wangjiaming0909/fix/TS-3350
fix: data compare of signed and unsigned integers
2023-05-09 08:58:55 +08:00
Hui Li a68a5b73b8
Merge pull request #21212 from taosdata/fix/TD-24030
fix: fix invalid read
2023-05-08 20:30:44 +08:00
dapan1121 95b228a050
Merge pull request #21194 from taosdata/fix/TD-24010
fix:[TD-24010] subscribeStb.py failed in windows CI
2023-05-08 20:29:47 +08:00
wangjiaming0909 e22c62ffba fix: data compare of signed and unsigned integers 2023-05-08 18:13:37 +08:00
yihaoDeng c3e0de0bfc fix invalid read 2023-05-08 09:21:20 +00:00
Benguang Zhao bd5372c378 fix: protect against nullptr in syncRespCleanRsp 2023-05-08 17:08:24 +08:00
wangmm0220 f9142c0ddb fix:[TD24010] lost data if apply ver is small than commit ver 2023-05-08 16:49:56 +08:00
dapan1121 5d4830956a
Merge pull request #21187 from taosdata/szhou/fix-ts23905-ts23865
fix: forbid some stream computing
2023-05-08 16:24:00 +08:00
slzhou 2f45a3dfdb fix: change variable name 2023-05-08 14:42:31 +08:00
dapan1121 1526eb2923 fix: projection group merge issue 2023-05-08 10:28:07 +08:00
liuyao eb52e73305 Merge branch 'enh/rocksdbSstate' of https://github.com/taosdata/TDengine into enh/rocksdbSstate 2023-05-08 09:54:00 +08:00
liuyao fc8cab6fe1 recover setSelectValueColumnInfo 2023-05-08 09:53:27 +08:00
Yihao Deng cb223acf82
Merge branch 'main' into enh/rocksdbSstate 2023-05-08 09:45:27 +08:00
Minglei Jin bb7f050b37 Merge branch '3.0' into fix/TD-23623 2023-05-08 08:13:00 +08:00
Haojun Liao 31ac1e3eaa fix(stream): revise the input queue capacity. 2023-05-08 00:00:55 +08:00
Haojun Liao d026e7ef16 refactor: update some logs. 2023-05-07 22:55:49 +08:00
yihaoDeng 163a862f5f fix mem leak 2023-05-06 13:57:33 +00:00
yihaoDeng 08c3a63341 Merge branch 'enh/standVer' into enh/rocksdbSstateMerge 2023-05-06 12:37:54 +00:00
Haojun Liao c141abfbb8 fix(stream): set correct msg size; 2023-05-06 20:03:07 +08:00
dapan1121 c83367e455 enh: add table group cache 2023-05-06 19:24:47 +08:00
wangmm0220 261f2736f7 fix:[TD-24010] subscribeStb.py failed in windows CI 2023-05-06 19:17:36 +08:00
Haojun Liao c6007d53e8
Merge pull request #21190 from taosdata/fix/TS-3347
fix:[TS-3347]set ver to first version if version stored is smaller th…
2023-05-06 18:51:49 +08:00
Haojun Liao 13f3ca4226 fix(stream): add input queue size limitation. 2023-05-06 18:47:29 +08:00
yihaoDeng 8be29dc98e failed to open rocksdb cf 2023-05-06 10:35:23 +00:00
dapan1121 1de5f84536
Merge pull request #21184 from taosdata/fix/TD-23898-a
fix: fix taosd not exit when press ctrl+c
2023-05-06 17:46:38 +08:00
liuyao 6ceda68365 opt selectivity function 2023-05-06 17:42:38 +08:00
slzhou 04e9648d8e enhance: change variable name 2023-05-06 17:16:27 +08:00
slzhou 276e5daa8c fix: pseudo column function are treated as variable 2023-05-06 17:13:14 +08:00
dapan1121 1f25cc57cd fix: projection merge issue 2023-05-06 16:39:40 +08:00
wangmm0220 ee32620808 fix:[TS-3347]set ver to first version if version stored is smaller than first version in wal when subscribe db 2023-05-06 16:22:30 +08:00
shenglian zhou 83c857a017 fix: fix compilation error 2023-05-06 16:17:34 +08:00
Minglei Jin 596bee8028 Merge branch '3.0' into fix/TD-23623 2023-05-06 16:07:26 +08:00
shenglian zhou c8ac3a581e fix: forbid some stream computing 2023-05-06 15:50:38 +08:00
Ganlin Zhao 33d4e0cc67 fix: fix taosd not exit when press ctrl+c 2023-05-06 15:03:17 +08:00
dapan1121 e798ef8645
Merge pull request #21168 from taosdata/fix/TD-23985
fix: having clause issues
2023-05-06 13:40:42 +08:00
Haojun Liao 6b305bf745 refactor: do some internal refactor. 2023-05-06 13:35:18 +08:00
Haojun Liao aca5760ceb fix(query): fix syntax error. 2023-05-06 13:17:31 +08:00
Haojun Liao da6212bab0 other: merge main. 2023-05-06 12:51:38 +08:00
Shengliang Guan af81f91c0f
Merge pull request #21162 from taosdata/FIX/TD-22103-3.0
enh: unify error msg for disk space checking in doInitAggInfoSup
2023-05-06 11:15:57 +08:00
dapan1121 47791dfe2f fix: group by validation issue 2023-05-06 11:02:20 +08:00
Haojun Liao 1fa4327f6c Merge branch 'main' into fix/liaohj_main 2023-05-06 10:15:23 +08:00
liuyao 76bf0aea56 opt stream input queue 2023-05-06 10:14:27 +08:00
Haojun Liao 3afc5bdfcf refactor: add some logs. 2023-05-06 10:09:51 +08:00
Haojun Liao 29fcd1b83a refactor: do some internal refactor. 2023-05-06 10:08:05 +08:00
Haojun Liao 5d4a3116d5
Merge pull request #21139 from taosdata/fix/liaohj_main
refactor: do some internal refactor.
2023-05-06 09:49:26 +08:00
wade zhang 2025aa5650
Merge pull request #21167 from taosdata/fix/TD-23953
fix(tdb/decoder): free decoder's value if not needed by user
2023-05-06 08:32:29 +08:00
yihaoDeng d7e86aca05 fix case failure 2023-05-05 15:14:16 +00:00
Haojun Liao cbf0cd41ec
Merge pull request #21169 from taosdata/fix/stop_tsdb_read
fix(stream): opt task scan performance.
2023-05-05 22:08:11 +08:00
kailixu 0c3dc0867f chore: sync fix from main 2023-05-05 20:33:41 +08:00
Haojun Liao 8958aabe4b fix(stream): opt task scan performance. 2023-05-05 19:33:30 +08:00
Haojun Liao 4be94940e1
Merge pull request #21164 from taosdata/fix/stop_tsdb_read
fix(stream): secure the delete task operation. TD-1198
2023-05-05 18:40:23 +08:00
Haojun Liao 08ce790cda fix(query): fix memory leak. 2023-05-05 18:20:27 +08:00
dapan1121 997be0a3ed fix: having clause issues 2023-05-05 17:04:36 +08:00
yihaoDeng f7a7743af7 fix case failure 2023-05-05 08:32:33 +00:00
Minglei Jin 8286c145b6 fix(tdb/decoder): free decoder's value if not needed by user 2023-05-05 16:15:15 +08:00
Ganlin Zhao 5a1681d91d fix data block not properly saved 2023-05-05 15:24:15 +08:00
Haojun Liao 8b12d4d3da fix(stream): secure the delete task operation. TD-1198 2023-05-05 15:02:03 +08:00
Benguang Zhao 0e6de09353 enh: unify error msg for disk space checking in doInitAggInfoSup 2023-05-05 14:53:32 +08:00
dapan1121 e889249c54 fix: grant no table specifed issue 2023-05-05 14:33:09 +08:00
dapan1121 3976504b47 fix: subtable grant is not allowed 2023-05-05 14:01:15 +08:00
Haojun Liao 9b5c205498 fix(stream): set correct ssdatablock for tqRetrieveDataBlock 2023-05-05 13:41:25 +08:00
yihaoDeng a1b9dcf595 fix mem leak 2023-05-05 02:20:11 +00:00
liuyao 74ab689719 opt batch num 2023-05-05 08:59:07 +08:00
yihaoDeng f20b28bc9f fix mem leak 2023-05-04 14:29:56 +00:00
yihaoDeng 6b0bda6708 fix mem leak 2023-05-04 13:38:19 +00:00
yihaoDeng c2de8c91dd fix mem leak 2023-05-04 11:52:29 +00:00
yihaoDeng f9c49f4938 add compile opt on windows 2023-05-04 10:22:13 +00:00
Haojun Liao 2b7a816b86 fix(tmq): fix syntax error. 2023-05-04 16:59:26 +08:00
Haojun Liao 23c49594b7 other: merge main. 2023-05-04 16:41:53 +08:00
yihaoDeng c27d01a510 Merge branch 'enh/addTtlToStream' into enh/rocksdbSstateMerge 2023-05-04 08:22:31 +00:00
Haojun Liao 09a04052ec refactor: do some internal refactor. 2023-05-04 16:15:14 +08:00
Haojun Liao 11dccf12de
Merge pull request #21131 from taosdata/fix/liaohj_main
refactor: do some internal refactor.
2023-05-04 11:26:00 +08:00
Haojun Liao 851193a033
Merge pull request #21060 from taosdata/fix/TS-3222
opti:change push mgr to consume msg for subscribe
2023-05-04 10:16:41 +08:00
liuyao d8a1f15d10 fix resum bug 2023-05-04 09:28:06 +08:00
dapan1121 4bc30ff2cf
Merge pull request #21126 from taosdata/fix/TD-23864
enh: optimize tbname condition
2023-05-04 08:54:04 +08:00
Haojun Liao 3b814f2478 fix(stream): do some internal refactor. 2023-05-01 23:21:29 +08:00
Haojun Liao a1263b8b04 fix(query):fix syntax error. 2023-05-01 19:40:26 +08:00
Haojun Liao 3c61932ecc refactor: do some internal refactor. 2023-05-01 19:28:54 +08:00
Haojun Liao 6c86847b12 refactor: do some internal refactor. 2023-05-01 14:58:59 +08:00
Haojun Liao ace193ca9b fix(stream): set the seek version if the reader's version is earlier than the first version in wal. 2023-04-29 23:34:49 +08:00
Haojun Liao 777ed1761f refactor: update logs. 2023-04-29 18:24:46 +08:00
Haojun Liao 39cac9d308 refactor: remove log ; 2023-04-29 14:06:26 +08:00
Haojun Liao bbb8aaa0dc refactor: add some logs. 2023-04-29 02:37:10 +08:00
Haojun Liao 8b57184a9a
Merge pull request #21123 from taosdata/fix/liaohj_main
refactor: remove assert.
2023-04-29 00:44:24 +08:00
Haojun Liao b69137df44 refactor(log): add some logs. 2023-04-29 00:00:25 +08:00
Haojun Liao 05d416f3b9 fix(stream): fix invalid access when handling error, not start stream if tsDisablestream is set. 2023-04-28 23:53:53 +08:00
Haojun Liao c647ded0da fix(stream): add some logs. 2023-04-28 19:47:49 +08:00
dapan1121 70761fd959 enh: optimize tbname condition 2023-04-28 17:56:52 +08:00
yihaoDeng dda1c8803c Merge branch 'enh/rocksdbSstate' into enh/rocksdbSstateMerge 2023-04-28 09:17:22 +00:00
Ganlin Zhao 42df9f587f fix group_key not set properly 2023-04-28 16:41:36 +08:00
Haojun Liao a0d08b7fe4 fix(query): add null ptr check. 2023-04-28 16:29:09 +08:00
Ganlin Zhao 76eea9f7c4 fix group_key check 2023-04-28 14:59:35 +08:00
Haojun Liao b3da6cb224 fix(query): fix syntax error. 2023-04-28 14:56:50 +08:00
yihaoDeng afc6023a8a merge rocksdb inst 2023-04-28 06:32:33 +00:00
Haojun Liao 03b1de017a refactor: remove assert. 2023-04-28 14:12:17 +08:00
Haojun Liao ad059db91b
Merge pull request #21120 from taosdata/fix/liaohj_main
other: add some logs.
2023-04-28 14:12:04 +08:00
Haojun Liao b7c8346b44 other: merge other branch. 2023-04-28 13:06:47 +08:00
Haojun Liao f9a64cbcd6 other: add some logs. 2023-04-28 12:58:03 +08:00
Haojun Liao a0c2b34788
Merge pull request #21119 from taosdata/fix/liaohj_main
refactor: do some internal refactor.
2023-04-28 12:53:31 +08:00
Haojun Liao da0d9c78ef refactor: do some internal refactor. 2023-04-28 11:42:34 +08:00
Haojun Liao f850388ed9
Merge pull request #21116 from taosdata/fix/liaohj_main
fix(query): stop tsdbreade ASAP, and do some internal refactor. TD-23249
2023-04-28 11:42:05 +08:00
liuyao 2984c5a758 merge main 2023-04-28 10:34:46 +08:00
Haojun Liao 3ac1ce69b6 fix(query): set correct scan flag. 2023-04-28 10:02:37 +08:00
yihaoDeng c4f36d32ae merge rocksdb inst 2023-04-28 01:31:37 +00:00
Haojun Liao 6482ef9ad1 refactor: do some internal refactor. 2023-04-28 09:19:53 +08:00
Haojun Liao 8205168428 fix(query): fix memory leak. 2023-04-28 09:16:11 +08:00
Haojun Liao 7adc21028a refactor: do some internal refactor. 2023-04-28 00:23:38 +08:00
yihaoDeng 984a69671e merge rocksdb inst 2023-04-27 14:46:33 +00:00
yihaoDeng 36a4413bf1 merge rocksdb inst 2023-04-27 14:38:33 +00:00
Haojun Liao 25010cb11e fix(query): stop tsdbreade ASAP, and do some internal refactor. 2023-04-27 22:21:18 +08:00
kailixu fa822ff286 Merge branch '3.0' into enh/TD-21161-3.0 2023-04-27 19:11:16 +08:00
jiajingbin ebf9a13fe7 inc batch num 2023-04-27 18:15:17 +08:00
Haojun Liao ad7c3218f7
Merge pull request #21111 from taosdata/fix/liaohj_main
enh(query): stop tsdb reader ASAP.  TD-23249
2023-04-27 17:45:38 +08:00
Haojun Liao 91f9b58f9a refactor: do some internal refactor. 2023-04-27 16:06:06 +08:00
Haojun Liao 17a5691afb refactor: remove assert. 2023-04-27 15:37:33 +08:00
Haojun Liao d83f29dc23 refactor: remove assert. 2023-04-27 15:33:04 +08:00
Haojun Liao 6780833cd2 Merge remote-tracking branch 'origin/enh/rocksdbSstate' into enh/rocksdbSstate 2023-04-27 15:08:17 +08:00
Haojun Liao b7040ed15e enh(stream): support resume from the latest data, and do some internal refactor. 2023-04-27 15:07:54 +08:00
liuyao 8b5251004f inc queue cap 2023-04-27 14:04:46 +08:00
Haojun Liao e1bd65ec0a
Merge pull request #21105 from taosdata/fix/liaohj_main
fix(query): check the init status for pReader->status.merger  TD-23903
2023-04-27 12:40:13 +08:00
Ganlin Zhao 54d82fce8a add reset when switching groups 2023-04-27 11:28:20 +08:00
liuyao dbdc31539c inc queue cap 2023-04-27 10:46:08 +08:00
wangmm0220 6a889ae80e Merge branch 'main' of https://github.com/taosdata/TDengine into fix/TS-3222 2023-04-27 09:48:04 +08:00
Haojun Liao db1d75bb48 refactor: do some internal refactor. 2023-04-27 09:28:20 +08:00
liuyao 4c4a4775de opt stream 2023-04-26 19:13:58 +08:00
liuyao 863d30e5a9 opt tq read 2023-04-26 18:58:19 +08:00
Ganlin Zhao c64788ad71 fix group restore 2023-04-26 18:37:23 +08:00
Ganlin Zhao 75f76a62ab fix process next group bug 2023-04-26 18:07:19 +08:00
dapan1121 51a1e07dbf
Merge pull request #21029 from taosdata/fix/TD-23797
fix: fix crash caused by deleting from system table
2023-04-26 17:48:58 +08:00
Minglei Jin a1fba2df65 Merge branch '3.0' into fix/TD-23623 2023-04-26 17:38:47 +08:00
liuyao 2533b5c5c2 op stream 2023-04-26 17:00:33 +08:00
dapan1121 5db5205e31 fix: schema/tag version update to int32 2023-04-26 13:41:16 +08:00
Ganlin Zhao fc6ca69afa refactor timeslice operator 2023-04-26 11:30:21 +08:00
dapan1121 919d98d393
Merge pull request #21066 from taosdata/szhou/tag-scan-group-slimit
feature: tag scan group and slimit
2023-04-26 11:17:29 +08:00
Ganlin Zhao c56bb64f1c refactor timeslice operator 2023-04-26 11:04:13 +08:00
Xiaoyu Wang 528d55f8f9
Merge pull request #21072 from taosdata/FIX/TD-22103-3.0
enh: unify error msg for no disk space
2023-04-26 10:44:24 +08:00
Ganlin Zhao d4c783b590 check duplicate timestamps 2023-04-26 09:48:43 +08:00
Ganlin Zhao 0ec4bbdfbc enable interp used with super table 2023-04-26 09:48:13 +08:00
Xiaoyu Wang 05dc0fd6b1
Merge pull request #21056 from taosdata/feat/TD-23693
feat: subtable level privilege
2023-04-26 09:17:23 +08:00
kailixu a6e37622ff chore: more code 2023-04-25 22:15:06 +08:00
Benguang Zhao fee4050d79 enh: rename error code TSDB_CODE_SYN_NEGO_WIN_EXCEEDED 2023-04-25 18:05:36 +08:00
yihaoDeng 10582fb5e0 opt write opt 2023-04-25 09:49:28 +00:00
yihaoDeng 84cae91f9f rocksdb_iter_value 2023-04-25 09:39:57 +00:00
Xiaoyu Wang b07e4c8522 Merge branch 'feat/TD-23693' of github.com:taosdata/TDengine into feat/TD-23693 2023-04-25 17:39:51 +08:00
Xiaoyu Wang e584bb3ea1 feat: subtable level privilege 2023-04-25 17:39:28 +08:00
Benguang Zhao 693bc09f19 enh: comment off unused error codes in sync and wal 2023-04-25 17:36:13 +08:00
yihaoDeng c64a7d3e5f add ttl to stream state key 2023-04-25 08:54:03 +00:00
Xiaoyu Wang 90b3f0093b
Merge pull request #21069 from taosdata/fix/change-learner-config-format
change learner config format
2023-04-25 16:42:43 +08:00
wangmm0220 4321012ac4 Merge branch 'main' of https://github.com/taosdata/TDengine into fix/TS-3222 2023-04-25 16:24:28 +08:00
Minglei Jin 2566bd4ae8 row/iter: fix null column iter 2023-04-25 16:17:58 +08:00
cadem 7e2dee8a0f filter voter when agree upon 2023-04-25 15:49:17 +08:00
Benguang Zhao 12f28a4a43 enh: unify error msg for no disk space 2023-04-25 15:39:11 +08:00
cadem 2fd9640a39 change learner config format 2023-04-25 15:15:28 +08:00
shenglian zhou 93ab81437f enhance: code refactor and operator full implement slimit 2023-04-25 11:08:58 +08:00
yihaoDeng 05df0f6ed7 add ttl to stream state key 2023-04-25 02:36:44 +00:00
kailixu 781834065a Merge branch '3.0' into enh/TD-21161-3.0 2023-04-25 08:22:08 +08:00
yihaoDeng 81bd7661bd add ttl to stream state key 2023-04-24 14:20:01 +00:00
kailixu 2d4dd64584 chore: more code 2023-04-24 20:21:28 +08:00
wangmm0220 1c63408b3e opti:change push mgr to consume msg for subscribe 2023-04-24 20:18:20 +08:00
dapan1121 de1161dafb enh: ignore single row null data type validation 2023-04-24 19:22:44 +08:00
dapan1121 8c4b73a351 feat: add get table tag sync API 2023-04-24 19:19:12 +08:00
liuyao d429e070da fix fill bug 2023-04-24 18:23:35 +08:00
Ganlin Zhao 80621e14eb refactor 2023-04-24 17:24:07 +08:00
Xiaoyu Wang 6f5d8150e1
Merge pull request #21055 from taosdata/fix/remove-null-pointer
remove null pointer
2023-04-24 17:19:59 +08:00
Ganlin Zhao 782566ad08 refactor 2023-04-24 17:15:46 +08:00
yihaoDeng f15b806e15 opt write opt 2023-04-24 09:08:48 +00:00
yihaoDeng e1535124d1 opt write opt 2023-04-24 09:08:07 +00:00
dapan1121 6386c32392
Merge pull request #21034 from taosdata/szhou/td-23586
enhance: error code refactor
2023-04-24 16:53:53 +08:00
yihaoDeng 23803c04ed opt write opt 2023-04-24 08:49:56 +00:00
yihaoDeng 2d5218246d add ttl to stream state key 2023-04-24 08:18:02 +00:00
yihaoDeng 3abdbec813 add ttl to stream state key 2023-04-24 08:17:57 +00:00
cadem 5a512eb767 remove null pointer 2023-04-24 16:06:56 +08:00
shenglian zhou 758427b3c4 fix: use slimit to indicate group for tag scan 2023-04-24 15:48:20 +08:00
Xiaoyu Wang f5a974489e
Merge pull request #21045 from taosdata/fix/block-check-to-async-check
fix/block-check-to-async-check
2023-04-24 15:41:17 +08:00
liuyao eca7b68fa0 ignore update 2023-04-24 15:01:56 +08:00
Xiaoyu Wang 1f5f52add0 Merge branch 'enh/rocksdbSstate' of github.com:taosdata/TDengine into enh/rocksdbSstate 2023-04-24 14:48:53 +08:00
Xiaoyu Wang dc5235eb92 feat: add pause/resume stream statement 2023-04-24 14:48:33 +08:00
Haojun Liao 48c36a8c35 Merge branch 'main' into enh/rocksdbSstate 2023-04-24 14:44:13 +08:00
Minglei Jin f8bf98f6dc Merge branch '3.0' into fix/TD-23623 2023-04-24 14:28:49 +08:00
kailixu b26842e398 Merge branch '3.0' into enh/TD-21161-3.0 2023-04-24 14:19:49 +08:00
Haojun Liao fa46165227 Merge branch 'main' into enh/rocksdbSstate 2023-04-24 12:59:24 +08:00
Haojun Liao 057cc2d30d
Merge pull request #21018 from taosdata/feature/3_liaohj
fix(stream): set the correct start offset for stream task.
2023-04-24 12:02:20 +08:00
dapan1121 24aff3d680 fix: memory leak issue 2023-04-24 10:46:32 +08:00
dapan1121 8480c42234 fix: memory leak issue 2023-04-24 10:41:28 +08:00
dapan1121 905df6f7ac fix: memory leak issue 2023-04-24 10:37:58 +08:00
dapan1121 3b8e8018b2 fix: get user errcode issue 2023-04-24 10:34:07 +08:00
cadem a781d43577 fix/block-check-to-async-check 2023-04-24 10:23:43 +08:00
kailixu 2a96acb62e Merge branch '3.0' into enh/TD-21161-3.0 2023-04-24 10:04:48 +08:00