Commit Graph

6450 Commits

Author SHA1 Message Date
wade zhang 021fcf2a59
Merge pull request #22059 from taosdata/fix/TD-25215
fix/TD-25215: ttlMgrDeleteTtl should ignore ttl 0 tables
2023-07-14 17:53:06 +08:00
dapan1121 9bf7180074
Merge pull request #21969 from taosdata/enh/TD-23769-3.0
enh: rsma stream state adaption
2023-07-13 19:19:37 +08:00
Haojun Liao e0ea0f2df4
Merge pull request #22020 from taosdata/fix/liaohj
other: merge main
2023-07-13 17:55:28 +08:00
Shungang Li a39a9428af fix: ttlMgrDeleteTtl should ignore ttl 0 tables 2023-07-13 17:43:32 +08:00
kailixu 6ee135cb52 chore: more code 2023-07-13 17:37:31 +08:00
kailixu 67461d92a7 chore: merge 3.0 and solve conflict 2023-07-13 17:35:55 +08:00
wade zhang ec86a68b6f
Merge pull request #22045 from taosdata/FEAT/TS-2699-3.0
enh: unify handling of vnode primary dir for vnd, tsdb and sma
2023-07-13 13:55:46 +08:00
Benguang Zhao dc75f7ce21 enh: use VNODE_RSMA_DIR in tdRSmaGetCurrentFName 2023-07-13 11:27:31 +08:00
Haojun Liao f41bcd73b0 other: merge main. 2023-07-13 11:02:09 +08:00
Benguang Zhao e209b487c6 enh: rename func name vnodeGetPrimaryDir 2023-07-13 10:38:05 +08:00
kailixu 466f1037b4 Merge branch '3.0' into enh/TD-23769-3.0 2023-07-12 18:50:16 +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
kailixu 8f58f9aa5b fix: skip primary key for block sma 2023-07-12 18:07:01 +08:00
Benguang Zhao 05e8af4837 enh: unify handling of vnode primary dir for vnd and tsdb 2023-07-12 17:58:18 +08:00
Benguang Zhao 4c3bf41178 enh: unify handling of vnode primary dir for sma 2023-07-12 17:56:21 +08:00
Benguang Zhao bbf58d2d9d enh: unify handling of vnode primary dir in vnodeCreate and metaOpen 2023-07-12 17:56:21 +08:00
kailixu 8cb6356b99 chore: more code 2023-07-12 10:47:02 +08:00
kailixu f282acbc4c chore: rsma refactor 2023-07-12 10:13:50 +08:00
kailixu 8c8bcabdd4 Merge branch '3.0' into enh/TD-23769-3.0 2023-07-12 09:11:34 +08:00
wade zhang 2cfdd234b3
Merge pull request #22034 from taosdata/feat/TS-3239
feat/TS-3239/TS-3596: port 'keepTimeOffset' from 2.6 to 3.0
2023-07-12 08:18:38 +08:00
Haojun Liao fed3803739 fix(stream): fix memory leak. 2023-07-11 19:29:52 +08:00
kailixu ba0bce8092 chore: code revert 2023-07-11 18:52:51 +08:00
kailixu 30f8c9c79e chore: more check 2023-07-11 18:08:48 +08:00
Shungang Li 4886cb4674 feat: port 'keepTimeOffset' from 2.6 to 3.0 2023-07-11 17:40:35 +08:00
kailixu 7c85f7701d chore: more check 2023-07-11 16:32:29 +08:00
Haojun Liao 2e386a6fdf fix(stream): check if stream task is in normal state. 2023-07-11 15:23:49 +08:00
Haojun Liao 6d78816d22 fix(stream): fix syntax error. 2023-07-11 14:06:25 +08:00
kailixu 314123ef34 chore: add check 2023-07-11 14:05:09 +08:00
kailixu d5435926c2 chore: more code 2023-07-11 12:37:01 +08:00
Haojun Liao 3ffdbe923d other: merge 3.0 2023-07-11 09:12:57 +08:00
kailixu 14b438ec64 chore: bug fix 2023-07-11 07:02:36 +08:00
kailixu f391462e34 chore: more code 2023-07-10 20:01:50 +08:00
kailixu 57ceaed535 chore: code revert 2023-07-10 19:55:01 +08:00
kailixu f16fa6d000 enh: exclude tk log from time series check 2023-07-10 19:48:50 +08:00
kailixu 802112c00a chore: more code 2023-07-09 21:49:37 +08:00
kailixu a7253fc390 Merge branch '3.0' into enh/TD-25083-3.0 2023-07-09 16:04:38 +08:00
wangmm0220 35ba132a29 fix:conflicts from main 2023-07-09 12:52:18 +08:00
wangmm0220 a5363e6e03 fix:test case in tmq 2023-07-09 12:49:50 +08:00
wangmm0220 f9f656b21a fix:return offset stored if get assignment in init mode 2023-07-08 13:25:39 +08:00
wangmm0220 4436eb7e0f fix:set commitOffset is send msg success & optimize log & add test cases for TD-25129 2023-07-07 19:12:18 +08:00
kailixu a746d288a1 chore: add debug info 2023-07-07 18:53:01 +08:00
wangmm0220 106e273157 fix:bugs in get_assignment 2023-07-07 16:12:15 +08:00
wade zhang 0865b1a828
Merge pull request #21973 from luckeverda/fix/TD-25074-main
fix/TD-25074 for main
2023-07-07 11:24:33 +08:00
kailixu cb8b10f6a2 Merge branch '3.0' into enh/TD-23769-3.0 2023-07-07 10:19:43 +08:00
kailixu 64ef48e0dd Merge branch '3.0' into enh/TD-23769-3.0 2023-07-07 10:17:25 +08:00
kailixu 06c52af2c2 enh: exclude tk_log from timeseries check 2023-07-07 10:14:37 +08:00
wade zhang 47a7a45d1d
Merge pull request #21978 from taosdata/fix/TD-24962
fix(coverity): fix coverity scan issues
2023-07-07 08:20:07 +08:00
wangmm0220 0928bd5510 fix:send rsp offset to client if unregister push mgr 2023-07-06 19:35:48 +08:00
wangmm0220 b2d41ce907 Merge branch 'main' of https://github.com/taosdata/TDengine into fix/TD-25071 2023-07-06 19:34:22 +08:00
Minglei Jin 09222801c4 fix(coverity): fix coverity scan issues 2023-07-06 17:52:48 +08:00