Commit 3203e2dc authored by antirez's avatar antirez
Browse files

Fix 2.8 backport of fastscript branch.

No REDIS_ENCODING_EMBSTR in 2.8 internals.
parent 6e478ec8
...@@ -373,8 +373,7 @@ cleanup: ...@@ -373,8 +373,7 @@ cleanup:
* (we must be the only owner) for us to cache it. */ * (we must be the only owner) for us to cache it. */
if (j < LUA_CMD_OBJCACHE_SIZE && if (j < LUA_CMD_OBJCACHE_SIZE &&
o->refcount == 1 && o->refcount == 1 &&
(o->encoding == REDIS_ENCODING_RAW || o->encoding == REDIS_ENCODING_RAW &&
o->encoding == REDIS_ENCODING_EMBSTR) &&
sdslen(o->ptr) <= LUA_CMD_OBJCACHE_MAX_LEN) sdslen(o->ptr) <= LUA_CMD_OBJCACHE_MAX_LEN)
{ {
struct sdshdr *sh = (void*)(((char*)(o->ptr))-(sizeof(struct sdshdr))); struct sdshdr *sh = (void*)(((char*)(o->ptr))-(sizeof(struct sdshdr)));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment