xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
25,986 Commits 3 Branches 0 Tags 479 MiB
Commit Graph

1004 Commits

Author SHA1 Message Date
Minghao Li e12d24d220 Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/3.0_mhli 2022-03-23 18:06:26 +08:00
Minghao Li d5188f14f9 sync refactor 2022-03-23 17:56:32 +08:00
dapan1121 ed5b283291 feature/scheduler 2022-03-23 17:19:04 +08:00
Haojun Liao 33d5f1ac22
Merge branch '3.0' into feature/3.0_liaohj 2022-03-23 10:02:47 +08:00
Haojun Liao d82e66b7c2 [td-13039] merge 3.0 and fix bug. 2022-03-22 23:29:38 +08:00
Liu Jicong af67c49f0e
Merge branch '3.0' into feature/tq 2022-03-22 19:25:55 +08:00
Liu Jicong d3104e78ec stream task exec 2022-03-22 18:00:03 +08:00
Minghao Li e3a3c1386b sync refactor 2022-03-22 17:53:43 +08:00
dapan1121 1cb96f984a Merge remote-tracking branch 'origin/3.0_query_integrate' into feature/scheduler 2022-03-22 17:15:59 +08:00
Minghao Li 7c6fbbfbd1 sync refactor 2022-03-22 16:58:36 +08:00
Minghao Li f7432337fd sync refactor 2022-03-22 16:43:30 +08:00
Xiaoyu Wang ef125eaa40 merge 3.0 2022-03-22 04:29:54 -04:00
Minghao Li 1c3113686e sync refactor 2022-03-22 16:17:17 +08:00
dapan1121 96bc72c53b Merge remote-tracking branch 'origin/3.0_query_integrate' into feature/scheduler 2022-03-22 15:21:03 +08:00
Shengliang Guan 4d842cb162 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-21 20:02:47 +08:00
Shengliang Guan 0432a8ec75 refact query queue 2022-03-21 20:02:37 +08:00
Shengliang Guan 8738ef6980
Merge pull request #10875 from taosdata/feature/shm 
refact dnode queue
 2022-03-21 19:37:41 +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 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 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 79e8f8e6ea sync refactor 2022-03-21 16:50:13 +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
yihaoDeng d3212463dd handle except 2022-03-21 16:37:19 +08:00
Haojun Liao fcb058cee4 [td-13039] support scan ssdatablock. 2022-03-21 16:15:51 +08:00
Haojun Liao 84818987b3 [td-13039] fix bug in show tables; 2022-03-21 15:25:13 +08: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
Shengliang Guan 3544df4112 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-20 10:19:01 +08:00
afwerar 79057240bd [TD-13759]<fix>: redefine thread api. 2022-03-20 00:47:45 +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 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 96db2f503b merge 3.0 2022-03-19 09:08:11 +08:00
yihaoDeng 916dbe798b handle except 2022-03-18 23:38:47 +08:00
yihaoDeng 3b147dd5bc handle except 2022-03-18 22:00:20 +08:00
dapan1121 f51203bb30 feature/scheduler 2022-03-18 18:04:57 +08:00
Xiaoyu Wang c2b4ec91ff tmq plan implement 2022-03-18 05:44:08 -04:00
Shengliang Guan 41880bac8e Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-18 11:27:06 +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
dapan1121 83b62c90ba
Merge pull request #10808 from taosdata/feature/qnode 
feature/qnode
 2022-03-18 09:50:25 +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 98a5e28586 TD-13675 merge 3.0_query_integrate 2022-03-17 06:58:04 -04: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
Xiaoyu Wang 7eb4153ad0 Merge remote-tracking branch 'origin/3.0' into feature/3.0_wxy 2022-03-17 03:24:15 -04:00
Xiaoyu Wang 861445c33a TD-14043 show tables split 2022-03-17 03:14:59 -04:00
afwerar 30c10ef8b3 [TD-13063]<fix>: prepare for win compilation. 2022-03-17 14:22:36 +08:00
Shengliang Guan b16e686809 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-17 13:28:15 +08:00
Yihao Deng a6e2e85367
Merge pull request #10783 from taosdata/feature/supportQuery 
Feature/support query
 2022-03-16 23:09:14 +08:00
