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

Fix UBSan report in arrayCumSum

Browse Source
This commit is contained in:
Alexey Milovidov 2021-02-06 22:17:19 +03:00
parent b0f201df72
commit fd899daa00
1 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/Functions/array/arrayCumSum.cpp
View File

@ -45,6 +45,41 @@ struct ArrayCumSumImpl
} }
template <typename Src, typename Dst>
static void NO_SANITIZE_UNDEFINED implConst(
size_t size, const IColumn::Offset * __restrict offsets, Dst * __restrict res_values, Src src_value)
{
size_t pos = 0;
for (const auto * end = offsets + size; offsets < end; ++offsets)
{
auto offset = *offsets;
Src accumulated{};
for (; pos < offset; ++pos)
{
accumulated += src_value;
res_values[pos] = accumulated;
}
}
}
template <typename Src, typename Dst>
static void NO_SANITIZE_UNDEFINED implVector(
size_t size, const IColumn::Offset * __restrict offsets, Dst * __restrict res_values, const Src * __restrict src_values)
{
size_t pos = 0;
for (const auto * end = offsets + size; offsets < end; ++offsets)
{
auto offset = *offsets;
Src accumulated{};
for (; pos < offset; ++pos)
{
accumulated += src_values[pos];
res_values[pos] = accumulated;
}
}
}
template <typename Element, typename Result> template <typename Element, typename Result>
static bool executeType(const ColumnPtr & mapped, const ColumnArray & array, ColumnPtr & res_ptr) static bool executeType(const ColumnPtr & mapped, const ColumnArray & array, ColumnPtr & res_ptr)
{ {
@ -75,19 +110,7 @@ struct ArrayCumSumImpl
typename ColVecResult::Container & res_values = res_nested->getData(); typename ColVecResult::Container & res_values = res_nested->getData();
res_values.resize(column_const->size()); res_values.resize(column_const->size());
implConst(offsets.size(), offsets.data(), res_values.data(), x);
size_t pos = 0;
for (auto offset : offsets)
{
// skip empty arrays
if (pos < offset)
{
res_values[pos++] = x; // NOLINT
for (; pos < offset; ++pos)
res_values[pos] = res_values[pos - 1] + x;
}
}
res_ptr = ColumnArray::create(std::move(res_nested), array.getOffsetsPtr()); res_ptr = ColumnArray::create(std::move(res_nested), array.getOffsetsPtr());
return true; return true;
} }
@ -103,18 +126,7 @@ struct ArrayCumSumImpl
typename ColVecResult::Container & res_values = res_nested->getData(); typename ColVecResult::Container & res_values = res_nested->getData();
res_values.resize(data.size()); res_values.resize(data.size());
implVector(offsets.size(), offsets.data(), res_values.data(), data.data());
size_t pos = 0;
for (auto offset : offsets)
{
// skip empty arrays
if (pos < offset)
{
res_values[pos] = data[pos]; // NOLINT
for (++pos; pos < offset; ++pos)
res_values[pos] = res_values[pos - 1] + data[pos];
}
}
res_ptr = ColumnArray::create(std::move(res_nested), array.getOffsetsPtr()); res_ptr = ColumnArray::create(std::move(res_nested), array.getOffsetsPtr());
return true; return true;