clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Speeding up the gcontact search

Browse Source
This commit is contained in:
Michael Vogel
2016-04-17 13:46:49 +02:00
committed by Roland Haeder
parent 1e933744da
commit 5370b3f76d
5 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/DirSearch.php
View File

@@ -38,6 +38,8 @@ class DirSearch {
else
$extra_sql = "";
$search .= "%";
$results = q("SELECT `contact`.`id` AS `cid`, `gcontact`.`url`, `gcontact`.`name`, `gcontact`.`nick`, `gcontact`.`photo`,
`gcontact`.`network`, `gcontact`.`keywords`, `gcontact`.`addr`, `gcontact`.`community`
FROM `gcontact`
@@ -46,10 +48,10 @@ class DirSearch {
AND NOT `contact`.`pending` AND `contact`.`rel` IN ('%s', '%s')
WHERE (`contact`.`id` > 0 OR (NOT `gcontact`.`hide` AND `gcontact`.`network` IN ('%s', '%s', '%s') AND
((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`)))) AND
(`gcontact`.`addr` REGEXP '%s' OR `gcontact`.`name` REGEXP '%s' OR `gcontact`.`nick` REGEXP '%s') $extra_sql
(`gcontact`.`addr` LIKE '%s' OR `gcontact`.`name` LIKE '%s' OR `gcontact`.`nick` LIKE '%s') $extra_sql
GROUP BY `gcontact`.`nurl`
ORDER BY `gcontact`.`nurl` DESC
LIMIT 40",
LIMIT 1000",
intval(local_user()), dbesc(CONTACT_IS_SHARING), dbesc(CONTACT_IS_FRIEND),
dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora),
dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search)));

5
include/dbstructure.php
View File

@@ -508,6 +508,7 @@ function db_definition() {
"indexes" => array(
"PRIMARY" => array("id"),
"uid" => array("uid"),
"nurl" => array("nurl"),
)
);
$database["conv"] = array(
@@ -669,7 +670,9 @@ function db_definition() {
),
"indexes" => array(
"PRIMARY" => array("id"),
"nurl" => array("nurl"),
"name" => array("name"),
"nick" => array("nick"),
"addr" => array("addr"),
"updated" => array("updated"),
)
);