yihaoDeng 3843b689bb handle except 2022-03-16 22:19:43 +08:00
yihaoDeng 1d8ffd9581 handle except 2022-03-16 21:48:19 +08:00
Shengliang Guan 565774b985 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-16 21:35:48 +08:00
Xiaoyu Wang 4e0b56324a TD-13675 rollup, alter db, alter table syntax definition 2022-03-16 07:28:40 -04:00
Shengliang Guan e10e8c8fec shm 2022-03-16 18:20:57 +08:00
Shengliang Guan 003864f902 shm 2022-03-16 16:59:45 +08:00
Xiaoyu Wang 16e5fd226e
Merge pull request #10771 from taosdata/feature/3.0_wxy 
TD-13597 create/drop topic, alter database, drop index, drop qnode statement implement
 2022-03-16 15:03:02 +08:00
Shengliang Guan ba12601dff Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-16 14:48:49 +08:00
Shengliang Guan 58b64fcff2 shm 2022-03-16 14:32:02 +08:00
Xiaoyu Wang f8f7aabfd9 TD-13597 create/drop topic, alter database, drop index, drop qnode statement implement 2022-03-16 02:08:59 -04:00
Yihao Deng 07dda4c8f8
Merge pull request #10768 from taosdata/feature/supportQuery 
handle except and update UT
 2022-03-16 13:41:05 +08:00
yihaoDeng f43efb9fea handle except and update UT 2022-03-16 13:30:03 +08:00
Yihao Deng 82431b840b
Merge pull request #10761 from taosdata/feature/supportQuery 
handle except and update UT
 2022-03-16 09:39:14 +08:00
yihaoDeng 4f330fab1f handle except 2022-03-15 23:47:37 +08:00
Shengliang Guan db970c79a8 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-15 20:29:56 +08:00
Xiaoyu Wang 4281664e03 TD-14068 create qnode implement 2022-03-15 08:04:52 -04:00
yihaoDeng 607a7ac025 handle except and update UT 2022-03-15 19:54:06 +08:00
dapan1121 cb0d52d13c feature/scheduler 2022-03-15 19:47:08 +08:00
Xiaoyu Wang dc5519bd53
Merge pull request #10758 from taosdata/feature/3.0_wxy 
TD-13675 create sma index parser implement
 2022-03-15 18:55:00 +08:00
Xiaoyu Wang c2aebb25bf TD-13675 create sma index parser implement 2022-03-15 06:44:38 -04:00
Shengliang Guan 44cd8c00bb shm 2022-03-15 18:37:08 +08:00
Haojun Liao 14f8e606f8
Merge pull request #10741 from taosdata/feature/3.0_liaohj 
Feature/3.0 liaohj
 2022-03-15 17:03:23 +08:00
Xiaoyu Wang eae2d7b661 TD-13675 create sma index grammar 2022-03-15 04:00:09 -04:00
dapan1121 440b0b8682 Merge remote-tracking branch 'origin/3.0' into feature/scheduler 2022-03-15 15:42:05 +08:00
dapan1121 d351e55a41 Merge remote-tracking branch 'origin/3.0_query_integrate' into feature/scheduler 2022-03-15 15:35:20 +08:00
dapan1121 43d7912987 feature/scheduler 2022-03-15 15:34:17 +08:00
Shengliang Guan 143a311360 shm 2022-03-15 11:59:22 +08:00
dapan1121 8f1cc6ee91 Merge remote-tracking branch 'origin/3.0_query_integrate' into feature/scheduler 2022-03-14 18:17:02 +08:00
dapan1121 d9cde31b6f feature/scheduler 2022-03-14 17:31:08 +08:00
Yihao Deng 4189328ddf
Merge pull request #10718 from taosdata/feature/supportQuery 
update transport
 2022-03-14 16:21:15 +08:00
