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

Fix progress bar jumping near 50%

Browse Source
This commit is contained in:
Alexey Milovidov 2022-02-20 19:29:09 +01:00
parent 26d0e5438c
commit 1d5e99362f
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/Common/ProgressIndication.cpp
View File

@ -238,28 +238,44 @@ void ProgressIndication::writeProgress()
/// at right after progress bar or at left on top of the progress bar. /// at right after progress bar or at left on top of the progress bar.
if (width_of_progress_bar <= 1 + 2 * static_cast<int64_t>(profiling_msg.size())) if (width_of_progress_bar <= 1 + 2 * static_cast<int64_t>(profiling_msg.size()))
profiling_msg.clear(); profiling_msg.clear();
else
width_of_progress_bar -= profiling_msg.size();
if (width_of_progress_bar > 0) if (width_of_progress_bar > 0)
{ {
double bar_width = UnicodeBar::getWidth(current_count, 0, max_count, width_of_progress_bar); double bar_width = UnicodeBar::getWidth(current_count, 0, max_count, width_of_progress_bar);
std::string bar = UnicodeBar::render(bar_width); std::string bar = UnicodeBar::render(bar_width);
/// Render profiling_msg at left on top of the progress bar. if (profiling_msg.empty())
bool render_profiling_msg_at_left = current_count * 2 >= max_count; {
if (!profiling_msg.empty() && render_profiling_msg_at_left) message << "\033[0;32m" << bar << "\033[0m";
message << "\033[30;42m" << profiling_msg << "\033[0m"; }
else
{
bool render_profiling_msg_at_left = current_count * 2 >= max_count;
message << "\033[0;32m" << bar << "\033[0m"; if (render_profiling_msg_at_left)
{
/// Render profiling_msg at left on top of the progress bar.
/// Whitespaces after the progress bar. message << "\033[30;42m" << profiling_msg << "\033[0m"
if (width_of_progress_bar > static_cast<int64_t>(bar.size() / UNICODE_BAR_CHAR_SIZE)) << "\033[0;32m" << bar.substr(profiling_msg.size()) << "\033[0m";
message << std::string(width_of_progress_bar - bar.size() / UNICODE_BAR_CHAR_SIZE, ' ');
/// Render profiling_msg at right after the progress bar. /// Whitespaces after the progress bar.
if (!profiling_msg.empty() && !render_profiling_msg_at_left) if (width_of_progress_bar > static_cast<int64_t>(bar.size() / UNICODE_BAR_CHAR_SIZE))
message << "\033[2m" << profiling_msg << "\033[0m"; message << std::string(width_of_progress_bar - bar.size() / UNICODE_BAR_CHAR_SIZE, ' ');
}
else
{
/// Render profiling_msg at right after the progress bar.
message << "\033[0;32m" << bar << "\033[0m";
/// Whitespaces after the progress bar.
if (width_of_progress_bar > static_cast<int64_t>(profiling_msg.size()) + static_cast<int64_t>(bar.size() / UNICODE_BAR_CHAR_SIZE))
message << std::string(width_of_progress_bar - profiling_msg.size() - bar.size() / UNICODE_BAR_CHAR_SIZE, ' ');
message << "\033[2m" << profiling_msg << "\033[0m";
}
}
} }
} }
} }