Skip to content

bpo-46721: Optimize set.issuperset() for non-set arguments #31280

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.

Sign up for GitHub

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
serhiy-storchaka merged 3 commits into from
Apr 6, 2022
Merged

bpo-46721: Optimize set.issuperset() for non-set arguments #31280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97fc47c
bpo-46721: Optimize set.issuperset() for non-set arguments
serhiy-storchaka Feb 11, 2022
0f0af5a
Merge branch 'main' into set-issuperset
serhiy-storchaka Feb 11, 2022
a246b55
Merge branch 'main' into set-issuperset
serhiy-storchaka Mar 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2022-02-11-17-16-30.bpo-46721.JkHaLF.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Optimize :meth:`set.issuperset` for non-set argument.
39 changes: 23 additions & 16 deletions Objects/setobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1378,14 +1378,7 @@ set_isdisjoint(PySetObject *so, PyObject *other)
return NULL;

while ((key = PyIter_Next(it)) != NULL) {
Py_hash_t hash = PyObject_Hash(key);

if (hash == -1) {
Py_DECREF(key);
Py_DECREF(it);
return NULL;
}
rv = set_contains_entry(so, key, hash);
rv = set_contains_key(so, key);
Py_DECREF(key);
if (rv < 0) {
Py_DECREF(it);
Expand Down Expand Up @@ -1769,17 +1762,31 @@ PyDoc_STRVAR(issubset_doc, "Report whether another set contains this set.");
static PyObject *
set_issuperset(PySetObject *so, PyObject *other)
{
PyObject *tmp, *result;
if (PyAnySet_Check(other)) {
return set_issubset((PySetObject *)other, (PyObject *)so);
}

if (!PyAnySet_Check(other)) {
tmp = make_new_set(&PySet_Type, other);
if (tmp == NULL)
PyObject *key, *it = PyObject_GetIter(other);
if (it == NULL) {
return NULL;
}
while ((key = PyIter_Next(it)) != NULL) {
int rv = set_contains_key(so, key);
Py_DECREF(key);
if (rv < 0) {
Py_DECREF(it);
return NULL;
result = set_issuperset(so, tmp);
Py_DECREF(tmp);
return result;
}
if (!rv) {
Py_DECREF(it);
Py_RETURN_FALSE;
}
}
return set_issubset((PySetObject *)other, (PyObject *)so);
Py_DECREF(it);
if (PyErr_Occurred()) {
return NULL;
}
Py_RETURN_TRUE;
}

PyDoc_STRVAR(issuperset_doc, "Report whether this set contains another set.");
Expand Down