Merge branch '1.0.x' into testing
This commit is contained in:
commit
68b1c05705
@ -35,7 +35,7 @@ class Group_block extends Memcached_DataObject
|
|||||||
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
|
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
|
||||||
|
|
||||||
/* Static get */
|
/* 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 */
|
/* the code above is auto generated do not remove the tag below */
|
||||||
###END_AUTOCODE
|
###END_AUTOCODE
|
||||||
|
@ -35,7 +35,7 @@ class Login_token extends Memcached_DataObject
|
|||||||
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
|
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
|
||||||
|
|
||||||
/* Static get */
|
/* 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 */
|
/* the code above is auto generated do not remove the tag below */
|
||||||
###END_AUTOCODE
|
###END_AUTOCODE
|
||||||
|
@ -1250,10 +1250,15 @@ class Notice extends Memcached_DataObject
|
|||||||
return array();
|
return array();
|
||||||
}
|
}
|
||||||
|
|
||||||
// XXX: cache me
|
$ids = array();
|
||||||
|
|
||||||
$groups = array();
|
$keypart = sprintf('notice:groups:%d', $this->id);
|
||||||
|
|
||||||
|
$idstr = self::cacheGet($keypart);
|
||||||
|
|
||||||
|
if ($idstr !== false) {
|
||||||
|
$ids = explode(',', $idstr);
|
||||||
|
} else {
|
||||||
$gi = new Group_inbox();
|
$gi = new Group_inbox();
|
||||||
|
|
||||||
$gi->selectAdd();
|
$gi->selectAdd();
|
||||||
@ -1263,14 +1268,21 @@ class Notice extends Memcached_DataObject
|
|||||||
|
|
||||||
if ($gi->find()) {
|
if ($gi->find()) {
|
||||||
while ($gi->fetch()) {
|
while ($gi->fetch()) {
|
||||||
$group = User_group::staticGet('id', $gi->group_id);
|
$ids[] = $gi->group_id;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
self::cacheSet($keypart, implode(',', $ids));
|
||||||
|
}
|
||||||
|
|
||||||
|
$groups = array();
|
||||||
|
|
||||||
|
foreach ($ids as $id) {
|
||||||
|
$group = User_group::staticGet('id', $id);
|
||||||
if ($group) {
|
if ($group) {
|
||||||
$groups[] = $group;
|
$groups[] = $group;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
$gi->free();
|
|
||||||
|
|
||||||
return $groups;
|
return $groups;
|
||||||
}
|
}
|
||||||
|
@ -31,7 +31,9 @@ class User_group extends Memcached_DataObject
|
|||||||
public $force_scope; // tinyint
|
public $force_scope; // tinyint
|
||||||
|
|
||||||
/* Static get */
|
/* 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 */
|
/* the code above is auto generated do not remove the tag below */
|
||||||
###END_AUTOCODE
|
###END_AUTOCODE
|
||||||
|
83
plugins/SQLStats/SQLStatsPlugin.php
Normal file
83
plugins/SQLStats/SQLStatsPlugin.php
Normal file
@ -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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user