First implementation of the slow log feature

[redis.git] / src / object.c

diff --git a/src/object.c b/src/object.c
index 4bf1df01fe9c5dce7edae769d25406ed8acaa442..ce13429af94df159cf51307d721f8da52e152550 100644 (file)
--- a/src/object.c
+++ b/src/object.c
@@ -1,5 +1,4 @@
 #include "redis.h"
 #include "redis.h"

-#include <pthread.h>

 #include <math.h>
 
 robj *createObject(int type, void *ptr) {
 #include <math.h>
 
 robj *createObject(int type, void *ptr) {


@@ -30,9 +29,7 @@ robj *createStringObject(char *ptr, size_t len) {
 
 robj *createStringObjectFromLongLong(long long value) {
     robj *o;
 
 robj *createStringObjectFromLongLong(long long value) {
     robj *o;

-    if (value >= 0 && value < REDIS_SHARED_INTEGERS &&
-        !server.ds_enabled &&
-        pthread_equal(pthread_self(),server.mainthread)) {
+    if (value >= 0 && value < REDIS_SHARED_INTEGERS) {

         incrRefCount(shared.integers[value]);
         o = shared.integers[value];
     } else {
         incrRefCount(shared.integers[value]);
         o = shared.integers[value];
     } else {


@@ -144,7 +141,7 @@ void freeSetObject(robj *o) {
 void freeZsetObject(robj *o) {
     zset *zs;
     switch (o->encoding) {
 void freeZsetObject(robj *o) {
     zset *zs;
     switch (o->encoding) {

-    case REDIS_ENCODING_RAW:
+    case REDIS_ENCODING_SKIPLIST:

         zs = o->ptr;
         dictRelease(zs->dict);
         zslFree(zs->zsl);
         zs = o->ptr;
         dictRelease(zs->dict);
         zslFree(zs->zsl);


@@ -180,7 +177,7 @@ void decrRefCount(void *obj) {
     robj *o = obj;
 
     if (o->refcount <= 0) redisPanic("decrRefCount against refcount <= 0");
     robj *o = obj;
 
     if (o->refcount <= 0) redisPanic("decrRefCount against refcount <= 0");

-    if (--(o->refcount) == 0) {
+    if (o->refcount == 1) {

         switch(o->type) {
         case REDIS_STRING: freeStringObject(o); break;
         case REDIS_LIST: freeListObject(o); break;
         switch(o->type) {
         case REDIS_STRING: freeStringObject(o); break;
         case REDIS_LIST: freeListObject(o); break;


@@ -189,8 +186,9 @@ void decrRefCount(void *obj) {
         case REDIS_HASH: freeHashObject(o); break;
         default: redisPanic("Unknown object type"); break;
         }
         case REDIS_HASH: freeHashObject(o); break;
         default: redisPanic("Unknown object type"); break;
         }

-        o->ptr = NULL; /* defensive programming. We'll see NULL in traces. */

         zfree(o);
         zfree(o);

+    } else {
+        o->refcount--;

     }
 }
 
     }
 }
 


@@ -202,6 +200,16 @@ int checkType(redisClient *c, robj *o, int type) {
     return 0;
 }
 
     return 0;
 }
 

+int isObjectRepresentableAsLongLong(robj *o, long long *llval) {
+    redisAssert(o->type == REDIS_STRING);
+    if (o->encoding == REDIS_ENCODING_INT) {
+        if (llval) *llval = (long) o->ptr;
+        return REDIS_OK;
+    } else {
+        return string2ll(o->ptr,sdslen(o->ptr),llval) ? REDIS_OK : REDIS_ERR;
+    }
+}
+

 /* Try to encode a string object in order to save space */
 robj *tryObjectEncoding(robj *o) {
     long value;
 /* Try to encode a string object in order to save space */
 robj *tryObjectEncoding(robj *o) {
     long value;


@@ -219,7 +227,7 @@ robj *tryObjectEncoding(robj *o) {
     redisAssert(o->type == REDIS_STRING);
 
     /* Check if we can represent this string as a long integer */
     redisAssert(o->type == REDIS_STRING);
 
     /* Check if we can represent this string as a long integer */

-    if (isStringRepresentableAsLong(s,&value) == REDIS_ERR) return o;
+    if (!string2l(s,sdslen(s),&value)) return o;

 
     /* Ok, this object can be encoded...
      *
 
     /* Ok, this object can be encoded...
      *


@@ -230,10 +238,7 @@ robj *tryObjectEncoding(robj *o) {
      * Note that we also avoid using shared integers when maxmemory is used
      * because every object needs to have a private LRU field for the LRU
      * algorithm to work well. */
      * Note that we also avoid using shared integers when maxmemory is used
      * because every object needs to have a private LRU field for the LRU
      * algorithm to work well. */

-    if (!server.ds_enabled &&
-        server.maxmemory == 0 && value >= 0 && value < REDIS_SHARED_INTEGERS &&
-        pthread_equal(pthread_self(),server.mainthread))
-    {
+    if (server.maxmemory == 0 && value >= 0 && value < REDIS_SHARED_INTEGERS) {

         decrRefCount(o);
         incrRefCount(shared.integers[value]);
         return shared.integers[value];
         decrRefCount(o);
         incrRefCount(shared.integers[value]);
         return shared.integers[value];