Skip to content
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

Jump to bottom

[21] generate a better optimized query for path prefix search filters #29080

Merged
merged 1 commit into from
Oct 13, 2021
Merged

[21] generate a better optimized query for path prefix search filters #29080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions lib/private/Files/Cache/Cache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,7 +800,7 @@ public function search($pattern) {
* @param IResult $result
* @return CacheEntry[]
*/
private function searchResultToCacheEntries(IResult $result): array {
protected function searchResultToCacheEntries(IResult $result): array {
$files = $result->fetchAll();

return array_map(function (array $data) {
Expand Down Expand Up @@ -837,7 +837,7 @@ public function searchByMime($mimetype) {
}, $files);
}

public function searchQuery(ISearchQuery $searchQuery) {
protected function buildSearchQuery(ISearchQuery $searchQuery): IQueryBuilder {
$builder = $this->getQueryBuilder();

$query = $builder->selectFileCache('file');
Expand Down Expand Up @@ -877,6 +877,12 @@ public function searchQuery(ISearchQuery $searchQuery) {
$query->setFirstResult($searchQuery->getOffset());
}

return $query;
}

public function searchQuery(ISearchQuery $searchQuery) {
$query = $this->buildSearchQuery($searchQuery);

$result = $query->execute();
$cacheEntries = $this->searchResultToCacheEntries($result);
$result->closeCursor();
Expand Down
40 changes: 16 additions & 24 deletions lib/private/Files/Cache/Wrapper/CacheJail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,10 @@
namespace OC\Files\Cache\Wrapper;

use OC\Files\Cache\Cache;
use OC\Files\Search\SearchBinaryOperator;
use OC\Files\Search\SearchComparison;
use OC\Files\Cache\QuerySearchHelper;
use OC\Files\Search\SearchQuery;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\Files\Cache\ICacheEntry;
use OCP\Files\Search\ISearchBinaryOperator;
use OCP\Files\Search\ISearchComparison;
use OCP\Files\Search\ISearchQuery;

/**
Expand Down Expand Up @@ -63,6 +60,7 @@ public function __construct($cache, $root) {
} else {
$this->unjailedRoot = $root;
}
$this->querySearchHelper = new QuerySearchHelper($this->mimetypeLoader);
}

protected function getRoot() {
Expand Down Expand Up @@ -260,7 +258,7 @@ public function search($pattern) {
->whereStorageId()
->andWhere($query->expr()->orX(
$query->expr()->like('path', $query->createNamedParameter($this->getGetUnjailedRoot() . '/%')),
$query->expr()->eq('path_hash', $query->createNamedParameter(md5($this->getGetUnjailedRoot()))),
$query->expr()->eq('path', $query->createNamedParameter($this->getGetUnjailedRoot())),
))
->andWhere($query->expr()->iLike('name', $query->createNamedParameter($pattern)));

Expand Down Expand Up @@ -292,7 +290,7 @@ public function searchByMime($mimetype) {
->whereStorageId()
->andWhere($query->expr()->orX(
$query->expr()->like('path', $query->createNamedParameter($this->getGetUnjailedRoot() . '/%')),
$query->expr()->eq('path_hash', $query->createNamedParameter(md5($this->getGetUnjailedRoot()))),
$query->expr()->eq('path', $query->createNamedParameter($this->getGetUnjailedRoot())),
));

if (strpos($mimetype, '/')) {
Expand All @@ -311,27 +309,21 @@ public function searchByMime($mimetype) {
return $this->formatSearchResults($results);
}

public function searchQuery(ISearchQuery $query) {
public function searchQuery(ISearchQuery $searchQuery) {
if ($this->getGetUnjailedRoot() === '' || $this->getGetUnjailedRoot() === '/') {
return parent::searchQuery($query);
return parent::searchQuery($searchQuery);
}

$prefixFilter = new SearchComparison(
ISearchComparison::COMPARE_LIKE,
'path',
$this->getGetUnjailedRoot() . '/%'
);
$rootFilter = new SearchComparison(
ISearchComparison::COMPARE_EQUAL,
'path',
$this->getGetUnjailedRoot()
);
$operation = new SearchBinaryOperator(
ISearchBinaryOperator::OPERATOR_AND,
[new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_OR, [$prefixFilter, $rootFilter]) , $query->getSearchOperation()]
);
$simpleQuery = new SearchQuery($operation, $query->getLimit(), $query->getOffset(), $query->getOrder(), $query->getUser());
$results = $this->getCache()->searchQuery($simpleQuery);
$query = $this->buildSearchQuery($searchQuery);

$query->andWhere($query->expr()->orX(
$query->expr()->like('path', $query->createNamedParameter($this->getGetUnjailedRoot() . '/%')),
$query->expr()->eq('path', $query->createNamedParameter($this->getGetUnjailedRoot())),
));

$result = $query->execute();
$results = $this->searchResultToCacheEntries($result);
$result->closeCursor();
return $this->formatSearchResults($results);
}

Expand Down