xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
31,602 Commits 3 Branches 0 Tags 479 MiB
Commit Graph

819 Commits

Author SHA1 Message Date
dapan1121 1792bf5ff3 fix bug 2022-05-07 14:46:04 +08:00
Shengliang Guan cdb7c37d16 refactor: adjust stb codes 2022-05-07 12:07:45 +08:00
WANG MINGMING 340f9158c0
Merge pull request #12156 from taosdata/feature/TD-14761 
feat: schemaless write
 2022-05-07 10:42:44 +08:00
Xiaoyu Wang 5f06387940 fix: some problems of parser and planner 2022-05-06 17:52:59 +08:00
wangmm0220 05daba7f8e refactor:merge from 3.0 2022-05-06 11:28:34 +08:00
Hongze Cheng f2859e9c1d Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/vnode_refact1 2022-05-05 01:42:47 +00:00
Shengliang Guan 5b2b4da11b refactor: fix: reset confict trans types 2022-05-04 16:49:24 +08:00
Shengliang Guan 8fda7b64dc refactor: adjust transaction unitest 2022-05-04 15:11:40 +08:00
Hongze Cheng ac0fb0237e drop table code 2022-05-04 03:57:16 +00:00
Hongze Cheng cfada1cc8a more sl refact 2022-05-03 14:08:30 +00:00
Hongze Cheng 05f06e04c1 refact sl 2022-05-02 15:17:43 +00:00
Shengliang Guan e3170a1325 Merge remote-tracking branch 'origin/3.0' into feature/dnode 2022-04-29 18:57:02 +08:00
Shengliang Guan 27b298bcfa fix: invalid read in multi-process mode 2022-04-29 18:56:46 +08:00
Hongze Cheng ab0e435d81 Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/vnode_refact1 2022-04-29 10:02:58 +00:00
Shengliang Guan c335098acb fix: invalid read in multi-process mode 2022-04-29 15:27:20 +08:00
afwerar f4f11fdc01 fix(os): fix win open file error. 2022-04-28 19:46:37 +08:00
Shengliang Guan 0faaa477cf enh: make single_stable mode work 2022-04-28 16:31:19 +08:00
Hongze Cheng 2f923ead39 Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/vnode_refact1 2022-04-28 06:20:12 +00:00
Hongze Cheng 3f65773a7c dev drop table 2022-04-28 06:20:00 +00:00
root fde3f3f68f stream update 2022-04-28 13:32:11 +08:00
Zhiqiang Wang cf8154551e
Merge pull request #11955 from taosdata/fix/ZhiqiangWang/fix-14989-fix-new-compilation-errors 
fix(os): fix new compilation errors.
 2022-04-27 19:11:08 +08:00
Yihao Deng 795f2a18d4
Merge pull request #11923 from taosdata/fix/TD-15127 
fix(rpc): fix duplicat port error
 2022-04-27 18:49:30 +08:00
Liu Jicong eba09ac3c0
Merge pull request #11952 from taosdata/feature/tq 
feat(tmq): consumer support recover
 2022-04-27 17:47:54 +08:00
afwerar bf9ab440a7 fix(os): fix new compilation errors. 2022-04-27 17:39:54 +08:00
Liu Jicong 37a2977ad9 feat(tmq): consumer support recover 2022-04-27 17:15:02 +08:00
Liu Jicong 1ff3057d37
Merge pull request #11940 from taosdata/feature/tq 
enh: more info in perf schema
 2022-04-27 15:35:24 +08:00
Liu Jicong 19ec7bcafc enh: more info in perf schema 2022-04-27 15:16:57 +08:00
yihaoDeng 5c025c0006 fix(rpc): fix duplicat port error 2022-04-27 12:45:28 +08:00
afwerar 48e379f320 fix(shell): memory init error. 2022-04-27 09:48:33 +08:00
Liu Jicong 08942d5a96
Merge pull request #11893 from taosdata/feature/tq 
feat(tmq): support show
 2022-04-26 17:47:55 +08:00
