wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Twitter-compatible API - since_id and before_id were polluting the cache and generating bad SQL

Browse Source 
(Also cleaned out some extra whitespace.)

darcs-hash:20081104053359-462f3-2f6619bb942aa34b38dd82cb427878f83d4c332c.gz
This commit is contained in:
zach 2008-11-04 00:33:59 -05:00
parent 5f05134110
commit 8deac7248e
2 changed files with 90 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
classes/Notice.php
View File

@ -226,21 +226,58 @@ class Notice extends Memcached_DataObject
}
}
static function getStream($qry, $cachekey, $offset=0, $limit=20) {
static function getStream($qry, $cachekey, $offset=0, $limit=20, $since_id=0, $before_id=0) {
if (common_config('memcached', 'enabled')) {
return Notice::getCachedStream($qry, $cachekey, $offset, $limit);
} else {
return Notice::getStreamDirect($qry, $offset, $limit);
# Skip the cache if this is a since_id or before_id qry
if ($since_id > 0 || $before_id > 0) {
return Notice::getStreamDirect($qry, $offset, $limit, $since_id, $before_id);
} else {
return Notice::getCachedStream($qry, $cachekey, $offset, $limit);
}
}
return Notice::getStreamDirect($qry, $offset, $limit, $since_id, $before_id);
}
static function getStreamDirect($qry, $offset, $limit) {
static function getStreamDirect($qry, $offset, $limit, $since_id, $before_id) {
$needAnd = FALSE;
$needWhere = TRUE;
if (preg_match('/\bWHERE\b/i', $qry)) {
$needWhere = FALSE;
$needAnd = TRUE;
}
if ($since_id > 0) {
if ($needWhere) {
$qry .= ' WHERE ';
$needWhere = FALSE;
} else {
$qry .= ' AND ';
}
$qry .= ' notice.id > ' . $since_id;
}
if ($before_id > 0) {
if ($needWhere) {
$qry .= ' WHERE ';
$needWhere = FALSE;
} else {
$qry .= ' AND ';
}
$qry .= ' notice.id < ' . $before_id;
}
$qry .= ' ORDER BY notice.created DESC, notice.id DESC ';
if(common_config('db','type')=='pgsql') {
if (common_config('db','type') == 'pgsql') {
$qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
} else {
$qry .= ' LIMIT ' . $offset . ', ' . $limit;
@ -323,30 +360,9 @@ class Notice extends Memcached_DataObject
$needAnd = TRUE;
}
// NOTE: since_id and before_id are extensions to Twitter API
if ($since_id > 0) {
if ($needWhere)
$qry .= ' WHERE ';
if ($needAnd)
$qry .= ' AND ';
$qry .= ' notice.id > ' . $since_id . ' ';
$needAnd = FALSE;
$needWhere = FALSE;
}
if ($before_id > 0) {
if ($needWhere)
$qry .= ' WHERE ';
if ($needAnd)
$qry .= ' AND ';
$qry .= ' notice.id < ' . $before_id . ' ';
$needAnd = FALSE;
$needWhere = FALSE;
}
return Notice::getStream($qry,
'public',
$offset, $limit);
$offset, $limit, $since_id, $before_id);
}
function addToInboxes() {

39
classes/User.php
View File

@ -297,20 +297,9 @@ class User extends Memcached_DataObject
'FROM notice JOIN reply ON notice.id = reply.notice_id ' .
'WHERE reply.profile_id = %d ';
if ($since_id > 0) {
$qry .= ' AND notice.id > ' . $since_id . ' ';
$needAnd = FALSE;
}
// NOTE: before_id is an extension to Twitter API
if ($before_id > 0) {
$qry .= ' AND notice.id < ' . $before_id . ' ';
$needAnd = FALSE;
}
return Notice::getStream(sprintf($qry, $this->id),
'user:replies:'.$this->id,
$offset, $limit);
$offset, $limit, $since_id, $before_id);
}
function getNotices($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0) {
@ -319,20 +308,9 @@ class User extends Memcached_DataObject
'FROM notice ' .
'WHERE profile_id = %d ';
if ($since_id > 0) {
$qry .= ' AND notice.id > ' . $since_id . ' ';
$needAnd = FALSE;
}
// NOTE: before_id is an extension to Twitter API
if ($before_id > 0) {
$qry .= ' AND notice.id < ' . $before_id . ' ';
$needAnd = FALSE;
}
return Notice::getStream(sprintf($qry, $this->id),
'user:notices:'.$this->id,
$offset, $limit);
$offset, $limit, $since_id, $before_id);
}
function favoriteNotices($offset=0, $limit=NOTICES_PER_PAGE) {
@ -352,20 +330,9 @@ class User extends Memcached_DataObject
'FROM notice JOIN notice_inbox ON notice.id = notice_inbox.notice_id ' .
'WHERE notice_inbox.user_id = %d ';
if ($since_id > 0) {
$qry .= ' AND notice.id > ' . $since_id . ' ';
$needAnd = FALSE;
}
// NOTE: before_id is an extension to Twitter API
if ($before_id > 0) {
$qry .= ' AND notice.id < ' . $before_id . ' ';
$needAnd = FALSE;
}
return Notice::getStream(sprintf($qry, $this->id),
'user:notices_with_friends:' . $this->id,
$offset, $limit);
$offset, $limit, $since_id, $before_id);
}
function blowFavesCache() {