Skip to content

[17] Handle long dav property paths by hashing them #20034

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
rullzer merged 8 commits into from
Mar 24, 2020
Merged

[17] Handle long dav property paths by hashing them #20034

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a5164ee
merge the two almost identical custom property backends
icewind1991 Jan 31, 2020
594873d
test custom properties backend against real database
icewind1991 Jan 31, 2020
28fed26
remove unused code
icewind1991 Jan 31, 2020
0c49273
handle long property paths to hasing paths >250 chars
icewind1991 Jan 31, 2020
61f95a1
use INode instead of Node for custom properties
icewind1991 Feb 3, 2020
37150d0
remove the detour trough node and work with path directly
icewind1991 Feb 3, 2020
d108833
fix tests
icewind1991 Feb 3, 2020
12d0b9c
rebuild autoloader
icewind1991 Feb 4, 2020
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
Next Next commit
remove unused code 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991
icewind1991 committed Mar 19, 2020
commit 28fed26c6d9ab9d5985494fe64d1ac1f81af6fb7
53 changes: 0 additions & 53 deletions apps/dav/lib/DAV/CustomPropertiesBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@

namespace OCA\DAV\DAV;

use OCA\DAV\Connector\Sabre\Directory;
use OCA\DAV\Connector\Sabre\Node;
use OCP\IDBConnection;
use OCP\IUser;
Expand Down Expand Up @@ -319,56 +318,4 @@ private function updateProperties($node, $properties) {

return true;
}

/**
* Bulk load properties for directory children
*
* @param Directory $node
* @param array $requestedProperties requested properties
*
* @return void
*/
private function loadChildrenProperties(Directory $node, $requestedProperties) {
$path = $node->getPath();
if (isset($this->cache[$path])) {
// we already loaded them at some point
return;
}

$childNodes = $node->getChildren();
// pre-fill cache
foreach ($childNodes as $childNode) {
$this->cache[$childNode->getPath()] = [];
}

$sql = 'SELECT * FROM `*PREFIX*properties` WHERE `userid` = ? AND `propertypath` LIKE ?';
$sql .= ' AND `propertyname` in (?) ORDER BY `propertypath`, `propertyname`';

$result = $this->connection->executeQuery(
$sql,
array($this->user->getUID(), $this->connection->escapeLikeParameter(rtrim($path, '/')) . '/%', $requestedProperties),
array(null, null, \Doctrine\DBAL\Connection::PARAM_STR_ARRAY)
);

$oldPath = null;
$props = [];
while ($row = $result->fetch()) {
$path = $row['propertypath'];
if ($oldPath !== $path) {
// save previously gathered props
$this->cache[$oldPath] = $props;
$oldPath = $path;
// prepare props for next path
$props = [];
}
$props[$row['propertyname']] = $row['propertyvalue'];
}
if (!is_null($oldPath)) {
// save props from last run
$this->cache[$oldPath] = $props;
}

$result->closeCursor();
}

}