Add hashed attribute column for indexed job existence check

Signed-off-by: Julius Härtl <jus@bitgrid.net>

diff --git a/core/Migrations/Version24000Date20211230140012.php b/core/Migrations/Version24000Date20211230140012.php
new file mode 100644 (file)
index 0000000..fc01333
--- /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/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index 2f55631cb9aea1fc410dd67e071421a5ac49fcb5..203079853d84ecfeda75ef38c9766ad73fd148e5 100644 (file)
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -971,6 +971,7 @@ return array(
     'OC\\Core\\Migrations\\Version21000Date20210309185127' => $baseDir . '/core/Migrations/Version21000Date20210309185127.php',
     'OC\\Core\\Migrations\\Version22000Date20210216080825' => $baseDir . '/core/Migrations/Version22000Date20210216080825.php',
     'OC\\Core\\Migrations\\Version23000Date20210906132259' => $baseDir . '/core/Migrations/Version23000Date20210906132259.php',
+    'OC\\Core\\Migrations\\Version24000Date20211230140012' => $baseDir . '/core/Migrations/Version24000Date20211230140012.php',
     'OC\\Core\\Notification\\CoreNotifier' => $baseDir . '/core/Notification/CoreNotifier.php',
     'OC\\Core\\Service\\LoginFlowV2Service' => $baseDir . '/core/Service/LoginFlowV2Service.php',
     'OC\\DB\\Adapter' => $baseDir . '/lib/private/DB/Adapter.php',

diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index 10b579c962443d33bca346b62bc3277012b1d485..7e74dff2f22bcff68d5512dc5b022eb2d62fd91e 100644 (file)
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -1000,6 +1000,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
         'OC\\Core\\Migrations\\Version21000Date20210309185127' => __DIR__ . '/../../..' . '/core/Migrations/Version21000Date20210309185127.php',
         'OC\\Core\\Migrations\\Version22000Date20210216080825' => __DIR__ . '/../../..' . '/core/Migrations/Version22000Date20210216080825.php',
         'OC\\Core\\Migrations\\Version23000Date20210906132259' => __DIR__ . '/../../..' . '/core/Migrations/Version23000Date20210906132259.php',
+        'OC\\Core\\Migrations\\Version24000Date20211230140012' => __DIR__ . '/../../..' . '/core/Migrations/Version24000Date20211230140012.php',
         'OC\\Core\\Notification\\CoreNotifier' => __DIR__ . '/../../..' . '/core/Notification/CoreNotifier.php',
         'OC\\Core\\Service\\LoginFlowV2Service' => __DIR__ . '/../../..' . '/core/Service/LoginFlowV2Service.php',
         'OC\\DB\\Adapter' => __DIR__ . '/../../..' . '/lib/private/DB/Adapter.php',

diff --git a/lib/private/BackgroundJob/JobList.php b/lib/private/BackgroundJob/JobList.php
index 693c7af5ea1a2fedbf7f8e633a5388e427517cd1..e8af8ece08ba8b38efaacb6314106d83873ab548 100644 (file)
--- a/lib/private/BackgroundJob/JobList.php
+++ b/lib/private/BackgroundJob/JobList.php
@@ -82,6 +82,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),
                                ]);
@@ -90,7 +91,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->executeStatement();
        }
@@ -145,7 +146,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 ff7c88015972d8a9f4f1331e37f80a0dcbbdc3d7..9b14e54a2105a8bfafa6e9f0ce989c1a404166b3 100644 (file)
--- 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 = [22, 2, 4, 1];
+$OC_Version = [22, 2, 4, 2];
 
 // The human readable string
 $OC_VersionString = '22.2.4 RC2';