From caff59ed65a8dea7bcd46c4184f196561ca60417 Mon Sep 17 00:00:00 2001 From: John Sully Date: Wed, 22 Sep 2021 19:25:57 +0000 Subject: [PATCH] We returned too early and didn't set the mvcc Former-commit-id: d8e2ffe538a6b237529c37cb142a7076dd4836f8 --- src/object.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/object.cpp b/src/object.cpp index ee6310c41..01b83b4c9 100644 --- a/src/object.cpp +++ b/src/object.cpp @@ -1601,23 +1601,22 @@ robj *deserializeStoredStringObject(const char *data, size_t cb) newObject = createObject(OBJ_STRING, nullptr); newObject->encoding = oT->encoding; newObject->m_ptr = oT->m_ptr; - return newObject; + break; case OBJ_ENCODING_EMBSTR: newObject = createEmbeddedStringObject(szFromObj(oT), sdslen(szFromObj(oT))); - return newObject; + break; case OBJ_ENCODING_RAW: newObject = createObject(OBJ_STRING, sdsnewlen(SDS_NOINIT,cb-sizeof(robj)-sizeof(uint64_t))); newObject->lru = oT->lru; memcpy(newObject->m_ptr, data+sizeof(robj)+sizeof(mvcc), cb-sizeof(robj)-sizeof(mvcc)); - return newObject; + break; default: serverPanic("Unknown string object encoding from storage"); } setMvccTstamp(newObject, mvcc); - newObject->setrefcount(1); return newObject; }