Commit Graph

2491 Commits

Author SHA1 Message Date
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
dapan1121 6eb799d7b8 Merge remote-tracking branch 'origin/3.0_query_integrate' into feature/scheduler 2022-03-22 19:07:08 +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 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
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
dapan1121 4b98359e9a feature/scheduler 2022-03-22 16:51:45 +08:00
Minghao Li f7432337fd sync refactor 2022-03-22 16:43:30 +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
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
dapan1121 5e85c21f36 feature/scheduler 2022-03-22 16:12:14 +08:00
Haojun Liao 5533875326 [td-13039] support group by. 2022-03-22 16:03:42 +08:00
Minghao Li 944bb33156 sync refactor 2022-03-22 15:29:32 +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
dapan1121 3b2a50050b feature/scheduler 2022-03-22 15:17:09 +08:00
Xiaoyu Wang 48822785e1 TD-14178 bugfix 2022-03-22 02:56:51 -04:00
yihaoDeng ed477de87e handle except 2022-03-22 14:51:26 +08:00
Minghao Li 559f570ea0 sync refactor 2022-03-22 14:43:58 +08:00
Xiaoyu Wang 746ed7d795 TD-14221 bugfix 2022-03-22 02:09:15 -04:00
dapan1121 5a202e89e4 feature/scheduler 2022-03-22 14:06:30 +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
Minghao Li 0c9e64f0d2 sync refactor 2022-03-22 13:18:29 +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
dapan1121 195ca4ab25 feature/scheduler 2022-03-22 11:32:53 +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
yihaoDeng 76b206fe6a Merge branch 'ddd' into sche 2022-03-21 16:47:51 +08:00
dapan1121 43336c0a39 feature/scheduler 2022-03-21 16:43:27 +08:00
Minghao Li 1251d64e81 sync refactor 2022-03-21 16:42:30 +08:00
yihaoDeng d3212463dd handle except 2022-03-21 16:37:19 +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
Haojun Liao 84818987b3 [td-13039] fix bug in show tables; 2022-03-21 15:25:13 +08:00
Xiaoyu Wang 22a26d3d43 merge 3.0 2022-03-21 03:14:00 -04:00
dapan1121 f26fe260dc Merge remote-tracking branch 'origin/3.0_query_integrate' into feature/scheduler 2022-03-21 14:06:50 +08: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
dapan a2856bb2b4 feature/scheduler 2022-03-21 08:32:22 +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
Haojun Liao 3e1b750312 [td-13039] fix bug in show tables; 2022-03-19 23:52:28 +08:00
yihaoDeng 2d0c5ff5c3 handle except 2022-03-19 23:38:18 +08:00
Haojun Liao cf1e4507f3 [td-13039] refactor. 2022-03-19 23:12:58 +08:00
Yihao Deng 25569755e2
Merge pull request #10809 from taosdata/feature/supportQuery
handle except
2022-03-19 18:57:56 +08:00
Xiaoyu Wang e4dd627b20 stream plan implement 2022-03-19 03:02:31 -04:00
yihaoDeng 9d12273a9a merge 3.0 2022-03-19 14:35:24 +08:00
yihaoDeng 538a02170c merge 3.0 2022-03-19 14:10:35 +08:00
Hongze Cheng 0dd0f6f007
Merge pull request #10839 from taosdata/feature/tdb-merge
Feature/tdb merge
2022-03-19 11:55:07 +08:00
yihaoDeng 96db2f503b merge 3.0 2022-03-19 09:08:11 +08:00
Haojun Liao 3aab21c0fa [td-13039] fix bug in show tables/stables. 2022-03-19 00:13:07 +08:00
yihaoDeng 916dbe798b handle except 2022-03-18 23:38:47 +08:00
yihaoDeng a9b712ab45 handle except 2022-03-18 22:00:46 +08:00
yihaoDeng 3b147dd5bc handle except 2022-03-18 22:00:20 +08:00
Li Minghao 712ff8f479
Merge pull request #10840 from taosdata/feature/3.0_mhli
Feature/3.0 mhli
2022-03-18 19:24:31 +08:00
Minghao Li aea4e0f472 sync refactor 2022-03-18 19:09:22 +08:00
Hongze Cheng 6cd165bea7 disable TDB compile 2022-03-18 10:44:12 +00:00
Minghao Li 3ce39eec1c sync refactor 2022-03-18 18:42:49 +08:00
Hongze Cheng 74c2ec8e26 Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/tdb-merge 2022-03-18 10:42:26 +00:00
Xiaoyu Wang ce50f40b84
Merge pull request #10838 from taosdata/feature/3.0_wxy
insert bugfix
2022-03-18 18:41:57 +08:00
Xiaoyu Wang e554bb4856 insert bugfix 2022-03-18 06:31:44 -04:00
Xiaoyu Wang bb913611c0
Merge pull request #10805 from taosdata/feature/3.0_wxy
TD-13675 rollup, alter db, alter table syntax definition, and logic plan code reorganize.
2022-03-18 18:19:08 +08:00
dapan1121 f51203bb30 feature/scheduler 2022-03-18 18:04:57 +08:00
Haojun Liao 46242e8a43 [td-13039] refactor. 2022-03-18 18:02:00 +08:00
Hongze Cheng 1c0d55b27f more TDB 2022-03-18 09:56:44 +00:00
Xiaoyu Wang eac1ccb5ec merge origin/3.0 2022-03-18 05:56:18 -04:00
Hongze Cheng fae3f1d7c9 refact TDB 2022-03-18 09:54:41 +00:00
Hongze Cheng 533a60d4fc more TDB 2022-03-18 09:51:21 +00:00
Minghao Li 4ddb1272ad Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/3.0_mhli 2022-03-18 17:48:04 +08:00
Minghao Li 736dfaf064 sync refactor 2022-03-18 17:46:40 +08:00
Hongze Cheng df1caa7062 more TDB 2022-03-18 09:45:59 +00:00
Xiaoyu Wang c2b4ec91ff tmq plan implement 2022-03-18 05:44:08 -04:00
Hongze Cheng 465dac8234 more TDB 2022-03-18 09:35:09 +00:00
Minghao Li 21feed915f sync refactor 2022-03-18 17:23:48 +08:00
Hongze Cheng 2a597151c9 more TDB 2022-03-18 09:22:15 +00:00
Shengliang Guan cbef74653e Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-18 17:15:08 +08:00
Cary Xu 51ea336f08 Merge branch '3.0' into feature/TD-11463-3.0 2022-03-18 17:08:59 +08:00
Hongze Cheng 6a8424b671 more TDB 2022-03-18 09:07:52 +00:00
Zhiqiang Wang 6c4b004f98
Merge pull request #10829 from taosdata/fix/ZhiqiangWang/TD-13767-forbid-wchar_t
[TD-13767]<fix>: forbid wchar_t.
2022-03-18 16:58:50 +08:00
Hongze Cheng ac620c0dc2 more TDB 2022-03-18 08:52:59 +00:00
afwerar 159c2671a2 [TD-13767]<fix>: forbid wchar_t. 2022-03-18 16:48:12 +08:00
Cary Xu 36751ea53f logic optimization and resource release 2022-03-18 16:33:53 +08:00
Li Minghao f0917eeec2
Merge pull request #10822 from taosdata/feature/3.0_mhli
Feature/3.0 mhli
2022-03-18 16:07:16 +08:00
Minghao Li 59ae887e30 sync refactor 2022-03-18 15:24:38 +08:00
Minghao Li 5de67d4256 sync refactor 2022-03-18 15:21:40 +08:00
Minghao Li b5547c7a3d sync refactor 2022-03-18 15:05:56 +08:00
Hongze Cheng 3beef665c8 more TDB 2022-03-18 06:59:37 +00:00
plum-lihui a3795f4017 [TD-14099] 2022-03-18 14:44:10 +08:00
afwerar 394178da68 [TD-13767]<fix>: only use iconv. 2022-03-18 13:23:48 +08:00
Minghao Li ef61d3ee94 sync refactor 2022-03-18 11:47:46 +08:00
Minghao Li 6a7f5c5fd2 sync refactor 2022-03-18 11:29:03 +08:00
Shengliang Guan 41880bac8e Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-18 11:27:06 +08:00
Haojun Liao 0354ac2f33 [td-13039] refactor. 2022-03-18 11:12:49 +08:00
Xiaoyu Wang 05f7532ee0 Merge remote-tracking branch 'origin/3.0' into feature/3.0_wxy 2022-03-17 22:37:10 -04:00
Xiaoyu Wang 1ee1691ae1 logic plan code reorganize 2022-03-17 22:28:21 -04:00
Hongze Cheng 031d84e76e more TDB 2022-03-18 01:55:03 +00:00
dapan1121 83b62c90ba
Merge pull request #10808 from taosdata/feature/qnode
feature/qnode
2022-03-18 09:50:25 +08:00
Li Minghao 6a18279dd6
Merge pull request #10801 from taosdata/feature/3.0_mhli
sync refactor
2022-03-18 09:38:55 +08:00
yihaoDeng 3cc9979a99 handle except 2022-03-18 09:17:56 +08:00
dapan1121 c393fa19b3 feature/qnode 2022-03-18 09:10:32 +08:00
Xiaoyu Wang 0db2e65d6a logic plan code reorganize 2022-03-17 07:47:12 -04:00
Xiaoyu Wang 40228a00c8 TD-14043 show statement bugfix 2022-03-17 07:32:28 -04:00
Xiaoyu Wang 98a5e28586 TD-13675 merge 3.0_query_integrate 2022-03-17 06:58:04 -04:00
Minghao Li 11c8ac91da sync refactor 2022-03-17 18:55:26 +08:00
Xiaoyu Wang d49adcd4f5 TD-13675 rollup, alter db, alter table syntax definition 2022-03-17 06:44:45 -04:00
Cary Xu 8b2d5a6fea Merge branch '3.0' into feature/TD-11463-3.0 2022-03-17 18:18:32 +08:00
Cary Xu b44ef3c81e use dataDir to init sma env 2022-03-17 18:16:57 +08:00
Hongze Cheng fb5b200e77 more TDB 2022-03-17 09:23:30 +00:00