harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve performance of the zotfeed queries

Browse Source
This commit is contained in:
friendica
2015-03-23 19:56:10 -07:00
parent d32f63df82
commit c2acab21d4
4 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/items.php
View File

@@ -4366,12 +4366,11 @@ function zot_feed($uid,$observer_xchan,$arr) {
$sql_extra = item_permissions_sql($uid);
}
$limit = " LIMIT 100 ";
if($mindate != NULL_DATE) {
$sql_extra .= " and ( created > '$mindate' or edited > '$mindate' ) ";
$limit = "";
}
else
$limit = " limit 0, 50 ";
if($message_id) {
$sql_extra .= " and mid = '" . dbesc($message_id) . "' ";
@@ -4382,20 +4381,20 @@ function zot_feed($uid,$observer_xchan,$arr) {
if(is_sys_channel($uid)) {
require_once('include/security.php');
$r = q("SELECT distinct parent, created from item
$r = q("SELECT parent from item
WHERE uid != %d
and uid in (" . stream_perms_api_uids(PERMS_PUBLIC) . ") AND item_restrict = 0
AND (item_flags & %d)>0
and item_private = 0 $sql_extra ORDER BY created ASC $limit",
AND item_private = 0 AND item_restrict = 0 AND uid in (" . stream_perms_api_uids(PERMS_PUBLIC,10,1) . ")
AND (item_flags & %d) > 0
$sql_extra GROUP BY parent ORDER BY created ASC $limit",
intval($uid),
intval(ITEM_WALL)
);
}
else {
$r = q("SELECT distinct parent, created from item
$r = q("SELECT parent from item
WHERE uid = %d AND item_restrict = 0
AND (item_flags & %d)>0
$sql_extra ORDER BY created ASC $limit",
AND (item_flags & %d) > 0
$sql_extra GROUP BY parent ORDER BY created ASC $limit",
intval($uid),
intval(ITEM_WALL)
);