Skip to content

Commit

Permalink
lib-index, lib-storage: Add mail_index_header.last_temp_file_scan
Browse files Browse the repository at this point in the history
Also add index_mailbox_update_last_temp_file_scan() for easily updating it.

This is reusing an old "sync timestamp" field. Because it was a timestamp,
it doesn't matter if the old data still exists in it. This field could have
been added as an extension, but that's more work and this feature is generic
enough that it should be useful for many of the mail storage backends.
  • Loading branch information
sirainen committed Jul 3, 2017
1 parent c5e2aa3 commit 2ecee6e
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/lib-index/mail-index-map-hdr.c
Expand Up @@ -293,7 +293,7 @@ int mail_index_map_check_header(struct mail_index_map *map,
/* pre-v2.2 (although should have been done in v2.1 already):
make sure the old unused fields are cleared */
map->hdr.unused_old_sync_size = 0;
map->hdr.unused_old_sync_stamp = 0;
map->hdr.last_temp_file_scan = 0;
}
if (hdr->first_recent_uid == 0) {
*error_r = "first_recent_uid=0";
Expand Down
2 changes: 1 addition & 1 deletion src/lib-index/mail-index.h
Expand Up @@ -106,7 +106,7 @@ struct mail_index_header {
uint32_t log_file_head_offset;

uint64_t unused_old_sync_size;
uint32_t unused_old_sync_stamp;
uint32_t last_temp_file_scan;

/* daily first UIDs that have been added to index. */
uint32_t day_stamp;
Expand Down
16 changes: 16 additions & 0 deletions src/lib-storage/index/index-storage.c
Expand Up @@ -861,6 +861,22 @@ int index_storage_mailbox_rename(struct mailbox *src, struct mailbox *dest)
return 0;
}

int index_mailbox_update_last_temp_file_scan(struct mailbox *box)
{
uint32_t last_temp_file_scan = ioloop_time;
struct mail_index_transaction *trans =
mail_index_transaction_begin(box->view,
MAIL_INDEX_TRANSACTION_FLAG_EXTERNAL);
mail_index_update_header(trans,
offsetof(struct mail_index_header, last_temp_file_scan),
&last_temp_file_scan, sizeof(last_temp_file_scan), TRUE);
if (mail_index_transaction_commit(&trans) < 0) {
mailbox_set_index_error(box);
return -1;
}
return 0;
}

bool index_storage_is_readonly(struct mailbox *box)
{
return (box->flags & MAILBOX_FLAG_READONLY) != 0;
Expand Down
2 changes: 2 additions & 0 deletions src/lib-storage/index/index-storage.h
Expand Up @@ -80,6 +80,8 @@ int index_storage_mailbox_delete(struct mailbox *box);
int index_storage_mailbox_delete_dir(struct mailbox *box, bool mailbox_deleted);
int index_storage_mailbox_rename(struct mailbox *src, struct mailbox *dest);

int index_mailbox_update_last_temp_file_scan(struct mailbox *box);

bool index_storage_is_readonly(struct mailbox *box);
bool index_storage_is_inconsistent(struct mailbox *box);

Expand Down

0 comments on commit 2ecee6e

Please sign in to comment.