Commit graph

1883 commits

Author SHA1 Message Date
Cary Xu
e2e1d4c899 Merge branch '3.0' into feature/TD-11463-3.0 2022-04-01 17:44:21 +08:00
Cary Xu
cf68440a59 bSma grammar integrate 2022-04-01 17:43:50 +08:00
Haojun Liao
3846250454 [td-13039] fix query crash. 2022-04-01 16:09:00 +08:00
Shengliang Guan
6129f132ac
Merge pull request #11179 from taosdata/feature/shm
shm
2022-04-01 13:53:58 +08:00
Xiaoyu Wang
613963a128
Merge pull request #11167 from taosdata/feature/3.0_wxy
TD-14409 TD-14436 bugfix
2022-04-01 12:57:35 +08:00
Shengliang Guan
8eb99ef6d1 shm 2022-04-01 11:57:35 +08:00
Xiaoyu Wang
7060fb793a modify unit test since the unit of db/table option DAYS/KEEP changes 2022-03-31 23:27:19 -04:00
Shengliang Guan
ea8a336269 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-04-01 10:42:07 +08:00
Shengliang Guan
8fcaee6d97 minor changes 2022-04-01 10:39:59 +08:00
Haojun Liao
3f6e96c66d
Merge pull request #11166 from taosdata/feature/3.0_liaohj
[td-14373]fix bug.
2022-04-01 10:37:39 +08:00
Xiaoyu Wang
689fb26708 db or table option keep implement 2022-03-31 07:38:17 -04:00
Liu Jicong
b06db715bc
Merge pull request #11163 from taosdata/feature/tq
fix
2022-03-31 19:04:47 +08:00
Liu Jicong
e21ba1637e revert uid 2022-03-31 18:39:11 +08:00
Shengliang Guan
d89ab51375 minor changes 2022-03-31 17:38:47 +08:00
Liu Jicong
b56ea026cb fix 2022-03-31 17:36:21 +08:00
Shengliang Guan
651fb09407 handle sigchild 2022-03-31 17:27:04 +08:00
Liu Jicong
d02850382c fix serialize 2022-03-31 16:45:16 +08:00
Shengliang Guan
781d31d39f adjust log 2022-03-31 16:41:27 +08:00
Haojun Liao
8ab075c342 [td-14373]fix bug. 2022-03-31 16:24:59 +08:00
Shengliang Guan
bee82c6ff9 rename files 2022-03-31 16:19:47 +08:00
Shengliang Guan
68f2911ce2 rename files 2022-03-31 16:19:26 +08:00
Liu Jicong
b45f7cef2e fix 2022-03-31 16:04:23 +08:00
Liu Jicong
e163197573 merge from 3.0 2022-03-31 15:55:34 +08:00
Liu Jicong
3e5da8bedb fix 2022-03-31 15:52:54 +08:00
Shengliang Guan
873c2373f3 adjust logs 2022-03-31 15:48:53 +08:00
Shengliang Guan
a041c07c2f Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-31 15:29:21 +08:00
Shengliang Guan
1a8b1753fb shm 2022-03-31 15:27:21 +08:00
Haojun Liao
1e5bdbfa60
Merge pull request #11134 from taosdata/feature/3.0_liaohj
[td-14392] fix show bug.
2022-03-31 14:40:13 +08:00
Shengliang Guan
4c2ce0b407 shm 2022-03-31 11:59:34 +08:00
Shengliang Guan
4d6c844438 shm 2022-03-30 21:09:45 +08:00
Shengliang Guan
68da160004 shm 2022-03-30 20:51:34 +08:00
Shengliang Guan
afad08d106 shm 2022-03-30 20:45:30 +08:00
Shengliang Guan
b168766ff2 shm 2022-03-30 20:32:01 +08:00
Shengliang Guan
d90ebef80b Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-30 20:15:22 +08:00
Shengliang Guan
79936567c5 shm 2022-03-30 20:11:09 +08:00
Haojun Liao
387cfe8d45 [td-13039] fix bug in stream interval query. 2022-03-30 19:38:30 +08:00
Haojun Liao
8fe7c183cc Merge remote-tracking branch 'origin/3.0' into feature/3.0_liaohj 2022-03-30 18:11:33 +08:00
Cary Xu
7a8642ff53 memory clear 2022-03-30 17:54:29 +08:00
Haojun Liao
c39595639c [td-14392] fix show bug. 2022-03-30 17:09:06 +08:00
Shengliang Guan
ae182cd75a shm 2022-03-30 16:52:14 +08:00
Shengliang Guan
6ece0d9ac1 shm 2022-03-30 16:03:21 +08:00
Shengliang Guan
5bd37b75dc shm 2022-03-30 15:57:12 +08:00
Cary Xu
cf06c16379 Merge branch '3.0' into feature/TD-11463-3.0 2022-03-30 15:49:53 +08:00
Cary Xu
8627b593d5 insert tSma by SSDataBlock 2022-03-30 15:48:51 +08:00
Liu Jicong
f65908a095
Merge pull request #11118 from taosdata/feature/tq
Feature/tq
2022-03-30 14:38:16 +08:00
Liu Jicong
9364c8063c revert topic phyplan 2022-03-30 14:25:44 +08:00
Shengliang Guan
f16e9970fd Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-03-30 14:06:46 +08:00
Shengliang Guan
a341c476c0 shm 2022-03-30 14:06:36 +08:00
Liu Jicong
459ec6ed71 tmq optimize offset handling 2022-03-30 14:06:02 +08:00
Hongze Cheng
abfb80acac still use BDB 2022-03-30 03:21:57 +00:00