Haojun Liao a853c6ddf5 [td-13039] refactor. 2022-03-14 16:09:26 +08:00
Haojun Liao dc27021f01 Merge remote-tracking branch 'origin/3.0' into feature/3.0_liaohj 2022-03-14 14:19:50 +08:00
Xiaoyu Wang b2291cb4f3 TD-14043 show dnodes/mnodes/modules/qnodes/user_functions/user_indexes/user_stables/user_tables/user_streams/user_users/vgroups rewirte 2022-03-13 23:45:24 -04:00
dapan1121 9b0f5df93a Merge remote-tracking branch 'origin/3.0' into feature/scheduler 2022-03-14 09:26:15 +08:00
Xiaoyu Wang 0cb811a542 Merge remote-tracking branch 'origin/3.0' into feature/3.0_wxy 2022-03-13 17:28:37 -04:00
Xiaoyu Wang 8a883ea00c TD-13990 interval plan implement 2022-03-13 15:28:50 -04:00
Shengliang Guan 6c8cf998fd shm 2022-03-13 00:06:09 +08:00
Haojun Liao 0271413aff [td-13039] refactor. 2022-03-12 22:59:12 +08:00
ubuntu 64d979fd5c update transport 2022-03-12 19:07:53 +08:00
dapan dad8b812a7 feature/scheduler 2022-03-12 17:19:50 +08:00
Haojun Liao 02981347e4
Merge pull request #10569 from taosdata/feature/3.0_liaohj 
Feature/3.0 liaohj
 2022-03-12 15:47:52 +08:00
ubuntu 1dfae9b48f merge 3.0 2022-03-12 14:02:57 +08:00
ubuntu baf0ac2d31 update UT test 2022-03-12 11:31:07 +08:00
Yihao Deng a5d8b20e19
Merge pull request #10712 from taosdata/feature/supportQuery 
handle persist conn
 2022-03-12 10:39:32 +08:00
yihaoDeng 62700c1f13 handle persist conn 2022-03-11 21:39:16 +08:00
Xiaoyu Wang 4b2ab16e52 Merge remote-tracking branch 'origin/3.0_query_integrate' into feature/3.0_query_integrate_wxy 2022-03-11 06:31:02 -05:00
Xiaoyu Wang e5286898c0 TD-13990 implement interval plan 2022-03-11 05:11:25 -05:00
Xiaoyu Wang d7406cabeb Merge remote-tracking branch 'origin/feature/scheduler' into feature/3.0_query_integrate_wxy 2022-03-11 03:00:33 -05:00
Xiaoyu Wang 9de235f3e4
Merge pull request #10700 from taosdata/feature/3.0_query_integrate_wxy 
TD-13981 show databases rewrite
 2022-03-11 15:59:54 +08:00
dapan1121 732a0b2c6b feature/scheduler 2022-03-11 15:59:28 +08:00
Xiaoyu Wang 028e6d1620 TD-13981 show databases rewrite 2022-03-11 02:58:29 -05:00
Haojun Liao c62dfe6460 [td-13039] merge 3.0. 2022-03-11 14:59:42 +08:00
Xiaoyu Wang a5459df0bb
Merge pull request #10698 from taosdata/feature/3.0_query_integrate_wxy 
TD-13981 show databases rewrite
 2022-03-11 14:49:31 +08:00
Xiaoyu Wang 396c099a77 TD-13981 show databases rewrite 2022-03-11 01:41:57 -05:00
Haojun Liao 7273746467 Merge branch '3.0' into feature/3.0_liaohj 2022-03-11 14:24:34 +08:00
Haojun Liao 309076de1f [td-13039] add first/last query. 2022-03-11 14:11:34 +08:00
Yihao Deng d07b1d9b2c
Merge branch '3.0' into feature/index_oper 2022-03-11 11:48:29 +08:00
yihaoDeng 5262b4ad3b modify transport 2022-03-11 11:46:05 +08:00
dapan1121 397dfe1e18 Merge remote-tracking branch 'origin/3.0' into feature/scheduler 2022-03-11 10:53:56 +08:00
Xiaoyu Wang 54e15db2f5 TD-13747 show mnodes 2022-03-10 21:02:47 -05:00
Xiaoyu Wang abb55e4a87 Merge remote-tracking branch 'origin/3.0' into feature/3.0_query_integrate_wxy 2022-03-10 20:19:58 -05:00
dapan1121 f17d4fb94e Merge remote-tracking branch 'origin/3.0_query_integrate' into feature/scheduler 2022-03-10 19:36:58 +08:00
Xiaoyu Wang 84f60fcc0a TD-13747 deal memory leaks 2022-03-10 06:32:39 -05:00
yihaoDeng b2c24a0338 modify transport 2022-03-10 19:32:26 +08:00
dapan1121 9f140ceca4 Merge remote-tracking branch 'origin/3.0_query_integrate' into feature/scheduler 2022-03-10 19:11:14 +08:00
dapan1121 763eccf8aa feature/scheduler 2022-03-10 19:05:58 +08:00
Xiaoyu Wang e055dd5fd7 TD-13747 bugfix 2022-03-10 03:58:51 -05:00
Haojun Liao e56e55f34e Merge remote-tracking branch 'origin/3.0_query_integrate' into 3.0_query_integrate 2022-03-10 11:13:08 +08:00
Haojun Liao 8345a5429b [td-13039] add min/max/systable-scanner. 2022-03-10 11:12:44 +08:00
Xiaoyu Wang 066c39d571 TD-13747 merge 3.0 2022-03-09 21:35:24 -05:00
Minghao Li 3c9875e955 sync refactor 2022-03-09 20:24:27 +08:00
Xiaoyu Wang 921500dbec
Merge pull request #10658 from taosdata/feature/3.0_query_integrate_wxy 
TD-13704 super table plan split
 2022-03-09 19:57:45 +08:00
