-
-
Notifications
You must be signed in to change notification settings - Fork 34.9k
bpo-38613: Optimize set operations of dict keys. #16961
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
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
b684ce1
bpo-38613: Optimize set operations of dict keys.
methane ed139f4
code cleanup
methane 0a8241a
Add news entry
methane 4430b6e
Use iter(dict_keys) instead of iter(dict) when dict is subclassed.
methane 86e730b
code cleanup
methane File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
3 changes: 3 additions & 0 deletions
3
Misc/NEWS.d/next/Core and Builtins/2019-10-29-15-44-24.bpo-38613.V_R3NC.rst
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| Optimized some set operations (e.g. ``|``, ``^``, and ``-``) of | ||
| ``dict_keys``. ``d.keys() | other`` was slower than ``set(d) | other`` but | ||
| they are almost same performance for now. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4162,17 +4162,34 @@ static PySequenceMethods dictkeys_as_sequence = { | |
| (objobjproc)dictkeys_contains, /* sq_contains */ | ||
| }; | ||
|
|
||
| // Create an set object from dictviews object. | ||
| // Returns a new reference. | ||
| // This utility function is used by set operations. | ||
| static PyObject* | ||
| dictviews_sub(PyObject* self, PyObject *other) | ||
| dictviews_to_set(PyObject *self) | ||
| { | ||
| PyObject *result = PySet_New(self); | ||
| PyObject *tmp; | ||
| _Py_IDENTIFIER(difference_update); | ||
| PyObject *left = self; | ||
| if (PyDictKeys_Check(self)) { | ||
| // PySet_New() has fast path for the dict object. | ||
| PyObject *dict = (PyObject *)((_PyDictViewObject *)self)->dv_dict; | ||
| if (PyDict_CheckExact(dict)) { | ||
| left = dict; | ||
| } | ||
| } | ||
| return PySet_New(left); | ||
| } | ||
|
|
||
| if (result == NULL) | ||
| static PyObject* | ||
| dictviews_sub(PyObject *self, PyObject *other) | ||
| { | ||
| PyObject *result = dictviews_to_set(self); | ||
| if (result == NULL) { | ||
| return NULL; | ||
| } | ||
|
|
||
| tmp = _PyObject_CallMethodIdOneArg(result, &PyId_difference_update, other); | ||
| _Py_IDENTIFIER(difference_update); | ||
| PyObject *tmp = _PyObject_CallMethodIdOneArg( | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I am wondering whether calling |
||
| result, &PyId_difference_update, other); | ||
| if (tmp == NULL) { | ||
| Py_DECREF(result); | ||
| return NULL; | ||
|
|
@@ -4273,34 +4290,29 @@ _PyDictView_Intersect(PyObject* self, PyObject *other) | |
| static PyObject* | ||
| dictviews_or(PyObject* self, PyObject *other) | ||
| { | ||
| PyObject *result = PySet_New(self); | ||
| PyObject *tmp; | ||
| _Py_IDENTIFIER(update); | ||
|
|
||
| if (result == NULL) | ||
| PyObject *result = dictviews_to_set(self); | ||
| if (result == NULL) { | ||
| return NULL; | ||
| } | ||
|
|
||
| tmp = _PyObject_CallMethodIdOneArg(result, &PyId_update, other); | ||
| if (tmp == NULL) { | ||
| if (_PySet_Update(result, other) < 0) { | ||
| Py_DECREF(result); | ||
| return NULL; | ||
| } | ||
|
|
||
| Py_DECREF(tmp); | ||
| return result; | ||
| } | ||
|
|
||
| static PyObject* | ||
| dictviews_xor(PyObject* self, PyObject *other) | ||
| { | ||
| PyObject *result = PySet_New(self); | ||
| PyObject *tmp; | ||
| _Py_IDENTIFIER(symmetric_difference_update); | ||
|
|
||
| if (result == NULL) | ||
| PyObject *result = dictviews_to_set(self); | ||
| if (result == NULL) { | ||
| return NULL; | ||
| } | ||
|
|
||
| tmp = _PyObject_CallMethodIdOneArg(result, &PyId_symmetric_difference_update, other); | ||
| _Py_IDENTIFIER(symmetric_difference_update); | ||
| PyObject *tmp = _PyObject_CallMethodIdOneArg( | ||
| result, &PyId_symmetric_difference_update, other); | ||
| if (tmp == NULL) { | ||
| Py_DECREF(result); | ||
| return NULL; | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.