valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scrap counter cache system; rework counters to sum() booleans instead

This commit is contained in:
Andrew Dolgov 2020-01-24 14:25:31 +03:00
parent a6d314b753
commit 6080cca9ca
8 changed files with 170 additions and 502 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
classes/api.php
View File

@ -300,16 +300,6 @@ class API extends Handler {
$num_updated = $sth->rowCount(); $num_updated = $sth->rowCount();
if ($num_updated > 0 && $field == "unread") {
$sth = $this->pdo->prepare("SELECT DISTINCT feed_id FROM ttrss_user_entries
WHERE ref_id IN ($article_qmarks)");
$sth->execute($article_ids);
while ($line = $sth->fetch()) {
CCache::update($line["feed_id"], $_SESSION["uid"]);
}
}
$this->wrap(self::STATUS_OK, array("status" => "OK", $this->wrap(self::STATUS_OK, array("status" => "OK",
"updated" => $num_updated)); "updated" => $num_updated));

73
classes/article.php
View File

@ -27,69 +27,6 @@ class Article extends Handler_Protected {
} }
} }
/*
function view() {
$id = clean($_REQUEST["id"]);
$cids = explode(",", clean($_REQUEST["cids"]));
$mode = clean($_REQUEST["mode"]);
// in prefetch mode we only output requested cids, main article
// just gets marked as read (it already exists in client cache)
$articles = array();
if ($mode == "") {
array_push($articles, $this->format_article($id, false));
} else if ($mode == "zoom") {
array_push($articles, $this->format_article($id, true, true));
} else if ($mode == "raw") {
if (isset($_REQUEST['html'])) {
header("Content-Type: text/html");
print '<link rel="stylesheet" type="text/css" href="css/default.css"/>';
}
$article = $this->format_article($id, false, isset($_REQUEST["zoom"]));
print $article['content'];
return;
}
$this->catchupArticleById($id, 0);
if (!$_SESSION["bw_limit"]) {
foreach ($cids as $cid) {
if ($cid) {
array_push($articles, $this->format_article($cid, false, false));
}
}
}
print json_encode($articles);
} */
/*
private function catchupArticleById($id, $cmode) {
if ($cmode == 0) {
$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
unread = false,last_read = NOW()
WHERE ref_id = ? AND owner_uid = ?");
} else if ($cmode == 1) {
$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
unread = true
WHERE ref_id = ? AND owner_uid = ?");
} else {
$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
unread = NOT unread,last_read = NOW()
WHERE ref_id = ? AND owner_uid = ?");
}
$sth->execute([$id, $_SESSION['uid']]);
$feed_id = $this->getArticleFeed($id);
CCache::update($feed_id, $_SESSION["uid"]);
}
*/
static function create_published_article($title, $url, $content, $labels_str, static function create_published_article($title, $url, $content, $labels_str,
$owner_uid) { $owner_uid) {
@ -718,16 +655,6 @@ class Article extends Handler_Protected {
} }
$sth->execute(array_merge($ids, [$owner_uid])); $sth->execute(array_merge($ids, [$owner_uid]));
/* update ccache */
$sth = $pdo->prepare("SELECT DISTINCT feed_id FROM ttrss_user_entries
WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
$sth->execute(array_merge($ids, [$owner_uid]));
while ($line = $sth->fetch()) {
CCache::update($line["feed_id"], $owner_uid);
}
} }
static function getLastArticleId() { static function getLastArticleId() {

211
classes/ccache.php
View File

@ -1,211 +0,0 @@
<?php
class CCache {
static function zero_all($owner_uid) {
$pdo = Db::pdo();
$sth = $pdo->prepare("UPDATE ttrss_counters_cache SET
value = 0 WHERE owner_uid = ?");
$sth->execute([$owner_uid]);
$sth = $pdo->prepare("UPDATE ttrss_cat_counters_cache SET
value = 0 WHERE owner_uid = ?");
$sth->execute([$owner_uid]);
}
static function remove($feed_id, $owner_uid, $is_cat = false) {
$feed_id = (int) $feed_id;
if (!$is_cat) {
$table = "ttrss_counters_cache";
} else {
$table = "ttrss_cat_counters_cache";
}
$pdo = Db::pdo();
$sth = $pdo->prepare("DELETE FROM $table WHERE
feed_id = ? AND owner_uid = ?");
$sth->execute([$feed_id, $owner_uid]);
}
static function update_all($owner_uid) {
$pdo = Db::pdo();
if (get_pref('ENABLE_FEED_CATS', $owner_uid)) {
$sth = $pdo->prepare("SELECT feed_id FROM ttrss_cat_counters_cache
WHERE feed_id > 0 AND owner_uid = ?");
$sth->execute([$owner_uid]);
while ($line = $sth->fetch()) {
CCache::update($line["feed_id"], $owner_uid, true);
}
/* We have to manually include category 0 */
CCache::update(0, $owner_uid, true);
} else {
$sth = $pdo->prepare("SELECT feed_id FROM ttrss_counters_cache
WHERE feed_id > 0 AND owner_uid = ?");
$sth->execute([$owner_uid]);
while ($line = $sth->fetch()) {
print CCache::update($line["feed_id"], $owner_uid);
}
}
}
static function find($feed_id, $owner_uid, $is_cat = false,
$no_update = false) {
// "" (null) is valid and should be cast to 0 (uncategorized)
// everything else i.e. tags are not
if (!is_numeric($feed_id) && $feed_id)
return;
$feed_id = (int) $feed_id;
if (!$is_cat) {
$table = "ttrss_counters_cache";
} else {
$table = "ttrss_cat_counters_cache";
}
$pdo = Db::pdo();
$sth = $pdo->prepare("SELECT value FROM $table
WHERE owner_uid = ? AND feed_id = ?
LIMIT 1");
$sth->execute([$owner_uid, $feed_id]);
if ($row = $sth->fetch()) {
return $row["value"];
} else {
if ($no_update) {
return -1;
} else {
return CCache::update($feed_id, $owner_uid, $is_cat);
}
}
}
static function update($feed_id, $owner_uid, $is_cat = false,
$update_pcat = true, $pcat_fast = false) {
// "" (null) is valid and should be cast to 0 (uncategorized)
// everything else i.e. tags are not
if (!is_numeric($feed_id) && $feed_id)
return;
$feed_id = (int) $feed_id;
$prev_unread = CCache::find($feed_id, $owner_uid, $is_cat, true);
/* When updating a label, all we need to do is recalculate feed counters
* because labels are not cached */
if ($feed_id < 0) {
CCache::update_all($owner_uid);
return;
}
if (!$is_cat) {
$table = "ttrss_counters_cache";
} else {
$table = "ttrss_cat_counters_cache";
}
$pdo = Db::pdo();
if ($is_cat && $feed_id >= 0) {
/* Recalculate counters for child feeds */
if (!$pcat_fast) {
$sth = $pdo->prepare("SELECT id FROM ttrss_feeds
WHERE owner_uid = :uid AND
(cat_id = :cat OR (:cat = 0 AND cat_id IS NULL))");
$sth->execute([":uid" => $owner_uid, ":cat" => $feed_id]);
while ($line = $sth->fetch()) {
CCache::update((int)$line["id"], $owner_uid, false, false);
}
}
$sth = $pdo->prepare("SELECT SUM(value) AS sv
FROM ttrss_counters_cache, ttrss_feeds
WHERE ttrss_feeds.id = feed_id AND
(cat_id = :cat OR (:cat = 0 AND cat_id IS NULL)) AND
ttrss_counters_cache.owner_uid = :uid AND
ttrss_feeds.owner_uid = :uid");
$sth->execute([":uid" => $owner_uid, ":cat" => $feed_id]);
$row = $sth->fetch();
$unread = (int) $row["sv"];
} else {
$unread = (int) Feeds::getFeedArticles($feed_id, $is_cat, true, $owner_uid);
}
$tr_in_progress = false;
try {
$pdo->beginTransaction();
} catch (Exception $e) {
$tr_in_progress = true;
}
$sth = $pdo->prepare("SELECT feed_id FROM $table
WHERE owner_uid = ? AND feed_id = ? LIMIT 1");
$sth->execute([$owner_uid, $feed_id]);
if ($sth->fetch()) {
$sth = $pdo->prepare("UPDATE $table SET
value = ?, updated = NOW() WHERE
feed_id = ? AND owner_uid = ?");
$sth->execute([$unread, $feed_id, $owner_uid]);
} else {
$sth = $pdo->prepare("INSERT INTO $table
(feed_id, value, owner_uid, updated)
VALUES
(?, ?, ?, NOW())");
$sth->execute([$feed_id, $unread, $owner_uid]);
}
if (!$tr_in_progress) $pdo->commit();
if ($feed_id > 0 && $prev_unread != $unread) {
if (!$is_cat) {
/* Update parent category */
if ($update_pcat) {
$sth = $pdo->prepare("SELECT cat_id FROM ttrss_feeds
WHERE owner_uid = ? AND id = ?");
$sth->execute([$owner_uid, $feed_id]);
if ($row = $sth->fetch()) {
CCache::update((int)$row["cat_id"], $owner_uid, true, true, true);
}
}
}
} else if ($feed_id < 0) {
CCache::update_all($owner_uid);
}
return $unread;
}
}

303
classes/counters.php
View File

@ -13,174 +13,84 @@ class Counters {
} }
static function getCategoryCounters() { static function getCategoryCounters() {
$ret_arr = array(); $ret = [];
/* Labels category */ /* Labels category */
$cv = array("id" => -2, "kind" => "cat", $cv = array("id" => -2, "kind" => "cat",
"counter" => Feeds::getCategoryUnread(-2)); "counter" => Feeds::getCategoryUnread(-2));
array_push($ret_arr, $cv); array_push($ret, $cv);
$pdo = DB::pdo(); $pdo = DB::pdo();
$sth = $pdo->prepare("SELECT ttrss_feed_categories.id AS cat_id, value AS unread, $sth = $pdo->prepare("SELECT fc.id,
(SELECT COUNT(id) FROM ttrss_feed_categories AS c2 SUM(CASE WHEN unread THEN 1 ELSE 0 END) AS count,
WHERE c2.parent_cat = ttrss_feed_categories.id) AS num_children SUM(CASE WHEN marked THEN 1 ELSE 0 END) AS count_marked,
FROM ttrss_feed_categories, ttrss_cat_counters_cache (SELECT COUNT(id) FROM ttrss_feed_categories fcc
WHERE ttrss_cat_counters_cache.feed_id = ttrss_feed_categories.id AND WHERE fcc.parent_cat = fc.id) AS num_children
ttrss_cat_counters_cache.owner_uid = ttrss_feed_categories.owner_uid AND FROM ttrss_feed_categories fc, ttrss_feeds f, ttrss_user_entries ue
ttrss_feed_categories.owner_uid = ?"); WHERE f.cat_id = fc.id AND
$sth->execute([$_SESSION['uid']]); ue.feed_id = f.id AND
ue.owner_uid = :uid
GROUP BY fc.id
UNION
SELECT 0,
SUM(CASE WHEN unread THEN 1 ELSE 0 END) AS count,
SUM(CASE WHEN marked THEN 1 ELSE 0 END) AS count_marked,
0
FROM ttrss_feeds f, ttrss_user_entries ue
WHERE f.cat_id IS NULL AND
ue.feed_id = f.id AND
ue.owner_uid = :uid");
$sth->execute(["uid" => $_SESSION['uid']]);
while ($line = $sth->fetch()) { while ($line = $sth->fetch()) {
$line["cat_id"] = (int) $line["cat_id"];
if ($line["num_children"] > 0) { if ($line["num_children"] > 0) {
$child_counter = Feeds::getCategoryChildrenUnread($line["cat_id"], $_SESSION["uid"]); $child_counter = Feeds::getCategoryChildrenUnread($line["cat_id"], $_SESSION["uid"]);
} else { } else {
$child_counter = 0; $child_counter = 0;
} }
$cv = array("id" => $line["cat_id"], "kind" => "cat", $cv = [
"counter" => $line["unread"] + $child_counter); "id" => (int)$line["id"],
"kind" => "cat",
"markedcounter" => (int) $line["count_marked"],
"counter" => (int) $line["count"] + $child_counter
];
array_push($ret_arr, $cv); array_push($ret, $cv);
} }
/* Special case: NULL category doesn't actually exist in the DB */ array_push($ret, $cv);
$cv = array("id" => 0, "kind" => "cat", return $ret;
"counter" => (int) CCache::find(0, $_SESSION["uid"], true));
array_push($ret_arr, $cv);
return $ret_arr;
} }
static function getGlobalCounters($global_unread = -1) {
$ret_arr = array();
if ($global_unread == -1) {
$global_unread = Feeds::getGlobalUnread();
}
$cv = array("id" => "global-unread",
"counter" => (int) $global_unread);
array_push($ret_arr, $cv);
$pdo = Db::pdo();
$sth = $pdo->prepare("SELECT COUNT(id) AS fn FROM
ttrss_feeds WHERE owner_uid = ?");
$sth->execute([$_SESSION['uid']]);
$row = $sth->fetch();
$subscribed_feeds = $row["fn"];
$cv = array("id" => "subscribed-feeds",
"counter" => (int) $subscribed_feeds);
array_push($ret_arr, $cv);
return $ret_arr;
}
static function getVirtCounters() {
$ret_arr = array();
for ($i = 0; $i >= -4; $i--) {
$count = getFeedUnread($i);
if ($i == 0 || $i == -1 || $i == -2)
$auxctr = Feeds::getFeedArticles($i, false);
else
$auxctr = 0;
$cv = array("id" => $i,
"counter" => (int) $count,
"auxcounter" => (int) $auxctr);
// if (get_pref('EXTENDED_FEEDLIST'))
// $cv["xmsg"] = getFeedArticles($i)." ".__("total");
array_push($ret_arr, $cv);
}
$feeds = PluginHost::getInstance()->get_feeds(-1);
if (is_array($feeds)) {
foreach ($feeds as $feed) {
$cv = array("id" => PluginHost::pfeed_to_feed_id($feed['id']),
"counter" => $feed['sender']->get_unread($feed['id']));
if (method_exists($feed['sender'], 'get_total'))
$cv["auxcounter"] = $feed['sender']->get_total($feed['id']);
array_push($ret_arr, $cv);
}
}
return $ret_arr;
}
static function getLabelCounters($descriptions = false) {
$ret_arr = array();
$pdo = Db::pdo();
$sth = $pdo->prepare("SELECT id,caption,SUM(CASE WHEN u1.unread = true THEN 1 ELSE 0 END) AS unread, COUNT(u1.unread) AS total
FROM ttrss_labels2 LEFT JOIN ttrss_user_labels2 ON
(ttrss_labels2.id = label_id)
LEFT JOIN ttrss_user_entries AS u1 ON u1.ref_id = article_id
WHERE ttrss_labels2.owner_uid = :uid AND u1.owner_uid = :uid
GROUP BY ttrss_labels2.id,
ttrss_labels2.caption");
$sth->execute([":uid" => $_SESSION['uid']]);
while ($line = $sth->fetch()) {
$id = Labels::label_to_feed_id($line["id"]);
$cv = array("id" => $id,
"counter" => (int) $line["unread"],
"auxcounter" => (int) $line["total"]);
if ($descriptions)
$cv["description"] = $line["caption"];
array_push($ret_arr, $cv);
}
return $ret_arr;
}
static function getFeedCounters($active_feed = false) { static function getFeedCounters($active_feed = false) {
$ret_arr = array(); $ret = [];
$pdo = Db::pdo(); $pdo = Db::pdo();
$sth = $pdo->prepare("SELECT ttrss_feeds.id, $sth = $pdo->prepare("SELECT f.id,
ttrss_feeds.title, f.title,
".SUBSTRING_FOR_DATE."(ttrss_feeds.last_updated,1,19) AS last_updated, ".SUBSTRING_FOR_DATE."(f.last_updated,1,19) AS last_updated,
last_error, value AS count f.last_error,
FROM ttrss_feeds, ttrss_counters_cache SUM(CASE WHEN unread THEN 1 ELSE 0 END) AS count,
WHERE ttrss_feeds.owner_uid = ? SUM(CASE WHEN marked THEN 1 ELSE 0 END) AS count_marked
AND ttrss_counters_cache.owner_uid = ttrss_feeds.owner_uid FROM ttrss_feeds f, ttrss_user_entries ue
AND ttrss_counters_cache.feed_id = ttrss_feeds.id"); WHERE f.id = ue.feed_id AND ue.owner_uid = :uid
GROUP BY f.id");
$sth->execute([$_SESSION['uid']]); $sth->execute([$_SESSION['uid']]);
while ($line = $sth->fetch()) { while ($line = $sth->fetch()) {
$id = $line["id"]; $id = $line["id"];
$count = $line["count"];
$last_error = htmlspecialchars($line["last_error"]); $last_error = htmlspecialchars($line["last_error"]);
$last_updated = make_local_datetime($line['last_updated'], false); $last_updated = make_local_datetime($line['last_updated'], false);
if (Feeds::feedHasIcon($id)) { if (Feeds::feedHasIcon($id)) {
@ -192,25 +102,134 @@ class Counters {
if (date('Y') - date('Y', strtotime($line['last_updated'])) > 2) if (date('Y') - date('Y', strtotime($line['last_updated'])) > 2)
$last_updated = ''; $last_updated = '';
$cv = array("id" => $id, $cv = [
"id" => $id,
"updated" => $last_updated, "updated" => $last_updated,
"counter" => (int) $count, "counter" => (int) $line["count"],
"has_img" => (int) $has_img); "markedcounter" => (int) $line["count_marked"],
"has_img" => (int) $has_img
];
if ($last_error) if ($last_error)
$cv["error"] = $last_error; $cv["error"] = $last_error;
// if (get_pref('EXTENDED_FEEDLIST'))
// $cv["xmsg"] = getFeedArticles($id)." ".__("total");
if ($active_feed && $id == $active_feed) if ($active_feed && $id == $active_feed)
$cv["title"] = truncate_string($line["title"], 30); $cv["title"] = truncate_string($line["title"], 30);
array_push($ret_arr, $cv); array_push($ret, $cv);
} }
return $ret_arr; return $ret;
} }
} static function getGlobalCounters($global_unread = -1) {
$ret = [];
if ($global_unread == -1) {
$global_unread = Feeds::getGlobalUnread();
}
$cv = [
"id" => "global-unread",
"counter" => (int) $global_unread
];
array_push($ret, $cv);
$pdo = Db::pdo();
$sth = $pdo->prepare("SELECT COUNT(id) AS fn FROM
ttrss_feeds WHERE owner_uid = ?");
$sth->execute([$_SESSION['uid']]);
$row = $sth->fetch();
$subscribed_feeds = $row["fn"];
$cv = [
"id" => "subscribed-feeds",
"counter" => (int) $subscribed_feeds
];
array_push($ret, $cv);
return $ret;
}
static function getVirtCounters() {
$ret = [];
for ($i = 0; $i >= -4; $i--) {
$count = getFeedUnread($i);
if ($i == 0 || $i == -1 || $i == -2)
$auxctr = Feeds::getFeedArticles($i, false);
else
$auxctr = 0;
$cv = [
"id" => $i,
"counter" => (int) $count,
"auxcounter" => (int) $auxctr
];
array_push($ret, $cv);
}
$feeds = PluginHost::getInstance()->get_feeds(-1);
if (is_array($feeds)) {
foreach ($feeds as $feed) {
$cv = [
"id" => PluginHost::pfeed_to_feed_id($feed['id']),
"counter" => $feed['sender']->get_unread($feed['id'])
];
if (method_exists($feed['sender'], 'get_total'))
$cv["auxcounter"] = $feed['sender']->get_total($feed['id']);
array_push($ret, $cv);
}
}
return $ret;
}
static function getLabelCounters($descriptions = false) {
$ret = [];
$pdo = Db::pdo();
$sth = $pdo->prepare("SELECT id,
caption,
SUM(CASE WHEN u1.unread = true THEN 1 ELSE 0 END) AS unread,
COUNT(u1.unread) AS total
FROM ttrss_labels2 LEFT JOIN ttrss_user_labels2 ON
(ttrss_labels2.id = label_id)
LEFT JOIN ttrss_user_entries AS u1 ON u1.ref_id = article_id
WHERE ttrss_labels2.owner_uid = :uid AND u1.owner_uid = :uid
GROUP BY ttrss_labels2.id, ttrss_labels2.caption");
$sth->execute([":uid" => $_SESSION['uid']]);
while ($line = $sth->fetch()) {
$id = Labels::label_to_feed_id($line["id"]);
$cv = [
"id" => $id,
"counter" => (int) $line["unread"],
"auxcounter" => (int) $line["total"]
];
if ($descriptions)
$cv["description"] = $line["caption"];
array_push($ret, $cv);
}
return $ret;
}
}

24
classes/feeds.php
View File

@ -457,8 +457,6 @@ class Feeds extends Handler_Protected {
$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
last_read = NOW(), unread = false WHERE unread = true AND owner_uid = ?"); last_read = NOW(), unread = false WHERE unread = true AND owner_uid = ?");
$sth->execute([$_SESSION['uid']]); $sth->execute([$_SESSION['uid']]);
CCache::zero_all($_SESSION["uid"]);
} }
function view() { function view() {
@ -512,13 +510,6 @@ class Feeds extends Handler_Protected {
return; return;
} }
/* Updating a label ccache means recalculating all of the caches
* so for performance reasons we don't do that here */
if ($feed >= 0) {
CCache::update($feed, $_SESSION["uid"], $cat_view);
}
set_pref("_DEFAULT_VIEW_MODE", $view_mode); set_pref("_DEFAULT_VIEW_MODE", $view_mode);
set_pref("_DEFAULT_VIEW_ORDER_BY", $order_by); set_pref("_DEFAULT_VIEW_ORDER_BY", $order_by);
@ -1013,8 +1004,6 @@ class Feeds extends Handler_Protected {
} }
CCache::update($feed, $owner_uid, $cat_view);
} else { // tag } else { // tag
$sth = $pdo->prepare("UPDATE ttrss_user_entries $sth = $pdo->prepare("UPDATE ttrss_user_entries
SET unread = false, last_read = NOW() WHERE ref_id IN SET unread = false, last_read = NOW() WHERE ref_id IN
@ -1381,12 +1370,14 @@ class Feeds extends Handler_Protected {
$pdo = Db::pdo(); $pdo = Db::pdo();
$sth = $pdo->prepare("SELECT SUM(value) AS c_id FROM ttrss_counters_cache $sth = $pdo->prepare("SELECT SUM(CASE WHEN unread THEN 1 ELSE 0 END) AS count
WHERE owner_uid = ? AND feed_id > 0"); FROM ttrss_user_entries ue
WHERE ue.owner_uid = ?");
$sth->execute([$user_id]); $sth->execute([$user_id]);
$row = $sth->fetch(); $row = $sth->fetch();
return $row["c_id"]; return $row["count"];
} }
static function getCategoryTitle($cat_id) { static function getCategoryTitle($cat_id) {
@ -2116,9 +2107,6 @@ class Feeds extends Handler_Protected {
} }
if ($purge_interval == -1 || !$purge_interval) { if ($purge_interval == -1 || !$purge_interval) {
if ($owner_uid) {
CCache::update($feed_id, $owner_uid);
}
return; return;
} }
@ -2163,8 +2151,6 @@ class Feeds extends Handler_Protected {
$rows = $sth->rowCount(); $rows = $sth->rowCount();
CCache::update($feed_id, $owner_uid);
Debug::log("Purged feed $feed_id ($purge_interval): deleted $rows articles"); Debug::log("Purged feed $feed_id ($purge_interval): deleted $rows articles");
return $rows; return $rows;

14
classes/pref/feeds.php
View File

@ -1389,17 +1389,11 @@ class Pref_Feeds extends Handler_Protected {
$obj = array(); $obj = array();
$cat_id = (int) $cat_id; $cat_id = (int) $cat_id;
if ($cat_id > 0) {
$cat_unread = CCache::find($cat_id, $_SESSION["uid"], true);
} else if ($cat_id == 0 || $cat_id == -2) {
$cat_unread = Feeds::getCategoryUnread($cat_id);
}
$obj['id'] = 'CAT:' . $cat_id; $obj['id'] = 'CAT:' . $cat_id;
$obj['items'] = array(); $obj['items'] = array();
$obj['name'] = Feeds::getCategoryTitle($cat_id); $obj['name'] = Feeds::getCategoryTitle($cat_id);
$obj['type'] = 'category'; $obj['type'] = 'category';
$obj['unread'] = (int) $cat_unread; $obj['unread'] = (int) Feeds::getCategoryUnread($cat_id);
$obj['bare_id'] = $cat_id; $obj['bare_id'] = $cat_id;
return $obj; return $obj;
@ -1562,12 +1556,9 @@ class Pref_Feeds extends Handler_Protected {
} }
private function remove_feed_category($id, $owner_uid) { private function remove_feed_category($id, $owner_uid) {
$sth = $this->pdo->prepare("DELETE FROM ttrss_feed_categories $sth = $this->pdo->prepare("DELETE FROM ttrss_feed_categories
WHERE id = ? AND owner_uid = ?"); WHERE id = ? AND owner_uid = ?");
$sth->execute([$id, $owner_uid]); $sth->execute([$id, $owner_uid]);
CCache::remove($id, $owner_uid, true);
} }
static function remove_feed($id, $owner_uid) { static function remove_feed($id, $owner_uid) {
@ -1640,11 +1631,8 @@ class Pref_Feeds extends Handler_Protected {
unlink(ICONS_DIR . "/$id.ico"); unlink(ICONS_DIR . "/$id.ico");
} }
CCache::remove($id, $owner_uid);
} else { } else {
Labels::remove(Labels::feed_to_label_id($id), $owner_uid); Labels::remove(Labels::feed_to_label_id($id), $owner_uid);
//CCache::remove($id, $owner_uid); don't think labels are cached
} }
} }

20
classes/rssutils.php
View File

@ -1469,26 +1469,12 @@ class RSSUtils {
mb_strtolower(strip_tags($title), 'utf-8')); mb_strtolower(strip_tags($title), 'utf-8'));
} }
/* counter cache is no longer used, if called truncate leftover data */
static function cleanup_counters_cache() { static function cleanup_counters_cache() {
$pdo = Db::pdo(); $pdo = Db::pdo();
$res = $pdo->query("DELETE FROM ttrss_counters_cache $pdo->query("DELETE FROM ttrss_counters_cache");
WHERE feed_id > 0 AND $pdo->query("DELETE FROM ttrss_cat_counters_cache");
(SELECT COUNT(id) FROM ttrss_feeds WHERE
id = feed_id AND
ttrss_counters_cache.owner_uid = ttrss_feeds.owner_uid) = 0");
$frows = $res->rowCount();
$res = $pdo->query("DELETE FROM ttrss_cat_counters_cache
WHERE feed_id > 0 AND
(SELECT COUNT(id) FROM ttrss_feed_categories WHERE
id = feed_id AND
ttrss_cat_counters_cache.owner_uid = ttrss_feed_categories.owner_uid) = 0");
$crows = $res->rowCount();
Debug::log("Removed $frows (feeds) $crows (cats) orphaned counter cache entries.");
} }
static function housekeeping_user($owner_uid) { static function housekeeping_user($owner_uid) {

17
include/functions.php
View File

@ -731,24 +731,7 @@
if ($_SESSION["uid"]) { if ($_SESSION["uid"]) {
startup_gettext(); startup_gettext();
load_user_plugins($_SESSION["uid"]); load_user_plugins($_SESSION["uid"]);
/* cleanup ccache */
$sth = $pdo->prepare("DELETE FROM ttrss_counters_cache WHERE owner_uid = ?
AND
(SELECT COUNT(id) FROM ttrss_feeds WHERE
ttrss_feeds.id = feed_id) = 0");
$sth->execute([$_SESSION['uid']]);
$sth = $pdo->prepare("DELETE FROM ttrss_cat_counters_cache WHERE owner_uid = ?
AND
(SELECT COUNT(id) FROM ttrss_feed_categories WHERE
ttrss_feed_categories.id = feed_id) = 0");
$sth->execute([$_SESSION['uid']]);
} }
} }
} }