find users for background scan one by one

Signed-off-by: Robin Appelman <robin@icewind.nl>

diff --git a/apps/files/lib/BackgroundJob/ScanFiles.php b/apps/files/lib/BackgroundJob/ScanFiles.php
index f0c318882dde73c39c5e060bcc10eadd0883b122..37416aed521e9d70fce934d3388781bec174efa5 100644 (file)
--- a/apps/files/lib/BackgroundJob/ScanFiles.php
+++ b/apps/files/lib/BackgroundJob/ScanFiles.php
@@ -21,6 +21,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>
  *
  */
+
 namespace OCA\Files\BackgroundJob;
 
 use OC\Files\Utils\Scanner;
@@ -40,8 +41,6 @@ use OCP\IUserManager;
 class ScanFiles extends \OC\BackgroundJob\TimedJob {
        /** @var IConfig */
        private $config;
-       /** @var IUserManager */
-       private $userManager;
        /** @var IEventDispatcher */
        private $dispatcher;
        /** @var ILogger */
@@ -53,23 +52,20 @@ class ScanFiles extends \OC\BackgroundJob\TimedJob {
 
        /**
         * @param IConfig $config
-        * @param IUserManager $userManager
         * @param IEventDispatcher $dispatcher
         * @param ILogger $logger
         * @param IDBConnection $connection
         */
        public function __construct(
-               IConfig $config,
-               IUserManager $userManager,
+               IConfig          $config,
                IEventDispatcher $dispatcher,
-               ILogger $logger,
-               IDBConnection $connection
+               ILogger          $logger,
+               IDBConnection    $connection
        ) {
                // Run once per 10 minutes
                $this->setInterval(60 * 10);
 
                $this->config = $config;
-               $this->userManager = $userManager;
                $this->dispatcher = $dispatcher;
                $this->logger = $logger;
                $this->connection = $connection;
@@ -81,10 +77,10 @@ class ScanFiles extends \OC\BackgroundJob\TimedJob {
        protected function runScanner(string $user) {
                try {
                        $scanner = new Scanner(
-                                       $user,
-                                       null,
-                                       $this->dispatcher,
-                                       $this->logger
+                               $user,
+                               null,
+                               $this->dispatcher,
+                               $this->logger
                        );
                        $scanner->backgroundScan('');
                } catch (\Exception $e) {
@@ -94,20 +90,20 @@ class ScanFiles extends \OC\BackgroundJob\TimedJob {
        }
 
        /**
-        * Find all storages which have unindexed files and return a user for each
+        * Find a storage which have unindexed files and return a user with access to the storage
         *
-        * @return string[]
+        * @return string|false
         */
-       private function getUsersToScan(): array {
+       private function getUserToScan() {
                $query = $this->connection->getQueryBuilder();
-               $query->select($query->func()->max('user_id'))
+               $query->select('user_id')
                        ->from('filecache', 'f')
                        ->innerJoin('f', 'mounts', 'm', $query->expr()->eq('storage_id', 'storage'))
                        ->where($query->expr()->lt('size', $query->createNamedParameter(0, IQueryBuilder::PARAM_INT)))
-                       ->groupBy('storage_id')
-                       ->setMaxResults(self::USERS_PER_SESSION);
+                       ->andWhere($query->expr()->gt('parent', $query->createNamedParameter(-1, IQueryBuilder::PARAM_INT)))
+                       ->setMaxResults(1);
 
-               return $query->execute()->fetchAll(\PDO::FETCH_COLUMN);
+               return $query->execute()->fetchOne();
        }
 
        /**
@@ -119,10 +115,12 @@ class ScanFiles extends \OC\BackgroundJob\TimedJob {
                        return;
                }
 
-               $users = $this->getUsersToScan();
-
-               foreach ($users as $user) {
+               $usersScanned = 0;
+               $user = $this->getUserToScan();
+               while ($user && $usersScanned < self::USERS_PER_SESSION) {
                        $this->runScanner($user);
+                       $user = $this->getUserToScan();
+                       $usersScanned += 1;
                }
        }
 }