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

make sure that the resulting value in hincrby is encoded when possible

Browse Source
This commit is contained in:
Pieter Noordhuis 2010-04-17 12:46:23 +02:00
parent edc2f63ad9
commit 3f973463a7
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
redis.c
View File

@ -2775,6 +2775,23 @@ static robj *createStringObject(char *ptr, size_t len) {
return createObject(REDIS_STRING,sdsnewlen(ptr,len)); return createObject(REDIS_STRING,sdsnewlen(ptr,len));
} }
static robj *createStringObjectFromLongLong(long long value) {
robj *o;
if (value >= 0 && value < REDIS_SHARED_INTEGERS) {
incrRefCount(shared.integers[value]);
o = shared.integers[value];
} else {
o = createObject(REDIS_STRING, NULL);
if (value >= LONG_MIN && value <= LONG_MAX) {
o->encoding = REDIS_ENCODING_INT;
o->ptr = (void*)((long)value);
} else {
o->ptr = sdscatprintf(sdsempty(),"%lld",value);
}
}
return o;
}
static robj *dupStringObject(robj *o) { static robj *dupStringObject(robj *o) {
assert(o->encoding == REDIS_ENCODING_RAW); assert(o->encoding == REDIS_ENCODING_RAW);
return createStringObject(o->ptr,sdslen(o->ptr)); return createStringObject(o->ptr,sdslen(o->ptr));
@ -6071,8 +6088,8 @@ static void hashTryConversion(robj *subject, robj **argv, int start, int end) {
/* Encode given objects in-place when the hash uses a dict. */ /* Encode given objects in-place when the hash uses a dict. */
static void hashTryObjectEncoding(robj *subject, robj **o1, robj **o2) { static void hashTryObjectEncoding(robj *subject, robj **o1, robj **o2) {
if (subject->encoding == REDIS_ENCODING_HT) { if (subject->encoding == REDIS_ENCODING_HT) {
*o1 = tryObjectEncoding(*o1); if (o1) *o1 = tryObjectEncoding(*o1);
*o2 = tryObjectEncoding(*o2); if (o2) *o2 = tryObjectEncoding(*o2);
} }
} }
@ -6316,7 +6333,8 @@ static void hincrbyCommand(redisClient *c) {
} }
value += incr; value += incr;
new = createObject(REDIS_STRING,sdscatprintf(sdsempty(),"%lld",value)); new = createStringObjectFromLongLong(value);
hashTryObjectEncoding(o,&c->argv[2],NULL);
hashSet(o,c->argv[2],new); hashSet(o,c->argv[2],new);
decrRefCount(new); decrRefCount(new);
addReplyLongLong(c,value); addReplyLongLong(c,value);