eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x

Browse Source
This commit is contained in:
Brion Vibber 2010-04-01 11:09:45 -07:00
commit d844e6bde5
1 changed files with 47 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
classes/Profile.php
View File

@ -225,31 +225,62 @@ class Profile extends Memcached_DataObject
{ {
$notice = new Notice(); $notice = new Notice();
$notice->profile_id = $this->id; // Temporary hack until notice_profile_id_idx is updated
// to (profile_id, id) instead of (profile_id, created, id).
// It's been falling back to PRIMARY instead, which is really
// very inefficient for a profile that hasn't posted in a few
// months. Even though forcing the index will cause a filesort,
// it's usually going to be better.
if (common_config('db', 'type') == 'mysql') {
$index = '';
$query =
"select id from notice force index (notice_profile_id_idx) ".
"where profile_id=" . $notice->escape($this->id);
$notice->selectAdd(); if ($since_id != 0) {
$notice->selectAdd('id'); $query .= " and id > $since_id";
}
if ($since_id != 0) { if ($max_id != 0) {
$notice->whereAdd('id > ' . $since_id); $query .= " and id < $max_id";
} }
if ($max_id != 0) { $query .= ' order by id DESC';
$notice->whereAdd('id <= ' . $max_id);
}
$notice->orderBy('id DESC'); if (!is_null($offset)) {
$query .= " LIMIT $limit OFFSET $offset";
}
if (!is_null($offset)) { $notice->query($query);
$notice->limit($offset, $limit); } else {
$index = '';
$notice->profile_id = $this->id;
$notice->selectAdd();
$notice->selectAdd('id');
if ($since_id != 0) {
$notice->whereAdd('id > ' . $since_id);
}
if ($max_id != 0) {
$notice->whereAdd('id <= ' . $max_id);
}
$notice->orderBy('id DESC');
if (!is_null($offset)) {
$notice->limit($offset, $limit);
}
$notice->find();
} }
$ids = array(); $ids = array();
if ($notice->find()) { while ($notice->fetch()) {
while ($notice->fetch()) { $ids[] = $notice->id;
$ids[] = $notice->id;
}
} }
return $ids; return $ids;