Elgato_dark/TDengine
1
0
Fork 0
mirror of https://github.com/taosdata/TDengine synced 2026-05-24 10:09:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
55260 commits 554 branches 514 tags 1.7 GiB
Commit graph

7035 commits

Author SHA1 Message Date
wangmm0220
6e673072cd fix:conflicts 2023-07-28 14:57:13 +08:00
Haojun Liao
2a78cd2d23
Merge pull request #22215 from taosdata/fix/liaohj 
other: merge main.
 2023-07-28 13:06:17 +08:00
wangmm0220
2f6c565392 fix:pHandle not load if taosd restart 2023-07-28 11:48:53 +08:00
wade zhang
b3e5b5bd24
Merge pull request #22217 from taosdata/fix/TD-25386 
fix(tsdb/cache): move to stt next row if data file exausted
 2023-07-28 08:56:29 +08:00
Haojun Liao
ccc0f13649
Merge pull request #22214 from taosdata/fix/3_liaohj 
fix(stream): scan wal in step2
 2023-07-28 00:42:15 +08:00
Haojun Liao
7f3d1dc464 fix(stream): fix memory leak. 2023-07-27 23:06:53 +08:00
wangmm0220
77d43ef5fd fix:tmq ci error 2023-07-27 20:28:45 +08:00
Haojun Liao
fbb33be85d other: add some comments. 2023-07-27 18:59:38 +08:00
Haojun Liao
22a5a18fff fix(stream): 1. set correct timewindow after step2. 2. handle the case when the task is failed to be added into the meta store. 2023-07-27 18:57:36 +08:00
Minglei Jin
cc9b9bd0b9 fix(tsdb/cache): move to stt next row if data file exausted 2023-07-27 17:19:42 +08:00
Haojun Liao
b145771a1b other: merge 3.0 2023-07-27 16:38:57 +08:00
Haojun Liao
3d403dca5a other: merge main. 2023-07-27 16:23:41 +08:00
Haojun Liao
6ff50d4eaf fix(stream): update the step2 scan wal files. 2023-07-27 16:10:55 +08:00
wangmm0220
75eacd56f1 fix:add log 2023-07-27 15:58:32 +08:00
wade zhang
a72c11c8de
Merge pull request #22205 from taosdata/fix/TD-25315 
fix(tsdb/commit2): new maxDelKey for commit context
 2023-07-27 15:48:46 +08:00
wangmm0220
2d41a42976 Merge branch 'main' of https://github.com/taosdata/TDengine into fix/TS-3728 2023-07-27 15:31:16 +08:00
Haojun Liao
40fe3ef4f6 fix(stream): refactor the step2 wal scan. 2023-07-27 14:49:20 +08:00
Minglei Jin
fe495f7013 tsdb/commit2: fix commit minKey for del 2023-07-27 13:54:48 +08:00
Haojun Liao
e89f530db2 fix(stream): scan wal in step2 2023-07-27 10:55:59 +08:00
Minglei Jin
8a2764c698 tsdb/commit2: use max fileset's maxKey as initial maxDelKey 2023-07-27 10:51:17 +08:00
Minglei Jin
dd32f12f92 tsdb/commit2: reset nextKey to max to stop commit 2023-07-27 09:50:32 +08:00
Minglei Jin
992d623ae5 fix(tsdb/commit2): initialize ctx's maxDelKey with TSKEY_MIN 2023-07-27 09:34:47 +08:00
Minglei Jin
580b7124cf fix(tsdb/commit2): new maxDelKey for commit context 2023-07-27 09:16:28 +08:00
Haojun Liao
087d54a807
Merge pull request #22198 from taosdata/fix/3_liaohj 
fix(stream): do filter before the update check.
 2023-07-26 18:57:48 +08:00
Haojun Liao
c57defa1c9
Merge pull request #22195 from taosdata/szhou/fix-td25369 
fix: stt and data block merge
 2023-07-26 17:11:18 +08:00
Haojun Liao
6a6830761d fix(tsdb): check for null ptr of pScanInfo 2023-07-26 17:08:29 +08:00
Haojun Liao
3c387f6e91 fix(stream): fix syntax error. 2023-07-26 17:00:41 +08:00
Haojun Liao
432c943c25 fix(stream): do filter before the update check. 2023-07-26 16:34:39 +08:00
Haojun Liao
610f9d19c1
Merge pull request #22188 from taosdata/fix/3_liaohj 
fix(stream): set the correct step2 scan time window range.
 2023-07-26 16:34:10 +08:00
