Commit Graph

3326 Commits

Author SHA1 Message Date
Haojun Liao e0ea0f2df4
Merge pull request #22020 from taosdata/fix/liaohj
other: merge main
2023-07-13 17:55:28 +08:00
Haojun Liao f41bcd73b0 other: merge main. 2023-07-13 11:02:09 +08:00
Haojun Liao c388802bda
Merge pull request #22024 from taosdata/fix/3_liaohj
fix(stream): fix concurrent bug in save task meta.
2023-07-12 18:17:27 +08:00
Haojun Liao fed3803739 fix(stream): fix memory leak. 2023-07-11 19:29:52 +08:00
Haojun Liao 3ffdbe923d other: merge 3.0 2023-07-11 09:12:57 +08:00
Ganlin Zhao b9c3ee387e remove wal_roll_period/wal_retention_size from
information_schema.ins_databases
2023-07-10 16:16:27 +08:00
dmchen 0a86523bcb fix/TS-3589 2023-07-10 14:58:28 +08:00
wangmm0220 35ba132a29 fix:conflicts from main 2023-07-09 12:52:18 +08:00
wangmm0220 47ae92af93 fix:conflicts from main 2023-07-06 13:40:04 +08:00
wangmm0220 34a62c3f38 fix:vginfo assigment not in same time,we should get vginfo by vg,not all vg 2023-07-05 22:55:41 +08:00
Ganlin Zhao e84ca5b838 fix: fix show queries output wrongly displayed 2023-07-04 13:53:09 +08:00
wangmm0220 a641a07085 fix:[TD-25071] pSub is null & return wal not exist if no data 2023-07-04 11:13:03 +08:00
Haojun Liao 200575647c
Merge branch '3.0' into refact/fillhistory 2023-07-03 15:16:18 +08:00
dapan1121 a36dac2008
Merge pull request #21893 from taosdata/fix/TS-3551-M
enh: update of user auth version
2023-07-03 14:58:09 +08:00
liuyao bc5e709d31 set task status of ins_stream_tasks 2023-07-03 14:00:30 +08:00
liuyao 863da2ae05 set task status of ins_stream_tasks 2023-07-03 11:10:38 +08:00
wade zhang 1a069970c0
Merge pull request #21911 from taosdata/fix/TD-25052
fix/TD-25052
2023-07-03 09:37:01 +08:00
Ganlin Zhao e1c62d17bc Merge branch '3.0' into fix/TD-25064 2023-07-03 09:08:53 +08:00
kailixu c16088fffa chore: remove obsolete code 2023-06-30 19:31:56 +08:00
kailixu c81ecb1771 chore: make jenkins happy 2023-06-30 19:22:14 +08:00
Ganlin Zhao e14a0e154f fix asan error 2023-06-30 17:37:06 +08:00
kailixu 067a8334fd chore: code optimization 2023-06-30 16:30:04 +08:00
kailixu 387d611179 chore: passVer and authVer refact 2023-06-30 14:52:20 +08:00
dmchen 99192b2998 fix/TD-25052 2023-06-30 12:38:52 +08:00
dmchen 1b68bfb473 fix/TS-3589 2023-06-29 18:14:35 +08:00
yihaoDeng b377fcffad fix:show subscriptions error 2023-06-29 16:04:02 +08:00
yihaoDeng 0b3fbfd87f fix:compile error 2023-06-29 14:40:32 +08:00
dapan1121 c8435de64a
Merge branch '3.0' into fix/m23.0 2023-06-29 14:03:56 +08:00
dapan1121 5ee1fbee7e fix: code merge issue 2023-06-29 14:01:19 +08:00
dapan1121 bb1e24dda4 Merge remote-tracking branch 'origin/main' into fix/m23.0 2023-06-29 13:59:56 +08:00
dapan1121 edf5b8c936 fix: code merge issue 2023-06-29 13:59:39 +08:00
wangmm0220 b264640ca1 fix:error in limit for tmq group 2023-06-29 11:15:53 +08:00
dapan1121 3519e9170e Merge remote-tracking branch 'origin/main' into 3.0 2023-06-29 11:13:45 +08:00
wangmm0220 4c39629d3c Merge branch 'main' of https://github.com/taosdata/TDengine into mark/tmq 2023-06-29 10:48:41 +08:00
wangmm0220 64d8d63f3d fix:error in limit for tmq group 2023-06-29 10:47:55 +08:00
kailixu 1e9b85545b chore: more code 2023-06-28 20:57:05 +08:00
kailixu aefebfca7f enh: update of user auth version 2023-06-28 20:49:29 +08:00
Haojun Liao d0542f99e2
Merge pull request #21744 from taosdata/mark/tmq
opti:tmq logic
2023-06-28 17:23:56 +08:00
wangmm0220 4ead47bcbd fix:add rows to pSub if rebalance 2023-06-28 16:43:30 +08:00
wangmm0220 865a3b2509 fix:add rows to pSub if rebalance 2023-06-28 16:37:57 +08:00
wangmm0220 ce0b71c634 fix:add rows to pSub if rebalance 2023-06-28 15:57:30 +08:00
wangmm0220 4a17f4b9f5 fix:add rows to pSub if rebalance 2023-06-28 14:57:31 +08:00
slzhou fc3fe9dff8 fix: remove connect to mnode 2023-06-28 13:49:13 +08:00
wangmm0220 fb82b61d2f fix:pSub is null 2023-06-28 10:35:38 +08:00
wangmm0220 d34dc1242f fix:memory leak 2023-06-28 09:41:20 +08:00
wangmm0220 7e38ef7091 fix:add limit for topic and group num 2023-06-27 17:44:51 +08:00
wangmm0220 4b95ea9cad fix:clear consumer if normal close 2023-06-27 17:11:20 +08:00
Haojun Liao 32fddeff18 fix(stream): fix error retrieve data from source task.And optimize the test cases. 2023-06-27 16:24:47 +08:00
Haojun Liao 3289ad62be other: merge 3.0 2023-06-27 11:33:40 +08:00
wade zhang d7e9eda6bc
Merge pull request #21844 from taosdata/FIX/TD-24924-3.0
enh:  change trans conflict scope of create topic
2023-06-27 10:47:53 +08:00