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

Small performance improvement to handling redirects #9467

Merged
merged 1 commit into from
Oct 11, 2024
Merged

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Oct 11, 2024

Reverse the conditional so the origin is only checked if not is_same_host_https_redirect

Calling .origin() is a bit expensive #7583 (comment)

Reverse the conditional so the origin is only checked if not is_same_host_https_redirect
@bdraco bdraco added bot:chronographer:skip This PR does not need to include a change note backport-3.10 Trigger automatic backporting to the 3.10 release branch by Patchback robot backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Oct 11, 2024
Copy link

codecov bot commented Oct 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.59%. Comparing base (c1dc794) to head (7017561).

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #9467   +/-   ##
=======================================
  Coverage   98.59%   98.59%           
=======================================
  Files         105      105           
  Lines       35089    35089           
  Branches     4178     4178           
=======================================
  Hits        34595    34595           
  Misses        329      329           
  Partials      165      165           
Flag Coverage Δ
CI-GHA 98.47% <ø> (ø)
OS-Linux 98.14% <ø> (ø)
OS-Windows 96.53% <ø> (ø)
OS-macOS 97.84% <ø> (+<0.01%) ⬆️
Py-3.10.11 97.71% <ø> (+<0.01%) ⬆️
Py-3.10.15 97.63% <ø> (ø)
Py-3.11.10 97.70% <ø> (ø)
Py-3.11.9 97.78% <ø> (-0.02%) ⬇️
Py-3.12.7 98.19% <ø> (ø)
Py-3.13.0 98.17% <ø> (ø)
Py-3.9.13 97.60% <ø> (ø)
Py-3.9.20 97.53% <ø> (ø)
Py-pypy7.3.16 97.16% <ø> (ø)
VM-macos 97.84% <ø> (+<0.01%) ⬆️
VM-ubuntu 98.14% <ø> (ø)
VM-windows 96.53% <ø> (ø)

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 marked this pull request as ready for review October 11, 2024 14:18
@bdraco bdraco requested a review from asvetlov as a code owner October 11, 2024 14:18
@bdraco bdraco merged commit 2b13e3b into master Oct 11, 2024
41 of 42 checks passed
@bdraco bdraco deleted the redirect_perf branch October 11, 2024 14:19
Copy link
Contributor

patchback bot commented Oct 11, 2024

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

❌ Failed to cleanly apply 2b13e3b on top of patchback/backports/3.10/2b13e3bd340c831ba44f29fb9a8592806971adff/pr-9467

Backporting merged PR #9467 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.10/2b13e3bd340c831ba44f29fb9a8592806971adff/pr-9467 upstream/3.10
  4. Now, cherry-pick PR Small performance improvement to handling redirects #9467 contents into that branch:
    $ git cherry-pick -x 2b13e3bd340c831ba44f29fb9a8592806971adff
    If it'll yell at you with something like fatal: Commit 2b13e3bd340c831ba44f29fb9a8592806971adff is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 2b13e3bd340c831ba44f29fb9a8592806971adff
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Small performance improvement to handling redirects #9467 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.10/2b13e3bd340c831ba44f29fb9a8592806971adff/pr-9467
  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 Oct 11, 2024

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

❌ Failed to cleanly apply 2b13e3b on top of patchback/backports/3.11/2b13e3bd340c831ba44f29fb9a8592806971adff/pr-9467

Backporting merged PR #9467 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/2b13e3bd340c831ba44f29fb9a8592806971adff/pr-9467 upstream/3.11
  4. Now, cherry-pick PR Small performance improvement to handling redirects #9467 contents into that branch:
    $ git cherry-pick -x 2b13e3bd340c831ba44f29fb9a8592806971adff
    If it'll yell at you with something like fatal: Commit 2b13e3bd340c831ba44f29fb9a8592806971adff is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 2b13e3bd340c831ba44f29fb9a8592806971adff
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Small performance improvement to handling redirects #9467 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/2b13e3bd340c831ba44f29fb9a8592806971adff/pr-9467
  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.

@bdraco bdraco removed backport-3.10 Trigger automatic backporting to the 3.10 release branch by Patchback robot backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Oct 11, 2024
@bdraco
Copy link
Member Author

bdraco commented Oct 11, 2024

Looks like this is only in master anyways

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot:chronographer:skip This PR does not need to include a change note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant