correctly set AOF base size field in server structure

[redis.git] / src / t_string.c

diff --git a/src/t_string.c b/src/t_string.c
index e442a49fd48e340133d674d8c9fd363eb2e5cdb2..64b6f0c59b4a521c69d7fc3357014c97bdaf2736 100644 (file)
--- a/src/t_string.c
+++ b/src/t_string.c
@@ -1,4 +1,3 @@
-#include <limits.h>

 #include "redis.h"
 
 /*-----------------------------------------------------------------------------
 #include "redis.h"
 
 /*-----------------------------------------------------------------------------


@@ -38,7 +37,7 @@ void setGenericCommand(redisClient *c, int nx, robj *key, robj *val, robj *expir
     } else {
         incrRefCount(val);
     }
     } else {
         incrRefCount(val);
     }

-    touchWatchedKey(c->db,key);
+    signalModifiedKey(c->db,key);

     server.dirty++;
     removeExpire(c->db,key);
     if (expire) setExpire(c->db,key,time(NULL)+seconds);
     server.dirty++;
     removeExpire(c->db,key);
     if (expire) setExpire(c->db,key,time(NULL)+seconds);


@@ -84,7 +83,7 @@ void getsetCommand(redisClient *c) {
     c->argv[2] = tryObjectEncoding(c->argv[2]);
     dbReplace(c->db,c->argv[1],c->argv[2]);
     incrRefCount(c->argv[2]);
     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]);
+    signalModifiedKey(c->db,c->argv[1]);

     server.dirty++;
     removeExpire(c->db,c->argv[1]);
 }
     server.dirty++;
     removeExpire(c->db,c->argv[1]);
 }


@@ -96,10 +95,8 @@ static int getBitOffsetFromArgument(redisClient *c, robj *o, size_t *offset) {
     if (getLongLongFromObjectOrReply(c,o,&loffset,err) != REDIS_OK)
         return REDIS_ERR;
 
     if (getLongLongFromObjectOrReply(c,o,&loffset,err) != REDIS_OK)
         return REDIS_ERR;
 

-    /* Limit offset to SIZE_T_MAX or 512MB in bytes */
-    if ((loffset < 0) ||
-        ((unsigned long long)loffset >= (unsigned)SIZE_T_MAX) ||
-        ((unsigned long long)loffset >> 3) >= (512*1024*1024))
+    /* Limit offset to 512MB in bytes */
+    if ((loffset < 0) || ((unsigned long long)loffset >> 3) >= (512*1024*1024))

     {
         addReplyError(c,err);
         return REDIS_ERR;
     {
         addReplyError(c,err);
         return REDIS_ERR;


@@ -113,17 +110,18 @@ void setbitCommand(redisClient *c) {
     robj *o;
     char *err = "bit is not an integer or out of range";
     size_t bitoffset;
     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 (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;
 
         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;
     }
         addReplyError(c,err);
         return;
     }


@@ -144,23 +142,30 @@ void setbitCommand(redisClient *c) {
         }
     }
 
         }
     }
 

+    /* Grow sds value to the right length if necessary */

     byte = bitoffset >> 3;
     byte = bitoffset >> 3;

-    bit = 7 - (bitoffset & 0x7);
-    on = bitvalue & 0x1;

     o->ptr = sdsgrowzero(o->ptr,byte+1);
     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++;
     server.dirty++;

