ubuntu
64d979fd5c
update transport
2022-03-12 19:07:53 +08:00
Haojun Liao
61b351a14f
[td-13039] refactor.
2022-03-12 18:02:56 +08:00
Minghao Li
7607169b17
sync io
2022-03-12 17:19:54 +08:00
Minghao Li
2796c0d171
sync comment
2022-03-12 17:13:49 +08:00
Minghao Li
4676a486a9
Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/3.0_mhli
2022-03-12 17:09:03 +08:00
Minghao Li
81be154e0d
sync refactor
2022-03-12 17:02:15 +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
Minghao Li
be532bd5eb
sync refactor
2022-03-12 12:29:44 +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
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
Xiaoyu Wang
e5286898c0
TD-13990 implement interval plan
2022-03-11 05:11:25 -05: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
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
0595d9f1a6
Merge pull request #10604 from taosdata/feature/index_oper
...
Feature/index oper
2022-03-11 12:29:08 +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
e82e53367d
Merge pull request #10685 from taosdata/3.0_query_integrate
...
3.0 query integrate
2022-03-11 10:49:01 +08:00
Xiaoyu Wang
474ca755db
Merge pull request #10694 from taosdata/feature/3.0_query_integrate_wxy
...
TD-13747 bugfix
2022-03-11 10:41:28 +08:00
Xiaoyu Wang
75c5de4762
TD-13747 bugfix
2022-03-10 21:39:37 -05:00
Xiaoyu Wang
7e7ee57c7d
Merge pull request #10693 from taosdata/feature/3.0_query_integrate_wxy
...
TD-13747 show mnodes
2022-03-11 10:04:22 +08:00
Xiaoyu Wang
54e15db2f5
TD-13747 show mnodes
2022-03-10 21:02:47 -05:00
Xiaoyu Wang
8fcf2cc66a
Merge pull request #10691 from taosdata/feature/3.0_query_integrate_wxy
...
TD-13747 merge 3.0
2022-03-11 09:21:15 +08: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