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

fix code style

Browse Source
This commit is contained in:
taiyang-li 2021-11-29 11:47:31 +08:00
parent 919b439b7c
commit 85cb7fc23e
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/IO/RemoteReadBufferCache.cpp
View File

@ -157,14 +157,9 @@ void RemoteCacheController::backgroupDownload(std::function<void(RemoteCacheCont
lock.unlock();
more_data_signal.notify_all();
finish_callback(this);
LOG_TRACE(
&Poco::Logger::get("RemoteCacheController"),
"finish download.{} into {}. size:{} ",
remote_path,
local_path.string(),
current_offset);
LOG_TRACE(log, "finish download.{} into {}. size:{} ", remote_path, local_path.string(), current_offset);
};
RemoteReadBufferCache::instance().GetThreadPool()->scheduleOrThrow(task);
RemoteReadBufferCache::instance().getThreadPool()->scheduleOrThrow(task);
}
void RemoteCacheController::flush(bool need_flush_meta_)
@ -389,7 +384,7 @@ RemoteReadBufferCache::RemoteReadBufferCache() = default;
RemoteReadBufferCache::~RemoteReadBufferCache()
{
threadPool->wait();
thread_pool->wait();
}
RemoteReadBufferCache & RemoteReadBufferCache::instance()
@ -432,7 +427,7 @@ void RemoteReadBufferCache::initOnce(
local_path_prefix = dir;
limit_size = limit_size_;
local_cache_bytes_read_before_flush = bytes_read_before_flush_;
threadPool = std::make_shared<FreeThreadPool>(max_threads, 1000, 1000, false);
thread_pool = std::make_shared<FreeThreadPool>(max_threads, 1000, 1000, false);
// scan local disk dir and recover the cache metas
std::filesystem::path root_dir(local_path_prefix);
@ -449,7 +444,7 @@ void RemoteReadBufferCache::initOnce(
this->inited = true;
LOG_TRACE(this->log, "recovered from disk ");
};
GetThreadPool()->scheduleOrThrow(recover_task);
getThreadPool()->scheduleOrThrow(recover_task);
}
std::filesystem::path RemoteReadBufferCache::calculateLocalPath(const RemoteFileMeta & meta)

6
src/IO/RemoteReadBufferCache.h
View File

@ -128,6 +128,8 @@ private:
size_t local_cache_bytes_read_before_flush;
std::shared_ptr<ReadBuffer> remote_readbuffer;
std::unique_ptr<std::ofstream> out_file;
Poco::Logger * log = &Poco::Logger::get("RemoteReadBufferCache");
};
/**
@ -186,7 +188,7 @@ public:
~RemoteReadBufferCache();
// global instance
static RemoteReadBufferCache & instance();
std::shared_ptr<FreeThreadPool> GetThreadPool() { return threadPool; }
std::shared_ptr<FreeThreadPool> getThreadPool() { return thread_pool; }
void initOnce(const std::filesystem::path & dir, size_t limit_size, size_t bytes_read_before_flush_, size_t max_threads);
inline bool hasInitialized() const { return inited; }
@ -197,7 +199,7 @@ public:
private:
std::string local_path_prefix;
std::shared_ptr<FreeThreadPool> threadPool;
std::shared_ptr<FreeThreadPool> thread_pool;
std::atomic<bool> inited = false;
std::mutex mutex;
size_t limit_size = 0;