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

dbms: fix segfault when SELECT FINAL selects zero parts[#METR-16457]

Browse Source
This commit is contained in:
Andrey Mironov 2015-09-16 14:46:23 +03:00
parent fa0e61086f
commit 55087bddc7
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
View File

@ -390,10 +390,9 @@ BlockInputStreams MergeTreeDataSelectExecutor::spreadMarkRangesAmongThreads(
const std::size_t total_rows = data.index_granularity * sum_marks; const std::size_t total_rows = data.index_granularity * sum_marks;
/// Выставим приблизительное количество строк только для первого источника /// Выставим приблизительное количество строк только для первого источника
if (!res.empty())
static_cast<IProfilingBlockInputStream &>(*res.front()).setTotalRowsApprox(total_rows); static_cast<IProfilingBlockInputStream &>(*res.front()).setTotalRowsApprox(total_rows);
LOG_TRACE(log, "Reading approx. " << total_rows); LOG_TRACE(log, "Reading approx. " << total_rows << " rows");
} }
else if (sum_marks > 0) else if (sum_marks > 0)
{ {
@ -514,6 +513,10 @@ BlockInputStreams MergeTreeDataSelectExecutor::spreadMarkRangesAmongThreadsFinal
parts.size(), sum_marks, min_marks_for_read_task, parts, data, prewhere_actions, prewhere_column, true, parts.size(), sum_marks, min_marks_for_read_task, parts, data, prewhere_actions, prewhere_column, true,
column_names, true); column_names, true);
/// Оценим общее количество строк - для прогресс-бара.
const std::size_t total_rows = data.index_granularity * sum_marks;
LOG_TRACE(log, "Reading approx. " << total_rows << " rows");
for (const auto i : ext::range(0, parts.size())) for (const auto i : ext::range(0, parts.size()))
{ {
BlockInputStreamPtr source_stream{ BlockInputStreamPtr source_stream{
@ -523,17 +526,12 @@ BlockInputStreams MergeTreeDataSelectExecutor::spreadMarkRangesAmongThreadsFinal
} }
}; };
if (i == 0)
/// Выставим приблизительное количество строк только для первого источника
static_cast<IProfilingBlockInputStream &>(*source_stream).setTotalRowsApprox(total_rows);
to_merge.push_back(new ExpressionBlockInputStream(source_stream, data.getPrimaryExpression())); to_merge.push_back(new ExpressionBlockInputStream(source_stream, data.getPrimaryExpression()));
} }
/// Оценим общее количество строк - для прогресс-бара.
const std::size_t total_rows = data.index_granularity * sum_marks;
/// Выставим приблизительное количество строк только для первого источника
if (!to_merge.empty())
static_cast<IProfilingBlockInputStream &>(*to_merge.front()).setTotalRowsApprox(total_rows);
LOG_TRACE(log, "Reading approx. " << total_rows);
} }
else else
{ {