Commit Graph

2352 Commits

Author SHA1 Message Date
Liu Jicong af67c49f0e
Merge branch '3.0' into feature/tq 2022-03-22 19:25:55 +08:00
Liu Jicong afe8439095 fix typo 2022-03-22 19:00:05 +08:00
Haojun Liao 3a6be84b80 [td-13039] support group by. 2022-03-22 18:17:04 +08:00
Liu Jicong d3104e78ec stream task exec 2022-03-22 18:00:03 +08:00
Xiaoyu Wang 953412238d Merge branch '3.0_query_integrate' of github.com:taosdata/TDengine into 3.0_query_integrate 2022-03-22 04:30:44 -04:00
Xiaoyu Wang ef125eaa40 merge 3.0 2022-03-22 04:29:54 -04:00
Haojun Liao 5533875326 [td-13039] support group by. 2022-03-22 16:03:42 +08:00
Xiaoyu Wang 15f028f8a8
Merge pull request #10890 from taosdata/feature/3.0_wxy
TD-13757 bugfix
2022-03-22 13:21:45 +08:00
Xiaoyu Wang 25f2b374cc TD-13757 bugfix 2022-03-21 23:50:27 -04:00
Li Minghao 223721a136
Merge pull request #10886 from taosdata/feature/3.0_mhli
sync refactor
2022-03-22 11:48:14 +08:00
Minghao Li c5c00d5955 sync refactor 2022-03-22 10:42:02 +08:00
Xiaoyu Wang 0025aed0d5 TD-14045 bugfix 2022-03-21 22:42:01 -04:00
Li Minghao 18abfd625c
Merge pull request #10877 from taosdata/feature/3.0_mhli
Feature/3.0 mhli
2022-03-22 09:49:45 +08:00
Zhiqiang Wang 29c5e63d85
Merge pull request #10882 from taosdata/fix/ZhiqiangWang/TD-13762-redefine-atomic-api
[TD-13762]<fix>: redefine atomic api.
2022-03-22 01:06:55 +08:00
afwerar a263f72d58 [TD-13762]<fix>: redefine atomic api. 2022-03-22 00:54:21 +08:00
Haojun Liao d6af555905 [td-13039] refactor. 2022-03-21 22:49:47 +08:00
Minghao Li 3139aaef05 sync refactor 2022-03-21 20:06:57 +08:00
Shengliang Guan 8738ef6980
Merge pull request #10875 from taosdata/feature/shm
refact dnode queue
2022-03-21 19:37:41 +08:00
Minghao Li 48aace92c5 sync refactor 2022-03-21 19:26:48 +08:00
Shengliang Guan 220fdfabe2 refact dnode queue 2022-03-21 19:08:25 +08:00
Haojun Liao 1c1c95edee [td-13039] merge 3.0 2022-03-21 18:34:42 +08:00
Haojun Liao 7137bf9d3c [td-13039] fix bug. 2022-03-21 18:31:31 +08:00
Haojun Liao f7a7d148c0 [td-13039] fix compiler error. 2022-03-21 18:09:23 +08:00
Xiaoyu Wang bda9c0602d merge 3.0 2022-03-21 06:02:03 -04:00
Haojun Liao 5566e9198d
Merge pull request #10865 from taosdata/feature/db_ss
[td-13039] support scan ssdatablock.
2022-03-21 17:40:13 +08:00
Xiaoyu Wang dce38817be merge 3.0 2022-03-21 05:39:28 -04:00
Minghao Li 3a053453c6 sync refactor 2022-03-21 17:07:00 +08:00
Minghao Li b8a13daf9f sync refactor 2022-03-21 16:56:37 +08:00
Minghao Li 0f176a3afc Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/3.0_mhli 2022-03-21 16:51:15 +08:00
Minghao Li 1251d64e81 sync refactor 2022-03-21 16:42:30 +08:00
Minghao Li 7129645023 sync refactor 2022-03-21 16:28:50 +08:00
Haojun Liao fcb058cee4 [td-13039] support scan ssdatablock. 2022-03-21 16:15:51 +08:00
Minghao Li 82144e35f0 sync refactor 2022-03-21 16:00:57 +08:00
Xiaoyu Wang 22a26d3d43 merge 3.0 2022-03-21 03:14:00 -04:00
Xiaoyu Wang 9ca80596e4 merge 3.0 2022-03-21 02:00:30 -04:00
yihaoDeng bc77e3c579 handle except 2022-03-21 13:44:24 +08:00
Yihao Deng 524edc1552
Merge pull request #10849 from taosdata/feature/supportQ
Feature/support q
2022-03-20 21:05:27 +08:00
yihaoDeng fa34b6d4b1 handle except 2022-03-20 20:52:32 +08:00
yihaoDeng e8e6dc44cc handle except 2022-03-20 19:17:51 +08:00
yihaoDeng e657b37e41 handle except 2022-03-20 18:58:00 +08:00
yihaoDeng 843477e3a1 handle except 2022-03-20 18:08:33 +08:00
Shengliang Guan 3544df4112 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-20 10:19:01 +08:00
Zhiqiang Wang a1d17e371a
Merge pull request #10848 from taosdata/fix/ZhiqiangWang/TD-13759-redefine-thread-api
[TD-13759]<fix>: redefine thread api.
2022-03-20 01:03:58 +08:00
afwerar 79057240bd [TD-13759]<fix>: redefine thread api. 2022-03-20 00:47:45 +08:00
afwerar caf1e0e860 [TD-13759]<fix>: redefine thread api. 2022-03-20 00:45:00 +08:00
Shengliang Guan 916e569229 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-20 00:30:24 +08:00
Yihao Deng a4ea6c7191
Merge pull request #10846 from taosdata/feature/supportQ
handle except
2022-03-20 00:18:50 +08:00
yihaoDeng 9a5d1139b6 handle except 2022-03-20 00:00:16 +08:00
Yihao Deng 2eb40c24e0
Merge pull request #10844 from taosdata/feature/supportQuery
Feature/support query
2022-03-19 23:57:06 +08:00
yihaoDeng 305057a04b handle except 2022-03-19 23:55:52 +08:00