Xiaoyu Wang 8615c97fc6 TD-13704 super table plan split 2022-03-09 06:53:00 -05:00
Xiaoyu Wang b91899e757 TD-13704 super table plan split 2022-03-09 04:32:12 -05:00
Minghao Li d87411116b sync refactor 2022-03-09 16:34:34 +08:00
dapan1121 ee8d007801 Merge remote-tracking branch 'origin/3.0_query_integrate' into feature/scheduler 2022-03-09 16:21:41 +08:00
dapan1121 c277b67d14 feature/qnode 2022-03-09 16:13:46 +08:00
Minghao Li fa7f441f42 sync refactor 2022-03-09 15:07:43 +08:00
Haojun Liao cbc3b52db5 [td-13039] add system table scanner. 2022-03-09 14:58:15 +08:00
Haojun Liao 459b0ef442 [td-13039] refactor. 2022-03-09 10:22:53 +08:00
Minghao Li 4118ddb9eb Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/3.0_mhli 2022-03-08 20:43:38 +08:00
Xiaoyu Wang 06f0f1d34e TD-13747 phase 1 function integration 2022-03-08 04:25:26 -05:00
Liu Jicong 255d795442 add tq push 2022-03-08 17:22:21 +08:00
Minghao Li c9c48e870d sync refactor 2022-03-08 13:43:54 +08:00
Xiaoyu Wang 6cc87452cf Merge remote-tracking branch 'origin/3.0' into feature/3.0_query_integrate_wxy 2022-03-07 21:56:17 -05:00
Zhiqiang Wang cc68f2e2df
Merge pull request #10587 from taosdata/fix/ZhiqiangWang/TD-13760-libuv-replace-socket-error 
[TD-13760]<fix>: libuv replace socket error.
 2022-03-07 22:45:25 +08:00
Xiaoyu Wang f88de49f55 TD-13881 implement create/alter/drop/show user, create/drop/show dnode, drop database, show stables and drop table 2022-03-07 07:18:05 -05:00
dapan1121 08541c0f22 feature/scheduler 2022-03-07 19:37:17 +08:00
afwerar 44367a009f [TD-13760]<fix>: libuv replace socket error. 2022-03-07 18:50:38 +08:00
Shengliang Guan 52c1df5f78 add cluster id for monitor 2022-03-07 15:45:58 +08:00
Shengliang Guan bef117d7db enable monitor gzip 2022-03-07 13:52:49 +08:00
Xiaoyu Wang 111a06da9e TD-13747 merge 3.0 2022-03-06 22:42:58 -05:00
Xiaoyu Wang b3d0283048 TD-13747 merge 3.0 2022-03-06 22:31:34 -05:00
dapan1121 216c53174b Merge remote-tracking branch 'origin/3.0_query_integrate' into feature/scheduler 2022-03-07 11:16:32 +08:00
dapan1121 d781ea842e feature/scheduler 2022-03-07 11:14:15 +08:00
Xiaoyu Wang 14e5d6aab3 TD-13852 create stable and create subtable 2022-03-06 08:52:12 -05:00
Xiaoyu Wang 08fb912aad TD-13852 create super table implement 2022-03-05 18:12:08 -05:00
dapan 3cab6df16b feature/scheduler 2022-03-05 17:19:21 +08:00
Shengliang Guan a070f95381
Merge pull request #10566 from taosdata/feature/config 
monitor for vnodes
 2022-03-05 16:17:58 +08:00
