mirror of
https://github.com/fluencelabs/redis
synced 2025-03-25 11:51:03 +00:00
Merge branch 'unstable' of github.com:antirez/redis into unstable
This commit is contained in:
commit
522c3255db
@ -384,15 +384,12 @@ robj *hashTypeCurrentObject(hashTypeIterator *hi, int what) {
|
|||||||
} else {
|
} else {
|
||||||
dst = createStringObjectFromLongLong(vll);
|
dst = createStringObjectFromLongLong(vll);
|
||||||
}
|
}
|
||||||
|
|
||||||
} else if (hi->encoding == REDIS_ENCODING_HT) {
|
} else if (hi->encoding == REDIS_ENCODING_HT) {
|
||||||
hashTypeCurrentFromHashTable(hi, what, &dst);
|
hashTypeCurrentFromHashTable(hi, what, &dst);
|
||||||
incrRefCount(dst);
|
incrRefCount(dst);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
redisPanic("Unknown hash encoding");
|
redisPanic("Unknown hash encoding");
|
||||||
}
|
}
|
||||||
|
|
||||||
return dst;
|
return dst;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user