Commit graph

4975 commits

Author SHA1 Message Date
dapan1121
c28c77a099 Merge branch '3.0' into feature/queryredirect 2022-06-30 14:35:15 +08:00
Minglei Jin
ceaa37e430 tsdbCache: comment tsdbReadBlockIdx out for compiling 2022-06-30 14:12:20 +08:00
Hongze Cheng
319e745dd5 more work 2022-06-30 06:02:47 +00:00
Cary Xu
7e3753d6ac Merge branch '3.0' into feature/TD-11274-3.0 2022-06-30 11:18:31 +08:00
Cary Xu
d53e1982ad refactor: tref used for rsma fetch task 2022-06-30 11:18:21 +08:00
yihaoDeng
e389dcedc8 add query epset 2022-06-30 10:30:36 +08:00
Liu Jicong
8ac13a1234
Merge pull request #14374 from taosdata/feature/stream
feat(tmq): offset support snapshot
2022-06-29 23:54:22 +08:00
Liu Jicong
94c3eb29d2 fix(tmq): rsp error offset 2022-06-29 23:25:04 +08:00
Liu Jicong
e74187248b fix(tmq): offset 2022-06-29 22:29:02 +08:00
Cary Xu
6600c4725e refactor: code optimization 2022-06-29 21:35:04 +08:00
Liu Jicong
0f0fe6276a merge from 3.0 2022-06-29 21:33:10 +08:00
Cary Xu
79def727b5 Merge branch '3.0' into feature/TD-11274-3.0 2022-06-29 21:33:10 +08:00
Cary Xu
efb2cd27c7 refactor: add tref to solve the timer not stopped problem 2022-06-29 21:32:06 +08:00
Liu Jicong
c2955a807b feat(tmq): offset support snapshot 2022-06-29 21:04:51 +08:00
Hongze Cheng
1d88e84d10 add an API 2022-06-29 12:37:16 +00:00
Hongze Cheng
f7648eb28a Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-29 12:32:50 +00:00
Hongze Cheng
86d98a665e fix coredump 2022-06-29 12:32:44 +00:00
Haojun Liao
f610e2c213 Merge remote-tracking branch 'origin/feat/tsdb_refact' into feat/tsdb_refact 2022-06-29 20:25:17 +08:00
Haojun Liao
c5951374d4 refactor: do internal refactor. 2022-06-29 20:25:03 +08:00
Minglei Jin
703e876b4c tsdbCache: remove deprecated last row API 2022-06-29 20:03:27 +08:00
Hongze Cheng
64460a95b0 Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-29 10:37:39 +00:00
Hongze Cheng
aefc151c03 fix some code 2022-06-29 10:37:35 +00:00
Minglei Jin
5e793c2f3f tsdbCacheRead: use new H version api of last_row 2022-06-29 18:10:25 +08:00
Hongze Cheng
ac7f5190aa Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-29 10:05:25 +00:00
Hongze Cheng
ed69d8ee9f more work 2022-06-29 10:05:21 +00:00
dapan1121
53efe75146 feat: query redirect 2022-06-29 17:56:35 +08:00
Minglei Jin
ffbe35d67d Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-29 17:42:19 +08:00
Minglei Jin
8cd3bffb36 tsdbCache/delete: refine tsdbCacheDelete API 2022-06-29 17:41:06 +08:00
Hongze Cheng
2a6be2bc8a do commit 2022-06-29 09:40:33 +00:00
Hongze Cheng
ddb6745bd9 Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-29 09:34:08 +00:00
Hongze Cheng
843ef87574 fix file corrput 2022-06-29 09:34:04 +00:00
Minglei Jin
8f223eec91 Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-29 17:30:28 +08:00
Minglei Jin
847016aa21 tsdbCache: new H version api for last/last_row getting 2022-06-29 17:29:49 +08:00
Yihao Deng
2001be5996
Merge branch '3.0' into enh/stopquery 2022-06-29 17:24:52 +08:00
dapan1121
914e06e8cb feat: query redirect 2022-06-29 17:15:08 +08:00
Haojun Liao
3a566d5e5e refactor(query): do some internal refactor. 2022-06-29 17:14:00 +08:00
Minglei Jin
7678b6bb7d Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-29 16:55:04 +08:00
Hongze Cheng
8e1de153dd fix bug 2022-06-29 08:54:32 +00:00
Minglei Jin
8218febeae Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-29 16:54:05 +08:00
Minglei Jin
90788972e5 tsdbCache: new release interface 2022-06-29 16:53:30 +08:00
Hongze Cheng
c595b8cf51 more work 2022-06-29 07:07:01 +00:00
Hongze Cheng
930252e35c more 2022-06-29 07:00:04 +00:00
Hongze Cheng
dde1b94d80 Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-29 06:51:48 +00:00
Hongze Cheng
d032dec4fb more work 2022-06-29 06:51:45 +00:00
Haojun Liao
f02dd0ef88 Merge remote-tracking branch 'origin/feat/tsdb_refact' into feat/tsdb_refact 2022-06-29 14:18:20 +08:00
Haojun Liao
6464a3d272 refactor(query): do some internal refactor. 2022-06-29 14:18:03 +08:00
Hongze Cheng
1d012a47e5 more work 2022-06-29 03:43:33 +00:00
Hongze Cheng
1baacb3c3b Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-29 03:34:58 +00:00
Hongze Cheng
40dd9564f2 more work 2022-06-29 03:34:55 +00:00
dapan1121
07b46f9e3c Merge branch '3.0' into feature/queryredirect 2022-06-29 10:53:52 +08:00
dapan1121
6d8fd7e506 feat: query redirect 2022-06-29 10:51:22 +08:00
Haojun Liao
10ab8ca868 Merge remote-tracking branch 'origin/feat/tsdb_refact' into feat/tsdb_refact 2022-06-29 10:35:23 +08:00
Haojun Liao
f2b83dfb4a fix(query):check null ptr. 2022-06-29 10:35:07 +08:00
wangmm0220
54caa629ac fix:disable ttl temporary 2022-06-29 10:08:44 +08:00
Hongze Cheng
0dbdc3d68e more work 2022-06-29 02:06:06 +00:00
yihaoDeng
32c00b3801 modify case 2022-06-29 10:04:02 +08:00
Hongze Cheng
553f1bd506 Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-29 01:59:24 +00:00
Hongze Cheng
7dc8b876f3 more work 2022-06-29 01:59:22 +00:00
Haojun Liao
b8bc052aa4 refactor(query): do some internal refactor. 2022-06-29 09:40:31 +08:00
dapan1121
f579cc4c15 Merge branch '3.0' into enh/stopquery 2022-06-29 08:57:35 +08:00
Haojun Liao
5efd5a3b6d fix(query):adjust api for retrieve lastrow in executor. 2022-06-28 23:24:20 +08:00
yihaoDeng
697ffc524f Merge branch 'enh/stopquery' of https://github.com/taosdata/TDengine into stopquery 2022-06-28 19:21:35 +08:00
Hongze Cheng
18afc81a48 finish delete func 2022-06-28 10:01:56 +00:00
dapan1121
2dc928be5f Merge branch 'feat/tsdb_refact' of github.com:taosdata/TDengine into feat/tsdb_refact 2022-06-28 16:36:26 +08:00
dapan1121
2b9aff693b fix: remove rpc response msg in delete 2022-06-28 16:35:27 +08:00
Haojun Liao
33d58a5d7a Merge remote-tracking branch 'origin/feat/tsdb_refact' into feat/tsdb_refact 2022-06-28 16:29:51 +08:00
Haojun Liao
21f494a4c5 fix(query): set correct table uid. 2022-06-28 16:29:36 +08:00
Cary Xu
fc55d6fb85 refactor: rsma code optimization 2022-06-28 16:24:48 +08:00
Liu Jicong
58803fafcf fix(query): check datablock should check output flag 2022-06-28 16:05:00 +08:00
Minglei Jin
d3e741a84e tsdbCache/delete: load delete data only del file exists 2022-06-28 15:59:54 +08:00
Cary Xu
4091113dae refactor: rsma code optimization 2022-06-28 15:56:06 +08:00
Shengliang Guan
c0183e1fa8 fix: duplicate response while set standby in vnode 2022-06-28 15:50:47 +08:00
yihaoDeng
66e8e06861 fix: fix rpc quit problem 2022-06-28 15:49:33 +08:00
Minglei Jin
b5125afd79 tsdbCache/delete: use new tsdbReadDelIdx/Data interfaces 2022-06-28 15:49:15 +08:00
Cary Xu
75c8ea0677 Merge branch '3.0' into feature/TD-11274-3.0 2022-06-28 15:45:53 +08:00
Cary Xu
55a1c02f73 refactor: rsma code optimization 2022-06-28 15:45:29 +08:00
Haojun Liao
be08ccaedc refactor:do internal refactor. 2022-06-28 15:35:51 +08:00
Minglei Jin
985d9a638a Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-28 15:28:10 +08:00
Minglei Jin
d8aacdf251 tsdbCache/last: draft framework for last cols loading 2022-06-28 15:26:44 +08:00
Cary Xu
b66caf4111
Merge pull request #14317 from taosdata/feature/TD-11274-3.0
refactor: rsma restore
2022-06-28 15:24:48 +08:00
Haojun Liao
47a7522748 Merge remote-tracking branch 'origin/feat/tsdb_refact' into feat/tsdb_refact
# Conflicts:
#	source/dnode/vnode/src/vnd/vnodeSvr.c
2022-06-28 15:23:21 +08:00
Haojun Liao
4a59e1300b other: merge 3.0. 2022-06-28 15:22:32 +08:00
Hongze Cheng
3ba5d8e98a refact del data 2022-06-28 07:20:46 +00:00
Cary Xu
df417c7f50 fix: not restore rsma if qtaskinfo file not exist 2022-06-28 14:48:40 +08:00
Minghao Li
33d1440e7b refactor(sync): adjust trace log 2022-06-28 14:23:45 +08:00
Cary Xu
29e6987855 other: merge 3.0 2022-06-28 14:12:49 +08:00
Cary Xu
59f4d2c9c5 Merge branch '3.0' into feature/TD-11274-3.0 2022-06-28 14:12:00 +08:00
Cary Xu
5be089b888 refactor: rsma restore 2022-06-28 14:11:44 +08:00
Hongze Cheng
fbb9ebfddc more work 2022-06-28 05:55:20 +00:00
Liu Jicong
383e7a495b fix(query): enable output check 2022-06-28 13:45:50 +08:00
Hongze Cheng
79e23420b4 refact more 2022-06-28 05:41:15 +00:00
Hongze Cheng
788267b5b1 Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-28 05:25:12 +00:00
Hongze Cheng
017170e80e more work 2022-06-28 05:25:09 +00:00
yihaoDeng
3bb68c78ae fix: fix rpc quit problem 2022-06-28 11:52:43 +08:00
Haojun Liao
758c9e6392 Merge remote-tracking branch 'origin/feat/tsdb_refact' into feat/tsdb_refact 2022-06-28 11:37:44 +08:00
Haojun Liao
6a32f81265 fix(query): retrieve in-memory buffer data. 2022-06-28 11:37:26 +08:00
Hongze Cheng
89026d754f more work 2022-06-28 03:22:56 +00:00
Hongze Cheng
6f81c3f3a2 Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-28 02:35:41 +00:00
Hongze Cheng
d862aa0f3b more work 2022-06-28 02:35:37 +00:00
dapan1121
4a55ed07b3 feature: query redirect 2022-06-28 10:34:51 +08:00
Haojun Liao
c638c33a76 enh(query): retrieve in-memory data. 2022-06-28 10:32:42 +08:00
dapan1121
7da915fa67 Merge branch '3.0' into feature/queryredirect 2022-06-28 09:31:03 +08:00
Yihao Deng
64cc8bd81c
Merge pull request #14290 from taosdata/feat/noRetryMsg
feat: add no retry  msg
2022-06-28 09:17:27 +08:00
Cary Xu
1bcdca11cb
Merge pull request #14300 from taosdata/feature/TD-11274-3.0
refactor: rsma restore and code optimization
2022-06-28 09:10:51 +08:00
Hongze Cheng
aac1fb643f more work 2022-06-27 15:44:33 +00:00
Hongze Cheng
44c473303f more work 2022-06-27 15:42:55 +00:00
Shengliang Guan
2d2db54068
Merge pull request #14299 from taosdata/fix/mnode
fix: balance vgroup
2022-06-27 22:18:08 +08:00
Cary Xu
771801e2af refactor: rsma restore 2022-06-27 21:35:17 +08:00
Cary Xu
da8db399c3 Merge branch '3.0' into feature/TD-11274-3.0 2022-06-27 21:25:48 +08:00
Cary Xu
23a9c8f317 refactor: rsma restore and code optimization 2022-06-27 21:25:34 +08:00
Shengliang Guan
0db14e9440 Merge pull request #14297 from taosdata/fix/mnode
enh: adjust vgroup before commit
2022-06-27 21:17:42 +08:00
Shengliang Guan
3a712fb5d1 fix: balance vgroup 2022-06-27 21:17:38 +08:00
Hongze Cheng
83fa9e63b0 Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-27 13:05:20 +00:00
Hongze Cheng
c9ab455bef more work 2022-06-27 13:05:17 +00:00
Minglei Jin
6ece070911 tsdbCache: first round tsRowFromTsdbRow 2022-06-27 20:59:13 +08:00
Shengliang Guan
3d323f5688 enh: adjust vgroup before commit 2022-06-27 20:55:17 +08:00
Shengliang Guan
c6c8446b18
Merge pull request #14291 from taosdata/fix/mnode
fix: drop dnode
2022-06-27 20:36:22 +08:00
Hongze Cheng
38b7cfe18e more work 2022-06-27 12:14:33 +00:00
Hongze Cheng
78774c333f more work 2022-06-27 12:03:19 +00:00
Shengliang Guan
f040d01812
Merge pull request #14289 from taosdata/fix/mnode
enh: add retryCode for transaction
2022-06-27 19:48:33 +08:00
Shengliang Guan
a6dc29ef9e fix: drop dnode 2022-06-27 19:47:37 +08:00
yihaoDeng
14209eeec6 feat: add no retry to query 2022-06-27 19:34:50 +08:00
Hongze Cheng
80367eb841 Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-27 11:20:13 +00:00
Hongze Cheng
f9fd39eb58 more work 2022-06-27 11:20:11 +00:00
dapan1121
d402716465 enh: stop query 2022-06-27 18:29:28 +08:00
Shengliang Guan
2e2b28dbd2 enh: add retryCode for transaction 2022-06-27 18:28:51 +08:00
Shengliang Guan
f24d73db4a
Merge pull request #14285 from taosdata/fix/mnode
enh: add retryCode for transaction
2022-06-27 18:28:20 +08:00
Xiaoyu Wang
87b8131409
Merge pull request #14266 from taosdata/feature/3.0_debug_wxy
feat: tail function rewrite to statement
2022-06-27 17:16:37 +08:00
Shengliang Guan
007ebbd54a enh: add retryCode for transaction 2022-06-27 17:10:38 +08:00
shenglian-zhou
88083c96d3
Merge pull request #14275 from taosdata/szhou/feature/misc
fix: fix bug about memcpy overflow
2022-06-27 16:59:12 +08:00
slzhou
b67c65313b fix: add group to multi-merge operator 2022-06-27 16:25:14 +08:00
Minglei Jin
ed6276bd11 Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-27 15:50:55 +08:00
Minglei Jin
03d5b62d52 tsdbCache/skyline: first round skyline detection 2022-06-27 15:50:16 +08:00
Hongze Cheng
d814016e23 more work 2022-06-27 07:23:38 +00:00
Cary Xu
8281176b0b other: code optimization 2022-06-27 15:22:56 +08:00
Cary Xu
16b2d7932d refactor: rsma restore 2022-06-27 15:02:18 +08:00
Cary Xu
e2ec8b57d9 Merge branch '3.0' into feature/TD-11274-3.0 2022-06-27 14:47:31 +08:00
Cary Xu
e6dd04f573 refactor: rsma restore 2022-06-27 14:47:14 +08:00
Hongze Cheng
2a41f1d3f6 more work 2022-06-27 06:07:45 +00:00
Hongze Cheng
6140856ef4 Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-27 05:30:14 +00:00
Hongze Cheng
4b5b3bad11 more work 2022-06-27 05:30:10 +00:00
shenglian zhou
9a24494922 fix: fix bug about memcpy overflow 2022-06-27 11:07:07 +08:00
Li Minghao
486f268353
Merge pull request #14272 from taosdata/feature/3.0_mhli
refactor(sync): optimized only one replica
2022-06-27 11:05:39 +08:00
Haojun Liao
dbd8c300fa refactor: do tsdbread refactor. 2022-06-27 10:46:20 +08:00
Minglei Jin
ce15ee0e41 tsdbCache: insert into lru if last_row loaded 2022-06-27 10:09:16 +08:00
Cary Xu
0597f3b9cd refactor: rsma resource release 2022-06-26 18:44:49 +08:00
Minghao Li
6eecbcd1a6 refactor(sync): optimized one replica 2022-06-26 01:16:11 +08:00
Minglei Jin
9dd060b439 use new tsdbReadBlockData interface 2022-06-25 20:58:29 +08:00
Shengliang Guan
013c3820f3
Merge pull request #14251 from taosdata/fix/tsim
feat: privilege for sysinfo user
2022-06-25 20:40:20 +08:00
Yihao Deng
a081c7c154
Merge branch '3.0' into feat/idxFix 2022-06-25 20:40:16 +08:00
yihaoDeng
5a4b51a968 fix index bug 2022-06-25 20:36:38 +08:00
Minghao Li
a6f33ba01c refactor(sync): optimized one replica 2022-06-25 20:31:42 +08:00
Shengliang Guan
225f283738 fix: set user name to root in unitest 2022-06-25 20:05:27 +08:00
Liu Jicong
0c1a51bad6 enh(stream): refine tqRetrieveDataBlock api 2022-06-25 20:03:29 +08:00
Hongze Cheng
9a123ba608 Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-25 11:40:52 +00:00
Hongze Cheng
e32961ce5e more work 2022-06-25 11:40:50 +00:00
Minglei Jin
65b54f9d73 tsdbCache: framework for last row merging 2022-06-25 19:31:16 +08:00
Shengliang Guan
d6ed66d248 Merge remote-tracking branch 'origin/3.0' into fix/tsim 2022-06-25 19:22:09 +08:00
Shengliang Guan
86f82af821 fix: check privilege while show dnode variables 2022-06-25 19:21:35 +08:00
Liu Jicong
996f995644 fix(sma): drop stream when drop sma 2022-06-25 18:14:42 +08:00
Liu Jicong
bdd4134fc1
Revert "fix(sma): drop stream when drop sma" 2022-06-25 18:11:11 +08:00
Shengliang Guan
8fe87e9e0e Merge remote-tracking branch 'origin/3.0' into fix/tsim 2022-06-25 18:03:23 +08:00
Shengliang Guan
89d6ca7823 feat: privilege for sysinfo user 2022-06-25 18:03:12 +08:00
Liu Jicong
3210fdc367 merge from 3.0 2022-06-25 17:49:25 +08:00
Liu Jicong
47ae534c0f fix(sma): drop stream when drop sma 2022-06-25 17:44:54 +08:00
Liu Jicong
c8cca3568a
Merge pull request #14246 from taosdata/feature/stream
enh(stream): generate schema only once
2022-06-25 17:36:18 +08:00
Liu Jicong
814b3caabf enh(stream): generate schema only once 2022-06-25 17:14:50 +08:00
liuyao
76596b0c17
Merge pull request #14243 from taosdata/feature/TD-16728
feat(stream): auto pull data
2022-06-25 17:08:14 +08:00
shenglian-zhou
6c7aaecbe0
Merge pull request #14237 from taosdata/szhou/feature/table-merge-scan-operator
fix: restore table merge scan operator
2022-06-25 17:07:33 +08:00
Hongze Cheng
7d1574feca fix map data encode bug 2022-06-25 08:52:24 +00:00
54liuyao
10e90ce973 feat(stream): auto pull data 2022-06-25 16:44:14 +08:00
Liu Jicong
3e754d157f
Merge pull request #14241 from taosdata/feature/stream
fix(tmq): check stb existence when subscribing stb
2022-06-25 15:51:24 +08:00
Shengliang Guan
1fb2c664a4
Merge pull request #14223 from taosdata/fix/tsim
refactor: rename auth to privilege
2022-06-25 15:26:59 +08:00
Liu Jicong
90121ae439 fix(tmq): check stb existence when subscribing stb 2022-06-25 15:26:29 +08:00
WANG MINGMING
0e8319f70a
Merge pull request #14236 from taosdata/feature/TD-16524
fix:memory error
2022-06-25 14:48:04 +08:00
Yihao Deng
6e4e10ad41
Merge pull request #14214 from taosdata/feat/rpcRefactor1
feat: rpc refactor
2022-06-25 14:47:37 +08:00
slzhou
a9f094613a fix: restore table merge scan operator 2022-06-25 13:52:52 +08:00
wangmm0220
7acf012253 fix:memory error 2022-06-25 13:51:43 +08:00
yihaoDeng
7c57b03de7 handle rpc retry 2022-06-25 12:19:52 +08:00
Haojun Liao
916adb82c6 enh(query): add user name when retrieving meta-data from mnode. 2022-06-25 12:10:34 +08:00
Shengliang Guan
d08835d518 fix: privilege for create topic 2022-06-25 12:03:15 +08:00
Hongze Cheng
e0deddc817 more work 2022-06-25 03:46:05 +00:00
Liu Jicong
e6f88b6286
Merge pull request #14225 from taosdata/feature/stream
enh(query): window included in serialized retrieve table rsp
2022-06-25 11:35:18 +08:00
Shengliang Guan
b07dfdbaf5 Merge branch 'fix/mnode' into fix/tsim 2022-06-25 11:32:41 +08:00
Shengliang Guan
43f1d41122 fix: compile error 2022-06-25 11:23:44 +08:00
Shengliang Guan
a0a167a120 Merge remote-tracking branch 'origin/3.0' into fix/mnode 2022-06-25 11:22:48 +08:00
Shengliang Guan
23653fd843 enh: privilege for topic and stream 2022-06-25 11:22:34 +08:00
Shengliang Guan
aa8faeba49
Merge pull request #14224 from taosdata/fix/mnode
refactor: rename auth to privilege
2022-06-25 11:02:17 +08:00
Liu Jicong
5040cb9541 enh(query): window included in serialized retrieve table rsp 2022-06-25 10:43:19 +08:00
Shengliang Guan
09ce47ae9f refactor: rename auth to privilege 2022-06-25 10:27:27 +08:00
Shengliang Guan
96b3603bfd refactor: rename auth to privilege 2022-06-25 09:56:34 +08:00
WANG MINGMING
f0b50add27
Merge pull request #14184 from taosdata/feature/TD-13041
feat:sort table group if needed & optimize partition by tag
2022-06-25 09:41:30 +08:00
Shengliang Guan
4fb79dd0c3 fix: compile errors 2022-06-25 09:01:16 +08:00
Shengliang Guan
12f9a3f34d Merge remote-tracking branch 'origin/3.0' into fix/mnode 2022-06-25 08:58:33 +08:00
Shengliang Guan
cdfb47cb55 feat: check oper privilege 2022-06-25 08:56:47 +08:00
Shengliang Guan
c70a930dea
Merge pull request #14222 from taosdata/fix/tsim
fix: no redirect resp
2022-06-25 08:56:21 +08:00
Liu Jicong
91d714e69b
Merge pull request #14220 from taosdata/feature/stream
fix(stream): support none type in submit msg
2022-06-24 22:10:16 +08:00
Liu Jicong
0964b07229 fix(stream): support none type in submit msg 2022-06-24 21:44:53 +08:00
Hongze Cheng
21062f72d1 more work 2022-06-24 13:10:39 +00:00
Shengliang Guan
f810212d29 fix: no redirect resp 2022-06-24 19:03:56 +08:00
wangmm0220
f3c2957628 opti:ttl/comment log and parameters 2022-06-24 18:38:06 +08:00
Hongze Cheng
bbf92eeba6 more work 2022-06-24 10:10:41 +00:00
Shengliang Guan
e3698b0bd3 test: fix unitest after enable sysinfo option 2022-06-24 18:09:07 +08:00
Shengliang Guan
41eaee7623 test: fix unitest after enable sysinfo option 2022-06-24 18:03:55 +08:00
Shengliang Guan
5427caf4df Merge remote-tracking branch 'origin/3.0' into fix/mnode 2022-06-24 17:49:20 +08:00
wangmm0220
62ce467711 fix:error in compile 2022-06-24 17:37:30 +08:00
Li Minghao
732d69db63
Merge pull request #14211 from taosdata/feature/3.0_mhli
refactor(sync): adjust log buf size
2022-06-24 17:27:10 +08:00
Liu Jicong
64d2a3e34f Merge branch '3.0' into feature/stream 2022-06-24 17:00:07 +08:00
Shengliang Guan
d98270fe12 fix: no redirect resp 2022-06-24 17:00:00 +08:00
Liu Jicong
f53521cb8c test(stream): partition by tbname 2022-06-24 16:50:11 +08:00
Shengliang Guan
9aa684ba77 fix: no redirect resp 2022-06-24 16:47:28 +08:00
Shengliang Guan
e823041cf4 test: adjust retry times if lock failed 2022-06-24 16:47:12 +08:00
dapan1121
f7ece71ff7
Merge pull request #14204 from taosdata/enh/showvariables
enh: refactor show variables
2022-06-24 16:41:48 +08:00
Zhiqiang Wang
4935ef8fb4
Merge pull request #14198 from taosdata/fix/ZhiqiangWang/TD-16357-add-test-time-count-print
test: add test time count print
2022-06-24 16:12:15 +08:00
Shengliang Guan
01ce401d54 Merge remote-tracking branch 'origin/3.0' into fix/dnode 2022-06-24 16:08:59 +08:00
wangmm0220
ff3cb336d8 fix:merge from 3.0 2022-06-24 16:01:58 +08:00
Shengliang Guan
b47c829a9c fix: auth failure 2022-06-24 15:55:31 +08:00
Hongze Cheng
39e48a7eaa more work 2022-06-24 07:42:17 +00:00
Minghao Li
7695dbcce7 refactor(sync): adjust election timer 2022-06-24 15:28:01 +08:00
Liu Jicong
26c1388237
Merge pull request #14201 from taosdata/feature/stream
refactor(stream): seperate stream scheduling and persistence
2022-06-24 15:25:31 +08:00
Shengliang Guan
e8db435e2e enh: adjust password len 2022-06-24 15:24:13 +08:00
Shengliang Guan
544a2534c5 test: case for sysinfo and enable user 2022-06-24 15:22:57 +08:00
dapan1121
94a2b6d945 enh: refactor show variables 2022-06-24 15:18:40 +08:00
Liu Jicong
a9606ea0eb Merge branch '3.0' into feature/stream 2022-06-24 14:41:17 +08:00
afwerar
4c846895ff test: add test time count print 2022-06-24 14:36:41 +08:00
Minghao Li
87defc2790 refactor(sync): add interface: get retry epset 2022-06-24 14:26:31 +08:00
Liu Jicong
b884ca9db7 refactor(stream): seperate stream scheduling and persistence 2022-06-24 14:19:12 +08:00
Minghao Li
8a8e42a923 refactor(sync): set error code in syncIsReady 2022-06-24 14:04:58 +08:00
wangmm0220
0d9ed6d60a fix:merge from 3.0 2022-06-24 13:51:33 +08:00
Hongze Cheng
a7ea0bfe73 more 2022-06-24 01:47:37 +00:00
Liu Jicong
35e234f1f0
Merge pull request #14187 from taosdata/feature/stream
fix(stream): memory leak
2022-06-24 09:39:53 +08:00
Hongze Cheng
f7c771727a Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-24 01:29:19 +00:00
Minglei Jin
c999aead58 last_row/del-skyline: first round skyline building 2022-06-23 23:14:18 +08:00
Liu Jicong
f2f5d68f3b fix(stream): memory leak 2022-06-23 22:05:00 +08:00
Hongze Cheng
1753d121cb more work 2022-06-23 13:23:43 +00:00
Shengliang Guan
61f733c589 Merge remote-tracking branch 'origin/3.0' into fix/mnode 2022-06-23 21:10:03 +08:00
Shengliang Guan
9f0d89d6ff enh: add stbinfo to minotor 2022-06-23 21:09:50 +08:00
wangmm0220
a95f98f7e7 feat:merge from 3.0 2022-06-23 20:50:48 +08:00
wangmm0220
3799db4366 feat:sort table group if needed 2022-06-23 20:46:11 +08:00
Shengliang Guan
bec17d10a9
Merge pull request #14180 from taosdata/fix/mnode
enh: add stbs/tbs/dbs to monitor info
2022-06-23 20:21:21 +08:00
Liu Jicong
5cdef06f8c
Merge pull request #14119 from taosdata/feature/3_liaohj
refactor(query): do some internal refactor.
2022-06-23 20:08:15 +08:00
wangmm0220
26cceaf172 feat:sort table group if needed 2022-06-23 19:58:12 +08:00
Shengliang Guan
44a3faafa8 Merge remote-tracking branch 'origin/3.0' into fix/mnode 2022-06-23 19:55:08 +08:00
Hongze Cheng
81897d32af more work 2022-06-23 10:30:19 +00:00
Shengliang Guan
c93d93e2d5 enh: add stbs/tbs/dbs to monitor info 2022-06-23 18:23:51 +08:00
Shengliang Guan
eb86ecfa78 Merge remote-tracking branch 'origin/3.0' into fix/dnode 2022-06-23 17:57:34 +08:00
Haojun Liao
9c6057caa3 fix(query): fix syntax error. 2022-06-23 17:44:58 +08:00
Haojun Liao
e3c4215ac9 Merge branch '3.0' into feature/3_liaohj 2022-06-23 17:39:58 +08:00
Liu Jicong
323ee6b1b0 enh(tmq): add demo for tmq_get_raw_meta 2022-06-23 17:26:52 +08:00
Liu Jicong
14048a5e4c fix(tmq): read repeat data after reading snapshot 2022-06-23 17:09:06 +08:00
Shengliang Guan
ef00464f9c fix: retry 12 seconds if lock file failed 2022-06-23 16:35:05 +08:00
Hongze Cheng
4b33695f3c more work 2022-06-23 08:34:18 +00:00
Liu Jicong
c018a14e56 Merge branch '3.0' into feature/stream 2022-06-23 16:09:41 +08:00
Liu Jicong
bd64bebb63
Merge branch '3.0' into feature/3_liaohj 2022-06-23 16:00:17 +08:00
Cary Xu
e76af269e6
Merge pull request #14032 from taosdata/feature/TD-14481-3.0
refactor: rsma code optimization
2022-06-23 15:57:48 +08:00
Liu Jicong
71bda7e658 feat(tmq): add with meta config 2022-06-23 15:56:54 +08:00
Shengliang Guan
725baf4a7c Merge remote-tracking branch 'origin/3.0' into fix/dnode 2022-06-23 15:35:56 +08:00
Shengliang Guan
0811e5fc93 feat: make config dnode work 2022-06-23 15:35:22 +08:00
Cary Xu
b2f81331a5 other: code optimization for rsma 2022-06-23 15:28:02 +08:00
Shengliang Guan
147a984c17 feat: make config dnode work 2022-06-23 15:11:23 +08:00
Shengliang Guan
6241799b29
Merge pull request #14149 from taosdata/fix/dnode
feat: let drop dnode support ep
2022-06-23 15:00:36 +08:00
wangmm0220
c8f223a6ec fix:merge from 3.0 2022-06-23 14:26:26 +08:00
Cary Xu
b1adcf00c8 Merge branch '3.0' into feature/TD-14481-3.0 2022-06-23 14:19:33 +08:00
Cary Xu
0a24fbcdd6 feat: persistence of rsma qtaskinfo 2022-06-23 14:19:21 +08:00
Liu Jicong
132b22d488
Merge pull request #14150 from taosdata/feature/stream
feat(tmq): scan tsdb as a snapshot
2022-06-23 14:19:07 +08:00
Liu Jicong
2af4a4d250 merge from 3.0 2022-06-23 14:15:33 +08:00
Shengliang Guan
4093184d2c Merge remote-tracking branch 'origin/3.0' into fix/dnode 2022-06-23 14:14:31 +08:00
shenglian zhou
edc42a78ab fix: fix compilation error 2022-06-23 13:59:31 +08:00
shenglian zhou
f4ec009a00 Merge branch '3.0' of github.com:taosdata/TDengine into feature/3_liaohj 2022-06-23 13:49:10 +08:00
WANG MINGMING
94fd30919f
Merge pull request #14147 from taosdata/feature/3.0_wxy
fix: error in lock meta
2022-06-23 13:40:14 +08:00
Liu Jicong
4ed47a0296 feat(tmq): scan tsdb as snapshot 2022-06-23 13:35:24 +08:00
Shengliang Guan
34daf19946 feat: let drop dnode support ep 2022-06-23 13:29:27 +08:00
dapan1121
b2ff536050
Merge pull request #14118 from taosdata/feature/showdnodevariables
feat: show dnode variables
2022-06-23 13:23:06 +08:00
wangmm0220
eb8a68827a fix: unlock meta 2022-06-23 12:11:12 +08:00
wangmm0220
fb59f14289 fix: unlock meta 2022-06-23 12:09:24 +08:00
Hongze Cheng
4d8d1df2e5 more work 2022-06-23 03:54:20 +00:00
Hongze Cheng
cae57255be more work 2022-06-23 03:08:19 +00:00
Haojun Liao
2d31d3cb43 other: merge 3.0 2022-06-23 10:37:07 +08:00
WANG MINGMING
9012834531
Merge branch 'feature/3.0_wxy' into 3.0 2022-06-23 10:16:58 +08:00
WANG MINGMING
77f34c8fca
Merge pull request #14094 from taosdata/feature/TD-16524
fix: error in windows
2022-06-23 10:08:56 +08:00
Hongze Cheng
c58b43ba95 more work 2022-06-23 01:45:53 +00:00
Hongze Cheng
bc326593d6 more work 2022-06-23 01:39:47 +00:00
Liu Jicong
ab01fec5e4
Merge pull request #14134 from taosdata/feature/stream
feat(stream): stream support multiple type input
2022-06-22 22:52:35 +08:00
Liu Jicong
14a488c92c feat(stream): stream support multiple type input 2022-06-22 21:21:39 +08:00
Shengliang Guan
31744fcf00
Merge pull request #14131 from taosdata/fix/dnode
feat: balance vgroup
2022-06-22 20:48:35 +08:00
Haojun Liao
bf0caa2038 Merge branch '3.0' into feature/3_liaohj 2022-06-22 20:32:02 +08:00
Hongze Cheng
f0caae86af more work 2022-06-22 12:03:44 +00:00
Shengliang Guan
f05c431e84 feat: balance vgroup 2022-06-22 19:56:38 +08:00
Liu Jicong
df1967de4b
Merge pull request #14120 from taosdata/feature/stream
feat(stream): support retrieve
2022-06-22 19:34:27 +08:00
shenglian-zhou
cc3543d4e3
Merge pull request #14126 from taosdata/szhou/feature/sort-group-2
feat: prepare for multiple group tsdb reads
2022-06-22 19:20:41 +08:00
Liu Jicong
fb596625d3 feat(stream): support retrieve 2022-06-22 19:12:31 +08:00
shenglian zhou
c1f5f825b7 feat: prepare for multiple group tsdb reads 2022-06-22 18:51:16 +08:00
Hongze Cheng
5d2491de52 more work 2022-06-22 09:28:59 +00:00
Haojun Liao
5c1e7f3114 Merge branch '3.0' into feature/3_liaohj 2022-06-22 17:23:57 +08:00
Haojun Liao
14ddf539e0 refactor(query): do some internal refactor. 2022-06-22 17:21:04 +08:00
dapan1121
66cfe3a3fc feat: show dnode variables 2022-06-22 17:17:18 +08:00
wangmm0220
d9dc806a21 feat: add configure for ttl 2022-06-22 17:11:18 +08:00
Cary Xu
ee7ace765b Merge branch '3.0' into feature/TD-14481-3.0 2022-06-22 17:06:45 +08:00
Hongze Cheng
b20d7d56b5 more work 2022-06-22 08:45:26 +00:00
WANG MINGMING
15eb9c485e
Merge pull request #14069 from taosdata/3.0
feat:merge from 3.0
2022-06-22 16:33:15 +08:00
wangmm0220
db34294bed opt: filter by tag 2022-06-22 16:32:10 +08:00
Shengliang Guan
8cdbe63952 enh: drop qnode and snode on dnode 2022-06-22 15:41:30 +08:00
Shengliang Guan
9f96667f86 Merge remote-tracking branch 'origin/3.0' into fix/dnode 2022-06-22 14:55:42 +08:00
Shengliang Guan
f5c0ab8579 feat: drop dnode 2022-06-22 14:55:29 +08:00
Hongze Cheng
23c838c9ef more work 2022-06-22 06:34:39 +00:00
Liu Jicong
45489e7481
Merge pull request #14101 from taosdata/feature/stream
fix(wal): return correct msg for open wal file
2022-06-22 13:28:22 +08:00
Liu Jicong
82a1cc8e41 fix(wal): return correct msg for open wal file 2022-06-22 11:21:33 +08:00
Shengliang Guan
adce85f977 Merge remote-tracking branch 'origin/3.0' into feature/TD-16524 2022-06-22 11:20:08 +08:00
Shengliang Guan
ab37b6e546 refactor: adjust code styles 2022-06-22 11:18:10 +08:00
Yihao Deng
7f8b260194
Merge pull request #14073 from taosdata/feature/refactor_rpc
refactor:  add gtid to log
2022-06-22 11:17:01 +08:00
Shengliang Guan
f4b0cb6baf
Merge pull request #14092 from taosdata/fix/dnode
refactor: add gtid for trace
2022-06-22 11:06:16 +08:00
Shengliang Guan
ca0d858a00 refactor: add gtid for trace 2022-06-22 09:50:53 +08:00
Liu Jicong
557d69d14a
Merge pull request #14087 from taosdata/feature/stream
fix(stream): convert datablk to submit blk
2022-06-22 09:43:48 +08:00
afwerar
72ab0e1ae9 test: fix sim test ttl error 2022-06-21 21:52:38 +08:00
Liu Jicong
5005ee3369
Merge branch '3.0' into feature/stream 2022-06-21 21:50:03 +08:00
Zhiqiang Wang
04771a6d82
Merge pull request #14079 from taosdata/fix/ZhiqiangWang/TD-16357-fix-sim-test-error
test: fix sim test error
2022-06-21 21:50:01 +08:00
Liu Jicong
f2b66cc16a fix(stream): convert datablk to submit blk 2022-06-21 21:48:24 +08:00
dapan1121
4a8c9db884 Merge branch '3.0' into feature/showdnodevariables 2022-06-21 21:07:44 +08:00
dapan1121
692f5f0e01 feat: show dnode variables 2022-06-21 21:05:47 +08:00
dapan1121
a23418d1fa
Merge pull request #14070 from taosdata/feature/showcreate
feat: show create table
2022-06-21 21:05:30 +08:00
afwerar
9dff7b93c6 test: fix sim test error 2022-06-21 20:04:55 +08:00
Yihao Deng
c485e023fc
Merge branch '3.0' into feature/refactor_rpc 2022-06-21 19:19:32 +08:00
dapan1121
a98601b11d feat: show create table 2022-06-21 18:41:12 +08:00
wangmm0220
f2ad546666 fix: add configure for ttl unit 2022-06-21 18:37:47 +08:00
yihaoDeng
963a72eed3 refactor code 2022-06-21 18:31:50 +08:00
Hongze Cheng
7b353b5709 more work 2022-06-21 10:25:10 +00:00
wangmm0220
12d8714f29 feat:merge from 3.0 2022-06-21 18:01:40 +08:00
dapan1121
88b48ec46c Merge branch '3.0' into feature/showcreate 2022-06-21 17:40:52 +08:00
Hongze Cheng
6a50b2b483 Merge branch 'feat/tsdb_refact' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-21 09:13:19 +00:00
Hongze Cheng
47e07b7b13 more work 2022-06-21 09:13:16 +00:00
Shengliang Guan
f8e282644e test: minor changes 2022-06-21 16:44:49 +08:00
Haojun Liao
4a132aecef fix(query): add query cache implementation file 2022-06-21 16:29:19 +08:00
Shengliang Guan
676e70d5df refactor: add gtid to log 2022-06-21 16:18:01 +08:00
Haojun Liao
906b50df49 Merge remote-tracking branch 'origin/feat/tsdb_refact' into feat/tsdb_refact 2022-06-21 16:16:35 +08:00
Haojun Liao
d8c778e468 feature(query):add lastrow scan operator. 2022-06-21 16:15:17 +08:00
Cary Xu
57db482a9f Merge branch '3.0' into feature/TD-14481-3.0 2022-06-21 15:58:35 +08:00
Shengliang Guan
40a84f9f0a Merge remote-tracking branch 'origin/3.0' into fix/mnode 2022-06-21 15:35:17 +08:00
Liu Jicong
1644294e25
Merge pull request #14046 from taosdata/feature/stream
feat(stream): drop stream
2022-06-21 15:18:30 +08:00
Liu Jicong
3f6ce2da73 feat(tmq): support topic with meta 2022-06-21 15:18:09 +08:00
Hongze Cheng
29e65ce767 more tsdb fs work 2022-06-21 07:13:12 +00:00
Shengliang Guan
c243b314c7 refactor: add gtid to log 2022-06-21 15:05:31 +08:00
Cary Xu
75160a989d Merge branch '3.0' into feature/TD-14481-3.0 2022-06-21 13:59:29 +08:00
Shengliang Guan
714c599fd7 fix: deadlock while set standby 2022-06-21 11:40:27 +08:00
Liu Jicong
c409760f75 feat(stream): drop stream 2022-06-21 11:32:36 +08:00
wangmm0220
c79be2dac6 feat: merge from 3.0 2022-06-21 10:58:50 +08:00
Minglei Jin
a55f40a1a7 feat/tsdbCache: the first round tsdbCache 2022-06-21 10:54:30 +08:00
wangmm0220
8494bf17be opt:partition by tag 2022-06-21 10:52:09 +08:00
Shengliang Guan
7571d9d91e
Merge pull request #14024 from taosdata/fix/mnode
refactor: get sdb snapshot in atomic way
2022-06-21 10:32:46 +08:00
Shengliang Guan
964ce011b5 Merge remote-tracking branch 'origin/3.0' into fix/mnode 2022-06-21 09:52:00 +08:00
Shengliang Guan
53198f58bb refactor: add post process for query msg 2022-06-21 09:48:31 +08:00
Liu Jicong
212144a3e6 test(stream): window close not work for stb 2022-06-20 21:50:13 +08:00
Cary Xu
6ea490a8fb Merge branch '3.0' into feature/TD-14481-3.0 2022-06-20 21:11:47 +08:00
dapan1121
be2935cba6 feat: show create table 2022-06-20 20:58:36 +08:00
Liu Jicong
57e6846dae
Merge pull request #14028 from taosdata/feature/stream
feat(stream): support snode
2022-06-20 20:49:56 +08:00
Li Minghao
55a79f25a2
Merge pull request #14031 from taosdata/feature/3.0_mhli
refactor(sync): propose fail when changing
2022-06-20 20:45:57 +08:00
Cary Xu
a1774d913b refactor: code optimization 2022-06-20 20:42:28 +08:00
Cary Xu
68dfcfff8a refactor: rsma code optimization 2022-06-20 20:32:44 +08:00
Liu Jicong
f5f8100d25
Merge branch '3.0' into feature/stream 2022-06-20 20:19:08 +08:00
Liu Jicong
450675f672 feat(stream): support snode 2022-06-20 20:18:34 +08:00
Hongze Cheng
4cacd72fcb more work 2022-06-20 12:17:22 +00:00
Hongze Cheng
5028420791 more work 2022-06-20 11:28:45 +00:00
Cary Xu
20508c42f2 Merge branch '3.0' into feature/TD-14481-3.0 2022-06-20 19:27:38 +08:00
Cary Xu
ba94a44bec refactor: rsma support max_delay/watermark params 2022-06-20 19:27:26 +08:00
Shengliang Guan
ab0d7d31bc refactor: get sdb snapshot in atomic way 2022-06-20 18:37:46 +08:00
Shengliang Guan
ca7057ce11 Merge remote-tracking branch 'origin/3.0' into fix/mnode 2022-06-20 18:07:00 +08:00
Minghao Li
e441bd266b refactor(sync): add changing state 2022-06-20 17:48:56 +08:00
Hongze Cheng
d17d6c5009 more work 2022-06-20 09:47:24 +00:00
Cary Xu
565a11330d
Merge pull request #14010 from taosdata/feature/TD-14481-3.0
feat: fetch rsma result by timer supported
2022-06-20 17:12:43 +08:00
Cary Xu
4ef0a66453 test: adjust rsma test case 2022-06-20 16:41:36 +08:00
Shengliang Guan
96434756de refactor: save sdb file on needed 2022-06-20 16:23:04 +08:00
Hongze Cheng
0359254bdf more work 2022-06-20 08:06:34 +00:00
Cary Xu
24af96f833 other: solve conflict 2022-06-20 15:39:20 +08:00
Liu Jicong
1505667897
Merge branch '3.0' into feature/stream 2022-06-20 15:34:04 +08:00
wangmm0220
934d0f9784 fix:error in windows 2022-06-20 15:23:48 +08:00
Cary Xu
820cc89c3a Merge branch '3.0' into feature/TD-14481-3.0 2022-06-20 15:21:41 +08:00
Cary Xu
fcfd5c250d feat: fetch rsma result by timer supported 2022-06-20 15:21:30 +08:00
Haojun Liao
a2cec0e488
Merge pull request #14004 from taosdata/feature/3_liaohj
feature(query): support show table block distribution.
2022-06-20 15:13:10 +08:00
Liu Jicong
1daa62e7f7 merge from 3.0 2022-06-20 15:04:50 +08:00
Hongze Cheng
607f698fc6 more work 2022-06-20 06:41:17 +00:00
Liu Jicong
53ef66961a feat(stream): support snode 2022-06-20 14:29:18 +08:00
dapan1121
88aff7bae1 Merge branch '3.0' into feature/showcreate 2022-06-20 13:35:18 +08:00
dapan1121
40879a80fe feat: show create table 2022-06-20 13:32:21 +08:00
Hongze Cheng
4e9e0c9b28 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-20 05:14:02 +00:00
dapan1121
3155a228e5
Merge pull request #13999 from taosdata/enh/abortpreprocess
enh: add rpc msg abort preprocess
2022-06-20 13:13:30 +08:00
Hongze Cheng
a889ac3edc Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-20 05:13:12 +00:00
Haojun Liao
659e429b87 feature(query): support show table block distribution. 2022-06-20 12:54:46 +08:00
dapan1121
ef21c6b339 enh: add rpc msg abort preprocess 2022-06-20 11:37:40 +08:00
Hongze Cheng
f828d1b321 more refact 2022-06-20 03:21:39 +00:00
Hongze Cheng
af1724fb42 more refact 2022-06-20 03:05:32 +00:00
Minghao Li
5968c6353f refactor(sync): get snapshot and create reader 2022-06-20 10:58:59 +08:00
Hongze Cheng
21ea4e3a0b more work 2022-06-20 02:38:08 +00:00
Hongze Cheng
0767b57e59 refact work 2022-06-20 02:06:27 +00:00
Hongze Cheng
e3c7925a5d make it compile 2022-06-20 01:30:32 +00:00
Hongze Cheng
bdc427dc78 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-20 01:26:31 +00:00
Hongze Cheng
22b01362bd more work 2022-06-20 01:21:12 +00:00
wangmm0220
746f4759b0 fix:merge from 3.0 2022-06-18 19:40:36 +08:00
Hongze Cheng
e0995ac1cb more 2022-06-18 11:32:34 +00:00
Hongze Cheng
2627a0203c Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-18 11:29:57 +00:00
Hongze Cheng
ecd3b35f1d make it pass compile 2022-06-18 10:36:12 +00:00
Hongze Cheng
afb5be516f Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-18 10:35:57 +00:00
Hongze Cheng
465816e50a more work 2022-06-18 10:33:53 +00:00
Yihao Deng
2941254a2b
Merge branch '3.0' into enh/trace1 2022-06-18 18:26:26 +08:00
yihaoDeng
974f56cdf1 add trace base func 2022-06-18 18:12:31 +08:00
yihaoDeng
e37a89d41a add trace log 2022-06-18 17:23:55 +08:00
Xiaoyu Wang
3599b26526
Merge pull request #13943 from taosdata/feature/3.0_debug_wxy
feat: rollup options adjust
2022-06-18 16:26:48 +08:00
Hongze Cheng
92559ef227 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-18 07:28:08 +00:00
Hongze Cheng
50e615915a more work 2022-06-18 07:16:50 +00:00
Hongze Cheng
e29651f032 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-18 03:36:06 +00:00
Hongze Cheng
709e9fd78b more work 2022-06-18 03:35:49 +00:00
Cary Xu
ef828d6750 enh: timezone already set in mnode for tsma 2022-06-18 11:20:56 +08:00
Cary Xu
65deb0541f Merge branch '3.0' into feature/TD-14481-3.0 2022-06-18 11:17:55 +08:00
Cary Xu
c838824d9e fix: use timezone of server in mnode for tsma 2022-06-18 11:17:42 +08:00
dapan1121
6f610bd363
Merge pull request #13952 from taosdata/enh/taos.ref
fix: fix insert affected rows issue
2022-06-18 11:12:50 +08:00
WANG MINGMING
a64013461f
Merge branch '3.0' into feature/TD-16524 2022-06-18 11:11:54 +08:00
Hongze Cheng
3efb2c7c53 refact some code 2022-06-18 02:27:09 +00:00
dapan1121
d862f2b49c fix TAOS ref issue 2022-06-18 09:53:18 +08:00
Hongze Cheng
2e590c3036 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-18 01:53:01 +00:00
Shengliang Guan
6673f0f773 fix: unitest for sdb 2022-06-18 00:38:02 +08:00
Shengliang Guan
6d5e629c5b Merge remote-tracking branch 'origin/3.0' into fix/dnode 2022-06-18 00:35:07 +08:00
Shengliang Guan
1c46b8d03e
Merge pull request #13946 from taosdata/fix/tsim
refactor: sdb commit index
2022-06-18 00:30:48 +08:00
Liu Jicong
4043e5c699
Merge pull request #13954 from taosdata/feature/stream
fix(stream): build ctb name
2022-06-17 22:40:56 +08:00
Shengliang Guan
b0a2bcce9a
Merge pull request #13927 from taosdata/fix/mnode
enh(mnode): transaction conflict supports two db
2022-06-17 22:22:31 +08:00
Shengliang Guan
1d5f431dd2 Merge remote-tracking branch 'origin/3.0' into fix/tsim 2022-06-17 22:20:07 +08:00
Shengliang Guan
eaea7289bb Merge remote-tracking branch 'origin/3.0' into fix/dnode 2022-06-17 22:18:48 +08:00
Shengliang Guan
74b090e298 test: comment out temporarily to merge code 2022-06-17 22:18:42 +08:00
Liu Jicong
9744dd31fb Merge branch '3.0' into feature/stream 2022-06-17 21:36:22 +08:00
Liu Jicong
342a1ae42d fix(stream): build ctb name 2022-06-17 21:00:10 +08:00
Cary Xu
e7e6d41211
Merge pull request #13945 from taosdata/feature/TD-14481-3.0
fix: merge data in memory and file
2022-06-17 20:49:49 +08:00
Hongze Cheng
a200ea85db Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-17 12:23:01 +00:00
Hongze Cheng
64554461f6 more work 2022-06-17 12:22:45 +00:00
Shengliang Guan
7f0469539d Merge branch 'fix/mnode' into fix/tsim 2022-06-17 19:23:31 +08:00
Shengliang Guan
6331532023 Merge branch 'fix/mnode' into fix/dnode 2022-06-17 19:22:17 +08:00
Shengliang Guan
b2924fd9c7 fix: deadlock in tmq test 2022-06-17 19:20:20 +08:00
Shengliang Guan
4ab601279d Merge remote-tracking branch 'origin/3.0' into fix/mnode 2022-06-17 19:05:20 +08:00
Xiaoyu Wang
64f8a9cea8 merge 3.0 2022-06-17 18:45:17 +08:00
Shengliang Guan
cea23e2f31 Merge branch 'fix/mnode' of https://github.com/taosdata/TDengine into fix/mnode 2022-06-17 18:44:16 +08:00
Shengliang Guan
98272d1434 Merge remote-tracking branch 'origin/3.0' into fix/dnode 2022-06-17 18:41:39 +08:00
Shengliang Guan
fefb416213 enh: let rollback stage stage also need to be consistent 2022-06-17 18:30:40 +08:00
dapan1121
211adf20af
Merge pull request #13875 from taosdata/feature/showapps
feat: support show apps command
2022-06-17 18:20:05 +08:00
Cary Xu
22e62e5cd2 other: code optimization 2022-06-17 18:11:09 +08:00
Cary Xu
715bb6d2e9 other: code optimization 2022-06-17 18:08:41 +08:00
Cary Xu
6c7dce7363 fix: merge data in memory and file 2022-06-17 18:06:08 +08:00
Hongze Cheng
9bc64e80b5 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-17 09:36:32 +00:00
Xiaoyu Wang
aea4f9c69b feat: rollup options adjust 2022-06-17 17:27:42 +08:00
Hongze Cheng
b0cfcbcd1a more work 2022-06-17 09:27:31 +00:00
Shengliang Guan
4c554437ea
Merge pull request #13931 from taosdata/fix/tsim
refactor: adjust logs
2022-06-17 17:00:12 +08:00
Shengliang Guan
94071f4cc7 refactor: add more logs 2022-06-17 16:52:25 +08:00
Liu Jicong
4958fc066f
Merge pull request #13919 from taosdata/feature/stream
refactor(tmq): offset storage
2022-06-17 16:26:01 +08:00
Zhiqiang Wang
4df4b2d145
Merge pull request #13934 from taosdata/fix/ZhiqiangWang/TD-16357-fix-sim-udf-test-error
test: fix sim udf test error
2022-06-17 16:23:04 +08:00
wangmm0220
66163539bd Merge branch 'feature/TD-16524' of github.com:taosdata/TDengine into feature/TD-16524 2022-06-17 15:57:31 +08:00