thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 00:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better logger name

Browse Source
This commit is contained in:
kssenii 2024-04-03 19:06:33 +02:00
parent f0dac3dfd5
commit 2db1e34517
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,9 +90,15 @@ FileCache::FileCache(const std::string & cache_name, const FileCacheSettings & s
, metadata(settings.base_path, settings.background_download_queue_size_limit, settings.background_download_threads, write_cache_per_user_directory)
{
if (settings.cache_policy == "LRU")
main_priority = std::make_unique<LRUFileCachePriority>(settings.max_size, settings.max_elements);
{
main_priority = std::make_unique<LRUFileCachePriority>(
settings.max_size, settings.max_elements, nullptr, cache_name);
}
else if (settings.cache_policy == "SLRU")
main_priority = std::make_unique<SLRUFileCachePriority>(settings.max_size, settings.max_elements, settings.slru_size_ratio);
{
main_priority = std::make_unique<SLRUFileCachePriority>(
settings.max_size, settings.max_elements, settings.slru_size_ratio, nullptr, nullptr, cache_name);
}
else
throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown cache policy: {}", settings.cache_policy);

8
src/Interpreters/Cache/SLRUFileCachePriority.cpp
View File

@ -28,17 +28,19 @@ SLRUFileCachePriority::SLRUFileCachePriority(
size_t max_elements_,
double size_ratio_,
LRUFileCachePriority::StatePtr probationary_state_,
LRUFileCachePriority::StatePtr protected_state_)
LRUFileCachePriority::StatePtr protected_state_,
const std::string & description_)
: IFileCachePriority(max_size_, max_elements_)
, size_ratio(size_ratio_)
, protected_queue(LRUFileCachePriority(getRatio(max_size_, size_ratio),
getRatio(max_elements_, size_ratio),
protected_state_,
"protected"))
description_ + ", protected"))
, probationary_queue(LRUFileCachePriority(getRatio(max_size_, 1 - size_ratio),
getRatio(max_elements_, 1 - size_ratio),
probationary_state_,
"probationary"))
description_ + ", probationary"))
, log(getLogger("SLRUFileCachePriority(" + description_ + ")"))
{
LOG_DEBUG(
log, "Probationary queue {} in size and {} in elements. "

5
src/Interpreters/Cache/SLRUFileCachePriority.h
View File

@ -19,7 +19,8 @@ public:
size_t max_elements_,
double size_ratio_,
LRUFileCachePriority::StatePtr probationary_state_ = nullptr,
LRUFileCachePriority::StatePtr protected_state_ = nullptr);
LRUFileCachePriority::StatePtr protected_state_ = nullptr,
const std::string & description_ = "none");
size_t getSize(const CachePriorityGuard::Lock & lock) const override;
@ -67,7 +68,7 @@ private:
double size_ratio;
LRUFileCachePriority protected_queue;
LRUFileCachePriority probationary_queue;
LoggerPtr log = getLogger("SLRUFileCachePriority");
LoggerPtr log;
void increasePriority(SLRUIterator & iterator, const CachePriorityGuard::Lock & lock);