caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 08:38:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

RDB hashes loading fixed removing the assertion that failed every time an HT-encoded hash was loaded.

Browse Source
This commit is contained in:
antirez 2012-03-13 09:49:11 +01:00
parent 79642420b0
commit c3c856228d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/rdb.c
View File

@ -844,9 +844,10 @@ robj *rdbLoadObject(int rdbtype, rio *rdb) {
hashTypeConvert(o, REDIS_ENCODING_HT); hashTypeConvert(o, REDIS_ENCODING_HT);
/* Load every field and value into the ziplist */ /* Load every field and value into the ziplist */
while (o->encoding == REDIS_ENCODING_ZIPLIST && len-- > 0) { while (o->encoding == REDIS_ENCODING_ZIPLIST && len > 0) {
robj *field, *value; robj *field, *value;
len--;
/* Load raw strings */ /* Load raw strings */
field = rdbLoadStringObject(rdb); field = rdbLoadStringObject(rdb);
if (field == NULL) return NULL; if (field == NULL) return NULL;
@ -869,9 +870,10 @@ robj *rdbLoadObject(int rdbtype, rio *rdb) {
} }
/* Load remaining fields and values into the hash table */ /* Load remaining fields and values into the hash table */
while (o->encoding == REDIS_ENCODING_HT && len-- > 0) { while (o->encoding == REDIS_ENCODING_HT && len > 0) {
robj *field, *value; robj *field, *value;
len--;
/* Load encoded strings */ /* Load encoded strings */
field = rdbLoadEncodedStringObject(rdb); field = rdbLoadEncodedStringObject(rdb);
if (field == NULL) return NULL; if (field == NULL) return NULL;