From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Tue, 31 Mar 2020 12:03:16 +0000 (+0300)
Subject: lib-storage: Rename mail_cache_compress_* settings to mail_cache_purge_*
X-Git-Tag: 2.3.11.2~371
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f76794b45c01ccfa741fc22025b2e8ec4bc1f0f0;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Rename mail_cache_compress_* settings to mail_cache_purge_*

The old settings are still recognized by the old-set-parser.
---

diff --git a/src/config/old-set-parser.c b/src/config/old-set-parser.c
index 5aac8d94d5..2b7374d516 100644
--- a/src/config/old-set-parser.c
+++ b/src/config/old-set-parser.c
@@ -341,6 +341,11 @@ old_settings_handle_root(struct config_parser_context *ctx,
 		set_rename(ctx, key, "mdbox_rotate_size", value);
 		return TRUE;
 	}
+	if (str_begins(key, "mail_cache_compress_")) {
+		const char *new_key = t_strconcat("mail_cache_purge_", key+20, NULL);
+		set_rename(ctx, key, new_key, value);
+		return TRUE;
+	}
 	if (strcmp(key, "imap_client_workarounds") == 0) {
 		char **args, **arg;
 
diff --git a/src/lib-storage/index/index-storage.c b/src/lib-storage/index/index-storage.c
index c72b421c46..e0145472d2 100644
--- a/src/lib-storage/index/index-storage.c
+++ b/src/lib-storage/index/index-storage.c
@@ -273,10 +273,10 @@ int index_storage_mailbox_alloc_index(struct mailbox *box)
 			.unaccessed_field_drop_secs = set->mail_cache_unaccessed_field_drop,
 			.record_max_size = set->mail_cache_record_max_size,
 			.max_size = set->mail_cache_max_size,
-			.purge_min_size = set->mail_cache_compress_min_size,
-			.purge_delete_percentage = set->mail_cache_compress_delete_percentage,
-			.purge_continued_percentage = set->mail_cache_compress_continued_percentage,
-			.purge_header_continue_count = set->mail_cache_compress_header_continue_count,
+			.purge_min_size = set->mail_cache_purge_min_size,
+			.purge_delete_percentage = set->mail_cache_purge_delete_percentage,
+			.purge_continued_percentage = set->mail_cache_purge_continued_percentage,
+			.purge_header_continue_count = set->mail_cache_purge_header_continue_count,
 		},
 	};
 	mail_index_set_optimization_settings(box->index, &optimization_set);
diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c
index aaa0eeb1ea..2a0cd38da4 100644
--- a/src/lib-storage/mail-storage-settings.c
+++ b/src/lib-storage/mail-storage-settings.c
@@ -47,10 +47,10 @@ static const struct setting_define mail_storage_setting_defines[] = {
 	DEF(SET_TIME, mail_cache_unaccessed_field_drop),
 	DEF(SET_SIZE, mail_cache_record_max_size),
 	DEF(SET_SIZE, mail_cache_max_size),
-	DEF(SET_SIZE, mail_cache_compress_min_size),
-	DEF(SET_UINT, mail_cache_compress_delete_percentage),
-	DEF(SET_UINT, mail_cache_compress_continued_percentage),
-	DEF(SET_UINT, mail_cache_compress_header_continue_count),
+	DEF(SET_SIZE, mail_cache_purge_min_size),
+	DEF(SET_UINT, mail_cache_purge_delete_percentage),
+	DEF(SET_UINT, mail_cache_purge_continued_percentage),
+	DEF(SET_UINT, mail_cache_purge_header_continue_count),
 	DEF(SET_SIZE, mail_index_rewrite_min_log_bytes),
 	DEF(SET_SIZE, mail_index_rewrite_max_log_bytes),
 	DEF(SET_SIZE, mail_index_log_rotate_min_size),
@@ -114,10 +114,10 @@ const struct mail_storage_settings mail_storage_default_settings = {
 	.mail_cache_unaccessed_field_drop = 60*60*24*30,
 	.mail_cache_record_max_size = 64 * 1024,
 	.mail_cache_max_size = 1024 * 1024 * 1024,
-	.mail_cache_compress_min_size = 32 * 1024,
-	.mail_cache_compress_delete_percentage = 20,
-	.mail_cache_compress_continued_percentage = 200,
-	.mail_cache_compress_header_continue_count = 4,
+	.mail_cache_purge_min_size = 32 * 1024,
+	.mail_cache_purge_delete_percentage = 20,
+	.mail_cache_purge_continued_percentage = 200,
+	.mail_cache_purge_header_continue_count = 4,
 	.mail_index_rewrite_min_log_bytes = 8 * 1024,
 	.mail_index_rewrite_max_log_bytes = 128 * 1024,
 	.mail_index_log_rotate_min_size = 32 * 1024,
@@ -474,8 +474,8 @@ static bool mail_storage_settings_check(void *_set, pool_t pool,
 		*error_r = "mail_cache_max_size can't be over 1 GB";
 		return FALSE;
 	}
-	if (set->mail_cache_compress_delete_percentage > 100) {
-		*error_r = "mail_cache_compress_delete_percentage can't be over 100";
+	if (set->mail_cache_purge_delete_percentage > 100) {
+		*error_r = "mail_cache_purge_delete_percentage can't be over 100";
 		return FALSE;
 	}
 
diff --git a/src/lib-storage/mail-storage-settings.h b/src/lib-storage/mail-storage-settings.h
index b14bd7499f..078afe6bd6 100644
--- a/src/lib-storage/mail-storage-settings.h
+++ b/src/lib-storage/mail-storage-settings.h
@@ -29,10 +29,10 @@ struct mail_storage_settings {
 	unsigned int mail_cache_unaccessed_field_drop;
 	uoff_t mail_cache_record_max_size;
 	uoff_t mail_cache_max_size;
-	uoff_t mail_cache_compress_min_size;
-	unsigned int mail_cache_compress_delete_percentage;
-	unsigned int mail_cache_compress_continued_percentage;
-	unsigned int mail_cache_compress_header_continue_count;
+	uoff_t mail_cache_purge_min_size;
+	unsigned int mail_cache_purge_delete_percentage;
+	unsigned int mail_cache_purge_continued_percentage;
+	unsigned int mail_cache_purge_header_continue_count;
 	uoff_t mail_index_rewrite_min_log_bytes;
 	uoff_t mail_index_rewrite_max_log_bytes;
 	uoff_t mail_index_log_rotate_min_size;