Make SLOWLOG argument truncation play well with LZF encoding.

redis · Apr 4, 2014 · 1c894f5 · 1c894f5
1 parent e2871e2
commit 1c894f5
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/slowlog.c b/src/slowlog.c
@@ -63,15 +63,17 @@ slowlogEntry *slowlogCreateEntry(robj **argv, int argc, long long duration) {
         } else {
             /* Trim too long strings as well... */
             if (argv[j]->type == REDIS_STRING &&
-                sdsEncodedObject(argv[j]) &&
-                sdslen(argv[j]->ptr) > SLOWLOG_ENTRY_MAX_STRING)
+                (sdsEncodedObject(argv[j]) || lzfEncodedObject(argv[j])) &&
+                stringObjectLen(argv[j]) > SLOWLOG_ENTRY_MAX_STRING)
             {
-                sds s = sdsnewlen(argv[j]->ptr, SLOWLOG_ENTRY_MAX_STRING);
+                robj *o = getDecodedObject(argv[j]);
+                sds s = sdsnewlen(o->ptr, SLOWLOG_ENTRY_MAX_STRING);
 
                 s = sdscatprintf(s,"... (%lu more bytes)",
                     (unsigned long)
-                    sdslen(argv[j]->ptr) - SLOWLOG_ENTRY_MAX_STRING);
+                    stringObjectLen(argv[j]) - SLOWLOG_ENTRY_MAX_STRING);
                 se->argv[j] = createObject(REDIS_STRING,s);
+                decrRefCount(o);
             } else {
                 se->argv[j] = argv[j];
                 incrRefCount(argv[j]);