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 |
Shengliang Guan
|
a4a8d38ca2
|
fix: minor changes
|
2022-06-17 09:25:27 +08:00 |
Shengliang Guan
|
ad8eeb0962
|
Merge remote-tracking branch 'origin/3.0' into fix/dnode
|
2022-06-17 08:25:51 +08:00 |
Shengliang Guan
|
50c422bf74
|
fix: dnode removed if create vnode failed
|
2022-06-17 08:25:30 +08:00 |
Liu Jicong
|
aef7c7ebe1
|
Merge branch '3.0' into feature/stream
|
2022-06-16 22:01:31 +08:00 |
Liu Jicong
|
79494364ae
|
refactor(tmq): offset storage
|
2022-06-16 22:00:33 +08:00 |
Cary Xu
|
fce8a2c6dd
|
Merge pull request #13912 from taosdata/feature/TD-11274-3.0
fix: uncomment the codes of dropping stable
|
2022-06-16 21:45:30 +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 |
Hongze Cheng
|
75816b7e7a
|
more work
|
2022-06-16 12:53:25 +00: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 |
Cary Xu
|
8353da6694
|
other: revert the code
|
2022-06-16 20:17:36 +08:00 |
Hongze Cheng
|
338383182d
|
Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact
|
2022-06-16 12:15:58 +00:00 |
Cary Xu
|
bdf24b6ab0
|
fix: uncomment the codes of dropping stable
|
2022-06-16 20:14:48 +08:00 |
Shengliang Guan
|
f978b15bc7
|
Merge remote-tracking branch 'origin/3.0' into test/chr/TD-14699
|
2022-06-16 20:06:50 +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 |
Hongze Cheng
|
813005eb7b
|
query start
|
2022-06-16 11:32:05 +00:00 |
Hongze Cheng
|
760905f632
|
refact
|
2022-06-16 11:14:56 +00:00 |
Shengliang Guan
|
5a6ab29741
|
Merge remote-tracking branch 'origin/3.0' into fix/dnode
|
2022-06-16 19:10:24 +08:00 |
Hongze Cheng
|
0bdbf866c0
|
Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact
|
2022-06-16 10:19:26 +00:00 |
Cary Xu
|
9db554648e
|
Merge branch '3.0' into feature/TD-11274-3.0
|
2022-06-16 18:15:01 +08:00 |
Cary Xu
|
111c3451f8
|
Merge pull request #13893 from taosdata/feature/TD-14481-3.0
fix: not submit for stables without rollup in rsma database
|
2022-06-16 18:14:05 +08:00 |
Hongze Cheng
|
5bd3732adf
|
refact more code
|
2022-06-16 09:53:07 +00: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
|
782e8fb518
|
fix: set stop falg before stop sync
|
2022-06-16 17:39:31 +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 |
Hongze Cheng
|
5485c7fc9f
|
refact tsdb read
|
2022-06-16 09:18:30 +00: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 |
Hongze Cheng
|
d59b0254d3
|
more work
|
2022-06-16 08:58:00 +00:00 |
Liu Jicong
|
44e733645c
|
ci: remove unstable case
|
2022-06-16 16:35:55 +08:00 |
Hongze Cheng
|
3c18269c29
|
Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact
|
2022-06-16 08:34:43 +00: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 |
Cary Xu
|
f0a17847da
|
Merge branch '3.0' into feature/TD-14481-3.0
|
2022-06-16 15:35:25 +08:00 |
Cary Xu
|
26ef05e624
|
Merge branch '3.0' into feature/TD-11274-3.0
|
2022-06-16 15:35:24 +08:00 |
Cary Xu
|
dbef3dfc55
|
fix: not submit for rsma without rollup
|
2022-06-16 15:34:33 +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 |
Hongze Cheng
|
07792850cb
|
refact code
|
2022-06-16 06:29:28 +00:00 |
Shengliang Guan
|
ed532ed7ac
|
refactor: adjust logs
|
2022-06-16 12:01:13 +08:00 |
Hongze Cheng
|
76b5cef36d
|
Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact
|
2022-06-16 04:00:22 +00:00 |
Hongze Cheng
|
b0b30215af
|
more work
|
2022-06-16 04:00:15 +00:00 |
Cary Xu
|
28c3c0a601
|
Merge branch '3.0' into feature/TD-11274-3.0
|
2022-06-16 10:47:54 +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 |
Hongze Cheng
|
3da422fef7
|
Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact
|
2022-06-16 01:33:06 +00:00 |
Hongze Cheng
|
47b11afe10
|
more work
|
2022-06-16 01:32:48 +00: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 |
Hongze Cheng
|
a85d522e20
|
more work
|
2022-06-15 12:28:52 +00:00 |
Shengliang Guan
|
19439c8b58
|
fix: adjust log
|
2022-06-15 19:55:36 +08:00 |
Hongze Cheng
|
76a71b11ed
|
Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact
|
2022-06-15 11:26:18 +00:00 |
Hongze Cheng
|
63802f06a9
|
more work
|
2022-06-15 11:13:55 +00:00 |
Cary Xu
|
d00802086c
|
Merge branch '3.0' into feature/TD-11274-3.0
|
2022-06-15 19:07:36 +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 |
Cary Xu
|
8cded9e73b
|
Merge branch '3.0' into feature/TD-11274-3.0
|
2022-06-15 17:31:37 +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 |
Cary Xu
|
0354f3b41b
|
Merge branch '3.0' into feature/TD-11274-3.0
|
2022-06-15 16:23:30 +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 |
Hongze Cheng
|
288904e901
|
more work
|
2022-06-15 08:04:26 +00:00 |
Hongze Cheng
|
f80db38c59
|
Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact
|
2022-06-15 07:41:28 +00:00 |
Hongze Cheng
|
d21b905c88
|
more work
|
2022-06-15 07:41:14 +00: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 |
Cary Xu
|
26cd9f8a25
|
Merge branch '3.0' into feature/TD-11274-3.0
|
2022-06-15 13:46:54 +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 |
Shengliang Guan
|
2b6cbbf761
|
Merge remote-tracking branch 'origin/3.0' into fix/mnode
|
2022-06-15 10:56:17 +08:00 |
Shengliang Guan
|
b94772e838
|
fix: stable column reset after create sma
|
2022-06-15 10:56:06 +08:00 |
Shengliang Guan
|
08c45a5ec0
|
Merge pull request #13843 from taosdata/fix/mnode
feat: make create db retry
|
2022-06-15 10:26:08 +08:00 |
Cary Xu
|
5a0d7ebf8a
|
Merge branch '3.0' into feature/TD-11274-3.0
|
2022-06-15 10:22:37 +08:00 |
Cary Xu
|
2383b2b76d
|
Merge pull request #13839 from taosdata/feature/TD-14481-3.0
enh: tsma code refactor
|
2022-06-15 09:53:11 +08:00 |
Shengliang Guan
|
cba62bebba
|
feat: make create db retry
|
2022-06-15 09:35:44 +08:00 |
Hongze Cheng
|
858474736d
|
Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact
|
2022-06-15 01:20:18 +00:00 |
Xiaoyu Wang
|
ddaf616473
|
Merge pull request #13832 from taosdata/feature/3.0_debug_wxy
feat: execution plan of super table join
|
2022-06-15 09:18:25 +08:00 |
Shengliang Guan
|
261795079f
|
Merge remote-tracking branch 'origin/fix/dnode' into fix/mnode
|
2022-06-15 09:10:56 +08:00 |
Cary Xu
|
fbf9cb7087
|
enh: tsma code refactor
|
2022-06-14 21:32:15 +08:00 |
Hongze Cheng
|
555469c775
|
more work
|
2022-06-14 13:19:46 +00:00 |
Shengliang Guan
|
548397db16
|
feat: redistribute vgroup
|
2022-06-14 20:58:59 +08:00 |
Shengliang Guan
|
f917bd3a61
|
feat: redistribute vgroup
|
2022-06-14 20:40:27 +08:00 |
Cary Xu
|
0babaa1eaf
|
Merge branch '3.0' into feature/TD-11274-3.0
|
2022-06-14 20:19:37 +08:00 |
Cary Xu
|
c6782e9669
|
Merge branch '3.0' of github.com:taosdata/TDengine into 3.0
|
2022-06-14 20:19:35 +08:00 |
Cary Xu
|
cb7d0c2256
|
feat: tsma insert and query
|
2022-06-14 20:19:25 +08:00 |
Xiaoyu Wang
|
b472ed1173
|
merge 3.0
|
2022-06-14 19:55:52 +08:00 |
Hongze Cheng
|
c9a3a7a6c6
|
Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact
|
2022-06-14 11:49:05 +00:00 |
Hongze Cheng
|
0c63eeccf9
|
refact some code
|
2022-06-14 11:46:46 +00:00 |
Shengliang Guan
|
fb327e2ef3
|
Merge pull request #13822 from taosdata/fix/mnode
enh: set vnode standby if drop it
|
2022-06-14 18:03:20 +08:00 |
Hongze Cheng
|
9b15bc409a
|
Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact
|
2022-06-14 09:59:41 +00:00 |
Hongze Cheng
|
83edf4d611
|
more work
|
2022-06-14 09:55:04 +00:00 |
Shengliang Guan
|
d0c658d310
|
enh: set vnode standby if drop it
|
2022-06-14 17:19:10 +08:00 |
Shengliang Guan
|
f22c45e23d
|
Merge pull request #13811 from taosdata/fix/mnode
enh: drop sma while drop stb and db
|
2022-06-14 17:18:52 +08:00 |
Cary Xu
|
3e1e1f07f5
|
Merge branch '3.0' into feature/TD-11274-3.0
|
2022-06-14 17:15:49 +08:00 |
Hongze Cheng
|
9f398eca68
|
more work
|
2022-06-14 08:45:11 +00:00 |
Liu Jicong
|
b6af62926e
|
Merge pull request #13817 from taosdata/feature/stream
fix(stream): build table name
|
2022-06-14 16:39:34 +08:00 |
Liu Jicong
|
04593fa44e
|
fix(stream): build table name
|
2022-06-14 16:38:33 +08:00 |
Xiaoyu Wang
|
6948d648ef
|
feat: super table join
|
2022-06-14 16:24:11 +08:00 |
Shengliang Guan
|
72bc32af1e
|
ehn: remove sync ref
|
2022-06-14 16:17:37 +08:00 |
Liu Jicong
|
dd520bdde3
|
Merge pull request #13805 from taosdata/feature/stream
enh(tmq): put offset store into vnode
|
2022-06-14 16:10:19 +08:00 |
Shengliang Guan
|
c9509acf22
|
refactor: mnode pre process msg
|
2022-06-14 16:01:32 +08:00 |
Shengliang Guan
|
cc0b48f7be
|
Merge remote-tracking branch 'origin/3.0' into fix/mnode
|
2022-06-14 15:49:12 +08:00 |
Shengliang Guan
|
300a3a2c02
|
enh: drop sma while drop stb and db
|
2022-06-14 15:46:16 +08:00 |
Liu Jicong
|
79d9c04a4c
|
fix: check error code
|
2022-06-14 15:22:50 +08:00 |
Li Minghao
|
41a285a3f6
|
Merge pull request #13807 from taosdata/feature/3.0_mhli
refactor(sync): update replica index in snapshot sender
|
2022-06-14 15:21:09 +08:00 |
Liu Jicong
|
acda336f4e
|
Merge branch '3.0' into feature/stream
|
2022-06-14 15:14:47 +08:00 |
Liu Jicong
|
5881ef2690
|
refactor: convert datablock to submit block
|
2022-06-14 15:08:37 +08:00 |
Hongze Cheng
|
72e525082f
|
Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact
|
2022-06-14 06:57:21 +00:00 |
Hongze Cheng
|
b25e55cf81
|
more work
|
2022-06-14 06:57:07 +00:00 |
Shengliang Guan
|
0cf6de865d
|
Merge pull request #13804 from taosdata/fix/mnode
enh: show db status such as creating and dropping
|
2022-06-14 14:42:10 +08:00 |
dapan1121
|
2861534ada
|
Merge pull request #13781 from taosdata/feature/cacheIndex
feat: cache table index
|
2022-06-14 14:29:13 +08:00 |
Yihao Deng
|
e5bef6d77d
|
Merge pull request #13764 from taosdata/fix/invalidIdx
fix: invalid read/write
|
2022-06-14 14:17:35 +08:00 |
Liu Jicong
|
ae8d2fd36d
|
merge from 3.0
|
2022-06-14 14:10:37 +08:00 |
Shengliang Guan
|
9d6a7a2286
|
Merge pull request #13799 from taosdata/fix/mnode
fix: mnode not start
|
2022-06-14 14:05:18 +08:00 |
Liu Jicong
|
601e454a24
|
enh(tmq): put offset store into vnode
|
2022-06-14 13:58:40 +08:00 |
Cary Xu
|
70c51026e7
|
Merge branch '3.0' into feature/TD-11274-3.0
|
2022-06-14 13:58:33 +08:00 |
Cary Xu
|
c7fb7f303a
|
Merge pull request #13780 from taosdata/feature/TD-14481-3.0
fix: adjust the initial array size of fs
|
2022-06-14 13:54:45 +08:00 |
Shengliang Guan
|
ad11eef979
|
enh: show db status such as creating and dropping
|
2022-06-14 13:52:07 +08:00 |
yihaoDeng
|
0237c68e27
|
fix: invalid read/write
|
2022-06-14 13:44:13 +08:00 |
Hongze Cheng
|
62f9403ed9
|
Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact
|
2022-06-14 05:24:18 +00:00 |
Hongze Cheng
|
d76912cc76
|
more work
|
2022-06-14 05:24:10 +00:00 |
Shengliang Guan
|
110bf97904
|
fix: mnode not start
|
2022-06-14 13:22:24 +08:00 |
Cary Xu
|
28b8b8b145
|
Merge branch '3.0' into feature/TD-11274-3.0
|
2022-06-14 11:52:54 +08:00 |
Hongze Cheng
|
bb0f20f6e6
|
more work
|
2022-06-14 03:38:20 +00:00 |
Shengliang Guan
|
4e7aac8171
|
fix: crash in mnode
|
2022-06-14 11:34:51 +08:00 |
Shengliang Guan
|
bea94b4f16
|
Merge remote-tracking branch 'origin/3.0' into fix/mnode
|
2022-06-14 11:18:41 +08:00 |
Minghao Li
|
9cd54c5cc9
|
refactor(sync): update replica index in snapshot sender
|
2022-06-14 11:16:32 +08:00 |
Shengliang Guan
|
63927d15fa
|
fix: compile err in windows
|
2022-06-14 11:15:17 +08:00 |
Shengliang Guan
|
d93f4c4a83
|
refactor: mnode worker
|
2022-06-14 11:10:36 +08:00 |
Shengliang Guan
|
a3f1273640
|
refactor: mnode sync
|
2022-06-14 10:58:36 +08:00 |
Shengliang Guan
|
01521a2541
|
refactor: mnode file
|
2022-06-14 10:41:15 +08:00 |
Hongze Cheng
|
e6e629ae84
|
Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact
|
2022-06-14 01:59:30 +00:00 |
Shengliang Guan
|
82112e8d4a
|
Merge pull request #13786 from taosdata/fix/mnode
fix(sync): send snapshot to multi nodes at the same time
|
2022-06-14 09:54:21 +08:00 |
Shengliang Guan
|
877cb761f1
|
refactor: mnode worker
|
2022-06-14 09:43:22 +08:00 |
Cary Xu
|
73a30de65e
|
Merge branch '3.0' into feature/TD-11274-3.0
|
2022-06-14 09:41:21 +08:00 |
Hongze Cheng
|
c67e572266
|
Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact
|
2022-06-14 01:36:16 +00:00 |
Shengliang Guan
|
be3de7b7df
|
fix(sync): send snapshot to multi nodes at the same time
|
2022-06-13 22:20:53 +08:00 |
Hongze Cheng
|
b2c147be72
|
more work
|
2022-06-13 13:13:37 +00:00 |
dapan1121
|
f15d17c578
|
show queries
|
2022-06-13 21:03:40 +08:00 |
Hongze Cheng
|
6211f28102
|
more work
|
2022-06-13 12:47:32 +00:00 |
dapan1121
|
e3e7c3979e
|
show queries
|
2022-06-13 20:40:19 +08:00 |
Hongze Cheng
|
0ef7eec754
|
more work
|
2022-06-13 12:12:54 +00:00 |
Hongze Cheng
|
c000c15e58
|
more work
|
2022-06-13 11:54:50 +00:00 |
dapan1121
|
b83197398e
|
fix msg decode issue
|
2022-06-13 19:47:14 +08:00 |
Cary Xu
|
1227d6aed2
|
other: adjust debug logs
|
2022-06-13 19:39:40 +08:00 |
Cary Xu
|
d1b149a9f8
|
fix: adjust the initial array size of fs
|
2022-06-13 19:35:56 +08:00 |
dapan1121
|
8d86b877e7
|
Merge branch '3.0' into feature/cacheIndex
|
2022-06-13 18:49:08 +08:00 |
Hongze Cheng
|
baea84c6bf
|
more work
|
2022-06-13 10:44:57 +00:00 |
Xiaoyu Wang
|
a5ce5192f2
|
merge 3.0
|
2022-06-13 18:37:25 +08:00 |
Hongze Cheng
|
c94ac9a1e4
|
Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact
|
2022-06-13 09:11:11 +00:00 |
Cary Xu
|
afbb72da7b
|
Merge branch '3.0' into feature/TD-14481-3.0
|
2022-06-13 17:05:39 +08:00 |
Cary Xu
|
1a5056edd5
|
Merge branch '3.0' into feature/TD-11274-3.0
|
2022-06-13 17:05:37 +08:00 |
shenglian-zhou
|
5507931dee
|
Merge pull request #13766 from taosdata/szhou/feature/multiwaymerge
feature: explain mulitway merge and merge interval optimization
|
2022-06-13 16:34:55 +08:00 |
Minghao Li
|
e4897e5f46
|
enh(sync): add leader transfer
|
2022-06-13 15:52:43 +08:00 |
Shengliang Guan
|
3d8ebc2660
|
refactor: adjust logs
|
2022-06-13 15:38:43 +08:00 |
dapan1121
|
7a78d81232
|
fix compile issue
|
2022-06-13 15:36:28 +08:00 |
Hongze Cheng
|
b5c847d06c
|
more work
|
2022-06-13 07:36:20 +00:00 |
Cary Xu
|
7fe75a2087
|
Merge branch '3.0' into feature/TD-14481-3.0
|
2022-06-13 15:33:26 +08:00 |
Cary Xu
|
85b8a9fc56
|
Merge branch '3.0' into feature/TD-11274-3.0
|
2022-06-13 15:33:24 +08:00 |
shenglian zhou
|
dc56c636ea
|
Merge branch '3.0' of github.com:taosdata/TDengine into szhou/feature/multiwaymerge
|
2022-06-13 15:08:26 +08:00 |
shenglian zhou
|
140e15bc8d
|
fix: merge interval operator optimization and explain analyze multimerge operator
|
2022-06-13 15:07:54 +08:00 |
Hongze Cheng
|
627dc00b93
|
more work
|
2022-06-13 07:02:15 +00:00 |
Xiaoyu Wang
|
1863bbee9a
|
merge 3.0
|
2022-06-13 15:01:29 +08:00 |
Xiaoyu Wang
|
380a071551
|
fix: handle the memory leak of parser
|
2022-06-13 14:54:38 +08:00 |
Hongze Cheng
|
2c63430804
|
Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact
|
2022-06-13 06:10:51 +00:00 |
Hongze Cheng
|
4027782f9a
|
more work
|
2022-06-13 06:09:43 +00:00 |
dapan1121
|
eff9f9be4d
|
add sma update
|
2022-06-13 14:06:11 +08:00 |
Hongze Cheng
|
8f08aedcde
|
more work
|
2022-06-13 06:05:05 +00:00 |
dapan1121
|
2eed1d4f2f
|
Merge pull request #13690 from taosdata/feature/qnode
feat: support mnode/vnode epset update
|
2022-06-13 14:02:06 +08:00 |
Haojun Liao
|
6bd38625e7
|
Merge pull request #13753 from taosdata/feature/3_liaohj
refactor: do some internal refactor of sample function.
|
2022-06-13 13:29:57 +08:00 |
Hongze Cheng
|
03f9012a3d
|
Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact
|
2022-06-13 05:15:12 +00:00 |
Shengliang Guan
|
63a8129b01
|
Merge pull request #13758 from taosdata/fix/mnode
feat: redistribute vgroup
|
2022-06-13 13:14:53 +08:00 |
Cary Xu
|
c0964e03be
|
other: add debug logs
|
2022-06-13 12:51:21 +08:00 |
Hongze Cheng
|
4ed2af9e97
|
more
|
2022-06-13 04:01:10 +00:00 |
Shengliang Guan
|
95e4b79091
|
feat: redistribute vgroup
|
2022-06-13 11:55:38 +08:00 |
Yihao Deng
|
43651032ee
|
Merge pull request #13755 from taosdata/fix/invalidIdx
fix: invalid idx
|
2022-06-13 11:45:54 +08:00 |
Cary Xu
|
8033635717
|
other: add debug logs
|
2022-06-13 11:29:53 +08:00 |
Hongze Cheng
|
cc7640321b
|
more work
|
2022-06-13 03:25:16 +00:00 |
dapan1121
|
17f6275015
|
add sma cache
|
2022-06-13 10:38:45 +08:00 |
Haojun Liao
|
13907386fb
|
Merge branch '3.0' into feature/3_liaohj
|
2022-06-13 10:32:56 +08:00 |
Cary Xu
|
b13d78833d
|
Merge branch '3.0' into feature/TD-11274-3.0
|
2022-06-13 09:58:45 +08:00 |
Hongze Cheng
|
a26ccade3e
|
Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact
|
2022-06-13 01:34:31 +00:00 |
Minghao Li
|
aad288ab17
|
refactor(sync): add debug log
|
2022-06-12 15:21:56 +08:00 |
Liu Jicong
|
32151de1f0
|
Merge pull request #13745 from taosdata/feature/stream
enh(tmq): avoid uninitialized memory
|
2022-06-12 08:56:08 +08:00 |
WANG MINGMING
|
0f417eb584
|
Merge pull request #13743 from taosdata/feature/TD-14761
fix:disable schemaless database parameters & fix insert error in multi thread in schemaless
|
2022-06-11 23:38:06 +08:00 |
Liu Jicong
|
0ef33c05bc
|
enh(tmq): avoid uninitialized memory
|
2022-06-11 21:36:15 +08:00 |
Hongze Cheng
|
a992b5f966
|
more work
|
2022-06-11 12:32:01 +00:00 |
wangmm0220
|
324e8607cc
|
fix:disable schemaless database parameters
|
2022-06-11 20:26:11 +08:00 |
Hongze Cheng
|
4e2c2b8084
|
more work
|
2022-06-11 12:02:12 +00:00 |
Shengliang Guan
|
8d38ce5aff
|
enh: enable show grants in community version
|
2022-06-11 19:33:40 +08:00 |
Cary Xu
|
9bc6b46b35
|
Merge branch '3.0' into feature/TD-11274-3.0
|
2022-06-11 19:30:48 +08:00 |
Haojun Liao
|
eee5408d25
|
Merge branch 'feature/3_liaohj' of github.com:taosdata/tdengine into feature/3_liaohj
|
2022-06-11 19:28:44 +08:00 |
Haojun Liao
|
0b8dd61f41
|
fix(query): fix some memory leaks.
|
2022-06-13 09:33:08 +08:00 |
Cary Xu
|
9b8a7d11df
|
other: add logs when read blk info
|
2022-06-11 18:50:28 +08:00 |
Hongze Cheng
|
edb3c069d6
|
Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact
|
2022-06-11 10:45:36 +00:00 |
Shengliang Guan
|
9d070b3d49
|
Merge remote-tracking branch 'origin/3.0' into fix/mnode
|
2022-06-11 18:00:04 +08:00 |
Shengliang Guan
|
35c74839f6
|
test: case from drop dnode which has mnode
|
2022-06-11 17:59:57 +08:00 |
dapan1121
|
0046593d4f
|
Merge branch '3.0' into feature/qnode
|
2022-06-11 17:58:53 +08:00 |
WANG MINGMING
|
ed43a4da73
|
Merge pull request #13728 from taosdata/feature/TD-14761
fix:error in schemaless
|
2022-06-11 17:51:57 +08:00 |
Hongze Cheng
|
98bc4630bc
|
Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact
|
2022-06-11 09:24:14 +00:00 |
Hongze Cheng
|
6af7d4cfad
|
more work
|
2022-06-11 09:20:29 +00:00 |
Xiaoyu Wang
|
67baa48961
|
Merge pull request #13720 from taosdata/feature/3.0_wxy
fix: some problems of parser
|
2022-06-11 17:16:47 +08:00 |
Shengliang Guan
|
e6ff854e7e
|
Merge remote-tracking branch 'origin/3.0' into fix/mnode
|
2022-06-11 16:52:38 +08:00 |
Cary Xu
|
7930260fed
|
other: add debug logs when load block info
|
2022-06-11 16:44:01 +08:00 |
dapan1121
|
d3a56d87ca
|
Merge branch '3.0' into feature/qnode
|
2022-06-11 16:34:21 +08:00 |
Shengliang Guan
|
c1addc442d
|
Merge pull request #13715 from taosdata/fix/mnode
test: execute trans in follower
|
2022-06-11 16:19:07 +08:00 |
Cary Xu
|
f0652ba4ff
|
Merge pull request #13719 from taosdata/feature/TD-14481-3.0
refactor: tsma
|
2022-06-11 16:07:17 +08:00 |
Xiaoyu Wang
|
e17396be9c
|
fix: some problems of parser
|
2022-06-11 15:44:49 +08:00 |
Hongze Cheng
|
b4252f8b14
|
Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact
|
2022-06-11 07:40:11 +00:00 |
Hongze Cheng
|
8f3c4e4638
|
more work
|
2022-06-11 07:34:40 +00:00 |
Minghao Li
|
9b563b7f64
|
Merge remote-tracking branch 'origin/fix/mnode' into feature/3.0_mhli
|
2022-06-11 15:34:03 +08:00 |
Shengliang Guan
|
1e8942e6b6
|
fix: cant drop mnode which is offline
|
2022-06-11 15:22:26 +08:00 |
Liu Jicong
|
824c3fbead
|
Merge pull request #13718 from taosdata/feature/stream
fix(stream): fix shuffle vg id not initialized
|
2022-06-11 15:21:13 +08:00 |
Liu Jicong
|
767b768e51
|
fix(stream): fix shuffle vg id not initialized
|
2022-06-11 15:20:59 +08:00 |
Cary Xu
|
25911e12a4
|
Merge branch '3.0' into feature/TD-14481-3.0
|
2022-06-11 15:16:20 +08:00 |
Cary Xu
|
ed829455a9
|
feat: tsma refactor
|
2022-06-11 15:15:55 +08:00 |
liuyao
|
3097bf2af8
|
Merge pull request #13716 from taosdata/feature/TD-16435
feat(stream): stream max delay
|
2022-06-11 15:11:39 +08:00 |
Shengliang Guan
|
86c102c525
|
Merge remote-tracking branch 'origin/3.0' into fix/mnode
|
2022-06-11 14:39:44 +08:00 |
Hongze Cheng
|
7bed78543f
|
more work
|
2022-06-11 06:36:22 +00:00 |
Liu Jicong
|
91940ac721
|
Merge pull request #13714 from taosdata/feature/stream
enh(tmq): add log
|
2022-06-11 14:35:56 +08:00 |
54liuyao
|
d210ef1c0e
|
feat(stream): stream max delay
|
2022-06-11 14:27:45 +08:00 |
Shengliang Guan
|
33b5efc21f
|
test: execute trans in follower
|
2022-06-11 14:11:10 +08:00 |
Liu Jicong
|
6f4f6c14fa
|
enh(tmq): add log
|
2022-06-11 14:02:48 +08:00 |
Shengliang Guan
|
230b210266
|
Merge pull request #13711 from taosdata/fix/mnode
fix: save sync config in mnode
|
2022-06-11 13:36:49 +08:00 |
Hongze Cheng
|
e52400dd44
|
Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact
|
2022-06-11 05:30:49 +00:00 |
Shengliang Guan
|
3fc793dbe0
|
enh: save dnodeVer in dnodeEps.json
|
2022-06-11 13:09:45 +08:00 |
Shengliang Guan
|
d702cb1486
|
refactor: adjust mnode log
|
2022-06-11 12:55:16 +08:00 |
Hongze Cheng
|
1e9ce7c543
|
more work
|
2022-06-11 03:59:06 +00:00 |
dapan1121
|
23e26d569b
|
Merge branch '3.0' into feature/qnode
|
2022-06-11 11:21:27 +08:00 |
Hongze Cheng
|
a21f83c984
|
Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact
|
2022-06-11 03:00:53 +00:00 |
Shengliang Guan
|
95ca88432f
|
fix: save sync config in mnode
|
2022-06-11 10:58:57 +08:00 |
Liu Jicong
|
27fa0d7d32
|
Merge branch '3.0' into feature/stream
|
2022-06-11 10:58:41 +08:00 |
Liu Jicong
|
e31a304206
|
refactor(scheduler)
|
2022-06-11 10:56:04 +08:00 |
liuyao
|
2dd1c31f0b
|
Merge pull request #13702 from taosdata/feature/TD-16425
feat(stream): combine function spread\elapsed\histogram\hll
|
2022-06-11 10:54:57 +08:00 |
Shengliang Guan
|
83e3ae36ad
|
Merge pull request #13700 from taosdata/fix/dnode
feat: redistribute vgroups
|
2022-06-11 10:29:37 +08:00 |
54liuyao
|
ee5517d5ee
|
feat(stream): combine function spread\elapsed\histogram\hll
|
2022-06-11 10:28:44 +08:00 |
Hongze Cheng
|
9534265107
|
Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact
|
2022-06-11 01:13:58 +00:00 |
dapan1121
|
041002a585
|
Merge branch '3.0' into feature/qnode
|
2022-06-11 08:23:48 +08:00 |
Li Minghao
|
80d2d150e4
|
Merge pull request #13705 from taosdata/feature/sync-timer-log
refactor(sync): add heartbeat log
|
2022-06-10 23:41:45 +08:00 |
Liu Jicong
|
795becbc23
|
Merge pull request #13704 from taosdata/feature/stream
refactor(stream): stream scheduler
|
2022-06-10 22:40:14 +08:00 |
Minghao Li
|
ae5219dd6e
|
refactor(sync): add heartbeat log
|
2022-06-10 22:29:28 +08:00 |
Liu Jicong
|
a7fba4b224
|
refactor(stream): stream scheduler
|
2022-06-10 21:57:59 +08:00 |
Hongze Cheng
|
bcc01d630b
|
more work
|
2022-06-10 12:54:02 +00:00 |
dapan1121
|
7923d51f62
|
Merge branch '3.0' into feature/qnode
|
2022-06-10 20:04:19 +08:00 |
dapan1121
|
38e6bf3b6e
|
fix tmq crash issue
|
2022-06-10 19:56:11 +08:00 |
Hongze Cheng
|
39626c1bc6
|
more work
|
2022-06-10 11:50:06 +00:00 |
yihaoDeng
|
587198a191
|
fix: avoid invalid value
|
2022-06-10 19:46:31 +08:00 |
Shengliang Guan
|
4cc6b1fb62
|
feat: redistribute vgroups
|
2022-06-10 18:56:11 +08:00 |
yihaoDeng
|
ad25660f99
|
fix: avoid crash
|
2022-06-10 18:51:48 +08:00 |
Liu Jicong
|
4b4c142e72
|
Merge pull request #13693 from taosdata/feature/stream
fix(tmq): false cache
|
2022-06-10 18:47:07 +08:00 |
yihaoDeng
|
39244e08ea
|
enh: fix index bug
|
2022-06-10 18:24:04 +08:00 |
Li Minghao
|
797cde53d2
|
Merge pull request #13692 from taosdata/feature/3.0_mhli
refactor(sync): add rpcMsg to reconfig callback
|
2022-06-10 18:22:00 +08:00 |
Liu Jicong
|
d3cf004164
|
fix(tmq): false cache
|
2022-06-10 18:04:03 +08:00 |
wangmm0220
|
9333120d42
|
feat: add async logic for schemaless
|
2022-06-10 17:53:13 +08:00 |
Hongze Cheng
|
2f87d80d1c
|
Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/tsdb_refact
|
2022-06-10 09:49:13 +00:00 |
Hongze Cheng
|
2ff00f23a5
|
more work
|
2022-06-10 09:49:01 +00:00 |
Minghao Li
|
972fee7fbc
|
refactor(sync): add rpcMsg to reconfig callback
|
2022-06-10 17:39:30 +08:00 |
Shengliang Guan
|
f590a362f8
|
Merge pull request #13687 from taosdata/fix/dnode
feat: redistribute vgroup to dnodes
|
2022-06-10 17:14:05 +08:00 |
dapan1121
|
0e9203ebf6
|
Merge branch '3.0' into feature/qnode
|
2022-06-10 17:09:11 +08:00 |
dapan1121
|
1b196df8ed
|
update epset
|
2022-06-10 17:07:24 +08:00 |
Shengliang Guan
|
56ce7b1baa
|
enh: adjust show transcations output
|
2022-06-10 16:45:31 +08:00 |
Shengliang Guan
|
b90f1f246c
|
refactor: adjust mnode trace log
|
2022-06-10 16:31:33 +08:00 |
Liu Jicong
|
2be81daf2e
|
Merge pull request #13681 from taosdata/feature/stream
refactor(tsdb): tsdb reader open
|
2022-06-10 15:53:03 +08:00 |
Shengliang Guan
|
f30d9a034e
|
feat: redistribute vgroup to dnodes
|
2022-06-10 15:39:11 +08:00 |
Cary Xu
|
988f4126b4
|
other: merge 3.0
|
2022-06-10 15:21:16 +08:00 |
Liu Jicong
|
6fcee0e244
|
refactor(tsdb): tsdb reader open
|
2022-06-10 15:20:57 +08:00 |
Hongze Cheng
|
17efc22b03
|
refact: 1
|
2022-06-10 06:48:21 +00:00 |
Hongze Cheng
|
9c1b1b4507
|
Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/row_refact
|
2022-06-10 06:33:27 +00:00 |
Haojun Liao
|
c55c349952
|
Merge pull request #13669 from taosdata/feature/3_liaohj
enh(query): add new api in taos.h
|
2022-06-10 12:58:52 +08:00 |
Liu Jicong
|
73b8f02ac7
|
fix(stream): set child id
|
2022-06-10 12:00:38 +08:00 |
Hongze Cheng
|
a4638486d9
|
Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/row_refact
|
2022-06-10 03:47:38 +00:00 |
Haojun Liao
|
24cca6cbcd
|
Merge branch '3.0' into feature/3_liaohj
|
2022-06-10 11:28:10 +08:00 |
Liu Jicong
|
092a13786f
|
Merge branch '3.0' into feature/stream
|
2022-06-10 10:27:45 +08:00 |
Liu Jicong
|
0e1328ae7f
|
fix(stream): set child id
|
2022-06-10 10:24:56 +08:00 |
Cary Xu
|
2160a112f5
|
other: merge 3.0
|
2022-06-10 09:59:47 +08:00 |
Haojun Liao
|
c55aae2c0c
|
enh(query): block distribution query is supported.
|
2022-06-10 09:51:57 +08:00 |
Hongze Cheng
|
da1d012824
|
Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/row_refact
|
2022-06-10 01:44:30 +00:00 |
Shengliang Guan
|
74ced4e0c0
|
feat: split vgroup
|
2022-06-09 20:55:26 +08:00 |
Shengliang Guan
|
e85e323863
|
feat: split vgroup
|
2022-06-09 20:46:15 +08:00 |
Cary Xu
|
fff84f1cb4
|
other: merge 3.0
|
2022-06-09 20:08:50 +08:00 |
Cary Xu
|
2b2485d175
|
feat: tsma exp wnds process
|
2022-06-09 20:02:55 +08:00 |
Shengliang Guan
|
5bda367fbd
|
Merge remote-tracking branch 'origin/3.0' into fix/dnode
|
2022-06-09 19:32:38 +08:00 |
Liu Jicong
|
7ed9da56e3
|
Merge pull request #13653 from taosdata/feature/stream
feat(stream): sink table can be other db
|
2022-06-09 19:12:35 +08:00 |
Shengliang Guan
|
4da408afe6
|
enh: call walEndSnapshot while sdb writefile
|
2022-06-09 17:44:39 +08:00 |
Liu Jicong
|
b23fa19bc4
|
feat(stream): sink table can be other db
|
2022-06-09 16:50:11 +08:00 |
Shengliang Guan
|
ab578845b4
|
Merge remote-tracking branch 'origin/3.0' into feature/sync-refactor
|
2022-06-09 16:34:43 +08:00 |
Hongze Cheng
|
7a559aec8d
|
Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/row_refact
|
2022-06-09 08:16:57 +00:00 |
Cary Xu
|
69e7c77f4a
|
Merge branch '3.0' into feature/TD-14481-3.0
|
2022-06-09 15:15:22 +08:00 |
Yihao Deng
|
1946f39a96
|
Merge pull request #13638 from taosdata/enh/refactorTrans
enh: refactor trans
|
2022-06-09 14:32:04 +08:00 |
Shengliang Guan
|
17f8ccc901
|
enh: record config index
|
2022-06-09 14:12:52 +08:00 |
Hongze Cheng
|
d893ae4405
|
start bulk refact
|
2022-06-09 06:04:56 +00:00 |