Commit Graph

1719 Commits

Author SHA1 Message Date
Haojun Liao a2545549bd [td-11818] merge 3.0 2022-01-10 23:20:43 +08:00
Shengliang Guan 9f1f333d68
Merge pull request #9719 from taosdata/feature/dnode3
Feature/dnode3
2022-01-10 20:51:42 +08:00
Shengliang Guan dcda885a36
Merge pull request #9717 from taosdata/feature/3.0_wxy
TD-12678 datasink to json
2022-01-10 20:46:02 +08:00
Shengliang Guan a326b29021 minor changes 2022-01-10 04:44:11 -08:00
Xiaoyu Wang 867f6ba8f3 TD-12678 datasink to json 2022-01-10 06:59:10 -05: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 73675bc537 Merge remote-tracking branch 'origin/3.0' into feature/vnode 2022-01-10 02:13:36 -08:00
Shengliang Guan 91430320c7
Merge pull request #9708 from taosdata/feature/dnode3
Feature/dnode3
2022-01-10 18:13:09 +08:00
Shengliang Guan 519fce0f61
Merge pull request #9707 from taosdata/feature/3.0_wxy
TD-12678 bug fix
2022-01-10 18:06:01 +08:00
Hongze Cheng 1c963ec764 fix stuck 2022-01-10 10:01:56 +00:00
Shengliang Guan 0ead2f5354 Merge branch 'feature/vnode' of https://github.com/taosdata/TDengine into feature/vnode 2022-01-10 01:48:55 -08:00
Shengliang Guan 0d484a1023 minor changes 2022-01-10 01:48:39 -08:00
Xiaoyu Wang 7508af0057 TD-12678 bug fix 2022-01-10 04:48:30 -05:00
Hongze Cheng 6c89b0ec63 more tkv 2022-01-10 09:08:58 +00: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
Hongze Cheng 109a891b39 add one line 2022-01-10 08:53:57 +00:00
Shengliang Guan 2af3b3a2bc Merge remote-tracking branch 'origin/3.0' into feature/dnode3 2022-01-10 00:31:52 -08:00
Shengliang Guan 155978b883 minor changes 2022-01-10 00:31:50 -08:00
Liu Jicong 3d7b737bbc fix compile error 2022-01-10 16:23:35 +08:00
Liu Jicong 7437c5dd71 Merge branch '3.0' into feature/tq 2022-01-10 16:18:05 +08:00
Liu Jicong 1e17d776f9 fix crash 2022-01-10 16:13:05 +08:00
Shengliang Guan 6835b68987 minor changes 2022-01-10 00:00:37 -08:00
Shengliang Guan ef05688e6d Merge branch 'feature/dnode3' into feature/vnode 2022-01-09 23:18:21 -08:00
Shengliang Guan d23d223fdc minor changes 2022-01-09 23:15:37 -08:00
Hongze Cheng d9343722aa Merge branch 'feature/tkv' of https://github.com/taosdata/TDengine into feature/vnode 2022-01-10 06:55:04 +00:00
Hongze Cheng 788ecf5e78 fix possible coredump 2022-01-10 06:43:14 +00:00
Hongze Cheng dc3a7ae946 fix commit issue 2022-01-10 06:30:50 +00:00
Xiaoyu Wang 87411e72a8 TD-12678 bug fix 2022-01-10 01:30:12 -05:00
Hongze Cheng df202e6d5d make commit work 2022-01-10 06:09:03 +00:00
Hongze Cheng 4c6f7d90cd more 2022-01-10 05:41:43 +00:00
Hongze Cheng d7f7e3272f Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/vnode 2022-01-10 05:32:24 +00:00
Hongze Cheng a511aed8d5 more 2022-01-10 05:30:20 +00:00
Shengliang Guan caeab780c6 dnode restart error while vnode size is 0 2022-01-09 21:22:41 -08:00
Hongze Cheng 8d8b7b1c00 more 2022-01-10 03:40:43 +00:00
Hongze Cheng a04b6dba7a more 2022-01-10 02:55:36 +00:00
Shengliang Guan 95347ff6e1 Merge remote-tracking branch 'origin/3.0' into feature/dnode3 2022-01-09 18:50:01 -08:00
Shengliang Guan 371432c143 minor changes 2022-01-09 18:49:48 -08:00
Shengliang Guan 5b5917136f
Merge pull request #9698 from taosdata/feature/3.0_wxy
TD-12678 qSetSubplanExecutionNode interface implement
2022-01-10 10:48:39 +08:00
Shengliang Guan 00faaa4137
Merge pull request #9692 from taosdata/feature/3.0_liaohj
Feature/3.0 liaohj
2022-01-10 10:48:16 +08:00
Shengliang Guan d861c05468
Merge pull request #9691 from taosdata/feature/index_complete
add tfile analysis tool
2022-01-10 10:47:57 +08:00
Xiaoyu Wang 6271f002ee TD-12678 qSetSubplanExecutionNode interface implement 2022-01-09 21:33:41 -05:00
Xiaoyu Wang 014471530f TD-12678 qSetSubplanExecutionNode interface implement 2022-01-09 21:31:23 -05:00
dapan1121 180eba5b23 feature/qnode 2022-01-10 09:32:10 +08:00
Hongze Cheng 041c977c5d Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/vnode 2022-01-10 01:23:59 +00:00
dapan 7791d68d48 feature/qnode 2022-01-09 18:08:04 +08:00
yihaoDeng cdaf97cb0e validate tfile 2022-01-09 00:06:03 +08:00
yihaoDeng 15c0275333 validate tfile 2022-01-08 23:58:51 +08:00