mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

limit constructing of result objects in file search 

even thought we currently have no proper way of limiting the search itself, we can at least limit the construction of the result objects.

this saves about 40% of the time spend in the search request in my local testing

Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2021-03-10 18:46:18 +01:00 committed by Vincent Petry
parent 0e30c82f30
commit df77c7d37c
No known key found for this signature in database
GPG Key ID: E055D6A4D513575C
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/private/Search/Provider/File.php
View File

@ -29,20 +29,31 @@
namespace OC\Search\Provider; namespace OC\Search\Provider;
use OC\Files\Filesystem; use OC\Files\Filesystem;
use OCP\Search\PagedProvider;
/** /**
* Provide search results from the 'files' app * Provide search results from the 'files' app
*/ */
class File extends \OCP\Search\Provider { class File extends PagedProvider {
/** /**
* Search for files and folders matching the given query * Search for files and folders matching the given query
*
* @param string $query * @param string $query
* @return \OCP\Search\Result * @param int|null $limit
* @param int|null $offset
* @return \OCP\Search\Result[]
*/ */
public function search($query) { public function search($query, int $limit = null, int $offset = null) {
if ($offset === null) {
$offset = 0;
}
\OC_Util::setupFS();
$files = Filesystem::search($query); $files = Filesystem::search($query);
$results = []; $results = [];
if ($limit !== null) {
$files = array_slice($files, $offset, $offset + $limit);
}
// edit results // edit results
foreach ($files as $fileData) { foreach ($files as $fileData) {
// skip versions // skip versions
@ -75,4 +86,12 @@ class File extends \OCP\Search\Provider {
// return // return
return $results; return $results;
} }
public function searchPaged($query, $page, $size) {
if ($size === 0) {
return $this->search($query);
} else {
return $this->search($query, $size, ($page - 1) * $size);
}
}
} }