shenglian zhou
1357e623d0 fix: fix compilation error 2023-07-26 15:43:50 +08:00
shenglian zhou
79020ea4a4 fix: stt and data block merge 2023-07-26 15:01:20 +08:00
Haojun Liao
df57768a3e Merge branch '3.0' into fix/3_liaohj 2023-07-26 14:45:11 +08:00
Haojun Liao
cdffabcdad fix(stream): fix memory leak. 2023-07-26 14:37:04 +08:00
wade zhang
d8fd5b9394
Merge pull request #22190 from taosdata/fix/TD-25315 
fix(tsdb/del): reset next key to del record's ekey
 2023-07-26 10:23:01 +08:00
Haojun Liao
b6eb739ae0 fix(tsdb): fix the 2023-07-26 09:14:19 +08:00
Minglei Jin
fb860726de fix(tsdb/del): reset next key to del record's ekey 2023-07-26 08:40:44 +08:00
wade zhang
02bc1b2a8f
Merge pull request #22186 from taosdata/fix/TD-25315 
fix(tsdb/del): continue committing fileset if more del left
 2023-07-25 17:41:30 +08:00
Haojun Liao
0bdccd2681 refactor: do some internal refactor. 2023-07-25 17:31:54 +08:00
Minglei Jin
7bfb4e0f88 fix(tsdb/del): continue committing fileset if more del left 2023-07-25 16:42:45 +08:00
wangmm0220
be4e47e9a7 fix:add macro ASSERT_NOT_CORE to control ASSERT not core in release version 2023-07-25 16:15:33 +08:00
Haojun Liao
d29f835a63 fix(stream): set the correct step2 scan time window range. 2023-07-25 15:09:22 +08:00
Haojun Liao
c2588d71c3
Merge pull request #22173 from taosdata/fix/TS-3728 
fix:avoid request offset type is 0
 2023-07-25 14:59:30 +08:00
wade zhang
2bf84c2676
Merge pull request #22179 from taosdata/FIX/TS-3702-3.0 
enh: compatibility between getFileNamePrefix and tsdbTFileName
 2023-07-25 14:26:14 +08:00
