refactor: don't join on filecache in defaultshareprovider

Signed-off-by: Robin Appelman <[email protected]>

lib/private/Share20/DefaultShareProvider.php

@@ -35,6 +35,7 @@
 namespace OC\Share20;
 
 use OC\Files\Cache\Cache;
+use OC\Files\Cache\CacheAccess;
 use OC\Share20\Exception\BackendError;
 use OC\Share20\Exception\InvalidShare;
 use OC\Share20\Exception\ProviderException;
@@ -67,52 +68,21 @@ class DefaultShareProvider implements IShareProvider {
  // Special share type for user modified group shares
  public const SHARE_TYPE_USERGROUP = 2;
 
- /** @var IDBConnection */
- private $dbConn;
-
- /** @var IUserManager */
- private $userManager;
-
- /** @var IGroupManager */
- private $groupManager;
-
- /** @var IRootFolder */
- private $rootFolder;
-
- /** @var IMailer */
- private $mailer;
-
- /** @var Defaults */
- private $defaults;
-
- /** @var IFactory */
- private $l10nFactory;
-
- /** @var IURLGenerator */
- private $urlGenerator;
-
- private ITimeFactory $timeFactory;
+ private IDBConnection $dbConn;
 
  public function __construct(
  IDBConnection $connection,
- IUserManager $userManager,
- IGroupManager $groupManager,
- IRootFolder $rootFolder,
- IMailer $mailer,
- Defaults $defaults,
- IFactory $l10nFactory,
- IURLGenerator $urlGenerator,
- ITimeFactory $timeFactory,
+ private IUserManager $userManager,
+ private IGroupManager $groupManager,
+ private IRootFolder $rootFolder,
+ private IMailer $mailer,
+ private Defaults $defaults,
+ private IFactory $l10nFactory,
+ private IURLGenerator $urlGenerator,
+ private ITimeFactory $timeFactory,
+ private CacheAccess $cacheAccess,
  ) {
  $this->dbConn = $connection;
- $this->userManager = $userManager;
- $this->groupManager = $groupManager;
- $this->rootFolder = $rootFolder;
- $this->mailer = $mailer;
- $this->defaults = $defaults;
- $this->l10nFactory = $l10nFactory;
- $this->urlGenerator = $urlGenerator;
- $this->timeFactory = $timeFactory;
  }
 
  /**
@@ -653,10 +623,7 @@ public function move(\OCP\Share\IShare $share, $recipient) {
 
  public function getSharesInFolder($userId, Folder $node, $reshares, $shallow = true) {
  $qb = $this->dbConn->getQueryBuilder();
- $qb->select('s.*',
- 'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash',
- 'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime',
- 'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum')
+ $qb->select('s.*')
  ->from('share', 's')
  ->andWhere($qb->expr()->orX(
  $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
@@ -683,27 +650,17 @@ public function getSharesInFolder($userId, Folder $node, $reshares, $shallow = t
  );
  }
 
- // todo? maybe get these from the oc_mounts table
- $childMountNodes = array_filter($node->getDirectoryListing(), function (Node $node): bool {
- return $node->getInternalPath() === '';
- });
- $childMountRootIds = array_map(function (Node $node): int {
+ $childFileIds = array_map(function (Node $node): int {
  return $node->getId();
- }, $childMountNodes);
+ }, $node->getDirectoryListing());
 
- $qb->innerJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
- $qb->andWhere(
- $qb->expr()->orX(
- $qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())),
- $qb->expr()->in('f.fileid', $qb->createParameter('chunk'))
- )
- );
+ $qb->andWhere($qb->expr()->in('s.source_id', $qb->createParameter('chunk')));
 
  $qb->orderBy('id');
 
  $shares = [];
 
- $chunks = array_chunk($childMountRootIds, 1000);
+ $chunks = array_chunk($childFileIds, 1000);
 
  // Force the request to be run when there is 0 mount.
  if (count($chunks) === 0) {
@@ -887,15 +844,8 @@ public function getSharedWith($userId, $shareType, $node, $limit, $offset) {
  if ($shareType === IShare::TYPE_USER) {
  //Get shares directly with this user
  $qb = $this->dbConn->getQueryBuilder();
- $qb->select('s.*',
- 'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash',
- 'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime',
- 'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum'
- )
- ->selectAlias('st.id', 'storage_string_id')
- ->from('share', 's')
- ->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'))
- ->leftJoin('f', 'storages', 'st', $qb->expr()->eq('f.storage', 'st.numeric_id'));
+ $qb->select('s.*')
+ ->from('share', 's');
 
  // Order by id
  $qb->orderBy('s.id');
@@ -921,14 +871,7 @@ public function getSharedWith($userId, $shareType, $node, $limit, $offset) {
  $cursor = $qb->execute();
 
  while ($data = $cursor->fetch()) {
- if ($data['fileid'] && $data['path'] === null) {
- $data['path'] = (string) $data['path'];
- $data['name'] = (string) $data['name'];
- $data['checksum'] = (string) $data['checksum'];
- }
- if ($this->isAccessibleResult($data)) {
- $shares[] = $this->createShare($data);
- }
+ $shares[] = $this->createShare($data);
  }
  $cursor->closeCursor();
  } elseif ($shareType === IShare::TYPE_GROUP) {
@@ -948,15 +891,8 @@ public function getSharedWith($userId, $shareType, $node, $limit, $offset) {
  }
 
  $qb = $this->dbConn->getQueryBuilder();
- $qb->select('s.*',
- 'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash',
- 'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime',
- 'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum'
- )
- ->selectAlias('st.id', 'storage_string_id')
+ $qb->select('s.*')
  ->from('share', 's')
- ->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'))
- ->leftJoin('f', 'storages', 'st', $qb->expr()->eq('f.storage', 'st.numeric_id'))
  ->orderBy('s.id')
  ->setFirstResult(0);
 
@@ -1005,7 +941,31 @@ public function getSharedWith($userId, $shareType, $node, $limit, $offset) {
  }
 
 
- return $shares;
+ return $this->setNodes($shares);
+ }
+
+ /**
+ * @param IShare[] $shares
+ * @return IShare[]
+ */
+ private function setNodes(array $shares): array {
+ $fileIds = array_map(function (IShare $share): int {
+ return $share->getNodeId();
+ }, $shares);
+ $files = $this->cacheAccess->getByFileIds($fileIds);
+
+ $sharesWithFiles = [];
+ foreach ($shares as $share) {
+ if (isset($files[$share->getNodeId()])) {
+ $cacheItem = $files[$share->getNodeId()];
+ if ($this->isAccessibleResult($cacheItem->getData())) {
+ $share->setNodeCacheEntry($cacheItem);
+ $sharesWithFiles[] = $share;
+ }
+ }
+ }
+
+ return $sharesWithFiles;
  }
 
  /**

lib/private/Share20/ProviderFactory.php

@@ -41,7 +41,6 @@
 use OCA\ShareByMail\Settings\SettingsManager;
 use OCA\ShareByMail\ShareByMailProvider;
 use OCA\Talk\Share\RoomShareProvider;
-use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Defaults;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IServerContainer;
@@ -96,17 +95,7 @@ public function registerProvider(string $shareProviderClass): void {
  */
  protected function defaultShareProvider() {
  if ($this->defaultProvider === null) {
- $this->defaultProvider = new DefaultShareProvider(
- $this->serverContainer->getDatabaseConnection(),
- $this->serverContainer->getUserManager(),
- $this->serverContainer->getGroupManager(),
- $this->serverContainer->getLazyRootFolder(),
- $this->serverContainer->getMailer(),
- $this->serverContainer->query(Defaults::class),
- $this->serverContainer->getL10NFactory(),
- $this->serverContainer->getURLGenerator(),
- $this->serverContainer->query(ITimeFactory::class),
- );
+ $this->defaultProvider = $this->serverContainer->get(DefaultShareProvider::class);
  }
 
  return $this->defaultProvider;