diff options
author | Brion Vibber <brion@pobox.com> | 2010-12-17 13:20:38 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-12-17 13:20:38 -0800 |
commit | 4cd3a0756bdfba4589dbf1efeab9a2a509e9d566 (patch) | |
tree | bdb291289903bc57934c37734085702711f7f97b /classes/Profile.php | |
parent | 9e8bbff8ac3825dc789bcd19b1751fe24017a789 (diff) |
Update notice sorting for profile streams; extract more common code to Notice::addSinceId() and Notice::addMaxId()
Diffstat (limited to 'classes/Profile.php')
-rw-r--r-- | classes/Profile.php | 56 |
1 files changed, 10 insertions, 46 deletions
diff --git a/classes/Profile.php b/classes/Profile.php index 332d51e20..62789a489 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -252,58 +252,22 @@ class Profile extends Memcached_DataObject { $notice = new Notice(); - // 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); - - if ($since_id != 0) { - $query .= " and id > $since_id"; - } - - if ($max_id != 0) { - $query .= " and id <= $max_id"; - } - - $query .= ' order by id DESC'; - - if (!is_null($offset)) { - $query .= " LIMIT $limit OFFSET $offset"; - } - - $notice->query($query); - } else { - $index = ''; - - $notice->profile_id = $this->id; - - $notice->selectAdd(); - $notice->selectAdd('id'); - - if ($since_id != 0) { - $notice->whereAdd('id > ' . $since_id); - } + $notice->profile_id = $this->id; - if ($max_id != 0) { - $notice->whereAdd('id <= ' . $max_id); - } + $notice->selectAdd(); + $notice->selectAdd('id'); - $notice->orderBy('id DESC'); + Notice::addWhereSinceId($notice, $since_id); + Notice::addWhereMaxId($notice, $max_id); - if (!is_null($offset)) { - $notice->limit($offset, $limit); - } + $notice->orderBy('created DESC, id DESC'); - $notice->find(); + if (!is_null($offset)) { + $notice->limit($offset, $limit); } + $notice->find(); + $ids = array(); while ($notice->fetch()) { |