Skip to content

[stable26] use more efficient tag retrieval on DAV report request #39232

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
juliusknorr merged 14 commits into from
Jul 10, 2023
Merged

[stable26] use more efficient tag retrieval on DAV report request #39232

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b172df6
use efficient tag retrieval on DAV report request
blizzz Apr 28, 2023
c33f728
fix: change if with conditionless else to switch; and a parameter value
blizzz May 11, 2023
48c92ad
fix: favorites view and universal search against tags
blizzz May 11, 2023
6d249b5
fix: ensure searchBySystemTag() is available
blizzz May 11, 2023
b0ec34f
chore: cleanup unused code
blizzz May 11, 2023
3ed878a
fix: no search when LazyFolder was provided
blizzz May 12, 2023
bb165d3
fix: search with more than one search tags
blizzz Jun 2, 2023
0b4db60
fix: include invisible tags for admins
blizzz Jun 15, 2023
749efc1
fix: cominbation of small fixes
blizzz Jun 21, 2023
eeb7646
fix: obey offset and limit for results from favs and circles
blizzz Jun 21, 2023
22c417d
fix: use array_unitersect against objects
blizzz Jun 21, 2023
dfbedda
refactor: save unnecessary method_exists
blizzz Jun 21, 2023
db1306b
fix: cannot apply limit+offset on multi-tag-search
blizzz Jun 27, 2023
fc9fd0d
refactor: adjust to unexposed searchBySystemTag
blizzz Jul 6, 2023
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
refactor: adjust to unexposed searchBySystemTag 
- in this backport we have to drop the breaking addition in
  \OCP\Files\Folder
- this requires adjustments in check for the existance of the method but
  also in testing
- another change in \OCP\SystemTag\ISystemTagManager can be applied as
  this interface is not implemented elsewhere

Signed-off-by: Arthur Schiwon <[email protected]>
  • Loading branch information
@blizzz
blizzz committed Jul 7, 2023
commit fc9fd0d7f2ce12e21568773e9cf8a990eb3c6fd0
2 changes: 1 addition & 1 deletion apps/dav/lib/Connector/Sabre/FilesReportPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ protected function processFilterRulesForFileNodes(array $filterRules, ?int $limi

// type check to ensure searchBySystemTag is available, it is not
// exposed in API yet
if (!empty($systemTagIds)) {
if (!empty($systemTagIds) && method_exists($this->userFolder, 'searchBySystemTag')) {
$tags = $this->tagManager->getTagsByIds($systemTagIds, $this->userSession->getUser());

// For we run DB queries per tag and require intersection, we cannot apply limit and offset for DB queries on multi tag search.
Expand Down
2 changes: 2 additions & 0 deletions apps/dav/tests/unit/Connector/Sabre/FilesReportPluginTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ protected function setUp(): void {

$this->userFolder = $this->getMockBuilder(Folder::class)
->disableOriginalConstructor()
->addMethods(['searchBySystemTag'])
->onlyMethods(get_class_methods(Folder::class))
->getMock();

$this->previewManager = $this->getMockBuilder(IPreview::class)
Expand Down
4 changes: 4 additions & 0 deletions lib/private/Files/Node/LazyFolder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,10 @@ public function searchByTag($tag, $userId) {
return $this->__call(__FUNCTION__, func_get_args());
}

public function searchBySystemTag(string $tagName, string $userId, int $limit = 0, int $offset = 0): array {
return $this->__call(__FUNCTION__, func_get_args());
}

/**
* @inheritDoc
*/
Expand Down
2 changes: 1 addition & 1 deletion lib/public/SystemTag/ISystemTagManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ interface ISystemTagManager {
* @throws TagNotFoundException if at least one given tag ids did no exist
* The message contains a json_encoded array of the ids that could not be found
*
* @since 9.0.0, optional parameter $user added in 28.0.0
* @since 9.0.0, optional parameter $user added in 26.0.4
*/
public function getTagsByIds($tagIds, ?IUser $user = null): array;

Expand Down