gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix failed merge due to overwriting the hashidx and pretending no rehash is in progress

Browse Source 
Former-commit-id: 0524b822a05b732e0f3e510dcaeb3304069d3595
This commit is contained in:
John Sully 2021-03-10 02:52:22 +00:00
parent 50060b4a13
commit a2c2337cd9
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dict.cpp
View File

@ -201,8 +201,6 @@ int dictMerge(dict *dst, dict *src)
std::swap(dst->iterators, src->iterators); std::swap(dst->iterators, src->iterators);
} }
src->rehashidx = -1;
if (!dictIsRehashing(dst) && !dictIsRehashing(src)) if (!dictIsRehashing(dst) && !dictIsRehashing(src))
{ {
if (dst->ht[0].size >= src->ht[0].size) if (dst->ht[0].size >= src->ht[0].size)