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

Fix tests and build

Browse Source
This commit is contained in:
Pavel Kruglov 2021-04-28 19:49:55 +03:00
parent 931d533152
commit ee659fa902
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Columns/ColumnFixedString.cpp
View File

@ -351,7 +351,7 @@ void ColumnFixedString::expand(const IColumn::Filter & mask, bool reverse)
int index = mask.size() - 1;
int from = size() - 1;
chars.resize(mask.size() * n);
chars.resize_fill(mask.size() * n, 0);
while (index >= 0)
{
if (mask[index] ^ reverse)

4
src/Columns/MaskOperations.cpp
View File

@ -102,6 +102,7 @@ void expandOffsetsByMask(PaddedPODArray<UInt64> & offsets, const PaddedPODArray<
}
template <typename ValueType>
bool tryExpandMaskColumnByMask(const ColumnPtr & column, const PaddedPODArray<UInt8> & mask, bool reverse, UInt8 default_value_for_expanding_mask)
{
@ -256,11 +257,10 @@ bool checkArgumentsForColumnFunction(const ColumnsWithTypeAndName & arguments)
{
for (const auto & arg : arguments)
{
if (const auto * col = checkAndGetColumn<ColumnFunction>(*arg.column))
if (checkAndGetColumn<ColumnFunction>(*arg.column))
return true;
}
return false;
}
}

2
src/Columns/MaskOperations.h
View File

@ -13,7 +13,7 @@ void expandDataByMask(PaddedPODArray<T> & data, const PaddedPODArray<UInt8> & ma
void expandOffsetsByMask(PaddedPODArray<UInt64> & offsets, const PaddedPODArray<UInt8> & mask, bool reverse);
void getMaskFromColumn(const ColumnPtr & column, PaddedPODArray<UInt8> & mask, bool reverse = false, const PaddedPODArray<UInt8> * null_bytemap = nullptr, UInt8 null_value = 1);
void getMaskFromColumn(const ColumnPtr & column, PaddedPODArray<UInt8> & res, bool reverse = false, const PaddedPODArray<UInt8> * null_bytemap = nullptr, UInt8 null_value = 1);
void conjunctionMasks(PaddedPODArray<UInt8> & mask1, const PaddedPODArray<UInt8> & mask2);