mirror of
https://github.com/fluencelabs/redis
synced 2025-03-30 22:31:03 +00:00
computeObjectSwappability is now able to compute swappability for intset encoded sets
This commit is contained in:
parent
740eee1cc6
commit
5f19e8a4a5
23
src/vm.c
23
src/vm.c
@ -395,15 +395,20 @@ double computeObjectSwappability(robj *o) {
|
|||||||
z = (o->type == REDIS_ZSET);
|
z = (o->type == REDIS_ZSET);
|
||||||
d = z ? ((zset*)o->ptr)->dict : o->ptr;
|
d = z ? ((zset*)o->ptr)->dict : o->ptr;
|
||||||
|
|
||||||
asize = sizeof(dict)+(sizeof(struct dictEntry*)*dictSlots(d));
|
if (!z && o->encoding == REDIS_ENCODING_INTSET) {
|
||||||
if (z) asize += sizeof(zset)-sizeof(dict);
|
intset *is = o->ptr;
|
||||||
if (dictSize(d)) {
|
asize = sizeof(*is)+is->encoding*is->length;
|
||||||
de = dictGetRandomKey(d);
|
} else {
|
||||||
ele = dictGetEntryKey(de);
|
asize = sizeof(dict)+(sizeof(struct dictEntry*)*dictSlots(d));
|
||||||
elesize = (ele->encoding == REDIS_ENCODING_RAW) ?
|
if (z) asize += sizeof(zset)-sizeof(dict);
|
||||||
(sizeof(*o)+sdslen(ele->ptr)) : sizeof(*o);
|
if (dictSize(d)) {
|
||||||
asize += (sizeof(struct dictEntry)+elesize)*dictSize(d);
|
de = dictGetRandomKey(d);
|
||||||
if (z) asize += sizeof(zskiplistNode)*dictSize(d);
|
ele = dictGetEntryKey(de);
|
||||||
|
elesize = (ele->encoding == REDIS_ENCODING_RAW) ?
|
||||||
|
(sizeof(*o)+sdslen(ele->ptr)) : sizeof(*o);
|
||||||
|
asize += (sizeof(struct dictEntry)+elesize)*dictSize(d);
|
||||||
|
if (z) asize += sizeof(zskiplistNode)*dictSize(d);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case REDIS_HASH:
|
case REDIS_HASH:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user