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

Fix: read row counts before move columns out of chunk

Browse Source
This commit is contained in:
Igor Nikonov 2022-08-05 21:29:57 +00:00
parent 9fddf6efde
commit 8278da6475
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Processors/Transforms/DistinctTransform.cpp
View File

@ -11,7 +11,7 @@ namespace ErrorCodes
DistinctTransform::DistinctTransform(
const Block & header_,
const SizeLimits & set_size_limits_,
UInt64 limit_hint_,
const UInt64 limit_hint_,
const Names & columns_)
: ISimpleTransform(header_, header_, true)
, limit_hint(limit_hint_)
@ -50,9 +50,13 @@ void DistinctTransform::buildFilter(
void DistinctTransform::transform(Chunk & chunk)
{
if (unlikely(!chunk.hasRows()))
return;
/// Convert to full column, because SetVariant for sparse column is not implemented.
convertToFullIfSparse(chunk);
const auto num_rows = chunk.getNumRows();
auto columns = chunk.detachColumns();
/// Special case, - only const columns, return single row
@ -66,13 +70,6 @@ void DistinctTransform::transform(Chunk & chunk)
return;
}
/// Stop reading if we already reach the limit.
if (limit_hint && data.getTotalRowCount() >= limit_hint)
{
stopReading();
return;
}
ColumnRawPtrs column_ptrs;
column_ptrs.reserve(key_columns_pos.size());
for (auto pos : key_columns_pos)
@ -82,7 +79,6 @@ void DistinctTransform::transform(Chunk & chunk)
data.init(SetVariants::chooseMethod(column_ptrs, key_sizes));
const auto old_set_size = data.getTotalRowCount();
const auto num_rows = chunk.getNumRows();
IColumn::Filter filter(num_rows);
switch (data.type)
@ -108,6 +104,13 @@ void DistinctTransform::transform(Chunk & chunk)
column = column->filter(filter, -1);
chunk.setColumns(std::move(columns), data.getTotalRowCount() - old_set_size);
/// Stop reading if we already reach the limit
if (limit_hint && data.getTotalRowCount() >= limit_hint)
{
stopReading();
return;
}
}
}