Shengliang Guan c03f4abd79 monitor 2022-03-05 16:09:55 +08:00
Haojun Liao 9c610369e2 [td-13039] refactor. 2022-03-05 15:58:28 +08:00
Minghao Li 29fab2e30a Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/3.0_mhli 2022-03-05 15:06:59 +08:00
dapan 21af31f496 Merge remote-tracking branch 'origin/3.0_query_integrate' into feature/scheduler 2022-03-05 13:44:57 +08:00
Shengliang Guan a11a2f37ed Merge remote-tracking branch 'origin/3.0' into feature/config 2022-03-05 12:13:15 +08:00
Shengliang Guan cde33ee27a io and band 2022-03-05 11:56:00 +08:00
dapan b6b4563ac7 feature/scheduler 2022-03-05 10:54:36 +08:00
Shengliang Guan 09be95e404 sysinfo for monitor 2022-03-05 10:23:16 +08:00
dapan1121 71fdf76b8a feature/scheduler 2022-03-04 19:36:03 +08:00
Xiaoyu Wang 92cd252b70 TD-13706 integration create table stmt and insert stmt 2022-03-04 05:43:23 -05:00
dapan1121 194722ee24 feature/qnode 2022-03-04 17:26:47 +08:00
Minghao Li 8d789bba31 sync enq 2022-03-04 15:48:09 +08:00
Shengliang Guan fe8ffe5577
Merge pull request #10548 from taosdata/feature/config 
monitor
 2022-03-04 15:40:45 +08:00
Xiaoyu Wang f8bde07340 TD-13037 datasink code 2022-03-04 02:17:04 -05:00
Shengliang Guan 5367ca7f2a record log 2022-03-04 15:15:29 +08:00
Shengliang Guan 1d9119df87 record num of logs for monitoring 2022-03-04 14:34:35 +08:00
Haojun Liao cde3e97061 [td-13039] merge 3.0. 2022-03-04 14:31:21 +08:00
Shengliang Guan d4a280d83f log level 2022-03-04 13:36:06 +08:00
Shengliang Guan 7b054eac78 tfs monitor 2022-03-04 13:28:03 +08:00
Haojun Liao 92da01a8ba [td-13039] refactor. 2022-03-04 13:25:39 +08:00
Xiaoyu Wang 0a9675e454 TD-13037 merge 3.0 2022-03-03 22:44:45 -05:00
xiao-yu-wang 3119efc7bd
Merge pull request #10533 from taosdata/feature/3.0_query_integrate_wxy 
TD-13706 client modify vnode process integration
 2022-03-03 20:26:19 +08:00
Xiaoyu Wang 441db317fd TD-13706 client modify vnode process integration 2022-03-03 07:25:16 -05:00
Shengliang Guan d907200519
Merge pull request #10531 from taosdata/feature/config 
monitor
 2022-03-03 19:43:19 +08:00
Shengliang Guan 2bf46ddc54 monitor 2022-03-03 19:12:08 +08:00
Li Minghao 405e9e2c5a
Merge pull request #10527 from taosdata/feature/3.0_mhli 
Feature/3.0 mhli
 2022-03-03 18:44:19 +08:00
Shengliang Guan c890b0b5c1 sysinfo in monitor 2022-03-03 18:10:56 +08:00
Minghao Li f72390141a Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/3.0_mhli 2022-03-03 17:37:41 +08:00
Minghao Li 64d224a0d2 syncInt 2022-03-03 17:28:00 +08:00
Shengliang Guan 47f4edc337
Merge pull request #10526 from taosdata/feature/config 
monitor
 2022-03-03 17:12:35 +08:00
Shengliang Guan 6cfff92b21 get tfs monitor info 2022-03-03 17:11:24 +08:00
Shengliang Guan cc82966e2e monitor 2022-03-03 16:37:37 +08:00
Yihao Deng ff8c9dd9ed
Merge pull request #10491 from taosdata/feature/support_json 
support json
 2022-03-03 16:18:41 +08:00