Benguang Zhao
01f45b2a99 enh: compatibility between getFileNamePrefix and tsdbTFileName 2023-07-25 11:35:35 +08:00
Minglei Jin
1bce96ea27 fix(tsdb/pageSize): use tsdbPageSize instead of szPage(tdb's) 2023-07-25 10:46:03 +08:00
wade zhang
7ea9cf1ddc
Merge pull request #22166 from taosdata/fix/TD-24422 
fix(tsdb/cache): reuse data file reader
 2023-07-25 10:28:59 +08:00
Haojun Liao
96722a07b1
Merge pull request #22174 from taosdata/fix/3_liaohj 
fix(stream): fix the invalid check of step2 .
 2023-07-25 00:30:06 +08:00
Haojun Liao
a2694b9ce9 fix(stream): fix the invalid check of step2 . 2023-07-24 19:44:28 +08:00
wangmm0220
6a0e994169 fix:avoid request offset type is 0 2023-07-24 19:24:05 +08:00
Haojun Liao
d36903bf08
Merge pull request #22162 from taosdata/fix/3_liaohj 
fix(stream): add some logs, and remove the invalid loop.
 2023-07-24 16:29:51 +08:00
wangmm0220
9628a9f74e fix:open info log in tmq & ignore wal apply ver when read wal 2023-07-24 15:53:02 +08:00
Minglei Jin
424dd40078 tsdb/cache: reuse pDataFileReader for same fileset 2023-07-24 14:45:35 +08:00
Haojun Liao
9bae91bcba fix(stream): add some logs, and remove the invalid loop. 2023-07-24 13:37:44 +08:00
Haojun Liao
13bab114cb
Merge pull request #22155 from taosdata/fix/3_liaohj 
fix(stream): refactor the halt status to check more status.
 2023-07-24 11:04:08 +08:00
Minglei Jin
968cfd9e65 tsdb/cache: pLastIter null pointer check 2023-07-24 11:03:07 +08:00
wade zhang
5f25d70fc2
Merge pull request #22154 from taosdata/enh/tsdb_optimize 
fix(tsdb/cache): new next stt row state for fs tranverse
 2023-07-24 10:47:51 +08:00
Haojun Liao
1367552f38 fix(stream): refactor the halt status to check more status. 2023-07-24 10:04:15 +08:00
Haojun Liao
6a19ad3127
Merge pull request #22151 from taosdata/fix/3_liaohj 
fix(stream): set the correct flag of pause/resume.
 2023-07-24 09:07:49 +08:00
Minglei Jin
13491fab95 tsdb/cache: new next stt row state for fs tranverse 2023-07-24 08:51:20 +08:00
Haojun Liao
0b6e1a12bb refactor: do some internal refactor. 2023-07-23 19:09:43 +08:00
Haojun Liao
e387b2f932 refactor: do some internal refactor. 2023-07-23 18:59:34 +08:00
Haojun Liao
4e0f7ffbf8 fix(stream): set the correct flag of pause/resume. 2023-07-23 18:49:56 +08:00
Haojun Liao
321be1f83f
Merge pull request #22135 from taosdata/fix/3_liaohj 
refactor: do some internal refactor.
 2023-07-22 15:06:28 +08:00
Haojun Liao
bfc4a07207 fix(stream): fix memory leak. 2023-07-22 00:20:02 +08:00
Haojun Liao
1b2636028a fix(stream): fix memory leak. 2023-07-21 23:05:42 +08:00
Haojun Liao
16d7707b90 fix(stream): align the scan real time data for stream task. 2023-07-21 19:33:43 +08:00
wade zhang
7b1e809d98
Merge pull request #21794 from taosdata/enh/tsdb_optimize 
for test purpose
 2023-07-21 14:18:32 +08:00
wangmm0220
bb86f5c580 fix:commit offset should not plus 1 2023-07-21 11:13:05 +08:00
wangmm0220
10ebf1f438 fix:subscribeStb.py maybe failed 2023-07-21 11:07:34 +08:00
Haojun Liao
39ca9b537f fix(stream): fix syntax error 2023-07-21 09:43:08 +08:00
Haojun Liao
c9d75eab5a refactor: do some internal refactor. 2023-07-21 09:16:13 +08:00
Haojun Liao
db46d31ca5 fix(stream): refactor the halt function. 2023-07-21 01:32:42 +08:00
Haojun Liao
9353f7c8cf refactor: do some internal refactor. 2023-07-20 16:35:02 +08:00
Haojun Liao
c9fa170e65 refactor: do some internal refactor. 2023-07-20 16:31:46 +08:00
Haojun Liao
45cb478b31 refactor: do some internal refactor. 2023-07-20 15:36:46 +08:00
Haojun Liao
87fa8f0c4c Merge branch '3.0' into fix/3_liaohj 2023-07-20 12:15:23 +08:00
Haojun Liao
aed99da6c1 refactor: refactor the stream task starting order. 2023-07-20 12:14:53 +08:00
Minglei Jin
48222f5dc3 tsdb/cache: move data file reader for fs iter to cache reader 2023-07-20 09:11:26 +08:00
Minglei Jin
6dd4ec41ae tsdb/cache cleanup: remove unused fs methods 2023-07-20 08:51:03 +08:00
Minglei Jin
7f0ea10573 Merge branch 'enh/tsdb_optimize' of https://github.com/taosdata/TDengine into enh/tsdb_optimize 2023-07-20 08:42:12 +08:00
Minglei Jin
46d6dcda3e tsdb/cache: reset skyline when clearing fileset 2023-07-20 08:41:32 +08:00
Haojun Liao
bfcc538205 fix(tsdb):disable stt statistics. 2023-07-20 00:01:30 +08:00
Haojun Liao
97c44e7c18 refactor: do some internal refactor. 2023-07-19 18:42:02 +08:00
wangmm0220
d7d81d82a0 feat:add committed & position & commite_offset interface 2023-07-19 18:27:19 +08:00
Minglei Jin
ce71b8bbe7 Merge branch 'enh/tsdb_optimize' of https://github.com/taosdata/TDengine into enh/tsdb_optimize 2023-07-19 18:11:14 +08:00
Minglei Jin
4eaecd11de tsdb/cache: merge fs & stt row 2023-07-19 18:10:36 +08:00
wangmm0220
5cb35f2fa6 feat:add committed & position & commite_offset interface 2023-07-19 17:29:39 +08:00
Haojun Liao
37ae80d135 fix(tsdb): fix memory leak. 2023-07-19 16:42:51 +08:00
Haojun Liao
d82fb45a4f Merge remote-tracking branch 'origin/enh/tsdb_optimize' into enh/tsdb_optimize 2023-07-19 15:01:37 +08:00
Haojun Liao
a84efab2c8 enh(tsdb): add table filter according to stt block statistics data. 2023-07-19 15:01:25 +08:00
Minglei Jin
913cfe43e8 tsdb/cache: remove input[3] 2023-07-19 12:20:54 +08:00
Minglei Jin
7a716d452e tsdb/fs2: fix vnode get primary dir args 2023-07-19 11:36:26 +08:00
Minglei Jin
4b96bc7147
Merge branch '3.0' into enh/tsdb_optimize 2023-07-19 11:15:57 +08:00
Shungang Li
1d88a6a7c6 enh: ttlMgrFlush adjust log level 2023-07-19 11:15:54 +08:00
Minglei Jin
185081a948 tsdb/fsreader: clear last fileset's resources 2023-07-19 11:04:28 +08:00
wade zhang
c3e5375f15
Merge pull request #22085 from taosdata/FEAT/TS-2699-3.0 
feat: distribute vnode primary dirs among disks of level 0
 2023-07-19 09:44:43 +08:00
wangmm0220
5c344b0159 fix:conflicts from main 2023-07-19 09:05:05 +08:00
Haojun Liao
9513f76172 fix(stream): set downstream task ready state. 2023-07-18 19:02:24 +08:00
Minglei Jin
a127e91534 tsdb/cache skyline: first round implementation of cache skyline 2023-07-18 17:17:06 +08:00
Benguang Zhao
2faa3d2e7b enh: check validity of diskPrimary during vnodeOpen 2023-07-18 15:39:29 +08:00
Minglei Jin
9f9efe9a5e tsdb/cache reader: remove dataf & dataf last readers 2023-07-18 15:30:31 +08:00
Benguang Zhao
24fed51137 enh: tfsRename dir on primary disk at last 2023-07-18 13:58:43 +08:00
Benguang Zhao
5624ecc8df fix: prepare vnode dir recursively in vnodeCreate 2023-07-18 11:32:23 +08:00
Benguang Zhao
6b6b7d8d8f enh: alloc disk of vnode primary dir in vmAllocPrimaryDisk 2023-07-18 11:32:23 +08:00
Minglei Jin
998fbe574d tsdb/cache reader: move suid into reader's info field 2023-07-17 19:10:33 +08:00
Minglei Jin
463b5b608b tsdb/read2: fix null pointer runtime error 2023-07-17 18:35:56 +08:00
Minglei Jin
62cfda1a88 tsdb/read2: fix UAF 2023-07-17 17:35:08 +08:00
Minglei Jin
832b68e17d tsdb/cache: load mem del data 2023-07-17 15:48:08 +08:00
Minglei Jin
a05383e29e tsdb/cache: new load tomb callback from tsdb mergetree 2023-07-17 15:07:10 +08:00
Minglei Jin
27b8671f97 tsdb/cache: new cacheReader field for tsdb & cache reader 2023-07-17 14:27:27 +08:00
Minglei Jin
9b0b4061e0 tsdb/cache: relayout cache row reader 2023-07-17 14:16:54 +08:00
Benguang Zhao
b21e603481 enh: add the field diskPrimary to vnodeGetPrimaryDir, and entries of vnodes.json 2023-07-17 11:48:48 +08:00
Minglei Jin
8263c49c17 tsdb/cache: fix compilation 2023-07-17 09:00:17 +08:00
Minglei Jin
2b21c5e0f6 tsdb2: adapt cache with tsdb2 API 2023-07-17 08:50:54 +08:00
wade zhang
c2b3c2db52
Merge pull request #22066 from taosdata/fix/TD-25215-main 
fix/TD-25215: ttlMgrDeleteTtl should ignore ttl 0 tables for main
 2023-07-14 17:53:25 +08:00
wade zhang
021fcf2a59
Merge pull request #22059 from taosdata/fix/TD-25215 
fix/TD-25215: ttlMgrDeleteTtl should ignore ttl 0 tables
 2023-07-14 17:53:06 +08:00
wangmm0220
6762a01d88 Merge branch 'main' of https://github.com/taosdata/TDengine into mark/tmq 2023-07-14 16:44:00 +08:00
wangmm0220
bbdcbcb75b fix:modify commit version to next validate version 2023-07-14 16:43:28 +08:00
Hongze Cheng
145c43e346 little fix 2023-07-14 16:38:35 +08:00
yihaoDeng
e16a3935a5 fix coverity scan problem 2023-07-14 14:40:32 +08:00
Shungang Li
a48d359f8b fix: ttlMgrDeleteTtl should ignore ttl 0 tables 2023-07-14 14:37:17 +08:00
Hongze Cheng
25120cede4 fix sma merge error 2023-07-14 13:46:01 +08:00
Hongze Cheng
5a89b96e91 make compile 2023-07-14 10:21:06 +08:00
Hongze Cheng
1fad69df3b Merge branch '3.0' of https://github.com/taosdata/TDengine into enh/tsdb_optimize 2023-07-14 10:13:15 +08:00
dapan1121
9bf7180074
Merge pull request #21969 from taosdata/enh/TD-23769-3.0 
enh: rsma stream state adaption
 2023-07-13 19:19:37 +08:00
Haojun Liao
e0ea0f2df4
Merge pull request #22020 from taosdata/fix/liaohj 
other: merge main
 2023-07-13 17:55:28 +08:00
Shungang Li
a39a9428af fix: ttlMgrDeleteTtl should ignore ttl 0 tables 2023-07-13 17:43:32 +08:00
Benguang Zhao
81a2cd16e7 enh: unify handling of vnode primary dir in current_fname 2023-07-13 17:37:53 +08:00
kailixu
6ee135cb52 chore: more code 2023-07-13 17:37:31 +08:00
kailixu
67461d92a7 chore: merge 3.0 and solve conflict 2023-07-13 17:35:55 +08:00
Hongze Cheng
d81d2790ea Merge branch '3.0' of https://github.com/taosdata/TDengine into enh/tsdb_optimize 2023-07-13 17:20:45 +08:00
Haojun Liao
e2ae868377
Merge pull request #22032 from taosdata/mark/tmq 
fix:set firset version to reqOffset of response
 2023-07-13 16:35:21 +08:00
wade zhang
ec86a68b6f
Merge pull request #22045 from taosdata/FEAT/TS-2699-3.0 
enh: unify handling of vnode primary dir for vnd, tsdb and sma
 2023-07-13 13:55:46 +08:00
Benguang Zhao
dc75f7ce21 enh: use VNODE_RSMA_DIR in tdRSmaGetCurrentFName 2023-07-13 11:27:31 +08:00
Haojun Liao
f41bcd73b0 other: merge main. 2023-07-13 11:02:09 +08:00
Benguang Zhao
e209b487c6 enh: rename func name vnodeGetPrimaryDir 2023-07-13 10:38:05 +08:00
kailixu
466f1037b4 Merge branch '3.0' into enh/TD-23769-3.0 2023-07-12 18:50:16 +08:00
Haojun Liao
c388802bda
Merge pull request #22024 from taosdata/fix/3_liaohj 
fix(stream): fix concurrent bug in save task meta.
 2023-07-12 18:17:27 +08:00
kailixu
8f58f9aa5b fix: skip primary key for block sma 2023-07-12 18:07:01 +08:00
Benguang Zhao
05e8af4837 enh: unify handling of vnode primary dir for vnd and tsdb 2023-07-12 17:58:18 +08:00
Benguang Zhao
4c3bf41178 enh: unify handling of vnode primary dir for sma 2023-07-12 17:56:21 +08:00
Benguang Zhao
bbf58d2d9d enh: unify handling of vnode primary dir in vnodeCreate and metaOpen 2023-07-12 17:56:21 +08:00
wangmm0220
cf64d4c9c5 fix:set get_assignment offset to first version of response block 2023-07-12 17:22:23 +08:00
Hongze Cheng
3fc282f035 Merge branch '3.0' of https://github.com/taosdata/TDengine into enh/tsdb_optimize 2023-07-12 11:57:19 +08:00
kailixu
8cb6356b99 chore: more code 2023-07-12 10:47:02 +08:00
kailixu
f282acbc4c chore: rsma refactor 2023-07-12 10:13:50 +08:00
kailixu
8c8bcabdd4 Merge branch '3.0' into enh/TD-23769-3.0 2023-07-12 09:11:34 +08:00
wade zhang
2cfdd234b3
Merge pull request #22034 from taosdata/feat/TS-3239 
feat/TS-3239/TS-3596: port 'keepTimeOffset' from 2.6 to 3.0
 2023-07-12 08:18:38 +08:00
Haojun Liao
fed3803739 fix(stream): fix memory leak. 2023-07-11 19:29:52 +08:00
kailixu
ba0bce8092 chore: code revert 2023-07-11 18:52:51 +08:00