Commit Graph

6934 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
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