Commit Graph

7038 Commits

Author SHA1 Message Date
Minglei Jin 33967b243b
Merge branch '3.0' into fix/TD-25010-3 2023-08-10 12:14:01 +08:00
Haojun Liao b658608541
Merge pull request #22388 from taosdata/fix/3_liaohj
other: merge main.
2023-08-10 11:43:02 +08:00
Haojun Liao c10b323188 other: merge main. 2023-08-10 09:26:33 +08:00
Haojun Liao 4393375e47 fix(stream): set correct task id. 2023-08-10 02:16:04 +08:00
Haojun Liao 0757e88ced fix(stream): set the correct hash keys. 2023-08-09 23:52:14 +08:00
Haojun Liao 7e3f1d92fc Merge branch 'main' into fix/liaohj 2023-08-09 19:43:24 +08:00
Minglei Jin a853d9d40c mxml: use ~/local/include 2023-08-09 18:21:55 +08:00
Haojun Liao 1e8579e8c5 fix(stream): fix other cases. 2023-08-09 16:04:48 +08:00
Haojun Liao 4c92997328 fix(stream): use streamId&taskId to identify the stream task in the stream meta. 2023-08-09 15:52:23 +08:00
Hui Li 584427dd44
Merge pull request #22374 from taosdata/szhou/restore-minglei-main
fix: restore stt/block merge back
2023-08-09 14:40:03 +08:00
Minglei Jin b08d5b4d42 mxml: add include dir to vnode 2023-08-09 14:02:10 +08:00
Minglei Jin 7e2859ed43 apr: use tarball to avoid ./buildconf 2023-08-09 13:03:37 +08:00
Haojun Liao 3cdb16352c fix(stream): avoid launching check downstream when failed to add stream task into stream meta. 2023-08-09 12:03:14 +08:00
Minglei Jin 2e0519b960 apr: fix apr & apr-util project names 2023-08-09 11:01:42 +08:00
Minglei Jin 7114ad63e5 apr:makefile for apr & apr-util 2023-08-09 10:54:17 +08:00
Minglei Jin 4d1155a5cf curl: makefile for curl 2023-08-09 10:43:27 +08:00
shenglian zhou e9e06d1eae fix: restore stt block/data block merge back 2023-08-09 10:36:54 +08:00
shenglian zhou 2b1478f46e Revert "fix(tsdb/read2): reset stt reader when suspended"
This reverts commit 079d7ff69e.
2023-08-09 10:36:26 +08:00
Minglei Jin 16e015253b s3/mxml: remove os external dependency 2023-08-09 10:10:25 +08:00
Haojun Liao bb39d94f9c
Merge pull request #22357 from taosdata/fix/liaohj
other: merge fix from 3.0 to main.
2023-08-09 09:05:54 +08:00
Haojun Liao 17c6143471 fix(stream): check more status when handling the state transfer. 2023-08-08 15:08:11 +08:00
Hongze Cheng c8f106106a fix: update assert issue 2023-08-08 14:49:05 +08:00
Hui Li 05e356cd81
Merge pull request #22346 from taosdata/fix/TD-25612
fix: snapshot invalid read
2023-08-08 09:19:55 +08:00
Haojun Liao 458143c8b7
Merge pull request #22348 from taosdata/szhou/restore-tsdb-minglei
fix: restore stt block and data block merge back
2023-08-08 08:58:02 +08:00
Haojun Liao ad3e231b2f
Merge pull request #22350 from taosdata/fix/3_liaohj
other: merge main and fix bugs in stop stream tasks.
2023-08-07 22:57:13 +08:00
Haojun Liao aea1690cd1 fix(stream): fix the stream task after checking if it is in the timer activities. 2023-08-07 17:49:36 +08:00
shenglian zhou ec1270f75c fix: restore stt block/data block merge back 2023-08-07 17:17:12 +08:00
Minglei Jin 9e4da6c089 s3/config: parsing s3 configuration 2023-08-07 17:14:58 +08:00
shenglian zhou 9ddab11d98 Revert "fix(tsdb/read2): reset stt reader when suspended"
This reverts commit 079d7ff69e.
2023-08-07 17:13:49 +08:00
Haojun Liao e6b80e6c52 Merge branch '3.0' into fix/3_liaohj 2023-08-07 16:26:31 +08:00
Hongze Cheng a545d45b5e fix: snapshot invalid read 2023-08-07 16:12:03 +08:00
Minglei Jin fac7e521e9 s3/evict: fetch atime from stat file 2023-08-07 15:59:37 +08:00
Hongze Cheng 661f2aca98 fix: memory leak 2023-08-07 14:13:44 +08:00
wangmm0220 9ecabb30f5 fix:ref is not there 2023-08-07 10:27:44 +08:00
wangmm0220 5f02e2ddfb fix:ref is not there 2023-08-07 09:31:29 +08:00
wangmm0220 d9a1695257 fix:add log 2023-08-04 18:07:44 +08:00
Minglei Jin 65d8af19ed s3: new api s3Size 2023-08-04 16:35:35 +08:00
Minglei Jin 87783a9650 s3query/get: pull object to local 2023-08-04 15:37:52 +08:00
Minglei Jin ebd09ca532 tsdb/write: use keep1 as minKey instead of keep2 2023-08-04 13:44:17 +08:00
Minglei Jin 88d755be76 feat(tsdb/cos): s3 migration 2023-08-04 13:31:00 +08:00
wade zhang abe15cc68e
Merge pull request #22315 from taosdata/szhou/fix-td25385-main
fix: keep stt iterator valid in the list
2023-08-04 08:02:16 +08:00
slzhou fef091b13d fix: keep the stt iterator valid 2023-08-03 21:50:50 +08:00
shenglian zhou b85c1ae8a1 fix: remove the core 2023-08-03 21:50:50 +08:00
shenglian zhou 5322e38dfe fix: add init add check it 2023-08-03 21:50:50 +08:00
shenglian zhou 97b15ed718 fix: delete SLDataItem if stt level files num is smaller 2023-08-03 21:50:50 +08:00
slzhou 1cb1451e41 fix: set nextIndex when get neighbouring index 2023-08-03 18:26:29 +08:00
wade zhang 68f2018246
Merge pull request #22289 from taosdata/szhou/fix-25385
fix: keep stt iterator valid
2023-08-02 20:22:54 +08:00
wade zhang 13c713d33b
Merge pull request #22290 from taosdata/3.0_main
merge 3.0 into branch main
2023-08-02 16:04:08 +08:00
Hongze Cheng f90f0b7047 disable infinite count loop 2023-08-02 15:51:51 +08:00
Minglei Jin cff85550f9 Merge branch '3.0' into 3.0_main 2023-08-02 14:10:45 +08:00