Commit Graph

4551 Commits

Author SHA1 Message Date
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
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
Hongze Cheng 0b05c8802e more work 2022-06-17 07:14:20 +00:00
Liu Jicong d7660484cc fix(tmq): performance issue 2022-06-17 15:10:00 +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
Shengliang Guan ad5f9555fb refactor: sdb commit index 2022-06-17 14:48:30 +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
Hongze Cheng 189f99eb74 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-17 06:41:12 +00:00
Hongze Cheng 095ca03f0d more work 2022-06-17 06:29:06 +00: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 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 62f21b528e refactor: remove duplicate conninfo in SRpcMsg 2022-06-17 10:52:45 +08:00
Hongze Cheng 6f80993d56 Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact 2022-06-17 02:50:34 +00:00
Hongze Cheng 39759c6004 more work 2022-06-17 02:50:25 +00:00
Shengliang Guan 80e0b830fe refactor: remove duplicate conninfo in SRpcMsg 2022-06-17 10:40:42 +08:00