Skip to content

gh-141510: Add frozendict fast-path to the set type #144912

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
vstinner merged 4 commits into from
Feb 18, 2026
Merged

gh-141510: Add frozendict fast-path to the set type #144912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2601647
gh-141510: Add frozendict fast-path to the set type
vstinner Feb 17, 2026
5e9b898
Avoid locking for frozendict
vstinner Feb 17, 2026
5ce1ed0
Add missing critical sections
vstinner Feb 17, 2026
4ed37f6
Add #ifdef Py_DEBUG
vstinner Feb 17, 2026
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
13 changes: 12 additions & 1 deletion Lib/test/test_set.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,10 @@ def test_symmetric_difference(self):
self.assertEqual(type(i), self.basetype)
self.assertRaises(PassThru, self.s.symmetric_difference, check_pass_thru())
self.assertRaises(TypeError, self.s.symmetric_difference, [[]])
for C in set, frozenset, dict.fromkeys, str, list, tuple:
constructors = (set, frozenset,
dict.fromkeys, frozendict.fromkeys,
str, list, tuple)
for C in constructors:
self.assertEqual(self.thetype('abcba').symmetric_difference(C('cdc')), set('abd'))
self.assertEqual(self.thetype('abcba').symmetric_difference(C('efgfe')), set('abcefg'))
self.assertEqual(self.thetype('abcba').symmetric_difference(C('ccb')), set('a'))
Expand Down Expand Up @@ -1591,6 +1594,14 @@ def setUp(self):

#------------------------------------------------------------------------------

class TestOnlySetsFrozenDict(TestOnlySetsInBinaryOps, unittest.TestCase):
def setUp(self):
self.set = set((1, 2, 3))
self.other = frozendict({1:2, 3:4})
self.otherIsIterable = True

#------------------------------------------------------------------------------

class TestOnlySetsOperator(TestOnlySetsInBinaryOps, unittest.TestCase):
def setUp(self):
self.set = set((1, 2, 3))
Expand Down
35 changes: 29 additions & 6 deletions Objects/setobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1183,10 +1183,14 @@ set_iter(PyObject *so)
static int
set_update_dict_lock_held(PySetObject *so, PyObject *other)
{
assert(PyDict_CheckExact(other));
assert(PyAnyDict_CheckExact(other));

_Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(so);
_Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(other);
#ifdef Py_DEBUG
if (!PyFrozenDict_CheckExact(other)) {
_Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(other);
}
#endif

/* Do one big resize at the start, rather than
* incrementally resizing as we insert new keys. Expect
Expand Down Expand Up @@ -1242,7 +1246,7 @@ set_update_lock_held(PySetObject *so, PyObject *other)
if (PyAnySet_Check(other)) {
return set_merge_lock_held(so, other);
}
else if (PyDict_CheckExact(other)) {
else if (PyAnyDict_CheckExact(other)) {
return set_update_dict_lock_held(so, other);
}
return set_update_iterable_lock_held(so, other);
Expand All @@ -1267,6 +1271,9 @@ set_update_local(PySetObject *so, PyObject *other)
Py_END_CRITICAL_SECTION();
return rv;
}
else if (PyFrozenDict_CheckExact(other)) {
return set_update_dict_lock_held(so, other);
}
return set_update_iterable_lock_held(so, other);
}

Expand All @@ -1290,6 +1297,13 @@ set_update_internal(PySetObject *so, PyObject *other)
Py_END_CRITICAL_SECTION2();
return rv;
}
else if (PyFrozenDict_CheckExact(other)) {
int rv;
Py_BEGIN_CRITICAL_SECTION(so);
rv = set_update_dict_lock_held(so, other);
Py_END_CRITICAL_SECTION();
return rv;
}
else {
int rv;
Py_BEGIN_CRITICAL_SECTION(so);
Expand Down Expand Up @@ -2030,7 +2044,7 @@ set_difference(PySetObject *so, PyObject *other)
if (PyAnySet_Check(other)) {
other_size = PySet_GET_SIZE(other);
}
else if (PyDict_CheckExact(other)) {
else if (PyAnyDict_CheckExact(other)) {
other_size = PyDict_GET_SIZE(other);
}
else {
Expand All @@ -2047,7 +2061,7 @@ set_difference(PySetObject *so, PyObject *other)
if (result == NULL)
return NULL;

if (PyDict_CheckExact(other)) {
if (PyAnyDict_CheckExact(other)) {
while (set_next(so, &pos, &entry)) {
key = entry->key;
hash = entry->hash;
Expand Down Expand Up @@ -2169,7 +2183,11 @@ static int
set_symmetric_difference_update_dict(PySetObject *so, PyObject *other)
{
_Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(so);
_Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(other);
#ifdef Py_DEBUG
if (!PyFrozenDict_CheckExact(other)) {
_Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(other);
}
#endif

Py_ssize_t pos = 0;
PyObject *key, *value;
Expand Down Expand Up @@ -2243,6 +2261,11 @@ set_symmetric_difference_update_impl(PySetObject *so, PyObject *other)
rv = set_symmetric_difference_update_dict(so, other);
Py_END_CRITICAL_SECTION2();
}
else if (PyFrozenDict_CheckExact(other)) {
Py_BEGIN_CRITICAL_SECTION(so);
rv = set_symmetric_difference_update_dict(so, other);
Py_END_CRITICAL_SECTION();
}
else if (PyAnySet_Check(other)) {
Py_BEGIN_CRITICAL_SECTION2(so, other);
rv = set_symmetric_difference_update_set(so, (PySetObject *)other);
Expand Down
Loading