thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-27 10:02:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always display resource usage in client

Browse Source
This commit is contained in:
Alexey Milovidov 2021-12-29 01:26:58 +03:00
parent e8e19b8b0d
commit d456c5ddda
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Common/ProgressIndication.cpp
View File

@ -182,18 +182,19 @@ void ProgressIndication::writeProgress()
written_progress_chars = message.count() - prefix_size - (strlen(indicator) - 2); /// Don't count invisible output (escape sequences). written_progress_chars = message.count() - prefix_size - (strlen(indicator) - 2); /// Don't count invisible output (escape sequences).
/// Display resource usage if possible.
std::string profiling_msg; std::string profiling_msg;
// If approximate cores number is known, display it.
double cpu_usage = getCPUUsage(); double cpu_usage = getCPUUsage();
if (cpu_usage > 0) auto [memory_usage, max_host_usage] = getMemoryUsage();
if (cpu_usage > 0 || memory_usage > 0)
{ {
WriteBufferFromOwnString profiling_msg_builder; WriteBufferFromOwnString profiling_msg_builder;
profiling_msg_builder << "(" << fmt::format("{:.1f}", cpu_usage) << " CPU"; profiling_msg_builder << "(" << fmt::format("{:.1f}", cpu_usage) << " CPU";
auto [memory_usage, max_host_usage] = getMemoryUsage(); if (memory_usage > 0)
if (memory_usage != 0)
profiling_msg_builder << ", " << formatReadableSizeWithDecimalSuffix(memory_usage) << " RAM"; profiling_msg_builder << ", " << formatReadableSizeWithDecimalSuffix(memory_usage) << " RAM";
if (max_host_usage < memory_usage) if (max_host_usage < memory_usage)
profiling_msg_builder << ", " << formatReadableSizeWithDecimalSuffix(max_host_usage) << " max/host"; profiling_msg_builder << ", " << formatReadableSizeWithDecimalSuffix(max_host_usage) << " max/host";