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

Get rid of key only iterate, the threadsafe is just as fast and key only users can ignore the robj

Browse Source 
Former-commit-id: 29689a5ed6141c5b2019d41ccd4036e6ddd1a121
This commit is contained in:
John Sully 2019-11-24 15:45:17 -05:00
parent 0a123e145e
commit 9a75557651
2 changed files with 3 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/db.cpp
View File

@ -649,7 +649,7 @@ bool redisDbPersistentData::iterate(std::function<bool(const char*, robj*)> fn)
if (fResult && m_pdbSnapshot != nullptr) if (fResult && m_pdbSnapshot != nullptr)
{ {
fResult = m_pdbSnapshot->iterate([&](const char *key){ fResult = m_pdbSnapshot->iterate_threadsafe([&](const char *key, robj_roptr){
// Before passing off to the user we need to make sure it's not already in the // Before passing off to the user we need to make sure it's not already in the
// the current set, and not deleted // the current set, and not deleted
dictEntry *deCurrent = dictFind(m_pdict, key); dictEntry *deCurrent = dictFind(m_pdict, key);
@ -671,10 +671,10 @@ bool redisDbPersistentData::iterate(std::function<bool(const char*, robj*)> fn)
bool redisDbPersistentData::iterate_threadsafe(std::function<bool(const char*, robj_roptr o)> fn) const bool redisDbPersistentData::iterate_threadsafe(std::function<bool(const char*, robj_roptr o)> fn) const
{ {
dictIterator *di = dictGetIterator(m_pdict);
dictEntry *de = nullptr; dictEntry *de = nullptr;
bool fResult = true; bool fResult = true;
dictIterator *di = dictGetIterator(m_pdict);
while((de = dictNext(di)) != nullptr) while((de = dictNext(di)) != nullptr)
{ {
if (!fn((const char*)dictGetKey(de), (robj*)dictGetVal(de))) if (!fn((const char*)dictGetKey(de), (robj*)dictGetVal(de)))
@ -705,41 +705,6 @@ bool redisDbPersistentData::iterate_threadsafe(std::function<bool(const char*, r
return fResult; return fResult;
} }
bool redisDbPersistentData::iterate(std::function<bool(const char*)> fn) const
{
dictIterator *di = dictGetIterator(m_pdict);
dictEntry *de = nullptr;
bool fResult = true;
while((de = dictNext(di)) != nullptr)
{
if (!fn((const char*)dictGetKey(de)))
{
fResult = false;
break;
}
}
dictReleaseIterator(di);
if (fResult && m_pdbSnapshot != nullptr)
{
fResult = m_pdbSnapshot->iterate([&](const char *key){
// Before passing off to the user we need to make sure it's not already in the
// the current set, and not deleted
dictEntry *deCurrent = dictFind(m_pdict, key);
if (deCurrent != nullptr)
return true;
dictEntry *deTombstone = dictFind(m_pdictTombstone, key);
if (deTombstone != nullptr)
return true;
// Alright it's a key in the use keyspace
return fn(key);
});
}
return fResult;
}
client *createFakeClient(void); client *createFakeClient(void);
void freeFakeClient(client *); void freeFakeClient(client *);
void keysCommandCore(client *cIn, const redisDbPersistentData *db, sds pattern) void keysCommandCore(client *cIn, const redisDbPersistentData *db, sds pattern)
@ -753,7 +718,7 @@ void keysCommandCore(client *cIn, const redisDbPersistentData *db, sds pattern)
void *replylen = addReplyDeferredLen(c); void *replylen = addReplyDeferredLen(c);
allkeys = (pattern[0] == '*' && pattern[1] == '\0'); allkeys = (pattern[0] == '*' && pattern[1] == '\0');
db->iterate([&](const char *key)->bool { db->iterate_threadsafe([&](const char *key, robj_roptr)->bool {
robj *keyobj; robj *keyobj;
if (allkeys || stringmatchlen(pattern,plen,key,sdslen(key),0)) { if (allkeys || stringmatchlen(pattern,plen,key,sdslen(key),0)) {

1
src/server.h
View File

@ -1261,7 +1261,6 @@ public:
// Note: If you do not need the obj then use the objless iterator version. It's faster // Note: If you do not need the obj then use the objless iterator version. It's faster
bool iterate(std::function<bool(const char*, robj*)> fn); bool iterate(std::function<bool(const char*, robj*)> fn);
bool iterate_threadsafe(std::function<bool(const char*, robj_roptr o)> fn) const; bool iterate_threadsafe(std::function<bool(const char*, robj_roptr o)> fn) const;
bool iterate(std::function<bool(const char*)> fn) const;
void setExpire(robj *key, robj *subkey, long long when); void setExpire(robj *key, robj *subkey, long long when);
void setExpire(expireEntry &&e); void setExpire(expireEntry &&e);
expireEntry *getExpire(robj_roptr key); expireEntry *getExpire(robj_roptr key);