Commit graph

6240 commits

Author SHA1 Message Date
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
wangmm0220
fb123d8761 fix:conflict from 3.0 2023-06-13 09:47:08 +08:00
Benguang Zhao
16fbcbb67a fix: filter by tbFName in metaFilterTableByHash 2023-06-12 14:19:50 +08:00
wangmm0220
1903b815d4 fix:modify offset description to string 2023-06-12 09:45:06 +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
wangmm0220
3f46a9bbc9 feat:add parameters for consumer & add offset rows for subscription 2023-06-08 18:14:02 +08:00
Haojun Liao
30eba472c3
Merge pull request #21602 from taosdata/fix/TD-24600-dv3
fix/td-24600-dv3
2023-06-08 13:42:02 +08:00
yihaoDeng
9b749b8faa change link op t 2023-06-08 02:43:44 +00:00
liuyao
1e9c4d5fac opt stream block dispatch 2023-06-07 10:45:27 +08:00
Minglei Jin
c4418046e1
Merge branch '3.0' into fix/TS-3247 2023-06-05 18:17:18 +08:00
wade zhang
11321aa279
Merge pull request #21386 from taosdata/fix/TD-23549
fix(meta): split meta
2023-06-05 17:47:19 +08:00
Minglei Jin
d02746d86f fix(query/sys): pause/resume with sys scan operator 2023-06-05 15:24:39 +08:00
Haojun Liao
044e56fc97
Merge branch '3.0' into fix/resume_mem 2023-06-03 12:19:17 +08:00
Haojun Liao
4bb6429249 fix(query): fix syntax error. 2023-06-03 00:20:59 +08:00
Haojun Liao
becacbc84b fix(query): fix syntax error. 2023-06-02 23:36:47 +08:00
Haojun Liao
b5b4cd2a05 fix(query): load del info with upper version limitation. 2023-06-02 23:15:27 +08:00
Haojun Liao
cca69f3038 Merge branch '3.0' into fix/resume_mem 2023-06-02 18:40:48 +08:00
wangmm0220
56f7a137ee fix:conflict 2023-06-02 15:47:53 +08:00
wangmm0220
b2f0d88639 fix:conflict 2023-06-02 15:43:35 +08:00
yihaoDeng
f4bde33dc3 avoid mem leak 2023-06-02 06:06:05 +00:00
Haojun Liao
cce87a036f other: merge 3.0. 2023-06-02 13:34:20 +08:00
Haojun Liao
709e3f5079
Merge pull request #21566 from taosdata/fix/TD-24570
reset ud table name
2023-06-02 13:26:49 +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
Haojun Liao
f1bd829977 refactor: do some internal refactor. 2023-06-02 13:10:54 +08:00
Haojun Liao
27b7d1ec88 refactor: do some internal refactor. 2023-06-02 11:17:44 +08:00
liuyao
27f791ac7f reset ud table name 2023-06-02 11:05:39 +08:00
yihaoDeng
4d0ce625c4 Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/TD-19042 2023-06-01 22:55:30 +08:00
wangmm0220
a7418d439b Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/TD-19042 2023-06-01 22:50:51 +08:00
wangmm0220
56782a5d41 fix:open task case & modify mqRebVgReq encode/decode style 2023-06-01 18:29:16 +08:00
Haojun Liao
ee8a9856cb
Merge pull request #21557 from taosdata/feature/TD-19042
fix:make version compatible
2023-06-01 18:25:37 +08:00
wangmm0220
69499b9582 fix:make version compatible 2023-06-01 16:09:17 +08:00
wangmm0220
d20e0a06f6 fix:make version compatible 2023-06-01 16:04:45 +08:00
wangmm0220
21920721f3 fix:make version compatible 2023-06-01 15:10:08 +08:00
Minglei Jin
9b9bf2de68 meta/tbc: key cannot be null 2023-06-01 10:41:01 +08:00
Haojun Liao
5d98a319c7
Merge pull request #21515 from taosdata/feature/TD-19042
feat: support create topic as stable with conditions
2023-06-01 09:56:55 +08:00
Haojun Liao
5301c5756a other: merge main into 3.0. 2023-06-01 09:29:18 +08:00
Minglei Jin
fb2f367aac meta/split: trim invalidated uids 2023-06-01 08:13:32 +08:00
Haojun Liao
6d04c4e2fd refactor: do some internal refactor. 2023-05-31 19:05:40 +08:00
Haojun Liao
9e021087a9 refactor: do some internal refactor. 2023-05-31 19:04:53 +08:00
Haojun Liao
a3abe25539 refactor: do some internal refactor. 2023-05-31 19:03:37 +08:00
Haojun Liao
fa5c024b3e refactor: do some internal refactor. 2023-05-31 17:22:59 +08:00
Haojun Liao
18b971c666 fix(query): check the version range when dump partial rows of file block to sdata block directly. 2023-05-31 17:06:38 +08:00
Minglei Jin
99d6c5cfa0 Merge branch '3.0' into fix/TD-23549 2023-05-31 15:31:20 +08:00
Benguang Zhao
28efd7dcd7 enh: check trans conflicts in mndTransValidate 2023-05-31 10:53:36 +08:00
wangmm0220
689ee05527 Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/TD-19042 2023-05-30 15:45:46 +08:00
Haojun Liao
d122a398b3
Merge pull request #21516 from taosdata/fix/TD-24447
set sched status
2023-05-30 10:59:28 +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