Commit Graph

1780 Commits

Author SHA1 Message Date
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
Shengliang Guan 96434756de refactor: save sdb file on needed 2022-06-20 16:23:04 +08:00
Cary Xu 24af96f833 other: solve conflict 2022-06-20 15:39:20 +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
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
dapan1121 3155a228e5
Merge pull request #13999 from taosdata/enh/abortpreprocess
enh: add rpc msg abort preprocess
2022-06-20 13:13:30 +08:00
dapan1121 ef21c6b339 enh: add rpc msg abort preprocess 2022-06-20 11:37:40 +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
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
Cary Xu c838824d9e fix: use timezone of server in mnode for tsma 2022-06-18 11:17:42 +08:00
WANG MINGMING a64013461f
Merge branch '3.0' into feature/TD-16524 2022-06-18 11:11:54 +08: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
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 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
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
Xiaoyu Wang aea4f9c69b feat: rollup options adjust 2022-06-17 17:27:42 +08:00
Shengliang Guan 4c554437ea
Merge pull request #13931 from taosdata/fix/tsim
refactor: adjust logs
2022-06-17 17:00:12 +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
wangmm0220 6184d33011 fix: comment & ttl 2022-06-17 15:55:59 +08:00
dapan1121 b864da2a9c fix app release issue 2022-06-17 15:26:45 +08:00
Shengliang Guan db4e02c7c7 fix: add log to debug mnode sync 2022-06-17 15:23:17 +08:00
afwerar 764d59b481 test: fix sim udf test error 2022-06-17 14:56:54 +08:00
Shengliang Guan ab2f268601 Merge branch 'fix/tsim' into fix/dnode 2022-06-17 14:53:04 +08:00
Shengliang Guan 0d9329d752 Merge branch 'fix/dnode' of https://github.com/taosdata/TDengine into fix/dnode 2022-06-17 14:52:55 +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
dapan1121 f0c53fb982 Merge branch '3.0' into feature/showapps 2022-06-17 14:44:44 +08:00
Shengliang Guan 43f8f34b0f refactor: adjust logs 2022-06-17 14:24:17 +08:00
Shengliang Guan fd9ea1053a Merge remote-tracking branch 'origin/3.0' into fix/mnode 2022-06-17 12:26:26 +08:00
Shengliang Guan 7e0ad8781b refactor(sync) add raft cfg test 2022-06-17 11:46:19 +08:00
Minghao Li f5db109e61 fix(sync): get last max snapshot index 2022-06-17 11:37:10 +08:00
Shengliang Guan 5ae355077c enh(mnode): transaction conflict supports two db 2022-06-17 11:11:29 +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 ae46031121 fix: mnode basic5.sim 2022-06-16 21:31:45 +08:00
dapan1121 b3f9f81b61 support show apps 2022-06-16 21:06:04 +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
Shengliang Guan 8a72d44494
Merge pull request #13909 from taosdata/fix/mnodesync2
refactor(sync): add syncIsReady
2022-06-16 20:00:39 +08:00
Shengliang Guan 0dfa6c0c6a fix: condition of syncIsReady is wrong 2022-06-16 19:46:57 +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 7e72c16bde
Merge pull request #13896 from taosdata/fix/dnode
feat: redistribute vgroup
2022-06-16 17:25:18 +08:00
Shengliang Guan 26ca03af4f fix: crash while mnode sync 2022-06-16 17:24:42 +08:00
Liu Jicong 07288e26b2 refactor(stream): change msg name 2022-06-16 17:08:31 +08:00
Liu Jicong 7f32639a5c
Merge pull request #13881 from taosdata/feature/stream
feat(stream): drop stream
2022-06-16 17:03:24 +08:00
Liu Jicong 44e733645c ci: remove unstable case 2022-06-16 16:35:55 +08:00
Liu Jicong 32d8e60ce2 refactor(sma): create 2022-06-16 16:22:58 +08:00
Shengliang Guan 35c47cee55 Merge remote-tracking branch 'origin/feature/3.0_mhli' into test/chr/TD-14699 2022-06-16 16:17:20 +08:00
Liu Jicong 928f45709d feat(stream): drop stream 2022-06-16 16:01:22 +08:00
Shengliang Guan 7aa087a48d feat: redistribute vgroup 2022-06-16 15:25:04 +08:00
Minghao Li 77b03ac821 refactor(sync): add restore finish when become leader again 2022-06-16 14:40:42 +08:00
Shengliang Guan ed532ed7ac refactor: adjust logs 2022-06-16 12:01:13 +08:00
dapan1121 7156f5257a Merge branch '3.0' into feature/showapps 2022-06-16 10:40:41 +08:00
Liu Jicong 803249837a feat(stream): drop stream 2022-06-16 10:29:30 +08:00
dapan1121 a2d1987208 show apps 2022-06-16 10:24:01 +08:00
Shengliang Guan 4a9738ef95 Merge remote-tracking branch 'origin/3.0' into fix/dnode 2022-06-16 09:55:08 +08:00
Shengliang Guan fdee8a0cb3 feat: redistribute vgroup 2022-06-16 09:55:03 +08:00
dapan1121 69eb9daddb
Merge pull request #13851 from taosdata/feature/showqueries
feat: support some show and kill commands
2022-06-16 09:15:02 +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
dapan1121 4973739794 show apps 2022-06-15 20:59:33 +08:00
dapan1121 b56f1dc03d fix schemaless taos issue 2022-06-15 20:58:18 +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
dapan1121 f93bd44f97 fix ut issue and crash issue 2022-06-15 20:29:39 +08:00
Shengliang Guan 1b15c3439a
Merge pull request #13859 from taosdata/fix/dnode
feat: increase enable and sysinfo limits for user privilege
2022-06-15 18:24:32 +08:00
Liu Jicong 9ae7dc1028 enh(sma): remove filefator 2022-06-15 17:42:21 +08:00
Shengliang Guan 405b561821 Merge remote-tracking branch 'origin/3.0' into fix/dnode 2022-06-15 17:42:08 +08:00
Shengliang Guan 6711d79434 feat: increase enable and sysinfo limits for user privilege 2022-06-15 17:40:02 +08:00
Liu Jicong d7a6c4976c
fix(stream): max delay should not be seen by operator (#13864) 2022-06-15 17:27:01 +08:00
Liu Jicong d200fc710b fix(stream): max delay should not be seen by operator 2022-06-15 17:25:47 +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 13eaf5fc73 Merge branch '3.0' of https://github.com/taosdata/TDengine into feature/3.0_mhli 2022-06-15 16:14:38 +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
Shengliang Guan 5ea1f3512f feat: increase enable and sysinfo limits for user privilege 2022-06-15 14:43:30 +08:00
Shengliang Guan 5fed3d3a0f refactor: not send create/drop tsma msg to vgroup 2022-06-15 13:58:19 +08:00
dapan1121 96f8a0da42 Merge branch '3.0' into feature/showqueries 2022-06-15 11:34:54 +08:00
dapan1121 947aecb74f show queries/connection; kill connection 2022-06-15 11:27:53 +08:00