thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-29 11:02:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #309 from ludv1x/METR-24025

Browse Source 
Fixed segfault in aggregation combinators for complex nested functions
This commit is contained in:
alexey-milovidov 2017-01-09 20:14:16 +04:00 committed by GitHub
commit 1d641212c8
4 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbms/include/DB/AggregateFunctions/AggregateFunctionArray.h
View File

@ -83,7 +83,7 @@ public:
return nested_func->alignOfData();
}
void add(AggregateDataPtr place, const IColumn ** columns, size_t row_num, Arena *) const override
void add(AggregateDataPtr place, const IColumn ** columns, size_t row_num, Arena * arena) const override
{
const IColumn * nested[num_agruments];
@ -97,7 +97,7 @@ public:
size_t end = offsets[row_num];
for (size_t i = begin; i < end; ++i)
nested_func->add(place, nested, i, nullptr);
nested_func->add(place, nested, i, arena);
}
void merge(AggregateDataPtr place, ConstAggregateDataPtr rhs, Arena * arena) const override

4
dbms/include/DB/AggregateFunctions/AggregateFunctionIf.h
View File

@ -77,10 +77,10 @@ public:
return nested_func->alignOfData();
}
void add(AggregateDataPtr place, const IColumn ** columns, size_t row_num, Arena *) const override
void add(AggregateDataPtr place, const IColumn ** columns, size_t row_num, Arena * arena) const override
{
if (static_cast<const ColumnUInt8 &>(*columns[num_agruments - 1]).getData()[row_num])
nested_func->add(place, columns, row_num, nullptr);
nested_func->add(place, columns, row_num, arena);
}
void merge(AggregateDataPtr place, ConstAggregateDataPtr rhs, Arena * arena) const override

20
dbms/tests/queries/0_stateless/00410_aggregation_combinators_with_arenas.reference Normal file
View File

@ -0,0 +1,20 @@
999
999
999
999
999
999
999
999
999
999
1000
1000
1000
1000
1000
1000
1000
1000
1000
1000

6
dbms/tests/queries/0_stateless/00410_aggregation_combinators_with_arenas.sql Normal file
View File

@ -0,0 +1,6 @@
DROP TABLE IF EXISTS test.arena;
CREATE TABLE test.arena (k UInt8, d String) ENGINE = Memory;
INSERT INTO test.arena SELECT number % 10 AS k, hex(intDiv(number, 10) % 1000) AS d FROM system.numbers LIMIT 10000000;
SELECT length(groupUniqArrayIf(d, d != hex(0))) FROM test.arena GROUP BY k;
SELECT length(groupUniqArrayMerge(ds)) FROM (SELECT k, groupUniqArrayState(d) AS ds FROM test.arena GROUP BY k) GROUP BY k;
DROP TABLE IF EXISTS test.arena;