Commit Graph

3223 Commits

Author SHA1 Message Date
Haojun Liao 1b9eca5ce0 other: merge main. 2023-06-15 13:03:17 +08:00
dapan1121 0c2bfde7fe
Merge pull request #21706 from taosdata/szhou/version-not-compatible-log
enhance: version not compatible log
2023-06-15 09:05:47 +08:00
wangmm0220 864236a8dc fix:conflicts 2023-06-14 12:05:10 +08:00
wangmm0220 c28d7d9bf8 fix:open info log in tmq client & modify parametes in show consumers 2023-06-14 12:01:54 +08:00
Haojun Liao 4fac83ecf2
Merge pull request #21709 from taosdata/feature/TD-24749
feat:control memory size if consumer group is too much
2023-06-14 10:15:20 +08:00
wangmm0220 827e84b1a5 fix:memory leak 2023-06-13 17:10:23 +08:00
dapan1121 f84eef0ac4
Merge branch '3.0' into feat/TD-24499 2023-06-13 15:27:18 +08:00
wangmm0220 d8d6b6dd21 Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/TD-24749 2023-06-13 15:15:05 +08:00
wangmm0220 8a81278024 fix:load pHandle if necessary wher tq restore 2023-06-13 15:14:11 +08:00
Haojun Liao 933d08b489
Merge pull request #21690 from taosdata/feature/TS-3495
feat:add parameters for consumer & add offset rows for subscription
2023-06-13 14:59:15 +08:00
shenglian zhou 28e6c45021 enhance: version not compatible log 2023-06-13 14:41:42 +08:00
dapan1121 73d3c21e21 Merge remote-tracking branch 'origin/3.0' into feat/TD-24499 2023-06-13 11:44:41 +08:00
wangmm0220 fb123d8761 fix:conflict from 3.0 2023-06-13 09:47:08 +08:00
wangmm0220 fb59ec4591 feat:move plan msg from vginfo to subscription info 2023-06-13 09:32:54 +08:00
wangmm0220 a723fc37c3 fix:modify offset description to string 2023-06-12 17:18:06 +08:00
dapan1121 59b8cfbc7d enh: add sub_query in systable and kill subquery 2023-06-12 17:14:41 +08:00
wangmm0220 fe155898fe fix:modify offset description to string 2023-06-12 16:34:53 +08:00
wangmm0220 6657b8d849 fix:modify offset description to string 2023-06-12 09:44:00 +08:00
Benguang Zhao 3689b41f3a Merge branch '3.0' into FIX/TD-24182-3.0 2023-06-12 09:39:49 +08:00
slzhou 76d341682e fix: select * from information_schema.ins_columns can not complete 2023-06-09 20:55:17 +08:00
wangmm0220 aa610b27a4 feat:add parameters for consumer & add offset rows for subscription 2023-06-09 18:51:10 +08:00
wangmm0220 d7a4817124 feat:add parameters for consumer & add offset rows for subscription 2023-06-08 19:11:15 +08:00
wangmm0220 ac5862c321 feat:add parameters for consumer & add offset rows for subscription 2023-06-08 19:08:22 +08:00
wangmm0220 3f46a9bbc9 feat:add parameters for consumer & add offset rows for subscription 2023-06-08 18:14:02 +08:00
dmchen 169a2bd349 fix/TD-24644 2023-06-07 11:13:48 +08:00
dapan1121 fe7ba9d92e
Merge pull request #21523 from taosdata/feat/TS-3134-3.0
feat: allow user to reset root passwd
2023-06-06 11:10:11 +08:00
dapan1121 dff35ac584
Merge pull request #21550 from wangjiaming0909/feature/3.0/TD-23974
feature: add user priv when create db, remove priv check with create_dbs
2023-06-06 11:06:18 +08:00
Benguang Zhao ae26f701ae fix: ignore TSDB_CODE_MND_TRANS_SYNC_TIMEOUT on updating trans 2023-06-02 18:49:15 +08:00
wangmm0220 b2f0d88639 fix:conflict 2023-06-02 15:43:35 +08:00
Haojun Liao d45aa7ef84
Merge pull request #21555 from taosdata/fix/liaohj_main
other: merge main into 3.0.
2023-06-02 13:11:12 +08:00
wangmm0220 56782a5d41 fix:open task case & modify mqRebVgReq encode/decode style 2023-06-01 18:29:16 +08:00
Benguang Zhao 2ef2715ee1 enh: add mndAddVgStatusAction and mndAddDbStatusAction 2023-06-01 17:58:27 +08:00
wangmm0220 bb772e2062 fix:make version compatible 2023-06-01 17:03:02 +08:00
wangmm0220 21920721f3 fix:make version compatible 2023-06-01 15:10:08 +08:00
Haojun Liao 5301c5756a other: merge main into 3.0. 2023-06-01 09:29:18 +08:00
wangjiaming0909 60100a0fb6 feature: add user priv when create db, remove priv check with create_dbs 2023-05-31 18:43:56 +08:00
Benguang Zhao 28efd7dcd7 enh: check trans conflicts in mndTransValidate 2023-05-31 10:53:36 +08:00
Benguang Zhao 4a6d81855b enh: add mndTransValidate for prepare actions 2023-05-30 18:50:00 +08:00
Benguang Zhao 6679b8af7b fix: release action.pCont on error 2023-05-30 10:55:56 +08:00
wangmm0220 d490ca753f Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/TD-19042 2023-05-30 09:48:49 +08:00
Haojun Liao bcba18d90e
Merge pull request #21521 from taosdata/refact/fillhistory
refactor: do some internal refactor.
2023-05-30 00:38:38 +08:00
kailixu 9501d4f417 feat: allow user to reset root passwd 2023-05-29 19:44:11 +08:00
Haojun Liao 3628888ecc refactor: do some internal refactor. 2023-05-29 18:02:45 +08:00
Haojun Liao cd2d225c93 refactor: do some internal refactor. 2023-05-29 17:50:39 +08:00
dmchen 23983e506f fix test case 2023-05-29 16:12:26 +08:00
Haojun Liao f2887278e2 refactor: do some internal refactor. 2023-05-29 15:44:45 +08:00
wangmm0220 78db3520a6 fix:conflict 2023-05-29 14:57:03 +08:00
Benguang Zhao 3c698b2461 enh: add mndAddPrepareNewVgAction 2023-05-29 14:13:11 +08:00
Benguang Zhao 873ad8839b enh: add prepareActions in STrans 2023-05-29 14:13:11 +08:00
tangfangzhi e21a2f9cce check empty 2023-05-29 14:02:36 +08:00