diff options
author | Mario Vavti <mario@mariovavti.com> | 2018-02-04 20:42:40 +0100 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2018-02-04 20:42:40 +0100 |
commit | 3cc756f3029e5f3b02008dac94a90e168d398c9a (patch) | |
tree | bc6b6cdc552ef119e0f7beb8b40e83ffe59798c7 /Zotlabs/Module/Ping.php | |
parent | 512f3a764361dde44e36fb72c105265d6df298ad (diff) | |
download | volse-hubzilla-3cc756f3029e5f3b02008dac94a90e168d398c9a.tar.gz volse-hubzilla-3cc756f3029e5f3b02008dac94a90e168d398c9a.tar.bz2 volse-hubzilla-3cc756f3029e5f3b02008dac94a90e168d398c9a.zip |
remove some never used indices which prevented our item queries to find the right query execution plan in mysql and adjust some queries to optimze the result
Diffstat (limited to 'Zotlabs/Module/Ping.php')
-rw-r--r-- | Zotlabs/Module/Ping.php | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index f8399d871..2e86804ac 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -149,13 +149,11 @@ class Ping extends \Zotlabs\Web\Controller { $pubs = q("SELECT count(id) as total from item WHERE uid = %d AND author_xchan != '%s' - AND obj_type != '%s' AND item_unseen = 1 AND created > '" . datetime_convert('UTC','UTC',$_SESSION['static_loadtime']) . "' $item_normal", intval($sys['channel_id']), - dbesc(get_observer_hash()), - dbesc(ACTIVITY_OBJ_FILE) + dbesc(get_observer_hash()) ); if($pubs) @@ -320,12 +318,13 @@ class Ping extends \Zotlabs\Web\Controller { if(argc() > 1 && (argv(1) === 'network' || argv(1) === 'home')) { $result = array(); - $use_index = db_use_index('uid_item_unseen'); - - $r = q("SELECT * FROM item $use_index - WHERE item_unseen = 1 and uid = %d $item_normal + $r = q("SELECT * FROM item + WHERE uid = %d AND author_xchan != '%s' - ORDER BY created DESC limit 300", + AND item_unseen = 1 + $item_normal + ORDER BY created DESC, id + LIMIT 300", intval(local_channel()), dbesc($ob_hash) ); @@ -495,9 +494,7 @@ class Ping extends \Zotlabs\Web\Controller { if($vnotify & (VNOTIFY_NETWORK|VNOTIFY_CHANNEL)) { - $use_index = db_use_index('uid_item_unseen'); - - $r = q("SELECT id, item_wall FROM item $use_index + $r = q("SELECT id, item_wall FROM item WHERE item_unseen = 1 and uid = %d $item_normal AND author_xchan != '%s'", |