From d4fc462980b1223b14bcf91c3412ec897b0facde Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 11 Mar 2021 16:37:23 +0100 Subject: [PATCH 1/3] add a prefix index to filecache.path The reason that `filecache.path` hasn't had an index added is the mysql limitation of ~1kb for indexeded fields, which is to small for the `path`, however mysql supports indexing only the first N bytes of a column instead of the entire column, allowing us to add an index even if the column is to long. Because the index doesn't cover the entire column it can't be used in all situations where a normal index would be used, but it does cover the `path like 'folder/path/%'` queries that are used in various places. Sqlite and Postgresql don't support prefix indexes, but they also don't have the 1kb limit and DBAL handles the differences in index creation. Signed-off-by: Robin Appelman --- core/Application.php | 4 ++++ core/Command/Db/AddMissingIndices.php | 7 +++++++ core/Migrations/Version13000Date20170718121200.php | 1 + 3 files changed, 12 insertions(+) diff --git a/core/Application.php b/core/Application.php index a6c64e81b84d6..03ff1be681e83 100644 --- a/core/Application.php +++ b/core/Application.php @@ -115,6 +115,10 @@ function (GenericEvent $event) use ($container) { if (!$table->hasIndex('fs_size')) { $subject->addHintForMissingSubject($table->getName(), 'fs_size'); } + + if (!$table->hasIndex('fs_storage_path_prefix')) { + $subject->addHintForMissingSubject($table->getName(), 'fs_storage_path_prefix'); + } } if ($schema->hasTable('twofactor_providers')) { diff --git a/core/Command/Db/AddMissingIndices.php b/core/Command/Db/AddMissingIndices.php index 1acff55fa40a2..1cf64c27c31eb 100644 --- a/core/Command/Db/AddMissingIndices.php +++ b/core/Command/Db/AddMissingIndices.php @@ -144,6 +144,13 @@ private function addCoreIndexes(OutputInterface $output) { $updated = true; $output->writeln('Filecache table updated successfully.'); } + if (!$table->hasIndex('fs_storage_path_prefix')) { + $output->writeln('Adding additional path index to the filecache table, this can take some time...'); + $table->addIndex(['storage', 'path'], 'fs_storage_path_prefix', [], ['lengths' => [null, 64]]); + $this->connection->migrateToSchema($schema->getWrappedSchema()); + $updated = true; + $output->writeln('Filecache table updated successfully.'); + } } $output->writeln('Check indices of the twofactor_providers table.'); diff --git a/core/Migrations/Version13000Date20170718121200.php b/core/Migrations/Version13000Date20170718121200.php index 4912bef885738..d023942e0ec75 100644 --- a/core/Migrations/Version13000Date20170718121200.php +++ b/core/Migrations/Version13000Date20170718121200.php @@ -262,6 +262,7 @@ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $op $table->addIndex(['storage', 'size', 'fileid'], 'fs_storage_size'); $table->addIndex(['mtime'], 'fs_mtime'); $table->addIndex(['size'], 'fs_size'); + $table->addIndex(['storage', 'path'], 'fs_storage_path_prefix', [], ['lengths' => [null, 64]]); } if (!$schema->hasTable('group_user')) { From c3d9471fe0debb09823495270f66853131f71e0d Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 26 Aug 2021 14:25:17 +0200 Subject: [PATCH 2/3] disable path prefix index on postgresql for now having the index work properly for the queries we need it for requires some additional options which dbal does not support at the momement. to prevent making it harder to add the correct index later on we don't create the index for now on postgresql Signed-off-by: Robin Appelman --- core/Application.php | 3 ++- core/Command/Db/AddMissingIndices.php | 3 ++- .../Migrations/Version13000Date20170718121200.php | 5 ++++- lib/private/DB/SchemaWrapper.php | 13 +++++++++++++ lib/public/DB/ISchemaWrapper.php | 15 ++++++++++++++- 5 files changed, 35 insertions(+), 4 deletions(-) diff --git a/core/Application.php b/core/Application.php index 03ff1be681e83..05e45f4084f21 100644 --- a/core/Application.php +++ b/core/Application.php @@ -32,6 +32,7 @@ namespace OC\Core; +use Doctrine\DBAL\Platforms\PostgreSQL94Platform; use OC\Authentication\Events\RemoteWipeFinished; use OC\Authentication\Events\RemoteWipeStarted; use OC\Authentication\Listeners\RemoteWipeActivityListener; @@ -116,7 +117,7 @@ function (GenericEvent $event) use ($container) { $subject->addHintForMissingSubject($table->getName(), 'fs_size'); } - if (!$table->hasIndex('fs_storage_path_prefix')) { + if (!$table->hasIndex('fs_storage_path_prefix') && !$schema->getDatabasePlatform() instanceof PostgreSQL94Platform) { $subject->addHintForMissingSubject($table->getName(), 'fs_storage_path_prefix'); } } diff --git a/core/Command/Db/AddMissingIndices.php b/core/Command/Db/AddMissingIndices.php index 1cf64c27c31eb..7079c68fcdbe4 100644 --- a/core/Command/Db/AddMissingIndices.php +++ b/core/Command/Db/AddMissingIndices.php @@ -33,6 +33,7 @@ namespace OC\Core\Command\Db; +use Doctrine\DBAL\Platforms\PostgreSQL94Platform; use OC\DB\Connection; use OC\DB\SchemaWrapper; use OCP\IDBConnection; @@ -144,7 +145,7 @@ private function addCoreIndexes(OutputInterface $output) { $updated = true; $output->writeln('Filecache table updated successfully.'); } - if (!$table->hasIndex('fs_storage_path_prefix')) { + if (!$table->hasIndex('fs_storage_path_prefix') && !$schema->getDatabasePlatform() instanceof PostgreSQL94Platform) { $output->writeln('Adding additional path index to the filecache table, this can take some time...'); $table->addIndex(['storage', 'path'], 'fs_storage_path_prefix', [], ['lengths' => [null, 64]]); $this->connection->migrateToSchema($schema->getWrappedSchema()); diff --git a/core/Migrations/Version13000Date20170718121200.php b/core/Migrations/Version13000Date20170718121200.php index d023942e0ec75..8b67550609562 100644 --- a/core/Migrations/Version13000Date20170718121200.php +++ b/core/Migrations/Version13000Date20170718121200.php @@ -30,6 +30,7 @@ namespace OC\Core\Migrations; +use Doctrine\DBAL\Platforms\PostgreSQL94Platform; use OCP\DB\Types; use OCP\DB\ISchemaWrapper; use OCP\IDBConnection; @@ -262,7 +263,9 @@ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $op $table->addIndex(['storage', 'size', 'fileid'], 'fs_storage_size'); $table->addIndex(['mtime'], 'fs_mtime'); $table->addIndex(['size'], 'fs_size'); - $table->addIndex(['storage', 'path'], 'fs_storage_path_prefix', [], ['lengths' => [null, 64]]); + if (!$schema->getDatabasePlatform() instanceof PostgreSQL94Platform) { + $table->addIndex(['storage', 'path'], 'fs_storage_path_prefix', [], ['lengths' => [null, 64]]); + } } if (!$schema->hasTable('group_user')) { diff --git a/lib/private/DB/SchemaWrapper.php b/lib/private/DB/SchemaWrapper.php index 20ae5b6faa6b3..9f7623bac44ca 100644 --- a/lib/private/DB/SchemaWrapper.php +++ b/lib/private/DB/SchemaWrapper.php @@ -24,6 +24,8 @@ namespace OC\DB; +use Doctrine\DBAL\Exception; +use Doctrine\DBAL\Platforms\AbstractPlatform; use Doctrine\DBAL\Schema\Schema; use OCP\DB\ISchemaWrapper; @@ -130,4 +132,15 @@ public function dropTable($tableName) { public function getTables() { return $this->schema->getTables(); } + + /** + * Gets the DatabasePlatform for the database. + * + * @return AbstractPlatform + * + * @throws Exception + */ + public function getDatabasePlatform() { + return $this->connection->getDatabasePlatform(); + } } diff --git a/lib/public/DB/ISchemaWrapper.php b/lib/public/DB/ISchemaWrapper.php index 3d58a10d2d28e..1eac5c4f755dd 100644 --- a/lib/public/DB/ISchemaWrapper.php +++ b/lib/public/DB/ISchemaWrapper.php @@ -23,6 +23,9 @@ namespace OCP\DB; +use Doctrine\DBAL\Exception; +use Doctrine\DBAL\Platforms\AbstractPlatform; + /** * Interface ISchemaWrapper * @@ -82,7 +85,7 @@ public function getTables(); * @since 13.0.0 */ public function getTableNames(); - + /** * Gets all table names * @@ -90,4 +93,14 @@ public function getTableNames(); * @since 13.0.0 */ public function getTableNamesWithoutPrefix(); + + /** + * Gets the DatabasePlatform for the database. + * + * @return AbstractPlatform + * + * @throws Exception + * @since 23.0.0 + */ + public function getDatabasePlatform(); } From a61ac5acf5b55747b5383e72d993510f49fd44fe Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 23 Nov 2021 14:51:26 +0100 Subject: [PATCH 3/3] update @since for getDatabasePlatform Signed-off-by: Robin Appelman --- lib/public/DB/ISchemaWrapper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/public/DB/ISchemaWrapper.php b/lib/public/DB/ISchemaWrapper.php index 1eac5c4f755dd..85b09aee10e55 100644 --- a/lib/public/DB/ISchemaWrapper.php +++ b/lib/public/DB/ISchemaWrapper.php @@ -100,7 +100,7 @@ public function getTableNamesWithoutPrefix(); * @return AbstractPlatform * * @throws Exception - * @since 23.0.0 + * @since 21.0.8 */ public function getDatabasePlatform(); }