Skip to content

Commit

Permalink
fix: reduce sql queries in Share::getUsersSharingFile()
Browse files Browse the repository at this point in the history
  • Loading branch information
@DeepDiver1975
DeepDiver1975 committed Nov 20, 2023
1 parent efa6c74 commit 2f5953e
Show file tree
Hide file tree
Showing 5 changed files with 225 additions and 131 deletions.
15 changes: 15 additions & 0 deletions lib/private/Diagnostics/Query.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,21 @@ public function getDuration() {
return $this->end - $this->start;
}

public function getFullSql(): string {
$s = preg_replace('/\s\s+/', ' ', $this->sql);
foreach ($this->params as $i => $param) {
$param = json_encode($param);
$pos = strpos($s, '?');
if ($pos !== false) {
$s = substr_replace($s, $param, $pos, \strlen('?'));
} else {
$s = str_replace(":$i", $param, $s);
}
}

return $s;
}

public function jsonSerialize() {
return [
'query' => $this->sql,
Expand Down
216 changes: 92 additions & 124 deletions lib/private/Share/Share.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
use Doctrine\DBAL\Connection;
use OC\Files\Filesystem;
use OC\Group\Group;
use OC\User\NoUserException;
use OCA\FederatedFileSharing\DiscoveryManager;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IUser;
Expand Down Expand Up @@ -151,7 +152,7 @@ public static function getUsersSharingFile($path, $ownerUser, $includeOwner = fa
if ($userObject === null) {
$msg = "Backends provided no user object for $ownerUser";
\OC::$server->getLogger()->error($msg, ['app' => __CLASS__]);
throw new \OC\User\NoUserException($msg);
throw new NoUserException($msg);
}

$ownerUser = $userObject->getUID();
Expand All @@ -160,7 +161,7 @@ public static function getUsersSharingFile($path, $ownerUser, $includeOwner = fa
$shares = $sharePaths = $fileTargets = [];
$publicShare = false;
$remoteShare = false;
$source = -1;
$sources = [];
$cache = $mountPath = false;

$view = new \OC\Files\View('/' . $ownerUser . '/files');
Expand All @@ -172,8 +173,10 @@ public static function getUsersSharingFile($path, $ownerUser, $includeOwner = fa
$meta = $view->getFileInfo(\dirname($path));
}

$source = -1;
if ($meta !== false) {
$source = $meta['fileid'];
$sources[]= $source;
$cache = new \OC\Files\Cache\Cache($meta['storage']);

$mountPath = $meta->getMountPoint()->getMountPoint();
Expand All @@ -182,125 +185,94 @@ public static function getUsersSharingFile($path, $ownerUser, $includeOwner = fa
}
}

// let's get the parent for the next round
if ($recursive === true) {
while ($source !== -1) {
$meta = $cache->get((int)$source);
if ($meta !== false) {
# $paths[$source] = $meta['path'];
$source = (int)$meta['parent'];
$sources[]= $source;
} else {
break;
}
}
}

$connection = \OC::$server->getDatabaseConnection();

$paths = [];
$rejected = [];
# TODO: performance consideration - build list of all parent folders up front - don't loop
while ($source !== -1) {
// Fetch all shares with another user
if (!$returnUserPaths) {
$query = \OC_DB::prepare(
'SELECT `parent`, `share_with`, `file_source`, `file_target`, `accepted`
FROM
`*PREFIX*share`
WHERE
`item_source` = ? AND `share_type` = ? AND `item_type` IN (\'file\', \'folder\')'
);
$result = $query->execute([$source, self::SHARE_TYPE_USER]);
} else {
$query = \OC_DB::prepare(
'SELECT `parent`, `share_with`, `file_source`, `file_target`, `accepted`
FROM
`*PREFIX*share`
WHERE
`item_source` = ? AND `share_type` IN (?, ?) AND `item_type` IN (\'file\', \'folder\')'
);
$result = $query->execute([$source, self::SHARE_TYPE_USER, self::$shareTypeGroupUserUnique]);
}
// Fetch all shares with another user
$qb = $connection->getQueryBuilder();
$qb->select('parent', 'share_with', 'file_source', 'file_target', 'accepted')
->from('share')
->where($qb->expr()->in('item_source', $qb->createNamedParameter($sources, Connection::PARAM_INT_ARRAY)))
->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], Connection::PARAM_STR_ARRAY)));

if (\OCP\DB::isError($result)) {
\OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage(), \OCP\Util::ERROR);
} else {
while ($row = $result->fetchRow()) {
if ((int)($row['accepted']) === Constants::STATE_REJECTED) {
$rejected[]= $row['parent'];
continue;
}
$shares[] = $row['share_with'];
if ($returnUserPaths) {
$fileTargets[(int) $row['file_source']][$row['share_with']] = $row;
}
}
if ($returnUserPaths) {
$qb->andWhere($qb->expr()->in('share_type', $qb->createNamedParameter([self::SHARE_TYPE_USER, self::$shareTypeGroupUserUnique], Connection::PARAM_INT_ARRAY)));
} else {
$qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_USER)));
}
$result = $qb->execute();
while ($row = $result->fetch()) {
if ((int)($row['accepted']) === Constants::STATE_REJECTED) {
$rejected[]= $row['parent'];
continue;
}

// We also need to take group shares into account
$qb = $connection->getQueryBuilder();
$qb->select('share_with', 'file_source', 'file_target')
->from('share')
->where($qb->expr()->eq('item_source', $qb->createNamedParameter($source)))
->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_GROUP)))
->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], Connection::PARAM_STR_ARRAY)));

