Skip to content

bpo-33712: Create the od_fast_nodes cache in OrderedDict only if needed.#7349

Merged
vstinner merged 1 commit intopython:masterfrom
serhiy-storchaka:odict-od_fast_nodes
Oct 19, 2018
Merged

bpo-33712: Create the od_fast_nodes cache in OrderedDict only if needed.#7349
vstinner merged 1 commit intopython:masterfrom
serhiy-storchaka:odict-od_fast_nodes

Conversation

@serhiy-storchaka
Copy link
Member

@serhiy-storchaka serhiy-storchaka commented Jun 3, 2018 •
edited by bedevere-bot
Loading

vstinner
vstinner reviewed Jun 4, 2018
View reviewed changes
Copy link
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

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

PyMem_FREE should be replaced with PyMem_Free.

PyMem_FREE is just an old alias to PyMem_Free.

@serhiy-storchaka
Copy link
Member Author

serhiy-storchaka commented Jun 5, 2018

This is for consistency with other PyMem_FREE. Do you suggest to replace other PyMem_MALLOC, PyMem_NEW and PyMem_FREE?

@vstinner
Copy link
Member

vstinner commented Jun 5, 2018

Do you suggest to replace other PyMem_MALLOC, PyMem_NEW and PyMem_FREE?

I'm not sure that it's worth it to replace them. I just suggest to avoid old aliases for new code.

This is for consistency with other PyMem_FREE.

It's up to you. It was just a remark.

@vstinner vstinner merged commit 6f17e51 into python:master Oct 19, 2018
@miss-islington
Copy link
Contributor

miss-islington commented Oct 19, 2018

Thanks @serhiy-storchaka for the PR, and @vstinner for merging it 🌮🎉.. I'm working now to backport this PR to: 3.6, 3.7.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

miss-islington commented Oct 19, 2018

Sorry, @serhiy-storchaka and @vstinner, I could not cleanly backport this to 3.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 6f17e51345d930ccb4db306acc12b7d1f6c5e690 3.7

@miss-islington
Copy link
Contributor

miss-islington commented Oct 19, 2018

Sorry, @serhiy-storchaka and @vstinner, I could not cleanly backport this to 3.6 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 6f17e51345d930ccb4db306acc12b7d1f6c5e690 3.6

@miss-islington
Copy link
Contributor

miss-islington commented Oct 19, 2018

Thanks @serhiy-storchaka for the PR, and @vstinner for merging it 🌮🎉.. I'm working now to backport this PR to: 3.6.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

@miss-islington
Copy link
Contributor

miss-islington commented Oct 19, 2018

Thanks @serhiy-storchaka for the PR, and @vstinner for merging it 🌮🎉.. I'm working now to backport this PR to: 3.7.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

miss-islington commented Oct 19, 2018

Sorry, @serhiy-storchaka and @vstinner, I could not cleanly backport this to 3.6 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 6f17e51345d930ccb4db306acc12b7d1f6c5e690 3.6

@miss-islington
Copy link
Contributor

miss-islington commented Oct 19, 2018

Sorry, @serhiy-storchaka and @vstinner, I could not cleanly backport this to 3.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 6f17e51345d930ccb4db306acc12b7d1f6c5e690 3.7

@vstinner
Copy link
Member

vstinner commented Oct 19, 2018

I merged the PR.

vstinner removed needs backport to 3.6 needs backport to 3.7 labels a minute ago

I removed them because I understood that this change is an optimization... but oops, when I looked at https://bugs.python.org/issue33712 it looks more as a bugfix than an optimization.

@serhiy-storchaka: do you want to backport this change manually?

serhiy-storchaka added a commit to serhiy-storchaka/cpython that referenced this pull request Oct 20, 2018
@serhiy-storchaka
[3.7] bpo-33712: OrderedDict only creates od_fast_nodes cache if need…
0bff6f0 
…ed (pythonGH-7349).

(cherry picked from commit 6f17e51)

Co-authored-by: Serhiy Storchaka <[email protected]>
@bedevere-bot
Copy link

bedevere-bot commented Oct 20, 2018

GH-10000 is a backport of this pull request to the 3.7 branch.

serhiy-storchaka added a commit that referenced this pull request Oct 20, 2018
@serhiy-storchaka
bpo-33712: OrderedDict only creates od_fast_nodes cache if needed (GH…
861d34e 
…-7349). (GH-10000)

(cherry picked from commit 6f17e51)
serhiy-storchaka added a commit to serhiy-storchaka/cpython that referenced this pull request Oct 20, 2018
@serhiy-storchaka
[3.6] bpo-33712: OrderedDict only creates od_fast_nodes cache if need…
5b7e8b7 
…ed (pythonGH-7349).

(cherry picked from commit 6f17e51)

Co-authored-by: Serhiy Storchaka <[email protected]>
@serhiy-storchaka serhiy-storchaka deleted the odict-od_fast_nodes branch October 20, 2018 08:36
@bedevere-bot
Copy link

bedevere-bot commented Oct 20, 2018

GH-10001 is a backport of this pull request to the 3.6 branch.

serhiy-storchaka added a commit that referenced this pull request Oct 20, 2018
@serhiy-storchaka
bpo-33712: OrderedDict only creates od_fast_nodes cache if needed (GH…
f1b90e3 
…-7349). (GH-10001)

(cherry picked from commit 6f17e51)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vstinner vstinner vstinner left review comments

@methane methane methane approved these changes

@ericsnowcurrently ericsnowcurrently Awaiting requested review from ericsnowcurrently

Assignees

@vstinner vstinner

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@serhiy-storchaka @vstinner @miss-islington @bedevere-bot @methane @the-knights-who-say-ni