From: Timo Sirainen <tss@iki.fi>
Date: Tue, 7 Sep 2010 15:32:17 +0000 (+0100)
Subject: maildir: Avoid unnecessary uidlist recreation during mail delivery.
X-Git-Tag: 2.0.2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6ccb2a38287c42aa53f66a927a6ada9d324b0be;p=thirdparty%2Fdovecot%2Fcore.git

maildir: Avoid unnecessary uidlist recreation during mail delivery.
---

diff --git a/src/lib-storage/index/maildir/maildir-uidlist.c b/src/lib-storage/index/maildir/maildir-uidlist.c
index d66bdca114..4f39d03447 100644
--- a/src/lib-storage/index/maildir/maildir-uidlist.c
+++ b/src/lib-storage/index/maildir/maildir-uidlist.c
@@ -93,6 +93,7 @@ struct maildir_uidlist {
 	uint8_t mailbox_guid[MAIL_GUID_128_SIZE];
 
 	unsigned int recreate:1;
+	unsigned int recreate_on_change:1;
 	unsigned int initial_read:1;
 	unsigned int initial_hdr_read:1;
 	unsigned int retry_rewind:1;
@@ -778,7 +779,7 @@ maildir_uidlist_update_read(struct maildir_uidlist *uidlist,
                         ret = -1;
 
 		if (uidlist->unsorted) {
-			uidlist->recreate = TRUE;
+			uidlist->recreate_on_change = TRUE;
 			maildir_uidlist_records_sort_by_uid(uidlist);
 		}
 		if (uidlist->next_uid <= uidlist->prev_read_uid)
@@ -1453,6 +1454,7 @@ static int maildir_uidlist_recreate(struct maildir_uidlist *uidlist)
 		uidlist->fd_size = st.st_size;
 		uidlist->last_read_offset = st.st_size;
 		uidlist->recreate = FALSE;
+		uidlist->recreate_on_change = FALSE;
 		uidlist->have_mailbox_guid = TRUE;
 		maildir_uidlist_update_hdr(uidlist, &st);
 	}
@@ -1515,7 +1517,7 @@ static int maildir_uidlist_sync_update(struct maildir_uidlist_sync_ctx *ctx)
 	struct stat st;
 	uoff_t file_size;
 
-	if (maildir_uidlist_want_recreate(ctx))
+	if (maildir_uidlist_want_recreate(ctx) || uidlist->recreate_on_change)
 		return maildir_uidlist_recreate(uidlist);
 
 	if (!uidlist->locked_refresh || uidlist->fd == -1) {