Hongze Cheng 15127f3a97 Merge branch '3.0' of https://github.com/taosdata/TDengine into vnode_refact_merge 2022-04-26 09:19:30 +00:00
Liu Jicong a5a10f7068 feat: tmq support show 2022-04-26 17:08:42 +08:00
Shengliang Guan 8379c33a25 fix: allow startup if the log directory does not exist 2022-04-26 16:27:59 +08:00
Shengliang Guan 68be5698a0 refactor(cluster): adjust acct errno 2022-04-26 16:00:40 +08:00
Hongze Cheng 9204992516 Merge branch '3.0' of https://github.com/taosdata/TDengine into vnode_refact_merge 2022-04-26 06:54:14 +00:00
afwerar dce677a72d fix(os): fix window compilation errors. 2022-04-26 14:11:16 +08:00
Hongze Cheng 6fe299cdcd Merge branch '3.0' of https://github.com/taosdata/TDengine into vnode_refact_merge 2022-04-26 05:49:42 +00:00
Shengliang Guan 933405adc9
Merge pull request #11845 from taosdata/feature/check 
fix: add error string for sync
 2022-04-25 18:41:08 +08:00
Shengliang Guan f2ea7c1fbd fix: add errstr for sync 2022-04-25 18:17:06 +08:00
wangmm0220 9eff7ff43a refactor: schemaless function 2022-04-25 15:54:34 +08:00
afwerar 50cd7bfe4a feature(dnode): param name error. 2022-04-25 15:33:36 +08:00
afwerar f966242047 feature(dnode): mul parameter start. 2022-04-25 13:57:55 +08:00
Haojun Liao 8f14f8e8b3 fix(query): enable mnd support show topics processing. 2022-04-25 11:40:56 +08:00
Haojun Liao 5eed1159b1 other: merge 3.0 2022-04-25 09:16:37 +08:00
Haojun Liao 1d681a9e4b enh(query): Add the group id in the serialized block format to support the multi-table(super table) interval query. 2022-04-24 20:48:42 +08:00
Shengliang Guan d1ac98fa84 Merge remote-tracking branch 'origin/3.0' into feature/check 2022-04-24 19:21:42 +08:00
Shengliang Guan 5e7da3511d fix(cluster): add refid in rpc, and handle it in multi-process mode 2022-04-24 18:22:00 +08:00
Shengliang Guan c5ea02c4ed fix(cluster): disable startup on create dir failed 2022-04-24 17:51:34 +08:00
Shengliang Guan bd70f5e104 fix(cluster): disable startup on create dir failed 2022-04-24 14:35:21 +08:00
Shengliang Guan 15ddbe8231 Merge remote-tracking branch 'origin/3.0' into feature/check 2022-04-24 11:25:15 +08:00
Liu Jicong 581b71cf13 merge from 3.0 2022-04-22 19:54:04 +08:00
Liu Jicong 32e9887664 feat(tmq): add push mode 2022-04-22 19:47:00 +08:00
WANG MINGMING 4291981b54
Merge pull request #11690 from taosdata/feature/TD-13041 
fix: bugs in to_json
 2022-04-22 18:23:27 +08:00
Shengliang Guan bc65c92ee3 refactor(tools): adjust client config parameters 2022-04-22 16:04:10 +08:00
Hongze Cheng 57d642b9b4 Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/vnode_refact1 2022-04-22 05:33:29 +00:00
Hongze Cheng 44c5e42ff2 Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/vnode_refact1 2022-04-22 01:56:56 +00:00
afwerar fc24521621 fix(os): windows compile 3.0. 2022-04-22 09:54:27 +08:00
Haojun Liao be1a2c690e
Merge pull request #11718 from taosdata/feature/3.0_liaohj 
fix(query): if one vgroup has no tables, query against this vgroup will receive unexpected error.
 2022-04-21 21:21:25 +08:00
Hongze Cheng b4169cdf2e Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/vnode_refact1 2022-04-21 12:40:42 +00:00
Liu Jicong 5747629c9e
Merge pull request #11720 from taosdata/feature/tq 
fix: memory leak
 2022-04-21 19:53:19 +08:00
