Commit Graph

20485 Commits

Author SHA1 Message Date
Hongze Cheng e34ef9191e Merge branch '3.0' into feature/vnode 2021-12-27 18:05:14 +08:00
Hongze Cheng b898fc0e1c more 2021-12-27 18:03:26 +08:00
Shengliang Guan 08e32652b7 removde http testcases 2021-12-27 01:59:18 -08:00
Hongze Cheng 221c8254cf more 2021-12-27 17:17:07 +08:00
Shengliang Guan 4224343001 add test cases 2021-12-27 01:14:20 -08:00
Shengliang Guan 073f6b5e39
Merge pull request #9411 from taosdata/feature/3.0_liaohj
Feature/3.0 liaohj
2021-12-27 16:46:44 +08:00
Haojun Liao 0f2f421600 [td-11818] resolve conflict. 2021-12-27 16:23:10 +08:00
Haojun Liao 2d256bd8fa [td-11818]refactor. 2021-12-27 16:17:56 +08:00
Haojun Liao 43d1e3f788 [td-11818] fix bug. 2021-12-27 16:10:39 +08:00
Shengliang Guan f6149011bb
Merge pull request #9407 from taosdata/feature/dnode3
minor changes
2021-12-27 15:43:46 +08:00
Hongze Cheng 6c0c1b222f more 2021-12-27 15:32:51 +08:00
Shengliang Guan 4982b48f6f minor changes 2021-12-26 23:29:58 -08:00
Haojun Liao e661d95aa0 [td-11818] refactor. 2021-12-27 15:19:10 +08:00
Shengliang Guan 4c7b587d4e
Merge pull request #9404 from taosdata/feature/dnode3
Feature/dnode3
2021-12-27 15:15:57 +08:00
Shengliang Guan b77149240f fix msg error 2021-12-26 23:15:03 -08:00
Shengliang Guan 68fd418c73 Merge remote-tracking branch 'origin/feature/3.0_liaohj' into feature/dnode3 2021-12-26 22:31:04 -08:00
Shengliang Guan 0b14f73668 minor changes 2021-12-26 22:27:32 -08:00
Haojun Liao 36b98707d9 [td-11818] merge 3.0 2021-12-27 14:15:15 +08:00
Shengliang Guan 8420c3aab2 remove mgmtq 2021-12-27 13:19:18 +08:00
Shengliang Guan 6160aa6e07 mgmt queue 2021-12-26 19:56:37 -08:00
Shengliang Guan bb3a0b21d2 change clusterid from int32 to int64 2021-12-26 19:14:19 -08:00
Shengliang Guan 791c6c849e adjust status msg 2021-12-26 18:47:14 -08:00
Shengliang Guan c1605db693 Merge remote-tracking branch 'origin/3.0' into feature/dnode3 2021-12-26 17:47:01 -08:00
Shengliang Guan 9fe4651081
Merge pull request #9396 from taosdata/origin/feature/index_cache
add flush-helper function
2021-12-27 09:46:28 +08:00
Shengliang Guan 408b1168a7
Merge pull request #9397 from taosdata/feature/qnode
Feature/qnode
2021-12-27 09:46:14 +08:00
dapan1121 0be1920188 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2021-12-27 08:20:03 +08:00
Shengliang Guan 0d11825d38 refact trans 2021-12-26 23:46:22 +08:00
yihaoDeng f99f6ec87e add flush-helper function 2021-12-26 23:31:16 +08:00
Shengliang Guan c5b42e5706
Merge pull request #9394 from taosdata/feature/index_cache
add iterator interface for fst
2021-12-26 21:01:14 +08:00
dapan 8febfa11aa Merge remote-tracking branch 'origin/3.0' into feature/qnode 2021-12-26 20:35:55 +08:00
dapan 250e5152a0 feature/qnode 2021-12-26 20:05:24 +08:00
yihaoDeng f45119ea5e add iterator interface for fst 2021-12-26 15:09:21 +08:00
Shengliang Guan 3052e8e154
Merge pull request #9392 from taosdata/feature/index_cache
Feature/index cache
2021-12-26 10:58:15 +08:00
Shengliang Guan 60be4f7331
Merge pull request #9389 from taosdata/feature/vnode
more
2021-12-26 10:58:02 +08:00
dapan 13d4406774 catalog ut 2021-12-25 21:29:42 +08:00
yihaoDeng 0365c67b81 Combine the search results of cache and tfile And Update cache code 2021-12-25 19:16:05 +08:00
Hongze Cheng 9ab51149d1 more 2021-12-25 17:32:25 +08:00
Hongze Cheng fea6562a29 more 2021-12-25 16:54:28 +08:00
Hongze Cheng 5f0cf0acd4 Merge branch '3.0' into feature/vnode 2021-12-25 16:29:05 +08:00
Hongze Cheng 435de712ad more 2021-12-25 16:25:57 +08:00
Shengliang Guan d3157a2d32
Merge pull request #9388 from taosdata/feature/dnode3
minor changes
2021-12-25 16:19:43 +08:00
Shengliang Guan a927ca8bc4 minor changes 2021-12-25 16:11:57 +08:00
Hongze Cheng 85a53ac1fa Merge branch '3.0' into feature/vnode 2021-12-25 16:11:47 +08:00
Shengliang Guan 6701bccaaf
Merge pull request #9386 from taosdata/feature/dnode3
Feature/dnode3
2021-12-25 16:09:07 +08:00
Shengliang Guan be06f24c46 minor changes 2021-12-25 16:05:18 +08:00
Hongze Cheng e5b4126752 Merge branch '3.0' into feature/vnode 2021-12-25 15:57:37 +08:00
Hongze Cheng 05baf88df8 more 2021-12-25 15:50:12 +08:00
Shengliang Guan 406a350476 Merge remote-tracking branch 'origin/3.0' into feature/dnode3 2021-12-25 15:47:17 +08:00
Shengliang Guan 1a2b987a72 Merge remote-tracking branch 'origin/feature/vnode' into feature/dnode3 2021-12-25 15:24:53 +08:00
Hongze Cheng 67cc6839b2 more 2021-12-25 15:04:48 +08:00