Commit Graph

79 Commits

Author SHA1 Message Date
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
Shengliang Guan ad94dff047 mionr changes 2022-01-05 04:18:56 -08:00
Xiaoyu Wang 0d4490bce8 TD-12696 bug fix for insert 2022-01-04 22:32:38 -05:00
Shengliang Guan 268c3343d5 minor changes 2022-01-04 04:42:03 -08:00
Shengliang Guan 821b9ea4d3 minor changes 2022-01-04 04:04:23 -08:00
Shengliang Guan e2a6d3e120
Merge pull request #9572 from taosdata/feature/dnode3
Feature/dnode3
2022-01-04 13:39:48 +08:00
Shengliang Guan 9633a2b246 Merge remote-tracking branch 'origin/3.0' into feature/dnode3 2022-01-03 21:34:04 -08:00
dapan1121 c1bbea8caf Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-01-04 11:27:32 +08:00
Liu Jicong 8938c902de merge from 3.0 2022-01-04 10:46:49 +08:00
Liu Jicong 0a83ecac81 add sub structure 2022-01-04 10:40:34 +08:00
Hongze Cheng 729aabca15 refact 2022-01-02 10:29:47 +00:00
Hongze Cheng 8f1a1b7bbc refact 2022-01-02 10:26:32 +00:00
Hongze Cheng 6b6f3f75af refact 2022-01-02 09:27:33 +00:00
dapan1121 d74b91afb9 feature/qnode 2021-12-31 19:31:35 +08:00
Shengliang Guan 97df31ebad unitest for create user 2021-12-31 02:40:49 -08:00
Hongze Cheng 1c57b5e746 batch create table 2021-12-31 08:30:40 +00:00
Hongze Cheng 54af08bc98 fix more 2021-12-31 07:48:21 +00:00
dapan1121 36437b65ce feature/qnode 2021-12-31 14:43:13 +08:00
dapan1121 d7f756b587 Merge remote-tracking branch 'origin/feature/vnode' into feature/qnode 2021-12-31 14:26:39 +08:00
dapan1121 953ef456ef feature/qnode 2021-12-31 14:26:05 +08:00
Hongze Cheng d847bff7d8 Merge branch '3.0' of github.com:taosdata/TDengine into feature/vnode 2021-12-31 13:42:20 +08:00
Hongze Cheng 76e393d4a8 more 2021-12-31 05:41:58 +00:00
dapan1121 2e82b55ad4 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2021-12-31 13:35:15 +08:00
dapan1121 b420338551 feature/qnode 2021-12-31 13:34:38 +08:00
Hongze Cheng dc8bad19df more 2021-12-31 03:45:44 +00:00
Hongze Cheng 8e9183a04a more 2021-12-31 03:39:51 +00:00
Haojun Liao 2010f83715 Merge remote-tracking branch 'origin/3.0' into feature/3.0_liaohj 2021-12-30 15:37:28 +08:00
Haojun Liao b91eb6b80b [td-11818] refactor APIs, and fix bug in show tables; 2021-12-30 15:19:09 +08:00
Shengliang Guan f598d31b00
Merge pull request #9501 from taosdata/feature/dnode3
add support vnodes config
2021-12-30 11:57:44 +08:00
Shengliang Guan 026f6afd36
Merge pull request #9493 from taosdata/feature/vnode
Feature/vnode
2021-12-30 11:56:26 +08:00
Shengliang Guan b2cf6b3496 add support vnodes config 2021-12-29 19:35:46 -08:00
Haojun Liao 0656624db7
Merge pull request #9491 from taosdata/feature/3.0_liaohj
[td-11818] support show tables;
2021-12-30 10:37:26 +08:00
Hongze Cheng 95f3b1403e Merge branch '3.0' into feature/vnode 2021-12-30 10:05:19 +08:00
Haojun Liao be7bccae63 [td-11818] support show tables; 2021-12-29 23:07:01 +08:00
Shengliang Guan 3316c1489a test cases 2021-12-29 05:00:26 -08:00
Shengliang Guan 736c90adfd add qnode test 2021-12-29 04:31:04 -08:00
Hongze Cheng 69acee11ac Merge branch '3.0' into feature/vnode 2021-12-29 20:17:25 +08:00
Hongze Cheng 4e424e19df add more functions 2021-12-29 12:15:56 +00:00
Shengliang Guan c116946740 create bnode and snode 2021-12-29 04:05:10 -08:00
Liu Jicong 7f80c1e969 fix compile 2021-12-29 18:00:42 +08:00
Liu Jicong f3067eb26c merge from 3.0 2021-12-29 17:57:54 +08:00
Liu Jicong 335de53594 add mndconsumer 2021-12-29 17:53:43 +08:00
Hongze Cheng a514dfe470 more work 2021-12-29 09:20:10 +00:00
Shengliang Guan 222b1d562d Merge remote-tracking branch 'origin/3.0' into feature/dnode3 2021-12-29 00:26:55 -08:00
Hongze Cheng 1450652187 add table meta msg 2021-12-29 07:47:45 +00:00
Shengliang Guan 4c11d0bc76 Merge remote-tracking branch 'origin/3.0' into feature/dnode3 2021-12-28 22:36:54 -08:00
Hongze Cheng 402b851cf2 more 2021-12-29 11:49:13 +08:00
Shengliang Guan 86e7dd3a61 Merge remote-tracking branch 'origin/3.0' into feature/dnode3 2021-12-28 18:08:19 -08:00
Hongze Cheng 311b044e02 Merge branch '3.0' into feature/vnode 2021-12-28 20:40:16 +08:00