Commit Graph

24264 Commits

Author SHA1 Message Date
Xiaoyu Wang 72ad5483a6
Merge pull request #10893 from taosdata/feature/3.0_wxy
TD-14221 bugfix
2022-03-22 19:46:17 +08:00
Xiaoyu Wang d0a5c77f7c merge 3.0 2022-03-22 07:30:44 -04:00
Liu Jicong af67c49f0e
Merge branch '3.0' into feature/tq 2022-03-22 19:25:55 +08:00
Haojun Liao 32c8e1f12c
Merge pull request #10874 from taosdata/3.0_query_integrate
3.0 query integrate
2022-03-22 19:18:06 +08:00
dapan1121 6eb799d7b8 Merge remote-tracking branch 'origin/3.0_query_integrate' into feature/scheduler 2022-03-22 19:07:08 +08:00
Haojun Liao c6f51591af Merge remote-tracking branch 'origin/3.0_query_integrate' into 3.0_query_integrate 2022-03-22 19:04:27 +08:00
Haojun Liao fd9658ff7f [td-13039] disable restart. 2022-03-22 19:03:55 +08:00
dapan1121 97ad141579 feature/scheduler 2022-03-22 19:00:55 +08:00
Liu Jicong afe8439095 fix typo 2022-03-22 19:00:05 +08:00
Haojun Liao da1523f1f5
Merge branch '3.0' into 3.0_query_integrate 2022-03-22 18:47:58 +08:00
Haojun Liao a3f705c5ed [td-13039] disable some unit test temporarily. 2022-03-22 18:44:34 +08:00
Hongze Cheng 3b49a863ea more TDB 2022-03-22 10:43:51 +00:00
Shengliang Guan af252f18bb
Merge pull request #10908 from taosdata/feature/shm
refact queue
2022-03-22 18:18:21 +08:00
Haojun Liao 3a6be84b80 [td-13039] support group by. 2022-03-22 18:17:04 +08:00
Shengliang Guan 20017d82b3 minor changes 2022-03-22 18:06:10 +08:00
Liu Jicong d3104e78ec stream task exec 2022-03-22 18:00:03 +08:00
Xiaoyu Wang a25de3475b ignore test generated file 2022-03-22 05:55:45 -04:00
Minghao Li e3a3c1386b sync refactor 2022-03-22 17:53:43 +08:00
yihaoDeng 6a98d0c0cf Merge branch 'feature/scheduler' of https://github.com/taosdata/TDengine into sc 2022-03-22 17:53:04 +08:00
yihaoDeng 0ee40a2195 handle except 2022-03-22 17:52:14 +08:00
dapan1121 11bd7b19be feature/scheduler 2022-03-22 17:50:49 +08:00
dapan1121 1cb96f984a Merge remote-tracking branch 'origin/3.0_query_integrate' into feature/scheduler 2022-03-22 17:15:59 +08:00
yihaoDeng 538f0a11c3 Merge branch 'feature/scheduler' of https://github.com/taosdata/TDengine into sc 2022-03-22 17:02:06 +08:00
yihaoDeng 3c82cae1f1 merge trans 2022-03-22 17:01:02 +08:00
Minghao Li 7c6fbbfbd1 sync refactor 2022-03-22 16:58:36 +08:00
Xiaoyu Wang ef50049a8b merge 3.0 2022-03-22 04:54:40 -04:00
Shengliang Guan 748d002599 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-22 16:52:27 +08:00
dapan1121 4b98359e9a feature/scheduler 2022-03-22 16:51:45 +08:00
Shengliang Guan 2af212f42d refact worker 2022-03-22 16:51:30 +08:00
Shengliang Guan f48fddc7c4 refact queue 2022-03-22 16:47:53 +08:00
Minghao Li f7432337fd sync refactor 2022-03-22 16:43:30 +08:00
Xiaoyu Wang 72d121b3e7 merge 3.0 2022-03-22 04:38:10 -04: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
Hongze Cheng d7b54201bc more TDB 2022-03-22 08:26:43 +00:00
yihaoDeng 28c930f920 handle except 2022-03-22 16:19:55 +08:00
Minghao Li 1c3113686e sync refactor 2022-03-22 16:17:17 +08:00
Hongze Cheng aee8b60324 more TDB 2022-03-22 08:13:32 +00:00
dapan1121 5e85c21f36 feature/scheduler 2022-03-22 16:12:14 +08:00
Shengliang Guan a340baa879 refact queue 2022-03-22 16:10:26 +08:00
Haojun Liao 5533875326 [td-13039] support group by. 2022-03-22 16:03:42 +08:00
Shengliang Guan b36356ae57 get queue size 2022-03-22 15:53:29 +08:00
Hongze Cheng 238550b0f4 more TDB 2022-03-22 07:50:34 +00:00
Cary Xu 2dc845fba9 restore 2022-03-22 15:32:36 +08:00
Minghao Li 944bb33156 sync refactor 2022-03-22 15:29:32 +08:00
Shengliang Guan c6d23422e9 refact queue 2022-03-22 15:23:00 +08:00
dapan1121 96bc72c53b Merge remote-tracking branch 'origin/3.0_query_integrate' into feature/scheduler 2022-03-22 15:21:03 +08:00
Xiaoyu Wang 9195433f4d Merge remote-tracking branch 'origin/3.0' into feature/3.0_wxy 2022-03-22 03:18:17 -04:00
Cary Xu 1a1008548e trigger CI 2022-03-22 15:17:45 +08:00
dapan1121 3b2a50050b feature/scheduler 2022-03-22 15:17:09 +08:00