thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-30 03:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

tryReserve() cleanup

Browse Source 
simplify removing eviction candidates
This commit is contained in:
Igor Nikonov 2023-05-21 22:01:28 +00:00
parent 8102fe3e21
commit f5dc07d052
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Interpreters/Cache/FileCache.cpp
View File

@ -573,27 +573,25 @@ bool FileCache::tryReserve(FileSegment & file_segment, size_t size)
else
queue_size += 1;
class EvictionCandidates final : public std::vector<FileSegmentMetadataPtr>
struct EvictionCandidates
{
public:
explicit EvictionCandidates(KeyMetadataPtr key_metadata_) : key_metadata(key_metadata_) {}
KeyMetadata & getMetadata() { return *key_metadata; }
void add(FileSegmentMetadataPtr candidate)
{
candidate->removal_candidate = true;
push_back(candidate);
candidates.push_back(candidate);
}
~EvictionCandidates()
{
for (const auto & candidate : *this)
// todo: it looks redundant, - why is it needed?
for (const auto & candidate : candidates)
candidate->removal_candidate = false;
}
private:
KeyMetadataPtr key_metadata;
std::vector<FileSegmentMetadataPtr> candidates;
};
std::unordered_map<Key, EvictionCandidates> to_delete;
@ -681,23 +679,22 @@ bool FileCache::tryReserve(FileSegment & file_segment, size_t size)
for (auto & [current_key, deletion_info] : to_delete)
{
auto locked_key = deletion_info.getMetadata().tryLock();
auto locked_key = deletion_info.key_metadata->tryLock();
if (!locked_key)
continue; /// key could become invalid after we released the key lock above, just skip it.
for (auto it = deletion_info.begin(); it != deletion_info.end();)
for (const auto & candidate : deletion_info.candidates)
{
chassert((*it)->releasable());
chassert(candidate->releasable());
auto segment = (*it)->file_segment;
auto segment = candidate->file_segment;
locked_key->removeFileSegment(segment->offset(), segment->lock());
segment->getQueueIterator()->remove(cache_lock);
if (query_context)
query_context->remove(current_key, segment->offset(), cache_lock);
it = deletion_info.erase(it);
}
deletion_info.candidates.clear();
}
/// queue_iteratir is std::nullopt here if no space has been reserved yet, a file_segment_metadata

2
src/Interpreters/Cache/Metadata.h
View File

@ -24,7 +24,7 @@ struct FileSegmentMetadata : private boost::noncopyable
bool valid() const { return !removal_candidate.load(); }
Priority::Iterator getQueueIterator() { return file_segment->getQueueIterator(); }
Priority::Iterator getQueueIterator() const { return file_segment->getQueueIterator(); }
FileSegmentPtr file_segment;
std::atomic<bool> removal_candidate{false};