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

Fix bug where we skip valid dict elements in dictGetRandomKey

Browse Source 
Former-commit-id: 626b56b00824573660af0c47b210fd1e8d2cfeb2
This commit is contained in:
John Sully 2021-03-24 19:58:51 +00:00
parent d841598ea0
commit 131a8c9e35
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/dict.cpp
View File

@ -373,6 +373,7 @@ int dictRehash(dict *d, int n) {
dictAsyncRehashCtl::dictAsyncRehashCtl(struct dict *d, dictAsyncRehashCtl *next) : dict(d), next(next) { dictAsyncRehashCtl::dictAsyncRehashCtl(struct dict *d, dictAsyncRehashCtl *next) : dict(d), next(next) {
queue.reserve(c_targetQueueSize); queue.reserve(c_targetQueueSize);
__atomic_fetch_add(&d->refcount, 1, __ATOMIC_RELEASE); __atomic_fetch_add(&d->refcount, 1, __ATOMIC_RELEASE);
this->rehashIdxBase = d->rehashidx;
} }
dictAsyncRehashCtl *dictRehashAsyncStart(dict *d, int buckets) { dictAsyncRehashCtl *dictRehashAsyncStart(dict *d, int buckets) {
@ -931,12 +932,18 @@ dictEntry *dictGetRandomKey(dict *d)
if (dictSize(d) == 0) return NULL; if (dictSize(d) == 0) return NULL;
if (dictIsRehashing(d)) _dictRehashStep(d); if (dictIsRehashing(d)) _dictRehashStep(d);
if (dictIsRehashing(d)) { if (dictIsRehashing(d)) {
long rehashidx = d->rehashidx;
auto async = d->asyncdata;
while (async != nullptr) {
rehashidx = std::min((long)async->rehashIdxBase, rehashidx);
async = async->next;
}
do { do {
/* We are sure there are no elements in indexes from 0 /* We are sure there are no elements in indexes from 0
* to rehashidx-1 */ * to rehashidx-1 */
h = d->rehashidx + (random() % (d->ht[0].size + h = rehashidx + (random() % (d->ht[0].size +
d->ht[1].size - d->ht[1].size -
d->rehashidx)); rehashidx));
he = (h >= d->ht[0].size) ? d->ht[1].table[h - d->ht[0].size] : he = (h >= d->ht[0].size) ? d->ht[1].table[h - d->ht[0].size] :
d->ht[0].table[h]; d->ht[0].table[h];
} while(he == NULL); } while(he == NULL);

1
src/dict.h
View File

@ -100,6 +100,7 @@ struct dictAsyncRehashCtl {
struct dict *dict = nullptr; struct dict *dict = nullptr;
std::vector<workItem> queue; std::vector<workItem> queue;
size_t hashIdx = 0; size_t hashIdx = 0;
long rehashIdxBase;
dictAsyncRehashCtl *next = nullptr; dictAsyncRehashCtl *next = nullptr;
std::atomic<bool> done { false }; std::atomic<bool> done { false };
std::atomic<bool> abondon { false }; std::atomic<bool> abondon { false };