Commit Graph

4200 Commits

Author SHA1 Message Date
yihaoDeng 986a502019 refactor stream backend 2023-10-23 18:22:58 +08:00
yihaoDeng ca1ffd584d refactor stream backend 2023-10-23 16:45:17 +08:00
yihaoDeng 9d210ec957 refactor stream backend 2023-10-23 14:06:25 +08:00
dapan1121 ab98f7623c Merge remote-tracking branch 'origin/3.0' into feat/TD-25204 2023-10-23 08:44:46 +08:00
Haojun Liao a882c639be fix(stream): remove invalid assert. 2023-10-22 16:16:59 +08:00
Haojun Liao 825195b351 refactor: do some internal refactor. 2023-10-21 16:38:46 +08:00
Haojun Liao 74572dd6a7 refactor: do some internal refactor. 2023-10-21 15:21:02 +08:00
Haojun Liao 49014d4b68 fix(stream): update the nodeEp even during checkpoint trans. 2023-10-21 01:42:43 +08:00
yihaoDeng 1a4cfd11a5 Merge branch 'enh/new3.0' into enh/refactorBackend 2023-10-20 15:28:10 +08:00
yihaoDeng 1bc7e5eb85 enh gen first tag name 2023-10-20 14:02:13 +08:00
yihaoDeng e13fb887b8 enh gen first tag name 2023-10-20 10:47:27 +08:00
yihaoDeng e89d1851c8 enh gen first tag name 2023-10-20 10:47:02 +08:00
yihaoDeng 6f21d542cd enh gen first tag name 2023-10-20 10:46:17 +08:00
yihaoDeng f9a027bc7d enh gen first tag name 2023-10-20 10:45:57 +08:00
yihaoDeng c0c6e206d2 enh gen first tag name 2023-10-20 10:44:33 +08:00
yihaoDeng 08fc4814cb enh gen first tag name 2023-10-20 10:43:44 +08:00
yihaoDeng 9f6dd2b405 change gen first tag name 2023-10-20 09:42:11 +08:00
yihaoDeng 8fbea08bba enh gen first tag name 2023-10-20 09:37:43 +08:00
dapan1121 42f440b0fb Merge remote-tracking branch 'origin/3.0' into feat/TD-25204 2023-10-20 08:46:32 +08:00
dapan1121 969b002936 enh: support view privilege 2023-10-20 08:41:49 +08:00
Haojun Liao d5059826a8 fix(stream): fix bugs caused by refactor. 2023-10-19 17:59:04 +08:00
Haojun Liao c1cebae6ba fix(stream): fix error in stream. 2023-10-19 16:20:27 +08:00
yihaoDeng 67dc52d2d6 refactor stream checkpoint 2023-10-19 15:19:52 +08:00
Haojun Liao 402aefd95d refactor(stream): do some internal refactor. 2023-10-19 15:09:47 +08:00
Benguang Zhao 083dd148be feat: exchange difference of snapshot info for replication 2023-10-19 10:37:34 +08:00
dapan1121 afe963a9d1 enh: support view privilege 2023-10-19 08:31:31 +08:00
Haojun Liao c6dd73b68b
Merge pull request #23187 from taosdata/feat/TD-26056
feat:add replay logic
2023-10-18 11:43:43 +08:00
kailixu 29c6daaff5 fix: trans mutex init 2023-10-17 11:12:52 +08:00
kailixu a30eedafec fix: trans mutex init 2023-10-17 11:06:06 +08:00
Haojun Liao 531f478ade refactor: do some internal refactor W.R.T. global configurations. 2023-10-17 08:17:49 +08:00
kailixu 38c1f7d48d fix: add lock for trans 2023-10-16 20:20:04 +08:00
dapan1121 cdda43cd67 Merge remote-tracking branch 'origin/3.0' into feat/TD-25204 2023-10-16 19:54:21 +08:00
wangmm0220 473142fab7 fix:conflicts from 3.0 2023-10-16 11:35:56 +08:00
Haojun Liao 67bee17e5e other: merge main. 2023-10-16 09:55:41 +08:00
Haojun Liao f90cf54714 fix(stream): fix error in creating update node trans. 2023-10-15 21:56:49 +08:00
Haojun Liao 6611f216ac enh(stream): add some logs. 2023-10-13 19:45:29 +08:00
dapan1121 a0699d758c Merge remote-tracking branch 'origin/3.0' into feat/TD-25204 2023-10-13 16:51:38 +08:00
dapan1121 c0a4328803 feat: support view meta updating 2023-10-13 16:29:34 +08:00
Haojun Liao 33d9f772be other: merge 3.0 2023-10-13 09:06:13 +08:00
Haojun Liao 84c5359d5b other: merge 3.0 2023-10-13 08:58:26 +08:00
Alex Duan 35fced8796
Merge pull request #23234 from taosdata/main_3_merge
other: merge main into 3.0
2023-10-12 07:48:20 -05:00
dapan1121 7c67f23469 feat: update view meta 2023-10-12 19:56:17 +08:00
Haojun Liao eb4449999f other: merge 3.0 2023-10-12 10:33:48 +08:00
dmchen c1e22eff1a fix/pr-23223-ci-core 2023-10-11 10:25:28 +00:00
Haojun Liao 5f9b858fc1 other: merge main. 2023-10-10 15:38:46 +08:00
Haojun Liao 21fb502690 enh(stream): add trans to reset task status to avoid being frozen in checkpoint status due to doing checkpoint failure of partial tasks. 2023-10-09 20:10:26 +08:00
Haojun Liao af2c0c95e9 refactor: do some internal refactor. 2023-10-09 20:10:22 +08:00
Haojun Liao 9d5a3b8d78 other: merge stream fix. 2023-10-09 20:10:13 +08:00
Haojun Liao 11d8c8da39 fix(stream): update the sink data. 2023-10-09 20:09:23 +08:00
Haojun Liao f0c5b5a970 refactor(stream): revised the display info. 2023-10-09 20:09:22 +08:00
Haojun Liao 28008f8263 enh(stream): add more info for sink task. 2023-10-09 20:09:22 +08:00
Haojun Liao 932d93ab35 refactor: wait for more time for future data 2023-10-09 20:09:21 +08:00
Haojun Liao 0ab5d4b342 refactor: do some internal refactor. 2023-10-09 20:09:20 +08:00
Haojun Liao c295ec322a refactor: do some internal refactor. 2023-10-09 20:09:20 +08:00
Haojun Liao 583ac1fc45 refactor: do some internal refactor. 2023-10-09 20:09:20 +08:00
Haojun Liao 19042cdea6 fix(stream): fix invalid param. 2023-10-09 20:09:19 +08:00
Haojun Liao f9113ab7b0 fix(stream): fix invalid param. 2023-10-09 20:09:11 +08:00
Haojun Liao bb4ba54f28 fix(stream): enable new time range for stream task. 2023-10-09 20:09:09 +08:00
Haojun Liao c759d90bf6 enh(stream): optimize the stream status when creating without fill-history option. 2023-10-09 20:09:09 +08:00
Haojun Liao dfe8641c0c refactor: optimize the fill-history task launch policy, and do some other internal refactor. 2023-10-09 20:08:52 +08:00
Haojun Liao 65f66f0986 fix(stream): transfer state when all downstream rsp already. 2023-10-09 20:08:11 +08:00
Haojun Liao 4fe1382cd9 fix(stream): adjust nodeUpdate check interval. 2023-10-09 20:08:09 +08:00
Haojun Liao 498519c94d fix(stream): remove invalid node. 2023-10-09 20:08:02 +08:00
Haojun Liao 124e1ed1ab enh(stream): add stage info for streamt tasks. 2023-10-09 20:08:02 +08:00
Haojun Liao a3d13d6634 fix(stream): remove invalid cached task info in buffer. 2023-10-09 20:07:08 +08:00
Haojun Liao 1f45bd82d2 other: merge stream fix in main. 2023-10-09 20:07:01 +08:00
Haojun Liao 53237c34d1 enh(stream): add info in log. 2023-10-09 20:06:09 +08:00
Haojun Liao e27111ecd1 enh(stream): add node stage check. 2023-10-09 20:06:09 +08:00
Haojun Liao ff3ea366e2 fix(stream): keep the status entry in hash table, instead entry index. 2023-10-09 20:06:05 +08:00
Haojun Liao 38bf2d24e7 fix(stream): remove stream in buf. 2023-10-09 20:05:39 +08:00
Haojun Liao 57bf1cadc4 fix(stream): fix error in decode stream task. 2023-10-09 20:05:37 +08:00
Haojun Liao 0459a4628c fix(stream): fix stream task id error. 2023-10-09 20:05:36 +08:00
Haojun Liao 5f1146d415 fix(stream): fix memory leak. 2023-10-09 20:04:17 +08:00
Haojun Liao 1256eafddb other: merge stream fix. 2023-10-09 19:59:24 +08:00
Haojun Liao be09c173ab fix:fix coverity issue and remove unnecessary files. 2023-10-09 19:56:17 +08:00
wangmm0220 3e2e924e98 feat:[TD-26056] add replay logic 2023-10-09 18:36:39 +08:00
dapan1121 d229492616 Merge remote-tracking branch 'origin/3.0' into feat/TD-25204 2023-10-09 18:34:08 +08:00
dapan1121 6c8db261f3 feat: support show views command 2023-10-09 17:19:36 +08:00
kailixu 5dd277248e fix: alter active code for different server 2023-10-09 17:16:56 +08:00
Haojun Liao ee6516f3c4 enh(stream): add trans to reset task status to avoid being frozen in checkpoint status due to doing checkpoint failure of partial tasks. 2023-10-09 10:13:53 +08:00
dapan1121 5b639a172d feat: support query from view 2023-10-08 18:36:06 +08:00
Shungang Li a7507d26b0 feat: alter local/dnode asynclog 2023-10-08 18:26:25 +08:00
wangmm0220 b04d57fcc3 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/TD-26056 2023-10-08 16:15:19 +08:00
wangmm0220 3f2d890560 feat:[TD-26056] add replay logic 2023-10-08 16:06:15 +08:00
dapan1121 9b207b9b3e
Merge pull request #23133 from taosdata/fix/TD-26474-3.0
fix: mutex init for trans
2023-10-08 15:07:47 +08:00
wade zhang a9db1ed8e0
Merge pull request #23116 from taosdata/fix/TD-26539
fix(keep0-duration): force keep0 at least thrice of duration
2023-10-08 13:07:05 +08:00
kailixu a2e3109447 chore: add grant method for community 2023-10-08 09:47:57 +08:00
Haojun Liao ab17bfdf09 refactor: do some internal refactor. 2023-10-07 19:16:55 +08:00
dapan1121 deb9a6875b feat: mnode processing view meta request 2023-10-07 10:40:00 +08:00
Haojun Liao 115a284ac0 enh(stream): update the checkpoint interval 2023-10-07 09:56:03 +08:00
Haojun Liao f542a8c786 fix(stream): update the sink data. 2023-10-07 09:22:25 +08:00
Haojun Liao 798f559b62 refactor(stream): revised the display info. 2023-10-07 09:04:38 +08:00
Haojun Liao c20dd002fb enh(stream): add more info for sink task. 2023-10-07 01:14:00 +08:00
kailixu c339f3552a fix: mutex init for trans 2023-10-05 09:19:44 +08:00
Haojun Liao 132fb8e82e refactor: wait for more time for future data 2023-10-03 15:42:00 +08:00
Haojun Liao 58f410a9df refactor: do some internal refactor. 2023-10-03 02:37:52 +08:00
Haojun Liao a543f4ca97 refactor: do some internal refactor. 2023-10-03 01:52:03 +08:00
kailixu 53c4c56206 chore: code optimization 2023-10-02 09:23:51 +08:00
Haojun Liao 5718158fc0 refactor: do some internal refactor. 2023-10-01 22:27:29 +08:00
kailixu a19efd266e chore: more code 2023-10-01 21:55:17 +08:00
kailixu 5067eb8cc5 chore: more code for check active code 2023-09-30 16:00:14 +08:00
kailixu e677e41573 fix: support check and merge activeCode 2023-09-30 12:29:44 +08:00
Haojun Liao f3275f76e8 fix(stream): fix invalid param. 2023-09-28 23:31:07 +08:00
Haojun Liao c14873401f fix(stream): fix invalid param. 2023-09-28 23:26:46 +08:00
Haojun Liao f2d8431619 fix(stream): enable new time range for stream task. 2023-09-28 18:26:52 +08:00
Haojun Liao 0047d1e1a6 Merge branch 'main' into fix/liaohj 2023-09-28 14:35:14 +08:00
dapan1121 0a0f512023 feat: add view meta processing 2023-09-28 11:44:38 +08:00
Haojun Liao 80ec77cbb6 enh(stream): optimize the stream status when creating without fill-history option. 2023-09-28 11:23:03 +08:00
wade zhang 10ad4600e4
Merge pull request #23104 from taosdata/fix/TD-26527
fix/TD-26527: alter database keep_time_offset can't changed
2023-09-28 09:33:00 +08:00
Haojun Liao cc9b9d1054
Merge pull request #23102 from taosdata/fix/liaohj
fix(stream): fix several bugs and do some internal refactor for stream processing.
2023-09-28 09:12:39 +08:00
yihaoDeng 5a684f2a26 fix invalid read 2023-09-27 22:32:54 +08:00
Shungang Li 63ce2f6f2f fix: alter database keep_time_offset can't changed 2023-09-27 19:04:01 +08:00
yihaoDeng 28dbe36b91 fix ip white for all users 2023-09-27 16:41:29 +08:00
yihaoDeng 62e1d4cb65 fix ip white for all users 2023-09-27 16:10:02 +08:00
yihaoDeng d0e1aec270 fix ip white for all users 2023-09-27 16:08:09 +08:00
yihaoDeng 48be800639 fix ip white for all users 2023-09-27 15:46:25 +08:00
Haojun Liao e13efd5b04 refactor: optimize the fill-history task launch policy, and do some other internal refactor. 2023-09-27 14:00:48 +08:00
dmchen a4c1611755 TD-26432 2023-09-26 11:06:44 +00:00
yihaoDeng 3b885f4faf fix ip white list 2023-09-26 17:04:25 +08:00
wade zhang f6134b42d7
Merge pull request #23036 from taosdata/feat/TS-4011-3.0
feat/TS-4011: adjust config 'keep_time_offset' level from dnode to db
2023-09-26 14:25:54 +08:00
Haojun Liao d5621b52d7
Merge pull request #23053 from taosdata/fix/26475
Fix/26475
2023-09-26 13:42:53 +08:00
yihaoDeng b134365d08 Merge branch '3.0' of https://github.com/taosdata/TDengine into 3.0 2023-09-25 18:40:10 +08:00
yihaoDeng 40a3c778f0 disable ip on community 2023-09-25 18:39:49 +08:00
Haojun Liao c9576d7a85 fix(stream): transfer state when all downstream rsp already. 2023-09-25 17:31:38 +08:00
kailixu 68fb1b296f chore: code refactor 2023-09-25 16:16:12 +08:00
kailixu b0b4d782fc chore: code refactor 2023-09-25 15:57:54 +08:00
Shungang Li 8f0d700fe8 feat: rm dnode config item keepTimeOffset 2023-09-25 15:46:12 +08:00
Shungang Li 743a5b0640 feat: add db config item keep_time_offset 2023-09-25 15:46:08 +08:00
kailixu f689ef8fe4 chore: make jenkins happy 2023-09-25 15:41:23 +08:00
kailixu 3083189f4d grant: enable update cluster info 2023-09-25 12:35:18 +08:00
Haojun Liao dbc53069db
Merge branch 'main' into fix/liaohj 2023-09-25 10:41:18 +08:00
Haojun Liao 1af95969b2 fix(stream): adjust nodeUpdate check interval. 2023-09-25 10:40:30 +08:00
kailixu c69b9e0197 chore: make jenkins happy 2023-09-24 09:45:19 +08:00
kailixu e50b8a3a0d chore: make jenkins happy for community 2023-09-24 08:48:14 +08:00
kailixu ff3e36e679 enh: timeseries calculation 2023-09-24 08:41:45 +08:00
kailixu 53a9459c20 enh: update timeseries 2023-09-24 07:52:27 +08:00
kailixu bc8ebf1562 Merge branch '3.0' into enh/TS-3812-3.0 2023-09-23 18:19:08 +08:00
kailixu a4b92760f0 enh: grant notify optimize 2023-09-23 18:10:08 +08:00
kailixu 8f828e052b enh: timeseries calculation optimization 2023-09-22 20:07:51 +08:00
Haojun Liao 7e4410f094
Merge pull request #22992 from taosdata/feat/TD-26052
feat:support vnode split in tmq
2023-09-22 13:57:21 +08:00
Haojun Liao 7380151322 fix(stream): remove invalid node. 2023-09-22 11:45:46 +08:00
Haojun Liao 198e6bb023 enh(stream): add stage info for streamt tasks. 2023-09-22 10:36:15 +08:00
kailixu 3beb9c5c84 Merge branch '3.0' into enh/TS-3812-3.0 2023-09-21 19:38:27 +08:00
dapan1121 a67b0c99fc feat: support create/drop view 2023-09-21 19:28:07 +08:00
Cary Xu 1bbb812557
Merge branch '3.0' into enh/TS-3934-3.0 2023-09-21 17:32:51 +08:00
dapan1121 64da3f4ef9
Merge pull request #22978 from taosdata/szhou/show-db-table
enhance: show normal/child tables and show user/system databases
2023-09-21 16:55:26 +08:00
kailixu 7445b9ff50 Merge branch '3.0' into enh/TS-3812-3.0 2023-09-21 16:25:06 +08:00
kailixu e7dd0caeb9 Merge branch '3.0' into enh/TS-3934-3.0 2023-09-21 10:21:45 +08:00
wangmm0220 ce2fc8b319 fix:memory leak 2023-09-21 10:05:52 +08:00
kailixu 2b25982495 enh: user dropped notification 2023-09-21 09:53:45 +08:00
wangmm0220 f9c5aa01af fix:enable split if there are topics & fix memory leak 2023-09-21 09:20:34 +08:00
dapan1121 cc08a5ee87 fix: add query sql 2023-09-20 19:30:40 +08:00
Haojun Liao 92f18989df fix(stream): remove invalid cached task info in buffer. 2023-09-20 19:19:04 +08:00
wangmm0220 d3f54e678f feat:support vnode split in tmq 2023-09-20 18:27:43 +08:00
Haojun Liao 6633fb971b fix(stream): update logs. 2023-09-20 18:18:31 +08:00
dapan1121 6b87d97989 feat: support view in mnode 2023-09-20 15:01:03 +08:00
Haojun Liao 5e3a268b6d enh(stream): add info in log. 2023-09-20 13:15:50 +08:00
dm chen 4497a01168
Merge branch 'main' into feat/TD-26127-audit-sql 2023-09-20 11:13:34 +08:00
Haojun Liao b4419bda65 enh(stream): add node stage check. 2023-09-20 10:35:01 +08:00
Haojun Liao 779c0c5f19
Merge pull request #22970 from taosdata/fix/liaohj
fix(stream): keep the status entry in hash table, instead entry index.
2023-09-20 10:33:05 +08:00
slzhou ef1e91a6be Merge branch '3.0' of github.com:taosdata/TDengine into szhou/continue-coing 2023-09-20 08:44:15 +08:00
wangmm0220 2881a2504c fix:conflicts from 3.0 2023-09-19 18:39:40 +08:00
dmchen dbde1a4491 ci break 2023-09-19 14:40:48 +08:00
dm chen ee913cbfbc
Merge branch 'main' into feat/TD-26127-audit-sql 2023-09-19 14:39:20 +08:00
dapan1121 b9d554275c Merge remote-tracking branch 'origin/3.0' into feat/TD-25204 2023-09-19 14:21:00 +08:00
dapan1121 14e8db289d feat: support view 2023-09-19 14:19:54 +08:00
shenglian zhou a072fb6a2c Merge branch '2.0' of github.com:taosdata/TDengine into szhou/continue-coing 2023-09-19 14:03:16 +08:00
dmchen e36ff1282c revert dependency 2023-09-19 13:42:02 +08:00
wangmm0220 ad70dc178f fix:conflicts from 3.0 2023-09-19 11:56:52 +08:00
wangmm0220 edb42aa2aa fix:move from main to 3.0 2023-09-19 11:51:52 +08:00
Haojun Liao 1cfd34a6a9
Merge pull request #22955 from taosdata/fix/avoidConflictIdxNameMain
avoid first tag index conflict
2023-09-19 11:37:26 +08:00
slzhou c882f4ba08 fix: fix address sanitizer error 2023-09-19 11:31:20 +08:00
Haojun Liao 5a6e50d523 fix(stream): keep the status entry in hash table, instead entry index. 2023-09-19 10:33:58 +08:00
kailixu 6698861c8b chore: timeseries distribute 2023-09-19 08:29:51 +08:00
Haojun Liao 1ca06e960f fix(stream): remove stream in buf. 2023-09-18 20:25:24 +08:00
wangmm0220 1e859084b7 fix:conflicts from 3.0 2023-09-18 19:57:33 +08:00
wangmm0220 4b74135350 fix:vnode tranform support in tmq 2023-09-18 19:47:28 +08:00
wangmm0220 59d8f7d10f fix:return in progress in drop consumer group 2023-09-18 17:55:00 +08:00
shenglian zhou 94a616fcc1 fix: save and continue 2023-09-18 16:59:07 +08:00
wangmm0220 49a193b328 fix:send delete subscribe info to vnode if drop consumer 2023-09-18 14:46:39 +08:00
yihaoDeng 2c10163634 avoid first tag index conflict 2023-09-18 14:19:58 +08:00
wangmm0220 7869b693f2 add test case for tmq in vnode transform & fix core in race condition for pTq->pExecStore 2023-09-18 14:09:28 +08:00
Haojun Liao 82d3deb423
Merge pull request #22949 from taosdata/enh/disableIpWhiteListOnCommunity
disable white list on community
2023-09-18 13:41:08 +08:00
dmchen b473122dac break dependency 2023-09-18 12:29:08 +08:00
Haojun Liao 8aa34802f5
Merge pull request #22938 from taosdata/fix/TD-26323
fix:[TD-26323]add macro to control tmq assert & make subscribe transa…
2023-09-18 09:48:39 +08:00
Haojun Liao de04090f04
Merge pull request #22940 from taosdata/fix/avoidConflictOfIdxName
reduce the confliction of first tag index name
2023-09-18 09:47:58 +08:00
dm chen fda32dcc51
Merge branch 'main' into feat/TD-26127-audit-sql 2023-09-18 09:41:47 +08:00
kailixu 8111c18cc4 chore: merge 3.0 2023-09-18 09:20:43 +08:00
Haojun Liao 3dfdda3283 fix(stream): fix error in decode stream task. 2023-09-17 18:07:26 +08:00
Haojun Liao 01144c58a7 fix(stream): fix stream task id error. 2023-09-17 01:19:59 +08:00
yihaoDeng d890ccbd3b disable white list on community 2023-09-15 20:27:41 +08:00
wangmm0220 8ebb6e202e fix:[TD-26323]add macro to control tmq assert & make subscribe transaction no conflicts 2023-09-15 19:26:55 +08:00
Haojun Liao 05e9f40834
Merge pull request #22828 from taosdata/enh/ipWhiteList
Enh/ip white list
2023-09-15 17:49:37 +08:00
yihaoDeng a66145a494 reduce the possible of first tag index name 2023-09-15 17:41:04 +08:00
kailixu 7f477b413a chore: more code 2023-09-15 14:35:57 +08:00
kailixu 03aea454d7 chore: more code 2023-09-15 14:33:35 +08:00
kailixu 6b95013ba0 chore: code refactor for mndDnode 2023-09-15 10:28:07 +08:00
yihaoDeng 79fe29c848 fix compile error 2023-09-15 10:10:23 +08:00
kailixu 8505fb2aea chore: code refactor for mndDnode 2023-09-15 08:49:45 +08:00
kailixu 1ddc935072 Merge branch '3.0' into enh/TS-3812-3.0 2023-09-15 08:39:32 +08:00
Haojun Liao 5f55f489d8 fix(stream): fix memory leak. 2023-09-14 22:59:11 +08:00
kailixu 449092c5dc enh: timeseries update optimize 2023-09-14 20:16:02 +08:00
yihaoDeng 167be7c519 rm dup ip 2023-09-14 19:09:56 +08:00
yihaoDeng 0e496ab0c5 Merge branch 'enh/ipWhiteList' of https://github.com/taosdata/TDengine into enh/ipWhiteList 2023-09-14 18:18:05 +08:00
yihaoDeng 2af180c763 Merge branch 'enh/ipWhiteList' of https://github.com/taosdata/TDengine into enh/ipWhiteList 2023-09-14 17:56:44 +08:00
yihaoDeng 02f5f4f017 Merge branch 'enh/ipWhiteList' of https://github.com/taosdata/TDengine into enh/ipWhiteList 2023-09-14 17:23:31 +08:00
yihaoDeng a7d4547a2d Merge branch 'enh/ipWhiteList' of https://github.com/taosdata/TDengine into enh/ipWhiteList 2023-09-14 17:01:06 +08:00
yihaoDeng 011aee7214 Merge branch 'enh/ipWhiteList' of https://github.com/taosdata/TDengine into enh/ipWhiteList 2023-09-14 16:56:47 +08:00
yihaoDeng 2d1d74d4e8 Merge branch 'enh/ipWhiteList' of https://github.com/taosdata/TDengine into enh/ipWhiteList 2023-09-14 16:52:23 +08:00
slzhou 972a6a133f Merge branch 'enh/ipWhiteList' of github.com:taosdata/TDengine into enh/ipWhiteList 2023-09-14 16:34:30 +08:00
slzhou 59020ff52d fix: for community version, use 0.0.0.0/0 as whitelist 2023-09-14 16:34:03 +08:00
yihaoDeng e36dc50828 Merge branch 'enh/ipWhiteList' of https://github.com/taosdata/TDengine into enh/ipWhiteList 2023-09-14 15:42:17 +08:00
yihaoDeng 2002ed8709 add more error code 2023-09-14 15:34:28 +08:00
slzhou 2a40113f13 fix: entprise version compilation 2023-09-14 14:44:09 +08:00
Haojun Liao fce5be0eb4 fix(stream): fix dead lock. 2023-09-14 14:09:05 +08:00
slzhou a15a41f396 Merge branch 'enh/ipWhiteList' of github.com:taosdata/TDengine into szhou/enh/ipWhiteList 2023-09-14 13:06:15 +08:00
slzhou 94236b8cee fix: pass some test 2023-09-14 13:05:58 +08:00
yihaoDeng aa1cc01064 update test case 2023-09-14 12:18:43 +08:00
yihaoDeng 903c628067 update test case 2023-09-14 12:18:04 +08:00
yihaoDeng da55d7e67e update test case 2023-09-14 09:25:23 +08:00
Haojun Liao 9b70c0c457 fix:fix coverity issue and remove unnecessary files. 2023-09-14 09:06:10 +08:00
yihaoDeng 7ec31029e6 update test case 2023-09-14 08:45:55 +08:00
yihaoDeng e7815229ca update test case 2023-09-13 19:54:45 +08:00
wangmm0220 f729150497 fix:opti poll callbak logic & send epoch as -1 to get epset if vnode transformed 2023-09-13 18:32:45 +08:00
dapan1121 270a7584f4 enh: prevent accessing ins_users&ins_user_privileges without sysinfo 2023-09-13 17:48:26 +08:00
yihaoDeng c0a8f81176 update test case 2023-09-13 14:27:58 +08:00
wangmm0220 1dbd322fa0 fix:remove useless code 2023-09-13 11:42:09 +08:00
kailixu 53ed71959b enh: fetch cluster info for grant periodically 2023-09-13 11:30:04 +08:00
Yihao Deng fa302ac6b9
Merge branch '3.0' into enh/ipWhiteList 2023-09-13 10:14:08 +08:00
Haojun Liao 60f5056ab7 other: merge 3.0 2023-09-12 22:00:40 +08:00
yihaoDeng 5468c717e9 Merge branch 'enh/ipWhiteList' of https://github.com/taosdata/TDengine into enh/ipWhiteList 2023-09-12 21:03:42 +08:00
yihaoDeng d6f4c40e54 fix mem leak 2023-09-12 21:03:35 +08:00
slzhou 65fe665939 fix: get user whitelist version from user object 2023-09-12 16:27:07 +08:00
slzhou a44d0bceb6 Merge branch 'szhou/enh/ipWhiteList' into enh/ipWhiteList 2023-09-12 16:21:29 +08:00
yihaoDeng 7ce8f694dc Merge branch 'enh/dev3New' into enh/ipWhiteList 2023-09-12 15:54:06 +08:00
shenglian zhou d5f1662bf5 enh: enterprise version and community version split 2023-09-12 14:35:01 +08:00
shenglian zhou 21dd7a82b0 Merge branch 'szhou/enh/ipWhiteList' of github.com:taosdata/TDengine into szhou/enh/ipWhiteList 2023-09-12 14:16:35 +08:00
shenglian zhou 53894f1182 enhance: add hb whitelist version and notify taosadapter 2023-09-12 14:15:03 +08:00
shenglian zhou 8db96a0085 enhance: update notification and get user whitelist api 2023-09-12 14:10:41 +08:00
shenglian zhou 64caae83fd enhance: add hb whitelist version and notify taosadapter 2023-09-12 14:10:41 +08:00
Haojun Liao 025a2a3b50
Merge pull request #22846 from taosdata/fix/3_liaohj
fix(tsdb): check the schema before merge rows in buffer
2023-09-12 11:43:27 +08:00
yihaoDeng 4d16cfac05 add rpc update interface 2023-09-12 11:36:44 +08:00
yihaoDeng a902421f5b add user ip white ver 2023-09-12 11:33:32 +08:00
yihaoDeng f29880fee3 add rpc update interface 2023-09-12 11:31:06 +08:00
yihaoDeng d9eed32167 add rpc update interface 2023-09-12 09:54:13 +08:00
Haojun Liao f602aa965f fix(stream): fix coverity scan issues. 2023-09-12 09:16:18 +08:00
yihaoDeng 9efa9eeff4 add rpc update interface 2023-09-11 21:29:50 +08:00
yihaoDeng 0a8b1ebe46 add rpc update interface 2023-09-11 21:02:50 +08:00
yihaoDeng 39d04ed15b add rpc update interface 2023-09-11 20:48:24 +08:00
shenglian zhou 9da204e5ff enhance: update notification and get user whitelist api 2023-09-11 17:04:35 +08:00
yihaoDeng d549a47cf5 add rpc update interface 2023-09-11 15:17:20 +08:00
yihaoDeng 05727359ca add rpc update interface 2023-09-11 15:02:35 +08:00
dmchen a8e538a563 fix/TD-26210 2023-09-11 14:38:36 +08:00
yihaoDeng 2a30e12547 add rpc update interface 2023-09-11 10:45:45 +08:00
shenglian zhou 569283f806 enhance: add hb whitelist version and notify taosadapter 2023-09-11 09:52:58 +08:00
yihaoDeng 30a60be214 add rpc update interface 2023-09-11 09:26:00 +08:00
wade zhang ddc8c93a9c
Merge pull request #22767 from taosdata/mark/tmq
fix:send delete subscribe info to vnode if drop consumer
2023-09-10 22:17:26 +08:00
wade zhang 635d405867
Merge pull request #22800 from taosdata/fix/TS-3922-main
fix:[TS-3922] make SStreamObj->->currentTick aligned by 8
2023-09-10 22:17:07 +08:00
yihaoDeng 9781766009 add rpc update interface 2023-09-10 17:02:38 +08:00
yihaoDeng d121b564c0 add rpc update interface 2023-09-10 16:11:14 +08:00
yihaoDeng 25bc0b226b add rpc update interface 2023-09-10 14:09:36 +08:00
yihaoDeng 56706193eb add rpc update interface 2023-09-08 11:49:12 +08:00
yihaoDeng 27e3ee8f1d add rpc update interface 2023-09-07 21:10:05 +08:00
yihaoDeng 60d6a622e1 add rpc update interface 2023-09-07 20:47:10 +08:00
wangmm0220 842bb5742a fix:[TS-3922]rollback because cases failed & avoid atomic_store_64 core if parameters not aligned by 8 2023-09-07 19:26:33 +08:00
yihaoDeng 8c5fa3526a add rpc update interface 2023-09-07 16:10:07 +08:00
wangmm0220 c4898bffd8 fix:[TS-3922] make SStreamObj->->currentTick aligned by 8 2023-09-07 15:23:00 +08:00
Shungang Li 46af31539d fix: adjust the error code returned when db does not exist 2023-09-07 14:52:34 +08:00
yihaoDeng f4f97a67f5 add rpc update interface 2023-09-07 14:24:26 +08:00
yihaoDeng 147de26eec add rpc update interface 2023-09-07 11:54:34 +08:00
Haojun Liao 0f909285c4
Merge pull request #22684 from taosdata/mark/tmq-3.0
fix:use vgstatus before if rebalance
2023-09-07 09:20:27 +08:00
yihaoDeng ad5639df89 add rpc update interface 2023-09-06 21:36:16 +08:00
yihaoDeng ac8220012c add rpc update interface 2023-09-06 17:22:30 +08:00
yihaoDeng b5d40d01bb add rpc update interface 2023-09-06 16:24:29 +08:00
dapan1121 2bc8b3f7ee
Merge pull request #22625 from taosdata/enh/TD-23879-3.0
enh: allow altering options to the same value
2023-09-06 13:34:49 +08:00
wangmm0220 f209e31582 fix:send delete subscribe info to vnode if drop consumer 2023-09-06 11:16:03 +08:00
dmchen 231ba12f70 feat/TD-26127 2023-09-06 11:00:24 +08:00
yihaoDeng 393ef21348 add rpc update interface 2023-09-06 09:32:26 +08:00
yihaoDeng 6f6c517342 add rpc update interface 2023-09-05 21:00:01 +08:00
yihaoDeng e539eebaa2 add rpc update interface 2023-09-05 18:50:11 +08:00
wangmm0220 ef87b9c571 fix:conflicts from 3.0 2023-09-05 16:19:04 +08:00
wade zhang 0517358a02
Merge pull request #22717 from taosdata/fix/TD-22062
fix/TD-22062
2023-09-05 16:04:12 +08:00
Haojun Liao 5dcbae3594
Merge pull request #22681 from taosdata/fix/3_liaohj
refactor: do some internal refactor.
2023-09-05 12:54:09 +08:00
yihaoDeng 6257bf1e10 add rpc update interface 2023-09-05 12:03:23 +08:00
dapan1121 4a5bcb5c80
Merge pull request #22650 from taosdata/szhou/ip-whitelist
enhance: ip whitelist syntax
2023-09-05 11:00:55 +08:00
yihaoDeng 685bdea44a add rpc update interface 2023-09-04 21:15:46 +08:00
Haojun Liao 77eed06bcd
Merge branch '3.0' into fix/3_liaohj 2023-09-04 18:51:07 +08:00
dmchen 1a0480c834 fix/TD-22062 2023-09-04 17:14:29 +08:00
wangmm0220 90e938e48f fix:set vg status idle if reveive poll callback 2023-09-04 16:53:12 +08:00
Haojun Liao aeea699c9c Merge branch '3.0' into fix/3_liaohj 2023-09-04 15:53:39 +08:00
Haojun Liao 21dab8ceab other: merge 3.0 2023-09-04 13:08:19 +08:00
Haojun Liao d73de8ba1e fix(stream): add null ptr check. 2023-09-02 16:44:21 +08:00
Haojun Liao 037a232bfa refactor: do some internal refactor. 2023-09-01 17:05:36 +08:00
yihaoDeng 5f78c27535 add enable white list 2023-09-01 15:11:25 +08:00
dapan1121 cc17848b78 fix: merge 3.0 to main 2023-09-01 13:24:47 +08:00
yihaoDeng 8b146f793d Merge branch '3.0' into szhou/ip-whitelist 2023-09-01 10:51:24 +08:00
Haojun Liao 3765fbbba2 fix(stream): fix memory leak. 2023-09-01 09:59:56 +08:00
Haojun Liao e8294ed8dc fix(stream): fix bug in multi-replica vnode redistribute. 2023-09-01 03:10:12 +08:00
Haojun Liao fecba5b097 fix(stream): check for meta 2023-08-31 20:54:02 +08:00
Haojun Liao 95da66e3e8 fix(stream): fix error. 2023-08-31 20:50:12 +08:00
dmchen 03de7ad5a6 stream name 2023-08-31 16:44:36 +08:00
dmchen 12ffc58b7e password and topic name 2023-08-31 16:37:24 +08:00
dmchen 9b7bbe0168 audit table name 2023-08-31 14:42:25 +08:00
Haojun Liao 8645f763b5
Merge pull request #22661 from taosdata/enh/reserve
stream change ver
2023-08-31 13:35:23 +08:00
yihaoDeng 83a5e2be4c stream change ver 2023-08-31 11:42:12 +08:00
yihaoDeng 05ca71d5de stream change ver 2023-08-31 09:28:43 +08:00
dmchen 22f0778cca typo and remove ip port 2023-08-31 09:26:44 +08:00
wade zhang 68e4a72021
Merge pull request #22643 from taosdata/feat/audit-user-typestr
alter user type to str
2023-08-31 07:59:31 +08:00
slzhou 82dc2de2f4 Merge branch '3.0' of github.com:taosdata/TDengine into szhou/ip-whitelist 2023-08-30 17:11:42 +08:00
dmchen 623660d012 enhance 2023-08-30 16:17:13 +08:00
dmchen 04a89b4a49 long fields 2023-08-30 16:03:57 +08:00
Haojun Liao c5b279f045 Merge remote-tracking branch 'origin/enh/triggerCheckPoint2' into enh/triggerCheckPoint2 2023-08-30 16:01:08 +08:00
Haojun Liao 24b1a050fc other: merge 3.0 2023-08-30 16:00:14 +08:00
dmchen 63e2926a60 topic 2023-08-30 15:26:54 +08:00
dapan1121 718f97e506
Merge pull request #22640 from taosdata/fix/m23.1
Fix/m23.1
2023-08-30 14:58:40 +08:00
liuyao 0a72e576bd op stream pause
pause data dispatch

