thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-23 18:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix test

Browse Source
This commit is contained in:
Alexey Milovidov 2020-11-04 14:07:54 +03:00
parent 938ef62532
commit c848deed1e
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/AggregateFunctions/AggregateFunctionOrFill.h
View File

@ -105,20 +105,26 @@ public:
void addBatchSinglePlace(size_t batch_size, AggregateDataPtr place, const IColumn ** columns, Arena * arena) const override
{
nested_function->addBatchSinglePlace(batch_size, place, columns, arena);
place[size_of_data] = 1;
if (batch_size)
{
nested_function->addBatchSinglePlace(batch_size, place, columns, arena);
place[size_of_data] = 1;
}
}
void addBatchSinglePlaceNotNull(
size_t batch_size, AggregateDataPtr place, const IColumn ** columns, const UInt8 * null_map, Arena * arena) const override
{
nested_function->addBatchSinglePlaceNotNull(batch_size, place, columns, null_map, arena);
for (size_t i = 0; i < batch_size; ++i)
if (batch_size)
{
if (!null_map[i])
nested_function->addBatchSinglePlaceNotNull(batch_size, place, columns, null_map, arena);
for (size_t i = 0; i < batch_size; ++i)
{
place[size_of_data] = 1;
break;
if (!null_map[i])
{
place[size_of_data] = 1;
break;
}
}
}
}
@ -129,7 +135,6 @@ public:
Arena * arena) const override
{
nested_function->merge(place, rhs, arena);
place[size_of_data] |= rhs[size_of_data];
}