diff options
| author | Carl Schwan <carl@carlschwan.eu> | 2022-09-13 12:23:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-13 12:23:10 +0200 |
| commit | 39ef21a6b8cc91c5a86f7074a06813770e4f5cee (patch) | |
| tree | 76bcfb9c593a39a9f0e7d5db58f3b87ceb919e81 /lib/private | |
| parent | 408359fda20075fcc17eb19dbc7e4411fe99bf6b (diff) | |
| parent | 4d4a6727fc6280aa047d6cbae92f8fa9a91f6312 (diff) | |
| download | nextcloud-server-39ef21a6b8cc91c5a86f7074a06813770e4f5cee.tar.gz nextcloud-server-39ef21a6b8cc91c5a86f7074a06813770e4f5cee.zip | |
Merge pull request #33982 from nextcloud/backport/33788/stable23
[stable23] Improve getting recent files performance
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/Files/Node/Folder.php | 82 |
1 files changed, 55 insertions, 27 deletions
diff --git a/lib/private/Files/Node/Folder.php b/lib/private/Files/Node/Folder.php index 400fd6bedcc..48bc1c60b21 100644 --- a/lib/private/Files/Node/Folder.php +++ b/lib/private/Files/Node/Folder.php @@ -484,37 +484,65 @@ class Folder extends Node implements \OCP\Files\Folder { * @return \OCP\Files\Node[] */ public function getRecent($limit, $offset = 0) { - $query = new SearchQuery( - new SearchBinaryOperator( - // filter out non empty folders - ISearchBinaryOperator::OPERATOR_OR, - [ - new SearchBinaryOperator( - ISearchBinaryOperator::OPERATOR_NOT, - [ - new SearchComparison( - ISearchComparison::COMPARE_EQUAL, - 'mimetype', - FileInfo::MIMETYPE_FOLDER - ), - ] - ), - new SearchComparison( - ISearchComparison::COMPARE_EQUAL, - 'size', - 0 - ), - ] - ), - $limit, - $offset, + $filterOutNonEmptyFolder = new SearchBinaryOperator( + // filter out non empty folders + ISearchBinaryOperator::OPERATOR_OR, [ - new SearchOrder( - ISearchOrder::DIRECTION_DESCENDING, - 'mtime' + new SearchBinaryOperator( + ISearchBinaryOperator::OPERATOR_NOT, + [ + new SearchComparison( + ISearchComparison::COMPARE_EQUAL, + 'mimetype', + FileInfo::MIMETYPE_FOLDER + ), + ] + ), + new SearchComparison( + ISearchComparison::COMPARE_EQUAL, + 'size', + 0 ), ] ); + + $filterNonRecentFiles = new SearchComparison( + ISearchComparison::COMPARE_GREATER_THAN, + 'mtime', + strtotime("-2 week") + ); + if ($offset === 0 && $limit <= 100) { + $query = new SearchQuery( + new SearchBinaryOperator( + ISearchBinaryOperator::OPERATOR_AND, + [ + $filterOutNonEmptyFolder, + $filterNonRecentFiles, + ], + ), + $limit, + $offset, + [ + new SearchOrder( + ISearchOrder::DIRECTION_DESCENDING, + 'mtime' + ), + ] + ); + } else { + $query = new SearchQuery( + $filterOutNonEmptyFolder, + $limit, + $offset, + [ + new SearchOrder( + ISearchOrder::DIRECTION_DESCENDING, + 'mtime' + ), + ] + ); + } + return $this->search($query); } } |