-    addReply(c,shared.cone);
+    addReply(c, bitval ? shared.cone : shared.czero);

 }
 
 void getbitCommand(redisClient *c) {
     robj *o;
 }
 
 void getbitCommand(redisClient *c) {
     robj *o;

-    size_t bitoffset, byte, bitmask;
-    int on = 0;

     char llbuf[32];
     char llbuf[32];

+    size_t bitoffset;
+    size_t byte, bit;
+    size_t bitval = 0;

 
     if (getBitOffsetFromArgument(c,c->argv[2],&bitoffset) != REDIS_OK)
         return;
 
     if (getBitOffsetFromArgument(c,c->argv[2],&bitoffset) != REDIS_OK)
         return;


@@ -169,15 +174,16 @@ void getbitCommand(redisClient *c) {
         checkType(c,o,REDIS_STRING)) return;
 
     byte = bitoffset >> 3;
         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))
     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))
     } 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) {
 }
 
 void setrangeCommand(redisClient *c) {


@@ -188,11 +194,13 @@ void setrangeCommand(redisClient *c) {
     if (getLongFromObjectOrReply(c,c->argv[2],&offset,NULL) != REDIS_OK)
         return;
 
     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) {
     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);
         /* Return 0 when setting nothing on a non-existing string */
         if (sdslen(value) == 0) {
             addReply(c,shared.czero);


@@ -206,35 +214,19 @@ void setrangeCommand(redisClient *c) {
         o = createObject(REDIS_STRING,sdsempty());
         dbAdd(c->db,c->argv[1],o);
     } else {
         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;
 
 
         /* 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 */
         /* Return existing string length when setting nothing */

+        olen = stringObjectLen(o);

         if (sdslen(value) == 0) {
             addReplyLongLong(c,olen);
             return;
         }
 
         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;
         /* Return when the resulting string exceeds allowed size */
         if (checkStringLength(c,offset+sdslen(value)) != REDIS_OK)
             return;


@@ -251,12 +243,49 @@ void setrangeCommand(redisClient *c) {
     if (sdslen(value) > 0) {
         o->ptr = sdsgrowzero(o->ptr,offset+sdslen(value));
         memcpy((char*)o->ptr+offset,value,sdslen(value));
     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));
 }
 
         server.dirty++;
     }
     addReplyLongLong(c,sdslen(o->ptr));
 }
 

+void getrangeCommand(redisClient *c) {
+    robj *o;
+    long start, end;
+    char *str, llbuf[32];
+    size_t strlen;
+
+    if (getLongFromObjectOrReply(c,c->argv[2],&start,NULL) != REDIS_OK)
+        return;
+    if (getLongFromObjectOrReply(c,c->argv[3],&end,NULL) != REDIS_OK)
+        return;
+    if ((o = lookupKeyReadOrReply(c,c->argv[1],shared.emptybulk)) == NULL ||
+        checkType(c,o,REDIS_STRING)) return;
+
+    if (o->encoding == REDIS_ENCODING_INT) {
+        str = llbuf;
+        strlen = ll2string(llbuf,sizeof(llbuf),(long)o->ptr);
+    } else {
+        str = o->ptr;
+        strlen = sdslen(str);
+    }
+
+    /* Convert negative indexes */
+    if (start < 0) start = strlen+start;
+    if (end < 0) end = strlen+end;
+    if (start < 0) start = 0;
+    if (end < 0) end = 0;
+    if ((unsigned)end >= strlen) end = strlen-1;
+
+    /* Precondition: end >= 0 && end < strlen, so the only condition where
+     * nothing can be returned is: start > end. */
+    if (start > end) {
+        addReply(c,shared.emptybulk);
+    } else {
+        addReplyBulkCBuffer(c,(char*)str+start,end-start+1);
+    }
+}
+

 void mgetCommand(redisClient *c) {
     int j;
 
 void mgetCommand(redisClient *c) {
     int j;
 


@@ -301,7 +330,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]);
         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]);
+        signalModifiedKey(c->db,c->argv[j]);

     }
     server.dirty += (c->argc-1)/2;
     addReply(c, nx ? shared.cone : shared.ok);
     }
     server.dirty += (c->argc-1)/2;
     addReply(c, nx ? shared.cone : shared.ok);


