gc inboxes on a regular basis

diff --git a/classes/Notice.php b/classes/Notice.php
index 08125cf7b0d7c77f9546c39bf80c2a248a58c031..e16d84352f07019d5beff65b7744642e1eb68185 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -875,6 +875,7 @@ class Notice extends Memcached_DataObject
                 }
                 $qry .= '('.$id.', '.$this->id.', '.$source.', "'.$this->created.'") ';
                 $cnt++;
+                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 940381f84cd1e258ba0a8563ea79bae62c6b4b8a..a1aa9b05498c3c0eacdb97b7c9c835b40bbdee1f 100644 (file)
--- a/classes/Notice_inbox.php
+++ b/classes/Notice_inbox.php
@@ -24,6 +24,9 @@ require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 // We keep 5 pages of inbox notices in memcache, +1 for pagination check
 
 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_SOURCE_SUB', 1);
 define('NOTICE_INBOX_SOURCE_GROUP', 2);
@@ -100,4 +103,41 @@ class Notice_inbox extends Memcached_DataObject
     {
         return Memcached_DataObject::pkeyGet('Notice_inbox', $kv);
     }
+
+    static function gc($user_id)
+    {
+        $entry = new Notice_inbox();
+        $entry->user_id = $user_id;
+        $entry->orderBy('created DESC');
+        $entry->limit(NOTICE_INBOX_LIMIT - 1, NOTICE_INBOX_GC_MAX);
+
+        $total = $entry->find();
+
+        if ($total > 0) {
+            $notices = array();
+            $cnt = 0;
+            while ($entry->fetch()) {
+                $notices[] = $entry->notice_id;
+                $cnt++;
+                if ($cnt >= NOTICE_INBOX_GC_BOXCAR) {
+                    self::deleteMatching($user_id, $notices);
+                    $notices = array();
+                    $cnt = 0;
+                }
+            }
+
+            if ($cnt > 0) {
+                self::deleteMatching($user_id, $notices);
+                $notices = array();
+            }
+        }
+    }
+
+    static function deleteMatching($user_id, $notices)
+    {
+        $entry = new Notice_inbox();
+        return $entry->query('DELETE FROM notice_inbox '.
+                             'WHERE user_id = ' . $user_id . ' ' .
+                             'AND notice_id in ('.implode(',', $notices).')');
+    }
 }

diff --git a/scripts/triminboxes.php b/scripts/triminboxes.php
index b2135d6825ee2f52eccbe481a8c56cbfa3958861..27e200fef3a671ce0dbcb78165faed46ee4d312c 100644 (file)
--- a/scripts/triminboxes.php
+++ b/scripts/triminboxes.php
@@ -52,43 +52,5 @@ if (!empty($id)) {
 $cnt = $user->find();
 
 while ($user->fetch()) {
-
-    $inbox_entry = new Notice_inbox();
-    $inbox_entry->user_id = $user->id;
-    $inbox_entry->orderBy('created DESC');
-    $inbox_entry->limit(1000, 1);
-
-    $id = null;
-
-    if ($inbox_entry->find(true)) {
-        $id = $inbox_entry->notice_id;
-    }
-
-    $inbox_entry->free();
-    unset($inbox_entry);
-
-    if (is_null($id)) {
-        continue;
-    }
-
-    $start = microtime(true);
-
-    $old_inbox = new Notice_inbox();
-    $cnt = $old_inbox->query('DELETE from notice_inbox WHERE user_id = ' . $user->id . ' AND notice_id < ' . $id);
-    $old_inbox->free();
-    unset($old_inbox);
-
-    print "Deleted $cnt notices for $user->nickname ($user->id).\n";
-
-    $finish = microtime(true);
-
-    $delay = 3.0 * ($finish - $start);
-
-    print "Delaying $delay seconds...";
-
-    // Wait to let slaves catch up
-
-    usleep($delay * 1000000);
-
-    print "DONE.\n";
+    Notice_inbox::gc($user->id);
 }