Skip to content
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

Jump to bottom

Optimize CPU cache efficiency on dict while it's being rehashed #5692

Merged
merged 7 commits into from
Oct 31, 2023
Merged

Optimize CPU cache efficiency on dict while it's being rehashed #5692

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
24f3f86
add guard clause before lookup ht[0]
erpeng Dec 13, 2018
47eada0
dictGenericDelete can also add comparsion between idx and rehashidx
erpeng Dec 17, 2018
5e5745b
change more place with a global search
erpeng Dec 17, 2018
2249702
Merge branch 'unstable' into rehashidx
Dec 8, 2021
e5a3c92
Update src/dict.c
erpeng Dec 8, 2021
8cef564
avoid overflow
Dec 8, 2021
fa8ac13
Merge branch 'unstable' into rehashidx
oranagra Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/dict.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,7 @@ static dictEntry *dictGenericDelete(dict *d, const void *key, int nofree) {

for (table = 0; table <= 1; table++) {
idx = h & DICTHT_SIZE_MASK(d->ht_size_exp[table]);
if (table == 0 && (long)idx < d->rehashidx) continue;
he = d->ht_table[table][idx];
prevHe = NULL;
while(he) {
Expand Down Expand Up @@ -672,6 +673,7 @@ dictEntry *dictFind(dict *d, const void *key)
h = dictHashKey(d, key);
for (table = 0; table <= 1; table++) {
idx = h & DICTHT_SIZE_MASK(d->ht_size_exp[table]);
if (table == 0 && (long)idx < d->rehashidx) continue;
he = d->ht_table[table][idx];
while(he) {
void *he_key = dictGetKey(he);
Expand Down Expand Up @@ -1450,6 +1452,7 @@ void *dictFindPositionForInsert(dict *d, const void *key, dictEntry **existing)
return NULL;
for (table = 0; table <= 1; table++) {
idx = hash & DICTHT_SIZE_MASK(d->ht_size_exp[table]);
if (table == 0 && (long)idx < d->rehashidx) continue;
/* Search if this slot does not already contain the given key */
he = d->ht_table[table][idx];
while(he) {
Expand Down Expand Up @@ -1496,6 +1499,7 @@ dictEntry *dictFindEntryByPtrAndHash(dict *d, const void *oldptr, uint64_t hash)
if (dictSize(d) == 0) return NULL; /* dict is empty */
for (table = 0; table <= 1; table++) {
idx = hash & DICTHT_SIZE_MASK(d->ht_size_exp[table]);
if (table == 0 && (long)idx < d->rehashidx) continue;
he = d->ht_table[table][idx];
while(he) {
if (oldptr == dictGetKey(he))
Expand Down