[stable25] allow storing multiple mounts for the same rootid in the mount cache

core/Application.php

@@ -235,6 +235,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');
+ }
  }
  }
  );

core/Command/Db/AddMissingIndices.php

@@ -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) {

core/Migrations/Version13000Date20170718121200.php

@@ -150,7 +150,7 @@ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $op
  $table->addIndex(['storage_id'], 'mounts_storage_index');
  $table->addIndex(['root_id'], 'mounts_root_index');
  $table->addIndex(['mount_id'], 'mounts_mount_id_index');
- $table->addUniqueIndex(['user_id', 'root_id'], 'mounts_user_root_index');
+ $table->addIndex(['user_id', 'root_id', 'mount_point'], 'mounts_user_root_path_index', [], ['lengths' => [null, null, 128]]);
  } else {
  $table = $schema->getTable('mounts');
  $table->addColumn('mount_id', Types::BIGINT, [

core/Migrations/Version27000Date20220613163520.php

@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2022 Your name <your@email.com>
+ *
+ * @author Your name <your@email.com>
+ *
+ * @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\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+class Version27000Date20220613163520 extends SimpleMigrationStep {
+ public function name(): string {
+ return "Add mountpoint path to mounts table unique index";
+ }
+
+ public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+ /** @var ISchemaWrapper $schema */
+ $schema = $schemaClosure();
+
+ $table = $schema->getTable('mounts');
+ if ($table->hasIndex('mounts_user_root_index')) {
+ $table->dropIndex('mounts_user_root_index');
+ // new index gets added with "add missing indexes"
+ }
+
+ return $schema;
+ }
+}

lib/composer/composer/autoload_classmap.php

@@ -1071,6 +1071,7 @@
  'OC\\Core\\Migrations\\Version25000Date20220515204012' => $baseDir . '/core/Migrations/Version25000Date20220515204012.php',
  'OC\\Core\\Migrations\\Version25000Date20220602190540' => $baseDir . '/core/Migrations/Version25000Date20220602190540.php',
  'OC\\Core\\Migrations\\Version25000Date20221007010957' => $baseDir . '/core/Migrations/Version25000Date20221007010957.php',
+ 'OC\\Core\\Migrations\\Version27000Date20220613163520' => $baseDir . '/core/Migrations/Version27000Date20220613163520.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',

lib/composer/composer/autoload_static.php

@@ -1104,6 +1104,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
  'OC\\Core\\Migrations\\Version25000Date20220515204012' => __DIR__ . '/../../..' . '/core/Migrations/Version25000Date20220515204012.php',
  'OC\\Core\\Migrations\\Version25000Date20220602190540' => __DIR__ . '/../../..' . '/core/Migrations/Version25000Date20220602190540.php',
  'OC\\Core\\Migrations\\Version25000Date20221007010957' => __DIR__ . '/../../..' . '/core/Migrations/Version25000Date20221007010957.php',
+ 'OC\\Core\\Migrations\\Version27000Date20220613163520' => __DIR__ . '/../../..' . '/core/Migrations/Version27000Date20220613163520.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',

lib/private/Files/Config/UserMountCache.php

@@ -83,38 +83,39 @@ public function registerMounts(IUser $user, array $mounts, array $mountProviderC
  }
  }, $mounts);
  $newMounts = array_values(array_filter($newMounts));
