lib-index: Rename mail_transaction_log_file.saved_tail_offset to last_read_hdr_tail_o...

This describes better what it's actually used for.

diff --git a/src/lib-index/mail-transaction-log-append.c b/src/lib-index/mail-transaction-log-append.c
index d78b99be49a865e5a2993dc4e5ad1ff85f58bd31..662f72a9f97a23e447bab3b1515f4a51acc61cf4 100644 (file)
--- a/src/lib-index/mail-transaction-log-append.c
+++ b/src/lib-index/mail-transaction-log-append.c
@@ -158,9 +158,9 @@ log_append_sync_offset_if_needed(struct mail_transaction_log_append_ctx *ctx)
        }
        offset = file->max_tail_offset;
 
-       if (file->saved_tail_offset == offset)
+       if (file->last_read_hdr_tail_offset == offset)
                return;
-       i_assert(offset > file->saved_tail_offset);
+       i_assert(offset > file->last_read_hdr_tail_offset);
 
        buffer_create_from_data(&buf, update_data, sizeof(update_data));
        u = buffer_append_space_unsafe(&buf, sizeof(*u));

diff --git a/src/lib-index/mail-transaction-log-file.c b/src/lib-index/mail-transaction-log-file.c
index 15b94c57aa13d68d6de3da51fdfe8ce9bc252fee..b1e46807d6fad37abf79177a10b34cfaddc8f56f 100644 (file)
--- a/src/lib-index/mail-transaction-log-file.c
+++ b/src/lib-index/mail-transaction-log-file.c
@@ -179,12 +179,12 @@ mail_transaction_log_file_skip_to_head(struct mail_transaction_log_file *file)
                file->sync_highest_modseq = modseq_hdr->highest_modseq;
        }
        if (file->hdr.file_seq == log->index->map->hdr.log_file_seq) {
-               file->saved_tail_offset =
+               file->last_read_hdr_tail_offset =
                        log->index->map->hdr.log_file_tail_offset;
-               file->saved_tail_sync_offset = file->saved_tail_offset;
+               file->saved_tail_sync_offset = file->last_read_hdr_tail_offset;
        }
-       if (file->saved_tail_offset > file->max_tail_offset)
-               file->max_tail_offset = file->saved_tail_offset;
+       if (file->last_read_hdr_tail_offset > file->max_tail_offset)
+               file->max_tail_offset = file->last_read_hdr_tail_offset;
 }
 
 static void
@@ -992,7 +992,7 @@ log_file_track_mailbox_sync_offset_hdr(struct mail_transaction_log_file *file,
                       CONST_PTR_OFFSET(u + 1, offset_pos - u->offset),
                       sizeof(tail_offset));
 
-               if (tail_offset < file->saved_tail_offset) {
+               if (tail_offset < file->last_read_hdr_tail_offset) {
                        /* ignore shrinking tail offsets */
                        return 1;
                } else if (tail_offset > file->sync_offset + trans_size) {
@@ -1000,7 +1000,7 @@ log_file_track_mailbox_sync_offset_hdr(struct mail_transaction_log_file *file,
                                "log_file_tail_offset %u goes past sync offset %"PRIuUOFF_T,
                                tail_offset, file->sync_offset + trans_size);
                } else {
-                       file->saved_tail_offset = tail_offset;
+                       file->last_read_hdr_tail_offset = tail_offset;
                        if (tail_offset > file->max_tail_offset)
                                file->max_tail_offset = tail_offset;
                        return 1;

diff --git a/src/lib-index/mail-transaction-log-private.h b/src/lib-index/mail-transaction-log-private.h
index 5f012f9cff49c24628a673dc8f624895ea7692ee..b41566eb2682741eb1bf6842fd96d3309e68f959 100644 (file)
--- a/src/lib-index/mail-transaction-log-private.h
+++ b/src/lib-index/mail-transaction-log-private.h
@@ -50,13 +50,13 @@ struct mail_transaction_log_file {
        uoff_t sync_offset;
        /* highest modseq at sync_offset */
        uint64_t sync_highest_modseq;
-       /* saved_tail_offset is the offset that was last written to transaction
+       /* last_read_hdr_tail_offset is the offset that was last written to transaction
           log. max_tail_offset is what should be written to the log the next
           time a transaction is written. transaction log handling may update
           max_tail_offset automatically by making it skip external transactions
           after the last saved offset (to avoid re-reading them needlessly). */
-       uoff_t saved_tail_offset, max_tail_offset;
-       /* don't give warnings about saved_tail_offset shrinking if
+       uoff_t last_read_hdr_tail_offset, max_tail_offset;
+       /* don't give warnings about last_read_hdr_tail_offset shrinking if
           sync_offset is less than this. */
        uoff_t saved_tail_sync_offset;
 

diff --git a/src/lib-index/mail-transaction-log.c b/src/lib-index/mail-transaction-log.c
index f2211bece0ba5ae28b2441f6d270fd8b1b3941b2..b48953c73ef09fd09bccf39a80d61e740906dd5b 100644 (file)
--- a/src/lib-index/mail-transaction-log.c
+++ b/src/lib-index/mail-transaction-log.c
@@ -418,7 +418,7 @@ void mail_transaction_log_set_mailbox_sync_pos(struct mail_transaction_log *log,
                                               uoff_t file_offset)
 {
        i_assert(file_seq == log->head->hdr.file_seq);
-       i_assert(file_offset >= log->head->saved_tail_offset);
+       i_assert(file_offset >= log->head->last_read_hdr_tail_offset);
 
        if (file_offset >= log->head->max_tail_offset)
                log->head->max_tail_offset = file_offset;