From ece471de360ebbebee6b098a20d65042dd69928c Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 7 Feb 2019 15:43:20 +0100 Subject: Start implementing access cache Signed-off-by: Joas Schilling --- core/Migrations/Version15000Date20180917092725.php | 80 ---------------- core/Migrations/Version16000Date20190207141427.php | 104 +++++++++++++++++++++ 2 files changed, 104 insertions(+), 80 deletions(-) delete mode 100644 core/Migrations/Version15000Date20180917092725.php create mode 100644 core/Migrations/Version16000Date20190207141427.php (limited to 'core') diff --git a/core/Migrations/Version15000Date20180917092725.php b/core/Migrations/Version15000Date20180917092725.php deleted file mode 100644 index 1bcc6382745..00000000000 --- a/core/Migrations/Version15000Date20180917092725.php +++ /dev/null @@ -1,80 +0,0 @@ - - * - * @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 Doctrine\DBAL\Types\Type; -use OCP\DB\ISchemaWrapper; -use OCP\Migration\SimpleMigrationStep; -use OCP\Migration\IOutput; - -class Version15000Date20180917092725 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) { - /** @var ISchemaWrapper $schema */ - $schema = $schemaClosure(); - - if (!$schema->hasTable('collres_collections')) { - $table = $schema->createTable('collres_collections'); - - $table->addColumn('id', Type::BIGINT, [ - 'autoincrement' => true, - 'notnull' => true, - ]); - $table->addColumn('name', Type::STRING, [ - 'notnull' => true, - 'length' => 64, - ]); - - $table->setPrimaryKey(['id']); - } - - if (!$schema->hasTable('collres_resources')) { - $table = $schema->createTable('collres_resources'); - - $table->addColumn('collection_id', Type::BIGINT, [ - 'notnull' => true, - ]); - $table->addColumn('resource_type', Type::STRING, [ - 'notnull' => true, - 'length' => 64, - ]); - $table->addColumn('resource_id', Type::STRING, [ - 'notnull' => true, - 'length' => 64, - ]); - - $table->addUniqueIndex(['collection_id', 'resource_type', 'resource_id'], 'collres_unique_res'); - } - - return $schema; - } - -} diff --git a/core/Migrations/Version16000Date20190207141427.php b/core/Migrations/Version16000Date20190207141427.php new file mode 100644 index 00000000000..44e09a8463b --- /dev/null +++ b/core/Migrations/Version16000Date20190207141427.php @@ -0,0 +1,104 @@ + + * + * @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 Doctrine\DBAL\Types\Type; +use OCP\DB\ISchemaWrapper; +use OCP\Migration\SimpleMigrationStep; +use OCP\Migration\IOutput; + +class Version16000Date20190207141427 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) { + /** @var ISchemaWrapper $schema */ + $schema = $schemaClosure(); + + if (!$schema->hasTable('collres_collections')) { + $table = $schema->createTable('collres_collections'); + + $table->addColumn('id', Type::BIGINT, [ + 'autoincrement' => true, + 'notnull' => true, + ]); + $table->addColumn('name', Type::STRING, [ + 'notnull' => true, + 'length' => 64, + ]); + + $table->setPrimaryKey(['id']); + } + + if (!$schema->hasTable('collres_resources')) { + $table = $schema->createTable('collres_resources'); + + $table->addColumn('collection_id', Type::BIGINT, [ + 'notnull' => true, + ]); + $table->addColumn('resource_type', Type::STRING, [ + 'notnull' => true, + 'length' => 64, + ]); + $table->addColumn('resource_id', Type::STRING, [ + 'notnull' => true, + 'length' => 64, + ]); + + $table->addUniqueIndex(['collection_id', 'resource_type', 'resource_id'], 'collres_unique_res'); + } + + if (!$schema->hasTable('collres_accesscache')) { + $table = $schema->createTable('collres_accesscache'); + + $table->addColumn('user_id', Type::STRING, [ + 'notnull' => true, + 'length' => 64, + ]); + $table->addColumn('collection_id', Type::BIGINT, [ + 'notnull' => false, + ]); + $table->addColumn('resource_id', Type::STRING, [ + 'notnull' => false, + 'length' => 64, + ]); + $table->addColumn('access', Type::SMALLINT, [ + 'notnull' => true, + 'default' => 0, + ]); + + $table->addUniqueIndex(['user_id', 'collection_id', 'resource_id'], 'collres_unique_user'); + $table->addIndex(['user_id', 'resource_id'], 'collres_user_res'); + $table->addIndex(['user_id', 'collection_id'], 'collres_user_coll'); + } + + return $schema; + } + +} -- cgit v1.2.3