From c57aade0f22205c40792184b78f5071b5c769a8b Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Fri, 26 Oct 2018 21:05:00 +0200 Subject: Introduce a routine for minor DB maintenance (#2080) --- app/Controllers/entryController.php | 3 +-- app/Controllers/feedController.php | 6 ++++++ app/Models/DatabaseDAO.php | 4 ++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php index 78ddbf085..fc0af0639 100755 --- a/app/Controllers/entryController.php +++ b/app/Controllers/entryController.php @@ -207,9 +207,8 @@ class FreshRSS_entry_Controller extends Minz_ActionController { $feedDAO->updateCachedValues(); - //Minor DB checks: $databaseDAO = FreshRSS_Factory::createDatabaseDAO(); - $databaseDAO->ensureCaseInsensitiveGuids(); //FreshRSS 1.12 + $databaseDAO->minorDbMaintenance(); invalidateHttpCache(); Minz_Request::good(_t('feedback.sub.purge_completed', $nb_total), array( diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php index 2c8cdaa5c..f2b1b8960 100755 --- a/app/Controllers/feedController.php +++ b/app/Controllers/feedController.php @@ -481,6 +481,9 @@ class FreshRSS_feed_Controller extends Minz_ActionController { if ($entryDAO->inTransaction()) { $entryDAO->commit(); } + + $databaseDAO = FreshRSS_Factory::createDatabaseDAO(); + $databaseDAO->minorDbMaintenance(); } return array($updated_feeds, reset($feeds), $nb_new_articles); } @@ -511,6 +514,9 @@ class FreshRSS_feed_Controller extends Minz_ActionController { $entryDAO->commitNewEntries(); $feedDAO->updateCachedValues(); $entryDAO->commit(); + + $databaseDAO = FreshRSS_Factory::createDatabaseDAO(); + $databaseDAO->minorDbMaintenance(); } else { list($updated_feeds, $feed, $nb_new_articles) = self::actualizeFeed($id, $url, $force, null, false, $noCommit); } diff --git a/app/Models/DatabaseDAO.php b/app/Models/DatabaseDAO.php index dbd328bf7..b331eccc3 100644 --- a/app/Models/DatabaseDAO.php +++ b/app/Models/DatabaseDAO.php @@ -160,4 +160,8 @@ class FreshRSS_DatabaseDAO extends Minz_ModelPdo { } return $ok; } + + public function minorDbMaintenance() { + $this->ensureCaseInsensitiveGuids(); + } } -- cgit v1.2.3