From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Wed, 28 Jun 2017 16:41:21 +0000 (+0300)
Subject: lib-index, lib-storage: Add mail_index_header.last_temp_file_scan
X-Git-Tag: 2.2.32.rc1~132
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44fda550ff557a62c7eb19c0b67d5f1dfa1ffced;p=thirdparty%2Fdovecot%2Fcore.git

lib-index, lib-storage: Add mail_index_header.last_temp_file_scan

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

diff --git a/src/lib-index/mail-index-map-hdr.c b/src/lib-index/mail-index-map-hdr.c
index 59b0c7f93d..1caa3f1a2e 100644
--- a/src/lib-index/mail-index-map-hdr.c
+++ b/src/lib-index/mail-index-map-hdr.c
@@ -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";
diff --git a/src/lib-index/mail-index.h b/src/lib-index/mail-index.h
index fb6b19275c..1e1a289d7d 100644
--- a/src/lib-index/mail-index.h
+++ b/src/lib-index/mail-index.h
@@ -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;
diff --git a/src/lib-storage/index/index-storage.c b/src/lib-storage/index/index-storage.c
index f3fc07f729..7735516c40 100644
--- a/src/lib-storage/index/index-storage.c
+++ b/src/lib-storage/index/index-storage.c
@@ -852,6 +852,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;
diff --git a/src/lib-storage/index/index-storage.h b/src/lib-storage/index/index-storage.h
index 28dc66d649..f3d86fa5f1 100644
--- a/src/lib-storage/index/index-storage.h
+++ b/src/lib-storage/index/index-storage.h
@@ -81,6 +81,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);