Commit Graph

4034 Commits

Author SHA1 Message Date
Haojun Liao 33d5f1ac22
Merge branch '3.0' into feature/3.0_liaohj 2022-03-23 10:02:47 +08:00
Cary Xu ea034335bb encode info 2022-03-23 09:36:22 +08:00
Cary Xu d4cc6c1fe7 add bSma/rSma param 2022-03-23 07:58:07 +08:00
Cary Xu 044db54e74 refactor 2022-03-23 06:25:24 +08:00
Cary Xu fd61801ac8 Merge branch '3.0' into feature/TD-11463-3.0 2022-03-23 06:22:40 +08:00
Haojun Liao cf95e5a769 [td-13039] update test. 2022-03-22 23:33:03 +08:00
Haojun Liao d82e66b7c2 [td-13039] merge 3.0 and fix bug. 2022-03-22 23:29:38 +08:00
Liu Jicong 997a0a9395 remove duplicate msg handler 2022-03-22 20:07:01 +08:00
Liu Jicong ab62430d21 Merge branch '3.0' into feature/tq 2022-03-22 19:52:26 +08:00
Liu Jicong 7fce1e4c93 Merge branch 'feature/tq' of github.com:taosdata/TDengine into feature/tq 2022-03-22 19:48:59 +08:00
Liu Jicong c74b88afbb put tq header input vnd 2022-03-22 19:47:57 +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
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
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
Shengliang Guan 748d002599 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-22 16:52:27 +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
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
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
Cary Xu 2dc845fba9 restore 2022-03-22 15:32:36 +08:00
Shengliang Guan c6d23422e9 refact queue 2022-03-22 15:23:00 +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 eb5471fdd6 tsdb merge 2022-03-22 14:57:16 +08:00
Xiaoyu Wang 48822785e1 TD-14178 bugfix 2022-03-22 02:56:51 -04:00
Shengliang Guan 6e6936c175
Merge pull request #10894 from taosdata/feature/shm
refact queue
2022-03-22 14:56:31 +08:00
Shengliang Guan 4091771274 refact queue 2022-03-22 14:38:26 +08:00
Xiaoyu Wang 746ed7d795 TD-14221 bugfix 2022-03-22 02:09:15 -04:00
Cary Xu 3cdeed0d44 rename TDB to TSDB for log 2022-03-22 13:59:48 +08:00
Cary Xu 0081c145ae rename vnodes to vnode 2022-03-22 13:57:50 +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
Xiaoyu Wang 53ddf7e185
Merge pull request #10885 from taosdata/feature/3.0_wxy
TD-14045 bugfix
2022-03-22 10:58:11 +08:00
Shengliang Guan fe8714fe56 refact worker 2022-03-22 10:49:33 +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
Shengliang Guan 5f9f8ac7e2 fix double free 2022-03-22 10:03:17 +08:00
Shengliang Guan 40b3c0d376 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-22 09:53:38 +08:00
Shengliang Guan 48614d2cb0
Merge pull request #10878 from taosdata/feature/shm
refact query queue
2022-03-22 09:53:22 +08: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
Liu Jicong f72930eef6
Merge pull request #10880 from taosdata/feature/tq
fix memory error
2022-03-21 23:49:10 +08:00