Commit Graph

13208 Commits

Author SHA1 Message Date
yihaoDeng 86fe216921 add backend 2023-03-28 11:23:24 +00:00
Benguang Zhao ae8d87643f Merge branch 'main' into FIX/TD-22975-main 2023-03-28 18:00:51 +08:00
dapan1121 a87d35be08 fix: optimize performance 2023-03-28 17:40:46 +08:00
wangmm0220 b11a105327 fix:[TD-23339] parse block error 2023-03-28 17:36:23 +08:00
yihaoDeng ca5f813c5e add backend 2023-03-28 09:27:42 +00:00
dapan1121 4ba0fb97ee
Merge pull request #20668 from taosdata/fix/TS-3000
fix(query): spread/elapsed using sma result for computation
2023-03-28 16:14:17 +08:00
dapan1121 22ad3129b9 fix: query schema is old issue 2023-03-28 15:21:47 +08:00
yihaoDeng 1c21d67570 add backend 2023-03-28 06:24:16 +00:00
Haojun Liao fca79dbc53 Merge branch 'fix/liaohj' into main 2023-03-28 11:20:01 +08:00
slzhou 169d0ee13c fix: scalar return and log error of udf execution 2023-03-28 11:18:14 +08:00
Ganlin Zhao 2198ae2060 fix(query): spread/elapsed using sma result for computation 2023-03-28 10:49:49 +08:00
yihaoDeng 47cb4339f0 add backend 2023-03-28 02:27:20 +00:00
yihaoDeng e1046015ae add backend 2023-03-28 02:25:11 +00:00
Haojun Liao c158087d66 fix(tmq): kill the ongoing tsdb scans while transferring the ownership of vnode to other consumers. 2023-03-28 09:53:49 +08:00
Haojun Liao 9b5e53c821
Merge pull request #20642 from taosdata/fix/TD023101
fix:add test case for raw_block interface
2023-03-28 09:46:09 +08:00
Haojun Liao 5c128e2292 refactor: do some internal refactor. 2023-03-28 09:27:48 +08:00
dapan1121 80798dd934 fix: job retry issue 2023-03-28 09:20:53 +08:00
yihaoDeng 47bd13a7b1 add backend 2023-03-27 13:25:06 +00:00
dapan1121 61571d9296 enh: optimize count performance 2023-03-27 19:40:29 +08:00
Xiaoyu Wang 97855c6233
Merge pull request #20607 from taosdata/FEAT/TD-23257-3.0
feat: WAL cleanup not affected by topic consumption anymore
2023-03-27 17:58:31 +08:00
yihaoDeng 5a8c46b733 add backend 2023-03-27 08:34:12 +00:00
yihaoDeng 011c791b89 add backend 2023-03-27 08:25:40 +00:00
54liuyao cf2d169f75 feat:coverity scan 2023-03-27 16:17:49 +08:00
Xiaoyu Wang c4791d58a6 fix: create stream does not support event_window 2023-03-27 16:09:38 +08:00
yihaoDeng f0df728a0e add backend 2023-03-27 08:08:43 +00:00
yihaoDeng a3a0d9c81f add backend 2023-03-27 07:42:11 +00:00
54liuyao 3a12e36b4b fix:add combine function for last row 2023-03-27 14:13:17 +08:00
Xiaoyu Wang ed48713a4b
Merge pull request #20615 from taosdata/fix/trigger-election-by-sync-msg
Fix/trigger election by sync msg
2023-03-27 11:54:53 +08:00
wangmm0220 5a2e3c1603 fix:add test case for raw_block interface 2023-03-27 10:32:30 +08:00
yihaoDeng 0690604a49 add backend 2023-03-27 02:20:49 +00:00
yihaoDeng 2cc2e5d522 add backend 2023-03-27 01:39:00 +00:00
yihaoDeng 874b6916aa add backend 2023-03-26 12:06:06 +00:00
yihaoDeng ffd272597c add backend 2023-03-26 06:32:10 +00:00
yihaoDeng 78f22d71b9 add backend 2023-03-26 05:54:07 +00:00
yihaoDeng fe5fe72e63 add backend 2023-03-26 05:50:18 +00:00
yihaoDeng c3d7f888e9 add backend 2023-03-26 05:46:48 +00:00
dapan1121 ef7b9b848a
Merge pull request #20627 from taosdata/fix/TD023101
fix:send data batch if consume wal where subscribe db
2023-03-25 16:40:06 +08:00
wangmm0220 8823997941 fix:case error & add NONE for rows to col mode 2023-03-25 15:56:22 +08:00
Haojun Liao 7d1aa634fb
Merge pull request #20527 from taosdata/fix/TD-23200
fix:scan of fill history ended prematurely
2023-03-25 15:01:42 +08:00
Haojun Liao 61974b9f70
Merge pull request #20605 from taosdata/fix/TD-23272
fix:add combine function for groupKey
2023-03-25 15:01:33 +08:00
Haojun Liao 27c848453e
Merge pull request #20625 from taosdata/fix/TD-23220
fix: modify stream fill linear
2023-03-25 15:01:06 +08:00
Haojun Liao 26ebd4e60d
Merge pull request #20620 from taosdata/fix/TD-23233
fix:reset parameter ignoreExpried for fill history
2023-03-25 15:00:43 +08:00
yihaoDeng b9531fc9a7 add backend 2023-03-25 06:46:19 +00:00
yihaoDeng 8e409f81ae add backend 2023-03-25 06:43:17 +00:00
wangmm0220 9f5e435140 fix:conflict from main 2023-03-25 11:49:37 +08:00
Xiaoyu Wang d2b8c5e433
Merge pull request #20524 from taosdata/fix/clusterid-isolation
fix: clusterid isolation
2023-03-25 09:19:49 +08:00
dapan1121 95dd3e078a
Merge pull request #20596 from taosdata/szhou/python-udf
fix: aggregate function can return null value
2023-03-25 08:57:33 +08:00
dapan1121 7c7e121632
Merge pull request #20606 from taosdata/szhou/fix-td23288
fix: query ins_table with table_name = '' results in db error
2023-03-25 08:56:24 +08:00
wangmm0220 57331cd71d Merge branch 'main' of https://github.com/taosdata/TDengine into fix/TD023101 2023-03-24 14:51:11 +08:00
wangmm0220 5d06474f2e fix:send data batch if consume wal where subscribe db 2023-03-24 14:43:29 +08:00
wangmm0220 dcaab41a27 fix:error in optimize consume logic 2023-03-24 13:20:03 +08:00
54liuyao f18cfc25d6 fix:reset parameter ignoreExpried for fill history 2023-03-24 11:06:05 +08:00
cadem 86ca5ce210 fix/trigger election by sync msg 2023-03-24 09:13:20 +08:00
Shengliang Guan 8d1224ce22 refactor: format code 2023-03-23 22:31:20 +08:00
yihaoDeng b17f99de47 add backend 2023-03-23 12:49:33 +00:00
Xiaoyu Wang bddba107be
Merge pull request #20608 from taosdata/fix/TS-2960
fix(tdb/restore): rollback journal files backward
2023-03-23 19:47:31 +08:00
Benguang Zhao 22d92cd3dc feat: WAL cleanup not affected by topic consumption anymore 2023-03-23 18:59:14 +08:00
Xiaoyu Wang 18b039fecd
Merge pull request #20603 from taosdata/enh/3.0_planner_optimize
fix: udf error check
2023-03-23 18:44:23 +08:00
Minglei Jin a07366ed02 fix(tdb/pager): destroy txn id list 2023-03-23 18:23:14 +08:00
Xiaoyu Wang ca2e566319 enh: improve error reporting information 2023-03-23 17:56:56 +08:00
Minglei Jin 5d641a8934 fix(tdb/restore): restore tdb journal backward 2023-03-23 17:55:53 +08:00
dapan1121 7f50b463bb
Merge pull request #20599 from taosdata/fix/mainT3.0
fix: merge main to 3.0
2023-03-23 16:17:01 +08:00
54liuyao ffa59f69aa fix:add combine function for groupKey 2023-03-23 15:20:45 +08:00
Xiaoyu Wang e15e40abdf enh: improve error reporting information 2023-03-23 14:15:49 +08:00
slzhou 40a78bde50 fix: unknow db error when query ins_tables with table_name="" 2023-03-23 13:52:53 +08:00
Xiaoyu Wang a5d8549cb1
Merge pull request #20593 from taosdata/FEAT/TD-23258-3.0
feat: support WAL_RETENTION_PERIOD and WAL_RETENTION_SIZE for alter database
2023-03-23 11:43:01 +08:00
dapan1121 dbca1c0e8c
Merge pull request #20595 from taosdata/fix/TD-23283
fix: slimit not work issue
2023-03-23 08:47:15 +08:00
yihaoDeng 981466a0c7 failed to read from 2023-03-22 14:35:24 +00:00
yihaoDeng 40535b5ede add backend 2023-03-22 13:34:19 +00:00
yihaoDeng b701198dbb add backend 2023-03-22 13:19:56 +00:00
Xiaoyu Wang fddf3f16cf fix: udf error check 2023-03-22 19:09:26 +08:00
dapan1121 a14631dc80
Merge pull request #20601 from taosdata/fix/TS-2904.2
fix: restore removed code
2023-03-22 18:24:29 +08:00
dapan1121 ddbc0e2e61 fix: restore removed code 2023-03-22 17:37:57 +08:00
dapan1121 965dc731f1
Merge pull request #20591 from taosdata/fix/TD-23271
fix: union all translate issue
2023-03-22 17:16:00 +08:00
dapan1121 6506805784 fix: fix no group slimit issue and test cases 2023-03-22 17:14:45 +08:00
dapan1121 5b02af6a91 fix: merge main to 3.0 2023-03-22 16:08:16 +08:00
shenglian zhou 7db1c08d9d fix: merge during pull 2023-03-22 15:28:37 +08:00
shenglian zhou 0c0edd6a39 fix: udf agg can not return null values 2023-03-22 15:27:11 +08:00
dapan1121 97c7d363f2 fix: slimit not work issue 2023-03-22 15:18:54 +08:00
Benguang Zhao 75b922c2be feat: retentionSize as 0 means unlimitted in size 2023-03-22 15:01:01 +08:00
dapan1121 e62e125dd3
Merge pull request #20569 from taosdata/feat/mode_opt
enh(query): improve mode function page buffer allocation
2023-03-22 13:54:23 +08:00
dapan1121 7258ea9244
Merge pull request #20576 from taosdata/fix/TS-2933
enh: optimize table merge scan performance
2023-03-22 13:45:00 +08:00
dapan1121 7b1835d181
Merge pull request #20582 from taosdata/fix/TS-2947
fix: stable with order by query limit issue
2023-03-22 13:40:13 +08:00
dapan1121 225db18fdb fix: union all translate issue 2023-03-22 13:37:35 +08:00
Xiaoyu Wang f97b66e8da merge 3.0 2023-03-22 11:55:59 +08:00
Xiaoyu Wang eb79046a70 merge 3.0 2023-03-22 11:42:02 +08:00
Benguang Zhao 0b101e4952 feat: support WAL_RETENTION_PERIOD and WAL_RETENTION_SIZE for alter database 2023-03-22 11:40:24 +08:00
Xiaoyu Wang fbc9b2404e feat: add sql command 'balance vgroup leader' 2023-03-22 09:53:56 +08:00
dapan1121 a4eef9ea1f
Merge pull request #20570 from taosdata/szhou/fix-td23266
fix: create function error for json/decimal/blob/varbinary type
2023-03-22 09:47:17 +08:00
cadem ea35f0ae11 feat/balance vgroup leader 2023-03-22 09:36:59 +08:00
yihaoDeng 43e16c865a add backend 2023-03-22 01:16:49 +00:00
dapan1121 cb3b4a6d8a Merge remote-tracking branch 'origin/main' into fix/TS-2947 2023-03-22 08:56:21 +08:00
dapan1121 56d5034b7f fix: table merge scan limit issue 2023-03-22 08:55:43 +08:00
yihaoDeng 7e33e70a66 add backend 2023-03-21 14:00:51 +00:00
yihaoDeng 764a81298f add backend 2023-03-21 13:21:36 +00:00
yihaoDeng 914d391845 fix tag filter 2023-03-21 12:28:16 +00:00
wangmm0220 ba6226c079 Merge branch 'main' of https://github.com/taosdata/TDengine into fix/TD023101 2023-03-21 19:28:58 +08:00
wangmm0220 74c201bc09 fix:create same table use writemetadata interface 2023-03-21 18:58:41 +08:00
dapan1121 ddfcba76f3 fix: optimize table merge scan perf 2023-03-21 18:51:16 +08:00
54liuyao a614ef777f fix: modify pull linear 2023-03-21 18:19:45 +08:00
Xiaoyu Wang 58ebd3539d feat: alter database wal_retention_period/wal_retention_size 2023-03-21 16:45:19 +08:00
slzhou b9edd24d3f fix: create function error for json/decimal/blob/varbinary type 2023-03-21 00:38:13 -08:00
dapan1121 3ab55496c1
Merge pull request #20561 from taosdata/fix/TS-2891-M
fix: select ins_columns from stb/tb
2023-03-21 16:24:46 +08:00
Ganlin Zhao 9e0faad5eb remove unused MACROS 2023-03-21 16:24:20 +08:00
Ganlin Zhao e9fa00185a enh(query): improve mode function page buffer allocation 2023-03-21 16:15:26 +08:00
wangmm0220 220d4bf86a fix:add log 2023-03-21 14:38:13 +08:00
Haojun Liao ca29dd344f other: merge main. 2023-03-21 14:04:52 +08:00
Haojun Liao d5a386a563 fix(client): fix coverity issues. 2023-03-21 14:03:36 +08:00
dapan1121 ddab83a2ba enh: optimize table merge scan performance 2023-03-21 11:42:46 +08:00
Haojun Liao ea0cc2c584
Merge pull request #20554 from taosdata/fix/TS-2828
fix: add retry if insert error with meta change
2023-03-21 09:01:22 +08:00
dapan1121 a070da04ec
Merge pull request #20538 from taosdata/szhou/python-udf
enhance: add udf context from plugin traceability
2023-03-21 08:44:27 +08:00
yihaoDeng 2d37aeabdc add backend 2023-03-20 15:33:18 +00:00
cadem 39f6ce1694 remove memory leak and syncNodeInRaftGroup 2023-03-20 18:34:20 +08:00
wangmm0220 7849459bef fix:add log 2023-03-20 18:20:01 +08:00
kailixu 179579f204 chore: more code 2023-03-20 17:41:22 +08:00
kailixu 24dbcaa844 chore: merge main 2023-03-20 17:32:54 +08:00
Haojun Liao ca1dffff45
Merge pull request #20508 from taosdata/fix/liaohj
fix(client): fix potential memory leak.
2023-03-20 16:11:22 +08:00
yihaoDeng 192570ce77 fix tag filter 2023-03-20 04:14:57 +00:00
yihaoDeng 05a205d3b8 add backend 2023-03-20 02:00:31 +00:00
Haojun Liao c678740968 refactor: do some internal refactor. 2023-03-19 19:22:43 +08:00
Haojun Liao 7e712a14b6 fix(tmq): adjust log. 2023-03-19 19:06:28 +08:00
Haojun Liao ae5155edcf fix(tmq): do some internal refactor. 2023-03-19 10:49:30 +08:00
slzhou 698b057aa0 enhance: add udf context from plugin traceability 2023-03-19 08:49:45 +08:00
Cary Xu 7a3c897a80
Revert "fix(query): invalid write when query of ins_columns" 2023-03-18 20:49:48 +08:00
yihaoDeng afaa77cc3e fix tag filter 2023-03-18 10:01:45 +00:00
dapan1121 77d8013808
Merge pull request #20526 from taosdata/fix/TD-23173
fix(query): do not update ts window at exchange operator.
2023-03-18 18:00:09 +08:00
yihaoDeng f24e06f36b fix tag filter 2023-03-18 08:58:26 +00:00
yihaoDeng e04de7f6df add backend 2023-03-18 07:37:54 +00:00
yihaoDeng 8039702c14 add backend 2023-03-18 07:36:55 +00:00
54liuyao 2185464836 fix:scan of fill history ended prematurely 2023-03-18 13:38:33 +08:00
kailixu d90c8e834a chore: var def optimization 2023-03-18 13:07:15 +08:00
kailixu 828af14b52 Merge branch 'main' into fix/TS-2891-M 2023-03-18 12:51:07 +08:00
kailixu 45a625f2dc fix: add mem check 2023-03-18 12:50:37 +08:00
cadem 042d94215b feat/add topic total and stream total in monitor 2023-03-18 12:50:07 +08:00
Ganlin Zhao 8fa4aa1435 fix(query): do not update ts window at exchange operator. 2023-03-18 12:06:59 +08:00
cadem 7c970d1847 fix/clusterid isolation 2023-03-18 11:16:52 +08:00
dapan1121 a6cc171d94
Merge pull request #20498 from taosdata/szhou/python-udf
enhance: add taospyudf test and run it in CI
2023-03-18 09:21:40 +08:00
slzhou ba82f05d68 fix: keep original udf file name when rename file error 2023-03-17 20:19:46 +08:00
wangmm0220 d5328b7a2b fix:add log for schmaless 2023-03-17 19:11:40 +08:00
dapan1121 f5aabde528
Merge branch 'main' into fix/TD-23161 2023-03-17 19:00:04 +08:00
dapan1121 b56360c55b
Merge pull request #20509 from taosdata/enh/TS-2904
enh: optimize count(1) performance
2023-03-17 18:16:58 +08:00
dapan1121 28905af158 fix: column alisa issue and ut case 2023-03-17 17:01:46 +08:00
kailixu 5d82380993 chore: code optimization 2023-03-17 16:55:53 +08:00
kailixu 5f2ced466b Merge branch 'main' into fix/TS-2891-M 2023-03-17 16:49:06 +08:00
dapan1121 af5c214e16 fix: count(1) from nested query issue 2023-03-17 16:36:13 +08:00
dapan1121 746174ea45 fix: remove count optimize 2023-03-17 16:16:15 +08:00
dapan1121 c2f346407d fix: order by error info 2023-03-17 15:17:09 +08:00
kailixu ed3fc6bdf1 fix: select ins_columns from stb/ctb 2023-03-17 14:48:23 +08:00
dapan1121 f45f3b460f enh: optimize count(1) performance 2023-03-17 14:30:58 +08:00
Haojun Liao 8d1c6956d6 fix(query): set the tag filter flag. 2023-03-17 14:28:30 +08:00
dapan1121 2744dec816
Merge pull request #20488 from taosdata/fix/addUt
fix: modify minrows/maxrows range and add cases
2023-03-17 14:27:31 +08:00
kailixu a85e30efe6 fix: select ins_columns from stb/ctb 2023-03-17 14:19:00 +08:00
Haojun Liao d5a8a4aefe
Merge pull request #20502 from taosdata/fix/liaohj
fix(client): set the initial value for num_of_rows.
2023-03-17 12:50:04 +08:00
kailixu 7ed966e3f1 fix: select ins_columns from stb/tb 2023-03-17 12:33:34 +08:00
yihaoDeng 497ba9992d fix coverity scan problem 2023-03-17 02:26:18 +00:00
Haojun Liao 970155a845 fix(query): fix coverity issues. 2023-03-16 21:53:34 +08:00
wangmm0220 14970478dc fix:conflicts 2023-03-16 19:15:08 +08:00
wangmm0220 fa2e7b234c fix:add log for schemaless & sleep longer if modify schema error 2023-03-16 19:13:15 +08:00
dapan1121 59b532a890 fix: modify minrows/maxrows range and add cases 2023-03-16 09:46:14 +08:00
kailixu ba5c3fb2ab fix: select ins_columns for stb with 4096 columns 2023-03-16 00:01:54 +08:00
kailixu acd57f03e6 fix(query): invalid write when query of ins_columns 2023-03-15 20:31:54 +08:00
yihaoDeng e2646734ad enh: add queue limit 2023-03-15 12:01:16 +00:00
yihaoDeng ef092c1cce enh: add queue limit 2023-03-15 11:54:36 +00:00
Shengliang Guan 08601f4b83
Merge pull request #20451 from taosdata/fix/TD-23134
fix: fix coverity scan
2023-03-15 14:10:18 +08:00
Shengliang Guan 51e503dd2c
Merge pull request #20464 from taosdata/fix/TD-23156
fix:source task needs to wait && stream state window does not handle null
2023-03-15 14:09:26 +08:00
Shengliang Guan dd2940b8b3
Merge pull request #20463 from taosdata/fix/TS-2883
fix: fix table count operator groupId issue
2023-03-15 14:08:54 +08:00
Shengliang Guan 09ca41b3f7
Merge pull request #20467 from taosdata/fix/TS-2893
fix:create same sub table
2023-03-15 14:07:47 +08:00
54liuyao 25732f7c3c fix:source task needs to wait & stream state window does not handle null 2023-03-15 13:15:17 +08:00
54liuyao d5defa3def fix:create same sub table 2023-03-15 11:10:55 +08:00
54liuyao 96db1192ae fix: fix coverity scan 2023-03-15 09:03:05 +08:00
dapan1121 1db4619fdc Merge branch 'main' of github.com:taosdata/TDengine into main 2023-03-15 08:42:44 +08:00
dapan1121 b2bf1871e1
Merge pull request #20415 from taosdata/feat/TD-22746
feat: add client meta stat info
2023-03-15 08:37:20 +08:00
dapan1121 20c8a9031d fix: fix table count operator groupId issue 2023-03-15 08:35:40 +08:00
Haojun Liao 15cbbd3a14 fix(query): fix error in show cluster alive. 2023-03-14 21:25:52 +08:00
Benguang Zhao 9f97162ef7 enh: separate election timer events 2023-03-14 21:02:06 +08:00
Benguang Zhao e350f71396 enh: reset elect timer at the end of callbacks 2023-03-14 19:45:31 +08:00
Haojun Liao 32ddecc347 other: merge main. 2023-03-14 12:13:09 +08:00
Shengliang Guan 6d09532f10
Merge pull request #20396 from taosdata/fix/TD-23087
fix(query): remove assert
2023-03-14 09:36:31 +08:00
Shengliang Guan bf03965931
Merge pull request #20413 from taosdata/FIX/TD-22564-main
enh: not allow to propose if fsm applying progress lagging behind too far
2023-03-14 09:36:04 +08:00
Shengliang Guan 6989f1be61
Merge pull request #20418 from taosdata/fix/TD-22671
fix:deal with ASSERT in tmq
2023-03-14 09:34:52 +08:00
Shengliang Guan 65de91b0af
Merge pull request #20443 from taosdata/szhou/udfd-conn-version
fix: add version to udfd conn req
2023-03-14 09:33:16 +08:00
Haojun Liao 21ef5e5577 Merge branch 'main' into fix/liaohj 2023-03-14 09:19:49 +08:00
Ganlin Zhao c3b0245ff5 Merge branch 'main' into fix/TD-23087 2023-03-13 18:43:43 +08:00
slzhou 66f7b90110 fix: add version to udfd conn req 2023-03-13 18:16:44 +08:00
Haojun Liao 731a2138df fix(tmq): fix error in tmq. 2023-03-13 17:08:17 +08:00
wangmm0220 49b3649c55 fix:add log if sml value is too long 2023-03-13 16:54:23 +08:00
Shengliang Guan 041f03e918
Merge pull request #20414 from taosdata/feat/TD-23058
feat: correct slimit&limit clause
2023-03-12 20:48:16 +08:00
dapan1121 91df1b3298 fix: group merge issue 2023-03-12 15:04:53 +08:00
Haojun Liao 564e9bb833 Merge branch 'main' into fix/liaohj 2023-03-12 14:38:38 +08:00
dapan1121 f74c488c42 fix: keep group for interval query 2023-03-12 11:03:41 +08:00
slzhou 9df6609448 Merge branch '3.0' of github.com:taosdata/TDengine into szhou/python-udf 2023-03-12 09:41:09 +08:00
slzhou c8e05226ce fix: unknown error prompt 2023-03-12 09:40:49 +08:00
wangmm0220 5b75ee4396 opti:modify tmq logic 2023-03-11 19:13:50 +08:00
dapan1121 16209644c4 fix: regenerate groupId and case issue 2023-03-11 17:24:54 +08:00
Xiaoyu Wang a846c26ef9 merge main 2023-03-11 16:14:27 +08:00
wangmm0220 9cc7a9f504 fix:deal with ASSERT in tmq 2023-03-11 16:12:11 +08:00
dapan1121 bad898cd0c Merge remote-tracking branch 'origin/3.0' into feat/TD-22746 2023-03-11 15:06:03 +08:00
dapan1121 5df32cbc78 feat: correct slimit&limit clause 2023-03-11 13:08:20 +08:00
slzhou 26b3773740 fix: core dump when copy resut buf 2023-03-10 18:58:25 +08:00
Xiaoyu Wang 822bb11a26 fix: invalid topic query 2023-03-10 18:23:30 +08:00