Commit Graph

2032 Commits

Author SHA1 Message Date
Liu Jicong 2af4a4d250 merge from 3.0 2022-06-23 14:15:33 +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
Liu Jicong 4ed47a0296 feat(tmq): scan tsdb as snapshot 2022-06-23 13:35:24 +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
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
Liu Jicong 14a488c92c feat(stream): stream support multiple type input 2022-06-22 21:21:39 +08:00
Haojun Liao bf0caa2038 Merge branch '3.0' into feature/3_liaohj 2022-06-22 20:32:02 +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
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
Cary Xu ee7ace765b Merge branch '3.0' into feature/TD-14481-3.0 2022-06-22 17:06:45 +08: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
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
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
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 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
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
dapan1121 88b48ec46c Merge branch '3.0' into feature/showcreate 2022-06-21 17:40:52 +08:00
Shengliang Guan 676e70d5df refactor: add gtid to log 2022-06-21 16:18:01 +08:00
Cary Xu 57db482a9f Merge branch '3.0' into feature/TD-14481-3.0 2022-06-21 15:58:35 +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
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
wangmm0220 8494bf17be opt:partition by tag 2022-06-21 10:52:09 +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
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
Minghao Li e441bd266b refactor(sync): add changing state 2022-06-20 17:48:56 +08: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
Liu Jicong 1505667897
Merge branch '3.0' into feature/stream 2022-06-20 15:34:04 +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
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
Haojun Liao 659e429b87 feature(query): support show table block distribution. 2022-06-20 12:54:46 +08:00
Minghao Li 5968c6353f refactor(sync): get snapshot and create reader 2022-06-20 10:58:59 +08:00
wangmm0220 746f4759b0 fix:merge from 3.0 2022-06-18 19:40:36 +08: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
Cary Xu ef828d6750 enh: timezone already set in mnode for tsma 2022-06-18 11:20:56 +08:00
WANG MINGMING a64013461f
Merge branch '3.0' into feature/TD-16524 2022-06-18 11:11:54 +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 98272d1434 Merge remote-tracking branch 'origin/3.0' into fix/dnode 2022-06-17 18:41:39 +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
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
Liu Jicong d7660484cc fix(tmq): performance issue 2022-06-17 15:10:00 +08:00
WANG MINGMING b3d2daeb72
Merge branch '3.0' into feature/TD-16524 2022-06-17 14:51:33 +08:00
wangmm0220 8ace8dfd8b feat:add ttl/comment function & fix global version shadows a variable 2022-06-17 14:47:37 +08:00
Shengliang Guan 43f8f34b0f refactor: adjust logs 2022-06-17 14:24:17 +08:00
Liu Jicong 18993d50e5 refactor(tmq): offset storage 2022-06-17 13:16:46 +08:00
Shengliang Guan 62f21b528e refactor: remove duplicate conninfo in SRpcMsg 2022-06-17 10:52:45 +08:00
Shengliang Guan 80e0b830fe refactor: remove duplicate conninfo in SRpcMsg 2022-06-17 10:40:42 +08:00
Shengliang Guan a4a8d38ca2 fix: minor changes 2022-06-17 09:25:27 +08:00
Shengliang Guan ad8eeb0962 Merge remote-tracking branch 'origin/3.0' into fix/dnode 2022-06-17 08:25:51 +08:00
Liu Jicong aef7c7ebe1 Merge branch '3.0' into feature/stream 2022-06-16 22:01:31 +08:00
Liu Jicong 79494364ae refactor(tmq): offset storage 2022-06-16 22:00:33 +08:00
wangmm0220 2bd2996e74 feat:add comment function 2022-06-16 20:45:00 +08:00
wangmm0220 e28e92ea35 feat:add ttl 2022-06-16 20:44:25 +08:00
Cary Xu 8353da6694 other: revert the code 2022-06-16 20:17:36 +08:00
Cary Xu bdf24b6ab0 fix: uncomment the codes of dropping stable 2022-06-16 20:14:48 +08:00
Shengliang Guan 5a6ab29741 Merge remote-tracking branch 'origin/3.0' into fix/dnode 2022-06-16 19:10:24 +08:00
Cary Xu 9db554648e Merge branch '3.0' into feature/TD-11274-3.0 2022-06-16 18:15:01 +08:00
Cary Xu 111c3451f8
Merge pull request #13893 from taosdata/feature/TD-14481-3.0
fix: not submit for stables without rollup in rsma database
2022-06-16 18:14:05 +08:00
Shengliang Guan fe9f8bfe98 Merge remote-tracking branch 'origin/3.0' into test/chr/TD-14699 2022-06-16 17:39:39 +08:00
Shengliang Guan 26ca03af4f fix: crash while mnode sync 2022-06-16 17:24:42 +08:00
Cary Xu dbef3dfc55 fix: not submit for rsma without rollup 2022-06-16 15:34:33 +08:00
Shengliang Guan 7aa087a48d feat: redistribute vgroup 2022-06-16 15:25:04 +08:00
Cary Xu 28c3c0a601 Merge branch '3.0' into feature/TD-11274-3.0 2022-06-16 10:47:54 +08:00
Shengliang Guan fdee8a0cb3 feat: redistribute vgroup 2022-06-16 09:55:03 +08:00
Shengliang Guan 6cfb42b493 Merge remote-tracking branch 'origin/3.0' into fix/dnode 2022-06-16 09:05:55 +08:00
Liu Jicong 683bc24646
Merge pull request #13876 from taosdata/feature/stream
feat(stream): drop task
2022-06-15 22:59:43 +08:00
Liu Jicong 5572abe1b4 feat(stream): drop task 2022-06-15 21:41:59 +08:00
Shengliang Guan b0f048a3f2 feat: redistribute vgroup 2022-06-15 20:57:55 +08:00
wangmm0220 f2a19c98ef feat:add test for operator encode/decode 2022-06-15 20:35:45 +08:00
Shengliang Guan 19439c8b58 fix: adjust log 2022-06-15 19:55:36 +08:00
Cary Xu 8cded9e73b Merge branch '3.0' into feature/TD-11274-3.0 2022-06-15 17:31:37 +08:00
Liu Jicong fd9bb8db73
Merge pull request #13860 from taosdata/feature/stream
feat(stream): trigger mode add max delay
2022-06-15 17:11:18 +08:00
Minghao Li 4b18bd718e refactor(sync): adjust errno 2022-06-15 16:14:17 +08:00
Liu Jicong 8eb08fa0d4 feat(stream): trigger mode add max delay 2022-06-15 16:11:20 +08:00
Cary Xu 26cd9f8a25 Merge branch '3.0' into feature/TD-11274-3.0 2022-06-15 13:46:54 +08:00
Shengliang Guan 261795079f Merge remote-tracking branch 'origin/fix/dnode' into fix/mnode 2022-06-15 09:10:56 +08:00
Shengliang Guan 548397db16 feat: redistribute vgroup 2022-06-14 20:58:59 +08:00
Shengliang Guan f917bd3a61 feat: redistribute vgroup 2022-06-14 20:40:27 +08:00
Cary Xu 0babaa1eaf Merge branch '3.0' into feature/TD-11274-3.0 2022-06-14 20:19:37 +08:00
Cary Xu c6782e9669 Merge branch '3.0' of github.com:taosdata/TDengine into 3.0 2022-06-14 20:19:35 +08:00
Cary Xu cb7d0c2256 feat: tsma insert and query 2022-06-14 20:19:25 +08:00
Shengliang Guan fb327e2ef3
Merge pull request #13822 from taosdata/fix/mnode
enh: set vnode standby if drop it
2022-06-14 18:03:20 +08:00
Shengliang Guan d0c658d310 enh: set vnode standby if drop it 2022-06-14 17:19:10 +08:00
Cary Xu 3e1e1f07f5 Merge branch '3.0' into feature/TD-11274-3.0 2022-06-14 17:15:49 +08:00
Liu Jicong b6af62926e
Merge pull request #13817 from taosdata/feature/stream
fix(stream): build table name
2022-06-14 16:39:34 +08:00
Liu Jicong 04593fa44e fix(stream): build table name 2022-06-14 16:38:33 +08:00
Liu Jicong dd520bdde3
Merge pull request #13805 from taosdata/feature/stream
enh(tmq): put offset store into vnode
2022-06-14 16:10:19 +08:00
Liu Jicong 79d9c04a4c fix: check error code 2022-06-14 15:22:50 +08:00
Li Minghao 41a285a3f6
Merge pull request #13807 from taosdata/feature/3.0_mhli
refactor(sync): update replica index in snapshot sender
2022-06-14 15:21:09 +08:00
Liu Jicong acda336f4e Merge branch '3.0' into feature/stream 2022-06-14 15:14:47 +08:00
Liu Jicong 5881ef2690 refactor: convert datablock to submit block 2022-06-14 15:08:37 +08:00
Yihao Deng e5bef6d77d
Merge pull request #13764 from taosdata/fix/invalidIdx
fix: invalid read/write
2022-06-14 14:17:35 +08:00
Liu Jicong ae8d2fd36d merge from 3.0 2022-06-14 14:10:37 +08:00
Liu Jicong 601e454a24 enh(tmq): put offset store into vnode 2022-06-14 13:58:40 +08:00
Cary Xu 70c51026e7 Merge branch '3.0' into feature/TD-11274-3.0 2022-06-14 13:58:33 +08:00
yihaoDeng 0237c68e27 fix: invalid read/write 2022-06-14 13:44:13 +08:00
Minghao Li 9cd54c5cc9 refactor(sync): update replica index in snapshot sender 2022-06-14 11:16:32 +08:00
Cary Xu 1227d6aed2 other: adjust debug logs 2022-06-13 19:39:40 +08:00
Cary Xu d1b149a9f8 fix: adjust the initial array size of fs 2022-06-13 19:35:56 +08:00
Cary Xu afbb72da7b Merge branch '3.0' into feature/TD-14481-3.0 2022-06-13 17:05:39 +08:00
Cary Xu 1a5056edd5 Merge branch '3.0' into feature/TD-11274-3.0 2022-06-13 17:05:37 +08:00
Minghao Li e4897e5f46 enh(sync): add leader transfer 2022-06-13 15:52:43 +08:00
Cary Xu 7fe75a2087 Merge branch '3.0' into feature/TD-14481-3.0 2022-06-13 15:33:26 +08:00
Cary Xu 85b8a9fc56 Merge branch '3.0' into feature/TD-11274-3.0 2022-06-13 15:33:24 +08:00
shenglian zhou dc56c636ea Merge branch '3.0' of github.com:taosdata/TDengine into szhou/feature/multiwaymerge 2022-06-13 15:08:26 +08:00
shenglian zhou 140e15bc8d fix: merge interval operator optimization and explain analyze multimerge operator 2022-06-13 15:07:54 +08:00
dapan1121 2eed1d4f2f
Merge pull request #13690 from taosdata/feature/qnode
feat: support mnode/vnode epset update
2022-06-13 14:02:06 +08:00
Haojun Liao 6bd38625e7
Merge pull request #13753 from taosdata/feature/3_liaohj
refactor: do some internal refactor of sample function.
2022-06-13 13:29:57 +08:00
Shengliang Guan 63a8129b01
Merge pull request #13758 from taosdata/fix/mnode
feat: redistribute vgroup
2022-06-13 13:14:53 +08:00
Cary Xu c0964e03be other: add debug logs 2022-06-13 12:51:21 +08:00