Skip to content

Commit 267941c

Browse files
committed
Issue python#28201: Dict reduces possibility of 2nd conflict in hash table.
Do perturb shift after first conflict.
1 parent 87845bc commit 267941c

2 files changed

Lines changed: 25 additions & 16 deletions

File tree

‎Misc/NEWS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ What's New in Python 3.6.0 beta 2
1010
Core and Builtins
1111
-----------------
1212

13+
- Issue #28201: Dict reduces possibility of 2nd conflict in hash table when
14+
hashes have same lower bits.
15+
1316
- Issue #28350: String constants with null character no longer interned.
1417

1518
- Issue #26617: Fix crash when GC runs during weakref callbacks.

‎Objects/dictobject.c‎

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ The other half of the strategy is to get the other bits of the hash code
184184
into play. This is done by initializing a (unsigned) vrbl "perturb" to the
185185
full hash code, and changing the recurrence to:
186186
187-
j = (5*j) + 1 + perturb;
188187
perturb >>= PERTURB_SHIFT;
188+
j = (5*j) + 1 + perturb;
189189
use j % 2**i as the next table index;
190190
191191
Now the probe sequence depends (eventually) on every bit in the hash code,
@@ -630,7 +630,7 @@ PyDict_New(void)
630630
static Py_ssize_t
631631
lookdict_index(PyDictKeysObject *k, Py_hash_t hash, Py_ssize_t index)
632632
{
633-
size_t i, perturb;
633+
size_t i;
634634
size_t mask = DK_MASK(k);
635635
Py_ssize_t ix;
636636

@@ -643,7 +643,8 @@ lookdict_index(PyDictKeysObject *k, Py_hash_t hash, Py_ssize_t index)
643643
return DKIX_EMPTY;
644644
}
645645

