Commit Graph

4077 Commits

Author SHA1 Message Date
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 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
dapan1121 d862f2b49c fix TAOS ref issue 2022-06-18 09:53:18 +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
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
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
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
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
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
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
Shengliang Guan ad5f9555fb refactor: sdb commit index 2022-06-17 14:48:30 +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
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