Commit Graph

3576 Commits

Author SHA1 Message Date
Minghao Li 6de1a73d4e Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/3.0_mhli 2022-06-02 13:21:23 +08:00
Cary Xu 08192fd05c
Merge pull request #13401 from taosdata/feature/TD-11274-3.0
other: code optimization and do more check
2022-06-02 12:28:21 +08:00
Liu Jicong f2048b00cb fix(tmq): subscribe stb 2022-06-02 11:01:05 +08:00
Cary Xu 6a7fb64086 Merge branch '3.0' into feature/TD-11274-3.0 2022-06-02 10:22:51 +08:00
Cary Xu 7fceb5a709 other: code optimization and do more check 2022-06-02 10:22:34 +08:00
Liu Jicong e1fd4a6640 feat(tmq): get_db api 2022-06-02 10:18:11 +08:00
Liu Jicong 671d06efd2
Merge pull request #13394 from taosdata/feature/tq
refactor(tmq): push mode
2022-06-01 22:55:06 +08:00
Shengliang Guan cc0f91658e
Merge pull request #13392 from taosdata/fix/tsim
enh: add creating and dropping states to mnode
2022-06-01 22:34:14 +08:00
Liu Jicong f3b680f630 refactor(tmq): push mode 2022-06-01 22:22:14 +08:00
Shengliang Guan d56c574fe4 enh: add creating and dropping states to mnode 2022-06-01 21:39:04 +08:00
Shengliang Guan 95c9dea9d6
Merge pull request #13391 from taosdata/fix/tsim
enh: add creating and dropping states to mnode
2022-06-01 21:38:59 +08:00
Shengliang Guan 1907c0e66c enh: add creating and dropping states to mnode 2022-06-01 21:16:22 +08:00
Liu Jicong c2f7023024 Merge branch '3.0' into feature/tq 2022-06-01 20:01:21 +08:00
Liu Jicong 135836c729 fix(tmq): tq deserialize msg 2022-06-01 19:57:03 +08:00
Shengliang Guan c01a898df8
Merge pull request #13379 from taosdata/fix/tsim
feat: increase the number of database replicas
2022-06-01 18:25:41 +08:00
Liu Jicong 5ca27cd440
Merge pull request #13378 from taosdata/feature/tq
refactor(tmq): tq sink and push
2022-06-01 17:39:55 +08:00
Shengliang Guan 36465ca29b feat: increase the number of database replicas 2022-06-01 17:35:27 +08:00
Shengliang Guan 141be56075 Merge remote-tracking branch 'origin/3.0' into fix/tsim 2022-06-01 17:31:47 +08:00
Shengliang Guan 7fcfd45a03 feat: increase the number of database replicas 2022-06-01 17:26:36 +08:00
Liu Jicong e1a5000e50 refactor(tmq): tq sink and push 2022-06-01 17:26:15 +08:00
Hongze Cheng 8e1a922057 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/row_refact 2022-06-01 07:32:09 +00:00
Cary Xu 737820ee24
Merge pull request #13371 from taosdata/feature/TD-14481-3.0
feat: tsma/rsma refactor
2022-06-01 15:24:27 +08:00
WANG MINGMING 8be47d5695
Merge pull request #13334 from taosdata/feat/tag_refact
feat:add new logic for new tag format
2022-06-01 15:09:43 +08:00
Cary Xu 648e0ac1c1 Merge branch '3.0' into feature/TD-14481-3.0 2022-06-01 15:08:44 +08:00
Cary Xu 15b25eeec5 feat: tsma/rsma refactor 2022-06-01 15:06:12 +08:00
Zhiqiang Wang 803ed0e3fd
Merge pull request #13349 from taosdata/fix/ZhiqiangWang/TD-15848-add-log-data-dir-configure
fix(os): add log data dir configure
2022-06-01 14:33:45 +08:00
Liu Jicong 87a85bf0d9 Merge branch '3.0' into feature/tq 2022-06-01 13:38:22 +08:00
Liu Jicong 98f62165ae refactor(tmq): tq meta 2022-06-01 13:37:33 +08:00
Shengliang Guan c388099efb refactor: adjust trans conflict dbname 2022-06-01 13:37:21 +08:00
wangmm0220 588c4f5abf Merge branch '3.0' into feat/tag_refact 2022-06-01 13:25:41 +08:00
Shengliang Guan 553122a41e
Merge pull request #13356 from taosdata/fix/tsim
refactor: adjust error msg
2022-06-01 13:24:33 +08:00
Shengliang Guan 2cbb30a0db refactor: adjust error msg 2022-06-01 12:11:31 +08:00
afwerar 8908407918 fix(os): add log data dir configure 2022-06-01 11:33:15 +08:00
Liu Jicong 2aacbfee10
Merge pull request #13341 from taosdata/feature/tq
fix(tmq): auto unsubscribe when consumer close
2022-06-01 10:42:14 +08:00
Shengliang Guan 68a2cb4ae8
Merge pull request #13340 from taosdata/fix/tsim
fix: the role should be OFFLINE after mnode stopped
2022-06-01 10:39:13 +08:00
Liu Jicong 6874016b43 Merge branch '3.0' into feature/tq 2022-06-01 10:30:10 +08:00
wangmm0220 f99e66df32 fix:fix error in new tag format 2022-06-01 10:29:10 +08:00
Liu Jicong 66899bd8d0 fix(tmq): auto unsubscribe when consumer close 2022-06-01 10:27:41 +08:00
Shengliang Guan e10edb80ef fix: the role should be OFFLINE after mnode stopped 2022-06-01 10:21:27 +08:00
Shengliang Guan 321e23fe7b
Merge pull request #13339 from taosdata/fix/tsim
fix: the max number of mnodes is limited to 3
2022-06-01 10:13:37 +08:00
wangmm0220 172834bc59 feat:fix conflict merge from 3.0 2022-06-01 09:58:58 +08:00
Shengliang Guan a6fe2f6862 refactor: make trans support db conflict 2022-06-01 09:55:25 +08:00
Shengliang Guan e610237e5b fix: the max number of mnodes is limited to 3 2022-06-01 09:53:25 +08:00
Zhiqiang Wang d5146ad923
Merge pull request #13337 from taosdata/fix/ZhiqiangWang/TD-15848-delete-two-win-ctest
fix(os): delete two win ctest
2022-06-01 09:44:56 +08:00
Shengliang Guan 70e6e15920 Merge branch 'fix/mnode' into fix/tsim 2022-06-01 09:41:54 +08:00
Shengliang Guan 8baf32fc23 fix: the max number of mnodes is limited to 3 2022-06-01 09:41:43 +08:00
afwerar 7c18d2f453 fix(os): delete two win ctest 2022-06-01 09:30:33 +08:00
Shengliang Guan 1035312f1c refactor: make trans support db conflict 2022-06-01 09:25:45 +08:00
wangmm0220 19b0932781 feat:merge from 3.0 2022-05-31 23:46:04 +08:00
wangmm0220 51b5e35933 feat:add new logic for new tag format 2022-05-31 23:38:21 +08:00