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

Fix

Browse Source
This commit is contained in:
kssenii 2022-12-07 15:03:12 +01:00
parent 88523ef0b6
commit ab8acfb8b2
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Storages/ReadFromStorageProgress.cpp
View File

@ -1,5 +1,6 @@
#include <Storages/ReadFromStorageProgress.h> #include <Storages/ReadFromStorageProgress.h>
#include <Processors/ISource.h> #include <Processors/ISource.h>
#include <QueryPipeline/StreamLocalLimits.h>
namespace DB namespace DB
{ {
@ -16,6 +17,21 @@ void updateRowsProgressApprox(
return; return;
const size_t num_rows = chunk.getNumRows(); const size_t num_rows = chunk.getNumRows();
if (!num_rows)
return;
const auto progress = source.getReadProgress();
if (progress && !progress->limits.empty())
{
for (const auto & limit : progress->limits)
{
if (limit.leaf_limits.max_rows || limit.leaf_limits.max_bytes
|| limit.local_limits.size_limits.max_rows || limit.local_limits.size_limits.max_bytes)
return;
}
}
const auto bytes_per_row = std::ceil(static_cast<double>(chunk.bytes()) / num_rows); const auto bytes_per_row = std::ceil(static_cast<double>(chunk.bytes()) / num_rows);
size_t total_rows_approx = static_cast<size_t>(std::ceil(static_cast<double>(total_result_size) / bytes_per_row)); size_t total_rows_approx = static_cast<size_t>(std::ceil(static_cast<double>(total_result_size) / bytes_per_row));
total_rows_approx_accumulated += total_rows_approx; total_rows_approx_accumulated += total_rows_approx;