fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-04 08:41:04 +00:00
Code Issues Projects Releases Wiki Activity

Use new dictGetRandomKeys() API to get samples for eviction.

Browse Source 
The eviction quality degradates a bit in my tests, but since the API is
faster, it allows to raise the number of samples, and overall is a win.
This commit is contained in:
antirez 2014-03-20 16:52:12 +01:00
parent 82b53c650c
commit c641b670c3
1 changed files with 24 additions and 4 deletions

28
src/redis.c

@ -2845,16 +2845,35 @@ struct evictionPoolEntry *evictionPoolAlloc(void) {
* We insert keys on place in ascending order, so keys with the smaller * We insert keys on place in ascending order, so keys with the smaller
* idle time are on the left, and keys with the higher idle time on the * idle time are on the left, and keys with the higher idle time on the
* right. */ * right. */
void evictionPoolPopulate(dict *sampledict, dict *keydict, struct evictionPoolEntry *pool) {
int j, k;
for (j = 0; j < server.maxmemory_samples; j++) { #define EVICTION_SAMPLES_ARRAY_SIZE 16
void evictionPoolPopulate(dict *sampledict, dict *keydict, struct evictionPoolEntry *pool) {
int j, k, count;
dictEntry *_samples[EVICTION_SAMPLES_ARRAY_SIZE];
dictEntry **samples;
/* Try to use a static buffer: this function is a big hit...
* Note: it was actually measured that this helps. */
if (server.maxmemory_samples <= EVICTION_SAMPLES_ARRAY_SIZE) {
samples = _samples;
} else {
samples = zmalloc(sizeof(samples[0])*server.maxmemory_samples);
}
#if 1 /* Use bulk get by default. */
count = dictGetRandomKeys(sampledict,samples,server.maxmemory_samples);
#else
count = server.maxmemory_samples;
for (j = 0; j < count; j++) samples[j] = dictGetRandomKey(sampledict);
#endif
for (j = 0; j < count; j++) {
unsigned long long idle; unsigned long long idle;
sds key; sds key;
robj *o; robj *o;
dictEntry *de; dictEntry *de;
de = dictGetRandomKey(sampledict); de = samples[j];
key = dictGetKey(de); key = dictGetKey(de);
/* If the dictionary we are sampling from is not the main /* If the dictionary we are sampling from is not the main
* dictionary (but the expires one) we need to lookup the key * dictionary (but the expires one) we need to lookup the key
@ -2896,6 +2915,7 @@ void evictionPoolPopulate(dict *sampledict, dict *keydict, struct evictionPoolEn
pool[k].key = sdsdup(key); pool[k].key = sdsdup(key);
pool[k].idle = idle; pool[k].idle = idle;
} }
if (samples != _samples) zfree(samples);
} }
int freeMemoryIfNeeded(void) { int freeMemoryIfNeeded(void) {