summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2014-05-07 16:39:43 +0200
committerantirez <antirez@gmail.com>2014-05-07 16:39:43 +0200
commit4bb905c98f55aa865618461cd2c4e6e7c3cfc2de (patch)
treef0e791e238115ebcf7afc145a63ccacf18abfa7d
parent80b96bc4a7350d3ef9971a5548b7e47a43aa7c90 (diff)
downloadredis-2.8-fastscript.tar.gz
Fix 2.8 backport of fastscript branch.2.8-fastscript
No REDIS_ENCODING_EMBSTR in 2.8 internals.
-rw-r--r--src/scripting.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/scripting.c b/src/scripting.c
index 056945a55..5539f40da 100644
--- a/src/scripting.c
+++ b/src/scripting.c
@@ -373,8 +373,7 @@ cleanup:
* (we must be the only owner) for us to cache it. */
if (j < LUA_CMD_OBJCACHE_SIZE &&
o->refcount == 1 &&
- (o->encoding == REDIS_ENCODING_RAW ||
- o->encoding == REDIS_ENCODING_EMBSTR) &&
+ o->encoding == REDIS_ENCODING_RAW &&
sdslen(o->ptr) <= LUA_CMD_OBJCACHE_MAX_LEN)
{
struct sdshdr *sh = (void*)(((char*)(o->ptr))-(sizeof(struct sdshdr)));