bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #9278 from annando/issue-9276

Browse source 
Issue 9276: Cache the trending hashtags in the background
This commit is contained in:
Hypolite Petovan 2020-09-26 08:24:54 -04:00 committed by GitHub
parent 6788c68977 3b90dc0289
commit f30d1a6d70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 60 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
src/Model/Tag.php
View file

@ -488,54 +488,86 @@ class Tag
* Returns a list of the most frequent global hashtags over the given period * Returns a list of the most frequent global hashtags over the given period
* *
* @param int $period Period in hours to consider posts * @param int $period Period in hours to consider posts
* @param int $limit Number of returned tags
* @return array * @return array
* @throws \Exception * @throws \Exception
*/ */
public static function getGlobalTrendingHashtags(int $period, $limit = 10) public static function getGlobalTrendingHashtags(int $period, $limit = 10)
{ {
$tags = DI::cache()->get('global_trending_tags'); $tags = DI::cache()->get('global_trending_tags-' . $period . '-' . $limit);
if (!empty($tags)) {
return $tags;
} else {
return self::setGlobalTrendingHashtags($period, $limit);
}
}
if (empty($tags)) { /**
$tagsStmt = DBA::p("SELECT `name` AS `term`, COUNT(*) AS `score` * Creates a list of the most frequent global hashtags over the given period
FROM `tag-search-view` *
WHERE `private` = ? AND `received` > DATE_SUB(NOW(), INTERVAL ? HOUR) * @param int $period Period in hours to consider posts
GROUP BY `term` ORDER BY `score` DESC LIMIT ?", * @param int $limit Number of returned tags
Item::PUBLIC, $period, $limit); * @return array
* @throws \Exception
*/
public static function setGlobalTrendingHashtags(int $period, $limit = 10)
{
$tagsStmt = DBA::p("SELECT `name` AS `term`, COUNT(*) AS `score`
FROM `tag-search-view`
WHERE `private` = ? AND `received` > DATE_SUB(NOW(), INTERVAL ? HOUR)
GROUP BY `term` ORDER BY `score` DESC LIMIT ?",
Item::PUBLIC, $period, $limit);
if (DBA::isResult($tagsStmt)) { if (DBA::isResult($tagsStmt)) {
$tags = DBA::toArray($tagsStmt); $tags = DBA::toArray($tagsStmt);
DI::cache()->set('global_trending_tags', $tags, Duration::HOUR); DI::cache()->set('global_trending_tags-' . $period . '-' . $limit, $tags, Duration::HOUR);
} return $tags;
} }
return $tags ?: []; return [];
} }
/** /**
* Returns a list of the most frequent local hashtags over the given period * Returns a list of the most frequent local hashtags over the given period
* *
* @param int $period Period in hours to consider posts * @param int $period Period in hours to consider posts
* @param int $limit Number of returned tags
* @return array * @return array
* @throws \Exception * @throws \Exception
*/ */
public static function getLocalTrendingHashtags(int $period, $limit = 10) public static function getLocalTrendingHashtags(int $period, $limit = 10)
{ {
$tags = DI::cache()->get('local_trending_tags'); $tags = DI::cache()->get('local_trending_tags');
if (!empty($tags)) {
return $tags;
} else {
return self::setLocalTrendingHashtags($period, $limit);
}
}
if (empty($tags)) { /**
$tagsStmt = DBA::p("SELECT `name` AS `term`, COUNT(*) AS `score` * Returns a list of the most frequent local hashtags over the given period
FROM `tag-search-view` *
WHERE `private` = ? AND `wall` AND `origin` AND `received` > DATE_SUB(NOW(), INTERVAL ? HOUR) * @param int $period Period in hours to consider posts
GROUP BY `term` ORDER BY `score` DESC LIMIT ?", * @param int $limit Number of returned tags
Item::PUBLIC, $period, $limit); * @return array
* @throws \Exception
*/
public static function setLocalTrendingHashtags(int $period, $limit = 10)
{
$tagsStmt = DBA::p("SELECT `name` AS `term`, COUNT(*) AS `score`
FROM `tag-search-view`
WHERE `private` = ? AND `wall` AND `origin` AND `received` > DATE_SUB(NOW(), INTERVAL ? HOUR)
GROUP BY `term` ORDER BY `score` DESC LIMIT ?",
Item::PUBLIC, $period, $limit);
if (DBA::isResult($tagsStmt)) { if (DBA::isResult($tagsStmt)) {
$tags = DBA::toArray($tagsStmt); $tags = DBA::toArray($tagsStmt);
DI::cache()->set('local_trending_tags', $tags, Duration::HOUR); DI::cache()->set('local_trending_tags', $tags, Duration::HOUR);
} return $tags;
} }
return $tags ?: []; return [];
} }
/** /**

5
src/Worker/Cron.php
View file

@ -25,6 +25,7 @@ use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Tag;
class Cron class Cron
{ {
@ -74,6 +75,10 @@ class Cron
// Repair entries in the database // Repair entries in the database
Worker::add(PRIORITY_LOW, 'RepairDatabase'); Worker::add(PRIORITY_LOW, 'RepairDatabase');
// Update trending tags cache for the community page
Tag::setLocalTrendingHashtags(24, 20);
Tag::setGlobalTrendingHashtags(24, 20);
// Hourly cron calls // Hourly cron calls
if (DI::config()->get('system', 'last_cron_hourly', 0) + 3600 < time()) { if (DI::config()->get('system', 'last_cron_hourly', 0) + 3600 < time()) {