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.

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

fix(TagSearchProvider): Short circuit if no tag matches the query #39062

Merged
merged 2 commits into from
Jul 5, 2023

Conversation

marcelklehr
Copy link
Member

@marcelklehr marcelklehr commented Jun 29, 2023

Summary

Avoids running a full files search if no tag matches in the first place.

Checklist

@juliusknorr juliusknorr added this to the Nextcloud 28 milestone Jun 29, 2023
@juliusknorr
Copy link
Member

Psalm complains about the parameter of getAllTags but otherwise looks reasonable :)

Signed-off-by: Marcel Klehr <mklehr@gmx.net>
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr marcelklehr force-pushed the fix/tag-search-short-circuit-master branch from 42cd266 to 29c0e07 Compare June 30, 2023 10:32
@blizzz blizzz merged commit fc7944f into master Jul 5, 2023
@blizzz blizzz deleted the fix/tag-search-short-circuit-master branch July 5, 2023 13:15
@marcelklehr
Copy link
Member Author

/backport to stable27

@marcelklehr
Copy link
Member Author

/backport to stable26

@marcelklehr
Copy link
Member Author

/backport to stable25

@backportbot-nextcloud
Copy link

The backport to stable27 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable27
git pull origin stable27

# Create the new backport branch
git checkout -b fix/foo-stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

The backport to stable25 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable25
git pull origin stable25

# Create the new backport branch
git checkout -b fix/foo-stable25

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

The backport to stable26 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable26
git pull origin stable26

# Create the new backport branch
git checkout -b fix/foo-stable26

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@miaulalala
Copy link
Contributor

/backport to stable27

@miaulalala
Copy link
Contributor

/backport to stable26

@miaulalala
Copy link
Contributor

/backport to stable25

@marcelklehr
Copy link
Member Author

Fingers crossed you have better luck than me :)

@backportbot-nextcloud
Copy link

The backport to stable26 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable26
git pull origin stable26

# Create the new backport branch
git checkout -b fix/foo-stable26

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

The backport to stable25 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable25
git pull origin stable25

# Create the new backport branch
git checkout -b fix/foo-stable25

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

The backport to stable27 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable27
git pull origin stable27

# Create the new backport branch
git checkout -b fix/foo-stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

kesselb added a commit that referenced this pull request Sep 14, 2023
1. #26813 Initial implementation with support for systemtags and davtags (vcategory)
2. #39062 Additional check if the given tag exists, though ISystemTagManager.getAllTags only looks for systemtags

Therefore it's not possible anymore to search for davtags and unnecessary to join the other tables.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
kesselb added a commit that referenced this pull request Sep 15, 2023
1. #26813 Initial implementation with support for systemtags and davtags (vcategory)
2. #39062 Additional check if the given tag exists, though ISystemTagManager.getAllTags only looks for systemtags

Therefore it's not possible anymore to search for davtags and unnecessary to join the other tables.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
kesselb added a commit that referenced this pull request Sep 15, 2023
1. #26813 Initial implementation with support for systemtags and davtags (vcategory)
2. #39062 Additional check if the given tag exists, though ISystemTagManager.getAllTags only looks for systemtags

Therefore it's not possible anymore to search for davtags and unnecessary to join the other tables.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
backportbot-nextcloud bot pushed a commit that referenced this pull request Sep 15, 2023
1. #26813 Initial implementation with support for systemtags and davtags (vcategory)
2. #39062 Additional check if the given tag exists, though ISystemTagManager.getAllTags only looks for systemtags

Therefore it's not possible anymore to search for davtags and unnecessary to join the other tables.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
backportbot-nextcloud bot pushed a commit that referenced this pull request Sep 15, 2023
1. #26813 Initial implementation with support for systemtags and davtags (vcategory)
2. #39062 Additional check if the given tag exists, though ISystemTagManager.getAllTags only looks for systemtags

Therefore it's not possible anymore to search for davtags and unnecessary to join the other tables.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
backportbot-nextcloud bot pushed a commit that referenced this pull request Sep 15, 2023
1. #26813 Initial implementation with support for systemtags and davtags (vcategory)
2. #39062 Additional check if the given tag exists, though ISystemTagManager.getAllTags only looks for systemtags

Therefore it's not possible anymore to search for davtags and unnecessary to join the other tables.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
kesselb added a commit that referenced this pull request Sep 18, 2023
1. #26813 Initial implementation with support for systemtags and davtags (vcategory)
2. #39062 Additional check if the given tag exists, though ISystemTagManager.getAllTags only looks for systemtags

Therefore it's not possible anymore to search for davtags and unnecessary to join the other tables.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
kesselb added a commit that referenced this pull request Sep 18, 2023
1. #26813 Initial implementation with support for systemtags and davtags (vcategory)
2. #39062 Additional check if the given tag exists, though ISystemTagManager.getAllTags only looks for systemtags

Therefore it's not possible anymore to search for davtags and unnecessary to join the other tables.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
zak39 pushed a commit to arawa/server that referenced this pull request Oct 11, 2023
1. nextcloud#26813 Initial implementation with support for systemtags and davtags (vcategory)
2. nextcloud#39062 Additional check if the given tag exists, though ISystemTagManager.getAllTags only looks for systemtags

Therefore it's not possible anymore to search for davtags and unnecessary to join the other tables.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
kesselb added a commit that referenced this pull request Dec 1, 2023
1. #26813 Initial implementation with support for systemtags and davtags (vcategory)
2. #39062 Additional check if the given tag exists, though ISystemTagManager.getAllTags only looks for systemtags

Therefore it's not possible anymore to search for davtags and unnecessary to join the other tables.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
zak39 pushed a commit to zak39/server that referenced this pull request Dec 19, 2023
1. nextcloud#26813 Initial implementation with support for systemtags and davtags (vcategory)
2. nextcloud#39062 Additional check if the given tag exists, though ISystemTagManager.getAllTags only looks for systemtags

Therefore it's not possible anymore to search for davtags and unnecessary to join the other tables.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants