Commit graph

328 commits

Author SHA1 Message Date
Liu Jicong
d9544f8d33 fix hb crash 2022-01-17 20:01:36 +08:00
Liu Jicong
354da6727a fix hb crash 2022-01-17 19:56:33 +08:00
Shengliang Guan
a15551d6f9 minor changes 2022-01-16 23:38:50 -08:00
Haojun Liao
7f53f2d1a0 [td-11818] merge 3.0. 2022-01-17 11:19:29 +08:00
dapan1121
7b8e19da56
Merge pull request #9804 from taosdata/feature/qnode
Feature/qnode
2022-01-14 18:58:45 +08:00
Liu Jicong
cc64e9e425 merge topic 2022-01-14 18:40:40 +08:00
Haojun Liao
2f3a58f8d6 [td-11818]support taos_create_topic 2022-01-14 18:35:57 +08:00
Liu Jicong
c5ece5715c set refObjId to 0 2022-01-14 17:30:57 +08:00
Liu Jicong
aa9a5b6f67 add test for new heartbeat 2022-01-14 15:54:07 +08:00
Liu Jicong
023289e51b Merge branch '3.0' into feature/tq 2022-01-14 10:53:55 +08:00
Liu Jicong
3b69bde0ce add mq defination 2022-01-14 10:48:05 +08:00
dapan1121
5cf4edacbb feature/qnode 2022-01-12 18:40:22 +08:00
dapan1121
8f0f1f01f8 Merge remote-tracking branch 'origin/feature/3.0_liaohj' into feature/qnode 2022-01-11 15:52:08 +08:00
Haojun Liao
a2545549bd [td-11818] merge 3.0 2022-01-10 23:20:43 +08:00
Shengliang Guan
a326b29021 minor changes 2022-01-10 04:44:11 -08:00
Haojun Liao
2d53617d5c [td-11818] support select * on child table. 2022-01-10 19:48:21 +08:00
Shengliang Guan
3b379f7be0 Merge remote-tracking branch 'origin/3.0' into feature/dnode3 2022-01-10 03:32:29 -08:00
Haojun Liao
506dd5905a Merge remote-tracking branch 'origin/3.0' into feature/3.0_liaohj 2022-01-10 18:13:55 +08:00
Shengliang Guan
731c18fefb Merge remote-tracking branch 'origin/3.0' into feature/vnode 2022-01-10 00:56:11 -08:00
Shengliang Guan
19e3f91df5 minor changes 2022-01-10 00:55:56 -08:00
Liu Jicong
7437c5dd71 Merge branch '3.0' into feature/tq 2022-01-10 16:18:05 +08:00
Shengliang Guan
6835b68987 minor changes 2022-01-10 00:00:37 -08:00
Shengliang Guan
33a60b6044 minor changes 2022-01-07 23:20:18 -08:00
Shengliang Guan
b472f95f32 Merge remote-tracking branch 'origin/3.0' into feature/dnode3 2022-01-07 02:13:44 -08:00
Shengliang Guan
2164fc3f80 minor changes 2022-01-07 02:03:28 -08:00
Liu Jicong
29cb7c6792 implement client heartbeat 2022-01-07 17:36:34 +08:00
Hongze Cheng
9696e74eaa
Merge pull request #9675 from taosdata/feature/vnode
Feature/vnode
2022-01-07 17:25:24 +08:00
Liu Jicong
57d341706b implement client heartbeat 2022-01-07 14:57:45 +08:00
dapan1121
8c4687c2f4
Merge branch '3.0' into feature/qnode 2022-01-07 14:41:47 +08:00
Hongze Cheng
c9e1dd4e8b Merge branch '3.0' into feature/vnode 2022-01-07 05:43:37 +00:00
Shengliang Guan
33a80e6913 Merge remote-tracking branch 'origin/3.0' into feature/dnode3 2022-01-06 19:46:37 -08:00
Shengliang Guan
19f161dd58
Merge pull request #9663 from taosdata/feature/tq
refine heartbeat framework
2022-01-07 10:54:29 +08:00
Liu Jicong
7583b45ecb refine heartbeat interface 2022-01-07 10:40:05 +08:00
Hongze Cheng
dc081e5228 Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/vnode 2022-01-07 02:35:03 +00:00
dapan1121
41b8ea6e46 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-01-07 09:58:36 +08:00
Shengliang Guan
cdb3fd2450 minor changes 2022-01-06 04:17:25 -08:00
Shengliang Guan
61136183a4
Merge pull request #9656 from taosdata/feature/dnode3
add batch for create_table
2022-01-06 20:04:20 +08:00
Liu Jicong
8a437a89dc add heartbeat framework 2022-01-06 18:17:08 +08:00
Hongze Cheng
ae426947d3 more integration 2022-01-06 10:11:28 +00:00
Shengliang Guan
d5e8981232 Send EP list when versions are different 2022-01-06 02:08:13 -08:00
Shengliang Guan
93153bd276 minor changes 2022-01-06 01:04:48 -08:00
Shengliang Guan
d10df1e3a8 minor changes 2022-01-06 00:17:41 -08:00
dapan1121
c85047f34b Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-01-06 15:31:02 +08:00
dapan1121
0adbbe080c feature/qnode 2022-01-06 15:30:32 +08:00
Hongze Cheng
96f2aea215 Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/vnode 2022-01-06 14:49:21 +08:00
Liu Jicong
b0d935ba7d merge from 3.0 2022-01-06 10:56:25 +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
Shengliang Guan
ad94dff047 mionr changes 2022-01-05 04:18:56 -08:00
Hongze Cheng
0db40add06 fix insert bug 2022-01-05 10:07:41 +00:00