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

More vertical space saved.

Browse Source
This commit is contained in:
antirez 2012-03-10 11:11:28 +01:00
parent c0caa1cf54
commit 753bb3dcbd
1 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/t_hash.c
View File

@ -109,11 +109,9 @@ robj *hashTypeGetObject(robj *o, robj *field) {
incrRefCount(aux); incrRefCount(aux);
value = aux; value = aux;
} }
} else { } else {
redisPanic("Unknown hash encoding"); redisPanic("Unknown hash encoding");
} }
return value; return value;
} }
@ -125,21 +123,14 @@ int hashTypeExists(robj *o, robj *field) {
unsigned int vlen = UINT_MAX; unsigned int vlen = UINT_MAX;
long long vll = LLONG_MAX; long long vll = LLONG_MAX;
if (hashTypeGetFromZiplist(o, field, &vstr, &vlen, &vll) == 0) { if (hashTypeGetFromZiplist(o, field, &vstr, &vlen, &vll) == 0) return 1;
return 1;
}
} else if (o->encoding == REDIS_ENCODING_HT) { } else if (o->encoding == REDIS_ENCODING_HT) {
robj *aux; robj *aux;
if (hashTypeGetFromHashTable(o, field, &aux) == 0) { if (hashTypeGetFromHashTable(o, field, &aux) == 0) return 1;
return 1;
}
} else { } else {
redisPanic("Unknown hash encoding"); redisPanic("Unknown hash encoding");
} }
return 0; return 0;
} }
@ -303,10 +294,7 @@ int hashTypeNext(hashTypeIterator *hi) {
redisAssert(vptr != NULL); redisAssert(vptr != NULL);
fptr = ziplistNext(zl, vptr); fptr = ziplistNext(zl, vptr);
} }
if (fptr == NULL) return REDIS_ERR;
if (fptr == NULL) {
return REDIS_ERR;
}
/* Grab pointer to the value (fptr points to the field) */ /* Grab pointer to the value (fptr points to the field) */
vptr = ziplistNext(zl, fptr); vptr = ziplistNext(zl, fptr);
@ -315,16 +303,11 @@ int hashTypeNext(hashTypeIterator *hi) {
/* fptr, vptr now point to the first or next pair */ /* fptr, vptr now point to the first or next pair */
hi->fptr = fptr; hi->fptr = fptr;
hi->vptr = vptr; hi->vptr = vptr;
} else if (hi->encoding == REDIS_ENCODING_HT) { } else if (hi->encoding == REDIS_ENCODING_HT) {
if ((hi->de = dictNext(hi->di)) == NULL) { if ((hi->de = dictNext(hi->di)) == NULL) return REDIS_ERR;
return REDIS_ERR;
}
} else { } else {
redisPanic("Unknown hash encoding"); redisPanic("Unknown hash encoding");
} }
return REDIS_OK; return REDIS_OK;
} }