fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-28 05:11:03 +00:00
Code Issues Projects Releases Wiki Activity

reduce code complexity because zipmapLen now is O(1)

Browse Source
This commit is contained in:
Pieter Noordhuis 2010-04-01 14:31:13 +02:00
parent da2cfe8a3b
commit e9484a8502
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
redis.c
View File

@ -5937,10 +5937,8 @@ static void hsetCommand(redisClient *c) {
decrRefCount(valobj); decrRefCount(valobj);
o->ptr = zm; o->ptr = zm;
/* And here there is the second check for hash conversion... /* And here there is the second check for hash conversion. */
* we want to do it only if the operation was not just an update as if (zipmapLen(zm) > server.hash_max_zipmap_entries)
* zipmapLen() is O(N). */
if (!update && zipmapLen(zm) > server.hash_max_zipmap_entries)
convertToRealHash(o); convertToRealHash(o);
} else { } else {
tryObjectEncoding(c->argv[2]); tryObjectEncoding(c->argv[2]);
@ -5958,7 +5956,6 @@ static void hsetCommand(redisClient *c) {
} }
static void hincrbyCommand(redisClient *c) { static void hincrbyCommand(redisClient *c) {
int update = 0;
long long value = 0, incr = 0; long long value = 0, incr = 0;
robj *o = lookupKeyWrite(c->db,c->argv[1]); robj *o = lookupKeyWrite(c->db,c->argv[1]);
@ -5995,13 +5992,12 @@ static void hincrbyCommand(redisClient *c) {
value += incr; value += incr;
sds svalue = sdscatprintf(sdsempty(),"%lld",value); sds svalue = sdscatprintf(sdsempty(),"%lld",value);
zm = zipmapSet(zm,c->argv[2]->ptr,sdslen(c->argv[2]->ptr), zm = zipmapSet(zm,c->argv[2]->ptr,sdslen(c->argv[2]->ptr),
(unsigned char*)svalue,sdslen(svalue),&update); (unsigned char*)svalue,sdslen(svalue),NULL);
sdsfree(svalue); sdsfree(svalue);
o->ptr = zm; o->ptr = zm;
/* Check if the zipmap needs to be converted /* Check if the zipmap needs to be converted. */
* if this was not an update. */ if (zipmapLen(zm) > server.hash_max_zipmap_entries)
if (!update && zipmapLen(zm) > server.hash_max_zipmap_entries)
convertToRealHash(o); convertToRealHash(o);
} else { } else {
robj *hval; robj *hval;