optimize calendar search query

[jmcclelland]

• Resolves: # Browser tab hangs when loading calendar calendar#4758

Summary

By moving the classification clause to the outer query it returns more quickly and efficiently, avoiding potential time out when viewing calendars with large numbers of items.

Checklist

• Code is properly formatted
• Sign-off message is added to all commits
• Tests (unit, integration, api and/or acceptance) are included
• Screenshots before/after for front-end changes
• Documentation (manuals or wiki) has been updated or is not required
• Backports requested where applicable (ex: critical bugfixes)

[kesselb]

Thanks for your pull request 👍

The failure looks related:

 There was 1 failure:

1) OCA\DAV\Tests\unit\CalDAV\CalDavBackendTest::testSearch with data set #1 (true, array(array(DateTime Object (...), DateTime Object (...))), 2)
Failed asserting that actual size 4 matches expected size 2.

/home/runner/work/server/server/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php:919

[jmcclelland]

Thanks @kesselb , it does seem related. It seems like the test inserts four calendar items, only two of which are public. And it should only return 2 items (the public ones) but with my change it is returning 4 of them.

I'm not sure why. @ChristophWurst - do you have any ideas on why it woudl fail this test?

[jmcclelland]

I think I found the problem. I suspect the where() call clobbered the earlier andWhere() call. @kesselb - is it possible to re-test with the latest change? Thank you!

[kesselb]

I suspect the where() call clobbered the earlier andWhere() call.

Well spotted, where will overwrite/reset andWhere.

is it possible to re-test with the latest change?

Looks good now!

DCO

Can you sign off your commits?

git rebase HEAD~2 --signoff
git push --force-with-lease origin optimize-cal-query

[jmcclelland]

Thanks for the help and feedback. Let me know if there's is anything else I should do.

[ChristophWurst]

Thanks a lot

[st3iny]

Thanks 👍

[st3iny]

Drone failure doesn't seem to be related (acceptance-app-files).

[solracsf]

Seems a good candidate to be backported 👍

[ChristophWurst]

/backport to stable27

[ChristophWurst]

/backport to stable26

[ChristophWurst]

/backport to stable25

[welcome]

Thanks for your first pull request and welcome to the community! Feel free to keep them coming! If you are looking for issues to tackle then have a look at this selection: https://github.com/nextcloud/server/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22

[backportbot-nextcloud]

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]

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]

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

[ChristophWurst]

/backport to stable27

[ChristophWurst]

/backport to stable26

[ChristophWurst]

/backport to stable25