From fa496d3e5f6ab7bc145de4aca5b9dc0e01c42394 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 9 Mar 2018 22:53:19 +0000 Subject: [PATCH] Issue 4556: Adding index hints to improve the notifications speed (hopefully) --- src/Core/NotificationsManager.php | 64 ++++++++++++++++++------------- 1 file changed, 38 insertions(+), 26 deletions(-) diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php index 0e552d2e0..10646cbf9 100644 --- a/src/Core/NotificationsManager.php +++ b/src/Core/NotificationsManager.php @@ -135,7 +135,7 @@ class NotificationsManager extends BaseObject public function setSeen($note, $seen = true) { return q( - "UPDATE `notify` SET `seen` = %d WHERE ( `link` = '%s' OR ( `parent` != 0 AND `parent` = %d AND `otype` = '%s' )) AND `uid` = %d", + "UPDATE `notify` SET `seen` = %d WHERE (`link` = '%s' OR (`parent` != 0 AND `parent` = %d AND `otype` = '%s')) AND `uid` = %d", intval($seen), dbesc($note['link']), intval($note['parent']), @@ -384,16 +384,18 @@ class NotificationsManager extends BaseObject private function networkTotal($seen = 0) { $sql_seen = ""; + $index_hint = ""; if ($seen === 0) { - $sql_seen = " AND `item`.`unseen` = 1 "; + $sql_seen = " AND `item`.`unseen` "; + $index_hint = "USE INDEX (`uid_unseen_contactid`)"; } $r = q( "SELECT COUNT(*) AS `total` - FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent` - WHERE `item`.`visible` = 1 AND `pitem`.`parent` != 0 AND - `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 + FROM `item` $index_hint STRAIGHT_JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent` + WHERE `item`.`visible` AND `pitem`.`parent` != 0 AND + NOT `item`.`deleted` AND `item`.`uid` = %d AND NOT `item`.`wall` $sql_seen", intval(local_user()) ); @@ -423,18 +425,20 @@ class NotificationsManager extends BaseObject $total = $this->networkTotal($seen); $notifs = []; $sql_seen = ""; + $index_hint = ""; if ($seen === 0) { - $sql_seen = " AND `item`.`unseen` = 1 "; + $sql_seen = " AND `item`.`unseen` "; + $index_hint = "USE INDEX (`uid_unseen_contactid`)"; } $r = q( "SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`, `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`, `pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid` - FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent` - WHERE `item`.`visible` = 1 AND `pitem`.`parent` != 0 AND - `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 + FROM `item` $index_hint STRAIGHT_JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent` + WHERE `item`.`visible` AND `pitem`.`parent` != 0 AND + NOT `item`.`deleted` AND `item`.`uid` = %d AND NOT `item`.`wall` $sql_seen ORDER BY `item`.`created` DESC LIMIT %d, %d ", intval(local_user()), @@ -466,7 +470,7 @@ class NotificationsManager extends BaseObject $sql_seen = ""; if ($seen === 0) { - $sql_seen = " AND `seen` = 0 "; + $sql_seen = " AND NOT `seen` "; } $r = q( @@ -501,7 +505,7 @@ class NotificationsManager extends BaseObject $sql_seen = ""; if ($seen === 0) { - $sql_seen = " AND `seen` = 0 "; + $sql_seen = " AND NOT `seen` "; } $r = q( @@ -536,7 +540,7 @@ class NotificationsManager extends BaseObject $myurl = str_replace(['www.', '.'], ['', '\\.'], $myurl); $diasp_url = str_replace('/profile/', '/u/', $myurl); $sql_extra = sprintf( - " AND ( `item`.`author-link` regexp '%s' OR `item`.`tag` regexp '%s' OR `item`.`tag` regexp '%s' ) ", + " AND (`item`.`author-link` REGEXP '%s' OR `item`.`tag` REGEXP '%s' OR `item`.`tag` REGEXP '%s') ", dbesc($myurl . '$'), dbesc($myurl . '\\]'), dbesc($diasp_url . '\\]') @@ -555,19 +559,21 @@ class NotificationsManager extends BaseObject private function personalTotal($seen = 0) { $sql_seen = ""; + $index_hint = ""; $sql_extra = $this->personalSqlExtra(); if ($seen === 0) { - $sql_seen = " AND `item`.`unseen` = 1 "; + $sql_seen = " AND `item`.`unseen` "; + $index_hint = "USE INDEX (`uid_unseen_contactid`)"; } $r = q( "SELECT COUNT(*) AS `total` - FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent` - WHERE `item`.`visible` = 1 + FROM `item` $index_hint + WHERE `item`.`visible` $sql_extra $sql_seen - AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 ", + AND NOT `item`.`deleted` AND `item`.`uid` = %d AND NOT `item`.`wall`", intval(local_user()) ); if (DBM::is_result($r)) { @@ -597,20 +603,22 @@ class NotificationsManager extends BaseObject $sql_extra = $this->personalSqlExtra(); $notifs = []; $sql_seen = ""; + $index_hint = ""; if ($seen === 0) { - $sql_seen = " AND `item`.`unseen` = 1 "; + $sql_seen = " AND `item`.`unseen` "; + $index_hint = "USE INDEX (`uid_unseen_contactid`)"; } $r = q( "SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`, `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`, `pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid` - FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent` - WHERE `item`.`visible` = 1 + FROM `item` $index_hint STRAIGHT_JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent` + WHERE `item`.`visible` $sql_extra $sql_seen - AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 + AND NOT `item`.`deleted` AND `item`.`uid` = %d AND NOT `item`.`wall` ORDER BY `item`.`created` DESC LIMIT %d, %d ", intval(local_user()), intval($start), @@ -639,13 +647,15 @@ class NotificationsManager extends BaseObject private function homeTotal($seen = 0) { $sql_seen = ""; + $index_hint = ""; if ($seen === 0) { - $sql_seen = " AND `item`.`unseen` = 1 "; + $sql_seen = " AND `item`.`unseen` "; + $index_hint = "USE INDEX (`uid_unseen_contactid`)"; } $r = q( - "SELECT COUNT(*) AS `total` FROM `item` + "SELECT COUNT(*) AS `total` FROM `item` $index_hint WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 1 $sql_seen", @@ -677,18 +687,20 @@ class NotificationsManager extends BaseObject $total = $this->homeTotal($seen); $notifs = []; $sql_seen = ""; + $index_hint = ""; if ($seen === 0) { - $sql_seen = " AND `item`.`unseen` = 1 "; + $sql_seen = " AND `item`.`unseen` "; + $index_hint = "USE INDEX (`uid_unseen_contactid`)"; } $r = q( "SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`, `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`, `pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid` - FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent` - WHERE `item`.`visible` = 1 AND - `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 1 + FROM `item` $index_hint STRAIGHT_JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent` + WHERE `item`.`visible` AND + NOT `item`.`deleted` AND `item`.`uid` = %d AND `item`.`wall` $sql_seen ORDER BY `item`.`created` DESC LIMIT %d, %d ", intval(local_user()),