- $newMountRootIds = array_map(function (ICachedMountInfo $mount) {
- return $mount->getRootId();
+ $newMountKeys = array_map(function (ICachedMountInfo $mount) {
+ return $mount->getRootId() . '::' . $mount->getMountPoint();
  }, $newMounts);
- $newMounts = array_combine($newMountRootIds, $newMounts);
+ $newMounts = array_combine($newMountKeys, $newMounts);
 
  $cachedMounts = $this->getMountsForUser($user);
  if (is_array($mountProviderClasses)) {
  $cachedMounts = array_filter($cachedMounts, function (ICachedMountInfo $mountInfo) use ($mountProviderClasses, $newMounts) {
  // for existing mounts that didn't have a mount provider set
  // we still want the ones that map to new mounts
- if ($mountInfo->getMountProvider() === '' && isset($newMounts[$mountInfo->getRootId()])) {
+ $mountKey = $mountInfo->getRootId() . '::' . $mountInfo->getMountPoint();
+ if ($mountInfo->getMountProvider() === '' && isset($newMounts[$mountKey])) {
  return true;
  }
  return in_array($mountInfo->getMountProvider(), $mountProviderClasses);
  });
  }
- $cachedMountRootIds = array_map(function (ICachedMountInfo $mount) {
- return $mount->getRootId();
+ $cachedRootKeys = array_map(function (ICachedMountInfo $mount) {
+ return $mount->getRootId() . '::' . $mount->getMountPoint();
  }, $cachedMounts);
- $cachedMounts = array_combine($cachedMountRootIds, $cachedMounts);
+ $cachedMounts = array_combine($cachedRootKeys, $cachedMounts);
 
  $addedMounts = [];
  $removedMounts = [];
 
- foreach ($newMounts as $rootId => $newMount) {
- if (!isset($cachedMounts[$rootId])) {
+ foreach ($newMounts as $mountKey => $newMount) {
+ if (!isset($cachedMounts[$mountKey])) {
  $addedMounts[] = $newMount;
  }
  }
 
- foreach ($cachedMounts as $rootId => $cachedMount) {
- if (!isset($newMounts[$rootId])) {
+ foreach ($cachedMounts as $mountKey => $cachedMount) {
+ if (!isset($newMounts[$mountKey])) {
  $removedMounts[] = $cachedMount;
  }
  }
@@ -144,13 +145,13 @@ public function registerMounts(IUser $user, array $mounts, array $mountProviderC
  private function findChangedMounts(array $newMounts, array $cachedMounts) {
  $new = [];
  foreach ($newMounts as $mount) {
- $new[$mount->getRootId()] = $mount;
+ $new[$mount->getRootId() . '::' . $mount->getMountPoint()] = $mount;
  }
  $changed = [];
  foreach ($cachedMounts as $cachedMount) {
- $rootId = $cachedMount->getRootId();
- if (isset($new[$rootId])) {
- $newMount = $new[$rootId];
+ $key = $cachedMount->getRootId() . '::' . $cachedMount->getMountPoint();
+ if (isset($new[$key])) {
+ $newMount = $new[$key];
  if (
  $newMount->getMountPoint() !== $cachedMount->getMountPoint() ||
  $newMount->getStorageId() !== $cachedMount->getStorageId() ||
@@ -173,7 +174,7 @@ private function addToCache(ICachedMountInfo $mount) {
  'mount_point' => $mount->getMountPoint(),
  'mount_id' => $mount->getMountId(),
  'mount_provider_class' => $mount->getMountProvider(),
- ], ['root_id', 'user_id']);
+ ], ['root_id', 'user_id', 'mount_point']);
  } else {
  // in some cases this is legitimate, like orphaned shares
  $this->logger->debug('Could not get storage info for mount at ' . $mount->getMountPoint());
@@ -199,7 +200,8 @@ private function removeFromCache(ICachedMountInfo $mount) {
 
  $query = $builder->delete('mounts')
  ->where($builder->expr()->eq('user_id', $builder->createNamedParameter($mount->getUser()->getUID())))
- ->andWhere($builder->expr()->eq('root_id', $builder->createNamedParameter($mount->getRootId(), IQueryBuilder::PARAM_INT)));
+ ->andWhere($builder->expr()->eq('root_id', $builder->createNamedParameter($mount->getRootId(), IQueryBuilder::PARAM_INT)))
+ ->andWhere($builder->expr()->eq('mount_point', $builder->createNamedParameter($mount->getMountPoint())));
  $query->execute();
  }
 

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 = [25, 0, 7, 1];
+$OC_Version = [25, 0, 7, 2];
 
 // The human readable string
 $OC_VersionString = '25.0.7';