INCRBYFLOAT implementation

[redis.git] / src / networking.c

diff --git a/src/networking.c b/src/networking.c
index 4ecf78e80e251f7d2991a8c2a9f52357b6496995..edd7891d379dfe99328c8ad5dc74992de9ac38fc 100644 (file)
--- a/src/networking.c
+++ b/src/networking.c
@@ -767,7 +767,6 @@ int processMultibulkBuffer(redisClient *c) {
             }
 
             pos += newline-(c->querybuf+pos)+2;
             }
 
             pos += newline-(c->querybuf+pos)+2;

-#ifdef REDIS_MBULK_BIG_ARG

             if (ll >= REDIS_MBULK_BIG_ARG) {
                 /* If we are going to read a large object from network
                  * try to make it likely that it will start at c->querybuf
             if (ll >= REDIS_MBULK_BIG_ARG) {
                 /* If we are going to read a large object from network
                  * try to make it likely that it will start at c->querybuf


@@ -775,12 +774,10 @@ int processMultibulkBuffer(redisClient *c) {
                  * avoiding a large copy of data. */
                 c->querybuf = sdsrange(c->querybuf,pos,-1);
                 pos = 0;
                  * avoiding a large copy of data. */
                 c->querybuf = sdsrange(c->querybuf,pos,-1);
                 pos = 0;

-            }
-            /* Hint the sds library about the amount of bytes this string is
-             * going to contain. */
-            if (ll >= REDIS_MBULK_BIG_ARG)
+                /* Hint the sds library about the amount of bytes this string is
+                 * going to contain. */

                 c->querybuf = sdsMakeRoomFor(c->querybuf,ll+2);
                 c->querybuf = sdsMakeRoomFor(c->querybuf,ll+2);

-#endif
+            }

             c->bulklen = ll;
         }
 
             c->bulklen = ll;
         }
 


@@ -792,12 +789,10 @@ int processMultibulkBuffer(redisClient *c) {
             /* Optimization: if the buffer contanins JUST our bulk element
              * instead of creating a new object by *copying* the sds we
              * just use the current sds string. */
             /* Optimization: if the buffer contanins JUST our bulk element
              * instead of creating a new object by *copying* the sds we
              * just use the current sds string. */

-#ifdef REDIS_MBULK_BIG_ARG

             if (pos == 0 &&
                 c->bulklen >= REDIS_MBULK_BIG_ARG &&
                 (signed) sdslen(c->querybuf) == c->bulklen+2)
             {
             if (pos == 0 &&
                 c->bulklen >= REDIS_MBULK_BIG_ARG &&
                 (signed) sdslen(c->querybuf) == c->bulklen+2)
             {

-                // printf("HERE (arg %d)\n",c->argc);

                 c->argv[c->argc++] = createObject(REDIS_STRING,c->querybuf);
                 sdsIncrLen(c->querybuf,-2); /* remove CRLF */
                 c->querybuf = sdsempty();
                 c->argv[c->argc++] = createObject(REDIS_STRING,c->querybuf);
                 sdsIncrLen(c->querybuf,-2); /* remove CRLF */
                 c->querybuf = sdsempty();


@@ -806,14 +801,10 @@ int processMultibulkBuffer(redisClient *c) {
                 c->querybuf = sdsMakeRoomFor(c->querybuf,c->bulklen+2);
                 pos = 0;
             } else {
                 c->querybuf = sdsMakeRoomFor(c->querybuf,c->bulklen+2);
                 pos = 0;
             } else {

-#endif
-                // printf("NOT HERE (arg %d) (pos %d)\n",c->argc, pos);

                 c->argv[c->argc++] =
                     createStringObject(c->querybuf+pos,c->bulklen);
                 pos += c->bulklen+2;
                 c->argv[c->argc++] =
                     createStringObject(c->querybuf+pos,c->bulklen);
                 pos += c->bulklen+2;

-#ifdef REDIS_MBULK_BIG_ARG

             }
             }

-#endif

             c->bulklen = -1;
             c->multibulklen--;
         }
             c->bulklen = -1;
             c->multibulklen--;
         }


@@ -876,7 +867,6 @@ void readQueryFromClient(aeEventLoop *el, int fd, void *privdata, int mask) {
     REDIS_NOTUSED(mask);
 
     readlen = REDIS_IOBUF_LEN;
     REDIS_NOTUSED(mask);
 
     readlen = REDIS_IOBUF_LEN;

-#if REDIS_MBULK_BIG_ARG

     /* If this is a multi bulk request, and we are processing a bulk reply
      * that is large enough, try to maximize the probabilty that the query
      * buffer contains excatly the SDS string representing the object, even
     /* If this is a multi bulk request, and we are processing a bulk reply
      * that is large enough, try to maximize the probabilty that the query
      * buffer contains excatly the SDS string representing the object, even


@@ -890,7 +880,6 @@ void readQueryFromClient(aeEventLoop *el, int fd, void *privdata, int mask) {
 
         if (remaining < readlen) readlen = remaining;
     }
 
         if (remaining < readlen) readlen = remaining;
     }

-#endif

 
     qblen = sdslen(c->querybuf);
     c->querybuf = sdsMakeRoomFor(c->querybuf, readlen);
 
     qblen = sdslen(c->querybuf);
     c->querybuf = sdsMakeRoomFor(c->querybuf, readlen);