strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Split slow catch-all query into three fast queries

Browse source 
Thanks @annando for the tip.
This commit is contained in:
Hypolite Petovan 2017-03-06 16:19:12 -05:00
parent 116b9e1c1f
commit 89f0b85905
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
include/Contact.php
View file

@ -534,14 +534,32 @@ function get_contact($url, $uid = 0, $no_update = false) {
$data = array(); $data = array();
$contact_id = 0; $contact_id = 0;
// Catch-all query, may return multiple rows // We first try the addr (nick@server.tld)
$contacts = q("SELECT `id`, `avatar-date` FROM `contact` $contacts = q("SELECT `id`, `avatar-date` FROM `contact`
WHERE ('%s' IN (`url`, `addr`, `alias`) OR '%s' IN (`nurl`, `alias`)) WHERE `addr` = '%s'
AND `uid` = %d", AND `uid` = %d",
dbesc($url), dbesc($url),
dbesc(normalise_link($url)),
intval($uid)); intval($uid));
// Then the nurl (http://server.tld/nick)
if (! dbm::is_result($contacts)) {
$contacts = q("SELECT `id`, `avatar-date` FROM `contact`
WHERE `nurl` = '%s'
AND `uid` = %d",
dbesc(normalise_link($url)),
intval($uid));
}
// Then the alias (which could be anything)
if (! dbm::is_result($contacts)) {
$contacts = q("SELECT `id`, `avatar-date` FROM `contact`
WHERE `alias` IN ('%s', '%s')
AND `uid` = %d",
dbesc($url),
dbesc(normalise_link($url)),
intval($uid));
}
if (dbm::is_result($contacts)) { if (dbm::is_result($contacts)) {
$contact_id = $contacts[0]["id"]; $contact_id = $contacts[0]["id"];
@ -552,6 +570,7 @@ function get_contact($url, $uid = 0, $no_update = false) {
return $contact_id; return $contact_id;
} }
} elseif ($uid != 0) { } elseif ($uid != 0) {
// Non-existing user-specific contact, exiting
return 0; return 0;
} }