From fcf1c3033be74fa3797f5e4b43a8be6f5838d383 Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Wed, 21 Jun 2023 15:10:06 +0200 Subject: [PATCH 1/3] fix(systemtags): Add missing systemtags index Signed-off-by: Marcel Klehr --- core/Application.php | 7 +++ core/Command/Db/AddMissingIndices.php | 13 +++++ .../Version28000Date20230621185127.php | 52 +++++++++++++++++++ 3 files changed, 72 insertions(+) create mode 100644 core/Migrations/Version28000Date20230621185127.php diff --git a/core/Application.php b/core/Application.php index 2e354610154..592e0929666 100644 --- a/core/Application.php +++ b/core/Application.php @@ -243,6 +243,13 @@ class Application extends App { $subject->addHintForMissingSubject($table->getName(), 'mounts_user_root_path_index'); } } + + if ($schema->hasTable('systemtag_object_mapping')) { + $table = $schema->getTable('systemtag_object_mapping'); + if (!$table->hasIndex('systag_by_tagid')) { + $subject->addHintForMissingSubject($table->getName(), 'systag_by_tagid'); + } + } } ); diff --git a/core/Command/Db/AddMissingIndices.php b/core/Command/Db/AddMissingIndices.php index 4f8e0c45a35..62109867913 100644 --- a/core/Command/Db/AddMissingIndices.php +++ b/core/Command/Db/AddMissingIndices.php @@ -472,6 +472,19 @@ class AddMissingIndices extends Command { } } + $output->writeln('Check indices of the oc_systemtag_object_mapping table.'); + if ($schema->hasTable('oc_systemtag_object_mapping')) { + $table = $schema->getTable('oc_systemtag_object_mapping'); + if (!$table->hasIndex('systag_by_tagid')) { + $output->writeln('Adding systag_by_tagid index to the oc_systemtag_object_mapping table, this can take some time...'); + + $table->addIndex(['systemtagid', 'objecttype'], 'systag_by_tagid'); + $this->connection->migrateToSchema($schema->getWrappedSchema()); + $updated = true; + $output->writeln('oc_systemtag_object_mapping table updated successfully.'); + } + } + if (!$updated) { $output->writeln('Done.'); } diff --git a/core/Migrations/Version28000Date20230621185127.php b/core/Migrations/Version28000Date20230621185127.php new file mode 100644 index 00000000000..eb656bb89df --- /dev/null +++ b/core/Migrations/Version28000Date20230621185127.php @@ -0,0 +1,52 @@ + + * + * @author Marcel Klehr + * + * @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 . + * + */ +namespace OC\Core\Migrations; + +use Closure; +use OCP\DB\ISchemaWrapper; +use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; + +class Version28000Date20230621185127 extends SimpleMigrationStep { + /** + * @param IOutput $output + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` + * @param array $options + * @return null|ISchemaWrapper + */ + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { + /** @var ISchemaWrapper $schema */ + $schema = $schemaClosure(); + + $table = $schema->getTable('systemtag_object_mapping'); + if (!$table->hasIndex('systag_by_tagid')) { + $table->addIndex(['systemtagid', 'objecttype'], 'systag_by_tagid'); + return $schema; + } + + return null; + } +} From ee9ad9c9dedb8a48fc8dc6b812091338e69ff567 Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Thu, 22 Jun 2023 09:49:53 +0200 Subject: [PATCH 2/3] fix(systemtags): Move index creation from new migration to existing original migration Signed-off-by: Marcel Klehr --- .../Version13000Date20170718121200.php | 2 +- .../Version28000Date20230621185127.php | 52 ------------------- 2 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 core/Migrations/Version28000Date20230621185127.php diff --git a/core/Migrations/Version13000Date20170718121200.php b/core/Migrations/Version13000Date20170718121200.php index 34a249814fb..bcf14656fec 100644 --- a/core/Migrations/Version13000Date20170718121200.php +++ b/core/Migrations/Version13000Date20170718121200.php @@ -753,7 +753,7 @@ class Version13000Date20170718121200 extends SimpleMigrationStep { 'unsigned' => true, ]); $table->setPrimaryKey(['objecttype', 'objectid', 'systemtagid'], 'som_pk'); -// $table->addUniqueIndex(['objecttype', 'objectid', 'systemtagid'], 'mapping'); + $table->addIndex(['systemtagid', 'objecttype'], 'systag_by_tagid'); } if (!$schema->hasTable('systemtag_group')) { diff --git a/core/Migrations/Version28000Date20230621185127.php b/core/Migrations/Version28000Date20230621185127.php deleted file mode 100644 index eb656bb89df..00000000000 --- a/core/Migrations/Version28000Date20230621185127.php +++ /dev/null @@ -1,52 +0,0 @@ - - * - * @author Marcel Klehr - * - * @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 . - * - */ -namespace OC\Core\Migrations; - -use Closure; -use OCP\DB\ISchemaWrapper; -use OCP\Migration\IOutput; -use OCP\Migration\SimpleMigrationStep; - -class Version28000Date20230621185127 extends SimpleMigrationStep { - /** - * @param IOutput $output - * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` - * @param array $options - * @return null|ISchemaWrapper - */ - public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { - /** @var ISchemaWrapper $schema */ - $schema = $schemaClosure(); - - $table = $schema->getTable('systemtag_object_mapping'); - if (!$table->hasIndex('systag_by_tagid')) { - $table->addIndex(['systemtagid', 'objecttype'], 'systag_by_tagid'); - return $schema; - } - - return null; - } -} From e7747084828c2f7fbc4e4dc0f03191955fc71ee9 Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Thu, 22 Jun 2023 10:12:15 +0200 Subject: [PATCH 3/3] fix(systemtags): Keep non-existing index Signed-off-by: Marcel Klehr --- core/Migrations/Version13000Date20170718121200.php | 1 + 1 file changed, 1 insertion(+) diff --git a/core/Migrations/Version13000Date20170718121200.php b/core/Migrations/Version13000Date20170718121200.php index bcf14656fec..05cdbcfd6b5 100644 --- a/core/Migrations/Version13000Date20170718121200.php +++ b/core/Migrations/Version13000Date20170718121200.php @@ -753,6 +753,7 @@ class Version13000Date20170718121200 extends SimpleMigrationStep { 'unsigned' => true, ]); $table->setPrimaryKey(['objecttype', 'objectid', 'systemtagid'], 'som_pk'); +// $table->addUniqueIndex(['objecttype', 'objectid', 'systemtagid'], 'mapping'); $table->addIndex(['systemtagid', 'objecttype'], 'systag_by_tagid'); }