Commit Graph

1720 Commits

Author SHA1 Message Date
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