Commit Graph

23785 Commits

Author SHA1 Message Date
Haojun Liao fa29596935 [td-13039] merge 3.0. 2022-03-23 16:29:01 +08:00
Haojun Liao 47d3255190 [td-14192] fix bug 2022-03-23 16:26:18 +08:00
plum-lihui 1ad4440b56 [modify] 2022-03-23 16:08:08 +08:00
Haojun Liao 6f11fd217e [td-13039] support group by multi-columns. 2022-03-23 15:56:49 +08:00
plum-lihui d27329d651 [add cases] 2022-03-23 15:45:13 +08:00
Shengliang Guan bd6cde63cd sma 2022-03-23 15:03:02 +08:00
Shengliang Guan ec790acc3c minor changes 2022-03-23 15:01:47 +08:00
Shengliang Guan 1b8a3a28c6 Merge branch 'feature/shm' of https://github.com/taosdata/TDengine into feature/shm 2022-03-23 15:00:20 +08:00
Shengliang Guan 9006b0f576 add tsma 2022-03-23 14:54:06 +08:00
Liu Jicong d1363d9cb2 task running 2022-03-23 14:47:24 +08:00
Shengliang Guan 411b9a2d33 add tsma 2022-03-23 13:50:53 +08:00
plum-lihui a4bb0e660d [modify] 2022-03-23 13:04:59 +08:00
Xiaoyu Wang d6f294ac2d
Merge pull request #10920 from taosdata/feature/3.0_wxy
TD-13077 `string` identifier implement
2022-03-23 11:11:47 +08:00
Xiaoyu Wang 255777ec09 TD-13077 `string` identifier implement 2022-03-22 22:59:20 -04:00
Cary Xu 2bd7801884
Merge pull request #10919 from taosdata/feature/TD-11463-3.0
Feature/td 11463 3.0
2022-03-23 10:52:37 +08:00
Xiaoyu Wang 3442e20916 TD-13077 identifier implement 2022-03-22 22:45:57 -04:00
Liu Jicong c3b3779713 Merge branch '3.0' into feature/tq 2022-03-23 10:44:50 +08:00
Liu Jicong 93347bec42 put next level info into task 2022-03-23 10:44:32 +08:00
Cary Xu 5b01c2df7f Merge branch '3.0' into feature/TD-11463-3.0 2022-03-23 10:36:03 +08:00
Haojun Liao f900f3d74b
Merge pull request #10789 from taosdata/feature/3.0_liaohj
Feature/3.0 liaohj
2022-03-23 10:35:19 +08:00
Cary Xu 3d4b60312b copy bitmap 2022-03-23 10:35:14 +08:00
Haojun Liao 2748f84c1e Merge remote-tracking branch 'origin/feature/3.0_liaohj' into feature/3.0_liaohj 2022-03-23 10:11:45 +08:00
Haojun Liao b4bd6b6bb8 [td-13039] fix compiler error. 2022-03-23 10:10:40 +08:00
Haojun Liao 33d5f1ac22
Merge branch '3.0' into feature/3.0_liaohj 2022-03-23 10:02:47 +08:00
Cary Xu 28f6ee79cc
Merge pull request #10916 from taosdata/feature/TD-11463-3.0
add bSma/rSma param
2022-03-23 09:49:15 +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 273faa1065
Merge pull request #10892 from taosdata/feature/TD-11463-3.0
rename vnodes to vnode
2022-03-23 06:37:15 +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 636edd5568 [td-13039] update test. 2022-03-22 23:33:53 +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 42ee594f6b
Merge pull request #10910 from taosdata/feature/tq
stream task exec
2022-03-22 20:36:11 +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 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
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
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
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