Merge branch '1.0.x' into testing

diff --git a/classes/Group_block.php b/classes/Group_block.php
index ffc57a496e0266c1a6d104f4edc4e930c42bfe40..68feaef4de79526b9a2b766e25a519ff209f4b15 100644 (file)
--- a/classes/Group_block.php
+++ b/classes/Group_block.php
@@ -35,7 +35,7 @@ class Group_block extends Memcached_DataObject
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* Static get */
-    function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Group_block',$k,$v); }
+    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Group_block',$k,$v); }
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE

diff --git a/classes/Login_token.php b/classes/Login_token.php
index 20d5d9dbcefcb3c62b9a9bfe8a7cf894f245a292..7a9388c947511b2bbb4b9d42cfad324d0198e377 100644 (file)
--- a/classes/Login_token.php
+++ b/classes/Login_token.php
@@ -35,7 +35,7 @@ class Login_token extends Memcached_DataObject
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* Static get */
-    function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Login_token',$k,$v); }
+    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Login_token',$k,$v); }
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE

diff --git a/classes/Notice.php b/classes/Notice.php
index a4f530c44facfe768ed9aec178a5a749d8249448..8098a8ace845c8cbf1d71011601ad19ab2ba59c0 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1250,27 +1250,39 @@ class Notice extends Memcached_DataObject
             return array();
         }
 
-        // XXX: cache me
+        $ids = array();
 
-        $groups = array();
+        $keypart = sprintf('notice:groups:%d', $this->id);
 
-        $gi = new Group_inbox();
+        $idstr = self::cacheGet($keypart);
 
-        $gi->selectAdd();
-        $gi->selectAdd('group_id');
+        if ($idstr !== false) {
+            $ids = explode(',', $idstr);
+        } else {
+            $gi = new Group_inbox();
 
-        $gi->notice_id = $this->id;
+            $gi->selectAdd();
+            $gi->selectAdd('group_id');
 
-        if ($gi->find()) {
-            while ($gi->fetch()) {
-                $group = User_group::staticGet('id', $gi->group_id);
-                if ($group) {
-                    $groups[] = $group;
+            $gi->notice_id = $this->id;
+
+            if ($gi->find()) {
+                while ($gi->fetch()) {
+                    $ids[] = $gi->group_id;
                 }
             }
+
+            self::cacheSet($keypart, implode(',', $ids));
         }
 
-        $gi->free();
+        $groups = array();
+
+        foreach ($ids as $id) {
+            $group = User_group::staticGet('id', $id);
+            if ($group) {
+                $groups[] = $group;
+            }
+        }
 
         return $groups;
     }

diff --git a/classes/User_group.php b/classes/User_group.php
index f72cc57533db1f8eb3f526b2016b6be0788bfcc9..e993961118e355afc08f9580437b98db26ea99f2 100644 (file)
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -31,7 +31,9 @@ class User_group extends Memcached_DataObject
     public $force_scope;                     // tinyint
 
     /* Static get */
-    function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('User_group',$k,$v); }
+    function staticGet($k,$v=NULL) {
+        return Memcached_DataObject::staticGet('User_group',$k,$v);
+    }
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE

diff --git a/plugins/SQLStats/SQLStatsPlugin.php b/plugins/SQLStats/SQLStatsPlugin.php
new file mode 100644 (file)
index 0000000..9e810a3
--- /dev/null
+++ b/plugins/SQLStats/SQLStatsPlugin.php
@@ -0,0 +1,83 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Check DB queries for filesorts and such and log em.
+ *
+ * @package SQLStatsPlugin
+ * @maintainer Evan Prodromou <brion@status.net>
+ */
+
+class SQLStatsPlugin extends Plugin
+{
+    protected $queryCount = 0;
+    protected $queryStart = 0;
+    protected $queryTimes = array();
+    protected $queries    = array();
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'SQLStats',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Evan Prodromou',
+                            'homepage' => 'http://status.net/wiki/Plugin:SQLStats',
+                            'rawdescription' =>
+                            _m('Debug tool to watch for poorly indexed DB queries.'));
+
+        return true;
+    }
+
+    function onStartDBQuery($obj, $query, &$result)
+    {
+        $this->queryStart = microtime(true);
+        return true;
+    }
+
+    function onEndDBQuery($obj, $query, &$result)
+    {
+        $endTime = microtime(true);
+        $this->queryTimes[] = round(($endTime - $this->queryStart) * 1000);
+        $this->queries[] = trim(preg_replace('/\s/', ' ', $query));
+        $this->queryStart = 0;
+
+        return true;
+    }
+
+    function cleanup()
+    {
+        $this->log(LOG_INFO, sprintf('%d queries this hit (total = %d, avg = %d, max = %d, min = %d)',
+                                     count($this->queryTimes),
+                                     array_sum($this->queryTimes),
+                                     array_sum($this->queryTimes)/count($this->queryTimes),
+                                     max($this->queryTimes),
+                                     min($this->queryTimes)));
+
+        $verbose = common_config('sqlstats', 'verbose');
+
+        if ($verbose) {
+            foreach ($this->queries as $query) {
+                $this->log(LOG_INFO, $query);
+            }
+        }
+    }
+}