thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-29 13:10:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

better arguments

Browse Source
This commit is contained in:
Anton Popov 2021-10-04 15:02:11 +03:00
parent 0dfe96fc02
commit cd08057285
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Columns/ColumnConst.cpp
View File

@ -93,7 +93,7 @@ ColumnPtr ColumnConst::replicate(const Offsets & offsets) const
ColumnPtr ColumnConst::permute(const Permutation & perm, size_t limit) const
{
limit = getLimitForPermutation(*this, perm, limit);
limit = getLimitForPermutation(size(), perm.size(), limit);
return ColumnConst::create(data, limit);
}

2
src/Columns/ColumnFunction.cpp
View File

@ -93,7 +93,7 @@ void ColumnFunction::expand(const Filter & mask, bool inverted)
ColumnPtr ColumnFunction::permute(const Permutation & perm, size_t limit) const
{
limit = getLimitForPermutation(*this, perm, limit);
limit = getLimitForPermutation(size(), perm.size(), limit);
ColumnsWithTypeAndName capture = captured_columns;
for (auto & column : capture)

13
src/Columns/ColumnsCommon.h
View File

@ -72,17 +72,16 @@ ColumnPtr selectIndexImpl(const Column & column, const IColumn & indexes, size_t
ErrorCodes::LOGICAL_ERROR);
}
template <typename Column>
size_t getLimitForPermutation(const Column & column, const IColumn::Permutation & perm, size_t limit)
size_t getLimitForPermutation(size_t column_size, size_t perm_size, size_t limit)
{
if (limit == 0)
limit = column.size();
limit = column_size;
else
limit = std::min(column.size(), limit);
limit = std::min(column_size, limit);
if (perm.size() < limit)
if (perm_size < limit)
throw Exception(ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH,
"Size of permutation ({}) is less than required ({})", perm.size(), limit);
"Size of permutation ({}) is less than required ({})", perm_size, limit);
return limit;
}
@ -90,7 +89,7 @@ size_t getLimitForPermutation(const Column & column, const IColumn::Permutation
template <typename Column>
ColumnPtr permuteImpl(const Column & column, const IColumn::Permutation & perm, size_t limit)
{
limit = getLimitForPermutation(column, perm, limit);
limit = getLimitForPermutation(column.size(), perm.size(), limit);
return column.indexImpl(perm, limit);
}