diff options
author | Julius Härtl <jus@bitgrid.net> | 2022-01-03 13:17:28 +0300 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2022-01-21 00:43:00 +0300 |
commit | f263ae09b7a149c2be884908560528ce76aee511 (patch) | |
tree | 83d57ca9ca4d0713a26f77392962ccc6783dc1bc | |
parent | f0f0509d31fa31a25c4654b804241af43f40a0ab (diff) |
Add hashed attribute column for indexed job existence check
Signed-off-by: Julius Härtl <jus@bitgrid.net>
-rw-r--r-- | core/Migrations/Version24000Date20211230140012.php | 67 | ||||
-rw-r--r-- | lib/private/BackgroundJob/JobList.php | 5 | ||||
-rw-r--r-- | version.php | 2 |
3 files changed, 71 insertions, 3 deletions
diff --git a/core/Migrations/Version24000Date20211230140012.php b/core/Migrations/Version24000Date20211230140012.php new file mode 100644 index 00000000000..fc013338862 --- /dev/null +++ b/core/Migrations/Version24000Date20211230140012.php @@ -0,0 +1,67 @@ +<?php + +declare(strict_types=1); +/** + * @copyright Copyright (c) 2022 Julius Härtl <jus@bitgrid.net> + * + * @author Julius Härtl <jus@bitgrid.net> + * + * @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 OC\Core\Migrations; + +use Closure; +use OCP\DB\ISchemaWrapper; +use OCP\DB\Types; +use OCP\IDBConnection; +use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; + +class Version24000Date20211230140012 extends SimpleMigrationStep { + /** @var IDBConnection */ + protected $connection; + + public function __construct(IDBConnection $connection) { + $this->connection = $connection; + } + + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { + /** @var ISchemaWrapper $schema */ + $schema = $schemaClosure(); + + $table = $schema->getTable('jobs'); + if (!$table->hasColumn('argument_hash')) { + $table->addColumn('argument_hash', Types::STRING, [ + 'notnull' => false, + 'length' => 32, + ]); + $table->addIndex(['class', 'argument_hash'], 'job_argument_hash'); + return $schema; + } + return null; + } + + public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) { + $update = $this->connection->getQueryBuilder(); + + $update->update('jobs') + ->set('argument_hash', $update->func()->md5('argument')); + + $update->executeStatement(); + } +} diff --git a/lib/private/BackgroundJob/JobList.php b/lib/private/BackgroundJob/JobList.php index 0e799595939..a088d4bc8d2 100644 --- a/lib/private/BackgroundJob/JobList.php +++ b/lib/private/BackgroundJob/JobList.php @@ -83,6 +83,7 @@ class JobList implements IJobList { ->values([ 'class' => $query->createNamedParameter($class), 'argument' => $query->createNamedParameter($argumentJson), + 'argument_hash' => $query->createNamedParameter(md5($argumentJson)), 'last_run' => $query->createNamedParameter(0, IQueryBuilder::PARAM_INT), 'last_checked' => $query->createNamedParameter($this->timeFactory->getTime(), IQueryBuilder::PARAM_INT), ]); @@ -91,7 +92,7 @@ class JobList implements IJobList { ->set('reserved_at', $query->expr()->literal(0, IQueryBuilder::PARAM_INT)) ->set('last_checked', $query->createNamedParameter($this->timeFactory->getTime(), IQueryBuilder::PARAM_INT)) ->where($query->expr()->eq('class', $query->createNamedParameter($class))) - ->andWhere($query->expr()->eq('argument', $query->createNamedParameter($argumentJson))); + ->andWhere($query->expr()->eq('argument_hash', $query->createNamedParameter(md5($argumentJson)))); } $query->execute(); } @@ -146,7 +147,7 @@ class JobList implements IJobList { $query->select('id') ->from('jobs') ->where($query->expr()->eq('class', $query->createNamedParameter($class))) - ->andWhere($query->expr()->eq('argument', $query->createNamedParameter($argument))) + ->andWhere($query->expr()->eq('argument_hash', $query->createNamedParameter(md5($argument)))) ->setMaxResults(1); $result = $query->execute(); diff --git a/version.php b/version.php index c2565ca1ac3..086e2d3f1db 100644 --- a/version.php +++ b/version.php @@ -30,7 +30,7 @@ // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // when updating major/minor version number. -$OC_Version = [21, 0, 8, 1]; +$OC_Version = [21, 0, 8, 2]; // The human readable string $OC_VersionString = '21.0.8 RC3'; |