yihaoDeng c64c29a241 support json 2022-03-03 16:09:31 +08:00
dapan1121 fa9d652e0e Merge remote-tracking branch 'origin/3.0' into 3.0_query_integrate 2022-03-03 15:40:57 +08:00
dapan1121 f3735939db Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-03-03 15:22:39 +08:00
dapan1121 c572b9cad2 feature/qnode 2022-03-03 15:07:33 +08:00
Shengliang Guan 7815a5e9ee Merge remote-tracking branch 'origin/3.0' into feature/config 2022-03-03 14:23:24 +08:00
Shengliang Guan 7986a372e9 monitor 2022-03-03 11:29:08 +08:00
Li Minghao 06bbae7d21
Merge pull request #10517 from taosdata/feature/3.0_mhli 
Feature/3.0 mhli
 2022-03-03 10:59:34 +08:00
Minghao Li 8c289ed38b Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/3.0_mhli 2022-03-03 10:04:15 +08:00
Shengliang Guan e14ef16667 Merge remote-tracking branch 'origin/3.0' into feature/config 2022-03-02 17:50:17 +08:00
Shengliang Guan dc30a83f24 monitor 2022-03-02 17:48:39 +08:00
Xiaoyu Wang 213793be49 TD-13747 merge 3.0 2022-03-02 04:24:59 -05:00
Shengliang Guan 4f4100f9c6 monitor 2022-03-02 15:41:19 +08:00
yihaoDeng 4be79789ca support json 2022-03-02 15:05:16 +08:00
Shengliang Guan 29d56b0a64 init monitor module 2022-03-02 14:00:56 +08:00
Xiaoyu Wang 523855bec5 TD-13747 planner integrate 2022-03-01 21:50:51 -05:00
yihaoDeng f5c13c13c6 support json 2022-03-01 22:36:19 +08:00
dapan1121 639b5102ce feature/qnode 2022-03-01 19:48:21 +08:00
Minghao Li d57320031f sync ping 2022-03-01 15:16:44 +08:00
Xiaoyu Wang db8669a3ce TD-13037 merge 3.0 2022-02-28 21:40:50 -05:00
dapan1121 712137ba18 feature/qnode 2022-03-01 10:32:36 +08:00
Xiaoyu Wang 195ff4f52f TD-13705 parser integrate and CREATE DATABASE implement 2022-02-28 21:13:22 -05:00
dapan1121 e0faac42c4 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-03-01 09:50:44 +08:00
Xiaoyu Wang cd7a0e559b TD-13747 New SQL model integration 2022-02-28 04:56:38 -05:00
Shengliang Guan 5891779fe1 common 2022-02-28 17:55:07 +08:00
Minghao Li eaf6142c79 sync modify timer 2022-02-28 17:47:47 +08:00
Xiaoyu Wang 768e05939c TD-13747 New SQL model integration 2022-02-28 04:02:43 -05:00
Shengliang Guan e5606ccf38 Merge remote-tracking branch 'origin/3.0' into feature/config 2022-02-28 16:35:36 +08:00
Haojun Liao c35a3fa35f
Merge pull request #10388 from taosdata/feature/3.0_liaohj 
Feature/3.0 liaohj
 2022-02-28 15:23:57 +08:00
Minghao Li 02f0f85aab sync modify timer 2022-02-28 14:10:34 +08:00
Shengliang Guan 1f83138df2 tcfg 2022-02-28 10:42:06 +08:00
dapan1121 cda6986125 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-02-28 09:39:13 +08:00
xiao-yu-wang 7ba4e6f49b
Merge pull request #10408 from taosdata/feature/3.0_wxy 
TD-13495 physical plan refactoring
 2022-02-27 20:22:03 +08:00
dapan 2d58e1fed7 feature/qnode 2022-02-27 17:54:47 +08:00
Minghao Li b0d73826a7 Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/3.0_mhli 2022-02-27 14:18:42 +08:00
Minghao Li 4afcb4387c add sync io 2022-02-27 10:22:15 +08:00
Minghao Li dbe28cd4ff add sync code 2022-02-27 00:02:18 +08:00
dapan1121 7129ba9cbd feature/qnode 2022-02-25 19:15:23 +08:00
Minghao Li b63995287d add raft store 2022-02-25 17:55:20 +08:00
Xiaoyu Wang 7377c27367 TD-13495 physical plan refactoring 2022-02-25 03:29:40 -05:00
Minghao Li 296d9abe2a add sync code 2022-02-25 15:34:24 +08:00
Haojun Liao 40da10fabd [td-13039] merge 3.0 2022-02-25 10:30:44 +08:00
afwerar 5a37fdf28f [TD-13062]<fix>: cross platform file system. 2022-02-25 01:47:20 +08:00
Minghao Li 51adf7e25e add raft store 2022-02-24 21:03:25 +08:00
Shengliang Guan 68514f3dfd
Merge pull request #10391 from taosdata/feature/config 
cfg
 2022-02-24 20:59:11 +08:00
