From c1ff12e2340a6a1ea2a9032848778af7085ff150 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Wed, 7 Feb 2018 09:35:55 +0100 Subject: [PATCH] CacheJail should apply limit and offset after searching Else the results might not be correct. Signed-off-by: Roeland Jago Douma --- apps/dav/lib/Files/FileSearchBackend.php | 2 +- lib/private/Files/Cache/Wrapper/CacheJail.php | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/apps/dav/lib/Files/FileSearchBackend.php b/apps/dav/lib/Files/FileSearchBackend.php index 965176ddd0..275d3dc8a4 100644 --- a/apps/dav/lib/Files/FileSearchBackend.php +++ b/apps/dav/lib/Files/FileSearchBackend.php @@ -271,7 +271,7 @@ class FileSearchBackend implements ISearchBackend { // TODO offset $limit = $query->limit; $orders = array_map([$this, 'mapSearchOrder'], $query->orderBy); - return new SearchQuery($this->transformSearchOperation($query->where), $limit->maxResults, 0, $orders, $this->user); + return new SearchQuery($this->transformSearchOperation($query->where), (int)$limit->maxResults, 0, $orders, $this->user); } /** diff --git a/lib/private/Files/Cache/Wrapper/CacheJail.php b/lib/private/Files/Cache/Wrapper/CacheJail.php index 1ad00ba44c..75df45e257 100644 --- a/lib/private/Files/Cache/Wrapper/CacheJail.php +++ b/lib/private/Files/Cache/Wrapper/CacheJail.php @@ -29,6 +29,7 @@ namespace OC\Files\Cache\Wrapper; use OC\Files\Cache\Cache; +use OC\Files\Search\SearchQuery; use OCP\Files\Cache\ICacheEntry; use OCP\Files\Search\ISearchQuery; @@ -236,8 +237,14 @@ class CacheJail extends CacheWrapper { } public function searchQuery(ISearchQuery $query) { - $results = $this->getCache()->searchQuery($query); - return $this->formatSearchResults($results); + $simpleQuery = new SearchQuery($query->getSearchOperation(), 0, 0, $query->getOrder(), $query->getUser()); + $results = $this->getCache()->searchQuery($simpleQuery); + $results = $this->formatSearchResults($results); + + $limit = $query->getLimit() === 0 ? NULL : $query->getLimit(); + $results = array_slice($results, $query->getOffset(), $limit); + + return $results; } /**