X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/1333f98dd2ff2aae4e4c2a9a43d7b83a0b1af8aa..b08c9dd28032a207a67773caf5d93616ff82a23f:/src/t_string.c diff --git a/src/t_string.c b/src/t_string.c index e5069218..e0b9b263 100644 --- a/src/t_string.c +++ b/src/t_string.c @@ -1,4 +1,3 @@ -#include #include "redis.h" /*----------------------------------------------------------------------------- @@ -14,7 +13,6 @@ static int checkStringLength(redisClient *c, long long size) { } void setGenericCommand(redisClient *c, int nx, robj *key, robj *val, robj *expire) { - int retval; long seconds = 0; /* initialized to avoid an harmness warning */ if (expire) { @@ -26,21 +24,12 @@ void setGenericCommand(redisClient *c, int nx, robj *key, robj *val, robj *expir } } - retval = dbAdd(c->db,key,val); - if (retval == REDIS_ERR) { - if (!nx) { - dbReplace(c->db,key,val); - incrRefCount(val); - } else { - addReply(c,shared.czero); - return; - } - } else { - incrRefCount(val); + if (lookupKeyWrite(c->db,key) != NULL && nx) { + addReply(c,shared.czero); + return; } - touchWatchedKey(c->db,key); + setKey(c->db,key,val); server.dirty++; - removeExpire(c->db,key); if (expire) setExpire(c->db,key,time(NULL)+seconds); addReply(c, nx ? shared.cone : shared.ok); } @@ -82,11 +71,8 @@ void getCommand(redisClient *c) { void getsetCommand(redisClient *c) { if (getGenericCommand(c) == REDIS_ERR) return; c->argv[2] = tryObjectEncoding(c->argv[2]); - dbReplace(c->db,c->argv[1],c->argv[2]); - incrRefCount(c->argv[2]); - touchWatchedKey(c->db,c->argv[1]); + setKey(c->db,c->argv[1],c->argv[2]); server.dirty++; - removeExpire(c->db,c->argv[1]); } static int getBitOffsetFromArgument(redisClient *c, robj *o, size_t *offset) { @@ -139,7 +125,7 @@ void setbitCommand(redisClient *c) { robj *decoded = getDecodedObject(o); o = createStringObject(decoded->ptr, sdslen(decoded->ptr)); decrRefCount(decoded); - dbReplace(c->db,c->argv[1],o); + dbOverwrite(c->db,c->argv[1],o); } } @@ -156,7 +142,7 @@ void setbitCommand(redisClient *c) { byteval &= ~(1 << bit); byteval |= ((on & 0x1) << bit); ((char*)o->ptr)[byte] = byteval; - touchWatchedKey(c->db,c->argv[1]); + signalModifiedKey(c->db,c->argv[1]); server.dirty++; addReply(c, bitval ? shared.cone : shared.czero); } @@ -215,21 +201,14 @@ void setrangeCommand(redisClient *c) { o = createObject(REDIS_STRING,sdsempty()); dbAdd(c->db,c->argv[1],o); } else { - int olen; + size_t olen; /* Key exists, check type */ if (checkType(c,o,REDIS_STRING)) return; - /* Find out existing value length */ - if (o->encoding == REDIS_ENCODING_INT) { - char llbuf[32]; - olen = ll2string(llbuf,sizeof(llbuf),(long)o->ptr); - } else { - olen = sdslen(o->ptr); - } - /* Return existing string length when setting nothing */ + olen = stringObjectLen(o); if (sdslen(value) == 0) { addReplyLongLong(c,olen); return; @@ -244,14 +223,14 @@ void setrangeCommand(redisClient *c) { robj *decoded = getDecodedObject(o); o = createStringObject(decoded->ptr, sdslen(decoded->ptr)); decrRefCount(decoded); - dbReplace(c->db,c->argv[1],o); + dbOverwrite(c->db,c->argv[1],o); } } if (sdslen(value) > 0) { o->ptr = sdsgrowzero(o->ptr,offset+sdslen(value)); memcpy((char*)o->ptr+offset,value,sdslen(value)); - touchWatchedKey(c->db,c->argv[1]); + signalModifiedKey(c->db,c->argv[1]); server.dirty++; } addReplyLongLong(c,sdslen(o->ptr)); @@ -267,7 +246,7 @@ void getrangeCommand(redisClient *c) { return; if (getLongFromObjectOrReply(c,c->argv[3],&end,NULL) != REDIS_OK) return; - if ((o = lookupKeyReadOrReply(c,c->argv[1],shared.nullbulk)) == NULL || + if ((o = lookupKeyReadOrReply(c,c->argv[1],shared.emptybulk)) == NULL || checkType(c,o,REDIS_STRING)) return; if (o->encoding == REDIS_ENCODING_INT) { @@ -288,7 +267,7 @@ void getrangeCommand(redisClient *c) { /* Precondition: end >= 0 && end < strlen, so the only condition where * nothing can be returned is: start > end. */ if (start > end) { - addReply(c,shared.nullbulk); + addReply(c,shared.emptybulk); } else { addReplyBulkCBuffer(c,(char*)str+start,end-start+1); } @@ -327,18 +306,15 @@ void msetGenericCommand(redisClient *c, int nx) { busykeys++; } } - } - if (busykeys) { - addReply(c, shared.czero); - return; + if (busykeys) { + addReply(c, shared.czero); + return; + } } for (j = 1; j < c->argc; j += 2) { c->argv[j+1] = tryObjectEncoding(c->argv[j+1]); - dbReplace(c->db,c->argv[j],c->argv[j+1]); - incrRefCount(c->argv[j+1]); - removeExpire(c->db,c->argv[j]); - touchWatchedKey(c->db,c->argv[j]); + setKey(c->db,c->argv[j],c->argv[j+1]); } server.dirty += (c->argc-1)/2; addReply(c, nx ? shared.cone : shared.ok); @@ -353,20 +329,28 @@ void msetnxCommand(redisClient *c) { } void incrDecrCommand(redisClient *c, long long incr) { - long long value; - robj *o; + long long value, oldvalue; + robj *o, *new; o = lookupKeyWrite(c->db,c->argv[1]); if (o != NULL && checkType(c,o,REDIS_STRING)) return; if (getLongLongFromObjectOrReply(c,o,&value,NULL) != REDIS_OK) return; + oldvalue = value; value += incr; - o = createStringObjectFromLongLong(value); - dbReplace(c->db,c->argv[1],o); - touchWatchedKey(c->db,c->argv[1]); + if ((incr < 0 && value > oldvalue) || (incr > 0 && value < oldvalue)) { + addReplyError(c,"increment or decrement would overflow"); + return; + } + new = createStringObjectFromLongLong(value); + if (o) + dbOverwrite(c->db,c->argv[1],new); + else + dbAdd(c->db,c->argv[1],new); + signalModifiedKey(c->db,c->argv[1]); server.dirty++; addReply(c,shared.colon); - addReply(c,o); + addReply(c,new); addReply(c,shared.crlf); } @@ -419,32 +403,22 @@ void appendCommand(redisClient *c) { robj *decoded = getDecodedObject(o); o = createStringObject(decoded->ptr, sdslen(decoded->ptr)); decrRefCount(decoded); - dbReplace(c->db,c->argv[1],o); + dbOverwrite(c->db,c->argv[1],o); } /* Append the value */ o->ptr = sdscatlen(o->ptr,append->ptr,sdslen(append->ptr)); totlen = sdslen(o->ptr); } - touchWatchedKey(c->db,c->argv[1]); + signalModifiedKey(c->db,c->argv[1]); server.dirty++; addReplyLongLong(c,totlen); } void strlenCommand(redisClient *c) { robj *o; - if ((o = lookupKeyReadOrReply(c,c->argv[1],shared.czero)) == NULL || checkType(c,o,REDIS_STRING)) return; - - if (o->encoding == REDIS_ENCODING_RAW) { - addReplyLongLong(c,sdslen(o->ptr)); - } else if (o->encoding == REDIS_ENCODING_INT) { - char llbuf[32]; - int len = ll2string(llbuf,sizeof(llbuf),(long)o->ptr); - addReplyLongLong(c,len); - } else { - redisPanic("Unknown string encoding"); - } + addReplyLongLong(c,stringObjectLen(o)); }