hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cache: Fix prev/next twiddling

Browse Source
This commit is contained in:
Johan Wikman
2016-11-29 17:23:53 +02:00
parent 9c1b9c188e
commit e5a9eceff4
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/modules/filter/cache/lrustorage.cc vendored
View File

@ -51,7 +51,7 @@ cache_result_t LRUStorage::do_get_value(const CACHE_KEY& key,
{ {
if (ptail_ == i->second) if (ptail_ == i->second)
{ {
ptail_ = i->second->next(); ptail_ = i->second->prev();
} }
phead_ = i->second->prepend(phead_); phead_ = i->second->prepend(phead_);
@ -217,6 +217,7 @@ LRUStorage::Node* LRUStorage::free_lru()
if (free_node_data(ptail_)) if (free_node_data(ptail_))
{ {
pnode = ptail_; pnode = ptail_;
ptail_ = ptail_->remove();
} }
return pnode; return pnode;
@ -280,7 +281,7 @@ bool LRUStorage::free_node_data(Node* pnode)
NodesPerKey::iterator i = nodes_per_key_.find(*pkey); NodesPerKey::iterator i = nodes_per_key_.find(*pkey);
if (i != nodes_per_key_.end()) if (i == nodes_per_key_.end())
{ {
MXS_ERROR("Item in LRU list was not found in key mapping."); MXS_ERROR("Item in LRU list was not found in key mapping.");
} }

4
server/modules/filter/cache/lrustorage.h vendored
View File

@ -119,8 +119,10 @@ private:
pnode->pprev_->pnext_ = this; pnode->pprev_->pnext_ = this;
} }
pnode->pprev_ = this; pprev_ = pnode->pprev_;
pnext_ = pnode; pnext_ = pnode;
pnode->pprev_ = this;
} }
return this; return this;