wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[CORE] Avoid materialisation in the TagNoticeStream query

Browse Source 
The notice.created sort forced the notice_tag by notice join plain to employ
materialisation, which can have a serious performance penalty depending on the
size of the database.
Sort by notice_tag.created instead, which should be exactly the same.
This commit is contained in:
Alexei Sorokin 2020-07-01 18:20:44 +03:00
parent 61765b0e33
commit c862589dcf
1 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
lib/notices/tagnoticestream.php
View File

@ -1,53 +1,52 @@
<?php <?php
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// GNU social is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with GNU social. If not, see <http://www.gnu.org/licenses/>.
/** /**
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2011, StatusNet, Inc.
*
* Stream of notices with a given tag * Stream of notices with a given tag
* *
* PHP version 5
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @category Stream * @category Stream
* @package StatusNet * @package GNUsocial
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @copyright 2011 StatusNet, Inc. * @copyright 2011 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
if (!defined('GNUSOCIAL')) { exit(1); } defined('GNUSOCIAL') || die();
/** /**
* Stream of notices with a given tag * Stream of notices with a given tag
* *
* @category Stream * @category Stream
* @package StatusNet * @package GNUsocial
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @copyright 2011 StatusNet, Inc. * @copyright 2011 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
class TagNoticeStream extends ScopingNoticeStream class TagNoticeStream extends ScopingNoticeStream
{ {
function __construct($tag, Profile $scoped=null) public function __construct($tag, Profile $scoped=null)
{ {
parent::__construct(new CachingNoticeStream(new RawTagNoticeStream($tag), parent::__construct(
'notice_tag:notice_ids:' . Cache::keyize($tag)), new CachingNoticeStream(
$scoped); new RawTagNoticeStream($tag),
'notice_tag:notice_ids:' . Cache::keyize($tag)
),
$scoped
);
} }
} }
@ -55,23 +54,22 @@ class TagNoticeStream extends ScopingNoticeStream
* Raw stream of notices with a given tag * Raw stream of notices with a given tag
* *
* @category Stream * @category Stream
* @package StatusNet * @package GNUsocial
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @copyright 2011 StatusNet, Inc. * @copyright 2011 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
class RawTagNoticeStream extends NoticeStream class RawTagNoticeStream extends NoticeStream
{ {
protected $tag; protected $tag;
function __construct($tag) public function __construct($tag)
{ {
$this->tag = $tag; $this->tag = $tag;
} }
function getNoticeIds($offset, $limit, $since_id, $max_id) public function getNoticeIds($offset, $limit, $since_id, $max_id)
{ {
$nt = new Notice_tag(); $nt = new Notice_tag();
@ -92,14 +90,16 @@ class RawTagNoticeStream extends NoticeStream
$nt->whereAddIn('notice.verb', $filter, 'string'); $nt->whereAddIn('notice.verb', $filter, 'string');
} }
$filter = array_keys(array_filter($this->selectVerbs, function ($v) { return !$v; })); $filter = array_keys(array_filter($this->selectVerbs, function ($v) {
return !$v;
}));
if (!empty($filter)) { if (!empty($filter)) {
// exclude verbs in selectVerbs with values that equate to false // exclude verbs in selectVerbs with values that equate to false
$nt->whereAddIn('!notice.verb', $filter, 'string'); $nt->whereAddIn('!notice.verb', $filter, 'string');
} }
} }
$nt->orderBy('notice.created DESC, notice_id DESC'); $nt->orderBy('notice_tag.created DESC, notice_id DESC');
if (!is_null($offset)) { if (!is_null($offset)) {
$nt->limit($offset, $limit); $nt->limit($offset, $limit);