Advance the buffer properly to scan the journal file (#13666)
Stelios Fragkakis committed
Sep 14, 2022 at 19:24 UTC
b629d3e31017601e06edc6d5b2be4edf8650ab71
1 file changed
+2
-2
database/engine/journalfile.c
+2
-2
@@ -442,7 +442,7 @@ static uint64_t iterate_transactions(struct rrdengine_instance *ctx, struct rrde
442
//data_file_size = journalfile->datafile->pos; TODO: utilize this?
443
444
max_id = 1;
445
- bool journal_is_mmapped = journalfile->data;
445
+ bool journal_is_mmapped = (journalfile->data != NULL);
446
if (unlikely(!journal_is_mmapped)) {
447
ret = posix_memalign((void *)&buf, RRDFILE_ALIGNMENT, READAHEAD_BYTES);
448
if (unlikely(ret))
@@ -479,7 +479,7 @@ static uint64_t iterate_transactions(struct rrdengine_instance *ctx, struct rrde
479
max_id = MAX(max_id, id);
480
}
481
if (likely(journal_is_mmapped))
482
- buf = journalfile->data + size_bytes;
482
+ buf += size_bytes;
483
}
484
skip_file:
485
if (unlikely(!journal_is_mmapped))