Liu Jicong ef05b1bc95 fix: memory leak 2022-04-21 17:56:32 +08:00
Haojun Liao fc799fa115 other: merge 3.0 2022-04-21 17:51:00 +08:00
Haojun Liao e14142d114 refactor(query): do some internal refactor. 2022-04-21 13:57:32 +08:00
Hongze Cheng 1fe0daaf36 Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/vnode_refact1 2022-04-21 03:49:47 +00:00
dapan1121 3f880627fd
Merge pull request #11700 from taosdata/feature/qnode5 
Feature/qnode5
 2022-04-21 10:34:38 +08:00
Hongze Cheng e5e7e713b1 Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/vnode_refact1 2022-04-21 01:18:43 +00:00
shenglian-zhou babef48c8a
Merge pull request #11687 from taosdata/3.0_udfd 
feat(udf):dnode start/stop/restart udfd and vnode create/destory proxy to udfd
 2022-04-21 09:10:16 +08:00
Liu Jicong 558edd3713 merge from 3.0 2022-04-20 22:12:10 +08:00
Liu Jicong d75ab9b3ff refactor 2022-04-20 21:36:55 +08:00
wangmm0220 d2a1203eeb refactor: fix bugs in to_json 2022-04-20 20:39:19 +08:00
Hongze Cheng c8acaa77bb Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/vnode_refact1 2022-04-20 12:29:57 +00:00
slzhou d8ba1d32f4 Merge branch '3.0' of github.com:taosdata/TDengine into 3.0_udfd 2022-04-20 19:29:17 +08:00
slzhou 177b1c96a5 udfd final program ongoing 2022-04-20 17:46:29 +08:00
wangmm0220 0fb41733ea refactor: merge from 3.0 2022-04-20 17:08:52 +08:00
Hongze Cheng 45cf8aa16b refact meta 3 2022-04-20 08:50:45 +00:00
dapan1121 fca15e39b2 Merge remote-tracking branch 'origin/3.0' into feature/qnode5 2022-04-20 09:04:56 +08:00
Hongze Cheng 3cc66adcb7 refact meta 1 2022-04-19 13:10:03 +00:00
Shengliang Guan f6597c37f4 fix: make taos_options work 2022-04-19 17:54:57 +08:00
Liu Jicong 3277607503 merge from 3.0 2022-04-19 17:10:58 +08:00
Liu Jicong b7bf0fe10b refactor(tmq): subscribe and rebalance process 2022-04-19 17:02:49 +08:00
Haojun Liao a6177f54ca test: disable free in hash temporarily. 2022-04-19 10:28:39 +08:00
wangmm0220 49c3057221 refactor: merge from 3.0 2022-04-18 21:15:57 +08:00
Haojun Liao dc76f2e91a refactor: refactor hash module to invoke the freeFp when destroying the hash node. 2022-04-18 17:32:50 +08:00
wangmm0220 24f805c5c2 refactor: add to_json function 2022-04-18 15:54:40 +08:00
dapan1121 49e0ecdb9b Merge remote-tracking branch 'origin/3.0' into feature/qnode4 2022-04-18 13:34:04 +08:00
Shengliang Guan 0d262b8747 fix: definite lost in tlog.c found by valgrind 2022-04-18 10:22:20 +08:00
Shengliang Guan 884bf3775f fix: definite lost in tcache.c found by valgrind 2022-04-18 10:21:41 +08:00
wangmm0220 b7bd654c77 refactor: add compare logic for json value 2022-04-16 21:24:07 +08:00
dapan1121 9547c0a09b stmt 2022-04-16 15:59:19 +08:00
wangmm0220 73c34da280 Merge branch '3.0' into feature/TD-13041 2022-04-16 09:30:26 +08:00
dapan1121 e3ea173046 stmt 2022-04-15 20:10:51 +08:00
Shengliang Guan b017d2a4c8 refactor: adjust logs and code style 2022-04-15 15:05:37 +08:00
dapan1121 0e9ecc628e Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-04-15 08:33:53 +08:00
dapan1121 69f09fd0e3 stmt 2022-04-14 20:14:52 +08:00
wangmm0220 93cbee6970 Merge branch '3.0' into feature/TD-13041 2022-04-14 18:25:08 +08:00
wangmm0220 32577d4196 refactor: add json tag function for sql parser 2022-04-14 18:24:21 +08:00
Shengliang Guan a8b890bcae refact(cluster): node mgmt 2022-04-12 20:33:13 +08:00
dapan1121 c9b43b2924 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-04-12 19:13:40 +08:00
dapan1121 b8391fad62 fix heartbeat msg 2022-04-12 19:10:52 +08:00
afwerar c11946fd75 [TD-13756]<fix>: Fix macro name error. 2022-04-11 18:55:43 +08:00
afwerar 2662a3b69d [TD-13254]<fix>: make 3.0 grant. 2022-04-10 19:08:16 +08:00
Shengliang Guan b8bdbed3db fix[cluster]: redirect meg when node not deployed 2022-04-10 13:47:28 +08:00
Shengliang Guan c1b3afa92d feat[cluster]: create and drop mnode 2022-04-09 19:38:20 +08:00
Shengliang Guan 66ef1daeb9 refactor[cluster]: adjust the error codes 2022-04-09 16:05:20 +08:00
dapan1121 cd8a0e89ce
Merge pull request #11330 from taosdata/feature/qnode 
Feature/qnode
 2022-04-09 13:20:10 +08:00
