use a soft limit so there's not a whole bunch of deletes on every write

diff --git a/classes/Notice.php b/classes/Notice.php
index e16d84352f07019d5beff65b7744642e1eb68185..0359c310d4b82237e2d43d7dfe648e01af4aa39b 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -875,7 +875,9 @@ class Notice extends Memcached_DataObject
                 }
                 $qry .= '('.$id.', '.$this->id.', '.$source.', "'.$this->created.'") ';
                 $cnt++;
-                Notice_inbox::gc($id);
+                if (rand() % NOTICE_INBOX_SOFT_LIMIT == 0) {
+                    Notice_inbox::gc($id);
+                }
                 if ($cnt >= MAX_BOXCARS) {
                     $inbox = new Notice_inbox();
                     $inbox->query($qry);

diff --git a/classes/Notice_inbox.php b/classes/Notice_inbox.php
index a1aa9b05498c3c0eacdb97b7c9c835b40bbdee1f..2af34b1a4659a47c81731afc67afe975d6f784ca 100644 (file)
--- a/classes/Notice_inbox.php
+++ b/classes/Notice_inbox.php
@@ -27,6 +27,7 @@ define('INBOX_CACHE_WINDOW', 101);
 define('NOTICE_INBOX_GC_BOXCAR', 128);
 define('NOTICE_INBOX_GC_MAX', 12800);
 define('NOTICE_INBOX_LIMIT', 1000);
+define('NOTICE_INBOX_SOFT_LIMIT', 1000);
 
 define('NOTICE_INBOX_SOURCE_SUB', 1);
 define('NOTICE_INBOX_SOURCE_GROUP', 2);