Commit Graph

2996 Commits

Author SHA1 Message Date
Benguang Zhao 5d63f438b5 enh: confirm alter hash range 2023-05-04 19:43:11 +08:00
Haojun Liao 09a04052ec refactor: do some internal refactor. 2023-05-04 16:15:14 +08:00
liuyao 2984c5a758 merge main 2023-04-28 10:34:46 +08:00
kailixu f075652e18 chore: update grantsSchema to support connectors 2023-04-27 20:10:03 +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
Haojun Liao db1d75bb48 refactor: do some internal refactor. 2023-04-27 09:28:20 +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
Xiaoyu Wang 05dc0fd6b1
Merge pull request #21056 from taosdata/feat/TD-23693
feat: subtable level privilege
2023-04-26 09:17:23 +08:00
54liuyao 255af84139 resume option 2023-04-25 19:01:19 +08:00
dapan1121 f22d279f5f
Merge pull request #21057 from taosdata/feat/TD-19567
feat: support log slow query by default
2023-04-25 13:43:34 +08:00
dapan1121 b743b889fc
Merge pull request #20828 from taosdata/enh/TD-23421-M
enh: support user passwd version
2023-04-24 17:16:37 +08:00
Ganlin Zhao 782566ad08 refactor 2023-04-24 17:15:46 +08:00
liuyao eca7b68fa0 ignore update 2023-04-24 15:01:56 +08:00
Xiaoyu Wang dc5235eb92 feat: add pause/resume stream statement 2023-04-24 14:48:33 +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
Xiaoyu Wang 4bb7a25fc7 feat: subtable level privilege 2023-04-23 16:30:28 +08:00
dapan1121 5fe99c5ad2 feat: support log long query 2023-04-23 15:54:15 +08:00
54liuyao 5089528a02 feat:stream pause&resume 2023-04-23 15:08:51 +08:00
Haojun Liao 9cf89c6b6f enh(tmq): add check for consumer Id; 2023-04-23 11:51:43 +08:00
Ganlin Zhao c5b3737702 fix: forbid delete from system table 2023-04-23 11:21:01 +08:00
Xiaoyu Wang aba9a236c0 compiled sql.y 2023-04-23 11:20:34 +08:00
yihaoDeng 917b07348c Merge branch 'fix/rocksdbState' into enh/rocksRevert 2023-04-23 02:37:26 +00:00
Haojun Liao 3dbe208712 enh(tmq): fix memory error and add retrieve wal info as required. 2023-04-22 15:34:46 +08:00
dapan1121 f4d1ac4e93
Merge pull request #21007 from taosdata/feat/TS-3249
feat: support table_prefix/table_suffix new mode
2023-04-21 19:18:28 +08:00
Haojun Liao 3f432cca2e
Merge pull request #20970 from taosdata/fix/TS-3116
opti:escape logic in schemaless
2023-04-21 18:44:06 +08:00
chenhaoran 7d7a0769b3 Merge remote-tracking branch 'origin/main' into enh/tsbsPerf.1 2023-04-21 16:20:37 +08:00
kailixu 9e71b6d071 Merge branch '3.0' into enh/TD-23421-M 2023-04-21 16:04:13 +08:00
dapan1121 3c2fc48e74 feat: support new table_prefix/table_suffix mode 2023-04-21 14:17:07 +08:00
dm chen d594e4963f
Merge branch '3.0' into feat/learner 2023-04-20 19:11:06 +08:00
wangmm0220 5df7906a62 Merge branch '3.0' of https://github.com/taosdata/TDengine into enh/rocksRevert 2023-04-20 18:33:37 +08:00
Benguang Zhao a21e0fe75e enh: propose vnode commit synchronously 2023-04-20 14:28:56 +08:00
Haojun Liao c654f1145d enh(stream): add new msg for seek, and do some internal refactor. 2023-04-20 10:59:16 +08:00
Haojun Liao a69e2a8045 fix(os): fix the link error in unit test cases. 2023-04-19 15:33:02 +08:00
wangmm0220 5b3087e48b opti:escape logic in schemaless 2023-04-19 00:55:26 +08:00
cadem 3b78d4382b add learner 2023-04-18 19:03:45 +08:00
wangmm0220 1771a54256 fix:rebalance not only one in once timer 2023-04-17 19:59:11 +08:00
Haojun Liao 04e042f21d Merge branch 'feature/3_liaohj' into enh/rocksRevert 2023-04-15 09:35:43 +08:00
Haojun Liao 5850a3ab01 Merge remote-tracking branch 'origin/enh/rocksRevert' into enh/rocksRevert 2023-04-14 10:37:17 +08:00
Haojun Liao b57c813681 other: merge feature/3_liaohj 2023-04-14 10:36:54 +08:00
Haojun Liao 9597453631
Merge pull request #20925 from taosdata/fix/TS-3106-MAIN
add option enableScience on taos.cfg to show float and double scientific notation
2023-04-14 10:28:00 +08:00
Alex Duan a0be0c1d06 fix: add client option tsEnableScience 2023-04-13 16:40:38 +08:00
dapan1121 7f518ca4ea feat: support cache db cfg 2023-04-13 10:54:57 +08:00
kailixu ac841b02bf merge 3.0 2023-04-12 13:09:52 +08:00
liuyao 6a98d55c2f add ci test 2023-04-12 11:04:57 +08:00
Xiaoyu Wang 9578c4538a Merge remote-tracking branch 'origin/3.0' into fix/3.0_merge_main 2023-04-11 19:33:23 +08:00
yihaoDeng b24b91886a Merge branch 'dev3' into enh/rocksRevert 2023-04-11 10:59:00 +00:00
Xiaoyu Wang 5ce6220106
Merge pull request #20781 from taosdata/szhou/replace-function
feature: udf replace function
2023-04-11 17:25:21 +08:00
Xiaoyu Wang 4c04b155d5 merge main 2023-04-11 15:56:28 +08:00
dapan1121 28ea375fe1
Merge pull request #20850 from taosdata/enh/ts-3112
enh: add queryMaxConcurrentTables configuration
2023-04-11 11:21:30 +08:00
Xiaoyu Wang 416af9a58d feat: table level privilege 2023-04-11 10:11:25 +08:00
dapan1121 d2f9f2d755 Merge remote-tracking branch 'origin/main' into enh/ts-3112 2023-04-11 09:02:36 +08:00
dapan1121 38231fc48e enh: add queryMaxConcurrentTables configuration 2023-04-11 09:01:19 +08:00
kailixu 76386b9fad enh: assign passVer during taos_connect 2023-04-10 13:07:18 +08:00
Xiaoyu Wang e2f82f4423 merge main 2023-04-10 09:56:03 +08:00
kailixu e689356c65 chore: more code 2023-04-09 19:01:51 +08:00
kailixu ec8cd0c6b8 enh: support passwd version 2023-04-09 18:44:46 +08:00
shenglian zhou 32523d72f9 fix: add created time to file name and keep file reuse 2023-04-08 10:11:57 +08:00
liuyao 0716a4aee8 feat:add check point 2023-04-06 16:45:22 +08:00
Xiaoyu Wang 54f13f6f55
Merge pull request #20756 from taosdata/fix/3.0_merge_main
merge main
2023-04-06 15:44:23 +08:00
shenglian-zhou 3d8776e266
Merge branch '3.0' into szhou/replace-function 2023-04-06 13:40:52 +08:00
Xiaoyu Wang a971d1a997
Merge pull request #20770 from taosdata/enh/3.0_planner_optimize
feat: add 'or replace' clause to 'create function' statement
2023-04-06 13:09:56 +08:00
Haojun Liao 2b2059ef18
Merge pull request #20534 from taosdata/fix/TD-22671
fix:error in TD-23218 & remove useless logic
2023-04-06 11:47:24 +08:00
shenglian zhou 47719b1028 Merge branch '2.0' of github.com:taosdata/TDengine into szhou/replace-function 2023-04-06 11:19:10 +08:00
Xiaoyu Wang c134432c45 merge main 2023-04-06 09:31:45 +08:00
Xiaoyu Wang 9b2a94f281 fix: column comment is not supported 2023-04-04 18:04:10 +08:00
Xiaoyu Wang cc7485812a feat: add 'or replace' clause to 'create function' statement 2023-04-04 17:45:18 +08:00
Xiaoyu Wang 6825b196ef feat: table level write privilege check 2023-04-04 17:19:18 +08:00
54liuyao 1892b806b5 feat:add stream state buff 2023-04-04 17:09:35 +08:00
54liuyao 429b5cd646 feat:add stream file state 2023-04-04 17:09:35 +08:00
Xiaoyu Wang e9d7a099cc merge main 2023-04-04 14:50:58 +08:00
Ganlin Zhao 23ec9287c9 fix: fix tsim crash on windows due to invalid input to strftime 2023-04-04 10:33:41 +08:00
wangmm0220 97b5c7abee fix:merge from main 2023-03-31 16:20:21 +08:00
cademfly 3ae4996458 remove all handle 2023-03-30 16:17:51 +08:00
shenglian zhou 23d4eef114 feat: startup of replace function when no active query 2023-03-30 11:46:40 +08:00
Xiaoyu Wang 6265251a03 feat: table level privilege syntax 2023-03-29 19:08:40 +08:00
wangmm0220 2243184a4d fix:conflicts 2023-03-29 17:53:05 +08:00
dapan1121 9952be43f6 Merge remote-tracking branch 'origin/main' into fix/cencVer 2023-03-29 15:50:14 +08:00
cademfly 2fd10c2aa0 table 2023-03-29 13:30:32 +08:00
dapan1121 0659814d16
Merge pull request #20674 from taosdata/fix/TS-3010
fix: query schema is old issue
2023-03-29 11:41:07 +08:00
dapan1121 0327a8eaa3 fix: block rows number type 2023-03-29 10:46:56 +08:00
cademfly 28584839ea change msg number 2023-03-28 20:19:01 +08:00
cademfly 4d04f0f44d add stb msg 2023-03-28 20:14:50 +08:00
Xiaoyu Wang daaf4871ac feat: table level privilege syntax 2023-03-28 18:43:58 +08:00
Benguang Zhao ae8d87643f Merge branch 'main' into FIX/TD-22975-main 2023-03-28 18:00:51 +08:00
dapan1121 22ad3129b9 fix: query schema is old issue 2023-03-28 15:21:47 +08:00
cadem 57d7ee29f3 fix/change msg order 2023-03-24 09:17:46 +08:00
cadem 86ca5ce210 fix/trigger election by sync msg 2023-03-24 09:13:20 +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
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
wangmm0220 dd4cf0597b fix:error in optimize consume logic 2023-03-22 17:04:02 +08:00
dapan1121 5b02af6a91 fix: merge main to 3.0 2023-03-22 16:08:16 +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
cadem ea35f0ae11 feat/balance vgroup leader 2023-03-22 09:36:59 +08:00
Xiaoyu Wang 58ebd3539d feat: alter database wal_retention_period/wal_retention_size 2023-03-21 16:45:19 +08:00
wangmm0220 a5144f0ba2 fix:set offset if read wal none 2023-03-20 10:10:07 +08:00
wangmm0220 55fb48b699 fix:error in TD-23218 & remove useless logic 2023-03-18 18:48:50 +08:00
wangmm0220 ccba1d07c6 fix:error in TD-23218 & remove useless logic 2023-03-18 18:42:49 +08:00
wangmm0220 7616a283e3 fix:error in TD-23218 & remove useless logic 2023-03-18 18:23:38 +08:00
Benguang Zhao 9f97162ef7 enh: separate election timer events 2023-03-14 21:02:06 +08:00
Benguang Zhao cc76d78673 enh: separate sync read and write events 2023-03-14 20:35:39 +08:00
Haojun Liao 32ddecc347 other: merge main. 2023-03-14 12:13:09 +08:00
Xiaoyu Wang ca39dfcf2d feat: show vgroup display num of cache tables 2023-03-13 17:21:32 +08:00
Haojun Liao 731a2138df fix(tmq): fix error in tmq. 2023-03-13 17:08:17 +08:00
Xiaoyu Wang 62377619ba enh: optimizing stt file reading in last query 2023-03-13 15:05:24 +08:00
Haojun Liao 564e9bb833 Merge branch 'main' into fix/liaohj 2023-03-12 14:38:38 +08:00
Xiaoyu Wang a846c26ef9 merge main 2023-03-11 16:14:27 +08:00
Haojun Liao 9e860f02ac refactor: do some internal refactor. 2023-03-11 11:25:37 +08:00
Xiaoyu Wang 77cd3e82fb Merge branch 'feat/TS-2846' of github.com:taosdata/TDengine into feat/TS-2846 2023-03-09 16:04:59 +08:00
Xiaoyu Wang e5de317f44 feat: alter database stt_trigger/minrows 2023-03-09 16:04:38 +08:00
Hongze Cheng 8ecfaa5a7c refact 2023-03-09 15:42:09 +08:00
Hongze Cheng 16262512b2 feat: alter stt_trigger and minrows 2023-03-09 15:25:47 +08:00
Xiaoyu Wang 66bb55187d Merge remote-tracking branch 'origin/main' into fix/3.0_merge_main 2023-03-08 18:30:24 +08:00
Shengliang Guan c4d2718296
Merge pull request #20332 from taosdata/fix/main_bugfix_wxy
fix: check the compatibility of client version and server version
2023-03-08 17:40:23 +08:00
Xiaoyu Wang 9be3e20276 fix: check the compatibility of client version and server version 2023-03-08 15:13:11 +08:00
Xiaoyu Wang 4c8bab7e58 merge main 2023-03-08 10:59:33 +08:00
Hongze Cheng 89281ee488 compact with time range 2023-03-07 21:46:34 +08:00
Xiaoyu Wang df0d200f59 feat: the compact command adds 'start with end with' clause 2023-03-07 15:24:04 +08:00
Haojun Liao caeb976dfe Merge branch 'main' into feature/3_liaohj 2023-03-05 19:09:37 +08:00
yihaoDeng e6ec795b4d fix debug info 2023-03-05 11:36:01 +08:00
Xiaoyu Wang 599967d39f feat: add language clause for create function 2023-03-04 11:08:50 +08:00
Shengliang Guan 2a272fb68d
Merge pull request #20263 from taosdata/FIX/TS-2766-main
enh: sync log retention of mnode configurable with mndLogRetention
2023-03-04 10:49:37 +08:00
Benguang Zhao b91734cf91 enh: sync log retention of mnode configurable with mndLogRetention 2023-03-04 09:51:34 +08:00
Shengliang Guan 50955b2e50
Merge pull request #20261 from taosdata/FIX/TS-2766-main
enh: control frequency of mnode sdb flushing with mndSdbWriteDelta
2023-03-03 18:22:30 +08:00
Benguang Zhao d27f392beb enh: control frequency of mnode sdb flushing with mndSdbWriteDelta 2023-03-03 17:30:23 +08:00
dapan1121 2a5074870d fix: add missing db options in show create database result 2023-03-02 11:33:29 +08:00
Haojun Liao b3ae58dac1
Merge pull request #20205 from taosdata/feat/TD-22831
feat:window close && ignore expired
2023-02-28 19:23:07 +08:00
54liuyao fe4123e814 feat:window close && ignore expired 2023-02-28 18:20:58 +08:00
wangmm0220 986ae9c4d0 fix:conflicts 2023-02-28 15:11:16 +08:00
Xiaoyu Wang d4e32cc8f1
Merge pull request #20180 from taosdata/fix/3.0_merge_main
merge 3.0
2023-02-27 17:08:44 +08:00
Haojun Liao 41c5ba29b6
Merge pull request #20154 from taosdata/fix/toManySeesion
fix: to many seesion
2023-02-27 16:58:57 +08:00
Xiaoyu Wang efa56d5352 merge main 2023-02-27 14:18:03 +08:00
Xiaoyu Wang f97a140a3c merge 3.0 2023-02-27 14:16:33 +08:00
wangmm0220 c638564179 fix:confilcts from main 2023-02-26 23:09:57 +08:00
dapan1121 cb2f09ed6c
Merge pull request #20139 from taosdata/fix/TD-22664-3.0
fix: fix coverity issue
2023-02-26 10:04:46 +08:00
Yihao Deng db47cb5805
Merge branch 'main' into fix/toManySeesion 2023-02-25 17:04:56 +08:00
Haojun Liao 0369ff2231 other: merge main. 2023-02-25 15:42:32 +08:00
Haojun Liao 514369c611 other: merge main 2023-02-25 11:06:13 +08:00
Haojun Liao d6fca036e5 refactor: do some internal refactor. 2023-02-25 11:02:42 +08:00
Xiaoyu Wang d6dd087f84 merge main 2023-02-25 10:29:20 +08:00
yihaoDeng 84706fe586 fix: limit session num 2023-02-24 21:20:15 +08:00
wangmm0220 54a546931c fix:optimize version logic in tmq and remove useless code 2023-02-24 19:22:08 +08:00
Ganlin Zhao 9342d796f0 Merge branch '3.0' into fix/TD-22664-3.0 2023-02-24 18:30:04 +08:00
dapan1121 2f816dc01f
Merge pull request #20119 from taosdata/fix/TS-2725
fix: alter column length too big issue
2023-02-24 17:33:37 +08:00
Xiaoyu Wang 961107d1ca merge main 2023-02-24 16:55:50 +08:00
Xiaoyu Wang 62936f22fd
Merge pull request #20118 from taosdata/enh/3.0_planner_optimize
fix: create index error
2023-02-24 16:48:37 +08:00
dapan1121 f6827c3f06 fix: systable header file compile issue 2023-02-24 13:53:48 +08:00
Ganlin Zhao 49fc02c52e fix coverity issue 2023-02-24 10:08:53 +08:00
Xiaoyu Wang 1ab144609e merge main 2023-02-23 14:58:22 +08:00
yihaoDeng e8527ee9de fix: fix invalid dist count 2023-02-23 14:46:34 +08:00
Xiaoyu Wang f67547d59f fix: create index error 2023-02-23 14:04:07 +08:00
Haojun Liao 4432ae51e6
Merge branch 'main' into fix/liaohj 2023-02-23 09:04:32 +08:00
Haojun Liao 6216ee815f
Merge pull request #20088 from taosdata/feat/TD-22418
feat:stream coverity scan
2023-02-23 09:03:09 +08:00
Hongze Cheng 81ee050a0f fix: coverity scan problem 2023-02-22 14:29:14 +08:00
54liuyao 1d58f85a54 feat:coverity scan 2023-02-22 10:10:04 +08:00
Haojun Liao 0c9145645b Merge branch 'main' into feature/3_liaohj 2023-02-22 08:53:23 +08:00
Haojun Liao 37fea8cf3d fix(tmq): update the epset when the leader of vnode changed. 2023-02-21 23:04:58 +08:00
Haojun Liao 9a5b7ce220 refactor: do some internal refactor. 2023-02-21 15:32:17 +08:00
yihaoDeng 2d85d0191c fix: add vgroup count 2023-02-21 14:40:10 +08:00
Xiaoyu Wang 319dfd8f06 merge 3.0 2023-02-20 17:21:37 +08:00
Haojun Liao ad0be66a78
Merge pull request #19935 from taosdata/enh/dynamicIdx
feat:  change  index dynamicly
2023-02-20 15:48:49 +08:00
Xiaoyu Wang c597de099f merge main 2023-02-20 13:41:27 +08:00
Haojun Liao 0a9f8347cc fix(query):suppress the syntax error in internal. 2023-02-20 10:51:04 +08:00
Haojun Liao bab9d273f9 refactor:do some internal refactor. 2023-02-20 10:14:25 +08:00
Haojun Liao 93f13b27f5 refactor:do some internal refactor. 2023-02-20 10:10:40 +08:00
Haojun Liao 8d187efc18 refactor:do some internal refactor. 2023-02-20 10:04:08 +08:00
yihaoDeng 098949b528 add trans param 2023-02-19 18:10:42 +08:00
Haojun Liao 0d9d2ea293 fix(query): do some internal refactor, and fix the bug when calender time duration exists in sliding and offset. 2023-02-17 18:31:32 +08:00
Xiaoyu Wang b7f4b93d22 merge 3.0 2023-02-17 09:23:41 +08:00
Xiaoyu Wang dc984d92f7 feat: compatible with older versions of wal 2023-02-17 09:21:07 +08:00
54liuyao 43966abbc6 feat:add disable stream option 2023-02-15 18:39:05 +08:00
Hongze Cheng c1a3a0855b finish code 2023-02-15 17:59:54 +08:00
yihaoDeng df296c15f7 opt: opt tag index 2023-02-14 17:31:10 +08:00
Haojun Liao c9ce01c878 Merge branch 'main' into feature/3_liaohj 2023-02-13 17:09:27 +08:00
Yihao Deng 5af1faf916
Merge branch '3.0' into enh/dynamicIdx 2023-02-13 13:36:06 +08:00
yihaoDeng a929aa22d8 merge 3.0 2023-02-12 10:48:18 +08:00
Haojun Liao a7fdc4bae3 other: merge 3.0 2023-02-10 19:20:24 +08:00
Xiaoyu Wang 3382a24a69 merge main 2023-02-10 18:03:11 +08:00
Haojun Liao 72287a3b5f fix(query): set correct tag value during tag filter and do some internal refactor. 2023-02-10 16:03:11 +08:00
Xiaoyu Wang b2e60da1cf merge main 2023-02-10 10:34:55 +08:00
Xiaoyu Wang fcff07675d merge main 2023-02-09 11:29:38 +08:00
Xiaoyu Wang 9bc225ffda merge 3.0 2023-02-09 09:44:29 +08:00
Liu Jicong ae4ad7d851 Merge branch 'main' into enh/stream_buffer_param 2023-02-08 16:09:35 +08:00
Xiaoyu Wang 09925437e3 merge main 2023-02-08 09:51:52 +08:00
Xiaoyu Wang a52371959e feat: add ignore update option for create stream 2023-02-07 19:31:08 +08:00
dapan1121 19508d118f
Merge pull request #19817 from taosdata/feat/TS-2502
feat: support force fill in interval clause
2023-02-07 17:00:01 +08:00
Xiaoyu Wang f2ff17dace merge 3.0 2023-02-06 14:18:13 +08:00
yihaoDeng f19d64e04b opt drop index 2023-02-04 13:50:21 +08:00
yihaoDeng db61fbb6a2 opt index 2023-02-04 12:52:02 +08:00
dapan1121 ef89a31e8f feat: force fill function 2023-02-03 15:37:04 +08:00
yihaoDeng 383bcea0cb fix err log 2023-02-03 14:17:36 +08:00
dapan1121 d88f1efeb1 feat: support force fill clause 2023-02-02 17:16:30 +08:00
Haojun Liao ab8c977417 other: merge main. 2023-02-02 14:00:36 +08:00
Haojun Liao 6a5ce7d663 refactor: opt tag filter perf. 2023-02-02 10:11:36 +08:00
Shengliang Guan 2a8d791e39 Merge remote-tracking branch 'origin/3.0' into enh/TD-18702 2023-01-31 16:31:26 +08:00
Hongze Cheng 11bc53bbd7 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/vnode_compact 2023-01-31 14:07:58 +08:00
Shengliang Guan 8bc0d4ba74 enh: add alter vnode hashrange request 2023-01-30 16:33:17 +08:00
Hongze Cheng dcd0ade349 fix double free problem 2023-01-30 14:24:00 +08:00
Shengliang Guan 03dc6e55b5 enh: add disable vnode write request 2023-01-30 13:54:15 +08:00