WANG MINGMING 6fbe057a0b
Merge pull request #11311 from taosdata/feature/TD-14422 
Feature/td 14422
 2022-04-09 11:32:48 +08:00
Shengliang Guan b1a8ed96f6 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-04-09 10:40:02 +08:00
WANG MINGMING 41392e9e4a
Merge branch '3.0' into feature/TD-14422 2022-04-09 10:18:52 +08:00
dapan1121 a8f740bcbb Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-04-09 09:41:18 +08:00
Shengliang Guan 951ee6136c feat[cluster]: send monitor information in multi-process mode 2022-04-08 21:25:46 +08:00
dapan1121 99d6fda66a feature/qnode 2022-04-08 18:34:11 +08:00
Haojun Liao 28456a034c Merge remote-tracking branch 'origin/3.0' into feature/3.0_liaohj 2022-04-08 13:13:38 +08:00
Haojun Liao f700e4746c [td-14393] fix bug. 2022-04-08 13:09:44 +08:00
wangmm0220 225cf61845 merge from 3.0 2022-04-07 11:31:50 +08:00
Shengliang Guan f6d3ba6265 fix CI error 2022-04-07 10:04:32 +08:00
Shengliang Guan 8202301992 fix dead lock in shm 2022-04-06 21:53:58 +08:00
Shengliang Guan 5d835bc5b1 cfg for multi process 2022-04-06 21:16:31 +08:00
Shengliang Guan 79963b9c34 rename node type 2022-04-06 20:53:12 +08:00
Shengliang Guan c53489204c minor changes 2022-04-06 20:27:59 +08:00
Shengliang Guan aee4c7a25e Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-04-06 19:41:55 +08:00
Shengliang Guan 563d2ec613 proc test 2022-04-06 19:41:41 +08:00
Shengliang Guan 1638220667 proc test 2022-04-06 19:23:38 +08:00
wangmm0220 83eacf8d07 merge from 3.0 2022-04-06 18:38:19 +08:00
Haojun Liao af32cfcaef
Merge pull request #11262 from taosdata/feature/3.0_liaohj 
[td-14493] support having in group by
 2022-04-06 18:25:52 +08:00
Haojun Liao 6863999ec5 [td-14493] support having in group by 2022-04-06 17:59:08 +08:00
dapan1121 7c1d1a2436
Merge pull request #11249 from taosdata/feature/qnode 
Feature/qnode
 2022-04-06 16:49:52 +08:00
