Commit Graph

3382 Commits

Author SHA1 Message Date
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
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
Haojun Liao 5f376274be [td-13039] fix bug in project query. 2022-03-12 15:28:15 +08:00
ubuntu 1dfae9b48f merge 3.0 2022-03-12 14:02:57 +08:00
ubuntu 30f602fae0 update UT test 2022-03-12 13:59:21 +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 31bf003dd2 handle except 2022-03-11 22:00:56 +08:00
yihaoDeng 62700c1f13 handle persist conn 2022-03-11 21:39:16 +08:00
Minghao Li 94efe10119 Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/3.0_mhli 2022-03-11 19:57:24 +08:00
Minghao Li f1624582cc sync refactor 2022-03-11 19:56:17 +08:00
Minghao Li 317f7669d7 sync refactor 2022-03-11 19:52:59 +08:00
Cary Xu 1c135a691c
Merge pull request #10709 from taosdata/feature/TD-11463-3.0
Feature/td 11463 3.0
2022-03-11 19:47:30 +08:00
Cary Xu 00f6807192 Merge branch '3.0' into feature/TD-11463-3.0 2022-03-11 19:39:23 +08:00
Shuduo Sang ba8d9a798e
Feature/sangshuduo/td 13063 3.0 windows (#10708)
* [TD-13063]<feature>: 3.0 on Windows

* add pthread in contrib

* fix linux compile

* fix osSemaphore

* add gnu regex for Windows

* fix compile error for Windows
2022-03-11 19:39:20 +08:00
Cary Xu 0c307568e4 code refactor 2022-03-11 19:38:13 +08:00
Minghao Li 690dabd617 sync refactor 2022-03-11 19:11:38 +08:00
Yihao Deng 3ef2facd8d
Merge pull request #10705 from taosdata/feature/supportQuery
fix except
2022-03-11 18:39:34 +08:00
yihaoDeng 9913d0c72a fix except 2022-03-11 18:27:52 +08:00
Xiaoyu Wang e5286898c0 TD-13990 implement interval plan 2022-03-11 05:11:25 -05:00
afwerar aa2e9ada55 [TD-13771]<fix>: redefine timer api. 2022-03-11 18:03:59 +08:00
Minghao Li 78b5da0e0f sync refactor 2022-03-11 17:08:27 +08:00
afwerar e04ef027ab [TD-13768]<fix>: redefine time api. 2022-03-11 16:49:07 +08:00
Minghao Li 7469d62fd7 sync refactor 2022-03-11 15:05:10 +08:00
Haojun Liao c62dfe6460 [td-13039] merge 3.0. 2022-03-11 14:59:42 +08:00
Haojun Liao 7273746467 Merge branch '3.0' into feature/3.0_liaohj 2022-03-11 14:24:34 +08:00
Yihao Deng d07b1d9b2c
Merge branch '3.0' into feature/index_oper 2022-03-11 11:48:29 +08:00
Minghao Li a0a62227c8 sync refactor 2022-03-11 11:47:56 +08:00
yihaoDeng 5262b4ad3b modify transport 2022-03-11 11:46:05 +08:00
yihaoDeng 5f51fb3a32 modify transport 2022-03-11 11:18:05 +08:00
Minghao Li 6a3869a3bc sync refactor 2022-03-11 10:50:50 +08:00
Xiaoyu Wang 75c5de4762 TD-13747 bugfix 2022-03-10 21:39:37 -05: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
Haojun Liao 89d7eb2d29 Merge remote-tracking branch 'origin/3.0_query_integrate' into 3.0_query_integrate 2022-03-10 23:13:44 +08:00
Haojun Liao cc53df1a01 [td-13039] fix bug in creating streamscanner. 2022-03-10 23:12:34 +08:00
Xiaoyu Wang 1e9b417f73 TD-13747 deal memory leaks 2022-03-10 06:58:07 -05:00
Xiaoyu Wang 87c87987b9
Merge pull request #10687 from taosdata/feature/3.0_query_integrate_wxy
TD-13747 deal memory leaks
2022-03-10 19:33:20 +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
Minghao Li 88aef2d1ab sync refactor 2022-03-10 19:21:02 +08:00
Haojun Liao 56f38425a9 [td-13039] fix bug. 2022-03-10 19:14:36 +08:00
Haojun Liao 8196b6ee9a [td-13039] refactor. 2022-03-10 18:07:07 +08:00
afwerar 6b6c43646d [TD-13770]<fix>: redefine system api. 2022-03-10 18:06:20 +08:00
Liu Jicong 94bc3a6e52
Merge pull request #10680 from taosdata/feature/tq
add mnode stream
2022-03-10 17:22:36 +08:00
Liu Jicong e766f3fad4 add mnode stream 2022-03-10 17:15:45 +08:00
Xiaoyu Wang 8ee10d50da
Merge pull request #10679 from taosdata/feature/3.0_query_integrate_wxy
TD-13747 bugfix
2022-03-10 17:00:47 +08:00
Xiaoyu Wang e055dd5fd7 TD-13747 bugfix 2022-03-10 03:58:51 -05:00
Minghao Li 73d768d273 sync refactor 2022-03-10 16:54:26 +08:00