thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-15 02:41:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify cache loading

Browse Source
This commit is contained in:
kssenii 2023-03-23 13:40:54 +01:00
parent 6dc08b2768
commit 3f1d0fa14c
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -827,7 +827,7 @@ void FileCache::removeAllReleasable()
void FileCache::loadMetadata() void FileCache::loadMetadata()
{ {
auto lock = cache_guard.lock(); auto lock = cache_guard.lock();
LockedCachePriority priority_queue(lock, *main_priority); LockedCachePriority queue(lock, *main_priority);
UInt64 offset = 0; UInt64 offset = 0;
size_t size = 0; size_t size = 0;
@ -887,7 +887,9 @@ void FileCache::loadMetadata()
{ {
parsed = tryParse<UInt64>(offset, offset_with_suffix.substr(0, delim_pos)); parsed = tryParse<UInt64>(offset, offset_with_suffix.substr(0, delim_pos));
if (offset_with_suffix.substr(delim_pos+1) == "persistent") if (offset_with_suffix.substr(delim_pos+1) == "persistent")
{
segment_kind = FileSegmentKind::Persistent; segment_kind = FileSegmentKind::Persistent;
}
if (offset_with_suffix.substr(delim_pos+1) == "temporary") if (offset_with_suffix.substr(delim_pos+1) == "temporary")
{ {
fs::remove(offset_it->path()); fs::remove(offset_it->path());
@ -908,11 +910,14 @@ void FileCache::loadMetadata()
continue; continue;
} }
if (tryReserveUnlocked(locked_key, offset, size, lock)) if ((queue.getSizeLimit() == 0 || queue.getSize() + size <= queue.getSizeLimit())
&& (queue.getElementsLimit() == 0 || queue.getElementsCount() + 1 <= queue.getElementsLimit()))
{ {
auto file_segment_metadata_it = addFileSegment( auto file_segment_metadata_it = addFileSegment(
*locked_key, offset, size, FileSegment::State::DOWNLOADED, *locked_key, offset, size, FileSegment::State::DOWNLOADED, CreateFileSegmentSettings(segment_kind), &lock);
CreateFileSegmentSettings(segment_kind), &lock);
chassert(file_segment_metadata_it->second.queue_iterator);
chassert(file_segment_metadata_it->second.size() == size);
queue_entries.emplace_back( queue_entries.emplace_back(
file_segment_metadata_it->second.queue_iterator, file_segment_metadata_it->second.file_segment); file_segment_metadata_it->second.queue_iterator, file_segment_metadata_it->second.file_segment);
@ -923,7 +928,7 @@ void FileCache::loadMetadata()
log, log,
"Cache capacity changed (max size: {}, used: {}), " "Cache capacity changed (max size: {}, used: {}), "
"cached file `{}` does not fit in cache anymore (size: {})", "cached file `{}` does not fit in cache anymore (size: {})",
priority_queue.getSizeLimit(), priority_queue.getSize(), key_it->path().string(), size); queue.getSizeLimit(), queue.getSize(), key_it->path().string(), size);
fs::remove(offset_it->path()); fs::remove(offset_it->path());
} }