Shengliang Guan 5d07ef4e43 Merge branch 'feature/config' into feature/3.0_liaohj 2022-02-24 20:58:04 +08:00
Xiaoyu Wang dafe0dae7a merge 3.0 2022-02-24 05:23:35 -05:00
Xiaoyu Wang 49143d079e TD-13495 physical plan refactoring 2022-02-24 05:18:41 -05:00
Shengliang Guan 955b89f3cb rpc config 2022-02-24 18:16:22 +08:00
Shengliang Guan 4278439666 refact config 2022-02-24 18:13:57 +08:00
Haojun Liao 84fedfba09 Merge remote-tracking branch 'origin/3.0' into feature/3.0_liaohj 2022-02-24 17:56:58 +08:00
Shengliang Guan 5ee328d181
Merge pull request #10382 from taosdata/feature/config 
config
 2022-02-24 14:32:38 +08:00
dapan1121 c108dd5db0
Merge pull request #10379 from taosdata/feature/qnode 
Feature/qnode
 2022-02-24 13:07:03 +08:00
Shengliang Guan 2331525a32 timezone 2022-02-24 12:19:51 +08:00
dapan1121 38fd1a657c Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-02-24 10:10:02 +08:00
Shengliang Guan b17f826756 Merge remote-tracking branch 'origin/3.0' into feature/config 2022-02-24 10:07:04 +08:00
Yihao Deng 59c4c444e7
Merge branch '3.0' into feature/3.0Trans 2022-02-23 23:14:31 +08:00
yihaoDeng 2271dee643 refactor trans code 2022-02-23 23:10:56 +08:00
Shengliang Guan e53540b5e7 rpc config 2022-02-23 21:18:40 +08:00
dapan1121 fe1b4dcde0 feature/qnode 2022-02-23 18:32:10 +08:00
Shengliang Guan 5b698b3d4d Merge remote-tracking branch 'origin/3.0' into feature/config 2022-02-23 17:33:44 +08:00
dapan1121 e2680ff326 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-02-23 15:11:32 +08:00
xiao-yu-wang 5fa4b1ae86
Merge pull request #10365 from taosdata/feature/3.0_wxy 
TD-13495 physical plan refactoring
 2022-02-23 14:46:19 +08:00
Xiaoyu Wang 708c361e92 TD-13495 physical plan refactoring 2022-02-23 01:34:18 -05:00
dapan1121 aa556cb462 feature/qnode 2022-02-23 14:34:17 +08:00
Shengliang Guan 0a0dfd5f7a rename var 2022-02-23 10:58:53 +08:00
dapan1121 b5982c5c3d Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-02-23 10:53:27 +08:00
Minghao Li 3d9d5240a5 add sync code 2022-02-23 09:54:44 +08:00
Shengliang Guan 06a7ba7b80 config integrate with taosd 2022-02-22 19:49:11 +08:00
dapan1121 93baf85a4f feature/qnode 2022-02-22 19:42:35 +08:00
Shengliang Guan 22cb2ada73 config 2022-02-22 14:22:56 +08:00
Shengliang Guan 392d3df98f config 2022-02-22 13:59:51 +08:00
Shengliang Guan 18634533a5 config 2022-02-22 13:36:26 +08:00
Haojun Liao b95e95dc0a [td-13039] fix bug in sorted merge operator. 2022-02-22 13:12:03 +08:00
Minghao Li be375fa143 add sync code 2022-02-22 11:28:15 +08:00
Yihao Deng 63d61faa70
Merge pull request #10303 from taosdata/feature/trans_impl 
test open UV
 2022-02-22 10:22:52 +08:00
dapan1121 8f7b375b54 feature/qnode 2022-02-21 19:31:14 +08:00
Shengliang Guan 1244bbe49a integrate cfg 2022-02-21 18:04:22 +08:00
xiao-yu-wang 740abc11b7
Merge pull request #10338 from taosdata/feature/3.0_wxy 
TD-13495 logic plan UT
 2022-02-21 17:56:34 +08:00
