-#include <limits.h>
#include "redis.h"
+#include <math.h> /* isnan(), isinf() */
/*-----------------------------------------------------------------------------
* String Commands
return REDIS_OK;
}
-void setGenericCommand(redisClient *c, int nx, robj *key, robj *val, robj *expire) {
- int retval;
- long seconds = 0; /* initialized to avoid an harmness warning */
+void setGenericCommand(redisClient *c, int nx, robj *key, robj *val, robj *expire, int unit) {
+ long long milliseconds = 0; /* initialized to avoid an harmness warning */
if (expire) {
- if (getLongFromObjectOrReply(c, expire, &seconds, NULL) != REDIS_OK)
+ if (getLongLongFromObjectOrReply(c, expire, &milliseconds, NULL) != REDIS_OK)
return;
- if (seconds <= 0) {
+ if (milliseconds <= 0) {
addReplyError(c,"invalid expire time in SETEX");
return;
}
+ if (unit == UNIT_SECONDS) milliseconds *= 1000;
}
- 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);
+ if (expire) setExpire(c->db,key,mstime()+milliseconds);
addReply(c, nx ? shared.cone : shared.ok);
}
void setCommand(redisClient *c) {
c->argv[2] = tryObjectEncoding(c->argv[2]);
- setGenericCommand(c,0,c->argv[1],c->argv[2],NULL);
+ setGenericCommand(c,0,c->argv[1],c->argv[2],NULL,0);
}
void setnxCommand(redisClient *c) {
c->argv[2] = tryObjectEncoding(c->argv[2]);
- setGenericCommand(c,1,c->argv[1],c->argv[2],NULL);
+ setGenericCommand(c,1,c->argv[1],c->argv[2],NULL,0);
}
void setexCommand(redisClient *c) {
c->argv[3] = tryObjectEncoding(c->argv[3]);
- setGenericCommand(c,0,c->argv[1],c->argv[3],c->argv[2]);
+ setGenericCommand(c,0,c->argv[1],c->argv[3],c->argv[2],UNIT_SECONDS);
+}
+
+void psetexCommand(redisClient *c) {
+ c->argv[3] = tryObjectEncoding(c->argv[3]);
+ setGenericCommand(c,0,c->argv[1],c->argv[3],c->argv[2],UNIT_MILLISECONDS);
}
int getGenericCommand(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) {
robj *o;
char *err = "bit is not an integer or out of range";
size_t bitoffset;
- long long bitvalue;
- int byte, bit, on;
+ int byte, bit;
+ int byteval, bitval;
+ long on;
if (getBitOffsetFromArgument(c,c->argv[2],&bitoffset) != REDIS_OK)
return;
- if (getLongLongFromObjectOrReply(c,c->argv[3],&bitvalue,err) != REDIS_OK)
+ if (getLongFromObjectOrReply(c,c->argv[3],&on,err) != REDIS_OK)
return;
- /* A bit can only be set to be on or off... */
- if (bitvalue & ~1) {
+ /* Bits can only be set or cleared... */
+ if (on & ~1) {
addReplyError(c,err);
return;
}
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);
}
}
+ /* Grow sds value to the right length if necessary */
byte = bitoffset >> 3;
- bit = 7 - (bitoffset & 0x7);
- on = bitvalue & 0x1;
o->ptr = sdsgrowzero(o->ptr,byte+1);
- ((char*)o->ptr)[byte] |= on << bit;
- ((char*)o->ptr)[byte] &= ~((!on) << bit);
- touchWatchedKey(c->db,c->argv[1]);
+ /* Get current values */
+ byteval = ((char*)o->ptr)[byte];
+ bit = 7 - (bitoffset & 0x7);
+ bitval = byteval & (1 << bit);
+
+ /* Update byte with new bit value and return original value */
+ byteval &= ~(1 << bit);
+ byteval |= ((on & 0x1) << bit);
+ ((char*)o->ptr)[byte] = byteval;
+ signalModifiedKey(c->db,c->argv[1]);
server.dirty++;
- addReply(c,shared.cone);
+ addReply(c, bitval ? shared.cone : shared.czero);
}
void getbitCommand(redisClient *c) {
robj *o;
- size_t bitoffset, byte, bitmask;
- int on = 0;
char llbuf[32];
+ size_t bitoffset;
+ size_t byte, bit;
+ size_t bitval = 0;
if (getBitOffsetFromArgument(c,c->argv[2],&bitoffset) != REDIS_OK)
return;
checkType(c,o,REDIS_STRING)) return;
byte = bitoffset >> 3;
- bitmask = 1 << (7 - (bitoffset & 0x7));
+ bit = 7 - (bitoffset & 0x7);
if (o->encoding != REDIS_ENCODING_RAW) {
if (byte < (size_t)ll2string(llbuf,sizeof(llbuf),(long)o->ptr))
- on = llbuf[byte] & bitmask;
+ bitval = llbuf[byte] & (1 << bit);
} else {
if (byte < sdslen(o->ptr))
- on = ((sds)o->ptr)[byte] & bitmask;
+ bitval = ((char*)o->ptr)[byte] & (1 << bit);
}
- addReply(c, on ? shared.cone : shared.czero);
+
+ addReply(c, bitval ? shared.cone : shared.czero);
}
void setrangeCommand(redisClient *c) {
if (getLongFromObjectOrReply(c,c->argv[2],&offset,NULL) != REDIS_OK)
return;
+ if (offset < 0) {
+ addReplyError(c,"offset is out of range");
+ return;
+ }
+
o = lookupKeyWrite(c->db,c->argv[1]);
if (o == NULL) {
- /* Negative offset is always 0 for non-existing keys */
- if (offset < 0) offset = 0;
-
/* Return 0 when setting nothing on a non-existing string */
if (sdslen(value) == 0) {
addReply(c,shared.czero);
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;
}
- /* Convert negative indexes. Note that for SETRANGE, the meaning of a
- * negative index is a little different than for other commands.
- * Here, an offset of -1 points to the trailing NULL byte of the
- * string instead of the last character. */
- if (offset < 0) {
- offset = olen+1+offset;
- if (offset < 0) offset = 0;
- }
-
/* Return when the resulting string exceeds allowed size */
if (checkStringLength(c,offset+sdslen(value)) != REDIS_OK)
return;
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));
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) {
/* 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);
}
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);
}
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;
+ if ((incr < 0 && oldvalue < 0 && incr < (LLONG_MIN-oldvalue)) ||
+ (incr > 0 && oldvalue > 0 && incr > (LLONG_MAX-oldvalue))) {
+ addReplyError(c,"increment or decrement would overflow");
+ return;
+ }
value += incr;
- o = createStringObjectFromLongLong(value);
- dbReplace(c->db,c->argv[1],o);
- touchWatchedKey(c->db,c->argv[1]);
+ 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);
}
incrDecrCommand(c,-incr);
}
+void incrbyfloatCommand(redisClient *c) {
+ long double incr, value;
+ robj *o, *new, *aux;
+
+ o = lookupKeyWrite(c->db,c->argv[1]);
+ if (o != NULL && checkType(c,o,REDIS_STRING)) return;
+ if (getLongDoubleFromObjectOrReply(c,o,&value,NULL) != REDIS_OK ||
+ getLongDoubleFromObjectOrReply(c,c->argv[2],&incr,NULL) != REDIS_OK)
+ return;
+
+ value += incr;
+ if (isnan(value) || isinf(value)) {
+ addReplyError(c,"increment would produce NaN or Infinity");
+ return;
+ }
+ new = createStringObjectFromLongDouble(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++;
+ addReplyBulk(c,new);
+
+ /* Always replicate INCRBYFLOAT as a SET command with the final value
+ * in order to make sure that differences in float pricision or formatting
+ * will not create differences in replicas or after an AOF restart. */
+ aux = createStringObject("SET",3);
+ rewriteClientCommandArgument(c,0,aux);
+ decrRefCount(aux);
+ rewriteClientCommandArgument(c,2,new);
+}
+
void appendCommand(redisClient *c) {
- int retval;
size_t totlen;
robj *o, *append;
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]);
+ c->argv[2] = tryObjectEncoding(c->argv[2]);
+ dbAdd(c->db,c->argv[1],c->argv[2]);
incrRefCount(c->argv[2]);
totlen = stringObjectLen(c->argv[2]);
} else {
- if (o->type != REDIS_STRING) {
- addReply(c,shared.wrongtypeerr);
+ /* Key exists, check type */
+ if (checkType(c,o,REDIS_STRING))
return;
- }
- append = getDecodedObject(c->argv[2]);
- if (o->encoding == REDIS_ENCODING_RAW &&
- (sdslen(o->ptr) + sdslen(append->ptr)) > 512*1024*1024)
- {
- addReplyError(c,"string exceeds maximum allowed size (512MB)");
- decrRefCount(append);
+ /* "append" is an argument, so always an sds */
+ append = c->argv[2];
+ totlen = stringObjectLen(o)+sdslen(append->ptr);
+ if (checkStringLength(c,totlen) != REDIS_OK)
return;
- }
/* If the object is shared or encoded, we have to make a copy */
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);
+ dbOverwrite(c->db,c->argv[1],o);
}
/* Append the value */
o->ptr = sdscatlen(o->ptr,append->ptr,sdslen(append->ptr));
- decrRefCount(append);
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));
}
projects / redis.git / blobdiff