Commit Graph

23240 Commits

Author SHA1 Message Date
Haojun Liao 89d7eb2d29 Merge remote-tracking branch 'origin/3.0_query_integrate' into 3.0_query_integrate 2022-03-10 23:13:44 +08:00
Haojun Liao cc53df1a01 [td-13039] fix bug in creating streamscanner. 2022-03-10 23:12:34 +08:00
Shengliang Guan 7912d6627d Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-10 21:27:12 +08:00
Shengliang Guan d1a913d8b2 shm 2022-03-10 21:25:55 +08:00
Liu Jicong 00c5307d51 refactor 2022-03-10 20:48:38 +08:00
Shengliang Guan c6e6ac214d shm 2022-03-10 20:40:52 +08:00
Xiaoyu Wang e5d32e307e
Merge pull request #10688 from taosdata/feature/3.0_query_integrate_wxy
TD-13747 deal memory leaks
2022-03-10 19:59:35 +08:00
Xiaoyu Wang 1e9b417f73 TD-13747 deal memory leaks 2022-03-10 06:58:07 -05:00
Xiaoyu Wang 87c87987b9
Merge pull request #10687 from taosdata/feature/3.0_query_integrate_wxy
TD-13747 deal memory leaks
2022-03-10 19:33:20 +08:00
Xiaoyu Wang 84f60fcc0a TD-13747 deal memory leaks 2022-03-10 06:32:39 -05:00
yihaoDeng b2c24a0338 modify transport 2022-03-10 19:32:26 +08:00
Minghao Li 88aef2d1ab sync refactor 2022-03-10 19:21:02 +08:00
Haojun Liao 3122566d2a
Update basic1.sim 2022-03-10 19:18:02 +08:00
Haojun Liao 56f38425a9 [td-13039] fix bug. 2022-03-10 19:14:36 +08:00
Zhiqiang Wang c0864a80cf
Merge pull request #10684 from taosdata/fix/ZhiqiangWang/TD-13770-redefine-system-api
[TD-13770]<fix>: redefine system api.
2022-03-10 18:14:31 +08:00
Haojun Liao 8196b6ee9a [td-13039] refactor. 2022-03-10 18:07:07 +08:00
afwerar 6b6c43646d [TD-13770]<fix>: redefine system api. 2022-03-10 18:06:20 +08:00
Liu Jicong 94bc3a6e52
Merge pull request #10680 from taosdata/feature/tq
add mnode stream
2022-03-10 17:22:36 +08:00
Liu Jicong e766f3fad4 add mnode stream 2022-03-10 17:15:45 +08:00
Xiaoyu Wang 8ee10d50da
Merge pull request #10679 from taosdata/feature/3.0_query_integrate_wxy
TD-13747 bugfix
2022-03-10 17:00:47 +08:00
Xiaoyu Wang e055dd5fd7 TD-13747 bugfix 2022-03-10 03:58:51 -05:00
Minghao Li 73d768d273 sync refactor 2022-03-10 16:54:26 +08:00
Shengliang Guan c673ad9334 shm 2022-03-10 16:49:09 +08:00
Xiaoyu Wang 40dd568dd7
Merge pull request #10678 from taosdata/feature/3.0_query_integrate_wxy
TD-13747 bugfix
2022-03-10 16:35:26 +08:00
Xiaoyu Wang 54afca4d57 TD-13747 bugfix 2022-03-10 03:34:31 -05:00
Li Minghao 19438fbbf0
Merge pull request #10659 from taosdata/feature/3.0_mhli
Feature/3.0 mhli
2022-03-10 16:28:30 +08:00
Haojun Liao ae9f58af45 Merge remote-tracking branch 'origin/3.0_query_integrate' into 3.0_query_integrate 2022-03-10 16:20:03 +08:00
Haojun Liao b57f7414e2 [td-13039] refactor. 2022-03-10 16:18:35 +08:00
Minghao Li 901b5976cc Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/3.0_mhli 2022-03-10 16:18:32 +08:00
Minghao Li 889d1339e5 sync refactor 2022-03-10 16:18:16 +08:00
Zhiqiang Wang 6e378345f2
Merge pull request #10676 from taosdata/fix/ZhiqiangWang/TD-13769-modify-sysinfo-code
[TD-13769]<fix>: modify sysinfo code.
2022-03-10 16:11:57 +08:00
afwerar 306dbdc057 [TD-13769]<fix>: modify sysinfo code. 2022-03-10 16:03:55 +08:00
Cary Xu 7bef44aa41
Merge pull request #10662 from taosdata/feature/TD-11463-3.0
reset smsStatWindow
2022-03-10 15:42:01 +08:00
Xiaoyu Wang 5b5ac34d5c
Merge pull request #10675 from taosdata/feature/3.0_query_integrate_wxy
TD-13747 file name organize
2022-03-10 15:38:23 +08:00
Xiaoyu Wang a01f8d447f Merge remote-tracking branch 'origin/3.0_query_integrate' into feature/3.0_query_integrate_wxy 2022-03-10 02:36:26 -05:00
Xiaoyu Wang da0fa26717 TD-13747 src file name organize 2022-03-10 02:36:06 -05:00
Cary Xu 7ad5e7429f ajust STSma definition 2022-03-10 15:34:15 +08:00
Haojun Liao ddbe4095ed [td-13039] fix bug in agg query of ordinary table. 2022-03-10 15:24:05 +08:00
Shengliang Guan cebcfc9115 shm 2022-03-10 14:46:53 +08:00
Minghao Li ebeb4bb7a6 sync refactor 2022-03-10 14:34:02 +08:00
Shengliang Guan 3e30f72068 shm 2022-03-10 14:06:28 +08:00
yihaoDeng fdb64e7c5d test 2022-03-10 13:50:40 +08:00
Zhiqiang Wang 13e1d70eea
Merge pull request #10669 from taosdata/fix/ZhiqiangWang/TD-13766-redefine-sleep-api
[TD-13766]<fix>: redefine sleep api.
2022-03-10 13:03:27 +08:00
Shuduo Sang e63f352f8b
Feature/sangshuduo/td 13558 taos shell refactor (#10661)
* [TD-13558]<feature>: taos shell refactor

add taosTools as submodule

* add tools/taos-tools

* add more client interface for taosTools compile

* update taos-tools

* update taos-tools
2022-03-10 12:02:55 +08:00
afwerar 651b3971c0 [TD-13766]<fix>: redefine sleep api. 2022-03-10 11:56:11 +08:00
Xiaoyu Wang dc01600a19
Merge pull request #10668 from taosdata/feature/3.0_query_integrate_wxy
TD-13747 bugfix
2022-03-10 11:32:26 +08:00
Xiaoyu Wang 1648754f02 TD-13747 bugfix 2022-03-09 22:31:23 -05:00
Minghao Li a51e576126 sync refactor 2022-03-10 11:21:04 +08:00
Haojun Liao e56e55f34e Merge remote-tracking branch 'origin/3.0_query_integrate' into 3.0_query_integrate 2022-03-10 11:13:08 +08:00
Haojun Liao 8345a5429b [td-13039] add min/max/systable-scanner. 2022-03-10 11:12:44 +08:00