X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/af4e866dbb1455a50d51b3d5f46832f1a36e2080..3c1bf4957e4c8aacd962a859e16cbcf2596f4edb:/src/t_string.c diff --git a/src/t_string.c b/src/t_string.c index eaaec05b..4b6fe792 100644 --- a/src/t_string.c +++ b/src/t_string.c @@ -1,3 +1,4 @@ +#include #include "redis.h" /*----------------------------------------------------------------------------- @@ -12,13 +13,11 @@ void setGenericCommand(redisClient *c, int nx, robj *key, robj *val, robj *expir if (getLongFromObjectOrReply(c, expire, &seconds, NULL) != REDIS_OK) return; if (seconds <= 0) { - addReplySds(c,sdsnew("-ERR invalid expire time in SETEX\r\n")); + addReplyError(c,"invalid expire time in SETEX"); return; } } - touchWatchedKey(c->db,key); - if (nx) deleteIfVolatile(c->db,key); retval = dbAdd(c->db,key,val); if (retval == REDIS_ERR) { if (!nx) { @@ -31,6 +30,7 @@ void setGenericCommand(redisClient *c, int nx, robj *key, robj *val, robj *expir } else { incrRefCount(val); } + touchWatchedKey(c->db,key); server.dirty++; removeExpire(c->db,key); if (expire) setExpire(c->db,key,time(NULL)+seconds); @@ -38,14 +38,17 @@ void setGenericCommand(redisClient *c, int nx, robj *key, robj *val, robj *expir } void setCommand(redisClient *c) { + c->argv[2] = tryObjectEncoding(c->argv[2]); setGenericCommand(c,0,c->argv[1],c->argv[2],NULL); } void setnxCommand(redisClient *c) { + c->argv[2] = tryObjectEncoding(c->argv[2]); setGenericCommand(c,1,c->argv[1],c->argv[2],NULL); } void setexCommand(redisClient *c) { + c->argv[3] = tryObjectEncoding(c->argv[3]); setGenericCommand(c,0,c->argv[1],c->argv[3],c->argv[2]); } @@ -70,16 +73,99 @@ 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]); server.dirty++; removeExpire(c->db,c->argv[1]); } +static int getBitOffsetFromArgument(redisClient *c, robj *o, size_t *offset) { + long long loffset; + char *err = "bit offset is not an integer or out of range"; + + if (getLongLongFromObjectOrReply(c,o,&loffset,err) != REDIS_OK) + return REDIS_ERR; + + /* Limit offset to SIZE_T_MAX or 1GB in bytes */ + if ((loffset < 0) || + ((unsigned long long)loffset >= (unsigned)SIZE_T_MAX) || + ((unsigned long long)loffset >> 3) >= (1024*1024*1024)) + { + addReplyError(c,err); + return REDIS_ERR; + } + + *offset = (size_t)loffset; + return REDIS_OK; +} + +void setbitCommand(redisClient *c) { + robj *o; + size_t bitoffset; + int on; + + if (getBitOffsetFromArgument(c,c->argv[2],&bitoffset) != REDIS_OK) + return; + + on = ((sds)c->argv[3]->ptr)[0] - '0'; + if (sdslen(c->argv[3]->ptr) != 1 || (on & ~1)) { + addReplyError(c,"bit should be 0 or 1"); + return; + } + + o = lookupKeyWrite(c->db,c->argv[1]); + if (o == NULL) { + sds value = sdssetbit(sdsempty(),bitoffset,on); + o = createObject(REDIS_STRING,value); + dbAdd(c->db,c->argv[1],o); + } else { + if (checkType(c,o,REDIS_STRING)) return; + + /* Create a copy when the object is shared or encoded. */ + if (o->refcount != 1 || o->encoding != REDIS_ENCODING_RAW) { + robj *decoded = getDecodedObject(o); + o = createStringObject(decoded->ptr, sdslen(decoded->ptr)); + decrRefCount(decoded); + dbReplace(c->db,c->argv[1],o); + } + + o->ptr = sdssetbit(o->ptr,bitoffset,on); + } + touchWatchedKey(c->db,c->argv[1]); + server.dirty++; + addReply(c,shared.cone); +} + +void getbitCommand(redisClient *c) { + robj *o; + size_t bitoffset, byte, bitmask; + int on = 0; + char llbuf[32]; + + if (getBitOffsetFromArgument(c,c->argv[2],&bitoffset) != REDIS_OK) + return; + + if ((o = lookupKeyReadOrReply(c,c->argv[1],shared.czero)) == NULL || + checkType(c,o,REDIS_STRING)) return; + + byte = bitoffset >> 3; + bitmask = 1 << (7 - (bitoffset & 0x7)); + if (o->encoding != REDIS_ENCODING_RAW) { + if (byte < (size_t)ll2string(llbuf,sizeof(llbuf),(long)o->ptr)) + on = llbuf[byte] & bitmask; + } else { + if (byte < sdslen(o->ptr)) + on = ((sds)o->ptr)[byte] & bitmask; + } + addReply(c, on ? shared.cone : shared.czero); +} + void mgetCommand(redisClient *c) { int j; - addReplySds(c,sdscatprintf(sdsempty(),"*%d\r\n",c->argc-1)); + addReplyMultiBulkLen(c,c->argc-1); for (j = 1; j < c->argc; j++) { robj *o = lookupKeyRead(c->db,c->argv[j]); if (o == NULL) { @@ -98,7 +184,7 @@ void msetGenericCommand(redisClient *c, int nx) { int j, busykeys = 0; if ((c->argc % 2) == 0) { - addReplySds(c,sdsnew("-ERR wrong number of arguments for MSET\r\n")); + addReplyError(c,"wrong number of arguments for MSET"); return; } /* Handle the NX flag. The MSETNX semantic is to return zero and don't @@ -120,6 +206,7 @@ void msetGenericCommand(redisClient *c, int nx) { 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]); } server.dirty += (c->argc-1)/2; addReply(c, nx ? shared.cone : shared.ok); @@ -144,6 +231,7 @@ void incrDecrCommand(redisClient *c, long long incr) { value += incr; o = createStringObjectFromLongLong(value); dbReplace(c->db,c->argv[1],o); + touchWatchedKey(c->db,c->argv[1]); server.dirty++; addReply(c,shared.colon); addReply(c,o); @@ -178,6 +266,7 @@ void appendCommand(redisClient *c) { robj *o; o = lookupKeyWrite(c->db,c->argv[1]); + c->argv[2] = tryObjectEncoding(c->argv[2]); if (o == NULL) { /* Create the key */ retval = dbAdd(c->db,c->argv[1],c->argv[2]); @@ -207,8 +296,9 @@ void appendCommand(redisClient *c) { } totlen = sdslen(o->ptr); } + touchWatchedKey(c->db,c->argv[1]); server.dirty++; - addReplySds(c,sdscatprintf(sdsempty(),":%lu\r\n",(unsigned long)totlen)); + addReplyLongLong(c,totlen); } void substrCommand(redisClient *c) { @@ -248,4 +338,13 @@ void substrCommand(redisClient *c) { decrRefCount(o); } +void strlenCommand(redisClient *c) { + robj *o; + + if ((o = lookupKeyReadOrReply(c,c->argv[1],shared.czero)) == NULL || + checkType(c,o,REDIS_STRING)) return; + o = getDecodedObject(o); + addReplyLongLong(c,sdslen(o->ptr)); + decrRefCount(o); +}