mirror of
https://codeberg.org/redict/redict.git
synced 2025-01-22 16:18:28 -05:00
Merge branch 'lists' of git://github.com/pietern/redis
This commit is contained in:
commit
65cc766581
2
redis.c
2
redis.c
@ -4191,7 +4191,6 @@ static robj *rdbLoadObject(int type, FILE *fp) {
|
|||||||
} else {
|
} else {
|
||||||
ele = tryObjectEncoding(ele);
|
ele = tryObjectEncoding(ele);
|
||||||
listAddNodeTail(o->ptr,ele);
|
listAddNodeTail(o->ptr,ele);
|
||||||
incrRefCount(ele);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (type == REDIS_SET) {
|
} else if (type == REDIS_SET) {
|
||||||
@ -5128,6 +5127,7 @@ static void listTypeConvert(robj *subject, int enc) {
|
|||||||
|
|
||||||
if (enc == REDIS_ENCODING_LIST) {
|
if (enc == REDIS_ENCODING_LIST) {
|
||||||
list *l = listCreate();
|
list *l = listCreate();
|
||||||
|
listSetFreeMethod(l,decrRefCount);
|
||||||
|
|
||||||
/* listTypeGet returns a robj with incremented refcount */
|
/* listTypeGet returns a robj with incremented refcount */
|
||||||
li = listTypeInitIterator(subject,0,REDIS_TAIL);
|
li = listTypeInitIterator(subject,0,REDIS_TAIL);
|
||||||
|
Loading…
Reference in New Issue
Block a user