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 |