646-
for (perturb = hash; ; perturb >>= PERTURB_SHIFT) {
646+
for (size_t perturb = hash;;) {
647+
perturb >>= PERTURB_SHIFT;
647648
i = mask & ((i << 2) + i + perturb + 1);
648649
ix = dk_get_index(k, i);
649650
if (ix == index) {
@@ -685,7 +686,7 @@ static Py_ssize_t
685686
lookdict(PyDictObject *mp, PyObject *key,
686687
Py_hash_t hash, PyObject ***value_addr, Py_ssize_t *hashpos)
687688
{
688-
size_t i, perturb, mask;
689+
size_t i, mask;
689690
Py_ssize_t ix, freeslot;
690691
int cmp;
691692
PyDictKeysObject *dk;
@@ -740,7 +741,8 @@ lookdict(PyDictObject *mp, PyObject *key,
740741
freeslot = -1;
741742
}
742743

743-
for (perturb = hash; ; perturb >>= PERTURB_SHIFT) {
744+
for (size_t perturb = hash;;) {
745+
perturb >>= PERTURB_SHIFT;
744746
i = ((i << 2) + i + perturb + 1) & mask;
745747
ix = dk_get_index(dk, i);
746748
if (ix == DKIX_EMPTY) {
@@ -797,7 +799,7 @@ static Py_ssize_t
797799
lookdict_unicode(PyDictObject *mp, PyObject *key,
798800
Py_hash_t hash, PyObject ***value_addr, Py_ssize_t *hashpos)
799801
{
800-
size_t i, perturb;
802+
size_t i;
801803
size_t mask = DK_MASK(mp->ma_keys);
802804
Py_ssize_t ix, freeslot;
803805
PyDictKeyEntry *ep, *ep0 = DK_ENTRIES(mp->ma_keys);
@@ -835,7 +837,8 @@ lookdict_unicode(PyDictObject *mp, PyObject *key,
835837
freeslot = -1;
836838
}
837839

838-
for (perturb = hash; ; perturb >>= PERTURB_SHIFT) {
840+
for (size_t perturb = hash;;) {
841+
perturb >>= PERTURB_SHIFT;
839842
i = mask & ((i << 2) + i + perturb + 1);
840843
ix = dk_get_index(mp->ma_keys, i);
841844
if (ix == DKIX_EMPTY) {
@@ -872,7 +875,7 @@ lookdict_unicode_nodummy(PyDictObject *mp, PyObject *key,
872875
Py_hash_t hash, PyObject ***value_addr,
873876
Py_ssize_t *hashpos)
874877
{
875-
size_t i, perturb;
878+
size_t i;
876879
size_t mask = DK_MASK(mp->ma_keys);
877880
Py_ssize_t ix;
878881
PyDictKeyEntry *ep, *ep0 = DK_ENTRIES(mp->ma_keys);
@@ -905,7 +908,8 @@ lookdict_unicode_nodummy(PyDictObject *mp, PyObject *key,
905908
*value_addr = &ep->me_value;
906909
return ix;
907910
}
908-
for (perturb = hash; ; perturb >>= PERTURB_SHIFT) {
911+
for (size_t perturb = hash;;) {
912+
perturb >>= PERTURB_SHIFT;
909913
i = mask & ((i << 2) + i + perturb + 1);
910914
ix = dk_get_index(mp->ma_keys, i);
911915
assert (ix != DKIX_DUMMY);
@@ -938,7 +942,7 @@ static Py_ssize_t
938942
lookdict_split(PyDictObject *mp, PyObject *key,
939943
Py_hash_t hash, PyObject ***value_addr, Py_ssize_t *hashpos)
940944
{
941-
size_t i, perturb;
945+
size_t i;
942946
size_t mask = DK_MASK(mp->ma_keys);
943947
Py_ssize_t ix;
944948
PyDictKeyEntry *ep, *ep0 = DK_ENTRIES(mp->ma_keys);
@@ -971,7 +975,8 @@ lookdict_split(PyDictObject *mp, PyObject *key,
971975
*value_addr = &mp->ma_values[ix];
972976
return ix;
973977
}
974-
for (perturb = hash; ; perturb >>= PERTURB_SHIFT) {
978+
for (size_t perturb = hash;;) {
979+
perturb >>= PERTURB_SHIFT;
975980
i = mask & ((i << 2) + i + perturb + 1);
976981
ix = dk_get_index(mp->ma_keys, i);
977982
if (ix == DKIX_EMPTY) {
@@ -1064,7 +1069,7 @@ static void
10641069
find_empty_slot(PyDictObject *mp, PyObject *key, Py_hash_t hash,
10651070
PyObject ***value_addr, Py_ssize_t *hashpos)
10661071
{
1067-
size_t i, perturb;
1072+
size_t i;
10681073
size_t mask = DK_MASK(mp->ma_keys);
10691074
Py_ssize_t ix;
10701075
PyDictKeyEntry *ep, *ep0 = DK_ENTRIES(mp->ma_keys);
@@ -1077,7 +1082,8 @@ find_empty_slot(PyDictObject *mp, PyObject *key, Py_hash_t hash,
10771082
mp->ma_keys->dk_lookup = lookdict;
10781083
i = hash & mask;
10791084
ix = dk_get_index(mp->ma_keys, i);
1080-
for (perturb = hash; ix != DKIX_EMPTY; perturb >>= PERTURB_SHIFT) {
1085+
for (size_t perturb = hash; ix != DKIX_EMPTY;) {
1086+
perturb >>= PERTURB_SHIFT;
10811087
i = (i << 2) + i + perturb + 1;
10821088
ix = dk_get_index(mp->ma_keys, i & mask);
10831089
}
@@ -1202,7 +1208,7 @@ static void
12021208
insertdict_clean(PyDictObject *mp, PyObject *key, Py_hash_t hash,
12031209
PyObject *value)
12041210
{
1205-
size_t i, perturb;
1211+
size_t i;
12061212
PyDictKeysObject *k = mp->ma_keys;
12071213
size_t mask = (size_t)DK_SIZE(k)-1;
12081214
PyDictKeyEntry *ep0 = DK_ENTRIES(mp->ma_keys);
@@ -1213,8 +1219,8 @@ insertdict_clean(PyDictObject *mp, PyObject *key, Py_hash_t hash,
12131219
assert(key != NULL);
12141220
assert(PyUnicode_CheckExact(key) || k->dk_lookup == lookdict);
12151221
i = hash & mask;
1216-
for (perturb = hash; dk_get_index(k, i) != DKIX_EMPTY;
1217-
perturb >>= PERTURB_SHIFT) {
1222+
for (size_t perturb = hash; dk_get_index(k, i) != DKIX_EMPTY;) {
1223+
perturb >>= PERTURB_SHIFT;
12181224
i = mask & ((i << 2) + i + perturb + 1);
12191225
}
12201226
ep = &ep0[k->dk_nentries];

0 commit comments

Comments
 (0)