From: Timo Sirainen <tss@iki.fi>
Date: Thu, 18 Apr 2013 14:54:29 +0000 (+0300)
Subject: lib-storage: Set virtual/physical size in dest_mail when copying, if possible.
X-Git-Tag: 2.2.1~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92bf0ad419f1aebcb1361d9d1bd64e8b4e3000f6;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Set virtual/physical size in dest_mail when copying, if possible.
Ideally lib-index would be fixed so this wouldn't be necessary. The
lib-index way of fixing it would also be useful for more than just quota
plugin.
---

diff --git a/src/lib-storage/index/index-storage.c b/src/lib-storage/index/index-storage.c
index 047ae6c5df..a4c1061c2b 100644
--- a/src/lib-storage/index/index-storage.c
+++ b/src/lib-storage/index/index-storage.c
@@ -795,6 +795,23 @@ mail_copy_cache_field(struct mail_save_context *ctx, struct mail *src_mail,
 		if (mail_cache_lookup_field(src_mail->transaction->cache_view, buf,
 					    src_mail->seq, src_field_idx) <= 0)
 			buffer_set_used_size(buf, 0);
+		else if (ctx->dest_mail != NULL &&
+			 (strcmp(name, "size.physical") == 0 ||
+			  strcmp(name, "size.virtual") == 0)) {
+			/* FIXME: until mail_cache_lookup() can read unwritten
+			   cached data from buffer, we'll do this optimization
+			   to make quota plugin's work faster */
+			struct index_mail *imail =
+				(struct index_mail *)ctx->dest_mail;
+			uoff_t size;
+
+			i_assert(buf->used == sizeof(size));
+			memcpy(&size, buf->data, sizeof(size));
+			if (strcmp(name, "size.physical") == 0)
+				imail->data.physical_size = size;
+			else
+				imail->data.virtual_size = size;
+		}
 	}
 	if (buf->used > 0) {
 		mail_cache_add(dest_trans->cache_trans, dest_seq,