opt stream pause
2023-08-30 14:53:49 +08:00
slzhou 1ab94d0992 Merge branch '3.0' of github.com:taosdata/TDengine into szhou/ip-whitelist 2023-08-30 14:42:26 +08:00
dmchen 7790afd85d fields 2023-08-30 13:13:05 +08:00
dmchen b9f77798a2 alter user type to str 2023-08-30 12:06:11 +08:00
wade zhang bec05f2677
Merge pull request #22638 from taosdata/feat/TD-26033
TD-26033
2023-08-30 11:40:44 +08:00
wade zhang bbed968256
Merge pull request #22617 from taosdata/FIX/TD-25995-3.0
enh: adjust criteria of completion to retrieve SShowObj info from mnode in mndProcessSysTableReq
2023-08-30 11:33:13 +08:00
dapan1121 f6321d0c4f Merge remote-tracking branch 'origin/main' into fix/m23.1 2023-08-30 11:03:33 +08:00
dmchen 7bea92cbf9 TD-26033 2023-08-30 10:28:39 +08:00
dmchen bb33620f5c dbname 2023-08-29 18:12:08 +08:00
Benguang Zhao dbeafb508b fix: reset show obj iter on no more data to read in mndRetrieveIdx 2023-08-29 17:56:24 +08:00
kailixu 3036b78910 Merge branch '3.0' into enh/TD-23879-3.0 2023-08-29 17:43:14 +08:00
shenglian zhou 33966cf856 enhance: continue coding 2023-08-29 17:35:03 +08:00
Benguang Zhao a6455672c0 fix: check completeness of retrieval properly in mndProcessRetrieveSysTableReq 2023-08-29 15:47:11 +08:00
kailixu 523994d93b enh: allow altering options to the same value 2023-08-29 15:15:07 +08:00
Benguang Zhao 5e5b7a3328 fix: reserve enough space of show Obj rows for vnodes of each vgroup in mndRetrieveVnodes 2023-08-29 12:07:52 +08:00
dmchen 1372cede48 init 2023-08-28 17:44:10 +08:00
dapan1121 778e50da79
Merge pull request #22592 from taosdata/fix/m23.0
Fix/m23.0
2023-08-28 17:35:35 +08:00
wade zhang 1797fe50e2
Merge pull request #22590 from taosdata/feat/TD-18801
init
2023-08-28 11:05:38 +08:00
Haojun Liao da0b4e1f92 Merge branch '3.0' into enh/triggerCheckPoint2 2023-08-28 10:55:38 +08:00
wade zhang e95c9d5fdc
Merge pull request #22591 from taosdata/feat/TD-18572
feat/TD-18572: dynamic 'supportvnodes'
2023-08-28 10:46:44 +08:00
dapan1121 0cce255a02 Merge remote-tracking branch 'origin/3.0' into fix/m23.0 2023-08-28 10:06:53 +08:00
Haojun Liao 88f6596965
Merge pull request #22464 from taosdata/feat/TD-18789
feat:support varbinary type
2023-08-28 09:45:57 +08:00
dapan1121 1f40da6fef Merge remote-tracking branch 'origin/main' into 3.0 2023-08-28 09:28:55 +08:00
Shungang Li 0c28c9aee8 feat: dynamic 'supportvnodes' 2023-08-28 09:17:35 +08:00
dmchen 06083e1eb9 init 2023-08-28 09:15:51 +08:00
wangmm0220 8b745de397 fix:transaction error 2023-08-26 00:43:47 +08:00
Haojun Liao 7ceb8dc627 fix(stream): disable the follower to execute the stop/resume instruction. 2023-08-25 19:20:49 +08:00
wangmm0220 047707fa17 fix:error in privilege 2023-08-25 17:56:17 +08:00
wangmm0220 26e025d78d feat:[TD-18789]support varbinary type 2023-08-25 15:43:45 +08:00
dapan1121 e24498b0fd enh: add task notify 2023-08-25 14:59:34 +08:00
liuyao 7d44b7e4cb mem leak 2023-08-25 14:53:29 +08:00
wangmm0220 cca00406a5 fix:drop topic error if topic not exist 2023-08-24 18:16:57 +08:00
yihaoDeng 9310d138a6 Merge branch 'enh/3.0' into enh/triggerCheckPoint2 2023-08-24 17:30:35 +08:00
wangmm0220 89884e1c49 fix:transaction in tmq 2023-08-24 16:34:52 +08:00
liuyao a72e6fd219 mem leak 2023-08-24 16:32:34 +08:00
wangmm0220 49216ffa54 fix:transaction in tmq 2023-08-24 16:32:15 +08:00
wangjiaming0909 366a9cc009 Revert "feat: support column comment"
This reverts commit dcbef83dea.
2023-08-24 13:54:27 +08:00
wangmm0220 be74370e98 fix:memory leak 2023-08-24 09:25:26 +08:00
wangmm0220 775f0668c5 fix:[TD-258900]modify tmq trans conflict to db level 2023-08-24 09:25:26 +08:00
wangmm0220 8f3956cc67 fix:[TD-258900]modify tmq trans conflict to db level 2023-08-24 09:25:26 +08:00
wangmm0220 4591f24746 fix:memory leak 2023-08-23 19:41:02 +08:00
Haojun Liao 809d3087ff Merge remote-tracking branch 'origin/enh/triggerCheckPoint2' into enh/triggerCheckPoint2
# Conflicts:
#	source/dnode/mnode/impl/src/mndStream.c
2023-08-23 17:53:50 +08:00
Haojun Liao 230d8c2d80 fix(stream): fix error in stream computing after vnode is transferred to other dnodes. 2023-08-23 17:50:44 +08:00
wangmm0220 f19c1ea3fe fix:[TD-258900]modify tmq trans conflict to db level 2023-08-23 16:46:33 +08:00
wangmm0220 8fc8aad1b5 fix:[TD-258900]modify tmq trans conflict to db level 2023-08-23 16:44:29 +08:00
yihaoDeng 5b621fc0c5 fix mem leak 2023-08-23 16:32:32 +08:00
yihaoDeng faa4bbcaca fix mem leak 2023-08-23 14:26:45 +08:00
Shungang Li 458fd07976 enh: ttl split flush and drop table
config:
1. ttlFlushThreshold: maximum number of dirty items in memory
2. tsTtlBatchDropNum: number of tables dropped per batch
3. tsTrimVDbIntervalSec: interval of trimming db in all vgroups
2023-08-23 11:13:34 +08:00
Haojun Liao 000e39aa18 fix(stream): add one more check. 2023-08-22 15:52:29 +08:00
Haojun Liao af80d94a88 refactor: do some internal refactor. 2023-08-22 15:43:50 +08:00
Haojun Liao cc8b2263cb fix(stream): fix error in heartbeat from vnode. 2023-08-22 13:37:38 +08:00
dmchen 9f004c209a keep version change 2023-08-22 11:28:50 +08:00
Haojun Liao 64556c9f1d Merge remote-tracking branch 'origin/enh/triggerCheckPoint2' into enh/triggerCheckPoint2 2023-08-22 10:47:02 +08:00
Haojun Liao def0877980 fix(stream): add timer to check stream task status. 2023-08-22 10:46:49 +08:00
dm chen b899a8b7df
Merge branch '3.0' into feat/TD-22970 2023-08-22 10:12:30 +08:00
yihaoDeng 1531e2d7d3 Merge branch 'enh/3.0' into enh/triggerCheckPoint2 2023-08-22 09:51:38 +08:00
wade zhang 501c86f858
Merge pull request #22488 from taosdata/FIX/TD-25762-3.0
enh: ensure transactional atomicity of db names in create database
2023-08-21 16:04:58 +08:00
Haojun Liao fbd67ce977 fix(stream): fix memory leak. 2023-08-21 11:50:53 +08:00
Haojun Liao 99024e9d78 Merge remote-tracking branch 'origin/enh/triggerCheckPoint2' into enh/triggerCheckPoint2 2023-08-21 11:49:08 +08:00
Haojun Liao 29bb5854cc fix(stream): fix error in check stream state. 2023-08-21 11:48:55 +08:00
Benguang Zhao d3ce0c1f80 fix: ensure creating status of create-db before completion 2023-08-21 11:46:25 +08:00
dm chen dda51d8019
Merge branch '3.0' into feat/TD-22970 2023-08-21 10:50:45 +08:00
yihaoDeng d934d91fb1 refactor checkpoint 2023-08-21 10:34:08 +08:00
Benguang Zhao f30d1ebacd enh: refactor func name as mndTransAppendPrepareLog 2023-08-18 18:35:44 +08:00
Benguang Zhao 9f1c8cc7b8 enh: unify validation of prepare actions with cb validateFp 2023-08-18 18:21:30 +08:00
Benguang Zhao e7411183d9 enh: create SDB_DB entry in prepareAction 2023-08-18 17:08:24 +08:00
Haojun Liao 41fe441dad fix(stream): update the conflict scope. 2023-08-18 17:00:35 +08:00
Haojun Liao c26d625152
Merge branch '3.0' into enh/triggerCheckPoint2 2023-08-18 15:51:07 +08:00
liuyao 87c65f3b68 Merge remote-tracking branch 'origin/3.0' into enh/triggerCheckPoint2 2023-08-18 15:27:02 +08:00
dapan1121 9b953707b8 Merge remote-tracking branch 'origin/main' into fix/mainto3.0 2023-08-18 14:42:43 +08:00
Benguang Zhao f01a26f68a enh: refactor func names of new Vg prepare actions 2023-08-18 14:26:58 +08:00
dm chen e393a98ee9
Merge branch '3.0' into feat/TD-22970 2023-08-18 13:37:18 +08:00
Haojun Liao 2a9668da67 Merge remote-tracking branch 'origin/enh/triggerCheckPoint2' into enh/triggerCheckPoint2
# Conflicts:
#	source/dnode/mnode/impl/src/mndStream.c
2023-08-18 10:30:30 +08:00
Haojun Liao 87785b1d9c refactor: add some logs. 2023-08-18 10:30:00 +08:00
wangjiaming0909 4dcdb549c9 fix: get systable cols error 2023-08-18 10:19:12 +08:00
yihaoDeng 80f6d092a1 add trace log 2023-08-18 08:43:37 +08:00
yihaoDeng ebd4cac36b Merge branch 'enh/triggerCheckPoint2' of https://github.com/taosdata/TDengine into enh/triggerCheckPoint2 2023-08-17 18:58:18 +08:00
yihaoDeng 46574c385f fix mem leak 2023-08-17 18:52:33 +08:00
Haojun Liao a18989df88 fix(stream): add lost codes caused by merge 3.0. 2023-08-17 18:51:39 +08:00
Benguang Zhao 7735e6f388 Merge branch 3.0 to FEAT/TD-25699-3.0 2023-08-17 16:04:23 +08:00
dapan1121 0e10e94a40
Merge pull request #22453 from taosdata/feat/TD-25685
feat: support column comment
2023-08-17 14:23:54 +08:00
Benguang Zhao 9b089d6446 enh: wrap state updating of vnodes and mnodes in mndProcessStatusReq 2023-08-17 11:59:53 +08:00
kailixu 49efb4ae72 fix: modify column length for super table 2023-08-17 11:43:07 +08:00
Haojun Liao 6746339609 Merge remote-tracking branch 'origin/enh/triggerCheckPoint2' into enh/triggerCheckPoint2
# Conflicts:
#	source/libs/stream/src/streamSnapshot.c
2023-08-17 00:08:44 +08:00
Haojun Liao ea6574b3c7 other: merge 3.0 2023-08-17 00:07:55 +08:00