Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-29949: Fix set memory usage regression (GH-943) 

Revert "Minor factoring:  move redundant resize scaling logic into the resize function."

This reverts commit 4897300276.
This commit is contained in:
INADA Naoki 2017-04-01 17:20:25 +09:00 committed by GitHub
parent cd815edf01
commit e82cf8675b
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -10,6 +10,8 @@ What's New in Python 3.7.0 alpha 1?
Core and Builtins Core and Builtins
----------------- -----------------
- bpo-29949: Fix memory usage regression of set and frozenset object.
- bpo-29935: Fixed error messages in the index() method of tuple, list and deque - bpo-29935: Fixed error messages in the index() method of tuple, list and deque
when pass indices of wrong type. when pass indices of wrong type.

11
Objects/setobject.c
View File

@ -236,7 +236,7 @@ set_add_entry(PySetObject *so, PyObject *key, Py_hash_t hash)
entry->hash = hash; entry->hash = hash;
if ((size_t)so->fill*5 < mask*3) if ((size_t)so->fill*5 < mask*3)
return 0; return 0;
return set_table_resize(so, so->used); return set_table_resize(so, so->used>50000 ? so->used*2 : so->used*4);
found_active: found_active:
Py_DECREF(key); Py_DECREF(key);
@ -302,7 +302,6 @@ set_table_resize(PySetObject *so, Py_ssize_t minused)
setentry small_copy[PySet_MINSIZE]; setentry small_copy[PySet_MINSIZE];
assert(minused >= 0); assert(minused >= 0);
minused = (minused > 50000) ? minused * 2 : minused * 4;
/* Find the smallest table size > minused. */ /* Find the smallest table size > minused. */
/* XXX speed-up with intrinsics */ /* XXX speed-up with intrinsics */
@ -643,8 +642,8 @@ set_merge(PySetObject *so, PyObject *otherset)
* that there will be no (or few) overlapping keys. * that there will be no (or few) overlapping keys.
*/ */
if ((so->fill + other->used)*5 >= so->mask*3) { if ((so->fill + other->used)*5 >= so->mask*3) {
if (set_table_resize(so, so->used + other->used) != 0) if (set_table_resize(so, (so->used + other->used)*2) != 0)
return -1; return -1;
} }
so_entry = so->table; so_entry = so->table;
other_entry = other->table; other_entry = other->table;
@ -987,7 +986,7 @@ set_update_internal(PySetObject *so, PyObject *other)
if (dictsize < 0) if (dictsize < 0)
return -1; return -1;
if ((so->fill + dictsize)*5 >= so->mask*3) { if ((so->fill + dictsize)*5 >= so->mask*3) {
if (set_table_resize(so, so->used + dictsize) != 0) if (set_table_resize(so, (so->used + dictsize)*2) != 0)
return -1; return -1;
} }
while (_PyDict_Next(other, &pos, &key, &value, &hash)) { while (_PyDict_Next(other, &pos, &key, &value, &hash)) {
@ -1507,7 +1506,7 @@ set_difference_update_internal(PySetObject *so, PyObject *other)
/* If more than 1/4th are dummies, then resize them away. */ /* If more than 1/4th are dummies, then resize them away. */
if ((size_t)(so->fill - so->used) <= (size_t)so->mask / 4) if ((size_t)(so->fill - so->used) <= (size_t)so->mask / 4)
return 0; return 0;
return set_table_resize(so, so->used); return set_table_resize(so, so->used>50000 ? so->used*2 : so->used*4);
} }
static PyObject * static PyObject *