Skip to content

C
cpython
Commit a4f8a975 authored by Guido van Rossum's avatar Guido van Rossum
Browse files
Options

Forget keeping track of whether a dictionary contains all interned 

string keys.  Just doing a pointer compare before the string compare
(in fact before the hash compare!) is just as fast.
parent a4f7dbc4
Hide whitespace changes
Inline Side-by-side
Showing with 110 additions and 178 deletions
Objects/dictobject.c
View file @ a4f8a975
...@@ -87,9 +87,6 @@ typedef struct { ...@@ -87,9 +87,6 @@ typedef struct {
int ma_fill; int ma_fill;
int ma_used; int ma_used;
int ma_size; int ma_size;
#ifdef INTERN_STRINGS
int ma_fast;
#endif
mappingentry *ma_table; mappingentry *ma_table;
} mappingobject; } mappingobject;
...@@ -109,9 +106,6 @@ newmappingobject() ...@@ -109,9 +106,6 @@ newmappingobject()
mp->ma_table = NULL; mp->ma_table = NULL;
mp->ma_fill = 0; mp->ma_fill = 0;
mp->ma_used = 0; mp->ma_used = 0;
#ifdef INTERN_STRINGS
mp->ma_fast = 1;
#endif
return (object *)mp; return (object *)mp;
} }
...@@ -169,80 +163,38 @@ lookmapping(mp, key, hash) ...@@ -169,80 +163,38 @@ lookmapping(mp, key, hash)
unsigned long sum; unsigned long sum;
int incr; int incr;
int size; int size;
#ifdef INTERN_STRINGS
int fast;
#endif
ep = &mp->ma_table[(unsigned long)hash%mp->ma_size]; ep = &mp->ma_table[(unsigned long)hash%mp->ma_size];
ekey = ep->me_key; ekey = ep->me_key;
if (ekey == NULL) if (ekey == NULL)
return ep; return ep;
#ifdef INTERN_STRINGS #ifdef INTERN_STRINGS
if ((fast = mp->ma_fast)) { {
object *ikey; object *ikey;
if (!is_stringobject(key) || if (is_stringobject(key) &&
(ikey = ((stringobject *)key)->ob_sinterned) == NULL) (ikey = ((stringobject *)key)->ob_sinterned) != NULL)
fast = 0;
else
key = ikey; key = ikey;
} }
#endif #endif
if (ekey == dummy) if (ekey == dummy)
freeslot = ep; freeslot = ep;
else { else {
#ifdef INTERN_STRINGS if (ekey == key)
if (fast) { return ep;
if (ekey == key) if (ep->me_hash == hash && cmpobject(ekey, key) == 0)
return ep; return ep;
}
else
#endif
{
if (ep->me_hash == hash && cmpobject(ekey, key) == 0)
return ep;
}
freeslot = NULL; freeslot = NULL;
} }
size = mp->ma_size; size = mp->ma_size;
sum = hash; sum = hash;
do { do {
sum = 3*sum + 1; sum += sum + sum + 1;
incr = sum % size; incr = sum % size;
} while (incr == 0); } while (incr == 0);
end = mp->ma_table + size; end = mp->ma_table + size;
#ifdef INTERN_STRINGS
if (fast) {
if (freeslot == NULL) {
for (;;) {
ep += incr;
if (ep >= end)
ep -= size;
ekey = ep->me_key;
if (ekey == NULL || ekey == key)
return ep;
if (ekey == dummy) {
freeslot = ep;
break;
}
}
}
for (;;) {
ep += incr;
if (ep >= end)
ep -= size;
ekey = ep->me_key;
if (ekey == NULL)
return freeslot;
if (ekey == key)
return ep;
}
}
#endif
if (freeslot == NULL) { if (freeslot == NULL) {
for (;;) { for (;;) {
ep += incr; ep += incr;
...@@ -255,7 +207,8 @@ lookmapping(mp, key, hash) ...@@ -255,7 +207,8 @@ lookmapping(mp, key, hash)
freeslot = ep; freeslot = ep;
break; break;
} }
if (ep->me_hash == hash && cmpobject(ekey, key) == 0) if (ekey == key || (ep->me_hash == hash &&
cmpobject(ekey, key) == 0))
return ep; return ep;
} }
} }
...@@ -267,8 +220,9 @@ lookmapping(mp, key, hash) ...@@ -267,8 +220,9 @@ lookmapping(mp, key, hash)
ekey = ep->me_key; ekey = ep->me_key;
if (ekey == NULL) if (ekey == NULL)
return freeslot; return freeslot;
if (ekey != dummy && if (ekey == key ||
ep->me_hash == hash && cmpobject(ekey, key) == 0) (ekey != dummy &&
ep->me_hash == hash && cmpobject(ekey, key) == 0))
return ep; return ep;
} }
} }
...@@ -378,11 +332,14 @@ mappinglookup(op, key) ...@@ -378,11 +332,14 @@ mappinglookup(op, key)
if (((mappingobject *)op)->ma_table == NULL) if (((mappingobject *)op)->ma_table == NULL)
return NULL; return NULL;
#ifdef CACHE_HASH #ifdef CACHE_HASH
if (!is_stringobject(key) || (hash = ((stringobject *) key)->ob_shash) == -1) if (!is_stringobject(key) ||
(hash = ((stringobject *) key)->ob_shash) == -1)
#endif #endif
hash = hashobject(key); {
if (hash == -1) hash = hashobject(key);
return NULL; if (hash == -1)
return NULL;
}
return lookmapping((mappingobject *)op, key, hash) -> me_value; return lookmapping((mappingobject *)op, key, hash) -> me_value;
} }
...@@ -412,9 +369,6 @@ mappinginsert(op, key, value) ...@@ -412,9 +369,6 @@ mappinginsert(op, key, value)
hash = ((stringobject *)key)->ob_shash; hash = ((stringobject *)key)->ob_shash;
if (hash == -1) if (hash == -1)
hash = hashobject(key); hash = hashobject(key);
#ifdef INTERN_STRINGS
mp->ma_fast = 0;
#endif
} }
} }
else else
...@@ -423,9 +377,6 @@ mappinginsert(op, key, value) ...@@ -423,9 +377,6 @@ mappinginsert(op, key, value)
hash = hashobject(key); hash = hashobject(key);
if (hash == -1) if (hash == -1)
return -1; return -1;
#ifdef INTERN_STRINGS
mp->ma_fast = 0;
#endif
} }
/* if fill >= 2/3 size, resize */ /* if fill >= 2/3 size, resize */
if (mp->ma_fill*3 >= mp->ma_size*2) { if (mp->ma_fill*3 >= mp->ma_size*2) {
...@@ -455,11 +406,14 @@ mappingremove(op, key) ...@@ -455,11 +406,14 @@ mappingremove(op, key)
return -1; return -1;
} }
#ifdef CACHE_HASH #ifdef CACHE_HASH
if (!is_stringobject(key) || (hash = ((stringobject *) key)->ob_shash) == -1) if (!is_stringobject(key) ||
(hash = ((stringobject *) key)->ob_shash) == -1)
#endif #endif
hash = hashobject(key); {
if (hash == -1) hash = hashobject(key);
return -1; if (hash == -1)
return -1;
}
mp = (mappingobject *)op; mp = (mappingobject *)op;
if (((mappingobject *)op)->ma_table == NULL) if (((mappingobject *)op)->ma_table == NULL)
goto empty; goto empty;
...@@ -621,11 +575,14 @@ mapping_subscript(mp, key) ...@@ -621,11 +575,14 @@ mapping_subscript(mp, key)
return NULL; return NULL;
} }
#ifdef CACHE_HASH #ifdef CACHE_HASH
if (!is_stringobject(key) || (hash = ((stringobject *) key)->ob_shash) == -1) if (!is_stringobject(key) ||
(hash = ((stringobject *) key)->ob_shash) == -1)
#endif #endif
hash = hashobject(key); {
if (hash == -1) hash = hashobject(key);
return NULL; if (hash == -1)
return NULL;
}
v = lookmapping(mp, key, hash) -> me_value; v = lookmapping(mp, key, hash) -> me_value;
if (v == NULL) if (v == NULL)
err_setval(KeyError, key); err_setval(KeyError, key);
...@@ -877,17 +834,23 @@ mapping_compare(a, b) ...@@ -877,17 +834,23 @@ mapping_compare(a, b)
if (res != 0) if (res != 0)
break; break;
#ifdef CACHE_HASH #ifdef CACHE_HASH
if (!is_stringobject(akey) || (ahash = ((stringobject *) akey)->ob_shash) == -1) if (!is_stringobject(akey) ||
(ahash = ((stringobject *) akey)->ob_shash) == -1)
#endif #endif
ahash = hashobject(akey); {
if (ahash == -1) ahash = hashobject(akey);
err_clear(); /* Don't want errors here */ if (ahash == -1)
err_clear(); /* Don't want errors here */
}
#ifdef CACHE_HASH #ifdef CACHE_HASH
if (!is_stringobject(bkey) || (bhash = ((stringobject *) bkey)->ob_shash) == -1) if (!is_stringobject(bkey) ||
(bhash = ((stringobject *) bkey)->ob_shash) == -1)
#endif #endif
bhash = hashobject(bkey); {
if (bhash == -1) bhash = hashobject(bkey);
err_clear(); /* Don't want errors here */ if (bhash == -1)
err_clear(); /* Don't want errors here */
}
aval = lookmapping(a, akey, ahash) -> me_value; aval = lookmapping(a, akey, ahash) -> me_value;
bval = lookmapping(b, bkey, bhash) -> me_value; bval = lookmapping(b, bkey, bhash) -> me_value;
res = cmpobject(aval, bval); res = cmpobject(aval, bval);
...@@ -918,11 +881,14 @@ mapping_has_key(mp, args) ...@@ -918,11 +881,14 @@ mapping_has_key(mp, args)
if (!getargs(args, "O", &key)) if (!getargs(args, "O", &key))
return NULL; return NULL;
#ifdef CACHE_HASH #ifdef CACHE_HASH
if (!is_stringobject(key) || (hash = ((stringobject *) key)->ob_shash) == -1) if (!is_stringobject(key) ||
(hash = ((stringobject *) key)->ob_shash) == -1)
#endif #endif
hash = hashobject(key); {
if (hash == -1) hash = hashobject(key);
return NULL; if (hash == -1)
return NULL;
}
ok = mp->ma_size != 0 && lookmapping(mp, key, hash)->me_value != NULL; ok = mp->ma_size != 0 && lookmapping(mp, key, hash)->me_value != NULL;
return newintobject(ok); return newintobject(ok);
} }
......
Objects/mappingobject.c
View file @ a4f8a975
...@@ -87,9 +87,6 @@ typedef struct { ...@@ -87,9 +87,6 @@ typedef struct {
int ma_fill; int ma_fill;
int ma_used; int ma_used;
int ma_size; int ma_size;
#ifdef INTERN_STRINGS
int ma_fast;
#endif
mappingentry *ma_table; mappingentry *ma_table;
} mappingobject; } mappingobject;
...@@ -109,9 +106,6 @@ newmappingobject() ...@@ -109,9 +106,6 @@ newmappingobject()
mp->ma_table = NULL; mp->ma_table = NULL;
mp->ma_fill = 0; mp->ma_fill = 0;
mp->ma_used = 0; mp->ma_used = 0;
#ifdef INTERN_STRINGS
mp->ma_fast = 1;
#endif
return (object *)mp; return (object *)mp;
} }
...@@ -169,80 +163,38 @@ lookmapping(mp, key, hash) ...@@ -169,80 +163,38 @@ lookmapping(mp, key, hash)
unsigned long sum; unsigned long sum;
int incr; int incr;
int size; int size;
#ifdef INTERN_STRINGS
int fast;
#endif
ep = &mp->ma_table[(unsigned long)hash%mp->ma_size]; ep = &mp->ma_table[(unsigned long)hash%mp->ma_size];
ekey = ep->me_key; ekey = ep->me_key;
if (ekey == NULL) if (ekey == NULL)
return ep; return ep;
#ifdef INTERN_STRINGS #ifdef INTERN_STRINGS
if ((fast = mp->ma_fast)) { {
object *ikey; object *ikey;
if (!is_stringobject(key) || if (is_stringobject(key) &&
(ikey = ((stringobject *)key)->ob_sinterned) == NULL) (ikey = ((stringobject *)key)->ob_sinterned) != NULL)
fast = 0;
else
key = ikey; key = ikey;
} }
#endif #endif
if (ekey == dummy) if (ekey == dummy)
freeslot = ep; freeslot = ep;
else { else {
#ifdef INTERN_STRINGS if (ekey == key)
if (fast) { return ep;
if (ekey == key) if (ep->me_hash == hash && cmpobject(ekey, key) == 0)
return ep; return ep;
}
else
#endif
{
if (ep->me_hash == hash && cmpobject(ekey, key) == 0)
return ep;
}
freeslot = NULL; freeslot = NULL;
} }
size = mp->ma_size; size = mp->ma_size;
sum = hash; sum = hash;
do { do {
sum = 3*sum + 1; sum += sum + sum + 1;
incr = sum % size; incr = sum % size;
} while (incr == 0); } while (incr == 0);
end = mp->ma_table + size; end = mp->ma_table + size;
#ifdef INTERN_STRINGS
if (fast) {
if (freeslot == NULL) {
for (;;) {
ep += incr;
if (ep >= end)
ep -= size;
ekey = ep->me_key;
if (ekey == NULL || ekey == key)
return ep;
if (ekey == dummy) {
freeslot = ep;
break;
}
}
}
for (;;) {
ep += incr;
if (ep >= end)
ep -= size;
ekey = ep->me_key;
if (ekey == NULL)
return freeslot;
if (ekey == key)
return ep;
}
}
#endif
if (freeslot == NULL) { if (freeslot == NULL) {
for (;;) { for (;;) {
ep += incr; ep += incr;
...@@ -255,7 +207,8 @@ lookmapping(mp, key, hash) ...@@ -255,7 +207,8 @@ lookmapping(mp, key, hash)
freeslot = ep; freeslot = ep;
break; break;
} }
if (ep->me_hash == hash && cmpobject(ekey, key) == 0) if (ekey == key || (ep->me_hash == hash &&
cmpobject(ekey, key) == 0))
return ep; return ep;
} }
} }
...@@ -267,8 +220,9 @@ lookmapping(mp, key, hash) ...@@ -267,8 +220,9 @@ lookmapping(mp, key, hash)
ekey = ep->me_key; ekey = ep->me_key;
if (ekey == NULL) if (ekey == NULL)
return freeslot; return freeslot;
if (ekey != dummy && if (ekey == key ||
ep->me_hash == hash && cmpobject(ekey, key) == 0) (ekey != dummy &&
ep->me_hash == hash && cmpobject(ekey, key) == 0))
return ep; return ep;
} }
} }
...@@ -378,11 +332,14 @@ mappinglookup(op, key) ...@@ -378,11 +332,14 @@ mappinglookup(op, key)
if (((mappingobject *)op)->ma_table == NULL) if (((mappingobject *)op)->ma_table == NULL)
return NULL; return NULL;
#ifdef CACHE_HASH #ifdef CACHE_HASH
if (!is_stringobject(key) || (hash = ((stringobject *) key)->ob_shash) == -1) if (!is_stringobject(key) ||
(hash = ((stringobject *) key)->ob_shash) == -1)
#endif #endif
hash = hashobject(key); {
if (hash == -1) hash = hashobject(key);
return NULL; if (hash == -1)
return NULL;
}
return lookmapping((mappingobject *)op, key, hash) -> me_value; return lookmapping((mappingobject *)op, key, hash) -> me_value;
} }
...@@ -412,9 +369,6 @@ mappinginsert(op, key, value) ...@@ -412,9 +369,6 @@ mappinginsert(op, key, value)
hash = ((stringobject *)key)->ob_shash; hash = ((stringobject *)key)->ob_shash;
if (hash == -1) if (hash == -1)
hash = hashobject(key); hash = hashobject(key);
#ifdef INTERN_STRINGS
mp->ma_fast = 0;
#endif
} }
} }
else else
...@@ -423,9 +377,6 @@ mappinginsert(op, key, value) ...@@ -423,9 +377,6 @@ mappinginsert(op, key, value)
hash = hashobject(key); hash = hashobject(key);
if (hash == -1) if (hash == -1)
return -1; return -1;
#ifdef INTERN_STRINGS
mp->ma_fast = 0;
#endif
} }
/* if fill >= 2/3 size, resize */ /* if fill >= 2/3 size, resize */
if (mp->ma_fill*3 >= mp->ma_size*2) { if (mp->ma_fill*3 >= mp->ma_size*2) {
...@@ -455,11 +406,14 @@ mappingremove(op, key) ...@@ -455,11 +406,14 @@ mappingremove(op, key)
return -1; return -1;
} }
#ifdef CACHE_HASH #ifdef CACHE_HASH
if (!is_stringobject(key) || (hash = ((stringobject *) key)->ob_shash) == -1) if (!is_stringobject(key) ||
(hash = ((stringobject *) key)->ob_shash) == -1)
#endif #endif
hash = hashobject(key); {
if (hash == -1) hash = hashobject(key);
return -1; if (hash == -1)
return -1;
}
mp = (mappingobject *)op; mp = (mappingobject *)op;
if (((mappingobject *)op)->ma_table == NULL) if (((mappingobject *)op)->ma_table == NULL)
goto empty; goto empty;
...@@ -621,11 +575,14 @@ mapping_subscript(mp, key) ...@@ -621,11 +575,14 @@ mapping_subscript(mp, key)
return NULL; return NULL;
} }
#ifdef CACHE_HASH #ifdef CACHE_HASH
if (!is_stringobject(key) || (hash = ((stringobject *) key)->ob_shash) == -1) if (!is_stringobject(key) ||
(hash = ((stringobject *) key)->ob_shash) == -1)
#endif #endif
hash = hashobject(key); {
if (hash == -1) hash = hashobject(key);
return NULL; if (hash == -1)
return NULL;
}
v = lookmapping(mp, key, hash) -> me_value; v = lookmapping(mp, key, hash) -> me_value;
if (v == NULL) if (v == NULL)
err_setval(KeyError, key); err_setval(KeyError, key);
...@@ -877,17 +834,23 @@ mapping_compare(a, b) ...@@ -877,17 +834,23 @@ mapping_compare(a, b)
if (res != 0) if (res != 0)
break; break;
#ifdef CACHE_HASH #ifdef CACHE_HASH
if (!is_stringobject(akey) || (ahash = ((stringobject *) akey)->ob_shash) == -1) if (!is_stringobject(akey) ||
(ahash = ((stringobject *) akey)->ob_shash) == -1)
#endif #endif
ahash = hashobject(akey); {
if (ahash == -1) ahash = hashobject(akey);
err_clear(); /* Don't want errors here */ if (ahash == -1)
err_clear(); /* Don't want errors here */
}
#ifdef CACHE_HASH #ifdef CACHE_HASH
if (!is_stringobject(bkey) || (bhash = ((stringobject *) bkey)->ob_shash) == -1) if (!is_stringobject(bkey) ||
(bhash = ((stringobject *) bkey)->ob_shash) == -1)
#endif #endif
bhash = hashobject(bkey); {
if (bhash == -1) bhash = hashobject(bkey);
err_clear(); /* Don't want errors here */ if (bhash == -1)
err_clear(); /* Don't want errors here */
}
aval = lookmapping(a, akey, ahash) -> me_value; aval = lookmapping(a, akey, ahash) -> me_value;
bval = lookmapping(b, bkey, bhash) -> me_value; bval = lookmapping(b, bkey, bhash) -> me_value;
res = cmpobject(aval, bval); res = cmpobject(aval, bval);
...@@ -918,11 +881,14 @@ mapping_has_key(mp, args) ...@@ -918,11 +881,14 @@ mapping_has_key(mp, args)
if (!getargs(args, "O", &key)) if (!getargs(args, "O", &key))
return NULL; return NULL;
#ifdef CACHE_HASH #ifdef CACHE_HASH
if (!is_stringobject(key) || (hash = ((stringobject *) key)->ob_shash) == -1) if (!is_stringobject(key) ||
(hash = ((stringobject *) key)->ob_shash) == -1)
#endif #endif
hash = hashobject(key); {
if (hash == -1) hash = hashobject(key);
return NULL; if (hash == -1)
return NULL;
}
ok = mp->ma_size != 0 && lookmapping(mp, key, hash)->me_value != NULL; ok = mp->ma_size != 0 && lookmapping(mp, key, hash)->me_value != NULL;
return newintobject(ok); return newintobject(ok);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7