@@ -316,17 +345,22 @@ void msetnxCommand(redisClient *c) {
 }
 
 void incrDecrCommand(redisClient *c, long long incr) {
 }
 
 void incrDecrCommand(redisClient *c, long long incr) {

-    long long value;
+    long long value, oldvalue;

     robj *o;
 
     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;
 
     robj *o;
 
     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;
     value += incr;

+    if ((incr < 0 && value > oldvalue) || (incr > 0 && value < oldvalue)) {
+        addReplyError(c,"increment or decrement would overflow");
+        return;
+    }

     o = createStringObjectFromLongLong(value);
     dbReplace(c->db,c->argv[1],o);
     o = createStringObjectFromLongLong(value);
     dbReplace(c->db,c->argv[1],o);

-    touchWatchedKey(c->db,c->argv[1]);
+    signalModifiedKey(c->db,c->argv[1]);

     server.dirty++;
     addReply(c,shared.colon);
     addReply(c,o);
     server.dirty++;
     addReply(c,shared.colon);
     addReply(c,o);


@@ -356,31 +390,26 @@ void decrbyCommand(redisClient *c) {
 }
 
 void appendCommand(redisClient *c) {
 }
 
 void appendCommand(redisClient *c) {

-    int retval;

     size_t totlen;
     robj *o, *append;
 
     o = lookupKeyWrite(c->db,c->argv[1]);
     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 */
     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 {
         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;
             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;
             return;

-        }

 
         /* If the object is shared or encoded, we have to make a copy */
         if (o->refcount != 1 || o->encoding != REDIS_ENCODING_RAW) {
 
         /* If the object is shared or encoded, we have to make a copy */
         if (o->refcount != 1 || o->encoding != REDIS_ENCODING_RAW) {


@@ -392,65 +421,17 @@ void appendCommand(redisClient *c) {
 
         /* Append the value */
         o->ptr = sdscatlen(o->ptr,append->ptr,sdslen(append->ptr));
 
         /* Append the value */
         o->ptr = sdscatlen(o->ptr,append->ptr,sdslen(append->ptr));

-        decrRefCount(append);

         totlen = sdslen(o->ptr);
     }
         totlen = sdslen(o->ptr);
     }

-    touchWatchedKey(c->db,c->argv[1]);
+    signalModifiedKey(c->db,c->argv[1]);

     server.dirty++;
     addReplyLongLong(c,totlen);
 }
 
     server.dirty++;
     addReplyLongLong(c,totlen);
 }
 

-void substrCommand(redisClient *c) {
-    robj *o;
-    long start = atoi(c->argv[2]->ptr);
-    long end = atoi(c->argv[3]->ptr);
-    size_t rangelen, strlen;
-    sds range;
-
-    if ((o = lookupKeyReadOrReply(c,c->argv[1],shared.nullbulk)) == NULL ||
-        checkType(c,o,REDIS_STRING)) return;
-
-    o = getDecodedObject(o);
-    strlen = sdslen(o->ptr);
-
-    /* convert negative indexes */
-    if (start < 0) start = strlen+start;
-    if (end < 0) end = strlen+end;
-    if (start < 0) start = 0;
-    if (end < 0) end = 0;
-
-    /* indexes sanity checks */
-    if (start > end || (size_t)start >= strlen) {
-        /* Out of range start or start > end result in null reply */
-        addReply(c,shared.nullbulk);
-        decrRefCount(o);
-        return;
-    }
-    if ((size_t)end >= strlen) end = strlen-1;
-    rangelen = (end-start)+1;
-
-    /* Return the result */
-    addReplySds(c,sdscatprintf(sdsempty(),"$%zu\r\n",rangelen));
-    range = sdsnewlen((char*)o->ptr+start,rangelen);
-    addReplySds(c,range);
-    addReply(c,shared.crlf);
-    decrRefCount(o);
-}
-

 void strlenCommand(redisClient *c) {
     robj *o;
 void strlenCommand(redisClient *c) {
     robj *o;

-

     if ((o = lookupKeyReadOrReply(c,c->argv[1],shared.czero)) == NULL ||
         checkType(c,o,REDIS_STRING)) return;
     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));

 }
 
 }