# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1558977432 -7200
# Node ID 98ef41a60fc3a7cad3c5e355652f1e784416803a
# Parent  c0ee2ed8ef199cbbbc22c30ad8b04fc23c7d60fa# Parent  2c8f674b9243c1daa5df0b60f6bb80c729586452
Merge 0.11->trunk

diff -r c0ee2ed8ef19 -r 98ef41a60fc3 plugins/mod_mam/mod_mam.lua
--- a/plugins/mod_mam/mod_mam.lua	Mon May 27 12:14:05 2019 +0200
+++ b/plugins/mod_mam/mod_mam.lua	Mon May 27 19:17:12 2019 +0200
@@ -43,7 +43,6 @@
 local cleanup_after = module:get_option_string("archive_expires_after", "1w");
 local cleanup_interval = module:get_option_number("archive_cleanup_interval", 4 * 60 * 60);
 local archive_item_limit = module:get_option_number("storage_archive_item_limit", archive.caps and archive.caps.quota or 1000);
-
 if not archive.find then
 	error("mod_"..(archive._provided_by or archive.name and "storage_"..archive.name).." does not support archiving\n"
 		.."See https://prosody.im/doc/storage and https://prosody.im/doc/archiving for more information");
@@ -375,9 +374,15 @@
 	-- messages, we collect the union of sets of users from dates that fall
 	-- outside the cleanup range.
 
+	local last_date = require "util.cache".new(module:get_option_number("archive_cleanup_date_cache_size", 1000));
 	function schedule_cleanup(username, date)
-		cleanup_map:set(date or datestamp(), username, true);
+		date = date or datestamp();
+		if last_date:get(username) == date then return end
+		local ok = cleanup_map:set(date, username, true);
+		if ok then
+			last_date:set(username, date);
 		end
+	end
 	local cleanup_time = module:measure("cleanup", "times");
 
 	cleanup_runner = require "util.async".runner(function ()
diff -r c0ee2ed8ef19 -r 98ef41a60fc3 plugins/mod_muc_mam.lua
--- a/plugins/mod_muc_mam.lua	Mon May 27 12:14:05 2019 +0200
+++ b/plugins/mod_muc_mam.lua	Mon May 27 19:17:12 2019 +0200
@@ -458,8 +458,14 @@
 	-- messages, we collect the union of sets of rooms from dates that fall
 	-- outside the cleanup range.
 
+	local last_date = require "util.cache".new(module:get_option_number("muc_log_cleanup_date_cache_size", 1000));
 	function schedule_cleanup(roomname, date)
-		cleanup_map:set(date or datestamp(), roomname, true);
+		date = date or datestamp();
+		if last_date:get(roomname) == date then return end
+		local ok = cleanup_map:set(date, roomname, true);
+		if ok then
+			last_date:set(roomname, date);
+		end
 	end
 
 	cleanup_runner = require "util.async".runner(function ()