Skip to content

allow storing multiple mounts for the same rootid in the mount cache #32877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
icewind1991 merged 2 commits into from
May 2, 2023
Merged

allow storing multiple mounts for the same rootid in the mount cache #32877

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5e2b0b
allow storing multiple mounts for the same rootid in the mount cache
icewind1991 Jun 14, 2022
db43d90
add new index in repair step instead of on-migrate
icewind1991 Apr 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
add new index in repair step instead of on-migrate 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991
icewind1991 committed Apr 28, 2023
commit db43d903877a8b90b78cafb404b1e7101bfb2c15
3 changes: 3 additions & 0 deletions core/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,9 @@ function (GenericEvent $event) use ($container) {
if (!$table->hasIndex('mounts_class_index')) {
$subject->addHintForMissingSubject($table->getName(), 'mounts_class_index');
}
if (!$table->hasIndex('mounts_user_root_path_index')) {
$subject->addHintForMissingSubject($table->getName(), 'mounts_user_root_path_index');
}
}
}
);
Expand Down
8 changes: 8 additions & 0 deletions core/Command/Db/AddMissingIndices.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,14 @@ private function addCoreIndexes(OutputInterface $output, bool $dryRun): void {
$updated = true;
$output->writeln('<info>oc_mounts table updated successfully.</info>');
}
if (!$table->hasIndex('mounts_user_root_path_index')) {
$output->writeln('<info>Adding mounts_user_root_path_index index to the oc_mounts table, this can take some time...</info>');

$table->addIndex(['user_id', 'root_id', 'mount_point'], 'mounts_user_root_path_index', [], ['lengths' => [null, null, 128]]);
$this->connection->migrateToSchema($schema->getWrappedSchema());
$updated = true;
$output->writeln('<info>oc_mounts table updated successfully.</info>');
}
}

if (!$updated) {
Expand Down
2 changes: 1 addition & 1 deletion core/Migrations/Version27000Date20220613163520.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
$table = $schema->getTable('mounts');
if ($table->hasIndex('mounts_user_root_index')) {
$table->dropIndex('mounts_user_root_index');
$table->addIndex(['user_id', 'root_id', 'mount_point'], 'mounts_user_root_path_index', [], ['lengths' => [null, null, 128]]);
// new index gets added with "add missing indexes"
}

return $schema;
Expand Down