Commit graph

1906 commits

Author SHA1 Message Date
Haojun Liao
29fd5ec11e [td-14393] fix bug. 2022-04-02 15:42:45 +08:00
Haojun Liao
c7e749d040 Merge remote-tracking branch 'origin/3.0' into feature/3.0_liaohj 2022-04-02 15:12:40 +08:00
Haojun Liao
cf25aca809 [td-13039] refactor. 2022-04-02 15:08:48 +08:00
Shengliang Guan
dc7147760b Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-04-02 11:02:10 +08:00
Cary Xu
37245334d5 rollup sma grammar integrate 2022-04-02 10:37:17 +08:00
Liu Jicong
eabc8e6337
Merge pull request #11195 from taosdata/feature/tq
add log
2022-04-01 22:43:36 +08:00
Liu Jicong
adf8bd5e82 add log 2022-04-01 21:30:06 +08:00
Shengliang Guan
5015a6a78b shm 2022-04-01 21:27:47 +08:00
Shengliang Guan
44311425db multi process 2022-04-01 19:52:14 +08:00
Shengliang Guan
8176ff04d1 minor changes 2022-04-01 19:43:29 +08:00
Shengliang Guan
e238dd22d5 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-04-01 19:31:49 +08:00
Haojun Liao
632f3b1cbf
Merge pull request #11188 from taosdata/feature/3.0_liaohj
[td-13039] support limit/offset
2022-04-01 19:07:22 +08:00
Shengliang Guan
becac9fd27 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-04-01 19:07:19 +08:00
Liu Jicong
18cd6c4055
Merge pull request #11190 from taosdata/feature/tq
Feature/tq
2022-04-01 18:28:53 +08:00
Liu Jicong
61d8ef3857 merge from 3.0 2022-04-01 18:15:18 +08:00
Liu Jicong
9ebdee326f fix txn 2022-04-01 18:13:46 +08:00
Cary Xu
ad68236481 remove the assert to pass CI 2022-04-01 17:58:09 +08:00
Shengliang Guan
e1660a1276 shm 2022-04-01 17:56:57 +08:00
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
7b0dfc6c4e [td-13039] support limit/offset 2022-04-01 17:21:24 +08:00
Shengliang Guan
c3917c2544 shm 2022-04-01 16:46:31 +08:00
Shengliang Guan
1649d0ddda shm 2022-04-01 16:36:36 +08:00
Haojun Liao
3846250454 [td-13039] fix query crash. 2022-04-01 16:09:00 +08:00
Shengliang Guan
13e6efe3fc shm 2022-04-01 15:42:27 +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
Liu Jicong
e916f83fd7 temp 2022-04-01 09:57:55 +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