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

Refactor Resource.resolve to avoid linear search of methods #9899

Merged
merged 11 commits into from
Nov 15, 2024

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Nov 15, 2024

The average time complexity of Resource.resolve is now O(1) instead of O(number_of_methods)

#2779 (comment)

Looks to be
~14% faster with a single method
~2.5x faster for the multiple methods

Screenshot 2024-11-15 at 8 30 25 AM

Copy link

codecov bot commented Nov 15, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.71%. Comparing base (7180ea8) to head (3f401b5).

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #9899      +/-   ##
==========================================
- Coverage   98.71%   98.71%   -0.01%     
==========================================
  Files         119      119              
  Lines       36386    36385       -1     
  Branches     4323     4322       -1     
==========================================
- Hits        35918    35917       -1     
  Misses        315      315              
  Partials      153      153              
Flag Coverage Δ
CI-GHA 98.60% <100.00%> (-0.01%) ⬇️
OS-Linux 98.29% <100.00%> (-0.01%) ⬇️
OS-Windows 96.09% <100.00%> (-0.01%) ⬇️
OS-macOS 97.38% <100.00%> (+<0.01%) ⬆️
Py-3.10.11 97.22% <100.00%> (+<0.01%) ⬆️
Py-3.10.15 97.82% <100.00%> (+0.05%) ⬆️
Py-3.11.10 97.81% <100.00%> (-0.01%) ⬇️
Py-3.11.9 97.26% <100.00%> (-0.02%) ⬇️
Py-3.12.7 98.30% <100.00%> (-0.05%) ⬇️
Py-3.13.0 98.29% <100.00%> (-0.01%) ⬇️
Py-3.9.13 97.14% <100.00%> (-0.01%) ⬇️
Py-3.9.20 97.73% <100.00%> (-0.01%) ⬇️
Py-pypy7.3.16 97.30% <100.00%> (-0.01%) ⬇️
VM-macos 97.38% <100.00%> (+<0.01%) ⬆️
VM-ubuntu 98.29% <100.00%> (-0.01%) ⬇️
VM-windows 96.09% <100.00%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@bdraco bdraco added the backport-3.12 Trigger automatic backporting to the 3.12 release branch by Patchback robot label Nov 15, 2024
Copy link

codspeed-hq bot commented Nov 15, 2024

CodSpeed Performance Report

Merging #9899 will not alter performance

Comparing route_search_linear (03ddda1) with master (7180ea8)

Summary

✅ 26 untouched benchmarks

@bdraco
Copy link
Member Author

bdraco commented Nov 15, 2024

__slots__ should be a separate PR, only added here to test performance change

aiohttp/web_urldispatcher.py Outdated Show resolved Hide resolved
aiohttp/web_urldispatcher.py Outdated Show resolved Hide resolved
Copy link
Member

@asvetlov asvetlov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.
Regarding or vs getting with default -- up to you.
Getting with the default looks a little better, the speed on macro benchmark should be roughly the same I guess.

@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Nov 15, 2024
@bdraco bdraco changed the title DNM: Refactor Resource.resolve to avoid linear search of methods Refactor Resource.resolve to avoid linear search of methods Nov 15, 2024
@bdraco
Copy link
Member Author

bdraco commented Nov 15, 2024

resolve_311

Tiny sample size from production testing.

Nice speed up there.

StaticResource.resolve the highest resolve on the profile now .... allowed_methods = set(self._routes) in there probably isn't helping but thats for another PR

@bdraco bdraco marked this pull request as ready for review November 15, 2024 14:47
@bdraco bdraco merged commit 2249f2d into master Nov 15, 2024
40 of 41 checks passed
@bdraco bdraco deleted the route_search_linear branch November 15, 2024 14:47
Copy link
Contributor

patchback bot commented Nov 15, 2024

Backport to 3.11: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 2249f2d on top of patchback/backports/3.11/2249f2d59d30b7992e3a2ea25ab790c6f621b5cb/pr-9899

Backporting merged PR #9899 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.11/2249f2d59d30b7992e3a2ea25ab790c6f621b5cb/pr-9899 upstream/3.11
  4. Now, cherry-pick PR Refactor Resource.resolve to avoid linear search of methods #9899 contents into that branch:
    $ git cherry-pick -x 2249f2d59d30b7992e3a2ea25ab790c6f621b5cb
    If it'll yell at you with something like fatal: Commit 2249f2d59d30b7992e3a2ea25ab790c6f621b5cb is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 2249f2d59d30b7992e3a2ea25ab790c6f621b5cb
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Refactor Resource.resolve to avoid linear search of methods #9899 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/2249f2d59d30b7992e3a2ea25ab790c6f621b5cb/pr-9899
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Copy link
Contributor

patchback bot commented Nov 15, 2024

Backport to 3.12: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 2249f2d on top of patchback/backports/3.12/2249f2d59d30b7992e3a2ea25ab790c6f621b5cb/pr-9899

Backporting merged PR #9899 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.12/2249f2d59d30b7992e3a2ea25ab790c6f621b5cb/pr-9899 upstream/3.12
  4. Now, cherry-pick PR Refactor Resource.resolve to avoid linear search of methods #9899 contents into that branch:
    $ git cherry-pick -x 2249f2d59d30b7992e3a2ea25ab790c6f621b5cb
    If it'll yell at you with something like fatal: Commit 2249f2d59d30b7992e3a2ea25ab790c6f621b5cb is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 2249f2d59d30b7992e3a2ea25ab790c6f621b5cb
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Refactor Resource.resolve to avoid linear search of methods #9899 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.12/2249f2d59d30b7992e3a2ea25ab790c6f621b5cb/pr-9899
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot backport-3.12 Trigger automatic backporting to the 3.12 release branch by Patchback robot bot:chronographer:provided There is a change note present in this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants