Commit Graph

20770 Commits

Author SHA1 Message Date
Shengliang Guan 41d8c7a612 minor changes 2022-01-05 21:20:20 -08:00
Shengliang Guan d2238d38d4 Merge remote-tracking branch 'origin/3.0' into feature/dnode3 2022-01-05 20:22:36 -08:00
Shengliang Guan db2dbe5f51 pullup trans when mnode restart 2022-01-05 20:22:33 -08:00
Shengliang Guan cf0ecbae0e
Merge pull request #9627 from taosdata/feature/3.0_liaohj
[td-11818] free still reachable buffer.
2022-01-06 11:21:44 +08:00
Shengliang Guan 45f9eaa01c
Merge pull request #9628 from taosdata/feature/tq
Feature/tq
2022-01-06 11:21:21 +08:00
Shengliang Guan c71c111da0
Merge pull request #9621 from taosdata/feature/index_complete
Feature/index complete
2022-01-06 11:21:03 +08:00
Haojun Liao 4725b4e020 [td-11818] fix crash in create database. 2022-01-06 11:16:26 +08:00
Liu Jicong b0d935ba7d merge from 3.0 2022-01-06 10:56:25 +08:00
Haojun Liao b00bc84157 [td-11818] free still reachable buffer. 2022-01-06 10:55:20 +08:00
Shengliang Guan 33d8177e13
Merge pull request #9626 from taosdata/CI/3.0
[TD-12758]<CI>add unit test in 3.0 CI
2022-01-06 10:52:50 +08:00
Liu Jicong df554c03fc handle merge conflict 2022-01-06 10:44:34 +08:00
Liu Jicong 0ba5427a9b handle subscribe 2022-01-06 10:28:34 +08:00
liuyq-617 0d4169102c udpate 2022-01-06 10:27:00 +08:00
liuyq-617 d7fc6e17f9 revert 2022-01-06 10:26:22 +08:00
liuyq-617 308faffccd [TD-12758]<CI>add unit test in 3.0 CI 2022-01-06 10:18:17 +08:00
yihaoDeng ccbbac4eef refactor code 2022-01-05 23:54:05 +08:00
yihaoDeng 2e0dc58890 refactor code 2022-01-05 22:56:08 +08:00
Shengliang Guan 3c3f32bdae minor changes 2022-01-05 05:17:16 -08:00
Shengliang Guan ad1e992951
Merge pull request #9619 from taosdata/feature/dnode3
rename some variables
2022-01-05 20:29:30 +08:00
Shengliang Guan ad94dff047 mionr changes 2022-01-05 04:18:56 -08:00
Shengliang Guan d10a47330b
Merge pull request #9615 from taosdata/feature/index_complete
refactor code
2022-01-05 19:36:16 +08:00
yihaoDeng 7d29af7316 refactor code 2022-01-05 19:22:06 +08:00
yihaoDeng 11eb2719f8 refactor code 2022-01-05 19:17:14 +08:00
Shengliang Guan 11d6b02aa4 minor changes 2022-01-05 02:35:34 -08:00
Shengliang Guan 9e3a6804a9 add show test 2022-01-05 02:20:59 -08:00
Shengliang Guan 2da55e1c71
Merge pull request #9614 from taosdata/feature/dnode3
fix gtest errors
2022-01-05 18:20:19 +08:00
Shengliang Guan fdca2ec4bf minor changes 2022-01-05 02:18:47 -08:00
Shengliang Guan 69349c38d4 fix gtest errors 2022-01-05 02:08:56 -08:00
Haojun Liao f65da854a5
Merge pull request #9613 from taosdata/feature/3.0_liaohj
Feature/3.0 liaohj
2022-01-05 18:06:03 +08:00
Haojun Liao 7916c1e622 [td-11818] fix memory leak and refactor. 2022-01-05 17:49:15 +08:00
Shengliang Guan 5ba5bc79d7
Merge pull request #9611 from taosdata/feature/dnode3
when an error occurs in rollback or retry, the failed result is returned first
2022-01-05 17:41:30 +08:00
Shengliang Guan d32d44f14e
Merge pull request #9609 from taosdata/feature/qnode
Feature/qnode
2022-01-05 17:41:20 +08:00
Shengliang Guan 92b6782d19 Merge remote-tracking branch 'origin/3.0' into feature/dnode3 2022-01-05 01:31:30 -08:00
Shengliang Guan 3bd4210765 When an error occurs in rollback or retry, the failed result is returned first 2022-01-05 01:31:13 -08:00
dapan1121 4728b159c7 feature/qnode 2022-01-05 16:00:06 +08:00
Shengliang Guan 9dd5922d15 error returned when trans rollback 2022-01-04 22:36:24 -08:00
Haojun Liao 27224db24b [td-11818] fix memory leak and refactor code. 2022-01-05 14:09:02 +08:00
Shengliang Guan e4c3d8fb24
Merge pull request #9598 from taosdata/feature/index_complete
Feature/index complete
2022-01-05 11:50:56 +08:00
Hongze Cheng 43f9702bd6
Merge pull request #9599 from taosdata/feature/3.0_wxy
TD-12696 bug fix for insert
2022-01-05 11:49:04 +08:00
Xiaoyu Wang 17b9917bfa TD-12696 bug fix for insert 2022-01-04 22:43:29 -05:00
Xiaoyu Wang 0d4490bce8 TD-12696 bug fix for insert 2022-01-04 22:32:38 -05:00
Hongze Cheng 3e0960c029
Merge pull request #9596 from taosdata/feature/vnode
Feature/vnode
2022-01-05 11:26:29 +08:00
Shengliang Guan ad965dbcb4 invalid release 2022-01-04 19:25:58 -08:00
yihaoDeng 5567613976 merge develop 2022-01-05 10:54:08 +08:00
Haojun Liao 4d33cb8f64 Merge remote-tracking branch 'origin/3.0' into feature/3.0_liaohj 2022-01-05 10:34:17 +08:00
Hongze Cheng c9eacf95c5 Merge branch '3.0' of github.com:taosdata/TDengine into feature/vnode 2022-01-05 10:31:16 +08:00
Shengliang Guan b697bf9aaf
Merge pull request #9595 from taosdata/feature/dnode3
fix crash while process transmsg
2022-01-05 10:30:33 +08:00
Shengliang Guan 6ae9a421e0 fix crash while process transmsg 2022-01-04 18:27:11 -08:00
Haojun Liao 27d5c71c6c Merge remote-tracking branch 'origin/3.0' into feature/3.0_liaohj 2022-01-05 10:17:54 +08:00
dapan1121 0baa818efc Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-01-05 10:12:55 +08:00