Xiaoyu Wang 6f555efeb1 TD-13495 logic plan UT 2022-02-21 04:35:30 -05:00
Shengliang Guan 2f97bd24ce unitest for config 2022-02-21 17:33:37 +08:00
Shengliang Guan 48a2d415d1 cfgtest 2022-02-21 16:04:37 +08:00
Shengliang Guan 863ad191d5 config interface 2022-02-21 15:09:10 +08:00
dapan1121 7c1e4d319d feature/qnode 2022-02-21 14:28:56 +08:00
Shengliang Guan 84fd629b9c Merge remote-tracking branch 'origin/3.0' into feature/config 2022-02-21 13:47:48 +08:00
dapan1121 8ebc791444 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-02-21 10:46:40 +08:00
dapan1121 c9ba7e02ce feature/qnode 2022-02-21 10:46:14 +08:00
Yihao Deng 507573d52d
Merge branch '3.0' into feature/trans_impl 2022-02-21 00:13:25 +08:00
yihaoDeng 4c19f56686 fix bug 2022-02-21 00:11:35 +08:00
Haojun Liao 6d37b663ed [td-11818] refactor sortedmerge operator. 2022-02-19 16:15:09 +08:00
Shengliang Guan f22d662b88 adjust interface 2022-02-18 21:37:05 +08:00
Shengliang Guan aa6a0cb47f config interface 2022-02-18 21:28:03 +08:00
dapan1121 8d413f09f9 feature/qnode 2022-02-18 19:43:36 +08:00
dapan1121 7debddd23f Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-02-18 08:33:01 +08:00
Yihao Deng 07d5c9232d
Merge branch '3.0' into feature/trans_impl 2022-02-17 20:32:43 +08:00
yihaoDeng 878401c19a fix query crash on super table 2022-02-17 19:38:37 +08:00
dapan1121 8f199e0eb8 feature/qnode 2022-02-17 19:30:43 +08:00
Haojun Liao d11c44fc18 [td-11818] refactor. 2022-02-17 18:38:55 +08:00
Haojun Liao c15c88dff7 [td-11818] add table id for streamscan operator. 2022-02-17 18:37:43 +08:00
Haojun Liao d6fa853b88 [td-11818] refactor. 2022-02-17 18:16:50 +08:00
dapan1121 76d5298ba1 feature/qnode 2022-02-17 16:08:59 +08:00
dapan1121 bffdb7a821 Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-02-17 09:36:40 +08:00
dapan1121 75ede63c8a feature/qnode 2022-02-17 09:34:55 +08:00
xiao-yu-wang ce824cdaa4
Merge pull request #10287 from taosdata/feature/3.0_wxy 
TD-13495 planner refactoring
 2022-02-16 18:38:40 +08:00
Shengliang Guan 5e0a6d9661
Merge pull request #10285 from taosdata/feature/privilege 
serialize msg
 2022-02-16 17:59:34 +08:00
Shengliang Guan 246311d4fc minor changes 2022-02-16 15:27:19 +08:00
xiao-yu-wang 33123636a7
Merge pull request #10265 from taosdata/feature/3.0_wxy 
TD-13338 SELECT statement translate code
 2022-02-15 17:51:01 +08:00
Haojun Liao 71fc95cc49 [td-11818] merge 3.0 2022-02-15 15:00:06 +08:00
Haojun Liao 3a23a30a9c [td-11818] Refactor. 2022-02-14 14:39:42 +08:00
Xiaoyu Wang 83d516af4c TD-13495 planner refactoring 2022-02-13 13:31:18 -05:00
xiao-yu-wang 6b31e0518d
Merge pull request #10309 from taosdata/feature/3.0_wxy 
TD-13495 planner refactoring
 2022-02-18 14:09:23 +08:00
Xiaoyu Wang 2624a81a30 TD-13495 planner refactoring 2022-02-12 18:47:47 -05:00
Xiaoyu Wang fb3bd53ea0 TD-13495 planner refactoring 2022-02-11 20:59:23 -05:00
Xiaoyu Wang 83479b0878 TD-13495 planner refactoring 2022-02-11 09:26:55 -05:00