gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source 
Former-commit-id: 0b43b51a2e3a6af11532146fbb7929f3ecf3b036
This commit is contained in:
John Sully 2019-07-18 21:52:19 -04:00
parent f88592451d
commit 589628823f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/db.cpp
View File

@ -1274,7 +1274,7 @@ void setExpire(client *c, redisDb *db, robj *key, expireEntry &&e)
kde = dictFind(db->pdict,ptrFromObj(key)); kde = dictFind(db->pdict,ptrFromObj(key));
serverAssertWithInfo(NULL,key,kde != NULL); serverAssertWithInfo(NULL,key,kde != NULL);
if (((robj*)dictGetVal(kde))->refcount == OBJ_SHARED_REFCOUNT) if (((robj*)dictGetVal(kde))->getrefcount(std::memory_order_relaxed) == OBJ_SHARED_REFCOUNT)
{ {
// shared objects cannot have the expire bit set, create a real object // shared objects cannot have the expire bit set, create a real object
dictSetVal(db->pdict, kde, dupStringObject((robj*)dictGetVal(kde))); dictSetVal(db->pdict, kde, dupStringObject((robj*)dictGetVal(kde)));