Xiaoyu Wang 709dda39b7 TD-13037 distinct, state window and partition by plan implement 2022-04-06 03:22:41 -04:00
dapan1121 21542194c6 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-04-06 11:32:46 +08:00
Shengliang Guan 5382648ba6 proc test 2022-04-06 11:01:16 +08:00
Shengliang Guan 279af752c3 rename test 2022-04-06 10:22:16 +08:00
Shengliang Guan 13770e971e Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-04-05 15:38:01 +08:00
Shengliang Guan 69aa4546f5 send response on child queue killed 2022-04-05 15:37:37 +08:00
Cary Xu b3bb652708 data and bitmap compress/store/decompress separatedly 2022-04-03 18:02:30 +08:00
Liu Jicong 47a094a24f merge from 3.0 2022-04-02 23:05:16 +08:00
Liu Jicong 8e2d121b3a temp 2022-04-02 19:59:25 +08:00
dapan1121 27a3a1d782 feature/qnode 2022-04-02 19:31:52 +08:00
wangmm0220 5aa3467e2b merge from 3.0 2022-04-02 19:02:45 +08:00
Zhiqiang Wang 5b98a16d95
Merge pull request #11218 from taosdata/fix/ZhiqiangWang/TD-13756-log-file-open-fail-error 
[TD-13756]<fix>: log file open fail error.
 2022-04-02 18:23:21 +08:00
afwerar a651affa47 [TD-13756]<fix>: log file open fail error. 2022-04-02 17:47:27 +08:00
wangmm0220 12c3a10a9b fix error in order by logic & fix no return error 2022-04-02 14:29:43 +08:00
Shengliang Guan 060149fa9d
Merge pull request #11192 from taosdata/feature/shm 
add multiprocess mode to CI
 2022-04-02 11:36:08 +08:00
afwerar 563500862f [TD-13756]<fix>: log file open fail error. 2022-04-02 10:54:17 +08:00
afwerar 131bf46854 [TD-13756]<fix>: log file open fail error. 2022-04-02 10:51:46 +08:00
afwerar e9f2c1cdc0 [TD-13756]<fix>: log file open fail error. 2022-04-02 10:33:35 +08:00
afwerar 42231d7691 [TD-13756]<fix>: log file open fail error. 2022-04-02 10:31:07 +08:00
Shengliang Guan 5015a6a78b shm 2022-04-01 21:27:47 +08:00
Shengliang Guan ea8a336269 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-04-01 10:42:07 +08:00
Shengliang Guan 8fcaee6d97 minor changes 2022-04-01 10:39:59 +08:00
Haojun Liao 3f6e96c66d
Merge pull request #11166 from taosdata/feature/3.0_liaohj 
[td-14373]fix bug.
 2022-04-01 10:37:39 +08:00
wangmm0220 69a5e55a24 [TD-14422]<fix> fix error in sort logic & add test case 2022-04-01 10:05:16 +08:00
Liu Jicong b06db715bc
Merge pull request #11163 from taosdata/feature/tq 
fix
 2022-03-31 19:04:47 +08:00
Shengliang Guan c649e345e7
Merge pull request #11168 from taosdata/feature/shm 
handle sigchild
 2022-03-31 18:03:48 +08:00
Haojun Liao 02e097dc5c [td-14426] fix bug. 2022-03-31 17:36:51 +08:00
Shengliang Guan 781d31d39f adjust log 2022-03-31 16:41:27 +08:00
Xiaoyu Wang 6df2b9b607
Merge pull request #11164 from taosdata/feature/3.0_wxy 
TD-14429 bugfix
 2022-03-31 16:16:54 +08:00