if (!empty($rejected)) {
$qb->andWhere($qb->expr()->notIn('id', $qb->createNamedParameter($rejected, Connection::PARAM_INT_ARRAY)));
}
$result = $qb->execute();

while ($row = $result->fetch()) {
$usersInGroup = self::usersInGroup($row['share_with']);
$shares = \array_merge($shares, $usersInGroup);
if ($returnUserPaths) {
foreach ($usersInGroup as $user) {
if (!isset($fileTargets[(int) $row['file_source']][$user])) {
// When the user already has an entry for this file source
// the file is either shared directly with him as well, or
// he has an exception entry (because of naming conflict).
$fileTargets[(int) $row['file_source']][$user] = $row;
}
}
}
$shares[] = $row['share_with'];
if ($returnUserPaths) {
$fileTargets[(int) $row['file_source']][$row['share_with']] = $row;
}
}

//check for public link shares
if (!$publicShare) {
$query = \OC_DB::prepare(
'
SELECT `share_with`
FROM `*PREFIX*share`
WHERE `item_source` = ? AND `share_type` = ? AND `item_type` IN (\'file\', \'folder\')',
1
);
// We also need to take group shares into account
$qb = $connection->getQueryBuilder();
$qb->select('share_with', 'file_source', 'file_target')
->from('share')
->where($qb->expr()->in('item_source', $qb->createNamedParameter($sources, Connection::PARAM_INT_ARRAY)))
->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(self::SHARE_TYPE_GROUP)))
->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], Connection::PARAM_STR_ARRAY)));

$result = $query->execute([$source, self::SHARE_TYPE_LINK]);
if (!empty($rejected)) {
$qb->andWhere($qb->expr()->notIn('id', $qb->createNamedParameter($rejected, Connection::PARAM_INT_ARRAY)));
}
$result = $qb->execute();

