Commit graph

853 commits

Author SHA1 Message Date
dapan1121
cd8a0e89ce
Merge pull request #11330 from taosdata/feature/qnode
Feature/qnode
2022-04-09 13:20:10 +08:00
WANG MINGMING
6fbe057a0b
Merge pull request #11311 from taosdata/feature/TD-14422
Feature/td 14422
2022-04-09 11:32:48 +08:00
Shengliang Guan
b1a8ed96f6 Merge remote-tracking branch 'origin/3.0' into feature/shm 2022-04-09 10:40:02 +08:00
Shengliang Guan
ffaef98b75 feat[cluster]: send monitor information in multi-process mode 2022-04-09 10:39:47 +08:00
WANG MINGMING
41392e9e4a
Merge branch '3.0' into feature/TD-14422 2022-04-09 10:18:52 +08:00
dapan1121
a8f740bcbb Merge remote-tracking branch 'origin/3.0' into feature/qnode 2022-04-09 09:41:18 +08:00
dapan1121
e9f7bf866a feature/qnode 2022-04-09 09:39:01 +08:00
dapan1121
abf827ed63 feature/qnode 2022-04-08 18:37:42 +08:00
dapan1121
99d6fda66a feature/qnode 2022-04-08 18:34:11 +08:00
Liu Jicong
deab8952e5
Merge pull request #11319 from taosdata/feature/tq
Feature/tq
2022-04-08 18:25:25 +08:00
WANG MINGMING
bcbba6d0ae
Merge branch '3.0' into feature/TD-14422 2022-04-08 17:28:03 +08:00
dapan1121
519b6ca0f3
Merge pull request #11305 from taosdata/feature/qnode
Feature/qnode
2022-04-08 17:21:33 +08:00
Liu Jicong
0480cb68e2 merge from 3.0 2022-04-08 17:14:34 +08:00
dapan1121
9f4744c6f3 feature/qnode 2022-04-08 16:05:30 +08:00
Liu Jicong
6df2fae1a2 fix compile 2022-04-08 15:26:02 +08:00
wangmm0220
8df8c60f60 merge from 3.0 2022-04-08 10:58:39 +08:00
Cary Xu
451a65f53f add dstVgId 2022-04-07 20:49:18 +08:00
Liu Jicong
74eee69a65 fix 2022-04-07 19:57:49 +08:00
Liu Jicong
d5fb11d239 add unsubscribe 2022-04-07 18:20:54 +08:00
Liu Jicong
10d291feab
Merge pull request #11282 from taosdata/feature/tq
add more log
2022-04-07 14:29:53 +08:00
Liu Jicong
a60185adc8 add more log 2022-04-07 14:11:16 +08:00
wangmm0220
83eacf8d07 merge from 3.0 2022-04-06 18:38:19 +08:00
Cary Xu
ca3206d45e Merge branch '3.0' into feature/TD-11463-3.0 2022-04-03 17:51:28 +08:00
Liu Jicong
47a094a24f merge from 3.0 2022-04-02 23:05:16 +08:00
Liu Jicong
798c3a9f82 add more log 2022-04-02 23:03:12 +08:00
Liu Jicong
8e2d121b3a temp 2022-04-02 19:59:25 +08:00
Shengliang Guan
7e361ebcd0 refact dm 2022-04-02 19:52:04 +08:00
wangmm0220
5aa3467e2b merge from 3.0 2022-04-02 19:02:45 +08:00
Cary Xu
1165368642 retentions param bug fix and deliver to vnode 2022-04-02 15:39:20 +08:00
wangmm0220
12c3a10a9b fix error in order by logic & fix no return error 2022-04-02 14:29:43 +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
44311425db multi process 2022-04-01 19:52:14 +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
Cary Xu
cf68440a59 bSma grammar integrate 2022-04-01 17:43:50 +08:00
Shengliang Guan
1649d0ddda shm 2022-04-01 16:36:36 +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
Xiaoyu Wang
7060fb793a modify unit test since the unit of db/table option DAYS/KEEP changes 2022-03-31 23:27:19 -04: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
Haojun Liao
8ab075c342 [td-14373]fix bug. 2022-03-31 16:24:59 +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