Shengliang Guan be2ab1f4f8 shm 2022-03-31 16:16:24 +08:00
Shengliang Guan fa354b85e5 shm 2022-03-31 16:05:24 +08:00
Xiaoyu Wang 59862e454d TD-14429 bugfix 2022-03-31 04:01:07 -04:00
Liu Jicong e163197573 merge from 3.0 2022-03-31 15:55:34 +08:00
Liu Jicong 3e5da8bedb fix 2022-03-31 15:52:54 +08:00
Shengliang Guan 873c2373f3 adjust logs 2022-03-31 15:48:53 +08:00
Shengliang Guan 1a8b1753fb shm 2022-03-31 15:27:21 +08:00
Shengliang Guan 4d6c844438 shm 2022-03-30 21:09:45 +08:00
Shengliang Guan b168766ff2 shm 2022-03-30 20:32:01 +08:00
Shengliang Guan d90ebef80b Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-30 20:15:22 +08:00
Shengliang Guan 79936567c5 shm 2022-03-30 20:11:09 +08:00
afwerar be4cd29d8b [TD-13759]<fix>: add pthread func. 2022-03-30 16:06:04 +08:00
Shengliang Guan 6ece0d9ac1 shm 2022-03-30 16:03:21 +08:00
Shengliang Guan dd94e2da5a shm 2022-03-29 21:13:09 +08:00
Shengliang Guan 232404fa86 shm queue 2022-03-29 15:21:48 +08:00
Shengliang Guan 182a5ee4b5 shm 2022-03-29 11:37:29 +08:00
Shengliang Guan 681dbc0150 remove rpcSendResponse in qnode 2022-03-28 21:24:59 +08:00
Shengliang Guan f82afcfe4d registerBrokenLinkArgFp 2022-03-28 20:45:52 +08:00
Shengliang Guan 30eb8d50b0 shm 2022-03-28 19:44:53 +08:00
Shengliang Guan ce016a216c refact node msg fp 2022-03-28 17:25:12 +08:00
Shengliang Guan 1e1573359d shm 2022-03-28 16:43:52 +08:00
Shengliang Guan 4b5c05334f minor changes 2022-03-28 10:10:06 +08:00
Shengliang Guan 2e2ede8725 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-28 10:08:40 +08:00
Shengliang Guan 9c1f71459e minor changes 2022-03-26 23:04:51 +08:00
afwerar 222db126bc [TD-13758]<fix>: redefine memory api. 2022-03-26 00:29:53 +08:00
Shengliang Guan d7e13ef739 shm 2022-03-25 18:22:59 +08:00
Shengliang Guan 474939ee49 shm 2022-03-25 17:28:38 +08:00
Cary Xu e8b91539dd
Merge pull request #10957 from taosdata/feature/TD-11463-3.0 
Feature/td 11463 3.0
 2022-03-24 10:43:49 +08:00
Cary Xu 4e8ebdef3a support drop sma in tsdb 2022-03-24 10:25:58 +08:00
Cary Xu 6bd84f7fb2 drop tSma logic of tsdb 2022-03-23 21:06:17 +08:00
Shengliang Guan 2ba675ec40 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-23 20:16:33 +08:00
Shengliang Guan e9831674b2 sma 2022-03-23 20:12:50 +08:00
Shengliang Guan 9006b0f576 add tsma 2022-03-23 14:54:06 +08:00
Xiaoyu Wang 3442e20916 TD-13077 identifier implement 2022-03-22 22:45:57 -04:00
Haojun Liao da1523f1f5
Merge branch '3.0' into 3.0_query_integrate 2022-03-22 18:47:58 +08:00
Shengliang Guan 2af212f42d refact worker 2022-03-22 16:51:30 +08:00
Shengliang Guan f48fddc7c4 refact queue 2022-03-22 16:47:53 +08:00
Xiaoyu Wang ef125eaa40 merge 3.0 2022-03-22 04:29:54 -04:00
Shengliang Guan a340baa879 refact queue 2022-03-22 16:10:26 +08:00
Shengliang Guan 4091771274 refact queue 2022-03-22 14:38:26 +08:00
Shengliang Guan fe8714fe56 refact worker 2022-03-22 10:49:33 +08:00
afwerar a263f72d58 [TD-13762]<fix>: redefine atomic api. 2022-03-22 00:54:21 +08:00
Xiaoyu Wang dce38817be merge 3.0 2022-03-21 05:39:28 -04:00
Xiaoyu Wang 9ca80596e4 merge 3.0 2022-03-21 02:00:30 -04:00
Shengliang Guan 4cb813a920 fix thread conflict 2022-03-20 10:19:14 +08:00