Signed-off-by: Georg Ehrke <developer@georgehrke.com>pull/3044/head
Georg Ehrke
6 years ago
committed by
Roeland Jago Douma
parent
bcce568c6d
commit
2d6473e79b
@ -0,0 +1,134 @@ |
||||
<?php |
||||
declare(strict_types=1); |
||||
/** |
||||
* @copyright 2019 Georg Ehrke <oc.list@georgehrke.com> |
||||
* |
||||
* @author Georg Ehrke <oc.list@georgehrke.com> |
||||
* |
||||
* @license GNU AGPL version 3 or any later version |
||||
* |
||||
* This program is free software: you can redistribute it and/or modify |
||||
* it under the terms of the GNU Affero General Public License as |
||||
* published by the Free Software Foundation, either version 3 of the |
||||
* License, or (at your option) any later version. |
||||
* |
||||
* This program is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
* GNU Affero General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU Affero General Public License |
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. |
||||
* |
||||
*/ |
||||
namespace OCA\DAV\BackgroundJob; |
||||
|
||||
use OC\BackgroundJob\QueuedJob; |
||||
use OCA\DAV\CalDAV\Reminder\ReminderService; |
||||
use OCP\AppFramework\Utility\ITimeFactory; |
||||
use OCP\BackgroundJob\IJobList; |
||||
use OCP\IDBConnection; |
||||
use OCP\ILogger; |
||||
|
||||
/** |
||||
* Class BuildReminderIndexBackgroundJob |
||||
* |
||||
* @package OCA\DAV\BackgroundJob |
||||
*/ |
||||
class BuildReminderIndexBackgroundJob extends QueuedJob { |
||||
|
||||
/** @var IDBConnection */ |
||||
private $db; |
||||
|
||||
/** @var ReminderService */ |
||||
private $reminderService; |
||||
|
||||
/** @var ILogger */ |
||||
private $logger; |
||||
|
||||
/** @var IJobList */ |
||||
private $jobList; |
||||
|
||||
/** @var ITimeFactory */ |
||||
private $timeFactory; |
||||
|
||||
/** |
||||
* BuildReminderIndexBackgroundJob constructor. |
||||
* |
||||
* @param IDBConnection $db |
||||
* @param ReminderService $reminderService |
||||
* @param ILogger $logger |
||||
* @param IJobList $jobList |
||||
* @param ITimeFactory $timeFactory |
||||
*/ |
||||
public function __construct(IDBConnection $db, |
||||
ReminderService $reminderService, |
||||
ILogger $logger, |
||||
IJobList $jobList, |
||||
ITimeFactory $timeFactory) { |
||||
$this->db = $db; |
||||
$this->reminderService = $reminderService; |
||||
$this->logger = $logger; |
||||
$this->jobList = $jobList; |
||||
$this->timeFactory = $timeFactory; |
||||
} |
||||
|
||||
/** |
||||
* @param $arguments |
||||
*/ |
||||
public function run($arguments) { |
||||
$offset = (int) $arguments['offset']; |
||||
$stopAt = (int) $arguments['stopAt']; |
||||
|
||||
$this->logger->info('Building calendar reminder index (' . $offset .'/' . $stopAt . ')'); |
||||
|
||||
$offset = $this->buildIndex($offset, $stopAt); |
||||
|
||||
if ($offset >= $stopAt) { |
||||
$this->logger->info('Building calendar reminder index done'); |
||||
} else { |
||||
$this->jobList->add(self::class, [ |
||||
'offset' => $offset, |
||||
'stopAt' => $stopAt |
||||
]); |
||||
$this->logger->info('Scheduled a new BuildReminderIndexBackgroundJob with offset ' . $offset); |
||||
} |
||||
} |
||||
|
||||
/** |
||||
* @param int $offset |
||||
* @param int $stopAt |
||||
* @return int |
||||
*/ |
||||
private function buildIndex(int $offset, int $stopAt):int { |
||||
$startTime = $this->timeFactory->getTime(); |
||||
|
||||
$query = $this->db->getQueryBuilder(); |
||||
$query->select('*') |
||||
->from('calendarobjects') |
||||
->where($query->expr()->lte('id', $query->createNamedParameter($stopAt))) |
||||
->andWhere($query->expr()->gt('id', $query->createNamedParameter($offset))) |
||||
->orderBy('id', 'ASC'); |
||||
|
||||
$stmt = $query->execute(); |
||||
while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) { |
||||
$offset = $row['id']; |
||||
if (is_resource($row['calendardata'])) { |
||||
$row['calendardata'] = stream_get_contents($row['calendardata']); |
||||
} |
||||
$row['component'] = $row['componenttype']; |
||||
|
||||
try { |
||||
$this->reminderService->onTouchCalendarObject('\OCA\DAV\CalDAV\CalDavBackend::createCalendarObject', $row); |
||||
} catch(\Exception $ex) { |
||||
$this->logger->logException($ex); |
||||
} |
||||
|
||||
if (($this->timeFactory->getTime() - $startTime) > 15) { |
||||
return $offset; |
||||
} |
||||
} |
||||
|
||||
return $stopAt; |
||||
} |
||||
} |
||||
@ -0,0 +1,96 @@ |
||||
<?php |
||||
declare(strict_types=1); |
||||
/** |
||||
* @copyright 2019 Georg Ehrke <oc.list@georgehrke.com> |
||||
* |
||||
* @author Georg Ehrke <oc.list@georgehrke.com> |
||||
* |
||||
* @license GNU AGPL version 3 or any later version |
||||
* |
||||
* This program is free software: you can redistribute it and/or modify |
||||
* it under the terms of the GNU Affero General Public License as |
||||
* published by the Free Software Foundation, either version 3 of the |
||||
* License, or (at your option) any later version. |
||||
* |
||||
* This program is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
* GNU Affero General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU Affero General Public License |
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. |
||||
* |
||||
*/ |
||||
namespace OCA\DAV\Migration; |
||||
|
||||
use OCA\DAV\BackgroundJob\BuildReminderIndexBackgroundJob; |
||||
use OCP\BackgroundJob\IJobList; |
||||
use OCP\IConfig; |
||||
use OCP\IDBConnection; |
||||
use OCP\Migration\IOutput; |
||||
use OCP\Migration\IRepairStep; |
||||
|
||||
/** |
||||
* Class RegisterBuildReminderIndexBackgroundJob |
||||
* |
||||
* @package OCA\DAV\Migration |
||||
*/ |
||||
class RegisterBuildReminderIndexBackgroundJob implements IRepairStep { |
||||
|
||||
/** @var IDBConnection */ |
||||
private $db; |
||||
|
||||
/** @var IJobList */ |
||||
private $jobList; |
||||
|
||||
/** @var IConfig */ |
||||
private $config; |
||||
|
||||
/** @var string */ |
||||
private const CONFIG_KEY = 'buildCalendarReminderIndex'; |
||||
|
||||
/** |
||||
* @param IDBConnection $db |
||||
* @param IJobList $jobList |
||||
* @param IConfig $config |
||||
*/ |
||||
public function __construct(IDBConnection $db, |
||||
IJobList $jobList, |
||||
IConfig $config) { |
||||
$this->db = $db; |
||||
$this->jobList = $jobList; |
||||
$this->config = $config; |
||||
} |
||||
|
||||
/** |
||||
* @return string |
||||
*/ |
||||
public function getName() { |
||||
return 'Registering building of calendar reminder index as background job'; |
||||
} |
||||
|
||||
/** |
||||
* @param IOutput $output |
||||
*/ |
||||
public function run(IOutput $output) { |
||||
// only run once |
||||
if ($this->config->getAppValue('dav', self::CONFIG_KEY) === 'yes') { |
||||
$output->info('Repair step already executed'); |
||||
return; |
||||
} |
||||
|
||||
$query = $this->db->getQueryBuilder(); |
||||
$query->select($query->createFunction('MAX(' . $query->getColumnName('id') . ')')) |
||||
->from('calendarobjects'); |
||||
$maxId = (int)$query->execute()->fetchColumn(); |
||||
|
||||
$output->info('Add background job'); |
||||
$this->jobList->add(BuildReminderIndexBackgroundJob::class, [ |
||||
'offset' => 0, |
||||
'stopAt' => $maxId |
||||
]); |
||||
|
||||
// if all were done, no need to redo the repair during next upgrade |
||||
$this->config->setAppValue('dav', self::CONFIG_KEY, 'yes'); |
||||
} |
||||
} |
||||
Loading…
Reference in new issue