Commit Graph

23006 Commits

Author SHA1 Message Date
Shengliang Guan edccd79561 shm 2022-03-14 13:24:15 +08:00
Shengliang Guan 352174a5ce shm 2022-03-14 11:50:02 +08:00
Shengliang Guan 04af649473 shm 2022-03-14 10:07:24 +08:00
Shengliang Guan 41c902804f shm 2022-03-13 20:48:33 +08:00
Shengliang Guan 20b69c5e61 shm 2022-03-13 20:32:31 +08:00
Shengliang Guan 7c7d8b33e9 rename files 2022-03-13 14:59:14 +08:00
Shengliang Guan f40383e4ef rename files 2022-03-13 14:32:42 +08:00
Shengliang Guan 6c8cf998fd shm 2022-03-13 00:06:09 +08:00
Shengliang Guan 7435abcf9b rename files 2022-03-12 23:41:32 +08:00
Shengliang Guan 2bbed649e0 refact 2022-03-12 23:33:46 +08:00
Shengliang Guan a82511435a shm 2022-03-12 23:32:21 +08:00
Shengliang Guan 35961a9c44 rename files 2022-03-12 23:24:23 +08:00
Shengliang Guan a1c1a062b7 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-12 23:09:28 +08:00
Shengliang Guan c71ec2b7f6 shm 2022-03-12 23:08:48 +08:00
Shengliang Guan f9685371a9 rename files 2022-03-12 23:00:55 +08:00
Shengliang Guan ea47b4da24 shm 2022-03-12 22:56:56 +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
Haojun Liao 5f376274be [td-13039] fix bug in project query. 2022-03-12 15:28:15 +08:00
Yihao Deng 9fe7540539
Merge pull request #10714 from taosdata/feature/supportQuery
modify  UT
2022-03-12 14:46:11 +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
Shengliang Guan 80a4c22e18 compile error 2022-03-12 12:08:40 +08:00
Shengliang Guan 8a0ab2615e Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-12 11:52:18 +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
Shengliang Guan 3343bef1b7 shm 2022-03-11 21:51:34 +08:00
yihaoDeng 62700c1f13 handle persist conn 2022-03-11 21:39:16 +08:00
Li Minghao 959bda646b
Merge pull request #10710 from taosdata/feature/3.0_mhli
Feature/3.0 mhli
2022-03-11 20:06:37 +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
Shengliang Guan ad1609fe7f shm 2022-03-11 18:18:45 +08:00
Zhiqiang Wang 0509aedde7
Merge pull request #10704 from taosdata/fix/ZhiqiangWang/TD-13771-redefine-timer-api
[TD-13771]<fix>: redefine timer api.
2022-03-11 18:10:45 +08: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
Zhiqiang Wang e061e71833
Merge pull request #10702 from taosdata/fix/ZhiqiangWang/TD-13768-redefine-time-api
[TD-13768]<fix>: redefine time api.
2022-03-11 16:57:06 +08:00
Shengliang Guan 712587511c shm 2022-03-11 16:49:48 +08:00
afwerar e04ef027ab [TD-13768]<fix>: redefine time api. 2022-03-11 16:49:07 +08:00
Shengliang Guan 27c17bcc5f shm 2022-03-11 16:09:55 +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
Shengliang Guan 266bf53a09 shm 2022-03-11 14:44:17 +08:00