if (\OCP\DB::isError($result)) {
\OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage(), \OCP\Util::ERROR);
} else {
if ($result->fetchRow()) {
$publicShare = true;
while ($row = $result->fetch()) {
$usersInGroup = self::usersInGroup($row['share_with']);
$shares = \array_merge($shares, $usersInGroup);
if ($returnUserPaths) {
foreach ($usersInGroup as $user) {
if (!isset($fileTargets[(int) $row['file_source']][$user])) {
// When the user already has an entry for this file source
// the file is either shared directly with him as well, or
// he has an exception entry (because of naming conflict).
$fileTargets[(int) $row['file_source']][$user] = $row;
}
}
}
}

//check for remote share
if (!$remoteShare) {
$query = \OC_DB::prepare(
'
SELECT `share_with`
FROM `*PREFIX*share`
WHERE `item_source` = ? AND `share_type` = ? AND `item_type` IN (\'file\', \'folder\')',
1
);

$result = $query->execute([$source, self::SHARE_TYPE_REMOTE]);
//check for public link shares
$qb = $connection->getQueryBuilder();
$qb->select('share_with', 'share_type')
->from('share')
->where($qb->expr()->in('item_source', $qb->createNamedParameter($sources, Connection::PARAM_INT_ARRAY)))
->andWhere($qb->expr()->in('share_type', $qb->createNamedParameter([3, 6], Connection::PARAM_INT_ARRAY)))
->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], Connection::PARAM_STR_ARRAY)));
$result = $qb->execute();
$rows = $result->fetchAllAssociative();
$result->free();

if (\OCP\DB::isError($result)) {
\OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage(), \OCP\Util::ERROR);
} else {
if ($result->fetchRow()) {
$remoteShare = true;
}
}
foreach ($rows as $row) {
if ((int)($row['share_type']) === self::SHARE_TYPE_LINK) {
$publicShare = true;
}

// let's get the parent for the next round
$meta = $cache->get((int)$source);
if ($recursive === true && $meta !== false) {
$paths[$source] = $meta['path'];
$source = (int)$meta['parent'];
} else {
$source = -1;
if ((int)($row['share_type']) === self::SHARE_TYPE_REMOTE) {
$remoteShare = true;
}
}

Expand All @@ -314,27 +286,23 @@ public static function getUsersSharingFile($path, $ownerUser, $includeOwner = fa
$fileTargetIDs = \array_unique($fileTargetIDs);

if (!empty($fileTargetIDs)) {
$query = \OC_DB::prepare(
'SELECT `fileid`, `path`
FROM `*PREFIX*filecache`
WHERE `fileid` IN (' . \implode(',', $fileTargetIDs) . ')'
);
$result = $query->execute();
$qb = $connection->getQueryBuilder();
$qb->select('fileid', 'path')
->from('filecache')
->where($qb->expr()->in('fileid', $qb->createNamedParameter($fileTargetIDs, Connection::PARAM_INT_ARRAY)));

if (\OCP\DB::isError($result)) {
\OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage(), \OCP\Util::ERROR);
} else {
while ($row = $result->fetchRow()) {
foreach ($fileTargets[$row['fileid']] as $uid => $shareData) {
if ($mountPath !== false) {
$sharedPath = $shareData['file_target'];
$sharedPath .= \substr($path, \strlen($mountPath) + \strlen($paths[$row['fileid']]));
$sharePaths[$uid] = $sharedPath;
} else {
$sharedPath = $shareData['file_target'];
$sharedPath .= \substr($path, \strlen($row['path']) -5);
$sharePaths[$uid] = $sharedPath;
}
$result = $qb->execute();

while ($row = $result->fetch()) {
foreach ($fileTargets[$row['fileid']] as $uid => $shareData) {
if ($mountPath !== false) {
$sharedPath = $shareData['file_target'];
$sharedPath .= \substr($path, \strlen($mountPath) + \strlen($paths[$row['fileid']]));
$sharePaths[$uid] = $sharedPath;
} else {
$sharedPath = $shareData['file_target'];
$sharedPath .= \substr($path, \strlen($row['path']) -5);
$sharePaths[$uid] = $sharedPath;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/public/IDBConnection.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public function getQueryBuilder();
* @param string $sql the sql query with ? placeholder for params
* @param int $limit the maximum number of rows
* @param int $offset from which row we want to start
* @return \Doctrine\DBAL\Driver\Statement The prepared statement.
* @return \Doctrine\DBAL\Statement The prepared statement.
* @since 6.0.0
*/
public function prepare($sql, $limit=null, $offset=null);
Expand Down
Loading

0 comments on commit 2f5953e

Please sign in to comment.