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

rssutils: start PDO switch

This commit is contained in:
Andrew Dolgov 2017-12-02 08:38:57 +03:00
parent 1d92297a96
commit afcb105f4e
1 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
classes/rssutils.php
View File

@ -18,31 +18,38 @@ class RSSUtils {
static function update_feedbrowser_cache() { static function update_feedbrowser_cache() {
$result = db_query("SELECT feed_url, site_url, title, COUNT(id) AS subscribers $pdo = Db::pdo();
$sth = $pdo->query("SELECT feed_url, site_url, title, COUNT(id) AS subscribers
FROM ttrss_feeds WHERE feed_url NOT IN (SELECT feed_url FROM ttrss_feeds FROM ttrss_feeds WHERE feed_url NOT IN (SELECT feed_url FROM ttrss_feeds
WHERE private IS true OR auth_login != '' OR auth_pass != '' OR feed_url LIKE '%:%@%/%') WHERE private IS true OR auth_login != '' OR auth_pass != '' OR feed_url LIKE '%:%@%/%')
GROUP BY feed_url, site_url, title ORDER BY subscribers DESC LIMIT 1000"); GROUP BY feed_url, site_url, title ORDER BY subscribers DESC LIMIT 1000");
db_query("BEGIN"); $pdo->beginTransaction();
db_query("DELETE FROM ttrss_feedbrowser_cache"); $pdo->query("DELETE FROM ttrss_feedbrowser_cache");
$count = 0; $count = 0;
while ($line = db_fetch_assoc($result)) { while ($line = $sth->fetch()) {
$subscribers = db_escape_string($line["subscribers"]); $subscribers = db_escape_string($line["subscribers"]);
$feed_url = db_escape_string($line["feed_url"]); $feed_url = db_escape_string($line["feed_url"]);
$title = db_escape_string($line["title"]); $title = db_escape_string($line["title"]);
$site_url = db_escape_string($line["site_url"]); $site_url = db_escape_string($line["site_url"]);
$tmp_result = db_query("SELECT subscribers FROM $tmph = $pdo->prepare("SELECT subscribers FROM
ttrss_feedbrowser_cache WHERE feed_url = '$feed_url'"); ttrss_feedbrowser_cache WHERE feed_url = ?");
$tmph->execute([$feed_url]);
if (db_num_rows($tmp_result) == 0) { if (!$tmph->fetch()) {
db_query("INSERT INTO ttrss_feedbrowser_cache $tmph = $pdo->prepare("INSERT INTO ttrss_feedbrowser_cache
(feed_url, site_url, title, subscribers) VALUES ('$feed_url', (feed_url, site_url, title, subscribers)
'$site_url', '$title', '$subscribers')"); VALUES
(?, ?, ?, ?)");
$tmph->execute([$feed_url, $site_url, $title, $subscribers]);
++$count; ++$count;
@ -50,7 +57,7 @@ class RSSUtils {
} }
db_query("COMMIT"); $pdo->commit();
return $count; return $count;
@ -63,6 +70,8 @@ class RSSUtils {
die("Schema version is wrong, please upgrade the database.\n"); die("Schema version is wrong, please upgrade the database.\n");
} }
$pdo = Db::pdo();
if (!SINGLE_USER_MODE && DAEMON_UPDATE_LOGIN_LIMIT > 0) { if (!SINGLE_USER_MODE && DAEMON_UPDATE_LOGIN_LIMIT > 0) {
if (DB_TYPE == "pgsql") { if (DB_TYPE == "pgsql") {
$login_thresh_qpart = "AND ttrss_users.last_login >= NOW() - INTERVAL '".DAEMON_UPDATE_LOGIN_LIMIT." days'"; $login_thresh_qpart = "AND ttrss_users.last_login >= NOW() - INTERVAL '".DAEMON_UPDATE_LOGIN_LIMIT." days'";
@ -124,22 +133,23 @@ class RSSUtils {
$updstart_thresh_qpart $updstart_thresh_qpart
$query_order $query_limit"; $query_order $query_limit";
$result = db_query($query); $res = $pdo->query($query);
if ($debug) _debug(sprintf("Scheduled %d feeds to update...", db_num_rows($result)));
$feeds_to_update = array(); $feeds_to_update = array();
while ($line = db_fetch_assoc($result)) { while ($line = $res->fetch()) {
array_push($feeds_to_update, $line['feed_url']); array_push($feeds_to_update, $line['feed_url']);
} }
if ($debug) _debug(sprintf("Scheduled %d feeds to update...", count($feeds_to_update)));
// Update last_update_started before actually starting the batch // Update last_update_started before actually starting the batch
// in order to minimize collision risk for parallel daemon tasks // in order to minimize collision risk for parallel daemon tasks
if (count($feeds_to_update) > 0) { if (count($feeds_to_update) > 0) {
$feeds_quoted = array_map(function ($s) { return "'" . db_escape_string($s) . "'"; }, $feeds_to_update); $feeds_qmarks = arr_qmarks($feeds_to_update);
db_query(sprintf("UPDATE ttrss_feeds SET last_update_started = NOW() $tmph = $pdo->prepare("UPDATE ttrss_feeds SET last_update_started = NOW()
WHERE feed_url IN (%s)", implode(',', $feeds_quoted))); WHERE feed_url IN ($feeds_qmarks)");
$tmph->execute($feeds_to_update);
} }
$nf = 0; $nf = 0;
@ -147,38 +157,37 @@ class RSSUtils {
$batch_owners = array(); $batch_owners = array();
foreach ($feeds_to_update as $feed) { // since we have the data cached, we can deal with other feeds with the same url
if($debug) _debug("Base feed: $feed"); $usth = $pdo->prepare("SELECT DISTINCT ttrss_feeds.id,last_updated,ttrss_feeds.owner_uid
//update_rss_feed($line["id"], true);
// since we have the data cached, we can deal with other feeds with the same url
$tmp_result = db_query("SELECT DISTINCT ttrss_feeds.id,last_updated,ttrss_feeds.owner_uid
FROM ttrss_feeds, ttrss_users, ttrss_user_prefs WHERE FROM ttrss_feeds, ttrss_users, ttrss_user_prefs WHERE
ttrss_user_prefs.owner_uid = ttrss_feeds.owner_uid AND ttrss_user_prefs.owner_uid = ttrss_feeds.owner_uid AND
ttrss_users.id = ttrss_user_prefs.owner_uid AND ttrss_users.id = ttrss_user_prefs.owner_uid AND
ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL' AND ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL' AND
ttrss_user_prefs.profile IS NULL AND ttrss_user_prefs.profile IS NULL AND
feed_url = '".db_escape_string($feed)."' feed_url = ?
$update_limit_qpart $update_limit_qpart
$login_thresh_qpart $login_thresh_qpart
ORDER BY ttrss_feeds.id $query_limit"); ORDER BY ttrss_feeds.id $query_limit");
if (db_num_rows($tmp_result) > 0) { foreach ($feeds_to_update as $feed) {
while ($tline = db_fetch_assoc($tmp_result)) { if($debug) _debug("Base feed: $feed");
if ($debug) _debug(" => " . $tline["last_updated"] . ", " . $tline["id"] . " " . $tline["owner_uid"]);
if (array_search($tline["owner_uid"], $batch_owners) === FALSE) $usth->execute([$feed]);
array_push($batch_owners, $tline["owner_uid"]); //update_rss_feed($line["id"], true);
$fstarted = microtime(true); if ($tline = $usth->fetch()) {
RSSUtils::update_rss_feed($tline["id"], true, false); if ($debug) _debug(" => " . $tline["last_updated"] . ", " . $tline["id"] . " " . $tline["owner_uid"]);
_debug_suppress(false);
_debug(sprintf(" %.4f (sec)", microtime(true) - $fstarted)); if (array_search($tline["owner_uid"], $batch_owners) === FALSE)
array_push($batch_owners, $tline["owner_uid"]);
++$nf; $fstarted = microtime(true);
} RSSUtils::update_rss_feed($tline["id"], true, false);
_debug_suppress(false);
_debug(sprintf(" %.4f (sec)", microtime(true) - $fstarted));
++$nf;
} }
} }
@ -197,7 +206,6 @@ class RSSUtils {
Digest::send_headlines_digests($debug); Digest::send_headlines_digests($debug);
return $nf; return $nf;
} }
// this is used when subscribing // this is used when subscribing