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

expand the dictionary of the target set to the right size when converting from intset

Browse Source
This commit is contained in:
Pieter Noordhuis 2010-06-13 21:52:07 +02:00
parent 273f616930
commit 400aea2b13
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
redis.c
View File

@ -4193,6 +4193,7 @@ static int rdbLoadDoubleValue(FILE *fp, double *val) {
static robj *rdbLoadObject(int type, FILE *fp) { static robj *rdbLoadObject(int type, FILE *fp) {
robj *o, *ele, *dec; robj *o, *ele, *dec;
size_t len; size_t len;
unsigned int i;
redisLog(REDIS_DEBUG,"LOADING OBJECT %d (at %d)\n",type,ftell(fp)); redisLog(REDIS_DEBUG,"LOADING OBJECT %d (at %d)\n",type,ftell(fp));
if (type == REDIS_STRING) { if (type == REDIS_STRING) {
@ -4247,7 +4248,7 @@ static robj *rdbLoadObject(int type, FILE *fp) {
} }
/* Load every single element of the list/set */ /* Load every single element of the list/set */
while(len--) { for (i = 0; i < len; i++) {
long long llval; long long llval;
if ((ele = rdbLoadEncodedStringObject(fp)) == NULL) return NULL; if ((ele = rdbLoadEncodedStringObject(fp)) == NULL) return NULL;
ele = tryObjectEncoding(ele); ele = tryObjectEncoding(ele);
@ -4258,6 +4259,7 @@ static robj *rdbLoadObject(int type, FILE *fp) {
o->ptr = intsetAdd(o->ptr,llval,NULL); o->ptr = intsetAdd(o->ptr,llval,NULL);
} else { } else {
setTypeConvert(o,REDIS_ENCODING_HT); setTypeConvert(o,REDIS_ENCODING_HT);
dictExpand(o->ptr,len);
} }
} }
@ -5668,6 +5670,9 @@ static unsigned long setTypeSize(robj *subject) {
} }
} }
/* Convert the set to specified encoding. The resulting dict (when converting
* to a hashtable) is presized to hold the number of elements in the original
* set. */
static void setTypeConvert(robj *subject, int enc) { static void setTypeConvert(robj *subject, int enc) {
setIterator *si; setIterator *si;
robj *element; robj *element;
@ -5675,6 +5680,8 @@ static void setTypeConvert(robj *subject, int enc) {
if (enc == REDIS_ENCODING_HT) { if (enc == REDIS_ENCODING_HT) {
dict *d = dictCreate(&setDictType,NULL); dict *d = dictCreate(&setDictType,NULL);
/* Presize the dict to avoid rehashing */
dictExpand(d,intsetLen(subject->ptr));
/* setTypeGet returns a robj with incremented refcount */ /* setTypeGet returns a robj with incremented refcount */
si = setTypeInitIterator(subject); si = setTypeInitIterator(subject);